new failure handler interface

diff --git a/tos/lib/safe/avr/fail.c b/tos/lib/safe/avr/fail.c
index f3bf47dd9d39353deabeade71a56f381ada1ecef..c74c584b184d1151325ba19aa8b550b06ff8050a 100644 (file)
--- a/tos/lib/safe/avr/fail.c
+++ b/tos/lib/safe/avr/fail.c
@@ -138,7 +138,7 @@ static inline void load_to_z_and_break (int value)
                : "=z"(value)  : "r" (value));
 }
 
-void deputy_fail_noreturn_fast (const char* file, int flid, const char* func)
+void deputy_fail_noreturn_fast (int flid)
 {
   asm volatile ("cli");
   load_to_z_and_break (flid);
@@ -171,18 +171,12 @@ void deputy_fail_noreturn_fast (const char* file, int flid, const char* func)
 
 }
 
-void deputy_fail_mayreturn(const char *check, const char *text,
-                           const char* file, int line, const char* func)
+void deputy_fail_mayreturn(int flid)
 {
-    // I don't think this has any meaning without FLID transformation
-    // FLID transformation stores FLID in line variable
-    deputy_fail_noreturn_fast(file, line, func);
+    deputy_fail_noreturn_fast(flid);
 }
 
-void deputy_fail_noreturn(const char *check, const char *text,
-                          const char* file, int line, const char* func)
+void deputy_fail_noreturn(int flid)
 {
-    // I don't think this has any meaning without FLID transformation
-    // FLID transformation stores FLID in line variable
-    deputy_fail_noreturn_fast(file, line, func);
+    deputy_fail_noreturn_fast(flid);
 }

diff --git a/tos/lib/safe/msp430/fail.c b/tos/lib/safe/msp430/fail.c
index dabc72fac2ced3fde875a4970140d75cfa49c489..9c39be5540f0f0b86b90bb2198e13b760f03c3e4 100644 (file)
--- a/tos/lib/safe/msp430/fail.c
+++ b/tos/lib/safe/msp430/fail.c
@@ -122,7 +122,7 @@ static void display_int_flid (const unsigned int x)
 }
 
 // Not sure how to do this in Telosb without looking it up
-void deputy_fail_noreturn_fast (const char* file, int flid, const char* func)
+void deputy_fail_noreturn_fast (int flid)
 {
   // disable interrupts
   // set LEDS to output
@@ -133,18 +133,12 @@ void deputy_fail_noreturn_fast (const char* file, int flid, const char* func)
 
 }
 
-void deputy_fail_mayreturn(const char *check, const char *text,
-                           const char* file, int line, const char* func)
+void deputy_fail_mayreturn(int flid)
 {
-    // I don't think this has any meaning without FLID transformation
-    // FLID transformation stores FLID in line variable
-    deputy_fail_noreturn_fast(file, line, func);
+    deputy_fail_noreturn_fast(flid);
 }
 
-void deputy_fail_noreturn(const char *check, const char *text,
-                          const char* file, int line, const char* func)
+void deputy_fail_noreturn(int flid)
 {
-    // I don't think this has any meaning without FLID transformation
-    // FLID transformation stores FLID in line variable
-    deputy_fail_noreturn_fast(file, line, func);
+    deputy_fail_noreturn_fast(flid);
 }