From 0a6dd963cba054585355e9f45cf13c2f2f3d41e9 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 69babebac..fa661e21c 100644 --- a/artiq/gateware/rtio/core.py +++ b/artiq/gateware/rtio/core.py @@ -167,6 +167,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:])