[Tinyos-2-commits] CVS: tinyos-2.x/tos/interfaces BlockRead.nc, 1.1.2.10, 1.1.2.11 BlockWrite.nc, 1.1.2.9, 1.1.2.10

David Gay idgay at users.sourceforge.net
Wed May 31 07:56:59 PDT 2006


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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	BlockRead.nc BlockWrite.nc 
Log Message:
comments
add initial-crc parameter to computeCrc


Index: BlockRead.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/interfaces/Attic/BlockRead.nc,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -C2 -d -r1.1.2.10 -r1.1.2.11
*** BlockRead.nc	30 May 2006 21:35:14 -0000	1.1.2.10
--- BlockRead.nc	31 May 2006 14:56:55 -0000	1.1.2.11
***************
*** 41,45 ****
  
  interface BlockRead {
-   
    /**
     * Initiate a read operation within a given volume. On SUCCESS, the
--- 41,44 ----
***************
*** 50,56 ****
     * @param buf buffer to place read data.
     * @param len number of bytes to read.
!    * @return SUCCESS if the request was accepted, FAIL otherwise.
     */
!   command error_t read( storage_addr_t addr, void* buf, storage_len_t len );
  
    /**
--- 49,58 ----
     * @param buf buffer to place read data.
     * @param len number of bytes to read.
!    * @return 
!    *   <li>SUCCESS if the request was accepted, 
!    *   <li>EINVAL if the parameters are invalid
!    *   <li>EBUSY if a request is already being processed.
     */
!   command error_t read(storage_addr_t addr, void* buf, storage_len_t len);
  
    /**
***************
*** 60,67 ****
     * @param buf buffer where read data was placed.
     * @param len number of bytes read.
!    * @param error notification of how the operation went.
     */
!   event void readDone( storage_addr_t addr, void* buf, storage_len_t len, 
! 		       error_t error );
    
    /**
--- 62,70 ----
     * @param buf buffer where read data was placed.
     * @param len number of bytes read.
!    * @param error SUCCESS if the operation was successful, FAIL if
!    *   it failed
     */
!   event void readDone(storage_addr_t addr, void* buf, storage_len_t len, 
! 		      error_t error);
    
    /**
***************
*** 72,76 ****
     * operation.
     *
!    * @return SUCCESS if the request was accepted, FAIL otherwise.
     */
    command error_t verify();
--- 75,81 ----
     * operation.
     *
!    * @return 
!    *   <li>SUCCESS if the request was accepted, 
!    *   <li>EBUSY if a request is already being processed.
     */
    command error_t verify();
***************
*** 79,85 ****
     * Signals the completion of a verify operation.
     *
!    * @param error notification of how the operation went.
     */
!   event void verifyDone( error_t error );
    
    /**
--- 84,91 ----
     * Signals the completion of a verify operation.
     *
!    * @param error SUCCESS if the operation was successful, FAIL if
!    *   it failed
     */
!   event void verifyDone(error_t error);
    
    /**
***************
*** 90,96 ****
     * @param addr starting address.
     * @param len the number of bytes to compute the crc over.
!    * @return SUCCESS if the request was accepted, FAIL otherwise.
     */
!   command error_t computeCrc( storage_addr_t addr, storage_len_t len );
  
    /**
--- 96,107 ----
     * @param addr starting address.
     * @param len the number of bytes to compute the crc over.
!    * @parm crc initial CRC value
!    * @return 
!    *   <li>SUCCESS if the request was accepted, 
!    *   <li>EINVAL if the parameters are invalid
!    *   <li>EBUSY if a request is already being processed.
     */
!   command error_t computeCrc(storage_addr_t addr, storage_len_t len,
! 			     uint16_t crc);
  
    /**
***************
*** 100,107 ****
     * @param len number of bytes the crc was computed over.
     * @param crc the resulting crc value.
!    * @param error notification of how the operation went.
     */
!   event void computeCrcDone( storage_addr_t addr, storage_len_t len,
! 			     uint16_t crc, error_t error );
  
    /**
--- 111,119 ----
     * @param len number of bytes the crc was computed over.
     * @param crc the resulting crc value.
!    * @param error SUCCESS if the operation was successful, FAIL if
!    *   it failed
     */
!   event void computeCrcDone(storage_addr_t addr, storage_len_t len,
! 			    uint16_t crc, error_t error);
  
    /**
***************
*** 111,114 ****
     */
    command storage_len_t getSize();
- 
  }
