X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fchips%2Ftda5250%2Fmac%2FRedMacP.nc;h=ea7e070105ca7d026cdb9f58515fc19ec6beecbe;hb=7d5a4598831eb9baa8ee77dcd97fb88df9eaa924;hp=1a8600f7a1f016e37df9404e5558bd4c06b2295f;hpb=337d0b13acf569c2640b3ed7b7f5c7cec35d7ddd;p=tinyos-2.x.git diff --git a/tos/chips/tda5250/mac/RedMacP.nc b/tos/chips/tda5250/mac/RedMacP.nc index 1a8600f7..ea7e0701 100644 --- a/tos/chips/tda5250/mac/RedMacP.nc +++ b/tos/chips/tda5250/mac/RedMacP.nc @@ -39,7 +39,6 @@ #include "PacketAck.h" #include "RedMac.h" -// #define MACM_DEBUG // debug... module RedMacP { provides { interface Init; @@ -51,7 +50,6 @@ module RedMacP { interface SleepTime; interface Teamgeist; interface ChannelCongestion; - interface McuPowerOverride; } uses { interface StdControl as CcaStdControl; @@ -76,11 +74,14 @@ module RedMacP { interface Alarm as SampleTimer; interface Counter as Counter32khz16; async command am_addr_t amAddress(); -#ifdef MACM_DEBUG +/* interface GeneralIO as Led0; interface GeneralIO as Led1; interface GeneralIO as Led2; - interface GeneralIO as Led3; + interface GeneralIO as Led3; +*/ +#ifdef REDMAC_DEBUG + interface SerialDebug; #endif } } @@ -104,124 +105,52 @@ implementation macState_t macState; /****** debug vars & defs & functions ***********************/ -#ifdef MACM_DEBUG -#define HISTORY_ENTRIES 60 - typedef struct { - int index; - macState_t state; - int place; - } history_t; - - history_t history[HISTORY_ENTRIES]; - unsigned histIndex; - void storeOldState(int p) { - atomic { - history[histIndex].index = histIndex; - history[histIndex].state = macState; - history[histIndex].place = p; - histIndex++; - if(histIndex >= HISTORY_ENTRIES) histIndex = 0; - } +#ifdef REDMAC_DEBUG + void sdDebug(uint16_t p) { + call SerialDebug.putPlace(p); } + uint8_t repCounter; #else - void storeOldState(int p) {}; -#endif - - void signalFailure(uint8_t place) { -#ifdef MACM_DEBUG - unsigned long i,j; - atomic { - for(;;) { - call Led0.clr(); - call Led1.clr(); - call Led2.clr(); - call Led3.clr(); - - for(i = 0; i < 100; i++) { - for(j=0; j < 200; j++) { - (i & 1) ? call Led0.set() : call Led0.clr(); - } - for(j=0; j < 200; j++) { - (i & 2) ? call Led1.set() : call Led1.clr(); - } - for(j=0; j < 200; j++) { - (i & 4) ? call Led2.set() : call Led2.clr(); - } - for(j=0; j < 200; j++) { - (i & 8) ? call Led3.set() : call Led3.clr(); - } - } - - (place & 1) ? call Led0.set() : call Led0.clr(); - (place & 2) ? call Led1.set() : call Led1.clr(); - (place & 4) ? call Led2.set() : call Led2.clr(); - (place & 8) ? call Led3.set() : call Led3.clr(); - - for(i = 0; i < 1000000; i++) { - ; - } - - (macState & 1) ? call Led0.set() : call Led0.clr(); - (macState & 2) ? call Led1.set() : call Led1.clr(); - (macState & 4) ? call Led2.set() : call Led2.clr(); - (macState & 8) ? call Led3.set() : call Led3.clr(); - - for(i = 0; i < 1000000; i++) { - ; - } - } - } + void sdDebug(uint16_t p) {}; #endif - } - - void signalMacState() { -#ifdef MACM_DEBUG -/* (macState & 1) ? call Led0.set() : call Led0.clr(); - (macState & 2) ? call Led1.set() : call Led1.clr(); - (macState & 4) ? call Led2.set() : call Led2.clr(); - (macState & 8) ? call Led3.set() : call Led3.clr(); -*/ -#endif - } - - + /**************** Module Global Constants *****************/ enum { - BYTE_TIME=13, // byte at 38400 kBit/s, 4b6b encoded - PREAMBLE_BYTE_TIME=9, // byte at 38400 kBit/s, no coding - PHY_HEADER_TIME=51, // 6 Phy Preamble at 38400 - SUB_HEADER_TIME=PHY_HEADER_TIME + sizeof(tda5250_header_t)*BYTE_TIME, - SUB_FOOTER_TIME=2*BYTE_TIME, // 2 bytes crc 38400 kBit/s with 4b6b encoding - MAX_TIME_VALUE=0xFFFFFFFF, - MAXTIMERVALUE=0xFFFF, // helps to compute backoff - //DEFAULT_SLEEP_TIME=3250, - DEFAULT_SLEEP_TIME=6500, + + BYTE_TIME=21, // byte at 23405 kBit/s, 4b6b encoded + PREAMBLE_BYTE_TIME=14, // byte at 23405 kBit/s, no coding + PHY_HEADER_TIME=84, // 6 Phy Preamble at 23405 bits/s + TIME_CORRECTION=16, // difference between txSFD and rxSFD: 475us + + SUB_HEADER_TIME=PHY_HEADER_TIME + sizeof(message_header_t)*BYTE_TIME, + SUB_FOOTER_TIME=2*BYTE_TIME, // 2 bytes crc + // DEFAULT_SLEEP_TIME=1625, + // DEFAULT_SLEEP_TIME=3250, + // DEFAULT_SLEEP_TIME=6500, // DEFAULT_SLEEP_TIME=9750, + DEFAULT_SLEEP_TIME=16384, + // DEFAULT_SLEEP_TIME=32768U, DATA_DETECT_TIME=17, - RX_SETUP_TIME=111, // time to set up receiver - TX_SETUP_TIME=69, // time to set up transmitter - ADDED_DELAY = 40, - RX_ACK_TIMEOUT = RX_SETUP_TIME + PHY_HEADER_TIME + 29 + 2*ADDED_DELAY, - TX_GAP_TIME=RX_ACK_TIMEOUT + TX_SETUP_TIME + 11, + RX_SETUP_TIME=102, // time to set up receiver + TX_SETUP_TIME=58, // time to set up transmitter + ADDED_DELAY = 30, + RX_ACK_TIMEOUT = RX_SETUP_TIME + PHY_HEADER_TIME + ADDED_DELAY + 30, + TX_GAP_TIME = RX_ACK_TIMEOUT + TX_SETUP_TIME + 33, // the duration of a send ACK ACK_DURATION = SUB_HEADER_TIME + SUB_FOOTER_TIME, - MAX_SHORT_RETRY=7, - MAX_LONG_RETRY=2, + MAX_SHORT_RETRY=9, + MAX_LONG_RETRY=1, MAX_AGE=2*MAX_LONG_RETRY*MAX_SHORT_RETRY, MSG_TABLE_ENTRIES=20, TOKEN_ACK_FLAG = 64, TOKEN_ACK_MASK = 0x3f, - /* correct the difference between the transmittedSFD and the receivedSFD - that appears due to buffering, measured value on an osci is 320us, so this - value is actually 10.48576 - */ - TIME_CORRECTION = 10, INVALID_SNR = 0xffff, - PREAMBLE_LONG = 6, - PREAMBLE_SHORT = 2, + // PREAMBLE_LONG = 5, + // PREAMBLE_SHORT = 2, + // reduced minimal backoff + ZERO_BACKOFF_MASK = 0xff }; - /**************** Module Global Variables *****************/ typedef union { @@ -301,7 +230,7 @@ implementation void setRxMode() { setFlag(&flags, SWITCHING); clearFlag(&flags, RSSI_STABLE); - storeOldState(0); + // sdDebug(10); checkCounter = 0; rssiValue = INVALID_SNR; if(call RadioModes.RxMode() == FAIL) { @@ -317,7 +246,7 @@ implementation } void setSleepMode() { - storeOldState(161); + // sdDebug(20); clearFlag(&flags, RSSI_STABLE); post ReleaseAdcTask(); setFlag(&flags, SWITCHING); @@ -333,7 +262,7 @@ implementation void setTxMode() { post ReleaseAdcTask(); - storeOldState(2); + // sdDebug(30); clearFlag(&flags, RSSI_STABLE); setFlag(&flags, SWITCHING); if(call RadioModes.TxMode() == FAIL) { @@ -348,20 +277,32 @@ implementation } /**************** Helper functions ************************/ + void computeBackoff(); + void checkSend() { - storeOldState(10); if((shortRetryCounter) && (txBufPtr != NULL) && (isFlagSet(&flags, MESSAGE_PREPARED)) && (macState == SLEEP) && (!isFlagSet(&flags, RESUME_BACKOFF)) && (!call Timer.isRunning())) { - storeOldState(11); + // sdDebug(40); macState = CCA; checkCounter = 0; setRxMode(); } +/* else { + if(txBufPtr) // sdDebug(41); + if(shortRetryCounter) // sdDebug(42); + if(isFlagSet(&flags, MESSAGE_PREPARED)) // sdDebug(43); + if(txBufPtr) { + if(macState == SLEEP) // sdDebug(44); + if(!isFlagSet(&flags, RESUME_BACKOFF)) // sdDebug(45); + if(!call Timer.isRunning()) // sdDebug(46); + } + } +*/ } uint32_t backoff(uint8_t counter) { uint32_t rVal = call Random.rand16() & MIN_BACKOFF_MASK; - return rVal << counter; + return (rVal << counter) + ZERO_BACKOFF_MASK; } bool needsAckTx(message_t* msg) { @@ -391,7 +332,7 @@ implementation (getHeader(msg)->type == teamgeistType)) { if(rssiValue != INVALID_SNR) snr = rssiValue; rVal = signal Teamgeist.needsAck(msg, getHeader(msg)->src, getHeader(msg)->dest, snr); - *level = 1; + *level = 2; } } } @@ -423,7 +364,13 @@ implementation txMacHdr = macHdr; setFlag(&flags, MESSAGE_PREPARED); if((macState == SLEEP) && (!call Timer.isRunning()) && (!isFlagSet(&flags, RESUME_BACKOFF))) { - call Timer.start(backoff(longRetryCounter)); + if((longRetryCounter == 1) && + (getHeader(msg)->dest != AM_BROADCAST_ADDR)) { + call Timer.start((call Random.rand16() >> 3) & ZERO_BACKOFF_MASK); + } + else { + call Timer.start(backoff(longRetryCounter)); + } } } } @@ -431,9 +378,13 @@ implementation bool prepareRepetition() { bool repeat; atomic { - if(isFlagSet(&flags, CANCEL_SEND)) txMacHdr->repetitionCounter = 0; - repeat = (txMacHdr->repetitionCounter >= 1); - txMacHdr->repetitionCounter--; + if(isFlagSet(&flags, CANCEL_SEND)) { + repeat = txMacHdr->repetitionCounter = 0; + } + else { + repeat = txMacHdr->repetitionCounter; + txMacHdr->repetitionCounter--; + } } return repeat; } @@ -441,7 +392,7 @@ implementation void signalSendDone(error_t error) { message_t *m; error_t e = error; - storeOldState(12); + // sdDebug(50); atomic { m = txBufPtr; txBufPtr = NULL; @@ -457,8 +408,11 @@ implementation if(isFlagSet(&flags, CANCEL_SEND)) { e = ECANCEL; } + clearFlag(&flags, MESSAGE_PREPARED); clearFlag(&flags, CANCEL_SEND); } + // sdDebug(3000 + e); + // sdDebug(4000 + getHeader(m)->type); signal MacSend.sendDone(m, e); } @@ -468,7 +422,7 @@ implementation longRetryCounter++; shortRetryCounter = 1; if(longRetryCounter > MAX_LONG_RETRY) { - storeOldState(13); + // sdDebug(60); signalSendDone(FAIL); } } @@ -480,7 +434,7 @@ implementation longRetryCounter++; shortRetryCounter = 1; if(longRetryCounter > MAX_LONG_RETRY) { - storeOldState(13); + // sdDebug(70); signalSendDone(FAIL); } else { post PrepareMsgTask(); @@ -505,10 +459,10 @@ implementation restLaufzeit = restLaufzeit - now; } else { - restLaufzeit += MAXTIMERVALUE - now; + restLaufzeit = (uint16_t)(-1) - restLaufzeit + now; } if(restLaufzeit > MIN_BACKOFF_MASK << MAX_LONG_RETRY) { - restLaufzeit = backoff(0); + restLaufzeit = call Random.rand16() & ZERO_BACKOFF_MASK; } setFlag(&flags, RESUME_BACKOFF); } @@ -519,7 +473,6 @@ implementation setFlag(&flags, RESUME_BACKOFF); restLaufzeit = backoff(longRetryCounter); updateRetryCounters(); - storeOldState(92); } } @@ -577,6 +530,9 @@ implementation getHeader(&ackMsg)->src = call amAddress(); getHeader(&ackMsg)->dest = getHeader(msg)->src; getHeader(&ackMsg)->type = getHeader(msg)->type; +#ifdef REDMAC_DEBUG + repCounter = ((red_mac_header_t *)call SubPacket.getPayload(msg, NULL))->repetitionCounter; +#endif } uint32_t calcGeneratedTime(red_mac_header_t *m) { @@ -605,20 +561,22 @@ implementation MIN_BACKOFF_MASK = (MIN_BACKOFF_MASK << 1) + 1; } MIN_BACKOFF_MASK >>= 2; - storeOldState(20); shortRetryCounter = 0; longRetryCounter = 0; counter2sec = 127; rxTime = 0; teamgeistType = 0; } +#ifdef REDMAC_DEBUG + call SerialDebug.putShortDesc("RedMacP"); +#endif return SUCCESS; } /**************** SplitControl *****************/ task void StartDoneTask() { - storeOldState(14); + // sdDebug(90); atomic { call SampleTimer.start(sleepTime); macState = SLEEP; @@ -632,16 +590,15 @@ implementation call CcaStdControl.start(); atomic { macState = INIT; - // signalMacState(); setRxMode(); - storeOldState(15); + // sdDebug(100); } return SUCCESS; } task void StopDoneTask() { call Init.init(); - storeOldState(16); + // sdDebug(110); signal SplitControl.stopDone(SUCCESS); } @@ -652,12 +609,12 @@ implementation atomic { if((macState == SLEEP) && isFlagSet(&flags, SWITCHING)) { macState = STOP; - storeOldState(17); + // sdDebug(120); } else { macState = STOP; setSleepMode(); - storeOldState(18); + // sdDebug(121); } } return SUCCESS; @@ -690,24 +647,23 @@ implementation /****** Radio(Mode) events *************************/ async event void RadioModes.RssiStable() { - if(isFlagSet(&flags, RSSI_STABLE)) signalFailure(0); setFlag(&flags, RSSI_STABLE); if((macState == RX) || (macState == CCA)) { call Timer.start(DATA_DETECT_TIME); - storeOldState(30); + // sdDebug(130); } else if(macState == RX_P) { - storeOldState(31); + // sdDebug(131); if(call RssiAdcResource.isOwner()) call ChannelMonitorData.getSnr(); } else if(macState == RX_ACK) { // if(call RssiAdcResource.isOwner()) call ChannelMonitor.start(); - storeOldState(32); + // sdDebug(132); } else if(macState == RX_ACK_P) { } else if(macState == INIT) { - storeOldState(33); + // sdDebug(133); if(call RssiAdcResource.isOwner()) { call ChannelMonitorControl.updateNoiseFloor(); } else { @@ -715,65 +671,55 @@ implementation } } else if(macState == STOP) { - storeOldState(34); + // sdDebug(134); } else { - storeOldState(35); - signalFailure(1); + // sdDebug(135); } } async event void RadioModes.RxModeDone() { - storeOldState(40); - if(!isFlagSet(&flags, SWITCHING)) signalFailure(2); atomic { clearFlag(&flags, SWITCHING); if((macState == RX) || (macState == RX_ACK) || (macState == CCA) || (macState == INIT) || (macState == STOP)) { - storeOldState(41); + // sdDebug(140); if(macState != RX_ACK) requestAdc(); } else { - storeOldState(42); - signalFailure(3); + // sdDebug(141); } } } async event void RadioModes.TxModeDone() { - storeOldState(50); - if(!isFlagSet(&flags, SWITCHING)) signalFailure(4); + // sdDebug(150); atomic { clearFlag(&flags, SWITCHING); if(macState == TX) { - call UartPhyControl.setNumPreambles(PREAMBLE_SHORT); setFlag(&flags, ACTION_DETECTED); - if(txBufPtr == NULL) signalFailure(5); if(call PacketSend.send(txBufPtr, txLen) == SUCCESS) { - storeOldState(51); - } else { - storeOldState(52); - signalFailure(6); + // sdDebug(151); + } + else { + // sdDebug(152); } } else if(macState == TX_ACK) { if(call PacketSend.send(&ackMsg, 0) == SUCCESS) { - storeOldState(53); + // sdDebug(153); } else { - storeOldState(54); - signalFailure(6); + // sdDebug(154); } } else { - storeOldState(55); - signalFailure(7); + // sdDebug(155); } } } async event void RadioModes.SleepModeDone() { - storeOldState(60); - if(!isFlagSet(&flags, SWITCHING)) signalFailure(8); + // sdDebug(160); atomic { clearFlag(&flags, SWITCHING); if(isFlagSet(&flags, ACTION_DETECTED)) { @@ -781,24 +727,29 @@ implementation } else { if(congestionLevel > 0) congestionLevel--; } - if((macState == SLEEP) && (!call Timer.isRunning())) { - if(isFlagSet(&flags, RESUME_BACKOFF)) { - storeOldState(61); - clearFlag(&flags, RESUME_BACKOFF); - call Timer.start(restLaufzeit); - restLaufzeit = 0; - } - else { - storeOldState(62); - checkSend(); + // if(congestionLevel > 3) // sdDebug(2000 + congestionLevel); + if(macState == SLEEP) { + // sdDebug(161); + if(!call Timer.isRunning()) { + // sdDebug(162); + if(isFlagSet(&flags, RESUME_BACKOFF)) { + // sdDebug(164); + clearFlag(&flags, RESUME_BACKOFF); + call Timer.start(restLaufzeit); + restLaufzeit = 0; + } + else { + // sdDebug(165); + checkSend(); + } } } else if(macState == INIT) { - storeOldState(63); + // sdDebug(167); post StartDoneTask(); } else if(macState == STOP) { - storeOldState(64); + // sdDebug(168); post StopDoneTask(); } signal ChannelCongestion.congestionEvent(congestionLevel); @@ -811,7 +762,7 @@ implementation atomic { if((shortRetryCounter == 0) && (txBufPtr == NULL)) { clearFlag(&flags, MESSAGE_PREPARED); - storeOldState(65); + // sdDebug(5000 + getHeader(msg)->type); shortRetryCounter = 1; longRetryCounter = 1; txBufPtr = msg; @@ -820,7 +771,7 @@ implementation if(seqNo >= TOKEN_ACK_FLAG) seqNo = 1; } else { - storeOldState(66); + // sdDebug(171); err = EBUSY; } } @@ -834,12 +785,24 @@ implementation error_t err = FAIL; atomic { if(msg == txBufPtr) { + // sdDebug(320); setFlag(&flags, CANCEL_SEND); shortRetryCounter = MAX_SHORT_RETRY + 2; longRetryCounter = MAX_LONG_RETRY + 2; - if(macState == SLEEP) signalSendDone(ECANCEL); + if(macState == SLEEP) { + // sdDebug(321); + signalSendDone(ECANCEL); + } + else { + // sdDebug(322); + } + // sdDebug(1000 + macState); err = SUCCESS; } + else { + // sdDebug(323); + // sdDebug(1100 + macState); + } } return err; } @@ -849,6 +812,7 @@ implementation async event void PacketReceive.receiveDetected() { rssiValue = INVALID_SNR; setFlag(&flags, ACTION_DETECTED); + call ChannelMonitor.rxSuccess(); if(macState <= CCA_ACK) { if(macState == CCA) computeBackoff(); if(macState != RX_ACK) { @@ -858,8 +822,7 @@ implementation } } else if(macState == INIT) { - storeOldState(72); - if(isFlagSet(&flags, UNHANDLED_PACKET)) signalFailure(9); + // sdDebug(180); setFlag(&flags, UNHANDLED_PACKET); } } @@ -871,17 +834,17 @@ implementation uint8_t level = 0; bool isCnt; - storeOldState(80); + // sdDebug(190); if(macState == RX_P) { - storeOldState(81); + // sdDebug(191); if(error == SUCCESS) { - storeOldState(82); + // sdDebug(192); isCnt = isControl(msg); if(msgIsForMe(msg)) { if(!isCnt) { - storeOldState(83); + // sdDebug(193); if(isNewMsg(msg)) { - storeOldState(84); + // sdDebug(194); if(rssiValue != INVALID_SNR) { (getMetadata(m))->strength = rssiValue; } @@ -893,24 +856,25 @@ implementation (getMetadata(m))->strength = 1; } } - (getMetadata(msg))->time = calcGeneratedTime((red_mac_header_t*) payload); + getMetadata(msg)->time = calcGeneratedTime((red_mac_header_t*) payload); + getMetadata(msg)->ack = WAS_NOT_ACKED; m = signal MacReceive.receiveDone(msg); // assume a buffer swap -- if buffer is not swapped, assume that the // message was not successfully delivered to upper layers if(m != msg) { - storeOldState(85); + // sdDebug(195); rememberMsg(msg); } else { - storeOldState(86); + // sdDebug(196); action = RX; } } if(needsAckRx(msg, &level) && (action != RX)) { - storeOldState(87); + // sdDebug(197); action = CCA_ACK; } else { - storeOldState(88); + // sdDebug(198); if(action != RX) { nav = ((red_mac_header_t*)payload)->repetitionCounter * (SUB_HEADER_TIME + getHeader(msg)->length*BYTE_TIME + @@ -920,12 +884,12 @@ implementation } } else { - storeOldState(89); + // sdDebug(199); action = RX; } } else { - storeOldState(90); + // sdDebug(200); action = SLEEP; if(!isCnt) { nav = ((red_mac_header_t*)payload)->repetitionCounter * @@ -936,14 +900,14 @@ implementation } } else { - storeOldState(91); + // sdDebug(201); action = RX; } } else if(macState == RX_ACK_P) { if(error == SUCCESS) { if(ackIsForMe(msg)) { - storeOldState(92); + // sdDebug(202); if(rssiValue != INVALID_SNR) { (getMetadata(txBufPtr))->strength = rssiValue; } @@ -960,7 +924,9 @@ implementation signal Teamgeist.gotAck(txBufPtr, getHeader(msg)->src, getMetadata(txBufPtr)->strength); } + // sdDebug(203); signalSendDone(SUCCESS); + // sdDebug(30000 + getHeader(msg)->src); action = SLEEP; } else { @@ -970,30 +936,30 @@ implementation } else { if(call Timer.isRunning()) { - storeOldState(94); + sdDebug(204); action = RX_ACK; } else { + // sdDebug(205); updateLongRetryCounters(); action = RX; } } } else { - storeOldState(96); + // sdDebug(206); action = INIT; } if(action == CCA_ACK) { - prepareAck(msg); macState = CCA_ACK; - if(call Random.rand16() & 4) { - call Timer.start(RX_SETUP_TIME - TX_SETUP_TIME + (ADDED_DELAY>>level)); - call UartPhyControl.setNumPreambles(PREAMBLE_SHORT); + if(call Random.rand16() & 2) { + call Timer.start(RX_SETUP_TIME - TX_SETUP_TIME + 16 - level*8 + ADDED_DELAY); } else { - call Timer.start(RX_SETUP_TIME - TX_SETUP_TIME); - call UartPhyControl.setNumPreambles(PREAMBLE_LONG); + macState = TX_ACK; + call Timer.start(RX_SETUP_TIME - TX_SETUP_TIME + 16); } + prepareAck(msg); } else if(action == RX_ACK) { macState = RX_ACK; @@ -1005,43 +971,40 @@ implementation } else if(action == SLEEP) { macState = SLEEP; - setSleepMode(); if(isFlagSet(&flags, RESUME_BACKOFF)) { if(nav > restLaufzeit) restLaufzeit += nav; } else { setFlag(&flags, RESUME_BACKOFF); - restLaufzeit = nav + backoff(longRetryCounter); + restLaufzeit = call Random.rand16() & ZERO_BACKOFF_MASK; } + setSleepMode(); } else if(action == INIT) { - if(!isFlagSet(&flags, UNHANDLED_PACKET)) signalFailure(11); clearFlag(&flags, UNHANDLED_PACKET); } else { - storeOldState(94); - signalFailure(11); + // sdDebug(207); } return m; } async event void PacketSend.sendDone(message_t* msg, error_t error) { if(macState == TX) { - storeOldState(97); - if(msg != txBufPtr) signalFailure(12); - storeOldState(99); macState = RX_ACK; setRxMode(); call Timer.start(RX_ACK_TIMEOUT); + sdDebug(220); checkCounter = 0; } else if(macState == TX_ACK) { checkCounter = 0; macState = RX; setRxMode(); - } - else { - signalFailure(13); + sdDebug(221); +#ifdef REDMAC_DEBUG + // sdDebug(40000U + repCounter); +#endif } } @@ -1065,7 +1028,7 @@ implementation } else { // assume a clock wrap here - txMacHdr->time = MAX_TIME_VALUE - mTime + now; + txMacHdr->time = (uint32_t)(-1) - mTime + now; } } } @@ -1075,16 +1038,16 @@ implementation atomic { time.lo = call Counter32khz16.get(); time.hi = counter2sec; + if(call Counter32khz16.isOverflowPending()) ++time.hi; } return time.op; } async event void Counter32khz16.overflow() { - counter2sec++; + ++counter2sec; } - - + /****** Timer ******************************/ void checkOnBusy() { @@ -1094,7 +1057,7 @@ implementation computeBackoff(); } requestAdc(); - storeOldState(150); + // sdDebug(230); macState = RX; checkCounter = 0; call Timer.start(TX_GAP_TIME>>1); @@ -1105,90 +1068,101 @@ implementation if(macState == RX) { checkCounter++; if(checkCounter >= 3) { - storeOldState(153); + // sdDebug(240); macState = SLEEP; setSleepMode(); } else { - storeOldState(154); - call Timer.start(TX_GAP_TIME>>1); + // sdDebug(241); + call Timer.start(TX_GAP_TIME >> 1); requestAdc(); } } else if(macState == CCA) { checkCounter++; if(checkCounter < 3) { - storeOldState(158); - call Timer.start((TX_GAP_TIME + backoff(0))>>1); + // sdDebug(242); + call Timer.start(TX_GAP_TIME >> 1); requestAdc(); } else { - storeOldState(159); + // sdDebug(243); macState = TX; setTxMode(); } } else if(macState == CCA_ACK) { - storeOldState(160); + // sdDebug(244); macState = TX_ACK; setTxMode(); + sdDebug(20000 + getHeader(&ackMsg)->dest); } } async event void Timer.fired() { - storeOldState(100); + // sdDebug(250); if((macState == RX) || (macState == CCA) || (macState == CCA_ACK)) { - if(isFlagSet(&flags, SWITCHING)) signalFailure(14); if((!call RssiAdcResource.isOwner()) || (call ChannelMonitor.start() != SUCCESS)) { if(call UartPhyControl.isBusy()) { - storeOldState(101); + // sdDebug(251); checkOnBusy(); } else { - storeOldState(102); + // sdDebug(252); checkOnIdle(); } } } else if(macState == RX_ACK) { if(prepareRepetition()) { - storeOldState(156); + sdDebug(253); macState = TX; setTxMode(); } else { if(needsAckTx(txBufPtr)) { - storeOldState(157); + sdDebug(254); updateLongRetryCounters(); } else { - storeOldState(158); + // sdDebug(255); signalSendDone(SUCCESS); } macState = SLEEP; setSleepMode(); } } + else if(macState == TX_ACK) { + setTxMode(); + sdDebug(10000 + getHeader(&ackMsg)->dest); + } else if(macState == SLEEP) { if(isFlagSet(&flags, SWITCHING)) { - storeOldState(106); - call Timer.start(backoff(0)); + // sdDebug(256); + call Timer.start(call Random.rand16() & 0x0f); } else { - storeOldState(107); - checkSend(); + if(isFlagSet(&flags, RESUME_BACKOFF)) { + // sdDebug(261); + clearFlag(&flags, RESUME_BACKOFF); + call Timer.start(restLaufzeit); + restLaufzeit = 0; + } + else { + // sdDebug(262); + checkSend(); + } } } else if((macState == RX_ACK_P) || (macState == RX_P)) { - storeOldState(108); + // sdDebug(258); } else if(macState == INIT) { - storeOldState(109); + // sdDebug(259); post StartDoneTask(); } else { - storeOldState(110); - signalFailure(15); + // sdDebug(260); } } @@ -1205,12 +1179,12 @@ implementation async event void SampleTimer.fired() { call SampleTimer.start(sleepTime); - storeOldState(111); + // sdDebug(270); if((macState == SLEEP) && (!isFlagSet(&flags, SWITCHING))) { clearFlag(&flags, ACTION_DETECTED); interruptBackoffTimer(); macState = RX; - storeOldState(112); + // sdDebug(271); setRxMode(); call Timer.stop(); } @@ -1237,12 +1211,12 @@ implementation /****** ChannelMonitor events *********************/ async event void ChannelMonitor.channelBusy() { - storeOldState(120); + // sdDebug(280); checkOnBusy(); } async event void ChannelMonitor.channelIdle() { - storeOldState(121); + // sdDebug(281); checkOnIdle(); } @@ -1250,19 +1224,17 @@ implementation event void ChannelMonitorControl.updateNoiseFloorDone() { if(macState == INIT) { - storeOldState(130); + // sdDebug(290); call Timer.start(call Random.rand16() % DEFAULT_SLEEP_TIME); setSleepMode(); } else { - storeOldState(131); - signalFailure(16); + // sdDebug(291); } } /***** ChannelMonitorData events ******************/ async event void ChannelMonitorData.getSnrDone(int16_t data) { - storeOldState(140); atomic if((macState == RX_P) || (macState == RX_ACK_P)) rssiValue = data; } @@ -1271,14 +1243,14 @@ implementation macState_t ms; atomic ms = macState; if(ms < SLEEP) { - storeOldState(144); + // sdDebug(300); } else if(ms == INIT) { - storeOldState(145); + // sdDebug(301); call ChannelMonitorControl.updateNoiseFloor(); } else { - storeOldState(146); + // sdDebug(302); post ReleaseAdcTask(); } } @@ -1307,23 +1279,11 @@ implementation } default async event void ChannelCongestion.congestionEvent(uint8_t level) {} - + /***** unused Radio Modes events **************************/ async event void RadioModes.TimerModeDone() {} async event void RadioModes.SelfPollingModeDone() {} async event void RadioModes.PWDDDInterrupt() {} - - /** prevent MCU from going into a too low power mode */ - async command mcu_power_t McuPowerOverride.lowestState() { - mcu_power_t mp; - if(macState != SLEEP) { - mp = MSP430_POWER_LPM1; - } - else { - mp = MSP430_POWER_LPM3; - } - return mp; - } }