Merge over into the trunk.

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

diff --git a/tos/chips/cc1000/CC1000Msg.h b/tos/chips/cc1000/CC1000Msg.h
index 282a74334b053639c5b05ec196ea638ad4862d0c..8932aa6a3d4b5b422d59f8b0bad4f03c865d15a6 100644 (file)
--- a/tos/chips/cc1000/CC1000Msg.h
+++ b/tos/chips/cc1000/CC1000Msg.h
@@ -4,7 +4,8 @@
 #include "AM.h"
 
 typedef nx_struct CC1KHeader {
-  nx_am_addr_t addr;
+  nx_am_addr_t dest;
+  nx_am_addr_t source;
   nx_uint8_t length;
   nx_am_group_t group;
   nx_am_id_t type;
@@ -15,7 +16,7 @@ typedef nx_struct CC1KFooter {
 } cc1000_footer_t;
 
 typedef nx_struct CC1KMetadata {
-  nx_uint16_t strength;
+  nx_int16_t strength_or_preamble; /* negative when used for preamble length */
   nx_uint8_t ack;
   nx_uint16_t time;
   nx_uint8_t sendSecurityMode;