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

soc/rtio: mux OE

This commit is contained in:
Sebastien Bourdeauducq 2014-07-25 11:09:26 -06:00
parent f03ae5e5b0
commit 6b6b44b924
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
soc/artiqlib/rtio/__init__.py
View File

@ -74,8 +74,10 @@ class RTIO(Module, AutoCSR):
# CSRs # CSRs
self._r_reset = CSRStorage(reset=1) self._r_reset = CSRStorage(reset=1)
self._r_oe = CSRStorage(len(oes))
self._r_chan_sel = CSRStorage(flen(self.bank_o.sel)) self._r_chan_sel = CSRStorage(flen(self.bank_o.sel))
self._r_oe = CSR()
self._r_o_timestamp = CSRStorage(counter_width+fine_ts_width) self._r_o_timestamp = CSRStorage(counter_width+fine_ts_width)
self._r_o_value = CSRStorage() self._r_o_value = CSRStorage()
self._r_o_writable = CSRStatus() self._r_o_writable = CSRStatus()
@ -84,7 +86,17 @@ class RTIO(Module, AutoCSR):
self._r_o_level = CSRStatus(bits_for(ofifo_depth)) self._r_o_level = CSRStatus(bits_for(ofifo_depth))
# OE # OE
self.comb += Cat(*oes).eq(self._r_oe.storage) oes = []
for n, padif in enumerate(phy.interface):
if hasattr(padif, "oe"):
self.sync += \
If(self._r_oe.re & (self._r_chan_sel.storage == n),
padif.oe.eq(self._r_oe.r)
)
oes.append(padif.oe)
else:
oes.append(1)
self.comb += self._r_oe.w.eq(Array(oes)[self._r_chan_sel.storage])
# Output/Gate # Output/Gate
self.comb += [ self.comb += [