[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/tosboot/micaz avrhardware.h, 1.1, 1.2

David Gay idgay at users.sourceforge.net
Mon Oct 8 13:10:11 PDT 2007


Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/tosboot/micaz
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26594/tos/lib/tosboot/micaz

Modified Files:
	avrhardware.h 
Log Message:
don't use __attribute__ for nesC attributes


Index: avrhardware.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/tosboot/micaz/avrhardware.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** avrhardware.h	11 Jul 2007 00:42:56 -0000	1.1
--- avrhardware.h	8 Oct 2007 20:10:09 -0000	1.2
***************
*** 134,141 ****
  // We need slightly different defs than SIGNAL, INTERRUPT
  #define TOSH_SIGNAL(signame)					\
! void signame() __attribute__ ((signal, spontaneous, C))
  
  #define TOSH_INTERRUPT(signame)				\
! void signame() __attribute__ ((interrupt, spontaneous, C))
  
  /* Watchdog Prescaler
--- 134,141 ----
  // We need slightly different defs than SIGNAL, INTERRUPT
  #define TOSH_SIGNAL(signame)					\
!   void signame() __attribute__ ((signal)) @spontaneous() @C()
  
  #define TOSH_INTERRUPT(signame)				\
!   void signame() __attribute__ ((interrupt)) @spontaneous() @C()
  
  /* Watchdog Prescaler
***************
*** 167,171 ****
  /* #ifndef NESC_BUILD_BINARY */
  
! /* inline __nesc_atomic_t __nesc_atomic_start(void) __attribute__((spontaneous)) */
  /* { */
  /*   __nesc_atomic_t result = inp(SREG); */
--- 167,171 ----
  /* #ifndef NESC_BUILD_BINARY */
  
! /* inline __nesc_atomic_t __nesc_atomic_start(void) @spontaneous() */
  /* { */
  /*   __nesc_atomic_t result = inp(SREG); */
***************
*** 174,178 ****
  /* } */
  
! /* inline void __nesc_atomic_end(__nesc_atomic_t oldSreg) __attribute__((spontaneous)) */
  /* { */
  /*   outp(oldSreg, SREG); */
--- 174,178 ----
  /* } */
  
! /* inline void __nesc_atomic_end(__nesc_atomic_t oldSreg) @spontaneous() */
  /* { */
  /*   outp(oldSreg, SREG); */



More information about the Tinyos-2-commits mailing list