[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/wustl/apps/Agilla/opcodes OPrtsM.nc, 1.14, 1.15

[Chien-Liang Fok]

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

Modified Files:
	OPrtsM.nc 
Log Message:
Changes made for force_uart


Index: OPrtsM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/opcodes/OPrtsM.nc,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** OPrtsM.nc	26 May 2006 02:58:20 -0000	1.14
--- OPrtsM.nc	27 Sep 2006 04:20:32 -0000	1.15
***************
*** 98,101 ****
--- 98,105 ----
    AgillaTuple tuple;
    
+   // fs2:  Agent Group Communication
+   // Flags for forced_uart operation
+   uint16_t _flags;
+ 
    task void doOProutgs();
    task void doOPrrdpgs();
***************
*** 243,246 ****
--- 247,255 ----
      {      
        uint16_t dest;
+       
+       // fs2:  Agent Group Communication
+       // Flags default to NONE no flags
+       _flags = RTS_OP_MGR_NONE;
+       
        _instr = instr;
       
***************
*** 260,264 ****
--- 269,280 ----
              dest = destV.value.value;
            else if (destV.vtype & AGILLA_VAR_L)
+           {
              dest = call LocationMgrI.getAddress(&destV.loc);  // convert location to address
+             
+             // fs2:  Agent Group Communication
+             // get the correct flag according to the location
+             if((destV.loc.x == FORCE_UART_X) && (destV.loc.y == FORCE_UART_Y))
+             	_flags |= RTS_OP_MGR_FORCE_UART;
+           }
            else 
            {
***************
*** 335,339 ****
        else
        {
!         if (!call RemoteTSOpMgrI.execute(_currAgent, instr, dest, tuple))
          {
            dbg(DBG_USR1, "VM (%i:%i): OPrtsM: ERROR: RemoteTSOpMgrI.execute() returned fail.\n", _currAgent->id.id, _currAgent->pc-1);
--- 351,355 ----
        else
        {
!         if (!call RemoteTSOpMgrI.execute(_currAgent, instr, dest, tuple, _flags))
          {
            dbg(DBG_USR1, "VM (%i:%i): OPrtsM: ERROR: RemoteTSOpMgrI.execute() returned fail.\n", _currAgent->id.id, _currAgent->pc-1);
***************
*** 353,357 ****
        if (call NeighborListI.getNeighbor(_cNbrIndex++, &dest))
        {
!         if (!call RemoteTSOpMgrI.execute(_currAgent, IOProut, dest, tuple))
          {
            dbg(DBG_USR1, "VM (%i:%i): OPrtsM.doOProutgs(): ERROR: RemoteTSOpMgrI.execute() returned fail.\n", _currAgent->id.id, _currAgent->pc-1);
--- 369,373 ----
        if (call NeighborListI.getNeighbor(_cNbrIndex++, &dest))
        {
!         if (!call RemoteTSOpMgrI.execute(_currAgent, IOProut, dest, tuple, _flags))
          {
            dbg(DBG_USR1, "VM (%i:%i): OPrtsM.doOProutgs(): ERROR: RemoteTSOpMgrI.execute() returned fail.\n", _currAgent->id.id, _currAgent->pc-1);
***************
*** 384,388 ****
        if (call NeighborListI.getNeighbor(_cNbrIndex++, &dest))
        {
!         if (!call RemoteTSOpMgrI.execute(_currAgent, IOPrrdp, dest, tuple))
          {
            dbg(DBG_USR1, "VM (%i:%i): OPrtsM.doOPrrdpgs(): ERROR: RemoteTSOpMgrI.execute() returned fail.\n", _currAgent->id.id, _currAgent->pc-1);
--- 400,404 ----
        if (call NeighborListI.getNeighbor(_cNbrIndex++, &dest))
        {
!         if (!call RemoteTSOpMgrI.execute(_currAgent, IOPrrdp, dest, tuple, _flags))
          {
            dbg(DBG_USR1, "VM (%i:%i): OPrtsM.doOPrrdpgs(): ERROR: RemoteTSOpMgrI.execute() returned fail.\n", _currAgent->id.id, _currAgent->pc-1);