From: Jean THOMAS <git0@pub.jeanthomas.me>
Date: Fri, 17 Jul 2020 15:54:45 +0000 (+0200)
Subject: Fix code styling
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=250d78b8700250c8cf3207aa06aa5ca68364ac39;p=gram.git

Fix code styling
---

diff --git a/gram/core/bankmachine.py b/gram/core/bankmachine.py
index 65f226d..ad289d6 100644
--- a/gram/core/bankmachine.py
+++ b/gram/core/bankmachine.py
@@ -113,12 +113,9 @@ class BankMachine(Elaboratable):
             self.req.ready.eq(cmd_buffer_lookahead.sink.ready),
             cmd_buffer_lookahead.sink.payload.we.eq(self.req.we),
             cmd_buffer_lookahead.sink.payload.addr.eq(self.req.addr),
-
             cmd_buffer_lookahead.source.connect(cmd_buffer.sink),
-            cmd_buffer.source.ready.eq(
-                self.req.wdata_ready | self.req.rdata_valid),
-            self.req.lock.eq(cmd_buffer_lookahead.source.valid |
-                             cmd_buffer.source.valid),
+            cmd_buffer.source.ready.eq(self.req.wdata_ready | self.req.rdata_valid),
+            self.req.lock.eq(cmd_buffer_lookahead.source.valid | cmd_buffer.source.valid),
         ]
 
         m.submodules.lookahead_slicer = lookahead_slicer = _AddressSlicer(len(cmd_buffer_lookahead.source.addr),
@@ -154,13 +151,10 @@ class BankMachine(Elaboratable):
             m.d.comb += self.cmd.a.eq((auto_precharge << 10) | current_slicer.col)
 
         # tWTP (write-to-precharge) controller -----------------------------------------------------
-        write_latency = math.ceil(
-            self.settings.phy.cwl / self.settings.phy.nphases)
-        precharge_time = write_latency + self.settings.timing.tWR + \
-            self.settings.timing.tCCD  # AL=0
+        write_latency = math.ceil(self.settings.phy.cwl / self.settings.phy.nphases)
+        precharge_time = write_latency + self.settings.timing.tWR + self.settings.timing.tCCD  # AL=0
         m.submodules.twtpcon = twtpcon = tXXDController(precharge_time)
-        m.d.comb += twtpcon.valid.eq(self.cmd.valid &
-                                     self.cmd.ready & self.cmd.is_write)
+        m.d.comb += twtpcon.valid.eq(self.cmd.valid & self.cmd.ready & self.cmd.is_write)
 
         # tRC (activate-activate) controller -------------------------------------------------------
         m.submodules.trccon = trccon = tXXDController(self.settings.timing.tRC)
diff --git a/gram/core/controller.py b/gram/core/controller.py
index 4e36032..15aaaf7 100644
--- a/gram/core/controller.py
+++ b/gram/core/controller.py
@@ -83,15 +83,12 @@ class gramController(Elaboratable):
         # Bank Machines ----------------------------------------------------------------------------
         bank_machines = []
         for n in range(nranks*nbanks):
-            bank_machine = BankMachine(n,
-                                       address_width=self.interface.address_width,
-                                       address_align=self._address_align,
-                                       nranks=nranks,
-                                       settings=self.settings)
+            bank_machine = BankMachine(n, address_width=self.interface.address_width,
+                address_align=self._address_align,
+                nranks=nranks, settings=self.settings)
             bank_machines.append(bank_machine)
             setattr(m.submodules, "bankmachine"+str(n), bank_machine)
-            m.d.comb += getattr(self.interface, "bank" +
-                                str(n)).connect(bank_machine.req)
+            m.d.comb += getattr(self.interface, "bank" + str(n)).connect(bank_machine.req)
 
         # Multiplexer ------------------------------------------------------------------------------
         m.submodules.multiplexer = Multiplexer(