[Tinyos-2-commits] CVS: tinyos-2.x/apps/tests/rf230/RF230Sniffer RF230SnifferC.nc, 1.7, 1.8

[Miklos Maroti]

Update of /cvsroot/tinyos/tinyos-2.x/apps/tests/rf230/RF230Sniffer
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8696

Modified Files:
	RF230SnifferC.nc 
Log Message:
change metadata handling, 
remove the RF2xxPacket component, move functionality to RF2xxActiveMessage,
prepare blip support (RF2xxMessageC)


Index: RF230SnifferC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/rf230/RF230Sniffer/RF230SnifferC.nc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** RF230SnifferC.nc	29 Mar 2009 21:12:43 -0000	1.7
--- RF230SnifferC.nc	2 Apr 2009 22:11:59 -0000	1.8
***************
*** 28,32 ****
  implementation
  {
! 	components RF230SnifferP, MainC, SerialActiveMessageC, RF230DriverLayerC, RF230ActiveMessageP, IEEE154Packet2C, AssertC;
  	
  	RF230SnifferP.Boot -> MainC;
--- 28,32 ----
  implementation
  {
! 	components RF230SnifferP, MainC, SerialActiveMessageC, AssertC;
  	
  	RF230SnifferP.Boot -> MainC;
***************
*** 34,40 ****
  	RF230SnifferP.RadioState -> RF230DriverLayerC;
  
  	RF230DriverLayerC.RF230DriverConfig -> RF230ActiveMessageP;
  
! 	RF230ActiveMessageP.IEEE154Packet2 -> IEEE154Packet2C;
  
  	// just to avoid a timer compilation bug
--- 34,51 ----
  	RF230SnifferP.RadioState -> RF230DriverLayerC;
  
+ 	components RF230DriverLayerC;
+ 	RF230DriverLayerC.PacketRF230Metadata -> RF230ActiveMessageP;
  	RF230DriverLayerC.RF230DriverConfig -> RF230ActiveMessageP;
+ 	RF230DriverLayerC.PacketTimeStamp -> TimeStampingLayerC;
  
! 	components MetadataFlagsLayerC;
! 	MetadataFlagsLayerC.PacketFlagsMetadata -> RF230ActiveMessageP;
! 
! 	components RF230ActiveMessageP, IEEE154PacketLayerC;
! 	RF230ActiveMessageP.IEEE154PacketLayer -> IEEE154PacketLayerC;
! 
! 	components TimeStampingLayerC;
! 	TimeStampingLayerC.LocalTimeRadio -> RF230DriverLayerC;
! 	TimeStampingLayerC.PacketTimeStampMetadata -> RF230ActiveMessageP;
  
  	// just to avoid a timer compilation bug