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

gateware/serwb/phy: remove unnecessary rx_dly_rst (use wrap-around), fix typo & pep8

This commit is contained in:
Florent Kermarrec 2017-11-10 10:37:08 +01:00
parent 59be095512
commit 48bfaec8d3
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
artiq/gateware/serwb/phy.py
View File

@ -13,7 +13,7 @@ from artiq.gateware.serwb.s7phy import S7Serdes
# 2) Master sends K28.5 commas to allow Slave to calibrate, Slave sends idle pattern. # 2) Master sends K28.5 commas to allow Slave to calibrate, Slave sends idle pattern.
# 3) Slave sends K28.5 commas to allow Master to calibrate, Master sends K28.5 commas. # 3) Slave sends K28.5 commas to allow Master to calibrate, Master sends K28.5 commas.
# 4) Master stops sending K28.5 commas. # 4) Master stops sending K28.5 commas.
# 5) Slave stops sending K25.5 commas. # 5) Slave stops sending K28.5 commas.
# 6) Link is ready. # 6) Link is ready.
class _SerdesMasterInit(Module): class _SerdesMasterInit(Module):
@ -120,13 +120,8 @@ class _SerdesMasterInit(Module):
NextValue(delay_max_found, 0), NextValue(delay_max_found, 0),
NextState("WAIT_STABLE") NextState("WAIT_STABLE")
).Else( ).Else(
NextState("RESET_SAMPLING_WINDOW") NextState("CONFIGURE_SAMPLING_WINDOW")
) ),
)
fsm.act("RESET_SAMPLING_WINDOW",
NextValue(delay, 0),
serdes.rx_delay_rst.eq(1),
NextState("WAIT_SAMPLING_WINDOW"),
serdes.tx_comma.eq(1) serdes.tx_comma.eq(1)
) )
fsm.act("CONFIGURE_SAMPLING_WINDOW", fsm.act("CONFIGURE_SAMPLING_WINDOW",
@ -246,13 +241,9 @@ class _SerdesSlaveInit(Module, AutoCSR):
NextValue(delay_max_found, 0), NextValue(delay_max_found, 0),
NextState("WAIT_STABLE") NextState("WAIT_STABLE")
).Else( ).Else(
NextState("RESET_SAMPLING_WINDOW") NextState("CONFIGURE_SAMPLING_WINDOW")
) ),
) serdes.tx_idle.eq(1)
fsm.act("RESET_SAMPLING_WINDOW",
NextValue(delay, 0),
serdes.rx_delay_rst.eq(1),
NextState("WAIT_SAMPLING_WINDOW")
) )
fsm.act("CONFIGURE_SAMPLING_WINDOW", fsm.act("CONFIGURE_SAMPLING_WINDOW",
If(delay == (delay_min + (delay_max - delay_min)[1:]), If(delay == (delay_min + (delay_max - delay_min)[1:]),
@ -368,9 +359,15 @@ class SERWBPLL(Module):
p_CLKOUT2_DIVIDE=8//vco_div, p_CLKOUT2_PHASE=0.0, p_CLKOUT2_DIVIDE=8//vco_div, p_CLKOUT2_PHASE=0.0,
o_CLKOUT2=pll_serwb_serdes_5x_clk o_CLKOUT2=pll_serwb_serdes_5x_clk
), ),
Instance("BUFG", i_I=pll_serwb_serdes_clk, o_O=self.serwb_serdes_clk), Instance("BUFG",
Instance("BUFG", i_I=pll_serwb_serdes_20x_clk, o_O=self.serwb_serdes_20x_clk), i_I=pll_serwb_serdes_clk,
Instance("BUFG", i_I=pll_serwb_serdes_5x_clk, o_O=self.serwb_serdes_5x_clk) o_O=self.serwb_serdes_clk),
Instance("BUFG",
i_I=pll_serwb_serdes_20x_clk,
o_O=self.serwb_serdes_20x_clk),
Instance("BUFG",
i_I=pll_serwb_serdes_5x_clk,
o_O=self.serwb_serdes_5x_clk)
] ]
self.specials += MultiReg(pll_locked, self.lock) self.specials += MultiReg(pll_locked, self.lock)