[Tinyos-2-commits] CVS: tinyos-2.x/apps/tests/rf230/RF230Sniffer RF230SnifferP.nc, 1.1, 1.2

[Miklos Maroti]

Update of /cvsroot/tinyos/tinyos-2.x/apps/tests/rf230/RF230Sniffer
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26337

Modified Files:
	RF230SnifferP.nc 
Log Message:
consolidated the normal and sniffer drivers

Index: RF230SnifferP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/rf230/RF230Sniffer/RF230SnifferP.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RF230SnifferP.nc	6 Nov 2007 19:41:28 -0000	1.1
--- RF230SnifferP.nc	7 May 2008 20:39:57 -0000	1.2
***************
*** 22,27 ****
   */
  
  #include <Tasklet.h>
- #include <DefaultMac.h>
  #include <message.h>
  
--- 22,27 ----
   */
  
+ #include <DefaultPacket.h>
  #include <Tasklet.h>
  #include <message.h>
  
***************
*** 34,43 ****
  
  		interface RadioState;
- 		interface IEEE154Packet;
- 	}
- 
- 	provides 
- 	{
- 		interface RF230Config;
  	}
  }
--- 34,37 ----
***************
*** 71,125 ****
  	{
  	}
- 
- 	async command uint8_t RF230Config.getLength(message_t* msg)
- 	{
- 		return call IEEE154Packet.getLength(msg);
- 	}
- 
- 	async command void RF230Config.setLength(message_t* msg, uint8_t len)
- 	{
- 		call IEEE154Packet.setLength(msg, len);
- 	}
- 
- 	async command uint8_t* RF230Config.getPayload(message_t* msg)
- 	{
- 		return ((uint8_t*)(call IEEE154Packet.getHeader(msg))) + 1;
- 	}
- 
- 	inline defaultmac_metadata_t* getMeta(message_t* msg)
- 	{
- 		return (defaultmac_metadata_t*)(msg->metadata);
- 	}
- 
- 	async command void RF230Config.setTimestamp(message_t* msg, uint16_t time)
- 	{
- 		getMeta(msg)->timestamp = time;
- 	}
- 
- 	async command void RF230Config.setLinkQuality(message_t* msg, uint8_t lqi)
- 	{
- 		getMeta(msg)->lqi = lqi;
- 	}
- 
- 	async command uint8_t RF230Config.getHeaderLength()
- 	{
- 		// we need the fcf, dsn, destpan and dest
- 		return 7;
- 	}
- 
- 	async command uint8_t RF230Config.getMaxLength()
- 	{
- 		// note, that the ieee154_footer_t is not stored, but we should include it here
- 		return sizeof(defaultmac_header_t) - 1 + TOSH_DATA_LENGTH + sizeof(ieee154_footer_t);
- 	}
- 
- 	async command uint8_t RF230Config.getTransmitPower(message_t* msg)
- 	{
- 		return 0;
- 	}
- 
- 	async command uint8_t RF230Config.getDefaultChannel()
- 	{
- 		return RF230_DEF_CHANNEL;
- 	}
  }
--- 65,67 ----