From 9b57b0f71ad5b0c00ca230b4e181c113ea88b88c Mon Sep 17 00:00:00 2001 From: janhauer Date: Thu, 5 Mar 2009 10:07:11 +0000 Subject: [PATCH] renaming --- ...ameDispatchQueueP.nc => DispatchQueueP.nc} | 2 +- ...meDispatchP.nc => DispatchSlottedCsmaP.nc} | 36 ++++---- ...DispatchP.nc => DispatchUnslottedCsmaP.nc} | 14 +-- tos/lib/mac/tkn154/PibP.nc | 14 +-- tos/lib/mac/tkn154/TKN154BeaconEnabledP.nc | 24 ++--- tos/lib/mac/tkn154/TKN154NonBeaconEnabledP.nc | 90 +++++++++---------- ...eDispatchQueueP.nc => NoDispatchQueueP.nc} | 4 +- ...DispatchP.nc => NoDispatchSlottedCsmaP.nc} | 4 +- 8 files changed, 94 insertions(+), 94 deletions(-) rename tos/lib/mac/tkn154/{FrameDispatchQueueP.nc => DispatchQueueP.nc} (99%) rename tos/lib/mac/tkn154/{SlottedFrameDispatchP.nc => DispatchSlottedCsmaP.nc} (95%) rename tos/lib/mac/tkn154/{UnslottedFrameDispatchP.nc => DispatchUnslottedCsmaP.nc} (97%) rename tos/lib/mac/tkn154/dummies/{NoFrameDispatchQueueP.nc => NoDispatchQueueP.nc} (96%) rename tos/lib/mac/tkn154/dummies/{NoSlottedFrameDispatchP.nc => NoDispatchSlottedCsmaP.nc} (97%) diff --git a/tos/lib/mac/tkn154/FrameDispatchQueueP.nc b/tos/lib/mac/tkn154/DispatchQueueP.nc similarity index 99% rename from tos/lib/mac/tkn154/FrameDispatchQueueP.nc rename to tos/lib/mac/tkn154/DispatchQueueP.nc index 6693ade0..85669850 100644 --- a/tos/lib/mac/tkn154/FrameDispatchQueueP.nc +++ b/tos/lib/mac/tkn154/DispatchQueueP.nc @@ -33,7 +33,7 @@ * ======================================================================== */ #include "TKN154_MAC.h" -generic module FrameDispatchQueueP() { +generic module DispatchQueueP() { provides { interface Init as Reset; diff --git a/tos/lib/mac/tkn154/SlottedFrameDispatchP.nc b/tos/lib/mac/tkn154/DispatchSlottedCsmaP.nc similarity index 95% rename from tos/lib/mac/tkn154/SlottedFrameDispatchP.nc rename to tos/lib/mac/tkn154/DispatchSlottedCsmaP.nc index 4abb5269..9c1ad6a5 100644 --- a/tos/lib/mac/tkn154/SlottedFrameDispatchP.nc +++ b/tos/lib/mac/tkn154/DispatchSlottedCsmaP.nc @@ -60,7 +60,7 @@ #error "The IEEE154_BEACON_ENABLED_PAN macro MUST be defined when using this component!" #endif -generic module SlottedFrameDispatchP(uint8_t sfDirection) +generic module DispatchSlottedCsmaP(uint8_t sfDirection) { provides { @@ -167,7 +167,7 @@ implementation void dbg_flush_state() { m_dbgStr[HEADER_STR_LEN + m_dbgNumEntries++] = '\n'; m_dbgStr[HEADER_STR_LEN + m_dbgNumEntries++] = 0; - dbg_serial("SlottedFrameDispatchP",m_dbgStr); + dbg_serial("DispatchSlottedCsmaP",m_dbgStr); m_dbgNumEntries = 0; } #else @@ -195,7 +195,7 @@ implementation (uint32_t) call SuperframeStructure.sfSlotDuration(); uint16_t guardTime = call SuperframeStructure.guardTime(); - dbg_serial("SlottedFrameDispatchP", "Got token, remaining CAP time: %lu\n", + dbg_serial("DispatchSlottedCsmaP", "Got token, remaining CAP time: %lu\n", call SuperframeStructure.sfStartTime() + capDuration - guardTime - call CapEndAlarm.getNow()); if (DEVICE_ROLE && !call IsTrackingBeacons.getNow()) { // very rare case: @@ -206,12 +206,12 @@ implementation m_lastFrame = m_currentFrame; m_currentFrame = NULL; m_txStatus = IEEE154_NO_BEACON; - dbg_serial("SlottedFrameDispatchP", "CAP component got token, remaining time: %lu\n"); + dbg_serial("DispatchSlottedCsmaP", "CAP component got token, remaining time: %lu\n"); post signalTxDoneTask(); return; } else if (capDuration < guardTime) { // CAP is too short to do anything practical - dbg_serial("SlottedFrameDispatchP", "CAP too short!\n"); + dbg_serial("DispatchSlottedCsmaP", "CAP too short!\n"); call TokenToCfp.transfer(); return; } else { @@ -227,7 +227,7 @@ implementation // in task context and then continue m_lock = TRUE; post setupTxBroadcastTask(); - dbg_serial("SlottedFrameDispatchP", "Preparing broadcast.\n"); + dbg_serial("DispatchSlottedCsmaP", "Preparing broadcast.\n"); } } call CapEndAlarm.startAt(call SuperframeStructure.sfStartTime(), capDuration); @@ -241,15 +241,15 @@ implementation { if (m_currentFrame != NULL) { // we've not finished transmitting the current frame yet - dbg_serial("SlottedFrameDispatchP", "Overflow\n"); + dbg_serial("DispatchSlottedCsmaP", "Overflow\n"); return IEEE154_TRANSACTION_OVERFLOW; } else { setCurrentFrame(frame); - dbg("SlottedFrameDispatchP", "New frame to transmit, DSN: %lu\n", (uint32_t) MHR(frame)[MHR_INDEX_SEQNO]); + dbg("DispatchSlottedCsmaP", "New frame to transmit, DSN: %lu\n", (uint32_t) MHR(frame)[MHR_INDEX_SEQNO]); // a beacon must be found before transmitting in a beacon-enabled PAN if (DEVICE_ROLE && !call IsTrackingBeacons.getNow()) { call TrackSingleBeacon.start(); - dbg_serial("SlottedFrameDispatchP", "Tracking single beacon now\n"); + dbg_serial("DispatchSlottedCsmaP", "Tracking single beacon now\n"); // we'll receive the Token after a beacon was found or after // aBaseSuperframeDuration*(2n+1) symbols if none was found } @@ -368,7 +368,7 @@ implementation } m_lock = FALSE; // unlock dbg_flush_state(); - dbg_serial("SlottedFrameDispatchP", "Handing over to CFP.\n"); + dbg_serial("DispatchSlottedCsmaP", "Handing over to CFP.\n"); call TokenToCfp.transfer(); return; } else @@ -400,7 +400,7 @@ implementation stopAllAlarms(); // may still fire, but is locked through isOwner() // nothing more to do... just release the Token m_lock = FALSE; // unlock - dbg_serial("SlottedFrameDispatchP", "Token requested: Handing over to CFP.\n"); + dbg_serial("DispatchSlottedCsmaP", "Token requested: Handing over to CFP.\n"); call TokenToCfp.transfer(); return; } else @@ -443,7 +443,7 @@ implementation // nothing more to do... just release the Token stopAllAlarms(); // may still fire, but is locked through isOwner() m_lock = FALSE; // unlock - dbg_serial("SlottedFrameDispatchP", "Releasing token\n"); + dbg_serial("DispatchSlottedCsmaP", "Releasing token\n"); call Token.release(); return; } @@ -491,7 +491,7 @@ implementation error_t res; res = call SlottedCsmaCa.transmit(m_currentFrame, &m_csma, call SuperframeStructure.sfStartTimeRef(), dtMax, m_resume, m_remainingBackoff); - dbg("SlottedFrameDispatchP", "SlottedCsmaCa.transmit() -> %lu\n", (uint32_t) res); + dbg("DispatchSlottedCsmaP", "SlottedCsmaCa.transmit() -> %lu\n", (uint32_t) res); next = WAIT_FOR_TXDONE; // this will NOT clear the lock } } @@ -532,7 +532,7 @@ implementation async event void RadioRx.enableRxDone() { m_lock = FALSE; updateState();} async event void CapEndAlarm.fired() { - dbg_serial("SlottedFrameDispatchP", "CapEndAlarm.fired()\n"); + dbg_serial("DispatchSlottedCsmaP", "CapEndAlarm.fired()\n"); updateState(); } async event void BLEAlarm.fired() { updateState();} @@ -553,7 +553,7 @@ implementation bool ackPendingFlag, uint16_t remainingBackoff, error_t result) { bool done = TRUE; - dbg("SlottedFrameDispatchP", "SlottedCsmaCa.transmitDone() -> %lu\n", (uint32_t) result); + dbg("DispatchSlottedCsmaP", "SlottedCsmaCa.transmitDone() -> %lu\n", (uint32_t) result); m_resume = FALSE; switch (result) @@ -598,12 +598,12 @@ implementation m_txStatus = IEEE154_NO_ACK; break; case EINVAL: // DEBUG!!! - dbg_serial("SlottedFrameDispatchP", "EINVAL returned by transmitDone()!\n"); + dbg_serial("DispatchSlottedCsmaP", "EINVAL returned by transmitDone()!\n"); // fall through case ERETRY: // frame was not transmitted, because the transaction does not // fit in the remaining CAP (in beacon-enabled PANs only) - dbg_serial("SlottedFrameDispatchP", "Transaction didn't fit, current BE: %lu\n", (uint32_t) csma->BE); + dbg_serial("DispatchSlottedCsmaP", "Transaction didn't fit, current BE: %lu\n", (uint32_t) csma->BE); m_resume = TRUE; m_remainingBackoff = remainingBackoff; done = FALSE; @@ -639,7 +639,7 @@ implementation m_indirectTxPending = FALSE; m_lastFrame = NULL; // only now can the next transmission can begin if (lastFrame) { - dbg("SlottedFrameDispatchP", "Transmit done, DSN: %lu, result: 0x%lx\n", + dbg("DispatchSlottedCsmaP", "Transmit done, DSN: %lu, result: 0x%lx\n", (uint32_t) MHR(lastFrame)[MHR_INDEX_SEQNO], (uint32_t) status); signal FrameTx.transmitDone(lastFrame, status); } diff --git a/tos/lib/mac/tkn154/UnslottedFrameDispatchP.nc b/tos/lib/mac/tkn154/DispatchUnslottedCsmaP.nc similarity index 97% rename from tos/lib/mac/tkn154/UnslottedFrameDispatchP.nc rename to tos/lib/mac/tkn154/DispatchUnslottedCsmaP.nc index a261dc39..cb00450b 100644 --- a/tos/lib/mac/tkn154/UnslottedFrameDispatchP.nc +++ b/tos/lib/mac/tkn154/DispatchUnslottedCsmaP.nc @@ -50,7 +50,7 @@ #error "The IEEE154_BEACON_ENABLED_PAN macro MUST NOT be set when using this component!" #endif -module UnslottedFrameDispatchP +module DispatchUnslottedCsmaP { provides { @@ -187,7 +187,7 @@ implementation { if (m_currentFrame != NULL) { // we've not finished transmitting the current frame yet - dbg_serial("UnslottedFrameDispatchP", "Overflow\n"); + dbg_serial("DispatchUnslottedCsmaP", "Overflow\n"); return IEEE154_TRANSACTION_OVERFLOW; } else { setCurrentFrame(frame); @@ -263,7 +263,7 @@ implementation if (call RadioOff.isOff()) { // nothing more to do... just release the Token m_lock = FALSE; // unlock - dbg_serial("UnslottedFrameDispatchP", "Token requested: releasing it.\n"); + dbg_serial("DispatchUnslottedCsmaP", "Token requested: releasing it.\n"); call Token.release(); return; } else @@ -292,7 +292,7 @@ implementation if (next == DO_NOTHING) { // nothing more to do... just release the Token m_lock = FALSE; // unlock - dbg_serial("UnslottedFrameDispatchP", "Releasing token\n"); + dbg_serial("DispatchUnslottedCsmaP", "Releasing token\n"); call Token.release(); return; } @@ -323,7 +323,7 @@ implementation else { error_t res; res = call UnslottedCsmaCa.transmit(m_currentFrame, &m_csma); - dbg("UnslottedFrameDispatchP", "UnslottedCsmaCa.transmit() -> %lu\n", (uint32_t) res); + dbg("DispatchUnslottedCsmaP", "UnslottedCsmaCa.transmit() -> %lu\n", (uint32_t) res); next = WAIT_FOR_TXDONE; // this will NOT clear the lock } return next; @@ -378,7 +378,7 @@ implementation ieee154_csma_t *csma, bool ackPendingFlag, error_t result) { bool done = TRUE; - dbg("UnslottedFrameDispatchP", "UnslottedCsmaCa.transmitDone() -> %lu\n", (uint32_t) result); + dbg("DispatchUnslottedCsmaP", "UnslottedCsmaCa.transmitDone() -> %lu\n", (uint32_t) result); m_resume = FALSE; switch (result) @@ -444,7 +444,7 @@ implementation m_indirectTxPending = FALSE; m_lastFrame = NULL; // only now the next transmission can begin if (lastFrame) { - dbg("UnslottedFrameDispatchP", "Transmit done, DSN: %lu, result: 0x%lx\n", + dbg("DispatchUnslottedCsmaP", "Transmit done, DSN: %lu, result: 0x%lx\n", (uint32_t) MHR(lastFrame)[MHR_INDEX_SEQNO], (uint32_t) status); signal FrameTx.transmitDone(lastFrame, status); } diff --git a/tos/lib/mac/tkn154/PibP.nc b/tos/lib/mac/tkn154/PibP.nc index bf8a0ac2..b4e7f6f9 100644 --- a/tos/lib/mac/tkn154/PibP.nc +++ b/tos/lib/mac/tkn154/PibP.nc @@ -62,8 +62,8 @@ module PibP { uses { interface Get as PromiscuousModeGet; - interface Init as FrameDispatchReset; - interface Init as FrameDispatchQueueReset; + interface Init as DispatchReset; + interface Init as DispatchQueueReset; interface Init as MacReset; interface SplitControl as RadioControl; interface Random; @@ -206,9 +206,9 @@ implementation event void RadioControl.stopDone(error_t result) { ASSERT(result == SUCCESS); - call FrameDispatchReset.init(); // resets the CAP component(s), spool out frames - call FrameDispatchQueueReset.init(); // resets the CAP queue component(s), spool out frames - call MacReset.init(); // resets the remaining components + call DispatchReset.init(); // resets the dispatch component(s), spools out frames + call DispatchQueueReset.init(); // resets the dispatch queue component(s), spools out frames + call MacReset.init(); // resets the remaining components m_resetSpin = 5; post resetSpinTask(); } @@ -217,8 +217,8 @@ implementation { if (m_resetSpin == 2) { // just to be safe... - call FrameDispatchReset.init(); - call FrameDispatchQueueReset.init(); + call DispatchReset.init(); + call DispatchQueueReset.init(); call MacReset.init(); } if (m_resetSpin--) { diff --git a/tos/lib/mac/tkn154/TKN154BeaconEnabledP.nc b/tos/lib/mac/tkn154/TKN154BeaconEnabledP.nc index 2f718b0c..ea794c3b 100644 --- a/tos/lib/mac/tkn154/TKN154BeaconEnabledP.nc +++ b/tos/lib/mac/tkn154/TKN154BeaconEnabledP.nc @@ -136,23 +136,23 @@ implementation #ifndef IEEE154_BEACON_SYNC_DISABLED BeaconSynchronizeP, - new FrameDispatchQueueP() as DeviceCapQueue, - new SlottedFrameDispatchP(INCOMING_SUPERFRAME) as DeviceCap, + new DispatchQueueP() as DeviceCapQueue, + new DispatchSlottedCsmaP(INCOMING_SUPERFRAME) as DeviceCap, #else NoBeaconSynchronizeP as BeaconSynchronizeP, - new NoFrameDispatchQueueP() as DeviceCapQueue, - new NoSlottedFrameDispatchP(INCOMING_SUPERFRAME) as DeviceCap, + new NoDispatchQueueP() as DeviceCapQueue, + new NoDispatchSlottedCsmaP(INCOMING_SUPERFRAME) as DeviceCap, #endif NoDeviceCfpP as DeviceCfp, #ifndef IEEE154_BEACON_TX_DISABLED BeaconTransmitP, - new FrameDispatchQueueP() as CoordCapQueue, - new SlottedFrameDispatchP(OUTGOING_SUPERFRAME) as CoordCap, + new DispatchQueueP() as CoordCapQueue, + new DispatchSlottedCsmaP(OUTGOING_SUPERFRAME) as CoordCap, #else NoBeaconTransmitP as BeaconTransmitP, - new NoFrameDispatchQueueP() as CoordCapQueue, - new NoSlottedFrameDispatchP(OUTGOING_SUPERFRAME) as CoordCap, + new NoDispatchQueueP() as CoordCapQueue, + new NoDispatchSlottedCsmaP(OUTGOING_SUPERFRAME) as CoordCap, #endif NoCoordCfpP as CoordCfp, @@ -402,16 +402,16 @@ implementation /* --------------------- CAP (incoming superframe) -------------------- */ - PibP.FrameDispatchQueueReset -> DeviceCapQueue; + PibP.DispatchQueueReset -> DeviceCapQueue; DeviceCapQueue.Queue -> DeviceCapQueueC; DeviceCapQueue.FrameTxCsma -> DeviceCap; - PibP.FrameDispatchQueueReset -> CoordCapQueue; + PibP.DispatchQueueReset -> CoordCapQueue; CoordCapQueue.Queue -> CoordCapQueueC; CoordCapQueue.FrameTxCsma -> CoordCap; components new RadioClientC() as DeviceCapRadioClient; - PibP.FrameDispatchReset -> DeviceCap; + PibP.DispatchReset -> DeviceCap; DeviceCap.CapEndAlarm = Alarm3; DeviceCap.BLEAlarm = Alarm4; DeviceCap.IndirectTxWaitAlarm = Alarm5; @@ -440,7 +440,7 @@ implementation components new RadioClientC() as CoordCapRadioClient, new BackupP(ieee154_cap_frame_backup_t); - PibP.FrameDispatchReset -> CoordCap; + PibP.DispatchReset -> CoordCap; CoordCap.CapEndAlarm = Alarm7; CoordCap.BLEAlarm = Alarm8; CoordCap.Token -> CoordCapRadioClient; diff --git a/tos/lib/mac/tkn154/TKN154NonBeaconEnabledP.nc b/tos/lib/mac/tkn154/TKN154NonBeaconEnabledP.nc index f5bc50a4..9924fbd0 100644 --- a/tos/lib/mac/tkn154/TKN154NonBeaconEnabledP.nc +++ b/tos/lib/mac/tkn154/TKN154NonBeaconEnabledP.nc @@ -118,8 +118,8 @@ implementation #else NoDisassociateP as DisassociateP, #endif - new FrameDispatchQueueP() as FrameDispatchQueueP, - UnslottedFrameDispatchP as FrameDispatchP, + new DispatchQueueP() as DispatchQueueP, + DispatchUnslottedCsmaP as DispatchP, #ifndef IEEE154_RXENABLE_DISABLED RxEnableP, @@ -142,7 +142,7 @@ implementation new PoolC(ieee154_txframe_t, TXFRAME_POOL_SIZE) as TxFramePoolP, new PoolC(ieee154_txcontrol_t, TXCONTROL_POOL_SIZE) as TxControlPoolP, - new QueueC(ieee154_txframe_t*, CAP_TX_QUEUE_SIZE) as FrameDispatchQueueC; + new QueueC(ieee154_txframe_t*, CAP_TX_QUEUE_SIZE) as DispatchQueueC; components MainC; @@ -151,7 +151,7 @@ implementation MCPS_PURGE = DataP; /* MLME */ - MLME_START = FrameDispatchP; + MLME_START = DispatchP; MLME_ASSOCIATE = AssociateP; MLME_DISASSOCIATE = DisassociateP; MLME_BEACON_NOTIFY = ScanP; @@ -194,9 +194,9 @@ implementation /* -------------------- Association (MLME-ASSOCIATE) -------------------- */ PibP.MacReset -> AssociateP; - AssociateP.AssociationRequestRx -> FrameDispatchP.FrameRx[FC1_FRAMETYPE_CMD + CMD_FRAME_ASSOCIATION_REQUEST]; - AssociateP.AssociationRequestTx -> FrameDispatchQueueP.FrameTx[unique(CAP_TX_CLIENT)]; - AssociateP.AssociationResponseExtracted -> FrameDispatchP.FrameExtracted[FC1_FRAMETYPE_CMD + CMD_FRAME_ASSOCIATION_RESPONSE]; + AssociateP.AssociationRequestRx -> DispatchP.FrameRx[FC1_FRAMETYPE_CMD + CMD_FRAME_ASSOCIATION_REQUEST]; + AssociateP.AssociationRequestTx -> DispatchQueueP.FrameTx[unique(CAP_TX_CLIENT)]; + AssociateP.AssociationResponseExtracted -> DispatchP.FrameExtracted[FC1_FRAMETYPE_CMD + CMD_FRAME_ASSOCIATION_RESPONSE]; AssociateP.AssociationResponseTx -> IndirectTxP.FrameTx[unique(INDIRECT_TX_CLIENT)]; AssociateP.DataRequest -> PollP.DataRequest[ASSOCIATE_POLL_CLIENT]; AssociateP.ResponseTimeout = Timer2; @@ -212,12 +212,12 @@ implementation PibP.MacReset -> DisassociateP; DisassociateP.DisassociationIndirectTx -> IndirectTxP.FrameTx[unique(INDIRECT_TX_CLIENT)]; - DisassociateP.DisassociationDirectTx -> FrameDispatchQueueP.FrameTx[unique(CAP_TX_CLIENT)]; - DisassociateP.DisassociationToCoord -> FrameDispatchQueueP.FrameTx[unique(CAP_TX_CLIENT)]; + DisassociateP.DisassociationDirectTx -> DispatchQueueP.FrameTx[unique(CAP_TX_CLIENT)]; + DisassociateP.DisassociationToCoord -> DispatchQueueP.FrameTx[unique(CAP_TX_CLIENT)]; DisassociateP.DisassociationExtractedFromCoord -> - FrameDispatchP.FrameExtracted[FC1_FRAMETYPE_CMD + CMD_FRAME_DISASSOCIATION_NOTIFICATION]; + DispatchP.FrameExtracted[FC1_FRAMETYPE_CMD + CMD_FRAME_DISASSOCIATION_NOTIFICATION]; DisassociateP.DisassociationRxFromDevice -> - FrameDispatchP.FrameRx[FC1_FRAMETYPE_CMD + CMD_FRAME_DISASSOCIATION_NOTIFICATION]; + DispatchP.FrameRx[FC1_FRAMETYPE_CMD + CMD_FRAME_DISASSOCIATION_NOTIFICATION]; DisassociateP.TxFramePool -> TxFramePoolP; DisassociateP.TxControlPool -> TxControlPoolP; DisassociateP.MLME_GET -> PibP; @@ -227,15 +227,15 @@ implementation /* ------------------ Data Transmission (MCPS-DATA) ------------------- */ - DataP.DeviceCapTx -> FrameDispatchQueueP.FrameTx[unique(CAP_TX_CLIENT)]; - DataP.CoordCapTx -> FrameDispatchQueueP.FrameTx[unique(CAP_TX_CLIENT)]; + DataP.DeviceCapTx -> DispatchQueueP.FrameTx[unique(CAP_TX_CLIENT)]; + DataP.CoordCapTx -> DispatchQueueP.FrameTx[unique(CAP_TX_CLIENT)]; DataP.DeviceCapRx -> PollP.DataRx; DataP.DeviceCapRx -> PromiscuousModeP.FrameRx; DataP.TxFramePool -> TxFramePoolP; DataP.IndirectTx -> IndirectTxP.FrameTx[unique(INDIRECT_TX_CLIENT)]; DataP.FrameUtility -> PibP; DataP.Frame -> PibP; - DataP.PurgeDirect -> FrameDispatchQueueP; + DataP.PurgeDirect -> DispatchQueueP; DataP.PurgeIndirect -> IndirectTxP; DataP.MLME_GET -> PibP; DataP.Packet -> PibP; @@ -244,8 +244,8 @@ implementation /* ------------------------ Polling (MLME-POLL) ----------------------- */ PibP.MacReset -> PollP; - PollP.PollTx -> FrameDispatchQueueP.FrameTx[unique(CAP_TX_CLIENT)]; - PollP.DataExtracted -> FrameDispatchP.FrameExtracted[FC1_FRAMETYPE_DATA]; + PollP.PollTx -> DispatchQueueP.FrameTx[unique(CAP_TX_CLIENT)]; + PollP.DataExtracted -> DispatchP.FrameExtracted[FC1_FRAMETYPE_DATA]; PollP.FrameUtility -> PibP; PollP.TxFramePool -> TxFramePoolP; PollP.TxControlPool -> TxControlPoolP; @@ -255,8 +255,8 @@ implementation /* ---------------------- Indirect transmission ----------------------- */ PibP.MacReset -> IndirectTxP; - IndirectTxP.CoordCapTx -> FrameDispatchQueueP.FrameTx[unique(CAP_TX_CLIENT)]; - IndirectTxP.DataRequestRx -> FrameDispatchP.FrameRx[FC1_FRAMETYPE_CMD + CMD_FRAME_DATA_REQUEST]; + IndirectTxP.CoordCapTx -> DispatchQueueP.FrameTx[unique(CAP_TX_CLIENT)]; + IndirectTxP.DataRequestRx -> DispatchP.FrameRx[FC1_FRAMETYPE_CMD + CMD_FRAME_DATA_REQUEST]; IndirectTxP.MLME_GET -> PibP; IndirectTxP.FrameUtility -> PibP; IndirectTxP.IndirectTxTimeout = Timer3; @@ -266,8 +266,8 @@ implementation /* ---------------------------- Realignment --------------------------- */ PibP.MacReset -> CoordRealignmentP; - CoordRealignmentP.CoordRealignmentTx -> FrameDispatchQueueP.FrameTx[unique(CAP_TX_CLIENT)]; - CoordRealignmentP.OrphanNotificationRx -> FrameDispatchP.FrameRx[FC1_FRAMETYPE_CMD + CMD_FRAME_ORPHAN_NOTIFICATION]; + CoordRealignmentP.CoordRealignmentTx -> DispatchQueueP.FrameTx[unique(CAP_TX_CLIENT)]; + CoordRealignmentP.OrphanNotificationRx -> DispatchP.FrameRx[FC1_FRAMETYPE_CMD + CMD_FRAME_ORPHAN_NOTIFICATION]; CoordRealignmentP.FrameUtility -> PibP; CoordRealignmentP.Frame -> PibP; CoordRealignmentP.TxFramePool -> TxFramePoolP; @@ -275,31 +275,31 @@ implementation CoordRealignmentP.MLME_GET -> PibP; CoordRealignmentP.LocalExtendedAddress -> PibP.GetLocalExtendedAddress; - /* --------------------- FrameDispatchP -------------------- */ + /* --------------------- DispatchP -------------------- */ - PibP.FrameDispatchReset -> FrameDispatchP; - PibP.FrameDispatchQueueReset -> FrameDispatchQueueP; - FrameDispatchQueueP.Queue -> FrameDispatchQueueC; - FrameDispatchQueueP.FrameTxCsma -> FrameDispatchP; + PibP.DispatchReset -> DispatchP; + PibP.DispatchQueueReset -> DispatchQueueP; + DispatchQueueP.Queue -> DispatchQueueC; + DispatchQueueP.FrameTxCsma -> DispatchP; - components new RadioClientC() as FrameDispatchRadioClient; - PibP.FrameDispatchReset -> FrameDispatchP; - FrameDispatchP.IndirectTxWaitTimer = Timer4; - FrameDispatchP.Token -> FrameDispatchRadioClient; - FrameDispatchP.SetMacSuperframeOrder -> PibP.SetMacSuperframeOrder; - FrameDispatchP.SetMacPanCoordinator -> PibP.SetMacPanCoordinator; - FrameDispatchP.IsTokenRequested -> FrameDispatchRadioClient; - FrameDispatchP.IsRxEnableActive -> RxEnableP.IsRxEnableActive; - FrameDispatchP.GetIndirectTxFrame -> IndirectTxP; - FrameDispatchP.RxEnableStateChange -> RxEnableP.RxEnableStateChange; - FrameDispatchP.FrameUtility -> PibP; - FrameDispatchP.UnslottedCsmaCa -> FrameDispatchRadioClient; - FrameDispatchP.RadioRx -> FrameDispatchRadioClient; - FrameDispatchP.RadioOff -> FrameDispatchRadioClient; - FrameDispatchP.MLME_GET -> PibP; - FrameDispatchP.MLME_SET -> PibP.MLME_SET; - FrameDispatchP.TimeCalc -> PibP; - FrameDispatchP.Leds = Leds; + components new RadioClientC() as DispatchRadioClient; + PibP.DispatchReset -> DispatchP; + DispatchP.IndirectTxWaitTimer = Timer4; + DispatchP.Token -> DispatchRadioClient; + DispatchP.SetMacSuperframeOrder -> PibP.SetMacSuperframeOrder; + DispatchP.SetMacPanCoordinator -> PibP.SetMacPanCoordinator; + DispatchP.IsTokenRequested -> DispatchRadioClient; + DispatchP.IsRxEnableActive -> RxEnableP.IsRxEnableActive; + DispatchP.GetIndirectTxFrame -> IndirectTxP; + DispatchP.RxEnableStateChange -> RxEnableP.RxEnableStateChange; + DispatchP.FrameUtility -> PibP; + DispatchP.UnslottedCsmaCa -> DispatchRadioClient; + DispatchP.RadioRx -> DispatchRadioClient; + DispatchP.RadioOff -> DispatchRadioClient; + DispatchP.MLME_GET -> PibP; + DispatchP.MLME_SET -> PibP.MLME_SET; + DispatchP.TimeCalc -> PibP; + DispatchP.Leds = Leds; /* -------------------------- promiscuous mode ------------------------ */ @@ -314,8 +314,8 @@ implementation PibP.MacReset -> RxEnableP; RxEnableP.TimeCalc -> PibP.TimeCalc; - RxEnableP.WasRxEnabled -> FrameDispatchP.WasRxEnabled; - RxEnableP.WasRxEnabled -> FrameDispatchP.WasRxEnabled; + RxEnableP.WasRxEnabled -> DispatchP.WasRxEnabled; + RxEnableP.WasRxEnabled -> DispatchP.WasRxEnabled; RxEnableP.RxEnableTimer = Timer5; /* ------------------------------- PIB -------------------------------- */ diff --git a/tos/lib/mac/tkn154/dummies/NoFrameDispatchQueueP.nc b/tos/lib/mac/tkn154/dummies/NoDispatchQueueP.nc similarity index 96% rename from tos/lib/mac/tkn154/dummies/NoFrameDispatchQueueP.nc rename to tos/lib/mac/tkn154/dummies/NoDispatchQueueP.nc index 890c816b..01e1a1b4 100644 --- a/tos/lib/mac/tkn154/dummies/NoFrameDispatchQueueP.nc +++ b/tos/lib/mac/tkn154/dummies/NoDispatchQueueP.nc @@ -33,10 +33,10 @@ * ======================================================================== */ - /** Empty placeholder component for FrameDispatchQueueP. */ + /** Empty placeholder component for DispatchQueueP. */ #include "TKN154_MAC.h" -generic module NoFrameDispatchQueueP() { +generic module NoDispatchQueueP() { provides { interface Init as Reset; diff --git a/tos/lib/mac/tkn154/dummies/NoSlottedFrameDispatchP.nc b/tos/lib/mac/tkn154/dummies/NoDispatchSlottedCsmaP.nc similarity index 97% rename from tos/lib/mac/tkn154/dummies/NoSlottedFrameDispatchP.nc rename to tos/lib/mac/tkn154/dummies/NoDispatchSlottedCsmaP.nc index 92b7cb0e..73d201ef 100644 --- a/tos/lib/mac/tkn154/dummies/NoSlottedFrameDispatchP.nc +++ b/tos/lib/mac/tkn154/dummies/NoDispatchSlottedCsmaP.nc @@ -33,12 +33,12 @@ * ======================================================================== */ - /** Empty placeholder component for SlottedFrameDispatchP. */ + /** Empty placeholder component for DispatchSlottedCsmaP. */ #include "TKN154_PHY.h" #include "TKN154_MAC.h" -generic module NoSlottedFrameDispatchP(uint8_t superframeDirection) +generic module NoDispatchSlottedCsmaP(uint8_t superframeDirection) { provides { -- 2.39.2