Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / lib / net / ctp / CtpRoutingPacket.nc

diff --git a/tos/lib/net/ctp/CtpRoutingPacket.nc b/tos/lib/net/ctp/CtpRoutingPacket.nc
index 5fa376c4b26a3a7826af9a523617c1d94e49c024..00153e61f8442886af5c798032036cae23835705 100644 (file)
--- a/tos/lib/net/ctp/CtpRoutingPacket.nc
+++ b/tos/lib/net/ctp/CtpRoutingPacket.nc
@@ -43,16 +43,16 @@
 interface CtpRoutingPacket {
 
   /* Allow individual options to be read, set, and reset independently */
-  command bool          getOption(message_t* msg, ctp_options_t opt);
-  command void          setOption(message_t* msg, ctp_options_t opt);
-  command void          clearOption(message_t* msg, ctp_options_t opt);
+  command bool          getOption(message_t* ONE msg, ctp_options_t opt);
+  command void          setOption(message_t* ONE msg, ctp_options_t opt);
+  command void          clearOption(message_t* ONE msg, ctp_options_t opt);
   
   /* Clear all options */
-  command void          clearOptions(message_t* msg);
+  command void          clearOptions(message_t* ONE msg);
 
-  command am_addr_t     getParent(message_t* msg);
-  command void          setParent(message_t* msg, am_addr_t addr);
+  command am_addr_t     getParent(message_t* ONE msg);
+  command void          setParent(message_t* ONE msg, am_addr_t addr);
 
-  command uint16_t      getEtx(message_t* msg);
-  command void          setEtx(message_t* msg, uint8_t etx);
+  command uint16_t      getEtx(message_t* ONE msg);
+  command void          setEtx(message_t* ONE msg, uint16_t etx);
 }