[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/rf2xx/rf230 RF230.h, 1.1, 1.2 RF230DriverLayerP.nc, 1.1, 1.2

[Miklos Maroti]

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

Modified Files:
	RF230.h RF230DriverLayerP.nc 
Log Message:
use the default TX power

Index: RF230.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/rf230/RF230.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RF230.h	10 Mar 2009 20:37:58 -0000	1.1
--- RF230.h	10 Mar 2009 21:44:00 -0000	1.2
***************
*** 97,101 ****
  	RF230_TX_AUTO_CRC_ON = 1 << 7,
  	RF230_TX_PWR_MASK = 0x0F,
- 	RF230_TX_PWR_DEFAULT = 0,
  	RF230_RSSI_MASK = 0x1F,
  	RF230_CCA_REQUEST = 1 << 7,
--- 97,100 ----

Index: RF230DriverLayerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/rf230/RF230DriverLayerP.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RF230DriverLayerP.nc	10 Mar 2009 20:37:58 -0000	1.1
--- RF230DriverLayerP.nc	10 Mar 2009 21:44:00 -0000	1.2
***************
*** 223,229 ****
  		writeRegister(RF230_IRQ_MASK, RF230_IRQ_TRX_UR | RF230_IRQ_PLL_LOCK | RF230_IRQ_TRX_END | RF230_IRQ_RX_START);
  		writeRegister(RF230_CCA_THRES, RF230_CCA_THRES_VALUE);
! 		writeRegister(RF230_PHY_TX_PWR, RF230_TX_AUTO_CRC_ON | RF230_TX_PWR_DEFAULT);
  
! 		txPower = RF230_TX_PWR_DEFAULT;
  		channel = call RF230DriverConfig.getDefaultChannel() & RF230_CHANNEL_MASK;
  		writeRegister(RF230_PHY_CC_CCA, RF230_CCA_MODE_VALUE | channel);
--- 223,229 ----
  		writeRegister(RF230_IRQ_MASK, RF230_IRQ_TRX_UR | RF230_IRQ_PLL_LOCK | RF230_IRQ_TRX_END | RF230_IRQ_RX_START);
  		writeRegister(RF230_CCA_THRES, RF230_CCA_THRES_VALUE);
! 		writeRegister(RF230_PHY_TX_PWR, RF230_TX_AUTO_CRC_ON | (RF230_DEF_RFPOWER & RF230_TX_PWR_MASK));
  
! 		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);