diff options
Diffstat (limited to 'src/mame/drivers/exprraid.c')
-rw-r--r-- | src/mame/drivers/exprraid.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/mame/drivers/exprraid.c b/src/mame/drivers/exprraid.c index 3a4f053b9a5..ba6d94e7ffa 100644 --- a/src/mame/drivers/exprraid.c +++ b/src/mame/drivers/exprraid.c @@ -212,7 +212,7 @@ Stephh's notes (based on the games M6502 code and some tests) : #include "cpu/m6502/m6502.h" #include "cpu/m6809/m6809.h" #include "sound/2203intf.h" -#include "sound/3812intf.h" +#include "sound/3526intf.h" extern WRITE8_HANDLER( exprraid_videoram_w ); @@ -282,10 +282,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( slave_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_RAM - AM_RANGE(0x2000, 0x2000) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w) - AM_RANGE(0x2001, 0x2001) AM_READWRITE(ym2203_read_port_0_r, ym2203_write_port_0_w) - AM_RANGE(0x4000, 0x4000) AM_READWRITE(ym3526_status_port_0_r, ym3526_control_port_0_w) - AM_RANGE(0x4001, 0x4001) AM_WRITE(ym3526_write_port_0_w) + AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE(SOUND, "ym1", ym2203_r, ym2203_w) + AM_RANGE(0x4000, 0x4001) AM_DEVREADWRITE(SOUND, "ym2", ym3526_r, ym3526_w) AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -435,9 +433,9 @@ GFXDECODE_END /* handler called by the 3812 emulator when the internal timers cause an IRQ */ -static void irqhandler(running_machine *machine, int linestate) +static void irqhandler(const device_config *device, int linestate) { - cpu_set_input_line_and_vector(machine->cpu[1],0,linestate,0xff); + cpu_set_input_line_and_vector(device->machine->cpu[1],0,linestate,0xff); } static const ym3526_interface ym3526_config = |