From 7196bc21c1a9553795afb3228e92e6df9e23c18c Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Mon, 12 Dec 2016 17:35:10 +0800 Subject: [PATCH] rtio: simplify error reset logic Channel is always selected when reset is issued. --- artiq/gateware/rtio/core.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/artiq/gateware/rtio/core.py b/artiq/gateware/rtio/core.py index 33f2e6507..674ba761f 100644 --- a/artiq/gateware/rtio/core.py +++ b/artiq/gateware/rtio/core.py @@ -336,13 +336,13 @@ class Core(Module, AutoCSR): collision = Signal() busy = Signal() self.sync.rsys += [ - If(selected & (self.cri.cmd == cri.commands["o_underflow_reset"]), + If(self.cri.cmd == cri.commands["o_underflow_reset"], underflow.eq(0)), - If(selected & (self.cri.cmd == cri.commands["o_sequence_error_reset"]), + If(self.cri.cmd == cri.commands["o_sequence_error_reset"], sequence_error.eq(0)), - If(selected & (self.cri.cmd == cri.commands["o_collision_reset"]), + If(self.cri.cmd == cri.commands["o_collision_reset"], collision.eq(0)), - If(selected & (self.cri.cmd == cri.commands["o_busy_reset"]), + If(self.cri.cmd == cri.commands["o_busy_reset"], busy.eq(0)), If(o_manager.underflow, underflow.eq(1)), If(o_manager.sequence_error, sequence_error.eq(1)),