From 7ffd0739e070beea09d6262c082ddb94757c1181 Mon Sep 17 00:00:00 2001 From: rarseverino Date: Fri, 18 Sep 2009 16:33:29 +0000 Subject: [PATCH] *** empty log message *** --- tos/lib/net/zigbee/cc2420/CC2420ReceiveP.nc | 2 +- .../zigbee/ieee802154/phy/{Phy.nc => PhyC.nc} | 40 ++++++------ .../ieee802154/phy/{PhyM.nc => PhyP.nc} | 2 +- tos/lib/net/zigbee/readme.txt | 19 +++--- tos/lib/net/zigbee/wrapper/WrapperC.nc | 64 +++++++++---------- .../wrapper/{WrapperM.nc => WrapperP.nc} | 4 +- 6 files changed, 67 insertions(+), 64 deletions(-) rename tos/lib/net/zigbee/ieee802154/phy/{Phy.nc => PhyC.nc} (57%) rename tos/lib/net/zigbee/ieee802154/phy/{PhyM.nc => PhyP.nc} (99%) rename tos/lib/net/zigbee/wrapper/{WrapperM.nc => WrapperP.nc} (99%) diff --git a/tos/lib/net/zigbee/cc2420/CC2420ReceiveP.nc b/tos/lib/net/zigbee/cc2420/CC2420ReceiveP.nc index 14cb939a..51708378 100644 --- a/tos/lib/net/zigbee/cc2420/CC2420ReceiveP.nc +++ b/tos/lib/net/zigbee/cc2420/CC2420ReceiveP.nc @@ -786,7 +786,7 @@ typedef enum{ case S_RX_FCF: m_state = S_RX_PAYLOAD; - /* + * The destination address check here is not completely optimized. If you * are seeing issues with dropped acknowledgements, try removing * the address check and decreasing SACK_HEADER_LENGTH to 2. diff --git a/tos/lib/net/zigbee/ieee802154/phy/Phy.nc b/tos/lib/net/zigbee/ieee802154/phy/PhyC.nc similarity index 57% rename from tos/lib/net/zigbee/ieee802154/phy/Phy.nc rename to tos/lib/net/zigbee/ieee802154/phy/PhyC.nc index a66da761..c4a5ec54 100644 --- a/tos/lib/net/zigbee/ieee802154/phy/Phy.nc +++ b/tos/lib/net/zigbee/ieee802154/phy/PhyC.nc @@ -7,7 +7,7 @@ #include "CC2420.h" #include "IEEE802154.h" -configuration Phy { +configuration PhyC { provides interface SplitControl; @@ -27,49 +27,49 @@ configuration Phy { implementation { - components PhyM; + components PhyP; components MainC; - MainC.SoftwareInit -> PhyM; + MainC.SoftwareInit -> PhyP; - SplitControl = PhyM; + SplitControl = PhyP; - //Test_send = PhyM; + //Test_send = PhyP; components CC2420ControlC; - PhyM.Resource -> CC2420ControlC; - PhyM.CC2420Power -> CC2420ControlC; - PhyM.CC2420Config ->CC2420ControlC; + PhyP.Resource -> CC2420ControlC; + PhyP.CC2420Power -> CC2420ControlC; + PhyP.CC2420Config ->CC2420ControlC; components CC2420TransmitC; - PhyM.SubControl -> CC2420TransmitC; + PhyP.SubControl -> CC2420TransmitC; - PhyM.Sendframe ->CC2420TransmitC; + PhyP.Sendframe ->CC2420TransmitC; components CC2420ReceiveC; //Receive = CC2420ReceiveC; - PhyM.SubControl -> CC2420ReceiveC; + PhyP.SubControl -> CC2420ReceiveC; - PhyM.Receiveframe ->CC2420ReceiveC; + PhyP.Receiveframe ->CC2420ReceiveC; components RandomC; - PhyM.Random -> RandomC; + PhyP.Random -> RandomC; components LedsC as Leds; - PhyM.Leds -> Leds; + PhyP.Leds -> Leds; - PD_DATA=PhyM; + PD_DATA=PhyP; - PLME_ED=PhyM; - PLME_CCA=PhyM; - PLME_GET = PhyM; - PLME_SET=PhyM; - PLME_SET_TRX_STATE=PhyM; + PLME_ED=PhyP; + PLME_CCA=PhyP; + PLME_GET = PhyP; + PLME_SET=PhyP; + PLME_SET_TRX_STATE=PhyP; } diff --git a/tos/lib/net/zigbee/ieee802154/phy/PhyM.nc b/tos/lib/net/zigbee/ieee802154/phy/PhyP.nc similarity index 99% rename from tos/lib/net/zigbee/ieee802154/phy/PhyM.nc rename to tos/lib/net/zigbee/ieee802154/phy/PhyP.nc index 457f176c..ca9c842a 100644 --- a/tos/lib/net/zigbee/ieee802154/phy/PhyM.nc +++ b/tos/lib/net/zigbee/ieee802154/phy/PhyP.nc @@ -10,7 +10,7 @@ #include "phy_enumerations.h" -module PhyM { +module PhyP { provides interface SplitControl; // provides interface Test_send; diff --git a/tos/lib/net/zigbee/readme.txt b/tos/lib/net/zigbee/readme.txt index 2c9c5cf5..df5110e5 100644 --- a/tos/lib/net/zigbee/readme.txt +++ b/tos/lib/net/zigbee/readme.txt @@ -1,5 +1,6 @@ -Title: open-zb protocol stack implementation for TinyOS v2.0 -Author: André Cunha - IPP-HURRAY! http://www.open-zb.net +Title: open-zb protocol stack implementation for TinyOS v2.x +Author: Ricardo Severino - IPP-HURRAY! http://www.open-zb.net +Author: Andr� Cunha - IPP-HURRAY! http://www.open-zb.net ---------------------------------------------- Implementation of the ZigBee and the beacon-enabled mode of the IEEE 802.15.4. @@ -10,12 +11,12 @@ mode of the IEEE 802.15.4 with the ZigBee network layer supporting the Cluster-t The current version of the implementation of the IEEE 802.15.4 beacon enabled mode supports the following functionalities: --CSMA/CA algorithm – slotted version; +-CSMA/CA algorithm � slotted version; -GTS Mechanism; -Indirect transmission mechanism; -Direct / Indirect / GTS Data Transmission; -Beacon Management; --Frame construction – Short Addressing Fields only and extended addressing +-Frame construction � Short Addressing Fields only and extended addressing fields in the association request; -Association/Disassociation Mechanism; -MAC PIB Management; @@ -30,7 +31,7 @@ version of the implementation -Active and Orphan channel Scan; -Orphan Devices; -Frame Reception Conditions (Verify Conditions); --Security – Out of the scope of this implementation; +-Security � Out of the scope of this implementation; The current version of the ZigBee Network Layer, besides the above functionalities, supports @@ -67,16 +68,16 @@ devices have a depth of 1 and the coordinator a depth of 0). - ZigBee Network Layer with the TDBS -Test_APL -This application uses the interfaces provided by the NWKM component and currently is customized +This application uses the interfaces provided by the NWKP component and currently is customized to use with the TELOSB mote due to the interfacing with the mote user button. The TELOSB mote needs to -“warmup” before entering into normal operational behaviour, so, the user button is used to start the mote +�warmup� before entering into normal operational behaviour, so, the user button is used to start the mote operation either by starting to send beacons, in the case of the ZigBee Coordinator, or to associate to a network in the case of ZigBee Routers or End Devices. In order to test the cluster-tree approach we have forced the association to a specific parent device by assigning some static parameters to the device. These parameters are located in the nwk_const.h file under the lib.nwk and are the following: --TYPE_DEVICE – selecting the role of the device in the network; --DEVICE_DEPTH – selecting the depth of the device in the network. This parameter in be used in +-TYPE_DEVICE � selecting the role of the device in the network; +-DEVICE_DEPTH � selecting the depth of the device in the network. This parameter in be used in computing the cskip functions used for the address assignment and for the tree-routing. This value will also be used to select the appropriate parent selected for the association. Depending of the selected depth the device will select the statically defined parent. The parent values are diff --git a/tos/lib/net/zigbee/wrapper/WrapperC.nc b/tos/lib/net/zigbee/wrapper/WrapperC.nc index eacc1dc8..6b210a9d 100644 --- a/tos/lib/net/zigbee/wrapper/WrapperC.nc +++ b/tos/lib/net/zigbee/wrapper/WrapperC.nc @@ -1,6 +1,6 @@ /* * - * + * Wrapper layer to use the TKN 154 MAC * @author: Ricardo Severino * ======================================================================== */ @@ -40,52 +40,52 @@ implementation { components Ieee802154BeaconEnabledC as MAC; - components WrapperM; + components WrapperP; - WrapperM.MLME_RESET -> MAC; - WrapperM.MLME_START -> MAC; + WrapperP.MLME_RESET -> MAC; + WrapperP.MLME_START -> MAC; - WrapperM.MLME_GET -> MAC; - WrapperM.MLME_SET -> MAC; + WrapperP.MLME_GET -> MAC; + WrapperP.MLME_SET -> MAC; - WrapperM.MLME_BEACON_NOTIFY -> MAC; - //WrapperM.MLME_GTS -> MAC; + WrapperP.MLME_BEACON_NOTIFY -> MAC; + //WrapperP.MLME_GTS -> MAC; - WrapperM.MLME_ASSOCIATE -> MAC; - WrapperM.MLME_DISASSOCIATE -> MAC; + WrapperP.MLME_ASSOCIATE -> MAC; + WrapperP.MLME_DISASSOCIATE -> MAC; - WrapperM.MLME_ORPHAN -> MAC; - WrapperM.MLME_SYNC -> MAC; - WrapperM.MLME_SYNC_LOSS -> MAC; - WrapperM.MLME_SCAN -> MAC; + WrapperP.MLME_ORPHAN -> MAC; + WrapperP.MLME_SYNC -> MAC; + WrapperP.MLME_SYNC_LOSS -> MAC; + WrapperP.MLME_SCAN -> MAC; - WrapperM.MCPS_DATA -> MAC; - WrapperM.IEEE154Frame -> MAC; - WrapperM.IEEE154BeaconFrame -> MAC; - WrapperM.Packet -> MAC; + WrapperP.MCPS_DATA -> MAC; + WrapperP.IEEE154Frame -> MAC; + WrapperP.IEEE154BeaconFrame -> MAC; + WrapperP.Packet -> MAC; components new PoolC(message_t, WRAPPER_MESSAGE_QUEUE_SIZE) as MessagePool; - WrapperM.MessagePool -> MessagePool; + WrapperP.MessagePool -> MessagePool; - OPENZB_MLME_RESET = WrapperM; - OPENZB_MLME_START = WrapperM; + OPENZB_MLME_RESET = WrapperP; + OPENZB_MLME_START = WrapperP; - OPENZB_MLME_GET = WrapperM; - OPENZB_MLME_SET = WrapperM; + OPENZB_MLME_GET = WrapperP; + OPENZB_MLME_SET = WrapperP; - OPENZB_MLME_BEACON_NOTIFY = WrapperM; - OPENZB_MLME_GTS = WrapperM; + OPENZB_MLME_BEACON_NOTIFY = WrapperP; + OPENZB_MLME_GTS = WrapperP; - OPENZB_MLME_ASSOCIATE = WrapperM; - OPENZB_MLME_DISASSOCIATE = WrapperM; + OPENZB_MLME_ASSOCIATE = WrapperP; + OPENZB_MLME_DISASSOCIATE = WrapperP; - OPENZB_MLME_ORPHAN = WrapperM; - OPENZB_MLME_SYNC = WrapperM; - OPENZB_MLME_SYNC_LOSS = WrapperM; - OPENZB_MLME_SCAN = WrapperM; + OPENZB_MLME_ORPHAN = WrapperP; + OPENZB_MLME_SYNC = WrapperP; + OPENZB_MLME_SYNC_LOSS = WrapperP; + OPENZB_MLME_SCAN = WrapperP; - OPENZB_MCPS_DATA = WrapperM; + OPENZB_MCPS_DATA = WrapperP; diff --git a/tos/lib/net/zigbee/wrapper/WrapperM.nc b/tos/lib/net/zigbee/wrapper/WrapperP.nc similarity index 99% rename from tos/lib/net/zigbee/wrapper/WrapperM.nc rename to tos/lib/net/zigbee/wrapper/WrapperP.nc index a1be1ce2..d8db2eb7 100644 --- a/tos/lib/net/zigbee/wrapper/WrapperM.nc +++ b/tos/lib/net/zigbee/wrapper/WrapperP.nc @@ -33,7 +33,7 @@ * ======================================================================== */ -module WrapperM +module WrapperP { uses { interface MLME_START; @@ -110,6 +110,7 @@ implementation { ieee154_CapabilityInformation_t capabilityInformation; ieee154_address_t coordAddress; + if (securityenable) return IEEE154_UNSUPPORTED_SECURITY; memcpy(&coordAddress, CoordAddress, 8); @@ -138,6 +139,7 @@ implementation uint16_t AssocShortAddress, uint8_t status, bool securityenable) { uint64_t deviceAddress; + if (securityenable) return IEEE154_UNSUPPORTED_SECURITY; memcpy(&deviceAddress, DeviceAddress, 8); -- 2.39.2