use the default TX power

diff --git a/tos/chips/rf2xx/rf230/RF230.h b/tos/chips/rf2xx/rf230/RF230.h
index 781a13306b8034c55f44d1d9eff07be31556f71c..dd386a1d17c82296751b062d32c6a898c3cd893d 100644 (file)
--- a/tos/chips/rf2xx/rf230/RF230.h
+++ b/tos/chips/rf2xx/rf230/RF230.h
@@ -96,7 +96,6 @@ enum rf230_phy_register_enums
 {
        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,
        RF230_CCA_MODE_0 = 0 << 5,

diff --git a/tos/chips/rf2xx/rf230/RF230DriverLayerP.nc b/tos/chips/rf2xx/rf230/RF230DriverLayerP.nc
index c7e59fb2f89e0a1657f79a572839f773c6fa0877..725796c550f008f762fdd75fdc1a94f3066a8e46 100644 (file)
--- a/tos/chips/rf2xx/rf230/RF230DriverLayerP.nc
+++ b/tos/chips/rf2xx/rf230/RF230DriverLayerP.nc
@@ -222,9 +222,9 @@ implementation
 
                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);
+               writeRegister(RF230_PHY_TX_PWR, RF230_TX_AUTO_CRC_ON | (RF230_DEF_RFPOWER & RF230_TX_PWR_MASK));
 
-               txPower = RF230_TX_PWR_DEFAULT;
+               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);