[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/wustl/apps/Agilla Agilla.nc, 1.21, 1.22 AgillaOpcodes.h, 1.15, 1.16 Example Makefile.Agilla, 1.30, 1.31 platforms.properties, 1.3, 1.4

borndigerati borndigerati at users.sourceforge.net
Thu Apr 6 18:15:10 PDT 2006


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

Modified Files:
	Agilla.nc AgillaOpcodes.h Example Makefile.Agilla 
	platforms.properties 
Log Message:


Index: Agilla.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/Agilla.nc,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Agilla.nc	22 Mar 2006 01:06:01 -0000	1.21
--- Agilla.nc	7 Apr 2006 01:14:31 -0000	1.22
***************
*** 2,37 ****
  
  /* Agilla - A middleware for wireless sensor networks.
!  * Copyright (C) 2004, Washington University in Saint Louis 
   * By Chien-Liang Fok.
!  * 
!  * Washington University states that Agilla is free software; 
!  * you can redistribute it and/or modify it under the terms of 
!  * the current version of the GNU Lesser General Public License 
   * as published by the Free Software Foundation.
!  * 
!  * Agilla is distributed in the hope that it will be useful, but 
!  * THERE ARE NO WARRANTIES, WHETHER ORAL OR WRITTEN, EXPRESS OR 
!  * IMPLIED, INCLUDING BUT NOT LIMITED TO, IMPLIED WARRANTIES OF 
   * MERCHANTABILITY OR FITNESS FOR A PARTICULAR USE.
   *
!  * YOU UNDERSTAND THAT AGILLA IS PROVIDED "AS IS" FOR WHICH NO 
!  * WARRANTIES AS TO CAPABILITIES OR ACCURACY ARE MADE. THERE ARE NO 
!  * WARRANTIES AND NO REPRESENTATION THAT AGILLA IS FREE OF 
!  * INFRINGEMENT OF THIRD PARTY PATENT, COPYRIGHT, OR OTHER 
!  * PROPRIETARY RIGHTS.  THERE ARE NO WARRANTIES THAT SOFTWARE IS 
!  * FREE FROM "BUGS", "VIRUSES", "TROJAN HORSES", "TRAP DOORS", "WORMS", 
!  * OR OTHER HARMFUL CODE.  
   *
!  * YOU ASSUME THE ENTIRE RISK AS TO THE PERFORMANCE OF SOFTWARE AND/OR 
!  * ASSOCIATED MATERIALS, AND TO THE PERFORMANCE AND VALIDITY OF 
!  * INFORMATION GENERATED USING SOFTWARE. By using Agilla you agree to 
!  * indemnify, defend, and hold harmless WU, its employees, officers and 
!  * agents from any and all claims, costs, or liabilities, including 
!  * attorneys fees and court costs at both the trial and appellate levels 
!  * for any loss, damage, or injury caused by your actions or actions of 
!  * your officers, servants, agents or third parties acting on behalf or 
!  * under authorization from you, as a result of using Agilla. 
   *
!  * See the GNU Lesser General Public License for more details, which can 
   * be found here: http://www.gnu.org/copyleft/lesser.html
   */
--- 2,37 ----
  
  /* Agilla - A middleware for wireless sensor networks.
!  * Copyright (C) 2004, Washington University in Saint Louis
   * By Chien-Liang Fok.
!  *
!  * Washington University states that Agilla is free software;
!  * you can redistribute it and/or modify it under the terms of
!  * the current version of the GNU Lesser General Public License
   * as published by the Free Software Foundation.
!  *
!  * Agilla is distributed in the hope that it will be useful, but
!  * THERE ARE NO WARRANTIES, WHETHER ORAL OR WRITTEN, EXPRESS OR
!  * IMPLIED, INCLUDING BUT NOT LIMITED TO, IMPLIED WARRANTIES OF
   * MERCHANTABILITY OR FITNESS FOR A PARTICULAR USE.
   *
!  * YOU UNDERSTAND THAT AGILLA IS PROVIDED "AS IS" FOR WHICH NO
!  * WARRANTIES AS TO CAPABILITIES OR ACCURACY ARE MADE. THERE ARE NO
!  * WARRANTIES AND NO REPRESENTATION THAT AGILLA IS FREE OF
!  * INFRINGEMENT OF THIRD PARTY PATENT, COPYRIGHT, OR OTHER
!  * PROPRIETARY RIGHTS.  THERE ARE NO WARRANTIES THAT SOFTWARE IS
!  * FREE FROM "BUGS", "VIRUSES", "TROJAN HORSES", "TRAP DOORS", "WORMS",
!  * OR OTHER HARMFUL CODE.
   *
!  * YOU ASSUME THE ENTIRE RISK AS TO THE PERFORMANCE OF SOFTWARE AND/OR
!  * ASSOCIATED MATERIALS, AND TO THE PERFORMANCE AND VALIDITY OF
!  * INFORMATION GENERATED USING SOFTWARE. By using Agilla you agree to
!  * indemnify, defend, and hold harmless WU, its employees, officers and
!  * agents from any and all claims, costs, or liabilities, including
!  * attorneys fees and court costs at both the trial and appellate levels
!  * for any loss, damage, or injury caused by your actions or actions of
!  * your officers, servants, agents or third parties acting on behalf or
!  * under authorization from you, as a result of using Agilla.
   *
!  * See the GNU Lesser General Public License for more details, which can
   * be found here: http://www.gnu.org/copyleft/lesser.html
   */
***************
*** 84,102 ****
    components OPhalt, OPaddr, OPaid, OPrand, OPcpush;
    components OPcistype,  OPloc, /*OPvicinity,*/ OPclear, OPnumnbrs;
!   components OPrandnbr, OPwait;
  
    // One operand instructions
    components OPinc;
!   components OPclearvar, OPinv, OPnot, OPcopy, OPpop, OPcpull, OPsleep;
!   components OPjump, OPputled, OPmove, OPgetsetvars, OPgetnbr;
!   components OPcisnbr, OPdec;
!   
!   components OPsenseDummyC as OPsense;
!   //components OPsenseMTS310CAC as OPsense;
  
!   // Two and three operand-instructions 
!   components OPdist, OPswap, OPlogical, OPmul, OPdiv, OPadd;
!   components OPmod, OPcompare, OPceqtype;
!   components OPrts, OPts, OPrxn;
  
    // T-class instructions
--- 84,112 ----
    components OPhalt, OPaddr, OPaid, OPrand, OPcpush;
    components OPcistype,  OPloc, /*OPvicinity,*/ OPclear, OPnumnbrs;
!   components OPrandnbr;
! 
!   #if !ENABLE_CLUSTERING
!     components OPwait;
!   #endif
  
    // One operand instructions
    components OPinc;
!   components OPnot, OPcopy, OPpop, OPcpull, OPsleep;
!   components OPjump, OPputled, OPmove, OPgetsetvars;
!   components OPdec;
  
!   #if !ENABLE_CLUSTERING
!     components OPclearvar, OPcisnbr, OPinv, OPsenseDummyC as OPsense, OPgetnbr;
!     //components OPsenseMTS310CAC as OPsense;
! 
!     // Two and three operand-instructions
!     components OPdist, OPswap, OPlogical, OPmul, OPdiv, OPadd;
!     components OPmod, OPceqtype;
!   #endif
!   components  OPts, OPcompare;
! 
!   #if !ENABLE_CLUSTERING
!     components OPrts, OPrxn;
!   #endif
  
    // T-class instructions
***************
*** 114,127 ****
    // X-Class instructions
    components OPpushc6;
!   
    /**   Extended ISA 1 **/
    components OPshift, OPdepth, OPerr, OPhid;
    components OPlocToValue;
    components OPegetsetvar6, OPsub;
    components OPdesc;
    components OPgetlocation, OPgetNumAgents, OPgetAgents, OPgetClosestAgent;
!   
    #if ENABLE_DELUGE
!     components DelugeC;  
      Main.StdControl -> DelugeC;
    #endif
--- 124,139 ----
    // X-Class instructions
    components OPpushc6;
! 
    /**   Extended ISA 1 **/
+   #if !ENABLE_CLUSTERING
    components OPshift, OPdepth, OPerr, OPhid;
    components OPlocToValue;
    components OPegetsetvar6, OPsub;
+   #endif
    components OPdesc;
    components OPgetlocation, OPgetNumAgents, OPgetAgents, OPgetClosestAgent;
! 
    #if ENABLE_DELUGE
!     components DelugeC;
      Main.StdControl -> DelugeC;
    #endif
***************
*** 131,135 ****
    // B-Class instructions
    // zero operand instructions
!   AgillaEngineC.BasicISA[IOPhalt] -> OPhalt; 
    AgillaEngineC.BasicISA[IOPaddr] -> OPaddr;
    AgillaEngineC.BasicISA[IOPaid] -> OPaid;
--- 143,147 ----
    // B-Class instructions
    // zero operand instructions
!   AgillaEngineC.BasicISA[IOPhalt] -> OPhalt;
    AgillaEngineC.BasicISA[IOPaddr] -> OPaddr;
    AgillaEngineC.BasicISA[IOPaid] -> OPaid;
***************
*** 142,151 ****
    AgillaEngineC.BasicISA[IOPnumnbrs] -> OPnumnbrs;
    AgillaEngineC.BasicISA[IOPrandnbr] -> OPrandnbr;
!   AgillaEngineC.BasicISA[IOPwait] -> OPwait;
  
    // One operand instructions
    AgillaEngineC.BasicISA[IOPinc] -> OPinc;
-   AgillaEngineC.BasicISA[IOPclearvar] -> OPclearvar;
-   AgillaEngineC.BasicISA[IOPinv] -> OPinv;
    AgillaEngineC.BasicISA[IOPnot]  -> OPnot;
    AgillaEngineC.BasicISA[IOPlnot] -> OPnot;
--- 154,165 ----
    AgillaEngineC.BasicISA[IOPnumnbrs] -> OPnumnbrs;
    AgillaEngineC.BasicISA[IOPrandnbr] -> OPrandnbr;
! 
! 
!   #if !ENABLE_CLUSTERING
!     AgillaEngineC.BasicISA[IOPwait] -> OPwait;
!   #endif
  
    // One operand instructions
    AgillaEngineC.BasicISA[IOPinc] -> OPinc;
    AgillaEngineC.BasicISA[IOPnot]  -> OPnot;
    AgillaEngineC.BasicISA[IOPlnot] -> OPnot;
***************
*** 163,189 ****
    AgillaEngineC.BasicISA[IOPgetvars] -> OPgetsetvars;
    AgillaEngineC.BasicISA[IOPsetvars] -> OPgetsetvars;
-   AgillaEngineC.BasicISA[IOPgetnbr] -> OPgetnbr;
-   AgillaEngineC.BasicISA[IOPcisnbr] -> OPcisnbr;  
-   AgillaEngineC.BasicISA[IOPsense] -> OPsense;
    AgillaEngineC.BasicISA[IOPdec] -> OPdec;
  
!   // Two and three operand-instructions
!   AgillaEngineC.BasicISA[IOPdist] -> OPdist;
!   AgillaEngineC.BasicISA[IOPswap] -> OPswap;
!   AgillaEngineC.BasicISA[IOPland] -> OPlogical;
!   AgillaEngineC.BasicISA[IOPlor]  -> OPlogical;
!   AgillaEngineC.BasicISA[IOPand]  -> OPlogical;
!   AgillaEngineC.BasicISA[IOPor]   -> OPlogical;
!   AgillaEngineC.BasicISA[IOPmul] -> OPmul;
!   AgillaEngineC.BasicISA[IOPdiv] -> OPdiv;
!   AgillaEngineC.BasicISA[IOPadd] -> OPadd;
!   AgillaEngineC.BasicISA[IOPmod] -> OPmod;
!   AgillaEngineC.BasicISA[IOPceq]  -> OPcompare;
!   AgillaEngineC.BasicISA[IOPcneq] -> OPcompare;
!   AgillaEngineC.BasicISA[IOPclt]  -> OPcompare;
!   AgillaEngineC.BasicISA[IOPcgt]  -> OPcompare;
!   AgillaEngineC.BasicISA[IOPclte] -> OPcompare;
!   AgillaEngineC.BasicISA[IOPcgte] -> OPcompare;
!   AgillaEngineC.BasicISA[IOPceqtype] -> OPceqtype;
    AgillaEngineC.BasicISA[IOPout]    -> OPts;   // local TS Ops
    AgillaEngineC.BasicISA[IOPinp]    -> OPts;
--- 177,204 ----
    AgillaEngineC.BasicISA[IOPgetvars] -> OPgetsetvars;
    AgillaEngineC.BasicISA[IOPsetvars] -> OPgetsetvars;
    AgillaEngineC.BasicISA[IOPdec] -> OPdec;
  
!   #if !ENABLE_CLUSTERING
!     AgillaEngineC.BasicISA[IOPclearvar] -> OPclearvar;
!     AgillaEngineC.BasicISA[IOPcisnbr] -> OPcisnbr;
!     AgillaEngineC.BasicISA[IOPinv] -> OPinv;
!     AgillaEngineC.BasicISA[IOPsense] -> OPsense;
!     AgillaEngineC.BasicISA[IOPgetnbr] -> OPgetnbr;
!   #endif
! 
!   #if !ENABLE_CLUSTERING
!     // Two and three operand-instructions
!     AgillaEngineC.BasicISA[IOPdist] -> OPdist;
!     AgillaEngineC.BasicISA[IOPswap] -> OPswap;
!     AgillaEngineC.BasicISA[IOPland] -> OPlogical;
!     AgillaEngineC.BasicISA[IOPlor]  -> OPlogical;
!     AgillaEngineC.BasicISA[IOPand]  -> OPlogical;
!     AgillaEngineC.BasicISA[IOPor]   -> OPlogical;
!     AgillaEngineC.BasicISA[IOPmul] -> OPmul;
!     AgillaEngineC.BasicISA[IOPdiv] -> OPdiv;
!     AgillaEngineC.BasicISA[IOPadd] -> OPadd;
!     AgillaEngineC.BasicISA[IOPmod] -> OPmod;
!     AgillaEngineC.BasicISA[IOPceqtype] -> OPceqtype;
!   #endif
    AgillaEngineC.BasicISA[IOPout]    -> OPts;   // local TS Ops
    AgillaEngineC.BasicISA[IOPinp]    -> OPts;
***************
*** 191,202 ****
    AgillaEngineC.BasicISA[IOPin]     -> OPts;
    AgillaEngineC.BasicISA[IOPrd]     -> OPts;
!   AgillaEngineC.BasicISA[IOPendrxn] -> OPrxn;
!   AgillaEngineC.BasicISA[IOProut]  -> OPrts;  // remote TS Ops
!   AgillaEngineC.BasicISA[IOPrinp]  -> OPrts;
!   AgillaEngineC.BasicISA[IOPrrdp]  -> OPrts;
!   AgillaEngineC.BasicISA[IOPrrdpg]  -> OPrts;
!   AgillaEngineC.BasicISA[IOProutg]  -> OPrts;
!   AgillaEngineC.BasicISA[IOPregrxn]   -> OPrxn;
!   AgillaEngineC.BasicISA[IOPderegrxn] -> OPrxn; 
  
    // T-Class instructions
--- 206,226 ----
    AgillaEngineC.BasicISA[IOPin]     -> OPts;
    AgillaEngineC.BasicISA[IOPrd]     -> OPts;
! 
!   #if !ENABLE_CLUSTERING
!     AgillaEngineC.BasicISA[IOPendrxn] -> OPrxn;
!     AgillaEngineC.BasicISA[IOProut]  -> OPrts;  // remote TS Ops
!     AgillaEngineC.BasicISA[IOPrinp]  -> OPrts;
!     AgillaEngineC.BasicISA[IOPrrdp]  -> OPrts;
!     AgillaEngineC.BasicISA[IOPrrdpg]  -> OPrts;
!     AgillaEngineC.BasicISA[IOProutg]  -> OPrts;
!     AgillaEngineC.BasicISA[IOPregrxn]   -> OPrxn;
!     AgillaEngineC.BasicISA[IOPderegrxn] -> OPrxn;
!   #endif
!   AgillaEngineC.BasicISA[IOPceq]  -> OPcompare;
!   AgillaEngineC.BasicISA[IOPclt]  -> OPcompare;
!   AgillaEngineC.BasicISA[IOPcgt]  -> OPcompare;
!   AgillaEngineC.BasicISA[IOPclte] -> OPcompare;
!   AgillaEngineC.BasicISA[IOPcgte] -> OPcompare;
!   AgillaEngineC.BasicISA[IOPcneq] -> OPcompare;
  
    // T-Class instructions
***************
*** 216,220 ****
    AgillaEngineC.BasicISA[IOPpusht+5]  -> OPpusht;
    AgillaEngineC.BasicISA[IOPpusht+6]  -> OPpusht;
!   
  
  
--- 240,244 ----
    AgillaEngineC.BasicISA[IOPpusht+5]  -> OPpusht;
    AgillaEngineC.BasicISA[IOPpusht+6]  -> OPpusht;
! 
  
  
***************
*** 391,395 ****
    AgillaEngineC.BasicISA[IOPpushc+62] -> OPpushc6;
    AgillaEngineC.BasicISA[IOPpushc+63] -> OPpushc6;
!   
    AgillaEngineC.ExtendedISA1[IOPshiftr] -> OPshift;
    AgillaEngineC.ExtendedISA1[IOPshiftl] -> OPshift;
--- 415,420 ----
    AgillaEngineC.BasicISA[IOPpushc+62] -> OPpushc6;
    AgillaEngineC.BasicISA[IOPpushc+63] -> OPpushc6;
! 
!   #if !ENABLE_CLUSTERING
    AgillaEngineC.ExtendedISA1[IOPshiftr] -> OPshift;
    AgillaEngineC.ExtendedISA1[IOPshiftl] -> OPshift;
***************
*** 403,415 ****
    AgillaEngineC.ExtendedISA1[IOPrrdpgs] -> OPrts;
    AgillaEngineC.ExtendedISA1[IOPsub] -> OPsub;
!     
    AgillaEngineC.ExtendedISA1[IOPgetAgents] -> OPgetAgents;
    AgillaEngineC.ExtendedISA1[IOPgetLocation] -> OPgetlocation;
    AgillaEngineC.ExtendedISA1[IOPgetNumAgents] -> OPgetNumAgents;
    AgillaEngineC.ExtendedISA1[IOPgetClosestAgent] -> OPgetClosestAgent;
!   
    AgillaEngineC.ExtendedISA1[IOPsetdesc] -> OPdesc;
    AgillaEngineC.ExtendedISA1[IOPgetdesc] -> OPdesc;
!    
    AgillaEngineC.ExtendedISA1[IOPegetvar] -> OPegetsetvar6;
    AgillaEngineC.ExtendedISA1[IOPegetvar+1] -> OPegetsetvar6;
--- 428,442 ----
    AgillaEngineC.ExtendedISA1[IOPrrdpgs] -> OPrts;
    AgillaEngineC.ExtendedISA1[IOPsub] -> OPsub;
!   #endif
! 
    AgillaEngineC.ExtendedISA1[IOPgetAgents] -> OPgetAgents;
    AgillaEngineC.ExtendedISA1[IOPgetLocation] -> OPgetlocation;
    AgillaEngineC.ExtendedISA1[IOPgetNumAgents] -> OPgetNumAgents;
    AgillaEngineC.ExtendedISA1[IOPgetClosestAgent] -> OPgetClosestAgent;
! 
    AgillaEngineC.ExtendedISA1[IOPsetdesc] -> OPdesc;
    AgillaEngineC.ExtendedISA1[IOPgetdesc] -> OPdesc;
! 
!   #if !ENABLE_CLUSTERING
    AgillaEngineC.ExtendedISA1[IOPegetvar] -> OPegetsetvar6;
    AgillaEngineC.ExtendedISA1[IOPegetvar+1] -> OPegetsetvar6;
***************
*** 476,480 ****
    AgillaEngineC.ExtendedISA1[IOPegetvar+62] -> OPegetsetvar6;
    AgillaEngineC.ExtendedISA1[IOPegetvar+63] -> OPegetsetvar6;
!   
    AgillaEngineC.ExtendedISA1[IOPesetvar] -> OPegetsetvar6;
    AgillaEngineC.ExtendedISA1[IOPesetvar+1] -> OPegetsetvar6;
--- 503,507 ----
    AgillaEngineC.ExtendedISA1[IOPegetvar+62] -> OPegetsetvar6;
    AgillaEngineC.ExtendedISA1[IOPegetvar+63] -> OPegetsetvar6;
! 
    AgillaEngineC.ExtendedISA1[IOPesetvar] -> OPegetsetvar6;
    AgillaEngineC.ExtendedISA1[IOPesetvar+1] -> OPegetsetvar6;
***************
*** 540,544 ****
    AgillaEngineC.ExtendedISA1[IOPesetvar+61] -> OPegetsetvar6;
    AgillaEngineC.ExtendedISA1[IOPesetvar+62] -> OPegetsetvar6;
!   AgillaEngineC.ExtendedISA1[IOPesetvar+63] -> OPegetsetvar6;  
  }
  
