diff options
author | Steven Koo <steven.koo@ni.com> | 2020-07-25 13:09:53 -0500 |
---|---|---|
committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2020-07-30 11:39:00 -0500 |
commit | 25a0e462ddc8ca737415dbae4feb90787e6a35b2 (patch) | |
tree | 2f4f7c57e57299e02a7e0f94e4ddb6ca1a6be6ee /mpm/python/usrp_mpm/periph_manager | |
parent | 80b79df60380990744f59137d313b1dd1db9ca92 (diff) | |
download | uhd-25a0e462ddc8ca737415dbae4feb90787e6a35b2.tar.gz uhd-25a0e462ddc8ca737415dbae4feb90787e6a35b2.tar.bz2 uhd-25a0e462ddc8ca737415dbae4feb90787e6a35b2.zip |
mpm: Default virtual NIC CHDR IP selection
This change adds detection for setting the correct internal
fpga CHDR IP address when using embedded mode.
Diffstat (limited to 'mpm/python/usrp_mpm/periph_manager')
-rw-r--r-- | mpm/python/usrp_mpm/periph_manager/e31x.py | 6 | ||||
-rw-r--r-- | mpm/python/usrp_mpm/periph_manager/e320.py | 6 | ||||
-rw-r--r-- | mpm/python/usrp_mpm/periph_manager/n3xx.py | 6 |
3 files changed, 15 insertions, 3 deletions
diff --git a/mpm/python/usrp_mpm/periph_manager/e31x.py b/mpm/python/usrp_mpm/periph_manager/e31x.py index 11f65dd17..025f8b222 100644 --- a/mpm/python/usrp_mpm/periph_manager/e31x.py +++ b/mpm/python/usrp_mpm/periph_manager/e31x.py @@ -524,7 +524,11 @@ class e31x(ZynqComponents, PeriphManagerBase): self.log.warning("Can't get link options for unknown link type: `{}'." .format(xport_type)) return [] - return self._xport_mgrs[xport_type].get_chdr_link_options() + if xport_type == "udp": + return self._xport_mgrs[xport_type].get_chdr_link_options( + self.mboard_info['rpc_connection']) + else: + return self._xport_mgrs[xport_type].get_chdr_link_options() ########################################################################### # Device info diff --git a/mpm/python/usrp_mpm/periph_manager/e320.py b/mpm/python/usrp_mpm/periph_manager/e320.py index 770b449b5..f8b17df7f 100644 --- a/mpm/python/usrp_mpm/periph_manager/e320.py +++ b/mpm/python/usrp_mpm/periph_manager/e320.py @@ -399,7 +399,11 @@ class e320(ZynqComponents, PeriphManagerBase): self.log.warning("Can't get link options for unknown link type: `{}'." .format(xport_type)) return [] - return self._xport_mgrs[xport_type].get_chdr_link_options() + if xport_type == "udp": + return self._xport_mgrs[xport_type].get_chdr_link_options( + self.mboard_info['rpc_connection']) + else: + return self._xport_mgrs[xport_type].get_chdr_link_options() ########################################################################### # Device info diff --git a/mpm/python/usrp_mpm/periph_manager/n3xx.py b/mpm/python/usrp_mpm/periph_manager/n3xx.py index 7a9f61df7..4e9406c81 100644 --- a/mpm/python/usrp_mpm/periph_manager/n3xx.py +++ b/mpm/python/usrp_mpm/periph_manager/n3xx.py @@ -519,7 +519,11 @@ class n3xx(ZynqComponents, PeriphManagerBase): if xport_type not in self._xport_mgrs: self.log.warning("Can't get link options for unknown link type: `{}'.".format(xport_type)) return [] - return self._xport_mgrs[xport_type].get_chdr_link_options() + if xport_type == "udp": + return self._xport_mgrs[xport_type].get_chdr_link_options( + self.mboard_info['rpc_connection']) + else: + return self._xport_mgrs[xport_type].get_chdr_link_options() ########################################################################### # Device info |