diff options
30 files changed, 46 insertions, 40 deletions
diff --git a/Makefile.common b/Makefile.common index fe026b227..35ff20395 100644 --- a/Makefile.common +++ b/Makefile.common @@ -28,13 +28,21 @@ grincludedir = $(includedir)/gnuradio # swig includes swigincludedir = $(grincludedir)/swig -# Install this stuff in the appropriate subdirectory +# Install the gnuradio stuff in the appropriate subdirectory # This usually ends up at: # ${prefix}/lib/python${python_version}/site-packages/gnuradio grpythondir = $(pythondir)/gnuradio grpyexecdir = $(pyexecdir)/gnuradio +# Install the non-gnuradio usrp stuff in the appropriate subdirectory +# This usually ends up at: +# ${prefix}/lib/python${python_version}/site-packages/usrpm + +usrppythondir = $(pythondir)/usrpm +usrppyexecdir = $(pyexecdir)/usrpm + + # swig flags SWIGPYTHONFLAGS = -fvirtual -python -modern diff --git a/gnuradio-examples/python/apps/hf_radio/input.py b/gnuradio-examples/python/apps/hf_radio/input.py index 3a62a68cc..a7c871287 100644 --- a/gnuradio-examples/python/apps/hf_radio/input.py +++ b/gnuradio-examples/python/apps/hf_radio/input.py @@ -7,7 +7,7 @@ from gnuradio import gr, gru, optfir from gnuradio import usrp -import usrp_dbid +from usrpm import usrp_dbid import math # Put special knowlege of usrp here. diff --git a/gnuradio-examples/python/multi-antenna/multi_fft.py b/gnuradio-examples/python/multi-antenna/multi_fft.py index ca9c614a8..3a8d48195 100755 --- a/gnuradio-examples/python/multi-antenna/multi_fft.py +++ b/gnuradio-examples/python/multi-antenna/multi_fft.py @@ -8,7 +8,7 @@ from gnuradio import optfir from optparse import OptionParser from gnuradio.wxgui import stdgui, fftsink, waterfallsink, scopesink, form, slider import wx -import usrp_dbid +from usrpm import usrp_dbid import time import os.path import sys diff --git a/gnuradio-examples/python/multi-antenna/multi_file.py b/gnuradio-examples/python/multi-antenna/multi_file.py index e2a6e04f6..d5a5d8721 100755 --- a/gnuradio-examples/python/multi-antenna/multi_file.py +++ b/gnuradio-examples/python/multi-antenna/multi_file.py @@ -8,7 +8,7 @@ from gnuradio import optfir from optparse import OptionParser from gnuradio.wxgui import stdgui, fftsink, waterfallsink, scopesink, form, slider import wx -import usrp_dbid +from usrpm import usrp_dbid import time import os.path import sys diff --git a/gnuradio-examples/python/multi-antenna/multi_scope.py b/gnuradio-examples/python/multi-antenna/multi_scope.py index 43aa77b0d..b35e91651 100755 --- a/gnuradio-examples/python/multi-antenna/multi_scope.py +++ b/gnuradio-examples/python/multi-antenna/multi_scope.py @@ -8,7 +8,7 @@ from gnuradio import optfir from optparse import OptionParser from gnuradio.wxgui import stdgui, fftsink, waterfallsink, scopesink, form, slider import wx -import usrp_dbid +from usrpm import usrp_dbid import time import os.path import sys diff --git a/gnuradio-examples/python/usrp/fm_tx4.py b/gnuradio-examples/python/usrp/fm_tx4.py index a9201b3f4..da887d8bf 100755 --- a/gnuradio-examples/python/usrp/fm_tx4.py +++ b/gnuradio-examples/python/usrp/fm_tx4.py @@ -18,7 +18,7 @@ from gnuradio import audio from gnuradio import blks from gnuradio.eng_option import eng_option from optparse import OptionParser -import usrp_dbid +from usrpm import usrp_dbid import math import sys diff --git a/gnuradio-examples/python/usrp/fm_tx_2_daughterboards.py b/gnuradio-examples/python/usrp/fm_tx_2_daughterboards.py index 1cb161018..66ee9f02d 100755 --- a/gnuradio-examples/python/usrp/fm_tx_2_daughterboards.py +++ b/gnuradio-examples/python/usrp/fm_tx_2_daughterboards.py @@ -17,7 +17,7 @@ from gnuradio import audio from gnuradio import blks from gnuradio.eng_option import eng_option from optparse import OptionParser -import usrp_dbid +from usrpm import usrp_dbid import math import sys diff --git a/gnuradio-examples/python/usrp/usrp_nbfm_ptt.py b/gnuradio-examples/python/usrp/usrp_nbfm_ptt.py index 9415cfab9..798c4a7eb 100755 --- a/gnuradio-examples/python/usrp/usrp_nbfm_ptt.py +++ b/gnuradio-examples/python/usrp/usrp_nbfm_ptt.py @@ -31,7 +31,7 @@ from gnuradio import audio from gnuradio import blks from gnuradio.eng_option import eng_option from gnuradio.wxgui import stdgui, fftsink, scopesink, slider, form -import usrp_dbid +from usrpm import usrp_dbid from Numeric import convolve, array diff --git a/gnuradio-examples/python/usrp/usrp_nbfm_rcv.py b/gnuradio-examples/python/usrp/usrp_nbfm_rcv.py index 018a5b76e..868dee5cc 100755 --- a/gnuradio-examples/python/usrp/usrp_nbfm_rcv.py +++ b/gnuradio-examples/python/usrp/usrp_nbfm_rcv.py @@ -8,7 +8,7 @@ from gnuradio.eng_option import eng_option from gnuradio.wxgui import slider, powermate from gnuradio.wxgui import stdgui, fftsink, form from optparse import OptionParser -import usrp_dbid +from usrpm import usrp_dbid import sys import math import wx diff --git a/gnuradio-examples/python/usrp/usrp_spectrum_sense.py b/gnuradio-examples/python/usrp/usrp_spectrum_sense.py index 182d055a6..1d86e03cc 100755 --- a/gnuradio-examples/python/usrp/usrp_spectrum_sense.py +++ b/gnuradio-examples/python/usrp/usrp_spectrum_sense.py @@ -6,7 +6,7 @@ from gnuradio import usrp from gnuradio import blks from gnuradio.eng_option import eng_option from optparse import OptionParser -import usrp_dbid +from usrpm import usrp_dbid import sys import math import struct diff --git a/gnuradio-examples/python/usrp/usrp_tv_rcv.py b/gnuradio-examples/python/usrp/usrp_tv_rcv.py index e8e439b80..8fabc2b47 100755 --- a/gnuradio-examples/python/usrp/usrp_tv_rcv.py +++ b/gnuradio-examples/python/usrp/usrp_tv_rcv.py @@ -21,7 +21,7 @@ from gnuradio.eng_option import eng_option from gnuradio.wxgui import slider, powermate from gnuradio.wxgui import stdgui, fftsink, form from optparse import OptionParser -import usrp_dbid +from usrpm import usrp_dbid import sys import math import wx diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv.py b/gnuradio-examples/python/usrp/usrp_wfm_rcv.py index 284438731..9ffb41fb0 100755 --- a/gnuradio-examples/python/usrp/usrp_wfm_rcv.py +++ b/gnuradio-examples/python/usrp/usrp_wfm_rcv.py @@ -8,7 +8,7 @@ from gnuradio.eng_option import eng_option from gnuradio.wxgui import slider, powermate from gnuradio.wxgui import stdgui, fftsink, form from optparse import OptionParser -import usrp_dbid +from usrpm import usrp_dbid import sys import math import wx diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py b/gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py index 40e7dd754..efb0448fa 100755 --- a/gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py +++ b/gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py @@ -6,7 +6,7 @@ from gnuradio import usrp from gnuradio import blks from gnuradio.eng_option import eng_option from optparse import OptionParser -import usrp_dbid +from usrpm import usrp_dbid import sys import math diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv_nogui.py b/gnuradio-examples/python/usrp/usrp_wfm_rcv_nogui.py index 2e9acf4dc..9aeae1171 100755 --- a/gnuradio-examples/python/usrp/usrp_wfm_rcv_nogui.py +++ b/gnuradio-examples/python/usrp/usrp_wfm_rcv_nogui.py @@ -6,7 +6,7 @@ from gnuradio import usrp from gnuradio import blks from gnuradio.eng_option import eng_option from optparse import OptionParser -import usrp_dbid +from usrpm import usrp_dbid import sys import math diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py b/gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py index b03f0944f..1d4fb3370 100755 --- a/gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py +++ b/gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py @@ -8,7 +8,7 @@ from gnuradio.eng_option import eng_option from gnuradio.wxgui import slider, powermate from gnuradio.wxgui import stdgui, fftsink, form, scopesink from optparse import OptionParser -import usrp_dbid +from usrpm import usrp_dbid import sys import math import wx diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv_sca.py b/gnuradio-examples/python/usrp/usrp_wfm_rcv_sca.py index 640ffe872..4daa401f7 100644 --- a/gnuradio-examples/python/usrp/usrp_wfm_rcv_sca.py +++ b/gnuradio-examples/python/usrp/usrp_wfm_rcv_sca.py @@ -59,7 +59,7 @@ from gnuradio.eng_option import eng_option from gnuradio.wxgui import slider, powermate from gnuradio.wxgui import stdgui, fftsink, form from optparse import OptionParser -import usrp_dbid +from usrpm import usrp_dbid import sys import math import wx diff --git a/gnuradio-examples/python/usrp/usrp_wxapt_rcv.py b/gnuradio-examples/python/usrp/usrp_wxapt_rcv.py index dd5651967..39ad688e1 100755 --- a/gnuradio-examples/python/usrp/usrp_wxapt_rcv.py +++ b/gnuradio-examples/python/usrp/usrp_wxapt_rcv.py @@ -8,7 +8,7 @@ from gnuradio.eng_option import eng_option from gnuradio.wxgui import slider, powermate from gnuradio.wxgui import stdgui, fftsink, form from optparse import OptionParser -import usrp_dbid +from usrpm import usrp_dbid import sys import math import wx diff --git a/gr-radio-astronomy/src/python/usrp_psr_receiver.py b/gr-radio-astronomy/src/python/usrp_psr_receiver.py index 91cb2e7ef..759022cfb 100755 --- a/gr-radio-astronomy/src/python/usrp_psr_receiver.py +++ b/gr-radio-astronomy/src/python/usrp_psr_receiver.py @@ -30,7 +30,7 @@ # # from gnuradio import gr, gru, blks, audio -import usrp_dbid +from usrpm import usrp_dbid from gnuradio import usrp, optfir from gnuradio import eng_notation from gnuradio.eng_option import eng_option diff --git a/gr-radio-astronomy/src/python/usrp_ra_receiver.py b/gr-radio-astronomy/src/python/usrp_ra_receiver.py index 78c9b1e47..2ecf946cb 100755 --- a/gr-radio-astronomy/src/python/usrp_ra_receiver.py +++ b/gr-radio-astronomy/src/python/usrp_ra_receiver.py @@ -22,7 +22,7 @@ from gnuradio import gr, gru from gnuradio import usrp -import usrp_dbid +from usrpm import usrp_dbid from gnuradio import eng_notation from gnuradio.eng_option import eng_option from gnuradio.wxgui import stdgui, ra_fftsink, ra_stripchartsink, ra_waterfallsink, form, slider diff --git a/gr-usrp/src/db_base.py b/gr-usrp/src/db_base.py index 0f34cd0ac..589af7546 100644 --- a/gr-usrp/src/db_base.py +++ b/gr-usrp/src/db_base.py @@ -19,9 +19,9 @@ # Boston, MA 02110-1301, USA. # -import usrp_prims import weakref -from usrp_fpga_regs import * +from usrpm import usrp_prims +from usrpm.usrp_fpga_regs import * class db_base(object): """ diff --git a/gr-usrp/src/db_basic.py b/gr-usrp/src/db_basic.py index 1d936f2f5..7d65ac183 100644 --- a/gr-usrp/src/db_basic.py +++ b/gr-usrp/src/db_basic.py @@ -20,7 +20,7 @@ # import sys -import usrp_dbid +from usrpm import usrp_dbid import db_base import db_instantiator diff --git a/gr-usrp/src/db_dbs_rx.py b/gr-usrp/src/db_dbs_rx.py index 59c9a9897..5541df8c7 100644 --- a/gr-usrp/src/db_dbs_rx.py +++ b/gr-usrp/src/db_dbs_rx.py @@ -20,7 +20,7 @@ # import math -import usrp_dbid +from usrpm import usrp_dbid import db_base import db_instantiator diff --git a/gr-usrp/src/db_flexrf.py b/gr-usrp/src/db_flexrf.py index 5d8f4d881..271b14728 100644 --- a/gr-usrp/src/db_flexrf.py +++ b/gr-usrp/src/db_flexrf.py @@ -22,10 +22,10 @@ from gnuradio import usrp1 import time,math -import usrp_dbid +from usrpm import usrp_dbid import db_base import db_instantiator -from usrp_fpga_regs import * +from usrpm.usrp_fpga_regs import * #debug_using_gui = True # Must be set to True or False debug_using_gui = False # Must be set to True or False diff --git a/gr-usrp/src/db_flexrf_mimo.py b/gr-usrp/src/db_flexrf_mimo.py index e961e0902..7fed805f6 100644 --- a/gr-usrp/src/db_flexrf_mimo.py +++ b/gr-usrp/src/db_flexrf_mimo.py @@ -22,10 +22,10 @@ from gnuradio import usrp1 import time,math -import usrp_dbid +from usrpm import usrp_dbid import db_base import db_instantiator -from usrp_fpga_regs import * +from usrpm.usrp_fpga_regs import * from db_flexrf import * # self._u.fpga_master_clock_freq() diff --git a/gr-usrp/src/db_tv_rx.py b/gr-usrp/src/db_tv_rx.py index 026f3e11a..9fed8c52c 100644 --- a/gr-usrp/src/db_tv_rx.py +++ b/gr-usrp/src/db_tv_rx.py @@ -22,7 +22,7 @@ __all__ = ['tv_rx'] import math -import usrp_dbid +from usrpm import usrp_dbid import db_base import db_instantiator diff --git a/gr-usrp/src/usrp.py b/gr-usrp/src/usrp.py index 90fb9695d..78e6c1018 100644 --- a/gr-usrp/src/usrp.py +++ b/gr-usrp/src/usrp.py @@ -21,11 +21,11 @@ -import usrp_prims -import usrp_dbid +from usrpm import usrp_prims +from usrpm import usrp_dbid from gnuradio import usrp1 # usrp Rev 1 and later from gnuradio import gru -from usrp_fpga_regs import * +from usrpm.usrp_fpga_regs import * FPGA_MODE_NORMAL = usrp1.FPGA_MODE_NORMAL FPGA_MODE_LOOPBACK = usrp1.FPGA_MODE_LOOPBACK diff --git a/gr-usrp/src/usrp_multi.py b/gr-usrp/src/usrp_multi.py index 6bda538fa..65c6c0b87 100644 --- a/gr-usrp/src/usrp_multi.py +++ b/gr-usrp/src/usrp_multi.py @@ -25,7 +25,7 @@ from gnuradio.gr import hier_block_base from gnuradio import usrp from gnuradio import usrp1 # usrp Rev 1 and later from gnuradio import blks -import usrp_prims +from usrpm import usrp_prims import sys diff --git a/usrp/host/lib/Makefile.am b/usrp/host/lib/Makefile.am index 83f2984e7..7d17a380a 100644 --- a/usrp/host/lib/Makefile.am +++ b/usrp/host/lib/Makefile.am @@ -1,7 +1,7 @@ # # USRP - Universal Software Radio Peripheral # -# Copyright (C) 2003,2004,2006 Free Software Foundation, Inc. +# Copyright (C) 2003,2004,2006,2007 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -137,7 +137,7 @@ noinst_HEADERS = \ rate_to_regval.h \ usrp_local_sighandler.h -python_PYTHON = \ +usrppython_PYTHON = \ usrp_dbid.py noinst_PYTHON = \ diff --git a/usrp/host/swig/Makefile.am b/usrp/host/swig/Makefile.am index be3bbf2a9..8868d1ecb 100644 --- a/usrp/host/swig/Makefile.am +++ b/usrp/host/swig/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2001,2003,2004,2006 Free Software Foundation, Inc. +# Copyright 2001,2003,2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,11 +21,9 @@ include $(top_srcdir)/Makefile.common -# This usually ends up at: -# ${prefix}/lib/python${python_version}/site-packages/usrp_prims +ourpythondir = $(usrppythondir) +ourlibdir = $(usrppyexecdir) -ourpythondir = $(pythondir) -ourlibdir = $(pyexecdir) INCLUDES = $(USRP_INCLUDES) \ $(PYTHON_CPPFLAGS) \ diff --git a/usrp/host/swig/usrp_fpga_regs.py b/usrp/host/swig/usrp_fpga_regs.py index 1b8b19cad..e022518bd 100644 --- a/usrp/host/swig/usrp_fpga_regs.py +++ b/usrp/host/swig/usrp_fpga_regs.py @@ -19,7 +19,7 @@ # Boston, MA 02110-1301, USA. # -import usrp_prims +from usrpm import usrp_prims # Copy everything that starts with FR_ or bmFR_ from the usrp_prims # name space into our name space. This is effectively a python binding for |