diff options
| author | Sugandha Gupta <sugandha.gupta@ettus.com> | 2019-04-17 16:34:10 -0700 |
|---|---|---|
| committer | Brent Stapleton <brent.stapleton@ettus.com> | 2019-05-01 15:17:23 -0700 |
| commit | 8a400f6a30942c9d6d3596f6989720eb4cff058b (patch) | |
| tree | 43a25f8500e41c5f0ee62880271fdd0e52c57eff /mpm | |
| parent | 7bccabcda1128a412fe21203937cf54f92e0eb15 (diff) | |
| download | uhd-8a400f6a30942c9d6d3596f6989720eb4cff058b.tar.gz uhd-8a400f6a30942c9d6d3596f6989720eb4cff058b.tar.bz2 uhd-8a400f6a30942c9d6d3596f6989720eb4cff058b.zip | |
mpm: Add option for muxed data stream for liberio transport
If the number of channels for embedded mode streaming is 4
(1 for ctrl, 1 for async messages and 2 for data ), we need to
mux the data transport. This is needed for E310
Diffstat (limited to 'mpm')
| -rw-r--r-- | mpm/python/usrp_mpm/xports/xportmgr_liberio.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/mpm/python/usrp_mpm/xports/xportmgr_liberio.py b/mpm/python/usrp_mpm/xports/xportmgr_liberio.py index b035e64fe..c9c5ee0f1 100644 --- a/mpm/python/usrp_mpm/xports/xportmgr_liberio.py +++ b/mpm/python/usrp_mpm/xports/xportmgr_liberio.py @@ -64,12 +64,18 @@ class XportMgrLiberio(object): elif xport_type == 'ASYNC_MSG': chan = 1 else: - chan = 2 + self._data_chan_ctr - self._data_chan_ctr += 1 + if self.max_chan > 4: + chan = 2 + self._data_chan_ctr + self._data_chan_ctr += 1 + else: + if xport_type == 'RX_DATA': + chan = 2 + else: + chan = 3 xport_info = { 'type': 'liberio', 'send_sid': str(sid), - 'muxed': str(xport_type in ('CTRL', 'ASYNC_MSG')), + 'muxed': str(xport_type in ('CTRL', 'ASYNC_MSG')) if (self.max_chan > 4) else 'True', 'dma_chan': str(chan), 'tx_dev': "/dev/tx-dma{}".format(chan), 'rx_dev': "/dev/rx-dma{}".format(chan), |