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

cores/video/VideoTerminal: Add CLEAR-XY after reset.

This commit is contained in:
Florent Kermarrec 2021-03-04 17:55:37 +01:00
parent a1e7aab35c
commit 82d0ecd7bd
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
litex/soc/cores/video.py
View File

@ -407,7 +407,7 @@ class VideoTerminal(Module):
font_width = 8 font_width = 8
font_heigth = 16 font_heigth = 16
font_mem = Memory(width=8, depth=4096, init=font) font_mem = Memory(width=8, depth=4096, init=font)
font_rdport = font_mem.get_port(write_capable=False, has_re=True) font_rdport = font_mem.get_port(has_re=True)
self.specials += font_mem, font_rdport self.specials += font_mem, font_rdport
# Terminal Mem. # Terminal Mem.
@ -418,7 +418,7 @@ class VideoTerminal(Module):
term_init = [ord(c) for c in [" "]*term_colums*term_lines] term_init = [ord(c) for c in [" "]*term_colums*term_lines]
term_mem = Memory(width=font_width, depth=term_depth, init=term_init) term_mem = Memory(width=font_width, depth=term_depth, init=term_init)
term_wrport = term_mem.get_port(write_capable=True) term_wrport = term_mem.get_port(write_capable=True)
term_rdport = term_mem.get_port(write_capable=False, has_re=True) term_rdport = term_mem.get_port(has_re=True)
self.specials += term_mem, term_wrport, term_rdport self.specials += term_mem, term_wrport, term_rdport
# UART Terminal Fill. # UART Terminal Fill.
@ -438,7 +438,25 @@ class VideoTerminal(Module):
x_term = term_wrport.adr[:7] x_term = term_wrport.adr[:7]
y_term = term_wrport.adr[7:] y_term = term_wrport.adr[7:]
y_term_rollover = Signal() y_term_rollover = Signal()
self.submodules.uart_fsm = uart_fsm = FSM(reset_state="IDLE") self.submodules.uart_fsm = uart_fsm = FSM(reset_state="RESET")
uart_fsm.act("RESET",
NextValue(x_term, 0),
NextValue(y_term, 0),
NextState("CLEAR-XY")
)
uart_fsm.act("CLEAR-XY",
term_wrport.we.eq(1),
term_wrport.dat_w.eq(ord(" ")),
NextValue(x_term, x_term + 1),
If(x_term == (term_colums - 1),
NextValue(x_term, 0),
NextValue(y_term, y_term + 1),
If(y_term == (term_lines - 1),
NextValue(y_term, 0),
NextState("IDLE")
)
)
)
uart_fsm.act("IDLE", uart_fsm.act("IDLE",
If(uart_sink.valid, If(uart_sink.valid,
If(uart_sink.data == ord("\n"), If(uart_sink.data == ord("\n"),
@ -486,7 +504,7 @@ class VideoTerminal(Module):
NextValue(x_term, x_term + 1), NextValue(x_term, x_term + 1),
term_wrport.we.eq(1), term_wrport.we.eq(1),
term_wrport.dat_w.eq(ord(" ")), term_wrport.dat_w.eq(ord(" ")),
If(x_term == (80 - 1), If(x_term == (term_colums - 1),
NextValue(x_term, 0), NextValue(x_term, 0),
NextState("IDLE") NextState("IDLE")
) )