1 files changed, 4 insertions, 34 deletions
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 220ccec..94d536c 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
@@ -37,9 +37,6 @@
  ******************************************************************************/
 static void 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
  ******************************************************************************/
@@ -70,14 +67,9 @@ 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;
@@ -88,9 +80,6 @@ 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;
 
-#ifdef  CFG_ENABLE_LOADER_TYPE
-ErrorExit:
-#endif
     return ReturnValue;
 }
 
@@ -241,6 +230,10 @@ ErrorCode_e R15_SetProtocolTimeouts(Communication_t *Communication_p, void *Time
     ErrorCode_e ReturnValue = E_INVALID_INPUT_PARAMETERS;
     R15_Timeouts_t *NewTimeoutData_p = (R15_Timeouts_t *)TimeoutData_p;
     VERIFY(NULL != TimeoutData_p, E_INVALID_INPUT_PARAMETERS);
+    C_(printf("R15_SetProtocolTimeouts: Setting new timeouts!\n");)
+    C_(printf("                  TCACK: %d\n", NewTimeoutData_p->TCACK);)
+    C_(printf("                   TBCR: %d\n", NewTimeoutData_p->TBCR);)
+    C_(printf("                   TBDR: %d\n", NewTimeoutData_p->TBDR);)
 
     R15_TIMEOUTS(Communication_p)->TCACK = NewTimeoutData_p->TCACK;
     R15_TIMEOUTS(Communication_p)->TBCR = NewTimeoutData_p->TBCR;
@@ -316,29 +309,6 @@ static void TimerSet(PacketMeta_t *Packet_p, const SendData_LP_t *const InputDat
     }
 }
 
-#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
 
 /** @} */
 /** @} */