M-Labs/HeavyX
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

uart: style

Browse Source
This commit is contained in:
Sebastien Bourdeauducq 2019-05-02 12:52:29 +08:00
parent d765dfb7b9
commit 88db84cfd7
1 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
heavycomps/heavycomps/uart.py
View File

@ -26,12 +26,16 @@ class RS232RX(Elaboratable):
rx_busy = Signal() rx_busy = Signal()
rx_done = self.stb rx_done = self.stb
rx_data = self.data rx_data = self.data
m.d.sync += rx_done.eq(0) m.d.sync += [
m.d.sync += rx_r.eq(rx) rx_done.eq(0),
rx_r.eq(rx)
]
with m.If(~rx_busy): with m.If(~rx_busy):
with m.If(~rx & rx_r): # look for start bit with m.If(~rx & rx_r): # look for start bit
m.d.sync += rx_busy.eq(1) m.d.sync += [
m.d.sync += rx_bitcount.eq(0) rx_busy.eq(1),
rx_bitcount.eq(0)
]
with m.Else(): with m.Else():
with m.If(uart_clk_rxen): with m.If(uart_clk_rxen):
m.d.sync += rx_bitcount.eq(rx_bitcount + 1) m.d.sync += rx_bitcount.eq(rx_bitcount + 1)
@ -41,8 +45,10 @@ class RS232RX(Elaboratable):
with m.Elif(rx_bitcount == 9): with m.Elif(rx_bitcount == 9):
m.d.sync += rx_busy.eq(0) m.d.sync += rx_busy.eq(0)
with m.If(rx): # verify stop bit with m.If(rx): # verify stop bit
m.d.sync += rx_data.eq(rx_reg) m.d.sync += [
m.d.sync += rx_done.eq(1) rx_data.eq(rx_reg),
rx_done.eq(1)
]
with m.Else(): with m.Else():
m.d.sync += rx_reg.eq(Cat(rx_reg[1:], rx)) m.d.sync += rx_reg.eq(Cat(rx_reg[1:], rx))
with m.If(rx_busy): with m.If(rx_busy):
@ -78,23 +84,29 @@ class RS232TX(Elaboratable):
tx_reg = Signal(8) tx_reg = Signal(8)
tx_bitcount = Signal(4) tx_bitcount = Signal(4)
tx_busy = Signal() tx_busy = Signal()
m.d.sync += self.ack.eq(0), m.d.sync += self.ack.eq(0)
with m.If(self.stb & ~tx_busy & ~self.ack): with m.If(self.stb & ~tx_busy & ~self.ack):
m.d.sync += tx_reg.eq(self.data) m.d.sync += [
m.d.sync += tx_bitcount.eq(0) tx_reg.eq(self.data),
m.d.sync += tx_busy.eq(1) tx_bitcount.eq(0),
m.d.sync += self.tx.eq(0) tx_busy.eq(1),
self.tx.eq(0)
]
with m.Elif(uart_clk_txen & tx_busy): with m.Elif(uart_clk_txen & tx_busy):
m.d.sync += tx_bitcount.eq(tx_bitcount + 1) m.d.sync += tx_bitcount.eq(tx_bitcount + 1)
with m.If(tx_bitcount == 8): with m.If(tx_bitcount == 8):
m.d.sync += self.tx.eq(1) m.d.sync += self.tx.eq(1)
with m.Elif(tx_bitcount == 9): with m.Elif(tx_bitcount == 9):
m.d.sync += self.tx.eq(1) m.d.sync += [
m.d.sync += tx_busy.eq(0) self.tx.eq(1),
m.d.sync += self.ack.eq(1), tx_busy.eq(0),
self.ack.eq(1)
]
with m.Else(): with m.Else():
m.d.sync += self.tx.eq(tx_reg[0]) m.d.sync += [
m.d.sync += tx_reg.eq(Cat(tx_reg[1:], 0)) self.tx.eq(tx_reg[0]),
tx_reg.eq(Cat(tx_reg[1:], 0))
]
with m.If(tx_busy): with m.If(tx_busy):
m.d.sync += Cat(phase_accumulator_tx, uart_clk_txen).eq(phase_accumulator_tx + self.tuning_word) m.d.sync += Cat(phase_accumulator_tx, uart_clk_txen).eq(phase_accumulator_tx + self.tuning_word)
with m.Else(): with m.Else():