[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/atm128/sim atm128hardware.h, 1.5, 1.6

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


Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/atm128/sim
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26594/tos/chips/atm128/sim

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


Index: atm128hardware.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/atm128/sim/atm128hardware.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** atm128hardware.h	27 Apr 2007 17:32:20 -0000	1.5
--- atm128hardware.h	8 Oct 2007 20:10:09 -0000	1.6
***************
*** 49,56 ****
  /* We need slightly different defs than SIGNAL, INTERRUPT */
  #define AVR_ATOMIC_HANDLER(signame) \
!   void signame() __attribute__ ((spontaneous, C))
  
  #define AVR_NONATOMIC_HANDLER(signame) \
!   void signame() __attribute__ ((spontaneous, C))
  
  /* Macro to create union casting functions. */
--- 49,56 ----
  /* We need slightly different defs than SIGNAL, INTERRUPT */
  #define AVR_ATOMIC_HANDLER(signame) \
!   void signame() @spontaneous() @C()
  
  #define AVR_NONATOMIC_HANDLER(signame) \
!   void signame() @spontaneous() @C()
  
  /* Macro to create union casting functions. */
***************
*** 90,94 ****
  /* Saves current interrupt mask state and disables interrupts. */
  inline __nesc_atomic_t 
! __nesc_atomic_start(void) __attribute__((spontaneous))
  {
      __nesc_atomic_t result = SREG;
--- 90,94 ----
  /* Saves current interrupt mask state and disables interrupts. */
  inline __nesc_atomic_t 
! __nesc_atomic_start(void) @spontaneous()
  {
      __nesc_atomic_t result = SREG;
***************
*** 99,103 ****
  /* Restores interrupt mask to original state. */
  inline void 
! __nesc_atomic_end(__nesc_atomic_t original_SREG) __attribute__((spontaneous))
  {
    SREG = original_SREG;
--- 99,103 ----
  /* Restores interrupt mask to original state. */
  inline void 
! __nesc_atomic_end(__nesc_atomic_t original_SREG) @spontaneous()
  {
    SREG = original_SREG;



More information about the Tinyos-2-commits mailing list