mpm/mpmd: Move to request_xport()/commit_xport() architecture

This commit combines code from various branches to finally enable both
UDP and Liberio transports.

1 files changed, 3 insertions, 15 deletions

diff --git a/mpm/python/usrp_mpm/liberiotable.py b/mpm/python/usrp_mpm/liberiotable.py
index 8f70c5ebe..6f2454379 100644
--- a/mpm/python/usrp_mpm/liberiotable.py
+++ b/mpm/python/usrp_mpm/liberiotable.py
@@ -19,15 +19,13 @@ class LiberioDispatcherTable(object):
     label -- A label that can be used by udev to find a UIO device
     """
 
-    MTU_OFFSET = 0x80000
-
     def __init__(self, label):
         self.log = get_logger(label)
         self._regs = UIO(label=label, read_only=False)
         self.poke32 = self._regs.poke32
         self.peek32 = self._regs.peek32
 
-    def set_route(self, sid, dma_channel, mtu):
+    def set_route(self, sid, dma_channel):
         """
         Sets up routing in the Liberio dispatcher. From sid, only the
         destination part is important. After this call, any CHDR packet with the
@@ -35,14 +33,10 @@ class LiberioDispatcherTable(object):
 
         sid -- Full SID, but only destination part matters.
         dma_channel -- The DMA channel to which these packets should get routed.
-        mtu -- Max size of bytes per packet. This is important to get right. The
-               DMA implementation will pad packets smaller than MTU up to the
-               mtu value, so making MTU extra large is inefficient. Packets
-               larger than MTU will get chopped up. Even worse.
         """
         self.log.debug(
-            "Routing SID `{sid}' to DMA channel `{chan}', MTU {mtu} bytes.".format(
-                sid=str(sid), chan=dma_channel, mtu=mtu
+            "Routing SID `{sid}' to DMA channel `{chan}'.".format(
+                sid=str(sid), chan=dma_channel
             )
         )
         def poke_and_trace(addr, data):
@@ -51,18 +45,12 @@ class LiberioDispatcherTable(object):
                 addr, data
             ))
             self.poke32(addr, data)
-
         # Poke reg for destination channel
-        # Poke reg for MTU
         try:
             poke_and_trace(
                 0 + 4 * sid.dst_ep,
                 dma_channel,
             )
-            poke_and_trace(
-                self.MTU_OFFSET + 4 * sid.dst_ep,
-                int(mtu / 8),
-            )
         except Exception as ex:
             self.log.error(
                 "Unexpected exception while setting route: %s",