diff options
Diffstat (limited to 'src/mame/drivers/wwfwfest.c')
-rw-r--r-- | src/mame/drivers/wwfwfest.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/mame/drivers/wwfwfest.c b/src/mame/drivers/wwfwfest.c index e53c0cacaad..9a256ca9ba6 100644 --- a/src/mame/drivers/wwfwfest.c +++ b/src/mame/drivers/wwfwfest.c @@ -53,7 +53,7 @@ static READ16_HANDLER( wwfwfest_paletteram16_xxxxBBBBGGGGRRRR_word_r ); static WRITE16_HANDLER( wwfwfest_paletteram16_xxxxBBBBGGGGRRRR_word_w ); static WRITE16_HANDLER( wwfwfest_1410_write ); /* priority write */ static WRITE16_HANDLER( wwfwfest_scroll_write ); /* scrolling write */ -static WRITE8_HANDLER( oki_bankswitch_w ); +static WRITE8_DEVICE_HANDLER( oki_bankswitch_w ); static WRITE16_HANDLER ( wwfwfest_soundwrite ); static WRITE16_HANDLER ( wwfwfest_flipscreen_w ); static WRITE16_HANDLER ( wwfwfest_irq_ack_w ); @@ -88,11 +88,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xc7ff) AM_RAM - AM_RANGE(0xc800, 0xc800) AM_WRITE(ym2151_register_port_0_w) - AM_RANGE(0xc801, 0xc801) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w) - AM_RANGE(0xd800, 0xd800) AM_READWRITE(okim6295_status_0_r,okim6295_data_0_w) + AM_RANGE(0xc800, 0xc801) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0xd800, 0xd800) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r) - AM_RANGE(0xe800, 0xe800) AM_WRITE(oki_bankswitch_w) + AM_RANGE(0xe800, 0xe800) AM_DEVWRITE(SOUND, "oki", oki_bankswitch_w) ADDRESS_MAP_END /******************************************************************************* @@ -159,9 +158,9 @@ static WRITE16_HANDLER( wwfwfest_scroll_write ) /*- Sound Related (from dd3) -*/ -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 ( wwfwfest_soundwrite ) @@ -370,9 +369,9 @@ static TIMER_DEVICE_CALLBACK( wwfwfest_scanline ) Straight from Ddragon 3 with some adjusted volumes *******************************************************************************/ -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 = |