[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Drain Drain.h, 1.4, 1.5 DrainLinkEstM.nc, 1.4, 1.5

[Gilman Tolle]

Update of /cvsroot/tinyos/tinyos-1.x/beta/Drain
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30685

Modified Files:
	Drain.h DrainLinkEstM.nc 
Log Message:
Reverse routing working better...

Index: Drain.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drain/Drain.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Drain.h	4 Mar 2005 03:13:56 -0000	1.4
--- Drain.h	4 Mar 2005 23:54:44 -0000	1.5
***************
*** 95,98 ****
--- 95,99 ----
    uint16_t linkSource;
    uint16_t destAddr;
+   uint8_t  addrLength;
    uint8_t  op;
  } DrainRegisterMsg;

Index: DrainLinkEstM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drain/DrainLinkEstM.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DrainLinkEstM.nc	4 Mar 2005 03:13:56 -0000	1.4
--- DrainLinkEstM.nc	4 Mar 2005 23:54:44 -0000	1.5
***************
*** 70,73 ****
--- 70,74 ----
    uint16_t children[DRAIN_MAX_CHILDREN];
    uint8_t  childrenToNotify;
+   uint8_t  myAddrLength;
  
    bool msgBufBusy;
***************
*** 487,490 ****
--- 488,492 ----
        if (pRM->linkSource == route->nextHop) {
  	myAddr = pRM->destAddr;
+ 	myAddrLength = pRM->addrLength;
        }
      }
***************
*** 525,529 ****
  
  	pRM->linkSource = TOS_LOCAL_ADDRESS;
! 	pRM->destAddr = (myAddr << 2) + i; //assumes 2 bits per hop
  	pRM->op = DRAIN_REGISTER_OP_JOINED;
  
--- 527,532 ----
  
  	pRM->linkSource = TOS_LOCAL_ADDRESS;
! 	//assumes 2 bits per hop
! 	pRM->destAddr = (i << myAddrLength) + myAddr;
  	pRM->op = DRAIN_REGISTER_OP_JOINED;