--- 567,572 ----
    AgillaEngineC.ExtendedISA1[IOPesetvar+61] -> OPegetsetvar6;
    AgillaEngineC.ExtendedISA1[IOPesetvar+62] -> OPegetsetvar6;
!   AgillaEngineC.ExtendedISA1[IOPesetvar+63] -> OPegetsetvar6;
!   #endif
  }
  

Index: AgillaOpcodes.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/AgillaOpcodes.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** AgillaOpcodes.h	23 Mar 2006 01:58:51 -0000	1.15
--- AgillaOpcodes.h	7 Apr 2006 01:14:32 -0000	1.16
***************
*** 2,37 ****
  
  /* Agilla - A middleware for wireless sensor networks.
!  * Copyright (C) 2004, Washington University in Saint Louis 
   * By Chien-Liang Fok.
!  * 
!  * Washington University states that Agilla is free software; 
!  * you can redistribute it and/or modify it under the terms of 
!  * the current version of the GNU Lesser General Public License 
   * as published by the Free Software Foundation.
!  * 
!  * Agilla is distributed in the hope that it will be useful, but 
!  * THERE ARE NO WARRANTIES, WHETHER ORAL OR WRITTEN, EXPRESS OR 
!  * IMPLIED, INCLUDING BUT NOT LIMITED TO, IMPLIED WARRANTIES OF 
   * MERCHANTABILITY OR FITNESS FOR A PARTICULAR USE.
   *
!  * YOU UNDERSTAND THAT AGILLA IS PROVIDED "AS IS" FOR WHICH NO 
!  * WARRANTIES AS TO CAPABILITIES OR ACCURACY ARE MADE. THERE ARE NO 
!  * WARRANTIES AND NO REPRESENTATION THAT AGILLA IS FREE OF 
!  * INFRINGEMENT OF THIRD PARTY PATENT, CIOPYRIGHT, OR OTHER 
!  * PRIOPRIETARY RIGHTS.  THERE ARE NO WARRANTIES THAT SOFTWARE IS 
!  * FREE FROM "BUGS", "VIRUSES", "TROJAN HORSES", "TRAP DOORS", "WORMS", 
!  * OR OTHER HARMFUL CODE.  
   *
!  * YOU ASSUME THE ENTIRE RISK AS TO THE PERFORMANCE OF SOFTWARE AND/OR 
!  * ASSOCIATED MATERIALS, AND TO THE PERFORMANCE AND VALIDITY OF 
!  * INFORMATION GENERATED USING SOFTWARE. By using Agilla you agree to 
!  * indemnify, defend, and hold harmless WU, its employees, officers and 
!  * agents from any and all claims, costs, or liabilities, including 
!  * attorneys fees and court costs at both the trial and appellate levels 
!  * for any loss, damage, or injury caused by your actions or actions of 
!  * your officers, servants, agents or third parties acting on behalf or 
!  * under authorization from you, as a result of using Agilla. 
   *
!  * See the GNU Lesser General Public License for more details, which can 
   * be found here: http://www.gnu.org/copyleft/lesser.html
   */
