if (call RadioOff.isOff())
signal RadioOff.offDone();
- else
- ASSERT(call RadioOff.off() == SUCCESS);
+ else if (call RadioOff.off() != SUCCESS)
+ ASSERT(0);
}
async event void RadioOff.offDone()
async event void BeaconRx.enableRxDone()
{
+ uint32_t dt;
+
switch (m_state)
{
case S_INITIAL_SCAN:
+ // "To acquire beacon synchronization, a device shall enable its
+ // receiver and search for at most [aBaseSuperframeDuration * (2^n + 1)]
+ // symbols, where n is the value of macBeaconOrder [...] Once the number
+ // of missed beacons reaches aMaxLostBeacons, the MLME shall notify the
+ // next higher layer." (Sect. 7.5.4.1)
m_state = S_RECEIVING;
- call TrackAlarm.start((((uint32_t) 1 << m_beaconOrder) + (uint32_t) 1) *
- (uint32_t) IEEE154_aBaseSuperframeDuration * (uint32_t) IEEE154_aMaxLostBeacons);
+ dt = (((uint32_t) 1 << m_beaconOrder) + (uint32_t) 1) *
+ (uint32_t) IEEE154_aBaseSuperframeDuration *
+ (uint32_t) IEEE154_aMaxLostBeacons;
+ call TrackAlarm.start(dt);
+ dbg_serial("BeaconSynchronizeP","Rx enabled, expecting beacon within %lu symbols.\n", dt);
break;
case S_PREPARE:
m_state = S_RECEIVING;
- dbg_serial("BeaconSynchronizeP","Rx enabled, expecting beacon in %lu symbols.\n",
- (uint32_t) ((m_lastBeaconRxTime + m_dt) - call TrackAlarm.getNow()));
- call TrackAlarm.startAt(m_lastBeaconRxTime, m_dt + IEEE154_MAX_BEACON_LISTEN_TIME(m_beaconOrder));
+ dt = m_dt + IEEE154_MAX_BEACON_LISTEN_TIME(m_beaconOrder);
+ call TrackAlarm.startAt(m_lastBeaconRxTime, dt);
+ dbg_serial("BeaconSynchronizeP","Rx enabled, expecting beacon within %lu symbols.\n",
+ (uint32_t) ((m_lastBeaconRxTime + dt) - call TrackAlarm.getNow()));
break;
default:
ASSERT(0);
interface Pool<ieee154_txframe_t> as TxFramePool;
interface Pool<ieee154_txcontrol_t> as TxControlPool;
interface MLME_GET;
+ interface MLME_SET;
interface FrameUtility;
interface IEEE154Frame as Frame;
interface Get<uint64_t> as LocalExtendedAddress;
uint8_t m_payloadDisassocRequest[2];
uint8_t m_coordAddrMode;
bool m_disAssociationOngoing;
+ void resetPanValuesInPib();
command error_t Init.init()
{
uint8_t DeviceAddrMode = (mhr[MHR_INDEX_FC2] & FC2_SRC_MODE_MASK) >> FC2_SRC_MODE_OFFSET;
uint16_t DevicePANID = *((nxle_uint16_t*) (&(mhr[MHR_INDEX_ADDRESS])));
ieee154_address_t DeviceAddress;
+
if ((mhr[MHR_INDEX_FC2] & FC2_DEST_MODE_MASK) == FC2_DEST_MODE_EXTENDED)
srcAddrOffset += 6;
call FrameUtility.convertToNative(&DeviceAddress.extendedAddress, &mhr[srcAddrOffset]);
call TxFramePool.put(data);
dbg_serial("DisassociateP", "transmitDone() -> result: %lu\n", (uint32_t) status);
m_disAssociationOngoing = FALSE;
+
+ // "[...] even if the acknowledgment is not received,
+ // the device should consider itself disassociated." (Sect. 7.5.3.2)
+ if (status == IEEE154_SUCCESS || status == IEEE154_NO_ACK)
+ resetPanValuesInPib();
signal MLME_DISASSOCIATE.confirm(status, DeviceAddrMode, DevicePANID, DeviceAddress);
}
uint8_t DeviceAddrMode = (mhr[1] & FC2_DEST_MODE_MASK) >> FC2_DEST_MODE_OFFSET;
uint16_t DevicePANID = *((nxle_uint16_t*) (&(mhr[MHR_INDEX_ADDRESS])));
ieee154_address_t DeviceAddress;
+
call FrameUtility.convertToNative(&DeviceAddress.extendedAddress, &mhr[dstAddrOffset]);
call TxControlPool.put((ieee154_txcontrol_t*) ((uint8_t*) data->header - offsetof(ieee154_txcontrol_t, header)));
call TxFramePool.put(data);
dbg_serial("DisassociateP", "transmitDone() -> result: %lu\n", (uint32_t) status);
m_disAssociationOngoing = FALSE;
+
+ // "[...] even if the acknowledgment is not received,
+ // the device should consider itself disassociated." (Sect. 7.5.3.2)
+ if (status == IEEE154_SUCCESS || status == IEEE154_NO_ACK)
+ resetPanValuesInPib();
signal MLME_DISASSOCIATE.confirm(status, DeviceAddrMode, DevicePANID, DeviceAddress);
}
{
// received a disassociation notification from the coordinator (direct tx)
ieee154_address_t address;
+
address.extendedAddress = call LocalExtendedAddress.get();
signal MLME_DISASSOCIATE.indication(address.extendedAddress, frame->data[1], NULL);
return frame;
{
// received a disassociation notification from the device
ieee154_address_t address;
+
if (call Frame.getSrcAddrMode(frame) == ADDR_MODE_EXTENDED_ADDRESS &&
call Frame.getSrcAddr(frame, &address) == SUCCESS)
signal MLME_DISASSOCIATE.indication(address.extendedAddress, frame->data[1], NULL);
return frame;
}
+ void resetPanValuesInPib()
+ {
+ // "An associated device shall disassociate itself by removing
+ // all references to the PAN; the MLME shall set macPANId,
+ // macShortAddress, macAssociatedPANCoord, macCoordShortAddress
+ // and macCoordExtended- Address to the default values." (Sect. 7.5.3.2)
+ call MLME_SET.macPANId(IEEE154_DEFAULT_PANID);
+ call MLME_SET.macShortAddress(IEEE154_DEFAULT_SHORTADDRESS);
+ call MLME_SET.macAssociatedPANCoord(IEEE154_DEFAULT_ASSOCIATEDPANCOORD);
+ call MLME_SET.macCoordShortAddress(IEEE154_DEFAULT_COORDSHORTADDRESS);
+ call MLME_SET.macCoordExtendedAddress(0);
+ }
+
/* ------------------- Defaults ------------------- */
default event void MLME_DISASSOCIATE.indication (