[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/rincon/apps/Blackbook5/apps/BlackbookFullConnect BlackbookFullConnect.h, 1.1, 1.2 BlackbookFullConnectM.nc, 1.3, 1.4

[dmm]

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

Modified Files:
	BlackbookFullConnect.h BlackbookFullConnectM.nc 
Log Message:
Updated to Blackbook v.5.2

Index: BlackbookFullConnect.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/rincon/apps/Blackbook5/apps/BlackbookFullConnect/BlackbookFullConnect.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BlackbookFullConnect.h	18 May 2006 22:34:20 -0000	1.1
--- BlackbookFullConnect.h	28 Sep 2006 17:31:53 -0000	1.2
***************
*** 35,39 ****
  
  typedef struct BlackbookNodeMsg {
!   struct node focusedNode;
  } BlackbookNodeMsg;
  
--- 35,39 ----
  
  typedef struct BlackbookNodeMsg {
!   struct flashnode focusedNode;
  } BlackbookNodeMsg;
  

Index: BlackbookFullConnectM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/rincon/apps/Blackbook5/apps/BlackbookFullConnect/BlackbookFullConnectM.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BlackbookFullConnectM.nc	18 Jul 2006 16:18:12 -0000	1.3
--- BlackbookFullConnectM.nc	28 Sep 2006 17:31:54 -0000	1.4
***************
*** 161,165 ****
      if((nodeTosPtr = call NodeTransceiver.requestWrite()) != NULL) {
        nodeOutMsg = (BlackbookNodeMsg *) nodeTosPtr->data;
!       memcpy(&nodeOutMsg->focusedNode, call NodeMap.getNodeAtIndex(inMsg->focusedNode.state), sizeof(node));
        call NodeTransceiver.sendUart(sizeof(BlackbookNodeMsg));
      }
--- 161,165 ----
      if((nodeTosPtr = call NodeTransceiver.requestWrite()) != NULL) {
        nodeOutMsg = (BlackbookNodeMsg *) nodeTosPtr->data;
!       memcpy(&nodeOutMsg->focusedNode, call NodeMap.getNodeAtIndex(inMsg->focusedNode.state), sizeof(flashnode));
        call NodeTransceiver.sendUart(sizeof(BlackbookNodeMsg));
      }
***************
*** 626,630 ****
    }
    
!   
    /***************** Functions ****************/
    /**
--- 626,632 ----
    }
    
!   event void BDictionary.totalKeys(uint16_t totalKeys) {
!   }
! 
    /***************** Functions ****************/
    /**