[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Drain DrainLinkEstM.nc, 1.6, 1.7 DrainM.nc, 1.5, 1.6

[Gilman Tolle]

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

Modified Files:
	DrainLinkEstM.nc DrainM.nc 
Log Message:
Added support for sending Drain messages to the UART, as well as to the local area and up the tree. This relies on our ugly TOS_UART_ADDR hack, but that's how I'll leave it until we rework this all for TinyOS 2.0

Index: DrainLinkEstM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drain/DrainLinkEstM.nc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DrainLinkEstM.nc	15 Mar 2005 01:19:13 -0000	1.6
--- DrainLinkEstM.nc	15 Mar 2005 01:52:35 -0000	1.7
***************
*** 237,242 ****
  	Msg->addr = TOS_BCAST_ADDR;
  	
!       } else {
  	
  	route = getRoute(pMHMsg->dest);
  	
--- 237,246 ----
  	Msg->addr = TOS_BCAST_ADDR;
  	
!       } else if (pMHMsg->dest == TOS_UART_ADDR) {
  	
+ 	Msg->addr = TOS_UART_ADDR;
+ 
+       } else {
+ 
  	route = getRoute(pMHMsg->dest);
  	

Index: DrainM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drain/DrainM.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DrainM.nc	15 Mar 2005 01:19:13 -0000	1.5
--- DrainM.nc	15 Mar 2005 01:52:35 -0000	1.6
***************
*** 357,361 ****
      }
  
!     if (pMsg->addr == TOS_BCAST_ADDR) {
  
        // It didn't have a destination.
--- 357,361 ----
      }
  
!     if (pMsg->addr == TOS_BCAST_ADDR || pMsg->addr == TOS_UART_ADDR) {
  
        // It didn't have a destination.