[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/tosthreads/csystem CAMRadioC.nc, 1.3, 1.4 CAMSerialC.nc, 1.2, 1.3

[Chieh-Jan Mike Liang]

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

Modified Files:
	CAMRadioC.nc CAMSerialC.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: CAMRadioC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/tosthreads/csystem/CAMRadioC.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CAMRadioC.nc	12 Jul 2008 02:25:59 -0000	1.3
--- CAMRadioC.nc	7 Jan 2009 04:12:39 -0000	1.4
***************
*** 31,35 ****
  implementation {
    components CAMRadioP as CAMP;
-   components ActiveMessageC;
    components BlockingActiveMessageC as AM;
    
--- 31,34 ----
***************
*** 43,49 ****
    CAMP.AMPacket -> AM;
    CAMP.PacketAcknowledgements -> AM;
-   
-   AM.Receive -> ActiveMessageC.ReceiveDefault;
-   AM.Snoop -> ActiveMessageC.SnoopDefault;
-   AM.AMSend -> ActiveMessageC;
  }
--- 42,44 ----

Index: CAMSerialC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/tosthreads/csystem/CAMSerialC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CAMSerialC.nc	18 Jun 2008 04:22:58 -0000	1.2
--- CAMSerialC.nc	7 Jan 2009 04:12:39 -0000	1.3
***************
*** 31,35 ****
  implementation {
    components CAMSerialP as CAMP;
-   components SerialActiveMessageC;
    components BlockingSerialActiveMessageC as AM;
    
--- 31,34 ----
***************
*** 41,46 ****
    CAMP.AMPacket -> AM;
    CAMP.PacketAcknowledgements -> AM;
-   
-   AM.Receive -> SerialActiveMessageC.Receive;
-   AM.AMSend -> SerialActiveMessageC.AMSend;
  }
--- 40,42 ----