From 9dc2897fef041426347e80385707b7c86324c63e Mon Sep 17 00:00:00 2001 From: XVSALGE Date: Wed, 22 Feb 2012 08:14:11 +0100 Subject: Sync lcm with CC source Synchronize loader_communication with clearcase source ST-Ericsson ID: 413947 ST-Ericsson FOSS-OUT ID: STETL-FOSS-OUT-10204 Change-Id: Ib23b84360b351a2598190d9d6b510895cc892436 Depends-On: I4b049943fc2acc63ed5f94dff6d4bc0e36fde1cf Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/48934 Reviewed-by: QABUILD Reviewed-by: QATEST Reviewed-by: Zoran ANCEVSKI Tested-by: Aleksandar GASOSKI Tested-by: Cvetko MLADENOVSKI Reviewed-by: Vlatko PISTOLOV Tested-by: Vlatko PISTOLOV --- lcmodule/source/LCM.rc | 2 +- lcmodule/source/LCM.vcproj | 2 +- .../include/r_a2_transport.h | 4 +- .../include/r_bulk_protocol.h | 4 +- .../include/r_protrom_protocol.h | 3 - .../include/r_protrom_transport.h | 3 +- .../include/r_r15_transport_layer.h | 9 +- .../include/r_z_protocol.h | 2 +- .../include/r_z_transport.h | 2 +- .../include/t_bulk_protocol.h | 4 +- .../include/t_command_protocol.h | 8 +- .../include/t_protrom_protocol.h | 1 - .../include/t_protrom_transport.h | 1 - .../include/t_r15_transport_layer.h | 3 +- .../source/a2_transport.c | 2 +- .../source/bulk_protocol.c | 24 +- .../source/command_protocol.c | 2 +- .../source/protrom_transport.c | 2 +- .../source/r15_transport_layer.c | 42 +- .../test_cases/ADbg_cnh1605204.c | 10 + .../include/r_a2_network.h | 2 +- .../include/r_protrom_header.h | 1 - .../include/r_protrom_network.h | 2 +- .../include/r_r15_network_layer.h | 7 +- .../include/r_z_network.h | 8 +- .../include/t_protrom_header.h | 4 +- .../include/t_protrom_network.h | 20 +- .../include/t_r15_header.h | 2 +- .../include/t_r15_network_layer.h | 25 +- .../include/t_z_header.h | 2 +- .../include/t_z_network.h | 10 +- .../source/a2_header.c | 2 +- .../source/a2_network.c | 6 +- .../source/protrom_header.c | 2 +- .../source/protrom_network.c | 8 +- .../source/r15_header.c | 8 +- .../source/r15_network_layer.c | 11 +- .../source/z_network.c | 6 +- .../test_cases/ADbg_cnh1605205.c | 10 + .../config/a2_commands.xml | 3 - .../config/audit_c.xsl | 2 +- .../config/audit_h.xsl | 4 +- .../config/ces_commands_c.xsl | 6 - .../config/command_ids_h.xsl | 15 +- .../config/command_marshal.xsl | 4 +- .../config/commands.xml | 506 ++++++++-------- .../config/common.xsl | 5 + .../config/error_codes.xml | 108 ++-- .../config/errorcode_h.xsl | 78 ++- .../include/r_a2_family.h | 7 +- .../include/r_communication_service.h | 30 +- .../include/r_measurement_tool.h | 159 ----- .../include/r_protrom_family.h | 11 +- .../include/r_r15_family.h | 13 +- .../include/r_z_family.h | 10 +- .../include/t_communication_service.h | 28 +- .../include/t_measurement_tool.h | 89 --- .../include/t_r15_family.h | 5 +- .../source/communication_service.c | 4 +- .../source/lcm_version.c | 2 +- .../source/measurement_tool.c | 667 --------------------- .../source/r15_family.c | 6 +- .../test_cases/ADbg_cnh1606344.c | 18 +- lcmodule/source/legacy_compatibility/c_system.h | 34 -- lcmodule/source/legacy_compatibility/c_system_v2.h | 27 + source/LCDriver.rc | 2 +- source/LCM/Hash.cpp | 3 +- source/LCM/include/t_protrom_header.h | 2 - source/LcdVersion.cpp | 2 +- source/api_wrappers/linux/CEventObject.cpp | 11 +- source/api_wrappers/linux/CSemaphore.cpp | 10 +- source/api_wrappers/linux/CSemaphore.h | 2 +- source/utilities/BulkHandler.cpp | 1 + 73 files changed, 656 insertions(+), 1484 deletions(-) delete mode 100644 lcmodule/source/cnh1606344_ldr_communication_module/include/r_measurement_tool.h delete mode 100644 lcmodule/source/cnh1606344_ldr_communication_module/include/t_measurement_tool.h delete mode 100644 lcmodule/source/cnh1606344_ldr_communication_module/source/measurement_tool.c delete mode 100644 lcmodule/source/legacy_compatibility/c_system.h create mode 100644 lcmodule/source/legacy_compatibility/c_system_v2.h diff --git a/lcmodule/source/LCM.rc b/lcmodule/source/LCM.rc index 0993ba4..180fe54 100644 --- a/lcmodule/source/LCM.rc +++ b/lcmodule/source/LCM.rc @@ -77,7 +77,7 @@ BEGIN VALUE "LegalCopyright", "Copyright (C) STEricsson AB 2012" VALUE "PrivateBuild", "Change-Id: I70835353a592d1f1ad40743640a1d0827e56fd2e" VALUE "ProductName", "CXA1104507 Loader Communication Module" - VALUE "ProductVersion", "P3Y" + VALUE "ProductVersion", "P4Y" END END BLOCK "VarFileInfo" diff --git a/lcmodule/source/LCM.vcproj b/lcmodule/source/LCM.vcproj index 7283845..86b8f4c 100644 --- a/lcmodule/source/LCM.vcproj +++ b/lcmodule/source/LCM.vcproj @@ -744,7 +744,7 @@ > 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 feff254..4e4a1fb 100644 --- a/lcmodule/source/cnh1605204_ldr_transport_layer/source/bulk_protocol.c +++ b/lcmodule/source/cnh1605204_ldr_transport_layer/source/bulk_protocol.c @@ -14,7 +14,7 @@ /******************************************************************************* * Includes ******************************************************************************/ -#include "c_system.h" +#include "c_system_v2.h" #include "r_basicdefinitions.h" #include #include @@ -908,7 +908,7 @@ ErrorCode_e R15_Bulk_Process_Write(Communication_t *Communication_p, TL_BulkVect } #endif - C_(printf("bulk_protocol.c(%d) Sent chunk (%d) session (%d)\n", __LINE__, ChunkId, BulkVector_p->SessionId);) + C_(printf("bulk_protocol.c(%d) Sent chunk (%d) session (%d)\n", __LINE__, BulkVector_p->SendingChunkId, BulkVector_p->SessionId);) } break; @@ -955,12 +955,12 @@ ErrorCode_e R15_Bulk_Process_Write(Communication_t *Communication_p, TL_BulkVect } #endif - C_(printf("bulk_protocol.c(%d) Sent chunk (%d) session (%d)\n", __LINE__, ChunkId, BulkVector_p->SessionId);) + C_(printf("bulk_protocol.c(%d) Sent chunk (%d) session (%d)\n", __LINE__, BulkVector_p->SendingChunkId, BulkVector_p->SessionId);) } } #ifdef CFG_ENABLE_MEASUREMENT_TOOL - ReturnValue = MP(Measurement_p, ChunkId, RECEIVED_CHUNK_TIME); + ReturnValue = MP(Measurement_p, BulkVector_p->SendingChunkId, RECEIVED_CHUNK_TIME); #endif break; @@ -979,7 +979,7 @@ ErrorCode_e R15_Bulk_Process_Write(Communication_t *Communication_p, TL_BulkVect pcbf(Communication_p->Object_p, BulkVector_p->SessionId, BulkVector_p->ChunkSize, BulkVector_p->Offset, BulkVector_p->Length, TRUE); // close the current bulk session - (void)Do_R15_Bulk_CloseSession(Communication_p, BulkVector_p); //TODO: da se hendla return vrednosta! + (void)Do_R15_Bulk_CloseSession(Communication_p, BulkVector_p); //TODO: return value should be handled BulkExtendedHeader_t *PendingHeader_p = R15_TRANSPORT(Communication_p)->BulkHandle.PendingBulkHeader_p; @@ -1030,7 +1030,7 @@ ErrorCode_e R15_Bulk_Process_Write(Communication_t *Communication_p, TL_BulkVect #ifndef CFG_ENABLE_LOADER_TYPE ErrExit: -#endif +#endif //CFG_ENABLE_LOADER_TYPE Do_CriticalSection_Leave(R15_TRANSPORT(Communication_p)->BulkHandle.BulkTransferCS); return ReturnValue; @@ -1302,9 +1302,9 @@ static uint32 R15_Bulk_GetChunkId(const PacketMeta_t *const Packet_p) { BulkExtendedHeader_t BulkExtendedHeader = {0}; + //lint -e(413,826) R15_DeserializeBulkExtendedHeader(&BulkExtendedHeader, Packet_p->ExtendedHeader_p); - //lint -e(413,826) return BulkExtendedHeader.AcksChunk; } @@ -1457,7 +1457,7 @@ static ErrorCode_e R15_Bulk_ReadRequestHandler(Communication_t *Communication_p, pcbf(Communication_p->Object_p, BulkVector_p->SessionId, BulkVector_p->ChunkSize, BulkVector_p->Offset, BulkVector_p->Length, TRUE); // close the current bulk session - (void)Do_R15_Bulk_CloseSession(Communication_p, BulkVector_p); //TODO: da se hendla return vrednosta! + (void)Do_R15_Bulk_CloseSession(Communication_p, BulkVector_p); //TODO: return value should be handled // set bulk parameters for new bulk session ACK_Read = FALSE; @@ -1494,7 +1494,7 @@ static ErrorCode_e R15_Bulk_ReadRequestHandler(Communication_t *Communication_p, /* Try to release the timer for the bulk session acknowledge */ if (R15_TRANSPORT(Communication_p)->BulkHandle.TimerKey > 0) { - (void)TIMER(Communication_p, TimerRelease_Fn)(OBJECT_TIMER(Communication_p), R15_TRANSPORT(Communication_p)->BulkHandle.TimerKey); // LCM MB bug fix: Timer should be released on request for retransmission + (void)TIMER(Communication_p, TimerRelease_Fn)(OBJECT_TIMER(Communication_p), R15_TRANSPORT(Communication_p)->BulkHandle.TimerKey); // LCM bug fix: Timer should be released on request for retransmission R15_TRANSPORT(Communication_p)->BulkHandle.TimerKey = 0; } @@ -1510,7 +1510,7 @@ static ErrorCode_e R15_Bulk_ReadRequestHandler(Communication_t *Communication_p, pcbf = (BulkCommandReqCallback_t)R15_TRANSPORT(Communication_p)->BulkCommandCallback_p; pcbf(Communication_p->Object_p, BulkVector_p->SessionId, BulkVector_p->ChunkSize, BulkVector_p->Offset, BulkVector_p->Length, TRUE); - (void)Do_R15_Bulk_CloseSession(Communication_p, BulkVector_p); //TODO: da se hendla return vrednosta! + (void)Do_R15_Bulk_CloseSession(Communication_p, BulkVector_p); //TODO: return value should be handled } else { /* Clean the previous saved data if there is any */ BUFFER_FREE(R15_TRANSPORT(Communication_p)->BulkHandle.PendingBulkHeader_p); @@ -1532,7 +1532,7 @@ static ErrorCode_e R15_Bulk_ReadRequestHandler(Communication_t *Communication_p, /* Try to release the timer for the bulk session acknowledge */ if (R15_TRANSPORT(Communication_p)->BulkHandle.TimerKey > 0) { - (void)TIMER(Communication_p, TimerRelease_Fn)(OBJECT_TIMER(Communication_p), R15_TRANSPORT(Communication_p)->BulkHandle.TimerKey); // LCM MB bug fix: Timer should be released on request for retransmission + (void)TIMER(Communication_p, TimerRelease_Fn)(OBJECT_TIMER(Communication_p), R15_TRANSPORT(Communication_p)->BulkHandle.TimerKey); // LCM bug fix: Timer should be released on request for retransmission R15_TRANSPORT(Communication_p)->BulkHandle.TimerKey = 0; } } @@ -1602,7 +1602,7 @@ static ErrorCode_e R15_Bulk_DataRequestHandler(Communication_t *Communication_p, BulkVector_p->TransferedLength += BulkVector_p->ChunkSize; pcbf = (BulkDataReqCallback_t)R15_TRANSPORT(Communication_p)->BulkDataCallback_p; 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);) + C_(printf("S(%d) L(%d) CS(%d)\n", BulkVector_p->SessionId, BulkVector_p->Length, ExtendedHeader.ChunkSize);) } } diff --git a/lcmodule/source/cnh1605204_ldr_transport_layer/source/command_protocol.c b/lcmodule/source/cnh1605204_ldr_transport_layer/source/command_protocol.c index 08b4819..311ca2b 100644 --- a/lcmodule/source/cnh1605204_ldr_transport_layer/source/command_protocol.c +++ b/lcmodule/source/cnh1605204_ldr_transport_layer/source/command_protocol.c @@ -54,7 +54,7 @@ static ErrorCode_e DispatchCommand(Communication_t *Communication_p, PacketMeta_ */ ErrorCode_e Do_R15_Command_ResetSessionCounters(const Communication_t *const Communication_p) { - /* Iintialize the session counters */ + /* Initialize the session counters */ R15_TRANSPORT(Communication_p)->SessionStateIn = 0; R15_TRANSPORT(Communication_p)->SessionStateOut = 0; diff --git a/lcmodule/source/cnh1605204_ldr_transport_layer/source/protrom_transport.c b/lcmodule/source/cnh1605204_ldr_transport_layer/source/protrom_transport.c index 6ea08d4..8f9ba0f 100644 --- a/lcmodule/source/cnh1605204_ldr_transport_layer/source/protrom_transport.c +++ b/lcmodule/source/cnh1605204_ldr_transport_layer/source/protrom_transport.c @@ -17,7 +17,7 @@ #include #include -#include "c_system.h" +#include "c_system_v2.h" #include "t_basicdefinitions.h" #include "r_debug.h" #include "r_debug_macro.h" diff --git a/lcmodule/source/cnh1605204_ldr_transport_layer/source/r15_transport_layer.c b/lcmodule/source/cnh1605204_ldr_transport_layer/source/r15_transport_layer.c index 893412f..dcc5a3a 100644 --- a/lcmodule/source/cnh1605204_ldr_transport_layer/source/r15_transport_layer.c +++ b/lcmodule/source/cnh1605204_ldr_transport_layer/source/r15_transport_layer.c @@ -14,7 +14,7 @@ /******************************************************************************* * Includes ******************************************************************************/ -#include "c_system.h" +#include "c_system_v2.h" #include "r_r15_transport_layer.h" #include #include @@ -37,7 +37,9 @@ ******************************************************************************/ static Timer_t *TimerSet(PacketMeta_t *Packet_p, const SendData_LP_t *const InputData_p, Communication_t *Communication_p); static void R15_Transport_OutHashCallback(const void *const Data_p, uint32 Length, const uint8 *const Hash_p, void *Param_p); - +#ifdef CFG_ENABLE_LOADER_TYPE +static ErrorCode_e ConfigureDeviceTimeouts(Communication_t *Communication_p); +#endif /******************************************************************************* * File scope types, constants and variables ******************************************************************************/ @@ -57,6 +59,7 @@ static void R15_Transport_OutHashCallback(const void *const Data_p, uint32 Lengt */ ErrorCode_e R15_Transport_Initialize(const Communication_t *const Communication_p) { + ErrorCode_e ReturnValue = E_SUCCESS; int VectorCounter; /* Initialize the session counters for command protocol*/ @@ -67,9 +70,14 @@ ErrorCode_e R15_Transport_Initialize(const Communication_t *const Communication_ R15_TRANSPORT(Communication_p)->BulkSessionCounter = 0; /* Initialize the default timeouts */ +#ifndef CFG_ENABLE_LOADER_TYPE R15_TIMEOUTS(Communication_p)->TCACK = ACK_TIMEOUT_IN_MS; R15_TIMEOUTS(Communication_p)->TBCR = BULK_COMMAND_RECEIVING_TIMEOUT; R15_TIMEOUTS(Communication_p)->TBDR = BULK_DATA_RECEIVING_TIMEOUT; +#else + ReturnValue = ConfigureDeviceTimeouts((Communication_t *)Communication_p); + VERIFY(E_SUCCESS == ReturnValue, ReturnValue); +#endif for (VectorCounter = 0; VectorCounter < MAX_BULK_TL_PROCESSES; VectorCounter++) { R15_TRANSPORT(Communication_p)->BulkVectorList[VectorCounter].Status = BULK_SESSION_IDLE; @@ -80,7 +88,10 @@ ErrorCode_e R15_Transport_Initialize(const Communication_t *const Communication_ R15_TRANSPORT(Communication_p)->BulkHandle.BulkTransferCS = Do_CriticalSection_Create(); R15_TRANSPORT(Communication_p)->BulkHandle.PendingBulkHeader_p = NULL; - return E_SUCCESS; +#ifdef CFG_ENABLE_LOADER_TYPE +ErrorExit: +#endif + return ReturnValue; } /* @@ -314,6 +325,31 @@ static Timer_t *TimerSet(PacketMeta_t *Packet_p, const SendData_LP_t *const Inpu return Timer_p; } + +#ifdef CFG_ENABLE_LOADER_TYPE +/* + * Function for configuration of timeouts for communication device. + * + * @param [in] Communication_p Communication module context. + * + * @return E_SUCCESS If is successfully executed. + */ +static ErrorCode_e ConfigureDeviceTimeouts(Communication_t *Communication_p) +{ + ErrorCode_e ReturnValue = E_INVALID_INPUT_PARAMETERS; + R15_Timeouts_t NewTimeoutData = {0}; + + ReturnValue = Communication_p->CommunicationDevice_p->SetTimeouts((void *)&NewTimeoutData, (void *)Communication_p); + VERIFY(E_SUCCESS == ReturnValue, ReturnValue); + + ReturnValue = R15_SetProtocolTimeouts(Communication_p, (void *)&NewTimeoutData); + VERIFY(E_SUCCESS == ReturnValue, ReturnValue); + +ErrorExit: + return ReturnValue; +} +#endif + /** @} */ /** @} */ /** @} */ diff --git a/lcmodule/source/cnh1605204_ldr_transport_layer/test_cases/ADbg_cnh1605204.c b/lcmodule/source/cnh1605204_ldr_transport_layer/test_cases/ADbg_cnh1605204.c index 8453acf..7c95361 100644 --- a/lcmodule/source/cnh1605204_ldr_transport_layer/test_cases/ADbg_cnh1605204.c +++ b/lcmodule/source/cnh1605204_ldr_transport_layer/test_cases/ADbg_cnh1605204.c @@ -25,7 +25,9 @@ #include "r_adbg_case.h" #include "r_adbg_module.h" #include "r_adbg_command.h" +#ifndef CFG_ENABLE_LOADER_TYPE #include "r_a2_protocol.h" +#endif // CFG_ENABLE_LOADER_TYPE #include "r_bulk_protocol.h" #include "r_command_protocol.h" #include "r_r15_transport_layer.h" @@ -34,7 +36,9 @@ /******************************************************************************* * The test case functions declarations ******************************************************************************/ +#ifndef CFG_ENABLE_LOADER_TYPE static void ADbg_Do_A2_Command_Send(ADbg_Case_t *Case_p); +#endif // CFG_ENABLE_LOADER_TYPE static void ADbg_Do_R15_Bulk_OpenSession(ADbg_Case_t *Case_p); static void ADbg_Do_R15_Bulk_CreateVector(ADbg_Case_t *Case_p); @@ -58,9 +62,11 @@ static void ADbg_R15_GetProtocolTimeouts(ADbg_Case_t *Case_p); /******************************************************************************* * The test case definitions ******************************************************************************/ +#ifndef CFG_ENABLE_LOADER_TYPE // A2_protocol static uint8 Parameters1_1[4] = {3, WORDPTR, WORDPTR, WORD}; ADBG_CASE_DEFINE(Test_Do_A2_Command_Send, 1, 8, ADbg_Do_A2_Command_Send, Parameters1_1); +#endif // CFG_ENABLE_LOADER_TYPE // Bulk_protocol static uint8 Parameters3_1[5] = {4, WORDPTR, SHORT, WORD, WORD}; @@ -107,7 +113,9 @@ ADBG_CASE_DEFINE(Test_R15_GetProtocolTimeouts, 18, 8, ADbg_R15_GetProtocolTimeou ******************************************************************************/ ADBG_SUITE_DEFINE_BEGIN(TestCase_CNH1605204, 0, 8) +#ifndef CFG_ENABLE_LOADER_TYPE ADBG_SUITE_ENTRY(Test_Do_A2_Command_Send) +#endif // CFG_ENABLE_LOADER_TYPE ADBG_SUITE_ENTRY(Test_Do_R15_Bulk_OpenSession) ADBG_SUITE_ENTRY(Test_Do_R15_Bulk_CreateVector) @@ -141,6 +149,7 @@ void Do_CNH1605204_Module_Test_Run(ADbg_MainModule_t *MainModule_p) /******************************************************************************* * Test cases ******************************************************************************/ +#ifndef CFG_ENABLE_LOADER_TYPE /** * This function will test function: * CNH1605204_TestedFunction1. @@ -171,6 +180,7 @@ static void ADbg_Do_A2_Command_Send(ADbg_Case_t *Case_p) free(CmdData_p); } } +#endif // CFG_ENABLE_LOADER_TYPE /** * This function will test function: diff --git a/lcmodule/source/cnh1605205_ldr_network_layer/include/r_a2_network.h b/lcmodule/source/cnh1605205_ldr_network_layer/include/r_a2_network.h index fd6efb7..a4007e5 100644 --- a/lcmodule/source/cnh1605205_ldr_network_layer/include/r_a2_network.h +++ b/lcmodule/source/cnh1605205_ldr_network_layer/include/r_a2_network.h @@ -58,7 +58,7 @@ ErrorCode_e A2_Network_Shutdown(const Communication_t *const Communication_p); ErrorCode_e A2_Network_CancelRetransmission(const Communication_t *const Communication_p, uint32 UniqueKey); /** - * Handler for received packets in A2 protocl family. + * Handler for received packets in A2 protocol family. * * This callback function handles the received packets. * diff --git a/lcmodule/source/cnh1605205_ldr_network_layer/include/r_protrom_header.h b/lcmodule/source/cnh1605205_ldr_network_layer/include/r_protrom_header.h index 8165430..1462f12 100644 --- a/lcmodule/source/cnh1605205_ldr_network_layer/include/r_protrom_header.h +++ b/lcmodule/source/cnh1605205_ldr_network_layer/include/r_protrom_header.h @@ -19,7 +19,6 @@ * Includes ******************************************************************************/ #include -#include "t_protrom_header.h" #include "t_protrom_network.h" /******************************************************************************* diff --git a/lcmodule/source/cnh1605205_ldr_network_layer/include/r_protrom_network.h b/lcmodule/source/cnh1605205_ldr_network_layer/include/r_protrom_network.h index a6e897c..c18108d 100644 --- a/lcmodule/source/cnh1605205_ldr_network_layer/include/r_protrom_network.h +++ b/lcmodule/source/cnh1605205_ldr_network_layer/include/r_protrom_network.h @@ -51,7 +51,7 @@ ErrorCode_e Protrom_Network_Shutdown(const Communication_t *const Communication_ * * @param [in] Data_p Pointer to the received data. * @param [in] Length Length of the received data. - * @param [in] Param_p Extra parameteres. + * @param [in] Param_p Extra parameters. * * @return none. */ diff --git a/lcmodule/source/cnh1605205_ldr_network_layer/include/r_r15_network_layer.h b/lcmodule/source/cnh1605205_ldr_network_layer/include/r_r15_network_layer.h index cf739b5..9a2c53f 100644 --- a/lcmodule/source/cnh1605205_ldr_network_layer/include/r_r15_network_layer.h +++ b/lcmodule/source/cnh1605205_ldr_network_layer/include/r_r15_network_layer.h @@ -22,7 +22,6 @@ #include "error_codes.h" #include "t_basicdefinitions.h" #include "t_r15_network_layer.h" -#include "t_communication_service.h" /******************************************************************************* * Declaration of functions @@ -66,14 +65,14 @@ ErrorCode_e R15_Network_CancelRetransmission(const Communication_t *const Commun * combination of protocol type, session number and command. * * @param [in] Packet_p Pointer to the packet. - * @param [in] ExternalKey External key for marking the packet for retransmision. + * @param [in] ExternalKey External key for marking the packet for retransmission. * * @return Unique key. */ uint32 R15_Network_CreateUniqueKey(const PacketMeta_t *const Packet_p, const uint8 ExternalKey); /** - * Handler for received packets in R15 protocl family. + * Handler for received packets in R15 protocol family. * * This callback function handles the received packets. * @@ -114,7 +113,7 @@ ErrorCode_e R15_Network_ReceiverHandler(Communication_t *Communication_p); /** * Handler for sending data. * - * This function checks if new data is available for sending and handles the transmision. + * This function checks if new data is available for sending and handles the transmission. * * @param [in,out] Communication_p Communication module context. * diff --git a/lcmodule/source/cnh1605205_ldr_network_layer/include/r_z_network.h b/lcmodule/source/cnh1605205_ldr_network_layer/include/r_z_network.h index c8450e5..892eb6f 100644 --- a/lcmodule/source/cnh1605205_ldr_network_layer/include/r_z_network.h +++ b/lcmodule/source/cnh1605205_ldr_network_layer/include/r_z_network.h @@ -49,7 +49,7 @@ ErrorCode_e Z_Network_Initialize(Communication_t *Communication_p); ErrorCode_e Z_Network_Shutdown(const Communication_t *const Communication_p); /** - * Handler for received packets in Z protcol family. + * Handler for received packets in Z protocol family. * * This callback function handles the received packets. * @@ -77,7 +77,7 @@ void Z_Network_ReadCallback(const void *Data_p, const uint32 Length, void *Param void Z_Network_WriteCallback(const void *Data_p, const uint32 Length, void *Param_p); /** - * Handler for receiving new data in Z protcol family. + * Handler for receiving new data in Z protocol family. * * This function checks if new data has been received. * @@ -89,9 +89,9 @@ void Z_Network_ReceiverHandler(Communication_t *Communication_p); /** - * Handler for sending new data in Z protcol family. + * Handler for sending new data in Z protocol family. * - * This function checks if new data has been transmited. + * This function checks if new data has been transmitted. * * @param [in] Communication_p Communication module context. * @param [in] SendingContent_p Pointer to the sending context. diff --git a/lcmodule/source/cnh1605205_ldr_network_layer/include/t_protrom_header.h b/lcmodule/source/cnh1605205_ldr_network_layer/include/t_protrom_header.h index 63ae6ef..a434e79 100644 --- a/lcmodule/source/cnh1605205_ldr_network_layer/include/t_protrom_header.h +++ b/lcmodule/source/cnh1605205_ldr_network_layer/include/t_protrom_header.h @@ -32,8 +32,6 @@ #define PROTROM_HEADER_LENGTH 7 /** Value of the reserved field */ #define PROTROM_RESERVED_FIELD 0x00 -/** Offset of the header in the buffer */ -#define HEADER_OFFSET_IN_BUFFER 8 /** * Header search results @@ -52,7 +50,7 @@ typedef struct { uint8 HeaderPattern; /**< Header pattern for marking header start.*/ uint8 Protocol; /**< Protocol type. */ uint8 SourceAddress; /**< Source address. */ - uint8 DestinationAddress; /**< Destionation address. */ + uint8 DestinationAddress; /**< Destination address. */ uint8 ReservedField; /**< Reserved field. */ uint16 PayloadLength; /**< Payload length. */ } Protrom_Header_t; diff --git a/lcmodule/source/cnh1605205_ldr_network_layer/include/t_protrom_network.h b/lcmodule/source/cnh1605205_ldr_network_layer/include/t_protrom_network.h index b29a65a..fe693f4 100644 --- a/lcmodule/source/cnh1605205_ldr_network_layer/include/t_protrom_network.h +++ b/lcmodule/source/cnh1605205_ldr_network_layer/include/t_protrom_network.h @@ -39,11 +39,11 @@ typedef enum { /** Defined state of the transmitter */ typedef enum { - PROTROM_SEND_IDLE, /**< Transmiter idle state.*/ - PROTROM_SEND_HEADER, /**< Transmiter send header. */ - PROTROM_SEND_PAYLOAD, /**< Transmiter send payload. */ - PROTROM_SENDING_HEADER, /**< Transmiter is in process sending header.*/ - PROTROM_SENDING_PAYLOAD /**< Transmiter is in process sending payload.*/ + PROTROM_SEND_IDLE, /**< Transmitter idle state.*/ + PROTROM_SEND_HEADER, /**< Transmitter send header. */ + PROTROM_SEND_PAYLOAD, /**< Transmitter send payload. */ + PROTROM_SENDING_HEADER, /**< Transmitter is in process sending header.*/ + PROTROM_SENDING_PAYLOAD /**< Transmitter is in process sending payload.*/ } Protrom_OutboundState_t; /** Structure for the packet meta data type. */ @@ -52,8 +52,8 @@ typedef struct Protrom_Packet { uint8 *Buffer_p; /**< Temporary buffer for receiving data.*/ uint16 CRC; /**< Calculated CRC of received packet. */ Communication_t *Communication_p; /**< The communication over which this - packet has been/is to be transferred - over */ + packet has been/is to be transferred + over */ } Protrom_Packet_t; /** Structure for handling incoming PROTROM packets.*/ @@ -62,9 +62,9 @@ typedef struct { Protrom_InboundState_t State; /**< Number of requested data for receiving from communication device. */ uint32 ReqData; - /**< Number of receivied data from communication device. */ + /**< Number of received data from communication device. */ uint32 RecData; - /**< Number of receivied data from backup buffer used for switching the + /**< Number of received data from backup buffer used for switching the * protocol family. */ uint32 RecBackupData; /**< Offset in the buffer for next data that should be received. */ @@ -73,7 +73,7 @@ typedef struct { uint8 *Target_p; /**< Temporary buffer for receiving data. */ uint8 Scratch[PROTROM_HEADER_LENGTH]; - /** Number of packets before receiver is stoped. */ + /** Number of packets before receiver is stopped. */ uint8 PacketsBeforeReceiverStop; /** Indicator for stopping the receiver. */ boolean StopTransfer; diff --git a/lcmodule/source/cnh1605205_ldr_network_layer/include/t_r15_header.h b/lcmodule/source/cnh1605205_ldr_network_layer/include/t_r15_header.h index e31ca8c..4b5cc70 100644 --- a/lcmodule/source/cnh1605205_ldr_network_layer/include/t_r15_header.h +++ b/lcmodule/source/cnh1605205_ldr_network_layer/include/t_r15_header.h @@ -69,7 +69,7 @@ typedef struct { uint8 HeaderPattern; /**< Header pattern for marking header start.*/ uint8 Protocol; /**< Protocol type. */ uint16 HeaderPatternExtension; /**< Header pattern extension.*/ - uint8 Flags; /**< Flasgs for the header.*/ + uint8 Flags; /**< Flags for the header.*/ uint8 ExtendedHeaderLength; /**< Extended header length.*/ uint8 ExtendedHeaderChecksum; /**< Extended header checksum.*/ uint32 PayloadLength; /**< Payload length. */ 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 0bd2944..408fdf9 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 @@ -71,8 +71,8 @@ /** Size of a buffer used for commands. */ #define COMMAND_BUFFER_SIZE 0x00010000 -/** Size of a buffer used for bulk transfer, - * must be biger than buffer for commands. */ +/** Size of a payload buffer used for bulk transfer, + * must be larger than buffer for commands. */ #define BULK_BUFFER_SIZE 0x00100000 @@ -86,7 +86,7 @@ #define SESSION_MASK 0xFFFC /** - * Defines all posible types of buffers that can be created (allocated). + * Defines all possible types of buffers that can be created (allocated). * * It is used to specified the type of the buffer * when allocating a new buffer. Also it is used when @@ -108,7 +108,7 @@ TYPEDEF_ENUM { BUF_TX_SENT = 0x00000008, /**< The buffer is sent and wait ACK. */ BUF_TX_DONE = 0x00000010, /**< The buffer has been sent and can be deallocated. */ - BUF_TX_TIMEOUT = 0x00000020, /**< The timeout ocure when buffer is + BUF_TX_TIMEOUT = 0x00000020, /**< The timeout occur when buffer is sending. */ BUF_RX_READY = 0x00000040, /**< The buffer is filled with received data and is ready for @@ -201,7 +201,7 @@ typedef void (*PacketCallBack_t)(Communication_t *Communication_p, const void *D /** Structure for the packet meta data. */ typedef struct PacketMeta { - PacketCallBack_t CallBack_p; /**< Cllback function used after + PacketCallBack_t CallBack_p; /**< Callback function used after sending packet.*/ uint32 Flags; /**< Field is a bit-field. Flags for the Packet state. */ @@ -209,9 +209,9 @@ typedef struct PacketMeta { corresponding buffer used in the packet. */ R15_Header_t Header; /**< Structure of the header. */ - uint32 Resend; /**< Resend counter. */ + uint32 Resend; /**< Resent counter. */ Timer_t *Timer_p; /**< Timer data used for - sending/reciving packet. */ + sending/receiving packet. */ uint8 *ExtendedHeader_p; /**< Pointer to the extended header located in the packet. */ uint8 *Payload_p; /**< Pointer to the payload data @@ -234,8 +234,7 @@ typedef struct { uint32 Timeout; /**< Defined timeout for retransmission. */ uint32 TimerKey; /**< Timer identification number.*/ uint32 Key; /**< Generated unique key, used for marking packet for - retransmission or removing from - retransmission list. */ + retransmission or removing from retransmission list. */ PacketMeta_t *Packet_p; /**< Pointer to the packet for retransmission. */ } RetransmissionContext_t; @@ -246,9 +245,9 @@ typedef struct { R15_InboundState_t State; /**< Number of requested data for receiving from communication device. */ uint32 ReqData; - /**< Number of receivied data from communication device. */ + /**< Number of received data from communication device. */ uint32 RecData; - /**< Number of receivied data from backup buffer used for switching the + /**< Number of received data from backup buffer used for switching the * protocol family. */ uint32 RecBackupData; /**< Offset in the buffer for next data that should be received. */ @@ -259,9 +258,9 @@ typedef struct { uint8 Scratch[ALIGNED_HEADER_LENGTH + ALIGNED_BULK_EXTENDED_HEADER_LENGTH]; /** Temporary structure for handling R15 packet.*/ R15_Header_t Header; - /** Poiter to meta data for allocated buffer for handling R15 packet.*/ + /** Pointer to meta data for allocated buffer for handling R15 packet.*/ PacketMeta_t *Packet_p; - /** Number of packets before receiver is stoped. */ + /** Number of packets before receiver is stopped. */ uint8 PacketsBeforeReceiverStop; /** Indicator for stopping the receiver. */ boolean StopTransfer; diff --git a/lcmodule/source/cnh1605205_ldr_network_layer/include/t_z_header.h b/lcmodule/source/cnh1605205_ldr_network_layer/include/t_z_header.h index 09fe771..0eab5d2 100644 --- a/lcmodule/source/cnh1605205_ldr_network_layer/include/t_z_header.h +++ b/lcmodule/source/cnh1605205_ldr_network_layer/include/t_z_header.h @@ -10,7 +10,7 @@ * @addtogroup z_family * @{ * @addtogroup ldr_z_header Z header - * Functionalities for analizing header from Z protocol family. + * Functionalities for analyzing header from Z protocol family. * * @{ */ diff --git a/lcmodule/source/cnh1605205_ldr_network_layer/include/t_z_network.h b/lcmodule/source/cnh1605205_ldr_network_layer/include/t_z_network.h index 7f66e67..fa189f1 100644 --- a/lcmodule/source/cnh1605205_ldr_network_layer/include/t_z_network.h +++ b/lcmodule/source/cnh1605205_ldr_network_layer/include/t_z_network.h @@ -34,9 +34,9 @@ typedef enum { /** Defined state of the transmitter */ typedef enum { - Z_SEND_IDLE, /**< Transmiter idle state.*/ - Z_SEND_PACKET, /**< Transmiter send packet. */ - Z_SENDING_PACKET /**< Transmiter is in process sending packet.*/ + Z_SEND_IDLE, /**< Transmitter idle state.*/ + Z_SEND_PACKET, /**< Transmitter send packet. */ + Z_SENDING_PACKET /**< Transmitter is in process sending packet.*/ } Z_OutboundState_t; /** Structure for handling incoming Z packets.*/ @@ -45,11 +45,11 @@ typedef struct { Z_InboundState_t State; /**< Number of requested data for receiving from communication device. */ uint32 ReqData; - /**< Number of receivied data from communication device. */ + /**< Number of received data from communication device. */ uint32 RecData; /**< Temporary pointer to buffer for handling received data.*/ uint8 *Target_p; - /** Number of packets before receiver is stoped. */ + /** Number of packets before receiver is stopped. */ uint8 PacketsBeforeReceiverStop; /** Indicator for stopping the receiver. */ boolean StopTransfer; diff --git a/lcmodule/source/cnh1605205_ldr_network_layer/source/a2_header.c b/lcmodule/source/cnh1605205_ldr_network_layer/source/a2_header.c index fd48503..6215372 100644 --- a/lcmodule/source/cnh1605205_ldr_network_layer/source/a2_header.c +++ b/lcmodule/source/cnh1605205_ldr_network_layer/source/a2_header.c @@ -14,7 +14,7 @@ /******************************************************************************* * Includes ******************************************************************************/ -#include "c_system.h" +#include "c_system_v2.h" #include #include "t_basicdefinitions.h" #include "r_a2_header.h" diff --git a/lcmodule/source/cnh1605205_ldr_network_layer/source/a2_network.c b/lcmodule/source/cnh1605205_ldr_network_layer/source/a2_network.c index 1aa32a3..bfc0f97 100644 --- a/lcmodule/source/cnh1605205_ldr_network_layer/source/a2_network.c +++ b/lcmodule/source/cnh1605205_ldr_network_layer/source/a2_network.c @@ -17,7 +17,7 @@ #include #include #include -#include "c_system.h" +#include "c_system_v2.h" #include "r_basicdefinitions.h" #include "r_a2_family.h" #include "r_a2_transport.h" @@ -29,10 +29,6 @@ #include "r_debug_macro.h" #include "r_critical_section.h" -#ifdef WIN32 -#include -#endif - /******************************************************************************* * Declaration of file local functions ******************************************************************************/ diff --git a/lcmodule/source/cnh1605205_ldr_network_layer/source/protrom_header.c b/lcmodule/source/cnh1605205_ldr_network_layer/source/protrom_header.c index acc7836..acb8806 100644 --- a/lcmodule/source/cnh1605205_ldr_network_layer/source/protrom_header.c +++ b/lcmodule/source/cnh1605205_ldr_network_layer/source/protrom_header.c @@ -14,7 +14,7 @@ /******************************************************************************* * Includes ******************************************************************************/ -#include "c_system.h" +#include "c_system_v2.h" #include #include "t_basicdefinitions.h" #include "r_protrom_header.h" diff --git a/lcmodule/source/cnh1605205_ldr_network_layer/source/protrom_network.c b/lcmodule/source/cnh1605205_ldr_network_layer/source/protrom_network.c index 11410e2..47602a6 100644 --- a/lcmodule/source/cnh1605205_ldr_network_layer/source/protrom_network.c +++ b/lcmodule/source/cnh1605205_ldr_network_layer/source/protrom_network.c @@ -16,7 +16,7 @@ ******************************************************************************/ #include #include -#include "c_system.h" +#include "c_system_v2.h" #include "t_basicdefinitions.h" #include "r_protrom_family.h" #include "r_protrom_transport.h" @@ -28,10 +28,6 @@ #include "r_debug_macro.h" #include "r_critical_section.h" -#ifdef WIN32 -#include -#endif - /******************************************************************************* * Declaration of file local functions ******************************************************************************/ @@ -393,7 +389,7 @@ static ErrorCode_e Protrom_Network_TransmiterHandler(Communication_t *Communicat Out_p->Packet_p = (Protrom_Packet_t *)QUEUE(Communication_p, FifoDequeue_Fn)(OBJECT_QUEUE(Communication_p), Communication_p->Outbound_p); if (NULL != Out_p->Packet_p) { - /* get next packet for transmiting */ + /* get next packet for transmitting */ Out_p->State = PROTROM_SEND_HEADER; } else { break; diff --git a/lcmodule/source/cnh1605205_ldr_network_layer/source/r15_header.c b/lcmodule/source/cnh1605205_ldr_network_layer/source/r15_header.c index be504e5..5687bcf 100644 --- a/lcmodule/source/cnh1605205_ldr_network_layer/source/r15_header.c +++ b/lcmodule/source/cnh1605205_ldr_network_layer/source/r15_header.c @@ -14,7 +14,7 @@ /******************************************************************************* * Includes ******************************************************************************/ -#include "c_system.h" +#include "c_system_v2.h" #include #include "t_basicdefinitions.h" #include "r_r15_header.h" @@ -224,8 +224,12 @@ boolean R15_IsReceivedHeader(R15_Inbound_t *In_p) In_p->ReqBuffOffset = In_p->RecData - StartHeaderInBuffer; } } else { - In_p->ReqData = ALIGNED_HEADER_LENGTH; + /* Sync the header. */ + In_p->RecData = 0; In_p->ReqBuffOffset = 0; + In_p->State = RECEIVE_HEADER; + In_p->ReqData = ALIGNED_HEADER_LENGTH; + In_p->Target_p = In_p->Scratch; } } diff --git a/lcmodule/source/cnh1605205_ldr_network_layer/source/r15_network_layer.c b/lcmodule/source/cnh1605205_ldr_network_layer/source/r15_network_layer.c index e5afef2..509e8cf 100644 --- a/lcmodule/source/cnh1605205_ldr_network_layer/source/r15_network_layer.c +++ b/lcmodule/source/cnh1605205_ldr_network_layer/source/r15_network_layer.c @@ -14,13 +14,13 @@ /******************************************************************************* * Includes ******************************************************************************/ +#include +#include #include "r_r15_network_layer.h" #include "r_basicdefinitions.h" -#include #include "r_debug.h" #include "r_debug_macro.h" -#include -#include "c_system.h" +#include "c_system_v2.h" #include "r_r15_transport_layer.h" #include "r_r15_family.h" #include "r_r15_header.h" @@ -466,7 +466,7 @@ ErrorCode_e R15_Network_TransmiterHandler(Communication_t *Communication_p) * Cancel retransmission of packets. * * @param [in,out] Communication_p Communication module context. - * @param [in] UniqueKey Unique key used for identification of packet + * @param [in] UniqueKey Unique key used for identification of packet * for retransmission. * * @return none. @@ -729,6 +729,7 @@ static ErrorCode_e R15_Network_ReceiveHeader(const Communication_t *const Commun if (print_header) { uint32 Counter = 0; + print_header = 0; printf("Invalid header! \n"); for (Counter = 0; Counter < 16; Counter++) { @@ -818,7 +819,7 @@ static ErrorCode_e R15_Network_ReceiveExtendedHeader(Communication_t *Communicat } else { A_( uint32 Counter = 0; - printf("Invalid exheader! \n"); + printf("Invalid extended header! \n"); for (Counter = 0; Counter < 16; Counter++) { printf(" %02X", In_p->Target_p[Counter]); diff --git a/lcmodule/source/cnh1605205_ldr_network_layer/source/z_network.c b/lcmodule/source/cnh1605205_ldr_network_layer/source/z_network.c index 4ec23eb..6ed92c2 100644 --- a/lcmodule/source/cnh1605205_ldr_network_layer/source/z_network.c +++ b/lcmodule/source/cnh1605205_ldr_network_layer/source/z_network.c @@ -16,7 +16,7 @@ ******************************************************************************/ #include #include -#include "c_system.h" +#include "c_system_v2.h" #include "t_basicdefinitions.h" #include "r_z_family.h" #include "r_z_transport.h" @@ -26,10 +26,6 @@ #include "r_communication_service.h" #include "r_critical_section.h" -#ifdef WIN32 -#include -#endif - /******************************************************************************* * Declaration of file local functions ******************************************************************************/ diff --git a/lcmodule/source/cnh1605205_ldr_network_layer/test_cases/ADbg_cnh1605205.c b/lcmodule/source/cnh1605205_ldr_network_layer/test_cases/ADbg_cnh1605205.c index 68455bf..ddce514 100644 --- a/lcmodule/source/cnh1605205_ldr_network_layer/test_cases/ADbg_cnh1605205.c +++ b/lcmodule/source/cnh1605205_ldr_network_layer/test_cases/ADbg_cnh1605205.c @@ -25,8 +25,10 @@ #include "r_adbg_case.h" #include "r_adbg_module.h" #include "r_adbg_command.h" +#ifndef CFG_ENABLE_LOADER_TYPE #include "r_a2_header.h" #include "r_a2_network.h" +#endif // CFG_ENABLE_LOADER_TYPE #include "r_r15_header.h" #include "r_r15_network_layer.h" #include @@ -34,6 +36,7 @@ /******************************************************************************* * The test case functions declarations ******************************************************************************/ +#ifndef CFG_ENABLE_LOADER_TYPE static void ADbg_A2_GetPacketLength(ADbg_Case_t *Case_p); static void ADbg_A2_IsValidHeader(ADbg_Case_t *Case_p); static void ADbg_A2_IsReceivedHeader(ADbg_Case_t *Case_p); @@ -42,6 +45,7 @@ static void ADbg_A2_Network_Initialize(ADbg_Case_t *Case_p); static void ADbg_A2_Network_Shutdown(ADbg_Case_t *Case_p); static void ADbg_A2_Network_PacketAllocate(ADbg_Case_t *Case_p); static void ADbg_A2_Network_PacketRelease(ADbg_Case_t *Case_p); +#endif // CFG_ENABLE_LOADER_TYPE static void ADbg_R15_GetPacketLength(ADbg_Case_t *Case_p); static void ADbg_R15_IsValidHeader(ADbg_Case_t *Case_p); @@ -57,6 +61,7 @@ static void ADbg_R15_Network_PacketRelease(ADbg_Case_t *Case_p); /******************************************************************************* * The test case definitions ******************************************************************************/ +#ifndef CFG_ENABLE_LOADER_TYPE static uint8 Parameters1_1[3] = {2, WORDPTR, WORD}; ADBG_CASE_DEFINE(Test_A2_GetPacketLength, 1, 9, ADbg_A2_GetPacketLength, Parameters1_1); static uint8 Parameters1_2[3] = {2, VOIDPTR, BYTE}; @@ -72,6 +77,7 @@ static uint8 Parameters2_3[4] = {3, WORDPTR, WORD, WORDPTR}; ADBG_CASE_DEFINE(Test_A2_Network_PacketAllocate, 6, 9, ADbg_A2_Network_PacketAllocate, Parameters2_3); static uint8 Parameters2_4[4] = {3, WORDPTR, WORD, WORDPTR}; ADBG_CASE_DEFINE(Test_A2_Network_PacketRelease, 7, 9, ADbg_A2_Network_PacketRelease, Parameters2_4); +#endif // CFG_ENABLE_LOADER_TYPE static uint8 Parameters3_1[3] = {2, WORDPTR, WORD}; ADBG_CASE_DEFINE(Test_R15_GetPacketLength, 8, 9, ADbg_R15_GetPacketLength, Parameters3_1); @@ -98,6 +104,7 @@ ADBG_CASE_DEFINE(Test_R15_Network_PacketRelease, 16, 9, ADbg_R15_Network_PacketR ******************************************************************************/ ADBG_SUITE_DEFINE_BEGIN(TestCase_CNH1605205, 0, 9) +#ifndef CFG_ENABLE_LOADER_TYPE ADBG_SUITE_ENTRY(Test_A2_GetPacketLength) ADBG_SUITE_ENTRY(Test_A2_IsValidHeader) ADBG_SUITE_ENTRY(Test_A2_IsReceivedHeader) @@ -106,6 +113,7 @@ ADBG_SUITE_ENTRY(Test_A2_Network_Initialize) ADBG_SUITE_ENTRY(Test_A2_Network_Shutdown) ADBG_SUITE_ENTRY(Test_A2_Network_PacketAllocate) ADBG_SUITE_ENTRY(Test_A2_Network_PacketRelease) +#endif // CFG_ENABLE_LOADER_TYPE ADBG_SUITE_ENTRY(Test_R15_GetPacketLength) ADBG_SUITE_ENTRY(Test_R15_IsValidHeader) @@ -132,6 +140,7 @@ void Do_CNH1605205_Module_Test_Run(ADbg_MainModule_t *MainModule_p) /******************************************************************************* * Test cases ******************************************************************************/ +#ifndef CFG_ENABLE_LOADER_TYPE /** * This function will test function: * A2_GetPacketLength. @@ -315,6 +324,7 @@ static void ADbg_A2_Network_PacketRelease(ADbg_Case_t *Case_p) free(Meta_p); } } +#endif // CFG_ENABLE_LOADER_TYPE /** * This function will test function: diff --git a/lcmodule/source/cnh1606344_ldr_communication_module/config/a2_commands.xml b/lcmodule/source/cnh1606344_ldr_communication_module/config/a2_commands.xml index 171df8f..6da32f0 100644 --- a/lcmodule/source/cnh1606344_ldr_communication_module/config/a2_commands.xml +++ b/lcmodule/source/cnh1606344_ldr_communication_module/config/a2_commands.xml @@ -32,9 +32,6 @@ diff --git a/lcmodule/source/cnh1606344_ldr_communication_module/config/audit_c.xsl b/lcmodule/source/cnh1606344_ldr_communication_module/config/audit_c.xsl index f9b577b..f4d8849 100644 --- a/lcmodule/source/cnh1606344_ldr_communication_module/config/audit_c.xsl +++ b/lcmodule/source/cnh1606344_ldr_communication_module/config/audit_c.xsl @@ -81,7 +81,7 @@ - PermArray_, + PermArray_, NULL, 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 064f27a..24da528 100644 --- a/lcmodule/source/cnh1606344_ldr_communication_module/config/audit_h.xsl +++ b/lcmodule/source/cnh1606344_ldr_communication_module/config/audit_h.xsl @@ -60,11 +60,11 @@ TYPEDEF_ENUM { diff --git a/lcmodule/source/cnh1606344_ldr_communication_module/config/ces_commands_c.xsl b/lcmodule/source/cnh1606344_ldr_communication_module/config/ces_commands_c.xsl index 19971b9..da5f5ec 100644 --- a/lcmodule/source/cnh1606344_ldr_communication_module/config/ces_commands_c.xsl +++ b/lcmodule/source/cnh1606344_ldr_communication_module/config/ces_commands_c.xsl @@ -18,18 +18,12 @@ - -#ifdef DISABLE_SECURITY - { NULL, _Repeat, , 1 }, - -#endif - 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 325b598..f0fd533 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 @@ -19,6 +19,7 @@ #ifndef _COMMAND_IDS_H #define _COMMAND_IDS_H #include "t_basicdefinitions.h" + TYPEDEF_ENUM { } ENUM8(GroupId_e); @@ -38,15 +39,15 @@ 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 ce47482..d4a8672 100644 --- a/lcmodule/source/cnh1606344_ldr_communication_module/config/command_marshal.xsl +++ b/lcmodule/source/cnh1606344_ldr_communication_module/config/command_marshal.xsl @@ -138,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;\ @@ -335,7 +335,7 @@ ErrorCode_e + + +