[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/rf230 RadioAssert.h, 1.1, 1.2 SlottedCollisionLayerC.nc, 1.1, 1.2 SlottedCollisionLayerP.nc, 1.1, 1.2 Tasklet.h, 1.1, 1.2 TrafficMonitorLayerC.nc, 1.1, 1.2 TrafficMonitorLayerP.nc, 1.2, 1.3

[Miklos Maroti]

Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22470

Modified Files:
	RadioAssert.h SlottedCollisionLayerC.nc 
	SlottedCollisionLayerP.nc Tasklet.h TrafficMonitorLayerC.nc 
	TrafficMonitorLayerP.nc 
Log Message:
rename everything to support the RF212 

Index: RadioAssert.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230/RadioAssert.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RadioAssert.h	5 Nov 2007 20:36:57 -0000	1.1
--- RadioAssert.h	8 Mar 2009 23:29:05 -0000	1.2
***************
*** 25,29 ****
  #define __RADIOASSERT_H__
  
! #ifdef RF230_DEBUG
  
  	void assert(bool condition, const char* file, uint16_t line);
--- 25,29 ----
  #define __RADIOASSERT_H__
  
! #ifdef RF2XX_DEBUG
  
  	void assert(bool condition, const char* file, uint16_t line);

Index: SlottedCollisionLayerC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230/SlottedCollisionLayerC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SlottedCollisionLayerC.nc	5 Nov 2007 20:36:59 -0000	1.1
--- SlottedCollisionLayerC.nc	8 Mar 2009 23:29:05 -0000	1.2
***************
*** 51,55 ****
  	MainC.SoftwareInit -> SlottedCollisionLayerP;
  
! #ifdef RF230_DEBUG
  	components DiagMsgC;
  	SlottedCollisionLayerP.DiagMsg -> DiagMsgC;
--- 51,55 ----
  	MainC.SoftwareInit -> SlottedCollisionLayerP;
  
! #ifdef RF2XX_DEBUG
  	components DiagMsgC;
  	SlottedCollisionLayerP.DiagMsg -> DiagMsgC;

Index: SlottedCollisionLayerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230/SlottedCollisionLayerP.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SlottedCollisionLayerP.nc	5 Nov 2007 20:36:59 -0000	1.1
--- SlottedCollisionLayerP.nc	8 Mar 2009 23:29:05 -0000	1.2
***************
*** 40,44 ****
  		interface Random;
  		interface SlottedCollisionConfig as Config;
! #ifdef RF230_DEBUG
  		interface DiagMsg;
  #endif
--- 40,44 ----
  		interface Random;
  		interface SlottedCollisionConfig as Config;
! #ifdef RF2XX_DEBUG
  		interface DiagMsg;
  #endif
***************
*** 253,257 ****
  	}
  
! #ifdef RF230_DEBUG
  	tasklet_norace uint8_t count;
  	void printStats()
--- 253,257 ----
  	}
  
! #ifdef RF2XX_DEBUG
  	tasklet_norace uint8_t count;
  	void printStats()

Index: Tasklet.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230/Tasklet.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Tasklet.h	5 Nov 2007 20:37:00 -0000	1.1
--- Tasklet.h	8 Mar 2009 23:29:05 -0000	1.2
***************
*** 37,39 ****
  #endif
  
! #endif//__RF230_H__
--- 37,39 ----
  #endif
  
! #endif//__TASKLET_H__

Index: TrafficMonitorLayerC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230/TrafficMonitorLayerC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrafficMonitorLayerC.nc	5 Nov 2007 20:37:01 -0000	1.1
--- TrafficMonitorLayerC.nc	8 Mar 2009 23:29:05 -0000	1.2
***************
*** 58,62 ****
  	TrafficMonitorLayerP.Tasklet -> TaskletC;
  
! #ifdef RF230_DEBUG
  	components DiagMsgC;
  	TrafficMonitorLayerP.DiagMsg -> DiagMsgC;
--- 58,62 ----
  	TrafficMonitorLayerP.Tasklet -> TaskletC;
  
! #ifdef RF2XX_DEBUG
  	components DiagMsgC;
  	TrafficMonitorLayerP.DiagMsg -> DiagMsgC;

Index: TrafficMonitorLayerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230/TrafficMonitorLayerP.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TrafficMonitorLayerP.nc	25 Feb 2009 20:44:03 -0000	1.2
--- TrafficMonitorLayerP.nc	8 Mar 2009 23:29:05 -0000	1.3
***************
*** 154,158 ****
  		call Tasklet.resume();
  
! #ifdef RF230_DEBUG
  		if( ++debugCounter >= 10 && call DiagMsg.record() )
  		{
--- 154,158 ----
  		call Tasklet.resume();
  
! #ifdef RF2XX_DEBUG
  		if( ++debugCounter >= 10 && call DiagMsg.record() )
  		{