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

cores/uart: cleanup

This commit is contained in:
Florent Kermarrec 2020-02-28 22:11:51 +01:00
parent ea8563339f
commit 9199306a65
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
# This file is Copyright (c) 2014 Yann Sionneau <ys@m-labs.hk> # This file is Copyright (c) 2014 Yann Sionneau <ys@m-labs.hk>
# This file is Copyright (c) 2015-2018 Florent Kermarrec <florent@enjoy-digital.fr> # This file is Copyright (c) 2015-2020 Florent Kermarrec <florent@enjoy-digital.fr>
# This file is Copyright (c) 2015 Sebastien Bourdeauducq <sb@m-labs.hk> # This file is Copyright (c) 2015 Sebastien Bourdeauducq <sb@m-labs.hk>
# This file is Copyright (c) 2018 Tim 'mithro' Ansell <me@mith.ro> # This file is Copyright (c) 2018 Tim 'mithro' Ansell <me@mith.ro>
# License: BSD # License: BSD
@ -34,17 +34,17 @@ class RS232PHYRX(Module):
# # # # # #
uart_clk_rxen = Signal() uart_clk_rxen = Signal()
phase_accumulator_rx = Signal(32) phase_accumulator_rx = Signal(32)
rx = Signal() rx = Signal()
self.specials += MultiReg(pads.rx, rx) rx_r = Signal()
rx_r = Signal() rx_reg = Signal(8)
rx_reg = Signal(8)
rx_bitcount = Signal(4) rx_bitcount = Signal(4)
rx_busy = Signal() rx_busy = Signal()
rx_done = self.source.valid rx_done = self.source.valid
rx_data = self.source.data rx_data = self.source.data
self.specials += MultiReg(pads.rx, rx)
self.sync += [ self.sync += [
rx_done.eq(0), rx_done.eq(0),
rx_r.eq(rx), rx_r.eq(rx),
@ -86,14 +86,14 @@ class RS232PHYTX(Module):
# # # # # #
uart_clk_txen = Signal() uart_clk_txen = Signal()
phase_accumulator_tx = Signal(32) phase_accumulator_tx = Signal(32)
pads.tx.reset = 1 pads.tx.reset = 1
tx_reg = Signal(8) tx_reg = Signal(8)
tx_bitcount = Signal(4) tx_bitcount = Signal(4)
tx_busy = Signal() tx_busy = Signal()
self.sync += [ self.sync += [
self.sink.ready.eq(0), self.sink.ready.eq(0),
If(self.sink.valid & ~tx_busy & ~self.sink.ready, If(self.sink.valid & ~tx_busy & ~self.sink.ready,
@ -126,7 +126,7 @@ class RS232PHYTX(Module):
class RS232PHY(Module, AutoCSR): class RS232PHY(Module, AutoCSR):
def __init__(self, pads, clk_freq, baudrate=115200): def __init__(self, pads, clk_freq, baudrate=115200):
self._tuning_word = CSRStorage(32, reset=int((baudrate/clk_freq)*2**32)) self._tuning_word = CSRStorage(32, reset=int((baudrate/clk_freq)*2**32))
self.submodules.tx = RS232PHYTX(pads, self._tuning_word.storage) self.submodules.tx = RS232PHYTX(pads, self._tuning_word.storage)
self.submodules.rx = RS232PHYRX(pads, self._tuning_word.storage) self.submodules.rx = RS232PHYRX(pads, self._tuning_word.storage)
self.sink, self.source = self.tx.sink, self.rx.source self.sink, self.source = self.tx.sink, self.rx.source
@ -152,7 +152,7 @@ class RS232PHYMultiplexer(Module):
class RS232PHYModel(Module): class RS232PHYModel(Module):
def __init__(self, pads): def __init__(self, pads):
self.sink = stream.Endpoint([("data", 8)]) self.sink = stream.Endpoint([("data", 8)])
self.source = stream.Endpoint([("data", 8)]) self.source = stream.Endpoint([("data", 8)])
self.comb += [ self.comb += [
@ -189,12 +189,12 @@ def UARTPHY(pads, clk_freq, baudrate):
class UART(Module, AutoCSR, UARTInterface): class UART(Module, AutoCSR, UARTInterface):
def __init__(self, phy=None, def __init__(self, phy=None,
tx_fifo_depth=16, tx_fifo_depth = 16,
rx_fifo_depth=16, rx_fifo_depth = 16,
rx_fifo_rx_we=False, rx_fifo_rx_we = False,
phy_cd="sys",): phy_cd = "sys"):
self._rxtx = CSR(8) self._rxtx = CSR(8)
self._txfull = CSRStatus() self._txfull = CSRStatus()
self._rxempty = CSRStatus() self._rxempty = CSRStatus()
self.submodules.ev = EventManager() self.submodules.ev = EventManager()