rename everything to support the RF212

diff --git a/tos/chips/rf230/RadioAssert.h b/tos/chips/rf230/RadioAssert.h
index 19f172626d3a9903d21be60b0e8f6be35a1109ac..0194f21e1100ff8a00c5222a2ef90724f1ef7f8f 100644 (file)
--- a/tos/chips/rf230/RadioAssert.h
+++ b/tos/chips/rf230/RadioAssert.h
@@ -24,7 +24,7 @@
 #ifndef __RADIOASSERT_H__
 #define __RADIOASSERT_H__
 
-#ifdef RF230_DEBUG
+#ifdef RF2XX_DEBUG
 
        void assert(bool condition, const char* file, uint16_t line);
        #define ASSERT(COND) assert(COND, __FILE__, __LINE__)

diff --git a/tos/chips/rf230/SlottedCollisionLayerC.nc b/tos/chips/rf230/SlottedCollisionLayerC.nc
index 002884635c12075af2eefc75c85d83bbf624aba8..fb3962b318d88519eea6fa18bb30e72baa884d05 100644 (file)
--- a/tos/chips/rf230/SlottedCollisionLayerC.nc
+++ b/tos/chips/rf230/SlottedCollisionLayerC.nc
@@ -50,7 +50,7 @@ implementation
        SlottedCollisionLayerP.Random -> RandomC;
        MainC.SoftwareInit -> SlottedCollisionLayerP;
 
-#ifdef RF230_DEBUG
+#ifdef RF2XX_DEBUG
        components DiagMsgC;
        SlottedCollisionLayerP.DiagMsg -> DiagMsgC;
 #endif

diff --git a/tos/chips/rf230/SlottedCollisionLayerP.nc b/tos/chips/rf230/SlottedCollisionLayerP.nc
index f9108ee1c2be399983105bc2fde187c209f96e3d..4a7eaff643d733be5435a75c50dbbb9c7685c9da 100644 (file)
--- a/tos/chips/rf230/SlottedCollisionLayerP.nc
+++ b/tos/chips/rf230/SlottedCollisionLayerP.nc
@@ -39,7 +39,7 @@ module SlottedCollisionLayerP
                interface RadioAlarm;
                interface Random;
                interface SlottedCollisionConfig as Config;
-#ifdef RF230_DEBUG
+#ifdef RF2XX_DEBUG
                interface DiagMsg;
 #endif
        }
@@ -252,7 +252,7 @@ implementation
                return SUCCESS;
        }
 
-#ifdef RF230_DEBUG
+#ifdef RF2XX_DEBUG
        tasklet_norace uint8_t count;
        void printStats()
        {

diff --git a/tos/chips/rf230/Tasklet.h b/tos/chips/rf230/Tasklet.h
index 38f185fb05bc0548321b61fe4a27e2d4635dbdd4..e4cd520c70179fba1bf425e1008ec8122cdcdc2f 100644 (file)
--- a/tos/chips/rf230/Tasklet.h
+++ b/tos/chips/rf230/Tasklet.h
@@ -36,4 +36,4 @@
 
 #endif
 
-#endif//__RF230_H__
+#endif//__TASKLET_H__

diff --git a/tos/chips/rf230/TrafficMonitorLayerC.nc b/tos/chips/rf230/TrafficMonitorLayerC.nc
index b144c8ab5b1417695fd2d92e03871676914de318..bad50e126558b769e42fa7badb7d1e7e3649395b 100644 (file)
--- a/tos/chips/rf230/TrafficMonitorLayerC.nc
+++ b/tos/chips/rf230/TrafficMonitorLayerC.nc
@@ -57,7 +57,7 @@ implementation
        TrafficMonitorLayerP.NeighborhoodFlag -> NeighborhoodFlagC;
        TrafficMonitorLayerP.Tasklet -> TaskletC;
 
-#ifdef RF230_DEBUG
+#ifdef RF2XX_DEBUG
        components DiagMsgC;
        TrafficMonitorLayerP.DiagMsg -> DiagMsgC;
 #endif

diff --git a/tos/chips/rf230/TrafficMonitorLayerP.nc b/tos/chips/rf230/TrafficMonitorLayerP.nc
index 144fc0f5541ea52a7dd82be4a5b8f3106c492aad..237ea8150ab324140bec9ee436caa19110f6197a 100644 (file)
--- a/tos/chips/rf230/TrafficMonitorLayerP.nc
+++ b/tos/chips/rf230/TrafficMonitorLayerP.nc
@@ -153,7 +153,7 @@ implementation
 
                call Tasklet.resume();
 
-#ifdef RF230_DEBUG
+#ifdef RF2XX_DEBUG
                if( ++debugCounter >= 10 && call DiagMsg.record() )
                {
                        debugCounter = 0;