[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/rf2xx/rf230 RF230ActiveMessageP.nc, 1.2, 1.3 RF230DriverConfig.nc, 1.1, 1.2 RF230DriverLayerP.nc, 1.3, 1.4

[Miklos Maroti]

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

Modified Files:
	RF230ActiveMessageP.nc RF230DriverConfig.nc 
	RF230DriverLayerP.nc 
Log Message:
simplify default channel configuration

Index: RF230ActiveMessageP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/rf230/RF230ActiveMessageP.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RF230ActiveMessageP.nc	10 Mar 2009 20:41:36 -0000	1.2
--- RF230ActiveMessageP.nc	27 Mar 2009 21:55:10 -0000	1.3
***************
*** 85,93 ****
  	}
  
- 	async command uint8_t RF230DriverConfig.getDefaultChannel()
- 	{
- 		return RF230_DEF_CHANNEL;
- 	}
- 
  	async command bool RF230DriverConfig.requiresRssiCca(message_t* msg)
  	{
--- 85,88 ----

Index: RF230DriverConfig.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/rf230/RF230DriverConfig.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RF230DriverConfig.nc	10 Mar 2009 20:37:58 -0000	1.1
--- RF230DriverConfig.nc	27 Mar 2009 21:55:10 -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: RF230DriverLayerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/rf230/RF230DriverLayerP.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RF230DriverLayerP.nc	26 Mar 2009 13:49:25 -0000	1.3
--- RF230DriverLayerP.nc	27 Mar 2009 21:55:10 -0000	1.4
***************
*** 226,230 ****
  
  		txPower = RF230_DEF_RFPOWER & RF230_TX_PWR_MASK;
! 		channel = call RF230DriverConfig.getDefaultChannel() & RF230_CHANNEL_MASK;
  		writeRegister(RF230_PHY_CC_CCA, RF230_CCA_MODE_VALUE | channel);
  
--- 226,230 ----
  
  		txPower = RF230_DEF_RFPOWER & RF230_TX_PWR_MASK;
! 		channel = RF230_DEF_CHANNEL & RF230_CHANNEL_MASK;
  		writeRegister(RF230_PHY_CC_CCA, RF230_CCA_MODE_VALUE | channel);