[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/wustl/apps/Agilla/types Agilla.h, 1.18, 1.19 LocationDirectory.h, 1.8, 1.9

[Chien-Liang Fok]

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

Modified Files:
	Agilla.h LocationDirectory.h 
Log Message:


Index: Agilla.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/types/Agilla.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Agilla.h	27 Mar 2006 00:38:21 -0000	1.18
--- Agilla.h	5 Apr 2006 18:04:39 -0000	1.19
***************
*** 395,407 ****
   */
  typedef struct AgillaBeaconMsg {
!   uint16_t id;  // the ID of the node
    uint16_t hopsToGW; // The number of hops to the gateway node.
                       // Zero implies that this node is the gateway.
    #if ENABLE_CLUSTERING
    int16_t chId;     // The id of cluster head of the cluster to which it belongs; -1 if not set
!               // If this node is the cluster head, then it sends its own id
!   uint16_t energy;    // The residual energy of the node
    #endif
! } AgillaBeaconMsg; // 4 bytes / 8 bytes
  
  /**
--- 395,408 ----
   */
  typedef struct AgillaBeaconMsg {
!   uint16_t id;       // the ID of the node
    uint16_t hopsToGW; // The number of hops to the gateway node.
                       // Zero implies that this node is the gateway.
    #if ENABLE_CLUSTERING
    int16_t chId;     // The id of cluster head of the cluster to which it belongs; -1 if not set
!                     // If this node is the cluster head, then it sends its own id
!   uint16_t energy;  // The residual energy of the node
!   //uint16_t range;   // Communication range of the node
    #endif
! } AgillaBeaconMsg;  // 4 bytes / 10 bytes
  
  /**
***************
*** 453,465 ****
   */
  
! #define AGILLA_NBR_MSG_SIZE 5
  //#define AGILLA_NBR_MSG_SIZE 8
  
  
  typedef struct AgillaNbrMsg {
!   uint8_t hopsToGW[AGILLA_NBR_MSG_SIZE];  // the number of hops to the gateway
    uint16_t nbr[AGILLA_NBR_MSG_SIZE];    // the address of the neighbor
!   uint16_t lqi[AGILLA_NBR_MSG_SIZE];
!   uint8_t dummy;
! } AgillaNbrMsg; // 26 bytes
  #endif
--- 454,465 ----
   */
  
! #define AGILLA_NBR_MSG_SIZE 4
  //#define AGILLA_NBR_MSG_SIZE 8
  
  
  typedef struct AgillaNbrMsg {
!   uint16_t hopsToGW[AGILLA_NBR_MSG_SIZE];  // the number of hops to the gateway
    uint16_t nbr[AGILLA_NBR_MSG_SIZE];    // the address of the neighbor
!   uint16_t lqi[AGILLA_NBR_MSG_SIZE];  
! } AgillaNbrMsg; // 24 bytes
  #endif

Index: LocationDirectory.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/types/LocationDirectory.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** LocationDirectory.h	28 Mar 2006 01:50:53 -0000	1.8
--- LocationDirectory.h	5 Apr 2006 18:04:39 -0000	1.9
***************
*** 5,10 ****
  #include "TOSTime.h"
  
  enum {
!   MAX_AGENT_NUM   = 3,
  } AgillaLocDirConstants;
  
--- 5,13 ----
  #include "TOSTime.h"
  
+ #define NO_CH 0xff
+ 
  enum {
!   MAX_AGENT_NUM   = 2,
!   MAX_AGENT_ARRAY_NUM = 10,
  } AgillaLocDirConstants;
  
***************
*** 41,45 ****
    uint16_t agent_type;          //  2 bytes: type of agent
    uint16_t src;                 //  2 bytes: src id of host that detected the agent
!   AgillaLocation loc;           //  4 bytes: location of host that detected the agent
    tos_time_t timestamp;         //  2 bytes: time at which agent was detected
    uint16_t dest;                //  2 bytes: destination id (BS id)
--- 44,48 ----
    uint16_t agent_type;          //  2 bytes: type of agent
    uint16_t src;                 //  2 bytes: src id of host that detected the agent
!   AgillaLocation loc;           //  4 bytes: location of agent
    tos_time_t timestamp;         //  2 bytes: time at which agent was detected
    uint16_t dest;                //  2 bytes: destination id (BS id)
***************
*** 141,144 ****
--- 144,148 ----
    uint16_t qid;                 // 2 bytes: query id
    AgillaLocation loc;           // 4 bytes: location of agent that was requested by the query
+   AgillaString nw_desc;         // 2 bytes: network description; unique for each sensor network
  } AgillaQueryReplyAgentLocMsg;  // 10 bytes
  
***************
*** 152,160 ****
  typedef struct AgillaQueryReplyNearestAgentMsg {
    AgillaAgentID agent_id;           // 2 bytes: id of agent issuing query
    uint16_t dest;                    // 2 bytes: id of node to which query result should to be routed
    uint16_t qid;                     // 2 bytes: query id
    AgillaAgentID nearest_agent_id;   // 2 bytes: id of nearest agent
    AgillaLocation nearest_agent_loc; // 4 bytes: location of nearest agent
! } AgillaQueryReplyNearestAgentMsg;  // 12 bytes
  
  /**
--- 156,165 ----
  typedef struct AgillaQueryReplyNearestAgentMsg {
    AgillaAgentID agent_id;           // 2 bytes: id of agent issuing query
+   uint16_t src;                     // 2 bytes: id of node sending the reply
    uint16_t dest;                    // 2 bytes: id of node to which query result should to be routed
    uint16_t qid;                     // 2 bytes: query id
    AgillaAgentID nearest_agent_id;   // 2 bytes: id of nearest agent
    AgillaLocation nearest_agent_loc; // 4 bytes: location of nearest agent
! } AgillaQueryReplyNearestAgentMsg;  // 14 bytes
  
  /**
***************
*** 167,175 ****
  typedef struct AgillaQueryReplyAllAgentsMsg {
    AgillaAgentID agent_id;                           // 2 bytes: id of agent issuing query
    uint16_t dest;                                    // 2 bytes: id of node to which query result should to be routed
    uint16_t qid;                                     // 2 byte: query id
    uint16_t num_agents;                              // 2 byte: number of agents
    AgillaLocMAgentInfo agent_info[MAX_AGENT_NUM];    // 18 bytes: agent info (id, loc) 6 bytes each
! } AgillaQueryReplyAllAgentsMsg;                     // 26 bytes
  
  #endif
--- 172,181 ----
  typedef struct AgillaQueryReplyAllAgentsMsg {
    AgillaAgentID agent_id;                           // 2 bytes: id of agent issuing query
+   uint16_t src;                                     // 2 bytes: id of node sending the reply
    uint16_t dest;                                    // 2 bytes: id of node to which query result should to be routed
    uint16_t qid;                                     // 2 byte: query id
    uint16_t num_agents;                              // 2 byte: number of agents
    AgillaLocMAgentInfo agent_info[MAX_AGENT_NUM];    // 18 bytes: agent info (id, loc) 6 bytes each
! } AgillaQueryReplyAllAgentsMsg;                     // 28 bytes
  
  #endif