[Tinyos-2-commits] CVS: tinyos-2.x/apps/tests/rf230/RF230Sniffer Makefile, 1.1, 1.2 RF230SnifferC.nc, 1.1, 1.2 RF230Config.nc, 1.1, NONE RF230LayerC.nc, 1.1, NONE RF230LayerP.nc, 1.1, NONE RadioWait.nc, 1.1, NONE

[Miklos Maroti]

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

Modified Files:
	Makefile RF230SnifferC.nc 
Removed Files:
	RF230Config.nc RF230LayerC.nc RF230LayerP.nc RadioWait.nc 
Log Message:
consolidated the normal and sniffer drivers

Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/rf230/RF230Sniffer/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile	6 Nov 2007 19:41:28 -0000	1.1
--- Makefile	7 May 2008 20:40:30 -0000	1.2
***************
*** 1,8 ****
  COMPONENT=RF230SnifferC
- IEEE154_CHANNEL ?= 11
- CFLAGS += -DCC240_DEF_CHANNEL=$(IEEE154_CHANNEL)
- CFLAGS += -DRF230_DEF_CHANNEL=$(IEEE154_CHANNEL)
  CFLAGS += -I$(TOSDIR)/lib/diagmsg
  CFLAGS += -DTASKLET_IS_TASK
  CFLAGS += -DDIAGMSG_RECORDED_MSGS=60
  include $(MAKERULES)
--- 1,6 ----
  COMPONENT=RF230SnifferC
  CFLAGS += -I$(TOSDIR)/lib/diagmsg
  CFLAGS += -DTASKLET_IS_TASK
  CFLAGS += -DDIAGMSG_RECORDED_MSGS=60
+ CFLAGS += -DRF230_DEBUG -DRF230_DEBUG_MESSAGES
  include $(MAKERULES)

Index: RF230SnifferC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/rf230/RF230Sniffer/RF230SnifferC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RF230SnifferC.nc	6 Nov 2007 19:41:28 -0000	1.1
--- RF230SnifferC.nc	7 May 2008 20:40:30 -0000	1.2
***************
*** 28,38 ****
  implementation
  {
! 	components RF230SnifferP, MainC, SerialActiveMessageC, RF230LayerC, IEEE154PacketC;
  
  	RF230SnifferP.Boot -> MainC;
  	RF230SnifferP.SplitControl -> SerialActiveMessageC;
  	RF230SnifferP.RadioState -> RF230LayerC;
- 	RF230SnifferP.IEEE154Packet -> IEEE154PacketC;
  
! 	RF230LayerC.RF230Config -> RF230SnifferP;
  }
--- 28,43 ----
  implementation
  {
! 	components RF230SnifferP, MainC, SerialActiveMessageC, RF230LayerC, DefaultMacP, DefaultPacketC, IEEE154PacketC, AssertC;
  
  	RF230SnifferP.Boot -> MainC;
  	RF230SnifferP.SplitControl -> SerialActiveMessageC;
+ 
  	RF230SnifferP.RadioState -> RF230LayerC;
  
! 	RF230LayerC.RF230Config -> DefaultMacP;
! 	RF230LayerC.PacketLinkQuality -> DefaultPacketC.PacketLinkQuality;
! 	RF230LayerC.PacketTransmitPower -> DefaultPacketC.PacketTransmitPower;
! 	RF230LayerC.PacketTimeStamp -> DefaultPacketC.PacketTimeStamp;
! 
! 	DefaultMacP.IEEE154Packet -> IEEE154PacketC;
  }

--- RF230Config.nc DELETED ---

--- RF230LayerC.nc DELETED ---

--- RF230LayerP.nc DELETED ---

--- RadioWait.nc DELETED ---