From b19e9145f301244b3eacaab67c7d5bdcff693461 Mon Sep 17 00:00:00 2001
From: Jean THOMAS <git0@pub.jeanthomas.me>
Date: Fri, 24 Jul 2020 14:58:28 +0200
Subject: [PATCH] Removing superfluous variables in multiplexer

---
 gram/core/multiplexer.py | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/gram/core/multiplexer.py b/gram/core/multiplexer.py
index fb77430..b02b76f 100644
--- a/gram/core/multiplexer.py
+++ b/gram/core/multiplexer.py
@@ -343,12 +343,7 @@ class Multiplexer(Elaboratable):
 
         # Anti Starvation --------------------------------------------------------------------------
         m.submodules.read_antistarvation = read_antistarvation = _AntiStarvation(settings.read_time)
-        read_time_en = read_antistarvation.en
-        max_read_time = read_antistarvation.max_time
-
         m.submodules.write_antistarvation = write_antistarvation = _AntiStarvation(settings.write_time)
-        write_time_en = write_antistarvation.en
-        max_write_time = write_antistarvation.max_time
 
         # Refresh ----------------------------------------------------------------------------------
         m.d.comb += [bm.refresh_req.eq(refresher.cmd.valid)
@@ -390,7 +385,7 @@ class Multiplexer(Elaboratable):
         with m.FSM():
             with m.State("Read"):
                 m.d.comb += [
-                    read_time_en.eq(1),
+                    read_antistarvation.en.eq(1),
                     choose_req.want_reads.eq(1),
                     steerer_sel(steerer, "read"),
                 ]
@@ -408,7 +403,7 @@ class Multiplexer(Elaboratable):
 
                 with m.If(write_available):
                     # TODO: switch only after several cycles of ~read_available?
-                    with m.If(~read_available | max_read_time):
+                    with m.If(~read_available | read_antistarvation.max_time):
                         m.next = "RTW"
 
                 with m.If(go_to_refresh):
@@ -416,7 +411,7 @@ class Multiplexer(Elaboratable):
 
             with m.State("Write"):
                 m.d.comb += [
-                    write_time_en.eq(1),
+                    write_antistarvation.en.eq(1),
                     choose_req.want_writes.eq(1),
                     steerer_sel(steerer, "write"),
                 ]
@@ -433,7 +428,7 @@ class Multiplexer(Elaboratable):
                     ]
 
                 with m.If(read_available):
-                    with m.If(~write_available | max_write_time):
+                    with m.If(~write_available | write_antistarvation.max_time):
                         m.next = "WTR"
 
                 with m.If(go_to_refresh):
-- 
2.30.2