Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / lib / net / zigbee / ieee802154 / macTDBS / mac_enumerations.h

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