[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/tosthreads/system BlockingAMReceiverC.nc, 1.3, 1.4 BlockingAMSenderC.nc, 1.2, 1.3 BlockingAMSnooperC.nc, 1.3, 1.4 BlockingActiveMessageC.nc, 1.2, 1.3 BlockingSerialAMReceiverC.nc, 1.2, 1.3 BlockingSerialAMSenderC.nc, 1.2, 1.3 BlockingSerialActiveMessageC.nc, 1.2, 1.3

[Chieh-Jan Mike Liang]

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

Modified Files:
	BlockingAMReceiverC.nc BlockingAMSenderC.nc 
	BlockingAMSnooperC.nc BlockingActiveMessageC.nc 
	BlockingSerialAMReceiverC.nc BlockingSerialAMSenderC.nc 
	BlockingSerialActiveMessageC.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: BlockingAMReceiverC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/tosthreads/system/BlockingAMReceiverC.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BlockingAMReceiverC.nc	12 Jul 2008 02:25:59 -0000	1.3
--- BlockingAMReceiverC.nc	7 Jan 2009 04:12:39 -0000	1.4
***************
*** 45,52 ****
  }
  implementation {
-   components ActiveMessageC;
    components BlockingActiveMessageC as AM;
    BlockingReceive = AM.BlockingReceive[amId];
-   AM.Receive[amId] -> ActiveMessageC.ReceiveDefault[amId];
    
    Packet = AM;
--- 45,50 ----

Index: BlockingAMSenderC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/tosthreads/system/BlockingAMSenderC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BlockingAMSenderC.nc	15 Jun 2008 17:26:00 -0000	1.2
--- BlockingAMSenderC.nc	7 Jan 2009 04:12:39 -0000	1.3
***************
*** 46,53 ****
  
  implementation {
-   components ActiveMessageC;
    components BlockingActiveMessageC as AM;
    BlockingAMSend = AM.BlockingAMSend[AMId];
-   AM.AMSend[AMId] -> ActiveMessageC.AMSend[AMId];
    
    Packet = AM;
--- 46,51 ----

Index: BlockingAMSnooperC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/tosthreads/system/BlockingAMSnooperC.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BlockingAMSnooperC.nc	12 Jul 2008 02:25:59 -0000	1.3
--- BlockingAMSnooperC.nc	7 Jan 2009 04:12:39 -0000	1.4
***************
*** 45,52 ****
  }
  implementation {
-   components ActiveMessageC;
    components BlockingActiveMessageC as AM;
    BlockingReceive = AM.BlockingSnoop[amId];
-   AM.Snoop[amId] -> ActiveMessageC.SnoopDefault[amId];
    
    Packet = AM;
--- 45,50 ----

Index: BlockingActiveMessageC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/tosthreads/system/BlockingActiveMessageC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BlockingActiveMessageC.nc	15 Jun 2008 17:26:00 -0000	1.2
--- BlockingActiveMessageC.nc	7 Jan 2009 04:12:39 -0000	1.3
***************
*** 47,55 ****
      interface PacketAcknowledgements;
    }
-   uses {
-     interface Receive as Receive[uint8_t id];
-     interface Receive as Snoop[uint8_t id];
-     interface AMSend as AMSend[uint8_t id];
-   }
  }
  implementation {
--- 47,50 ----
***************
*** 67,73 ****
    
    BlockingStdControlC.SplitControl -> AM;
!   Receive = AMReceiverP.Receive;
!   Snoop = AMSnooperP.Snoop;
!   AMSend = AMSenderP.AMSend;
      
    Packet       = AM;
--- 62,68 ----
    
    BlockingStdControlC.SplitControl -> AM;
!   AMReceiverP.Receive -> AM.Receive;
!   AMSnooperP.Snoop -> AM.Snoop;
!   AMSenderP.AMSend -> AM.AMSend;
      
    Packet       = AM;

Index: BlockingSerialAMReceiverC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/tosthreads/system/BlockingSerialAMReceiverC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BlockingSerialAMReceiverC.nc	15 Jun 2008 17:34:12 -0000	1.2
--- BlockingSerialAMReceiverC.nc	7 Jan 2009 04:12:39 -0000	1.3
***************
*** 44,51 ****
  }
  implementation {
-   components SerialActiveMessageC;
    components BlockingSerialActiveMessageC as AM;
    BlockingReceive = AM.BlockingReceive[amId];
-   AM.Receive[amId] -> SerialActiveMessageC.Receive[amId];
    
    Packet = AM;
--- 44,49 ----

Index: BlockingSerialAMSenderC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/tosthreads/system/BlockingSerialAMSenderC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BlockingSerialAMSenderC.nc	15 Jun 2008 17:34:12 -0000	1.2
--- BlockingSerialAMSenderC.nc	7 Jan 2009 04:12:39 -0000	1.3
***************
*** 46,53 ****
  
  implementation {
-   components SerialActiveMessageC;
    components BlockingSerialActiveMessageC as AM;
    BlockingAMSend = AM.BlockingAMSend[AMId];
-   AM.AMSend[AMId] -> SerialActiveMessageC.AMSend[AMId];
    
    Packet = AM;
--- 46,51 ----

Index: BlockingSerialActiveMessageC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/tosthreads/system/BlockingSerialActiveMessageC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BlockingSerialActiveMessageC.nc	15 Jun 2008 17:34:12 -0000	1.2
--- BlockingSerialActiveMessageC.nc	7 Jan 2009 04:12:39 -0000	1.3
***************
*** 45,52 ****
      interface PacketAcknowledgements;
    }
-   uses {
-     interface Receive as Receive[uint8_t id];
-     interface AMSend as AMSend[uint8_t id];
-   }
  }
  implementation {
--- 45,48 ----
***************
*** 55,58 ****
--- 51,55 ----
    components BlockingSerialAMReceiverP as AMReceiverP;
    components BlockingSerialAMSenderP as AMSenderP;
+   
    BlockingStdControl = BlockingStdControlC;
    BlockingReceive = AMReceiverP;
***************
*** 61,66 ****
    
    BlockingStdControlC.SplitControl -> AM;
!   Receive = AMReceiverP.Receive;
!   AMSend = AMSenderP.AMSend;
      
    Packet       = AM;
--- 58,63 ----
    
    BlockingStdControlC.SplitControl -> AM;
!   AMReceiverP.Receive -> AM.Receive;
!   AMSenderP.AMSend -> AM.AMSend;
      
    Packet       = AM;