summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/aquarium.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/aquarium.c')
-rw-r--r--src/mame/drivers/aquarium.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/src/mame/drivers/aquarium.c b/src/mame/drivers/aquarium.c
index a4b07febecb..e431df4ed57 100644
--- a/src/mame/drivers/aquarium.c
+++ b/src/mame/drivers/aquarium.c
@@ -125,15 +125,15 @@ static UINT8 aquarium_snd_bitswap(UINT8 scrambled_data)
return data;
}
-static READ8_HANDLER( aquarium_oki_r )
+static READ8_DEVICE_HANDLER( aquarium_oki_r )
{
- return (aquarium_snd_bitswap(okim6295_status_0_r(space,0)) );
+ return (aquarium_snd_bitswap(okim6295_r(device,0)) );
}
-static WRITE8_HANDLER( aquarium_oki_w )
+static WRITE8_DEVICE_HANDLER( aquarium_oki_w )
{
- logerror("Z80-PC:%04x Writing %04x to the OKI M6295\n",cpu_get_previouspc(space->cpu),aquarium_snd_bitswap(data));
- okim6295_data_0_w( space, 0, (aquarium_snd_bitswap(data)) );
+ logerror("%s:Writing %04x to the OKI M6295\n",cpuexec_describe_context(device->machine),aquarium_snd_bitswap(data));
+ okim6295_w( device, 0, (aquarium_snd_bitswap(data)) );
}
@@ -165,9 +165,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( snd_portmap, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_WRITE(ym2151_register_port_0_w)
- AM_RANGE(0x01, 0x01) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
- AM_RANGE(0x02, 0x02) AM_READWRITE(aquarium_oki_r, aquarium_oki_w)
+ AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w)
+ AM_RANGE(0x02, 0x02) AM_DEVREADWRITE(SOUND, "oki", aquarium_oki_r, aquarium_oki_w)
AM_RANGE(0x04, 0x04) AM_READ(soundlatch_r)
AM_RANGE(0x06, 0x06) AM_WRITE(aquarium_snd_ack_w)
AM_RANGE(0x08, 0x08) AM_WRITE(aquarium_z80_bank_w)
@@ -330,9 +329,9 @@ static GFXDECODE_START( aquarium )
GFXDECODE_ENTRY( "gfx4", 0, char5bpplayout, 0x400, 32 )
GFXDECODE_END
-static void irq_handler(running_machine *machine, int irq)
+static void irq_handler(const device_config *device, int irq)
{
- cpu_set_input_line(machine->cpu[1], 0 , irq ? ASSERT_LINE : CLEAR_LINE );
+ cpu_set_input_line(device->machine->cpu[1], 0 , irq ? ASSERT_LINE : CLEAR_LINE );
}
static const ym2151_interface ym2151_config =