From 224434889bf564a4456011180c62a58e0ca55c8f Mon Sep 17 00:00:00 2001
From: eb <eb@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Wed, 7 Mar 2007 01:43:43 +0000
Subject: Merged eb/usrp-install r4723:4727 into trunk. This moves usrp related
.py files from the top-level of site-packages into site-packages/usrpm.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4728 221aa14e-8319-0410-a670-987f0aec2ac5
---
gr-usrp/src/db_base.py | 4 ++--
gr-usrp/src/db_basic.py | 2 +-
gr-usrp/src/db_dbs_rx.py | 2 +-
gr-usrp/src/db_flexrf.py | 4 ++--
gr-usrp/src/db_flexrf_mimo.py | 4 ++--
gr-usrp/src/db_tv_rx.py | 2 +-
gr-usrp/src/usrp.py | 6 +++---
gr-usrp/src/usrp_multi.py | 2 +-
8 files changed, 13 insertions(+), 13 deletions(-)
(limited to 'gr-usrp/src')
diff --git a/gr-usrp/src/db_base.py b/gr-usrp/src/db_base.py
index 0f34cd0acf..589af75466 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 1d936f2f59..7d65ac1833 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 59c9a98977..5541df8c74 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 5d8f4d8819..271b14728b 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 e961e09021..7fed805f64 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 026f3e11a8..9fed8c52ce 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 90fb9695dd..78e6c10182 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 6bda538fa1..65c6c0b87c 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
--
cgit v1.2.3