[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/diku/evb13192/tos/lib/ieee802154 RTScheduler.nc, 1.1, 1.2 endianconv.h, 1.2, 1.3 Ieee802154C.nc, 1.7, 1.8 RTSchedulerM.nc, 1.5, 1.6 SimpleBufferManM.nc, 1.4, 1.5 SymbolAlarmM.nc, 1.1, 1.2

Wed Aug 23 02:55:00 PDT 2006

Update of /cvsroot/tinyos/tinyos-1.x/contrib/diku/evb13192/tos/lib/ieee802154
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17970/tos/lib/ieee802154

Modified Files:
	RTScheduler.nc endianconv.h Ieee802154C.nc RTSchedulerM.nc 
	SimpleBufferManM.nc SymbolAlarmM.nc 
Log Message:
802.15.4 library updates

Index: RTScheduler.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/diku/evb13192/tos/lib/ieee802154/RTScheduler.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RTScheduler.nc	19 Jan 2006 16:18:31 -0000	1.1
--- RTScheduler.nc	23 Aug 2006 09:54:58 -0000	1.2
***************
*** 1,2 ****
--- 1,31 ----
+ /* 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>
+ */
  
  interface RTScheduler

Index: endianconv.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/diku/evb13192/tos/lib/ieee802154/endianconv.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** endianconv.h	5 Jan 2006 17:12:45 -0000	1.2
--- endianconv.h	23 Aug 2006 09:54:58 -0000	1.3
***************
*** 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>
+ */
+ 
  #ifndef _ENDIANCONV_H_
  #define _ENDIANCONV_H_

Index: Ieee802154C.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/diku/evb13192/tos/lib/ieee802154/Ieee802154C.nc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Ieee802154C.nc	14 Jan 2006 22:12:34 -0000	1.7
--- Ieee802154C.nc	23 Aug 2006 09:54:58 -0000	1.8
***************
*** 1,2 ****
--- 1,31 ----
+ /* 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>
+ */
  
  configuration Ieee802154C
***************
*** 63,73 ****
  	uses
  	{
! 		interface IeeeRadioControl as RadioControl;
! 		interface IeeeRadioSend as RadioSend;
! 		interface IeeeRadioRecv as RadioRecv;
! 		interface IeeeRadioCCA as RadioCCA;
! 		interface IeeeRadioEvents as RadioEvents;
  		interface Debug;
- 		interface Timer[uint8_t timer];
  	}
  }
--- 92,102 ----
  	uses
  	{
! 		interface PhyAttributes;
! 		interface PhyControl;
! 		interface PhyEnergyDetect;
! 		interface PhyReceive;
! 		interface PhyTransmit;
! 		
  		interface Debug;
  	}
  }
***************
*** 146,177 ****
  	MlmeSyncLossIndication = Ieee802154MacC.MlmeSyncLossIndication;
  	
- 	// Wire the phy layer externally.
- 	Ieee802154PhyC.RadioControl = RadioControl;
- 	Ieee802154PhyC.RadioSend = RadioSend;
- 	Ieee802154PhyC.RadioRecv = RadioRecv;
- 	Ieee802154PhyC.RadioCCA = RadioCCA;
- 	
- 	// Wire the mac layer externally.
- 	Ieee802154MacC.IeeeRadioEvents = RadioEvents;
- 	
- 	// Wire the mac layer to the phy layer.
- 	Ieee802154MacC.IeeePhyPibAttribute -> Ieee802154PhyC.IeeePhyPibAttribute;
- 	Ieee802154MacC.IeeePhySdu -> Ieee802154PhyC.IeeePhySdu;
- 	
- 	Ieee802154MacC.PlmeCcaRequestConfirm -> Ieee802154PhyC.PlmeCcaRequestConfirm;
- 	Ieee802154MacC.PlmeEdRequestConfirm -> Ieee802154PhyC.PlmeEdRequestConfirm;
- 	Ieee802154MacC.PlmeGetRequestConfirm -> Ieee802154PhyC.PlmeGetRequestConfirm;
- 	Ieee802154MacC.PlmeSetRequestConfirm -> Ieee802154PhyC.PlmeSetRequestConfirm;
- 	Ieee802154MacC.PlmeSetTrxStateRequestConfirm -> Ieee802154PhyC.PlmeSetTrxStateRequestConfirm;
- 	Ieee802154MacC.PlmeRequestConfirmCca -> Ieee802154PhyC.PlmeRequestConfirmCca;
- 	Ieee802154MacC.PlmeRequestConfirmEd -> Ieee802154PhyC.PlmeRequestConfirmEd;
- 	Ieee802154MacC.PlmeRequestConfirmGet -> Ieee802154PhyC.PlmeRequestConfirmGet;
- 	Ieee802154MacC.PlmeRequestConfirmSet -> Ieee802154PhyC.PlmeRequestConfirmSet;
- 	Ieee802154MacC.PlmeRequestConfirmSetTrxState -> Ieee802154PhyC.PlmeRequestConfirmSetTrxState;
- 	Ieee802154MacC.PdDataRequestConfirm -> Ieee802154PhyC.PdDataRequestConfirm;
- 	Ieee802154MacC.PdDataIndication -> Ieee802154PhyC.PdDataIndication;
- 	Ieee802154MacC.PdRequestConfirmData -> Ieee802154PhyC.PdRequestConfirmData;
- 	Ieee802154MacC.PdIndicationData -> Ieee802154PhyC.PdIndicationData;
- 	
  	// Wire timers.
  	Ieee802154MacC.ScanTimer = Timer[unique("Timer")];
