[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/wustl/apps/Agilla/components LocationMgrM.nc, 1.6, 1.7 RemoteTSOpMgrDummy.nc, 1.2, 1.3 RemoteTSOpMgrM.nc, 1.21, 1.22

[Chien-Liang Fok]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/components
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7256/components

Modified Files:
	LocationMgrM.nc RemoteTSOpMgrDummy.nc RemoteTSOpMgrM.nc 
Log Message:
Changes made for force_uart


Index: LocationMgrM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/components/LocationMgrM.nc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** LocationMgrM.nc	18 May 2006 19:58:40 -0000	1.6
--- LocationMgrM.nc	27 Sep 2006 04:20:32 -0000	1.7
***************
*** 144,148 ****
     */
    command uint16_t LocationMgrI.getAddress(AgillaLocation* loc) {
!     if (loc->x == UART_X && loc->y == UART_Y)
        return TOS_UART_ADDR;      
      else if (loc->x == BCAST_X && loc->y == BCAST_Y)
--- 144,154 ----
     */
    command uint16_t LocationMgrI.getAddress(AgillaLocation* loc) {
!   
!     // fs2:  Agent Group Comunication
!     // check for device that are NOT base station, force_uart
! 
!     //if (loc->x == UART_X && loc->y == UART_Y)
!     if ((loc->x == UART_X && loc->y == UART_Y) 
!     	|| (loc->x == FORCE_UART_X && loc->y == FORCE_UART_Y))
        return TOS_UART_ADDR;      
      else if (loc->x == BCAST_X && loc->y == BCAST_Y)

Index: RemoteTSOpMgrDummy.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/components/RemoteTSOpMgrDummy.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RemoteTSOpMgrDummy.nc	18 May 2006 19:58:40 -0000	1.2
--- RemoteTSOpMgrDummy.nc	27 Sep 2006 04:20:32 -0000	1.3
***************
*** 56,60 ****
    
    command result_t RemoteTSOpMgrI.execute(AgillaAgentContext* agent, 
!     uint16_t op, uint16_t dest, AgillaTuple tuple)
    {
      return SUCCESS;
--- 56,60 ----
    
    command result_t RemoteTSOpMgrI.execute(AgillaAgentContext* agent, 
!     uint16_t op, uint16_t dest, AgillaTuple tuple, uint16_t flags)
    {
      return SUCCESS;

Index: RemoteTSOpMgrM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/components/RemoteTSOpMgrM.nc,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** RemoteTSOpMgrM.nc	18 May 2006 19:58:40 -0000	1.21
--- RemoteTSOpMgrM.nc	27 Sep 2006 04:20:32 -0000	1.22
***************
*** 94,98 ****
     */
    AgillaTuple _tuple;
! 
    /**
     * The current instruction.
--- 94,98 ----
     */
    AgillaTuple _tuple;
!   
    /**
     * The current instruction.
***************
*** 115,118 ****
--- 115,122 ----
     */
    uint8_t _numTries;
+   
+   // fs2:  Agent Group Comunication
+   // Flags for the forces_uart operations 
+   uint16_t _flags;
  
  
***************
*** 155,159 ****
  
    command result_t RemoteTSOpMgrI.execute(AgillaAgentContext* agent,
!     uint16_t op, uint16_t dest, AgillaTuple tuple)
    {
      _currAgent = agent;
--- 159,163 ----
  
    command result_t RemoteTSOpMgrI.execute(AgillaAgentContext* agent,
!     uint16_t op, uint16_t dest, AgillaTuple tuple, uint16_t flags)
    {
      _currAgent = agent;
***************
*** 163,166 ****
--- 167,172 ----
      _numResults = 0;
      _numTries = 0;
+     
+     _flags = flags;
  
      if (!post doRemoteOp())
***************
*** 198,202 ****
        // If the destination is the UART but this mote am not the gateway,
        // find the neighbor that is closest to the gateway.
!       if (onehop_dest == TOS_UART_ADDR && !call AddressMgrI.isGW())
        {
          // If there is no known gateway, abort.
--- 204,212 ----
        // If the destination is the UART but this mote am not the gateway,
        // find the neighbor that is closest to the gateway.
!       
!       // fs2: Agent Group Comunication
!       // If the destination is the UART but this mote am not the gateway, and it is NOT forced operation
!       
!       if (onehop_dest == TOS_UART_ADDR && !call AddressMgrI.isGW() && !(_flags & RTS_OP_MGR_FORCE_UART))
        {
          // If there is no known gateway, abort.