diff options
| author | Gjore Gjorgjievski <gjore.gjorgjievski@seavus.com> | 2011-06-21 09:58:20 +0100 |
|---|---|---|
| committer | Viktor Mladenovski <viktor.mladenovski@seavus.com> | 2011-08-17 22:11:37 +0200 |
| commit | 632b3be5e00fd38294b0106705ac0ecdab9d62b6 (patch) | |
| tree | f02775b40b606d699ddc01a14622c30eef33d934 | |
| parent | b9b4df06ddb81a6d14354fc0d42e22acf0b4c30c (diff) | |
Increase the bulk command receiving timeout.
This timeout expires when working with MFA relay.
ST-Ericsson ID: 329180
ST-Ericsson FOSS-OUT ID: STETL-FOSS-OUT-10204
Change-Id: I5d459585cb065bad1cc16ffefd25ec28b731778d
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/25508
Reviewed-by: QATOOLS
Reviewed-by: QATEST
Tested-by: Vlatko STENKOSKI
Tested-by: Aleksandar GASOSKI <aleksandar.gasoski@seavus.com>
Reviewed-by: Zoran ANCEVSKI <zoran.ancevski@seavus.com>
Reviewed-by: Vlatko PISTOLOV <vlatko.pistolov@seavus.com>
Tested-by: Vlatko PISTOLOV <vlatko.pistolov@seavus.com>
Conflicts:
lcmodule/win_binaries/LCM.dll
win_binaries/LCDriver_CNH1606432.dll
7 files changed, 11 insertions, 11 deletions
diff --git a/lcmodule/source/LCM.rc b/lcmodule/source/LCM.rc index b011c38..572d78e 100755 --- a/lcmodule/source/LCM.rc +++ b/lcmodule/source/LCM.rc @@ -69,16 +69,16 @@ BEGIN BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "Comments", "Build date: 2011-06-16"
+ VALUE "Comments", "Build date: 2011-06-21"
VALUE "CompanyName", "ST Ericsson AB"
VALUE "FileDescription", "LCM Dynamic Link Library"
VALUE "FileVersion", "1,0,0,1"
VALUE "InternalName", "LCM"
VALUE "LegalCopyright", "Copyright (C) ST Ericsson 2011"
VALUE "OriginalFilename", "LCM.dll"
- VALUE "PrivateBuild", "Change-Id: Ib1901abfc2efa6c887c70b8583ddd2258e21aa78"
+ VALUE "PrivateBuild", "Change-Id: I5d459585cb065bad1cc16ffefd25ec28b731778d"
VALUE "ProductName", "CXA1104507 Loader Communication Module"
- VALUE "ProductVersion", "R1T"
+ VALUE "ProductVersion", "P1S"
END
END
BLOCK "VarFileInfo"
diff --git a/lcmodule/source/cnh1605204_ldr_transport_layer/source/bulk_protocol.c b/lcmodule/source/cnh1605204_ldr_transport_layer/source/bulk_protocol.c index dd92fe8..072d487 100644 --- a/lcmodule/source/cnh1605204_ldr_transport_layer/source/bulk_protocol.c +++ b/lcmodule/source/cnh1605204_ldr_transport_layer/source/bulk_protocol.c @@ -1311,7 +1311,7 @@ static ErrorCode_e R15_Bulk_ReadRequestHandler(Communication_t *Communication_p, ErrorExit: /* release the buffer for command BULK READ */ - ReturnValue = R15_Network_PacketRelease(Communication_p, Packet_p); // TODO: proveri zosto ReturnValue se zema od ovde za posleden! + ReturnValue = R15_Network_PacketRelease(Communication_p, Packet_p); return ReturnValue; } diff --git a/lcmodule/source/cnh1605205_ldr_network_layer/include/t_r15_network_layer.h b/lcmodule/source/cnh1605205_ldr_network_layer/include/t_r15_network_layer.h index 3d48957..a66bf6f 100644 --- a/lcmodule/source/cnh1605205_ldr_network_layer/include/t_r15_network_layer.h +++ b/lcmodule/source/cnh1605205_ldr_network_layer/include/t_r15_network_layer.h @@ -50,7 +50,7 @@ /** Acknowledge packet time(mS) out value */ #define ACK_TIMEOUT_IN_MS 10000 /** Default time(mS) out for receiving bulk command */ -#define BULK_COMMAND_RECEIVING_TIMEOUT 10000 +#define BULK_COMMAND_RECEIVING_TIMEOUT 20000 /** Default time(mS) out for receiving bulk data. This value is set for UART on 115200kbps! */ #define BULK_DATA_RECEIVING_TIMEOUT 120000 diff --git a/lcmodule/source/cnh1605551_ldr_utilities/critical_section/t_critical_section.h b/lcmodule/source/cnh1605551_ldr_utilities/critical_section/t_critical_section.h index 17e4ff7..448da41 100755 --- a/lcmodule/source/cnh1605551_ldr_utilities/critical_section/t_critical_section.h +++ b/lcmodule/source/cnh1605551_ldr_utilities/critical_section/t_critical_section.h @@ -20,7 +20,7 @@ * Types, constants ******************************************************************************/ /** Critical Section abstract type definition */ -typedef void* CriticalSection_t; +typedef void *CriticalSection_t; /** @} */ /** @} */ diff --git a/lcmodule/source/cnh1606344_ldr_communication_module/source/protrom_family.c b/lcmodule/source/cnh1606344_ldr_communication_module/source/protrom_family.c index 762d5cb..f27ad01 100644 --- a/lcmodule/source/cnh1606344_ldr_communication_module/source/protrom_family.c +++ b/lcmodule/source/cnh1606344_ldr_communication_module/source/protrom_family.c @@ -138,7 +138,7 @@ ErrorCode_e Protrom_CancelReceiver(Communication_t *Communication_p, uint8 Packe { ErrorCode_e ReturnValue = E_SUCCESS; - printf("Protrom_CancelReceiver called ...\n"); + A_(printf("Protrom_CancelReceiver called ...\n");) VERIFY(NULL != Communication_p, E_INVALID_INPUT_PARAMETERS); diff --git a/source/LCDriver.rc b/source/LCDriver.rc index 5be4ef9..037465d 100755 --- a/source/LCDriver.rc +++ b/source/LCDriver.rc @@ -81,16 +81,16 @@ BEGIN BEGIN
BLOCK "000904b0"
BEGIN
- VALUE "Comments", "Build date: 2011-06-16"
+ VALUE "Comments", "Build date: 2011-06-21"
VALUE "CompanyName", "STEricsson AB"
VALUE "FileDescription", "LCDriver Dynamic Link Library"
VALUE "FileVersion", "1, 0, 0, 1"
VALUE "InternalName", "Loader Communication Driver"
VALUE "LegalCopyright", "Copyright (C) STEricsson AB 2011"
VALUE "OriginalFilename", "LCDriver_CNH1606432.dll"
- VALUE "PrivateBuild", "Change-Id: Ib1901abfc2efa6c887c70b8583ddd2258e21aa78"
+ VALUE "PrivateBuild", "Change-Id: I5d459585cb065bad1cc16ffefd25ec28b731778d"
VALUE "ProductName", "CXC 173 0865, LCDriver DLL"
- VALUE "ProductVersion", "R1N"
+ VALUE "ProductVersion", "P1N"
END
END
BLOCK "VarFileInfo"
diff --git a/source/LCM/include/t_critical_section.h b/source/LCM/include/t_critical_section.h index 17e4ff7..448da41 100755 --- a/source/LCM/include/t_critical_section.h +++ b/source/LCM/include/t_critical_section.h @@ -20,7 +20,7 @@ * Types, constants ******************************************************************************/ /** Critical Section abstract type definition */ -typedef void* CriticalSection_t; +typedef void *CriticalSection_t; /** @} */ /** @} */ |