mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sb16: Convert to isa_register_portio_list

Browse Source 
Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Richard Henderson 2011-08-15 16:10:47 -07:00 committed by Avi Kivity
parent 1922abd0a2
commit 42c1a22de7
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
hw/sb16.c
View File

@ -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 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; SB16State *s;
int i;
s = DO_UPCAST (SB16State, dev, dev); s = DO_UPCAST (SB16State, dev, dev);
@ -1366,22 +1375,7 @@ static int sb16_initfn (ISADevice *dev)
dolog ("warning: Could not create auxiliary timer\n"); dolog ("warning: Could not create auxiliary timer\n");
} }
for (i = 0; i < ARRAY_SIZE (dsp_write_ports); i++) { isa_register_portio_list (dev, s->port, sb16_ioport_list, s, "sb16");
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);
DMA_register_channel (s->hdma, SB_read_DMA, s); DMA_register_channel (s->hdma, SB_read_DMA, s);
DMA_register_channel (s->dma, SB_read_DMA, s); DMA_register_channel (s->dma, SB_read_DMA, s);