[Tinyos-2-commits] CVS: tinyos-2.x/apps/tosthreads/apps/BaseStation BaseStationAppC.nc, 1.3, 1.4

[Chieh-Jan Mike Liang]

Update of /cvsroot/tinyos/tinyos-2.x/apps/tosthreads/apps/BaseStation
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31034/apps/tosthreads/apps/BaseStation

Modified Files:
	BaseStationAppC.nc 
Log Message:
Move the wiring for underlying AMSend/Receive/Snoop interfaces from CAMRadioC.nc/BlockingAM*C.nc to 
BlockingActiveMessageC.nc and from CAMSerialC.nc/BlockingSerialAM*C.nc to BlockingSerialActiveMessageC.nc.

This prevents those interfaces from being wired multiple times in the case of multiple users.


Index: BaseStationAppC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tosthreads/apps/BaseStation/BaseStationAppC.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BaseStationAppC.nc	18 Jun 2008 19:34:56 -0000	1.3
--- BaseStationAppC.nc	7 Jan 2009 04:12:39 -0000	1.4
***************
*** 106,116 ****
    SerialReceiveRadioSendP.BlockingReceiveAny -> BlockingSerialActiveMessageC.BlockingReceiveAny;
    SerialReceiveRadioSendP.BlockingAMSend -> BlockingRadioActiveMessageC;
-   
-   components ActiveMessageC, SerialActiveMessageC;
-   BlockingRadioActiveMessageC.Receive -> ActiveMessageC.Receive;
-   BlockingRadioActiveMessageC.Snoop -> ActiveMessageC.Snoop;
-   BlockingRadioActiveMessageC.AMSend -> ActiveMessageC.AMSend;
-   
-   BlockingSerialActiveMessageC.Receive -> SerialActiveMessageC.Receive;
-   BlockingSerialActiveMessageC.AMSend -> SerialActiveMessageC.AMSend;
  }
--- 106,108 ----