[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/diku/evb13192/apps/TestIeee802154Mac TestIeee802154Mac.nc, 1.8, 1.9 TestFreescale802154Mac.nc, 1.4, 1.5 Makefile, 1.7, 1.8 TestIeee802154MacM.nc, 1.22, 1.23

Jan Flora janflora at users.sourceforge.net
Wed Aug 23 02:41:15 PDT 2006 

Update of /cvsroot/tinyos/tinyos-1.x/contrib/diku/evb13192/apps/TestIeee802154Mac
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12501/apps/TestIeee802154Mac

Modified Files:
	TestIeee802154Mac.nc TestFreescale802154Mac.nc Makefile 
	TestIeee802154MacM.nc 
Log Message:
application updates

Index: TestIeee802154Mac.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/diku/evb13192/apps/TestIeee802154Mac/TestIeee802154Mac.nc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TestIeee802154Mac.nc	5 Jan 2006 17:15:10 -0000	1.8
--- TestIeee802154Mac.nc	23 Aug 2006 09:41:13 -0000	1.9
***************
*** 1,2 ****
--- 1,32 ----
+ /* Copyright (c) 2006, Jan Flora <janflora at diku.dk>
+  * All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without modification,
+  * are permitted provided that the following conditions are met:
+  *
+  *  - Redistributions of source code must retain the above copyright notice, this
+  *    list of conditions and the following disclaimer.
+  *  - Redistributions in binary form must reproduce the above copyright notice,
+  *    this list of conditions and the following disclaimer in the documentation
+  *    and/or other materials provided with the distribution.
+  *  - Neither the name of the University of Copenhagen nor the names of its
+  *    contributors may be used to endorse or promote products derived from this
+  *    software without specific prior written permission.
+  *
+  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+  * SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+  * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+ /*
+   @author Jan Flora <janflora at diku.dk>
+ */
+ 
  includes macConstants;
  includes mcuToRadioPorts;
***************
*** 11,81 ****
  	components Main,
  	           TestIeee802154MacM,
! 	           mc13192Ieee802154RadioC,
  	           HPLSPIM as mcuSPI,
! 	           Ieee802154C,
! 	           LedsC,
! 	           TimerC,
  	           ConsoleDebugM,
  	           ConsoleC;
  
- 	ConsoleDebugM.ConsoleOut -> ConsoleC.ConsoleOut;
- 	Ieee802154C.Debug -> ConsoleDebugM.Debug;
- 	
- 	// Connect radio.
- 	mc13192Ieee802154RadioC.SPI -> mcuSPI.SPI;
- 	mc13192Ieee802154RadioC.Debug -> ConsoleDebugM.Debug;
- 	mc13192Ieee802154RadioC.ConsoleOut -> ConsoleC.ConsoleOut;
- 	Ieee802154C.RadioControl -> mc13192Ieee802154RadioC.Control;
- 	Ieee802154C.RadioRecv -> mc13192Ieee802154RadioC.Recv;
- 	Ieee802154C.RadioSend -> mc13192Ieee802154RadioC.Send;
- 	Ieee802154C.RadioCCA -> mc13192Ieee802154RadioC.CCA;
- 	Ieee802154C.RadioEvents -> mc13192Ieee802154RadioC.Events;
- 	
- 	// Connect timers.
- 	Ieee802154C.Timer -> TimerC.Timer;
- 	
  	Main.StdControl -> mcuSPI.StdControl;
! 	Main.StdControl -> mc13192Ieee802154RadioC.StdControl;
  	Main.StdControl -> ConsoleC.StdControl;
! 	Main.StdControl -> TimerC.StdControl;
! 
! 	Main.StdControl -> Ieee802154C.StdControl;
  	Main.StdControl -> TestIeee802154MacM.StdControl;
  
!  	mcuSPI.Leds -> LedsC;
   	
! 	TestIeee802154MacM.IeeePibAttribute -> Ieee802154C;
! 	TestIeee802154MacM.IeeePanDescriptor -> Ieee802154C;
! 	TestIeee802154MacM.IeeeSdu -> Ieee802154C;
! 	TestIeee802154MacM.IeeeAddress -> Ieee802154C;
  	
  	// MCPS
! 	TestIeee802154MacM.McpsIndicationData -> Ieee802154C.McpsIndicationData;
! 	TestIeee802154MacM.McpsRequestConfirmData -> Ieee802154C.McpsRequestConfirmData;
  	
! 	TestIeee802154MacM.McpsDataIndication -> Ieee802154C.McpsDataIndication;
! 	TestIeee802154MacM.McpsDataRequestConfirm -> Ieee802154C.McpsDataRequestConfirm;
  	
  	// MLME
! 	TestIeee802154MacM.MlmeIndicationResponseAssociate -> Ieee802154C.MlmeIndicationResponseAssociate;
! 	TestIeee802154MacM.MlmeRequestConfirmAssociate -> Ieee802154C.MlmeRequestConfirmAssociate;
! 	TestIeee802154MacM.MlmeRequestConfirmGet -> Ieee802154C.MlmeRequestConfirmGet;
! 	TestIeee802154MacM.MlmeIndicationGts -> Ieee802154C.MlmeIndicationGts;
! 	TestIeee802154MacM.MlmeRequestConfirmGts -> Ieee802154C.MlmeRequestConfirmGts;
! 	TestIeee802154MacM.MlmeRequestConfirmScan -> Ieee802154C.MlmeRequestConfirmScan;
! 	TestIeee802154MacM.MlmeRequestConfirmSet -> Ieee802154C.MlmeRequestConfirmSet;
! 	TestIeee802154MacM.MlmeRequestConfirmStart -> Ieee802154C.MlmeRequestConfirmStart;
! 	TestIeee802154MacM.MlmeIndicationSyncLoss -> Ieee802154C.MlmeIndicationSyncLoss;
! 	TestIeee802154MacM.MlmeRequestConfirmRxEnable -> Ieee802154C.MlmeRequestConfirmRxEnable;
! 
! 	TestIeee802154MacM.MlmeAssociateIndicationResponse -> Ieee802154C.MlmeAssociateIndicationResponse;
! 	TestIeee802154MacM.MlmeAssociateRequestConfirm -> Ieee802154C.MlmeAssociateRequestConfirm;
! 	TestIeee802154MacM.MlmeGetRequestConfirm -> Ieee802154C.MlmeGetRequestConfirm;
! 	TestIeee802154MacM.MlmeGtsIndication -> Ieee802154C.MlmeGtsIndication;
! 	TestIeee802154MacM.MlmeGtsRequestConfirm -> Ieee802154C.MlmeGtsRequestConfirm;
! 	TestIeee802154MacM.MlmeScanRequestConfirm -> Ieee802154C.MlmeScanRequestConfirm;	
! 	TestIeee802154MacM.MlmeSetRequestConfirm -> Ieee802154C.MlmeSetRequestConfirm;
! 	TestIeee802154MacM.MlmeStartRequestConfirm -> Ieee802154C.MlmeStartRequestConfirm;
! 	TestIeee802154MacM.MlmeRxEnableRequestConfirm -> Ieee802154C.MlmeRxEnableRequestConfirm;
  
  	TestIeee802154MacM.ConsoleOut -> ConsoleC.ConsoleOut;
--- 41,159 ----
  	components Main,
  	           TestIeee802154MacM,
! 	           mc13192PhyDriverC,
  	           HPLSPIM as mcuSPI,
! 	           Ieee802154MacC,
! 	           HPLTimer2M,
! 	           AsyncAlarmC,
! 	           RandomLFSR,
! 	           SimpleBufferManM,
! 	           FIFOQueueM,
  	           ConsoleDebugM,
  	           ConsoleC;
  
  	Main.StdControl -> mcuSPI.StdControl;
! 	Main.StdControl -> HPLTimer2M.StdControl;
! 	Main.StdControl -> mc13192PhyDriverC.StdControl;
  	Main.StdControl -> ConsoleC.StdControl;
! 	Main.StdControl -> AsyncAlarmC.StdControl;
! 	Main.StdControl -> SimpleBufferManM.StdControl;
! 	Main.StdControl -> Ieee802154MacC.StdControl;
  	Main.StdControl -> TestIeee802154MacM.StdControl;
  
! 	// Connect debug.
! 	ConsoleDebugM.ConsoleOut -> ConsoleC.ConsoleOut;
! 	Ieee802154MacC.Debug -> ConsoleDebugM.Debug;
! 	mc13192PhyDriverC.Debug -> ConsoleDebugM.Debug;
! 	FIFOQueueM.Debug -> ConsoleDebugM.Debug;
! 	SimpleBufferManM.Debug -> ConsoleDebugM.Debug;
! 	AsyncAlarmC.Debug -> ConsoleDebugM.Debug;
! 	TestIeee802154MacM.Debug -> ConsoleDebugM.Debug;
! 	
! 	// Connect Phy.
! 	mc13192PhyDriverC.SPI -> mcuSPI.SPI;
! 	mc13192PhyDriverC.MCUTime -> AsyncAlarmC.LocalTime;
! 
! 	Ieee802154MacC.PhyReceive -> mc13192PhyDriverC.PhyReceive;
! 	Ieee802154MacC.PhyTransmit -> mc13192PhyDriverC.PhyTransmit;
! 	Ieee802154MacC.PhyEnergyDetect -> mc13192PhyDriverC.PhyEnergyDetect;
! 	Ieee802154MacC.PhyAttributes -> mc13192PhyDriverC.PhyAttributes;
! 	Ieee802154MacC.PhyControl -> mc13192PhyDriverC.PhyControl;
! 	Ieee802154MacC.PhyReset -> mc13192PhyDriverC.PhyReset;
! 
! 	// Wire alarms
! 	Ieee802154MacC.ScanAlarm -> AsyncAlarmC.Alarm[unique("AsyncAlarm")];
! 	Ieee802154MacC.EdAlarm -> AsyncAlarmC.Alarm[unique("AsyncAlarm")];
! 	Ieee802154MacC.TrackAlarm -> AsyncAlarmC.Alarm[unique("AsyncAlarm")];
! 	Ieee802154MacC.TrackerCfpAlarm -> AsyncAlarmC.Alarm[unique("AsyncAlarm")];
! 	Ieee802154MacC.BeaconAlarm -> AsyncAlarmC.Alarm[unique("AsyncAlarm")];
! 	Ieee802154MacC.GeneratorCfpAlarm -> AsyncAlarmC.Alarm[unique("AsyncAlarm")];
! 	Ieee802154MacC.RxEnableAlarm -> AsyncAlarmC.Alarm[unique("AsyncAlarm")];
! 	Ieee802154MacC.TimeoutAlarm1 -> AsyncAlarmC.Alarm[unique("AsyncAlarm")];
! 	Ieee802154MacC.TimeoutAlarm2 -> AsyncAlarmC.Alarm[unique("AsyncAlarm")];
! 	
! 	Ieee802154MacC.LocalTime -> AsyncAlarmC.LocalTime;
   	
!  	// Wire random generator
!  	Ieee802154MacC.Random -> RandomLFSR.Random;
!  	
!  	// Wire buffer manager
!  	SimpleBufferManM.Queue -> FIFOQueueM.FIFOQueue;
!  	Ieee802154MacC.BufferMng -> SimpleBufferManM.BufferMng;
!  //	TestIeee802154MacM.BufferManDebug -> SimpleBufferManM.BufferManDebug;
!  	
!  	
!  	// Wire other.
! 	TestIeee802154MacM.IeeePibAttribute -> Ieee802154MacC;
! 	TestIeee802154MacM.IeeePanDescriptor -> Ieee802154MacC;
! 	TestIeee802154MacM.IeeeSdu -> Ieee802154MacC;
! 	TestIeee802154MacM.IeeeAddress -> Ieee802154MacC;
  	
  	// MCPS
! 	TestIeee802154MacM.McpsIndicationData -> Ieee802154MacC.McpsIndicationData;
! 	TestIeee802154MacM.McpsRequestConfirmData -> Ieee802154MacC.McpsRequestConfirmData;
! 	TestIeee802154MacM.McpsRequestConfirmPurge -> Ieee802154MacC.McpsRequestConfirmPurge;
  	
! 	TestIeee802154MacM.McpsDataIndication -> Ieee802154MacC.McpsDataIndication;
! 	TestIeee802154MacM.McpsDataRequestConfirm -> Ieee802154MacC.McpsDataRequestConfirm;
! 	TestIeee802154MacM.McpsPurgeRequestConfirm -> Ieee802154MacC.McpsPurgeRequestConfirm;
  	
  	// MLME
! 	TestIeee802154MacM.MlmeIndicationResponseAssociate -> Ieee802154MacC.MlmeIndicationResponseAssociate;
! 	TestIeee802154MacM.MlmeRequestConfirmAssociate -> Ieee802154MacC.MlmeRequestConfirmAssociate;
! 	TestIeee802154MacM.MlmeIndicationDisassociate -> Ieee802154MacC.MlmeIndicationDisassociate;
! 	TestIeee802154MacM.MlmeRequestConfirmDisassociate -> Ieee802154MacC.MlmeRequestConfirmDisassociate;
! 	TestIeee802154MacM.MlmeRequestConfirmGet -> Ieee802154MacC.MlmeRequestConfirmGet;
! 	TestIeee802154MacM.MlmeIndicationGts -> Ieee802154MacC.MlmeIndicationGts;
! 	TestIeee802154MacM.MlmeRequestConfirmGts -> Ieee802154MacC.MlmeRequestConfirmGts;
! 	TestIeee802154MacM.MlmeRequestConfirmScan -> Ieee802154MacC.MlmeRequestConfirmScan;
! 	TestIeee802154MacM.MlmeRequestConfirmSet -> Ieee802154MacC.MlmeRequestConfirmSet;
! 	TestIeee802154MacM.MlmeRequestConfirmStart -> Ieee802154MacC.MlmeRequestConfirmStart;
! 	TestIeee802154MacM.MlmeIndicationSyncLoss -> Ieee802154MacC.MlmeIndicationSyncLoss;
! 	TestIeee802154MacM.MlmeRequestConfirmRxEnable -> Ieee802154MacC.MlmeRequestConfirmRxEnable;
! 	TestIeee802154MacM.MlmeRequestConfirmPoll -> Ieee802154MacC.MlmeRequestConfirmPoll;
! 	TestIeee802154MacM.MlmeRequestSync -> Ieee802154MacC.MlmeRequestSync;
! 	TestIeee802154MacM.MlmeIndicationBeaconNotify -> Ieee802154MacC.MlmeIndicationBeaconNotify;
! 	TestIeee802154MacM.MlmeRequestConfirmReset -> Ieee802154MacC.MlmeRequestConfirmReset;
! 	TestIeee802154MacM.MlmeIndicationCommStatus -> Ieee802154MacC.MlmeIndicationCommStatus;
! 	TestIeee802154MacM.MlmeIndicationResponseOrphan -> Ieee802154MacC.MlmeIndicationResponseOrphan;
! 	
! 	TestIeee802154MacM.MlmeAssociateIndicationResponse -> Ieee802154MacC.MlmeAssociateIndicationResponse;
! 	TestIeee802154MacM.MlmeAssociateRequestConfirm -> Ieee802154MacC.MlmeAssociateRequestConfirm;
! 	TestIeee802154MacM.MlmeDisassociateIndication -> Ieee802154MacC.MlmeDisassociateIndication;
! 	TestIeee802154MacM.MlmeDisassociateRequestConfirm -> Ieee802154MacC.MlmeDisassociateRequestConfirm;
! 	TestIeee802154MacM.MlmeGetRequestConfirm -> Ieee802154MacC.MlmeGetRequestConfirm;
! 	TestIeee802154MacM.MlmeGtsIndication -> Ieee802154MacC.MlmeGtsIndication;
! 	TestIeee802154MacM.MlmeGtsRequestConfirm -> Ieee802154MacC.MlmeGtsRequestConfirm;
! 	TestIeee802154MacM.MlmeScanRequestConfirm -> Ieee802154MacC.MlmeScanRequestConfirm;	
! 	TestIeee802154MacM.MlmeSetRequestConfirm -> Ieee802154MacC.MlmeSetRequestConfirm;
! 	TestIeee802154MacM.MlmeStartRequestConfirm -> Ieee802154MacC.MlmeStartRequestConfirm;
! 	TestIeee802154MacM.MlmeSyncLossIndication -> Ieee802154MacC.MlmeSyncLossIndication;
! 	TestIeee802154MacM.MlmeRxEnableRequestConfirm -> Ieee802154MacC.MlmeRxEnableRequestConfirm;
! 	TestIeee802154MacM.MlmePollRequestConfirm -> Ieee802154MacC.MlmePollRequestConfirm;
! 	TestIeee802154MacM.MlmeSyncRequest -> Ieee802154MacC.MlmeSyncRequest;
! 	TestIeee802154MacM.MlmeBeaconNotifyIndication -> Ieee802154MacC.MlmeBeaconNotifyIndication;
! 	TestIeee802154MacM.MlmeResetRequestConfirm -> Ieee802154MacC.MlmeResetRequestConfirm;
! 	TestIeee802154MacM.MlmeCommStatusIndication -> Ieee802154MacC.MlmeCommStatusIndication;
! 	TestIeee802154MacM.MlmeOrphanIndicationResponse -> Ieee802154MacC.MlmeOrphanIndicationResponse;
  
  	TestIeee802154MacM.ConsoleOut -> ConsoleC.ConsoleOut;

Index: TestFreescale802154Mac.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/diku/evb13192/apps/TestIeee802154Mac/TestFreescale802154Mac.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestFreescale802154Mac.nc	25 Jan 2006 13:51:57 -0000	1.4
--- TestFreescale802154Mac.nc	23 Aug 2006 09:41:13 -0000	1.5
***************
*** 1,2 ****
--- 1,32 ----
+ /* Copyright (c) 2006, Jan Flora <janflora at diku.dk>
+  * All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without modification,
+  * are permitted provided that the following conditions are met:
+  *
+  *  - Redistributions of source code must retain the above copyright notice, this
+  *    list of conditions and the following disclaimer.
+  *  - Redistributions in binary form must reproduce the above copyright notice,
+  *    this list of conditions and the following disclaimer in the documentation
+  *    and/or other materials provided with the distribution.
+  *  - Neither the name of the University of Copenhagen nor the names of its
+  *    contributors may be used to endorse or promote products derived from this
+  *    software without specific prior written permission.
+  *
+  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+  * SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+  * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+ /*
+   @author Jan Flora <janflora at diku.dk>
+ */
+ 
  includes macConstants;
  
***************
*** 16,19 ****
--- 46,50 ----
  	ConsoleDebugM.ConsoleOut -> ConsoleC.ConsoleOut;
  	Freescale802154C.Debug -> ConsoleDebugM.Debug;
+ 	TestIeee802154MacM.Debug -> ConsoleDebugM.Debug;
  	
  	Main.StdControl -> Freescale802154C.StdControl;
***************
*** 29,39 ****
--- 60,74 ----
  	TestIeee802154MacM.McpsIndicationData -> Freescale802154C.McpsIndicationData;
  	TestIeee802154MacM.McpsRequestConfirmData -> Freescale802154C.McpsRequestConfirmData;
+ 	TestIeee802154MacM.McpsRequestConfirmPurge -> Freescale802154C.McpsRequestConfirmPurge;
  	
  	TestIeee802154MacM.McpsDataIndication -> Freescale802154C.McpsDataIndication;
  	TestIeee802154MacM.McpsDataRequestConfirm -> Freescale802154C.McpsDataRequestConfirm;
+ 	TestIeee802154MacM.McpsPurgeRequestConfirm -> Freescale802154C.McpsPurgeRequestConfirm;
  	
  	// MLME
  	TestIeee802154MacM.MlmeIndicationResponseAssociate -> Freescale802154C.MlmeIndicationResponseAssociate;
  	TestIeee802154MacM.MlmeRequestConfirmAssociate -> Freescale802154C.MlmeRequestConfirmAssociate;
+ 	TestIeee802154MacM.MlmeIndicationDisassociate -> Freescale802154C.MlmeIndicationDisassociate;
+ 	TestIeee802154MacM.MlmeRequestConfirmDisassociate -> Freescale802154C.MlmeRequestConfirmDisassociate;
  	TestIeee802154MacM.MlmeRequestConfirmGet -> Freescale802154C.MlmeRequestConfirmGet;
  	TestIeee802154MacM.MlmeIndicationGts -> Freescale802154C.MlmeIndicationGts;
***************
*** 47,53 ****
--- 82,93 ----
  	TestIeee802154MacM.MlmeRequestSync -> Freescale802154C.MlmeRequestSync;
  	TestIeee802154MacM.MlmeIndicationCommStatus -> Freescale802154C.MlmeIndicationCommStatus;
+ 	TestIeee802154MacM.MlmeIndicationBeaconNotify -> Freescale802154C.MlmeIndicationBeaconNotify;
+ 	TestIeee802154MacM.MlmeRequestConfirmReset -> Freescale802154C.MlmeRequestConfirmReset;
+ 	TestIeee802154MacM.MlmeIndicationResponseOrphan -> Freescale802154C.MlmeIndicationResponseOrphan;
  
  	TestIeee802154MacM.MlmeAssociateIndicationResponse -> Freescale802154C.MlmeAssociateIndicationResponse;
  	TestIeee802154MacM.MlmeAssociateRequestConfirm -> Freescale802154C.MlmeAssociateRequestConfirm;
+ 	TestIeee802154MacM.MlmeDisassociateIndication -> Freescale802154C.MlmeDisassociateIndication;
+ 	TestIeee802154MacM.MlmeDisassociateRequestConfirm -> Freescale802154C.MlmeDisassociateRequestConfirm;
  	TestIeee802154MacM.MlmeGetRequestConfirm -> Freescale802154C.MlmeGetRequestConfirm;
  	TestIeee802154MacM.MlmeGtsIndication -> Freescale802154C.MlmeGtsIndication;
***************
*** 61,64 ****
--- 101,107 ----
  	TestIeee802154MacM.MlmeSyncRequest -> Freescale802154C.MlmeSyncRequest;
  	TestIeee802154MacM.MlmeCommStatusIndication -> Freescale802154C.MlmeCommStatusIndication;
+ 	TestIeee802154MacM.MlmeBeaconNotifyIndication -> Freescale802154C.MlmeBeaconNotifyIndication;
+ 	TestIeee802154MacM.MlmeResetRequestConfirm -> Freescale802154C.MlmeResetRequestConfirm;
+ 	TestIeee802154MacM.MlmeOrphanIndicationResponse -> Freescale802154C.MlmeOrphanIndicationResponse;
  
  	TestIeee802154MacM.ConsoleOut -> ConsoleC.ConsoleOut;

Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/diku/evb13192/apps/TestIeee802154Mac/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile	25 Jan 2006 13:51:57 -0000	1.7
--- Makefile	23 Aug 2006 09:41:13 -0000	1.8
***************
*** 1,3 ****
! MAC_TYPE=Freescale
  
  ifeq ($(MAC_TYPE),Generic)
--- 1,3 ----
! MAC_TYPE=Generic
  
  ifeq ($(MAC_TYPE),Generic)
***************
*** 6,10 ****
  	ENVIRONMENT=Generic802154
  	PFLAGS=-I$(TINYOS_EVB13192DIR)/tos/lib/ieee802154 \
- 	       -I$(TINYOS_EVB13192DIR)/tos/lib/ieee802154/phy \
  	       -I$(TINYOS_EVB13192DIR)/tos/lib/ieee802154/mac \
  	       -I$(TINYOS_EVB13192DIR)/tos/lib/ieee802154/mac/ADTModules \
--- 6,9 ----

Index: TestIeee802154MacM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/diku/evb13192/apps/TestIeee802154Mac/TestIeee802154MacM.nc,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** TestIeee802154MacM.nc	27 Jun 2006 12:26:02 -0000	1.22
--- TestIeee802154MacM.nc	23 Aug 2006 09:41:13 -0000	1.23
***************
*** 1,3 ****
--- 1,34 ----
+ /* Copyright (c) 2006, Jan Flora <janflora at diku.dk>
+  * All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without modification,
+  * are permitted provided that the following conditions are met:
+  *
+  *  - Redistributions of source code must retain the above copyright notice, this
+  *    list of conditions and the following disclaimer.
+  *  - Redistributions in binary form must reproduce the above copyright notice,
[...1454 lines suppressed...]
*** 1131,1139 ****
  			} else if (0 == strcmp("sync", cmd_input)) {
  				post sync();
! 			} else if (0 == strcmp("time", cmd_input)) {
  //				post getTime();
! 			} else if (0 == strcmp("wake", cmd_input)) {
  //				post getWake();
! 			} else if (0 == strcmp("get", cmd_input)) {
  //				post testGet();
  			} else if (0 == strcmp("requestgts", cmd_input)) {
--- 1318,1326 ----
  			} else if (0 == strcmp("sync", cmd_input)) {
  				post sync();
! //			} else if (0 == strcmp("time", cmd_input)) {
  //				post getTime();
! //			} else if (0 == strcmp("wake", cmd_input)) {
  //				post getWake();
! //			} else if (0 == strcmp("get", cmd_input)) {
  //				post testGet();
  			} else if (0 == strcmp("requestgts", cmd_input)) {

More information about the Tinyos-contrib-commits mailing list