]> oss.titaniummirror.com Git - tinyos-2.x.git/commitdiff
*** empty log message ***
authorrarseverino <rarseverino>
Mon, 7 Sep 2009 13:52:36 +0000 (13:52 +0000)
committerrarseverino <rarseverino>
Mon, 7 Sep 2009 13:52:36 +0000 (13:52 +0000)
tos/lib/net/zigbee/apps/Test_APL/Makefile
tos/lib/net/zigbee/ieee802154/nwk/NWK.nc
tos/lib/net/zigbee/ieee802154/nwk/NWKM.nc
tos/lib/net/zigbee/wrapper/WrapperC.nc

index 93e039a493a035404c231862969e37683eba8641..086b607e490591e6486f53365df58ee64e0e9219 100644 (file)
@@ -27,7 +27,7 @@ PFLAGS += -I$(TOSROOT)/tos/lib/mac/tkn154 \
 \
 -I$(TOSROOT)/tos/lib/net/zigbee/wrapper\
 -I$(TOSROOT)/tos/lib/net/zigbee/wrapper/interfaces/mac\
--I$(TOSROOT)/tos/lib/net/zigbee/ieee802154/includes \
+-I$(TOSROOT)/tos/lib/net/zigbee/wrapper/includes \
 -I$(TOSROOT)/tos/lib/net/zigbee/ieee802154/interfaces/nwk \
  -I$(TOSROOT)/tos/lib/net/zigbee/ieee802154/nwk
 
index b89ed06f2025bdf683739779b17462c1590e13b2..a23532575f3ecdbf2b97cf82d531a69b46103383 100644 (file)
@@ -6,14 +6,15 @@
 #include <Timer.h>
 
 #ifndef TKN154_MAC
-
+#endif
 #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"
 #include "nwk_const.h"
index b0b35f5bb2c736a700c4854f3a9090b5484d52f3..2a9c49b0b901a686097478fa77a63730ba613879 100644 (file)
@@ -6,6 +6,9 @@
 #include <Timer.h>
 #include "printfUART.h"
 
+
+
+
 module NWKM {
        
 
index 41f18572f4d1b1b3ed3b5eb6ba0107f9ec3791bb..1e6033bdade1800aef94465a6953e4952c21bd2b 100644 (file)
@@ -47,7 +47,7 @@ implementation
   WrapperM.MLME_SET -> MAC;
   
   WrapperM.MLME_BEACON_NOTIFY -> MAC;
-  WrapperM.MLME_GTS -> MAC;
+  //WrapperM.MLME_GTS -> MAC;
   
   WrapperM.MLME_ASSOCIATE -> MAC;
   WrapperM.MLME_DISASSOCIATE -> MAC;