[Commit-gnuradio] r10927 - gnuradio/branches/developers/jblum/digital

[jblum]

Author: jblum
Date: 2009-04-27 16:49:07 -0600 (Mon, 27 Apr 2009)
New Revision: 10927

Removed:
   gnuradio/branches/developers/jblum/digital/fusb_options.py
Modified:
   gnuradio/branches/developers/jblum/digital/Makefile.am
   gnuradio/branches/developers/jblum/digital/benchmark_rx.py
   gnuradio/branches/developers/jblum/digital/rx_voice.py
   gnuradio/branches/developers/jblum/digital/tx_voice.py
Log:
Removed fusb options and all references to fusb options.
Fast USB options are added in the generic usrp classes which are used by all 
top level python scripts in this directory via transmit and receive path.



Modified: gnuradio/branches/developers/jblum/digital/Makefile.am
===================================================================
--- gnuradio/branches/developers/jblum/digital/Makefile.am      2009-04-27 
22:13:33 UTC (rev 10926)
+++ gnuradio/branches/developers/jblum/digital/Makefile.am      2009-04-27 
22:49:07 UTC (rev 10927)
@@ -30,7 +30,6 @@
        benchmark_loopback.py   \
        benchmark_rx.py         \
        benchmark_tx.py         \
-       fusb_options.py         \
        gen_whitener.py         \
        pick_bitrate.py         \
        receive_path.py         \

Modified: gnuradio/branches/developers/jblum/digital/benchmark_rx.py
===================================================================
--- gnuradio/branches/developers/jblum/digital/benchmark_rx.py  2009-04-27 
22:13:33 UTC (rev 10926)
+++ gnuradio/branches/developers/jblum/digital/benchmark_rx.py  2009-04-27 
22:49:07 UTC (rev 10927)
@@ -32,7 +32,6 @@
 
 # from current dir
 from receive_path import receive_path
-import fusb_options
 
 #import os
 #print os.getpid()

Modified: gnuradio/branches/developers/jblum/digital/rx_voice.py
===================================================================
--- gnuradio/branches/developers/jblum/digital/rx_voice.py      2009-04-27 
22:13:33 UTC (rev 10926)
+++ gnuradio/branches/developers/jblum/digital/rx_voice.py      2009-04-27 
22:49:07 UTC (rev 10927)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2005,2006 Free Software Foundation, Inc.
+# Copyright 2005,2006,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -35,7 +35,6 @@
 
 # from current dir
 from receive_path import receive_path
-import fusb_options
 
 #import os
 #print os.getpid()
@@ -108,8 +107,6 @@
     for mod in demods.values():
         mod.add_options(expert_grp)
 
-    fusb_options.add_options(expert_grp)
-
     parser.set_defaults(bitrate=50e3)  # override default bitrate default
     (options, args) = parser.parse_args ()
 

Modified: gnuradio/branches/developers/jblum/digital/tx_voice.py
===================================================================
--- gnuradio/branches/developers/jblum/digital/tx_voice.py      2009-04-27 
22:13:33 UTC (rev 10926)
+++ gnuradio/branches/developers/jblum/digital/tx_voice.py      2009-04-27 
22:49:07 UTC (rev 10927)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2005,2006,2007 Free Software Foundation, Inc.
+# Copyright 2005,2006,2007,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -36,7 +36,6 @@
 
 # from current dir
 from transmit_path import transmit_path
-import fusb_options
 
 #import os
 #print os.getpid()
@@ -102,8 +101,6 @@
     for mod in mods.values():
         mod.add_options(expert_grp)
 
-    fusb_options.add_options(expert_grp)
-
     parser.set_defaults(bitrate=50e3)  # override default bitrate default
     (options, args) = parser.parse_args ()
 
@@ -149,4 +146,4 @@
     try:
         main()
     except KeyboardInterrupt:
-       pass
\ No newline at end of file
+       pass