--- 175,178 ----

Index: RTSchedulerM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/diku/evb13192/tos/lib/ieee802154/RTSchedulerM.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** RTSchedulerM.nc	1 Mar 2006 12:59:14 -0000	1.5
--- RTSchedulerM.nc	23 Aug 2006 09:54:58 -0000	1.6
***************
*** 1,2 ****
--- 1,31 ----
+ /* 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>
+ */
  
  module RTSchedulerM

Index: SimpleBufferManM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/diku/evb13192/tos/lib/ieee802154/SimpleBufferManM.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SimpleBufferManM.nc	20 Feb 2006 17:19:55 -0000	1.4
--- SimpleBufferManM.nc	23 Aug 2006 09:54:58 -0000	1.5
***************
*** 1,2 ****
--- 1,31 ----
+ /* 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>
+ */
  
  module SimpleBufferManM
***************
*** 6,9 ****
--- 35,39 ----
  		interface StdControl;
  		interface IeeeBufferManagement as BufferMng;
+ 		interface BufferManDebug;
  	}
  	uses
***************
*** 22,26 ****
  implementation
  {
! 	#define DBG_LEVEL 0
  	#include "Debug.h"
  
--- 52,56 ----
  implementation
  {
! 	#define DBG_LEVEL 3
  	#include "Debug.h"
  
***************
*** 98,104 ****
  		if (size > 128) return FAIL;		
  		freeQueue = getPool(size);
- 		#if DBG_LEVEL > 0
- 			printUsageStats();
- 		#endif
  		return call Queue.dequeue(freeQueue, buffer);
  	}
--- 128,131 ----
***************
*** 110,116 ****
  		if (size > 128) return FAIL;
  		freeQueue = getPool(size);
- 		#if DBG_LEVEL > 0
- 			printUsageStats();
- 		#endif
  		return call Queue.enqueue(freeQueue, buffer);
  	}
--- 137,140 ----
***************
*** 134,166 ****
  	
  #if DBG_LEVEL > 0
! 	void printUsageStats()
  	{
! 		printCount++;
! 		if (printCount >= 20) {
! 			uint8_t freeCount = 0;
! 			printCount = 0;
! 			DBG_STR("-----------------",3);
! 			DBG_STR("Number of 128 byte buffers free:",3);
! 			freeCount = call Queue.elementCount(&freeQueue128);
! 			DBG_INT(freeCount,3);
! 			
! 			DBG_STR("Number of 64 byte buffers free:",3);
! 			freeCount = call Queue.elementCount(&freeQueue64);
! 			DBG_INT(freeCount,3);
! 			
! 			DBG_STR("Number of 32 byte buffers free:",3);
! 			freeCount = call Queue.elementCount(&freeQueue32);
! 			DBG_INT(freeCount,3);
! 			
! 			DBG_STR("Number of 16 byte buffers free:",3);
! 			freeCount = call Queue.elementCount(&freeQueue16);
! 			DBG_INT(freeCount,3);
! 			
! 			DBG_STR("Number of 8 byte buffers free:",3);
! 			freeCount = call Queue.elementCount(&freeQueue8);
! 			DBG_INT(freeCount,3);
! 			
! 			DBG_STR("-----------------",3);
! 		}
  	}
  #endif
--- 158,186 ----
  	
  #if DBG_LEVEL > 0
! 	command void BufferManDebug.printUsageStats()
  	{
! 		uint8_t freeCount = 0;
! 		DBG_STR("-----------------",3);
! 		DBG_STR("Number of 128 byte buffers free:",3);
! 		freeCount = call Queue.elementCount(&freeQueue128);
! 		DBG_INT(freeCount,3);
! 		
! 		DBG_STR("Number of 64 byte buffers free:",3);
! 		freeCount = call Queue.elementCount(&freeQueue64);
! 		DBG_INT(freeCount,3);
! 		
! 		DBG_STR("Number of 32 byte buffers free:",3);
! 		freeCount = call Queue.elementCount(&freeQueue32);
! 		DBG_INT(freeCount,3);
! 		
! 		DBG_STR("Number of 16 byte buffers free:",3);
! 		freeCount = call Queue.elementCount(&freeQueue16);
! 		DBG_INT(freeCount,3);
! 		
! 		DBG_STR("Number of 8 byte buffers free:",3);
! 		freeCount = call Queue.elementCount(&freeQueue8);
! 		DBG_INT(freeCount,3);
! 		
! 		DBG_STR("-----------------",3);
  	}
  #endif

Index: SymbolAlarmM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/diku/evb13192/tos/lib/ieee802154/SymbolAlarmM.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SymbolAlarmM.nc	19 Jan 2006 17:26:12 -0000	1.1
--- SymbolAlarmM.nc	23 Aug 2006 09:54:58 -0000	1.2
***************
*** 1,2 ****
--- 1,31 ----
+ /* 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>
+ */
  
  module SymbolAlarmM