diff options
Diffstat (limited to 'src/mame/drivers/lsasquad.c')
-rw-r--r-- | src/mame/drivers/lsasquad.c | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/src/mame/drivers/lsasquad.c b/src/mame/drivers/lsasquad.c index 5f0e06de0f8..5f1facb6bcd 100644 --- a/src/mame/drivers/lsasquad.c +++ b/src/mame/drivers/lsasquad.c @@ -199,8 +199,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) - AM_RANGE(0xa000, 0xa000) AM_READ(ym2203_status_port_0_r) - AM_RANGE(0xa001, 0xa001) AM_READ(ym2203_read_port_0_r) + AM_RANGE(0xa000, 0xa001) AM_DEVREAD(SOUND, "ym", ym2203_r) AM_RANGE(0xd000, 0xd000) AM_READ(lsasquad_sh_sound_command_r) AM_RANGE(0xd800, 0xd800) AM_READ(lsasquad_sound_status_r) AM_RANGE(0xe000, 0xefff) AM_READ(SMH_ROM) /* space for diagnostic ROM? */ @@ -209,10 +208,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xa000, 0xa000) AM_WRITE(ym2203_control_port_0_w) - AM_RANGE(0xa001, 0xa001) AM_WRITE(ym2203_write_port_0_w) - AM_RANGE(0xc000, 0xc000) AM_WRITE(ay8910_control_port_0_w) - AM_RANGE(0xc001, 0xc001) AM_WRITE(ay8910_write_port_0_w) + AM_RANGE(0xa000, 0xa001) AM_DEVWRITE(SOUND, "ym", ym2203_w) + AM_RANGE(0xc000, 0xc001) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) AM_RANGE(0xd000, 0xd000) AM_WRITE(lsasquad_sh_result_w) AM_RANGE(0xd400, 0xd400) AM_WRITE(lsasquad_sh_nmi_disable_w) AM_RANGE(0xd800, 0xd800) AM_WRITE(lsasquad_sh_nmi_enable_w) @@ -388,10 +385,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_mem_daikaiju, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0xa000, 0xa000) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w) - AM_RANGE(0xa001, 0xa001) AM_READWRITE(ym2203_read_port_0_r, ym2203_write_port_0_w) - AM_RANGE(0xc000, 0xc000) AM_WRITE(ay8910_control_port_0_w) - AM_RANGE(0xc001, 0xc001) AM_WRITE(ay8910_write_port_0_w) + AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) + AM_RANGE(0xc000, 0xc001) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) AM_RANGE(0xd000, 0xd000) AM_READ(daikaiju_sh_sound_command_r) AM_RANGE(0xd400, 0xd400) AM_WRITENOP AM_RANGE(0xd800, 0xd800) AM_READ(daikaiju_sound_status_r) AM_WRITENOP @@ -532,12 +527,12 @@ GFXDECODE_END -static void irqhandler(running_machine *machine, int irq) +static void irqhandler(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 WRITE8_HANDLER( unk ) +static WRITE8_DEVICE_HANDLER( unk ) { } @@ -548,10 +543,10 @@ static const ym2203_interface ym2203_config = { AY8910_LEGACY_OUTPUT, AY8910_DEFAULT_LOADS, - NULL, - NULL, - unk, - unk, + DEVCB_NULL, + DEVCB_NULL, + DEVCB_HANDLER(unk), + DEVCB_HANDLER(unk), }, irqhandler }; |