[Tinyos-commits] CVS: tinyos-1.x/tos/lib/Deluge DelugeC.nc, 1.23, 1.24 NetProgC.nc, 1.11, 1.12

[Jonathan Hui]

Update of /cvsroot/tinyos/tinyos-1.x/tos/lib/Deluge
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19463

Modified Files:
	DelugeC.nc NetProgC.nc 
Log Message:
- Put back in ability to use GenericCommPromiscuous.



Index: DelugeC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/Deluge/DelugeC.nc,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** DelugeC.nc	22 Jul 2005 17:40:06 -0000	1.23
--- DelugeC.nc	3 Aug 2005 17:13:15 -0000	1.24
***************
*** 51,55 ****
      DelugeMetadataC as Metadata,
      DelugePageTransferC as PageTransfer,
-     GenericComm as Comm,
      NetProgC,
      RandomLFSR,
--- 51,54 ----
***************
*** 57,60 ****
--- 56,65 ----
      TimerC;
  
+ #ifdef DELUGE_GENERIC_COMM_PROMISCUOUS
+   components GenericCommPromiscuous as Comm;
+ #else
+   components GenericComm as Comm;
+ #endif
+ 
  #ifdef DELUGE_LEDS
    components LedsC as Leds;

Index: NetProgC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/Deluge/NetProgC.nc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** NetProgC.nc	22 Jul 2005 17:40:08 -0000	1.11
--- NetProgC.nc	3 Aug 2005 17:13:24 -0000	1.12
***************
*** 46,54 ****
      DelugeMetadataC as Metadata,
      DelugeStorageC as Storage,
-     GenericComm as Comm,
      Main,
      NetProgM,
      SharedMsgBufM;
  
  #ifndef PLATFORM_PC
    components InternalFlashC as IFlash;
--- 46,59 ----
      DelugeMetadataC as Metadata,
      DelugeStorageC as Storage,
      Main,
      NetProgM,
      SharedMsgBufM;
  
+ #ifdef DELUGE_GENERIC_COMM_PROMISCUOUS
+   components GenericCommPromiscuous as Comm;
+ #else
+   components GenericComm as Comm;
+ #endif
+ 
  #ifndef PLATFORM_PC
    components InternalFlashC as IFlash;