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

[jblum]

Author: jblum
Date: 2009-04-24 16:13:01 -0600 (Fri, 24 Apr 2009)
New Revision: 10906

Modified:
   gnuradio/branches/developers/jblum/digital/benchmark_loopback.py
   gnuradio/branches/developers/jblum/digital/benchmark_rx.py
   gnuradio/branches/developers/jblum/digital/benchmark_tx.py
   gnuradio/branches/developers/jblum/digital/transmit_path.py
   gnuradio/branches/developers/jblum/digital/tunnel.py
Log:
Updated copy write dates.
Removed fast usb options from top level scripts that call bottom level scripts 
that use the generic usrp since the generic usrp also has the fast usb options 
which is a more sensible place to put them.



Modified: gnuradio/branches/developers/jblum/digital/benchmark_loopback.py
===================================================================
--- gnuradio/branches/developers/jblum/digital/benchmark_loopback.py    
2009-04-24 21:45:28 UTC (rev 10905)
+++ gnuradio/branches/developers/jblum/digital/benchmark_loopback.py    
2009-04-24 22:13:01 UTC (rev 10906)
@@ -30,7 +30,6 @@
 # from current dir
 from transmit_path_lb import transmit_path
 from receive_path_lb import receive_path
-import fusb_options
 
 class my_top_block(gr.top_block):
     def __init__(self, mod_class, demod_class, rx_callback, options):

Modified: gnuradio/branches/developers/jblum/digital/benchmark_rx.py
===================================================================
--- gnuradio/branches/developers/jblum/digital/benchmark_rx.py  2009-04-24 
21:45:28 UTC (rev 10905)
+++ gnuradio/branches/developers/jblum/digital/benchmark_rx.py  2009-04-24 
22:13:01 UTC (rev 10906)
@@ -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
 # 
@@ -83,7 +83,6 @@
     for mod in demods.values():
         mod.add_options(expert_grp)
 
-    fusb_options.add_options(expert_grp)
     (options, args) = parser.parse_args ()
 
     if len(args) != 0:

Modified: gnuradio/branches/developers/jblum/digital/benchmark_tx.py
===================================================================
--- gnuradio/branches/developers/jblum/digital/benchmark_tx.py  2009-04-24 
21:45:28 UTC (rev 10905)
+++ gnuradio/branches/developers/jblum/digital/benchmark_tx.py  2009-04-24 
22:13:01 UTC (rev 10906)
@@ -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
 # 
@@ -30,7 +30,6 @@
 
 # from current dir
 from transmit_path import transmit_path
-import fusb_options
 
 #import os 
 #print os.getpid()
@@ -78,7 +77,6 @@
     for mod in mods.values():
         mod.add_options(expert_grp)
 
-    fusb_options.add_options(expert_grp)
     (options, args) = parser.parse_args ()
 
     if len(args) != 0:

Modified: gnuradio/branches/developers/jblum/digital/transmit_path.py
===================================================================
--- gnuradio/branches/developers/jblum/digital/transmit_path.py 2009-04-24 
21:45:28 UTC (rev 10905)
+++ gnuradio/branches/developers/jblum/digital/transmit_path.py 2009-04-24 
22:13:01 UTC (rev 10906)
@@ -1,5 +1,5 @@
 #
-# Copyright 2005,2006,2007 Free Software Foundation, Inc.
+# Copyright 2005,2006,2007,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 

Modified: gnuradio/branches/developers/jblum/digital/tunnel.py
===================================================================
--- gnuradio/branches/developers/jblum/digital/tunnel.py        2009-04-24 
21:45:28 UTC (rev 10905)
+++ gnuradio/branches/developers/jblum/digital/tunnel.py        2009-04-24 
22:13:01 UTC (rev 10906)
@@ -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
 # 
@@ -48,7 +48,6 @@
 # from current dir
 from transmit_path import transmit_path
 from receive_path import receive_path
-import fusb_options
 
 #print os.getpid()
 #raw_input('Attach and press enter')
@@ -202,8 +201,6 @@
     for demod in demods.values():
         demod.add_options(expert_grp)
 
-    fusb_options.add_options(expert_grp)
-
     (options, args) = parser.parse_args ()
     if len(args) != 0:
         parser.print_help(sys.stderr)