[Tinyos-2-commits] CVS: tinyos-2.x/apps/tests/tkn154/TestStartSync/device TestDeviceC.nc, 1.1, 1.2 TestStartSyncAppC.nc, 1.1, 1.2

[Jan-Hinrich Hauer]

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

Modified Files:
	TestDeviceC.nc TestStartSyncAppC.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: TestDeviceC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/tkn154/TestStartSync/device/TestDeviceC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestDeviceC.nc	21 Jul 2008 15:18:17 -0000	1.1
--- TestDeviceC.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);
    }
    
***************
*** 70,74 ****
    void startApp()
    {
!     ieee154_phyChannelsSupported_t supportedChannels;
      uint8_t scanDuration = BEACON_ORDER;
  
--- 70,74 ----
    void startApp()
    {
!     ieee154_phyChannelsSupported_t scanChannels;
      uint8_t scanDuration = BEACON_ORDER;
  
***************
*** 76,80 ****
      // as a parameter to make system ("make install,X")
      call MLME_SET.macShortAddress(TOS_NODE_ID); 
!     supportedChannels = call MLME_GET.phyChannelsSupported();
  
      // setting the macAutoRequest attribute to TRUE means
--- 76,81 ----
      // as a parameter to make system ("make install,X")
      call MLME_SET.macShortAddress(TOS_NODE_ID); 
!     scanChannels = call MLME_GET.phyChannelsSupported();
!     //scanChannels = (uint32_t) 1 << RADIO_CHANNEL;
  
      // setting the macAutoRequest attribute to TRUE means
***************
*** 84,88 ****
      call MLME_SCAN.request  (
          PASSIVE_SCAN,           // ScanType
!         supportedChannels,      // ScanChannels
          scanDuration,           // ScanDuration
          0x00,                   // ChannelPage
--- 85,89 ----
      call MLME_SCAN.request  (
          PASSIVE_SCAN,           // ScanType
!         scanChannels,           // ScanChannels
          scanDuration,           // ScanDuration
          0x00,                   // ChannelPage

Index: TestStartSyncAppC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/tkn154/TestStartSync/device/TestStartSyncAppC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestStartSyncAppC.nc	21 Jul 2008 15:18:17 -0000	1.1
--- TestStartSyncAppC.nc	4 Mar 2009 18:31:00 -0000	1.2
***************
*** 38,55 ****
  } implementation {
  
!   components MainC, LedsC, Ieee802154MacC as Ieee802154MacC;
    components TestDeviceC as App;
  
!   App.MLME_SCAN -> Ieee802154MacC;
!   App.MLME_SYNC -> Ieee802154MacC;
!   App.MLME_BEACON_NOTIFY -> Ieee802154MacC;
!   App.MLME_SYNC_LOSS -> Ieee802154MacC;
!   App.BeaconFrame -> Ieee802154MacC;
  
    MainC.Boot <- App;
    App.Leds -> LedsC;
!   App.MLME_RESET -> Ieee802154MacC;
!   App.MLME_SET -> Ieee802154MacC;
!   App.MLME_GET -> Ieee802154MacC;
  
  #ifdef PRINTF_ENABLED
--- 38,55 ----
  } implementation {
  
!   components MainC, LedsC, Ieee802154BeaconEnabledC as MAC;
    components TestDeviceC as App;
  
!   App.MLME_SCAN -> MAC;
!   App.MLME_SYNC -> MAC;
!   App.MLME_BEACON_NOTIFY -> MAC;
!   App.MLME_SYNC_LOSS -> MAC;
!   App.BeaconFrame -> MAC;
  
    MainC.Boot <- App;
    App.Leds -> LedsC;
!   App.MLME_RESET -> MAC;
!   App.MLME_SET -> MAC;
!   App.MLME_GET -> MAC;
  
  #ifdef PRINTF_ENABLED