Fix the issue with tos-deluge not timing out properly.

[tinyos-2.x.git] / tos / types / TinyError.h

diff --git a/tos/types/TinyError.h b/tos/types/TinyError.h
index 1f1465952d5a79d63f62956ed2d4426499d53a99..b9767ae6580d1366c185991b1d6ecb8c82d683a0 100644 (file)
--- a/tos/types/TinyError.h
+++ b/tos/types/TinyError.h
@@ -1,5 +1,5 @@
 // $Id$
-/*                                                                     tab:4
+/*
  * "Copyright (c) 2000-2005 The Regents of the University  of California.  
  * All rights reserved.
  *
@@ -49,12 +49,13 @@ enum {
   ERESERVE       =  8,           // Reservation required before usage
   EALREADY       =  9,           // The device state you are requesting is already set
   ENOMEM         = 10,           // Memory required not available
-  ELAST          = 10            // Last enum value
+  ENOACK         = 11,           // A packet was not acknowledged
+  ELAST          = 11            // Last enum value
 };
 
 typedef uint8_t error_t NESC_COMBINE("ecombine");
 
-error_t ecombine(error_t r1, error_t r2)
+error_t ecombine(error_t r1, error_t r2) @safe()
 /* Returns: r1 if r1 == r2, FAIL otherwise. This is the standard error
      combination function: two successes, or two identical errors are
      preserved, while conflicting errors are represented by FAIL.