[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/diku/evb13192/tos/lib/ieee802154/mac macFrame.h, 1.2, 1.3 TimingServiceM.nc, 1.1, 1.2 BeaconTrackerM.nc, 1.12, 1.13 SuperframeM.nc, 1.8, 1.9

[Jan Flora]

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

Modified Files:
	macFrame.h TimingServiceM.nc BeaconTrackerM.nc SuperframeM.nc 
Log Message:
802.15.4 library updates

Index: macFrame.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/diku/evb13192/tos/lib/ieee802154/mac/macFrame.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** macFrame.h	23 Aug 2006 09:54:56 -0000	1.2
--- macFrame.h	23 Aug 2006 12:21:48 -0000	1.3
***************
*** 278,281 ****
--- 278,282 ----
  #define msduGtsRequestGtsCharacteristicsOffset  msduCommandFrameIdentOffset+msduCommandFrameIdentLength
  #define msduGtsRequestGtsCharacteristics(frame) ((msduGtsCharacteristics_t*)((uint8_t*)msduGetPtr(frame)+msduGtsRequestGtsCharacteristicsOffset))
+ //#define msduGtsRequestGtsCharacteristics(frame) ((uint8_t*)msduGetPtr(frame)+msduGtsRequestGtsCharacteristicsOffset)
  
  #endif

Index: TimingServiceM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/diku/evb13192/tos/lib/ieee802154/mac/TimingServiceM.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TimingServiceM.nc	23 Aug 2006 09:54:56 -0000	1.1
--- TimingServiceM.nc	23 Aug 2006 12:21:48 -0000	1.2
***************
*** 65,70 ****
  	command void TimingService.waitForResponse[uint8_t service]()
  	{
! 		waitState[0].active = TRUE;
! 		waitState[0].
  		responseWaitService = service;
  		call ResponseWaitAlarm.armCountdown(aResponseWaitTime);
--- 65,70 ----
  	command void TimingService.waitForResponse[uint8_t service]()
  	{
! 	//	waitState[0].active = TRUE;
! 	//	waitState[0].
  		responseWaitService = service;
  		call ResponseWaitAlarm.armCountdown(aResponseWaitTime);

Index: BeaconTrackerM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/diku/evb13192/tos/lib/ieee802154/mac/BeaconTrackerM.nc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** BeaconTrackerM.nc	23 Aug 2006 09:54:56 -0000	1.12
--- BeaconTrackerM.nc	23 Aug 2006 12:21:48 -0000	1.13
***************
*** 184,190 ****
  			
  			for (i=0;i<numGtsDesc;i++) {
! 				if (gtsList->DeviceShortAddress == macShortAddr) {
  					// We have a GTS update.
! 					call BeaconGtsService.gtsUpdate(gtsList->GTSStartingSlot, gtsList->GTSLength, gtsDirections & i);
  				}
  				gtsList += sizeof(msduGTSList_t);
--- 184,191 ----
  			
  			for (i=0;i<numGtsDesc;i++) {
! 				if (gtsList->DeviceShortAddress == macShortAddress) {
  					// We have a GTS update.
! 					// TODO: Connect and enable.
! 					//call BeaconGtsService.gtsUpdate(gtsList->GTSStartingSlot, gtsList->GTSLength, gtsDirections & i);
  				}
  				gtsList += sizeof(msduGTSList_t);
***************
*** 246,250 ****
  		// Set up the track alarm to fire just before next beacon
  		call TrackAlarm.armAlarmClock(nextCommence-50);
! 		call BeaconGtsService.beaconReceived();
  		//DBG_STRINT("Cap end is:",capEnd,1);
  		//DBG_STRINT("Next commence is:",nextCommence,1);
--- 247,253 ----
  		// Set up the track alarm to fire just before next beacon
  		call TrackAlarm.armAlarmClock(nextCommence-50);
! 		// TODO: Connect and enable.
! 		//call BeaconGtsService.beaconReceived();
! 		
  		//DBG_STRINT("Cap end is:",capEnd,1);
  		//DBG_STRINT("Next commence is:",nextCommence,1);

Index: SuperframeM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/diku/evb13192/tos/lib/ieee802154/mac/SuperframeM.nc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** SuperframeM.nc	23 Aug 2006 09:54:56 -0000	1.8
--- SuperframeM.nc	23 Aug 2006 12:21:48 -0000	1.9
***************
*** 73,77 ****
  	command bool Superframe.fitsInGts(cfpTx_t *frame, gtsDescriptor_t *gts)
  	{
! 		return (frame->header->transactionTime <
  	}
  	
--- 73,77 ----
  	command bool Superframe.fitsInGts(cfpTx_t *frame, gtsDescriptor_t *gts)
  	{
! 		//return (frame->header->transactionTime <
  	}