Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / lib / net / ctp / Ctp.h

diff --git a/tos/lib/net/ctp/Ctp.h b/tos/lib/net/ctp/Ctp.h
index 5ba6a0b78e1d6bcf02ba334f531d643eed0dca38..fe5ad7e6336294d5b8fcd631a7ddf6f77f24c53e 100644 (file)
--- a/tos/lib/net/ctp/Ctp.h
+++ b/tos/lib/net/ctp/Ctp.h
@@ -50,13 +50,14 @@
 
 enum {
     // AM types:
-    AM_CTP_DATA    = 23,
-    AM_CTP_ROUTING = 24,
-    AM_CTP_DEBUG   = 25,
+    AM_CTP_ROUTING = 0x70,
+    AM_CTP_DATA    = 0x71,
+    AM_CTP_DEBUG   = 0x72,
 
     // CTP Options:
     CTP_OPT_PULL      = 0x80, // TEP 123: P field
     CTP_OPT_ECN       = 0x40, // TEP 123: C field
+    CTP_OPT_ALL       = 0xff
 };
 
 typedef nx_uint8_t nx_ctp_options_t;
@@ -69,14 +70,14 @@ typedef nx_struct {
   nx_am_addr_t        origin;
   nx_uint8_t          originSeqNo;
   nx_collection_id_t  type;
-  nx_uint8_t          data[0];
+  nx_uint8_t (COUNT(0) data)[0]; // Deputy place-holder, field will probably be removed when we Deputize Ctp
 } ctp_data_header_t;
 
 typedef nx_struct {
   nx_ctp_options_t    options;
   nx_am_addr_t        parent;
   nx_uint16_t         etx;
-  nx_uint8_t          data[0];
+  nx_uint8_t (COUNT(0) data)[0]; // Deputy place-holder, field will probably be removed when we Deputize Ctp
 } ctp_routing_header_t;
 
 #endif