[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/16] sb16: Convert to isa_register_portio_list.
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 11/16] sb16: Convert to isa_register_portio_list. |
Date: |
Tue, 23 Aug 2011 17:13:50 -0700 |
Signed-off-by: Richard Henderson <address@hidden>
---
hw/sb16.c | 32 +++++++++++++-------------------
1 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/hw/sb16.c b/hw/sb16.c
index a76df1b..fe927e2 100644
--- a/hw/sb16.c
+++ b/hw/sb16.c
@@ -1341,12 +1341,21 @@ static const VMStateDescription vmstate_sb16 = {
}
};
+static const MemoryRegionPortio sb16_ioport_list[] = {
+ { 4, 1, 1, .write = mixer_write_indexb },
+ { 4, 1, 2, .write = mixer_write_indexw },
+ { 5, 1, 1, .read = mixer_read, .write = mixer_write_datab },
+ { 6, 1, 1, .read = dsp_read, .write = dsp_write },
+ { 10, 1, 1, .read = dsp_read },
+ { 12, 1, 1, .write = dsp_write },
+ { 12, 4, 1, .read = dsp_read },
+ PORTIO_END_OF_LIST(),
+};
+
+
static int sb16_initfn (ISADevice *dev)
{
- static const uint8_t dsp_write_ports[] = {0x6, 0xc};
- static const uint8_t dsp_read_ports[] = {0x6, 0xa, 0xc, 0xd, 0xe, 0xf};
SB16State *s;
- int i;
s = DO_UPCAST (SB16State, dev, dev);
@@ -1366,22 +1375,7 @@ static int sb16_initfn (ISADevice *dev)
dolog ("warning: Could not create auxiliary timer\n");
}
- for (i = 0; i < ARRAY_SIZE (dsp_write_ports); i++) {
- register_ioport_write (s->port + dsp_write_ports[i], 1, 1, dsp_write,
s);
- isa_init_ioport(dev, s->port + dsp_write_ports[i]);
- }
-
- for (i = 0; i < ARRAY_SIZE (dsp_read_ports); i++) {
- register_ioport_read (s->port + dsp_read_ports[i], 1, 1, dsp_read, s);
- isa_init_ioport(dev, s->port + dsp_read_ports[i]);
- }
-
- register_ioport_write (s->port + 0x4, 1, 1, mixer_write_indexb, s);
- register_ioport_write (s->port + 0x4, 1, 2, mixer_write_indexw, s);
- isa_init_ioport(dev, s->port + 0x4);
- register_ioport_read (s->port + 0x5, 1, 1, mixer_read, s);
- register_ioport_write (s->port + 0x5, 1, 1, mixer_write_datab, s);
- isa_init_ioport(dev, s->port + 0x5);
+ isa_register_portio_list(dev, s->port, sb16_ioport_list, s, "sb16");
DMA_register_channel (s->hdma, SB_read_DMA, s);
DMA_register_channel (s->dma, SB_read_DMA, s);
--
1.7.4.4
- [Qemu-devel] [PATCH 00/16] isa_register_portio_list, v2, Richard Henderson, 2011/08/23
- [Qemu-devel] [PATCH 01/16] fixup: merge with last sm501 patch, Richard Henderson, 2011/08/23
- [Qemu-devel] [PATCH 02/16] fixup: merge with last arm_sysctl patch, Richard Henderson, 2011/08/23
- [Qemu-devel] [PATCH 03/16] isa: Tidy support code for isabus_get_fw_dev_path., Richard Henderson, 2011/08/23
- [Qemu-devel] [PATCH 04/16] isa: Add isa_register_portio_list()., Richard Henderson, 2011/08/23
- [Qemu-devel] [PATCH 05/16] fdc: Convert to isa_register_portio_list., Richard Henderson, 2011/08/23
- [Qemu-devel] [PATCH 06/16] gus: Convert to isa_register_portio_list., Richard Henderson, 2011/08/23
- [Qemu-devel] [PATCH 07/16] m48t59: Convert to isa_register_ioport., Richard Henderson, 2011/08/23
- [Qemu-devel] [PATCH 09/16] ne2000: Convert to isa_register_ioport., Richard Henderson, 2011/08/23
- [Qemu-devel] [PATCH 10/16] parallel: Convert to isa_register_portio_list., Richard Henderson, 2011/08/23
- [Qemu-devel] [PATCH 11/16] sb16: Convert to isa_register_portio_list.,
Richard Henderson <=
- [Qemu-devel] [PATCH 08/16] rtc: Convert to isa_register_ioport., Richard Henderson, 2011/08/23
- [Qemu-devel] [PATCH 13/16] pc: Convert port92 to isa_register_ioport., Richard Henderson, 2011/08/23
- [Qemu-devel] [PATCH 12/16] vga: Convert to isa_register_portio_list., Richard Henderson, 2011/08/23
- [Qemu-devel] [PATCH 15/16] ide: Convert to isa_register_portio_list., Richard Henderson, 2011/08/23
- [Qemu-devel] [PATCH 16/16] isa: Remove isa_init_ioport_range and isa_init_ioport., Richard Henderson, 2011/08/23
- [Qemu-devel] [PATCH 14/16] vmport: Convert to isa_register_ioport., Richard Henderson, 2011/08/23
- Re: [Qemu-devel] [PATCH 00/16] isa_register_portio_list, v2, Avi Kivity, 2011/08/24
- Re: [Qemu-devel] [PATCH 00/16] isa_register_portio_list, v2, malc, 2011/08/24