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

[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-serv14738/tos/lib/ieee802154/mac/ADTModules

Modified Files:
	MlmeGtsIndicationM.nc MlmeGtsRequestConfirmM.nc 
Log Message:
802.15.4 library 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.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MlmeGtsIndicationM.nc	23 Aug 2006 09:54:57 -0000	1.2
--- MlmeGtsIndicationM.nc	23 Aug 2006 12:21:49 -0000	1.3
***************
*** 66,70 ****
  	{
  		uint8_t *frame = indication->msg.indication.GTSRequestFrame;
! 		return msduGtsRequestGtsCharacteristics(frame);
  	}
  	
--- 66,70 ----
  	{
  		uint8_t *frame = indication->msg.indication.GTSRequestFrame;
! 		return *((uint8_t*)msduGtsRequestGtsCharacteristics(frame));
  	}
  	

Index: MlmeGtsRequestConfirmM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/diku/evb13192/tos/lib/ieee802154/mac/ADTModules/MlmeGtsRequestConfirmM.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MlmeGtsRequestConfirmM.nc	23 Aug 2006 09:54:58 -0000	1.3
--- MlmeGtsRequestConfirmM.nc	23 Aug 2006 12:21:49 -0000	1.4
***************
*** 93,97 ****
  	{
  		uint8_t *frame = request->msg.request.GTSRequestFrame;
! 		msduGtsRequestGtsCharacteristics(frame) = gtsCharacteristics;
  	}
  	
--- 93,97 ----
  	{
  		uint8_t *frame = request->msg.request.GTSRequestFrame;
! 		*((uint8_t*)msduGtsRequestGtsCharacteristics(frame)) = gtsCharacteristics;
  	}
  	
***************
*** 102,108 ****
  	{
  		uint8_t *frame = request->msg.request.GTSRequestFrame;
! 		msduGtsRequestGtsCharacteristics(frame) = (length & 7) << 5
! 		                                          | (direction & 1) << 4
! 		                                          | (type & 1) << 3;
  	}
  	
--- 102,109 ----
  	{
  		uint8_t *frame = request->msg.request.GTSRequestFrame;
! 		msduGtsCharacteristics_t *gtsChars = msduGtsRequestGtsCharacteristics(frame);
! 		gtsChars->GTSLength = length;
! 		gtsChars->GTSDirection = direction;
! 		gtsChars->CharType = type;
  	}
  	
***************
*** 116,120 ****
  	{
  		uint8_t *frame = confirm->msg.confirm.GTSRequestFrame;
! 		return msduGtsRequestGtsCharacteristics(frame);
  	}
  	
--- 117,121 ----
  	{
  		uint8_t *frame = confirm->msg.confirm.GTSRequestFrame;
! 		return *((uint8_t*)msduGtsRequestGtsCharacteristics(frame));
  	}