--- 2,37 ----
  
  /* Agilla - A middleware for wireless sensor networks.
!  * Copyright (C) 2004, Washington University in Saint Louis
   * By Chien-Liang Fok.
!  *
!  * Washington University states that Agilla is free software;
!  * you can redistribute it and/or modify it under the terms of
!  * the current version of the GNU Lesser General Public License
   * as published by the Free Software Foundation.
!  *
!  * Agilla is distributed in the hope that it will be useful, but
!  * THERE ARE NO WARRANTIES, WHETHER ORAL OR WRITTEN, EXPRESS OR
!  * IMPLIED, INCLUDING BUT NOT LIMITED TO, IMPLIED WARRANTIES OF
   * MERCHANTABILITY OR FITNESS FOR A PARTICULAR USE.
   *
!  * YOU UNDERSTAND THAT AGILLA IS PROVIDED "AS IS" FOR WHICH NO
!  * WARRANTIES AS TO CAPABILITIES OR ACCURACY ARE MADE. THERE ARE NO
!  * WARRANTIES AND NO REPRESENTATION THAT AGILLA IS FREE OF
!  * INFRINGEMENT OF THIRD PARTY PATENT, CIOPYRIGHT, OR OTHER
!  * PRIOPRIETARY RIGHTS.  THERE ARE NO WARRANTIES THAT SOFTWARE IS
!  * FREE FROM "BUGS", "VIRUSES", "TROJAN HORSES", "TRAP DOORS", "WORMS",
!  * OR OTHER HARMFUL CODE.
   *
!  * YOU ASSUME THE ENTIRE RISK AS TO THE PERFORMANCE OF SOFTWARE AND/OR
!  * ASSOCIATED MATERIALS, AND TO THE PERFORMANCE AND VALIDITY OF
!  * INFORMATION GENERATED USING SOFTWARE. By using Agilla you agree to
!  * indemnify, defend, and hold harmless WU, its employees, officers and
!  * agents from any and all claims, costs, or liabilities, including
!  * attorneys fees and court costs at both the trial and appellate levels
!  * for any loss, damage, or injury caused by your actions or actions of
!  * your officers, servants, agents or third parties acting on behalf or
!  * under authorization from you, as a result of using Agilla.
   *
!  * See the GNU Lesser General Public License for more details, which can
   * be found here: http://www.gnu.org/copyleft/lesser.html
   */
