Merge over into the trunk.

[tinyos-2.x.git] / tos / chips / tda5250 / tda5250_message.h

diff --git a/tos/chips/tda5250/tda5250_message.h b/tos/chips/tda5250/tda5250_message.h
index 8631d265a3a52cb5d52afad7ccd2741ea87c1968..4d8b563bc7df036ccf8ea3bbb9c98a0fded8b1ea 100644 (file)
--- a/tos/chips/tda5250/tda5250_message.h
+++ b/tos/chips/tda5250/tda5250_message.h
@@ -2,12 +2,14 @@
 #define TDA5250_MESSAGE_H
 
 #include "AM.h"
+#include "PacketAck.h"
 
 typedef nx_struct tda5250_header_t {
-  nx_am_addr_t addr;
-  nx_uint8_t length;
-  nx_am_group_t group;
-  nx_am_id_t type;
+  nx_uint8_t   length;
+  nx_am_addr_t src;
+  nx_am_addr_t dest;
+  nx_am_id_t   type;
+  nx_uint8_t   token;
 } tda5250_header_t;
 
 typedef nx_struct tda5250_footer_t {
@@ -17,7 +19,8 @@ typedef nx_struct tda5250_footer_t {
 typedef nx_struct tda5250_metadata_t {
   nx_uint16_t strength;
   nx_uint8_t ack;
-  nx_uint16_t time;
+  /* local time when message was generated */
+  nx_uint32_t time;
   nx_uint8_t sendSecurityMode;
   nx_uint8_t receiveSecurityMode;
 } tda5250_metadata_t;