From c633c67e5d24d9894b5f80a45cddaac9c75e393d Mon Sep 17 00:00:00 2001 From: rarseverino Date: Fri, 18 Sep 2009 16:15:59 +0000 Subject: [PATCH] *** empty log message *** --- .../zigbee/ieee802154/mac/{Mac.nc => MacC.nc} | 66 +++++++++---------- .../ieee802154/mac/{MacM.nc => MacP.nc} | 2 +- .../ieee802154/macTDBS/{Mac.nc => MacC.nc} | 66 +++++++++---------- .../ieee802154/macTDBS/{MacM.nc => MacP.nc} | 2 +- 4 files changed, 68 insertions(+), 68 deletions(-) rename tos/lib/net/zigbee/ieee802154/mac/{Mac.nc => MacC.nc} (57%) rename tos/lib/net/zigbee/ieee802154/mac/{MacM.nc => MacP.nc} (99%) rename tos/lib/net/zigbee/ieee802154/macTDBS/{Mac.nc => MacC.nc} (58%) rename tos/lib/net/zigbee/ieee802154/macTDBS/{MacM.nc => MacP.nc} (99%) diff --git a/tos/lib/net/zigbee/ieee802154/mac/Mac.nc b/tos/lib/net/zigbee/ieee802154/mac/MacC.nc similarity index 57% rename from tos/lib/net/zigbee/ieee802154/mac/Mac.nc rename to tos/lib/net/zigbee/ieee802154/mac/MacC.nc index 28da2de3..f8262d2f 100644 --- a/tos/lib/net/zigbee/ieee802154/mac/Mac.nc +++ b/tos/lib/net/zigbee/ieee802154/mac/MacC.nc @@ -6,7 +6,7 @@ #include -configuration Mac { +configuration MacC { //MLME @@ -37,74 +37,74 @@ configuration Mac { implementation { components MainC; - MainC.SoftwareInit -> MacM; + MainC.SoftwareInit -> MacP; components LedsC; - components MacM; + components MacP; - components Phy; + components PhyC; components TimerAsyncC; - MacM.TimerAsync ->TimerAsyncC; + MacP.TimerAsync ->TimerAsyncC; - MacM.Leds -> LedsC; + MacP.Leds -> LedsC; - MacM.AMControl ->Phy.SplitControl; + MacP.AMControl ->PhyC.SplitControl; components HplCC2420PinsC as Pins; - MacM.CCA -> Pins.CCA; + MacP.CCA -> Pins.CCA; components RandomC; - MacM.Random -> RandomC; + MacP.Random -> RandomC; components new TimerMilliC() as T_ackwait; - MacM.T_ackwait -> T_ackwait; + MacP.T_ackwait -> T_ackwait; components new TimerMilliC() as T_ResponseWaitTime; - MacM.T_ResponseWaitTime -> T_ResponseWaitTime; + MacP.T_ResponseWaitTime -> T_ResponseWaitTime; components new TimerMilliC() as T_ScanDuration; - MacM.T_ScanDuration -> T_ScanDuration; + MacP.T_ScanDuration -> T_ScanDuration; components CC2420ReceiveC; - MacM.AddressFilter -> CC2420ReceiveC; + MacP.AddressFilter -> CC2420ReceiveC; /*****************************************************/ /* INTERFACES */ /*****************************************************/ - MacM.PD_DATA -> Phy.PD_DATA; - MacM.PLME_ED ->Phy.PLME_ED; - MacM.PLME_CCA -> Phy.PLME_CCA; - MacM.PLME_SET -> Phy.PLME_SET; - MacM.PLME_GET -> Phy.PLME_GET; - MacM.PLME_SET_TRX_STATE -> Phy.PLME_SET_TRX_STATE; + MacP.PD_DATA -> PhyC.PD_DATA; + MacP.PLME_ED ->PhyC.PLME_ED; + MacP.PLME_CCA -> PhyC.PLME_CCA; + MacP.PLME_SET -> PhyC.PLME_SET; + MacP.PLME_GET -> PhyC.PLME_GET; + MacP.PLME_SET_TRX_STATE -> PhyC.PLME_SET_TRX_STATE; //MLME interfaces - MLME_START=MacM; + MLME_START=MacP; - MLME_SET=MacM; - MLME_GET=MacM; + MLME_SET=MacP; + MLME_GET=MacP; - MLME_ASSOCIATE=MacM; - MLME_DISASSOCIATE=MacM; + MLME_ASSOCIATE=MacP; + MLME_DISASSOCIATE=MacP; - MLME_BEACON_NOTIFY = MacM; - MLME_GTS=MacM; + MLME_BEACON_NOTIFY = MacP; + MLME_GTS=MacP; - MLME_ORPHAN=MacM; + MLME_ORPHAN=MacP; - MLME_SYNC=MacM; - MLME_SYNC_LOSS=MacM; + MLME_SYNC=MacP; + MLME_SYNC_LOSS=MacP; - MLME_RESET=MacM; + MLME_RESET=MacP; - MLME_SCAN=MacM; + MLME_SCAN=MacP; - MCPS_DATA=MacM; - MCPS_PURGE=MacM; + MCPS_DATA=MacP; + MCPS_PURGE=MacP; diff --git a/tos/lib/net/zigbee/ieee802154/mac/MacM.nc b/tos/lib/net/zigbee/ieee802154/mac/MacP.nc similarity index 99% rename from tos/lib/net/zigbee/ieee802154/mac/MacM.nc rename to tos/lib/net/zigbee/ieee802154/mac/MacP.nc index cf405995..ab2ca9bb 100644 --- a/tos/lib/net/zigbee/ieee802154/mac/MacM.nc +++ b/tos/lib/net/zigbee/ieee802154/mac/MacP.nc @@ -16,7 +16,7 @@ #include "mac_func.h" -module MacM { +module MacP { provides interface Init; diff --git a/tos/lib/net/zigbee/ieee802154/macTDBS/Mac.nc b/tos/lib/net/zigbee/ieee802154/macTDBS/MacC.nc similarity index 58% rename from tos/lib/net/zigbee/ieee802154/macTDBS/Mac.nc rename to tos/lib/net/zigbee/ieee802154/macTDBS/MacC.nc index a46b6f09..de4cd3d1 100644 --- a/tos/lib/net/zigbee/ieee802154/macTDBS/Mac.nc +++ b/tos/lib/net/zigbee/ieee802154/macTDBS/MacC.nc @@ -37,80 +37,80 @@ configuration Mac { implementation { components MainC; - MainC.SoftwareInit -> MacM; + MainC.SoftwareInit -> MacP; components LedsC; - components MacM; + components MacP; - components Phy; + components PhyC; components TimerAsyncC; - MacM.TimerAsync ->TimerAsyncC; + MacP.TimerAsync ->TimerAsyncC; - MacM.Leds -> LedsC; + MacP.Leds -> LedsC; - MacM.AMControl ->Phy.SplitControl; + MacP.AMControl ->PhyC.SplitControl; components HplCC2420PinsC as Pins; - MacM.CCA -> Pins.CCA; + MacP.CCA -> Pins.CCA; components RandomC; - MacM.Random -> RandomC; + MacP.Random -> RandomC; components new TimerMilliC() as T_ackwait; - MacM.T_ackwait -> T_ackwait; + MacP.T_ackwait -> T_ackwait; components new TimerMilliC() as T_ResponseWaitTime; - MacM.T_ResponseWaitTime -> T_ResponseWaitTime; + MacP.T_ResponseWaitTime -> T_ResponseWaitTime; components new TimerMilliC() as T_ScanDuration; - MacM.T_ScanDuration -> T_ScanDuration; + MacP.T_ScanDuration -> T_ScanDuration; components CC2420ReceiveC; - MacM.AddressFilter -> CC2420ReceiveC; + MacP.AddressFilter -> CC2420ReceiveC; // //components CC2420ControlC; - //MacM.CC2420Config ->CC2420ControlC; + //MacP.CC2420Config ->CC2420ControlC; /*****************************************************/ /* INTERFACES */ /*****************************************************/ - MacM.PD_DATA -> Phy.PD_DATA; - MacM.PLME_ED ->Phy.PLME_ED; - MacM.PLME_CCA -> Phy.PLME_CCA; - MacM.PLME_SET -> Phy.PLME_SET; - MacM.PLME_GET -> Phy.PLME_GET; - MacM.PLME_SET_TRX_STATE -> Phy.PLME_SET_TRX_STATE; + MacP.PD_DATA -> PhyC.PD_DATA; + MacP.PLME_ED ->PhyC.PLME_ED; + MacP.PLME_CCA -> PhyC.PLME_CCA; + MacP.PLME_SET -> PhyC.PLME_SET; + MacP.PLME_GET -> PhyC.PLME_GET; + MacP.PLME_SET_TRX_STATE -> PhyC.PLME_SET_TRX_STATE; //MLME interfaces - MLME_START=MacM; + MLME_START=MacP; - MLME_SET=MacM; - MLME_GET=MacM; + MLME_SET=MacP; + MLME_GET=MacP; - MLME_ASSOCIATE=MacM; - MLME_DISASSOCIATE=MacM; + MLME_ASSOCIATE=MacP; + MLME_DISASSOCIATE=MacP; - MLME_BEACON_NOTIFY = MacM; - MLME_GTS=MacM; + MLME_BEACON_NOTIFY = MacP; + MLME_GTS=MacP; - MLME_ORPHAN=MacM; + MLME_ORPHAN=MacP; - MLME_SYNC=MacM; - MLME_SYNC_LOSS=MacM; + MLME_SYNC=MacP; + MLME_SYNC_LOSS=MacP; - MLME_RESET=MacM; + MLME_RESET=MacP; - MLME_SCAN=MacM; + MLME_SCAN=MacP; - MCPS_DATA=MacM; - MCPS_PURGE=MacM; + MCPS_DATA=MacP; + MCPS_PURGE=MacP; diff --git a/tos/lib/net/zigbee/ieee802154/macTDBS/MacM.nc b/tos/lib/net/zigbee/ieee802154/macTDBS/MacP.nc similarity index 99% rename from tos/lib/net/zigbee/ieee802154/macTDBS/MacM.nc rename to tos/lib/net/zigbee/ieee802154/macTDBS/MacP.nc index 6b108a9e..f1a78dcb 100644 --- a/tos/lib/net/zigbee/ieee802154/macTDBS/MacM.nc +++ b/tos/lib/net/zigbee/ieee802154/macTDBS/MacP.nc @@ -16,7 +16,7 @@ #include "mac_func.h" -module MacM { +module MacP { #ifndef TKN154_MAC provides interface Init; -- 2.39.2