***************
*** 60,63 ****
--- 60,64 ----
   *
   */
+ 
  /*                  tab:4
   *  IMPORTANT: READ BEFORE DOWNLOADING, CIOPYING, INSTALLING OR USING.  By
***************
*** 97,103 ****
   *
   */
! /* Authors:   Neil Patel
   * History:   created 6/20/2003
-  *
   */
  
--- 98,105 ----
   *
   */
! 
! /**
!  * Authors:   Neil Patel
   * History:   created 6/20/2003
   */
  
***************
*** 121,125 ****
    IOPrand      = 0x03,
    IOPcpush     = 0x04,
!   IOPloc       = 0x05,  
    IOPvicinity  = 0x06,
    IOPclear     = 0x07,
--- 123,127 ----
    IOPrand      = 0x03,
    IOPcpush     = 0x04,
!   IOPloc       = 0x05,
    IOPvicinity  = 0x06,
    IOPclear     = 0x07,
***************
*** 195,199 ****
    IOPpushcl    = 0x51,
    IOPpushloc   = 0x52,
!   
    IOPextend1   = 0x53, // put the mote into extended ISA 1
    IOPextend2   = 0x54, // put the mote into extended ISA 2
--- 197,201 ----
    IOPpushcl    = 0x51,
    IOPpushloc   = 0x52,
