[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/at45db BlockStorageP.nc, 1.1.2.14, 1.1.2.15 ConfigStorageP.nc, 1.1.2.5, 1.1.2.6 LogStorageP.nc, 1.1.2.12, 1.1.2.13 Storage_chip.h, 1.1.2.5, 1.1.2.6

David Gay idgay at users.sourceforge.net
Fri Jun 2 10:37:38 PDT 2006


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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	BlockStorageP.nc ConfigStorageP.nc LogStorageP.nc 
	Storage_chip.h 
Log Message:
removed not very useful xxxstorage_t types


Index: BlockStorageP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/at45db/Attic/BlockStorageP.nc,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -C2 -d -r1.1.2.14 -r1.1.2.15
*** BlockStorageP.nc	2 Jun 2006 16:36:23 -0000	1.1.2.14
--- BlockStorageP.nc	2 Jun 2006 17:37:36 -0000	1.1.2.15
***************
*** 42,53 ****
  module BlockStorageP {
    provides {
!     interface BlockWrite[blockstorage_t blockId];
!     interface BlockRead[blockstorage_t blockId];
    }
    uses {
      interface At45db;
!     interface At45dbVolume[blockstorage_t blockId];
!     interface Resource[blockstorage_t blockId];
!     interface At45dbBlockConfig as BConfig[blockstorage_t blockId];
    }
  }
--- 42,53 ----
  module BlockStorageP {
    provides {
!     interface BlockWrite[uint8_t blockId];
!     interface BlockRead[uint8_t blockId];
    }
    uses {
      interface At45db;
!     interface At45dbVolume[uint8_t blockId];
!     interface Resource[uint8_t blockId];
!     interface At45dbBlockConfig as BConfig[uint8_t blockId];
    }
  }
***************
*** 123,131 ****
    }
  
!   event at45page_t BConfig.npages[blockstorage_t id]() {
      return call At45dbVolume.volumeSize[id]() >> 1;
    }
  
!   event at45page_t BConfig.remap[blockstorage_t id](at45page_t page) {
      if (call BConfig.isConfig[id]() && call BConfig.flipped[id]())
        page += signal BConfig.npages[id]();
--- 123,131 ----
    }
  
!   event at45page_t BConfig.npages[uint8_t id]() {
      return call At45dbVolume.volumeSize[id]() >> 1;
    }
  
!   event at45page_t BConfig.remap[uint8_t id](at45page_t page) {
      if (call BConfig.isConfig[id]() && call BConfig.flipped[id]())
        page += signal BConfig.npages[id]();
***************
*** 133,141 ****
    }
  
!   default command int BConfig.isConfig[blockstorage_t blockId]() {
      return FALSE;
    }
  
!   default command int BConfig.flipped[blockstorage_t blockId]() {
      return FALSE;
    }
--- 133,141 ----
    }
  
!   default command int BConfig.isConfig[uint8_t blockId]() {
      return FALSE;
    }
  
!   default command int BConfig.flipped[uint8_t blockId]() {
      return FALSE;
    }
