[Tinyos-2-commits] CVS: tinyos-2.x/apps/tests/TestNetwork TestNetworkAppC.nc, 1.5, 1.6 TestNetworkC.nc, 1.7, 1.8

[Phil Levis]

Update of /cvsroot/tinyos/tinyos-2.x/apps/tests/TestNetwork
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18812

Modified Files:
	TestNetworkAppC.nc TestNetworkC.nc 
Log Message:
Fixed wiring bug.


Index: TestNetworkAppC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestNetwork/TestNetworkAppC.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TestNetworkAppC.nc	14 Apr 2007 00:34:20 -0000	1.5
--- TestNetworkAppC.nc	14 Sep 2007 18:48:51 -0000	1.6
***************
*** 52,56 ****
    TestNetworkC.Pool -> PoolC;
    TestNetworkC.Queue -> QueueC;
! 
  #ifndef NO_DEBUG
    components new PoolC(message_t, 10) as DebugMessagePool;
--- 52,57 ----
    TestNetworkC.Pool -> PoolC;
    TestNetworkC.Queue -> QueueC;
!   TestNetworkC.RadioPacket -> ActiveMessageC;
!   
  #ifndef NO_DEBUG
    components new PoolC(message_t, 10) as DebugMessagePool;

Index: TestNetworkC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestNetwork/TestNetworkC.nc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TestNetworkC.nc	13 Sep 2007 23:10:20 -0000	1.7
--- TestNetworkC.nc	14 Sep 2007 18:48:51 -0000	1.8
***************
*** 37,40 ****
--- 37,41 ----
    uses interface CollectionDebug;
    uses interface AMPacket;
+   uses interface Packet as RadioPacket;
  }
  implementation {
***************
*** 163,167 ****
       message_t* msg = call Queue.dequeue();
       dbg("Traffic", "Sending packet to UART.\n");
!      if (call UARTSend.send(0xffff, msg, call Packet.payloadLength(msg)) == SUCCESS) {
         uartbusy = TRUE;
       }
--- 164,168 ----
       message_t* msg = call Queue.dequeue();
       dbg("Traffic", "Sending packet to UART.\n");
!      if (call UARTSend.send(0xffff, msg, call RadioPacket.payloadLength(msg)) == SUCCESS) {
         uartbusy = TRUE;
       }