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

rtio/phy/ttl: support 'set sensitivity and sample' command (#218)

This commit is contained in:
Sebastien Bourdeauducq 2016-09-07 15:42:09 +08:00
parent 269cedd782
commit a7dd356d30
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
artiq/gateware/rtio/phy/ttl_serdes_generic.py
View File

@ -90,14 +90,21 @@ class Inout(Module):
# Input # Input
sensitivity = Signal(2) sensitivity = Signal(2)
self.sync.rio += If(self.rtlink.o.stb & (self.rtlink.o.address == 2), sample = Signal()
sensitivity.eq(self.rtlink.o.data)) self.sync.rio += [
sample.eq(0),
If(self.rtlink.o.stb & self.rtlink.o.address[1],
sensitivity.eq(self.rtlink.o.data),
If(self.rtlink.o.address[0], sample.eq(1))
)
]
i = serdes.i[-1] i = serdes.i[-1]
i_d = Signal() i_d = Signal()
self.sync.rio_phy += [ self.sync.rio_phy += [
i_d.eq(i), i_d.eq(i),
self.rtlink.i.stb.eq( self.rtlink.i.stb.eq(
sample |
(sensitivity[0] & ( i & ~i_d)) | (sensitivity[0] & ( i & ~i_d)) |
(sensitivity[1] & (~i & i_d)) (sensitivity[1] & (~i & i_d))
), ),

11
artiq/gateware/rtio/phy/ttl_simple.py
View File

@ -59,8 +59,14 @@ class Inout(Module):
ts.oe.eq(oe_k) ts.oe.eq(oe_k)
) )
] ]
self.sync.rio += If(self.rtlink.o.stb & (self.rtlink.o.address == 2), sample = Signal()
sensitivity.eq(self.rtlink.o.data)) self.sync.rio += [
sample.eq(0),
If(self.rtlink.o.stb & self.rtlink.o.address[1],
sensitivity.eq(self.rtlink.o.data),
If(self.rtlink.o.address[0], sample.eq(1))
)
]
i = Signal() i = Signal()
i_d = Signal() i_d = Signal()
@ -68,6 +74,7 @@ class Inout(Module):
self.sync.rio_phy += i_d.eq(i) self.sync.rio_phy += i_d.eq(i)
self.comb += [ self.comb += [
self.rtlink.i.stb.eq( self.rtlink.i.stb.eq(
sample |
(sensitivity[0] & ( i & ~i_d)) | (sensitivity[0] & ( i & ~i_d)) |
(sensitivity[1] & (~i & i_d)) (sensitivity[1] & (~i & i_d))
), ),