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

gateware.spi: rework wb bus sequence

This commit is contained in:
Robert Jördens 2016-02-29 22:22:08 +01:00
parent 12252abc8f
commit da22ec73df
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
artiq/gateware/spi.py
View File

@ -292,14 +292,12 @@ class SPIMaster(Module):
data_width, clock_width=len(config.div_read), data_width, clock_width=len(config.div_read),
bits_width=len(xfer.read_length)) bits_width=len(xfer.read_length))
wb_we = Signal()
pending = Signal() pending = Signal()
cs = Signal.like(xfer.cs) cs = Signal.like(xfer.cs)
data_read = Signal.like(spi.reg.data) data_read = Signal.like(spi.reg.data)
data_write = Signal.like(spi.reg.data) data_write = Signal.like(spi.reg.data)
self.comb += [ self.comb += [
wb_we.eq(bus.cyc & bus.stb & bus.we & (~pending | spi.done)),
bus.dat_r.eq( bus.dat_r.eq(
Array([data_read, xfer.raw_bits(), config.raw_bits() Array([data_read, xfer.raw_bits(), config.raw_bits()
])[bus.adr]), ])[bus.adr]),
@ -310,13 +308,6 @@ class SPIMaster(Module):
spi.div_read.eq(config.div_read), spi.div_read.eq(config.div_read),
] ]
self.sync += [ self.sync += [
bus.ack.eq(bus.cyc & bus.stb & (~bus.we | ~pending | spi.done)),
If(wb_we,
Array([data_write, xfer.raw_bits(), config.raw_bits()
])[bus.adr].eq(bus.dat_w)
),
config.active.eq(spi.cs),
config.pending.eq(pending),
If(spi.done, If(spi.done,
data_read.eq(spi.reg.data), data_read.eq(spi.reg.data),
), ),
@ -327,9 +318,19 @@ class SPIMaster(Module):
spi.reg.data.eq(data_write), spi.reg.data.eq(data_write),
pending.eq(0), pending.eq(0),
), ),
If(wb_we & (bus.adr == 0), # data register bus.ack.eq(bus.cyc & bus.stb & (~bus.we | ~pending | spi.done)),
pending.eq(1), If(bus.ack,
bus.ack.eq(0),
), ),
If(bus.we & bus.ack,
Array([data_write, xfer.raw_bits(), config.raw_bits()
])[bus.adr].eq(bus.dat_w),
If(bus.adr == 0, # data register
pending.eq(1),
),
),
config.active.eq(spi.cs),
config.pending.eq(pending),
] ]
# I/O # I/O