diff options
Diffstat (limited to 'src/mame/drivers/slapfght.c')
-rw-r--r-- | src/mame/drivers/slapfght.c | 40 |
1 files changed, 12 insertions, 28 deletions
diff --git a/src/mame/drivers/slapfght.c b/src/mame/drivers/slapfght.c index 7f10406a51c..9849c46822c 100644 --- a/src/mame/drivers/slapfght.c +++ b/src/mame/drivers/slapfght.c @@ -963,28 +963,6 @@ static GFXDECODE_START( slapfght ) GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 0, 16 ) GFXDECODE_END -/**************************************************************************/ - -static const ay8910_interface ay8910_interface_1 = -{ - AY8910_LEGACY_OUTPUT, - AY8910_DEFAULT_LOADS, - DEVCB_INPUT_PORT("IN0"), - DEVCB_INPUT_PORT("IN1"), - DEVCB_NULL, - DEVCB_NULL -}; - -static const ay8910_interface ay8910_interface_2 = -{ - AY8910_LEGACY_OUTPUT, - AY8910_DEFAULT_LOADS, - DEVCB_INPUT_PORT("DSW1"), - DEVCB_INPUT_PORT("DSW2"), - DEVCB_NULL, - DEVCB_NULL -}; - /*************************************************************************** @@ -1027,11 +1005,13 @@ static MACHINE_CONFIG_START( perfrman, slapfght_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ay1", AY8910, XTAL_16MHz/8) - MCFG_SOUND_CONFIG(ay8910_interface_1) + MCFG_AY8910_PORT_A_READ_CB(IOPORT("IN0")) + MCFG_AY8910_PORT_B_READ_CB(IOPORT("IN1")) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MCFG_SOUND_ADD("ay2", AY8910, XTAL_16MHz/8) - MCFG_SOUND_CONFIG(ay8910_interface_2) + MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1")) + MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2")) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END @@ -1073,11 +1053,13 @@ static MACHINE_CONFIG_START( tigerh, slapfght_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ay1", AY8910, XTAL_36MHz/24) // 1.5MHz - MCFG_SOUND_CONFIG(ay8910_interface_1) + MCFG_AY8910_PORT_A_READ_CB(IOPORT("IN0")) + MCFG_AY8910_PORT_B_READ_CB(IOPORT("IN1")) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MCFG_SOUND_ADD("ay2", AY8910, XTAL_36MHz/24) // 1.5MHz - MCFG_SOUND_CONFIG(ay8910_interface_2) + MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1")) + MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2")) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END @@ -1136,11 +1118,13 @@ static MACHINE_CONFIG_START( slapfigh, slapfght_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ay1", AY8910, XTAL_36MHz/24) // 1.5MHz - MCFG_SOUND_CONFIG(ay8910_interface_1) + MCFG_AY8910_PORT_A_READ_CB(IOPORT("IN0")) + MCFG_AY8910_PORT_B_READ_CB(IOPORT("IN1")) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MCFG_SOUND_ADD("ay2", AY8910, XTAL_36MHz/24) // 1.5MHz - MCFG_SOUND_CONFIG(ay8910_interface_2) + MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1")) + MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2")) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END |