! 
    IOPextend1   = 0x53, // put the mote into extended ISA 1
    IOPextend2   = 0x54, // put the mote into extended ISA 2
***************
*** 234,252 ****
    IOPrrdpgs    = 0x09,
    IOPsub       = 0x0a,
!   
    IOPgetAgents       = 0x10,
    IOPgetLocation     = 0x11,
    IOPgetNumAgents    = 0x12,
!   IOPgetClosestAgent = 0x13,  
!   
    IOPtoAgentID       = 0x14,
!   
    IOPsetdesc         = 0x1a,
    IOPgetdesc         = 0x1b,
!   
    IOPegetvar = 0x80,
    IOPesetvar = 0xc0,
!   
  } ExtendedISA1;
!   
  #endif
--- 236,254 ----
    IOPrrdpgs    = 0x09,
    IOPsub       = 0x0a,
! 
    IOPgetAgents       = 0x10,
    IOPgetLocation     = 0x11,
    IOPgetNumAgents    = 0x12,
!   IOPgetClosestAgent = 0x13,
! 
    IOPtoAgentID       = 0x14,
! 
    IOPsetdesc         = 0x1a,
    IOPgetdesc         = 0x1b,
! 
    IOPegetvar = 0x80,
    IOPesetvar = 0xc0,
