Cleanup on gnuradio-examples restructuring.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6287 221aa14e-8319-0410-a670-987f0aec2ac5

4 files changed, 1 insertions, 171 deletions

diff --git a/gr-utils/src/python/Makefile.am b/gr-utils/src/python/Makefile.am
index cb8e9811c..231153636 100644
--- a/gr-utils/src/python/Makefile.am
+++ b/gr-utils/src/python/Makefile.am
@@ -23,7 +23,6 @@ EXTRA_DIST = \
     $(bin_SCRIPTS)
 
 bin_SCRIPTS = \
-    usrp_benchmark_usb.py \
     usrp_fft.py \
     usrp_oscope.py \
     usrp_print_db.py \
@@ -31,5 +30,4 @@ bin_SCRIPTS = \
     usrp_rx_nogui.py \
     usrp_siggen.py \
     usrp_test_counting.py \
-    usrp_test_loop.py \
-    usrp_test_loop_lfsr.py
+    usrp_test_loopback.py
diff --git a/gr-utils/src/python/usrp_benchmark_usb.py b/gr-utils/src/python/usrp_benchmark_usb.py
deleted file mode 100755
index fc01514a1..000000000
--- a/gr-utils/src/python/usrp_benchmark_usb.py
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2004,2005 Free Software Foundation, Inc.
-# 
-# This file is part of GNU Radio
-# 
-# GNU Radio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-# 
-# GNU Radio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-"""
-Benchmark the USB/USRP throughput.  Finds the maximum full-duplex speed
-the USRP/USB combination can sustain without errors.
-
-This program does not currently give reliable results.  Sorry about that...
-"""
-
-from gnuradio import gr
-from gnuradio import usrp
-from gnuradio import eng_notation
-
-import sys
-
-def run_test (usb_throughput, verbose):
-    # usb_throughput is in bytes/sec.
-    #
-    # Returns True or False
-    
-    nsec = 1
-    stream_length = int (usb_throughput/2 * nsec)   # length of stream to examine
-
-    adc_freq =  64e6
-    dac_freq = 128e6
-    sizeof_sample = 2 * gr.sizeof_short
-
-    usb_throughput_in_samples = usb_throughput / sizeof_sample
-
-    # allocate usb throughput 50/50 between Tx and Rx
-
-    tx_interp = int (dac_freq) / int (usb_throughput_in_samples / 2)
-    rx_decim  = int (adc_freq) / int (usb_throughput_in_samples / 2)
-
-    # print "tx_interp =", tx_interp, "rx_decim =", rx_decim
-    assert (tx_interp == 2 * rx_decim)
-    
-    fg = gr.flow_graph ()
-
-    # Build the Tx pipeline
-    data_src = gr.lfsr_32k_source_s ()
-    src_head = gr.head (gr.sizeof_short, int (stream_length * 2))
-    usrp_tx = usrp.sink_s (0, tx_interp)
-    fg.connect (data_src, src_head, usrp_tx)
-
-    # and the Rx pipeline
-    usrp_rx = usrp.source_s (0, rx_decim, 1, 0x32103210, usrp.FPGA_MODE_LOOPBACK)
-    head = gr.head (gr.sizeof_short, stream_length)
-    check = gr.check_lfsr_32k_s ()
-    fg.connect (usrp_rx, head, check)
-
-    fg.run ()
-
-    ntotal = check.ntotal ()
-    nright = check.nright ()
-    runlength = check.runlength ()
-
-    if verbose:
-        print "usb_throughput =", eng_notation.num_to_str (usb_throughput)
-        print "ntotal    =", ntotal
-        print "nright    =", nright
-        print "runlength =", runlength
-        print "delta     =", ntotal - runlength
-
-    return runlength >= stream_length - 80000
-    
-def main ():
-    verbose = True
-    best_rate = 0
-    usb_rate = [ 2e6, 4e6, 8e6, 16e6, 32e6 ]
-    #usb_rate = [ 32e6, 32e6, 32e6, 32e6, 32e6 ]
-    # usb_rate.reverse ()
-    for rate in usb_rate:
-        sys.stdout.write ("Testing %sB/sec... " % (eng_notation.num_to_str (rate)))
-        sys.stdout.flush ()
-        ok = run_test (rate, verbose)
-        if ok:
-            best_rate = max (best_rate, rate)
-            sys.stdout.write ("OK\n")
-        else:
-            sys.stdout.write ("FAILED\n")
-
-    print "Max USB/USRP throughput = %sB/sec" % (eng_notation.num_to_str (best_rate),)
-
-if __name__ == '__main__':
-    main ()
diff --git a/gr-utils/src/python/usrp_test_loop_lfsr.py b/gr-utils/src/python/usrp_test_loop_lfsr.py
deleted file mode 100755
index 446ca30a1..000000000
--- a/gr-utils/src/python/usrp_test_loop_lfsr.py
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2004 Free Software Foundation, Inc.
-# 
-# This file is part of GNU Radio
-# 
-# GNU Radio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-# 
-# GNU Radio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-"""
-Digital loopback (Tx to Rx) for the USRP Rev1.
-"""
-
-from gnuradio import gr
-from gnuradio import usrp
-
-
-def build_graph ():
-    tx_interp =  32       # tx should be twice rx
-    rx_decim  =  16
-    
-    fg = gr.flow_graph ()
-
-    data_src = gr.lfsr_32k_source_s ()
-
-    # usrp_tx = usrp.sink_s (0, tx_interp, 1, 0x98)
-    usrp_tx = usrp.sink_s (0, tx_interp)
-
-    fg.connect (data_src, usrp_tx)
-
-    usrp_rx = usrp.source_s (0, rx_decim, 1, 0x32103210, usrp.FPGA_MODE_LOOPBACK)
-
-    sink = gr.check_lfsr_32k_s ()
-    fg.connect (usrp_rx, sink)
-
-    # file_sink = gr.file_sink (gr.sizeof_short, "loopback.dat")
-    # fg.connect (usrp_rx, file_sink)
-    
-    return fg
-    
-def main ():
-    fg = build_graph ()
-    try:
-        fg.run()
-    except KeyboardInterrupt:
-        pass
-
-if __name__ == '__main__':
-    main ()
diff --git a/gr-utils/src/python/usrp_test_loop.py b/gr-utils/src/python/usrp_test_loopback.py
index 51a705a05..51a705a05 100755
--- a/gr-utils/src/python/usrp_test_loop.py
+++ b/gr-utils/src/python/usrp_test_loopback.py