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

serwb: replace valid/ready with stb/ack

This commit is contained in:
Florent Kermarrec 2018-04-07 03:03:44 +02:00
parent 73b727cade
commit c8a08375f8
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
artiq/gateware/serwb/kusphy.py
View File

@ -53,9 +53,9 @@ class KUSSerdes(Module):
clk_converter = stream.Converter(40, 8) clk_converter = stream.Converter(40, 8)
self.submodules += clk_converter self.submodules += clk_converter
self.comb += [ self.comb += [
clk_converter.sink.valid.eq(1), clk_converter.sink.stb.eq(1),
clk_converter.sink.data.eq(Replicate(Signal(10, reset=0b1111100000), 4)), clk_converter.sink.data.eq(Replicate(Signal(10, reset=0b1111100000), 4)),
clk_converter.source.ready.eq(1) clk_converter.source.ack.eq(1)
] ]
clk_o = Signal() clk_o = Signal()
self.specials += [ self.specials += [
@ -80,9 +80,9 @@ class KUSSerdes(Module):
# tx_data -> encoders -> converter -> serdes # tx_data -> encoders -> converter -> serdes
self.submodules.tx_converter = tx_converter = stream.Converter(40, 8) self.submodules.tx_converter = tx_converter = stream.Converter(40, 8)
self.comb += [ self.comb += [
tx_converter.sink.valid.eq(1), tx_converter.sink.stb.eq(1),
self.tx_ce.eq(tx_converter.sink.ready), self.tx_ce.eq(tx_converter.sink.ack),
tx_converter.source.ready.eq(1), tx_converter.source.ack.eq(1),
If(self.tx_idle, If(self.tx_idle,
tx_converter.sink.data.eq(0) tx_converter.sink.data.eq(0)
).Else( ).Else(
@ -148,8 +148,8 @@ class KUSSerdes(Module):
# serdes -> converter -> bitslip -> decoders -> rx_data # serdes -> converter -> bitslip -> decoders -> rx_data
self.submodules.rx_converter = rx_converter = stream.Converter(8, 40) self.submodules.rx_converter = rx_converter = stream.Converter(8, 40)
self.comb += [ self.comb += [
self.rx_ce.eq(rx_converter.source.valid), self.rx_ce.eq(rx_converter.source.stb),
rx_converter.source.ready.eq(1) rx_converter.source.ack.eq(1)
] ]
self.submodules.rx_bitslip = rx_bitslip = CEInserter()(BitSlip(40)) self.submodules.rx_bitslip = rx_bitslip = CEInserter()(BitSlip(40))
self.comb += rx_bitslip.ce.eq(self.rx_ce) self.comb += rx_bitslip.ce.eq(self.rx_ce)
@ -195,7 +195,7 @@ class KUSSerdes(Module):
] ]
self.comb += [ self.comb += [
rx_converter.sink.valid.eq(1), rx_converter.sink.stb.eq(1),
rx_converter.sink.data.eq(serdes_q), rx_converter.sink.data.eq(serdes_q),
rx_bitslip.value.eq(self.rx_bitslip_value), rx_bitslip.value.eq(self.rx_bitslip_value),
rx_bitslip.i.eq(rx_converter.source.data), rx_bitslip.i.eq(rx_converter.source.data),

16
artiq/gateware/serwb/s7phy.py
View File

@ -52,9 +52,9 @@ class S7Serdes(Module):
clk_converter = stream.Converter(40, 8) clk_converter = stream.Converter(40, 8)
self.submodules += clk_converter self.submodules += clk_converter
self.comb += [ self.comb += [
clk_converter.sink.valid.eq(1), clk_converter.sink.stb.eq(1),
clk_converter.sink.data.eq(Replicate(Signal(10, reset=0b1111100000), 4)), clk_converter.sink.data.eq(Replicate(Signal(10, reset=0b1111100000), 4)),
clk_converter.source.ready.eq(1) clk_converter.source.ack.eq(1)
] ]
clk_o = Signal() clk_o = Signal()
self.specials += [ self.specials += [
@ -83,9 +83,9 @@ class S7Serdes(Module):
# tx_data -> encoders -> converter -> serdes # tx_data -> encoders -> converter -> serdes
self.submodules.tx_converter = tx_converter = stream.Converter(40, 8) self.submodules.tx_converter = tx_converter = stream.Converter(40, 8)
self.comb += [ self.comb += [
tx_converter.sink.valid.eq(1), tx_converter.sink.stb.eq(1),
self.tx_ce.eq(tx_converter.sink.ready), self.tx_ce.eq(tx_converter.sink.ack),
tx_converter.source.ready.eq(1), tx_converter.source.ack.eq(1),
If(self.tx_idle, If(self.tx_idle,
tx_converter.sink.data.eq(0) tx_converter.sink.data.eq(0)
).Else( ).Else(
@ -156,8 +156,8 @@ class S7Serdes(Module):
# serdes -> converter -> bitslip -> decoders -> rx_data # serdes -> converter -> bitslip -> decoders -> rx_data
self.submodules.rx_converter = rx_converter = stream.Converter(8, 40) self.submodules.rx_converter = rx_converter = stream.Converter(8, 40)
self.comb += [ self.comb += [
self.rx_ce.eq(rx_converter.source.valid), self.rx_ce.eq(rx_converter.source.stb),
rx_converter.source.ready.eq(1) rx_converter.source.ack.eq(1)
] ]
self.submodules.rx_bitslip = rx_bitslip = CEInserter()(BitSlip(40)) self.submodules.rx_bitslip = rx_bitslip = CEInserter()(BitSlip(40))
self.comb += rx_bitslip.ce.eq(self.rx_ce) self.comb += rx_bitslip.ce.eq(self.rx_ce)
@ -206,7 +206,7 @@ class S7Serdes(Module):
] ]
self.comb += [ self.comb += [
rx_converter.sink.valid.eq(1), rx_converter.sink.stb.eq(1),
rx_converter.sink.data.eq(serdes_q), rx_converter.sink.data.eq(serdes_q),
rx_bitslip.value.eq(self.rx_bitslip_value), rx_bitslip.value.eq(self.rx_bitslip_value),
rx_bitslip.i.eq(rx_converter.source.data), rx_bitslip.i.eq(rx_converter.source.data),