From 93efc7297e3caf7c445911ea04ffedf19b9c5559 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Tue, 25 Jun 2013 19:14:13 +0200 Subject: [PATCH] Revert "dvisampler/dma: buffer full memory words" This reverts commit 1c8ef0fe3e5a799ce811b0052a073481e26181a4. --- milkymist/dvisampler/dma.py | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/milkymist/dvisampler/dma.py b/milkymist/dvisampler/dma.py index 79374b2b..48442bfe 100644 --- a/milkymist/dvisampler/dma.py +++ b/milkymist/dvisampler/dma.py @@ -3,7 +3,6 @@ from migen.genlib.fsm import FSM from migen.bank.description import * from migen.bank.eventmanager import * from migen.flow.actor import * -from migen.genlib.fifo import SyncFIFO from migen.actorlib import dma_lasmi from milkymist.dvisampler.common import frame_layout @@ -55,27 +54,6 @@ class _SlotArray(Module, AutoCSR): ] self.comb += [slot.address_done.eq(self.address_done & (current_slot == n)) for n, slot in enumerate(slots)] -class _BufferedWriter(Module): - def __init__(self, lasmim, depth=4): - self.address_data = Sink([("a", lasmim.aw), ("d", lasmim.dw)]) - self.busy = Signal() - - ### - - self.submodules.writer = dma_lasmi.Writer(lasmim) - self.submodules.fifo = SyncFIFO(lasmim.aw + lasmim.dw, depth) - self.comb += [ - self.fifo.din.eq(self.address_data.payload.raw_bits()), - self.fifo.we.eq(self.address_data.stb), - self.address_data.ack.eq(self.fifo.writable), - - self.writer.address_data.payload.raw_bits().eq(self.fifo.dout), - self.fifo.re.eq(self.writer.address_data.ack), - self.writer.address_data.stb.eq(self.fifo.readable), - - self.busy.eq(self.writer.busy | self.fifo.readable) - ] - class DMA(Module): def __init__(self, lasmim, nslots): bus_aw = lasmim.aw @@ -134,7 +112,7 @@ class DMA(Module): ) # bus accessor - self.submodules._bus_accessor = _BufferedWriter(lasmim) + self.submodules._bus_accessor = dma_lasmi.Writer(lasmim) self.comb += [ self._bus_accessor.address_data.payload.a.eq(current_address), self._bus_accessor.address_data.payload.d.eq(cur_memory_word) -- 2.30.2