Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1277 from trabucayre/uart_fix_Stream2Wishbone_v2 

Uart fix stream2 wishbone v2
This commit is contained in:
enjoy-digital 2022-04-20 10:56:38 +02:00 committed by GitHub
parent 4e5d1848cc a988712974
commit 5e451d68f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
litex/soc/cores/uart.py
View File

@ -312,17 +312,17 @@ class Stream2Wishbone(Module):
# # # # # #
assert data_width == address_width cmd = Signal(8, reset_less=True)
incr = Signal()
length = Signal(8, reset_less=True)
address = Signal(address_width, reset_less=True)
data = Signal(data_width, reset_less=True)
data_bytes_count = Signal(int(log2(data_width//8)), reset_less=True)
addr_bytes_count = Signal(int(log2(address_width//8)), reset_less=True)
words_count = Signal(8, reset_less=True)
cmd = Signal(8, reset_less=True) data_bytes_count_done = (data_bytes_count == (data_width//8 - 1))
incr = Signal() addr_bytes_count_done = (addr_bytes_count == (address_width//8 - 1))
length = Signal(8, reset_less=True)
address = Signal(address_width, reset_less=True)
data = Signal(data_width, reset_less=True)
bytes_count = Signal(int(log2(data_width//8)), reset_less=True)
words_count = Signal(8, reset_less=True)
bytes_count_done = (bytes_count == (data_width//8 - 1))
words_count_done = (words_count == (length - 1)) words_count_done = (words_count == (length - 1))
self.submodules.fsm = fsm = ResetInserter()(FSM(reset_state="RECEIVE-CMD")) self.submodules.fsm = fsm = ResetInserter()(FSM(reset_state="RECEIVE-CMD"))
@ -331,7 +331,8 @@ class Stream2Wishbone(Module):
self.comb += fsm.reset.eq(timer.done) self.comb += fsm.reset.eq(timer.done)
fsm.act("RECEIVE-CMD", fsm.act("RECEIVE-CMD",
sink.ready.eq(1), sink.ready.eq(1),
NextValue(bytes_count, 0), NextValue(data_bytes_count, 0),
NextValue(addr_bytes_count, 0),
NextValue(words_count, 0), NextValue(words_count, 0),
If(sink.valid, If(sink.valid,
NextValue(cmd, sink.data), NextValue(cmd, sink.data),
@ -349,8 +350,8 @@ class Stream2Wishbone(Module):
sink.ready.eq(1), sink.ready.eq(1),
If(sink.valid, If(sink.valid,
NextValue(address, Cat(sink.data, address)), NextValue(address, Cat(sink.data, address)),
NextValue(bytes_count, bytes_count + 1), NextValue(addr_bytes_count, addr_bytes_count + 1),
If(bytes_count_done, If(addr_bytes_count_done,
If((cmd == CMD_WRITE_BURST_INCR) | (cmd == CMD_WRITE_BURST_FIXED), If((cmd == CMD_WRITE_BURST_INCR) | (cmd == CMD_WRITE_BURST_FIXED),
NextValue(incr, cmd == CMD_WRITE_BURST_INCR), NextValue(incr, cmd == CMD_WRITE_BURST_INCR),
NextState("RECEIVE-DATA") NextState("RECEIVE-DATA")
@ -367,8 +368,8 @@ class Stream2Wishbone(Module):
sink.ready.eq(1), sink.ready.eq(1),
If(sink.valid, If(sink.valid,
NextValue(data, Cat(sink.data, data)), NextValue(data, Cat(sink.data, data)),
NextValue(bytes_count, bytes_count + 1), NextValue(data_bytes_count, data_bytes_count + 1),
If(bytes_count_done, If(data_bytes_count_done,
NextState("WRITE-DATA") NextState("WRITE-DATA")
) )
) )
@ -406,13 +407,13 @@ class Stream2Wishbone(Module):
cases = {} cases = {}
for i, n in enumerate(reversed(range(data_width//8))): for i, n in enumerate(reversed(range(data_width//8))):
cases[i] = source.data.eq(data[8*n:]) cases[i] = source.data.eq(data[8*n:])
self.comb += Case(bytes_count, cases) self.comb += Case(data_bytes_count, cases)
fsm.act("SEND-DATA", fsm.act("SEND-DATA",
sink.ready.eq(0), sink.ready.eq(0),
source.valid.eq(1), source.valid.eq(1),
If(source.ready, If(source.ready,
NextValue(bytes_count, bytes_count + 1), NextValue(data_bytes_count, data_bytes_count + 1),
If(bytes_count_done, If(data_bytes_count_done,
NextValue(words_count, words_count + 1), NextValue(words_count, words_count + 1),
NextValue(address, address + incr), NextValue(address, address + incr),
If(words_count_done, If(words_count_done,
@ -423,7 +424,7 @@ class Stream2Wishbone(Module):
) )
) )
) )
self.comb += source.last.eq(bytes_count_done & words_count_done) self.comb += source.last.eq(data_bytes_count_done & words_count_done)
if hasattr(source, "length"): if hasattr(source, "length"):
self.comb += source.length.eq((data_width//8)*length) self.comb += source.length.eq((data_width//8)*length)