X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Flib%2Fmac%2Ftkn154%2FFrameDispatchQueueP.nc;h=6693ade00d2c42fe920aa5a6422137af0a96d81c;hb=280de4fedba9a7080138600e623cdadf22bf728a;hp=4e34605f0db6a0133abf4fcf544336620539c4f9;hpb=cfc8b8448d14883d4d47e0852797366ef0c13a75;p=tinyos-2.x.git diff --git a/tos/lib/mac/tkn154/FrameDispatchQueueP.nc b/tos/lib/mac/tkn154/FrameDispatchQueueP.nc index 4e34605f..6693ade0 100644 --- a/tos/lib/mac/tkn154/FrameDispatchQueueP.nc +++ b/tos/lib/mac/tkn154/FrameDispatchQueueP.nc @@ -54,7 +54,7 @@ implementation command error_t Reset.init() { - while (call Queue.size()){ + while (call Queue.size()) { ieee154_txframe_t *txFrame = call Queue.dequeue(); signal FrameTx.transmitDone[txFrame->client](txFrame, IEEE154_TRANSACTION_OVERFLOW); } @@ -75,16 +75,16 @@ implementation task void txTask() { - if (!m_busy && call Queue.size()){ + if (!m_busy && call Queue.size()) { ieee154_txframe_t *txFrame = call Queue.head(); - if (txFrame->headerLen == 0){ + if (txFrame->headerLen == 0) { // was purged call Queue.dequeue(); signal Purge.purgeDone(txFrame, IEEE154_SUCCESS); post txTask(); } m_client = txFrame->client; - if (call FrameTxCsma.transmit(txFrame) == IEEE154_SUCCESS){ + if (call FrameTxCsma.transmit(txFrame) == IEEE154_SUCCESS) { m_busy = TRUE; } } @@ -106,16 +106,16 @@ implementation return signal FrameExtracted.received[m_client](frame); } - default event void FrameTx.transmitDone[uint8_t client](ieee154_txframe_t *txFrame, ieee154_status_t status){} + default event void FrameTx.transmitDone[uint8_t client](ieee154_txframe_t *txFrame, ieee154_status_t status) {} command ieee154_status_t Purge.purge(uint8_t msduHandle) { uint8_t qSize = call Queue.size(), i; - if (qSize > 1){ - for (i=0; i 1) { + for (i=0; iheader->mhr[MHR_INDEX_FC1] & FC1_FRAMETYPE_MASK) == FC1_FRAMETYPE_DATA) && - txFrame->handle == msduHandle){ + txFrame->handle == msduHandle) { txFrame->headerLen = 0; // mark as invalid return IEEE154_SUCCESS; } @@ -124,5 +124,5 @@ implementation return IEEE154_INVALID_HANDLE; } - default event void Purge.purgeDone(ieee154_txframe_t *txFrame, ieee154_status_t status){} + default event void Purge.purgeDone(ieee154_txframe_t *txFrame, ieee154_status_t status) {} }