! 
  } ExtendedISA1;
! 
  #endif

Index: Example Makefile.Agilla
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/Example Makefile.Agilla,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** Example Makefile.Agilla	5 Apr 2006 18:04:37 -0000	1.30
--- Example Makefile.Agilla	7 Apr 2006 01:14:32 -0000	1.31
***************
*** 25,29 ****
                -DTIMEOUT_GET_LOCATION=1024 \
                -DTIMEOUT_GET_NUM_AGENTS=1024 \
! 	      -DCLUSTER_UPDATE_INTERVAL=16384 \
  	      -DAGILLA_RF_POWER=31 \
                -DENABLE_SPACE_LOCALIZER=1 \
--- 25,30 ----
                -DTIMEOUT_GET_LOCATION=1024 \
                -DTIMEOUT_GET_NUM_AGENTS=1024 \
! 	      -DCLUSTER_UPDATE_INTERVAL=20480 \
! 	      -DCLUSTERMSG_RAND=1024 \
  	      -DAGILLA_RF_POWER=31 \
                -DENABLE_SPACE_LOCALIZER=1 \
***************
*** 31,35 ****
                -DENABLE_GRID_ROUTING=0 \
                -DENABLE_CLUSTERING=0 \
!               -DENABLE_EXP_LOGGING=1 \
                -DOMIT_AGENT_SENDER=0 \
                -DOMIT_AGENT_RECEIVER=0 \
