[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/safe/include deputy_annots.h, 1.2, 1.3 deputy_no_annots.h, 1.1, 1.2

[John Regehr]

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

Modified Files:
	deputy_annots.h deputy_no_annots.h 
Log Message:
add TRUSTEDBLOCK annotations

Index: deputy_annots.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/safe/include/deputy_annots.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** deputy_annots.h	11 Feb 2008 20:46:38 -0000	1.2
--- deputy_annots.h	11 Feb 2008 21:17:04 -0000	1.3
***************
*** 9,10 ****
--- 9,11 ----
  #define __DEPUTY_TRUSTED                       __attribute__((trusted))
  #define __DEPUTY_COPYTYPE                      __attribute__((copytype))
+ #define __DEPUTY_TRUSTEDBLOCK                  __blockattribute__((trusted))

Index: deputy_no_annots.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/safe/include/deputy_no_annots.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** deputy_no_annots.h	11 Feb 2008 20:46:38 -0000	1.1
--- deputy_no_annots.h	11 Feb 2008 21:17:04 -0000	1.2
***************
*** 4,6 ****
  #define __DEPUTY_TRUSTED_CAST(__type,__expr)   
  
! #define TC(__type,__expr)                      __DEPUTY_TRUSTED_CAST(__type,__expr)
--- 4,11 ----
  #define __DEPUTY_TRUSTED_CAST(__type,__expr)   
  
! #define TC(__type,__expr)                      
! 
! #define __DEPUTY_NONNULL                       
! #define __DEPUTY_TRUSTED                       
! #define __DEPUTY_COPYTYPE                      
! #define __DEPUTY_TRUSTEDBLOCK