rename the TRF230 timer to TRadio

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

diff --git a/tos/chips/rf230/RF230PacketP.nc b/tos/chips/rf230/RF230PacketP.nc
index 646cf122c779dc6c293800d38dd62473a3319a8d..7a8d117ad2d6b5a70d7540b992bf7dafba65f71c 100644 (file)
--- a/tos/chips/rf230/RF230PacketP.nc
+++ b/tos/chips/rf230/RF230PacketP.nc
@@ -36,7 +36,7 @@ module RF230PacketP
                interface PacketField<uint16_t> as PacketSleepInterval;
                interface PacketField<uint8_t> as PacketTimeSyncOffset;
 
-               interface PacketTimeStamp<TRF230, uint32_t> as PacketTimeStampRadio;
+               interface PacketTimeStamp<TRadio, uint32_t> as PacketTimeStampRadio;
                interface PacketTimeStamp<TMilli, uint32_t> as PacketTimeStampMilli;
        }
 
@@ -44,7 +44,7 @@ module RF230PacketP
        {
                interface IEEE154Packet;
 
-               interface LocalTime<TRF230> as LocalTimeRadio;
+               interface LocalTime<TRadio> as LocalTimeRadio;
                interface LocalTime<TMilli> as LocalTimeMilli;
        }
 }
@@ -55,7 +55,7 @@ implementation
        {
                PACKET_LENGTH_INCREASE = 
                        sizeof(rf230packet_header_t) - 1        // the 8-bit length field is not counted
-                       + sizeof(ieee154_footer_t),                     // the CRC is not stored in memory
+                       + sizeof(ieee154_footer_t),             // the CRC is not stored in memory
        };
 
        inline rf230packet_metadata_t* getMeta(message_t* msg)
@@ -69,10 +69,6 @@ implementation
        {
                call IEEE154Packet.createDataFrame(msg);
 
-#ifdef IEEE154_6LOWPAN
-               call IEEE154Packet.set6LowPan(msg, TINYOS_6LOWPAN_NETWORK_ID);
-#endif
-
                getMeta(msg)->flags = RF230PACKET_CLEAR_METADATA;
        }
 
@@ -81,13 +77,11 @@ implementation
                call IEEE154Packet.setLength(msg, len + PACKET_LENGTH_INCREASE);
        }
 
-       // TODO: make Packet.payloadLength async
        inline command uint8_t Packet.payloadLength(message_t* msg) 
        {
                return call IEEE154Packet.getLength(msg) - PACKET_LENGTH_INCREASE;
        }
 
-       // TODO: make Packet.maxPayloadLength async
        inline command uint8_t Packet.maxPayloadLength()
        {
                return TOSH_DATA_LENGTH;