From 64b6cdad82d59d479856f52b6117e30fb9bebc7e Mon Sep 17 00:00:00 2001 From: mmaroti Date: Sun, 8 Mar 2009 23:29:05 +0000 Subject: [PATCH] rename everything to support the RF212 --- tos/chips/rf230/RadioAssert.h | 2 +- tos/chips/rf230/SlottedCollisionLayerC.nc | 2 +- tos/chips/rf230/SlottedCollisionLayerP.nc | 4 ++-- tos/chips/rf230/Tasklet.h | 2 +- tos/chips/rf230/TrafficMonitorLayerC.nc | 2 +- tos/chips/rf230/TrafficMonitorLayerP.nc | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tos/chips/rf230/RadioAssert.h b/tos/chips/rf230/RadioAssert.h index 19f17262..0194f21e 100644 --- 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 00288463..fb3962b3 100644 --- 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 f9108ee1..4a7eaff6 100644 --- 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 38f185fb..e4cd520c 100644 --- 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 b144c8ab..bad50e12 100644 --- 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 144fc0f5..237ea815 100644 --- 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; -- 2.39.2