diff options
Diffstat (limited to 'src/mame/drivers/argus.c')
-rw-r--r-- | src/mame/drivers/argus.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/mame/drivers/argus.c b/src/mame/drivers/argus.c index b24f4a1b335..f39f73dbcbd 100644 --- a/src/mame/drivers/argus.c +++ b/src/mame/drivers/argus.c @@ -108,9 +108,9 @@ static INTERRUPT_GEN( argus_interrupt ) } /* Handler called by the YM2203 emulator when the internal timers cause an IRQ */ -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 = @@ -118,7 +118,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 }; @@ -236,17 +236,14 @@ ADDRESS_MAP_END #if 0 static ADDRESS_MAP_START( sound_portmap_1, 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(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym1", ym2203_r, ym2203_w) ADDRESS_MAP_END #endif static ADDRESS_MAP_START( sound_portmap_2, 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 @@ -546,7 +543,7 @@ static MACHINE_DRIVER_START( argus ) MDRV_SPEAKER_STANDARD_MONO("mono") #if 0 - MDRV_SOUND_ADD("ym", YM2203, 6000000 / 4) + MDRV_SOUND_ADD("ym1", YM2203, 6000000 / 4) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(0, "mono", 0.15) MDRV_SOUND_ROUTE(1, "mono", 0.15) |