[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/handhelds/tos/interfaces SD.nc, 1.3, 1.4

[steve ayer]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/handhelds/tos/interfaces
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11765

Modified Files:
	SD.nc 
Log Message:

by way of cleanup:
----------------
removed (already commented-out) detect()

removed setBlockLength()

removed readRegister()

by way of augmenting the interface to support new SD_DMA driver:
---------------------------------------------------------------
added deSelect() and forceInit()

converted read/writeSector() calls to read/writeBlock(), using the
parameter list of the former.





Index: SD.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/handhelds/tos/interfaces/SD.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SD.nc	22 Jan 2008 20:22:21 -0000	1.3
--- SD.nc	27 Mar 2008 19:08:28 -0000	1.4
***************
*** 40,63 ****
  
    command result_t init ();
  
    command result_t setIdle();
  
-   // we don't have pin for this one yet; it uses cd
-   //  command result_t detect();
- 
-   // change block length to 2^len bytes; default is 512
-   command result_t setBlockLength (const uint16_t len);
- 
-   // see macro in module for writing to a sector instead of an address
    // read a block of size count from address
!   command result_t readBlock(const uint32_t address, const uint16_t count, uint8_t * buffer);
!   command result_t readSector(uint32_t sector, uint8_t * pBuffer);
! 
!   // see macro in module for writing to a sector instead of an address
!   command result_t writeBlock (const uint32_t address, const uint16_t count, uint8_t * buffer);
!   command result_t writeSector(uint32_t sector, uint8_t * pBuffer);
  
!   // register read of length len into buffer
!   command result_t readRegister(const uint8_t register, const uint8_t len, uint8_t * buffer);
  
    // Read the Card Size from the CSD Register
--- 40,52 ----
  
    command result_t init ();
+   async command result_t forceInit ();
+   command void deSelect();
  
    command result_t setIdle();
  
    // read a block of size count from address
!   command result_t readBlock(const uint32_t sector, uint8_t * Buffer);
  
!   command result_t writeBlock(const uint32_t sector, uint8_t * Buffer);
  
    // Read the Card Size from the CSD Register