--- 32,36 ----
                -DENABLE_GRID_ROUTING=0 \
                -DENABLE_CLUSTERING=0 \
!               -DENABLE_EXP_LOGGING=0 \
                -DOMIT_AGENT_SENDER=0 \
                -DOMIT_AGENT_RECEIVER=0 \
***************
*** 71,74 ****
                -DDEBUG_OP_GETNUMAGENTS=0 \
                -DDEBUG_OP_RTS=0 \
-               -DDEBUG_EXP_LOGGER=0 \
                -DNBR_LIST_PRINT_CHANGES=0
--- 72,74 ----

Index: platforms.properties
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/platforms.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** platforms.properties	29 Mar 2006 20:33:11 -0000	1.3
--- platforms.properties	7 Apr 2006 01:14:32 -0000	1.4
***************
*** 1,19 ****
! ##Initial properties for the known platforms
! #This property file is used to associate the platforms specified in the comm
! #ID string (e.g. serial at COM1:mica) with various plaftorm-specific parameters
! #The entry format is as follows: 
! #	<platform>=<platform package>, <integer ID>, <baudrate>
! #	where
! #<platform> -- that's the platform we compile for (i.e. valid nesc target
! #<platform package> -- name of the common package family that uses the same AM format (e.g. avrmote)
! #<integer ID> -- unique integer that is used by serial forwarder to identify the platform across the network
! #<baudrate> -- default serial port datarate used to communicate with the mote
  
