From b1d58bd4c89447a3552ec4f54f75397434187320 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Mon, 27 Jul 2015 12:22:35 +0800 Subject: [PATCH] rtio: fix replace/sequence_error when fine_ts_width > 0 --- artiq/gateware/rtio/core.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/artiq/gateware/rtio/core.py b/artiq/gateware/rtio/core.py index 7e7344cfa..08c46188f 100644 --- a/artiq/gateware/rtio/core.py +++ b/artiq/gateware/rtio/core.py @@ -118,8 +118,10 @@ class _OutputManager(Module): sequence_error = Signal() nop = Signal() self.sync.rsys += [ - replace.eq(self.ev.timestamp == buf.timestamp[fine_ts_width:]), - sequence_error.eq(self.ev.timestamp < buf.timestamp[fine_ts_width:]) + replace.eq(self.ev.timestamp[fine_ts_width:] \ + == buf.timestamp[fine_ts_width:]), + sequence_error.eq(self.ev.timestamp[fine_ts_width:] \ + < buf.timestamp[fine_ts_width:]) ] if interface.suppress_nop: # disable NOP at reset: do not suppress a first write with all 0s