diff options
| author | RobertWalstab <robert.walstab@gmail.com> | 2020-06-22 15:02:11 +0200 | 
|---|---|---|
| committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2020-07-16 10:00:12 -0500 | 
| commit | 692249f2d2d17ee41d7fa207fe938020c01b68cb (patch) | |
| tree | 0553a535d172f3af2488a28ae7a5e74a49ae5d1a /mpm/python/usrp_mpm/periph_manager | |
| parent | 3f823004600472c7f4b173a0da83a3bd53968c40 (diff) | |
| download | uhd-692249f2d2d17ee41d7fa207fe938020c01b68cb.tar.gz uhd-692249f2d2d17ee41d7fa207fe938020c01b68cb.tar.bz2 uhd-692249f2d2d17ee41d7fa207fe938020c01b68cb.zip | |
mpm: remove class E310XportMgrLiberio
Diffstat (limited to 'mpm/python/usrp_mpm/periph_manager')
| -rw-r--r-- | mpm/python/usrp_mpm/periph_manager/e31x.py | 15 | 
1 files changed, 4 insertions, 11 deletions
| diff --git a/mpm/python/usrp_mpm/periph_manager/e31x.py b/mpm/python/usrp_mpm/periph_manager/e31x.py index 62d3ebd1a..8043fc704 100644 --- a/mpm/python/usrp_mpm/periph_manager/e31x.py +++ b/mpm/python/usrp_mpm/periph_manager/e31x.py @@ -22,7 +22,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_sysfs_sensors_value  from usrp_mpm.sys_utils.udev import get_spidev_nodes -from usrp_mpm.xports import XportMgrLiberio, XportMgrUDP +from usrp_mpm.xports import XportMgrUDP  from usrp_mpm.periph_manager.e31x_periphs import MboardRegsControl  from usrp_mpm.sys_utils.udev import get_eeprom_paths  from usrp_mpm import e31x_legacy_eeprom @@ -57,8 +57,7 @@ class E310XportMgrUDP(XportMgrUDP):          }      } -class E310XportMgrLiberio(XportMgrLiberio): -    " E310-specific Liberio configuration " +  # pylint: enable=too-few-public-methods  ############################################################################### @@ -331,8 +330,7 @@ class e31x(ZynqComponents, PeriphManagerBase):          self._init_ref_clock_and_time(args)          # Init CHDR transports          self._xport_mgrs = { -            'udp': E310XportMgrUDP(self.log, args), -            'liberio': E310XportMgrLiberio(self.log.getChild('liberio')), +            'udp': E310XportMgrUDP(self.log, args)          }          # Init complete.          self.log.debug("mboard info: {}".format(self.mboard_info)) @@ -516,12 +514,7 @@ class e31x(ZynqComponents, PeriphManagerBase):          See PeriphManagerBase.get_chdr_link_types() for docs.          """          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):          """ | 
