From d1c90a0a7cd67816dcd55ccf56875f487c9bdeb7 Mon Sep 17 00:00:00 2001 From: mmaroti Date: Mon, 30 Nov 2009 04:17:04 +0000 Subject: [PATCH] make TinyOS 6LOWPAN network ID available in the header --- tos/chips/rf2xx/layers/TinyosNetworkLayer.h | 4 ++++ tos/chips/rf2xx/layers/TinyosNetworkLayerC.nc | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tos/chips/rf2xx/layers/TinyosNetworkLayer.h b/tos/chips/rf2xx/layers/TinyosNetworkLayer.h index 11693c7d..5d29e5ec 100644 --- a/tos/chips/rf2xx/layers/TinyosNetworkLayer.h +++ b/tos/chips/rf2xx/layers/TinyosNetworkLayer.h @@ -24,6 +24,10 @@ #ifndef __TINYOSNETWORKLAYER_H__ #define __TINYOSNETWORKLAYER_H__ +#ifndef TINYOS_6LOWPAN_NETWORK_ID +#define TINYOS_6LOWPAN_NETWORK_ID 0x3f +#endif + typedef nx_struct network_header_t { nxle_uint8_t network; diff --git a/tos/chips/rf2xx/layers/TinyosNetworkLayerC.nc b/tos/chips/rf2xx/layers/TinyosNetworkLayerC.nc index 6757cbf7..385527db 100644 --- a/tos/chips/rf2xx/layers/TinyosNetworkLayerC.nc +++ b/tos/chips/rf2xx/layers/TinyosNetworkLayerC.nc @@ -23,10 +23,6 @@ #include -#ifndef TINYOS_6LOWPAN_NETWORK_ID -#define TINYOS_6LOWPAN_NETWORK_ID 0x3f -#endif - /* If TFRAMES_ENABLED is defined, then only TinyOS frames will be supported (with no network byte). If IEEE154FRAMES_ENABLED, then only IEEE 802.15.4 -- 2.39.2