phy/rmii/LiteEthPHYRMIIRX: Avoid reset on converter and improve frame delimitation.
This commit is contained in:
parent
66b277a80b
commit
5438ff01e1
|
@ -58,34 +58,36 @@ class LiteEthPHYRMIIRX(LiteXModule):
|
||||||
|
|
||||||
# Converter: 2-bit to 8-bit.
|
# Converter: 2-bit to 8-bit.
|
||||||
# --------------------------
|
# --------------------------
|
||||||
converter = stream.Converter(2, 8)
|
self.converter = converter = stream.Converter(2, 8)
|
||||||
converter = ResetInserter()(converter)
|
|
||||||
self.converter = converter
|
|
||||||
|
|
||||||
# Delay.
|
# Delay.
|
||||||
# ------
|
# ------
|
||||||
self.delay = delay = stream.Delay(layout=[("data", 8)], n=2)
|
self.delay = delay = stream.Delay(layout=[("data", 8)], n=2)
|
||||||
self.comb += delay.source.connect(converter.sink)
|
|
||||||
|
|
||||||
crs_dv_d = Signal()
|
# Frame Delimitation.
|
||||||
|
# -------------------
|
||||||
|
crs_dv_d = Signal()
|
||||||
|
crs_first = Signal()
|
||||||
|
crs_last = Signal()
|
||||||
self.sync += crs_dv_d.eq(crs_dv)
|
self.sync += crs_dv_d.eq(crs_dv)
|
||||||
|
self.comb += [
|
||||||
crs_first = (crs_dv & (rx_data != 0b00))
|
crs_first.eq(crs_dv & (rx_data != 0b00)), # Start of frame on crs_dv at 1 and non-null data.
|
||||||
crs_last = (~crs_dv & ~crs_dv_d) # End of frame when 2 consecutives 0 on crs_dv.
|
crs_last.eq(~crs_dv & ~crs_dv_d), # End of frame on 2 consecutives crs_dv at 0.
|
||||||
|
]
|
||||||
|
|
||||||
self.fsm = fsm = FSM(reset_state="IDLE")
|
self.fsm = fsm = FSM(reset_state="IDLE")
|
||||||
fsm.act("IDLE",
|
fsm.act("IDLE",
|
||||||
|
delay.source.ready.eq(1),
|
||||||
If(crs_first,
|
If(crs_first,
|
||||||
delay.sink.valid.eq(1),
|
delay.sink.valid.eq(1),
|
||||||
delay.sink.data.eq(rx_data),
|
delay.sink.data.eq(rx_data),
|
||||||
NextState("RECEIVE")
|
NextState("RECEIVE")
|
||||||
).Else(
|
|
||||||
converter.reset.eq(1)
|
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
fsm.act("RECEIVE",
|
fsm.act("RECEIVE",
|
||||||
delay.sink.valid.eq(1),
|
delay.sink.valid.eq(1),
|
||||||
delay.sink.data.eq(rx_data),
|
delay.sink.data.eq(rx_data),
|
||||||
|
delay.source.connect(converter.sink),
|
||||||
If(crs_last,
|
If(crs_last,
|
||||||
converter.sink.last.eq(1),
|
converter.sink.last.eq(1),
|
||||||
NextState("IDLE")
|
NextState("IDLE")
|
||||||
|
|
Loading…
Reference in New Issue