should fix pointer warning

[tinyos-2.x.git] / tos / lib / net / blip / IPDispatch.h

diff --git a/tos/lib/net/blip/IPDispatch.h b/tos/lib/net/blip/IPDispatch.h
index b2e6caeca0801ed8e6848304c48102856bf22706..2435899619463834dd54e04ff0bd43d034ab1aad 100644 (file)
--- a/tos/lib/net/blip/IPDispatch.h
+++ b/tos/lib/net/blip/IPDispatch.h
@@ -32,7 +32,6 @@ enum {
   N_EPOCHS_COUNTED = 1,
   N_RECONSTRUCTIONS = 2,
   N_FORWARD_ENT = IP_NUMBER_FRAGMENTS,
-  N_RETRIES = 5,
 };
 
 enum {
@@ -42,11 +41,14 @@ enum {
   PATH_COST_DIFF_THRESH = 10, // Threshold for 'similar' path costs
   LQI_DIFF_THRESH = 10, // Threshold for 'similar' LQI's
   LINK_EVICT_THRESH = 50, // ETX * 10
-  LQI_ADMIT_THRESH = 0x200, 
-  RSSI_ADMIT_THRESH = 0,
   RANDOM_ROUTE = 20, //Percentage of time to select random default route
+  LQI_ADMIT_THRESH = 0x200, 
 };
 
+/* chip-specific lqi values */
+uint16_t adjustLQI(uint8_t val);
+
+
 enum {
   WITHIN_THRESH = 1,
   ABOVE_THRESH = 2,
@@ -60,8 +62,8 @@ enum {
 };
 #else
 enum {
+  TGEN_BASE_TIME = 16384L,
   TGEN_MAX_INTERVAL = 60L * 1024L * 5L,
-  TGEN_BASE_TIME = TGEN_MAX_INTERVAL,
 };
 #endif
 
@@ -113,7 +115,7 @@ typedef struct {
   uint8_t   nchoices:4;
   uint8_t   retries;
   uint8_t   actRetries;
-  uint8_t   delay;
+  uint16_t  delay;
 } send_policy_t;
 
 typedef struct {