*** empty log message ***

diff --git a/tos/lib/net/zigbee/apps/Test_APL/Makefile b/tos/lib/net/zigbee/apps/Test_APL/Makefile
index ff0f928664f847b432a149e157b2605cbae11b3c..9372b0dfaa509bb319bea1c86c07560d23d397cf 100644 (file)
--- a/tos/lib/net/zigbee/apps/Test_APL/Makefile
+++ b/tos/lib/net/zigbee/apps/Test_APL/Makefile
@@ -4,7 +4,6 @@ TKN154_PLATFORM_INCLUDE=$(TOSROOT)/tos/platforms/telosb/mac/tkn154/Makefile.incl
 
 ifndef TKN154_MAC
 PFLAGS +=      -I$(TOSROOT)/tos/lib/net/zigbee/ieee802154/includes \
-               -I$(TOSROOT)/tos/lib/net/zigbee/Wrapper\
                        -I$(TOSROOT)/tos/lib/net/zigbee/ieee802154/macTDBS \
                        -I$(TOSROOT)/tos/lib/net/zigbee/ieee802154/phy \
                        -I$(TOSROOT)/tos/lib/net/zigbee/ieee802154/timerasyncTDBS \
@@ -18,25 +17,19 @@ PFLAGS +=   -I$(TOSROOT)/tos/lib/net/zigbee/ieee802154/includes \
 
 
 else
-
-PFLAGS += -I$(TOSROOT)/tos//lib/mac/tkn154 \
-       -I$(TOSROOT)/tos//lib/mac/tkn154/dummies \
-       -I$(TOSROOT)/tos//lib/mac/tkn154/interfaces/MCPS \
-       -I$(TOSROOT)/tos//lib/mac/tkn154/interfaces/MLME \
-       -I$(TOSROOT)/tos//lib/mac/tkn154/interfaces/private \
-       -I$(TOSROOT)/tos//lib/mac/tkn154/interfaces/public\
+PFLAGS += -DTKN154_MAC
+PFLAGS += -I$(TOSROOT)/tos/lib/mac/tkn154 \
+       -I$(TOSROOT)/tos/lib/mac/tkn154/dummies \
+       -I$(TOSROOT)/tos/lib/mac/tkn154/interfaces/MCPS \
+       -I$(TOSROOT)/tos/lib/mac/tkn154/interfaces/MLME \
+       -I$(TOSROOT)/tos/lib/mac/tkn154/interfaces/private \
+       -I$(TOSROOT)/tos/lib/mac/tkn154/interfaces/public\
 \
--I$(TOSROOT)/tos/lib/net/zigbee/ieee802154/includes \
 -I$(TOSROOT)/tos/lib/net/zigbee/Wrapper\
-                       -I$(TOSROOT)/tos/lib/net/zigbee/ieee802154/macTDBS \
-                       -I$(TOSROOT)/tos/lib/net/zigbee/ieee802154/phy \
-                       -I$(TOSROOT)/tos/lib/net/zigbee/ieee802154/timerasyncTDBS \
-                       -I$(TOSROOT)/tos/lib/net/zigbee/ieee802154/interfaces \
-                       -I$(TOSROOT)/tos/lib/net/zigbee/ieee802154/interfaces/mac \
-                       -I$(TOSROOT)/tos/lib/net/zigbee/ieee802154/interfaces/phy \
-                       -I$(TOSROOT)/tos/lib/net/zigbee/cc2420 \
-                       -I$(TOSROOT)/tos/lib/net/zigbee/ieee802154/interfaces/nwk \
-                       -I$(TOSROOT)/tos/lib/net/zigbee/ieee802154/nwk
+-I$(TOSROOT)/tos/lib/net/zigbee/Wrapper/interfaces/mac\
+-I$(TOSROOT)/tos/lib/net/zigbee/ieee802154/includes \
+-I$(TOSROOT)/tos/lib/net/zigbee/ieee802154/interfaces/nwk \
+ -I$(TOSROOT)/tos/lib/net/zigbee/ieee802154/nwk
 
   include $(TKN154_PLATFORM_INCLUDE)   
 

diff --git a/tos/lib/net/zigbee/apps/Test_APL/Test_APL.nc b/tos/lib/net/zigbee/apps/Test_APL/Test_APL.nc
index 055d12d3b805ff18f15e3eaa6c30149d81ad32ad..0e2f0931a1cb68fc95609a5f54fec48527ba5c35 100644 (file)
--- a/tos/lib/net/zigbee/apps/Test_APL/Test_APL.nc
+++ b/tos/lib/net/zigbee/apps/Test_APL/Test_APL.nc
@@ -5,12 +5,16 @@
  */
 #include <Timer.h>
 
