RF230: timesync changes to lower memory usage

[tinyos-2.x.git] / tos / chips / rf230 / RF230Packet.h

diff --git a/tos/chips/rf230/RF230Packet.h b/tos/chips/rf230/RF230Packet.h
index b3b0c39301aace356feb1c7a5387031ae728c994..7d952fe13c55941ad5af9ea602727621c207f408 100644 (file)
--- a/tos/chips/rf230/RF230Packet.h
+++ b/tos/chips/rf230/RF230Packet.h
@@ -25,30 +25,29 @@
 #define __RF230PACKET_H__
 
 #include <IEEE154Packet.h>
-#include <TimeSyncMessage.h>
 
 typedef ieee154_header_t rf230packet_header_t;
 
 typedef nx_struct rf230packet_footer_t
 {
-       timesync_footer_t timesync;
+       // the time stamp is not recorded here, time stamped messaged cannot have max length
 } rf230packet_footer_t;
 
-typedef nx_struct rf230packet_metadata_t
+typedef struct rf230packet_metadata_t
 {
-       nx_uint8_t flags;
-       nx_uint8_t lqi;
-       nx_uint8_t power;                               // shared between TXPOWER and RSSI
-       nx_uint16_t timestamp;
+       uint8_t flags;
+       uint8_t lqi;
+       uint8_t power;                          // shared between TXPOWER and RSSI
+       uint32_t timestamp;
 } rf230packet_metadata_t;
 
 enum rf230packet_metadata_flags
 {
        RF230PACKET_WAS_ACKED = 0x01,           // PacketAcknowledgements
        RF230PACKET_TIMESTAMP = 0x02,           // PacketTimeStamp
-       RF230PACKET_LAST_TOUCH = 0x04,  // PacketLastTouch.touch
-       RF230PACKET_TXPOWER = 0x10,             // PacketTransmitPower
-       RF230PACKET_RSSI = 0x20,                        // PacketRSSI
+       RF230PACKET_TXPOWER = 0x04,                     // PacketTransmitPower
+       RF230PACKET_RSSI = 0x08,                        // PacketRSSI
+       RF230PACKET_TIMESYNC = 0x10,            // PacketTimeSync (update timesync_footer)
 
        RF230PACKET_CLEAR_METADATA = 0x00,
 };