Skip to content

Commit

Permalink
gateware: extend mailbox to 3 entries.
Browse files Browse the repository at this point in the history
whitequark committed Oct 21, 2016
1 parent 6aa13fb commit 6872017
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions artiq/gateware/amp/mailbox.py
Original file line number Diff line number Diff line change
@@ -3,19 +3,19 @@


class Mailbox(Module):
def __init__(self):
def __init__(self, size=1):
self.i1 = wishbone.Interface()
self.i2 = wishbone.Interface()

# # #

value = Signal(32)
values = Array([Signal(32) for _ in range(size)])
for i in self.i1, self.i2:
self.sync += [
i.dat_r.eq(value),
i.dat_r.eq(values[i.adr]),
i.ack.eq(0),
If(i.cyc & i.stb & ~i.ack,
i.ack.eq(1),
If(i.we, value.eq(i.dat_w))
If(i.we, values[i.adr].eq(i.dat_w))
)
]
2 changes: 1 addition & 1 deletion artiq/gateware/soc.py
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ def __init__(self):
self.add_cpulevel_sdram_if(self.kernel_cpu.wb_sdram)
self.csr_devices.append("kernel_cpu")

self.submodules.mailbox = amp.Mailbox()
self.submodules.mailbox = amp.Mailbox(size=3)
self.add_wb_slave(mem_decoder(self.mem_map["mailbox"]),
self.mailbox.i1)
self.kernel_cpu.add_wb_slave(mem_decoder(self.mem_map["mailbox"]),

0 comments on commit 6872017

Please sign in to comment.