[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/diku/evb13192/tos/lib/ieee802154/mac/ADTModules MlmeGtsIndicationM.nc, 1.3, 1.4 MlmeGtsRequestConfirmM.nc, 1.4, 1.5

[Jan Flora]

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

Modified Files:
	MlmeGtsIndicationM.nc MlmeGtsRequestConfirmM.nc 
Log Message:
802.15.4 GTS functionality updates

Index: MlmeGtsIndicationM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/diku/evb13192/tos/lib/ieee802154/mac/ADTModules/MlmeGtsIndicationM.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MlmeGtsIndicationM.nc	23 Aug 2006 12:21:49 -0000	1.3
--- MlmeGtsIndicationM.nc	16 Sep 2006 17:52:24 -0000	1.4
***************
*** 45,55 ****
  	command result_t MlmeGtsIndication.destroy(Mlme_GtsIndication primitive)
  	{
! 		uint8_t *frame = primitive->msg.indication.GTSRequestFrame;
! 		uint8_t frameSize = mhrLengthFrame(frame) + msduCommandFrameIdentLength +
! 		                    msduGtsRequestGtsCharacteristicsLength;
! 		if (SUCCESS == call BufferMng.release(frameSize, frame)) {
! 			return call BufferMng.release(sizeof(mlmeGTSIndication_t), (uint8_t*)primitive);
! 		}
! 		return FAIL;
  	}
  	
--- 45,49 ----
  	command result_t MlmeGtsIndication.destroy(Mlme_GtsIndication primitive)
  	{
! 		return call BufferMng.release(sizeof(mlmeGTSIndication_t), (uint8_t*)primitive);
  	}
  	
***************
*** 57,76 ****
  	{
  		// Always short address.
! 		uint8_t *frame = indication->msg.indication.GTSRequestFrame;
! 		uint16_t ret;
! 		NTOUH16(mhrSrcAddr(frame), &((uint8_t)ret));
! 		return ret;
  	}
  	
  	command uint8_t MlmeGtsIndication.getGtsCharacteristics( Mlme_GtsIndication indication )
  	{
! 		uint8_t *frame = indication->msg.indication.GTSRequestFrame;
! 		return *((uint8_t*)msduGtsRequestGtsCharacteristics(frame));
  	}
  	
  	command bool MlmeGtsIndication.getSecurityUse( Mlme_GtsIndication indication )
  	{
! 		uint8_t *frame = indication->msg.indication.GTSRequestFrame;
! 		return mhrSecurityEnabled(frame);
  	}
  	
--- 51,65 ----
  	{
  		// Always short address.
! 		return indication->msg.indication.address;
  	}
  	
  	command uint8_t MlmeGtsIndication.getGtsCharacteristics( Mlme_GtsIndication indication )
  	{
! 		return indication->msg.indication.gtsCharacteristics;
  	}
  	
  	command bool MlmeGtsIndication.getSecurityUse( Mlme_GtsIndication indication )
  	{
! 		return indication->msg.indication.securityUse;
  	}
  	

Index: MlmeGtsRequestConfirmM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/diku/evb13192/tos/lib/ieee802154/mac/ADTModules/MlmeGtsRequestConfirmM.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MlmeGtsRequestConfirmM.nc	23 Aug 2006 12:21:49 -0000	1.4
--- MlmeGtsRequestConfirmM.nc	16 Sep 2006 17:52:24 -0000	1.5
***************
*** 93,96 ****
--- 93,98 ----
  	{
  		uint8_t *frame = request->msg.request.GTSRequestFrame;
+ 		request->msg.request.gtsType = ((msduGtsCharacteristics_t*)&(gtsCharacteristics))->CharType;
+ 		request->msg.request.gtsDirection = ((msduGtsCharacteristics_t*)&(gtsCharacteristics))->GTSDirection;
  		*((uint8_t*)msduGtsRequestGtsCharacteristics(frame)) = gtsCharacteristics;
  	}
***************
*** 103,106 ****
--- 105,110 ----
  		uint8_t *frame = request->msg.request.GTSRequestFrame;
  		msduGtsCharacteristics_t *gtsChars = msduGtsRequestGtsCharacteristics(frame);
+ 		request->msg.request.gtsType = type;
+ 		request->msg.request.gtsDirection = direction;
  		gtsChars->GTSLength = length;
  		gtsChars->GTSDirection = direction;