diff options
Diffstat (limited to 'src/mame/drivers/ddragon3.c')
-rw-r--r-- | src/mame/drivers/ddragon3.c | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/src/mame/drivers/ddragon3.c b/src/mame/drivers/ddragon3.c index f6a1dd26914..99780cac46d 100644 --- a/src/mame/drivers/ddragon3.c +++ b/src/mame/drivers/ddragon3.c @@ -165,9 +165,9 @@ extern VIDEO_UPDATE( ctribe ); * *************************************/ -static WRITE8_HANDLER( oki_bankswitch_w ) +static WRITE8_DEVICE_HANDLER( oki_bankswitch_w ) { - okim6295_set_bank_base(0, (data & 1) * 0x40000); + okim6295_set_bank_base(device, (data & 1) * 0x40000); } static WRITE16_HANDLER( ddragon3_io16_w ) @@ -295,34 +295,32 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) - AM_RANGE(0xc801, 0xc801) AM_READ(ym2151_status_port_0_r) - AM_RANGE(0xd800, 0xd800) AM_READ(okim6295_status_0_r) + AM_RANGE(0xc800, 0xc801) AM_DEVREAD(SOUND, "ym2151", ym2151_r) + AM_RANGE(0xd800, 0xd800) AM_DEVREAD(SOUND, "oki", okim6295_r) AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xc800, 0xc800) AM_WRITE(ym2151_register_port_0_w) - AM_RANGE(0xc801, 0xc801) AM_WRITE(ym2151_data_port_0_w) - AM_RANGE(0xd800, 0xd800) AM_WRITE(okim6295_data_0_w) - AM_RANGE(0xe800, 0xe800) AM_WRITE(oki_bankswitch_w) + AM_RANGE(0xc800, 0xc801) AM_DEVWRITE(SOUND, "ym2151", ym2151_w) + AM_RANGE(0xd800, 0xd800) AM_DEVWRITE(SOUND, "oki", okim6295_w) + AM_RANGE(0xe800, 0xe800) AM_DEVWRITE(SOUND, "oki", oki_bankswitch_w) ADDRESS_MAP_END static ADDRESS_MAP_START( ctribe_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) - AM_RANGE(0x8801, 0x8801) AM_READ(ym2151_status_port_0_r) - AM_RANGE(0x9800, 0x9800) AM_READ(okim6295_status_0_r) + AM_RANGE(0x8801, 0x8801) AM_DEVREAD(SOUND, "ym2151", ym2151_status_port_r) + AM_RANGE(0x9800, 0x9800) AM_DEVREAD(SOUND, "oki", okim6295_r) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( ctribe_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x8800, 0x8800) AM_WRITE(ym2151_register_port_0_w) - AM_RANGE(0x8801, 0x8801) AM_WRITE(ym2151_data_port_0_w) - AM_RANGE(0x9800, 0x9800) AM_WRITE(okim6295_data_0_w) + AM_RANGE(0x8800, 0x8801) AM_DEVWRITE(SOUND, "ym2151", ym2151_w) + AM_RANGE(0x9800, 0x9800) AM_DEVWRITE(SOUND, "oki", okim6295_w) ADDRESS_MAP_END /************************************* @@ -569,9 +567,9 @@ GFXDECODE_END * *************************************/ -static void dd3_ymirq_handler(running_machine *machine, int irq) +static void dd3_ymirq_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 = |