sdram: revert use of scalar values for DFIInjector

This commit is contained in:
Florent Kermarrec 2015-03-03 09:09:14 +01:00
parent 9df60bf98e
commit 2f7206b386
2 changed files with 3 additions and 4 deletions

View File

@ -9,7 +9,8 @@ from misoclib.mem.sdram.core.lasmicon.crossbar import Crossbar
class SDRAMCore(Module, AutoCSR): class SDRAMCore(Module, AutoCSR):
def __init__(self, phy, ramcon_type, sdram_geom, sdram_timing, **kwargs): def __init__(self, phy, ramcon_type, sdram_geom, sdram_timing, **kwargs):
# DFI # DFI
self.submodules.dfii = dfii.DFIInjector(phy, sdram_geom.mux_a, sdram_geom.bank_a) self.submodules.dfii = dfii.DFIInjector(sdram_geom.mux_a, sdram_geom.bank_a,
phy.settings.dfi_d, phy.settings.nphases)
self.comb += Record.connect(self.dfii.master, phy.dfi) self.comb += Record.connect(self.dfii.master, phy.dfi)
# LASMICON # LASMICON

View File

@ -36,9 +36,7 @@ class PhaseInjector(Module, AutoCSR):
self.sync += If(phase.rddata_valid, self._rddata.status.eq(phase.rddata)) self.sync += If(phase.rddata_valid, self._rddata.status.eq(phase.rddata))
class DFIInjector(Module, AutoCSR): class DFIInjector(Module, AutoCSR):
def __init__(self, phy, a, ba): def __init__(self, a, ba, d, nphases=1):
d = phy.settings.dfi_d
nphases = phy.settings.nphases
inti = dfi.Interface(a, ba, d, nphases) inti = dfi.Interface(a, ba, d, nphases)
self.slave = dfi.Interface(a, ba, d, nphases) self.slave = dfi.Interface(a, ba, d, nphases)
self.master = dfi.Interface(a, ba, d, nphases) self.master = dfi.Interface(a, ba, d, nphases)