[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/rf2xx/util Neighborhood.nc, 1.1, 1.2 NeighborhoodFlag.nc, 1.1, 1.2 NeighborhoodP.nc, 1.1, 1.2

Janos Sallai sallai at users.sourceforge.net
Wed May 26 17:23:13 PDT 2010


Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/util
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv29792/util

Modified Files:
	Neighborhood.nc NeighborhoodFlag.nc NeighborhoodP.nc 
Log Message:
minor fixes to make mspgcc happy

Index: Neighborhood.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/util/Neighborhood.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Neighborhood.nc	10 Mar 2009 20:37:58 -0000	1.1
--- Neighborhood.nc	27 May 2010 00:23:11 -0000	1.2
***************
*** 44,53 ****
  	 * fit into a byte, then it is periodically reset to a smaller value.
  	 */
! 	tasklet_async command uint8_t getAge(uint8_t index);
  
  	/**
  	 * Returns the node address for the given entry.
  	 */
! 	tasklet_async command am_addr_t getNode(uint8_t index);
  
  	/**
--- 44,53 ----
  	 * fit into a byte, then it is periodically reset to a smaller value.
  	 */
! 	tasklet_async command uint8_t getAge(uint8_t idx);
  
  	/**
  	 * Returns the node address for the given entry.
  	 */
! 	tasklet_async command am_addr_t getNode(uint8_t idx);
  
  	/**
***************
*** 67,70 ****
  	 * (see the NeighborhoodFlag interface)
  	 */
! 	tasklet_async event void evicted(uint8_t index);
  }
--- 67,70 ----
  	 * (see the NeighborhoodFlag interface)
  	 */
! 	tasklet_async event void evicted(uint8_t idx);
  }

Index: NeighborhoodFlag.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/util/NeighborhoodFlag.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NeighborhoodFlag.nc	10 Mar 2009 20:37:58 -0000	1.1
--- NeighborhoodFlag.nc	27 May 2010 00:23:11 -0000	1.2
***************
*** 33,42 ****
  	 * Returns the value of the flag for the given index
  	 */
! 	tasklet_async command bool get(uint8_t index);
  	
  	/**
  	 * Sets the flag for the given index
  	 */
! 	tasklet_async command void set(uint8_t index);
  
  	/**
--- 33,42 ----
  	 * Returns the value of the flag for the given index
  	 */
! 	tasklet_async command bool get(uint8_t idx);
  	
  	/**
  	 * Sets the flag for the given index
  	 */
! 	tasklet_async command void set(uint8_t idx);
  
  	/**
***************
*** 44,48 ****
  	 * cleared after the Neighborhood.evicted event is fired.
  	 */
! 	tasklet_async command void clear(uint8_t index);
  
  	/**
--- 44,48 ----
  	 * cleared after the Neighborhood.evicted event is fired.
  	 */
! 	tasklet_async command void clear(uint8_t idx);
  
  	/**

Index: NeighborhoodP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/util/NeighborhoodP.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NeighborhoodP.nc	10 Mar 2009 20:37:58 -0000	1.1
--- NeighborhoodP.nc	27 May 2010 00:23:11 -0000	1.2
***************
*** 52,63 ****
  	}
  
! 	inline tasklet_async command am_addr_t Neighborhood.getNode(uint8_t index)
  	{
! 		return nodes[index];
  	}
  
! 	inline tasklet_async command uint8_t Neighborhood.getAge(uint8_t index)
  	{
! 		return time - ages[index];
  	}
  
--- 52,63 ----
  	}
  
! 	inline tasklet_async command am_addr_t Neighborhood.getNode(uint8_t idx)
  	{
! 		return nodes[idx];
  	}
  
! 	inline tasklet_async command uint8_t Neighborhood.getAge(uint8_t idx)
  	{
! 		return time - ages[idx];
  	}
  
***************
*** 145,161 ****
  	}
  
! 	inline tasklet_async command bool NeighborhoodFlag.get[uint8_t bit](uint8_t index)
  	{
! 		return flags[index] & (1 << bit);
  	}
  
! 	inline tasklet_async command void NeighborhoodFlag.set[uint8_t bit](uint8_t index)
  	{
! 		flags[index] |= (1 << bit);
  	}
  
! 	inline tasklet_async command void NeighborhoodFlag.clear[uint8_t bit](uint8_t index)
  	{
! 		flags[index] &= ~(1 << bit);
  	}
  
--- 145,161 ----
  	}
  
! 	inline tasklet_async command bool NeighborhoodFlag.get[uint8_t bit](uint8_t idx)
  	{
! 		return flags[idx] & (1 << bit);
  	}
  
! 	inline tasklet_async command void NeighborhoodFlag.set[uint8_t bit](uint8_t idx)
  	{
! 		flags[idx] |= (1 << bit);
  	}
  
! 	inline tasklet_async command void NeighborhoodFlag.clear[uint8_t bit](uint8_t idx)
  	{
! 		flags[idx] &= ~(1 << bit);
  	}
  



More information about the Tinyos-2-commits mailing list