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

dmm rincon at users.sourceforge.net
Tue Jun 6 09:50:34 PDT 2006 

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

Modified Files:
	Makefile BlackbookFullConnectM.nc 
Log Message:
Updated Blackbook to v.5.1, fixed many bugs and increased reliability

Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/rincon/apps/Blackbook5/apps/BlackbookFullConnect/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile	18 May 2006 22:34:20 -0000	1.1
--- Makefile	6 Jun 2006 16:50:31 -0000	1.2
***************
*** 4,12 ****
  #CFLAGS += -I../../media/AT45DB
  CFLAGS += -I../../media/STM25P
- CFLAGS +=  -I../../ -I../../core -I../../interfaces -I../../boot
  
  CFLAGS += -I../FlashBridgeViewer
  CFLAGS += -Os
- 
  CFLAGS += -I../../../../tos/lib/State -I../../../../tos/lib/Transceiver
  
--- 4,11 ----
  #CFLAGS += -I../../media/AT45DB
  CFLAGS += -I../../media/STM25P
  
+ CFLAGS +=  -I../../ -I../../core -I../../interfaces -I../../boot
  CFLAGS += -I../FlashBridgeViewer
  CFLAGS += -Os
  CFLAGS += -I../../../../tos/lib/State -I../../../../tos/lib/Transceiver
  

Index: BlackbookFullConnectM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/rincon/apps/Blackbook5/apps/BlackbookFullConnect/BlackbookFullConnectM.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BlackbookFullConnectM.nc	18 May 2006 22:34:20 -0000	1.1
--- BlackbookFullConnectM.nc	6 Jun 2006 16:50:31 -0000	1.2
***************
*** 353,360 ****
     */
    event void BFileRead.opened(uint32_t amount, result_t result) {
!     outMsg->length = amount;
!     outMsg->result = result;
!     outMsg->cmd = REPLY_BFILEREAD_OPEN;
!     sendMsg();
    }
  
--- 353,362 ----
     */
    event void BFileRead.opened(uint32_t amount, result_t result) {
!     if(newMessage()) {
!       outMsg->length = amount;
!       outMsg->result = result;
!       outMsg->cmd = REPLY_BFILEREAD_OPEN;
!       sendMsg();
!     }
    }
  
***************
*** 364,370 ****
     */
    event void BFileRead.closed(result_t result) {
!     outMsg->result = result;
!     outMsg->cmd = REPLY_BFILEREAD_CLOSE;
!     sendMsg();
    }
  
--- 366,374 ----
     */
    event void BFileRead.closed(result_t result) {
!     if(newMessage()) {
!       outMsg->result = result;
!       outMsg->cmd = REPLY_BFILEREAD_CLOSE;
!       sendMsg();
!     }
    }
  
***************
*** 392,399 ****
     */
    event void BFileWrite.opened(uint32_t len, result_t result) {
!     outMsg->length = len;
!     outMsg->result = result;
!     outMsg->cmd = REPLY_BFILEWRITE_OPEN;
!     sendMsg();
    }
  
--- 396,405 ----
     */
    event void BFileWrite.opened(uint32_t len, result_t result) {
!     if(newMessage()) {
!       outMsg->length = len;
!       outMsg->result = result;
!       outMsg->cmd = REPLY_BFILEWRITE_OPEN;
!       sendMsg();
!     }
    }
  
***************
*** 403,409 ****
     */
    event void BFileWrite.closed(result_t result) {
!     outMsg->result = result;
!     outMsg->cmd = REPLY_BFILEWRITE_CLOSE;
!     sendMsg();
    }
  
--- 409,417 ----
     */
    event void BFileWrite.closed(result_t result) {
!     if(newMessage()) {
!       outMsg->result = result;
!       outMsg->cmd = REPLY_BFILEWRITE_CLOSE;
!       sendMsg();
!     }
    }
  
***************
*** 419,426 ****
     */
    event void BFileWrite.saved(result_t result) {
!     outMsg->result = result;
!     outMsg->cmd = REPLY_BFILEWRITE_SAVE;
!     sendMsg();
!     
    }
  
