[Tinyos-2-commits] CVS: tinyos-2.x/apps/tests/tkn154/TestPromiscuous Makefile, 1.2, 1.3 TestPromiscuousAppC.nc, 1.1, 1.2 TestPromiscuousC.nc, 1.1, 1.2

[Jan-Hinrich Hauer]

Update of /cvsroot/tinyos/tinyos-2.x/apps/tests/tkn154/TestPromiscuous
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17605/apps/tests/tkn154/TestPromiscuous

Modified Files:
	Makefile TestPromiscuousAppC.nc TestPromiscuousC.nc 
Log Message:
- re-designed the radio driver interfaces, restructured/improved the CC2420 radio driver
- split the main MAC configuration (was TKN154P.nc) in two: one for beacon-enabled mode the other for nonbeacon-enabled mode (this decision has to be made at compile time now)
- added (serial) debugging functions (compile with "TKN154_DEBUG=1 make telosb" and use the java PrintfClient, see tinyos-2.x/apps/tests/TestPrintf/README.txt)
- improved readability, added comments 

Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/tkn154/TestPromiscuous/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile	21 Oct 2008 17:29:00 -0000	1.2
--- Makefile	4 Mar 2009 18:31:00 -0000	1.3
***************
*** 1,4 ****
  COMPONENT=TestPromiscuousAppC
- PFLAGS += -DIEEE154_BEACON_TX_DISABLED -DIEEE154_BEACON_SYNC_DISABLED -DIEEE154_SCAN_DISABLED
  PFLAGS += -DPRINTF_BUFFER_SIZE=1000
  CFLAGS += -I$(TOSDIR)/lib/printf
--- 1,3 ----

Index: TestPromiscuousAppC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/tkn154/TestPromiscuous/TestPromiscuousAppC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestPromiscuousAppC.nc	21 Jul 2008 15:18:16 -0000	1.1
--- TestPromiscuousAppC.nc	4 Mar 2009 18:31:00 -0000	1.2
***************
*** 38,52 ****
  } implementation {
   components MainC, TestPromiscuousC as App, LedsC, 
!             Ieee802154MacC as Ieee802154MacC;
  
    MainC.Boot <- App;
    App.Leds -> LedsC;
  
!   App.MLME_RESET -> Ieee802154MacC;
!   App.MLME_SET -> Ieee802154MacC;
!   App.MLME_GET -> Ieee802154MacC;
!   App.MCPS_DATA -> Ieee802154MacC;
!   App.Frame -> Ieee802154MacC;
!   App.BeaconFrame -> Ieee802154MacC;
!   App.PromiscuousMode -> Ieee802154MacC;
  }
--- 38,52 ----
  } implementation {
   components MainC, TestPromiscuousC as App, LedsC, 
!             Ieee802154BeaconEnabledC as MAC;
  
    MainC.Boot <- App;
    App.Leds -> LedsC;
  
!   App.MLME_RESET -> MAC;
!   App.MLME_SET -> MAC;
!   App.MLME_GET -> MAC;
!   App.MCPS_DATA -> MAC;
!   App.Frame -> MAC;
!   App.BeaconFrame -> MAC;
!   App.PromiscuousMode -> MAC;
  }

Index: TestPromiscuousC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/tkn154/TestPromiscuous/TestPromiscuousC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestPromiscuousC.nc	21 Jul 2008 15:18:16 -0000	1.1
--- TestPromiscuousC.nc	4 Mar 2009 18:31:00 -0000	1.2
***************
*** 59,63 ****
  
    event void Boot.booted() {
!     call MLME_RESET.request(TRUE, BEACON_ENABLED_PAN);
    }
  
--- 59,63 ----
  
    event void Boot.booted() {
!     call MLME_RESET.request(TRUE);
    }