Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / lib / net / dip / Dip.h

diff --git a/tos/lib/net/dip/Dip.h b/tos/lib/net/dip/Dip.h
index bcdfe21efd57d2f7aacc56bbaf73fc7b1259dc25..0d840f34709b8ddd348ef9e98f7b7dcc50a34faf 100644 (file)
--- a/tos/lib/net/dip/Dip.h
+++ b/tos/lib/net/dip/Dip.h
@@ -2,14 +2,16 @@
 #ifndef __DIP_H__
 #define __DIP_H__
 
-#define DIP_TAU_LOW (1024L)
-#define DIP_TAU_HIGH (65535L)
 
 #define UQ_DIP unique("DIP")
 #define UQCOUNT_DIP uniqueCount("DIP")
 
-#define DIP_UNKNOWN_VERSION 0xFFFFFFFF
-#define DIP_UNKNOWN_INDEX 0xFFFF
+enum {
+  DIP_TAU_LOW = 1024L,
+  DIP_TAU_HIGH = 65535L,
+  DIP_UNKNOWN_VERSION = 0xFFFFFFFF,
+  DIP_UNKNOWN_INDEX = 0xFFFF
+};
 
 typedef enum {
   ID_DIP_INVALID = 0x0,
@@ -19,10 +21,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;
@@ -71,7 +73,9 @@ typedef nx_struct dip_data {
   nx_uint8_t data[16];
 } dip_data_t;
 
-#define DIP_SUMMARY_VALUES_PER_PACKET 2
-#define DIP_VECTOR_VALUES_PER_PACKET 2
+enum {
+  DIP_SUMMARY_VALUES_PER_PACKET = 2,
+  DIP_VECTOR_VALUES_PER_PACKET = 2
+};
 
 #endif