From 207453efcd55e3d738e8f79b5a8fdd91d6ca4c1b Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Thu, 6 Apr 2017 11:28:16 +0800 Subject: [PATCH] rtio: add a missing case for collision reporting --- artiq/gateware/rtio/core.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/artiq/gateware/rtio/core.py b/artiq/gateware/rtio/core.py index c21e1d43a..5974fee6e 100644 --- a/artiq/gateware/rtio/core.py +++ b/artiq/gateware/rtio/core.py @@ -104,6 +104,9 @@ class _OutputManager(Module): (self.ev.timestamp[fine_ts_width:] == buf.timestamp[fine_ts_width:]) & ((self.ev.timestamp[:fine_ts_width] != buf.timestamp[:fine_ts_width]) |different_addresses)) + else: + self.sync.rsys += collision.eq( + (self.ev.timestamp == buf.timestamp) & different_addresses) else: self.sync.rsys += collision.eq( self.ev.timestamp[fine_ts_width:] == buf.timestamp[fine_ts_width:])