+#ifndef TKN154_MAC
+
 #include "phy_const.h"
 #include "phy_enumerations.h"
 #include "mac_const.h"
 #include "mac_enumerations.h"
 #include "mac_func.h"
 
+#endif
+
 #include "nwk_const.h"
 #include "nwk_enumerations.h"
 #include "nwk_func.h"

diff --git a/tos/lib/net/zigbee/ieee802154/macTDBS/MacM.nc b/tos/lib/net/zigbee/ieee802154/macTDBS/MacM.nc
index d3ba973dffdc4829c29d0d6a826d65000989e9ba..6b108a9ec4a08320cc0cbc9179eb03e36339473f 100644 (file)
--- a/tos/lib/net/zigbee/ieee802154/macTDBS/MacM.nc
+++ b/tos/lib/net/zigbee/ieee802154/macTDBS/MacM.nc
@@ -17,7 +17,8 @@
 #include "mac_func.h"
 
 module MacM {
- 
+
+#ifndef TKN154_MAC 
        provides interface Init;
        
        provides interface MLME_START;
@@ -42,6 +43,7 @@ module MacM {
        //MCPS
        provides interface MCPS_DATA;
        provides interface MCPS_PURGE;
+#endif
                
        
        uses interface Timer<TMilli> as T_ackwait;      
@@ -515,6 +517,7 @@ on top of this file*/
 
 
    atomic{
+
        //inicialize the mac PIB
        init_MacPIB();
        

diff --git a/tos/lib/net/zigbee/ieee802154/macTDBS/mac_enumerations.h b/tos/lib/net/zigbee/ieee802154/macTDBS/mac_enumerations.h
index f8004b2ce871912fc0eadbb52d9fb1732115a127..d53c9cbf1aa00a41a9183880ead2192984a535fd 100644 (file)
--- a/tos/lib/net/zigbee/ieee802154/macTDBS/mac_enumerations.h
+++ b/tos/lib/net/zigbee/ieee802154/macTDBS/mac_enumerations.h
@@ -105,13 +105,18 @@ enum{
 };
 
 //channel scan enumerations
+#ifndef TKN154_MAC
 enum{
        ED_SCAN = 0x00,
        ACTIVE_SCAN = 0x01,
        PASSIVE_SCAN = 0x02,
        ORPHAN_SCAN = 0x03
 };
-
-
+#else
+enum{
+       ED_SCAN = 0x00
+}
+#endif
+//
 #endif
 

diff --git a/tos/lib/net/zigbee/ieee802154/nwk/NWK.nc b/tos/lib/net/zigbee/ieee802154/nwk/NWK.nc
index 0d35ddf33c64659cef171e409cb273b36be91f9c..b89ed06f2025bdf683739779b17462c1590e13b2 100644 (file)
--- a/tos/lib/net/zigbee/ieee802154/nwk/NWK.nc
+++ b/tos/lib/net/zigbee/ieee802154/nwk/NWK.nc
@@ -5,11 +5,14 @@
  */
 #include <Timer.h>
 
+#ifndef TKN154_MAC
+
 #include "phy_const.h"
 #include "phy_enumerations.h"
 #include "mac_const.h"
 #include "mac_enumerations.h"
 #include "mac_func.h"
+#endif
 
 #include "nwk_func.h"
 #include "nwk_enumerations.h"
@@ -52,12 +55,6 @@ implementation {
   components LedsC;
   components NWKM;
        
-  //components Mac;
-
-//////////
-  components WrapperC;
-
-/////////////
 
 
 
@@ -66,13 +63,14 @@ implementation {
    
        components RandomC;
        NWKM.Random -> RandomC;
-   
-  
 
 
  
   //MAC interfaces
-  /*
+#ifndef TKN154_MAC
+
+  components Mac;
+
   NWKM.MLME_START -> Mac.MLME_START;
   
   NWKM.MLME_GET ->Mac.MLME_GET;
@@ -87,43 +85,36 @@ implementation {
   NWKM.MLME_ORPHAN->Mac.MLME_ORPHAN;
   NWKM.MLME_SYNC->Mac.MLME_SYNC;
   NWKM.MLME_SYNC_LOSS->Mac.MLME_SYNC_LOSS;
- NWKM.MLME_RESET->Mac.MLME_RESET;
+  NWKM.MLME_RESET->Mac.MLME_RESET;
   NWKM.MLME_SCAN->Mac.MLME_SCAN;
   
   NWKM.MCPS_DATA->Mac.MCPS_DATA;
-*/
+#else
 
-///////////
-NWKM.MLME_RESET->WrapperC;
-NWKM.MLME_START -> WrapperC;
+
+  components WrapperC;
+  NWKM.MLME_RESET->WrapperC.OPENZB_MLME_RESET;
+  NWKM.MLME_START -> WrapperC.OPENZB_MLME_START;
   
-  NWKM.MLME_GET ->WrapperC;
-  NWKM.MLME_SET ->WrapperC;
+  NWKM.MLME_GET ->WrapperC.OPENZB_MLME_GET;
+  NWKM.MLME_SET ->WrapperC.OPENZB_MLME_SET;
   
-  NWKM.MLME_BEACON_NOTIFY ->WrapperC;
-  NWKM.MLME_GTS -> WrapperC;
+  NWKM.MLME_BEACON_NOTIFY ->WrapperC.OPENZB_MLME_BEACON_NOTIFY;
+  NWKM.MLME_GTS -> WrapperC.OPENZB_MLME_GTS;
   
-  NWKM.MLME_ASSOCIATE->WrapperC;
-  NWKM.MLME_DISASSOCIATE->WrapperC;
+  NWKM.MLME_ASSOCIATE->WrapperC.OPENZB_MLME_ASSOCIATE;
+  NWKM.MLME_DISASSOCIATE->WrapperC.OPENZB_MLME_DISASSOCIATE;
   
-  NWKM.MLME_ORPHAN->WrapperC;
-  NWKM.MLME_SYNC->WrapperC;
-  NWKM.MLME_SYNC_LOSS->WrapperC;
-  NWKM.MLME_SCAN->WrapperC;
+  NWKM.MLME_ORPHAN->WrapperC.OPENZB_MLME_ORPHAN;
+  NWKM.MLME_SYNC->WrapperC.OPENZB_MLME_SYNC;
+  NWKM.MLME_SYNC_LOSS->WrapperC.OPENZB_MLME_SYNC_LOSS;
+  NWKM.MLME_SCAN->WrapperC.OPENZB_MLME_SCAN;
   
-  NWKM.MCPS_DATA->WrapperC;
-
-
-
+  NWKM.MCPS_DATA->WrapperC.OPENZB_MCPS_DATA;
+#endif
 
 ///////////////
-  
-
-
-
-       
-       
-       
+       
        //NLDE NWK data service  
        NLDE_DATA=NWKM;
        

diff --git a/tos/lib/net/zigbee/ieee802154/nwk/NWKM.nc b/tos/lib/net/zigbee/ieee802154/nwk/NWKM.nc
index 9b0c42b05c8b4e8d299070633513cc91a13f9a6d..b0b35f5bb2c736a700c4854f3a9090b5484d52f3 100644 (file)
--- a/tos/lib/net/zigbee/ieee802154/nwk/NWKM.nc
+++ b/tos/lib/net/zigbee/ieee802154/nwk/NWKM.nc
@@ -8,11 +8,11 @@
 
 module NWKM {
        
-//uses
-       uses interface Leds;
 
-       //MAC interfaces
+       uses interface Leds;
        
+       //MAC interfaces
+#ifndef TKN154_MAC
        uses interface MLME_START;
        
        uses interface MLME_GET;
@@ -36,6 +36,33 @@ module NWKM {
        
        uses interface MCPS_DATA;
 
+#else
+       uses interface OPENZB_MLME_START as MLME_START;
+       
+       uses interface OPENZB_MLME_GET as MLME_GET;
+       uses interface OPENZB_MLME_SET as MLME_SET;
+       
+       uses interface OPENZB_MLME_BEACON_NOTIFY as MLME_BEACON_NOTIFY;
+       uses interface OPENZB_MLME_GTS as MLME_GTS;
+       
+       uses interface OPENZB_MLME_ASSOCIATE as MLME_ASSOCIATE;
+       uses interface OPENZB_MLME_DISASSOCIATE as MLME_DISASSOCIATE;
+       
+       uses interface OPENZB_MLME_ORPHAN as MLME_ORPHAN;
+       
+       uses interface OPENZB_MLME_SYNC as MLME_SYNC;
+       uses interface OPENZB_MLME_SYNC_LOSS as MLME_SYNC_LOSS;
+       
+       uses interface OPENZB_MLME_RESET as MLME_RESET;
+       
+       uses interface OPENZB_MLME_SCAN as MLME_SCAN;
+       
+       
+       uses interface OPENZB_MCPS_DATA as MCPS_DATA;
+
+
+#endif
+
 
        uses interface Random;
 
@@ -934,7 +961,7 @@ command error_t NLME_NETWORK_FORMATION.request(uint32_t ScanChannels, uint8_t Sc
 
 
 
-call MLME_RESET.request(1);
+