diff options
author | Zoran Ancevski <zoran.ancevski@seavus.com> | 2011-10-13 10:55:01 +0100 |
---|---|---|
committer | Viktor Mladenovski <viktor.mladenovski@seavus.com> | 2011-10-28 18:55:23 +0200 |
commit | 0ee6a4fffd68ec125fc7e7e0854aa10d8c09efc0 (patch) | |
tree | db3b0b73fec596c541423ee5796638a448e7fcfa /lcmodule/source/cnh1605205_ldr_network_layer/source/r15_network_layer.c | |
parent | 0ddb310bb30fc3445b9aa2be8cfb615cdadfdb78 (diff) |
Revert "Official R1U/R1S LCM/LCD Release"
This reverts commit d4baa448d384be488b2b2746519f02ff037a205e.
ST-Ericsson ID: 365326
ST-Ericsson FOSS-OUT ID: STETL-FOSS-OUT-10204
Change-Id: I372f164a742d031976ae9aed50a509f130a101cd
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33844
Reviewed-by: QATOOLS
Reviewed-by: QABUILD
Reviewed-by: Viktor MLADENOVSKI <viktor.mladenovski@stericsson.com>
Tested-by: Cvetko MLADENOVSKI <cvetko.mladenovski@seavus.com>
Reviewed-by: Vlatko PISTOLOV <vlatko.pistolov@seavus.com>
Tested-by: Vlatko PISTOLOV <vlatko.pistolov@seavus.com>
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 | 21 |
1 files changed, 13 insertions, 8 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 6268dc1..8d309b8 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 @@ -33,6 +33,9 @@ #include "r_time_utilities.h" #endif +#define FREE_TRANSMITER 0 +#define BUSY_TRANSMITER 1 + #ifdef CFG_ENABLE_MEASUREMENT_TOOL extern Measurement_t *Measurement_p; #endif @@ -330,15 +333,17 @@ ErrorCode_e R15_Network_TransmiterHandler(Communication_t *Communication_p) /* check retransmission count before send */ Out_p->Packet_p = (PacketMeta_t *)QUEUE(Communication_p, FifoDequeue_Fn)(OBJECT_QUEUE(Communication_p), Communication_p->Outbound_p); - if ((NULL == Out_p->Packet_p) || (CHECK_PACKET_FLAGS(Out_p->Packet_p, BUF_TX_DONE))) { - break; - } else if (Out_p->Packet_p->Resend < MAX_RESENDS) { - Out_p->Packet_p->Resend++; - /* get next packet for transmitting */ - Out_p->State = SEND_HEADER; + if (NULL != Out_p->Packet_p) { + if (Out_p->Packet_p->Resend < MAX_RESENDS) { + Out_p->Packet_p->Resend++; + /* get next packet for transmitting */ + Out_p->State = SEND_HEADER; + } else { + //Do_CommunicationInternalErrorHandler(E_RETRANSMITION_FAILED); + return E_RETRANSMITION_FAILED; + } } else { - //Do_CommunicationInternalErrorHandler(E_RETRANSMITION_FAILED); - return E_RETRANSMITION_FAILED; + break; } /* FALLTHROUGH */ |