[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/diku/evb13192/tos/lib/ieee802154/mac/interfaces CallbackService.nc, NONE, 1.1 CfpTx.nc, NONE, 1.1 BeaconGtsService.nc, 1.1, 1.2 Superframe.nc, 1.9, 1.10

[Jan Flora]

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

Modified Files:
	BeaconGtsService.nc Superframe.nc 
Added Files:
	CallbackService.nc CfpTx.nc 
Log Message:
802.15.4 GTS functionality updates

--- NEW FILE: CallbackService.nc ---
/* 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 CallbackService
{
	command void enqueue(uint8_t *primitive, void(*callback)(uint8_t*));
}

--- NEW FILE: CfpTx.nc ---
/* 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 CfpTx
{
	command void sendFrame(txHeader_t *header);
	event void done(txHeader_t *header);
	command void dataReceived();
}

Index: BeaconGtsService.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/diku/evb13192/tos/lib/ieee802154/mac/interfaces/BeaconGtsService.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BeaconGtsService.nc	23 Aug 2006 09:54:57 -0000	1.1
--- BeaconGtsService.nc	16 Sep 2006 17:52:23 -0000	1.2
***************
*** 31,36 ****
  interface BeaconGtsService
  {
! 	command void getPublishedGts(uint8_t *shortCnt, uint8_t *extCnt, uint8_t *data);
! 	command void gtsUpdate(uint8_t start, uint8_t length, bool deviceTxSlot);
  	command void beaconReceived();
  }
\ No newline at end of file
--- 31,36 ----
  interface BeaconGtsService
  {
! 	command void getPublishedGts(uint8_t *descriptorCount, uint8_t *data);
! 	command void gtsUpdate(uint8_t start, uint8_t length, bool deviceRxSlot);
  	command void beaconReceived();
  }
\ No newline at end of file

Index: Superframe.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/diku/evb13192/tos/lib/ieee802154/mac/interfaces/Superframe.nc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Superframe.nc	23 Aug 2006 12:21:48 -0000	1.9
--- Superframe.nc	16 Sep 2006 17:52:23 -0000	1.10
***************
*** 51,54 ****
--- 51,56 ----
  	command time_t getNextStart(superframe_t *superframe);
  	command time_t getSlotStartTime(superframe_t *sf, uint8_t slot);
+ 	command uint8_t getCurrentSlot(superframe_t *sf);
+ 	command uint16_t gtsTimeout(superframe_t *sf);
  	
  	//TODO: Update function - perhaps on another interface?