[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/safe/avr fail.c,1.1,1.2

[John Regehr]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/safe/avr
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1874/avr

Modified Files:
	fail.c 
Log Message:
new failure handler interface

Index: fail.c
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/safe/avr/fail.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fail.c	9 Feb 2008 00:50:00 -0000	1.1
--- fail.c	14 Feb 2008 20:27:36 -0000	1.2
***************
*** 139,143 ****
  }
  
! void deputy_fail_noreturn_fast (const char* file, int flid, const char* func)
  {
    asm volatile ("cli");
--- 139,143 ----
  }
  
! void deputy_fail_noreturn_fast (int flid)
  {
    asm volatile ("cli");
***************
*** 172,188 ****
  }
  
! void deputy_fail_mayreturn(const char *check, const char *text,
!                            const char* file, int line, const char* func)
  {
!     // 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);
  }
  
! void deputy_fail_noreturn(const char *check, const char *text,
!                           const char* file, int line, const char* func)
  {
!     // 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);
  }
--- 172,182 ----
  }
  
! void deputy_fail_mayreturn(int flid)
  {
!     deputy_fail_noreturn_fast(flid);
  }
  
! void deputy_fail_noreturn(int flid)
  {
!     deputy_fail_noreturn_fast(flid);
  }