Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / chips / cc1000 / CC1000Msg.h

diff --git a/tos/chips/cc1000/CC1000Msg.h b/tos/chips/cc1000/CC1000Msg.h
index a2df2697cc2e260f32fc007fec02cfce3b9011c8..c106b7a090a1df93c2bfc87ee94420e2b30f8410 100644 (file)
--- a/tos/chips/cc1000/CC1000Msg.h
+++ b/tos/chips/cc1000/CC1000Msg.h
@@ -29,9 +29,15 @@ typedef enum {
 typedef nx_struct CC1KMetadata {
   nx_int16_t strength_or_preamble; /* negative when used for preamble length */
   nx_uint8_t metadataBits;
-  nx_uint16_t time;
+  nx_bool timesync;
+  nx_uint32_t timestamp;
   nx_uint8_t sendSecurityMode;
   nx_uint8_t receiveSecurityMode;  
 } cc1000_metadata_t;
 
+enum
+{
+  CC1000_INVALID_TIMESTAMP  = 0x80000000L,
+};
+
 #endif