X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Flib%2Fnet%2Fctp%2FCtpForwardingEngine.h;h=e45d0231198083038b40fffd03f6cd16e3fcc72e;hb=d6e4bc62926324801eee6ea48783dce663d5b6b2;hp=92f72fda9f581ea9b434e0fa05bf42e7c708231d;hpb=ac19889e754777ca5b8e2d697ed6fa9b2c026fb0;p=tinyos-2.x.git

diff --git a/tos/lib/net/ctp/CtpForwardingEngine.h b/tos/lib/net/ctp/CtpForwardingEngine.h
index 92f72fda..e45d0231 100644
--- a/tos/lib/net/ctp/CtpForwardingEngine.h
+++ b/tos/lib/net/ctp/CtpForwardingEngine.h
@@ -58,24 +58,24 @@
  */
 
 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
 };