wishbone: add extracting module signals to the top

This commit is contained in:
Jan Kowalewski 2020-02-13 16:41:11 +01:00 committed by Piotr Binkowski
parent 485934edc9
commit e0bcb57d3d
1 changed files with 54 additions and 0 deletions

View File

@ -13,6 +13,7 @@ from migen.genlib.misc import split, displacer, chooser, WaitTimer
from migen.genlib.fsm import FSM, NextState from migen.genlib.fsm import FSM, NextState
from litex.soc.interconnect import csr from litex.soc.interconnect import csr
from litex.build.generic_platform import *
# TODO: rewrite without FlipFlop # TODO: rewrite without FlipFlop
@ -69,6 +70,59 @@ class Interface(Record):
yield from self._do_transaction() yield from self._do_transaction()
return (yield self.dat_r) 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':
if direction == DIR_M_TO_S:
module.comb += pads_signal.eq(wb_signal)
else:
module.comb += wb_signal.eq(pads_signal)
else:
if direction == DIR_S_TO_M:
module.comb += pads_signal.eq(wb_signal)
else:
module.comb += wb_signal.eq(pads_signal)
class InterconnectPointToPoint(Module): class InterconnectPointToPoint(Module):
def __init__(self, master, slave): def __init__(self, master, slave):