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

[David Gay]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	BlockRead.nc BlockWrite.nc 
Log Message:
new block storage interfaces


Index: BlockRead.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/interfaces/BlockRead.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
*** BlockRead.nc	20 Jun 2006 18:56:06 -0000	1.1.2.12
--- BlockRead.nc	21 Sep 2006 23:03:28 -0000	1.1.2.13
***************
*** 69,93 ****
    
    /**
-    * Initiate a verify operation to verify the integrity of the
-    * data. This operation is only valid after a commit operation from
-    * <code>BlockWrite</code> has been completed. On SUCCESS, the
-    * <code>verifyDone</code> 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 verify();
-   
-   /**
-    * 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);
-   
-   /**
     * Initiate a crc computation. On SUCCESS, the
     * <code>computeCrcDone</code> event will signal completion of the
--- 69,72 ----

Index: BlockWrite.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/interfaces/BlockWrite.nc,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -C2 -d -r1.1.2.11 -r1.1.2.12
*** BlockWrite.nc	20 Jun 2006 18:56:06 -0000	1.1.2.11
--- BlockWrite.nc	21 Sep 2006 23:03:28 -0000	1.1.2.12
***************
*** 45,48 ****
--- 45,50 ----
     * <code>writeDone</code> event will signal completion of the
     * operation.
+    * <p>
+    * Between two erases, no byte may be written more than once.
     * 
     * @param addr starting address to begin write.
***************
*** 58,62 ****
    /**
     * Signals the completion of a write operation. However, data is not
!    * guaranteed to survive a power-cycle unless a commit operation has
     * been completed.
     *
--- 60,64 ----
    /**
     * Signals the completion of a write operation. However, data is not
!    * guaranteed to survive a power-cycle unless a sync operation has
     * been completed.
     *
***************
*** 90,99 ****
  
    /**
!    * Initiate a commit operation and finialize any additional writes
!    * to the volume. A verify operation from <code>BlockRead</code> can
!    * be done to check if the data has been modified since. A commit
!    * operation must be issued to ensure that data is stored in
!    * non-volatile storage. On SUCCES, the <code>commitDone</code>
!    * event will signal completion of the operation.
     *
     * @return 
--- 92,100 ----
  
    /**
!    * Initiate a sync operation and finialize any additional writes to
!    * the volume. A sync operation must be issued to ensure that data is
!    * stored in non-volatile storage. On SUCCES, the
!    * <code>syncDone</code> event will signal completion of the
!    * operation.
     *
     * @return 
***************
*** 101,108 ****
     *   <li>EBUSY if a request is already being processed.
     */
!   command error_t commit();
  
    /**
!    * Signals the completion of a commit operation. All written data is
     * flushed to non-volatile storage after this event.
     *
--- 102,109 ----
     *   <li>EBUSY if a request is already being processed.
     */
!   command error_t sync();
  
    /**
!    * Signals the completion of a sync operation. All written data is
     * flushed to non-volatile storage after this event.
     *
***************
*** 110,113 ****
     *   it failed
     */
!   event void commitDone(error_t error);
  }
--- 111,114 ----
     *   it failed
     */
!   event void syncDone(error_t error);
  }