aboutsummaryrefslogtreecommitdiffstats
path: root/mpm
diff options
context:
space:
mode:
Diffstat (limited to 'mpm')
-rw-r--r--mpm/python/usrp_mpm/CMakeLists.txt2
-rw-r--r--mpm/python/usrp_mpm/__init__.py2
-rw-r--r--mpm/python/usrp_mpm/mpmtypes.py (renamed from mpm/python/usrp_mpm/types.py)0
-rw-r--r--mpm/python/usrp_mpm/periph_manager/__init__.py.in2
-rw-r--r--mpm/python/usrp_mpm/periph_manager/n310.py2
5 files changed, 4 insertions, 4 deletions
diff --git a/mpm/python/usrp_mpm/CMakeLists.txt b/mpm/python/usrp_mpm/CMakeLists.txt
index 44c70619f..e9e95555c 100644
--- a/mpm/python/usrp_mpm/CMakeLists.txt
+++ b/mpm/python/usrp_mpm/CMakeLists.txt
@@ -26,7 +26,7 @@ SET(USRP_MPM_TOP_FILES
${CMAKE_CURRENT_SOURCE_DIR}/nijesdcore.py
${CMAKE_CURRENT_SOURCE_DIR}/rpc_server.py
${CMAKE_CURRENT_SOURCE_DIR}/sysfs_gpio.py
- ${CMAKE_CURRENT_SOURCE_DIR}/types.py
+ ${CMAKE_CURRENT_SOURCE_DIR}/mpmtypes.py
${CMAKE_CURRENT_SOURCE_DIR}/uio.py
)
LIST(APPEND USRP_MPM_FILES ${USRP_MPM_TOP_FILES})
diff --git a/mpm/python/usrp_mpm/__init__.py b/mpm/python/usrp_mpm/__init__.py
index b91896542..29e0b1a09 100644
--- a/mpm/python/usrp_mpm/__init__.py
+++ b/mpm/python/usrp_mpm/__init__.py
@@ -20,7 +20,7 @@ MPM Module
from .discovery import spawn_discovery_process
from .rpc_server import spawn_rpc_process
-from . import types
+from . import mpmtypes
from . import periph_manager
from . import dboard_manager
from .mpmlog import get_main_logger
diff --git a/mpm/python/usrp_mpm/types.py b/mpm/python/usrp_mpm/mpmtypes.py
index 1fbddb934..1fbddb934 100644
--- a/mpm/python/usrp_mpm/types.py
+++ b/mpm/python/usrp_mpm/mpmtypes.py
diff --git a/mpm/python/usrp_mpm/periph_manager/__init__.py.in b/mpm/python/usrp_mpm/periph_manager/__init__.py.in
index c2dd7927c..34d29137a 100644
--- a/mpm/python/usrp_mpm/periph_manager/__init__.py.in
+++ b/mpm/python/usrp_mpm/periph_manager/__init__.py.in
@@ -21,6 +21,6 @@ periph_manager __init__.py
# This is where the import magic happens
from .. import libpyusrp_periphs as lib
from .. import dboard_manager
-from .. import types
+from .. import mpmtypes
from .${MPM_DEVICE} import ${MPM_DEVICE} as periph_manager
diff --git a/mpm/python/usrp_mpm/periph_manager/n310.py b/mpm/python/usrp_mpm/periph_manager/n310.py
index 56dba2ca8..8cc33cc9c 100644
--- a/mpm/python/usrp_mpm/periph_manager/n310.py
+++ b/mpm/python/usrp_mpm/periph_manager/n310.py
@@ -25,7 +25,7 @@ from .base import PeriphManagerBase
from .net import get_iface_addrs
from .net import byte_to_mac
from .net import get_mac_addr
-from ..types import SID
+from ..mpmtypes import SID
from ..uio import UIO
from ..sysfs_gpio import SysFSGPIO
from .. import libpyusrp_periphs as lib