From 6e3f7691c59f9f878b5968ede85c33a4741c13b4 Mon Sep 17 00:00:00 2001
From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Tue, 23 Jul 2019 12:39:14 +0200
Subject: [PATCH] core: move timing controllers to common

---
 litedram/common.py           | 33 ++++++++++++++++++++++++++++++---
 litedram/core/multiplexer.py | 25 +------------------------
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/litedram/common.py b/litedram/common.py
index 61ef34c..44248f1 100644
--- a/litedram/common.py
+++ b/litedram/common.py
@@ -3,6 +3,9 @@
 # This file is Copyright (c) 2018 bunnie <bunnie@kosagi.com>
 # License: BSD
 
+from functools import reduce
+from operator import add
+
 from migen import *
 
 from litex.soc.interconnect import stream
@@ -164,7 +167,7 @@ class LiteDRAMNativeReadPort(LiteDRAMNativePort):
         LiteDRAMNativePort.__init__(self, "read", *args, **kwargs)
 
 
-# Timing Controller ------------------------------------------------------------
+# Timing Controllers -----------------------------------------------------------
 
 class tXXDController(Module):
     def __init__(self, txxd):
@@ -178,7 +181,7 @@ class tXXDController(Module):
             count = Signal(max=max(txxd, 2))
             self.sync += \
                 If(valid,
-                    count.eq(txxd-1),
+                    count.eq(txxd - 1),
                     If((txxd - 1) == 0,
                         ready.eq(1)
                     ).Else(
@@ -186,5 +189,29 @@ class tXXDController(Module):
                     )
                 ).Elif(~ready,
                     count.eq(count - 1),
-                    If(count == 1, ready.eq(1))
+                    If(count == 1,
+                        ready.eq(1))
+                )
+
+
+class tFAWController(Module):
+    def __init__(self, tfaw):
+        self.valid = valid = Signal()
+        self.ready = ready = Signal(reset=1)
+        ready.attr.add("no_retiming")
+
+        # # #
+
+        if tfaw is not None:
+            count = Signal(max=max(tfaw, 2))
+            window = Signal(tfaw)
+            self.sync += window.eq(Cat(valid, window))
+            self.comb += count.eq(reduce(add, [window[i] for i in range(tfaw)]))
+            self.sync += \
+                If(count < 4,
+                    If(count == 3,
+                        ready.eq(~valid)
+                    ).Else(
+                        ready.eq(1)
+                    )
                 )
diff --git a/litedram/core/multiplexer.py b/litedram/core/multiplexer.py
index eae8a0a..6d1f773 100644
--- a/litedram/core/multiplexer.py
+++ b/litedram/core/multiplexer.py
@@ -7,7 +7,7 @@
 
 import math
 from functools import reduce
-from operator import add, or_, and_
+from operator import or_, and_
 
 from migen import *
 from migen.genlib.roundrobin import *
@@ -141,29 +141,6 @@ class _Steerer(Module):
             ]
 
 
-class tFAWController(Module):
-    def __init__(self, tfaw):
-        self.valid = valid = Signal()
-        self.ready = ready = Signal(reset=1)
-        ready.attr.add("no_retiming")
-
-        # # #
-
-        if tfaw is not None:
-            count = Signal(max=max(tfaw, 2))
-            window = Signal(tfaw)
-            self.sync += window.eq(Cat(valid, window))
-            self.comb += count.eq(reduce(add, [window[i] for i in range(tfaw)]))
-            self.sync += \
-                If(count < 4,
-                    If(count == 3,
-                        ready.eq(~valid)
-                    ).Else(
-                        ready.eq(1)
-                    )
-                )
-
-
 class Multiplexer(Module, AutoCSR):
     def __init__(self,
             settings,