litescope: more pep8 (when convenient), should be almost OK

diff --git a/misoclib/tools/litescope/bridge/uart2wb.py b/misoclib/tools/litescope/bridge/uart2wb.py
index 64cd1186ba80484975fea92a9550f20d76a60440..08e4ec03ab21fc62b49248497c16e078a35979fc 100644 (file)
--- a/misoclib/tools/litescope/bridge/uart2wb.py
+++ b/misoclib/tools/litescope/bridge/uart2wb.py
@@ -23,7 +23,7 @@ class UARTMux(Module):
         self.bridge_pads = UARTPads()
 
         # # #
-       
+
         # Route rx pad:
         # when sel==0, route it to shared rx and bridge rx
         # when sel==1, route it only to bridge rx
@@ -51,13 +51,14 @@ class LiteScopeUART2WB(Module, AutoCSR):
         "write": 0x01,
         "read": 0x02
     }
+
     def __init__(self, pads, clk_freq, baudrate=115200, share_uart=False):
         self.wishbone = wishbone.Interface()
         if share_uart:
             self._sel = CSRStorage()
-        
-               # # #
-               
+
+        # # #
+
         if share_uart:
             mux = UARTMux(pads)
             uart = UARTPHYSerial(mux.bridge_pads, clk_freq, baudrate)

diff --git a/misoclib/tools/litescope/core/storage.py b/misoclib/tools/litescope/core/storage.py
index 76c6735b20d518fcc5177fdbbcdcec8c845a5ece..7990ad1753dd4ffbe806372c9706ca682ecb1842 100644 (file)
--- a/misoclib/tools/litescope/core/storage.py
+++ b/misoclib/tools/litescope/core/storage.py
@@ -136,19 +136,25 @@ class LiteScopeRecorderUnit(Module):
             data_sink.ack.eq(fifo.sink.ack),
 
             fifo.source.ack.eq(fifo.fifo.level >= self.offset),
-            If(trigger_sink.stb & trigger_sink.hit, NextState("POST_HIT_RECORDING"))
+            If(trigger_sink.stb & trigger_sink.hit,
+                NextState("POST_HIT_RECORDING")
+            )
         )
         fsm.act("POST_HIT_RECORDING",
             self.post_hit.eq(1),
             If(self.qualifier,
-                fifo.sink.stb.eq(trigger_sink.stb & trigger_sink.hit & data_sink.stb)
+                fifo.sink.stb.eq(trigger_sink.stb &
+                                 trigger_sink.hit &
+                                 data_sink.stb)
             ).Else(
                 fifo.sink.stb.eq(data_sink.stb)
             ),
             fifo.sink.data.eq(data_sink.data),
             data_sink.ack.eq(fifo.sink.ack),
 
-            If(~fifo.sink.ack | (fifo.fifo.level >= self.length), NextState("IDLE"))
+            If(~fifo.sink.ack | (fifo.fifo.level >= self.length),
+                NextState("IDLE")
+            )
         )
 
 

diff --git a/misoclib/tools/litescope/example_designs/targets/simple.py b/misoclib/tools/litescope/example_designs/targets/simple.py
index bd7897cfe56a64413b9ff7810016719af9591a77..dfc0f3482bd4621fb03bb2ef03bc323b57925ea8 100644 (file)
--- a/misoclib/tools/litescope/example_designs/targets/simple.py
+++ b/misoclib/tools/litescope/example_designs/targets/simple.py
@@ -15,6 +15,7 @@ class LiteScopeSoC(SoC, AutoCSR):
         "la":    17
     }
     csr_map.update(SoC.csr_map)
+
     def __init__(self, platform):
         clk_freq = int((1/(platform.default_clk_period))*1000000000)
         SoC.__init__(self, platform, clk_freq,

diff --git a/misoclib/tools/litescope/example_designs/test/test_io.py b/misoclib/tools/litescope/example_designs/test/test_io.py
index fb853b02e9902a1133378f75d1ce7000a0982ae4..ddfd30c507d226a9f42bcdc9c9478ee0f01200e5 100644 (file)
--- a/misoclib/tools/litescope/example_designs/test/test_io.py
+++ b/misoclib/tools/litescope/example_designs/test/test_io.py
@@ -17,13 +17,13 @@ def led_anim1(io):
         for i in range(8):
             io.write(led_data)
             time.sleep(i*i*0.0020)
-            led_data = (led_data<<1)
+            led_data = (led_data << 1)
         # Led >>
         ledData = 128
         for i in range(8):
             io.write(led_data)
             time.sleep(i*i*0.0020)
-            led_data = (led_data>>1)
+            led_data = (led_data >> 1)
 
 
 def main(wb):

diff --git a/misoclib/tools/litescope/frontend/la.py b/misoclib/tools/litescope/frontend/la.py
index a216c35b4f8d783a05bba6c01f70ad048cf5236b..4ba2c039d73ebd296cdb7f5e8cd29a4bad0669c7 100644 (file)
--- a/misoclib/tools/litescope/frontend/la.py
+++ b/misoclib/tools/litescope/frontend/la.py
@@ -48,7 +48,8 @@ class LiteScopeLA(Module, AutoCSR):
         # XXX : sys_clk must be faster than capture_clk, add Converter on data to remove this limitation
         if self.clk_domain is not "sys":
             self.submodules.fifo = AsyncFIFO(self.sink.description, 32)
-            self.submodules += RenameClockDomains(self.fifo, {"write": self.clk_domain, "read": "sys"})
+            self.submodules += RenameClockDomains(self.fifo,
+                {"write": self.clk_domain, "read": "sys"})
             self.comb += Record.connect(sink, self.fifo.sink)
             sink = self.fifo.source
 

diff --git a/misoclib/tools/litescope/host/dump/vcd.py b/misoclib/tools/litescope/host/dump/vcd.py
index d3fd6d3ef48318bdcd6439380456e5703ab75dff..a27294cf5409eb6a804b39a71281d4701d85587e 100644 (file)
--- a/misoclib/tools/litescope/host/dump/vcd.py
+++ b/misoclib/tools/litescope/host/dump/vcd.py
@@ -33,25 +33,25 @@ class VCDDump(Dump):
         return r
 
     def generate_version(self):
-        r  = "$version\n"
+        r = "$version\n"
         r += "\tmiscope VCD dump\n"
         r += "$end\n"
         return r
 
     def generate_comment(self):
-        r  = "$comment\n"
+        r = "$comment\n"
         r += self.comment
         r += "\n$end\n"
         return r
 
     def generate_timescale(self):
-        r  = "$timescale "
+        r = "$timescale "
         r += self.timescale
         r += " $end\n"
         return r
 
     def generate_scope(self):
-        r  = "$scope "
+        r = "$scope "
         r += self.timescale
         r += " $end\n"
         return r
@@ -71,17 +71,17 @@ class VCDDump(Dump):
         return r
 
     def generate_unscope(self):
-        r  = "$unscope "
+        r = "$unscope "
         r += " $end\n"
         return r
 
     def generate_enddefinitions(self):
-        r  = "$enddefinitions "
+        r = "$enddefinitions "
         r += " $end\n"
         return r
 
     def generate_dumpvars(self):
-        r  = "$dumpvars\n"
+        r = "$dumpvars\n"
         for var in self.vars:
             r += "b"
             r += dec2bin(var.val, var.width)