[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/handhelds/swtest/TestSD SDAppM.nc, 1.2, 1.3

[steve ayer]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/handhelds/swtest/TestSD
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18124

Modified Files:
	SDAppM.nc 
Log Message:

converted read/writeSector calls to read/writeBlock in accordance with
new interface.  commenting out Leds.init() is a bug.


Index: SDAppM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/handhelds/swtest/TestSD/SDAppM.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SDAppM.nc	22 Jan 2008 20:17:45 -0000	1.2
--- SDAppM.nc	27 Mar 2008 19:22:34 -0000	1.3
***************
*** 103,107 ****
      TOSH_CLR_UTXD0_PIN();  
  
!     call Leds.init();
  
      //    call Leds.greenOn();
--- 103,107 ----
      TOSH_CLR_UTXD0_PIN();  
  
!     //    call Leds.init();
  
      //    call Leds.greenOn();
***************
*** 163,167 ****
    char * do_write(char * in, char * out, char * outmax) { 
      uint8_t rval;
-     register uint8_t i;
      uint32_t sector;
  
--- 163,166 ----
***************
*** 177,181 ****
  
      //    for(i = 0; i < 10; i++){
!       rval = call SD.writeSector(sector, sbuf);
  
        if(rval)
--- 176,180 ----
  
      //    for(i = 0; i < 10; i++){
!       rval = call SD.writeBlock(sector, sbuf);
  
        if(rval)
***************
*** 187,191 ****
    char * do_read(char * in, char * out, char * outmax) { 
      uint32_t sector;
!     uint8_t rval, i;
  
      if(!strcmp(in, "")){
--- 186,190 ----
    char * do_read(char * in, char * out, char * outmax) { 
      uint32_t sector;
!     uint8_t rval;
  
      if(!strcmp(in, "")){
***************
*** 198,202 ****
      }
  
!     rval = call SD.readSector(sector++, cardbuf);
  
      if(rval)
--- 197,201 ----
      }
  
!     rval = call SD.readBlock(sector++, cardbuf);
  
      if(rval)
***************
*** 216,220 ****
    char * get_size(char * in, char * out, char * outmax) { 
      cardsize = call SD.readCardSize();
! 	
      sprintf(msgbuf, "card size is %ld", cardsize);
  
--- 215,219 ----
    char * get_size(char * in, char * out, char * outmax) { 
      cardsize = call SD.readCardSize();
! 
      sprintf(msgbuf, "card size is %ld", cardsize);