aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2017-05-05 14:59:35 -0700
committerMartin Braun <martin.braun@ettus.com>2017-12-22 15:03:53 -0800
commit2270a6b1a670bfa8387004bafdfcf2e74fc90477 (patch)
treec273eb6d534faa4baf8852cf8f755cdccce85f44
parentb5b1ef2de2d554f16f67e254335265186fb642fa (diff)
downloaduhd-2270a6b1a670bfa8387004bafdfcf2e74fc90477.tar.gz
uhd-2270a6b1a670bfa8387004bafdfcf2e74fc90477.tar.bz2
uhd-2270a6b1a670bfa8387004bafdfcf2e74fc90477.zip
mpm: Fixed python import in discovery module
-rwxr-xr-xmpm/python/usrp_hwd.py4
-rw-r--r--mpm/python/usrp_mpm/discovery.py2
-rw-r--r--mpm/python/usrp_mpm/periph_manager/base.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/mpm/python/usrp_hwd.py b/mpm/python/usrp_hwd.py
index ca46baec7..a6b242415 100755
--- a/mpm/python/usrp_hwd.py
+++ b/mpm/python/usrp_hwd.py
@@ -22,7 +22,7 @@ from __future__ import print_function
import sys
from gevent import signal
import usrp_mpm as mpm
-from usrp_mpm.types import SharedState
+from usrp_mpm.mpmtypes import SharedState
from usrp_mpm.periph_manager import periph_manager
_PROCESSES = []
@@ -69,7 +69,7 @@ def main():
mpm.spawn_discovery_process(discovery_info, shared))
log.info("Spawning RPC process...")
_PROCESSES.append(
- mpm.spawn_rpc_process(mpm.types.MPM_RPC_PORT, shared, mgr))
+ mpm.spawn_rpc_process(mpm.mpmtypes.MPM_RPC_PORT, shared, mgr))
log.info("Processes launched. Registering signal handlers.")
signal.signal(signal.SIGTERM, kill_time)
signal.signal(signal.SIGINT, kill_time)
diff --git a/mpm/python/usrp_mpm/discovery.py b/mpm/python/usrp_mpm/discovery.py
index a8044d49e..ab35f8d33 100644
--- a/mpm/python/usrp_mpm/discovery.py
+++ b/mpm/python/usrp_mpm/discovery.py
@@ -22,7 +22,7 @@ from __future__ import print_function
from multiprocessing import Process
import socket
from six import iteritems
-from usrp_mpm.types import MPM_DISCOVERY_PORT
+from usrp_mpm.mpmtypes import MPM_DISCOVERY_PORT
from .mpmlog import get_main_logger
RESPONSE_PREAMBLE = "USRP-MPM"
diff --git a/mpm/python/usrp_mpm/periph_manager/base.py b/mpm/python/usrp_mpm/periph_manager/base.py
index ea2a145a8..8d2d5773a 100644
--- a/mpm/python/usrp_mpm/periph_manager/base.py
+++ b/mpm/python/usrp_mpm/periph_manager/base.py
@@ -21,7 +21,7 @@ Mboard implementation base class
import os
from six import iteritems
from ..mpmlog import get_logger
-from ..types import EEPROM
+from ..mpmtypes import EEPROM
from .. import dboard_manager
from .udev import get_eeprom_path
from .udev import get_spidev_nodes