- #Thu Nov 04 18:44:39 PST 2004
- telos=telos,1,19200
- tmote=telos,1,57600
- mica=avrmote,2,19200
- eyes=eyes,4,19200
- micaz=micaz,3,57600
- mica2=avrmote,2,57600
- mica2dot=avrmote,2,19200
--- 1,20 ----
! ##Initial properties for the known platforms
! #This property file is used to associate the platforms specified in the comm
! #ID string (e.g. serial at COM1:mica) with various plaftorm-specific parameters
! #The entry format is as follows: 
! #	<platform>=<platform package>, <integer ID>, <baudrate>
! #	where
! #<platform> -- that's the platform we compile for (i.e. valid nesc target
! #<platform package> -- name of the common package family that uses the same AM format (e.g. avrmote)
! #<integer ID> -- unique integer that is used by serial forwarder to identify the platform across the network
! #<baudrate> -- default serial port datarate used to communicate with the mote
! 
! #Thu Nov 04 18:44:39 PST 2004
! telos=telos,1,57600
! tmote=tmote,1,57600
! mica=avrmote,2,19200
! eyes=eyes,4,19200
! micaz=micaz,3,57600
! mica2=avrmote,2,57600
! mica2dot=avrmote,2,19200
  



More information about the Tinyos-contrib-commits mailing list