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

serwb/scrambler: dynamic enable/disable

This commit is contained in:
Florent Kermarrec 2018-04-17 19:20:06 +02:00
parent 816a6f2ec7
commit ebfac36223
1 changed files with 62 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
artiq/gateware/serwb/scrambler.py
View File

@ -31,81 +31,83 @@ class _Scrambler(Module):
class Scrambler(Module): class Scrambler(Module):
def __init__(self, sync_interval=1024, enable=True): def __init__(self, sync_interval=1024):
self.enable = Signal()
self.sink = sink = stream.Endpoint([("data", 32)]) self.sink = sink = stream.Endpoint([("data", 32)])
self.source = source = stream.Endpoint([("d", 32), ("k", 4)]) self.source = source = stream.Endpoint([("d", 32), ("k", 4)])
# # # # # #
if enable: # scrambler
# scrambler self.submodules.scrambler = scrambler = _Scrambler(32)
self.submodules.scrambler = scrambler = _Scrambler(32)
# insert K.29.7 as sync character # insert K.29.7 as sync character
# every sync_interval cycles # every sync_interval cycles
count = Signal(max=sync_interval) count = Signal(max=sync_interval)
self.submodules.fsm = fsm = FSM(reset_state="SYNC") self.submodules.fsm = fsm = ResetInserter()(FSM(reset_state="DISABLE"))
fsm.act("SYNC", self.comb += fsm.reset.eq(~self.enable)
scrambler.reset.eq(1), fsm.act("DISABLE",
source.stb.eq(1), sink.connect(source, omit={"data"}),
source.k[0].eq(1), source.k.eq(0b0000),
source.d[:8].eq(K(29, 7)), source.d.eq(sink.data),
NextValue(count, 0), NextState("SYNC")
If(source.ack, )
NextState("DATA") fsm.act("SYNC",
scrambler.reset.eq(1),
source.stb.eq(1),
source.k[0].eq(1),
source.d[:8].eq(K(29, 7)),
NextValue(count, 0),
If(source.ack,
NextState("DATA")
)
)
fsm.act("DATA",
scrambler.i.eq(sink.data),
sink.ack.eq(source.ack),
source.stb.eq(1),
source.d.eq(scrambler.o),
If(source.stb & source.ack,
scrambler.ce.eq(1),
NextValue(count, count + 1),
If(count == (sync_interval - 1),
NextState("SYNC")
) )
) )
fsm.act("DATA", )
scrambler.i.eq(sink.data),
sink.ack.eq(source.ack),
source.stb.eq(1),
source.d.eq(scrambler.o),
If(source.stb & source.ack,
scrambler.ce.eq(1),
NextValue(count, count + 1),
If(count == (sync_interval - 1),
NextState("SYNC")
)
)
)
else:
self.comb += [
sink.connect(source, omit={"data"}),
source.k.eq(0b0000),
source.d.eq(sink.data)
]
class Descrambler(Module): class Descrambler(Module):
def __init__(self, enable=True): def __init__(self):
self.enable = Signal()
self.sink = sink = stream.Endpoint([("d", 32), ("k", 4)]) self.sink = sink = stream.Endpoint([("d", 32), ("k", 4)])
self.source = source = stream.Endpoint([("data", 32)]) self.source = source = stream.Endpoint([("data", 32)])
# # # # # #
if enable: # descrambler
# descrambler self.submodules.descrambler = descrambler = _Scrambler(32)
self.submodules.descrambler = descrambler = _Scrambler(32) self.comb += descrambler.i.eq(sink.d)
self.comb += descrambler.i.eq(sink.d)
# detect K29.7 and synchronize descrambler # detect K29.7 and synchronize descrambler
self.comb += [ self.submodules.fsm = fsm = ResetInserter()(FSM(reset_state="DISABLE"))
descrambler.reset.eq(0), self.comb += fsm.reset.eq(~self.enable)
If((sink.k[0] == 1) & fsm.act("DISABLE",
(sink.d[:8] == K(29,7)), sink.connect(source, omit={"d", "k"}),
sink.ack.eq(1), source.data.eq(sink.d),
descrambler.reset.eq(1) NextState("SYNC_DATA")
).Else( )
sink.ack.eq(source.ack), fsm.act("SYNC_DATA",
source.stb.eq(sink.stb), If((sink.k[0] == 1) &
source.data.eq(descrambler.o), (sink.d[:8] == K(29,7)),
If(source.stb & source.ack, sink.ack.eq(1),
descrambler.ce.eq(1) descrambler.reset.eq(1)
) ).Else(
sink.ack.eq(source.ack),
source.stb.eq(sink.stb),
source.data.eq(descrambler.o),
If(source.stb & source.ack,
descrambler.ce.eq(1)
) )
] )
else: )
self.comb += [
sink.connect(source, omit={"d", "k"}),
source.data.eq(sink.d)
]