sdram: revert use of scalar values for DFIInjector

enjoy-digital · enjoy-digital · commit 2f7206b38643 · 2015-03-03T09:09:54.000+01:00
diff --git a/misoclib/mem/sdram/core/__init__.py b/misoclib/mem/sdram/core/__init__.py
@@ -9,7 +9,8 @@
 class SDRAMCore(Module, AutoCSR):
 	def __init__(self, phy, ramcon_type, sdram_geom, sdram_timing, **kwargs):
 		# 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)
 
 		# LASMICON
diff --git a/misoclib/mem/sdram/phy/dfii.py b/misoclib/mem/sdram/phy/dfii.py
@@ -36,9 +36,7 @@ def __init__(self, phase):
 		self.sync += If(phase.rddata_valid, self._rddata.status.eq(phase.rddata))
 
 class DFIInjector(Module, AutoCSR):
-	def __init__(self, phy, a, ba):
-		d = phy.settings.dfi_d
-		nphases = phy.settings.nphases
+	def __init__(self, a, ba, d, nphases=1):
 		inti = dfi.Interface(a, ba, d, nphases)
 		self.slave = dfi.Interface(a, ba, d, nphases)
 		self.master = dfi.Interface(a, ba, d, nphases)
