From a6f9ac58bb6add2cfbf03eea37f4d9a1015c485c Mon Sep 17 00:00:00 2001
From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Tue, 7 Sep 2021 09:44:43 +0200
Subject: [PATCH] build/sim/common: Review/Cleanup #1021 for consistency with
 other backends.

---
 litex/build/sim/common.py | 44 +++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/litex/build/sim/common.py b/litex/build/sim/common.py
index b5e795ac4..de0301566 100644
--- a/litex/build/sim/common.py
+++ b/litex/build/sim/common.py
@@ -3,33 +3,41 @@ from migen.fhdl.specials import Special
 
 from litex.build.io import *
 
-class InferedDDROutputSim(Module):
+# DDROutput ----------------------------------------------------------------------------------------
+
+class SimDDROutputImpl(Module):
     def __init__(self, o, i1, i2, clk):
         self.specials += Instance("DDR_OUTPUT",
-                i_i1 = i1,
-                i_i2 = i2,
-                o_o = o,
-                i_clk = clk)
+            i_i1  = i1,
+            i_i2  = i2,
+            o_o   = o,
+            i_clk = clk
+        )
 
-class InferedDDRInputSim(Module):
+class SimDDROutput
+    @staticmethod
+    def lower(dr):
+        return SimDDROutputImpl(dr.o, dr.i1, dr.i2, dr.clk)
+
+# DDRInput -----------------------------------------------------------------------------------------
+
+class SimDDRInputImpl(Module):
     def __init__(self, i, o1, o2, clk):
         self.specials += Instance("DDR_INPUT",
-                o_o1 = o1,
-                o_o2 = o2,
-                i_i = i,
-                i_clk = clk)
+            o_o1  = o1,
+            o_o2  = o2,
+            i_i   = i,
+            i_clk = clk
+        )
 
-class DDROutputSim:
+class SimDDRInput:
     @staticmethod
     def lower(dr):
-        return InferedDDROutputSim(dr.o, dr.i1, dr.i2, dr.clk)
+        return SimDDRInputImpl(dr.i, dr.o1, dr.o2, dr.clk)
 
-class DDRInputSim:
-    @staticmethod
-    def lower(dr):
-        return InferedDDRInputSim(dr.i, dr.o1, dr.o2, dr.clk)
+# Special Overrides --------------------------------------------------------------------------------
 
 sim_special_overrides = {
-    DDROutput: DDROutputSim,
-    DDRInput:  DDRInputSim,
+    DDROutput: SimDDROutput,
+    DDRInput:  SimDDRInput,
 }