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

This commit is contained in:
Florent Kermarrec 2015-04-13 13:56:24 +02:00
parent 4cdb0ddf3a
commit 40abd66d69
6 changed files with 26 additions and 17 deletions

View file

@ -51,12 +51,13 @@ 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)

View file

@ -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")
)
)

View file

@ -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,

View file

@ -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):

View file

@ -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

View file

@ -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)