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

[Jan-Hinrich Hauer]

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

Modified Files:
	TestAssociateAppC.nc TestDeviceC.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: TestAssociateAppC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/tkn154/TestAssociate/device/TestAssociateAppC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestAssociateAppC.nc	21 Jul 2008 14:56:59 -0000	1.1
--- TestAssociateAppC.nc	4 Mar 2009 18:31:00 -0000	1.2
***************
*** 37,41 ****
  {
  } implementation {
!   components MainC, LedsC, Ieee802154MacC as Ieee802154MacC,
               new Timer62500C() as Timer;
    components TestDeviceC as App;
--- 37,41 ----
  {
  } implementation {
!   components MainC, LedsC, Ieee802154BeaconEnabledC as MAC,
               new Timer62500C() as Timer;
    components TestDeviceC as App;
***************
*** 43,58 ****
    MainC.Boot <- App;
    App.Leds -> LedsC;
!   App.MLME_RESET -> Ieee802154MacC;
!   App.MLME_SET -> Ieee802154MacC;
!   App.MLME_GET -> Ieee802154MacC;
    App.DisassociateTimer -> Timer;  
!   App.MLME_SCAN -> Ieee802154MacC;
!   App.MLME_SYNC -> Ieee802154MacC;
!   App.MLME_BEACON_NOTIFY -> Ieee802154MacC;
!   App.MLME_SYNC_LOSS -> Ieee802154MacC;
!   App.MLME_ASSOCIATE -> Ieee802154MacC;
!   App.MLME_DISASSOCIATE -> Ieee802154MacC;
!   App.MLME_COMM_STATUS -> Ieee802154MacC;
!   App.BeaconFrame -> Ieee802154MacC;
  
  }
--- 43,58 ----
    MainC.Boot <- App;
    App.Leds -> LedsC;
!   App.MLME_RESET -> MAC;
!   App.MLME_SET -> MAC;
!   App.MLME_GET -> MAC;
    App.DisassociateTimer -> Timer;  
!   App.MLME_SCAN -> MAC;
!   App.MLME_SYNC -> MAC;
!   App.MLME_BEACON_NOTIFY -> MAC;
!   App.MLME_SYNC_LOSS -> MAC;
!   App.MLME_ASSOCIATE -> MAC;
!   App.MLME_DISASSOCIATE -> MAC;
!   App.MLME_COMM_STATUS -> MAC;
!   App.BeaconFrame -> MAC;
  
  }

Index: TestDeviceC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/tkn154/TestAssociate/device/TestDeviceC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestDeviceC.nc	21 Jul 2008 14:56:59 -0000	1.1
--- TestDeviceC.nc	4 Mar 2009 18:31:00 -0000	1.2
***************
*** 68,72 ****
      m_capabilityInformation.SecurityCapability = 0;
      m_capabilityInformation.AllocateAddress = 1;    
!     call MLME_RESET.request(TRUE, BEACON_ENABLED_PAN);
    }
  
--- 68,72 ----
      m_capabilityInformation.SecurityCapability = 0;
      m_capabilityInformation.AllocateAddress = 1;    
!     call MLME_RESET.request(TRUE);
    }