diff options
Diffstat (limited to 'lcmodule/source/cnh1605205_ldr_network_layer')
4 files changed, 16 insertions, 14 deletions
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 7b7631b..fd48503 100644 --- a/lcmodule/source/cnh1605205_ldr_network_layer/source/a2_header.c +++ b/lcmodule/source/cnh1605205_ldr_network_layer/source/a2_header.c @@ -163,8 +163,8 @@ boolean A2_IsReceivedHeader(A2_Inbound_t *In_p) return TRUE; } else { In_p->ReqData = StartHeaderInBuffer; - TmpPointer_p = (uint8 *)((uint32)In_p->Target_p + StartHeaderInBuffer); - memcpy(In_p->Target_p, (uint8 *)TmpPointer_p, A2_HEADER_LENGTH - StartHeaderInBuffer); + TmpPointer_p = In_p->Target_p + StartHeaderInBuffer; + memcpy(In_p->Target_p, TmpPointer_p, A2_HEADER_LENGTH - StartHeaderInBuffer); In_p->ReqBuffOffset = A2_HEADER_LENGTH - StartHeaderInBuffer; } } else { 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 eab4a6a..8ac6f7b 100644 --- a/lcmodule/source/cnh1605205_ldr_network_layer/source/protrom_header.c +++ b/lcmodule/source/cnh1605205_ldr_network_layer/source/protrom_header.c @@ -100,6 +100,7 @@ uint32 Protrom_GetPacketLength(const Protrom_Header_t *Header_p) boolean Protrom_IsValidHeader(const void *Data_p) { uint8 *Temp_p = (uint8 *)Data_p; + uint16 ProtromVal = 0; if (PROTROM_HEADER_PATTERN != *Temp_p) { return FALSE; @@ -121,7 +122,8 @@ boolean Protrom_IsValidHeader(const void *Data_p) return FALSE; } - if (*(uint16 *)(Temp_p + 5) < 1) { + ProtromVal = (Temp_p[6] << 8) | Temp_p[5]; + if (ProtromVal < 1) { return FALSE; } @@ -148,8 +150,8 @@ boolean Protrom_IsReceivedHeader(Protrom_Inbound_t *In_p) if (PROTROM_HEADER_PATTERN_CANDIDATE == Res) { /* call for receiving the rest bytes in header */ In_p->ReqData = StartHeaderInBuffer + PROTROM_HEADER_LENGTH - In_p->RecData; - TmpPointer_p = (uint8 *)((uint32)In_p->Target_p + StartHeaderInBuffer); - memcpy(In_p->Target_p, (uint8 *)TmpPointer_p, In_p->RecData - StartHeaderInBuffer); + TmpPointer_p = In_p->Target_p + StartHeaderInBuffer; + memcpy(In_p->Target_p, TmpPointer_p, In_p->RecData - StartHeaderInBuffer); In_p->ReqBuffOffset = In_p->RecData - StartHeaderInBuffer; } else { if (PROTROM_HEADER_PATTERN_MATCH == Res) { @@ -158,8 +160,8 @@ boolean Protrom_IsReceivedHeader(Protrom_Inbound_t *In_p) return TRUE; } else { In_p->ReqData = StartHeaderInBuffer + PROTROM_HEADER_LENGTH - In_p->RecData; - TmpPointer_p = (uint8 *)((uint32)In_p->Target_p + StartHeaderInBuffer); - memcpy(In_p->Target_p, (uint8 *)TmpPointer_p, In_p->RecData - StartHeaderInBuffer); + TmpPointer_p = In_p->Target_p + StartHeaderInBuffer; + memcpy(In_p->Target_p, TmpPointer_p, In_p->RecData - StartHeaderInBuffer); In_p->ReqBuffOffset = In_p->RecData - StartHeaderInBuffer; } } else { 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 8058506..be504e5 100644 --- a/lcmodule/source/cnh1605205_ldr_network_layer/source/r15_header.c +++ b/lcmodule/source/cnh1605205_ldr_network_layer/source/r15_header.c @@ -209,8 +209,8 @@ boolean R15_IsReceivedHeader(R15_Inbound_t *In_p) if (HEADER_PATTERN_CANDIDATE == Res) { /* call for receiving the rest bytes in header */ In_p->ReqData = StartHeaderInBuffer + ALIGNED_HEADER_LENGTH - In_p->RecData; - TmpPointer_p = (uint8 *)((uint32)In_p->Target_p + StartHeaderInBuffer); - memcpy(In_p->Target_p, (uint8 *)TmpPointer_p, In_p->RecData - StartHeaderInBuffer); + TmpPointer_p = In_p->Target_p + StartHeaderInBuffer; + memcpy(In_p->Target_p, TmpPointer_p, In_p->RecData - StartHeaderInBuffer); In_p->ReqBuffOffset = In_p->RecData - StartHeaderInBuffer; } else { if (HEADER_PATTERN_MATCH == Res) { @@ -219,8 +219,8 @@ boolean R15_IsReceivedHeader(R15_Inbound_t *In_p) return TRUE; } else { In_p->ReqData = StartHeaderInBuffer + ALIGNED_HEADER_LENGTH - In_p->RecData; - TmpPointer_p = (uint8 *)((uint32)In_p->Target_p + StartHeaderInBuffer); - memcpy(In_p->Target_p, (uint8 *)TmpPointer_p, In_p->RecData - StartHeaderInBuffer); + TmpPointer_p = In_p->Target_p + StartHeaderInBuffer; + memcpy(In_p->Target_p, TmpPointer_p, In_p->RecData - StartHeaderInBuffer); In_p->ReqBuffOffset = In_p->RecData - StartHeaderInBuffer; } } else { 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 3b3a2fc..bc18821 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 @@ -40,7 +40,7 @@ extern Measurement_t *Measurement_p; #endif -static PacketMeta_t PacketMetaInfo[COMMAND_BUFFER_COUNT + BULK_BUFFER_COUNT] = {0}; /* Packet Meta Info vector*/ +static PacketMeta_t PacketMetaInfo[COMMAND_BUFFER_COUNT + BULK_BUFFER_COUNT] ; /* Packet Meta Info vector*/ /******************************************************************************* * Declaration of file local functions @@ -429,7 +429,7 @@ uint32 R15_Network_CreateUniqueKey(const PacketMeta_t *const Packet_p, const uin uint32 Key = Packet_p->Header.Protocol; if (Key == PROTO_COMMAND) { - return((Key << 16) | *(Packet_p->ExtendedHeader_p) & MASK_CLR_STATE); + return((Key << 16) | (*(Packet_p->ExtendedHeader_p) & MASK_CLR_STATE)); } else { return ((Key << 16) | ((*(Packet_p->ExtendedHeader_p) & 0x00FF) << 8) | ExternalKey); } @@ -685,7 +685,7 @@ static ErrorCode_e R15_Network_ReceiveExtendedHeader(Communication_t *Communicat SET_INBOUND(In_p, RECEIVE_PAYLOAD, Aligned_Size); } else { -#ifdef DISABLE_SECURITY +#ifdef SKIP_PAYLOAD_VERIFICATION SET_PACKET_FLAGS(In_p->Packet_p, PACKET_RX_STATE_MASK, BUF_RX_READY); (void)QUEUE(Communication_p, FifoEnqueue_Fn)(OBJECT_QUEUE(Communication_p), Communication_p->Inbound_p, In_p->Packet_p); #else |