From: mmaroti <mmaroti>
Date: Tue, 10 Mar 2009 21:44:00 +0000 (+0000)
Subject: use the default TX power
X-Git-Tag: rc_6_tinyos_2_1_1~459
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=8abc3bffc9ccd6df6ef444a5426ede31fe5cd7a2

use the default TX power
---

diff --git a/tos/chips/rf2xx/rf230/RF230.h b/tos/chips/rf2xx/rf230/RF230.h
index 781a1330..dd386a1d 100644
--- 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 c7e59fb2..725796c5 100644
--- 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);