[Tinyos-2-commits] CVS: tinyos-2.x/tos/platforms/mica2/chips/at45db HplAt45dbIOC.nc, 1.2, 1.3 HplAt45dbIOP.nc, 1.2, 1.3 HplAt45db_chip.h, 1.2, 1.3

Phil Levis scipio at users.sourceforge.net
Tue Nov 7 11:32:08 PST 2006


Update of /cvsroot/tinyos/tinyos-2.x/tos/platforms/mica2/chips/at45db
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22851/tos/platforms/mica2/chips/at45db

Modified Files:
	HplAt45dbIOC.nc HplAt45dbIOP.nc HplAt45db_chip.h 
Log Message:
Merge over into the trunk.



Index: HplAt45dbIOP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/mica2/chips/at45db/HplAt45dbIOP.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HplAt45dbIOP.nc	12 Jul 2006 17:02:54 -0000	1.2
--- HplAt45dbIOP.nc	7 Nov 2006 19:31:24 -0000	1.3
***************
*** 100,104 ****
  	 : "=d" (spiIn) : "0" (spiIn), "r" (spiOut))
  
!   async command void FlashSpi.write(uint8_t spiOut, uint8_t *pspiIn) {
      uint8_t spiIn = 0;
  
--- 100,104 ----
  	 : "=d" (spiIn) : "0" (spiIn), "r" (spiOut))
  
!   async command uint8_t FlashSpi.write(uint8_t spiOut) {
      uint8_t spiIn = 0;
  
***************
*** 118,122 ****
        }
  
!     *pspiIn = spiIn;
    }
  
--- 118,122 ----
        }
  
!     return spiIn;
    }
  




More information about the Tinyos-2-commits mailing list