From: rarseverino <rarseverino>
Date: Fri, 18 Sep 2009 17:22:55 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: rc_6_tinyos_2_1_1~236
X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=commitdiff_plain;h=cb85acf34756d5ea12490038f65a9e1f6fea5fe7;p=tinyos-2.x.git

*** empty log message ***
---

diff --git a/tos/lib/net/zigbee/ieee802154/macTDBS/MacC.nc b/tos/lib/net/zigbee/ieee802154/macTDBS/MacC.nc
index de4cd3d1..c69b3b12 100644
--- 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 f1a78dcb..75ba457a 100644
--- 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 a3b313c3..923d4680 100644
--- 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