reorganized packet header handling, added RF212Ieee154MessageC for BLIP

[tinyos-2.x.git] / tos / chips / rf2xx / rf212 / RF212ActiveMessage.h

diff --git a/tos/chips/rf2xx/rf212/RF212ActiveMessage.h b/tos/chips/rf2xx/rf212/RF212ActiveMessage.h
index e13bba9844251d69be0d22eed591900f11a2ad6d..618d04895dd1cab7a27395910b5e4821930d2177 100644 (file)
--- a/tos/chips/rf2xx/rf212/RF212ActiveMessage.h
+++ b/tos/chips/rf2xx/rf212/RF212ActiveMessage.h
@@ -24,14 +24,24 @@
 #ifndef __RF212ACTIVEMESSAGE_H__
 #define __RF212ACTIVEMESSAGE_H__
 
-#include <IEEE154PacketLayer.h>
+#include <IEEE154MessageLayer.h>
+#include <LowpanNetworkLayer.h>
+#include <ActiveMessageLayer.h>
 #include <MetadataFlagsLayer.h>
 #include <RF212DriverLayer.h>
 #include <TimeStampingLayer.h>
 #include <LowPowerListeningLayer.h>
 #include <PacketLinkLayer.h>
 
-typedef ieee154_header_t rf212packet_header_t;
+typedef nx_struct rf212packet_header_t
+{
+       rf212_header_t rf212;
+       ieee154_header_t ieee154;
+#ifndef TFRAMES_ENABLED
+       lowpan_header_t lowpan;
+#endif
+       activemessage_header_t am;
+} rf212packet_header_t;
 
 typedef nx_struct rf212packet_footer_t
 {
@@ -40,15 +50,15 @@ typedef nx_struct rf212packet_footer_t
 
 typedef struct rf212packet_metadata_t
 {
-       flags_metadata_t flags;
-       rf212_metadata_t rf212;
-       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;
+       rf212_metadata_t rf212;
 } rf212packet_metadata_t;
 
 #endif//__RF212ACTIVEMESSAGE_H__