diff options
Diffstat (limited to 'src/mame/drivers/chqflag.c')
-rw-r--r-- | src/mame/drivers/chqflag.c | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c index c423fdfce1a..2684093fc74 100644 --- a/src/mame/drivers/chqflag.c +++ b/src/mame/drivers/chqflag.c @@ -21,7 +21,7 @@ Dip locations and recommended settings verified with manual static int K051316_readroms; -static WRITE8_HANDLER( k007232_extvolume_w ); +static WRITE8_DEVICE_HANDLER( k007232_extvolume_w ); /* from video/chqflag.c */ VIDEO_START( chqflag ); @@ -186,9 +186,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( chqflag_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) /* ROM */ AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) /* RAM */ - AM_RANGE(0xa000, 0xa00d) AM_READ(k007232_read_port_0_r) /* 007232 (chip 1) */ - AM_RANGE(0xb000, 0xb00d) AM_READ(k007232_read_port_1_r) /* 007232 (chip 2) */ - AM_RANGE(0xc001, 0xc001) AM_READ(ym2151_status_port_0_r) /* YM2151 */ + AM_RANGE(0xa000, 0xa00d) AM_DEVREAD(SOUND, "konami1", k007232_r) /* 007232 (chip 1) */ + AM_RANGE(0xb000, 0xb00d) AM_DEVREAD(SOUND, "konami2", k007232_r) /* 007232 (chip 2) */ + AM_RANGE(0xc000, 0xc001) AM_DEVREAD(SOUND, "ym", ym2151_r) /* YM2151 */ AM_RANGE(0xd000, 0xd000) AM_READ(soundlatch_r) /* soundlatch_r */ //AM_RANGE(0xe000, 0xe000) AM_READ(SMH_NOP) /* ??? */ ADDRESS_MAP_END @@ -200,24 +200,23 @@ static WRITE8_HANDLER( k007232_bankswitch_w ) /* banks # for the 007232 (chip 1) */ bank_A = ((data >> 4) & 0x03); bank_B = ((data >> 6) & 0x03); - k007232_set_bank( 0, bank_A, bank_B ); + k007232_set_bank( devtag_get_device(space->machine, SOUND, "konami1"), bank_A, bank_B ); /* banks # for the 007232 (chip 2) */ bank_A = ((data >> 0) & 0x03); bank_B = ((data >> 2) & 0x03); - k007232_set_bank( 1, bank_A, bank_B ); + k007232_set_bank( devtag_get_device(space->machine, SOUND, "konami2"), bank_A, bank_B ); } static ADDRESS_MAP_START( chqflag_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) /* ROM */ AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) /* RAM */ AM_RANGE(0x9000, 0x9000) AM_WRITE(k007232_bankswitch_w) /* 007232 bankswitch */ - AM_RANGE(0xa000, 0xa00d) AM_WRITE(k007232_write_port_0_w) /* 007232 (chip 1) */ - AM_RANGE(0xa01c, 0xa01c) AM_WRITE(k007232_extvolume_w)/* extra volume, goes to the 007232 w/ A11 */ + AM_RANGE(0xa000, 0xa00d) AM_DEVWRITE(SOUND, "konami1", k007232_w) /* 007232 (chip 1) */ + AM_RANGE(0xa01c, 0xa01c) AM_DEVWRITE(SOUND, "konami2", k007232_extvolume_w)/* extra volume, goes to the 007232 w/ A11 */ /* selecting a different latch for the external port */ - AM_RANGE(0xb000, 0xb00d) AM_WRITE(k007232_write_port_1_w) /* 007232 (chip 2) */ - AM_RANGE(0xc000, 0xc000) AM_WRITE(ym2151_register_port_0_w) /* YM2151 */ - AM_RANGE(0xc001, 0xc001) AM_WRITE(ym2151_data_port_0_w) /* YM2151 */ + AM_RANGE(0xb000, 0xb00d) AM_DEVWRITE(SOUND, "konami2", k007232_w) /* 007232 (chip 2) */ + AM_RANGE(0xc000, 0xc001) AM_DEVWRITE(SOUND, "ym", ym2151_w) /* YM2151 */ AM_RANGE(0xf000, 0xf000) AM_WRITE(SMH_NOP) /* ??? */ ADDRESS_MAP_END @@ -307,9 +306,9 @@ INPUT_PORTS_END -static void chqflag_ym2151_irq_w(running_machine *machine, int data) +static void chqflag_ym2151_irq_w(const device_config *device, int data) { - cpu_set_input_line(machine->cpu[1],INPUT_LINE_NMI,PULSE_LINE); + cpu_set_input_line(device->machine->cpu[1],INPUT_LINE_NMI,PULSE_LINE); } @@ -318,20 +317,20 @@ static const ym2151_interface ym2151_config = chqflag_ym2151_irq_w }; -static void volume_callback0(int v) +static void volume_callback0(const device_config *device, int v) { - k007232_set_volume(0,0,(v & 0x0f)*0x11,0); - k007232_set_volume(0,1,0,(v >> 4)*0x11); + k007232_set_volume(device,0,(v & 0x0f)*0x11,0); + k007232_set_volume(device,1,0,(v >> 4)*0x11); } -static WRITE8_HANDLER( k007232_extvolume_w ) +static WRITE8_DEVICE_HANDLER( k007232_extvolume_w ) { - k007232_set_volume(1,1,(data & 0x0f)*0x11/2,(data >> 4)*0x11/2); + k007232_set_volume(device,1,(data & 0x0f)*0x11/2,(data >> 4)*0x11/2); } -static void volume_callback1(int v) +static void volume_callback1(const device_config *device, int v) { - k007232_set_volume(1,0,(v & 0x0f)*0x11/2,(v >> 4)*0x11/2); + k007232_set_volume(device,0,(v & 0x0f)*0x11/2,(v >> 4)*0x11/2); } static const k007232_interface k007232_interface_1 = |