From 910f860a59057158193d3ae16568fc0af8bd0d57 Mon Sep 17 00:00:00 2001 From: Petar Dimoski Date: Tue, 16 Aug 2011 07:38:10 +0100 Subject: Fix astyle in Loader Communication Module. ST-Ericsson ID: 346088 ST-Ericsson FOSS-OUT ID: NA Change-Id: Ib3dee092ba3c16e550bc6d1e2335cf817b7e8ec8 Depends-On: Ib3dee092ba3c16e550bc6d1e2335cf817b7e8ec8 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/26000 Tested-by: Aleksandar GASOSKI Tested-by: Cvetko MLADENOVSKI Reviewed-by: Vlatko PISTOLOV Tested-by: Vlatko PISTOLOV --- .../customer_config/custom_command_marshal.xsl | 55 +- lcmodule/customer_config/custom_commands.xml | 36 +- .../customer_config/custom_commands_impl_h.xsl | 6 +- lcmodule/source/LCM.rc | 6 +- .../source/a2_speedflash.c | 6 +- .../source/bulk_protocol.c | 60 +- .../source/r15_transport_layer.c | 2 + .../source/a2_network.c | 30 +- .../source/protrom_header.c | 1 + .../source/protrom_network.c | 48 +- .../source/r15_network_layer.c | 83 +- .../source/z_network.c | 6 +- .../critical_section/critical_section.c | 10 +- .../critical_section/critical_section_linux.c | 12 +- .../critical_section/critical_section_win32.c | 13 +- .../critical_section/t_critical_section.h | 0 .../config/audit_c.xsl | 304 ++--- .../config/audit_h.xsl | 38 +- .../config/ces_commands_c.xsl | 74 +- .../config/ces_commands_h.xsl | 14 +- .../config/command_ids_h.xsl | 31 +- .../config/command_marshal.xsl | 283 ++-- .../config/commands.xml | 490 +++---- .../config/common.xsl | 25 +- .../config/error_codes.xml | 1438 ++++++++++---------- .../config/errorcode_h.xsl | 50 +- .../source/communication_service.c | 6 +- .../source/protrom_family.c | 2 +- source/LCDriver.rc | 6 +- source/LCM/include/t_critical_section.h | 0 30 files changed, 1597 insertions(+), 1538 deletions(-) mode change 100755 => 100644 lcmodule/source/cnh1605204_ldr_transport_layer/source/a2_speedflash.c mode change 100755 => 100644 lcmodule/source/cnh1605551_ldr_utilities/critical_section/critical_section.c mode change 100755 => 100644 lcmodule/source/cnh1605551_ldr_utilities/critical_section/critical_section_linux.c mode change 100755 => 100644 lcmodule/source/cnh1605551_ldr_utilities/critical_section/critical_section_win32.c mode change 100755 => 100644 lcmodule/source/cnh1605551_ldr_utilities/critical_section/t_critical_section.h mode change 100755 => 100644 source/LCM/include/t_critical_section.h diff --git a/lcmodule/customer_config/custom_command_marshal.xsl b/lcmodule/customer_config/custom_command_marshal.xsl index 4ee1838..6739367 100644 --- a/lcmodule/customer_config/custom_command_marshal.xsl +++ b/lcmodule/customer_config/custom_command_marshal.xsl @@ -18,9 +18,9 @@ diff --git a/lcmodule/customer_config/custom_commands.xml b/lcmodule/customer_config/custom_commands.xml index 39169d9..25b739c 100644 --- a/lcmodule/customer_config/custom_commands.xml +++ b/lcmodule/customer_config/custom_commands.xml @@ -20,52 +20,52 @@ - - Flash command group. - + + Flash command group. + - - GDFS command group. - + + GDFS command group. + - - File System Unit - + + File System Unit + - - Signature application - + + Signature application + - - Internal Security application - + + Internal Security application + - - Reset application - + + Reset application + diff --git a/lcmodule/customer_config/custom_commands_impl_h.xsl b/lcmodule/customer_config/custom_commands_impl_h.xsl index a62a434..7edd078 100644 --- a/lcmodule/customer_config/custom_commands_impl_h.xsl +++ b/lcmodule/customer_config/custom_commands_impl_h.xsl @@ -22,9 +22,9 @@ @@ -176,74 +176,76 @@ */ -CommandPermissionList_t CommandPermissionList[]= -{ - /* End of array */ - { - 0, - (CommandId_e)0, - 0, - NULL, - 0, - NULL, - 0, - FALSE, - FALSE, - FALSE, - FALSE, - NULL - } +CommandPermissionList_t CommandPermissionList[] = { + + + /* End of array */ + { + 0, + (CommandId_e)0, + 0, + NULL, + 0, + NULL, + 0, + FALSE, + FALSE, + FALSE, + FALSE, + NULL + } }; -CommandPermissionList_t * GetAuditData(CommandData_t * CmdData_p) +CommandPermissionList_t *GetAuditData(CommandData_t *CmdData_p) { -/* - boolean A1_Authentication = FALSE; - boolean CA_Authentication = FALSE; + /* + boolean A1_Authentication = FALSE; + boolean CA_Authentication = FALSE; - boolean A1_Factory = FALSE; - boolean A1_RD = FALSE; - boolean A1_Product = FALSE; - boolean A1_Service = FALSE; + boolean A1_Factory = FALSE; + boolean A1_RD = FALSE; + boolean A1_Product = FALSE; + boolean A1_Service = FALSE; - uint8 A1_depandancy = 0x00; + uint8 A1_depandancy = 0x00; - uint32 AuthenticationVector = 0; */ - int CounterList = 0; + uint32 AuthenticationVector = 0; */ + int CounterList = 0; - while(CommandPermissionList[CounterList].Group != 0) - { - if(CmdData_p->ApplicationNr==CommandPermissionList[CounterList].Group && CmdData_p->CommandNr==CommandPermissionList[CounterList].Command) - { - CommandPermissionList[CounterList].DataParam_p = CmdData_p->Payload.Data_p; - return (&CommandPermissionList[CounterList]); + while (CommandPermissionList[CounterList].Group != 0) { + if (CmdData_p->ApplicationNr == CommandPermissionList[CounterList].Group && CmdData_p->CommandNr == CommandPermissionList[CounterList].Command) { + + CommandPermissionList[CounterList].DataParam_p = CmdData_p->Payload.Data_p; + return (&CommandPermissionList[CounterList]); + } + + CounterList++; } - CounterList++; - } - return NULL; + + return NULL; } #ifdef CFG_ENABLE_AUDIT_CMD -ErrorCode_e CommandAudit(CommandData_t * CmdData_p) +ErrorCode_e CommandAudit(CommandData_t *CmdData_p) { - ErrorCode_e ReturnValue = E_GENERAL_FATAL_ERROR; - CommandPermissionList_t* CmdPermission_p = NULL; - - CmdPermission_p = GetAuditData(CmdData_p); - if(NULL == CmdPermission_p) - { - ReturnValue = E_UNSUPPORTED_CMD; - goto ErrorExit; - } - - ReturnValue = (ErrorCode_e)Do_LoaderSecLib_Audit_Permission_Levels(CmdPermission_p); - if(ReturnValue != E_SUCCESS) - { - ReturnValue = E_AUDITING_FAILED; - } + ErrorCode_e ReturnValue = E_GENERAL_FATAL_ERROR; + CommandPermissionList_t *CmdPermission_p = NULL; + + CmdPermission_p = GetAuditData(CmdData_p); + + if (NULL == CmdPermission_p) { + ReturnValue = E_UNSUPPORTED_CMD; + goto ErrorExit; + } + + ReturnValue = (ErrorCode_e)Do_LoaderSecLib_Audit_Permission_Levels(CmdPermission_p); + + if (ReturnValue != E_SUCCESS) { + ReturnValue = E_AUDITING_FAILED; + } ErrorExit: - return ReturnValue; + return ReturnValue; } #endif @@ -255,8 +257,7 @@ ErrorExit: -CommandPermission_e PermArray_[] = -{ +CommandPermission_e PermArray_[] = { @@ -267,8 +268,7 @@ CommandPermission_e PermArray_ -CommandPermission_e PermArray_[] = -{ +CommandPermission_e PermArray_[] = { @@ -286,14 +286,14 @@ CommandPermission_e PermArray_ -CommandAuthentication_e AuthArray_[] = -{ +CommandAuthentication_e AuthArray_[] = { + }; -CommandAuthentication_e AuthArray_[] = -{ +CommandAuthentication_e AuthArray_[] = { + }; diff --git a/lcmodule/source/cnh1606344_ldr_communication_module/config/audit_h.xsl b/lcmodule/source/cnh1606344_ldr_communication_module/config/audit_h.xsl index 27b11cd..064f27a 100644 --- a/lcmodule/source/cnh1606344_ldr_communication_module/config/audit_h.xsl +++ b/lcmodule/source/cnh1606344_ldr_communication_module/config/audit_h.xsl @@ -27,36 +27,36 @@ -typedef struct CommandPermissionList_s -{ - GroupId_e Group; - CommandId_e Command; - int CommmandPermissionLength; - CommandPermission_e *CommmandPermmision_p; - int ComandAuthenticationLength; - CommandAuthentication_e *CommandAuthentication_p; - int Depandancy; - boolean factory; - boolean rd; - boolean product; - boolean service; - uint8 *DataParam_p; -}CommandPermissionList_t; +typedef struct CommandPermissionList_s { -CommandPermissionList_t * GetAuditData(CommandData_t * CmdData_p); -ErrorCode_e CommandAudit(CommandData_t * CmdData_p); + GroupId_e Group; + CommandId_e Command; + int CommmandPermissionLength; + CommandPermission_e *CommmandPermmision_p; + int ComandAuthenticationLength; + CommandAuthentication_e *CommandAuthentication_p; + int Depandancy; + boolean factory; + boolean rd; + boolean product; + boolean service; + uint8 *DataParam_p; +} CommandPermissionList_t; + +CommandPermissionList_t *GetAuditData(CommandData_t *CmdData_p); +ErrorCode_e CommandAudit(CommandData_t *CmdData_p); #endif /* _AUDIT_H */ @@ -102,10 +102,10 @@ CommandInformation_t GenericGroupCommandsLis */ -ApplicationInfo_t ActiveApplications[]= -{ +ApplicationInfo_t ActiveApplications[] = { + -/* ADD MORE APPLICATIONS HERE */ + /* ADD MORE APPLICATIONS HERE */ }; /******************************************************************************* @@ -113,16 +113,16 @@ ApplicationInfo_t ActiveApplications[]= ******************************************************************************/ uint32 Get_ApplicationInfoSize(void) { - return sizeof(ApplicationInfo_t); + return sizeof(ApplicationInfo_t); } uint32 Get_ActiveApplicationsSize(void) { - return sizeof(ActiveApplications); + return sizeof(ActiveApplications); } /*@}*/ - + diff --git a/lcmodule/source/cnh1606344_ldr_communication_module/config/ces_commands_h.xsl b/lcmodule/source/cnh1606344_ldr_communication_module/config/ces_commands_h.xsl index b425fc6..0cac173 100644 --- a/lcmodule/source/cnh1606344_ldr_communication_module/config/ces_commands_h.xsl +++ b/lcmodule/source/cnh1606344_ldr_communication_module/config/ces_commands_h.xsl @@ -1,8 +1,8 @@ - + @@ -15,7 +15,7 @@ -ErrorCode_e _Repeat(void* ExecutionContext_p); +ErrorCode_e _Repeat(void *ExecutionContext_p); @@ -23,7 +23,7 @@ - + diff --git a/lcmodule/source/cnh1606344_ldr_communication_module/config/command_ids_h.xsl b/lcmodule/source/cnh1606344_ldr_communication_module/config/command_ids_h.xsl index a310b65..325b598 100644 --- a/lcmodule/source/cnh1606344_ldr_communication_module/config/command_ids_h.xsl +++ b/lcmodule/source/cnh1606344_ldr_communication_module/config/command_ids_h.xsl @@ -31,39 +31,38 @@ typedef enum { +typedef struct _s { +}_t; + @@ -71,7 +70,7 @@ typedef struct _s - = , /**< */ + = , /**< */ @@ -79,7 +78,7 @@ typedef struct _s - = /**< */ + = /**< */ diff --git a/lcmodule/source/cnh1606344_ldr_communication_module/config/command_marshal.xsl b/lcmodule/source/cnh1606344_ldr_communication_module/config/command_marshal.xsl index 5e7842a..ce47482 100644 --- a/lcmodule/source/cnh1606344_ldr_communication_module/config/command_marshal.xsl +++ b/lcmodule/source/cnh1606344_ldr_communication_module/config/command_marshal.xsl @@ -25,9 +25,9 @@ @@ -53,27 +53,24 @@ - /* Command / ( / ) */ - case COMMAND(FALSE, , ): - { - - - - Status = (Session, ); - + /* Command / ( / ) */ + case COMMAND(FALSE, , ): { + + + Status = (Session, ); + } break; - /* Response to / ( / ) */ - case COMMAND(TRUE, , ): - { + /* Response to / ( / ) */ + case COMMAND(TRUE, , ): { + - - ResponseStatus = (ErrorCode_e)get_uint32_le(&Data_p); - - Status = (Session, ResponseStatus, ); - + ResponseStatus = (ErrorCode_e)get_uint32_le(&Data_p); + + Status = (Session, ResponseStatus, ); + } break; @@ -118,7 +115,7 @@ #include "r_adbg_applications.h" #endif -#ifdef CFG_ENABLE_AUDIT_CMD +#ifdef CFG_ENABLE_AUDIT_CMD #include "audit.h" #endif @@ -126,7 +123,7 @@ #include "r_adbg_command.h" #endif -#define COMMAND(response, group, id) ((((int)(response)) << 30) | (((int)(group)) << 16) | ((int)(id))) +#define COMMAND(response, group, id) ((((int)(response)) << 30) | (((int)(group)) << 16) | ((int)(id))) #define COMMANDDATA(TypeP,ApplicationP,CommandP,SessionP,SizeP)\ memset((uint8*)&CmdData, 0x00, sizeof(CommandData_t));\ CmdData.Type = TypeP;\ @@ -141,7 +138,7 @@ A_(printf("command_marshal.c (%d): ** memory allocation failed! **\n",__LINE__);)\ return E_ALLOCATE_FAILED;\ }\ - + #define COMMANDDATAOUT(TypeP,ApplicationP,CommandP,SizeP)\ memset((uint8*)&CmdData, 0x00, sizeof(CommandData_t));\ CmdData.Type = TypeP;\ @@ -165,100 +162,103 @@ void disable_interrupt(void) { #ifndef WIN32 -/* todo implement this */ -//#warning This is disable_interrupt + /* todo implement this */ + //#warning This is disable_interrupt #endif } void enable_interrupt(void) { #ifndef WIN32 -/* todo implement this */ -//#warning This is enable_interrupt + /* todo implement this */ + //#warning This is enable_interrupt #endif } ErrorCode_e Do_CEH_Call(void *Object_p, CommandData_t *CmdData_p) { - ErrorCode_e Status = E_GENERAL_FATAL_ERROR; -// uint32 PL_GRSize = 0; - ErrorCode_e ResponseStatus = E_GENERAL_FATAL_ERROR; - boolean response = FALSE; -// CommandPermissionList_t* CmdPermission_p; - void *Data_p = CmdData_p->Payload.Data_p; - uint16 Session = CmdData_p->SessionNr; - - if (CmdData_p->Type == GENERAL_RESPONSE_PACKAGE) - { - response = TRUE; -// PL_GRSize = CmdData_p->Payload.Size; -// ResponseStatus = (ErrorCode_e)get_uint16(&Data_p); - } + ErrorCode_e Status = E_GENERAL_FATAL_ERROR; + // uint32 PL_GRSize = 0; + ErrorCode_e ResponseStatus = E_GENERAL_FATAL_ERROR; + boolean response = FALSE; + // CommandPermissionList_t* CmdPermission_p; + void *Data_p = CmdData_p->Payload.Data_p; + uint16 Session = CmdData_p->SessionNr; + + if (CmdData_p->Type == GENERAL_RESPONSE_PACKAGE) { + + response = TRUE; + // PL_GRSize = CmdData_p->Payload.Size; + // ResponseStatus = (ErrorCode_e)get_uint16(&Data_p); + } #ifdef CFG_ENABLE_AUDIT_CMD - if(COMMAND_TYPE == CmdData_p->Type) - { - ErrorCode_e AuditResponse = CommandAudit(CmdData_p); - CommandData_t CmdData = {0}; - uint32 PLSize = sizeof(ErrorCode_e); - - if (E_SUCCESS != AuditResponse) - { - memset((uint8*)&CmdData, 0x00, sizeof(CommandData_t)); - - CmdData.Type = GENERAL_RESPONSE; - CmdData.CommandNr = CmdData_p->CommandNr; - CmdData.ApplicationNr = CmdData_p->ApplicationNr; - CmdData.SessionNr = CmdData_p->SessionNr; - CmdData.Payload.Size = PLSize; - CmdData.Payload.Data_p = NULL; - CmdData.Payload.Data_p = (uint8*)malloc(PLSize); - if (NULL == CmdData.Payload.Data_p) - { - A_(printf("command_marshal.c (%d): ** memory allocation failed! **\n",__LINE__);) - return E_ALLOCATE_FAILED; - } - - Data_p = CmdData.Payload.Data_p; - put_uint32(&Data_p, AuditResponse); - - Status = Do_R15_Command_Send(GlobalCommunication_p, &CmdData); - if (NULL != CmdData.Payload.Data_p) - { - free(CmdData.Payload.Data_p); - } - - if (E_SUCCESS != Status) - { - return Status; - } - - if (E_UNSUPPORTED_CMD == AuditResponse) - { - Status = Do_System_ShutDownImpl(CmdData.SessionNr); - } - return Status; + + if (COMMAND_TYPE == CmdData_p->Type) { + ErrorCode_e AuditResponse = CommandAudit(CmdData_p); + CommandData_t CmdData = {0}; + uint32 PLSize = sizeof(ErrorCode_e); + + if (E_SUCCESS != AuditResponse) { + + memset((uint8 *)&CmdData, 0x00, sizeof(CommandData_t)); + + CmdData.Type = GENERAL_RESPONSE; + CmdData.CommandNr = CmdData_p->CommandNr; + CmdData.ApplicationNr = CmdData_p->ApplicationNr; + CmdData.SessionNr = CmdData_p->SessionNr; + CmdData.Payload.Size = PLSize; + CmdData.Payload.Data_p = NULL; + CmdData.Payload.Data_p = (uint8 *)malloc(PLSize); + + if (NULL == CmdData.Payload.Data_p) { + A_(printf("command_marshal.c (%d): ** memory allocation failed! **\n", __LINE__);) + return E_ALLOCATE_FAILED; + } + + Data_p = CmdData.Payload.Data_p; + put_uint32(&Data_p, AuditResponse); + + Status = Do_R15_Command_Send(GlobalCommunication_p, &CmdData); + + if (NULL != CmdData.Payload.Data_p) { + + free(CmdData.Payload.Data_p); + } + + if (E_SUCCESS != Status) { + + return Status; + } + + if (E_UNSUPPORTED_CMD == AuditResponse) { + + Status = Do_System_ShutDownImpl(CmdData.SessionNr); + } + + return Status; + } } - } + #endif - switch(COMMAND(response, CmdData_p->ApplicationNr, CmdData_p->CommandNr)) - { - - default: - { - Status = Do_CustomCEH_Call(CmdData_p); - if (E_SUCCESS != Status) - { - Status = Do_System_ShutDownImpl(Session); - } + switch (COMMAND(response, CmdData_p->ApplicationNr, CmdData_p->CommandNr)) { + + + default: { + + Status = Do_CustomCEH_Call(CmdData_p); + + if (E_SUCCESS != Status) { + Status = Do_System_ShutDownImpl(Session); + } } break; - } + } - return Status; + return Status; } - + @@ -273,56 +273,59 @@ ErrorCode_e Do_CEH_Call(void *Object_p, CommandData_t *CmdData_p) ErrorCode_e (void) { - ErrorCode_e Answer; - CommandData_t CmdData; - void *Data_p; - uint32 PLSize =0; - - - - COMMANDDATAOUT(COMMAND_TYPE, , , PLSize); - Data_p = CmdData.Payload.Data_p; - (void)(Data_p); //XVSZOAN Temporary solution! - - Answer = Do_R15_Command_Send(GlobalCommunication_p, &CmdData); - if(NULL != CmdData.Payload.Data_p) - free(CmdData.Payload.Data_p); - return Answer; + ErrorCode_e Answer; + CommandData_t CmdData; + void *Data_p; + uint32 PLSize = 0; + + + COMMANDDATAOUT(COMMAND_TYPE, , , PLSize); + Data_p = CmdData.Payload.Data_p; + (void)(Data_p); //XVSZOAN Temporary solution! + + Answer = Do_R15_Command_Send(GlobalCommunication_p, &CmdData); + if (NULL != CmdData.Payload.Data_p) { + free(CmdData.Payload.Data_p); + } + + return Answer; } ErrorCode_e (uint16 Session, ErrorCode_e Status, ) { - ErrorCode_e Answer; - CommandData_t CmdData; - void *Data_p; - uint32 PLSize =0; - - PLSize += sizeof(ErrorCode_e); - - COMMANDDATA(GENERAL_RESPONSE, , , Session, PLSize); - Data_p = CmdData.Payload.Data_p; - - put_uint32(&Data_p, Status); - - - + ErrorCode_e Answer; + CommandData_t CmdData; + void *Data_p; + uint32 PLSize = 0; + + PLSize += sizeof(ErrorCode_e); + + COMMANDDATA(GENERAL_RESPONSE, , , Session, PLSize); + Data_p = CmdData.Payload.Data_p; + + put_uint32(&Data_p, Status); + + + #ifdef CFG_ENABLE_ADBG_LOADER - Answer = ReleaseADbg_AppFunc(Status); - - Answer = E_SUCCESS; - - -#else - - Answer = Do_R15_Command_Send(GlobalCommunication_p, &CmdData); - - + Answer = ReleaseADbg_AppFunc(Status); + + Answer = E_SUCCESS; + + +#else + + Answer = Do_R15_Command_Send(GlobalCommunication_p, &CmdData); + + #endif - - if(NULL != CmdData.Payload.Data_p) - free(CmdData.Payload.Data_p); - return Answer; + + if (NULL != CmdData.Payload.Data_p) { + free(CmdData.Payload.Data_p); + } + + return Answer; } @@ -332,7 +335,7 @@ ErrorCode_e + diff --git a/lcmodule/source/cnh1606344_ldr_communication_module/source/communication_service.c b/lcmodule/source/cnh1606344_ldr_communication_module/source/communication_service.c index 99ac27e..e7ccd73 100644 --- a/lcmodule/source/cnh1606344_ldr_communication_module/source/communication_service.c +++ b/lcmodule/source/cnh1606344_ldr_communication_module/source/communication_service.c @@ -40,7 +40,7 @@ #define QUEUE_SIZE 32 Communication_t GlobalCommunication = {0}; -Communication_t* GlobalCommunication_p = &GlobalCommunication; +Communication_t *GlobalCommunication_p = &GlobalCommunication; static FamilyDescriptor_t ProtocolFamilies[] = { { @@ -406,7 +406,7 @@ ErrorExit: * @retval E_INVALID_INPUT_PARAMTERS In case when communication is not Singleton * and Communication_p is NULL pointer. */ -ErrorCode_e Do_Communication_GetCommunicationDevice(Communication_t *Communication_p, CommunicationDevice_t** CommunicationDevice_pp) +ErrorCode_e Do_Communication_GetCommunicationDevice(Communication_t *Communication_p, CommunicationDevice_t **CommunicationDevice_pp) { ErrorCode_e ReturnValue = E_SUCCESS; VERIFY(NULL != Communication_p && CommunicationDevice_pp != NULL, E_INVALID_INPUT_PARAMETERS); @@ -431,7 +431,7 @@ ErrorExit: * @retval E_INVALID_INPUT_PARAMTERS In case when communication is not Singleton * and Communication_p is NULL pointer. */ -ErrorCode_e Do_Communication_SetCommunicationDevice(Communication_t *Communication_p, CommunicationDevice_t* CommunicationDevice_p) +ErrorCode_e Do_Communication_SetCommunicationDevice(Communication_t *Communication_p, CommunicationDevice_t *CommunicationDevice_p) { ErrorCode_e ReturnValue = E_SUCCESS; VERIFY(NULL != Communication_p && CommunicationDevice_p != NULL, E_INVALID_INPUT_PARAMETERS); 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 f27ad01..660663e 100644 --- a/lcmodule/source/cnh1606344_ldr_communication_module/source/protrom_family.c +++ b/lcmodule/source/cnh1606344_ldr_communication_module/source/protrom_family.c @@ -50,7 +50,7 @@ ErrorCode_e Protrom_Family_Init(Communication_t *Communication_p) Communication_p->CurrentFamilyHash = HASH_CRC16; PROTROM_NETWORK(Communication_p)->Inbound.StopTransfer = FALSE; - + if (NULL != Communication_p->BackupCommBuffer_p) { if (Communication_p->BackupCommBufferSize < PROTROM_HEADER_LENGTH) { memcpy(PROTROM_NETWORK(Communication_p)->Inbound.Scratch, Communication_p->BackupCommBuffer_p, Communication_p->BackupCommBufferSize); diff --git a/source/LCDriver.rc b/source/LCDriver.rc index 239fedc..5a97a1d 100644 --- a/source/LCDriver.rc +++ b/source/LCDriver.rc @@ -81,15 +81,15 @@ BEGIN BEGIN BLOCK "000904b0" BEGIN - VALUE "Comments", "Build date: 2011-07-26" + VALUE "Comments", "Build date: 2011-08-09" 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", "http://gerrit.lud.stericsson.com/gerrit/28022" + VALUE "PrivateBuild", "Change-Id: Ib3dee092ba3c16e550bc6d1e2335cf817b7e8ec8" VALUE "ProductName", "CXC 173 0865, LCDriver DLL" - VALUE "ProductVersion", "PT1" + VALUE "ProductVersion", "PT2" END END BLOCK "VarFileInfo" diff --git a/source/LCM/include/t_critical_section.h b/source/LCM/include/t_critical_section.h old mode 100755 new mode 100644 -- cgit v1.2.3