--- 123,125 ----

Index: BlockWrite.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/interfaces/Attic/BlockWrite.nc,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -C2 -d -r1.1.2.9 -r1.1.2.10
*** BlockWrite.nc	23 May 2006 21:57:47 -0000	1.1.2.9
--- BlockWrite.nc	31 May 2006 14:56:56 -0000	1.1.2.10
***************
*** 41,45 ****
  
  interface BlockWrite {
-   
    /**
     * Initiate a write operation within a given volume. On SUCCESS, the
--- 41,44 ----
***************
*** 50,56 ****
     * @param buf buffer to write data from.
     * @param len number of bytes to write.
!    * @return SUCCESS if the request was accepted, FAIL otherwise.
     */
!   command error_t write( storage_addr_t addr, void* buf, storage_len_t len );
  
    /**
--- 49,58 ----
     * @param buf buffer to write data from.
     * @param len number of bytes to write.
!    * @return 
!    *   <li>SUCCESS if the request was accepted, 
!    *   <li>EINVAL if the parameters are invalid
!    *   <li>EBUSY if a request is already being processed.
     */
!   command error_t write(storage_addr_t addr, void* buf, storage_len_t len);
  
    /**
***************
*** 62,69 ****
     * @param buf buffer that written data was read from.
     * @param len number of bytes written.
!    * @param error notification of how the operation went.
     */
!   event void writeDone( storage_addr_t addr, void* buf, storage_len_t len, 
! 			error_t error );
    
    /**
--- 64,72 ----
     * @param buf buffer that written data was read from.
     * @param len number of bytes written.
!    * @param error SUCCESS if the operation was successful, FAIL if
!    *   it failed
     */
!   event void writeDone(storage_addr_t addr, void* buf, storage_len_t len, 
! 		       error_t error);
    
    /**
***************
*** 72,76 ****
     * operation.
     *
!    * @return SUCCESS if the request was accepted, FAIL otherwise.
     */
    command error_t erase();
--- 75,81 ----
     * operation.
     *
!    * @return 
!    *   <li>SUCCESS if the request was accepted, 
!    *   <li>EBUSY if a request is already being processed.
     */
    command error_t erase();
***************
*** 79,85 ****
     * Signals the completion of an erase operation.
     *
!    * @param error notification of how the operation went.
     */
!   event void eraseDone( error_t error );
  
    /**
--- 84,91 ----
     * Signals the completion of an erase operation.
     *
!    * @param error SUCCESS if the operation was successful, FAIL if
!    *   it failed
     */
!   event void eraseDone(error_t error);
  
    /**
***************
*** 91,95 ****
     * event will signal completion of the operation.
     *
!    * @return SUCCESS if the request was accepted, FAIL otherwise.
     */
    command error_t commit();
--- 97,103 ----
     * event will signal completion of the operation.
     *
!    * @return 
!    *   <li>SUCCESS if the request was accepted, 
!    *   <li>EBUSY if a request is already being processed.
     */
    command error_t commit();
***************
*** 99,105 ****
     * flushed to non-volatile storage after this event.
     *
!    * @param error notification of how the operation went.
     */
!   event void commitDone( error_t error );
!   
  }
--- 107,113 ----
     * flushed to non-volatile storage after this event.
     *
!    * @param error SUCCESS if the operation was successful, FAIL if
!    *   it failed
     */
!   event void commitDone(error_t error);
  }



More information about the Tinyos-2-commits mailing list