From d86db6f12b50e54c314dc13b46c8a9f6e5f5febc Mon Sep 17 00:00:00 2001
From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Mon, 24 Feb 2020 11:58:27 +0100
Subject: [PATCH] litex_gen/wishbone: simplify the way the bus is exposed as
 ios and connected to pads.

---
 litex/soc/interconnect/wishbone.py | 66 +++++++++---------------------
 1 file changed, 19 insertions(+), 47 deletions(-)

diff --git a/litex/soc/interconnect/wishbone.py b/litex/soc/interconnect/wishbone.py
index a1f6d249..128496e2 100644
--- a/litex/soc/interconnect/wishbone.py
+++ b/litex/soc/interconnect/wishbone.py
@@ -70,58 +70,30 @@ class Interface(Record):
         yield from self._do_transaction()
         return (yield self.dat_r)
 
-    def _signals_in_channels(self, channels):
-        for channel_name in channels:
-            s = getattr(self, channel_name)
-            for l in _layout:
-                if l[0] == channel_name:
-                    yield channel_name, s.nbits, l[2]
-
-    def to_pads(self, bus_name='wb'):
-        wb_bus = {}
-        for name, width, direction in self._signals_in_channels(['adr', 'dat_w', 'dat_r',
-                                                                'sel', 'cyc', 'stb', 'ack',
-                                                                'we', 'cti', 'bte', 'err']):
-            signal_name = name
-            wb_bus[signal_name] = width
-
-        signals = []
-        for pad in wb_bus:
-            signals.append(Subsignal(pad, Pins(wb_bus[pad])))
-
-        pads = [
-                (bus_name , 0) + tuple(signals)
-                ]
-        print(pads)
-        return pads
-
-    def connect_to_pads(self, module, platform, bus_name, mode='master'):
-
-        def _get_signals(pads, name):
-            signal_name = name
-            wb_signal = getattr(self, signal_name)
-            pads_signal = getattr(pads, signal_name)
-            return pads_signal, wb_signal
-
-        wb_pads = self.to_pads(bus_name)
-        platform.add_extension(wb_pads)
-        pads = platform.request(bus_name)
-
-        for name, width, direction in self._signals_in_channels(['adr', 'dat_w', 'dat_r',
-                                                                           'sel', 'cyc', 'stb', 'ack',
-                                                                           'we', 'cti', 'bte', 'err']):
-            pads_signal, wb_signal = _get_signals(pads, name)
-
-            if mode == 'master':
+    def get_ios(self, bus_name="wb"):
+        subsignals = []
+        for name, width, direction in self.layout:
+            subsignals.append(Subsignal(name, Pins(width)))
+        ios = [(bus_name , 0) + tuple(subsignals)]
+        return ios
+
+    def connect_to_pads(self, pads, mode="master"):
+        assert mode in ["slave", "master"]
+        r = []
+        for name, width, direction in self.layout:
+            sig  = getattr(self, name)
+            pad  = getattr(pads, name)
+            if mode == "master":
                 if direction == DIR_M_TO_S:
-                    module.comb += pads_signal.eq(wb_signal)
+                    r.append(pad.eq(sig))
                 else:
-                    module.comb += wb_signal.eq(pads_signal)
+                    r.append(sig.eq(pad))
             else:
                 if direction == DIR_S_TO_M:
-                    module.comb += pads_signal.eq(wb_signal)
+                    r.append(pad.eq(sig))
                 else:
-                    module.comb += wb_signal.eq(pads_signal)
+                    r.append(sig.eq(pad))
+        return r
 
 
 class InterconnectPointToPoint(Module):
-- 
2.30.2