summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/psychic5.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/psychic5.c')
-rw-r--r--src/mame/drivers/psychic5.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/src/mame/drivers/psychic5.c b/src/mame/drivers/psychic5.c
index 72d0ccb9b10..402f7b11bd7 100644
--- a/src/mame/drivers/psychic5.c
+++ b/src/mame/drivers/psychic5.c
@@ -448,10 +448,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( psychic5_soundport_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_WRITE(ym2203_control_port_0_w)
- AM_RANGE(0x01, 0x01) AM_WRITE(ym2203_write_port_0_w)
- AM_RANGE(0x80, 0x80) AM_WRITE(ym2203_control_port_1_w)
- AM_RANGE(0x81, 0x81) AM_WRITE(ym2203_write_port_1_w)
+ AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ym1", ym2203_w)
+ AM_RANGE(0x80, 0x81) AM_DEVWRITE(SOUND, "ym2", ym2203_w)
ADDRESS_MAP_END
@@ -483,10 +481,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( bombsa_soundport_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
- AM_RANGE(0x01, 0x01) AM_READWRITE(ym2203_read_port_0_r, ym2203_write_port_0_w)
- AM_RANGE(0x80, 0x80) AM_READWRITE(ym2203_status_port_1_r, ym2203_control_port_1_w)
- AM_RANGE(0x81, 0x81) AM_READWRITE(ym2203_read_port_1_r, ym2203_write_port_1_w)
+ AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym1", ym2203_r, ym2203_w)
+ AM_RANGE(0x80, 0x81) AM_DEVREADWRITE(SOUND, "ym2", ym2203_r, ym2203_w)
ADDRESS_MAP_END
@@ -666,9 +662,9 @@ GFXDECODE_END
-static void irqhandler(running_machine *machine, int irq)
+static void irqhandler(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 ym2203_interface ym2203_config =
@@ -676,7 +672,7 @@ static const ym2203_interface ym2203_config =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
- NULL, NULL, NULL, NULL
+ DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
},
irqhandler
};