M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

serwb/test: update

This commit is contained in:
Florent Kermarrec 2018-05-15 23:52:58 +02:00
parent 3873d09692
commit 77fc5c599f
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
artiq/gateware/test/serwb/test_serwb_init.py
View File

@ -8,14 +8,17 @@ from artiq.gateware.serwb.phy import _SerdesMasterInit, _SerdesSlaveInit
class SerdesModel(Module): class SerdesModel(Module):
def __init__(self, taps, mode="slave"): def __init__(self, taps, mode="slave"):
self.tx_idle = Signal() self.tx = Module()
self.tx_comma = Signal() self.rx = Module()
self.rx_idle = Signal()
self.rx_comma = Signal()
self.rx_bitslip_value = Signal(6) self.tx.idle = Signal()
self.rx_delay_rst = Signal() self.tx.comma = Signal()
self.rx_delay_inc = Signal() self.rx.idle = Signal()
self.rx.comma = Signal()
self.rx.bitslip_value = Signal(6)
self.rx.delay_rst = Signal()
self.rx.delay_inc = Signal()
self.valid_bitslip = Signal(6) self.valid_bitslip = Signal(6)
self.valid_delays = Signal(taps) self.valid_delays = Signal(taps)
@ -30,29 +33,29 @@ class SerdesModel(Module):
self.comb += valid_delays[taps-1-i].eq(self.valid_delays[i]) self.comb += valid_delays[taps-1-i].eq(self.valid_delays[i])
self.sync += [ self.sync += [
bitslip.eq(self.rx_bitslip_value), bitslip.eq(self.rx.bitslip_value),
If(self.rx_delay_rst, If(self.rx.delay_rst,
delay.eq(0) delay.eq(0)
).Elif(self.rx_delay_inc, ).Elif(self.rx.delay_inc,
delay.eq(delay + 1) delay.eq(delay + 1)
) )
] ]
if mode == "master": if mode == "master":
self.submodules.fsm = fsm = ResetInserter()(FSM(reset_state="IDLE")) self.submodules.fsm = fsm = ResetInserter()(FSM(reset_state="IDLE"))
self.comb += self.fsm.reset.eq(self.tx_idle) self.comb += self.fsm.reset.eq(self.tx.idle)
fsm.act("IDLE", fsm.act("IDLE",
If(self.tx_comma, If(self.tx.comma,
NextState("SEND_COMMA") NextState("SEND_COMMA")
), ),
self.rx_idle.eq(1) self.rx.idle.eq(1)
) )
fsm.act("SEND_COMMA", fsm.act("SEND_COMMA",
If(valid_delays[delay] & If(valid_delays[delay] &
(bitslip == self.valid_bitslip), (bitslip == self.valid_bitslip),
self.rx_comma.eq(1) self.rx.comma.eq(1)
), ),
If(~self.tx_comma, If(~self.tx.comma,
NextState("READY") NextState("READY")
) )
) )
@ -60,15 +63,15 @@ class SerdesModel(Module):
elif mode == "slave": elif mode == "slave":
self.submodules.fsm = fsm = FSM(reset_state="IDLE") self.submodules.fsm = fsm = FSM(reset_state="IDLE")
fsm.act("IDLE", fsm.act("IDLE",
self.rx_idle.eq(1), self.rx.idle.eq(1),
NextState("SEND_COMMA") NextState("SEND_COMMA")
) )
fsm.act("SEND_COMMA", fsm.act("SEND_COMMA",
If(valid_delays[delay] & If(valid_delays[delay] &
(bitslip == self.valid_bitslip), (bitslip == self.valid_bitslip),
self.rx_comma.eq(1) self.rx.comma.eq(1)
), ),
If(~self.tx_idle, If(~self.tx.idle,
NextState("READY") NextState("READY")
) )
) )