--- 427,435 ----
     */
    event void BFileWrite.saved(result_t result) {
!     if(newMessage()) {
!       outMsg->result = result;
!       outMsg->cmd = REPLY_BFILEWRITE_SAVE;
!       sendMsg();
!     }
    }
  
***************
*** 435,442 ****
     */
    event void BFileWrite.appended(void *data, uint16_t amountWritten, result_t result) {
!     outMsg->length = amountWritten;
!     outMsg->result = result;
!     outMsg->cmd = REPLY_BFILEWRITE_APPEND;
!     sendMsg();
    }
    
--- 444,453 ----
     */
    event void BFileWrite.appended(void *data, uint16_t amountWritten, result_t result) {
!     if(newMessage()) {
!       outMsg->length = amountWritten;
!       outMsg->result = result;
!       outMsg->cmd = REPLY_BFILEWRITE_APPEND;
!       sendMsg();
!     }
    }
    
***************
*** 448,454 ****
     */
    event void BFileDelete.deleted(result_t result) {
!     outMsg->result = result;
!     outMsg->cmd = REPLY_BFILEDELETE_DELETE;
!     sendMsg();
    }
    
--- 459,467 ----
     */
    event void BFileDelete.deleted(result_t result) {
!     if(newMessage()) {
!       outMsg->result = result;
!       outMsg->cmd = REPLY_BFILEDELETE_DELETE;
!       sendMsg();
!     }
    }
    
***************
*** 462,469 ****
     */
    event void BFileDir.corruptionCheckDone(char *fileName, bool isCorrupt, result_t result) {
!     outMsg->result = result;
!     outMsg->length = isCorrupt;
!     outMsg->cmd = REPLY_BFILEDIR_CHECKCORRUPTION;
!     sendMsg();
    }
  
--- 475,484 ----
     */
    event void BFileDir.corruptionCheckDone(char *fileName, bool isCorrupt, result_t result) {
!     if(newMessage()) {
!       outMsg->result = result;
!       outMsg->length = isCorrupt;
!       outMsg->cmd = REPLY_BFILEDIR_CHECKCORRUPTION;
!       sendMsg();
!     }
    }
  
***************
*** 475,482 ****
     */
    event void BFileDir.existsCheckDone(char *fileName, bool doesExist, result_t result) {
!     outMsg->result = result;
!     outMsg->length = doesExist;
!     outMsg->cmd = REPLY_BFILEDIR_EXISTS;
!     sendMsg();
    }
    
--- 490,499 ----
     */
    event void BFileDir.existsCheckDone(char *fileName, bool doesExist, result_t result) {
!     if(newMessage()) {
!       outMsg->result = result;
!       outMsg->length = doesExist;
!       outMsg->cmd = REPLY_BFILEDIR_EXISTS;
!       sendMsg();
!     }
    }
    
***************
*** 491,498 ****
     */  
    event void BFileDir.nextFile(char *fileName, result_t result) {
!     memcpy(outMsg->data, fileName, sizeof(filename));
!     outMsg->result = result;
!     outMsg->cmd = REPLY_BFILEDIR_READNEXT;
!     sendMsg();
    }
      
--- 508,517 ----
     */  
    event void BFileDir.nextFile(char *fileName, result_t result) {
!     if(newMessage()) {
!       memcpy(outMsg->data, fileName, sizeof(filename));
!       outMsg->result = result;
!       outMsg->cmd = REPLY_BFILEDIR_READNEXT;
!       sendMsg();
!     }
    }
      
***************
*** 507,514 ****
     */
    event void BDictionary.opened(uint32_t totalSize, uint32_t remainingBytes, result_t result) {
!     outMsg->length = totalSize;
!     outMsg->result = result;
!     outMsg->cmd = REPLY_BDICTIONARY_OPEN;
!     sendMsg();
    }
  
