Merge TinyOS 2.1.1 into master.

[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 d0946336d65f4480d722e5729523ce8ddc6bcf92..ccb92dbf3db3a1f1ccbf02db384d0af55b09358e 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 || PLATFORM_INTELMOTE2
-  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
 };
 
 
@@ -89,19 +90,6 @@ enum {
   MAX_RETRIES = 30
 };
 
-/*
- * The network header that the ForwardingEngine introduces.
- * This header will change for the TinyOS 2.0 full release 
- * (it needs several optimizations).
- */
-typedef nx_struct {
-  nx_uint8_t control;
-  nx_am_addr_t origin;
-  nx_uint8_t seqno;
-  nx_uint8_t collectid;
-  nx_uint16_t gradient;
-} network_header_t;
-
 /*
  * An element in the ForwardingEngine send queue.
  * The client field keeps track of which send client