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

rtio/sed: fix output driver busy output

pull/889/head
Sebastien Bourdeauducq 2017-09-11 23:04:52 +08:00
parent 64d9381c36
commit 00ff3f5b0d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artiq/gateware/rtio/sed/output_driver.py
View File

@ -96,6 +96,10 @@ class OutputDriver(Module):
self.sync += oif.data.eq(reduce(or_, onehot_data))
# detect busy errors, at lane level to reduce muxing
self.sync += [
self.busy.eq(0),
self.busy_channel.eq(0)
]
for lane_data in lane_datas:
stb_r = Signal()
channel_r = Signal(max=len(channels))
@ -103,8 +107,6 @@ class OutputDriver(Module):
stb_r.eq(lane_data.valid & ~lane_data.collision),
channel_r.eq(lane_data.payload.channel),
self.busy.eq(0),
self.busy_channel.eq(0),
If(stb_r & Array(channel.interface.o.busy for channel in channels)[channel_r],
self.busy.eq(1),
self.busy_channel.eq(channel_r)