[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/wustl/apps/Agilla/types Agilla.h, 1.27, 1.27.2.1

[Chien-Liang Fok]

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

Modified Files:
      Tag: GroupComm
	Agilla.h 
Log Message:
Added a proxy heart beat and a virtual ID for the proxy.

Index: Agilla.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/types/Agilla.h,v
retrieving revision 1.27
retrieving revision 1.27.2.1
diff -C2 -d -r1.27 -r1.27.2.1
*** Agilla.h	27 Sep 2006 04:20:32 -0000	1.27
--- Agilla.h	15 Nov 2006 04:29:35 -0000	1.27.2.1
***************
*** 188,241 ****
  
  
! typedef enum {
!   AGILLA_ERROR_TRIGGERED                =  0,
!   AGILLA_ERROR_INVALID_RUNNABLE         =  1,
!   AGILLA_ERROR_STACK_OVERFLOW           =  2,
!   AGILLA_ERROR_STACK_UNDERFLOW          =  3,
!   //AGILLA_ERROR_TS_FULL                  =  4,
!   AGILLA_ERROR_AGENT_NOT_RUNNING        =  5,
!   AGILLA_ERROR_INDEX_OUT_OF_BOUNDS      =  6,
!   AGILLA_ERROR_INSTRUCTION_RUNOFF       =  7,
!   AGILLA_ERROR_INVALID_FIELD_TYPE       =  8,
!   AGILLA_ERROR_CODE_OVERFLOW            =  9,
!   AGILLA_ERROR_ILLEGAL_TUPLE_NAME       = 10,
!   AGILLA_ERROR_QUEUE_ENQUEUE            = 11,
!   AGILLA_ERROR_QUEUE_DEQUEUE            = 12,
!   AGILLA_ERROR_QUEUE_REMOVE             = 13,
!   AGILLA_ERROR_QUEUE_INVALID            = 14,
!   AGILLA_ERROR_RSTACK_OVERFLOW          = 15,
!   AGILLA_ERROR_RSTACK_UNDERFLOW         = 16,
!   AGILLA_ERROR_INVALID_ACCESS           = 17,
!   AGILLA_ERROR_TYPE_CHECK               = 18,
!   AGILLA_ERROR_INVALID_TYPE             = 19,
!   AGILLA_ERROR_INVALID_LOCK             = 20,
!   AGILLA_ERROR_INVALID_INSTRUCTION      = 21,
!   AGILLA_ERROR_INVALID_SENSOR           = 22,
!   AGILLA_ERROR_ILLEGAL_CODE_BLOCK       = 23,
!   AGILLA_ERROR_ILLEGAL_FIELD_TYPE       = 24,
!   AGILLA_ERROR_INVALID_FIELD_COUNT      = 25,
!   AGILLA_ERROR_GET_FIELD_INVALID_TYPE   = 26,
! //  AGILLA_ERROR_UNKOWN_AGENT_CODE         = 27,
!   AGILLA_ERROR_UNKOWN_AGENT_HEAP         = 28,
!   AGILLA_ERROR_UNKOWN_AGENT_OPSTACK      = 29,
!   AGILLA_ERROR_REQUEST_Q_FULL            = 30,
!   AGILLA_ERROR_OPrtsM_AGENT_NULL         = 31,
!   AGILLA_ERROR_OPrtsM_AGENTID_MISMATCH   = 32,
!   AGILLA_ERROR_OPrtsM_INSTR_MISMATCH     = 33,
!   AGILLA_ERROR_OPrtsM_NO_RESPONSE        = 34,
!   AGILLA_ERROR_RCV_BUFF_FULL             = 35,
!   AGILLA_ERROR_UNKNOWN_MSG_TYPE          = 36,
!   AGILLA_ERROR_TUPLE_SIZE                = 37,
!   AGILLA_ERROR_SEND_BUFF_FULL            = 38,
!   AGILLA_ERROR_NO_CLOSER_NEIGHBOR        = 39,
!   AGILLA_ERROR_DROPPED_RESULTS_MESSAGE   = 40,
!   AGILLA_ERROR_OPrtsM_BOUNCE_QUEUE_FULL  = 41,
!   AGILLA_ERROR_RXN_NOT_FOUND             = 42,
!   AGILLA_ERROR_TASK_QUEUE_FULL           = 43,
!   AGILLA_ERROR_INVALID_VARIABLE_SIZE     = 44,
!   AGILLA_ERROR_OPSLEEP_BUFFER_UNDERFLOW  = 45,
!   AGILLA_ERROR_GET_FREE_BLOCK            = 46,
!   AGILLA_ERROR_ILLEGAL_RXN_OP            = 47,
! } ErrorICode;
  
  typedef enum {
--- 188,221 ----
  
  
! enum ErrorTypes {
!   NONFATAL = 0,
!   FATAL,
! };
! 
! enum ErrorCodes{
!   AGILLA_ERROR_TRIGGERED = 0,
!   AGILLA_ERROR_STACK_OVERFLOW,
!   AGILLA_ERROR_STACK_UNDERFLOW,  
!   AGILLA_ERROR_HEAP_INDEX_OUT_OF_BOUNDS,
!   AGILLA_ERROR_CODE_INDEX_OUT_OF_BOUNDS,
!   AGILLA_ERROR_INVALID_FIELD_TYPE,
!   AGILLA_ERROR_CODE_OVERFLOW,
!   AGILLA_ERROR_QUEUE_ENQUEUE, 
!   AGILLA_ERROR_QUEUE_DEQUEUE,
!   AGILLA_ERROR_QUEUE_REMOVE,
!   AGILLA_ERROR_TYPE_CHECK,
!   AGILLA_ERROR_INVALID_TYPE,
!   AGILLA_ERROR_INVALID_INSTRUCTION,
!   AGILLA_ERROR_INVALID_SENSOR,
!   AGILLA_ERROR_INVALID_VALUE,  
!   AGILLA_ERROR_ILLEGAL_CODE_BLOCK,
!   AGILLA_ERROR_ILLEGAL_FIELD_TYPE,
!   AGILLA_ERROR_INVALID_FIELD_COUNT,
!   AGILLA_ERROR_TUPLE_SIZE,
!   AGILLA_ERROR_SEND_BUFF_FULL,
!   AGILLA_ERROR_RXN_NOT_FOUND,
!   AGILLA_ERROR_GET_FREE_BLOCK,
!   AGILLA_ERROR_ILLEGAL_RXN_OP,
! };
  
  typedef enum {
***************
*** 377,380 ****
--- 357,361 ----
    AM_AGILLARESETMSG  = 0x21,
    AM_AGILLABEACONMSG = 0x22,
+   AM_AGILLAPROXYBEACONMSG = 0x30,
    AM_AGILLAEXPMSG    = 0x23,
    //AM_AGILLASTARTEXPMSG  = 0x24,
***************
*** 427,430 ****
--- 408,420 ----
  } AgillaBeaconMsg;  // 4 bytes / 10 bytes
  
+ 
+ /**
+  * This message is broadcasted by the proxy.
+  */
+ typedef struct AgillaProxyBeaconMsg {
+   uint16_t id;    // the ID of the proxy mote
+   uint16_t vID;   // the virtual address of the proxy mote
+ } AgillaProxyBeaconMsg;
+ 
  /**
   * This message is sent to the mote connected to the base station
***************
*** 432,436 ****
   */
  typedef struct AgillaSetBSMsg {
!   uint16_t dummy;
  } AgillaSetBSMsg; // 1 byte
  
--- 422,426 ----
   */
  typedef struct AgillaSetBSMsg {
!   uint16_t vID;  // the virtual address of the proxy
  } AgillaSetBSMsg; // 1 byte