simplify default channel configuration

[tinyos-2.x.git] / tos / chips / rf2xx / rf230 / RF230ActiveMessageP.nc

diff --git a/tos/chips/rf2xx/rf230/RF230ActiveMessageP.nc b/tos/chips/rf2xx/rf230/RF230ActiveMessageP.nc
index 71b1330723f3355ab57430c4daec7af27d30d5b4..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);
@@ -268,7 +263,7 @@ implementation
 
        async command uint8_t SlottedCollisionConfig.getScheduleExponent()
        {
-               return 11;
+               return 1 + RADIO_ALARM_MILLI_EXP;
        }
 
        async command uint16_t SlottedCollisionConfig.getTransmitTime(message_t* msg)