M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

rtio: do not clear asynchronous error flags on RTIO reset

This commit is contained in:
Sebastien Bourdeauducq 2017-04-03 00:20:30 +08:00
parent db3118b916
commit 12249dac57
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -333,7 +333,9 @@ class Core(Module, AutoCSR):
If(self.cri.cmd == cri.commands["write"], If(self.cri.cmd == cri.commands["write"],
o_underflow.eq(0), o_underflow.eq(0),
o_sequence_error.eq(0), o_sequence_error.eq(0),
), )
]
self.sync += [
If(self.async_error.re, If(self.async_error.re,
If(self.async_error.r[0], o_collision.eq(0)), If(self.async_error.r[0], o_collision.eq(0)),
If(self.async_error.r[1], o_busy.eq(0)), If(self.async_error.r[1], o_busy.eq(0)),
@ -370,7 +372,9 @@ class Core(Module, AutoCSR):
self.sync.rsys += [ self.sync.rsys += [
If(o_manager.underflow, o_underflow.eq(1)), If(o_manager.underflow, o_underflow.eq(1)),
If(o_manager.sequence_error, o_sequence_error.eq(1)), If(o_manager.sequence_error, o_sequence_error.eq(1))
]
self.sync += [
If(o_manager.collision, o_collision.eq(1)), If(o_manager.collision, o_collision.eq(1)),
If(o_manager.busy, o_busy.eq(1)) If(o_manager.busy, o_busy.eq(1))
] ]