[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/25] gus: Convert to isa_register_portio_list
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 15/25] gus: Convert to isa_register_portio_list |
Date: |
Thu, 6 Oct 2011 12:23:25 +0200 |
From: Richard Henderson <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
Signed-off-by: Avi Kivity <address@hidden>
---
hw/gus.c | 39 +++++++++++++++++++--------------------
1 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/hw/gus.c b/hw/gus.c
index 37e543a..1532686 100644
--- a/hw/gus.c
+++ b/hw/gus.c
@@ -232,6 +232,22 @@ static int GUS_read_DMA (void *opaque, int nchan, int
dma_pos, int dma_len)
}
};
+static const MemoryRegionPortio gus_portio_list1[] = {
+ {0x000, 1, 1, .write = gus_writeb },
+ {0x000, 1, 2, .write = gus_writew },
+ {0x006, 10, 1, .read = gus_readb, .write = gus_writeb },
+ {0x006, 10, 2, .read = gus_readw, .write = gus_writew },
+ {0x100, 8, 1, .read = gus_readb, .write = gus_writeb },
+ {0x100, 8, 2, .read = gus_readw, .write = gus_writew },
+ PORTIO_END_OF_LIST(),
+};
+
+static const MemoryRegionPortio gus_portio_list2[] = {
+ {0, 1, 1, .read = gus_readb },
+ {0, 1, 2, .read = gus_readw },
+ PORTIO_END_OF_LIST(),
+};
+
static int gus_initfn (ISADevice *dev)
{
GUSState *s = DO_UPCAST(GUSState, dev, dev);
@@ -262,26 +278,9 @@ static int gus_initfn (ISADevice *dev)
s->samples = AUD_get_buffer_size_out (s->voice) >> s->shift;
s->mixbuf = g_malloc0 (s->samples << s->shift);
- register_ioport_write (s->port, 1, 1, gus_writeb, s);
- register_ioport_write (s->port, 1, 2, gus_writew, s);
- isa_init_ioport_range(dev, s->port, 2);
-
- register_ioport_read ((s->port + 0x100) & 0xf00, 1, 1, gus_readb, s);
- register_ioport_read ((s->port + 0x100) & 0xf00, 1, 2, gus_readw, s);
- isa_init_ioport_range(dev, (s->port + 0x100) & 0xf00, 2);
-
- register_ioport_write (s->port + 6, 10, 1, gus_writeb, s);
- register_ioport_write (s->port + 6, 10, 2, gus_writew, s);
- register_ioport_read (s->port + 6, 10, 1, gus_readb, s);
- register_ioport_read (s->port + 6, 10, 2, gus_readw, s);
- isa_init_ioport_range(dev, s->port + 6, 10);
-
-
- register_ioport_write (s->port + 0x100, 8, 1, gus_writeb, s);
- register_ioport_write (s->port + 0x100, 8, 2, gus_writew, s);
- register_ioport_read (s->port + 0x100, 8, 1, gus_readb, s);
- register_ioport_read (s->port + 0x100, 8, 2, gus_readw, s);
- isa_init_ioport_range(dev, s->port + 0x100, 8);
+ isa_register_portio_list(dev, s->port, gus_portio_list1, s, "gus");
+ isa_register_portio_list(dev, (s->port + 0x100) & 0xf00,
+ gus_portio_list2, s, "gus");
DMA_register_channel (s->emu.gusdma, GUS_read_DMA, s);
s->emu.himemaddr = s->himem;
--
1.7.6.3
- [Qemu-devel] [PATCH 10/25] isa: Tidy support code for isabus_get_fw_dev_path, (continued)
- [Qemu-devel] [PATCH 10/25] isa: Tidy support code for isabus_get_fw_dev_path, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 13/25] isa: Add isa_register_portio_list(), Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 08/25] hw/versatile_pci: Expose multiple sysbus mmio regions, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 04/25] petalogix_ml605: convert to memory API, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 12/25] memory: Fix old portio word accesses, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 19/25] parallel: Convert to isa_register_portio_list, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 18/25] ne2000: Convert to isa_register_ioport, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 21/25] vga: Convert to isa_register_portio_list, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 20/25] sb16: Convert to isa_register_portio_list, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 06/25] ppc405_boards: convert to memory API, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 15/25] gus: Convert to isa_register_portio_list,
Avi Kivity <=
- [Qemu-devel] [PATCH 17/25] rtc: Convert to isa_register_ioport, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 16/25] m48t59: Convert to isa_register_ioport, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 22/25] pc: Convert port92 to isa_register_ioport, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 23/25] vmport: Convert to isa_register_ioport, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 11/25] Introduce PortioList, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 24/25] ide: Convert to isa_register_portio_list, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 25/25] isa: Remove isa_init_ioport_range and isa_init_ioport, Avi Kivity, 2011/10/06