aboutsummaryrefslogtreecommitdiffstats
path: root/mpm
diff options
context:
space:
mode:
authorRyan Marlow <ryan.marlow@ettus.com>2018-07-25 18:20:11 -0700
committerBrent Stapleton <brent.stapleton@ettus.com>2019-01-17 15:38:23 -0800
commit18cfd25129d06c456eade78d4e74dc4dceae6501 (patch)
treeb188d8e41e725c898ccf953e6bd2ff627f1f8d2d /mpm
parenta4289bca1038dfb91d3ccbe5bc7d66c672359cf2 (diff)
downloaduhd-18cfd25129d06c456eade78d4e74dc4dceae6501.tar.gz
uhd-18cfd25129d06c456eade78d4e74dc4dceae6501.tar.bz2
uhd-18cfd25129d06c456eade78d4e74dc4dceae6501.zip
mpm: n3xx: e320: Add bridge mode support
Diffstat (limited to 'mpm')
-rw-r--r--mpm/python/usrp_mpm/periph_manager/e320.py2
-rw-r--r--mpm/python/usrp_mpm/periph_manager/n3xx.py9
2 files changed, 9 insertions, 2 deletions
diff --git a/mpm/python/usrp_mpm/periph_manager/e320.py b/mpm/python/usrp_mpm/periph_manager/e320.py
index 8ec6c75e0..d60b7c110 100644
--- a/mpm/python/usrp_mpm/periph_manager/e320.py
+++ b/mpm/python/usrp_mpm/periph_manager/e320.py
@@ -283,7 +283,7 @@ class e320(ZynqComponents, PeriphManagerBase):
self._init_gps_sensors()
# Init CHDR transports
self._xport_mgrs = {
- 'udp': E320XportMgrUDP(self.log.getChild('UDP')),
+ 'udp': E320XportMgrUDP(self.log.getChild('UDP'), args),
'liberio': E320XportMgrLiberio(self.log.getChild('liberio')),
}
# Spawn status monitoring thread
diff --git a/mpm/python/usrp_mpm/periph_manager/n3xx.py b/mpm/python/usrp_mpm/periph_manager/n3xx.py
index 53f03aefc..64ccb48da 100644
--- a/mpm/python/usrp_mpm/periph_manager/n3xx.py
+++ b/mpm/python/usrp_mpm/periph_manager/n3xx.py
@@ -56,6 +56,12 @@ class N3xxXportMgrUDP(XportMgrUDP):
" N3xx-specific UDP configuration "
xbar_dev = "/dev/crossbar0"
iface_config = {
+ 'bridge0': {
+ 'label': 'misc-enet-regs0',
+ 'xbar': 0,
+ 'xbar_port': 0,
+ 'ctrl_src_addr': 0,
+ },
'sfp0': {
'label': 'misc-enet-regs0',
'xbar': 0,
@@ -81,6 +87,7 @@ class N3xxXportMgrUDP(XportMgrUDP):
'ctrl_src_addr': 1,
},
}
+ bridges = {'bridge0': ['sfp0', 'sfp1', 'bridge0']}
class N3xxXportMgrLiberio(XportMgrLiberio):
" N3xx-specific Liberio configuration "
@@ -361,7 +368,7 @@ class n3xx(ZynqComponents, PeriphManagerBase):
self.log.warning("No QSFP board detected!")
# Init CHDR transports
self._xport_mgrs = {
- 'udp': N3xxXportMgrUDP(self.log.getChild('UDP')),
+ 'udp': N3xxXportMgrUDP(self.log.getChild('UDP'), args),
'liberio': N3xxXportMgrLiberio(self.log.getChild('liberio')),
}
# Spawn status monitoring thread