[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/at45db At45dbP.nc, 1.8, 1.9 BlockStorageP.nc, 1.7, 1.8 ConfigStorageP.nc, 1.5, 1.6

[David Gay]

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

Modified Files:
	At45dbP.nc BlockStorageP.nc ConfigStorageP.nc 
Log Message:
deputy fixes

Index: At45dbP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/at45db/At45dbP.nc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** At45dbP.nc	23 Jun 2008 18:53:14 -0000	1.8
--- At45dbP.nc	23 Jun 2008 19:57:55 -0000	1.9
***************
*** 400,405 ****
  					uint16_t baseCrc) {
      /* This is a hack (store crc in reqBuf), but it saves 2 bytes of RAM */
!     reqBuf = TCAST(uint8_t * COUNT(baseCrc), baseCrc);
!     newRequest(R_READCRC, page, offset, reqBuf, n);
    }
  
--- 400,404 ----
  					uint16_t baseCrc) {
      /* This is a hack (store crc in reqBuf), but it saves 2 bytes of RAM */
!     newRequest(R_READCRC, page, offset, TCAST(uint8_t * COUNT(n), baseCrc), n);
    }
  

Index: BlockStorageP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/at45db/BlockStorageP.nc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** BlockStorageP.nc	23 Jun 2008 18:53:14 -0000	1.7
--- BlockStorageP.nc	23 Jun 2008 19:57:55 -0000	1.8
***************
*** 237,241 ****
      at45page_t page;
      at45pageoffset_t pageOffset, count;
!     uint8_t *buf = s[client].buf + currentOffset;
  
      if (remaining == 0)
--- 237,241 ----
      at45page_t page;
      at45pageoffset_t pageOffset, count;
!     uint8_t *buf = s[client].buf;
  
      if (remaining == 0)
***************
*** 255,262 ****
        {
        case R_WRITE:
! 	call At45db.write(page, pageOffset, buf, count);
  	break;
        case R_READ:
! 	call At45db.read(page, pageOffset, buf, count);
  	break;
        case R_CRC:
--- 255,262 ----
        {
        case R_WRITE:
! 	call At45db.write(page, pageOffset, buf + currentOffset, count);
  	break;
        case R_READ:
! 	call At45db.read(page, pageOffset, buf + currentOffset, count);
  	break;
        case R_CRC:

Index: ConfigStorageP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/at45db/ConfigStorageP.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ConfigStorageP.nc	11 Jun 2008 00:46:23 -0000	1.5
--- ConfigStorageP.nc	23 Jun 2008 19:57:55 -0000	1.6
***************
*** 191,195 ****
    }
  
!   void readReadDone(uint8_t id, storage_addr_t addr, void* buf, storage_len_t len, error_t error) {
      signal ConfigStorage.readDone[id](addr - sizeof low[0], buf, len, error);
    }
--- 191,195 ----
    }
  
!   void readReadDone(uint8_t id, storage_addr_t addr, void* COUNT(len) buf, storage_len_t len, error_t error) {
      signal ConfigStorage.readDone[id](addr - sizeof low[0], buf, len, error);
    }
***************
*** 258,262 ****
    }
  
!   void writeWriteDone(uint8_t id, storage_addr_t addr, void* buf, storage_len_t len, error_t error) {
      flip(id); // flip back to current half
      signal ConfigStorage.writeDone[id](addr - sizeof low[0], buf, len, error);
--- 258,262 ----
    }
  
!   void writeWriteDone(uint8_t id, storage_addr_t addr, void* COUNT(len) buf, storage_len_t len, error_t error) {
      flip(id); // flip back to current half
      signal ConfigStorage.writeDone[id](addr - sizeof low[0], buf, len, error);