[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/wustl/apps/AgillaAgents/GroupComm/chat Leader.ma, 1.4, 1.5

[Chien-Liang Fok]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/AgillaAgents/GroupComm/chat
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4762/chat

Modified Files:
	Leader.ma 
Log Message:
Test:  PDA - Proxy Only


Index: Leader.ma
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/AgillaAgents/GroupComm/chat/Leader.ma,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Leader.ma	18 Oct 2006 14:34:22 -0000	1.4
--- Leader.ma	15 Nov 2006 02:10:55 -0000	1.5
***************
*** 47,51 ****
  		pop
  		pop
! 		esetvar	17		// heap[17] = member agentID
  		esetvar 19		// heap[19] = name
  		esetvar 18		// heap[18] = message
--- 47,51 ----
  		pop
  		pop
! 		pop
  		esetvar 19		// heap[19] = name
  		esetvar 18		// heap[18] = message
***************
*** 53,76 ****
  		putled			// toggle yellow
  		pushc 0
! RGS_LOOP	inc
  		copy			// Stack:  cntr, cntr
! 		getvar 0		// Stack:  # of members, cntr, cntr
  		cgt			// check whether the counter is > number of members
  		pushcl DONE
! 		jumpc
! 		copy
! 		pushc 2
! 		mul
! 		getvars			// get the neighbor's address
! 		egetvar 18				
! 		swap
  		egetvar 19		// member's name
! 		swap
! 		egetvar 17		// member's agent ID	
! 		swap
  		pushn lbm
! 		swap
! 		pushc 4
! 		swap			// tuple = <"lbm", member ID, name, message>
  		rout
  		pushc RGS_LOOP
--- 53,97 ----
  		putled			// toggle yellow
  		pushc 0
! 		esetvar 17
! RGS_LOOP	egetvar 17
! 		inc
  		copy			// Stack:  cntr, cntr
! 		
! 		esetvar	17		// heap[17] = cntr
! 		
! 		getvar 0		// Stack:  # of members, cntr
  		cgt			// check whether the counter is > number of members
  		pushcl DONE
! 		jumpc	
! 				
! 		egetvar 18		// message				
  		egetvar 19		// member's name
! 
! 		egetvar 17		
! 		pushc 2
! 		mul					
! 		dec			// 2*idx - 1
! 		getvars			// each member's agent ID
! 
! 		//copy
! 		//pushn rcv
! 		//pushc 2
! 		//pushloc uart_x uart_y
! 		//rout	
! 
  		pushn lbm
! 		pushc 4			// tuple = <"lbm", member ID, name, message>
! 		
! 		egetvar 17
! 		pushc 2
! 		mul			// 2*idx		
! 		getvars			// get the member's address	
! 		//pushloc uart_x uart_y
! 		//copy
! 		//pushn rcv
! 		//pushc 2
! 		//pushloc uart_x uart_y
! 		//rout	
! 	
  		rout
  		pushc RGS_LOOP
***************
*** 78,82 ****
  DONE		pushc 25
  		putled			// toggle red
! 		pop			// pop the counter	
  		endrxn			// end the reaction
  
--- 99,103 ----
  DONE		pushc 25
  		putled			// toggle red
! 		//pop			// pop the counter	
  		endrxn			// end the reaction
  
***************
*** 100,103 ****
--- 121,134 ----
  		pushc 28
  		putled			// toggle yellow when member joins group
+ 		
+ 		//getvar  0
+ 		//pushc	2
+ 		//mul
+ 		//getvars
+ 		//pushn mem		// tell BS that a member has joined
+ 		//pushc 2
+ 		//pushloc uart_x uart_y
+ 		//rout
+ 		
  		endrxn