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 e219b7cf146f9e43b5e639bc363c893ba516f042..e91bf224024b8e098973b569178b28e5d219e33f 100644 (file)
--- a/tos/chips/rf2xx/rf230/RF230ActiveMessage.h
+++ b/tos/chips/rf2xx/rf230/RF230ActiveMessage.h
@@ -24,14 +24,24 @@
 #ifndef __RF230ACTIVEMESSAGE_H__
 #define __RF230ACTIVEMESSAGE_H__
 
-#include <IEEE154PacketLayer.h>
+#include <IEEE154MessageLayer.h>
+#include <LowpanNetworkLayer.h>
+#include <ActiveMessageLayer.h>
 #include <MetadataFlagsLayer.h>
 #include <RF230DriverLayer.h>
 #include <TimeStampingLayer.h>
 #include <LowPowerListeningLayer.h>
 #include <PacketLinkLayer.h>
 
-typedef ieee154_header_t rf230packet_header_t;
+typedef nx_struct rf230packet_header_t
+{
+       rf230_header_t rf230;
+       ieee154_header_t ieee154;
+#ifndef TFRAMES_ENABLED
+       lowpan_header_t lowpan;
+#endif
+       activemessage_header_t am;
+} rf230packet_header_t;
 
 typedef nx_struct rf230packet_footer_t
 {
@@ -40,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__