[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/tosthreads/system BlockingAMReceiverC.nc, 1.2, 1.3 BlockingAMSnooperC.nc, 1.2, 1.3

[Chieh-Jan Mike Liang]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/tosthreads/system
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31983/tos/lib/tosthreads/system

Modified Files:
	BlockingAMReceiverC.nc BlockingAMSnooperC.nc 
Log Message:
Fix the CC2420 Receive.receive and Snoop.receive fan-out warnings. This happened when both TinyOS services and TOSThreads 
apps want to use the radio. Now, TinyOS services have priority over TOSThreads apps on which AM ID they want to use.


Index: BlockingAMReceiverC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/tosthreads/system/BlockingAMReceiverC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BlockingAMReceiverC.nc	15 Jun 2008 17:26:00 -0000	1.2
--- BlockingAMReceiverC.nc	12 Jul 2008 02:25:59 -0000	1.3
***************
*** 32,35 ****
--- 32,36 ----
  /**
   * @author Kevin Klues (klueska at cs.stanford.edu)
+  * @author Chieh-Jan Mike Liang (cliang4 at cs.jhu.edu)
   */
  
***************
*** 47,51 ****
    components BlockingActiveMessageC as AM;
    BlockingReceive = AM.BlockingReceive[amId];
!   AM.Receive[amId] -> ActiveMessageC.Receive[amId];
    
    Packet = AM;
--- 48,52 ----
    components BlockingActiveMessageC as AM;
    BlockingReceive = AM.BlockingReceive[amId];
!   AM.Receive[amId] -> ActiveMessageC.ReceiveDefault[amId];
    
    Packet = AM;

Index: BlockingAMSnooperC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/tosthreads/system/BlockingAMSnooperC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BlockingAMSnooperC.nc	15 Jun 2008 17:26:00 -0000	1.2
--- BlockingAMSnooperC.nc	12 Jul 2008 02:25:59 -0000	1.3
***************
*** 32,35 ****
--- 32,36 ----
  /**
   * @author Kevin Klues (klueska at cs.stanford.edu)
+  * @author Chieh-Jan Mike Liang (cliang4 at cs.jhu.edu)
   */
  
***************
*** 47,51 ****
    components BlockingActiveMessageC as AM;
    BlockingReceive = AM.BlockingSnoop[amId];
!   AM.Snoop[amId] -> ActiveMessageC.Snoop[amId];
    
    Packet = AM;
--- 48,52 ----
    components BlockingActiveMessageC as AM;
    BlockingReceive = AM.BlockingSnoop[amId];
!   AM.Snoop[amId] -> ActiveMessageC.SnoopDefault[amId];
    
    Packet = AM;