Make timing the optimal values.

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

diff --git a/tos/lib/net/ctp/CtpForwardingEngine.h b/tos/lib/net/ctp/CtpForwardingEngine.h
index f79f6720114b7910ba0c1d4bc01e92036f94cd54..e45d0231198083038b40fffd03f6cd16e3fcc72e 100644 (file)
--- a/tos/lib/net/ctp/CtpForwardingEngine.h
+++ b/tos/lib/net/ctp/CtpForwardingEngine.h
@@ -58,24 +58,25 @@
  */
 
 enum {
-#if PLATFORM_MICAZ || PLATFORM_TELOSA || PLATFORM_TELOSB || PLATFORM_TMOTE
-  FORWARD_PACKET_TIME = 4,
+#if PLATFORM_MICAZ || PLATFORM_TELOSA || PLATFORM_TELOSB || PLATFORM_TMOTE || PLATFORM_INTELMOTE2 || PLATFORM_SHIMMER || PLATFORM_IRIS
+  FORWARD_PACKET_TIME = 7,
 #else
   FORWARD_PACKET_TIME = 32,
 #endif
 };
 
 enum {
-  SENDDONE_FAIL_OFFSET      =                       512,
-  SENDDONE_NOACK_OFFSET     = FORWARD_PACKET_TIME  << 2,
-  SENDDONE_OK_OFFSET        = FORWARD_PACKET_TIME  << 2,
-  LOOPY_OFFSET              = FORWARD_PACKET_TIME  << 4,
-  SENDDONE_FAIL_WINDOW      = SENDDONE_FAIL_OFFSET  - 1,
-  LOOPY_WINDOW              = LOOPY_OFFSET          - 1,
-  SENDDONE_NOACK_WINDOW     = SENDDONE_NOACK_OFFSET - 1,
-  SENDDONE_OK_WINDOW        = SENDDONE_OK_OFFSET    - 1,
+  SENDDONE_OK_OFFSET        = FORWARD_PACKET_TIME,
+  SENDDONE_OK_WINDOW        = FORWARD_PACKET_TIME,
+  SENDDONE_NOACK_OFFSET     = FORWARD_PACKET_TIME,
+  SENDDONE_NOACK_WINDOW     = FORWARD_PACKET_TIME,
+  SENDDONE_FAIL_OFFSET      = FORWARD_PACKET_TIME  << 2,
+  SENDDONE_FAIL_WINDOW      = SENDDONE_FAIL_OFFSET,
+  LOOPY_OFFSET              = FORWARD_PACKET_TIME  << 2,
+  LOOPY_WINDOW              = LOOPY_OFFSET,
   CONGESTED_WAIT_OFFSET     = FORWARD_PACKET_TIME  << 2,
-  CONGESTED_WAIT_WINDOW     = CONGESTED_WAIT_OFFSET - 1,
+  CONGESTED_WAIT_WINDOW     = CONGESTED_WAIT_OFFSET,
+  NO_ROUTE_RETRY            = 10000
 };
 
 
@@ -110,7 +111,7 @@ typedef nx_struct {
  * of how many times the packet has been transmitted.
  */
 typedef struct {
-  message_t *msg;
+  message_t * ONE_NOK msg;
   uint8_t client;
   uint8_t retries;
 } fe_queue_entry_t;