*** empty log message ***

diff --git a/tos/lib/net/zigbee/ieee802154/macTDBS/MacC.nc b/tos/lib/net/zigbee/ieee802154/macTDBS/MacC.nc
index de4cd3d1426491d8952efbb65091a7fb241c09c2..c69b3b1272750345688dceca74c7047747312869 100644 (file)
--- a/tos/lib/net/zigbee/ieee802154/macTDBS/MacC.nc
+++ b/tos/lib/net/zigbee/ieee802154/macTDBS/MacC.nc
@@ -6,7 +6,7 @@
 
 #include <Timer.h>
 
-configuration Mac {
+configuration MacC {
 
 
                //MLME  

diff --git a/tos/lib/net/zigbee/ieee802154/macTDBS/MacP.nc b/tos/lib/net/zigbee/ieee802154/macTDBS/MacP.nc
index f1a78dcb6bd42d1065ebcb3acf3576deeed09206..75ba457a6a9f37c27cd0226d68d2177aa16aa8c3 100644 (file)
--- a/tos/lib/net/zigbee/ieee802154/macTDBS/MacP.nc
+++ b/tos/lib/net/zigbee/ieee802154/macTDBS/MacP.nc
@@ -1154,7 +1154,7 @@ atomic{
                                                                                        return SUCCESS;
                                                                        }
                                                                        
-                                                                       /*
+                                                                       
                                                                        
                                                                        if ( mac_PIB.macShortAddress != 0xffff)
                                                                        {
@@ -1163,8 +1163,8 @@ atomic{
                                                                                        printfUART("pb %x %x\n", beacon_addr_short_ptr->source_address,mac_PIB.macCoordShortAddress);
                                                                                        return SUCCESS;
                                                                                }
-                                                                       }*/
-                                       /*
+                                                                       }
+                                       
                                        break;
                                        case TYPE_DATA:
                                        case TYPE_CMD:

diff --git a/tos/lib/net/zigbee/ieee802154/nwk/NWKC.nc b/tos/lib/net/zigbee/ieee802154/nwk/NWKC.nc
index a3b313c3c6291c6e12ae76ecdcee41abcfb326ab..923d4680f21f25e508e643296b066ed527fe0a7b 100644 (file)
--- a/tos/lib/net/zigbee/ieee802154/nwk/NWKC.nc
+++ b/tos/lib/net/zigbee/ieee802154/nwk/NWKC.nc
@@ -70,26 +70,26 @@ implementation {
   //MAC interfaces
 #ifndef TKN154_MAC
 
-  components Mac;
+  components MacC;
 
-  NWKP.MLME_START -> Mac.MLME_START;
+  NWKP.MLME_START -> MacC.MLME_START;
   
-  NWKP.MLME_GET ->Mac.MLME_GET;
-  NWKP.MLME_SET ->Mac.MLME_SET;
+  NWKP.MLME_GET ->MacC.MLME_GET;
+  NWKP.MLME_SET ->MacC.MLME_SET;
   
-  NWKP.MLME_BEACON_NOTIFY ->Mac.MLME_BEACON_NOTIFY;
-  NWKP.MLME_GTS -> Mac.MLME_GTS;
+  NWKP.MLME_BEACON_NOTIFY ->MacC.MLME_BEACON_NOTIFY;
+  NWKP.MLME_GTS -> MacC.MLME_GTS;
   
-  NWKP.MLME_ASSOCIATE->Mac.MLME_ASSOCIATE;
-  NWKP.MLME_DISASSOCIATE->Mac.MLME_DISASSOCIATE;
+  NWKP.MLME_ASSOCIATE->MacC.MLME_ASSOCIATE;
+  NWKP.MLME_DISASSOCIATE->MacC.MLME_DISASSOCIATE;
   
-  NWKP.MLME_ORPHAN->Mac.MLME_ORPHAN;
-  NWKP.MLME_SYNC->Mac.MLME_SYNC;
-  NWKP.MLME_SYNC_LOSS->Mac.MLME_SYNC_LOSS;
-  NWKP.MLME_RESET->Mac.MLME_RESET;
-  NWKP.MLME_SCAN->Mac.MLME_SCAN;
+  NWKP.MLME_ORPHAN->MacC.MLME_ORPHAN;
+  NWKP.MLME_SYNC->MacC.MLME_SYNC;
+  NWKP.MLME_SYNC_LOSS->MacC.MLME_SYNC_LOSS;
+  NWKP.MLME_RESET->MacC.MLME_RESET;
+  NWKP.MLME_SCAN->MacC.MLME_SCAN;
   
-  NWKP.MCPS_DATA->Mac.MCPS_DATA;
+  NWKP.MCPS_DATA->MacC.MCPS_DATA;
 #else