simplify default channel configuration

diff --git a/tos/chips/rf2xx/rf212/RF212ActiveMessageP.nc b/tos/chips/rf2xx/rf212/RF212ActiveMessageP.nc
index 34391daddcfbf60cf5084579f81adedd4c88ebe5..5e8104fdf74f8dfa04cc9ab0acbcdfadc447ef99 100644 (file)
--- a/tos/chips/rf2xx/rf212/RF212ActiveMessageP.nc
+++ b/tos/chips/rf2xx/rf212/RF212ActiveMessageP.nc
@@ -84,11 +84,6 @@ implementation
                return sizeof(rf212packet_header_t) - 1 + TOSH_DATA_LENGTH + sizeof(ieee154_footer_t);
        }
 
-       async command uint8_t RF212DriverConfig.getDefaultChannel()
-       {
-               return RF212_DEF_CHANNEL;
-       }
-
        async command bool RF212DriverConfig.requiresRssiCca(message_t* msg)
        {
                return call IEEE154Packet.isDataFrame(msg);

diff --git a/tos/chips/rf2xx/rf212/RF212DriverConfig.nc b/tos/chips/rf2xx/rf212/RF212DriverConfig.nc
index 49d53b3501964e0fbd6f8bbcae6e1ffd782bce0f..150b3424f85b67accd7b5dec852e87dfb52cce63 100644 (file)
--- a/tos/chips/rf2xx/rf212/RF212DriverConfig.nc
+++ b/tos/chips/rf2xx/rf212/RF212DriverConfig.nc
@@ -57,12 +57,6 @@ interface RF212DriverConfig
         */
        async command uint8_t getMaxLength();
 
-       /**
-        * 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.

diff --git a/tos/chips/rf2xx/rf212/RF212DriverLayerP.nc b/tos/chips/rf2xx/rf212/RF212DriverLayerP.nc
index e594bab1c84acee0f2f535f378f42a3ca932bcc4..2a9d35a34987c6529e300944630c4f6daccea69c 100644 (file)
--- a/tos/chips/rf2xx/rf212/RF212DriverLayerP.nc
+++ b/tos/chips/rf2xx/rf212/RF212DriverLayerP.nc
@@ -225,7 +225,7 @@ implementation
                writeRegister(RF212_PHY_TX_PWR, RF212_DEF_RFPOWER);
 
                txPower = RF212_DEF_RFPOWER;
-               channel = call RF212DriverConfig.getDefaultChannel() & RF212_CHANNEL_MASK;
+               channel = RF212_DEF_CHANNEL & RF212_CHANNEL_MASK;
                writeRegister(RF212_PHY_CC_CCA, RF212_CCA_MODE_VALUE | channel);
 
                call SLP_TR.set();

diff --git a/tos/chips/rf2xx/rf230/RF230ActiveMessageP.nc b/tos/chips/rf2xx/rf230/RF230ActiveMessageP.nc
index 58f658407dcbc8aa1170ac7236b8dc9ff0012f65..61473a4ccb62feeeba47b87b4ba62906c407d8af 100644 (file)
--- a/tos/chips/rf2xx/rf230/RF230ActiveMessageP.nc
+++ b/tos/chips/rf2xx/rf230/RF230ActiveMessageP.nc
@@ -84,11 +84,6 @@ implementation
                return sizeof(rf230packet_header_t) - 1 + TOSH_DATA_LENGTH + sizeof(ieee154_footer_t);
        }
 
-       async command uint8_t RF230DriverConfig.getDefaultChannel()
-       {
-               return RF230_DEF_CHANNEL;
-       }
-
        async command bool RF230DriverConfig.requiresRssiCca(message_t* msg)
        {
                return call IEEE154Packet.isDataFrame(msg);

diff --git a/tos/chips/rf2xx/rf230/RF230DriverConfig.nc b/tos/chips/rf2xx/rf230/RF230DriverConfig.nc
index 1b6b04f46b4ac2a223416ebc4554c0255f57491e..e6b05b3db8dc2518fc0d7ce909a5698607227d94 100644 (file)
--- a/tos/chips/rf2xx/rf230/RF230DriverConfig.nc
+++ b/tos/chips/rf2xx/rf230/RF230DriverConfig.nc
@@ -57,12 +57,6 @@ interface RF230DriverConfig
         */
        async command uint8_t getMaxLength();
 
-       /**
-        * 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.

diff --git a/tos/chips/rf2xx/rf230/RF230DriverLayerP.nc b/tos/chips/rf2xx/rf230/RF230DriverLayerP.nc
index b582d3cdd805d7836ad80f784d329862c825881e..17ea8ffa13a7be06272d0eb33272000c7f184061 100644 (file)
--- a/tos/chips/rf2xx/rf230/RF230DriverLayerP.nc
+++ b/tos/chips/rf2xx/rf230/RF230DriverLayerP.nc
@@ -225,7 +225,7 @@ implementation
                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;
+               channel = RF230_DEF_CHANNEL & RF230_CHANNEL_MASK;
                writeRegister(RF230_PHY_CC_CCA, RF230_CCA_MODE_VALUE | channel);
 
                call SLP_TR.set();