diff options
author | Viktor Mladenovski <viktor.mladenovski@seavus.com> | 2011-06-21 17:51:15 +0200 |
---|---|---|
committer | Viktor Mladenovski <viktor.mladenovski@seavus.com> | 2011-06-21 17:51:15 +0200 |
commit | 12da7d3751c8b7bd088587c8323123019680efff (patch) | |
tree | 6e1e3f6a65e260ba8ffe2e1336a0cc4f0be145ba /lcmodule/source/cnh1605205_ldr_network_layer/source/r15_network_layer.c | |
parent | f7e95217e936da34d7124aaced590692eb515923 (diff) |
Flashing procedure stops at different stages
Adds fix for retransmission in LCM transport layer
ST-Ericsson ID: 325725
ST-Ericsson FOSS-OUT ID: STETL-FOSS-OUT-10204
Change-Id: Ie6b32dcf6bf7b3023237920204e3c55ac0624a79
Diffstat (limited to 'lcmodule/source/cnh1605205_ldr_network_layer/source/r15_network_layer.c')
-rw-r--r-- | lcmodule/source/cnh1605205_ldr_network_layer/source/r15_network_layer.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 |