reorganized packet header handling, added RF212Ieee154MessageC for BLIP

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

diff --git a/tos/chips/rf2xx/rf230/RF230ActiveMessage.h b/tos/chips/rf2xx/rf230/RF230ActiveMessage.h
index 940da72354a01e4aa4c5806511ae092974f73452..e91bf224024b8e098973b569178b28e5d219e33f 100644 (file)
--- a/tos/chips/rf2xx/rf230/RF230ActiveMessage.h
+++ b/tos/chips/rf2xx/rf230/RF230ActiveMessage.h
@@ -35,6 +35,7 @@
 
 typedef nx_struct rf230packet_header_t
 {
+       rf230_header_t rf230;
        ieee154_header_t ieee154;
 #ifndef TFRAMES_ENABLED
        lowpan_header_t lowpan;
@@ -49,15 +50,15 @@ typedef nx_struct rf230packet_footer_t
 
 typedef struct rf230packet_metadata_t
 {
-       flags_metadata_t flags;
-       rf230_metadata_t rf230;
-       timestamp_metadata_t timestamp;
 #ifdef LOW_POWER_LISTENING
        lpl_metadata_t lpl;
 #endif
 #ifdef PACKET_LINK
        link_metadata_t link;
 #endif
+       timestamp_metadata_t timestamp;
+       flags_metadata_t flags;
+       rf230_metadata_t rf230;
 } rf230packet_metadata_t;
 
 #endif//__RF230ACTIVEMESSAGE_H__