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

suservo: cleanup rtio interface

This commit is contained in:
Robert Jördens 2018-04-24 13:08:40 +00:00
parent 3942c2d274
commit fe75064c1e
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
artiq/gateware/rtio/phy/servo.py
View File

@ -32,18 +32,19 @@ class RTServoMem(Module):
m_state = servo.m_state.get_port(write_capable=True) m_state = servo.m_state.get_port(write_capable=True)
self.specials += m_state, m_coeff self.specials += m_state, m_coeff
# just expose the w.coeff (18) MSBs of state
assert w.state >= w.coeff assert w.state >= w.coeff
assert len(m_coeff.dat_w) == 2*w.coeff assert len(m_coeff.dat_w) == 2*w.coeff
assert w.coeff >= w.word assert w.coeff >= w.word
self.rtlink = rtlink.Interface( self.rtlink = rtlink.Interface(
rtlink.OInterface( rtlink.OInterface(
w.state, data_width=w.coeff,
# coeff, profile, channel, 2 mems, rw # coeff, profile, channel, 2 mems, rw
3 + w.profile + w.channel + 1 + 1, address_width=3 + w.profile + w.channel + 1 + 1,
enable_replace=False), enable_replace=False),
rtlink.IInterface( rtlink.IInterface(
w.state, data_width=w.coeff,
timestamped=False) timestamped=False)
) )
@ -53,6 +54,7 @@ class RTServoMem(Module):
state_sel = self.rtlink.o.address[-2] state_sel = self.rtlink.o.address[-2]
high_coeff = self.rtlink.o.address[0] high_coeff = self.rtlink.o.address[0]
self.comb += [ self.comb += [
self.rtlink.o.busy.eq(0),
m_coeff.adr.eq(self.rtlink.o.address[1:]), m_coeff.adr.eq(self.rtlink.o.address[1:]),
m_coeff.dat_w.eq(Cat(self.rtlink.o.data, self.rtlink.o.data)), m_coeff.dat_w.eq(Cat(self.rtlink.o.data, self.rtlink.o.data)),
m_coeff.we[0].eq(self.rtlink.o.stb & ~high_coeff & m_coeff.we[0].eq(self.rtlink.o.stb & ~high_coeff &
@ -60,7 +62,7 @@ class RTServoMem(Module):
m_coeff.we[1].eq(self.rtlink.o.stb & high_coeff & m_coeff.we[1].eq(self.rtlink.o.stb & high_coeff &
we & ~state_sel), we & ~state_sel),
m_state.adr.eq(self.rtlink.o.address), m_state.adr.eq(self.rtlink.o.address),
m_state.dat_w.eq(self.rtlink.o.data << w.state - w.coeff), m_state.dat_w[w.state - w.coeff:].eq(self.rtlink.o.data),
m_state.we.eq(self.rtlink.o.stb & we & state_sel), m_state.we.eq(self.rtlink.o.stb & we & state_sel),
] ]
read = Signal() read = Signal()
@ -70,17 +72,20 @@ class RTServoMem(Module):
If(read, If(read,
read.eq(0) read.eq(0)
), ),
If(self.rtlink.o.stb & ~we, If(self.rtlink.o.stb,
read.eq(1), read.eq(~we),
read_sel.eq(state_sel), read_sel.eq(state_sel),
read_high.eq(high_coeff), read_high.eq(high_coeff),
) )
] ]
self.comb += [ self.comb += [
self.rtlink.o.busy.eq(read),
self.rtlink.i.stb.eq(read), self.rtlink.i.stb.eq(read),
self.rtlink.i.data.eq(Mux(state_sel, self.rtlink.i.data.eq(
m_state.dat_r >> w.state - w.coeff, Mux(
Mux(read_high, m_coeff.dat_r[w.coeff:], state_sel,
m_coeff.dat_r))) m_state.dat_r[w.state - w.coeff:],
Mux(
read_high,
m_coeff.dat_r[w.coeff:],
m_coeff.dat_r[:w.coeff])))
] ]