summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/spbactn.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/spbactn.c')
-rw-r--r--src/mame/drivers/spbactn.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/mame/drivers/spbactn.c b/src/mame/drivers/spbactn.c
index d2dc64526f3..6ce6be26307 100644
--- a/src/mame/drivers/spbactn.c
+++ b/src/mame/drivers/spbactn.c
@@ -203,7 +203,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM)
AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM)
- AM_RANGE(0xf800, 0xf800) AM_READ(okim6295_status_0_r)
+ AM_RANGE(0xf800, 0xf800) AM_DEVREAD(SOUND, "oki", okim6295_r)
AM_RANGE(0xfc00, 0xfc00) AM_READ(SMH_NOP) /* irq ack ?? */
AM_RANGE(0xfc20, 0xfc20) AM_READ(soundlatch_r)
ADDRESS_MAP_END
@@ -211,9 +211,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM)
AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM)
- AM_RANGE(0xf800, 0xf800) AM_WRITE(okim6295_data_0_w)
- AM_RANGE(0xf810, 0xf810) AM_WRITE(ym3812_control_port_0_w)
- AM_RANGE(0xf811, 0xf811) AM_WRITE(ym3812_write_port_0_w)
+ AM_RANGE(0xf800, 0xf800) AM_DEVWRITE(SOUND, "oki", okim6295_w)
+ AM_RANGE(0xf810, 0xf811) AM_DEVWRITE(SOUND, "ym", ym3812_w)
AM_RANGE(0xfc00, 0xfc00) AM_WRITE(SMH_NOP) /* irq ack ?? */
ADDRESS_MAP_END
@@ -343,9 +342,9 @@ static GFXDECODE_START( spbactn )
GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 0x0000, 16 + 384 )
GFXDECODE_END
-static void irqhandler(running_machine *machine, int linestate)
+static void irqhandler(const device_config *device, int linestate)
{
- cpu_set_input_line(machine->cpu[1],0,linestate);
+ cpu_set_input_line(device->machine->cpu[1],0,linestate);
}
static const ym3812_interface ym3812_config =