[Tinyos-2-commits] CVS: tinyos-2.x/apps/BaseStationCC2420 BaseStationC.nc, 1.5, 1.6 BaseStationP.nc, 1.5, 1.6

[Phil Levis]

Update of /cvsroot/tinyos/tinyos-2.x/apps/BaseStationCC2420
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28851

Modified Files:
	BaseStationC.nc BaseStationP.nc 
Log Message:
Correctly handle both snooped and received packets.


Index: BaseStationC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/BaseStationCC2420/BaseStationC.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BaseStationC.nc	8 Feb 2007 00:51:11 -0000	1.5
--- BaseStationC.nc	8 Feb 2007 00:56:35 -0000	1.6
***************
*** 83,87 ****
    BaseStationP.RadioSend -> Radio;
    BaseStationP.RadioReceive -> Radio.Receive;
!   BaseStationP.RadioReceive -> Radio.Snoop;
    BaseStationP.RadioPacket -> Radio;
    BaseStationP.RadioAMPacket -> Radio;
--- 83,87 ----
    BaseStationP.RadioSend -> Radio;
    BaseStationP.RadioReceive -> Radio.Receive;
!   BaseStationP.RadioSnoop -> Radio.Snoop;
    BaseStationP.RadioPacket -> Radio;
    BaseStationP.RadioAMPacket -> Radio;

Index: BaseStationP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/BaseStationCC2420/BaseStationP.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BaseStationP.nc	19 Dec 2006 17:55:22 -0000	1.5
--- BaseStationP.nc	8 Feb 2007 00:56:35 -0000	1.6
***************
*** 60,63 ****
--- 60,64 ----
      interface AMSend as RadioSend[am_id_t id];
      interface Receive as RadioReceive[am_id_t id];
+     interface Receive as RadioSnoop[am_id_t id];
      interface Packet as RadioPacket;
      interface AMPacket as RadioAMPacket;
***************
*** 129,136 ****
    event void RadioControl.stopDone(error_t error) {}
  
    uint8_t count = 0;
!   event message_t *RadioReceive.receive[am_id_t id](message_t *msg,
  						    void *payload,
  						    uint8_t len) {
      message_t *ret = msg;
  
--- 130,149 ----
    event void RadioControl.stopDone(error_t error) {}
  
+   message_t* receive(message_t* msg, void* payload, uint8_t len);
+   
    uint8_t count = 0;
!   event message_t* RadioReceive.receive[am_id_t id](message_t *msg,
  						    void *payload,
  						    uint8_t len) {
+     return receive(msg, payload, len);
+   }
+ 
+   event message_t* RadioSnoop.receive[am_id_t id](message_t* msg,
+ 						  void* payload,
+ 						  uint8_t len) {
+     return receive(msg, payload, len);
+   }
+ 
+   message_t* receive(message_t* msg, void* payload, uint8_t len) {
      message_t *ret = msg;