[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/17] gus: use IsaDma interface instead of global D
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [PATCH 15/17] gus: use IsaDma interface instead of global DMA_* functions |
Date: |
Tue, 29 Dec 2015 09:04:53 +0100 |
Signed-off-by: Hervé Poussineau <address@hidden>
---
hw/audio/gus.c | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/hw/audio/gus.c b/hw/audio/gus.c
index e0c8a4e..b027eb5 100644
--- a/hw/audio/gus.c
+++ b/hw/audio/gus.c
@@ -57,6 +57,7 @@ typedef struct GUSState {
SWVoiceOut *voice;
int64_t last_ticks;
qemu_irq pic;
+ IsaDma *isa_dma;
} GUSState;
static uint32_t gus_readb(void *opaque, uint32_t nport)
@@ -167,34 +168,36 @@ void GUS_irqclear (GUSEmuState *emu, int hwirq)
#endif
}
-void GUS_dmarequest (GUSEmuState *der)
+void GUS_dmarequest (GUSEmuState *emu)
{
- /* GUSState *s = (GUSState *) der; */
+ GUSState *s = emu->opaque;
+ IsaDmaClass *k = ISADMA_GET_CLASS(s->isa_dma);
ldebug ("dma request %d\n", der->gusdma);
- DMA_hold_DREQ (der->gusdma);
+ k->hold_DREQ(s->isa_dma, s->emu.gusdma);
}
static int GUS_read_DMA (void *opaque, int nchan, int dma_pos, int dma_len)
{
GUSState *s = opaque;
+ IsaDmaClass *k = ISADMA_GET_CLASS(s->isa_dma);
char tmpbuf[4096];
int pos = dma_pos, mode, left = dma_len - dma_pos;
ldebug ("read DMA %#x %d\n", dma_pos, dma_len);
- mode = DMA_get_channel_mode (s->emu.gusdma);
+ mode = k->has_autoinitialization(s->isa_dma, s->emu.gusdma);
while (left) {
int to_copy = audio_MIN ((size_t) left, sizeof (tmpbuf));
int copied;
ldebug ("left=%d to_copy=%d pos=%d\n", left, to_copy, pos);
- copied = DMA_read_memory (nchan, tmpbuf, pos, to_copy);
+ copied = k->read_memory(s->isa_dma, nchan, tmpbuf, pos, to_copy);
gus_dma_transferdata (&s->emu, tmpbuf, copied, left == copied);
left -= copied;
pos += copied;
}
if (((mode >> 4) & 1) == 0) {
- DMA_release_DREQ (s->emu.gusdma);
+ k->release_DREQ(s->isa_dma, s->emu.gusdma);
}
return dma_len;
}
@@ -231,6 +234,7 @@ static void gus_realizefn (DeviceState *dev, Error **errp)
{
ISADevice *d = ISA_DEVICE(dev);
GUSState *s = GUS (dev);
+ IsaDmaClass *k;
struct audsettings as;
AUD_register_card ("gus", &s->card);
@@ -263,7 +267,9 @@ static void gus_realizefn (DeviceState *dev, Error **errp)
isa_register_portio_list (d, (s->port + 0x100) & 0xf00,
gus_portio_list2, s, "gus");
- DMA_register_channel (s->emu.gusdma, GUS_read_DMA, s);
+ s->isa_dma = isa_get_dma(isa_bus_from_device(d), s->emu.gusdma);
+ k = ISADMA_GET_CLASS(s->isa_dma);
+ k->register_channel(s->isa_dma, s->emu.gusdma, GUS_read_DMA, s);
s->emu.himemaddr = s->himem;
s->emu.gusdatapos = s->emu.himemaddr + 1024 * 1024 + 32;
s->emu.opaque = s;
--
2.1.4
- [Qemu-devel] [PATCH 00/17] ISA DMA controllers cleanup (i8257, i82374), Hervé Poussineau, 2015/12/29
- [Qemu-devel] [PATCH 08/17] isa: add an ISA DMA interface, and store it within the ISA bus, Hervé Poussineau, 2015/12/29
- [Qemu-devel] [PATCH 06/17] i8257: add missing const, Hervé Poussineau, 2015/12/29
- [Qemu-devel] [PATCH 14/17] cs4231a: use IsaDma interface instead of global DMA_* functions, Hervé Poussineau, 2015/12/29
- [Qemu-devel] [PATCH 15/17] gus: use IsaDma interface instead of global DMA_* functions,
Hervé Poussineau <=
- [Qemu-devel] [PATCH 04/17] i8257: rename functions to start with i8257_ prefix, Hervé Poussineau, 2015/12/29
- [Qemu-devel] [PATCH 16/17] sb16: use IsaDma interface instead of global DMA_* functions, Hervé Poussineau, 2015/12/29
- [Qemu-devel] [PATCH 05/17] i8257: make the DMA running method per controller, Hervé Poussineau, 2015/12/29
- [Qemu-devel] [PATCH 03/17] i8257: rename struct dma_cont to I8257State, Hervé Poussineau, 2015/12/29
- [Qemu-devel] [PATCH 02/17] i8257: pass ISA bus to DMA_init() function, Hervé Poussineau, 2015/12/29
- [Qemu-devel] [PATCH 09/17] i8257: implement the IsaDma interface, Hervé Poussineau, 2015/12/29
- [Qemu-devel] [PATCH 10/17] magnum: disable floppy DMA for now, Hervé Poussineau, 2015/12/29
- [Qemu-devel] [PATCH 07/17] i8257: QOM'ify, Hervé Poussineau, 2015/12/29
- [Qemu-devel] [PATCH 01/17] i82374: device only existed as ISA device, so simplify device, Hervé Poussineau, 2015/12/29
- [Qemu-devel] [PATCH 12/17] sparc64: disable floppy DMA, Hervé Poussineau, 2015/12/29