aboutsummaryrefslogtreecommitdiffstats
path: root/mpm
diff options
context:
space:
mode:
authorRobertWalstab <robert.walstab@gmail.com>2020-06-08 15:59:30 +0200
committerAaron Rossetto <aaron.rossetto@ni.com>2020-07-16 10:00:12 -0500
commit217ec54c7a75e63476f2e574b9fc62e1458798ab (patch)
treecefb70c5f74d17188162e496ad7ee84dd4218ae3 /mpm
parent58601da0389035dbb0a109a516da214f9877c0fc (diff)
downloaduhd-217ec54c7a75e63476f2e574b9fc62e1458798ab.tar.gz
uhd-217ec54c7a75e63476f2e574b9fc62e1458798ab.tar.bz2
uhd-217ec54c7a75e63476f2e574b9fc62e1458798ab.zip
mpm: remove class E320XportMgrLiberio
Diffstat (limited to 'mpm')
-rw-r--r--mpm/python/usrp_mpm/periph_manager/e320.py17
1 files changed, 5 insertions, 12 deletions
diff --git a/mpm/python/usrp_mpm/periph_manager/e320.py b/mpm/python/usrp_mpm/periph_manager/e320.py
index 0236d5c20..2f34a8ce1 100644
--- a/mpm/python/usrp_mpm/periph_manager/e320.py
+++ b/mpm/python/usrp_mpm/periph_manager/e320.py
@@ -23,7 +23,7 @@ from usrp_mpm.rpc_server import no_rpc
from usrp_mpm.sys_utils import dtoverlay
from usrp_mpm.sys_utils.sysfs_thermal import read_thermal_sensor_value, read_thermal_sensors_value
from usrp_mpm.sys_utils.udev import get_spidev_nodes
-from usrp_mpm.xports import XportMgrUDP, XportMgrLiberio
+from usrp_mpm.xports import XportMgrUDP
from usrp_mpm.periph_manager.e320_periphs import MboardRegsControl
E320_DEFAULT_INT_CLOCK_FREQ = 20e6
@@ -62,8 +62,7 @@ class E320XportMgrUDP(XportMgrUDP):
}
}
-class E320XportMgrLiberio(XportMgrLiberio):
- "E320-specific liberio configuration"
+
# pylint: enable=too-few-public-methods
###############################################################################
@@ -291,8 +290,7 @@ class e320(ZynqComponents, PeriphManagerBase):
self._init_gps_sensors()
# Init CHDR transports
self._xport_mgrs = {
- 'udp': E320XportMgrUDP(self.log, args),
- 'liberio': E320XportMgrLiberio(self.log),
+ 'udp': E320XportMgrUDP(self.log, args)
}
# Spawn status monitoring thread
self.log.trace("Spawning status monitor thread...")
@@ -378,15 +376,10 @@ class e320(ZynqComponents, PeriphManagerBase):
###########################################################################
def get_chdr_link_types(self):
"""
- This will only ever return a single item (udp or liberio).
+ This will only ever return a single item (udp).
"""
assert self.mboard_info['rpc_connection'] in ('remote', 'local')
- if self.mboard_info['rpc_connection'] == 'remote':
- return ["udp"]
- elif self._xport_mgrs["liberio"].max_chan > 0:
- return ["liberio"]
- else:
- return ["udp"]
+ return ["udp"]
def get_chdr_link_options(self, xport_type):
"""