summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/psikyo.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/psikyo.c')
-rw-r--r--src/mame/drivers/psikyo.c27
1 files changed, 8 insertions, 19 deletions
diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c
index 76a0f5d8066..52f43c90394 100644
--- a/src/mame/drivers/psikyo.c
+++ b/src/mame/drivers/psikyo.c
@@ -376,9 +376,9 @@ ADDRESS_MAP_END
***************************************************************************/
-static void sound_irq( running_machine *machine, int irq )
+static void sound_irq( 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 READ8_HANDLER( psikyo_soundlatch_r )
@@ -418,10 +418,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sngkace_sound_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_READWRITE(ym2610_status_port_0_a_r, ym2610_control_port_0_a_w )
- AM_RANGE(0x01, 0x01) AM_WRITE(ym2610_data_port_0_a_w )
- AM_RANGE(0x02, 0x02) AM_READWRITE(ym2610_status_port_0_b_r, ym2610_control_port_0_b_w )
- AM_RANGE(0x03, 0x03) AM_WRITE(ym2610_data_port_0_b_w )
+ AM_RANGE(0x00, 0x03) AM_DEVREADWRITE(SOUND, "ym", ym2610_r, ym2610_w )
AM_RANGE(0x04, 0x04) AM_WRITE(sngkace_sound_bankswitch_w )
AM_RANGE(0x08, 0x08) AM_READ(psikyo_soundlatch_r )
AM_RANGE(0x0c, 0x0c) AM_WRITE(psikyo_clear_nmi_w )
@@ -457,10 +454,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( gunbird_sound_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(gunbird_sound_bankswitch_w )
- AM_RANGE(0x04, 0x04) AM_READWRITE(ym2610_status_port_0_a_r, ym2610_control_port_0_a_w )
- AM_RANGE(0x05, 0x05) AM_WRITE(ym2610_data_port_0_a_w )
- AM_RANGE(0x06, 0x06) AM_READWRITE(ym2610_status_port_0_b_r, ym2610_control_port_0_b_w )
- AM_RANGE(0x07, 0x07) AM_WRITE(ym2610_data_port_0_b_w )
+ AM_RANGE(0x04, 0x07) AM_DEVREADWRITE(SOUND, "ym", ym2610_r, ym2610_w )
AM_RANGE(0x08, 0x08) AM_READ(psikyo_soundlatch_r )
AM_RANGE(0x0c, 0x0c) AM_WRITE(psikyo_clear_nmi_w )
ADDRESS_MAP_END
@@ -473,12 +467,7 @@ static ADDRESS_MAP_START( s1945_sound_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(gunbird_sound_bankswitch_w )
AM_RANGE(0x02, 0x03) AM_WRITE(SMH_NOP )
- AM_RANGE(0x08, 0x08) AM_READWRITE(ymf278b_status_port_0_r, ymf278b_control_port_0_a_w )
- AM_RANGE(0x09, 0x09) AM_WRITE(ymf278b_data_port_0_a_w )
- AM_RANGE(0x0a, 0x0a) AM_WRITE(ymf278b_control_port_0_b_w )
- AM_RANGE(0x0b, 0x0b) AM_WRITE(ymf278b_data_port_0_b_w )
- AM_RANGE(0x0c, 0x0c) AM_WRITE(ymf278b_control_port_0_c_w )
- AM_RANGE(0x0d, 0x0d) AM_WRITE(ymf278b_data_port_0_c_w )
+ AM_RANGE(0x08, 0x0d) AM_DEVREADWRITE(SOUND, "ymf", ymf278b_r, ymf278b_w )
AM_RANGE(0x10, 0x10) AM_READ(psikyo_soundlatch_r )
AM_RANGE(0x18, 0x18) AM_WRITE(psikyo_clear_nmi_w )
ADDRESS_MAP_END
@@ -1312,12 +1301,12 @@ MACHINE_DRIVER_END
***************************************************************************/
-static void irqhandler(running_machine *machine, int linestate)
+static void irqhandler(const device_config *device, int linestate)
{
if (linestate)
- cpu_set_input_line(machine->cpu[1], 0, ASSERT_LINE);
+ cpu_set_input_line(device->machine->cpu[1], 0, ASSERT_LINE);
else
- cpu_set_input_line(machine->cpu[1], 0, CLEAR_LINE);
+ cpu_set_input_line(device->machine->cpu[1], 0, CLEAR_LINE);
}
static const ymf278b_interface ymf278b_config =