[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/rf2xx/rf212 RF212ActiveMessageP.nc, 1.1, 1.2 RF212DriverConfig.nc, 1.1, 1.2 RF212DriverLayerP.nc, 1.1, 1.2

[Miklos Maroti]

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

Modified Files:
	RF212ActiveMessageP.nc RF212DriverConfig.nc 
	RF212DriverLayerP.nc 
Log Message:
simplify default channel configuration

Index: RF212ActiveMessageP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/rf212/RF212ActiveMessageP.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RF212ActiveMessageP.nc	10 Mar 2009 21:43:26 -0000	1.1
--- RF212ActiveMessageP.nc	27 Mar 2009 21:54:56 -0000	1.2
***************
*** 85,93 ****
  	}
  
- 	async command uint8_t RF212DriverConfig.getDefaultChannel()
- 	{
- 		return RF212_DEF_CHANNEL;
- 	}
- 
  	async command bool RF212DriverConfig.requiresRssiCca(message_t* msg)
  	{
--- 85,88 ----

Index: RF212DriverConfig.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/rf212/RF212DriverConfig.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RF212DriverConfig.nc	10 Mar 2009 21:43:26 -0000	1.1
--- RF212DriverConfig.nc	27 Mar 2009 21:54:56 -0000	1.2
***************
*** 59,68 ****
  
  	/**
- 	 * This command is used at power up to set the default channel.
- 	 * The default CC2420 channel is 26.
- 	 */
- 	async command uint8_t getDefaultChannel();
- 
- 	/**
  	 * Returns TRUE if before sending this message we should make sure that
  	 * the channel is clear via a very basic (and quick) RSSI check.
--- 59,62 ----

Index: RF212DriverLayerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/rf212/RF212DriverLayerP.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RF212DriverLayerP.nc	10 Mar 2009 21:43:26 -0000	1.1
--- RF212DriverLayerP.nc	27 Mar 2009 21:54:56 -0000	1.2
***************
*** 226,230 ****
  
  		txPower = RF212_DEF_RFPOWER;
! 		channel = call RF212DriverConfig.getDefaultChannel() & RF212_CHANNEL_MASK;
  		writeRegister(RF212_PHY_CC_CCA, RF212_CCA_MODE_VALUE | channel);
  
--- 226,230 ----
  
  		txPower = RF212_DEF_RFPOWER;
! 		channel = RF212_DEF_CHANNEL & RF212_CHANNEL_MASK;
  		writeRegister(RF212_PHY_CC_CCA, RF212_CCA_MODE_VALUE | channel);