***************
*** 164,168 ****
  
    void endRequest(error_t result, uint16_t crc) {
!     blockstorage_t c = client;
      uint8_t tmpState = s[c].request;
      storage_addr_t actualLength = s[c].len - bytesRemaining;
--- 164,168 ----
  
    void endRequest(error_t result, uint16_t crc) {
!     uint8_t c = client;
      uint8_t tmpState = s[c].request;
      storage_addr_t actualLength = s[c].len - bytesRemaining;
***************
*** 197,201 ****
    }
  
!   error_t newRequest(uint8_t newState, blockstorage_t id,
  		       storage_addr_t addr, uint8_t* buf, storage_len_t len) {
      storage_len_t vsize;
--- 197,201 ----
    }
  
!   error_t newRequest(uint8_t newState, uint8_t id,
  		       storage_addr_t addr, uint8_t* buf, storage_len_t len) {
      storage_len_t vsize;
***************
*** 218,222 ****
    }
  
!   event void Resource.granted[blockstorage_t blockId]() {
      client = blockId;
  
--- 218,222 ----
    }
  
!   event void Resource.granted[uint8_t blockId]() {
      client = blockId;
  
***************
*** 237,245 ****
    }
  
!   default command int BConfig.writeHook[blockstorage_t blockId]() {
      return FALSE;
    }
  
!   event void BConfig.writeContinue[blockstorage_t blockId](error_t error) {
      /* Config intercept complete. Resume operation. */
      client = blockId;
--- 237,245 ----
    }
  
!   default command int BConfig.writeHook[uint8_t blockId]() {
      return FALSE;
    }
  
!   event void BConfig.writeContinue[uint8_t blockId](error_t error) {
      /* Config intercept complete. Resume operation. */
      client = blockId;
***************
*** 324,328 ****
    /* ------------------------------------------------------------------ */
  
!   command error_t BlockWrite.erase[blockstorage_t id]() {
      return newRequest(R_ERASE, id, 0, NULL, 0);
    }
--- 324,328 ----
    /* ------------------------------------------------------------------ */
  
!   command error_t BlockWrite.erase[uint8_t id]() {
      return newRequest(R_ERASE, id, 0, NULL, 0);
    }
***************
*** 340,344 ****
    /* ------------------------------------------------------------------ */
  
!   command error_t BlockWrite.write[blockstorage_t id](storage_addr_t addr, void* buf, storage_len_t len) {
      return newRequest(R_WRITE, id, addr, buf, len);
    }
--- 340,344 ----
    /* ------------------------------------------------------------------ */
  
!   command error_t BlockWrite.write[uint8_t id](storage_addr_t addr, void* buf, storage_len_t len) {
      return newRequest(R_WRITE, id, addr, buf, len);
    }
***************
*** 348,352 ****
    /* ------------------------------------------------------------------ */
  
!   command error_t BlockWrite.commit[blockstorage_t id]() {
      return newRequest(R_COMMIT, id, 0, NULL, s[id].maxAddr);
    }
--- 348,352 ----
    /* ------------------------------------------------------------------ */
  
!   command error_t BlockWrite.commit[uint8_t id]() {
      return newRequest(R_COMMIT, id, 0, NULL, s[id].maxAddr);
    }
***************
*** 375,379 ****
    /* ------------------------------------------------------------------ */
  
!   command error_t BlockRead.verify[blockstorage_t id]() {
      return newRequest(R_VERIFY, id, 0, NULL, 0);
    }
--- 375,379 ----
    /* ------------------------------------------------------------------ */
  
!   command error_t BlockRead.verify[uint8_t id]() {
      return newRequest(R_VERIFY, id, 0, NULL, 0);
    }
***************
*** 416,420 ****
    /* ------------------------------------------------------------------ */
  
!   command error_t BlockRead.read[blockstorage_t id](storage_addr_t addr, void* buf, storage_len_t len) {
      return newRequest(R_READ, id, addr, buf, len);
    }
--- 416,420 ----
    /* ------------------------------------------------------------------ */
  
!   command error_t BlockRead.read[uint8_t id](storage_addr_t addr, void* buf, storage_len_t len) {
      return newRequest(R_READ, id, addr, buf, len);
    }
***************
*** 424,428 ****
    /* ------------------------------------------------------------------ */
  
!   command error_t BlockRead.computeCrc[blockstorage_t id](storage_addr_t addr, storage_len_t len, uint16_t basecrc) {
      return newRequest(R_CRC, id, addr, (void *)basecrc, len);
    }
--- 424,428 ----
    /* ------------------------------------------------------------------ */
  
!   command error_t BlockRead.computeCrc[uint8_t id](storage_addr_t addr, storage_len_t len, uint16_t basecrc) {
      return newRequest(R_CRC, id, addr, (void *)basecrc, len);
    }
***************
*** 432,436 ****
    /* ------------------------------------------------------------------ */
  
!   command storage_len_t BlockRead.getSize[blockstorage_t blockId]() {
      storage_len_t vsize;
  
--- 432,436 ----
    /* ------------------------------------------------------------------ */
  
!   command storage_len_t BlockRead.getSize[uint8_t blockId]() {
      storage_len_t vsize;
  
***************
*** 487,493 ****
    default event void BlockRead.computeCrcDone[uint8_t id](storage_addr_t addr, storage_len_t len, uint16_t x, error_t result) { }
    
!   default command at45page_t At45dbVolume.remap[blockstorage_t id](at45page_t volumePage) { return 0; }
!   default command at45page_t At45dbVolume.volumeSize[blockstorage_t id]() { return 0; }
!   default async command error_t Resource.request[blockstorage_t id]() { return FAIL; }
!   default async command void Resource.release[blockstorage_t id]() { }
  }
--- 487,493 ----
    default event void BlockRead.computeCrcDone[uint8_t id](storage_addr_t addr, storage_len_t len, uint16_t x, error_t result) { }
    
!   default command at45page_t At45dbVolume.remap[uint8_t id](at45page_t volumePage) { return 0; }
!   default command at45page_t At45dbVolume.volumeSize[uint8_t id]() { return 0; }
!   default async command error_t Resource.request[uint8_t id]() { return FAIL; }
!   default async command void Resource.release[uint8_t id]() { }
  }

Index: ConfigStorageP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/at45db/Attic/ConfigStorageP.nc,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** ConfigStorageP.nc	31 May 2006 14:57:43 -0000	1.1.2.5
--- ConfigStorageP.nc	2 Jun 2006 17:37:36 -0000	1.1.2.6
***************
*** 22,33 ****
  module ConfigStorageP {
    provides {
!     interface Mount[configstorage_t id];
!     interface ConfigStorage[configstorage_t id];
!     interface At45dbBlockConfig as BConfig[blockstorage_t id];
    }
    uses {
      interface At45db;
!     interface BlockRead[configstorage_t id];
!     interface BlockWrite[configstorage_t id];
    }
  }
--- 22,33 ----
  module ConfigStorageP {
    provides {
!     interface Mount[uint8_t id];
!     interface ConfigStorage[uint8_t id];
!     interface At45dbBlockConfig as BConfig[uint8_t id];
    }
    uses {
      interface At45db;
!     interface BlockRead[uint8_t id];
!     interface BlockWrite[uint8_t id];
    }
  }
***************
*** 76,80 ****
    at45page_t nextPage;
  
!   void setFlip(blockstorage_t id, bool flip);
  
    /* ------------------------------------------------------------------ */
--- 76,80 ----
    at45page_t nextPage;
  
!   void setFlip(uint8_t id, bool flip);
  
    /* ------------------------------------------------------------------ */
***************
*** 142,146 ****
    /* ------------------------------------------------------------------ */
  
!   command error_t ConfigStorage.read[configstorage_t id](storage_addr_t addr, void* buf, storage_len_t len) {
      /* Read from current half using BlockRead */
      if (state[id] < S_CLEAN)
--- 142,146 ----
    /* ------------------------------------------------------------------ */
  
!   command error_t ConfigStorage.read[uint8_t id](storage_addr_t addr, void* buf, storage_len_t len) {
      /* Read from current half using BlockRead */
      if (state[id] < S_CLEAN)
***************
*** 150,154 ****
    }
  
!   void readReadDone(configstorage_t id, storage_addr_t addr, void* buf, storage_len_t len, error_t error) {
      signal ConfigStorage.readDone[id](addr - sizeof(uint32_t), buf, len, error);
    }
--- 150,154 ----
    }
  
!   void readReadDone(uint8_t id, storage_addr_t addr, void* buf, storage_len_t len, error_t error) {
      signal ConfigStorage.readDone[id](addr - sizeof(uint32_t), buf, len, error);
    }
***************
*** 158,162 ****
    /* ------------------------------------------------------------------ */
  
!   command error_t ConfigStorage.write[configstorage_t id](storage_addr_t addr, void* buf, storage_len_t len) {
      /* 1: If first write:
           copy to other half, increment version number, and flip.
--- 158,162 ----
    /* ------------------------------------------------------------------ */
  
!   command error_t ConfigStorage.write[uint8_t id](storage_addr_t addr, void* buf, storage_len_t len) {
      /* 1: If first write:
           copy to other half, increment version number, and flip.
***************
*** 171,175 ****
    void writeContinue(error_t error);
  
!   command int BConfig.writeHook[configstorage_t id]() {
      if (state[id] != S_CLEAN) // no work if dirty or invalid
        return FALSE;
--- 171,175 ----
    void writeContinue(error_t error);
  
!   command int BConfig.writeHook[uint8_t id]() {
      if (state[id] != S_CLEAN) // no work if dirty or invalid
        return FALSE;
***************
*** 235,239 ****
    }
  
!   void writeWriteDone(configstorage_t id, storage_addr_t addr, void* buf, storage_len_t len, error_t error) {
      signal ConfigStorage.writeDone[id](addr - sizeof(uint32_t), buf, len, error);
    }
--- 235,239 ----
    }
  
!   void writeWriteDone(uint8_t id, storage_addr_t addr, void* buf, storage_len_t len, error_t error) {
      signal ConfigStorage.writeDone[id](addr - sizeof(uint32_t), buf, len, error);
    }
***************
*** 243,247 ****
    /* ------------------------------------------------------------------ */
  
!   command error_t ConfigStorage.commit[configstorage_t id]() {
      /* Call BlockWrite.commit */
      /* Could special-case attempt to commit clean block */
--- 243,247 ----
    /* ------------------------------------------------------------------ */
  
!   command error_t ConfigStorage.commit[uint8_t id]() {
      /* Call BlockWrite.commit */
      /* Could special-case attempt to commit clean block */
***************
*** 251,255 ****
    }
  
!   void commitDone(configstorage_t id, error_t error) {
      if (error == SUCCESS)
        state[id] = S_CLEAN;
--- 251,255 ----
    }
  
!   void commitDone(uint8_t id, error_t error) {
      if (error == SUCCESS)
        state[id] = S_CLEAN;
***************
*** 261,265 ****
    /* ------------------------------------------------------------------ */
  
!   command storage_len_t ConfigStorage.getSize[configstorage_t id]() {
      return call BlockRead.getSize[id]();
    }
--- 261,265 ----
    /* ------------------------------------------------------------------ */
  
!   command storage_len_t ConfigStorage.getSize[uint8_t id]() {
      return call BlockRead.getSize[id]();
    }
***************
*** 269,273 ****
    /* ------------------------------------------------------------------ */
  
!   command bool ConfigStorage.valid[configstorage_t id]() {
      return state[id] != S_INVALID;
    }
--- 269,273 ----
    /* ------------------------------------------------------------------ */
  
!   command bool ConfigStorage.valid[uint8_t id]() {
      return state[id] != S_INVALID;
    }
***************
*** 280,288 ****
       config volume iff its its id is less than N */
  
!   command int BConfig.isConfig[blockstorage_t id]() {
      return id < N;
    }
  
!   void setFlip(blockstorage_t id, bool flip) {
      if (flip)
        flipped[id >> 3] |= 1 << (id & 7);
--- 280,288 ----
       config volume iff its its id is less than N */
  
!   command int BConfig.isConfig[uint8_t id]() {
      return id < N;
    }
  
!   void setFlip(uint8_t id, bool flip) {
      if (flip)
        flipped[id >> 3] |= 1 << (id & 7);
***************
*** 291,299 ****
    }
  
!   inline command int BConfig.flipped[blockstorage_t id]() {
      return (flipped[id >> 3] & (1 << (id & 7))) != 0;
    }
  
!   event void BlockRead.readDone[configstorage_t id](storage_addr_t addr, void* buf, storage_len_t len, error_t error) {
      if (id < N)
        if (state[id] == S_MOUNT)
--- 291,299 ----
    }
  
!   inline command int BConfig.flipped[uint8_t id]() {
      return (flipped[id >> 3] & (1 << (id & 7))) != 0;
    }
  
!   event void BlockRead.readDone[uint8_t id](storage_addr_t addr, void* buf, storage_len_t len, error_t error) {
      if (id < N)
        if (state[id] == S_MOUNT)
***************
*** 303,317 ****
    }
  
!   event void BlockRead.verifyDone[configstorage_t id]( error_t error ) {
      if (id < N)
        mountVerifyDone(id, error);
    }
  
!   event void BlockWrite.writeDone[configstorage_t id]( storage_addr_t addr, void* buf, storage_len_t len, error_t error ) {
      if (id < N)
        writeWriteDone(id, addr, buf, len, error);
    }
  
!   event void BlockWrite.commitDone[configstorage_t id]( error_t error ) {
      if (id < N)
        commitDone(id, error);
--- 303,317 ----
    }
  
!   event void BlockRead.verifyDone[uint8_t id]( error_t error ) {
      if (id < N)
        mountVerifyDone(id, error);
    }
  
!   event void BlockWrite.writeDone[uint8_t id]( storage_addr_t addr, void* buf, storage_len_t len, error_t error ) {
      if (id < N)
        writeWriteDone(id, addr, buf, len, error);
    }
  
!   event void BlockWrite.commitDone[uint8_t id]( error_t error ) {
      if (id < N)
        commitDone(id, error);
***************
*** 328,333 ****
    }
  
!   event void BlockRead.computeCrcDone[configstorage_t id]( storage_addr_t addr, storage_len_t len, uint16_t crc, error_t error ) {}
!   event void BlockWrite.eraseDone[configstorage_t id]( error_t error ) {}
    event void At45db.eraseDone(error_t error) {}
    event void At45db.syncDone(error_t error) {}
--- 328,333 ----
    }
  
!   event void BlockRead.computeCrcDone[uint8_t id]( storage_addr_t addr, storage_len_t len, uint16_t crc, error_t error ) {}
!   event void BlockWrite.eraseDone[uint8_t id]( error_t error ) {}
    event void At45db.eraseDone(error_t error) {}
    event void At45db.syncDone(error_t error) {}
***************
*** 336,342 ****
    event void At45db.computeCrcDone(error_t error, uint16_t crc) {}
  
!   default event void Mount.mountDone[configstorage_t id](error_t error) { }
!   default event void ConfigStorage.readDone[configstorage_t id](storage_addr_t addr, void* buf, storage_len_t len, error_t error) {}
!   default event void ConfigStorage.writeDone[configstorage_t id](storage_addr_t addr, void* buf, storage_len_t len, error_t error) {}
!   default event void ConfigStorage.commitDone[configstorage_t id](error_t error) {}
  }
--- 336,342 ----
    event void At45db.computeCrcDone(error_t error, uint16_t crc) {}
  
!   default event void Mount.mountDone[uint8_t id](error_t error) { }
!   default event void ConfigStorage.readDone[uint8_t id](storage_addr_t addr, void* buf, storage_len_t len, error_t error) {}
!   default event void ConfigStorage.writeDone[uint8_t id](storage_addr_t addr, void* buf, storage_len_t len, error_t error) {}
!   default event void ConfigStorage.commitDone[uint8_t id](error_t error) {}
  }

Index: LogStorageP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/at45db/Attic/LogStorageP.nc,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -C2 -d -r1.1.2.12 -r1.1.2.13
*** LogStorageP.nc	1 Jun 2006 22:09:26 -0000	1.1.2.12
--- LogStorageP.nc	2 Jun 2006 17:37:36 -0000	1.1.2.13
***************
*** 41,51 ****
  module LogStorageP {
    provides {
!     interface LogRead[logstorage_t logId];
!     interface LogWrite[logstorage_t logId];
    }
    uses {
      interface At45db;
!     interface At45dbVolume[logstorage_t logId];
!     interface Resource[logstorage_t logId];
    }
  }
--- 41,51 ----
  module LogStorageP {
    provides {
!     interface LogRead[uint8_t logId];
!     interface LogWrite[uint8_t logId];
    }
    uses {
      interface At45db;
!     interface At45dbVolume[uint8_t logId];
!     interface Resource[uint8_t logId];
    }
  }
***************
*** 301,305 ****
  
    void endRequest(error_t ok) {
!     logstorage_t c = client;
      uint8_t request = s[c].request;
      storage_len_t actualLen = s[c].len - len;
--- 301,305 ----
  
    void endRequest(error_t ok) {
!     uint8_t c = client;
      uint8_t request = s[c].request;
      storage_len_t actualLen = s[c].len - len;
***************
*** 322,326 ****
  
    /* Enqueue request and request the underlying flash */
!   error_t newRequest(uint8_t newRequest, logstorage_t id,
  		     uint8_t *buf, storage_len_t length) {
      s[id >> 1].circular = id & 1;
--- 322,326 ----
  
    /* Enqueue request and request the underlying flash */
!   error_t newRequest(uint8_t newRequest, uint8_t id,
  		     uint8_t *buf, storage_len_t length) {
      s[id >> 1].circular = id & 1;
***************
*** 338,342 ****
    }
  
!   event void Resource.granted[logstorage_t id]() {
      client = id;
      len = s[client].len;
--- 338,342 ----
    }
  
!   event void Resource.granted[uint8_t id]() {
      client = id;
      len = s[client].len;
***************
*** 344,348 ****
    }
  
!   command error_t LogWrite.append[logstorage_t id](void* buf, storage_len_t length) {
      if (len > call LogRead.getSize[id]() - PAGE_SIZE)
        /* Writes greater than the volume size are invalid.
--- 344,348 ----
    }
  
!   command error_t LogWrite.append[uint8_t id](void* buf, storage_len_t length) {
      if (len > call LogRead.getSize[id]() - PAGE_SIZE)
        /* Writes greater than the volume size are invalid.
***************
*** 357,386 ****
    }
  
!   command storage_cookie_t LogWrite.currentOffset[logstorage_t id]() {
      return s[id >> 1].wpos;
    }
  
!   command error_t LogWrite.erase[logstorage_t id]() {
      return newRequest(R_ERASE, id, NULL, 0);
    }
  
!   command error_t LogWrite.sync[logstorage_t id]() {
      return newRequest(R_SYNC, id, NULL, 0);
    }
  
!   command error_t LogRead.read[logstorage_t id](void* buf, storage_len_t length) {
      return newRequest(R_READ, id, buf, length);
    }
  
!   command storage_cookie_t LogRead.currentOffset[logstorage_t id]() {
      id >>= 1;
      return s[id].rvalid ? s[id].rpos : SEEK_BEGINNING;
    }
  
!   command error_t LogRead.seek[logstorage_t id](storage_cookie_t offset) {
      return newRequest(R_SEEK, id, (void *)(offset >> 16), offset);
    }
  
!   command storage_len_t LogRead.getSize[logstorage_t id]() {
      return call At45dbVolume.volumeSize[id >> 1]() * (storage_len_t)PAGE_SIZE;
    }
--- 357,386 ----
    }
  
!   command storage_cookie_t LogWrite.currentOffset[uint8_t id]() {
      return s[id >> 1].wpos;
    }
  
!   command error_t LogWrite.erase[uint8_t id]() {
      return newRequest(R_ERASE, id, NULL, 0);
    }
  
!   command error_t LogWrite.sync[uint8_t id]() {
      return newRequest(R_SYNC, id, NULL, 0);
    }
  
!   command error_t LogRead.read[uint8_t id](void* buf, storage_len_t length) {
      return newRequest(R_READ, id, buf, length);
    }
  
!   command storage_cookie_t LogRead.currentOffset[uint8_t id]() {
      id >>= 1;
      return s[id].rvalid ? s[id].rpos : SEEK_BEGINNING;
    }
  
!   command error_t LogRead.seek[uint8_t id](storage_cookie_t offset) {
      return newRequest(R_SEEK, id, (void *)(offset >> 16), offset);
    }
  
!   command storage_len_t LogRead.getSize[uint8_t id]() {
      return call At45dbVolume.volumeSize[id >> 1]() * (storage_len_t)PAGE_SIZE;
    }
***************
*** 956,968 ****
    event void At45db.copyPageDone(error_t error) { }
  
!   default event void LogWrite.appendDone[logstorage_t logId](void* buf, storage_len_t l, error_t error) { }
!   default event void LogWrite.eraseDone[logstorage_t logId](error_t error) { }
!   default event void LogWrite.syncDone[logstorage_t logId](error_t error) { }
!   default event void LogRead.readDone[logstorage_t logId](void* buf, storage_len_t l, error_t error) { }
!   default event void LogRead.seekDone[logstorage_t logId](error_t error) {}
  
!   default command at45page_t At45dbVolume.remap[logstorage_t logId](at45page_t volumePage) {return 0;}
!   default command at45page_t At45dbVolume.volumeSize[logstorage_t logId]() {return 0;}
!   default async command error_t Resource.request[logstorage_t logId]() {return SUCCESS;}
!   default async command void Resource.release[logstorage_t logId]() { }
  }
--- 956,968 ----
    event void At45db.copyPageDone(error_t error) { }
  
!   default event void LogWrite.appendDone[uint8_t logId](void* buf, storage_len_t l, error_t error) { }
!   default event void LogWrite.eraseDone[uint8_t logId](error_t error) { }
!   default event void LogWrite.syncDone[uint8_t logId](error_t error) { }
!   default event void LogRead.readDone[uint8_t logId](void* buf, storage_len_t l, error_t error) { }
!   default event void LogRead.seekDone[uint8_t logId](error_t error) {}
  
!   default command at45page_t At45dbVolume.remap[uint8_t logId](at45page_t volumePage) {return 0;}
!   default command at45page_t At45dbVolume.volumeSize[uint8_t logId]() {return 0;}
!   default async command error_t Resource.request[uint8_t logId]() {return SUCCESS;}
!   default async command void Resource.release[uint8_t logId]() { }
  }

Index: Storage_chip.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/at45db/Attic/Storage_chip.h,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** Storage_chip.h	25 May 2006 18:23:46 -0000	1.1.2.5
--- Storage_chip.h	2 Jun 2006 17:37:36 -0000	1.1.2.6
***************
*** 7,17 ****
  
  #define UQ_BLOCK_STORAGE "BlockStorageP.BlockRead"
- typedef uint8_t blockstorage_t;
- 
  #define UQ_LOG_STORAGE "LogStorageP.LogRead"
- typedef uint8_t logstorage_t;
- 
  #define UQ_CONFIG_STORAGE "ConfigStorageP.ConfigRead"
- typedef uint8_t configstorage_t;
  
  #endif
--- 7,12 ----



More information about the Tinyos-2-commits mailing list