summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/rohga.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/rohga.c')
-rw-r--r--src/mame/drivers/rohga.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/mame/drivers/rohga.c b/src/mame/drivers/rohga.c
index c2633622e4c..f0e1ee05baf 100644
--- a/src/mame/drivers/rohga.c
+++ b/src/mame/drivers/rohga.c
@@ -325,9 +325,9 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM)
AM_RANGE(0x100000, 0x100001) AM_READ(SMH_NOP)
- AM_RANGE(0x110000, 0x110001) AM_READ(ym2151_status_port_0_r)
- AM_RANGE(0x120000, 0x120001) AM_READ(okim6295_status_0_r)
- AM_RANGE(0x130000, 0x130001) AM_READ(okim6295_status_1_r)
+ AM_RANGE(0x110000, 0x110001) AM_DEVREAD(SOUND, "ym", ym2151_r)
+ AM_RANGE(0x120000, 0x120001) AM_DEVREAD(SOUND, "oki1", okim6295_r)
+ AM_RANGE(0x130000, 0x130001) AM_DEVREAD(SOUND, "oki2", okim6295_r)
AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r)
AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(SMH_BANK8)
ADDRESS_MAP_END
@@ -335,9 +335,9 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_ROM)
AM_RANGE(0x100000, 0x100001) AM_WRITE(SMH_NOP)
- AM_RANGE(0x110000, 0x110001) AM_WRITE(ym2151_word_0_w)
- AM_RANGE(0x120000, 0x120001) AM_WRITE(okim6295_data_0_w)
- AM_RANGE(0x130000, 0x130001) AM_WRITE(okim6295_data_1_w)
+ AM_RANGE(0x110000, 0x110001) AM_DEVWRITE(SOUND, "ym", ym2151_w)
+ AM_RANGE(0x120000, 0x120001) AM_DEVWRITE(SOUND, "oki1", okim6295_w)
+ AM_RANGE(0x130000, 0x130001) AM_DEVWRITE(SOUND, "oki2", okim6295_w)
AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_BANK8)
AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(h6280_timer_w)
AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w)
@@ -789,15 +789,15 @@ GFXDECODE_END
/**********************************************************************************/
-static void sound_irq(running_machine *machine, int state)
+static void sound_irq(const device_config *device, int state)
{
- cpu_set_input_line(machine->cpu[1],1,state); /* IRQ 2 */
+ cpu_set_input_line(device->machine->cpu[1],1,state); /* IRQ 2 */
}
-static WRITE8_HANDLER( sound_bankswitch_w )
+static WRITE8_DEVICE_HANDLER( sound_bankswitch_w )
{
- okim6295_set_bank_base(0, ((data & 1)>>0) * 0x40000);
- okim6295_set_bank_base(1, ((data & 2)>>1) * 0x40000);
+ okim6295_set_bank_base(devtag_get_device(device->machine, SOUND, "oki1"), ((data & 1)>>0) * 0x40000);
+ okim6295_set_bank_base(devtag_get_device(device->machine, SOUND, "oki2"), ((data & 2)>>1) * 0x40000);
}
static const ym2151_interface ym2151_config =