[Tinyos-2-commits] CVS: tinyos-2.x/apps/tests/TestNetwork Makefile, 1.1.2.10, 1.1.2.11 TestNetworkAppC.nc, 1.1.2.17, 1.1.2.18

[Rodrigo Fonseca]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	Makefile TestNetworkAppC.nc 
Log Message:
Added compile flag to turn off debug


Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestNetwork/Makefile,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -C2 -d -r1.1.2.10 -r1.1.2.11
*** Makefile	29 Aug 2006 17:24:08 -0000	1.1.2.10
--- Makefile	2 Nov 2006 08:10:58 -0000	1.1.2.11
***************
*** 3,7 ****
  CFLAGS += -I$(TOSDIR)/lib/net \
            -I$(TOSDIR)/lib/net/le \
!           -I$(TOSDIR)/lib/net/ctp
  
  TFLAGS += -I$(TOSDIR)/../apps/tests/TestDissemination \
--- 3,7 ----
  CFLAGS += -I$(TOSDIR)/lib/net \
            -I$(TOSDIR)/lib/net/le \
!           -I$(TOSDIR)/lib/net/ctp #-DNO_DEBUG
  
  TFLAGS += -I$(TOSDIR)/../apps/tests/TestDissemination \

Index: TestNetworkAppC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestNetwork/TestNetworkAppC.nc,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -C2 -d -r1.1.2.17 -r1.1.2.18
*** TestNetworkAppC.nc	27 Oct 2006 18:06:56 -0000	1.1.2.17
--- TestNetworkAppC.nc	2 Nov 2006 08:10:58 -0000	1.1.2.18
***************
*** 24,32 ****
    components new SerialAMSenderC(CL_TEST);
    components SerialActiveMessageC;
    components new SerialAMSenderC(AM_COLLECTION_DEBUG) as UARTSender;
    components UARTDebugSenderP as DebugSender;
    components RandomC;
!   components new QueueC(message_t*, 8);
!   components new PoolC(message_t, 8);
  
    TestNetworkC.Boot -> MainC;
--- 24,34 ----
    components new SerialAMSenderC(CL_TEST);
    components SerialActiveMessageC;
+ #ifndef NO_DEBUG
    components new SerialAMSenderC(AM_COLLECTION_DEBUG) as UARTSender;
    components UARTDebugSenderP as DebugSender;
+ #endif
    components RandomC;
!   components new QueueC(message_t*, 12);
!   components new PoolC(message_t, 12);
  
    TestNetworkC.Boot -> MainC;
***************
*** 49,52 ****
--- 51,55 ----
    TestNetworkC.Queue -> QueueC;
  
+ #ifndef NO_DEBUG
    components new PoolC(message_t, 10) as DebugMessagePool;
    components new QueueC(message_t*, 10) as DebugSendQueue;
***************
*** 57,60 ****
--- 60,64 ----
    Collector.CollectionDebug -> DebugSender;
    TestNetworkC.CollectionDebug -> DebugSender;
+ #endif
    TestNetworkC.AMPacket -> ActiveMessageC;
  }