summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/crimfght.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/crimfght.c')
-rw-r--r--src/mame/drivers/crimfght.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/src/mame/drivers/crimfght.c b/src/mame/drivers/crimfght.c
index 2e4945c65f4..a09376d6958 100644
--- a/src/mame/drivers/crimfght.c
+++ b/src/mame/drivers/crimfght.c
@@ -39,14 +39,14 @@ static WRITE8_HANDLER( crimfght_sh_irqtrigger_w )
cpu_set_input_line_and_vector(space->machine->cpu[1],0,HOLD_LINE,0xff);
}
-static WRITE8_HANDLER( crimfght_snd_bankswitch_w )
+static WRITE8_DEVICE_HANDLER( crimfght_snd_bankswitch_w )
{
/* b1: bank for channel A */
/* b0: bank for channel B */
int bank_A = ((data >> 1) & 0x01);
int bank_B = ((data) & 0x01);
- k007232_set_bank( 0, bank_A, bank_B );
+ k007232_set_bank( devtag_get_device(device->machine, SOUND, "konami"), bank_A, bank_B );
}
@@ -82,17 +82,16 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( crimfght_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) /* ROM 821l01.h4 */
AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) /* RAM */
- AM_RANGE(0xa001, 0xa001) AM_READ(ym2151_status_port_0_r) /* YM2151 */
+ AM_RANGE(0xa000, 0xa001) AM_DEVREAD(SOUND, "ym", ym2151_r) /* YM2151 */
AM_RANGE(0xc000, 0xc000) AM_READ(soundlatch_r) /* soundlatch_r */
- AM_RANGE(0xe000, 0xe00d) AM_READ(k007232_read_port_0_r) /* 007232 registers */
+ AM_RANGE(0xe000, 0xe00d) AM_DEVREAD(SOUND, "konami", k007232_r) /* 007232 registers */
ADDRESS_MAP_END
static ADDRESS_MAP_START( crimfght_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) /* ROM 821l01.h4 */
AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) /* RAM */
- AM_RANGE(0xa000, 0xa000) AM_WRITE(ym2151_register_port_0_w) /* YM2151 */
- AM_RANGE(0xa001, 0xa001) AM_WRITE(ym2151_data_port_0_w) /* YM2151 */
- AM_RANGE(0xe000, 0xe00d) AM_WRITE(k007232_write_port_0_w) /* 007232 registers */
+ AM_RANGE(0xa000, 0xa001) AM_DEVWRITE(SOUND, "ym", ym2151_w) /* YM2151 */
+ AM_RANGE(0xe000, 0xe00d) AM_DEVWRITE(SOUND, "konami", k007232_w) /* 007232 registers */
ADDRESS_MAP_END
/***************************************************************************
@@ -278,10 +277,10 @@ static const ym2151_interface ym2151_config =
crimfght_snd_bankswitch_w
};
-static void volume_callback(int v)
+static void volume_callback(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 const k007232_interface k007232_config =