[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/rincon/apps/Blackbook5/core CheckpointM.nc, 1.1, 1.2 BFileReadM.nc, 1.1, 1.2 BDictionaryM.nc, 1.1, 1.2 BFileWriteM.nc, 1.1, 1.2

[dmm]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/rincon/apps/Blackbook5/core
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1867/contrib/rincon/apps/Blackbook5/core

Modified Files:
	CheckpointM.nc BFileReadM.nc BDictionaryM.nc BFileWriteM.nc 
Log Message:
Uploaded Mark's fixes

Index: CheckpointM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/rincon/apps/Blackbook5/core/CheckpointM.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CheckpointM.nc	18 May 2006 22:34:20 -0000	1.1
--- CheckpointM.nc	7 Jun 2006 19:34:17 -0000	1.2
***************
*** 75,89 ****
    
    /***************** Prototypes ****************/
-   /** Verify all bytes in the last recovered point in a node are blank */
-   task void verifyRecoveryPoint();
-   
-   /** Delete the current page on flash */
-   task void deleteOnePage();
-   
-   /** Perform a full sector verification, marking off all unclean pages */
-   task void fullVerify();
-   
-   /** Mark the attempted recover node as deleted */
-   void markNodeDeleted();
    
    /***************** StdControl ****************/
--- 75,78 ----

Index: BFileReadM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/rincon/apps/Blackbook5/core/BFileReadM.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BFileReadM.nc	18 May 2006 22:34:20 -0000	1.1
--- BFileReadM.nc	7 Jun 2006 19:34:17 -0000	1.2
***************
*** 67,71 ****
    /***************** Prototypes ****************/  
  
-   
    /***************** StdControl Commands ****************/
    command result_t StdControl.init() {
--- 67,70 ----

Index: BDictionaryM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/rincon/apps/Blackbook5/core/BDictionaryM.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BDictionaryM.nc	18 May 2006 22:34:20 -0000	1.1
--- BDictionaryM.nc	7 Jun 2006 19:34:17 -0000	1.2
***************
*** 48,51 ****
--- 48,52 ----
   *
   * @author David Moss - dmm at rincon.com
+  * @author Mark Kranz
   */
      
***************
*** 236,246 ****
    task void getNextKey();
    
-   
    /** Read a value from the original file to copy into the new file */
    task void readCopyValue();
  
-   /** Write the value that was read from the original file into the new file */
-   task void writeCopyValue();
-   
    
    /** If the currentClient is not the Checkpoint, reset BlackbookState.toIdle */
--- 237,243 ----

Index: BFileWriteM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/rincon/apps/Blackbook5/core/BFileWriteM.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BFileWriteM.nc	18 May 2006 22:34:20 -0000	1.1
--- BFileWriteM.nc	7 Jun 2006 19:34:17 -0000	1.2
***************
*** 30,34 ****
--- 30,36 ----
   * Use unique("BFileWrite") when connecting to a parameterized
   * interface.
+  *
   * @author David Moss - dmm at rincon.com
+  * @author Mark Kranz
   */
   
***************
*** 75,96 ****
    
    /***************** Prototypes ****************/
-   /** Close all nodes in the current client's open file */
-   task void closeFile();
-   
-   /** Finalize the current client's open node */
-   task void finalizeNode();
-   
-   /** Unfinalize the current client's open node to flash */
-   task void unfinalizeNewNode();
    
    /** Checkpoint the current client's open file */
    task void checkpointNode();
    
-   /** Append data to the current client's file until all nodes are full */
-   task void appendFile();
-   
-   /** Output the appendAmount of data to the current client's open node */
-   task void outputData();
-   
    
    /***************** StdControl Commands ****************/
--- 77,84 ----