From a08c80408fca5875a895747e0ea6dc1aca29df18 Mon Sep 17 00:00:00 2001 From: Aleksandar Bozhinovski Date: Mon, 23 Jan 2012 16:37:39 +0100 Subject: Fix: Dump area cmd ends with negative speed Fix for dump area command ends with negative speed. ST-Ericsson ID: 403011 ST-Ericsson FOSS-OUT ID: STETL-FOSS-OUT-10204 Change-Id: I2737059dcca62d769ca1876a4859f7c468fcfdd9 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/46144 Reviewed-by: Vlatko PISTOLOV Tested-by: Vlatko PISTOLOV Tested-by: Cvetko MLADENOVSKI Reviewed-by: Viktor MLADENOVSKI --- lcmodule/source/LCM.rc | 6 +++--- .../source/cnh1605204_ldr_transport_layer/source/bulk_protocol.c | 6 +++--- .../source/cnh1606344_ldr_communication_module/source/lcm_version.c | 2 +- source/LCDriver.rc | 6 +++--- source/LcdVersion.cpp | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lcmodule/source/LCM.rc b/lcmodule/source/LCM.rc index c8c4b36..2652e31 100644 --- a/lcmodule/source/LCM.rc +++ b/lcmodule/source/LCM.rc @@ -69,15 +69,15 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "Comments", "Build date: 2012-01-17" + VALUE "Comments", "Build date: 2012-01-23" VALUE "CompanyName", "STEricsson AB" VALUE "FileDescription", "LCM Dynamic Link Library" VALUE "FileVersion", "1, 0, 0, 1" VALUE "InternalName", "Loader Communication Module" VALUE "LegalCopyright", "Copyright (C) STEricsson AB 2011" - VALUE "PrivateBuild", "Change-Id: I44e97085602e2005cbfbe1c350f243b2ace856c4" + VALUE "PrivateBuild", "Change-Id: I2737059dcca62d769ca1876a4859f7c468fcfdd9" VALUE "ProductName", "CXA1104507 Loader Communication Module" - VALUE "ProductVersion", "R1X" + VALUE "ProductVersion", "P1Y" 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 b04d715..9e20d59 100644 --- a/lcmodule/source/cnh1605204_ldr_transport_layer/source/bulk_protocol.c +++ b/lcmodule/source/cnh1605204_ldr_transport_layer/source/bulk_protocol.c @@ -1148,7 +1148,7 @@ static void R15_Bulk_SerializeChunk(Communication_t *Communication_p, PacketMeta /* Set extended header parameters */ ExtendedHeader.Session = BulkVector_p->SessionId; ExtendedHeader.AcksChunk = (uint8)ChunkId; - ExtendedHeader.ChunkSize = BulkVector_p->ChunkSize; + ExtendedHeader.ChunkSize = Header.PayloadLength; ExtendedHeader.Offset = BulkVector_p->Offset; ExtendedHeader.Length = BulkVector_p->Length; ExtendedHeader.TypeFlags = CMD_BULK_DATA; @@ -1598,8 +1598,8 @@ static ErrorCode_e R15_Bulk_DataRequestHandler(Communication_t *Communication_p, if (!IsChunkReceived(Communication_p, ChunkId)) { BulkVector_p->TransferedLength += BulkVector_p->ChunkSize; pcbf = (BulkDataReqCallback_t)R15_TRANSPORT(Communication_p)->BulkDataCallback_p; - pcbf(Communication_p->Object_p, BulkVector_p->SessionId, BulkVector_p->ChunkSize, BulkVector_p->Offset, BulkVector_p->Length, BulkVector_p->TotalLength, BulkVector_p->TransferedLength); - C_(printf("S(%d) L(%d) CS(%d)\n", BulkVector_p->SessionId, BulkVector_p->Length, BulkVector_p->ChunkSize);) //xvsvlpi + pcbf(Communication_p->Object_p, BulkVector_p->SessionId, ExtendedHeader.ChunkSize, BulkVector_p->Offset, BulkVector_p->Length, BulkVector_p->TotalLength, BulkVector_p->TransferedLength); + C_(printf("S(%d) L(%d) CS(%d)\n", BulkVector_p->SessionId, BulkVector_p->Length, BulkVector_p->ChunkSize);) } } diff --git a/lcmodule/source/cnh1606344_ldr_communication_module/source/lcm_version.c b/lcmodule/source/cnh1606344_ldr_communication_module/source/lcm_version.c index 6cc980b..3576b4a 100644 --- a/lcmodule/source/cnh1606344_ldr_communication_module/source/lcm_version.c +++ b/lcmodule/source/cnh1606344_ldr_communication_module/source/lcm_version.c @@ -13,6 +13,6 @@ * LCD_LCM_CompatibilityList in file LcdVersion.cpp in LCD code. */ -char LCM_CurrentVersion[] = "R1X"; +char LCM_CurrentVersion[] = "P1Y"; /** @} */ diff --git a/source/LCDriver.rc b/source/LCDriver.rc index a344099..3c8931d 100644 --- a/source/LCDriver.rc +++ b/source/LCDriver.rc @@ -81,15 +81,15 @@ BEGIN BEGIN BLOCK "000904b0" BEGIN - VALUE "Comments", "Build date: 2012-01-17" + VALUE "Comments", "Build date: 2012-01-23" 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 "PrivateBuild", "Change-Id: I44e97085602e2005cbfbe1c350f243b2ace856c4" + VALUE "PrivateBuild", "Change-Id: I2737059dcca62d769ca1876a4859f7c468fcfdd9" VALUE "ProductName", "CXC 173 0865, LCDriver DLL" - VALUE "ProductVersion", "R1X" + VALUE "ProductVersion", "P1Y" END END BLOCK "VarFileInfo" diff --git a/source/LcdVersion.cpp b/source/LcdVersion.cpp index 2db011b..5cd757e 100644 --- a/source/LcdVersion.cpp +++ b/source/LcdVersion.cpp @@ -18,6 +18,6 @@ * This table contains compatibility information for the versions of LCM. * Current LCM version is defined in file lcm_version.c in LCM code. */ -char *LCD_LCM_CompatibilityList[] = {"R1X", +char *LCD_LCM_CompatibilityList[] = {"P1Y", NULL }; -- cgit v1.2.3