[Tinyos-2-commits] CVS: tinyos-2.x/apps/BaseStation BaseStationC.nc, 1.2, 1.3 BaseStationP.nc, 1.2, 1.3 Makefile, 1.2, 1.3 README, 1.2, 1.3 README.txt, 1.2, 1.3

[Phil Levis]

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

Modified Files:
	BaseStationC.nc BaseStationP.nc Makefile README README.txt 
Log Message:
Merge over into the trunk.



Index: BaseStationP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/BaseStation/BaseStationP.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BaseStationP.nc	12 Jul 2006 16:58:54 -0000	1.2
--- BaseStationP.nc	7 Nov 2006 19:30:33 -0000	1.3
***************
*** 134,141 ****
  						    uint8_t len) {
      message_t *ret = msg;
- #if 0
-     if (!msg->crc || msg->group != TOS_AM_GROUP)
-       return msg;
- #endif
  
      atomic {
--- 134,137 ----

Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/BaseStation/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile	12 Jul 2006 16:58:55 -0000	1.2
--- Makefile	7 Nov 2006 19:30:33 -0000	1.3
***************
*** 1,4 ****
  COMPONENT=BaseStationC
- CFLAGS += -I%T/oski
  include $(MAKERULES)
  
--- 1,3 ----

Index: README
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/BaseStation/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** README	12 Jul 2006 16:58:55 -0000	1.2
--- README	7 Nov 2006 19:30:33 -0000	1.3
***************
*** 39,45 ****
  
  On CC2420 platforms, BaseStation can only overhear packets transmitted
! to it or to the broadcast address. This is due to how the CC2420 hardware
! filters packets based on address and how the CC2420 stack uses that
! functionality; future versions will not have this limitation.
  
  
--- 39,44 ----
  
  On CC2420 platforms, BaseStation can only overhear packets transmitted
! to it or to the broadcast address. For these platforms (e.g., micaz,
! telos, intel mote 2), you should use BaseStationCC2420.
  
  

Index: README.txt
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/BaseStation/README.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** README.txt	12 Jul 2006 16:58:57 -0000	1.2
--- README.txt	7 Nov 2006 19:30:33 -0000	1.3
***************
*** 38,40 ****
  Known bugs/limitations:
  
! None. 
--- 38,44 ----
  Known bugs/limitations:
  
! On CC2420 platforms, BaseStation can only overhear packets transmitted
! to it or to the broadcast address. For these platforms (e.g., micaz,
! telos, intel mote 2), you should use BaseStationCC2420.
! 
!