From 83fb431cd0e23b8e040d8dafa9d009659da6f679 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Wed, 2 May 2018 10:57:57 +0800 Subject: [PATCH] rtio/sed: pass sequence numbers through the FIFOs. Closes #978 --- artiq/gateware/rtio/sed/fifos.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/artiq/gateware/rtio/sed/fifos.py b/artiq/gateware/rtio/sed/fifos.py index 0452721f4..cbecccf07 100644 --- a/artiq/gateware/rtio/sed/fifos.py +++ b/artiq/gateware/rtio/sed/fifos.py @@ -32,16 +32,16 @@ class FIFOs(Module): fifos = [] for input, output in zip(self.input, self.output): - fifo = fifo_cls(layout_len(layout_payload), fifo_depth) + fifo = fifo_cls(seqn_width + layout_len(layout_payload), fifo_depth) self.submodules += fifo fifos.append(fifo) self.comb += [ - fifo.din.eq(input.payload.raw_bits()), + fifo.din.eq(Cat(input.seqn, input.payload.raw_bits())), fifo.we.eq(input.we), input.writable.eq(fifo.writable), - output.payload.raw_bits().eq(fifo.dout), + Cat(output.seqn, output.payload.raw_bits()).eq(fifo.dout), output.readable.eq(fifo.readable), fifo.re.eq(output.re) ]