srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

rtio: simplify error reset logic 

Channel is always selected when reset is issued.
This commit is contained in:
Sebastien Bourdeauducq 2016-12-12 17:35:10 +08:00
parent 1c74249638
commit 7196bc21c1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
artiq/gateware/rtio/core.py
View File

@ -336,13 +336,13 @@ class Core(Module, AutoCSR):
collision = Signal() collision = Signal()
busy = Signal() busy = Signal()
self.sync.rsys += [ 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)), 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)), 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)), 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)), busy.eq(0)),
If(o_manager.underflow, underflow.eq(1)), If(o_manager.underflow, underflow.eq(1)),
If(o_manager.sequence_error, sequence_error.eq(1)), If(o_manager.sequence_error, sequence_error.eq(1)),