[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/wustl/apps/Agilla/components/LocationReporter LocationReporterC.nc, 1.6, 1.7 LocationReporterM.nc, 1.10, 1.11

[Chien-Liang Fok]

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

Modified Files:
	LocationReporterC.nc LocationReporterM.nc 
Log Message:


Index: LocationReporterC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/components/LocationReporter/LocationReporterC.nc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** LocationReporterC.nc	11 Apr 2006 03:44:29 -0000	1.6
--- LocationReporterC.nc	11 Apr 2006 04:20:54 -0000	1.7
***************
*** 56,62 ****
    components LocationReporterM, AgentReceiverC, AddressMgrC, MessageBufferM;
    components NetworkInterfaceProxy as NIC, NeighborListProxy;
!   components LocationMgrC, SimpleTime, AgentMgrC /*, LocationSenderM*/;
    #if ENABLE_CLUSTERING
!   components NeighborListM, ClusterheadDirectoryM, LedsC /*, AgentSenderC*/;
    #endif
  
--- 56,62 ----
    components LocationReporterM, AgentReceiverC, AddressMgrC, MessageBufferM;
    components NetworkInterfaceProxy as NIC, NeighborListProxy;
!   components LocationMgrC, SimpleTime, AgentMgrC, LedsC /*, LocationSenderM*/;
    #if ENABLE_CLUSTERING
!   components NeighborListM, ClusterheadDirectoryM /*, AgentSenderC*/;
    #endif
  

Index: LocationReporterM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/components/LocationReporter/LocationReporterM.nc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** LocationReporterM.nc	11 Apr 2006 03:44:29 -0000	1.10
--- LocationReporterM.nc	11 Apr 2006 04:20:54 -0000	1.11
***************
*** 146,150 ****
        uint16_t onehop_dest;
  
- 
        #if ENABLE_CLUSTERING
          struct AgillaLocMsg *sMsg = (struct AgillaLocMsg *)msg->data;
--- 146,149 ----
***************
*** 461,465 ****
    {
        #if ENABLE_EXP_LOGGING
!         if(success){
            struct AgillaLocMsg *sMsg = (struct AgillaLocMsg *)m->data;
            call ExpLoggerI.sendTraceQid(sMsg->agent_id.id, TOS_LOCAL_ADDRESS, AGENT_LOCATION_SENT, sMsg->seq, sMsg->dest, sMsg->loc);
--- 460,465 ----
    {
        #if ENABLE_EXP_LOGGING
!         if(success)
!         {
            struct AgillaLocMsg *sMsg = (struct AgillaLocMsg *)m->data;
            call ExpLoggerI.sendTraceQid(sMsg->agent_id.id, TOS_LOCAL_ADDRESS, AGENT_LOCATION_SENT, sMsg->seq, sMsg->dest, sMsg->loc);