summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/pipedrm.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/pipedrm.c')
-rw-r--r--src/mame/drivers/pipedrm.c18
1 files changed, 5 insertions, 13 deletions
diff --git a/src/mame/drivers/pipedrm.c b/src/mame/drivers/pipedrm.c
index 02cd9d9aed9..1b38b59d4d7 100644
--- a/src/mame/drivers/pipedrm.c
+++ b/src/mame/drivers/pipedrm.c
@@ -265,23 +265,15 @@ static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x04, 0x04) AM_WRITE(sound_bankswitch_w)
AM_RANGE(0x16, 0x16) AM_READ(sound_command_r)
AM_RANGE(0x17, 0x17) AM_WRITE(pending_command_clear_w)
- AM_RANGE(0x18, 0x18) AM_READWRITE(ym2610_status_port_0_a_r, ym2610_control_port_0_a_w)
- AM_RANGE(0x19, 0x19) AM_WRITE(ym2610_data_port_0_a_w)
- AM_RANGE(0x1a, 0x1a) AM_READWRITE(ym2610_status_port_0_b_r, ym2610_control_port_0_b_w)
- AM_RANGE(0x1b, 0x1b) AM_WRITE(ym2610_data_port_0_b_w)
+ AM_RANGE(0x18, 0x1b) AM_DEVREADWRITE(SOUND, "ym", ym2610_r, ym2610_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( hatris_sound_portmap, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x02, 0x02) AM_WRITE(ym2608_control_port_0_b_w)
- AM_RANGE(0x03, 0x03) AM_WRITE(ym2608_data_port_0_b_w)
+ AM_RANGE(0x00, 0x03) AM_MIRROR(0x08) AM_DEVREADWRITE(SOUND, "ym", ym2608_r, ym2608_w)
AM_RANGE(0x04, 0x04) AM_READ(sound_command_r)
AM_RANGE(0x05, 0x05) AM_READWRITE(pending_command_r, pending_command_clear_w)
- AM_RANGE(0x08, 0x08) AM_READWRITE(ym2608_status_port_0_a_r, ym2608_control_port_0_a_w)
- AM_RANGE(0x09, 0x09) AM_WRITE(ym2608_data_port_0_a_w)
- AM_RANGE(0x0a, 0x0a) AM_READWRITE(ym2608_status_port_0_b_r, ym2608_control_port_0_b_w)
- AM_RANGE(0x0b, 0x0b) AM_WRITE(ym2608_data_port_0_b_w)
ADDRESS_MAP_END
@@ -524,9 +516,9 @@ 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);
}
@@ -535,7 +527,7 @@ static const ym2608_interface ym2608_config =
{
AY8910_LEGACY_OUTPUT | AY8910_SINGLE_OUTPUT,
AY8910_DEFAULT_LOADS,
- NULL, NULL, NULL, NULL
+ DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
},
irqhandler
};