aboutsummaryrefslogtreecommitdiff
path: root/hw/sb16.c
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2004-03-14 21:41:34 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2004-03-14 21:41:34 +0000
commit7d977de7e19b04c4bb0c95d5afe6d4350d4068e5 (patch)
tree68830a4d6ae437e5fa927a6edab355e60f2c6951 /hw/sb16.c
parent07d898662d9aa173ac2d5c0aa4c9a1cf39caa703 (diff)
downloadqemu-7d977de7e19b04c4bb0c95d5afe6d4350d4068e5.zip
qemu-7d977de7e19b04c4bb0c95d5afe6d4350d4068e5.tar.gz
qemu-7d977de7e19b04c4bb0c95d5afe6d4350d4068e5.tar.bz2
io port API change
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@661 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/sb16.c')
-rw-r--r--hw/sb16.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/hw/sb16.c b/hw/sb16.c
index 9fbf085..aee1d5f 100644
--- a/hw/sb16.c
+++ b/hw/sb16.c
@@ -50,9 +50,9 @@
#endif
#define IO_READ_PROTO(name) \
- uint32_t name (struct CPUState *env, uint32_t nport)
+ uint32_t name (void *opaque, uint32_t nport)
#define IO_WRITE_PROTO(name) \
- void name (struct CPUState *env, uint32_t nport, uint32_t val)
+ void name (void *opaque, uint32_t nport, uint32_t val)
static struct {
int ver_lo;
@@ -550,8 +550,8 @@ static IO_WRITE_PROTO(mixer_write_datab)
static IO_WRITE_PROTO(mixer_write_indexw)
{
- mixer_write_indexb (env, nport, val & 0xff);
- mixer_write_datab (env, nport, (val >> 8) & 0xff);
+ mixer_write_indexb (opaque, nport, val & 0xff);
+ mixer_write_datab (opaque, nport, (val >> 8) & 0xff);
}
static IO_READ_PROTO(mixer_read)
@@ -718,17 +718,17 @@ void SB16_init (void)
}
for (i = 0; i < LENOFA (dsp_write_ports); i++) {
- register_ioport_write (sb.port + dsp_write_ports[i], 1, dsp_write, 1);
+ register_ioport_write (sb.port + dsp_write_ports[i], 1, 1, dsp_write, NULL);
}
for (i = 0; i < LENOFA (dsp_read_ports); i++) {
- register_ioport_read (sb.port + dsp_read_ports[i], 1, dsp_read, 1);
+ register_ioport_read (sb.port + dsp_read_ports[i], 1, 1, dsp_read, NULL);
}
- register_ioport_write (sb.port + 0x4, 1, mixer_write_indexb, 1);
- register_ioport_write (sb.port + 0x4, 1, mixer_write_indexw, 2);
- register_ioport_read (sb.port + 0x5, 1, mixer_read, 1);
- register_ioport_write (sb.port + 0x5, 1, mixer_write_datab, 1);
+ register_ioport_write (sb.port + 0x4, 1, 1, mixer_write_indexb, NULL);
+ register_ioport_write (sb.port + 0x4, 1, 2, mixer_write_indexw, NULL);
+ register_ioport_read (sb.port + 0x5, 1, 1, mixer_read, NULL);
+ register_ioport_write (sb.port + 0x5, 1, 1, mixer_write_datab, NULL);
DMA_register_channel (sb.hdma, SB_read_DMA, NULL);
DMA_register_channel (sb.dma, SB_read_DMA, NULL);