--- 526,535 ----
     */
    event void BDictionary.opened(uint32_t totalSize, uint32_t remainingBytes, result_t result) {
!     if(newMessage()) {
!       outMsg->length = totalSize;
!       outMsg->result = result;
!       outMsg->cmd = REPLY_BDICTIONARY_OPEN;
!       sendMsg();
!     }
    }
  
***************
*** 518,525 ****
     */
    event void BDictionary.fileIsDictionary(bool isDictionary, result_t result) {
!     outMsg->length = isDictionary;
!     outMsg->result = result;
!     outMsg->cmd = REPLY_BDICTIONARY_ISDICTIONARY;
!     sendMsg();
    }
  
--- 539,548 ----
     */
    event void BDictionary.fileIsDictionary(bool isDictionary, result_t result) {
!     if(newMessage()) {
!       outMsg->length = isDictionary;
!       outMsg->result = result;
!       outMsg->cmd = REPLY_BDICTIONARY_ISDICTIONARY;
!       sendMsg();
!     }
    }
  
***************
*** 530,536 ****
     */
    event void BDictionary.closed(result_t result) {
!     outMsg->result = result;
!     outMsg->cmd = REPLY_BDICTIONARY_CLOSE;
!     sendMsg();
    }
    
--- 553,561 ----
     */
    event void BDictionary.closed(result_t result) {
!     if(newMessage()) {
!       outMsg->result = result;
!       outMsg->cmd = REPLY_BDICTIONARY_CLOSE;
!       sendMsg();
!     }
    }
    
***************
*** 543,550 ****
     */
    event void BDictionary.inserted(uint32_t key, void *value, uint16_t valueSize, result_t result) {
!     outMsg->result = result;
!     outMsg->length = key;
!     outMsg->cmd = REPLY_BDICTIONARY_INSERT;
!     sendMsg();
    }
    
--- 568,577 ----
     */
    event void BDictionary.inserted(uint32_t key, void *value, uint16_t valueSize, result_t result) {
!     if(newMessage()) {
!       outMsg->result = result;
!       outMsg->length = key;
!       outMsg->cmd = REPLY_BDICTIONARY_INSERT;
!       sendMsg();
!     }
    }
    
***************
*** 557,564 ****
     */
    event void BDictionary.retrieved(uint32_t key, void *valueHolder, uint16_t valueSize, result_t result) {
!     outMsg->result = result;
!     outMsg->length = valueSize;
!     outMsg->cmd = REPLY_BDICTIONARY_RETRIEVE;
!     sendMsg();
    }
    
--- 584,593 ----
     */
    event void BDictionary.retrieved(uint32_t key, void *valueHolder, uint16_t valueSize, result_t result) {
!     if(newMessage()) {
!       outMsg->result = result;
!       outMsg->length = valueSize;
!       outMsg->cmd = REPLY_BDICTIONARY_RETRIEVE;
!       sendMsg();
!     }
    }
    
***************
*** 569,576 ****
     */
    event void BDictionary.removed(uint32_t key, result_t result) {
!     outMsg->result = result;
!     outMsg->length = key;
!     outMsg->cmd = REPLY_BDICTIONARY_REMOVE;
!     sendMsg();
    }
    
--- 598,607 ----
     */
    event void BDictionary.removed(uint32_t key, result_t result) {
!     if(newMessage()) {
!       outMsg->result = result;
!       outMsg->length = key;
!       outMsg->cmd = REPLY_BDICTIONARY_REMOVE;
!       sendMsg();
!     }
    }
    
***************
*** 582,589 ****
     */
    event void BDictionary.nextKey(uint32_t nextKey, result_t result) {
!     outMsg->result = result;
!     outMsg->length = nextKey;
!     outMsg->cmd = REPLY_BDICTIONARY_NEXTKEY;
!     sendMsg();
    }
    
--- 613,622 ----
     */
    event void BDictionary.nextKey(uint32_t nextKey, result_t result) {
!     if(newMessage()) {
!       outMsg->result = result;
!       outMsg->length = nextKey;
!       outMsg->cmd = REPLY_BDICTIONARY_NEXTKEY;
!       sendMsg();
!     }
    }

More information about the Tinyos-contrib-commits mailing list