[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/rincon/apps/Blackbook5/boot BBootFullM.nc, 1.1, 1.2 BBootDictionaryM.nc, 1.1, 1.2

dmm rincon at users.sourceforge.net
Thu Sep 28 10:32:26 PDT 2006 

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

Modified Files:
	BBootFullM.nc BBootDictionaryM.nc 
Log Message:
Updated to Blackbook v.5.2

Index: BBootFullM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/rincon/apps/Blackbook5/boot/BBootFullM.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BBootFullM.nc	18 May 2006 22:34:20 -0000	1.1
--- BBootFullM.nc	28 Sep 2006 17:31:52 -0000	1.2
***************
*** 69,74 ****
    nodemeta currentNodeMeta;
    
!   /** The currently allocated node from the NodeBooter */
!   node *currentNode;
    
    /** The currently allocated file from the NodeBooter */
--- 69,74 ----
    nodemeta currentNodeMeta;
    
!   /** The currently allocated flashnode from the NodeBooter */
!   flashnode *currentNode;
    
    /** The currently allocated file from the NodeBooter */
***************
*** 90,97 ****
    
    /***************** Prototypes ****************/
!   /** Parse the newly read node */
    task void parseCurrentNode();
    
!   /** Allocate a new node and read it in from the address "currentAddress" */
    task void getNewNode();
    
--- 90,97 ----
    
    /***************** Prototypes ****************/
!   /** Parse the newly read flashnode */
    task void parseCurrentNode();
    
!   /** Allocate a new flashnode and read it in from the address "currentAddress" */
    task void getNewNode();
    
***************
*** 99,106 ****
    task void getNewFile();
    
!   /** Read the nodemeta for the node at the address "currentAddress" */
    task void readNodeMeta();
    
!   /** Read the filemeta for the node at the address "currentAddress" */
    task void readFileMeta();
   
--- 99,106 ----
    task void getNewFile();
    
!   /** Read the nodemeta for the flashnode at the address "currentAddress" */
    task void readNodeMeta();
    
!   /** Read the filemeta for the flashnode at the address "currentAddress" */
    task void readFileMeta();
   
***************
*** 208,215 ****
    /** 
     * The node's metadata was written to flash
!    * @param focusedNode - the node that metadata was written for
     * @param result - SUCCESS if it was written
     */
!   event void NodeShop.metaWritten(node *focusedNode, result_t result) {
    }
    
--- 208,215 ----
    /** 
     * The node's metadata was written to flash
!    * @param focusedNode - the flashnode that metadata was written for
     * @param result - SUCCESS if it was written
     */
!   event void NodeShop.metaWritten(flashnode *focusedNode, result_t result) {
    }
    
***************
*** 224,233 ****
    
    /**
!    * A node was deleted from flash by marking its magic number
     * invalid in the metadata.
!    * @param focusedNode - the node that was deleted.
!    * @param result - SUCCESS if the node was deleted successfully.
     */
!   event void NodeShop.metaDeleted(node *focusedNode, result_t result) {
      if(call BlackbookState.getState() == S_BOOT_BUSY) {
        currentNode->state = NODE_EMPTY;
--- 224,233 ----
    
    /**
!    * A flashnode was deleted from flash by marking its magic number
     * invalid in the metadata.
!    * @param focusedNode - the flashnode that was deleted.
!    * @param result - SUCCESS if the flashnode was deleted successfully.
     */
!   event void NodeShop.metaDeleted(flashnode *focusedNode, result_t result) {
      if(call BlackbookState.getState() == S_BOOT_BUSY) {
        currentNode->state = NODE_EMPTY;
***************
*** 240,245 ****
   
    /**
!    * A crc was calculated from node data on flash
!    * @param dataCrc - the crc of the data read from the node on flash.
     * @param result - SUCCESS if the crc is valid
     */
--- 240,245 ----
   
    /**
!    * A crc was calculated from flashnode data on flash
!    * @param dataCrc - the crc of the data read from the flashnode on flash.
     * @param result - SUCCESS if the crc is valid
     */
***************
*** 268,283 ****
    
    /**
!    * The given node was updated in the Checkpoint
!    * @param focusedNode - the node that was updated
     * @param result - SUCCESS if everything's ok
     */
!   event void Checkpoint.updated(node *focusedNode, result_t result) {
    }
  
    /** 
!    * A node was recovered.
     * @param result - SUCCESS if it was handled correctly.
     */
!   event void Checkpoint.recovered(node *focusedNode, result_t result) {
      if(call BlackbookState.getState() == S_BOOT_RECOVERING_BUSY) {
        
--- 268,283 ----
    
    /**
!    * The given flashnode was updated in the Checkpoint
!    * @param focusedNode - the flashnode that was updated
     * @param result - SUCCESS if everything's ok
     */
!   event void Checkpoint.updated(flashnode *focusedNode, result_t result) {
    }
  
    /** 
!    * A flashnode was recovered.
     * @param result - SUCCESS if it was handled correctly.
     */
!   event void Checkpoint.recovered(flashnode *focusedNode, result_t result) {
      if(call BlackbookState.getState() == S_BOOT_RECOVERING_BUSY) {
        
***************
*** 295,299 ****
    /***************** Tasks ****************/
    /**
!    * Parse the current node and nodemeta
     */
    task void parseCurrentNode() {
--- 295,299 ----
    /***************** Tasks ****************/
    /**
!    * Parse the current flashnode and nodemeta
     */
    task void parseCurrentNode() {
***************
*** 315,319 ****
        
      } else if(currentNodeMeta.magicNumber == META_CONSTRUCTING) {
!       // This node must be deleted. First we act like it's there, then we delete it.
        currentNode->state = NODE_VALID;
        call SectorMap.documentNode(currentNode);
--- 315,319 ----
        
      } else if(currentNodeMeta.magicNumber == META_CONSTRUCTING) {
!       // This flashnode must be deleted. First we act like it's there, then we delete it.
        currentNode->state = NODE_VALID;
        call SectorMap.documentNode(currentNode);
***************
*** 385,389 ****
    
    /**
!    * Recover each node from the Checkpoint file.
     */
    task void recoverNodes() {
--- 385,389 ----
    
    /**
!    * Recover each flashnode from the Checkpoint file.
     */
    task void recoverNodes() {
***************
*** 408,412 ****
    
    /**
!    * Allocate a new node and read it in from the address "currentAddress"
     */
    task void getNewNode() {
--- 408,412 ----
    
    /**
!    * Allocate a new flashnode and read it in from the address "currentAddress"
     */
    task void getNewNode() {
***************
*** 442,446 ****
    
    /**
!    * Read the nodemeta from the node at the flash address "currentAddress"
     */
    task void readNodeMeta() {
--- 442,446 ----
    
    /**
!    * Read the nodemeta from the flashnode at the flash address "currentAddress"
     */
    task void readNodeMeta() {
***************
*** 453,457 ****
    
    /** 
!    * Read the filemeta for the node at the flash address "currentAddress"
     * into the currentFile
     */
--- 453,457 ----
    
    /** 
!    * Read the filemeta for the flashnode at the flash address "currentAddress"
     * into the currentFile
     */

Index: BBootDictionaryM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/rincon/apps/Blackbook5/boot/BBootDictionaryM.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BBootDictionaryM.nc	18 May 2006 22:34:20 -0000	1.1
--- BBootDictionaryM.nc	28 Sep 2006 17:31:52 -0000	1.2
***************
*** 65,70 ****
    nodemeta currentNodeMeta;
    
!   /** The currently allocated node from the NodeBooter */
!   node *currentNode;
    
    /** The currently allocated file from the NodeBooter */
--- 65,70 ----
    nodemeta currentNodeMeta;
    
!   /** The currently allocated flashnode from the NodeBooter */
!   flashnode *currentNode;
    
    /** The currently allocated file from the NodeBooter */
***************
*** 86,93 ****
    
    /***************** Prototypes ****************/
!   /** Parse the newly read node */
    task void parseCurrentNode();
    
!   /** Allocate a new node and read it in from the address "currentAddress" */
    task void getNewNode();
    
--- 86,93 ----
    
    /***************** Prototypes ****************/
!   /** Parse the newly read flashnode */
    task void parseCurrentNode();
    
!   /** Allocate a new flashnode and read it in from the address "currentAddress" */
    task void getNewNode();
    
***************
*** 95,102 ****
    task void getNewFile();
    
!   /** Read the nodemeta for the node at the address "currentAddress" */
    task void readNodeMeta();
    
!   /** Read the filemeta for the node at the address "currentAddress" */
    task void readFileMeta();
   
--- 95,102 ----
    task void getNewFile();
    
!   /** Read the nodemeta for the flashnode at the address "currentAddress" */
    task void readNodeMeta();
    
!   /** Read the filemeta for the flashnode at the address "currentAddress" */
    task void readFileMeta();
   
***************
*** 203,210 ****
    /** 
     * The node's metadata was written to flash
!    * @param focusedNode - the node that metadata was written for
     * @param result - SUCCESS if it was written
     */
!   event void NodeShop.metaWritten(node *focusedNode, result_t result) {
    }
    
--- 203,210 ----
    /** 
     * The node's metadata was written to flash
!    * @param focusedNode - the flashnode that metadata was written for
     * @param result - SUCCESS if it was written
     */
!   event void NodeShop.metaWritten(flashnode *focusedNode, result_t result) {
    }
    
***************
*** 219,228 ****
    
    /**
!    * A node was deleted from flash by marking its magic number
     * invalid in the metadata.
!    * @param focusedNode - the node that was deleted.
!    * @param result - SUCCESS if the node was deleted successfully.
     */
!   event void NodeShop.metaDeleted(node *focusedNode, result_t result) {
      currentNode->state = NODE_EMPTY;
      if(currentFile != NULL) {
--- 219,228 ----
    
    /**
!    * A flashnode was deleted from flash by marking its magic number
     * invalid in the metadata.
!    * @param focusedNode - the flashnode that was deleted.
!    * @param result - SUCCESS if the flashnode was deleted successfully.
     */
!   event void NodeShop.metaDeleted(flashnode *focusedNode, result_t result) {
      currentNode->state = NODE_EMPTY;
      if(currentFile != NULL) {
***************
*** 233,238 ****
   
    /**
!    * A crc was calculated from node data on flash
!    * @param dataCrc - the crc of the data read from the node on flash.
     * @param result - SUCCESS if the crc is valid
     */
--- 233,238 ----
   
    /**
!    * A crc was calculated from flashnode data on flash
!    * @param dataCrc - the crc of the data read from the flashnode on flash.
     * @param result - SUCCESS if the crc is valid
     */
***************
*** 242,246 ****
    /***************** Tasks ****************/
    /**
!    * Parse the current node and nodemeta
     */
    task void parseCurrentNode() {
--- 242,246 ----
    /***************** Tasks ****************/
    /**
!    * Parse the current flashnode and nodemeta
     */
    task void parseCurrentNode() {
***************
*** 264,268 ****
        
      } else if(currentNodeMeta.magicNumber == META_CONSTRUCTING) {
!       // This node must be deleted.
        currentNode->state = NODE_IDLE;
        call SectorMap.documentNode(currentNode);
--- 264,268 ----
        
      } else if(currentNodeMeta.magicNumber == META_CONSTRUCTING) {
!       // This flashnode must be deleted.
        currentNode->state = NODE_IDLE;
        call SectorMap.documentNode(currentNode);
***************
*** 336,340 ****
    
    /**
!    * Allocate a new node and read it in from the address "currentAddress"
     */
    task void getNewNode() {
--- 336,340 ----
    
    /**
!    * Allocate a new flashnode and read it in from the address "currentAddress"
     */
    task void getNewNode() {
***************
*** 370,374 ****
    
    /**
!    * Read the nodemeta from the node at the flash address "currentAddress"
     */
    task void readNodeMeta() {
--- 370,374 ----
    
    /**
!    * Read the nodemeta from the flashnode at the flash address "currentAddress"
     */
    task void readNodeMeta() {
***************
*** 381,385 ****
    
    /** 
!    * Read the filemeta for the node at the flash address "currentAddress"
     * into the currentFile
     */
--- 381,385 ----
    
    /** 
!    * Read the filemeta for the flashnode at the flash address "currentAddress"
     * into the currentFile
     */

More information about the Tinyos-contrib-commits mailing list