From: gnawali <gnawali>
Date: Fri, 20 Jun 2008 21:54:24 +0000 (+0000)
Subject: Making AM IDs TEP 135 compliant
X-Git-Tag: release_tinyos_2_1_0_0~216
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=254090b8dfbfaf3c9611a75eb8c3ec25e502f1f7

Making AM IDs TEP 135 compliant
---

diff --git a/tos/lib/net/ctp/Ctp.h b/tos/lib/net/ctp/Ctp.h
index 5ba6a0b7..b821fca8 100644
--- a/tos/lib/net/ctp/Ctp.h
+++ b/tos/lib/net/ctp/Ctp.h
@@ -50,9 +50,9 @@
 
 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
diff --git a/tos/lib/net/dip/Dip.h b/tos/lib/net/dip/Dip.h
index bcdfe21e..b001d3eb 100644
--- a/tos/lib/net/dip/Dip.h
+++ b/tos/lib/net/dip/Dip.h
@@ -19,10 +19,10 @@ typedef enum {
 } dip_msgid_t;
 
 enum {
-  AM_DIP = 0x61,
-  AM_DIP_DATA_MSG = 0x61, // For MIG tool
-  AM_DIP_MSG = 0x61, // For MIG tool
-  AM_DIP_DATA = 0x61 // For MIG tool
+  AM_DIP = 0x62,
+  AM_DIP_DATA_MSG = 0x62, // For MIG tool
+  AM_DIP_MSG = 0x62, // For MIG tool
+  AM_DIP_DATA = 0x62 // For MIG tool
 };
 
 typedef uint16_t dip_index_t;
diff --git a/tos/lib/net/drip/DisseminationEngine.h b/tos/lib/net/drip/DisseminationEngine.h
index 5092a79f..18f101aa 100644
--- a/tos/lib/net/drip/DisseminationEngine.h
+++ b/tos/lib/net/drip/DisseminationEngine.h
@@ -38,8 +38,8 @@
  */
 
 enum {
-  AM_DISSEMINATION_MESSAGE = 13,
-  AM_DISSEMINATION_PROBE_MESSAGE = 14,
+  AM_DISSEMINATION_MESSAGE = 0x60,
+  AM_DISSEMINATION_PROBE_MESSAGE = 0x61,
   DISSEMINATION_SEQNO_UNKNOWN = 0,
 };
 
diff --git a/tos/lib/net/lqi/MultiHopLqi.h b/tos/lib/net/lqi/MultiHopLqi.h
index f4717e0e..a3fdacf8 100644
--- a/tos/lib/net/lqi/MultiHopLqi.h
+++ b/tos/lib/net/lqi/MultiHopLqi.h
@@ -90,9 +90,9 @@
 #define UQ_LQI_CLIENT "LqiForwardingEngineP.Send"
 
 enum {
-  AM_LQI_BEACON_MSG = 250,
-  AM_LQI_DATA_MSG = 251,
-  AM_LQI_DEBUG = 22,
+  AM_LQI_BEACON_MSG = 0x73,
+  AM_LQI_DATA_MSG = 0x74,
+  AM_LQI_DEBUG = 0x75,
   AM_LQI_DEBUG_PACKET = 3,
   NUM_LQI_CLIENTS = uniqueCount(UQ_LQI_CLIENT),
 };