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

[Razvan Musaloiu-E.]

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

Modified Files:
	hardware.h 
Log Message:
Merge of the latest Deluge T2.


Index: hardware.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/tosboot/micaz/hardware.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** hardware.h	11 Jul 2007 00:42:56 -0000	1.1
--- hardware.h	19 May 2008 21:25:09 -0000	1.2
***************
*** 81,86 ****
  typedef uint32_t ex_flash_addr_t;
  
! void wait( uint16_t t ) {
!   for ( ; t; t-- );
  }
  
--- 81,94 ----
  typedef uint32_t ex_flash_addr_t;
  
! static inline void wait( uint16_t dt ) {
!   /* In most cases (constant arg), the test is elided at compile-time */
!   if (dt)
!     /* loop takes 8 cycles. this is 1uS if running on an internal 8MHz
!        clock, and 1.09uS if running on the external crystal. */
!     asm volatile (
!       "1:       sbiw    %0,1\n"
!       " adiw    %0,1\n"
!       " sbiw    %0,1\n"
!       " brne    1b" : "+w" (dt));
  }