diff --git a/src/emu/mconfig.h b/src/emu/mconfig.h index 34844aa80a3..506076ed821 100644 --- a/src/emu/mconfig.h +++ b/src/emu/mconfig.h @@ -24,7 +24,8 @@ CONSTANTS ***************************************************************************/ -/* by convention, tags should all lowercase and this length or less */ +/* by convention, tags should all lowercase and between 3-15 characters */ +#define MIN_TAG_LENGTH 3 #define MAX_TAG_LENGTH 15 diff --git a/src/emu/validity.c b/src/emu/validity.c index 9dac3653b0a..a34dfc64eea 100644 --- a/src/emu/validity.c +++ b/src/emu/validity.c @@ -205,6 +205,11 @@ INLINE int validate_tag(const game_driver *driver, const char *object, const cha mame_printf_error("%s: %s has %s with 0-length tag\n", driver->source_file, driver->name, object); error = TRUE; } + if (strlen(begin) < MIN_TAG_LENGTH) + { + mame_printf_error("%s: %s has %s with tag '%s' < %d characters\n", driver->source_file, driver->name, object, tag, MIN_TAG_LENGTH); + error = TRUE; + } if (strlen(begin) > MAX_TAG_LENGTH) { mame_printf_error("%s: %s has %s with tag '%s' > %d characters\n", driver->source_file, driver->name, object, tag, MAX_TAG_LENGTH); diff --git a/src/mame/audio/8080bw.c b/src/mame/audio/8080bw.c index 2782f6c369d..a4aa02ee812 100644 --- a/src/mame/audio/8080bw.c +++ b/src/mame/audio/8080bw.c @@ -40,7 +40,7 @@ MACHINE_START( extra_8080bw_sh ) WRITE8_HANDLER( invadpt2_sh_port_1_w ) { const device_config *samples = devtag_get_device(space->machine, "samples"); - const device_config *sn = devtag_get_device(space->machine, "sn"); + const device_config *sn = devtag_get_device(space->machine, "snsnd"); UINT8 rising_bits = data & ~port_1_last_extra; sn76477_enable_w(sn, !(data & 0x01)); /* SAUCER SOUND */ @@ -92,7 +92,7 @@ WRITE8_HANDLER( spcewars_sh_port_w ) { const device_config *samples = devtag_get_device(space->machine, "samples"); const device_config *speaker = devtag_get_device(space->machine, "speaker"); - const device_config *sn = devtag_get_device(space->machine, "sn"); + const device_config *sn = devtag_get_device(space->machine, "snsnd"); UINT8 rising_bits = data & ~port_1_last_extra; sn76477_enable_w(sn, !(data & 0x01)); /* Saucer Sound */ @@ -800,7 +800,7 @@ static const double schaser_effect_rc[8] = WRITE8_HANDLER( schaser_sh_port_1_w ) { const device_config *discrete = devtag_get_device(space->machine, "discrete"); - const device_config *sn = devtag_get_device(space->machine, "sn"); + const device_config *sn = devtag_get_device(space->machine, "snsnd"); static int last_effect = 0; int effect; @@ -895,7 +895,7 @@ WRITE8_HANDLER( schaser_sh_port_2_w ) static TIMER_CALLBACK( schaser_effect_555_cb ) { - const device_config *sn = devtag_get_device(machine, "sn"); + const device_config *sn = devtag_get_device(machine, "snsnd"); int effect = param; attotime new_time; /* Toggle 555 output */ @@ -1032,7 +1032,7 @@ WRITE8_HANDLER( invrvnge_sh_port_w ) WRITE8_HANDLER( lupin3_sh_port_1_w ) { const device_config *samples = devtag_get_device(space->machine, "samples"); - const device_config *sn = devtag_get_device(space->machine, "sn"); + const device_config *sn = devtag_get_device(space->machine, "snsnd"); UINT8 rising_bits = data & ~port_1_last_extra; if (rising_bits & 0x01) sample_start(samples, 0, 6, 0); /* Walking, get money */ @@ -1120,7 +1120,7 @@ WRITE8_HANDLER( yosakdon_sh_port_1_w ) WRITE8_HANDLER( yosakdon_sh_port_2_w ) { const device_config *samples = devtag_get_device(space->machine, "samples"); - const device_config *sn = devtag_get_device(space->machine, "sn"); + const device_config *sn = devtag_get_device(space->machine, "snsnd"); UINT8 rising_bits = data & ~port_2_last_extra; if (rising_bits & 0x01) sample_start(samples, 1, 6, 0); /* Ready? , Game Over */ @@ -1146,7 +1146,7 @@ WRITE8_HANDLER( shuttlei_sh_port_1_w ) /* bit 3 is high while you are alive and playing */ const device_config *samples = devtag_get_device(space->machine, "samples"); - const device_config *sn = devtag_get_device(space->machine, "sn"); + const device_config *sn = devtag_get_device(space->machine, "snsnd"); UINT8 rising_bits = data & ~port_1_last_extra; if (rising_bits & 0x01) sample_start(samples, 4, 4, 0); /* Fleet move */ diff --git a/src/mame/audio/astrof.c b/src/mame/audio/astrof.c index d19df98d63a..cc0976edd49 100644 --- a/src/mame/audio/astrof.c +++ b/src/mame/audio/astrof.c @@ -219,7 +219,7 @@ MACHINE_DRIVER_END WRITE8_HANDLER( tomahawk_audio_w ) { - const device_config *sn = devtag_get_device(space->machine, "sn"); + const device_config *sn = devtag_get_device(space->machine, "snsnd"); /* D0 - sonar */ @@ -271,7 +271,7 @@ static const sn76477_interface tomahawk_sn76477_interface = MACHINE_DRIVER_START( tomahawk_audio ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("sn", SN76477, 0) + MDRV_SOUND_ADD("snsnd", SN76477, 0) MDRV_SOUND_CONFIG(tomahawk_sn76477_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/audio/atarijsa.c b/src/mame/audio/atarijsa.c index 7e07a5e8e2b..ce01c61fd49 100644 --- a/src/mame/audio/atarijsa.c +++ b/src/mame/audio/atarijsa.c @@ -136,7 +136,7 @@ void atarijsa_init(running_machine *machine, const char *testport, int testmask) /* determine which sound hardware is installed */ tms5220 = devtag_get_device(machine, "tms"); - ym2151 = devtag_get_device(machine, "ym"); + ym2151 = devtag_get_device(machine, "ymsnd"); pokey = devtag_get_device(machine, "pokey"); oki6295 = devtag_get_device(machine, "adpcm"); oki6295_l = devtag_get_device(machine, "adpcml"); @@ -723,7 +723,7 @@ static void update_all_volumes(running_machine *machine ) static ADDRESS_MAP_START( atarijsa1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_RAM - AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x2800, 0x2bff) AM_READWRITE(jsa1_io_r, jsa1_io_w) AM_RANGE(0x3000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -731,7 +731,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( atarijsa2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_RAM - AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x2800, 0x2bff) AM_READWRITE(jsa2_io_r, jsa2_io_w) AM_RANGE(0x3000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -740,7 +740,7 @@ ADDRESS_MAP_END /* full map verified from schematics and Batman GALs */ static ADDRESS_MAP_START( atarijsa3_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_RAM - AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x07fe) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x07fe) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x2800, 0x2fff) AM_READWRITE(jsa3_io_r, jsa3_io_w) AM_RANGE(0x3000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -748,7 +748,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( atarijsa3s_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_RAM - AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x07fe) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x07fe) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x2800, 0x2fff) AM_READWRITE(jsa3s_io_r, jsa3s_io_w) AM_RANGE(0x3000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -785,7 +785,7 @@ MACHINE_DRIVER_START( jsa_i_stereo ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, JSA_MASTER_CLOCK) + MDRV_SOUND_ADD("ymsnd", YM2151, JSA_MASTER_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.60) MDRV_SOUND_ROUTE(1, "rspeaker", 0.60) @@ -799,7 +799,7 @@ MACHINE_DRIVER_START( jsa_i_stereo_swapped ) MDRV_IMPORT_FROM(jsa_i_stereo) /* sound hardware */ - MDRV_SOUND_REPLACE("ym", YM2151, JSA_MASTER_CLOCK) + MDRV_SOUND_REPLACE("ymsnd", YM2151, JSA_MASTER_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "rspeaker", 0.60) MDRV_SOUND_ROUTE(1, "lspeaker", 0.60) @@ -830,7 +830,7 @@ MACHINE_DRIVER_START( jsa_i_mono_speech ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, JSA_MASTER_CLOCK) + MDRV_SOUND_ADD("ymsnd", YM2151, JSA_MASTER_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "mono", 0.60) MDRV_SOUND_ROUTE(1, "mono", 0.60) @@ -851,7 +851,7 @@ MACHINE_DRIVER_START( jsa_ii_mono ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, JSA_MASTER_CLOCK) + MDRV_SOUND_ADD("ymsnd", YM2151, JSA_MASTER_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "mono", 0.60) MDRV_SOUND_ROUTE(1, "mono", 0.60) @@ -897,7 +897,7 @@ MACHINE_DRIVER_START( jsa_iiis_stereo ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, JSA_MASTER_CLOCK) + MDRV_SOUND_ADD("ymsnd", YM2151, JSA_MASTER_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.60) MDRV_SOUND_ROUTE(1, "rspeaker", 0.60) diff --git a/src/mame/audio/crbaloon.c b/src/mame/audio/crbaloon.c index d84f3718fb2..d67c4697afb 100644 --- a/src/mame/audio/crbaloon.c +++ b/src/mame/audio/crbaloon.c @@ -171,7 +171,7 @@ MACHINE_DRIVER_START( crbaloon_audio ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("sn", SN76477, 0) + MDRV_SOUND_ADD("snsnd", SN76477, 0) MDRV_SOUND_CONFIG(crbaloon_sn76477_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0) diff --git a/src/mame/audio/cyberbal.c b/src/mame/audio/cyberbal.c index 29570ba322d..b5291f996dd 100644 --- a/src/mame/audio/cyberbal.c +++ b/src/mame/audio/cyberbal.c @@ -64,7 +64,7 @@ WRITE8_HANDLER( cyberbal_sound_bank_select_w ) coin_counter_w(1, (data >> 5) & 1); coin_counter_w(0, (data >> 4) & 1); cputag_set_input_line(space->machine, "dac", INPUT_LINE_RESET, (data & 0x08) ? CLEAR_LINE : ASSERT_LINE); - if (!(data & 0x01)) devtag_reset(space->machine, "ym"); + if (!(data & 0x01)) devtag_reset(space->machine, "ymsnd"); } diff --git a/src/mame/audio/gottlieb.c b/src/mame/audio/gottlieb.c index eb708225aef..73bc0be2f1e 100644 --- a/src/mame/audio/gottlieb.c +++ b/src/mame/audio/gottlieb.c @@ -469,7 +469,7 @@ static WRITE8_HANDLER( nmi_rate_w ) static CUSTOM_INPUT( speech_drq_custom_r ) { - return sp0250_drq_r(devtag_get_device(field->port->machine, "sp")); + return sp0250_drq_r(devtag_get_device(field->port->machine, "spsnd")); } @@ -506,14 +506,14 @@ static WRITE8_HANDLER( speech_control_w ) /* bit 6 = speech chip DATA PRESENT pin; high then low to make the chip read data */ if ((previous & 0x40) == 0 && (data & 0x40) != 0) { - const device_config *sp = devtag_get_device(space->machine, "sp"); + const device_config *sp = devtag_get_device(space->machine, "spsnd"); sp0250_w(sp, 0, *sp0250_latch); } /* bit 7 goes to the speech chip RESET pin */ if ((previous ^ data) & 0x80) { - const device_config *sp = devtag_get_device(space->machine, "sp"); + const device_config *sp = devtag_get_device(space->machine, "spsnd"); device_reset(sp); } } @@ -601,7 +601,7 @@ MACHINE_DRIVER_START( gottlieb_soundrev2 ) MDRV_SOUND_ADD("ay2", AY8913, SOUND2_CLOCK/2) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) - MDRV_SOUND_ADD("sp", SP0250, SOUND2_SPEECH_CLOCK) + MDRV_SOUND_ADD("spsnd", SP0250, SOUND2_SPEECH_CLOCK) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/audio/laserbat.c b/src/mame/audio/laserbat.c index 18892820302..73b871c2e4d 100644 --- a/src/mame/audio/laserbat.c +++ b/src/mame/audio/laserbat.c @@ -13,7 +13,7 @@ WRITE8_HANDLER( laserbat_csound1_w ) WRITE8_HANDLER( laserbat_csound2_w ) { - const device_config *sn = devtag_get_device(space->machine, "sn"); + const device_config *sn = devtag_get_device(space->machine, "snsnd"); int ksound = 0; if (data & 0x01) diff --git a/src/mame/audio/leland.c b/src/mame/audio/leland.c index d1374a76774..d25c9ae1b9b 100644 --- a/src/mame/audio/leland.c +++ b/src/mame/audio/leland.c @@ -518,7 +518,7 @@ static DEVICE_START( common_sh_start ) int i; /* determine which sound hardware is installed */ - has_ym2151 = (devtag_get_device(device->machine, "ym") != NULL); + has_ym2151 = (devtag_get_device(device->machine, "ymsnd") != NULL); /* allocate separate streams for the DMA and non-DMA DACs */ dma_stream = stream_create(device, 0, 1, OUTPUT_RATE, (void *)dmaspace, leland_80186_dma_update); @@ -2043,7 +2043,7 @@ static READ16_HANDLER( peripheral_r ) if (!has_ym2151) return pit8254_r(space, offset | 0x40, mem_mask); else - return ym2151_r(devtag_get_device(space->machine, "ym"), offset); + return ym2151_r(devtag_get_device(space->machine, "ymsnd"), offset); case 4: if (is_redline) @@ -2079,7 +2079,7 @@ static WRITE16_HANDLER( peripheral_w ) if (!has_ym2151) pit8254_w(space, offset | 0x40, data, mem_mask); else - ym2151_w(devtag_get_device(space->machine, "ym"), offset, data); + ym2151_w(devtag_get_device(space->machine, "ymsnd"), offset, data); break; case 4: diff --git a/src/mame/audio/mario.c b/src/mame/audio/mario.c index 6330e9939d2..379e90f9d47 100644 --- a/src/mame/audio/mario.c +++ b/src/mame/audio/mario.c @@ -656,8 +656,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( masao_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_ROM AM_RANGE(0x2000, 0x23ff) AM_RAM - AM_RANGE(0x4000, 0x4000) AM_DEVREADWRITE("ay", ay8910_r, ay8910_data_w) - AM_RANGE(0x6000, 0x6000) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x4000, 0x4000) AM_DEVREADWRITE("aysnd", ay8910_r, ay8910_data_w) + AM_RANGE(0x6000, 0x6000) AM_DEVWRITE("aysnd", ay8910_address_w) ADDRESS_MAP_END /************************************* @@ -713,7 +713,7 @@ MACHINE_DRIVER_START( masao_audio ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 14318000/6) + MDRV_SOUND_ADD("aysnd", AY8910, 14318000/6) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) diff --git a/src/mame/audio/mw8080bw.c b/src/mame/audio/mw8080bw.c index b01b4a7cf2f..608a8c12074 100644 --- a/src/mame/audio/mw8080bw.c +++ b/src/mame/audio/mw8080bw.c @@ -3149,7 +3149,7 @@ DISCRETE_SOUND_END MACHINE_DRIVER_START( spcenctr_audio ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("sn", SN76477, 0) + MDRV_SOUND_ADD("snsnd", SN76477, 0) MDRV_SOUND_CONFIG(spcenctr_sn76477_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20) @@ -3189,7 +3189,7 @@ WRITE8_DEVICE_HANDLER( spcenctr_audio_2_w ) WRITE8_DEVICE_HANDLER( spcenctr_audio_3_w ) { - const device_config *sn = devtag_get_device(device->machine, "sn"); + const device_config *sn = devtag_get_device(device->machine, "snsnd"); /* if (data & 0x01) enable SCREECH (hit the sides) sound */ @@ -3516,7 +3516,7 @@ MACHINE_DRIVER_START( invaders_samples_audio ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("sn", SN76477, 0) + MDRV_SOUND_ADD("snsnd", SN76477, 0) MDRV_SOUND_CONFIG(invaders_sn76477_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) @@ -4083,7 +4083,7 @@ DISCRETE_SOUND_END MACHINE_DRIVER_START( invaders_audio ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("sn", SN76477, 0) + MDRV_SOUND_ADD("snsnd", SN76477, 0) MDRV_SOUND_CONFIG(invaders_sn76477_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) @@ -4095,7 +4095,7 @@ MACHINE_DRIVER_END WRITE8_DEVICE_HANDLER( invaders_audio_1_w ) { - const device_config *sn = devtag_get_device(device->machine, "sn"); + const device_config *sn = devtag_get_device(device->machine, "snsnd"); sn76477_enable_w(sn, (~data >> 0) & 0x01); /* saucer sound */ diff --git a/src/mame/audio/n8080.c b/src/mame/audio/n8080.c index 347e12ee274..071c6b3c6da 100644 --- a/src/mame/audio/n8080.c +++ b/src/mame/audio/n8080.c @@ -170,13 +170,13 @@ static void stop_mono_flop(const device_config *sn, int n) static TIMER_CALLBACK( stop_mono_flop_callback ) { - stop_mono_flop(devtag_get_device(machine, "sn"), param); + stop_mono_flop(devtag_get_device(machine, "snsnd"), param); } static void spacefev_sound_pins_changed(running_machine *machine) { - const device_config *sn = devtag_get_device(machine, "sn"); + const device_config *sn = devtag_get_device(machine, "snsnd"); UINT16 changes = ~curr_sound_pins & prev_sound_pins; if (changes & (1 << 0x3)) @@ -208,7 +208,7 @@ static void spacefev_sound_pins_changed(running_machine *machine) static void sheriff_sound_pins_changed(running_machine *machine) { - const device_config *sn = devtag_get_device(machine, "sn"); + const device_config *sn = devtag_get_device(machine, "snsnd"); UINT16 changes = ~curr_sound_pins & prev_sound_pins; if (changes & (1 << 0x6)) @@ -442,7 +442,7 @@ static WRITE8_HANDLER( helifire_sound_ctrl_w ) static TIMER_CALLBACK( spacefev_vco_voltage_timer ) { - const device_config *sn = devtag_get_device(machine, "sn"); + const device_config *sn = devtag_get_device(machine, "snsnd"); double voltage = 0; if (mono_flop[2]) @@ -561,7 +561,7 @@ MACHINE_DRIVER_START( spacefev_sound ) MDRV_SOUND_ADD("dac", DAC, 0) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) - MDRV_SOUND_ADD("sn", SN76477, 0) + MDRV_SOUND_ADD("snsnd", SN76477, 0) MDRV_SOUND_CONFIG(spacefev_sn76477_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35) MACHINE_DRIVER_END @@ -582,7 +582,7 @@ MACHINE_DRIVER_START( sheriff_sound ) MDRV_SOUND_ADD("dac", DAC, 0) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) - MDRV_SOUND_ADD("sn", SN76477, 0) + MDRV_SOUND_ADD("snsnd", SN76477, 0) MDRV_SOUND_CONFIG(sheriff_sn76477_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35) MACHINE_DRIVER_END diff --git a/src/mame/audio/redalert.c b/src/mame/audio/redalert.c index 90306d900de..37ae35fd9c0 100644 --- a/src/mame/audio/redalert.c +++ b/src/mame/audio/redalert.c @@ -136,7 +136,7 @@ static const ay8910_interface redalert_ay8910_interface = static ADDRESS_MAP_START( redalert_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x7fff) AM_RANGE(0x0000, 0x03ff) AM_MIRROR(0x0c00) AM_RAM - AM_RANGE(0x1000, 0x1000) AM_MIRROR(0x0ffe) AM_READNOP AM_DEVWRITE("ay", redalert_AY8910_w) + AM_RANGE(0x1000, 0x1000) AM_MIRROR(0x0ffe) AM_READNOP AM_DEVWRITE("aysnd", redalert_AY8910_w) AM_RANGE(0x1001, 0x1001) AM_MIRROR(0x0ffe) AM_READWRITE(redalert_ay8910_latch_1_r, redalert_ay8910_latch_2_w) AM_RANGE(0x2000, 0x6fff) AM_NOP AM_RANGE(0x7000, 0x77ff) AM_MIRROR(0x0800) AM_ROM @@ -223,7 +223,7 @@ static MACHINE_DRIVER_START( redalert_audio_m37b ) MDRV_CPU_PROGRAM_MAP(redalert_audio_map) MDRV_CPU_PERIODIC_INT(irq0_line_hold, REDALERT_AUDIO_CPU_IRQ_FREQ) - MDRV_SOUND_ADD("ay", AY8910, REDALERT_AY8910_CLOCK) + MDRV_SOUND_ADD("aysnd", AY8910, REDALERT_AY8910_CLOCK) MDRV_SOUND_CONFIG(redalert_ay8910_interface) MDRV_SOUND_ROUTE(0, "mono", 0.50) MDRV_SOUND_ROUTE(1, "mono", 0.50) diff --git a/src/mame/audio/seibu.c b/src/mame/audio/seibu.c index bf58d114bbd..7404d0ba0d3 100644 --- a/src/mame/audio/seibu.c +++ b/src/mame/audio/seibu.c @@ -475,7 +475,7 @@ ADDRESS_MAP_START( seibu_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4002, 0x4002) AM_WRITE(seibu_rst10_ack_w) AM_RANGE(0x4003, 0x4003) AM_WRITE(seibu_rst18_ack_w) AM_RANGE(0x4007, 0x4007) AM_WRITE(seibu_bank_w) - AM_RANGE(0x4008, 0x4009) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) + AM_RANGE(0x4008, 0x4009) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w) AM_RANGE(0x4010, 0x4011) AM_READ(seibu_soundlatch_r) AM_RANGE(0x4012, 0x4012) AM_READ(seibu_main_data_pending_r) AM_RANGE(0x4013, 0x4013) AM_READ_PORT("COIN") @@ -494,7 +494,7 @@ ADDRESS_MAP_START( seibu2_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4002, 0x4002) AM_WRITE(seibu_rst10_ack_w) AM_RANGE(0x4003, 0x4003) AM_WRITE(seibu_rst18_ack_w) AM_RANGE(0x4007, 0x4007) AM_WRITE(seibu_bank_w) - AM_RANGE(0x4008, 0x4009) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x4008, 0x4009) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x4010, 0x4011) AM_READ(seibu_soundlatch_r) AM_RANGE(0x4012, 0x4012) AM_READ(seibu_main_data_pending_r) AM_RANGE(0x4013, 0x4013) AM_READ_PORT("COIN") @@ -512,7 +512,7 @@ ADDRESS_MAP_START( seibu2_raiden2_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4002, 0x4002) AM_WRITE(seibu_rst10_ack_w) AM_RANGE(0x4003, 0x4003) AM_WRITE(seibu_rst18_ack_w) AM_RANGE(0x4007, 0x4007) AM_WRITE(seibu_bank_w) - AM_RANGE(0x4008, 0x4009) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x4008, 0x4009) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x4010, 0x4011) AM_READ(seibu_soundlatch_r) AM_RANGE(0x4012, 0x4012) AM_READ(seibu_main_data_pending_r) AM_RANGE(0x4013, 0x4013) AM_READ_PORT("COIN") diff --git a/src/mame/audio/seibu.h b/src/mame/audio/seibu.h index c8eaa18acaa..621f698a872 100644 --- a/src/mame/audio/seibu.h +++ b/src/mame/audio/seibu.h @@ -98,7 +98,7 @@ extern const ym2203_interface seibu_ym2203_interface; #define SEIBU_SOUND_SYSTEM_YM3812_INTERFACE(freq1,freq2) \ MDRV_SPEAKER_STANDARD_MONO("mono") \ \ - MDRV_SOUND_ADD("ym", YM3812, freq1) \ + MDRV_SOUND_ADD("ymsnd", YM3812, freq1) \ MDRV_SOUND_CONFIG(seibu_ym3812_interface) \ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) \ \ @@ -109,7 +109,7 @@ extern const ym2203_interface seibu_ym2203_interface; #define SEIBU_SOUND_SYSTEM_YM3812_RAIDEN_INTERFACE(freq1,freq2) \ MDRV_SPEAKER_STANDARD_MONO("mono") \ \ - MDRV_SOUND_ADD("ym", YM3812, freq1) \ + MDRV_SOUND_ADD("ymsnd", YM3812, freq1) \ MDRV_SOUND_CONFIG(seibu_ym3812_interface) \ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) \ \ @@ -120,7 +120,7 @@ extern const ym2203_interface seibu_ym2203_interface; #define SEIBU_SOUND_SYSTEM_YM2151_INTERFACE(freq1,freq2) \ MDRV_SPEAKER_STANDARD_MONO("mono") \ \ - MDRV_SOUND_ADD("ym", YM2151, freq1) \ + MDRV_SOUND_ADD("ymsnd", YM2151, freq1) \ MDRV_SOUND_CONFIG(seibu_ym2151_interface) \ MDRV_SOUND_ROUTE(0, "mono", 0.50) \ MDRV_SOUND_ROUTE(1, "mono", 0.50) \ @@ -133,7 +133,7 @@ extern const ym2203_interface seibu_ym2203_interface; #define SEIBU_SOUND_SYSTEM_YM2151_RAIDEN2_INTERFACE(freq1,freq2,regiona, regionb) \ MDRV_SPEAKER_STANDARD_MONO("mono") \ \ - MDRV_SOUND_ADD("ym", YM2151, freq1) \ + MDRV_SOUND_ADD("ymsnd", YM2151, freq1) \ MDRV_SOUND_CONFIG(seibu_ym2151_interface) \ MDRV_SOUND_ROUTE(0, "mono", 0.50) \ MDRV_SOUND_ROUTE(1, "mono", 0.50) \ diff --git a/src/mame/audio/t5182.c b/src/mame/audio/t5182.c index c38643865f7..cf1ab86eff5 100644 --- a/src/mame/audio/t5182.c +++ b/src/mame/audio/t5182.c @@ -307,7 +307,7 @@ ADDRESS_MAP_END // 50 W test mode status flags (bit 0 = ROM test fail, bit 1 = RAM test fail, bit 2 = YM2151 IRQ not received) ADDRESS_MAP_START( t5182_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x10, 0x10) AM_WRITE(t5182_sharedram_semaphore_snd_acquire_w) AM_RANGE(0x11, 0x11) AM_WRITE(t5182_sharedram_semaphore_snd_release_w) AM_RANGE(0x12, 0x12) AM_WRITE(t5182_ym2151_irq_ack_w) diff --git a/src/mame/audio/williams.c b/src/mame/audio/williams.c index b4301cd6a2c..74e1a39a1bc 100644 --- a/src/mame/audio/williams.c +++ b/src/mame/audio/williams.c @@ -97,7 +97,7 @@ static WRITE8_HANDLER( narc_slave_sync_w ); /* CVSD readmem/writemem structures */ static ADDRESS_MAP_START( williams_cvsd_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x1800) AM_RAM - AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x1ffe) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x1ffe) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x4000, 0x4003) AM_MIRROR(0x1ffc) AM_DEVREADWRITE("cvsdpia", pia6821_r, pia6821_w) AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x07ff) AM_DEVWRITE("cvsd", cvsd_digit_clock_clear_w) AM_RANGE(0x6800, 0x6800) AM_MIRROR(0x07ff) AM_DEVWRITE("cvsd", cvsd_clock_set_w) @@ -109,7 +109,7 @@ ADDRESS_MAP_END /* NARC master readmem/writemem structures */ static ADDRESS_MAP_START( williams_narc_master_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_RAM - AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x03fe) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x03fe) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x2800, 0x2800) AM_MIRROR(0x03ff) AM_WRITE(narc_master_talkback_w) AM_RANGE(0x2c00, 0x2c00) AM_MIRROR(0x03ff) AM_WRITE(narc_command2_w) AM_RANGE(0x3000, 0x3000) AM_MIRROR(0x03ff) AM_DEVWRITE("dac1", dac_w) @@ -139,7 +139,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( williams_adpcm_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_RAM AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x03ff) AM_WRITE(adpcm_bank_select_w) - AM_RANGE(0x2400, 0x2401) AM_MIRROR(0x03fe) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x2400, 0x2401) AM_MIRROR(0x03fe) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x2800, 0x2800) AM_MIRROR(0x03ff) AM_DEVWRITE("dac", dac_w) AM_RANGE(0x2c00, 0x2c00) AM_MIRROR(0x03ff) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0x3000, 0x3000) AM_MIRROR(0x03ff) AM_READ(adpcm_command_r) @@ -201,7 +201,7 @@ MACHINE_DRIVER_START( williams_cvsd_sound ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, CVSD_FM_CLOCK) + MDRV_SOUND_ADD("ymsnd", YM2151, CVSD_FM_CLOCK) MDRV_SOUND_CONFIG(cvsd_ym2151_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) @@ -222,7 +222,7 @@ MACHINE_DRIVER_START( williams_narc_sound ) MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, NARC_FM_CLOCK) + MDRV_SOUND_ADD("ymsnd", YM2151, NARC_FM_CLOCK) MDRV_SOUND_CONFIG(adpcm_ym2151_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10) @@ -247,7 +247,7 @@ MACHINE_DRIVER_START( williams_adpcm_sound ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, ADPCM_FM_CLOCK) + MDRV_SOUND_ADD("ymsnd", YM2151, ADPCM_FM_CLOCK) MDRV_SOUND_CONFIG(adpcm_ym2151_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) @@ -382,7 +382,7 @@ void williams_adpcm_init(running_machine *machine) static void init_audio_state(running_machine *machine) { /* reset the YM2151 state */ - devtag_reset(machine, "ym"); + devtag_reset(machine, "ymsnd"); /* clear all the interrupts */ williams_sound_int_state = 0; diff --git a/src/mame/drivers/2mindril.c b/src/mame/drivers/2mindril.c index c38d4a45a40..b35d6c9c5af 100644 --- a/src/mame/drivers/2mindril.c +++ b/src/mame/drivers/2mindril.c @@ -233,7 +233,7 @@ static ADDRESS_MAP_START( drill_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x400000, 0x4fffff) AM_RAM AM_BASE(&unkram)// video stuff, 460000 - video regs ? AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x502000, 0x503fff) AM_RAM - AM_RANGE(0x600000, 0x600007) AM_DEVREADWRITE8("ym", ym2610_r, ym2610_w, 0x00ff) + AM_RANGE(0x600000, 0x600007) AM_DEVREADWRITE8("ymsnd", ym2610_r, ym2610_w, 0x00ff) AM_RANGE(0x60000c, 0x60000d) AM_RAM AM_RANGE(0x60000e, 0x60000f) AM_RAM AM_RANGE(0x700000, 0x70000f) AM_READWRITE(drill_io_r,drill_io_w) AM_BASE(&iodata) // i/o @@ -419,7 +419,7 @@ static MACHINE_DRIVER_START( drill ) MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, 16000000/2) + MDRV_SOUND_ADD("ymsnd", YM2610, 16000000/2) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -433,7 +433,7 @@ ROM_START( 2mindril ) ROM_LOAD16_BYTE( "d58-38.ic11", 0x00000, 0x40000, CRC(c58e8e4f) SHA1(648db679c3bfb5de1cd6c1b1217773a2fe56f11b) ) ROM_LOAD16_BYTE( "d58-37.ic9", 0x00001, 0x40000, CRC(19e5cc3c) SHA1(04ac0eef893c579fe90d91d7fd55c5741a2b7460) ) - ROM_REGION( 0x200000, "ym", 0 ) /* Samples */ + ROM_REGION( 0x200000, "ymsnd", 0 ) /* Samples */ ROM_LOAD( "d58-11.ic31", 0x000000, 0x200000, CRC(dc26d58d) SHA1(cffb18667da18f5367b02af85a2f7674dd61ae97) ) ROM_REGION( 0x800000, "gfx1", ROMREGION_ERASE00 ) diff --git a/src/mame/drivers/40love.c b/src/mame/drivers/40love.c index 23ab9b2e564..037501ab7cb 100644 --- a/src/mame/drivers/40love.c +++ b/src/mame/drivers/40love.c @@ -780,7 +780,7 @@ static WRITE8_DEVICE_HANDLER( sound_control_3_w ) /* unknown */ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xc7ff) AM_RAM - AM_RANGE(0xc800, 0xc801) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0xc800, 0xc801) AM_DEVWRITE("aysnd", ay8910_address_data_w) AM_RANGE(0xca00, 0xca0d) AM_DEVWRITE("msm", msm5232_w) AM_RANGE(0xcc00, 0xcc00) AM_DEVWRITE("msm", sound_control_0_w) AM_RANGE(0xce00, 0xce00) AM_DEVWRITE("msm", sound_control_1_w) @@ -1008,7 +1008,7 @@ static const ay8910_interface ay8910_config = AY8910_DEFAULT_LOADS, DEVCB_NULL, DEVCB_NULL, - DEVCB_DEVICE_HANDLER("ay", sound_control_2_w), + DEVCB_DEVICE_HANDLER("aysnd", sound_control_2_w), DEVCB_HANDLER(sound_control_3_w) }; @@ -1074,7 +1074,7 @@ static MACHINE_DRIVER_START( 40love ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 2000000) + MDRV_SOUND_ADD("aysnd", AY8910, 2000000) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) @@ -1131,7 +1131,7 @@ static MACHINE_DRIVER_START( undoukai ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 2000000) + MDRV_SOUND_ADD("aysnd", AY8910, 2000000) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) diff --git a/src/mame/drivers/4enraya.c b/src/mame/drivers/4enraya.c index 76118773eb9..bd9a89b6b65 100644 --- a/src/mame/drivers/4enraya.c +++ b/src/mame/drivers/4enraya.c @@ -85,7 +85,7 @@ static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x01, 0x01) AM_READ_PORT("INPUTS") AM_RANGE(0x02, 0x02) AM_READ_PORT("SYSTEM") AM_RANGE(0x23, 0x23) AM_WRITE(sound_data_w) - AM_RANGE(0x33, 0x33) AM_DEVWRITE("ay", sound_control_w) + AM_RANGE(0x33, 0x33) AM_DEVWRITE("aysnd", sound_control_w) ADDRESS_MAP_END @@ -180,7 +180,7 @@ static MACHINE_DRIVER_START( 4enraya ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 8000000/4 /* guess */) + MDRV_SOUND_ADD("aysnd", AY8910, 8000000/4 /* guess */) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_DRIVER_END diff --git a/src/mame/drivers/8080bw.c b/src/mame/drivers/8080bw.c index cf05ddf851b..1b5a5ab7bb1 100644 --- a/src/mame/drivers/8080bw.c +++ b/src/mame/drivers/8080bw.c @@ -903,7 +903,7 @@ static MACHINE_DRIVER_START( schaser ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("sn", SN76477, 0) + MDRV_SOUND_ADD("snsnd", SN76477, 0) MDRV_SOUND_CONFIG(schaser_sn76477_interface) MDRV_SOUND_ROUTE_EX(0, "discrete", 1.0, 0) diff --git a/src/mame/drivers/86lions.c b/src/mame/drivers/86lions.c index 638e68d0bc8..ef3fb8363a4 100644 --- a/src/mame/drivers/86lions.c +++ b/src/mame/drivers/86lions.c @@ -94,7 +94,7 @@ static ADDRESS_MAP_START( lions_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1801, 0x1801) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w) AM_RANGE(0x5000, 0x500f) AM_MIRROR(0x0010) AM_READWRITE(lions_via_r, lions_via_w) AM_RANGE(0x5300, 0x5300) AM_READ(test_r)//AM_READ_PORT("IN0") - AM_RANGE(0x5382, 0x5383) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x5382, 0x5383) AM_DEVWRITE("aysnd", ay8910_data_address_w) AM_RANGE(0xe000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -380,7 +380,7 @@ static MACHINE_DRIVER_START( lions ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, MAIN_CLOCK/8) /* 1.5 MHz.(guess) */ + MDRV_SOUND_ADD("aysnd", AY8910, MAIN_CLOCK/8) /* 1.5 MHz.(guess) */ MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MACHINE_DRIVER_END diff --git a/src/mame/drivers/88games.c b/src/mame/drivers/88games.c index 3150528383d..e3f04259d4b 100644 --- a/src/mame/drivers/88games.c +++ b/src/mame/drivers/88games.c @@ -113,7 +113,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0x9000, 0x9000) AM_WRITE(speech_msg_w) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xe000, 0xe000) AM_WRITE(speech_control_w) ADDRESS_MAP_END @@ -252,7 +252,7 @@ static MACHINE_DRIVER_START( 88games ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) MDRV_SOUND_ROUTE(0, "mono", 0.75) MDRV_SOUND_ROUTE(1, "mono", 0.75) diff --git a/src/mame/drivers/adp.c b/src/mame/drivers/adp.c index 567ae3988fb..1378c5e751c 100644 --- a/src/mame/drivers/adp.c +++ b/src/mame/drivers/adp.c @@ -328,7 +328,7 @@ static READ16_HANDLER(test_r) switch(mux_data) { case 0x00: value = input_port_read(space->machine, "x0"); break; - case 0x01: value = input_port_read(space->machine, "x1"); break; + case 0x01: value = input_port_read(space->machine, "x1snd"); break; case 0x02: value = input_port_read(space->machine, "x2"); break; case 0x03: value = input_port_read(space->machine, "1P_UP"); break; case 0x04: value = input_port_read(space->machine, "1P_B1"); break; @@ -377,8 +377,8 @@ static ADDRESS_MAP_START( skattv_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800082, 0x800083) AM_READWRITE(HD63484_data_r, HD63484_data_w) AM_RANGE(0x800100, 0x800101) AM_READWRITE(test_r,wh2_w) //related to input AM_RANGE(0x800140, 0x800141) AM_READ(t2_r) - AM_RANGE(0x800140, 0x800143) AM_DEVWRITE8("ay", ay8910_address_data_w, 0x00ff) //18b too - AM_RANGE(0x800142, 0x800143) AM_DEVREAD8("ay", ay8910_r, 0x00ff) //18b too + AM_RANGE(0x800140, 0x800143) AM_DEVWRITE8("aysnd", ay8910_address_data_w, 0x00ff) //18b too + AM_RANGE(0x800142, 0x800143) AM_DEVREAD8("aysnd", ay8910_r, 0x00ff) //18b too AM_RANGE(0x800180, 0x80019f) AM_DEVREADWRITE8( "duart68681", duart68681_r, duart68681_w, 0xff ) // AM_RANGE(0xffd246, 0xffd247) AM_READ(handler3_r) // AM_RANGE(0xffd248, 0xffd249) AM_READ(handler3_r) @@ -410,8 +410,8 @@ static ADDRESS_MAP_START( funland_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800082, 0x800083) AM_READWRITE(HD63484_data_r, HD63484_data_w) // AM_RANGE(0x800100, 0x8001ff) AM_READ(test_r) //18b too AM_RANGE(0x800140, 0x800141) AM_READ(t2_r) - AM_RANGE(0x800140, 0x800143) AM_DEVWRITE8("ay", ay8910_address_data_w, 0x00ff) //18b too - AM_RANGE(0x800142, 0x800143) AM_DEVREAD8("ay", ay8910_r, 0x00ff) //18b too + AM_RANGE(0x800140, 0x800143) AM_DEVWRITE8("aysnd", ay8910_address_data_w, 0x00ff) //18b too + AM_RANGE(0x800142, 0x800143) AM_DEVREAD8("aysnd", ay8910_r, 0x00ff) //18b too AM_RANGE(0x800180, 0x80019f) AM_DEVREADWRITE8( "duart68681", duart68681_r, duart68681_w, 0xff ) AM_RANGE(0xfc0000, 0xffffff) AM_RAM ADDRESS_MAP_END @@ -440,7 +440,7 @@ static INPUT_PORTS_START( skattv ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_BIT( 0xfffb, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("x1") + PORT_START("x1snd") PORT_DIPNAME( 0x0004,0x0004, "SW1" ) //another up button PORT_DIPSETTING( 0x0004, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -536,7 +536,7 @@ static MACHINE_DRIVER_START( quickjac ) MDRV_VIDEO_UPDATE(adp) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 3686400/2) + MDRV_SOUND_ADD("aysnd", AY8910, 3686400/2) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) MACHINE_DRIVER_END @@ -564,7 +564,7 @@ static MACHINE_DRIVER_START( skattv ) MDRV_VIDEO_UPDATE(adp) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 3686400/2) + MDRV_SOUND_ADD("aysnd", AY8910, 3686400/2) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) MACHINE_DRIVER_END @@ -586,7 +586,7 @@ static MACHINE_DRIVER_START( backgamn ) MDRV_VIDEO_UPDATE(adp) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 3686400/2) + MDRV_SOUND_ADD("aysnd", AY8910, 3686400/2) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) MACHINE_DRIVER_END diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c index 2ae8e1f4753..8fa6d1d3d6f 100644 --- a/src/mame/drivers/aerofgt.c +++ b/src/mame/drivers/aerofgt.c @@ -399,12 +399,12 @@ static ADDRESS_MAP_START( turbofrc_sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(aerofgt_sh_bankswitch_w) AM_RANGE(0x14, 0x14) AM_READWRITE(soundlatch_r, pending_command_clear_w) - AM_RANGE(0x18, 0x1b) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) + AM_RANGE(0x18, 0x1b) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) ADDRESS_MAP_END static ADDRESS_MAP_START( aerofgt_sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) + AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) AM_RANGE(0x04, 0x04) AM_WRITE(aerofgt_sh_bankswitch_w) AM_RANGE(0x08, 0x08) AM_WRITE(pending_command_clear_w) AM_RANGE(0x0c, 0x0c) AM_READ(soundlatch_r) @@ -422,7 +422,7 @@ static ADDRESS_MAP_START( wbbc97_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_ROM AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_RANGE(0xf800, 0xf800) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) - AM_RANGE(0xf810, 0xf811) AM_DEVWRITE("ym", ym3812_w) + AM_RANGE(0xf810, 0xf811) AM_DEVWRITE("ymsnd", ym3812_w) AM_RANGE(0xfc00, 0xfc00) AM_NOP AM_RANGE(0xfc20, 0xfc20) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -1336,7 +1336,7 @@ static MACHINE_DRIVER_START( pspikes ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -1462,7 +1462,7 @@ static MACHINE_DRIVER_START( karatblz ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -1501,7 +1501,7 @@ static MACHINE_DRIVER_START( spinlbrk ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, XTAL_8MHz) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -1540,7 +1540,7 @@ static MACHINE_DRIVER_START( turbofrc ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, XTAL_8MHz) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -1580,7 +1580,7 @@ static MACHINE_DRIVER_START( aerofgtb ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -1620,7 +1620,7 @@ static MACHINE_DRIVER_START( aerofgt ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, XTAL_8MHz) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -1719,7 +1719,7 @@ static MACHINE_DRIVER_START( wbbc97 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 3579545) + MDRV_SOUND_ADD("ymsnd", YM3812, 3579545) MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) @@ -1754,7 +1754,7 @@ ROM_START( pspikes ) ROM_REGION( 0x40000, "ym.deltat", 0 ) /* sound samples */ ROM_LOAD( "a47", 0x00000, 0x40000, CRC(c6779dfa) SHA1(ea7adefdb0da02755428aac9a6f86c908fc11253) ) - ROM_REGION( 0x100000, "ym", 0 ) /* sound samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* sound samples */ ROM_LOAD( "o5b", 0x000000, 0x100000, CRC(07d6cbac) SHA1(d3d5778dbaca7b6cdceae959d0847d56df7b5cc1) ) ROM_REGION( 0x0200, "plds", 0 ) @@ -1779,7 +1779,7 @@ ROM_START( pspikesk ) ROM_REGION( 0x40000, "ym.deltat", 0 ) /* sound samples */ ROM_LOAD( "a47", 0x00000, 0x40000, CRC(c6779dfa) SHA1(ea7adefdb0da02755428aac9a6f86c908fc11253) ) - ROM_REGION( 0x100000, "ym", 0 ) /* sound samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* sound samples */ ROM_LOAD( "o5b", 0x000000, 0x100000, CRC(07d6cbac) SHA1(d3d5778dbaca7b6cdceae959d0847d56df7b5cc1) ) ROM_REGION( 0x0400, "plds", 0 ) @@ -1805,7 +1805,7 @@ ROM_START( svolly91 ) ROM_REGION( 0x40000, "ym.deltat", 0 ) /* sound samples */ ROM_LOAD( "a47", 0x00000, 0x40000, CRC(c6779dfa) SHA1(ea7adefdb0da02755428aac9a6f86c908fc11253) ) - ROM_REGION( 0x100000, "ym", 0 ) /* sound samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* sound samples */ ROM_LOAD( "o5b", 0x000000, 0x100000, CRC(07d6cbac) SHA1(d3d5778dbaca7b6cdceae959d0847d56df7b5cc1) ) ROM_END @@ -1988,7 +1988,7 @@ ROM_START( spinlbrk ) /* no "ym.deltat" */ - ROM_REGION( 0x100000, "ym", 0 ) /* sound samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* sound samples */ ROM_LOAD( "ic166", 0x000000, 0x80000, CRC(6e0d063a) SHA1(313983e69f9625814de033fef7f6e9564694117a) ) ROM_LOAD( "ic163", 0x080000, 0x80000, CRC(e6621dfb) SHA1(85ee77c4720b7eb20ecf293c16b3105c8dcb1114) ) //FIRST AND SECOND HALF IDENTICAL @@ -2038,7 +2038,7 @@ ROM_START( spinlbrku ) /* no "ym.deltat" */ - ROM_REGION( 0x100000, "ym", 0 ) /* sound samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* sound samples */ ROM_LOAD( "ic166", 0x000000, 0x80000, CRC(6e0d063a) SHA1(313983e69f9625814de033fef7f6e9564694117a) ) ROM_LOAD( "ic163", 0x080000, 0x80000, CRC(e6621dfb) SHA1(85ee77c4720b7eb20ecf293c16b3105c8dcb1114) ) //FIRST AND SECOND HALF IDENTICAL @@ -2088,7 +2088,7 @@ ROM_START( spinlbrkj ) /* no "ym.deltat" */ - ROM_REGION( 0x100000, "ym", 0 ) /* sound samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* sound samples */ ROM_LOAD( "ic166", 0x000000, 0x80000, CRC(6e0d063a) SHA1(313983e69f9625814de033fef7f6e9564694117a) ) ROM_LOAD( "ic163", 0x080000, 0x80000, CRC(e6621dfb) SHA1(85ee77c4720b7eb20ecf293c16b3105c8dcb1114) ) //FIRST AND SECOND HALF IDENTICAL @@ -2129,7 +2129,7 @@ ROM_START( karatblz ) ROM_REGION( 0x080000, "ym.deltat", 0 ) /* sound samples */ ROM_LOAD( "u105.gh8", 0x000000, 0x080000, CRC(7a68cb1b) SHA1(1bdd0000c2d68019b9e5bf8f7ad84a6ae1af8443) ) - ROM_REGION( 0x100000, "ym", 0 ) /* sound samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* sound samples */ ROM_LOAD( "u104", 0x000000, 0x100000, CRC(5795e884) SHA1(a4178497ad0a1e60ceb87612b218d77b36d2a11b) ) ROM_END @@ -2161,7 +2161,7 @@ ROM_START( karatblzu ) ROM_REGION( 0x080000, "ym.deltat", 0 ) /* sound samples */ ROM_LOAD( "u105.gh8", 0x000000, 0x080000, CRC(7a68cb1b) SHA1(1bdd0000c2d68019b9e5bf8f7ad84a6ae1af8443) ) - ROM_REGION( 0x100000, "ym", 0 ) /* sound samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* sound samples */ ROM_LOAD( "u104", 0x000000, 0x100000, CRC(5795e884) SHA1(a4178497ad0a1e60ceb87612b218d77b36d2a11b) ) ROM_END @@ -2193,7 +2193,7 @@ ROM_START( karatblzj ) ROM_REGION( 0x080000, "ym.deltat", 0 ) /* sound samples */ ROM_LOAD( "u105.gh8", 0x000000, 0x080000, CRC(7a68cb1b) SHA1(1bdd0000c2d68019b9e5bf8f7ad84a6ae1af8443) ) - ROM_REGION( 0x100000, "ym", 0 ) /* sound samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* sound samples */ ROM_LOAD( "u104", 0x000000, 0x100000, CRC(5795e884) SHA1(a4178497ad0a1e60ceb87612b218d77b36d2a11b) ) ROM_END @@ -2228,7 +2228,7 @@ ROM_START( turbofrc ) ROM_REGION( 0x20000, "ym.deltat", 0 ) /* sound samples */ ROM_LOAD( "tfrcu180.bin", 0x00000, 0x20000, CRC(39c7c7d5) SHA1(66ee9f7cbc18ffab2c70f77ab0edead6bb018ca9) ) - ROM_REGION( 0x100000, "ym", 0 ) /* sound samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* sound samples */ ROM_LOAD( "tfrcu179.bin", 0x000000, 0x100000, CRC(60ca0333) SHA1(28b94edc98d360386759780ccd1122d43ffa5279) ) ROM_END @@ -2253,7 +2253,7 @@ ROM_START( aerofgt ) ROM_REGION( 0x40000, "ym.deltat", 0 ) /* sound samples */ ROM_LOAD( "it-19-01", 0x00000, 0x40000, CRC(6d42723d) SHA1(57c59234e9925430a4c687733682efed06d7eed1) ) - ROM_REGION( 0x100000, "ym", 0 ) /* sound samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* sound samples */ ROM_LOAD( "it-19-06", 0x000000, 0x100000, CRC(cdbbdb1d) SHA1(067c816545f246ff1fd4c821d70df1e7eb47938c) ) ROM_END @@ -2283,7 +2283,7 @@ ROM_START( aerofgtb ) ROM_REGION( 0x40000, "ym.deltat", 0 ) /* sound samples */ ROM_LOAD( "it-19-01", 0x00000, 0x40000, CRC(6d42723d) SHA1(57c59234e9925430a4c687733682efed06d7eed1) ) - ROM_REGION( 0x100000, "ym", 0 ) /* sound samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* sound samples */ ROM_LOAD( "it-19-06", 0x000000, 0x100000, CRC(cdbbdb1d) SHA1(067c816545f246ff1fd4c821d70df1e7eb47938c) ) ROM_END @@ -2314,7 +2314,7 @@ ROM_START( aerofgtc ) ROM_REGION( 0x40000, "ym.deltat", 0 ) /* sound samples */ ROM_LOAD( "it-19-01", 0x00000, 0x40000, CRC(6d42723d) SHA1(57c59234e9925430a4c687733682efed06d7eed1) ) - ROM_REGION( 0x100000, "ym", 0 ) /* sound samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* sound samples */ ROM_LOAD( "it-19-06", 0x000000, 0x100000, CRC(cdbbdb1d) SHA1(067c816545f246ff1fd4c821d70df1e7eb47938c) ) ROM_END @@ -2345,7 +2345,7 @@ ROM_START( sonicwi ) ROM_REGION( 0x40000, "ym.deltat", 0 ) /* sound samples */ ROM_LOAD( "it-19-01", 0x00000, 0x40000, CRC(6d42723d) SHA1(57c59234e9925430a4c687733682efed06d7eed1) ) - ROM_REGION( 0x100000, "ym", 0 ) /* sound samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* sound samples */ ROM_LOAD( "it-19-06", 0x000000, 0x100000, CRC(cdbbdb1d) SHA1(067c816545f246ff1fd4c821d70df1e7eb47938c) ) ROM_END diff --git a/src/mame/drivers/airbustr.c b/src/mame/drivers/airbustr.c index 82bb4355010..5edb310a17b 100644 --- a/src/mame/drivers/airbustr.c +++ b/src/mame/drivers/airbustr.c @@ -418,7 +418,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(sound_bankswitch_w) - AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0x04, 0x04) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0x06, 0x06) AM_READWRITE(soundcommand_r, soundcommand2_w) ADDRESS_MAP_END @@ -650,7 +650,7 @@ static MACHINE_DRIVER_START( airbustr ) // sound hardware MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 3000000) + MDRV_SOUND_ADD("ymsnd", YM2203, 3000000) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(0, "mono", 0.25) MDRV_SOUND_ROUTE(1, "mono", 0.25) diff --git a/src/mame/drivers/ajax.c b/src/mame/drivers/ajax.c index 019f32aaed5..8019f4689b7 100644 --- a/src/mame/drivers/ajax.c +++ b/src/mame/drivers/ajax.c @@ -55,7 +55,7 @@ static ADDRESS_MAP_START( ajax_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE("konami2", k007232_r, k007232_w) /* 007232 registers (chip 2) */ AM_RANGE(0xb80c, 0xb80c) AM_DEVWRITE("konami2", k007232_extvol_w) /* extra volume, goes to the 007232 w/ A11 */ /* selecting a different latch for the external port */ - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) /* YM2151 */ + AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) /* YM2151 */ AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r) /* soundlatch_r */ ADDRESS_MAP_END @@ -215,7 +215,7 @@ static MACHINE_DRIVER_START( ajax ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/albazc.c b/src/mame/drivers/albazc.c index 480d2c9e791..aaf5b3864bc 100644 --- a/src/mame/drivers/albazc.c +++ b/src/mame/drivers/albazc.c @@ -128,8 +128,8 @@ static ADDRESS_MAP_START( hanaroku_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xb000, 0xb000) AM_WRITENOP // ??? always 0x40 AM_RANGE(0xc000, 0xc3ff) AM_RAM // main ram AM_RANGE(0xc400, 0xc4ff) AM_RAM // ??? - AM_RANGE(0xd000, 0xd000) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0xd000, 0xd001) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0xd000, 0xd000) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0xd000, 0xd001) AM_DEVWRITE("aysnd", ay8910_address_data_w) AM_RANGE(0xe000, 0xe000) AM_READ_PORT("IN0") AM_WRITE(hanaroku_out_0_w) AM_RANGE(0xe001, 0xe001) AM_READ_PORT("IN1") AM_RANGE(0xe002, 0xe002) AM_READ_PORT("IN2") AM_WRITE(hanaroku_out_1_w) @@ -249,7 +249,7 @@ static MACHINE_DRIVER_START( hanaroku ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 1500000) + MDRV_SOUND_ADD("aysnd", AY8910, 1500000) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/albazg.c b/src/mame/drivers/albazg.c index cfba7565105..c529a8be0b9 100644 --- a/src/mame/drivers/albazg.c +++ b/src/mame/drivers/albazg.c @@ -254,8 +254,8 @@ static ADDRESS_MAP_START( port_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_DEVWRITE("crtc", mc6845_address_w) AM_RANGE(0x01, 0x01) AM_DEVWRITE("crtc", mc6845_register_w) - AM_RANGE(0x40, 0x40) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x40, 0x41) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x40, 0x40) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x40, 0x41) AM_DEVWRITE("aysnd", ay8910_address_data_w) AM_RANGE(0x80, 0x83) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) AM_RANGE(0xc0, 0xc0) AM_WRITE(watchdog_reset_w) ADDRESS_MAP_END @@ -301,7 +301,7 @@ static MACHINE_DRIVER_START( yumefuda ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, MASTER_CLOCK/16) /* guessed to use the same xtal as the crtc */ + MDRV_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/16) /* guessed to use the same xtal as the crtc */ MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/aliens.c b/src/mame/drivers/aliens.c index ca32b55d543..f9e36effa24 100644 --- a/src/mame/drivers/aliens.c +++ b/src/mame/drivers/aliens.c @@ -108,7 +108,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( aliens_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM /* ROM g04_b03.bin */ AM_RANGE(0x8000, 0x87ff) AM_RAM /* RAM */ - AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xc000, 0xc000) AM_READ(soundlatch_r) /* soundlatch_r */ AM_RANGE(0xe000, 0xe00d) AM_DEVREADWRITE("konami", k007232_r, k007232_w) ADDRESS_MAP_END @@ -219,7 +219,7 @@ static MACHINE_DRIVER_START( aliens ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "mono", 0.60) MDRV_SOUND_ROUTE(1, "mono", 0.60) diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c index 7a78eff9633..d5d85e7cb5b 100644 --- a/src/mame/drivers/alpha68k.c +++ b/src/mame/drivers/alpha68k.c @@ -836,8 +836,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( alpha68k_I_s_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x9fff) AM_ROM AM_RANGE(0xe000, 0xe000) AM_READWRITE(soundlatch_r, soundlatch_clear_w) - AM_RANGE(0xe800, 0xe800) AM_DEVREADWRITE("ym", ym3812_status_port_r, ym3812_control_port_w) - AM_RANGE(0xec00, 0xec00) AM_DEVWRITE("ym", ym3812_write_port_w) + AM_RANGE(0xe800, 0xe800) AM_DEVREADWRITE("ymsnd", ym3812_status_port_r, ym3812_control_port_w) + AM_RANGE(0xec00, 0xec00) AM_DEVWRITE("ymsnd", ym3812_write_port_w) AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_RANGE(0xfc00, 0xfc00) AM_RAM // unknown port ADDRESS_MAP_END @@ -867,16 +867,16 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( jongbou_sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVWRITE("ay", ay8910_address_w) - AM_RANGE(0x01, 0x01) AM_DEVREADWRITE("ay", ay8910_r, ay8910_data_w) + AM_RANGE(0x00, 0x00) AM_DEVWRITE("aysnd", ay8910_address_w) + AM_RANGE(0x01, 0x01) AM_DEVREADWRITE("aysnd", ay8910_r, ay8910_data_w) AM_RANGE(0x02, 0x02) AM_WRITE(soundlatch_clear_w) AM_RANGE(0x06, 0x06) AM_WRITENOP ADDRESS_MAP_END static ADDRESS_MAP_START( tnextspc_sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ym", ym3812_status_port_r, ym3812_control_port_w) - AM_RANGE(0x20, 0x20) AM_DEVWRITE("ym", ym3812_write_port_w) + AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ymsnd", ym3812_status_port_r, ym3812_control_port_w) + AM_RANGE(0x20, 0x20) AM_DEVWRITE("ymsnd", ym3812_write_port_w) AM_RANGE(0x3b, 0x3b) AM_READNOP // unknown read port AM_RANGE(0x3d, 0x3d) AM_READNOP // unknown read port AM_RANGE(0x7b, 0x7b) AM_READNOP // unknown read port @@ -2040,7 +2040,7 @@ static MACHINE_DRIVER_START( jongbou ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 2000000) + MDRV_SOUND_ADD("aysnd", AY8910, 2000000) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65) MACHINE_DRIVER_END @@ -2073,7 +2073,7 @@ static MACHINE_DRIVER_START( alpha68k_I ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 4000000) + MDRV_SOUND_ADD("ymsnd", YM3812, 4000000) MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END @@ -2280,7 +2280,7 @@ static MACHINE_DRIVER_START( tnextspc ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 4000000) + MDRV_SOUND_ADD("ymsnd", YM3812, 4000000) MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/amaticmg.c b/src/mame/drivers/amaticmg.c index 89ef9648543..ffa03f57ba1 100644 --- a/src/mame/drivers/amaticmg.c +++ b/src/mame/drivers/amaticmg.c @@ -431,7 +431,7 @@ static ADDRESS_MAP_START( amaticmg_portmap, ADDRESS_SPACE_IO, 8 ) // AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) // AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) // AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ppi8255_2", ppi8255_r, ppi8255_w) -// AM_RANGE(0x00, 0x00) AM_DEVWRITE("ym", ym3812_w) +// AM_RANGE(0x00, 0x00) AM_DEVWRITE("ymsnd", ym3812_w) // AM_RANGE(0x00, 0x00) AM_DEVWRITE("dac1", dac_signed_w) // AM_RANGE(0x00, 0x00) AM_DEVWRITE("dac2", dac_signed_w) @@ -644,7 +644,7 @@ static MACHINE_DRIVER_START( amaticmg ) /* sound hardware */ // MDRV_SPEAKER_STANDARD_MONO("mono") -// MDRV_SOUND_ADD("ym", YM3812, SND_CLOCK) +// MDRV_SOUND_ADD("ymsnd", YM3812, SND_CLOCK) // MDRV_SOUND_CONFIG(ym3812_config) // MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) diff --git a/src/mame/drivers/ampoker2.c b/src/mame/drivers/ampoker2.c index 79bf1b5836b..df9d28e30f8 100644 --- a/src/mame/drivers/ampoker2.c +++ b/src/mame/drivers/ampoker2.c @@ -607,8 +607,8 @@ static ADDRESS_MAP_START( ampoker2_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x35, 0x35) AM_WRITE (ampoker2_port35_w) /* see write handlers */ AM_RANGE(0x36, 0x36) AM_WRITE (ampoker2_port36_w) /* see write handlers */ AM_RANGE(0x37, 0x37) AM_WRITE(ampoker2_watchdog_reset_w) - AM_RANGE(0x38, 0x39) AM_DEVWRITE("ay", ay8910_address_data_w) - AM_RANGE(0x3A, 0x3A) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x38, 0x39) AM_DEVWRITE("aysnd", ay8910_address_data_w) + AM_RANGE(0x3A, 0x3A) AM_DEVREAD("aysnd", ay8910_r) ADDRESS_MAP_END /* @@ -1084,7 +1084,7 @@ static MACHINE_DRIVER_START( ampoker2 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910,MASTER_CLOCK/4) /* 1.5 MHz, measured */ + MDRV_SOUND_ADD("aysnd", AY8910,MASTER_CLOCK/4) /* 1.5 MHz, measured */ MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_DRIVER_END diff --git a/src/mame/drivers/amspdwy.c b/src/mame/drivers/amspdwy.c index e6791984363..2f396aa93a9 100644 --- a/src/mame/drivers/amspdwy.c +++ b/src/mame/drivers/amspdwy.c @@ -95,7 +95,7 @@ static ADDRESS_MAP_START( amspdwy_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa800, 0xa800) AM_READ(amspdwy_wheel_0_r) // Player 1 AM_RANGE(0xac00, 0xac00) AM_READ(amspdwy_wheel_1_r) // Player 2 AM_RANGE(0xb000, 0xb000) AM_WRITENOP // ? Exiting IRQ - AM_RANGE(0xb400, 0xb400) AM_DEVREAD("ym", amspdwy_sound_r) AM_WRITE(amspdwy_sound_w) // YM2151 status, To Sound CPU + AM_RANGE(0xb400, 0xb400) AM_DEVREAD("ymsnd", amspdwy_sound_r) AM_WRITE(amspdwy_sound_w) // YM2151 status, To Sound CPU AM_RANGE(0xc000, 0xc0ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size)// Sprites AM_RANGE(0xe000, 0xe7ff) AM_RAM // Work RAM ADDRESS_MAP_END @@ -125,7 +125,7 @@ static ADDRESS_MAP_START( amspdwy_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM // AM_RANGE(0x8000, 0x8000) AM_WRITENOP // ? Written with 0 at the start AM_RANGE(0x9000, 0x9000) AM_READ(soundlatch_r) // From Main CPU - AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) // + AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) // AM_RANGE(0xc000, 0xdfff) AM_RAM // Work RAM AM_RANGE(0xffff, 0xffff) AM_READNOP // ??? IY = FFFF at the start ? ADDRESS_MAP_END @@ -295,7 +295,7 @@ static MACHINE_DRIVER_START( amspdwy ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 3000000) + MDRV_SOUND_ADD("ymsnd", YM2151, 3000000) MDRV_SOUND_CONFIG(amspdwy_ym2151_interface) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/aquarium.c b/src/mame/drivers/aquarium.c index 48287791a30..518c1d35497 100644 --- a/src/mame/drivers/aquarium.c +++ b/src/mame/drivers/aquarium.c @@ -165,7 +165,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( snd_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x02, 0x02) AM_DEVREADWRITE("oki", aquarium_oki_r, aquarium_oki_w) AM_RANGE(0x04, 0x04) AM_READ(soundlatch_r) AM_RANGE(0x06, 0x06) AM_WRITE(aquarium_snd_ack_w) @@ -377,7 +377,7 @@ static MACHINE_DRIVER_START( aquarium ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.45) MDRV_SOUND_ROUTE(1, "rspeaker", 0.45) diff --git a/src/mame/drivers/arabian.c b/src/mame/drivers/arabian.c index b39c575a8ee..4b5ab49a2ea 100644 --- a/src/mame/drivers/arabian.c +++ b/src/mame/drivers/arabian.c @@ -235,8 +235,8 @@ ADDRESS_MAP_END *************************************/ static ADDRESS_MAP_START( main_io_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0xc800, 0xc800) AM_MIRROR(0x01ff) AM_DEVWRITE("ay", ay8910_address_w) - AM_RANGE(0xca00, 0xca00) AM_MIRROR(0x01ff) AM_DEVWRITE("ay", ay8910_data_w) + AM_RANGE(0xc800, 0xc800) AM_MIRROR(0x01ff) AM_DEVWRITE("aysnd", ay8910_address_w) + AM_RANGE(0xca00, 0xca00) AM_MIRROR(0x01ff) AM_DEVWRITE("aysnd", ay8910_data_w) ADDRESS_MAP_END @@ -398,7 +398,7 @@ static MACHINE_DRIVER_START( arabian ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, MAIN_OSC/4/2) + MDRV_SOUND_ADD("aysnd", AY8910, MAIN_OSC/4/2) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/arkanoid.c b/src/mame/drivers/arkanoid.c index d9749ba2400..8ccaf090c11 100644 --- a/src/mame/drivers/arkanoid.c +++ b/src/mame/drivers/arkanoid.c @@ -519,8 +519,8 @@ int arkanoid_bootleg_id; static ADDRESS_MAP_START( arkanoid_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xc7ff) AM_RAM - AM_RANGE(0xd000, 0xd001) AM_DEVWRITE("ay", ay8910_address_data_w) - AM_RANGE(0xd001, 0xd001) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0xd000, 0xd001) AM_DEVWRITE("aysnd", ay8910_address_data_w) + AM_RANGE(0xd001, 0xd001) AM_DEVREAD("aysnd", ay8910_r) AM_RANGE(0xd008, 0xd008) AM_WRITE(arkanoid_d008_w) /* gfx bank, flip screen etc. */ AM_RANGE(0xd00c, 0xd00c) AM_READ_PORT("SYSTEM") /* 2 bits from the 68705 */ AM_RANGE(0xd010, 0xd010) AM_READ_PORT("BUTTONS") AM_WRITE(watchdog_reset_w) @@ -534,8 +534,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bootleg_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xc7ff) AM_RAM - AM_RANGE(0xd000, 0xd000) AM_DEVWRITE("ay", ay8910_address_w) - AM_RANGE(0xd001, 0xd001) AM_DEVREADWRITE("ay", ay8910_r, ay8910_data_w) + AM_RANGE(0xd000, 0xd000) AM_DEVWRITE("aysnd", ay8910_address_w) + AM_RANGE(0xd001, 0xd001) AM_DEVREADWRITE("aysnd", ay8910_r, ay8910_data_w) AM_RANGE(0xd008, 0xd008) AM_WRITE(arkanoid_d008_w) /* gfx bank, flip screen etc. */ AM_RANGE(0xd00c, 0xd00c) AM_READ_PORT("SYSTEM") AM_RANGE(0xd010, 0xd010) AM_READ_PORT("BUTTONS") AM_WRITE(watchdog_reset_w) @@ -832,7 +832,7 @@ static MACHINE_DRIVER_START( arkanoid ) // sound hardware MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, XTAL_12MHz/4/2) /* YM2149 clock is 3mhz, pin 26 is low so 3mhz/2 */ + MDRV_SOUND_ADD("aysnd", AY8910, XTAL_12MHz/4/2) /* YM2149 clock is 3mhz, pin 26 is low so 3mhz/2 */ MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33) MACHINE_DRIVER_END diff --git a/src/mame/drivers/armedf.c b/src/mame/drivers/armedf.c index bb0656212d6..e517acaed8b 100644 --- a/src/mame/drivers/armedf.c +++ b/src/mame/drivers/armedf.c @@ -427,7 +427,7 @@ static READ8_HANDLER( soundlatch_clear_r ) static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x0, 0x1) AM_DEVWRITE("ym", ym3812_w) + AM_RANGE(0x0, 0x1) AM_DEVWRITE("ymsnd", ym3812_w) AM_RANGE(0x2, 0x2) AM_DEVWRITE("dac1", dac_signed_w) AM_RANGE(0x3, 0x3) AM_DEVWRITE("dac2", dac_signed_w) AM_RANGE(0x4, 0x4) AM_READ(soundlatch_clear_r) @@ -758,7 +758,7 @@ static MACHINE_DRIVER_START( terraf ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 4000000) + MDRV_SOUND_ADD("ymsnd", YM3812, 4000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MDRV_SOUND_ADD("dac1", DAC, 0) @@ -805,7 +805,7 @@ static MACHINE_DRIVER_START( terrafb ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 4000000) + MDRV_SOUND_ADD("ymsnd", YM3812, 4000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MDRV_SOUND_ADD("dac1", DAC, 0) @@ -846,7 +846,7 @@ static MACHINE_DRIVER_START( kodure ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 4000000) + MDRV_SOUND_ADD("ymsnd", YM3812, 4000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MDRV_SOUND_ADD("dac1", DAC, 0) @@ -887,7 +887,7 @@ static MACHINE_DRIVER_START( armedf ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 4000000) + MDRV_SOUND_ADD("ymsnd", YM3812, 4000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MDRV_SOUND_ADD("dac1", DAC, 0) @@ -928,7 +928,7 @@ static MACHINE_DRIVER_START( cclimbr2 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 4000000) + MDRV_SOUND_ADD("ymsnd", YM3812, 4000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MDRV_SOUND_ADD("dac1", DAC, 0) @@ -969,7 +969,7 @@ static MACHINE_DRIVER_START( legion ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 4000000) + MDRV_SOUND_ADD("ymsnd", YM3812, 4000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MDRV_SOUND_ADD("dac1", DAC, 0) @@ -1010,7 +1010,7 @@ static MACHINE_DRIVER_START( legiono ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 4000000) + MDRV_SOUND_ADD("ymsnd", YM3812, 4000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MDRV_SOUND_ADD("dac1", DAC, 0) diff --git a/src/mame/drivers/ashnojoe.c b/src/mame/drivers/ashnojoe.c index 6393a8ea0bf..da42b47122e 100644 --- a/src/mame/drivers/ashnojoe.c +++ b/src/mame/drivers/ashnojoe.c @@ -163,7 +163,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0x02, 0x02) AM_WRITE(adpcm_w) AM_RANGE(0x04, 0x04) AM_READ(sound_latch_r) AM_RANGE(0x06, 0x06) AM_READ(sound_latch_status_r) @@ -378,7 +378,7 @@ static MACHINE_DRIVER_START( ashnojoe ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 4000000) + MDRV_SOUND_ADD("ymsnd", YM2203, 4000000) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.1) diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c index ecfafa17239..162932a1634 100644 --- a/src/mame/drivers/asterix.c +++ b/src/mame/drivers/asterix.c @@ -202,10 +202,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_ROM AM_RANGE(0xf000, 0xf7ff) AM_RAM - AM_RANGE(0xf801, 0xf801) AM_DEVREADWRITE("ym", ym2151_status_port_r, ym2151_data_port_w) + AM_RANGE(0xf801, 0xf801) AM_DEVREADWRITE("ymsnd", ym2151_status_port_r, ym2151_data_port_w) AM_RANGE(0xfa00, 0xfa2f) AM_DEVREADWRITE("konami", k053260_r, k053260_w) AM_RANGE(0xfc00, 0xfc00) AM_WRITE(sound_arm_nmi_w) - AM_RANGE(0xfe00, 0xfe00) AM_DEVWRITE("ym", ym2151_register_port_w) + AM_RANGE(0xfe00, 0xfe00) AM_DEVWRITE("ymsnd", ym2151_register_port_w) ADDRESS_MAP_END @@ -255,7 +255,7 @@ static MACHINE_DRIVER_START( asterix ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 4000000) + MDRV_SOUND_ADD("ymsnd", YM2151, 4000000) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/astrocde.c b/src/mame/drivers/astrocde.c index a3960badf4d..22c8b00ef85 100644 --- a/src/mame/drivers/astrocde.c +++ b/src/mame/drivers/astrocde.c @@ -708,9 +708,9 @@ static ADDRESS_MAP_START( tenpin_sub_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x90, 0x93) AM_DEVREADWRITE("ctc", z80ctc_r, z80ctc_w) AM_RANGE(0x97, 0x97) AM_READ(soundlatch_r) - AM_RANGE(0x98, 0x98) AM_DEVWRITE("ay", ay8910_address_w) - AM_RANGE(0x98, 0x98) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x9a, 0x9a) AM_DEVWRITE("ay", ay8910_data_w) + AM_RANGE(0x98, 0x98) AM_DEVWRITE("aysnd", ay8910_address_w) + AM_RANGE(0x98, 0x98) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x9a, 0x9a) AM_DEVWRITE("aysnd", ay8910_data_w) ADDRESS_MAP_END @@ -1466,7 +1466,7 @@ static MACHINE_DRIVER_START( tenpindx ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8912, ASTROCADE_CLOCK/4) /* real clock unknown */ + MDRV_SOUND_ADD("aysnd", AY8912, ASTROCADE_CLOCK/4) /* real clock unknown */ MDRV_SOUND_CONFIG(ay8912_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33) MACHINE_DRIVER_END diff --git a/src/mame/drivers/asuka.c b/src/mame/drivers/asuka.c index 959f9058427..e287a424bae 100644 --- a/src/mame/drivers/asuka.c +++ b/src/mame/drivers/asuka.c @@ -276,7 +276,7 @@ static void asuka_msm5205_vck(const device_config *device) } else { - adpcm_data = memory_region(device->machine, "ym")[adpcm_pos]; + adpcm_data = memory_region(device->machine, "ymsnd")[adpcm_pos]; adpcm_pos = (adpcm_pos + 1) & 0xffff; msm5205_data_w(device, adpcm_data >> 4); } @@ -391,7 +391,7 @@ static ADDRESS_MAP_START( bonzeadv_z80_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) AM_RANGE(0xc000, 0xdfff) AM_RAM - AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) + AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) AM_RANGE(0xe200, 0xe200) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xe201, 0xe201) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w) AM_RANGE(0xe400, 0xe403) AM_WRITENOP /* pan */ @@ -405,7 +405,7 @@ static ADDRESS_MAP_START( z80_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) AM_RANGE(0x8000, 0x8fff) AM_RAM - AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) // AM_RANGE(0x9002, 0x9100) AM_READNOP AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xa001, 0xa001) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w) @@ -419,7 +419,7 @@ static ADDRESS_MAP_START( cadash_z80_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) AM_RANGE(0x8000, 0x8fff) AM_RAM - AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xa001, 0xa001) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w) ADDRESS_MAP_END @@ -820,7 +820,7 @@ static MACHINE_DRIVER_START( bonzeadv ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "mono", 0.25) MDRV_SOUND_ROUTE(1, "mono", 1.0) @@ -859,7 +859,7 @@ static MACHINE_DRIVER_START( asuka ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, XTAL_16MHz/4) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_16MHz/4) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "mono", 0.50) MDRV_SOUND_ROUTE(1, "mono", 0.50) @@ -901,7 +901,7 @@ static MACHINE_DRIVER_START( cadash ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, XTAL_8MHz/2) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_8MHz/2) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "mono", 0.50) MDRV_SOUND_ROUTE(1, "mono", 0.50) @@ -939,7 +939,7 @@ static MACHINE_DRIVER_START( mofflott ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 4000000) + MDRV_SOUND_ADD("ymsnd", YM2151, 4000000) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "mono", 0.50) MDRV_SOUND_ROUTE(1, "mono", 0.50) @@ -981,7 +981,7 @@ static MACHINE_DRIVER_START( galmedes ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 4000000) + MDRV_SOUND_ADD("ymsnd", YM2151, 4000000) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "mono", 0.50) MDRV_SOUND_ROUTE(1, "mono", 0.50) @@ -1019,7 +1019,7 @@ static MACHINE_DRIVER_START( eto ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 4000000) + MDRV_SOUND_ADD("ymsnd", YM2151, 4000000) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "mono", 0.50) MDRV_SOUND_ROUTE(1, "mono", 0.50) @@ -1051,7 +1051,7 @@ ROM_START( bonzeadv ) /* CPU3 - CCHIP aka TC0030CMD marked b41-05.43 */ - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b41-04.48", 0x00000, 0x80000, CRC(c668638f) SHA1(07238a6cb4d93ffaf6351657163b5d80f0dbf688) ) ROM_END @@ -1076,7 +1076,7 @@ ROM_START( bonzeadvo ) /* CPU3 - CCHIP aka TC0030CMD marked b41-05.43 */ - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b41-04.48", 0x00000, 0x80000, CRC(c668638f) SHA1(07238a6cb4d93ffaf6351657163b5d80f0dbf688) ) ROM_END @@ -1101,7 +1101,7 @@ ROM_START( bonzeadvu ) /* CPU3 - CCHIP aka TC0030CMD marked b41-05.43 */ - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b41-04.48", 0x00000, 0x80000, CRC(c668638f) SHA1(07238a6cb4d93ffaf6351657163b5d80f0dbf688) ) ROM_END @@ -1126,7 +1126,7 @@ ROM_START( jigkmgri ) /* CPU3 - CCHIP aka TC0030CMD marked b41-05.43 */ - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b41-04.48", 0x00000, 0x80000, CRC(c668638f) SHA1(07238a6cb4d93ffaf6351657163b5d80f0dbf688) ) ROM_END @@ -1149,7 +1149,7 @@ ROM_START( asuka ) ROM_LOAD( "b68-11.bin", 0x00000, 0x04000, CRC(c378b508) SHA1(1b145fe736b924f298e02532cf9f26cc18b42ca7) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x10000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x10000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b68-10.bin", 0x00000, 0x10000, CRC(387aaf40) SHA1(47c583564ef1d49ece15f97221b2e073e8fb0544) ) ROM_END @@ -1172,7 +1172,7 @@ ROM_START( asukaj ) ROM_LOAD( "b68-11.bin", 0x00000, 0x04000, CRC(c378b508) SHA1(1b145fe736b924f298e02532cf9f26cc18b42ca7) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x10000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x10000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b68-10.bin", 0x00000, 0x10000, CRC(387aaf40) SHA1(47c583564ef1d49ece15f97221b2e073e8fb0544) ) ROM_END @@ -1195,7 +1195,7 @@ ROM_START( mofflott ) ROM_LOAD( "c17-07.bin", 0x00000, 0x04000, CRC(cdb7bc2c) SHA1(5113055c954a39918436db75cc06b53c29c60728) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x10000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x10000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c17-06.bin", 0x00000, 0x10000, CRC(5c332125) SHA1(408f42df18b38347c8a4e177a9484162a66877e1) ) ROM_END diff --git a/src/mame/drivers/atarisy1.c b/src/mame/drivers/atarisy1.c index cc55b6f8189..9b7125e9c50 100644 --- a/src/mame/drivers/atarisy1.c +++ b/src/mame/drivers/atarisy1.c @@ -494,7 +494,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_RAM AM_RANGE(0x1000, 0x100f) AM_DEVREADWRITE("via6522_0", via_r, via_w) - AM_RANGE(0x1800, 0x1801) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x1800, 0x1801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x1810, 0x1810) AM_READWRITE(atarigen_6502_sound_r, atarigen_6502_sound_w) AM_RANGE(0x1820, 0x1820) AM_READ(switch_6502_r) AM_RANGE(0x1824, 0x1825) AM_WRITE(led_w) @@ -779,7 +779,7 @@ static MACHINE_DRIVER_START( atarisy1 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, ATARI_CLOCK_14MHz/4) + MDRV_SOUND_ADD("ymsnd", YM2151, ATARI_CLOCK_14MHz/4) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) diff --git a/src/mame/drivers/atarisy2.c b/src/mame/drivers/atarisy2.c index a8e39ba4ede..e2c8f0a7a36 100644 --- a/src/mame/drivers/atarisy2.c +++ b/src/mame/drivers/atarisy2.c @@ -631,7 +631,7 @@ static WRITE8_HANDLER( sound_reset_w ) /* a large number of signals are reset when this happens */ atarigen_sound_io_reset(cputag_get_cpu(space->machine, "soundcpu")); - devtag_reset(space->machine, "ym"); + devtag_reset(space->machine, "ymsnd"); mixer_w(space, 0, 0); tms5220_data = 0; tms5220_data_strobe = 0; @@ -755,7 +755,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1810, 0x1813) AM_MIRROR(0x278c) AM_READ(leta_r) AM_RANGE(0x1830, 0x183f) AM_MIRROR(0x2780) AM_DEVREADWRITE("pokey2", pokey_r, pokey_w) AM_RANGE(0x1840, 0x1840) AM_MIRROR(0x278f) AM_READ(switch_6502_r) - AM_RANGE(0x1850, 0x1851) AM_MIRROR(0x278e) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x1850, 0x1851) AM_MIRROR(0x278e) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x1860, 0x1860) AM_MIRROR(0x278f) AM_READ(sound_6502_r) AM_RANGE(0x1870, 0x1870) AM_MIRROR(0x2781) AM_WRITE(tms5220_w) AM_RANGE(0x1872, 0x1873) AM_MIRROR(0x2780) AM_WRITE(tms5220_strobe_w) @@ -1170,7 +1170,7 @@ static MACHINE_DRIVER_START( atarisy2 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK/4) + MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK/4) MDRV_SOUND_ROUTE(0, "lspeaker", 0.60) MDRV_SOUND_ROUTE(1, "rspeaker", 0.60) diff --git a/src/mame/drivers/ataxx.c b/src/mame/drivers/ataxx.c index d3829323370..27e5889b0a5 100644 --- a/src/mame/drivers/ataxx.c +++ b/src/mame/drivers/ataxx.c @@ -327,7 +327,7 @@ static MACHINE_DRIVER_START( wsf ) MDRV_IMPORT_FROM(ataxx) /* sound hardware */ - MDRV_SOUND_ADD("ym", YM2151, 4000000) + MDRV_SOUND_ADD("ymsnd", YM2151, 4000000) MDRV_SOUND_ROUTE(0, "mono", 0.40) MDRV_SOUND_ROUTE(1, "mono", 0.40) MACHINE_DRIVER_END diff --git a/src/mame/drivers/badlands.c b/src/mame/drivers/badlands.c index 7654aae1e48..49748385094 100644 --- a/src/mame/drivers/badlands.c +++ b/src/mame/drivers/badlands.c @@ -406,7 +406,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_RAM - AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x2800, 0x2bff) AM_READWRITE(audio_io_r, audio_io_w) AM_RANGE(0x3000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -527,7 +527,7 @@ static MACHINE_DRIVER_START( badlands ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, ATARI_CLOCK_14MHz/4) + MDRV_SOUND_ADD("ymsnd", YM2151, ATARI_CLOCK_14MHz/4) MDRV_SOUND_ROUTE(0, "mono", 0.30) MDRV_SOUND_ROUTE(1, "mono", 0.30) MACHINE_DRIVER_END @@ -733,7 +733,7 @@ static MACHINE_DRIVER_START( badlandb ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 2800000/4) + MDRV_SOUND_ADD("ymsnd", YM2151, 2800000/4) MDRV_SOUND_ROUTE(0, "mono", 0.30) MDRV_SOUND_ROUTE(1, "mono", 0.30) MACHINE_DRIVER_END diff --git a/src/mame/drivers/bagman.c b/src/mame/drivers/bagman.c index e35cb1633d4..c181dba4882 100644 --- a/src/mame/drivers/bagman.c +++ b/src/mame/drivers/bagman.c @@ -225,8 +225,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x08, 0x09) AM_DEVWRITE("ay", ay8910_address_data_w) - AM_RANGE(0x0c, 0x0c) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x08, 0x09) AM_DEVWRITE("aysnd", ay8910_address_data_w) + AM_RANGE(0x0c, 0x0c) AM_DEVREAD("aysnd", ay8910_r) //AM_RANGE(0x56, 0x56) AM_WRITENOP ADDRESS_MAP_END @@ -527,7 +527,7 @@ static MACHINE_DRIVER_START( bagman ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 1500000) + MDRV_SOUND_ADD("aysnd", AY8910, 1500000) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) @@ -563,7 +563,7 @@ static MACHINE_DRIVER_START( pickin ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 1500000) + MDRV_SOUND_ADD("aysnd", AY8910, 1500000) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) @@ -618,7 +618,7 @@ static MACHINE_DRIVER_START( botanic ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 1500000) + MDRV_SOUND_ADD("aysnd", AY8910, 1500000) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) @@ -629,7 +629,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( squaitsa ) MDRV_IMPORT_FROM( botanic ) - MDRV_SOUND_MODIFY("ay") + MDRV_SOUND_MODIFY("aysnd") MDRV_SOUND_CONFIG(ay8910_dial_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) MACHINE_DRIVER_END diff --git a/src/mame/drivers/balsente.c b/src/mame/drivers/balsente.c index 2cb642386f9..dba2969d3a1 100644 --- a/src/mame/drivers/balsente.c +++ b/src/mame/drivers/balsente.c @@ -589,10 +589,10 @@ static INPUT_PORTS_START( stocker ) PORT_DIPSETTING( 0x18, "5 Coins = 2 Bonus" ) PORT_DIPSETTING( 0x1c, "5 Coins = 3 Bonus" ) PORT_DIPNAME( 0x20, 0x00, "Left Coin Mech" ) PORT_DIPLOCATION("H1:6") - PORT_DIPSETTING( 0x00, "x1" ) + PORT_DIPSETTING( 0x00, "x1snd" ) PORT_DIPSETTING( 0x20, "x2" ) PORT_DIPNAME( 0xc0, 0x00, "Right Coin Mech" ) PORT_DIPLOCATION("H1:7,8") - PORT_DIPSETTING( 0x00, "x1" ) + PORT_DIPSETTING( 0x00, "x1snd" ) PORT_DIPSETTING( 0x40, "x4" ) PORT_DIPSETTING( 0x80, "x5" ) PORT_DIPSETTING( 0xc0, "x6" ) diff --git a/src/mame/drivers/battlane.c b/src/mame/drivers/battlane.c index 91321e2c3f5..bd87075cbfa 100644 --- a/src/mame/drivers/battlane.c +++ b/src/mame/drivers/battlane.c @@ -96,7 +96,7 @@ static ADDRESS_MAP_START( battlane_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1c01, 0x1c01) AM_READ_PORT("P2") AM_WRITE(battlane_scrollx_w) AM_RANGE(0x1c02, 0x1c02) AM_READ_PORT("DSW1") AM_WRITE(battlane_scrolly_w) AM_RANGE(0x1c03, 0x1c03) AM_READ_PORT("DSW2") AM_WRITE(battlane_cpu_command_w) - AM_RANGE(0x1c04, 0x1c05) AM_DEVREADWRITE("ym", ym3526_r, ym3526_w) + AM_RANGE(0x1c04, 0x1c05) AM_DEVREADWRITE("ymsnd", ym3526_r, ym3526_w) AM_RANGE(0x1e00, 0x1e3f) AM_WRITE(battlane_palette_w) AM_RANGE(0x2000, 0x3fff) AM_RAM_WRITE(battlane_bitmap_w) AM_SHARE(4) AM_RANGE(0x4000, 0xffff) AM_ROM @@ -278,7 +278,7 @@ static MACHINE_DRIVER_START( battlane ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3526, 3000000) + MDRV_SOUND_ADD("ymsnd", YM3526, 3000000) MDRV_SOUND_CONFIG(ym3526_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/battlera.c b/src/mame/drivers/battlera.c index 236f4a0c3be..f44dda146fb 100644 --- a/src/mame/drivers/battlera.c +++ b/src/mame/drivers/battlera.c @@ -121,7 +121,7 @@ static WRITE8_DEVICE_HANDLER( battlera_adpcm_reset_w ) static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x000000, 0x00ffff) AM_ROM - AM_RANGE(0x040000, 0x040001) AM_DEVWRITE("ym", ym2203_w) + AM_RANGE(0x040000, 0x040001) AM_DEVWRITE("ymsnd", ym2203_w) AM_RANGE(0x080000, 0x080001) AM_WRITE(battlera_adpcm_data_w) AM_RANGE(0x1fe800, 0x1fe80f) AM_DEVWRITE("c6280", c6280_w) AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK(7) /* Main ram */ @@ -268,7 +268,7 @@ static MACHINE_DRIVER_START( battlera ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2203, 12000000 / 8) + MDRV_SOUND_ADD("ymsnd", YM2203, 12000000 / 8) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) diff --git a/src/mame/drivers/battlex.c b/src/mame/drivers/battlex.c index 7ab1a8d2e36..da4bc55df37 100644 --- a/src/mame/drivers/battlex.c +++ b/src/mame/drivers/battlex.c @@ -77,7 +77,7 @@ static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x10, 0x10) AM_WRITE(battlex_flipscreen_w) /* verify all of these */ - AM_RANGE(0x22, 0x23) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x22, 0x23) AM_DEVWRITE("aysnd", ay8910_data_address_w) /* 0x30 looks like scroll, but can't be ? changes (increases or decreases) depending on the direction your ship is facing on lev 2. at least */ @@ -218,7 +218,7 @@ static MACHINE_DRIVER_START( battlex ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 10000000/8) + MDRV_SOUND_ADD("aysnd", AY8910, 10000000/8) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MACHINE_DRIVER_END diff --git a/src/mame/drivers/bbusters.c b/src/mame/drivers/bbusters.c index 3064c5aa7fb..be68e58cb84 100644 --- a/src/mame/drivers/bbusters.c +++ b/src/mame/drivers/bbusters.c @@ -378,13 +378,13 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) + AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) AM_RANGE(0xc0, 0xc1) AM_WRITENOP /* -> Main CPU */ ADDRESS_MAP_END static ADDRESS_MAP_START( sounda_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ym", ym2608_r, ym2608_w) + AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ymsnd", ym2608_r, ym2608_w) AM_RANGE(0xc0, 0xc1) AM_WRITENOP /* -> Main CPU */ ADDRESS_MAP_END @@ -735,7 +735,7 @@ static MACHINE_DRIVER_START( bbusters ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(0, "rspeaker", 1.0) @@ -772,7 +772,7 @@ static MACHINE_DRIVER_START( mechatt ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2608, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2608, 8000000) MDRV_SOUND_CONFIG(ym2608_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) MDRV_SOUND_ROUTE(0, "rspeaker", 0.50) @@ -820,7 +820,7 @@ ROM_START( bbusters ) ROM_LOAD( "bb-8.a14", 0x000000, 0x10000, CRC(61f3de03) SHA1(736f9634fe054ea68a2aa90a743bd0dc320f23c9) ) ROM_LOAD( "bb-9.c14", 0x000000, 0x10000, CRC(61f3de03) SHA1(736f9634fe054ea68a2aa90a743bd0dc320f23c9) ) - ROM_REGION( 0x80000, "ym", 0 ) + ROM_REGION( 0x80000, "ymsnd", 0 ) ROM_LOAD( "bb-pcma.l5", 0x000000, 0x80000, CRC(44cd5bfe) SHA1(26a612191a0aa614c090203485aba17c99c763ee) ) ROM_REGION( 0x80000, "ym.deltat", 0 ) @@ -865,7 +865,7 @@ ROM_START( bbustersu ) ROM_LOAD( "bb-8.a14", 0x000000, 0x10000, CRC(61f3de03) SHA1(736f9634fe054ea68a2aa90a743bd0dc320f23c9) ) ROM_LOAD( "bb-9.c14", 0x000000, 0x10000, CRC(61f3de03) SHA1(736f9634fe054ea68a2aa90a743bd0dc320f23c9) ) - ROM_REGION( 0x80000, "ym", 0 ) + ROM_REGION( 0x80000, "ymsnd", 0 ) ROM_LOAD( "bb-pcma.l5", 0x000000, 0x80000, CRC(44cd5bfe) SHA1(26a612191a0aa614c090203485aba17c99c763ee) ) ROM_REGION( 0x80000, "ym.deltat", 0 ) @@ -901,7 +901,7 @@ ROM_START( mechatt ) ROM_REGION( 0x80000, "gfx5", 0 ) ROM_LOAD( "mab289c2.bin", 0x000000, 0x80000, CRC(14f97ceb) SHA1(a22033532ea616dc3a3db8b66ad6ccc6172ed7cc) ) - ROM_REGION( 0x20000, "ym", 0 ) + ROM_REGION( 0x20000, "ymsnd", 0 ) ROM_LOAD( "ma2.bin", 0x000000, 0x20000, CRC(ea4cc30d) SHA1(d8f089fc0ce76309411706a8110ad907f93dc97e) ) ROM_REGION( 0x20000, "user1", 0 ) /* Zoom table */ @@ -938,7 +938,7 @@ ROM_START( mechattu ) ROM_REGION( 0x80000, "gfx5", 0 ) ROM_LOAD( "mab289c2.bin", 0x000000, 0x80000, CRC(14f97ceb) SHA1(a22033532ea616dc3a3db8b66ad6ccc6172ed7cc) ) - ROM_REGION( 0x20000, "ym", 0 ) + ROM_REGION( 0x20000, "ymsnd", 0 ) ROM_LOAD( "ma2.bin", 0x000000, 0x20000, CRC(ea4cc30d) SHA1(d8f089fc0ce76309411706a8110ad907f93dc97e) ) ROM_REGION( 0x20000, "user1", 0 ) /* Zoom table */ diff --git a/src/mame/drivers/bfcobra.c b/src/mame/drivers/bfcobra.c index 6e5d41cb4a5..85208c9a905 100644 --- a/src/mame/drivers/bfcobra.c +++ b/src/mame/drivers/bfcobra.c @@ -1444,8 +1444,8 @@ static ADDRESS_MAP_START( m6809_prog_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2800, 0x2800) AM_RAM // W AM_RANGE(0x2A00, 0x2A02) AM_READWRITE(latch_r, latch_w) AM_RANGE(0x2E00, 0x2E00) AM_READ(int_latch_r) - AM_RANGE(0x3001, 0x3001) AM_DEVWRITE("ay", ay8910_data_w) - AM_RANGE(0x3201, 0x3201) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x3001, 0x3001) AM_DEVWRITE("aysnd", ay8910_data_w) + AM_RANGE(0x3201, 0x3201) AM_DEVWRITE("aysnd", ay8910_address_w) AM_RANGE(0x3404, 0x3404) AM_DEVREADWRITE("acia6850_1", acia6850_stat_r, acia6850_ctrl_w) AM_RANGE(0x3405, 0x3405) AM_DEVREADWRITE("acia6850_1", acia6850_data_r, acia6850_data_w) AM_RANGE(0x3406, 0x3406) AM_DEVREADWRITE("acia6850_2", acia6850_stat_r, acia6850_ctrl_w) @@ -1759,7 +1759,7 @@ static MACHINE_DRIVER_START( bfcobra ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, M6809_XTAL) + MDRV_SOUND_ADD("aysnd", AY8910, M6809_XTAL) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20) MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK) diff --git a/src/mame/drivers/bfm_sc1.c b/src/mame/drivers/bfm_sc1.c index 1e2fd87911e..9bc4fd39a6c 100644 --- a/src/mame/drivers/bfm_sc1.c +++ b/src/mame/drivers/bfm_sc1.c @@ -780,8 +780,8 @@ static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2E00, 0x2E00) AM_READ(irqlatch_r) // irq latch AM_RANGE(0x3001, 0x3001) AM_READ(soundlatch_r) - AM_RANGE(0x3001, 0x3001) AM_DEVWRITE("ay", ay8910_data_w) - AM_RANGE(0x3101, 0x3201) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x3001, 0x3001) AM_DEVWRITE("aysnd", ay8910_data_w) + AM_RANGE(0x3101, 0x3201) AM_DEVWRITE("aysnd", ay8910_address_w) AM_RANGE(0x3406, 0x3406) AM_READWRITE(aciastat_r,aciactrl_w) // MC6850 status register AM_RANGE(0x3407, 0x3407) AM_READWRITE(aciadata_r,aciadata_w) // MC6850 data register @@ -825,8 +825,8 @@ static ADDRESS_MAP_START( memmap_adder2, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2E00, 0x2E00) AM_READ(irqlatch_r) // irq latch AM_RANGE(0x3001, 0x3001) AM_READ(soundlatch_r) - AM_RANGE(0x3001, 0x3001) AM_DEVWRITE("ay", ay8910_data_w) - AM_RANGE(0x3101, 0x3201) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x3001, 0x3001) AM_DEVWRITE("aysnd", ay8910_data_w) + AM_RANGE(0x3101, 0x3201) AM_DEVWRITE("aysnd", ay8910_address_w) AM_RANGE(0x3406, 0x3406) AM_READWRITE(aciastat_r,aciactrl_w) // MC6850 status register AM_RANGE(0x3407, 0x3407) AM_READWRITE(aciadata_r,aciadata_w) // MC6850 data register @@ -874,8 +874,8 @@ static ADDRESS_MAP_START( sc1_nec_uk, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2E00, 0x2E00) AM_READ(irqlatch_r) // irq latch AM_RANGE(0x3001, 0x3001) AM_READ(soundlatch_r) - AM_RANGE(0x3001, 0x3001) AM_DEVWRITE("ay", ay8910_data_w) - AM_RANGE(0x3101, 0x3201) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x3001, 0x3001) AM_DEVWRITE("aysnd", ay8910_data_w) + AM_RANGE(0x3101, 0x3201) AM_DEVWRITE("aysnd", ay8910_address_w) AM_RANGE(0x3406, 0x3406) AM_READWRITE(aciastat_r,aciactrl_w) // MC6850 status register AM_RANGE(0x3407, 0x3407) AM_READWRITE(aciadata_r,aciadata_w) // MC6850 data register @@ -1247,7 +1247,7 @@ static MACHINE_DRIVER_START( scorpion1 ) MDRV_CPU_PERIODIC_INT(timer_irq, 1000 ) // generate 1000 IRQ's per second MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay",AY8912, MASTER_CLOCK/4) + MDRV_SOUND_ADD("aysnd",AY8912, MASTER_CLOCK/4) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MDRV_NVRAM_HANDLER(generic_0fill) diff --git a/src/mame/drivers/bfm_sc2.c b/src/mame/drivers/bfm_sc2.c index 0fc6ba18bd3..07b5d21df87 100644 --- a/src/mame/drivers/bfm_sc2.c +++ b/src/mame/drivers/bfm_sc2.c @@ -339,7 +339,7 @@ static void on_scorpion2_reset(running_machine *machine) e2ram_reset(); - devtag_reset(machine, "ym"); + devtag_reset(machine, "ymsnd"); // reset stepper motors ///////////////////////////////////////////////// { @@ -698,7 +698,7 @@ static WRITE8_HANDLER( volume_override_w ) if ( old != volume_override ) { - const device_config *ym = devtag_get_device(space->machine, "ym"); + const device_config *ym = devtag_get_device(space->machine, "ymsnd"); const device_config *upd = devtag_get_device(space->machine, "upd"); float percent = volume_override? 1.0f : (32-global_volume)/32.0f; @@ -812,7 +812,7 @@ static WRITE8_HANDLER( expansion_latch_w ) } { - const device_config *ym = devtag_get_device(space->machine, "ym"); + const device_config *ym = devtag_get_device(space->machine, "ymsnd"); const device_config *upd = devtag_get_device(space->machine, "upd"); float percent = volume_override ? 1.0f : (32-global_volume)/32.0f; @@ -1544,7 +1544,7 @@ static ADDRESS_MAP_START( memmap_vid, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2A00, 0x2AFF) AM_DEVWRITE("upd", nec_latch_w) // this is where it reads? AM_RANGE(0x2B00, 0x2BFF) AM_DEVWRITE("upd", nec_reset_w) // upd7759 reset line AM_RANGE(0x2C00, 0x2C00) AM_WRITE(unlock_w) // custom chip unlock - AM_RANGE(0x2D00, 0x2D01) AM_DEVWRITE("ym", ym2413_w) + AM_RANGE(0x2D00, 0x2D01) AM_DEVWRITE("ymsnd", ym2413_w) AM_RANGE(0x2E00, 0x2E00) AM_WRITE(bankswitch_w) // write bank (rom page select for 0x6000 - 0x7fff ) AM_RANGE(0x2F00, 0x2F00) AM_WRITE(vfd2_data_w) // vfd2 data @@ -2248,7 +2248,7 @@ static MACHINE_DRIVER_START( scorpion2_vid ) MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) - MDRV_SOUND_ADD("ym", YM2413, XTAL_3_579545MHz) + MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END @@ -2784,7 +2784,7 @@ static ADDRESS_MAP_START( sc2_memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2A00, 0x2AFF) AM_DEVWRITE("upd", nec_latch_w) AM_RANGE(0x2B00, 0x2BFF) AM_DEVWRITE("upd", nec_reset_w) AM_RANGE(0x2C00, 0x2C00) AM_WRITE(unlock_w) /* custom chip unlock */ - AM_RANGE(0x2D00, 0x2D01) AM_DEVWRITE("ym", ym2413_w) + AM_RANGE(0x2D00, 0x2D01) AM_DEVWRITE("ymsnd", ym2413_w) AM_RANGE(0x2E00, 0x2E00) AM_WRITE(bankswitch_w) /* write bank (rom page select for 0x6000 - 0x7fff ) */ AM_RANGE(0x2F00, 0x2F00) AM_WRITE(vfd2_data_w) /* vfd2 data */ @@ -2833,7 +2833,7 @@ static ADDRESS_MAP_START( sc3_memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2A00, 0x2AFF) AM_DEVWRITE("upd", nec_latch_w) AM_RANGE(0x2B00, 0x2BFF) AM_DEVWRITE("upd", nec_reset_w) AM_RANGE(0x2C00, 0x2C00) AM_WRITE(unlock_w) - AM_RANGE(0x2D00, 0x2D01) AM_DEVWRITE("ym", ym2413_w) + AM_RANGE(0x2D00, 0x2D01) AM_DEVWRITE("ymsnd", ym2413_w) AM_RANGE(0x2E00, 0x2E00) AM_WRITE(bankswitch_w) AM_RANGE(0x2F00, 0x2F00) AM_WRITE(vfd2_data_w) AM_RANGE(0x3FFF, 0x3FFF) AM_READ( coin_input_r) @@ -2882,7 +2882,7 @@ static ADDRESS_MAP_START( memmap_sc2_dm01, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2A00, 0x2AFF) AM_DEVWRITE("upd", nec_latch_w) AM_RANGE(0x2B00, 0x2BFF) AM_DEVWRITE("upd", nec_reset_w) AM_RANGE(0x2C00, 0x2C00) AM_WRITE(unlock_w) - AM_RANGE(0x2D00, 0x2D01) AM_DEVWRITE("ym", ym2413_w) + AM_RANGE(0x2D00, 0x2D01) AM_DEVWRITE("ymsnd", ym2413_w) AM_RANGE(0x2E00, 0x2E00) AM_WRITE(bankswitch_w) AM_RANGE(0x2F00, 0x2F00) AM_WRITE(vfd2_data_w) AM_RANGE(0x3FFE, 0x3FFE) AM_READ( direct_input_r) @@ -3977,7 +3977,7 @@ static MACHINE_DRIVER_START( scorpion2 ) MDRV_SOUND_ADD("upd",UPD7759, UPD7759_STANDARD_CLOCK) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) - MDRV_SOUND_ADD("ym",YM2413, XTAL_3_579545MHz) + MDRV_SOUND_ADD("ymsnd",YM2413, XTAL_3_579545MHz) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_NVRAM_HANDLER(bfm_sc2) @@ -4004,7 +4004,7 @@ static MACHINE_DRIVER_START( scorpion2_dm01 ) MDRV_CPU_PERIODIC_INT(timer_irq, 1000 ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym",YM2413, XTAL_3_579545MHz) + MDRV_SOUND_ADD("ymsnd",YM2413, XTAL_3_579545MHz) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_SOUND_ADD("upd",UPD7759, UPD7759_STANDARD_CLOCK) diff --git a/src/mame/drivers/bfmsys85.c b/src/mame/drivers/bfmsys85.c index 0d4764482f2..13e36d7f9be 100644 --- a/src/mame/drivers/bfmsys85.c +++ b/src/mame/drivers/bfmsys85.c @@ -414,9 +414,9 @@ static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2A01, 0x2A01) AM_READWRITE(mux_ctrl_r,mux_ctrl_w)// mux status register AM_RANGE(0x2E00, 0x2E00) AM_READ(irqlatch_r) // irq latch ( MC6850 / timer ) - AM_RANGE(0x3000, 0x3000) AM_DEVWRITE("ay", ay8910_data_w) + AM_RANGE(0x3000, 0x3000) AM_DEVWRITE("aysnd", ay8910_data_w) AM_RANGE(0x3001, 0x3001) AM_READNOP //sound latch - AM_RANGE(0x3200, 0x3200) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x3200, 0x3200) AM_DEVWRITE("aysnd", ay8910_address_w) AM_RANGE(0x3402, 0x3402) AM_DEVWRITE("acia6850_0", acia6850_ctrl_w) AM_RANGE(0x3403, 0x3403) AM_DEVWRITE("acia6850_0", acia6850_data_w) @@ -443,7 +443,7 @@ static MACHINE_DRIVER_START( bfmsys85 ) MDRV_ACIA6850_ADD("acia6850_0", m6809_acia_if) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay",AY8912, MASTER_CLOCK/4) // add AY8912 soundchip + MDRV_SOUND_ADD("aysnd",AY8912, MASTER_CLOCK/4) // add AY8912 soundchip MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MDRV_NVRAM_HANDLER(generic_0fill) // load/save nv RAM diff --git a/src/mame/drivers/big10.c b/src/mame/drivers/big10.c index c63f12a91f5..cf5d7865efb 100644 --- a/src/mame/drivers/big10.c +++ b/src/mame/drivers/big10.c @@ -140,8 +140,8 @@ static ADDRESS_MAP_START( main_io, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x99, 0x99) AM_WRITE(v9938_0_command_w) AM_READ(v9938_0_status_r) AM_RANGE(0x9a, 0x9a) AM_WRITE(v9938_0_palette_w) AM_RANGE(0x9b, 0x9b) AM_WRITE(v9938_0_register_w) - AM_RANGE(0xa0, 0xa1) AM_DEVWRITE("ay", ay8910_address_data_w) - AM_RANGE(0xa2, 0xa2) AM_DEVREAD("ay", ay8910_r) /* Dip-Switches routes here. */ + AM_RANGE(0xa0, 0xa1) AM_DEVWRITE("aysnd", ay8910_address_data_w) + AM_RANGE(0xa2, 0xa2) AM_DEVREAD("aysnd", ay8910_r) /* Dip-Switches routes here. */ ADDRESS_MAP_END @@ -207,7 +207,7 @@ static INPUT_PORTS_START( big10 ) PORT_DIPSETTING( 0x20, "80%" ) PORT_DIPSETTING( 0x30, "90%" ) PORT_DIPNAME( 0xC0, 0x00, "Coinage (A=1; B=5; C=10)" ) PORT_DIPLOCATION("DSW1:1,2") - PORT_DIPSETTING( 0x00, "x1" ) + PORT_DIPSETTING( 0x00, "x1snd" ) PORT_DIPSETTING( 0x40, "x2" ) PORT_DIPSETTING( 0x80, "x5" ) PORT_DIPSETTING( 0xC0, "x10" ) @@ -265,7 +265,7 @@ static MACHINE_DRIVER_START( big10 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, MASTER_CLOCK/12) /* guess */ + MDRV_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/12) /* guess */ MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_DRIVER_END diff --git a/src/mame/drivers/bigevglf.c b/src/mame/drivers/bigevglf.c index b8171ff6ab5..2d35e07f0ef 100644 --- a/src/mame/drivers/bigevglf.c +++ b/src/mame/drivers/bigevglf.c @@ -368,7 +368,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xc7ff) AM_RAM - AM_RANGE(0xc800, 0xc801) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0xc800, 0xc801) AM_DEVWRITE("aysnd", ay8910_address_data_w) AM_RANGE(0xca00, 0xca0d) AM_DEVWRITE("msm", msm5232_w) AM_RANGE(0xcc00, 0xcc00) AM_WRITENOP AM_RANGE(0xce00, 0xce00) AM_WRITENOP @@ -463,7 +463,7 @@ static MACHINE_DRIVER_START( bigevglf ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 8000000/4) + MDRV_SOUND_ADD("aysnd", AY8910, 8000000/4) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) /* YM2149 really */ MDRV_SOUND_ADD("msm", MSM5232, 8000000/4) diff --git a/src/mame/drivers/bigfghtr.c b/src/mame/drivers/bigfghtr.c index fdb578fcc31..25fc2fce5df 100644 --- a/src/mame/drivers/bigfghtr.c +++ b/src/mame/drivers/bigfghtr.c @@ -365,7 +365,7 @@ static READ8_HANDLER( soundlatch_clear_r ) static ADDRESS_MAP_START( soundport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x0, 0x1) AM_DEVWRITE("ym", ym3812_w) + AM_RANGE(0x0, 0x1) AM_DEVWRITE("ymsnd", ym3812_w) AM_RANGE(0x2, 0x2) AM_DEVWRITE("dac1", dac_signed_w) AM_RANGE(0x3, 0x3) AM_DEVWRITE("dac2", dac_signed_w) AM_RANGE(0x4, 0x4) AM_READ(soundlatch_clear_r) @@ -448,7 +448,7 @@ static MACHINE_DRIVER_START( bigfghtr ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 4000000) + MDRV_SOUND_ADD("ymsnd", YM3812, 4000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MDRV_SOUND_ADD("dac1", DAC, 0) diff --git a/src/mame/drivers/bigstrkb.c b/src/mame/drivers/bigstrkb.c index c9409330ac8..6cfc7a52070 100644 --- a/src/mame/drivers/bigstrkb.c +++ b/src/mame/drivers/bigstrkb.c @@ -225,7 +225,7 @@ static MACHINE_DRIVER_START( bigstrkb ) MDRV_VIDEO_UPDATE(bigstrkb) MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") -// MDRV_SOUND_ADD("ym", YM2151, ym2151_config) +// MDRV_SOUND_ADD("ymsnd", YM2151, ym2151_config) MDRV_SOUND_ADD("oki1", OKIM6295, 4000000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) diff --git a/src/mame/drivers/bingoc.c b/src/mame/drivers/bingoc.c index 867e840df36..43230b1fc14 100644 --- a/src/mame/drivers/bingoc.c +++ b/src/mame/drivers/bingoc.c @@ -110,7 +110,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x40, 0x40) AM_DEVWRITE("upd", bingoc_play_w) AM_RANGE(0x80, 0x80) AM_DEVWRITE("upd", upd7759_port_w) #if !SOUND_TEST @@ -153,7 +153,7 @@ static MACHINE_DRIVER_START( bingoc ) MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") //might just be mono... - MDRV_SOUND_ADD("ym", YM2151, 7159160/2) + MDRV_SOUND_ADD("ymsnd", YM2151, 7159160/2) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/bionicc.c b/src/mame/drivers/bionicc.c index bdd483913f8..963eec74c4b 100644 --- a/src/mame/drivers/bionicc.c +++ b/src/mame/drivers/bionicc.c @@ -165,7 +165,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x8001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x8000, 0x8001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) AM_RANGE(0xc000, 0xc7ff) AM_RAM ADDRESS_MAP_END @@ -354,7 +354,7 @@ static MACHINE_DRIVER_START( bionicc ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) MDRV_SOUND_ROUTE(0, "mono", 0.60) MDRV_SOUND_ROUTE(1, "mono", 0.60) MACHINE_DRIVER_END diff --git a/src/mame/drivers/bishjan.c b/src/mame/drivers/bishjan.c index c2df23e06ee..8747d54dd96 100644 --- a/src/mame/drivers/bishjan.c +++ b/src/mame/drivers/bishjan.c @@ -516,7 +516,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( saklove_io, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x0020, 0x0020) AM_DEVREADWRITE( "oki", okim6295_r, okim6295_w ) - AM_RANGE(0x0040, 0x0041) AM_DEVWRITE( "ym", ym3812_w ) + AM_RANGE(0x0040, 0x0041) AM_DEVWRITE( "ymsnd", ym3812_w ) AM_RANGE(0x0060, 0x0062) AM_WRITE( colordac_w ) @@ -883,7 +883,7 @@ static MACHINE_DRIVER_START( saklove ) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - MDRV_SOUND_ADD("ym", YM3812, XTAL_12MHz / 4) // ? chip and clock unknown + MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_12MHz / 4) // ? chip and clock unknown MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MACHINE_DRIVER_END diff --git a/src/mame/drivers/bladestl.c b/src/mame/drivers/bladestl.c index 1d6b7de8e63..a0dc5ab69ea 100644 --- a/src/mame/drivers/bladestl.c +++ b/src/mame/drivers/bladestl.c @@ -132,7 +132,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM - AM_RANGE(0x1000, 0x1001) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) /* YM2203 */ + AM_RANGE(0x1000, 0x1001) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) /* YM2203 */ AM_RANGE(0x3000, 0x3000) AM_DEVWRITE("upd", bladestl_speech_ctrl_w) /* UPD7759 */ AM_RANGE(0x4000, 0x4000) AM_DEVREAD("upd", bladestl_speech_busy_r) /* UPD7759 */ AM_RANGE(0x5000, 0x5000) AM_WRITENOP /* ??? */ @@ -304,7 +304,7 @@ static MACHINE_DRIVER_START( bladestl ) MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) - MDRV_SOUND_ADD("ym", YM2203, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2203, 3579545) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45) MACHINE_DRIVER_END diff --git a/src/mame/drivers/blockhl.c b/src/mame/drivers/blockhl.c index d5e3b3af2ab..34b4de876b5 100644 --- a/src/mame/drivers/blockhl.c +++ b/src/mame/drivers/blockhl.c @@ -87,7 +87,7 @@ static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xe00c, 0xe00d) AM_WRITENOP /* leftover from missing 007232? */ ADDRESS_MAP_END @@ -176,7 +176,7 @@ static MACHINE_DRIVER_START( blockhl ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) MDRV_SOUND_ROUTE(0, "mono", 0.60) MDRV_SOUND_ROUTE(1, "mono", 0.60) MACHINE_DRIVER_END diff --git a/src/mame/drivers/blockout.c b/src/mame/drivers/blockout.c index 985cb581509..f95c3f5dbb6 100644 --- a/src/mame/drivers/blockout.c +++ b/src/mame/drivers/blockout.c @@ -66,7 +66,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x9800, 0x9800) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -205,7 +205,7 @@ static MACHINE_DRIVER_START( blockout ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.60) MDRV_SOUND_ROUTE(1, "rspeaker", 0.60) diff --git a/src/mame/drivers/bmcbowl.c b/src/mame/drivers/bmcbowl.c index 3a9ddf4e816..8da4db9b119 100644 --- a/src/mame/drivers/bmcbowl.c +++ b/src/mame/drivers/bmcbowl.c @@ -338,8 +338,8 @@ static ADDRESS_MAP_START( bmcbowl_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x092000, 0x09201f) AM_READWRITE(bmcbowl_via_r, bmcbowl_via_w) AM_RANGE(0x093000, 0x093003) AM_WRITENOP // related to music - AM_RANGE(0x092800, 0x092803) AM_DEVWRITE8("ay", ay8910_data_address_w, 0xff00) - AM_RANGE(0x092802, 0x092803) AM_DEVREAD8("ay", ay8910_r, 0xff00) + AM_RANGE(0x092800, 0x092803) AM_DEVWRITE8("aysnd", ay8910_data_address_w, 0xff00) + AM_RANGE(0x092802, 0x092803) AM_DEVREAD8("aysnd", ay8910_r, 0xff00) AM_RANGE(0x093802, 0x093803) AM_READ_PORT("IN0") AM_RANGE(0x095000, 0x095fff) AM_RAM AM_BASE((UINT16 **)&stats_ram) AM_SIZE(&stats_ram_size) /* 8 bit */ AM_RANGE(0x097000, 0x097001) AM_READNOP @@ -517,7 +517,7 @@ static MACHINE_DRIVER_START( bmcbowl ) MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ay", AY8910, 3579545/2) + MDRV_SOUND_ADD("aysnd", AY8910, 3579545/2) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) diff --git a/src/mame/drivers/boogwing.c b/src/mame/drivers/boogwing.c index 0b56b829e53..151e180b833 100644 --- a/src/mame/drivers/boogwing.c +++ b/src/mame/drivers/boogwing.c @@ -133,7 +133,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x000000, 0x00ffff) AM_ROM AM_RANGE(0x100000, 0x100001) AM_NOP - AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) AM_RANGE(0x130000, 0x130001) AM_DEVREADWRITE("oki2", okim6295_r, okim6295_w) AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) @@ -323,7 +323,7 @@ static MACHINE_DRIVER_START( boogwing ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 32220000/9) + MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) diff --git a/src/mame/drivers/bublbobl.c b/src/mame/drivers/bublbobl.c index d7b30f353f1..f11a87e1e8f 100644 --- a/src/mame/drivers/bublbobl.c +++ b/src/mame/drivers/bublbobl.c @@ -391,7 +391,7 @@ static ADDRESS_MAP_START( tokio_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9800, 0x9800) AM_READNOP // ??? AM_RANGE(0xa000, 0xa000) AM_WRITE(bublbobl_sh_nmi_disable_w) AM_RANGE(0xa800, 0xa800) AM_WRITE(bublbobl_sh_nmi_enable_w) - AM_RANGE(0xb000, 0xb001) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0xb000, 0xb001) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0xe000, 0xffff) AM_ROM // space for diagnostic ROM? ADDRESS_MAP_END @@ -720,7 +720,7 @@ static MACHINE_DRIVER_START( tokio ) // sound hardware MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, MAIN_XTAL/8) + MDRV_SOUND_ADD("ymsnd", YM2203, MAIN_XTAL/8) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(0, "mono", 0.08) MDRV_SOUND_ROUTE(1, "mono", 0.08) diff --git a/src/mame/drivers/buster.c b/src/mame/drivers/buster.c index b131eca3f18..87c4557953a 100644 --- a/src/mame/drivers/buster.c +++ b/src/mame/drivers/buster.c @@ -91,7 +91,7 @@ static MACHINE_DRIVER_START( buster ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 1500000/2) + MDRV_SOUND_ADD("aysnd", AY8910, 1500000/2) // MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_DRIVER_END diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c index d7e3a593f94..36d6d899293 100644 --- a/src/mame/drivers/cabal.c +++ b/src/mame/drivers/cabal.c @@ -189,7 +189,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4002, 0x4002) AM_WRITE(seibu_rst10_ack_w) AM_RANGE(0x4003, 0x4003) AM_WRITE(seibu_rst18_ack_w) AM_RANGE(0x4005, 0x4006) AM_DEVWRITE("adpcm1", seibu_adpcm_adr_w) - AM_RANGE(0x4008, 0x4009) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x4008, 0x4009) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x4010, 0x4011) AM_READ(seibu_soundlatch_r) AM_RANGE(0x4012, 0x4012) AM_READ(seibu_main_data_pending_r) AM_RANGE(0x4013, 0x4013) AM_READ_PORT("COIN") @@ -211,7 +211,7 @@ static ADDRESS_MAP_START( cabalbl_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4008, 0x4008) AM_READ(cabalbl_snd2_r) AM_RANGE(0x400a, 0x400a) AM_READ(cabalbl_snd1_r) AM_RANGE(0x400c, 0x400c) AM_WRITE(soundlatch2_w) - AM_RANGE(0x400e, 0x400f) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x400e, 0x400f) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x6000, 0x6000) AM_WRITENOP /* ??? */ AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -513,7 +513,7 @@ static MACHINE_DRIVER_START( cabal ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(seibu_ym2151_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.80) @@ -568,7 +568,7 @@ static MACHINE_DRIVER_START( cabalbl ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(cabalbl_ym2151_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.80) diff --git a/src/mame/drivers/cabaret.c b/src/mame/drivers/cabaret.c index ff50f60d239..130916e886f 100644 --- a/src/mame/drivers/cabaret.c +++ b/src/mame/drivers/cabaret.c @@ -151,7 +151,7 @@ static ADDRESS_MAP_START( cabaret_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x00a2, 0x00a2 ) AM_READ_PORT("DSW2") /* DSW2 */ AM_RANGE( 0x00b0, 0x00b0 ) AM_READ_PORT("DSW3") /* DSW3 */ - AM_RANGE( 0x00e0, 0x00e1 ) AM_DEVWRITE( "ym", ym2413_w ) + AM_RANGE( 0x00e0, 0x00e1 ) AM_DEVWRITE( "ymsnd", ym2413_w ) AM_RANGE( 0x2000, 0x27ff ) AM_RAM_WRITE( fg_tile_w ) AM_BASE( &fg_tile_ram ) AM_RANGE( 0x2800, 0x2fff ) AM_RAM_WRITE( fg_color_w ) AM_BASE( &fg_color_ram ) @@ -328,7 +328,7 @@ static MACHINE_DRIVER_START( cabaret ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2413, XTAL_3_579545MHz) + MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/capbowl.c b/src/mame/drivers/capbowl.c index a57e4b7a43a..ff71eaffe8a 100644 --- a/src/mame/drivers/capbowl.c +++ b/src/mame/drivers/capbowl.c @@ -276,7 +276,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM - AM_RANGE(0x1000, 0x1001) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x1000, 0x1001) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0x2000, 0x2000) AM_WRITENOP /* Not hooked up according to the schematics */ AM_RANGE(0x6000, 0x6000) AM_DEVWRITE("dac", dac_w) AM_RANGE(0x7000, 0x7000) AM_READ(soundlatch_r) @@ -375,7 +375,7 @@ static MACHINE_DRIVER_START( capbowl ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, MASTER_CLOCK/2) + MDRV_SOUND_ADD("ymsnd", YM2203, MASTER_CLOCK/2) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(0, "mono", 0.07) MDRV_SOUND_ROUTE(1, "mono", 0.07) diff --git a/src/mame/drivers/carrera.c b/src/mame/drivers/carrera.c index 916be791cc7..f443ad46340 100644 --- a/src/mame/drivers/carrera.c +++ b/src/mame/drivers/carrera.c @@ -71,7 +71,7 @@ static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x04, 0x04) AM_READ_PORT("IN4") AM_RANGE(0x05, 0x05) AM_READ_PORT("IN5") AM_RANGE(0x06, 0x06) AM_WRITENOP // ? - AM_RANGE(0x08, 0x09) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x08, 0x09) AM_DEVWRITE("aysnd", ay8910_address_data_w) ADDRESS_MAP_END static INPUT_PORTS_START( carrera ) @@ -338,7 +338,7 @@ static MACHINE_DRIVER_START( carrera ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, MASTER_CLOCK/12) + MDRV_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/12) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MACHINE_DRIVER_END diff --git a/src/mame/drivers/caswin.c b/src/mame/drivers/caswin.c index 5d78bd5ce0a..512bfad07ce 100644 --- a/src/mame/drivers/caswin.c +++ b/src/mame/drivers/caswin.c @@ -142,8 +142,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( vvillage_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x01,0x01) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x02,0x03) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x01,0x01) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x02,0x03) AM_DEVWRITE("aysnd", ay8910_data_address_w) AM_RANGE(0x10,0x10) AM_READ_PORT("IN0") AM_RANGE(0x11,0x11) AM_READ_PORT("IN1") AM_RANGE(0x10,0x10) AM_WRITE(vvillage_scroll_w) @@ -300,7 +300,7 @@ static MACHINE_DRIVER_START( vvillage ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 4000000 / 4) + MDRV_SOUND_ADD("aysnd", AY8910, 4000000 / 4) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MACHINE_DRIVER_END diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c index f1c4675d098..83c4d6eee07 100644 --- a/src/mame/drivers/cave.c +++ b/src/mame/drivers/cave.c @@ -987,7 +987,7 @@ static ADDRESS_MAP_START( hotdogst_sound_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x00) AM_WRITE(hotdogst_rombank_w) // ROM bank AM_RANGE(0x30, 0x30) AM_READ(soundlatch_lo_r) // From Main CPU AM_RANGE(0x40, 0x40) AM_READ(soundlatch_hi_r) // - AM_RANGE(0x50, 0x51) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) // + AM_RANGE(0x50, 0x51) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) // AM_RANGE(0x60, 0x60) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) // M6295 AM_RANGE(0x70, 0x70) AM_WRITE(hotdogst_okibank_w) // Samples bank ADDRESS_MAP_END @@ -1018,8 +1018,8 @@ static ADDRESS_MAP_START( mazinger_sound_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x00) AM_WRITE(mazinger_rombank_w) // ROM bank AM_RANGE(0x10, 0x10) AM_WRITE(soundlatch_ack_w) // To Main CPU AM_RANGE(0x30, 0x30) AM_READ(soundlatch_lo_r) // From Main CPU - AM_RANGE(0x50, 0x51) AM_DEVWRITE("ym", ym2203_w) // YM2203 - AM_RANGE(0x52, 0x53) AM_DEVREAD("ym", ym2203_r) // YM2203 + AM_RANGE(0x50, 0x51) AM_DEVWRITE("ymsnd", ym2203_w) // YM2203 + AM_RANGE(0x52, 0x53) AM_DEVREAD("ymsnd", ym2203_r) // YM2203 AM_RANGE(0x70, 0x70) AM_DEVWRITE("oki", okim6295_w) // M6295 AM_RANGE(0x74, 0x74) AM_WRITE(hotdogst_okibank_w) // Samples bank ADDRESS_MAP_END @@ -1068,7 +1068,7 @@ static ADDRESS_MAP_START( metmqstr_sound_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x20, 0x20) AM_READ(soundflags_r) // Communication AM_RANGE(0x30, 0x30) AM_READ(soundlatch_lo_r) // From Main CPU AM_RANGE(0x40, 0x40) AM_READ(soundlatch_hi_r) // - AM_RANGE(0x50, 0x51) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) // YM2151 + AM_RANGE(0x50, 0x51) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) // YM2151 AM_RANGE(0x60, 0x60) AM_DEVWRITE("oki1", okim6295_w) // M6295 #0 AM_RANGE(0x70, 0x70) AM_WRITE(metmqstr_okibank0_w) // Samples Bank #0 AM_RANGE(0x80, 0x80) AM_DEVWRITE("oki2", okim6295_w) // M6295 #1 @@ -1100,7 +1100,7 @@ static ADDRESS_MAP_START( pwrinst2_sound_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) // M6295 AM_RANGE(0x08, 0x08) AM_DEVREADWRITE("oki2", okim6295_r, okim6295_w) // AM_RANGE(0x10, 0x17) AM_WRITE(NMK112_okibank_w) // Samples bank - AM_RANGE(0x40, 0x41) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) // + AM_RANGE(0x40, 0x41) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) // AM_RANGE(0x50, 0x50) AM_WRITE(soundlatch_ack_w) // To Main CPU // AM_RANGE(0x51, 0x51) AM_WRITE(SMH_NOP) // ?? volume AM_RANGE(0x80, 0x80) AM_WRITE(pwrinst2_rombank_w) // ROM bank @@ -1164,7 +1164,7 @@ static ADDRESS_MAP_START( sailormn_sound_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x20, 0x20) AM_READ(soundflags_r) // Communication AM_RANGE(0x30, 0x30) AM_READ(soundlatch_lo_r) // From Main CPU AM_RANGE(0x40, 0x40) AM_READ(soundlatch_hi_r) // - AM_RANGE(0x50, 0x51) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) // YM2151 + AM_RANGE(0x50, 0x51) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) // YM2151 AM_RANGE(0x60, 0x60) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) // M6295 #0 AM_RANGE(0x70, 0x70) AM_WRITE(sailormn_okibank0_w) // Samples Bank #0 AM_RANGE(0x80, 0x80) AM_DEVREADWRITE("oki2", okim6295_r, okim6295_w) // M6295 #1 @@ -1973,7 +1973,7 @@ static MACHINE_DRIVER_START( hotdogst ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2203, XTAL_4MHz) + MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_4MHz) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.20) MDRV_SOUND_ROUTE(0, "rspeaker", 0.20) @@ -2068,7 +2068,7 @@ static MACHINE_DRIVER_START( mazinger ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2203, XTAL_4MHz) + MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_4MHz) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.20) MDRV_SOUND_ROUTE(0, "rspeaker", 0.20) @@ -2124,7 +2124,7 @@ static MACHINE_DRIVER_START( metmqstr ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, XTAL_16MHz / 4) + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_16MHz / 4) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 1.20) MDRV_SOUND_ROUTE(1, "rspeaker", 1.20) @@ -2179,7 +2179,7 @@ static MACHINE_DRIVER_START( pwrinst2 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2203, XTAL_16MHz / 4) + MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_16MHz / 4) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.40) MDRV_SOUND_ROUTE(0, "rspeaker", 0.40) @@ -2239,7 +2239,7 @@ static MACHINE_DRIVER_START( sailormn ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, XTAL_16MHz/4) + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_16MHz/4) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.30) MDRV_SOUND_ROUTE(1, "rspeaker", 0.30) diff --git a/src/mame/drivers/cbasebal.c b/src/mame/drivers/cbasebal.c index e4769c7fb99..dbb6a135b8b 100644 --- a/src/mame/drivers/cbasebal.c +++ b/src/mame/drivers/cbasebal.c @@ -146,7 +146,7 @@ static ADDRESS_MAP_START( cbasebal_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x02, 0x02) AM_WRITE(eeprom_clock_w) AM_RANGE(0x03, 0x03) AM_WRITE(eeprom_serial_w) AM_RANGE(0x05, 0x05) AM_DEVWRITE("oki", okim6295_w) - AM_RANGE(0x06, 0x07) AM_DEVWRITE("ym", ym2413_w) + AM_RANGE(0x06, 0x07) AM_DEVWRITE("ymsnd", ym2413_w) AM_RANGE(0x08, 0x09) AM_WRITE(cbasebal_scrollx_w) AM_RANGE(0x0a, 0x0b) AM_WRITE(cbasebal_scrolly_w) AM_RANGE(0x10, 0x10) AM_READ_PORT("P1") @@ -270,7 +270,7 @@ static MACHINE_DRIVER_START( cbasebal ) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) - MDRV_SOUND_ADD("ym", YM2413, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2413, 3579545) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/cchance.c b/src/mame/drivers/cchance.c index b91eb7edfc5..8ce758ecdcc 100644 --- a/src/mame/drivers/cchance.c +++ b/src/mame/drivers/cchance.c @@ -74,8 +74,8 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xf000, 0xf000) AM_READNOP AM_WRITENOP //??? AM_RANGE(0xf001, 0xf001) AM_READ(input_1_r) AM_WRITE(output_0_w) AM_RANGE(0xf002, 0xf002) AM_READ_PORT("IN0") AM_WRITE(output_1_w) - AM_RANGE(0xf800, 0xf801) AM_DEVWRITE("ay", ay8910_address_data_w) - AM_RANGE(0xf801, 0xf801) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0xf800, 0xf801) AM_DEVWRITE("aysnd", ay8910_address_data_w) + AM_RANGE(0xf801, 0xf801) AM_DEVREAD("aysnd", ay8910_r) ADDRESS_MAP_END @@ -202,7 +202,7 @@ static MACHINE_DRIVER_START( cchance ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 1500000/2) + MDRV_SOUND_ADD("aysnd", AY8910, 1500000/2) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_DRIVER_END diff --git a/src/mame/drivers/cclimber.c b/src/mame/drivers/cclimber.c index 607b28d8341..f19e51f7af0 100644 --- a/src/mame/drivers/cclimber.c +++ b/src/mame/drivers/cclimber.c @@ -381,8 +381,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cclimber_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x08, 0x09) AM_DEVWRITE("ay", ay8910_address_data_w) - AM_RANGE(0x0c, 0x0c) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x08, 0x09) AM_DEVWRITE("aysnd", ay8910_address_data_w) + AM_RANGE(0x0c, 0x0c) AM_DEVREAD("aysnd", ay8910_r) ADDRESS_MAP_END static ADDRESS_MAP_START( yamato_portmap, ADDRESS_SPACE_IO, 8 ) @@ -1006,7 +1006,7 @@ static MACHINE_DRIVER_START( cclimber ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, MASTER_CLOCK/3/2/2) + MDRV_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/3/2/2) MDRV_SOUND_CONFIG(cclimber_ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) diff --git a/src/mame/drivers/centiped.c b/src/mame/drivers/centiped.c index a3053935466..58598750bc4 100644 --- a/src/mame/drivers/centiped.c +++ b/src/mame/drivers/centiped.c @@ -848,7 +848,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bullsdrt_port_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x00) AM_WRITE(bullsdrt_sprites_bank_w) AM_RANGE(0x20, 0x3f) AM_WRITE(bullsdrt_tilesbank_w) AM_BASE(&bullsdrt_tiles_bankram) - AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READ(bullsdrt_data_port_r) AM_DEVWRITE("sn", sn76496_w) + AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READ(bullsdrt_data_port_r) AM_DEVWRITE("snsnd", sn76496_w) ADDRESS_MAP_END @@ -1741,7 +1741,7 @@ static MACHINE_DRIVER_START( bullsdrt ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("sn", SN76496, 12096000/8) + MDRV_SOUND_ADD("snsnd", SN76496, 12096000/8) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/champbas.c b/src/mame/drivers/champbas.c index d49c8a4a3cd..a901147f7c8 100644 --- a/src/mame/drivers/champbas.c +++ b/src/mame/drivers/champbas.c @@ -213,7 +213,7 @@ AB 1010_1011 static ADDRESS_MAP_START( talbot_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM AM_RANGE(0x6000, 0x63ff) AM_RAM AM_SHARE(1) /* MCU shared RAM */ - AM_RANGE(0x7000, 0x7001) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x7000, 0x7001) AM_DEVWRITE("aysnd", ay8910_data_address_w) AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(champbas_bg_videoram_w) AM_BASE(&champbas_bg_videoram) AM_RANGE(0x8800, 0x8fef) AM_RAM AM_RANGE(0x8ff0, 0x8fff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) @@ -240,7 +240,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( champbas_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM AM_RANGE(0x6000, 0x63ff) AM_RAM AM_SHARE(1) - AM_RANGE(0x7000, 0x7001) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x7000, 0x7001) AM_DEVWRITE("aysnd", ay8910_data_address_w) AM_RANGE(0x7800, 0x7fff) AM_ROM // champbb2 only AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(champbas_bg_videoram_w) AM_BASE(&champbas_bg_videoram) AM_RANGE(0x8800, 0x8fef) AM_RAM @@ -272,7 +272,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( exctsccb_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM // AM_RANGE(0x6000, 0x63ff) AM_RAM AM_SHARE(1) // MCU not used (though it's present on the board) - AM_RANGE(0x7000, 0x7001) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x7000, 0x7001) AM_DEVWRITE("aysnd", ay8910_data_address_w) // AM_RANGE(0x7800, 0x7fff) AM_ROM // champbb2 only AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(champbas_bg_videoram_w) AM_BASE(&champbas_bg_videoram) AM_RANGE(0x8800, 0x8fff) AM_RAM AM_BASE(&spriteram_2) /* ??? */ @@ -576,7 +576,7 @@ static MACHINE_DRIVER_START( talbot ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, XTAL_18_432MHz/12) + MDRV_SOUND_ADD("aysnd", AY8910, XTAL_18_432MHz/12) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MACHINE_DRIVER_END @@ -610,7 +610,7 @@ static MACHINE_DRIVER_START( champbas ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, XTAL_18_432MHz/12) + MDRV_SOUND_ADD("aysnd", AY8910, XTAL_18_432MHz/12) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MDRV_SOUND_ADD("dac", DAC, 0) @@ -716,7 +716,7 @@ static MACHINE_DRIVER_START( exctsccb ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, XTAL_18_432MHz/12) + MDRV_SOUND_ADD("aysnd", AY8910, XTAL_18_432MHz/12) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MDRV_SOUND_ADD("dac", DAC, 0) diff --git a/src/mame/drivers/champbwl.c b/src/mame/drivers/champbwl.c index da2b9257c3d..d5a43ff5a5f 100644 --- a/src/mame/drivers/champbwl.c +++ b/src/mame/drivers/champbwl.c @@ -195,7 +195,7 @@ static ADDRESS_MAP_START( champbwl_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0xa000, 0xbfff) AM_RAM AM_BASE(&tnzs_objram) - AM_RANGE(0xc000, 0xdfff) AM_DEVREADWRITE("x1", seta_sound_r, seta_sound_w) + AM_RANGE(0xc000, 0xdfff) AM_DEVREADWRITE("x1snd", seta_sound_r, seta_sound_w) AM_RANGE(0xe000, 0xe1ff) AM_RAM AM_BASE(&tnzs_vdcram) AM_RANGE(0xe200, 0xe2ff) AM_RAM AM_BASE(&tnzs_scrollram) /* scrolling info */ AM_RANGE(0xe300, 0xe303) AM_MIRROR(0xfc) AM_WRITE(champbwl_objctrl_w) AM_BASE(&tnzs_objctrl) /* control registers (0x80 mirror used by Arkanoid 2) */ @@ -356,7 +356,7 @@ static MACHINE_DRIVER_START( champbwl ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 16000000) + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) MDRV_SOUND_CONFIG(champbwl_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -376,7 +376,7 @@ ROM_START( champbwl ) ROM_LOAD( "ab001008.u26", 0x0000, 0x0200, CRC(30ac8d48) SHA1(af034de3f3b8548534effdf4e3717fe3838b7754) ) ROM_LOAD( "ab001009.u27", 0x0200, 0x0200, CRC(3bbd4bcd) SHA1(8c87ccc42ece2432b8ad25f8679cdf886e12a43c) ) - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "ab003003.3-3", 0x00000, 0x40000, CRC(ad40ad10) SHA1(db0e5744ea3fcda87345b545031f82fcb3fec175) ) ROM_LOAD( "ab003002.3-2", 0x40000, 0x40000, CRC(7ede8f28) SHA1(b5519c09b4f0019dc76cadca725da1d581912540) ) ROM_LOAD( "ab002003.2-3", 0x80000, 0x40000, CRC(3051b8c3) SHA1(5f53596d7af1c79db1dde4bdca3878e07c67b5d1) ) diff --git a/src/mame/drivers/chanbara.c b/src/mame/drivers/chanbara.c index 265a1704a96..bd9d135d1b9 100644 --- a/src/mame/drivers/chanbara.c +++ b/src/mame/drivers/chanbara.c @@ -183,7 +183,7 @@ static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2000, 0x2000) AM_READ_PORT("DSW0") AM_RANGE(0x2001, 0x2001) AM_READ_PORT("SYSTEM") AM_RANGE(0x2003, 0x2003) AM_READ_PORT("JOY") - AM_RANGE(0x3800, 0x3801) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x3800, 0x3801) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK(1)) AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END @@ -350,7 +350,7 @@ static MACHINE_DRIVER_START( chanbara ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 12000000/8) + MDRV_SOUND_ADD("ymsnd", YM2203, 12000000/8) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/chinagat.c b/src/mame/drivers/chinagat.c index 87dbc7d95f2..f020b9cf03b 100644 --- a/src/mame/drivers/chinagat.c +++ b/src/mame/drivers/chinagat.c @@ -365,7 +365,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x9800, 0x9800) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xA000, 0xA000) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -383,7 +383,7 @@ static ADDRESS_MAP_START( ym2203c_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) // AM_RANGE(0x8804, 0x8804) AM_WRITE(SMH_RAM) // AM_RANGE(0x8805, 0x8805) AM_WRITE(SMH_RAM) -// AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) +// AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) // AM_RANGE(0x9800, 0x9800) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xA000, 0xA000) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -391,7 +391,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( saiyugb1_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x9800, 0x9800) AM_WRITE(saiyugb1_mcu_command_w) AM_RANGE(0xA000, 0xA000) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -575,7 +575,7 @@ static MACHINE_DRIVER_START( chinagat ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "mono", 0.80) MDRV_SOUND_ROUTE(1, "mono", 0.80) @@ -618,7 +618,7 @@ static MACHINE_DRIVER_START( saiyugb1 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "mono", 0.80) MDRV_SOUND_ROUTE(1, "mono", 0.80) diff --git a/src/mame/drivers/chinsan.c b/src/mame/drivers/chinsan.c index 349d5348942..b299fc12e4d 100644 --- a/src/mame/drivers/chinsan.c +++ b/src/mame/drivers/chinsan.c @@ -212,7 +212,7 @@ static ADDRESS_MAP_START( chinsan_io, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x00) AM_WRITE(chinsan_port00_w) AM_RANGE(0x01, 0x01) AM_READ(chinsan_input_port_0_r) AM_RANGE(0x02, 0x02) AM_READ(chinsan_input_port_1_r) - AM_RANGE(0x10, 0x11) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x10, 0x11) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0x20, 0x20) AM_DEVWRITE("adpcm", chin_adpcm_w) AM_RANGE(0x30, 0x30) AM_WRITE(ctrl_w) // ROM bank + unknown stuff (input mutliplex?) ADDRESS_MAP_END @@ -542,7 +542,7 @@ static MACHINE_DRIVER_START( chinsan ) // sound hardware MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 1500000) /* ? Mhz */ + MDRV_SOUND_ADD("ymsnd", YM2203, 1500000) /* ? Mhz */ MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(0, "mono", 0.15) MDRV_SOUND_ROUTE(1, "mono", 0.15) diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c index 4e89b62cd38..43927b2f926 100644 --- a/src/mame/drivers/chqflag.c +++ b/src/mame/drivers/chqflag.c @@ -195,7 +195,7 @@ static ADDRESS_MAP_START( chqflag_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa000, 0xa00d) AM_DEVREADWRITE("konami1", k007232_r, k007232_w) /* 007232 (chip 1) */ AM_RANGE(0xa01c, 0xa01c) AM_DEVWRITE("konami2", k007232_extvolume_w) /* extra volume, goes to the 007232 w/ A11 */ AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE("konami2", k007232_r, k007232_w) /* 007232 (chip 2) */ - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) /* YM2151 */ + AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) /* YM2151 */ AM_RANGE(0xd000, 0xd000) AM_READ(soundlatch_r) /* soundlatch_r */ AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch2_r) /* engine sound volume */ AM_RANGE(0xf000, 0xf000) AM_WRITENOP /* ??? */ @@ -355,7 +355,7 @@ static MACHINE_DRIVER_START( chqflag ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) diff --git a/src/mame/drivers/cischeat.c b/src/mame/drivers/cischeat.c index 4112dd6d762..f5a677b4fce 100644 --- a/src/mame/drivers/cischeat.c +++ b/src/mame/drivers/cischeat.c @@ -702,7 +702,7 @@ static ADDRESS_MAP_START( bigrun_sound_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM AM_RANGE(0x040000, 0x040001) AM_READWRITE(soundlatch_word_r, bigrun_soundbank_w) // From Main CPU AM_RANGE(0x060000, 0x060001) AM_WRITE(soundlatch2_word_w) // To Main CPU - AM_RANGE(0x080000, 0x080003) AM_DEVREADWRITE8("ym", ym2151_r, ym2151_w, 0x00ff) + AM_RANGE(0x080000, 0x080003) AM_DEVREADWRITE8("ymsnd", ym2151_r, ym2151_w, 0x00ff) AM_RANGE(0x0a0000, 0x0a0001) AM_DEVREADWRITE8("oki1", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x0c0000, 0x0c0001) AM_DEVREADWRITE8("oki2", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x0f0000, 0x0fffff) AM_RAM // RAM @@ -724,7 +724,7 @@ static ADDRESS_MAP_START( cischeat_sound_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x040004, 0x040005) AM_DEVWRITE("oki2", cischeat_soundbank_w) // Sample Banking AM_RANGE(0x060002, 0x060003) AM_WRITE(soundlatch2_word_w) // To Main CPU AM_RANGE(0x060004, 0x060005) AM_READ(soundlatch_word_r) // From Main CPU - AM_RANGE(0x080000, 0x080003) AM_DEVREADWRITE8("ym", ym2151_r, ym2151_w, 0x00ff) + AM_RANGE(0x080000, 0x080003) AM_DEVREADWRITE8("ymsnd", ym2151_r, ym2151_w, 0x00ff) AM_RANGE(0x0a0000, 0x0a0003) AM_DEVREADWRITE8("oki1", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x0c0000, 0x0c0003) AM_DEVREADWRITE8("oki2", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x0f0000, 0x0fffff) AM_RAM // RAM @@ -740,7 +740,7 @@ static ADDRESS_MAP_START( f1gpstar_sound_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x040004, 0x040005) AM_DEVWRITE("oki1", cischeat_soundbank_w) // Sample Banking (cischeat: 40002) AM_RANGE(0x040008, 0x040009) AM_DEVWRITE("oki2", cischeat_soundbank_w) // Sample Banking (cischeat: 40004) AM_RANGE(0x060000, 0x060001) AM_READWRITE(soundlatch_word_r, soundlatch2_word_w) // From Main CPU (cischeat: 60004) - AM_RANGE(0x080000, 0x080003) AM_DEVREADWRITE8("ym", ym2151_r, ym2151_w, 0x00ff) + AM_RANGE(0x080000, 0x080003) AM_DEVREADWRITE8("ymsnd", ym2151_r, ym2151_w, 0x00ff) AM_RANGE(0x0a0000, 0x0a0003) AM_DEVREADWRITE8("oki1", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x0c0000, 0x0c0003) AM_DEVREADWRITE8("oki2", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x0e0000, 0x0fffff) AM_RAM // RAM (cischeat: f0000-fffff) @@ -757,7 +757,7 @@ static ADDRESS_MAP_START( f1gpstr2_sound_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x040008, 0x040009) AM_DEVWRITE("oki2", cischeat_soundbank_w) // Sample Banking AM_RANGE(0x04000e, 0x04000f) AM_WRITE(SMH_NOP) // ? 0 (f1gpstar: no) AM_RANGE(0x060004, 0x060005) AM_READWRITE(soundlatch_word_r, soundlatch2_word_w) // From Main CPU (f1gpstar: 60000) - AM_RANGE(0x080000, 0x080003) AM_DEVREADWRITE8("ym", ym2151_r, ym2151_w, 0x00ff) + AM_RANGE(0x080000, 0x080003) AM_DEVREADWRITE8("ymsnd", ym2151_r, ym2151_w, 0x00ff) AM_RANGE(0x0a0000, 0x0a0003) AM_DEVREADWRITE8("oki1", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x0c0000, 0x0c0003) AM_DEVREADWRITE8("oki2", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x0e0000, 0x0fffff) AM_RAM // RAM @@ -1600,7 +1600,7 @@ static MACHINE_DRIVER_START( bigrun ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, STD_FM_CLOCK) + MDRV_SOUND_ADD("ymsnd", YM2151, STD_FM_CLOCK) MDRV_SOUND_ROUTE(0, "lspeaker", 0.75) MDRV_SOUND_ROUTE(1, "rspeaker", 0.75) diff --git a/src/mame/drivers/citycon.c b/src/mame/drivers/citycon.c index d54693f876f..a0d5f55f369 100644 --- a/src/mame/drivers/citycon.c +++ b/src/mame/drivers/citycon.c @@ -53,9 +53,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_RAM - AM_RANGE(0x4000, 0x4001) AM_DEVWRITE("ay", ay8910_address_data_w) -// AM_RANGE(0x4002, 0x4002) AM_DEVREAD("ay", ay8910_r) /* ?? */ - AM_RANGE(0x6000, 0x6001) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x4000, 0x4001) AM_DEVWRITE("aysnd", ay8910_address_data_w) +// AM_RANGE(0x4002, 0x4002) AM_DEVREAD("aysnd", ay8910_r) /* ?? */ + AM_RANGE(0x6000, 0x6001) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -225,10 +225,10 @@ static MACHINE_DRIVER_START( citycon ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 1250000) + MDRV_SOUND_ADD("aysnd", AY8910, 1250000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) - MDRV_SOUND_ADD("ym", YM2203, 1250000) + MDRV_SOUND_ADD("ymsnd", YM2203, 1250000) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(0, "mono", 0.40) MDRV_SOUND_ROUTE(1, "mono", 0.40) diff --git a/src/mame/drivers/cmmb.c b/src/mame/drivers/cmmb.c index 32e5c3f3703..94202d40540 100644 --- a/src/mame/drivers/cmmb.c +++ b/src/mame/drivers/cmmb.c @@ -294,7 +294,7 @@ static MACHINE_DRIVER_START( cmmb ) /* sound hardware */ // MDRV_SPEAKER_STANDARD_MONO("mono") -// MDRV_SOUND_ADD("ay", AY8910, 8000000/4) +// MDRV_SOUND_ADD("aysnd", AY8910, 8000000/4) // MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_DRIVER_END diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c index 488399efdb9..cb643de567d 100644 --- a/src/mame/drivers/cninja.c +++ b/src/mame/drivers/cninja.c @@ -278,7 +278,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map_mutantf, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x000000, 0x00ffff) AM_ROM AM_RANGE(0x100000, 0x100001) AM_READNOP AM_WRITENOP - AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) AM_RANGE(0x130000, 0x130001) AM_DEVREADWRITE("oki2", okim6295_r, okim6295_w) AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) @@ -290,7 +290,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( stoneage_s_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) AM_RANGE(0x9800, 0x9800) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) ADDRESS_MAP_END @@ -767,7 +767,7 @@ static MACHINE_DRIVER_START( stoneage ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 32220000/9) + MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_interface2) MDRV_SOUND_ROUTE(0, "mono", 0.45) MDRV_SOUND_ROUTE(1, "mono", 0.45) @@ -908,7 +908,7 @@ static MACHINE_DRIVER_START( mutantf ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 32220000/9) + MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.45) MDRV_SOUND_ROUTE(1, "rspeaker", 0.45) diff --git a/src/mame/drivers/coinmstr.c b/src/mame/drivers/coinmstr.c index 54dde20a6a6..c9790a2e611 100644 --- a/src/mame/drivers/coinmstr.c +++ b/src/mame/drivers/coinmstr.c @@ -197,8 +197,8 @@ static ADDRESS_MAP_START( quizmstr_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READ(question_r) AM_RANGE(0x00, 0x03) AM_WRITE(question_w) - AM_RANGE(0x40, 0x41) AM_DEVWRITE("ay", ay8910_address_data_w) - AM_RANGE(0x41, 0x41) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x40, 0x41) AM_DEVWRITE("aysnd", ay8910_address_data_w) + AM_RANGE(0x41, 0x41) AM_DEVREAD("aysnd", ay8910_r) AM_RANGE(0x48, 0x4b) AM_DEVREADWRITE("pia0", pia6821_r, pia6821_w) AM_RANGE(0x50, 0x53) AM_READNOP AM_RANGE(0x50, 0x53) AM_WRITENOP @@ -215,8 +215,8 @@ static ADDRESS_MAP_START( trailblz_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x03) AM_WRITE(question_w) AM_RANGE(0x40, 0x40) AM_DEVWRITE("crtc", mc6845_address_w) AM_RANGE(0x41, 0x41) AM_DEVWRITE("crtc", mc6845_register_w) - AM_RANGE(0x48, 0x49) AM_DEVWRITE("ay", ay8910_address_data_w) - AM_RANGE(0x49, 0x49) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x48, 0x49) AM_DEVWRITE("aysnd", ay8910_address_data_w) + AM_RANGE(0x49, 0x49) AM_DEVREAD("aysnd", ay8910_r) AM_RANGE(0x50, 0x53) AM_DEVREADWRITE("pia0", pia6821_r, pia6821_w) //? AM_RANGE(0x60, 0x63) AM_DEVREADWRITE("pia1", pia6821_r, pia6821_w) AM_RANGE(0x70, 0x73) AM_DEVREADWRITE("pia2", pia6821_r, pia6821_w) @@ -239,8 +239,8 @@ static ADDRESS_MAP_START( supnudg2_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x68, 0x69) AM_READNOP AM_RANGE(0x68, 0x6b) AM_WRITENOP AM_RANGE(0x6b, 0x6b) AM_READNOP - AM_RANGE(0x78, 0x79) AM_DEVWRITE("ay", ay8910_address_data_w) - AM_RANGE(0x79, 0x79) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x78, 0x79) AM_DEVWRITE("aysnd", ay8910_address_data_w) + AM_RANGE(0x79, 0x79) AM_DEVREAD("aysnd", ay8910_r) AM_RANGE(0xc0, 0xc1) AM_READNOP AM_RANGE(0xc0, 0xc3) AM_WRITENOP ADDRESS_MAP_END @@ -249,8 +249,8 @@ static ADDRESS_MAP_START( pokeroul_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x40, 0x40) AM_DEVWRITE("crtc", mc6845_address_w) AM_RANGE(0x41, 0x41) AM_DEVWRITE("crtc", mc6845_register_w) - AM_RANGE(0x48, 0x49) AM_DEVWRITE("ay", ay8910_address_data_w) - AM_RANGE(0x49, 0x49) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x48, 0x49) AM_DEVWRITE("aysnd", ay8910_address_data_w) + AM_RANGE(0x49, 0x49) AM_DEVREAD("aysnd", ay8910_r) AM_RANGE(0x58, 0x5b) AM_DEVREADWRITE("pia0", pia6821_r, pia6821_w) /* confirmed */ AM_RANGE(0x68, 0x6b) AM_DEVREADWRITE("pia1", pia6821_r, pia6821_w) /* confirmed */ AM_RANGE(0x78, 0x7b) AM_DEVREADWRITE("pia2", pia6821_r, pia6821_w) /* confirmed */ @@ -1008,7 +1008,7 @@ static MACHINE_DRIVER_START( coinmstr ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 1500000) + MDRV_SOUND_ADD("aysnd", AY8910, 1500000) MDRV_SOUND_CONFIG(ay8912_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_DRIVER_END diff --git a/src/mame/drivers/combatsc.c b/src/mame/drivers/combatsc.c index b85b7e96a2b..9fbbb761646 100644 --- a/src/mame/drivers/combatsc.c +++ b/src/mame/drivers/combatsc.c @@ -308,8 +308,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM /* ROM */ AM_RANGE(0x8000, 0x87ef) AM_RAM /* RAM */ AM_RANGE(0x87f0, 0x87ff) AM_RAM /* ??? */ - AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) /* YM 2203 */ - AM_RANGE(0x9008, 0x9009) AM_DEVREAD("ym", ym2203_r) /* ??? */ + AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) /* YM 2203 */ + AM_RANGE(0x9008, 0x9009) AM_DEVREAD("ymsnd", ym2203_r) /* ??? */ AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) /* soundlatch_r? */ AM_RANGE(0x8800, 0xfffb) AM_ROM /* ROM? */ AM_RANGE(0xfffc, 0xffff) AM_RAM /* ??? */ @@ -326,7 +326,7 @@ static ADDRESS_MAP_START( combasc_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc000, 0xc000) AM_DEVWRITE("upd", combasc_voice_reset_w) /* upd7759 reset? */ AM_RANGE(0xd000, 0xd000) AM_READ(soundlatch_r) /* soundlatch_r? */ - AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE("ym", combasc_ym2203_r, ym2203_w) /* YM 2203 intercepted */ + AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE("ymsnd", combasc_ym2203_r, ym2203_w) /* YM 2203 intercepted */ ADDRESS_MAP_END @@ -576,7 +576,7 @@ static MACHINE_DRIVER_START( combasc ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 3000000) + MDRV_SOUND_ADD("ymsnd", YM2203, 3000000) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20) @@ -617,7 +617,7 @@ static MACHINE_DRIVER_START( combascb ) /* We are using the original sound subsystem */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 3000000) + MDRV_SOUND_ADD("ymsnd", YM2203, 3000000) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20) diff --git a/src/mame/drivers/compgolf.c b/src/mame/drivers/compgolf.c index ad5e0201ca9..c65d1a4a68b 100644 --- a/src/mame/drivers/compgolf.c +++ b/src/mame/drivers/compgolf.c @@ -61,7 +61,7 @@ static ADDRESS_MAP_START( compgolf_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3001, 0x3001) AM_READ_PORT("P2") AM_WRITE(compgolf_ctrl_w) AM_RANGE(0x3002, 0x3002) AM_READ_PORT("DSW1") AM_RANGE(0x3003, 0x3003) AM_READ_PORT("DSW2") - AM_RANGE(0x3800, 0x3801) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x3800, 0x3801) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -219,7 +219,7 @@ static MACHINE_DRIVER_START( compgolf ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 1500000) + MDRV_SOUND_ADD("ymsnd", YM2203, 1500000) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/contra.c b/src/mame/drivers/contra.c index 88e0e0fa84c..1ddefb67487 100644 --- a/src/mame/drivers/contra.c +++ b/src/mame/drivers/contra.c @@ -108,7 +108,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0000) AM_READ(soundlatch_r) - AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x4000, 0x4000) AM_WRITENOP /* read triggers irq reset and latch read (in the hardware only). */ AM_RANGE(0x6000, 0x67ff) AM_RAM AM_RANGE(0x8000, 0xffff) AM_ROM @@ -216,7 +216,7 @@ static MACHINE_DRIVER_START( contra ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 3582071) + MDRV_SOUND_ADD("ymsnd", YM2151, 3582071) MDRV_SOUND_ROUTE(0, "lspeaker", 0.60) MDRV_SOUND_ROUTE(1, "rspeaker", 0.60) MACHINE_DRIVER_END diff --git a/src/mame/drivers/cop01.c b/src/mame/drivers/cop01.c index 6df73f973ef..b2111cb54f6 100644 --- a/src/mame/drivers/cop01.c +++ b/src/mame/drivers/cop01.c @@ -153,7 +153,7 @@ static READ8_HANDLER( kludge ) { static int timer; return timer++; } static ADDRESS_MAP_START( mightguy_audio_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE("ym", ym3526_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ymsnd", ym3526_w) AM_RANGE(0x02, 0x02) AM_WRITENOP /* 1412M2? */ AM_RANGE(0x03, 0x03) AM_WRITENOP /* 1412M2? */ AM_RANGE(0x03, 0x03) AM_READ(kludge) /* 1412M2? */ @@ -456,7 +456,7 @@ static MACHINE_DRIVER_START( mightguy ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3526, 4000000) + MDRV_SOUND_ADD("ymsnd", YM3526, 4000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/cowrace.c b/src/mame/drivers/cowrace.c index e96f3ac8e36..d90cf0e2ab2 100644 --- a/src/mame/drivers/cowrace.c +++ b/src/mame/drivers/cowrace.c @@ -107,7 +107,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( io_map_sound_cowrace, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x40, 0x41) AM_DEVWRITE("ym", ym2203_w) + AM_RANGE(0x40, 0x41) AM_DEVWRITE("ymsnd", ym2203_w) ADDRESS_MAP_END @@ -225,7 +225,7 @@ static MACHINE_DRIVER_START( cowrace ) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80) - MDRV_SOUND_ADD("ym", YM2203, 3000000) + MDRV_SOUND_ADD("ymsnd", YM2203, 3000000) MDRV_SOUND_CONFIG(ym2203_interface_1) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80) diff --git a/src/mame/drivers/crbaloon.c b/src/mame/drivers/crbaloon.c index ff00fa4b725..645be8d2401 100644 --- a/src/mame/drivers/crbaloon.c +++ b/src/mame/drivers/crbaloon.c @@ -160,7 +160,7 @@ static READ8_HANDLER( pc3259_r ) static WRITE8_HANDLER( port_sound_w ) { const device_config *discrete = devtag_get_device(space->machine, "discrete"); - const device_config *sn = devtag_get_device(space->machine, "sn"); + const device_config *sn = devtag_get_device(space->machine, "snsnd"); /* D0 - interrupt enable - also goes to PC3259 as /HTCTRL */ cpu_interrupt_enable(cputag_get_cpu(space->machine, "maincpu"), (data & 0x01) ? TRUE : FALSE); diff --git a/src/mame/drivers/crgolf.c b/src/mame/drivers/crgolf.c index 4841a885e37..51d03991f55 100644 --- a/src/mame/drivers/crgolf.c +++ b/src/mame/drivers/crgolf.c @@ -258,7 +258,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("aysnd", ay8910_address_data_w) AM_RANGE(0xc002, 0xc002) AM_WRITENOP AM_RANGE(0xe000, 0xe000) AM_READWRITE(switch_input_r, switch_input_select_w) AM_RANGE(0xe001, 0xe001) AM_READWRITE(analog_input_r, unknown_w) @@ -382,7 +382,7 @@ static MACHINE_DRIVER_START( crgolf ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, MASTER_CLOCK/3/2/2) + MDRV_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/3/2/2) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/crimfght.c b/src/mame/drivers/crimfght.c index dc11b233dbd..be25c53711e 100644 --- a/src/mame/drivers/crimfght.c +++ b/src/mame/drivers/crimfght.c @@ -73,7 +73,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( crimfght_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM /* ROM 821l01.h4 */ AM_RANGE(0x8000, 0x87ff) AM_RAM /* RAM */ - AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) /* YM2151 */ + AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) /* YM2151 */ AM_RANGE(0xc000, 0xc000) AM_READ(soundlatch_r) /* soundlatch_r */ AM_RANGE(0xe000, 0xe00d) AM_DEVREADWRITE("konami", k007232_r, k007232_w) /* 007232 registers */ ADDRESS_MAP_END @@ -242,7 +242,7 @@ static MACHINE_DRIVER_START( crimfght ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 3579545) /* verified with PCB */ + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) /* verified with PCB */ MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/crospang.c b/src/mame/drivers/crospang.c index 64d6974e9b9..3985c7b5349 100644 --- a/src/mame/drivers/crospang.c +++ b/src/mame/drivers/crospang.c @@ -113,7 +113,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( crospang_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w) AM_RANGE(0x02, 0x02) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0x06, 0x06) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -328,7 +328,7 @@ static MACHINE_DRIVER_START( crospang ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 14318180/4) + MDRV_SOUND_ADD("ymsnd", YM3812, 14318180/4) MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) @@ -365,7 +365,7 @@ static MACHINE_DRIVER_START( bestri ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 14318180/4) + MDRV_SOUND_ADD("ymsnd", YM3812, 14318180/4) MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/drivers/crshrace.c b/src/mame/drivers/crshrace.c index 575f652bfa1..9e3f268134b 100644 --- a/src/mame/drivers/crshrace.c +++ b/src/mame/drivers/crshrace.c @@ -220,7 +220,7 @@ static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(crshrace_sh_bankswitch_w) AM_RANGE(0x04, 0x04) AM_READWRITE(soundlatch_r, pending_command_clear_w) - AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) + AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) ADDRESS_MAP_END @@ -468,7 +468,7 @@ static MACHINE_DRIVER_START( crshrace ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -507,7 +507,7 @@ ROM_START( crshrace ) ROM_REGION( 0x100000, "ym.deltat", 0 ) /* sound samples */ ROM_LOAD( "h894", 0x000000, 0x100000, CRC(d53300c1) SHA1(4c3ff7d3156791cb960c28845a5f1906605bce55) ) - ROM_REGION( 0x100000, "ym", 0 ) /* sound samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* sound samples */ ROM_LOAD( "h893", 0x000000, 0x100000, CRC(32513b63) SHA1(c4ede4aaa2611cedb53d47448422a1926acf3052) ) ROM_END @@ -541,7 +541,7 @@ ROM_START( crshrace2 ) ROM_REGION( 0x100000, "ym.deltat", 0 ) /* sound samples */ ROM_LOAD( "h894", 0x000000, 0x100000, CRC(d53300c1) SHA1(4c3ff7d3156791cb960c28845a5f1906605bce55) ) // IC73.BIN - ROM_REGION( 0x100000, "ym", 0 ) /* sound samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* sound samples */ ROM_LOAD( "h893", 0x000000, 0x100000, CRC(32513b63) SHA1(c4ede4aaa2611cedb53d47448422a1926acf3052) ) // IC69.BIN ROM_END diff --git a/src/mame/drivers/cyberbal.c b/src/mame/drivers/cyberbal.c index 09e00bcf9fb..12317ce7e21 100644 --- a/src/mame/drivers/cyberbal.c +++ b/src/mame/drivers/cyberbal.c @@ -187,7 +187,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_RAM - AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x2800, 0x2801) AM_WRITE(cyberbal_sound_68k_6502_w) AM_RANGE(0x2802, 0x2803) AM_READWRITE(atarigen_6502_irq_ack_r, atarigen_6502_irq_ack_w) AM_RANGE(0x2804, 0x2805) AM_WRITE(atarigen_6502_sound_w) @@ -453,7 +453,7 @@ static MACHINE_DRIVER_START( cyberbal ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, ATARI_CLOCK_14MHz/4) + MDRV_SOUND_ADD("ymsnd", YM2151, ATARI_CLOCK_14MHz/4) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.60) MDRV_SOUND_ROUTE(1, "rspeaker", 0.60) diff --git a/src/mame/drivers/d9final.c b/src/mame/drivers/d9final.c index 33af3386be4..2c29e316c34 100644 --- a/src/mame/drivers/d9final.c +++ b/src/mame/drivers/d9final.c @@ -103,7 +103,7 @@ static ADDRESS_MAP_START( d9final_io, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x00) AM_READ_PORT("DSWA") AM_RANGE(0x20, 0x20) AM_READ_PORT("DSWB") AM_RANGE(0x40, 0x40) AM_READ_PORT("DSWC") - AM_RANGE(0x40, 0x41) AM_DEVWRITE("ym",ym2413_w) + AM_RANGE(0x40, 0x41) AM_DEVWRITE("ymsnd",ym2413_w) AM_RANGE(0x60, 0x60) AM_READ_PORT("DSWD") AM_RANGE(0x80, 0x80) AM_READ_PORT("IN0") AM_RANGE(0xa0, 0xa0) AM_READ_PORT("IN1") AM_WRITE(d9final_bank_w) @@ -281,7 +281,7 @@ static MACHINE_DRIVER_START( d9final ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2413, XTAL_3_579545MHz) + MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MACHINE_DRIVER_END diff --git a/src/mame/drivers/darkhors.c b/src/mame/drivers/darkhors.c index c454ccaa75b..76ec6c534dd 100644 --- a/src/mame/drivers/darkhors.c +++ b/src/mame/drivers/darkhors.c @@ -715,7 +715,7 @@ MACHINE_DRIVER_END static ADDRESS_MAP_START( st0016_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) - AM_RANGE(0xe900, 0xe9ff) AM_DEVREADWRITE("st", st0016_snd_r, st0016_snd_w) + AM_RANGE(0xe900, 0xe9ff) AM_DEVREADWRITE("stsnd", st0016_snd_r, st0016_snd_w) AM_RANGE(0xec00, 0xec1f) AM_READ(st0016_character_ram_r) AM_WRITE(st0016_character_ram_w) AM_RANGE(0xf000, 0xffff) AM_RAM ADDRESS_MAP_END @@ -774,7 +774,7 @@ static MACHINE_DRIVER_START( jclub2o ) MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("st", ST0016, 0) + MDRV_SOUND_ADD("stsnd", ST0016, 0) MDRV_SOUND_CONFIG(st0016_config) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/darkmist.c b/src/mame/drivers/darkmist.c index 8bc002f4442..3a14b82f795 100644 --- a/src/mame/drivers/darkmist.c +++ b/src/mame/drivers/darkmist.c @@ -273,7 +273,7 @@ static MACHINE_DRIVER_START( darkmist ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 14318180/4) /* 3.579545 MHz */ + MDRV_SOUND_ADD("ymsnd", YM2151, 14318180/4) /* 3.579545 MHz */ MDRV_SOUND_CONFIG(t5182_ym2151_interface) MDRV_SOUND_ROUTE(0, "mono", 1.0) MDRV_SOUND_ROUTE(1, "mono", 1.0) diff --git a/src/mame/drivers/dblewing.c b/src/mame/drivers/dblewing.c index 4977a942ccd..3a1693a62ca 100644 --- a/src/mame/drivers/dblewing.c +++ b/src/mame/drivers/dblewing.c @@ -468,7 +468,7 @@ static READ8_HANDLER(irq_latch_r) static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym", ym2151_status_port_r,ym2151_w) + AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ymsnd", ym2151_status_port_r,ym2151_w) AM_RANGE(0xb000, 0xb000) AM_DEVREADWRITE("oki", okim6295_r,okim6295_w) AM_RANGE(0xc000, 0xc000) AM_READ(soundlatch_r) AM_RANGE(0xd000, 0xd000) AM_READ(irq_latch_r) //timing? sound latch? @@ -691,7 +691,7 @@ static MACHINE_DRIVER_START( dblewing ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 32220000/9) + MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) diff --git a/src/mame/drivers/dbz.c b/src/mame/drivers/dbz.c index 649f261a9f3..15fc1eaae1e 100644 --- a/src/mame/drivers/dbz.c +++ b/src/mame/drivers/dbz.c @@ -171,7 +171,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dbz_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_RAM - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xd000, 0xd002) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xe000, 0xe001) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -348,7 +348,7 @@ static MACHINE_DRIVER_START( dbz ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 4000000) + MDRV_SOUND_ADD("ymsnd", YM2151, 4000000) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/dcon.c b/src/mame/drivers/dcon.c index 422522c4886..03bbeb827f0 100644 --- a/src/mame/drivers/dcon.c +++ b/src/mame/drivers/dcon.c @@ -324,7 +324,7 @@ ROM_START( dcon ) ROM_LOAD16_BYTE("p1-1", 0x040001, 0x20000, CRC(4b8de320) SHA1(14a3ab347fc468869355951294c3e3a8f9211b6a) ) ROM_REGION( 0x20000, "audiocpu", 0 ) /* 64k code for sound Z80 */ - ROM_LOAD( "fm", 0x000000, 0x08000, CRC(50450faa) SHA1(d4add7d357951b51d53ed7f143ece7f3bde7f4cb) ) + ROM_LOAD( "fmsnd", 0x000000, 0x08000, CRC(50450faa) SHA1(d4add7d357951b51d53ed7f143ece7f3bde7f4cb) ) ROM_CONTINUE( 0x010000, 0x08000 ) ROM_COPY( "audiocpu", 0, 0x018000, 0x08000 ) diff --git a/src/mame/drivers/ddealer.c b/src/mame/drivers/ddealer.c index 6dce5d83d8e..9f58ca8e72f 100644 --- a/src/mame/drivers/ddealer.c +++ b/src/mame/drivers/ddealer.c @@ -433,7 +433,7 @@ static ADDRESS_MAP_START( ddealer, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1") AM_RANGE(0x080008, 0x080009) AM_READ_PORT("DSW1") AM_RANGE(0x08000a, 0x08000b) AM_READ_PORT("UNK") - AM_RANGE(0x084000, 0x084003) AM_DEVWRITE8("ym", ym2203_w, 0x00ff) // ym ? + AM_RANGE(0x084000, 0x084003) AM_DEVWRITE8("ymsnd", ym2203_w, 0x00ff) // ym ? AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) // palette ram AM_RANGE(0x08c000, 0x08cfff) AM_RAM_WRITE(ddealer_vregs_w) AM_BASE(&ddealer_vregs) // palette ram @@ -599,7 +599,7 @@ static MACHINE_DRIVER_START( ddealer ) MDRV_TIMER_ADD_PERIODIC("coinsim", ddealer_mcu_sim, HZ(10000)) // not real, but for simulating the MCU MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 6000000 / 4)//guess + MDRV_SOUND_ADD("ymsnd", YM2203, 6000000 / 4)//guess MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MACHINE_DRIVER_END diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c index 2408489b784..bc6c156b51a 100644 --- a/src/mame/drivers/ddenlovr.c +++ b/src/mame/drivers/ddenlovr.c @@ -1613,10 +1613,10 @@ static ADDRESS_MAP_START( quiz365_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300286, 0x300287) AM_READ(ddenlovr_gfxrom_r) // Video Chip AM_RANGE(0x3002c0, 0x3002c1) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff)// Sound - AM_RANGE(0x300300, 0x300303) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) + AM_RANGE(0x300300, 0x300303) AM_DEVWRITE8("ymsnd", ym2413_w, 0x00ff) AM_RANGE(0x300340, 0x30035f) AM_DEVREADWRITE8("rtc", msm6242_r, msm6242_w, 0x00ff) // 6242RTC - AM_RANGE(0x300380, 0x300383) AM_DEVWRITE8("ay", ay8910_address_data_w, 0x00ff) - AM_RANGE(0x300384, 0x300385) AM_DEVREAD8("ay", ay8910_r, 0x00ff) + AM_RANGE(0x300380, 0x300383) AM_DEVWRITE8("aysnd", ay8910_address_data_w, 0x00ff) + AM_RANGE(0x300384, 0x300385) AM_DEVREAD8("aysnd", ay8910_r, 0x00ff) AM_RANGE(0x3003c2, 0x3003c3) AM_DEVWRITE("oki", quiz365_oki_bank1_w) AM_RANGE(0x3003ca, 0x3003cb) AM_WRITE(ddenlovr_blitter_irq_ack_w) // Blitter irq acknowledge AM_RANGE(0x3003cc, 0x3003cd) AM_DEVWRITE("oki", quiz365_oki_bank2_w) @@ -1667,9 +1667,9 @@ static ADDRESS_MAP_START( ddenlvrj_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300070, 0x300071) AM_READ(unk16_r) // ? must be 78 on startup (not necessary in ddlover) AM_RANGE(0x300080, 0x300083) AM_WRITE(ddenlovr_blitter_w) AM_RANGE(0x300086, 0x300087) AM_READ(ddenlovr_gfxrom_r) // Video Chip - AM_RANGE(0x3000c0, 0x3000c3) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) + AM_RANGE(0x3000c0, 0x3000c3) AM_DEVWRITE8("ymsnd", ym2413_w, 0x00ff) AM_RANGE(0x300100, 0x30011f) AM_DEVREADWRITE8("rtc", msm6242_r, msm6242_w, 0x00ff) // 6242RTC - AM_RANGE(0x300140, 0x300143) AM_DEVWRITE8("ay", ay8910_address_data_w, 0x00ff) + AM_RANGE(0x300140, 0x300143) AM_DEVWRITE8("aysnd", ay8910_address_data_w, 0x00ff) AM_RANGE(0x300180, 0x300181) AM_READ_PORT("P1") AM_RANGE(0x300182, 0x300183) AM_READ_PORT("P2") AM_RANGE(0x300184, 0x300185) AM_READ_PORT("SYSTEM") @@ -1735,10 +1735,10 @@ static ADDRESS_MAP_START( ddenlvrk_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xe00308, 0xe00309) AM_WRITE(ddenlovr_coincounter_0_w) // Coin Counters AM_RANGE(0xe0030c, 0xe0030d) AM_WRITE(ddenlovr_coincounter_1_w) // - AM_RANGE(0xe00400, 0xe00403) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) + AM_RANGE(0xe00400, 0xe00403) AM_DEVWRITE8("ymsnd", ym2413_w, 0x00ff) AM_RANGE(0xe00500, 0xe0051f) AM_DEVREADWRITE8("rtc", msm6242_r, msm6242_w, 0x00ff) // 6242RTC - AM_RANGE(0xe00600, 0xe00603) AM_DEVWRITE8("ay", ay8910_address_data_w, 0x00ff) - AM_RANGE(0xe00604, 0xe00605) AM_DEVREAD8("ay", ay8910_r, 0x00ff) + AM_RANGE(0xe00600, 0xe00603) AM_DEVWRITE8("aysnd", ay8910_address_data_w, 0x00ff) + AM_RANGE(0xe00604, 0xe00605) AM_DEVREAD8("aysnd", ay8910_r, 0x00ff) AM_RANGE(0xe00700, 0xe00701) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) // Sound AM_RANGE(0xff0000, 0xffffff) AM_RAM // RAM ADDRESS_MAP_END @@ -1773,10 +1773,10 @@ static ADDRESS_MAP_START( ddenlovr_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xe00308, 0xe00309) AM_WRITE(ddenlovr_coincounter_0_w) // Coin Counters AM_RANGE(0xe0030c, 0xe0030d) AM_WRITE(ddenlovr_coincounter_1_w) // - AM_RANGE(0xe00400, 0xe00403) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) + AM_RANGE(0xe00400, 0xe00403) AM_DEVWRITE8("ymsnd", ym2413_w, 0x00ff) AM_RANGE(0xe00500, 0xe0051f) AM_DEVREADWRITE8("rtc", msm6242_r, msm6242_w, 0x00ff) // 6242RTC - AM_RANGE(0xe00600, 0xe00603) AM_DEVWRITE8("ay", ay8910_address_data_w, 0x00ff) - AM_RANGE(0xe00604, 0xe00605) AM_DEVREAD8("ay", ay8910_r, 0x00ff) + AM_RANGE(0xe00600, 0xe00603) AM_DEVWRITE8("aysnd", ay8910_address_data_w, 0x00ff) + AM_RANGE(0xe00604, 0xe00605) AM_DEVREAD8("aysnd", ay8910_r, 0x00ff) AM_RANGE(0xe00700, 0xe00701) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) // Sound AM_RANGE(0xff0000, 0xffffff) AM_RAM // RAM ADDRESS_MAP_END @@ -1847,9 +1847,9 @@ static ADDRESS_MAP_START( nettoqc_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300070, 0x300071) AM_READ(unk16_r) // ? must be 78 on startup (not necessary in ddlover) AM_RANGE(0x300080, 0x300083) AM_WRITE(ddenlovr_blitter_w) AM_RANGE(0x300086, 0x300087) AM_READ(ddenlovr_gfxrom_r) // Video Chip - AM_RANGE(0x3000c0, 0x3000c3) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) + AM_RANGE(0x3000c0, 0x3000c3) AM_DEVWRITE8("ymsnd", ym2413_w, 0x00ff) AM_RANGE(0x300100, 0x30011f) AM_DEVREADWRITE8("rtc", msm6242_r, msm6242_w, 0x00ff) // 6242RTC - AM_RANGE(0x300140, 0x300143) AM_DEVWRITE8("ay", ay8910_address_data_w, 0x00ff) + AM_RANGE(0x300140, 0x300143) AM_DEVWRITE8("aysnd", ay8910_address_data_w, 0x00ff) AM_RANGE(0x300180, 0x300181) AM_READ_PORT("P1") AM_RANGE(0x300182, 0x300183) AM_READ_PORT("P2") AM_RANGE(0x300184, 0x300185) AM_READ_PORT("SYSTEM") @@ -1909,7 +1909,7 @@ static ADDRESS_MAP_START( quizchq_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLO AM_RANGE(0x22, 0x23) AM_READ(rongrong_input2_r) AM_RANGE(0x40, 0x40) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) - AM_RANGE(0x60, 0x61) AM_DEVWRITE("ym", ym2413_w) + AM_RANGE(0x60, 0x61) AM_DEVWRITE("ymsnd", ym2413_w) AM_RANGE(0x80, 0x83) AM_WRITE(ddenlovr_palette_base_w) AM_RANGE(0x84, 0x87) AM_WRITE(ddenlovr_palette_mask_w) @@ -1944,7 +1944,7 @@ static ADDRESS_MAP_START( rongrong_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GL AM_RANGE(0x20, 0x2f) AM_DEVREADWRITE("rtc", msm6242_r, msm6242_w) // 6242RTC AM_RANGE(0x40, 0x40) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) - AM_RANGE(0x60, 0x61) AM_DEVWRITE("ym", ym2413_w) + AM_RANGE(0x60, 0x61) AM_DEVWRITE("ymsnd", ym2413_w) AM_RANGE(0x80, 0x83) AM_WRITE(ddenlovr_palette_base_w) AM_RANGE(0x84, 0x87) AM_WRITE(ddenlovr_palette_mask_w) @@ -2070,7 +2070,7 @@ static ADDRESS_MAP_START( mmpanic_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x60, 0x61) AM_WRITE(mmpanic_blitter_w) AM_RANGE(0x63, 0x63) AM_READ(rongrong_gfxrom_r) // Video Chip AM_RANGE(0x64, 0x65) AM_WRITE(mmpanic_blitter2_w) - AM_RANGE(0x68, 0x68) AM_DEVWRITE("ay", ddenlovr_select_w) + AM_RANGE(0x68, 0x68) AM_DEVWRITE("aysnd", ddenlovr_select_w) AM_RANGE(0x69, 0x69) AM_WRITE(mmpanic_lockout_w) AM_RANGE(0x6a, 0x6a) AM_READ_PORT("IN0") AM_RANGE(0x6b, 0x6b) AM_READ_PORT("IN1") @@ -2100,9 +2100,9 @@ static ADDRESS_MAP_START( mmpanic_sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_M AM_RANGE(0x02, 0x02) AM_READ(SMH_NOP ) // read just before port 00 AM_RANGE(0x04, 0x04) AM_NOP // read only once at the start AM_RANGE(0x06, 0x06) AM_WRITENOP // almost always 1, sometimes 0 - AM_RANGE(0x08, 0x09) AM_DEVWRITE("ym", ym2413_w) - AM_RANGE(0x0c, 0x0c) AM_DEVWRITE("ay", ay8910_data_w) - AM_RANGE(0x0e, 0x0e) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x08, 0x09) AM_DEVWRITE("ymsnd", ym2413_w) + AM_RANGE(0x0c, 0x0c) AM_DEVWRITE("aysnd", ay8910_data_w) + AM_RANGE(0x0e, 0x0e) AM_DEVWRITE("aysnd", ay8910_address_w) ADDRESS_MAP_END @@ -2390,7 +2390,7 @@ static ADDRESS_MAP_START( hanakanz_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GL AM_RANGE(0x93, 0x93) AM_WRITE(hanakanz_coincounter_w) AM_RANGE(0x94, 0x94) AM_WRITE(hanakanz_keyb_w) AM_RANGE(0x96, 0x96) AM_READ(hanakanz_rand_r) - AM_RANGE(0xa0, 0xa1) AM_DEVWRITE("ym", ym2413_w) + AM_RANGE(0xa0, 0xa1) AM_DEVWRITE("ymsnd", ym2413_w) AM_RANGE(0xc0, 0xc0) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xe0, 0xef) AM_DEVREADWRITE("rtc", msm6242_r, msm6242_w) // 6242RTC ADDRESS_MAP_END @@ -2405,7 +2405,7 @@ static ADDRESS_MAP_START( hkagerou_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GL AM_RANGE(0x80, 0x80) AM_WRITE(hanakanz_blitter_data_w) AM_RANGE(0x81, 0x81) AM_WRITE(hanakanz_palette_w) AM_RANGE(0x83, 0x84) AM_READ(hanakanz_gfxrom_r) - AM_RANGE(0xa0, 0xa1) AM_DEVWRITE("ym", ym2413_w) + AM_RANGE(0xa0, 0xa1) AM_DEVWRITE("ymsnd", ym2413_w) AM_RANGE(0xb0, 0xb0) AM_READ_PORT("SYSTEM") AM_RANGE(0xb1, 0xb2) AM_READ(hanakanz_keyb_r) AM_RANGE(0xb3, 0xb3) AM_WRITE(hanakanz_coincounter_w) @@ -2443,7 +2443,7 @@ static ADDRESS_MAP_START( mjreach1_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GL AM_RANGE(0x94, 0x94) AM_READ_PORT("SYSTEM") AM_RANGE(0x95, 0x96) AM_READ(hanakanz_keyb_r) AM_RANGE(0x97, 0x97) AM_WRITE(hanakanz_coincounter_w) - AM_RANGE(0xa0, 0xa1) AM_DEVWRITE("ym", ym2413_w) + AM_RANGE(0xa0, 0xa1) AM_DEVWRITE("ymsnd", ym2413_w) AM_RANGE(0xc0, 0xc0) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xe0, 0xef) AM_DEVREADWRITE("rtc", msm6242_r, msm6242_w) // 6242RTC ADDRESS_MAP_END @@ -2570,9 +2570,9 @@ static ADDRESS_MAP_START( mjchuuka_portmap, ADDRESS_SPACE_IO, 8 ) // 16 bit I/O AM_RANGE(0x63, 0x63) AM_MIRROR(0xff00) AM_READ_PORT("DSW4") AM_RANGE(0x64, 0x64) AM_MIRROR(0xff00) AM_READ_PORT("DSW5") // DSW 1-4 high bits AM_RANGE(0x80, 0x80) AM_MIRROR(0xff00) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) - AM_RANGE(0xa0, 0xa1) AM_MIRROR(0xff00) AM_DEVWRITE("ym", ym2413_w) + AM_RANGE(0xa0, 0xa1) AM_MIRROR(0xff00) AM_DEVWRITE("ymsnd", ym2413_w) AM_RANGE(0xc0, 0xcf) AM_MIRROR(0xff00) AM_DEVREADWRITE("rtc", msm6242_r, msm6242_w) // 6242RTC - AM_RANGE(0xe0, 0xe1) AM_MIRROR(0xff00) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0xe0, 0xe1) AM_MIRROR(0xff00) AM_DEVWRITE("aysnd", ay8910_address_data_w) ADDRESS_MAP_END @@ -2678,10 +2678,10 @@ static ADDRESS_MAP_START( mjmyster_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GL AM_RANGE(0x22, 0x22) AM_READ(mjmyster_coins_r) AM_RANGE(0x23, 0x23) AM_READ(mjmyster_keyb_r) AM_RANGE(0x40, 0x40) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) - AM_RANGE(0x42, 0x43) AM_DEVWRITE("ym", ym2413_w) - AM_RANGE(0x44, 0x44) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x46, 0x46) AM_DEVWRITE("ay", ay8910_data_w) - AM_RANGE(0x48, 0x48) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x42, 0x43) AM_DEVWRITE("ymsnd", ym2413_w) + AM_RANGE(0x44, 0x44) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x46, 0x46) AM_DEVWRITE("aysnd", ay8910_data_w) + AM_RANGE(0x48, 0x48) AM_DEVWRITE("aysnd", ay8910_address_w) AM_RANGE(0x60, 0x6f) AM_DEVREADWRITE("rtc", msm6242_r, msm6242_w) // 6242RTC AM_RANGE(0x80, 0x83) AM_WRITE(ddenlovr_palette_base_w) AM_RANGE(0x84, 0x87) AM_WRITE(ddenlovr_palette_mask_w) @@ -2843,10 +2843,10 @@ static ADDRESS_MAP_START( hginga_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOB AM_RANGE(0x03, 0x03) AM_READ(rongrong_gfxrom_r) AM_RANGE(0x1c, 0x1c) AM_READNOP AM_WRITE(mjmyster_rambank_w) AM_RANGE(0x1e, 0x1e) AM_WRITE(hginga_rombank_w) - AM_RANGE(0x22, 0x23) AM_DEVWRITE("ym", ym2413_w) - AM_RANGE(0x24, 0x24) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x26, 0x26) AM_DEVWRITE("ay", ay8910_data_w) - AM_RANGE(0x28, 0x28) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x22, 0x23) AM_DEVWRITE("ymsnd", ym2413_w) + AM_RANGE(0x24, 0x24) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x26, 0x26) AM_DEVWRITE("aysnd", ay8910_data_w) + AM_RANGE(0x28, 0x28) AM_DEVWRITE("aysnd", ay8910_address_w) AM_RANGE(0x40, 0x40) AM_WRITE(hginga_input_w) AM_RANGE(0x41, 0x41) AM_WRITE(hginga_coins_w) AM_RANGE(0x42, 0x42) AM_READ(hginga_coins_r) @@ -2959,10 +2959,10 @@ static ADDRESS_MAP_START( hgokou_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOB AM_RANGE(0x61, 0x61) AM_WRITE(hgokou_input_w) AM_RANGE(0x62, 0x62) AM_READ(hgokou_input_r) AM_RANGE(0x80, 0x80) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) - AM_RANGE(0x82, 0x83) AM_DEVWRITE("ym", ym2413_w) - AM_RANGE(0x84, 0x84) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x86, 0x86) AM_DEVWRITE("ay", ay8910_data_w) - AM_RANGE(0x88, 0x88) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x82, 0x83) AM_DEVWRITE("ymsnd", ym2413_w) + AM_RANGE(0x84, 0x84) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x86, 0x86) AM_DEVWRITE("aysnd", ay8910_data_w) + AM_RANGE(0x88, 0x88) AM_DEVWRITE("aysnd", ay8910_address_w) AM_RANGE(0xb0, 0xb0) AM_READ(hanakanz_rand_r) ADDRESS_MAP_END @@ -3038,7 +3038,7 @@ static ADDRESS_MAP_START( hparadis_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GL AM_RANGE(0x1c, 0x1c) AM_READ(hparadis_dsw_r) AM_RANGE(0x1e, 0x1e) AM_WRITE(hparadis_select_w) AM_RANGE(0x40, 0x40) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) - AM_RANGE(0x60, 0x61) AM_DEVWRITE("ym", ym2413_w) + AM_RANGE(0x60, 0x61) AM_DEVWRITE("ymsnd", ym2413_w) AM_RANGE(0x80, 0x83) AM_WRITE(ddenlovr_palette_base_w) AM_RANGE(0x84, 0x87) AM_WRITE(ddenlovr_palette_mask_w) AM_RANGE(0x88, 0x8b) AM_WRITE(ddenlovr_transparency_pen_w) @@ -3083,10 +3083,10 @@ static ADDRESS_MAP_START( mjmywrld_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GL AM_RANGE(0x22, 0x22) AM_READ(mjmywrld_coins_r) AM_RANGE(0x23, 0x23) AM_READ(mjmyster_keyb_r) AM_RANGE(0x40, 0x40) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) - AM_RANGE(0x42, 0x43) AM_DEVWRITE("ym", ym2413_w) - AM_RANGE(0x44, 0x44) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x46, 0x46) AM_DEVWRITE("ay", ay8910_data_w) - AM_RANGE(0x48, 0x48) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x42, 0x43) AM_DEVWRITE("ymsnd", ym2413_w) + AM_RANGE(0x44, 0x44) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x46, 0x46) AM_DEVWRITE("aysnd", ay8910_data_w) + AM_RANGE(0x48, 0x48) AM_DEVWRITE("aysnd", ay8910_address_w) AM_RANGE(0x60, 0x6f) AM_DEVREADWRITE("rtc", msm6242_r, msm6242_w) // 6242RTC AM_RANGE(0x80, 0x83) AM_WRITE(ddenlovr_palette_base_w) AM_RANGE(0x84, 0x87) AM_WRITE(ddenlovr_palette_mask_w) @@ -3184,10 +3184,10 @@ static ADDRESS_MAP_START( akamaru_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xe00308, 0xe00309) AM_WRITE(ddenlovr_coincounter_0_w) // Coin Counters AM_RANGE(0xe0030c, 0xe0030d) AM_WRITE(ddenlovr_coincounter_1_w) // - AM_RANGE(0xe00400, 0xe00403) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) + AM_RANGE(0xe00400, 0xe00403) AM_DEVWRITE8("ymsnd", ym2413_w, 0x00ff) AM_RANGE(0xe00500, 0xe0051f) AM_DEVREADWRITE8("rtc", msm6242_r, msm6242_w, 0x00ff) // 6242RTC - AM_RANGE(0xe00600, 0xe00603) AM_DEVWRITE8("ay", ay8910_address_data_w, 0x00ff) - AM_RANGE(0xe00604, 0xe00605) AM_DEVREAD8("ay", ay8910_r, 0x00ff) + AM_RANGE(0xe00600, 0xe00603) AM_DEVWRITE8("aysnd", ay8910_address_data_w, 0x00ff) + AM_RANGE(0xe00604, 0xe00605) AM_DEVREAD8("aysnd", ay8910_r, 0x00ff) AM_RANGE(0xe00700, 0xe00701) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) // Sound AM_RANGE(0xff0000, 0xffffff) AM_RAM // RAM ADDRESS_MAP_END @@ -3277,9 +3277,9 @@ static ADDRESS_MAP_START( mjflove_portmap, ADDRESS_SPACE_IO, 8 ) // 16 bit I/O AM_RANGE(0x0100, 0x0100) AM_READ_PORT("DSW1") AM_RANGE(0x0181, 0x0181) AM_WRITENOP // ? int. enable AM_RANGE(0x0184, 0x0184) AM_WRITE(mjflove_coincounter_w) - AM_RANGE(0x0200, 0x0201) AM_DEVWRITE("ym", ym2413_w) + AM_RANGE(0x0200, 0x0201) AM_DEVWRITE("ymsnd", ym2413_w) AM_RANGE(0x0280, 0x028f) AM_DEVREADWRITE("rtc", msm6242_r, msm6242_w) // 6242RTC - AM_RANGE(0x0300, 0x0301) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x0300, 0x0301) AM_DEVWRITE("aysnd", ay8910_address_data_w) AM_RANGE(0x0380, 0x0380) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) ADDRESS_MAP_END @@ -3317,7 +3317,7 @@ static ADDRESS_MAP_START( jongtei_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLO AM_RANGE(0x60, 0x60) AM_WRITE(hanakanz_blitter_data_w) AM_RANGE(0x61, 0x61) AM_WRITE(hanakanz_palette_w) AM_RANGE(0x63, 0x64) AM_READ(hanakanz_gfxrom_r) - AM_RANGE(0x80, 0x81) AM_DEVWRITE("ym", ym2413_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("ymsnd", ym2413_w) AM_RANGE(0xa0, 0xa0) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xc0, 0xcf) AM_DEVREADWRITE("rtc", msm6242_r, msm6242_w) // 6242RTC ADDRESS_MAP_END @@ -3377,8 +3377,8 @@ static WRITE8_HANDLER( sryudens_rambank_w ) static ADDRESS_MAP_START( sryudens_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) - AM_RANGE(0x02, 0x03) AM_DEVWRITE("ym", ym2413_w) - AM_RANGE(0x04, 0x05) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x02, 0x03) AM_DEVWRITE("ymsnd", ym2413_w) + AM_RANGE(0x04, 0x05) AM_DEVWRITE("aysnd", ay8910_address_data_w) AM_RANGE(0x1c, 0x1c) AM_READNOP AM_WRITE(sryudens_rambank_w) // ? ack on RTC int AM_RANGE(0x1e, 0x1e) AM_WRITE(mjflove_rombank_w) AM_RANGE(0x20, 0x23) AM_WRITE(ddenlovr_palette_base_w) @@ -3494,7 +3494,7 @@ static ADDRESS_MAP_START( daimyojn_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GL AM_RANGE(0x42, 0x44) AM_READ(hanakanz_gfxrom_r) AM_RANGE(0x8a, 0x8b) AM_READ(daimyojn_year_hack_r) // ? AM_RANGE(0x80, 0x8f) AM_DEVREADWRITE("rtc", msm6242_r, msm6242_w) // 6242RTC - AM_RANGE(0xa0, 0xa1) AM_DEVWRITE("ym", ym2413_w) + AM_RANGE(0xa0, 0xa1) AM_DEVWRITE("ymsnd", ym2413_w) AM_RANGE(0xa2, 0xa2) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xa8, 0xa8) AM_READ_PORT("SYSTEM") AM_RANGE(0xaa, 0xaa) AM_READ(daimyojn_keyb1_r) @@ -7362,10 +7362,10 @@ static MACHINE_DRIVER_START( ddenlovr ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2413, XTAL_28_63636MHz / 8) + MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_28_63636MHz / 8) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - MDRV_SOUND_ADD("ay", AY8910, XTAL_28_63636MHz / 16) // or /8 ? + MDRV_SOUND_ADD("aysnd", AY8910, XTAL_28_63636MHz / 16) // or /8 ? MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MDRV_SOUND_ADD("oki", OKIM6295, XTAL_28_63636MHz / 28) @@ -7416,7 +7416,7 @@ static MACHINE_DRIVER_START( quiz365 ) MDRV_CPU_MODIFY("maincpu") MDRV_CPU_PROGRAM_MAP(quiz365_map) - MDRV_SOUND_MODIFY("ay") + MDRV_SOUND_MODIFY("aysnd") MDRV_SOUND_CONFIG(quiz365_ay8910_interface) MACHINE_DRIVER_END @@ -7488,7 +7488,7 @@ static MACHINE_DRIVER_START( quizchq ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2413, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2413, 3579545) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MDRV_SOUND_ADD("oki", OKIM6295, 1022720) @@ -7566,10 +7566,10 @@ static MACHINE_DRIVER_START( mmpanic ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2413, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2413, 3579545) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - MDRV_SOUND_ADD("ay", AY8910, 3579545) + MDRV_SOUND_ADD("aysnd", AY8910, 3579545) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MDRV_SOUND_ADD("oki", OKIM6295, 1022720) @@ -7633,7 +7633,7 @@ static MACHINE_DRIVER_START( hanakanz ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2413, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2413, 3579545) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MDRV_SOUND_ADD("oki", OKIM6295, 1022720) @@ -7692,7 +7692,7 @@ static MACHINE_DRIVER_START( mjchuuka ) MDRV_CPU_IO_MAP(mjchuuka_portmap) MDRV_CPU_VBLANK_INT("screen", mjchuuka_irq) - MDRV_SOUND_ADD("ay", AY8910, 1789772) + MDRV_SOUND_ADD("aysnd", AY8910, 1789772) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END @@ -7767,7 +7767,7 @@ static MACHINE_DRIVER_START( mjmyster ) MDRV_CPU_VBLANK_INT_HACK(mjmyster_irq, 2) MDRV_CPU_PERIODIC_INT(rtc_nmi_irq, 1) - MDRV_SOUND_ADD("ay", AY8910, 3579545) + MDRV_SOUND_ADD("aysnd", AY8910, 3579545) MDRV_SOUND_CONFIG(mjmyster_ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_DRIVER_END @@ -7815,7 +7815,7 @@ static MACHINE_DRIVER_START( hginga ) MDRV_CPU_IO_MAP(hginga_portmap) MDRV_CPU_VBLANK_INT("screen", hginga_irq) - MDRV_SOUND_ADD("ay", AY8910, 3579545) + MDRV_SOUND_ADD("aysnd", AY8910, 3579545) MDRV_SOUND_CONFIG(hginga_ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_DRIVER_END @@ -7828,7 +7828,7 @@ static MACHINE_DRIVER_START( hgokou ) MDRV_CPU_IO_MAP(hgokou_portmap) MDRV_CPU_VBLANK_INT("screen", hginga_irq) - MDRV_SOUND_ADD("ay", AY8910, 3579545) + MDRV_SOUND_ADD("aysnd", AY8910, 3579545) MDRV_SOUND_CONFIG(hginga_ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_DRIVER_END @@ -7850,7 +7850,7 @@ static MACHINE_DRIVER_START( mjmyuniv ) MDRV_CPU_VBLANK_INT_HACK(mjmyster_irq, 2) MDRV_CPU_PERIODIC_INT(rtc_nmi_irq, 1) - MDRV_SOUND_ADD("ay", AY8910, 1789772) + MDRV_SOUND_ADD("aysnd", AY8910, 1789772) MDRV_SOUND_CONFIG(mjmyster_ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_DRIVER_END @@ -7863,7 +7863,7 @@ static MACHINE_DRIVER_START( mjmyornt ) MDRV_CPU_VBLANK_INT_HACK(mjmyster_irq, 2) MDRV_CPU_PERIODIC_INT(rtc_nmi_irq, 1) - MDRV_SOUND_ADD("ay", AY8910, 1789772) + MDRV_SOUND_ADD("aysnd", AY8910, 1789772) MDRV_SOUND_CONFIG(mjmyster_ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_DRIVER_END @@ -7895,7 +7895,7 @@ static MACHINE_DRIVER_START( mjflove ) MDRV_VIDEO_START(mjflove) // blitter commands in the roms are shuffled around - MDRV_SOUND_ADD("ay", AY8910, 28636363/8) + MDRV_SOUND_ADD("aysnd", AY8910, 28636363/8) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_DRIVER_END @@ -7940,7 +7940,7 @@ static MACHINE_DRIVER_START( jongtei ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2413, XTAL_28_63636MHz / 8) + MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_28_63636MHz / 8) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MDRV_SOUND_ADD("oki", OKIM6295, XTAL_28_63636MHz / 28) @@ -7980,10 +7980,10 @@ static MACHINE_DRIVER_START( sryudens ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2413, XTAL_28_63636MHz / 8) + MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_28_63636MHz / 8) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - MDRV_SOUND_ADD("ay", AY8910, XTAL_28_63636MHz / 8) + MDRV_SOUND_ADD("aysnd", AY8910, XTAL_28_63636MHz / 8) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MDRV_SOUND_ADD("oki", OKIM6295, XTAL_28_63636MHz / 28) // ? @@ -8023,7 +8023,7 @@ static MACHINE_DRIVER_START( daimyojn ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2413, XTAL_28_63636MHz / 8) + MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_28_63636MHz / 8) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MDRV_SOUND_ADD("oki", OKIM6295, XTAL_28_63636MHz / 28) diff --git a/src/mame/drivers/ddragon.c b/src/mame/drivers/ddragon.c index 9956cacec2d..420c5a467b0 100644 --- a/src/mame/drivers/ddragon.c +++ b/src/mame/drivers/ddragon.c @@ -586,7 +586,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_RAM AM_RANGE(0x1000, 0x1000) AM_READ(soundlatch_r) AM_RANGE(0x1800, 0x1800) AM_READ(dd_adpcm_status_r) - AM_RANGE(0x2800, 0x2801) AM_DEVREADWRITE("fm", ym2151_r, ym2151_w) + AM_RANGE(0x2800, 0x2801) AM_DEVREADWRITE("fmsnd", ym2151_r, ym2151_w) AM_RANGE(0x3800, 0x3807) AM_WRITE(dd_adpcm_w) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -595,7 +595,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dd2_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("fm", ym2151_r, ym2151_w) + AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("fmsnd", ym2151_r, ym2151_w) AM_RANGE(0x9800, 0x9800) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xA000, 0xA000) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -995,7 +995,7 @@ static MACHINE_DRIVER_START( ddragon ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("fm", YM2151, SOUND_CLOCK) + MDRV_SOUND_ADD("fmsnd", YM2151, SOUND_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "mono", 0.60) MDRV_SOUND_ROUTE(1, "mono", 0.60) @@ -1061,7 +1061,7 @@ static MACHINE_DRIVER_START( ddgn6809 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("fm", YM2151, SOUND_CLOCK) + MDRV_SOUND_ADD("fmsnd", YM2151, SOUND_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "mono", 0.60) MDRV_SOUND_ROUTE(1, "mono", 0.60) @@ -1108,7 +1108,7 @@ static MACHINE_DRIVER_START( ddragon2 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("fm", YM2151, SOUND_CLOCK) + MDRV_SOUND_ADD("fmsnd", YM2151, SOUND_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "mono", 0.60) MDRV_SOUND_ROUTE(1, "mono", 0.60) diff --git a/src/mame/drivers/ddrible.c b/src/mame/drivers/ddrible.c index 6e291ced069..0c1a25664f3 100644 --- a/src/mame/drivers/ddrible.c +++ b/src/mame/drivers/ddrible.c @@ -156,7 +156,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cpu2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&ddrible_snd_sharedram) /* shared RAM with CPU #1 */ - AM_RANGE(0x1000, 0x1001) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) /* YM2203 */ + AM_RANGE(0x1000, 0x1001) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) /* YM2203 */ AM_RANGE(0x3000, 0x3000) AM_DEVWRITE("vlm", vlm5030_data_w) /* Speech data */ AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM */ ADDRESS_MAP_END @@ -295,7 +295,7 @@ static MACHINE_DRIVER_START( ddribble ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, XTAL_3_579545MHz) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_3_579545MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(0, "filter1", 0.25) MDRV_SOUND_ROUTE(1, "filter2", 0.25) diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c index 6a104d6dcf4..c75a5a05930 100644 --- a/src/mame/drivers/deco32.c +++ b/src/mame/drivers/deco32.c @@ -957,7 +957,7 @@ static READ8_HANDLER(deco32_bsmt_status_r) static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x000000, 0x00ffff) AM_ROM - AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) AM_RANGE(0x130000, 0x130001) AM_DEVREADWRITE("oki2", okim6295_r, okim6295_w) AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) @@ -987,7 +987,7 @@ static READ8_HANDLER(latch_r) static ADDRESS_MAP_START( nslasher_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xb000, 0xb000) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) AM_RANGE(0xc000, 0xc000) AM_DEVREADWRITE("oki2", okim6295_r, okim6295_w) AM_RANGE(0xd000, 0xd000) AM_READ(latch_r) @@ -1701,7 +1701,7 @@ static MACHINE_DRIVER_START( captaven ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 32220000/9) + MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.42) MDRV_SOUND_ROUTE(1, "rspeaker", 0.42) @@ -1747,7 +1747,7 @@ static MACHINE_DRIVER_START( fghthist ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 32220000/9) + MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.42) MDRV_SOUND_ROUTE(1, "rspeaker", 0.42) @@ -1793,7 +1793,7 @@ static MACHINE_DRIVER_START( fghthsta ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 32220000/9) + MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.42) MDRV_SOUND_ROUTE(1, "rspeaker", 0.42) @@ -1841,7 +1841,7 @@ static MACHINE_DRIVER_START( dragngun ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 32220000/9) + MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.42) MDRV_SOUND_ROUTE(1, "rspeaker", 0.42) @@ -1894,7 +1894,7 @@ static MACHINE_DRIVER_START( lockload ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 32220000/9) + MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.42) MDRV_SOUND_ROUTE(1, "rspeaker", 0.42) @@ -1984,7 +1984,7 @@ static MACHINE_DRIVER_START( nslasher ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 32220000/9) + MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_interface_nslasher) MDRV_SOUND_ROUTE(0, "lspeaker", 0.40) MDRV_SOUND_ROUTE(1, "rspeaker", 0.40) diff --git a/src/mame/drivers/deniam.c b/src/mame/drivers/deniam.c index 6d86171a026..5ca12fd5be5 100644 --- a/src/mame/drivers/deniam.c +++ b/src/mame/drivers/deniam.c @@ -114,7 +114,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x01, 0x01) AM_READ(soundlatch_r) - AM_RANGE(0x02, 0x03) AM_DEVWRITE("ym", ym3812_w) + AM_RANGE(0x02, 0x03) AM_DEVWRITE("ymsnd", ym3812_w) AM_RANGE(0x05, 0x05) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0x07, 0x07) AM_DEVWRITE("oki", deniam16b_oki_rom_bank_w) ADDRESS_MAP_END @@ -132,7 +132,7 @@ static ADDRESS_MAP_START( deniam16c_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xc44002, 0xc44003) AM_READ_PORT("P1") AM_RANGE(0xc44004, 0xc44005) AM_READ_PORT("P2") AM_WRITENOP /* irq ack? */ AM_RANGE(0xc44006, 0xc44007) AM_READNOP AM_DEVWRITE("oki", deniam16c_oki_rom_bank_w) /* read unused? */ - AM_RANGE(0xc40008, 0xc4000b) AM_DEVWRITE8("ym", ym3812_w, 0xff00) + AM_RANGE(0xc40008, 0xc4000b) AM_DEVWRITE8("ymsnd", ym3812_w, 0xff00) AM_RANGE(0xc4400a, 0xc4400b) AM_READ_PORT("DSW") /* probably YM3812 input port */ AM_RANGE(0xff0000, 0xffffff) AM_RAM ADDRESS_MAP_END @@ -276,7 +276,7 @@ static MACHINE_DRIVER_START( deniam16b ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, XTAL_25MHz/6) /* "SM64" ym3812 clone; 4.166470 measured, = 4.166666Mhz verified */ + MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_25MHz/6) /* "SM64" ym3812 clone; 4.166470 measured, = 4.166666Mhz verified */ MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) @@ -312,7 +312,7 @@ static MACHINE_DRIVER_START( deniam16c ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, XTAL_25MHz/6) /* "SM64" ym3812 clone; 4.166470 measured, = 4.166666Mhz verified) */ + MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_25MHz/6) /* "SM64" ym3812 clone; 4.166470 measured, = 4.166666Mhz verified) */ MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) diff --git a/src/mame/drivers/dietgo.c b/src/mame/drivers/dietgo.c index a8048853ca5..e8f650008cc 100644 --- a/src/mame/drivers/dietgo.c +++ b/src/mame/drivers/dietgo.c @@ -35,7 +35,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x000000, 0x00ffff) AM_ROM AM_RANGE(0x100000, 0x100001) AM_NOP /* YM2203 - this board doesn't have one */ - AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0x130000, 0x130001) AM_NOP /* This board only has 1 oki chip */ AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) @@ -198,7 +198,7 @@ static MACHINE_DRIVER_START( dietgo ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, XTAL_32_22MHz/9) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_32_22MHz/9) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45) diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c index d18be25ce72..2efebc6a1fd 100644 --- a/src/mame/drivers/discoboy.c +++ b/src/mame/drivers/discoboy.c @@ -326,7 +326,7 @@ static void splash_msm5205_int(const device_config *device) static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0xf000, 0xf7ff) AM_RAM - AM_RANGE(0xec00, 0xec01) AM_DEVWRITE("ym", ym3812_w) + AM_RANGE(0xec00, 0xec01) AM_DEVWRITE("ymsnd", ym3812_w) AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -474,7 +474,7 @@ static MACHINE_DRIVER_START( discoboy ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 2500000) + MDRV_SOUND_ADD("ymsnd", YM3812, 2500000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) diff --git a/src/mame/drivers/djboy.c b/src/mame/drivers/djboy.c index 07e2b22a9c3..e0cb79c26ca 100644 --- a/src/mame/drivers/djboy.c +++ b/src/mame/drivers/djboy.c @@ -789,7 +789,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cpu2_port_am, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(cpu2_bankswitch_w) - AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0x04, 0x04) AM_READ(soundlatch_r) AM_RANGE(0x06, 0x06) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) AM_RANGE(0x07, 0x07) AM_DEVREADWRITE("oki2", okim6295_r, okim6295_w) @@ -941,7 +941,7 @@ static MACHINE_DRIVER_START( djboy ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 3000000) + MDRV_SOUND_ADD("ymsnd", YM2203, 3000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MDRV_SOUND_ADD("oki1", OKIM6295, 12000000 / 8) diff --git a/src/mame/drivers/dlair.c b/src/mame/drivers/dlair.c index 7cb5f1cf1ce..6c0c0336344 100644 --- a/src/mame/drivers/dlair.c +++ b/src/mame/drivers/dlair.c @@ -376,13 +376,13 @@ static WRITE8_DEVICE_HANDLER( sio_w ) static ADDRESS_MAP_START( dlus_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x9fff) AM_ROM AM_RANGE(0xa000, 0xa7ff) AM_MIRROR(0x1800) AM_RAM - AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x1fc7) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x1fc7) AM_DEVREAD("aysnd", ay8910_r) AM_RANGE(0xc008, 0xc008) AM_MIRROR(0x1fc7) AM_READ_PORT("CONTROLS") AM_RANGE(0xc010, 0xc010) AM_MIRROR(0x1fc7) AM_READ_PORT("SERVICE") AM_RANGE(0xc020, 0xc020) AM_MIRROR(0x1fc7) AM_READ(laserdisc_r) - AM_RANGE(0xe000, 0xe000) AM_MIRROR(0x1fc7) AM_DEVWRITE("ay", ay8910_data_w) + AM_RANGE(0xe000, 0xe000) AM_MIRROR(0x1fc7) AM_DEVWRITE("aysnd", ay8910_data_w) AM_RANGE(0xe008, 0xe008) AM_MIRROR(0x1fc7) AM_WRITE(misc_w) - AM_RANGE(0xe010, 0xe010) AM_MIRROR(0x1fc7) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0xe010, 0xe010) AM_MIRROR(0x1fc7) AM_DEVWRITE("aysnd", ay8910_address_w) AM_RANGE(0xe020, 0xe020) AM_MIRROR(0x1fc7) AM_WRITE(laserdisc_w) AM_RANGE(0xe030, 0xe037) AM_MIRROR(0x1fc0) AM_WRITE(led_den2_w) AM_RANGE(0xe038, 0xe03f) AM_MIRROR(0x1fc0) AM_WRITE(led_den1_w) @@ -708,7 +708,7 @@ static MACHINE_DRIVER_START( dlair_base ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ay", AY8910, MASTER_CLOCK_US/8) + MDRV_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK_US/8) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33) diff --git a/src/mame/drivers/dominob.c b/src/mame/drivers/dominob.c index f7316ba04eb..8e32930d907 100644 --- a/src/mame/drivers/dominob.c +++ b/src/mame/drivers/dominob.c @@ -122,8 +122,8 @@ static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_READWRITE(SMH_ROM, SMH_NOP) // there are some garbage writes to ROM AM_RANGE(0xc000, 0xc7ff) AM_RAM - AM_RANGE(0xd000, 0xd001) AM_DEVWRITE("ay", ay8910_address_data_w) - AM_RANGE(0xd001, 0xd001) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0xd000, 0xd001) AM_DEVWRITE("aysnd", ay8910_address_data_w) + AM_RANGE(0xd001, 0xd001) AM_DEVREAD("aysnd", ay8910_r) AM_RANGE(0xd008, 0xd008) AM_WRITE(dominob_d008_w) AM_RANGE(0xd00c, 0xd00c) AM_READ_PORT("IN0") AM_RANGE(0xd010, 0xd010) AM_READ_PORT("IN1") AM_WRITENOP @@ -266,7 +266,7 @@ static MACHINE_DRIVER_START( dominob ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 8000000/4 /* guess */) + MDRV_SOUND_ADD("aysnd", AY8910, 8000000/4 /* guess */) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_DRIVER_END diff --git a/src/mame/drivers/dooyong.c b/src/mame/drivers/dooyong.c index 3fb7a88b33e..d2322bae460 100644 --- a/src/mame/drivers/dooyong.c +++ b/src/mame/drivers/dooyong.c @@ -271,7 +271,7 @@ static ADDRESS_MAP_START( bluehawk_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_ROM AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r) - AM_RANGE(0xf808, 0xf809) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xf808, 0xf809) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xf80a, 0xf80a) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) ADDRESS_MAP_END @@ -789,7 +789,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( sound_2151 ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "mono", 0.50) MDRV_SOUND_ROUTE(1, "mono", 0.50) @@ -802,7 +802,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( sound_2151_m68k ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 4000000) + MDRV_SOUND_ADD("ymsnd", YM2151, 4000000) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "mono", 0.50) MDRV_SOUND_ROUTE(1, "mono", 0.50) diff --git a/src/mame/drivers/drw80pkr.c b/src/mame/drivers/drw80pkr.c index f2940949573..376fe08cfee 100644 --- a/src/mame/drivers/drw80pkr.c +++ b/src/mame/drivers/drw80pkr.c @@ -121,11 +121,11 @@ static WRITE8_HANDLER( drw80pkr_io_w ) // ay8910 control port if (p1 == 0xfc && p2 == 0xff && offset == 0x00) - ay8910_address_w(devtag_get_device(space->machine, "ay"), 0, data); + ay8910_address_w(devtag_get_device(space->machine, "aysnd"), 0, data); // ay8910_write_port_0_w if (p1 == 0xfe && p2 == 0xff && offset == 0x00) - ay8910_data_w(devtag_get_device(space->machine, "ay"), 0, data); + ay8910_data_w(devtag_get_device(space->machine, "aysnd"), 0, data); // CRTC Register // R0 = 0x1f(31) Horizontal Total @@ -331,7 +331,7 @@ static MACHINE_DRIVER_START( drw80pkr ) // sound hardware MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8912, 20000000/12) + MDRV_SOUND_ADD("aysnd", AY8912, 20000000/12) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) MACHINE_DRIVER_END diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c index cf2d4c78462..4d8bd9ff6aa 100644 --- a/src/mame/drivers/dunhuang.c +++ b/src/mame/drivers/dunhuang.c @@ -417,8 +417,8 @@ static ADDRESS_MAP_START( dunhuang_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x001b, 0x001b ) AM_WRITE( dunhuang_block_dest_w ) - AM_RANGE( 0x0081, 0x0081 ) AM_DEVWRITE( "ym", ym2413_register_port_w ) - AM_RANGE( 0x0089, 0x0089 ) AM_DEVWRITE( "ym", ym2413_data_port_w ) + AM_RANGE( 0x0081, 0x0081 ) AM_DEVWRITE( "ymsnd", ym2413_register_port_w ) + AM_RANGE( 0x0089, 0x0089 ) AM_DEVWRITE( "ymsnd", ym2413_data_port_w ) // AM_RANGE( 0x0082, 0x0082 ) AM_WRITE( dunhuang_82_w ) @@ -699,7 +699,7 @@ static MACHINE_DRIVER_START( dunhuang ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2413, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2413, 3579545) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MDRV_SOUND_ADD("ay8910", AY8910, 12000000/8) diff --git a/src/mame/drivers/dwarfd.c b/src/mame/drivers/dwarfd.c index 04e06e797f6..7a22ad27ab5 100644 --- a/src/mame/drivers/dwarfd.c +++ b/src/mame/drivers/dwarfd.c @@ -365,8 +365,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x01, 0x01) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x02, 0x03) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x01, 0x01) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x02, 0x03) AM_DEVWRITE("aysnd", ay8910_data_address_w) AM_RANGE(0x20, 0x20) AM_READWRITE(i8275_preg_r, i8275_preg_w) AM_RANGE(0x21, 0x21) AM_READWRITE(i8275_sreg_r, i8275_creg_w) @@ -715,7 +715,7 @@ static MACHINE_DRIVER_START( dwarfd ) MDRV_VIDEO_UPDATE(dwarfd) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 1500000) + MDRV_SOUND_ADD("aysnd", AY8910, 1500000) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/dynadice.c b/src/mame/drivers/dynadice.c index d800d4905f0..35ac6dc6796 100644 --- a/src/mame/drivers/dynadice.c +++ b/src/mame/drivers/dynadice.c @@ -92,7 +92,7 @@ static ADDRESS_MAP_START( dynadice_sound_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x00) AM_READ(soundlatch_r) AM_RANGE(0x01, 0x01) AM_WRITE(soundlatch_clear_w) AM_RANGE(0x02, 0x02) AM_WRITE(sound_data_w) - AM_RANGE(0x03, 0x03) AM_DEVWRITE("ay", sound_control_w) + AM_RANGE(0x03, 0x03) AM_DEVWRITE("aysnd", sound_control_w) ADDRESS_MAP_END static INPUT_PORTS_START( dynadice ) @@ -222,7 +222,7 @@ static MACHINE_DRIVER_START( dynadice ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 2000000) + MDRV_SOUND_ADD("aysnd", AY8910, 2000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c index 62954c4201d..5e23a0a33fc 100644 --- a/src/mame/drivers/dynax.c +++ b/src/mame/drivers/dynax.c @@ -540,8 +540,8 @@ static ADDRESS_MAP_START( hanamai_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x74, 0x74 ) AM_WRITE ( dynax_blitter_ack_w ) // Blitter IRQ Ack AM_RANGE( 0x76, 0x76 ) AM_WRITE ( dynax_blit_palbank_w ) // Layers Palettes (High Bit) AM_RANGE( 0x77, 0x77 ) AM_WRITE ( hanamai_layer_half_w ) // half of the interleaved layer to write to - AM_RANGE( 0x78, 0x79 ) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w ) // 2 x DSW - AM_RANGE( 0x7a, 0x7b ) AM_DEVWRITE ( "ay", ay8910_address_data_w ) // AY8910 + AM_RANGE( 0x78, 0x79 ) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w ) // 2 x DSW + AM_RANGE( 0x7a, 0x7b ) AM_DEVWRITE ( "aysnd", ay8910_address_data_w ) // AY8910 // AM_RANGE( 0x7c, 0x7c ) AM_WRITE ( SMH_NOP ) // CRT Controller // AM_RANGE( 0x7d, 0x7d ) AM_WRITE ( SMH_NOP ) // AM_RANGE( 0x7e, 0x7e ) AM_WRITE ( dynax_blit_romregion_w ) // Blitter ROM bank @@ -562,10 +562,10 @@ static ADDRESS_MAP_START( hnoridur_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x26, 0x26 ) AM_READ_PORT ( "DSW2" ) // DSW3 AM_RANGE( 0x30, 0x30 ) AM_DEVWRITE ( "msm", adpcm_reset_w ) // MSM5205 reset AM_RANGE( 0x32, 0x32 ) AM_WRITE ( adpcm_data_w ) // MSM5205 data - AM_RANGE( 0x34, 0x35 ) AM_DEVWRITE( "ym", ym2413_w ) // - AM_RANGE( 0x36, 0x36 ) AM_DEVREAD ( "ay", ay8910_r ) // AY8910, DSW1 - AM_RANGE( 0x38, 0x38 ) AM_DEVWRITE ( "ay", ay8910_data_w ) // AY8910 - AM_RANGE( 0x3a, 0x3a ) AM_DEVWRITE ( "ay", ay8910_address_w ) // + AM_RANGE( 0x34, 0x35 ) AM_DEVWRITE( "ymsnd", ym2413_w ) // + AM_RANGE( 0x36, 0x36 ) AM_DEVREAD ( "aysnd", ay8910_r ) // AY8910, DSW1 + AM_RANGE( 0x38, 0x38 ) AM_DEVWRITE ( "aysnd", ay8910_data_w ) // AY8910 + AM_RANGE( 0x3a, 0x3a ) AM_DEVWRITE ( "aysnd", ay8910_address_w ) // AM_RANGE( 0x40, 0x40 ) AM_WRITE ( dynax_blit_pen_w ) // Destination Pen AM_RANGE( 0x41, 0x41 ) AM_WRITE ( dynax_blit_dest_w ) // Destination Layer AM_RANGE( 0x42, 0x42 ) AM_WRITE ( dynax_blit_palette01_w ) // Layers Palettes @@ -645,11 +645,11 @@ static ADDRESS_MAP_START( hjingi_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBA AM_RANGE( 0x30, 0x30 ) AM_DEVWRITE ( "msm", adpcm_reset_w ) // MSM5205 reset AM_RANGE( 0x32, 0x32 ) AM_WRITE ( adpcm_data_w ) // MSM5205 data - AM_RANGE( 0x34, 0x35 ) AM_DEVWRITE( "ym", ym2413_w ) // + AM_RANGE( 0x34, 0x35 ) AM_DEVWRITE( "ymsnd", ym2413_w ) // - AM_RANGE( 0x36, 0x36 ) AM_DEVREAD ( "ay", ay8910_r ) // AY8910, DSW1 - AM_RANGE( 0x38, 0x38 ) AM_DEVWRITE ( "ay", ay8910_data_w ) // AY8910 - AM_RANGE( 0x3a, 0x3a ) AM_DEVWRITE ( "ay", ay8910_address_w) // + AM_RANGE( 0x36, 0x36 ) AM_DEVREAD ( "aysnd", ay8910_r ) // AY8910, DSW1 + AM_RANGE( 0x38, 0x38 ) AM_DEVWRITE ( "aysnd", ay8910_data_w ) // AY8910 + AM_RANGE( 0x3a, 0x3a ) AM_DEVWRITE ( "aysnd", ay8910_address_w) // AM_RANGE( 0x40, 0x40 ) AM_WRITE ( dynax_blit_pen_w ) // Destination Pen AM_RANGE( 0x41, 0x41 ) AM_WRITE ( dynax_blit_dest_w ) // Destination Layer @@ -781,9 +781,9 @@ static ADDRESS_MAP_START( yarunara_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x11, 0x17 ) AM_WRITE ( dynax_blitter_rev2_w ) // Blitter AM_RANGE( 0x20, 0x20 ) AM_DEVWRITE ( "msm", adpcm_reset_w ) // MSM5205 reset AM_RANGE( 0x22, 0x22 ) AM_WRITE ( adpcm_data_w ) // MSM5205 data - AM_RANGE( 0x24, 0x25 ) AM_DEVWRITE( "ym", ym2413_w ) // - AM_RANGE( 0x28, 0x28 ) AM_DEVWRITE ( "ay", ay8910_data_w ) // AY8910 - AM_RANGE( 0x2a, 0x2a ) AM_DEVWRITE ( "ay", ay8910_address_w ) // + AM_RANGE( 0x24, 0x25 ) AM_DEVWRITE( "ymsnd", ym2413_w ) // + AM_RANGE( 0x28, 0x28 ) AM_DEVWRITE ( "aysnd", ay8910_data_w ) // AY8910 + AM_RANGE( 0x2a, 0x2a ) AM_DEVWRITE ( "aysnd", ay8910_address_w ) // AM_RANGE( 0x48, 0x48 ) AM_WRITE ( dynax_extra_scrollx_w ) // screen scroll X AM_RANGE( 0x49, 0x49 ) AM_WRITE ( dynax_extra_scrolly_w ) // screen scroll Y AM_RANGE( 0x4a, 0x4a ) AM_WRITE ( yarunara_rombank_w ) // BANK ROM Select @@ -820,9 +820,9 @@ static ADDRESS_MAP_START( mcnpshnt_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x26, 0x26 ) AM_READ_PORT ( "DSW1" ) // DSW3 AM_RANGE( 0x30, 0x30 ) AM_DEVWRITE ( "msm", adpcm_reset_w ) // MSM5205 reset AM_RANGE( 0x32, 0x32 ) AM_WRITE ( adpcm_data_w ) // MSM5205 data - AM_RANGE( 0x34, 0x35 ) AM_DEVWRITE( "ym", ym2413_w ) // - AM_RANGE( 0x38, 0x38 ) AM_DEVWRITE ( "ay", ay8910_data_w ) // AY8910 - AM_RANGE( 0x3a, 0x3a ) AM_DEVWRITE ( "ay", ay8910_address_w ) // + AM_RANGE( 0x34, 0x35 ) AM_DEVWRITE( "ymsnd", ym2413_w ) // + AM_RANGE( 0x38, 0x38 ) AM_DEVWRITE ( "aysnd", ay8910_data_w ) // AY8910 + AM_RANGE( 0x3a, 0x3a ) AM_DEVWRITE ( "aysnd", ay8910_address_w ) // AM_RANGE( 0x40, 0x40 ) AM_WRITE ( dynax_blit_pen_w ) // Destination Pen AM_RANGE( 0x41, 0x41 ) AM_WRITE ( dynax_blit_dest_w ) // Destination Layer AM_RANGE( 0x42, 0x42 ) AM_WRITE ( dynax_blit_palette01_w ) // Layers Palettes @@ -848,7 +848,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sprtmtch_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE( 0x01, 0x07 ) AM_WRITE ( dynax_blitter_rev2_w ) // Blitter - AM_RANGE( 0x10, 0x11 ) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w ) // 2 x DSW + AM_RANGE( 0x10, 0x11 ) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w ) // 2 x DSW // AM_RANGE( 0x12, 0x12 ) AM_WRITE ( SMH_NOP ) // CRT Controller // AM_RANGE( 0x13, 0x13 ) AM_WRITE ( SMH_NOP ) // CRT Controller AM_RANGE( 0x20, 0x20 ) AM_READ_PORT ( "P1" ) // P1 @@ -894,7 +894,7 @@ static ADDRESS_MAP_START( mjfriday_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x63, 0x63 ) AM_READ ( hanamai_keyboard_0_r ) // P1 AM_RANGE( 0x64, 0x64 ) AM_READ_PORT ( "DSW0" ) // DSW AM_RANGE( 0x67, 0x67 ) AM_READ_PORT ( "DSW1" ) // DSW - AM_RANGE( 0x70, 0x71 ) AM_DEVWRITE ( "ym", ym2413_w ) // + AM_RANGE( 0x70, 0x71 ) AM_DEVWRITE ( "ymsnd", ym2413_w ) // // AM_RANGE( 0x80, 0x80 ) AM_WRITE ( SMH_NOP ) // IRQ ack? ADDRESS_MAP_END @@ -903,9 +903,9 @@ static ADDRESS_MAP_START( nanajign_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE( 0x00, 0x00 ) AM_DEVWRITE ( "msm", adpcm_reset_w ) // MSM5205 reset AM_RANGE( 0x02, 0x02 ) AM_WRITE ( adpcm_data_w ) // MSM5205 data - AM_RANGE( 0x04, 0x05 ) AM_DEVWRITE( "ym", ym2413_w ) // - AM_RANGE( 0x08, 0x08 ) AM_DEVWRITE ( "ay", ay8910_data_w ) // AY8910 - AM_RANGE( 0x0a, 0x0a ) AM_DEVWRITE ( "ay", ay8910_address_w ) // + AM_RANGE( 0x04, 0x05 ) AM_DEVWRITE( "ymsnd", ym2413_w ) // + AM_RANGE( 0x08, 0x08 ) AM_DEVWRITE ( "aysnd", ay8910_data_w ) // AY8910 + AM_RANGE( 0x0a, 0x0a ) AM_DEVWRITE ( "aysnd", ay8910_address_w ) // AM_RANGE( 0x10, 0x10 ) AM_WRITE ( hanamai_keyboard_w ) // keyboard row select AM_RANGE( 0x11, 0x11 ) AM_READ_PORT ( "COINS" ) // Coins AM_RANGE( 0x12, 0x12 ) AM_READ ( hanamai_keyboard_1_r ) // P2 @@ -1031,9 +1031,9 @@ static ADDRESS_MAP_START( jantouki_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE( 0x00, 0x00 ) AM_WRITE ( jantouki_sound_rombank_w ) // BANK ROM Select AM_RANGE( 0x10, 0x10 ) AM_WRITE ( jantouki_sound_vblank_ack_w ) // VBlank IRQ Ack - AM_RANGE( 0x21, 0x21 ) AM_DEVREAD ( "ay", ay8910_r ) // AY8910 - AM_RANGE( 0x22, 0x23 ) AM_DEVWRITE ( "ay", ay8910_data_address_w ) // - AM_RANGE( 0x28, 0x29 ) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) // + AM_RANGE( 0x21, 0x21 ) AM_DEVREAD ( "aysnd", ay8910_r ) // AY8910 + AM_RANGE( 0x22, 0x23 ) AM_DEVWRITE ( "aysnd", ay8910_data_address_w ) // + AM_RANGE( 0x28, 0x29 ) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) // AM_RANGE( 0x30, 0x30 ) AM_DEVWRITE ( "msm", adpcm_reset_w ) // MSM5205 reset AM_RANGE( 0x40, 0x40 ) AM_WRITE ( adpcm_data_w ) // MSM5205 data AM_RANGE( 0x50, 0x50 ) AM_READ ( jantouki_soundlatch_status_r ) // Soundlatch status @@ -1069,9 +1069,9 @@ static ADDRESS_MAP_START( mjelctrn_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE( 0x00, 0x00 ) AM_DEVWRITE ( "msm", adpcm_reset_w ) // MSM5205 reset AM_RANGE( 0x02, 0x02 ) AM_WRITE ( adpcm_data_w ) // MSM5205 data - AM_RANGE( 0x04, 0x05 ) AM_DEVWRITE( "ym", ym2413_w ) // - AM_RANGE( 0x08, 0x08 ) AM_DEVWRITE( "ay", ay8910_data_w ) // AY8910 - AM_RANGE( 0x0a, 0x0a ) AM_DEVWRITE( "ay", ay8910_address_w ) // + AM_RANGE( 0x04, 0x05 ) AM_DEVWRITE( "ymsnd", ym2413_w ) // + AM_RANGE( 0x08, 0x08 ) AM_DEVWRITE( "aysnd", ay8910_data_w ) // AY8910 + AM_RANGE( 0x0a, 0x0a ) AM_DEVWRITE( "aysnd", ay8910_address_w ) // AM_RANGE( 0x11, 0x12 ) AM_WRITE ( mjelctrn_blitter_ack_w ) //? // AM_RANGE( 0x20, 0x20 ) AM_WRITE ( SMH_NOP ) // CRT Controller // AM_RANGE( 0x21, 0x21 ) AM_WRITE ( SMH_NOP ) // CRT Controller @@ -1213,10 +1213,10 @@ static ADDRESS_MAP_START( htengoku_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x21, 0x21 ) AM_WRITE ( htengoku_coin_w ) // AM_RANGE( 0x22, 0x22 ) AM_READ ( htengoku_coin_r ) // AM_RANGE( 0x23, 0x23 ) AM_READ ( htengoku_input_r ) // - AM_RANGE( 0x40, 0x40 ) AM_DEVWRITE ( "ay", ay8910_address_w ) // AY8910 - AM_RANGE( 0x42, 0x42 ) AM_DEVREAD ( "ay", ay8910_r ) // - AM_RANGE( 0x44, 0x44 ) AM_DEVWRITE ( "ay", ay8910_data_w) // - AM_RANGE( 0x46, 0x47 ) AM_DEVWRITE( "ym", ym2413_w ) // + AM_RANGE( 0x40, 0x40 ) AM_DEVWRITE ( "aysnd", ay8910_address_w ) // AY8910 + AM_RANGE( 0x42, 0x42 ) AM_DEVREAD ( "aysnd", ay8910_r ) // + AM_RANGE( 0x44, 0x44 ) AM_DEVWRITE ( "aysnd", ay8910_data_w) // + AM_RANGE( 0x46, 0x47 ) AM_DEVWRITE( "ymsnd", ym2413_w ) // AM_RANGE( 0x80, 0x8f ) AM_DEVREADWRITE("rtc", msm6242_r, msm6242_w) // 6242RTC AM_RANGE( 0xa0, 0xa3 ) AM_WRITE ( ddenlovr_palette_base_w ) // ddenlovr mixer chip AM_RANGE( 0xa4, 0xa7 ) AM_WRITE ( ddenlovr_palette_mask_w ) @@ -1487,10 +1487,10 @@ static ADDRESS_MAP_START( tenkai_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x6000, 0x6fff ) AM_RAM AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE( 0x8000, 0xffff ) AM_READWRITE( tenkai_8000_r, tenkai_8000_w ) - AM_RANGE( 0x10000, 0x10000 ) AM_DEVREAD ( "ay", ay8910_r ) // AY8910 - AM_RANGE( 0x10008, 0x10008 ) AM_DEVWRITE( "ay", ay8910_data_w ) // - AM_RANGE( 0x10010, 0x10010 ) AM_DEVWRITE( "ay", ay8910_address_w ) // - AM_RANGE( 0x10020, 0x10021 ) AM_DEVWRITE("ym", ym2413_w ) // + AM_RANGE( 0x10000, 0x10000 ) AM_DEVREAD ( "aysnd", ay8910_r ) // AY8910 + AM_RANGE( 0x10008, 0x10008 ) AM_DEVWRITE( "aysnd", ay8910_data_w ) // + AM_RANGE( 0x10010, 0x10010 ) AM_DEVWRITE( "aysnd", ay8910_address_w ) // + AM_RANGE( 0x10020, 0x10021 ) AM_DEVWRITE("ymsnd", ym2413_w ) // AM_RANGE( 0x10040, 0x10040 ) AM_WRITE( dynax_blit_pen_w ) // Destination Pen AM_RANGE( 0x10044, 0x10044 ) AM_WRITE( tenkai_blit_dest_w ) // Destination Layer AM_RANGE( 0x10048, 0x10048 ) AM_WRITE( tenkai_blit_palette23_w ) // Layers Palettes @@ -1636,8 +1636,8 @@ static WRITE8_HANDLER( gekisha_8000_w ) case 0x8050: // CRT controller case 0x8051: return; - case 0x8070: ym2413_register_port_w(devtag_get_device(space->machine, "ym"), 0, data); return; - case 0x8071: ym2413_data_port_w (devtag_get_device(space->machine, "ym"), 0, data); return; + case 0x8070: ym2413_register_port_w(devtag_get_device(space->machine, "ymsnd"), 0, data); return; + case 0x8071: ym2413_data_port_w (devtag_get_device(space->machine, "ymsnd"), 0, data); return; case 0x8060: keyb = data; return; @@ -4208,10 +4208,10 @@ static MACHINE_DRIVER_START( hanamai ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 22000000 / 8) + MDRV_SOUND_ADD("aysnd", AY8910, 22000000 / 8) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20) - MDRV_SOUND_ADD("ym", YM2203, 22000000 / 8) + MDRV_SOUND_ADD("ymsnd", YM2203, 22000000 / 8) MDRV_SOUND_CONFIG(hanamai_ym2203_interface) MDRV_SOUND_ROUTE(0, "mono", 0.20) MDRV_SOUND_ROUTE(1, "mono", 0.20) @@ -4264,11 +4264,11 @@ static MACHINE_DRIVER_START( hnoridur ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 22000000 / 16) + MDRV_SOUND_ADD("aysnd", AY8910, 22000000 / 16) MDRV_SOUND_CONFIG(hnoridur_ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20) - MDRV_SOUND_ADD("ym", YM2413, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2413, 3579545) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_SOUND_ADD("msm", MSM5205, 384000) @@ -4309,11 +4309,11 @@ static MACHINE_DRIVER_START( hjingi ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, XTAL_22MHz / 16) + MDRV_SOUND_ADD("aysnd", AY8910, XTAL_22MHz / 16) MDRV_SOUND_CONFIG(hnoridur_ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20) - MDRV_SOUND_ADD("ym", YM2413, XTAL_3_579545MHz ) + MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz ) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_SOUND_ADD("msm", MSM5205, XTAL_384kHz ) @@ -4366,7 +4366,7 @@ static MACHINE_DRIVER_START( sprtmtch ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 22000000 / 8) + MDRV_SOUND_ADD("ymsnd", YM2203, 22000000 / 8) MDRV_SOUND_CONFIG(sprtmtch_ym2203_interface) MDRV_SOUND_ROUTE(0, "mono", 0.20) MDRV_SOUND_ROUTE(1, "mono", 0.20) @@ -4406,7 +4406,7 @@ static MACHINE_DRIVER_START( mjfriday ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2413, 24000000/6) + MDRV_SOUND_ADD("ymsnd", YM2413, 24000000/6) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END @@ -4561,10 +4561,10 @@ static MACHINE_DRIVER_START( jantouki ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 22000000 / 8) + MDRV_SOUND_ADD("aysnd", AY8910, 22000000 / 8) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20) - MDRV_SOUND_ADD("ym", YM2203, 22000000 / 8) + MDRV_SOUND_ADD("ymsnd", YM2203, 22000000 / 8) MDRV_SOUND_CONFIG(jantouki_ym2203_interface) MDRV_SOUND_ROUTE(0, "mono", 0.20) MDRV_SOUND_ROUTE(1, "mono", 0.20) @@ -4715,11 +4715,11 @@ static MACHINE_DRIVER_START( htengoku ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 20000000 / 16) + MDRV_SOUND_ADD("aysnd", AY8910, 20000000 / 16) MDRV_SOUND_CONFIG(htengoku_ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20) - MDRV_SOUND_ADD("ym", YM2413, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2413, 3579545) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) /* devices */ @@ -4776,11 +4776,11 @@ static MACHINE_DRIVER_START( tenkai ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 22000000 / 16) + MDRV_SOUND_ADD("aysnd", AY8910, 22000000 / 16) MDRV_SOUND_CONFIG(tenkai_ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20) - MDRV_SOUND_ADD("ym", YM2413, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2413, 3579545) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) /* devices */ @@ -4830,11 +4830,11 @@ static MACHINE_DRIVER_START( gekisha ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, XTAL_24MHz / 16) // ? + MDRV_SOUND_ADD("aysnd", AY8910, XTAL_24MHz / 16) // ? MDRV_SOUND_CONFIG(tenkai_ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20) - MDRV_SOUND_ADD("ym", YM2413, XTAL_24MHz / 8) // ? + MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_24MHz / 8) // ? MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/enigma2.c b/src/mame/drivers/enigma2.c index 319e103d43f..ff8f6a0878b 100644 --- a/src/mame/drivers/enigma2.c +++ b/src/mame/drivers/enigma2.c @@ -445,8 +445,8 @@ static ADDRESS_MAP_START( engima2_audio_cpu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_MIRROR(0x1000) AM_ROM AM_WRITENOP AM_RANGE(0x2000, 0x7fff) AM_NOP AM_RANGE(0x8000, 0x83ff) AM_MIRROR(0x1c00) AM_RAM - AM_RANGE(0xa000, 0xa001) AM_MIRROR(0x1ffc) AM_DEVWRITE("ay", ay8910_address_data_w) - AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x1ffc) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0xa000, 0xa001) AM_MIRROR(0x1ffc) AM_DEVWRITE("aysnd", ay8910_address_data_w) + AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x1ffc) AM_DEVREAD("aysnd", ay8910_r) AM_RANGE(0xa003, 0xa003) AM_MIRROR(0x1ffc) AM_NOP AM_RANGE(0xc000, 0xffff) AM_NOP ADDRESS_MAP_END @@ -584,7 +584,7 @@ static MACHINE_DRIVER_START( enigma2 ) /* audio hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, AY8910_CLOCK) + MDRV_SOUND_ADD("aysnd", AY8910, AY8910_CLOCK) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END @@ -614,7 +614,7 @@ static MACHINE_DRIVER_START( enigma2a ) /* audio hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, AY8910_CLOCK) + MDRV_SOUND_ADD("aysnd", AY8910, AY8910_CLOCK) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/epos.c b/src/mame/drivers/epos.c index da668c3e7a7..6966c9068f6 100644 --- a/src/mame/drivers/epos.c +++ b/src/mame/drivers/epos.c @@ -84,9 +84,9 @@ static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READ_PORT("DSW") AM_WRITE(watchdog_reset_w) AM_RANGE(0x01, 0x01) AM_READ_PORT("SYSTEM") AM_WRITE(epos_port_1_w) - AM_RANGE(0x02, 0x02) AM_READ_PORT("INPUTS") AM_DEVWRITE("ay", ay8910_data_w) + AM_RANGE(0x02, 0x02) AM_READ_PORT("INPUTS") AM_DEVWRITE("aysnd", ay8910_data_w) AM_RANGE(0x03, 0x03) AM_READ_PORT("UNK") - AM_RANGE(0x06, 0x06) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x06, 0x06) AM_DEVWRITE("aysnd", ay8910_address_w) ADDRESS_MAP_END static ADDRESS_MAP_START( dealer_io_map, ADDRESS_SPACE_IO, 8 ) @@ -387,7 +387,7 @@ static MACHINE_DRIVER_START( epos ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 11000000/4) + MDRV_SOUND_ADD("aysnd", AY8910, 11000000/4) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END @@ -415,7 +415,7 @@ static MACHINE_DRIVER_START( dealer ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 11000000/4) + MDRV_SOUND_ADD("aysnd", AY8910, 11000000/4) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/equites.c b/src/mame/drivers/equites.c index ded2f85b79b..9aa955df295 100644 --- a/src/mame/drivers/equites.c +++ b/src/mame/drivers/equites.c @@ -760,7 +760,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xc000) AM_READ(soundlatch_r) AM_RANGE(0xc080, 0xc08d) AM_DEVWRITE("msm", msm5232_w) - AM_RANGE(0xc0a0, 0xc0a1) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0xc0a0, 0xc0a1) AM_DEVWRITE("aysnd", ay8910_data_address_w) AM_RANGE(0xc0b0, 0xc0b0) AM_WRITENOP // n.c. AM_RANGE(0xc0c0, 0xc0c0) AM_WRITE(equites_cymbal_ctrl_w) AM_RANGE(0xc0d0, 0xc0d0) AM_WRITE(equites_dac_latch_w) // followed by 1 (and usually 0) on 8155 port B @@ -1180,7 +1180,7 @@ static MACHINE_DRIVER_START( common_sound ) MDRV_SOUND_ROUTE(9, "mono", 1.0) // pin 2 SOLO 16' (this actually feeds an analog section) MDRV_SOUND_ROUTE(10,"mono", 0.12) // pin 22 Noise Output (this actually feeds an analog section) - MDRV_SOUND_ADD("ay", AY8910, XTAL_6_144MHz/4) /* verified on pcb */ + MDRV_SOUND_ADD("aysnd", AY8910, XTAL_6_144MHz/4) /* verified on pcb */ MDRV_SOUND_CONFIG(equites_8910intf) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c index 0c6c80a6b9f..f5dfc421ca8 100644 --- a/src/mame/drivers/esd16.c +++ b/src/mame/drivers/esd16.c @@ -269,7 +269,7 @@ static READ8_HANDLER( esd16_sound_command_r ) static ADDRESS_MAP_START( multchmp_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE("ym", ym3812_w ) // YM3812 + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ymsnd", ym3812_w ) // YM3812 AM_RANGE(0x02, 0x02) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) // M6295 AM_RANGE(0x03, 0x03) AM_READ(esd16_sound_command_r ) // From Main CPU AM_RANGE(0x04, 0x04) AM_WRITE(SMH_NOP ) // ? $00, $30 @@ -555,7 +555,7 @@ static MACHINE_DRIVER_START( multchmp ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 4000000) + MDRV_SOUND_ADD("ymsnd", YM3812, 4000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MDRV_SOUND_ADD("oki", OKIM6295, 1056000) diff --git a/src/mame/drivers/espial.c b/src/mame/drivers/espial.c index 36738a6f7f2..cd1fd3792fb 100644 --- a/src/mame/drivers/espial.c +++ b/src/mame/drivers/espial.c @@ -126,7 +126,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( espial_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_address_data_w) ADDRESS_MAP_END @@ -321,7 +321,7 @@ static MACHINE_DRIVER_START( espial ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 1500000) + MDRV_SOUND_ADD("aysnd", AY8910, 1500000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/exedexes.c b/src/mame/drivers/exedexes.c index e2bf1237780..c63bc029fc2 100644 --- a/src/mame/drivers/exedexes.c +++ b/src/mame/drivers/exedexes.c @@ -68,7 +68,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x47ff) AM_RAM AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r) - AM_RANGE(0x8000, 0x8001) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x8000, 0x8001) AM_DEVWRITE("aysnd", ay8910_address_data_w) AM_RANGE(0x8002, 0x8002) AM_DEVWRITE("sn1", sn76496_w) AM_RANGE(0x8003, 0x8003) AM_DEVWRITE("sn2", sn76496_w) ADDRESS_MAP_END @@ -240,7 +240,7 @@ static MACHINE_DRIVER_START( exedexes ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 1500000) + MDRV_SOUND_ADD("aysnd", AY8910, 1500000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) MDRV_SOUND_ADD("sn1", SN76489, 3000000) diff --git a/src/mame/drivers/exterm.c b/src/mame/drivers/exterm.c index 69fd9b9333a..061f964361f 100644 --- a/src/mame/drivers/exterm.c +++ b/src/mame/drivers/exterm.c @@ -342,7 +342,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_master_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x1800) AM_RAM - AM_RANGE(0x4000, 0x5fff) AM_DEVWRITE("ym", ym2151_data_latch_w) + AM_RANGE(0x4000, 0x5fff) AM_DEVWRITE("ymsnd", ym2151_data_latch_w) AM_RANGE(0x6000, 0x67ff) AM_WRITE(sound_nmi_rate_w) AM_RANGE(0x6800, 0x6fff) AM_READ(sound_master_latch_r) AM_RANGE(0x7000, 0x77ff) AM_READ(sound_nmi_to_slave_r) @@ -507,7 +507,7 @@ static MACHINE_DRIVER_START( exterm ) MDRV_SOUND_ADD("dac", DAC, 0) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) - MDRV_SOUND_ADD("ym", YM2151, 4000000) + MDRV_SOUND_ADD("ymsnd", YM2151, 4000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/exzisus.c b/src/mame/drivers/exzisus.c index 113b50e4573..3aeb054241e 100644 --- a/src/mame/drivers/exzisus.c +++ b/src/mame/drivers/exzisus.c @@ -204,7 +204,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x8fff) AM_RAM - AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xa000, 0xa000) AM_READNOP AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xa001, 0xa001) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w) ADDRESS_MAP_END @@ -330,7 +330,7 @@ static MACHINE_DRIVER_START( exzisus ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 4000000) + MDRV_SOUND_ADD("ymsnd", YM2151, 4000000) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "mono", 0.50) MDRV_SOUND_ROUTE(1, "mono", 0.50) diff --git a/src/mame/drivers/f-32.c b/src/mame/drivers/f-32.c index bd81ad460ec..1295652937b 100644 --- a/src/mame/drivers/f-32.c +++ b/src/mame/drivers/f-32.c @@ -80,13 +80,13 @@ static READ32_HANDLER( f32_input_port_1_r ) static ADDRESS_MAP_START( mosaicf2_io, ADDRESS_SPACE_IO, 32 ) AM_RANGE(0x4000, 0x4003) AM_DEVREAD8("oki", okim6295_r, 0x000000ff) - AM_RANGE(0x4810, 0x4813) AM_DEVREAD8("ym", ym2151_status_port_r, 0x000000ff) + AM_RANGE(0x4810, 0x4813) AM_DEVREAD8("ymsnd", ym2151_status_port_r, 0x000000ff) AM_RANGE(0x5000, 0x5003) AM_READ_PORT("P1") AM_RANGE(0x5200, 0x5203) AM_READ(f32_input_port_1_r) AM_RANGE(0x5400, 0x5403) AM_READ(eeprom_r) AM_RANGE(0x6000, 0x6003) AM_DEVWRITE8("oki", okim6295_w, 0x000000ff) - AM_RANGE(0x6800, 0x6803) AM_DEVWRITE8("ym", ym2151_data_port_w, 0x000000ff) - AM_RANGE(0x6810, 0x6813) AM_DEVWRITE8("ym", ym2151_register_port_w, 0x000000ff) + AM_RANGE(0x6800, 0x6803) AM_DEVWRITE8("ymsnd", ym2151_data_port_w, 0x000000ff) + AM_RANGE(0x6810, 0x6813) AM_DEVWRITE8("ymsnd", ym2151_register_port_w, 0x000000ff) AM_RANGE(0x7000, 0x7003) AM_WRITE(eeprom_clock_line_w) AM_RANGE(0x7200, 0x7203) AM_WRITE(eeprom_cs_line_w) AM_RANGE(0x7400, 0x7403) AM_WRITE(eeprom_bit_w) @@ -148,7 +148,7 @@ static MACHINE_DRIVER_START( mosaicf2 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 14318180/4) + MDRV_SOUND_ADD("ymsnd", YM2151, 14318180/4) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/f1gp.c b/src/mame/drivers/f1gp.c index f12d8d2a247..f8dba33bb9d 100644 --- a/src/mame/drivers/f1gp.c +++ b/src/mame/drivers/f1gp.c @@ -156,7 +156,7 @@ static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x00) AM_WRITE(f1gp_sh_bankswitch_w) // f1gp AM_RANGE(0x0c, 0x0c) AM_WRITE(f1gp_sh_bankswitch_w) // f1gp2 AM_RANGE(0x14, 0x14) AM_READWRITE(soundlatch_r, pending_command_clear_w) - AM_RANGE(0x18, 0x1b) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) + AM_RANGE(0x18, 0x1b) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) ADDRESS_MAP_END static WRITE16_HANDLER( f1gpb_misc_w ) @@ -455,7 +455,7 @@ static MACHINE_DRIVER_START( f1gp ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, XTAL_8MHz) + MDRV_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -563,7 +563,7 @@ ROM_START( f1gp ) ROM_REGION( 0x100000, "ym.deltat", 0 ) /* sound samples */ ROM_LOAD( "rom14-a.09", 0x000000, 0x100000, CRC(b4c1ac31) SHA1(acab2e1b5ce4ca3a5c4734562481b54db4b46995) ) - ROM_REGION( 0x100000, "ym", 0 ) /* sound samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* sound samples */ ROM_LOAD( "rom17-a.08", 0x000000, 0x100000, CRC(ea70303d) SHA1(8de1a0e6d47cd80a622663c1745a1da54cd0ea05) ) ROM_END @@ -659,7 +659,7 @@ ROM_START( f1gp2 ) ROM_REGION( 0x080000, "ym.deltat", 0 ) /* sound samples */ ROM_LOAD( "rom4", 0x000000, 0x080000, CRC(c2d3d7ad) SHA1(3178096741583cfef1ca8f53e6efa0a59e1d5cb6) ) - ROM_REGION( 0x100000, "ym", 0 ) /* sound samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* sound samples */ ROM_LOAD( "rom3", 0x000000, 0x100000, CRC(7f8f066f) SHA1(5e051d5feb327ac818e9c7f7ac721dada3a102b6) ) ROM_END diff --git a/src/mame/drivers/fantland.c b/src/mame/drivers/fantland.c index e7a4cbcef0b..9d2263459bd 100644 --- a/src/mame/drivers/fantland.c +++ b/src/mame/drivers/fantland.c @@ -282,13 +282,13 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( fantland_sound_iomap, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x0080, 0x0080 ) AM_READ( soundlatch_r ) - AM_RANGE( 0x0100, 0x0101 ) AM_DEVREADWRITE( "ym", ym2151_r, ym2151_w ) + AM_RANGE( 0x0100, 0x0101 ) AM_DEVREADWRITE( "ymsnd", ym2151_r, ym2151_w ) AM_RANGE( 0x0180, 0x0180 ) AM_DEVWRITE( "dac", dac_w ) ADDRESS_MAP_END static ADDRESS_MAP_START( galaxygn_sound_iomap, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x0080, 0x0080 ) AM_READ( soundlatch_r ) - AM_RANGE( 0x0100, 0x0101 ) AM_DEVREADWRITE( "ym", ym2151_r, ym2151_w ) + AM_RANGE( 0x0100, 0x0101 ) AM_DEVREADWRITE( "ymsnd", ym2151_r, ym2151_w ) ADDRESS_MAP_END @@ -399,7 +399,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( wheelrun_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym", ym3526_r, ym3526_w ) + AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ymsnd", ym3526_r, ym3526_w ) AM_RANGE(0xb000, 0xb000) AM_WRITE( SMH_NOP ) // on a car crash / hit AM_RANGE(0xc000, 0xc000) AM_WRITE( SMH_NOP ) // "" @@ -853,7 +853,7 @@ static MACHINE_DRIVER_START( fantland ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 3000000) + MDRV_SOUND_ADD("ymsnd", YM2151, 3000000) MDRV_SOUND_ROUTE(0, "mono", 0.35) MDRV_SOUND_ROUTE(1, "mono", 0.35) @@ -901,7 +901,7 @@ static MACHINE_DRIVER_START( galaxygn ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 3000000) + MDRV_SOUND_ADD("ymsnd", YM2151, 3000000) MDRV_SOUND_CONFIG(galaxygn_ym2151_interface) MDRV_SOUND_ROUTE(0, "mono", 1.0) MDRV_SOUND_ROUTE(1, "mono", 1.0) @@ -1013,7 +1013,7 @@ static MACHINE_DRIVER_START( wheelrun ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3526, XTAL_14MHz/4) + MDRV_SOUND_ADD("ymsnd", YM3526, XTAL_14MHz/4) MDRV_SOUND_CONFIG(wheelrun_ym3526_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/finalizr.c b/src/mame/drivers/finalizr.c index 2d983250d8b..1cee083f61e 100644 --- a/src/mame/drivers/finalizr.c +++ b/src/mame/drivers/finalizr.c @@ -117,7 +117,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0813, 0x0813) AM_READ_PORT("DSW1") AM_RANGE(0x0818, 0x0818) AM_WRITE(watchdog_reset_w) AM_RANGE(0x0819, 0x0819) AM_WRITE(finalizr_coin_w) - AM_RANGE(0x081a, 0x081a) AM_DEVWRITE("sn", sn76496_w) /* This address triggers the SN chip to read the data port. */ + AM_RANGE(0x081a, 0x081a) AM_DEVWRITE("snsnd", sn76496_w) /* This address triggers the SN chip to read the data port. */ AM_RANGE(0x081b, 0x081b) AM_WRITENOP /* Loads the snd command into the snd latch */ AM_RANGE(0x081c, 0x081c) AM_WRITE(finalizr_i8039_irq_w) /* custom sound chip */ AM_RANGE(0x081d, 0x081d) AM_WRITE(soundlatch_w) /* custom sound chip */ @@ -276,7 +276,7 @@ static MACHINE_DRIVER_START( finalizr ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("sn", SN76489A, XTAL_18_432MHz/12) + MDRV_SOUND_ADD("snsnd", SN76489A, XTAL_18_432MHz/12) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) MDRV_SOUND_ADD("dac", DAC, 0) diff --git a/src/mame/drivers/firetrap.c b/src/mame/drivers/firetrap.c index e76a06342d3..6dac8bb162a 100644 --- a/src/mame/drivers/firetrap.c +++ b/src/mame/drivers/firetrap.c @@ -299,7 +299,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM - AM_RANGE(0x1000, 0x1001) AM_DEVWRITE("ym", ym3526_w) + AM_RANGE(0x1000, 0x1001) AM_DEVWRITE("ymsnd", ym3526_w) AM_RANGE(0x2000, 0x2000) AM_WRITE(firetrap_adpcm_data_w) /* ADPCM data for the MSM5205 chip */ AM_RANGE(0x2400, 0x2400) AM_WRITE(firetrap_sound_2400_w) AM_RANGE(0x2800, 0x2800) AM_WRITE(firetrap_sound_bankselect_w) @@ -588,7 +588,7 @@ static MACHINE_DRIVER_START( firetrap ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3526, 3000000) + MDRV_SOUND_ADD("ymsnd", YM3526, 3000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_SOUND_ADD("msm", MSM5205, 384000) @@ -626,7 +626,7 @@ static MACHINE_DRIVER_START( firetpbl ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3526, 3000000) + MDRV_SOUND_ADD("ymsnd", YM3526, 3000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_SOUND_ADD("msm", MSM5205, 384000) diff --git a/src/mame/drivers/flkatck.c b/src/mame/drivers/flkatck.c index 1ff1755102e..2df0b88c163 100644 --- a/src/mame/drivers/flkatck.c +++ b/src/mame/drivers/flkatck.c @@ -126,7 +126,7 @@ static ADDRESS_MAP_START( flkatck_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9006, 0x9006) AM_WRITENOP /* ??? */ AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) /* soundlatch_r */ AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE("konami", k007232_r, k007232_w) /* 007232 registers */ - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) /* YM2151 */ + AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) /* YM2151 */ ADDRESS_MAP_END @@ -237,7 +237,7 @@ static MACHINE_DRIVER_START( flkatck ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/flstory.c b/src/mame/drivers/flstory.c index a2b52ee6061..f2b95e2c948 100644 --- a/src/mame/drivers/flstory.c +++ b/src/mame/drivers/flstory.c @@ -233,7 +233,7 @@ static WRITE8_DEVICE_HANDLER( sound_control_3_w ) /* unknown */ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xc7ff) AM_RAM - AM_RANGE(0xc800, 0xc801) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0xc800, 0xc801) AM_DEVWRITE("aysnd", ay8910_address_data_w) AM_RANGE(0xca00, 0xca0d) AM_DEVWRITE("msm", msm5232_w) AM_RANGE(0xcc00, 0xcc00) AM_DEVWRITE("msm", sound_control_0_w) AM_RANGE(0xce00, 0xce00) AM_DEVWRITE("msm", sound_control_1_w) @@ -643,7 +643,7 @@ static const ay8910_interface ay8910_config = AY8910_DEFAULT_LOADS, DEVCB_NULL, DEVCB_NULL, - DEVCB_DEVICE_HANDLER("ay", sound_control_2_w), + DEVCB_DEVICE_HANDLER("aysnd", sound_control_2_w), DEVCB_HANDLER(sound_control_3_w) }; @@ -689,7 +689,7 @@ static MACHINE_DRIVER_START( flstory ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, XTAL_8MHz/4) /* verified on pcb */ + MDRV_SOUND_ADD("aysnd", AY8910, XTAL_8MHz/4) /* verified on pcb */ MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) @@ -746,7 +746,7 @@ static MACHINE_DRIVER_START( onna34ro ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 8000000/4) + MDRV_SOUND_ADD("aysnd", AY8910, 8000000/4) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) @@ -803,7 +803,7 @@ static MACHINE_DRIVER_START( victnine ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 8000000/4) + MDRV_SOUND_ADD("aysnd", AY8910, 8000000/4) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) diff --git a/src/mame/drivers/forte2.c b/src/mame/drivers/forte2.c index 00d66e27d55..7e2989bfd1e 100644 --- a/src/mame/drivers/forte2.c +++ b/src/mame/drivers/forte2.c @@ -37,8 +37,8 @@ static ADDRESS_MAP_START( io_mem, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x98, 0x98) AM_READWRITE( TMS9928A_vram_r, TMS9928A_vram_w ) AM_RANGE(0x99, 0x99) AM_READWRITE( TMS9928A_register_r, TMS9928A_register_w ) - AM_RANGE(0xa0, 0xa1) AM_DEVWRITE("ay", ay8910_address_data_w) - AM_RANGE(0xa2, 0xa2) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0xa0, 0xa1) AM_DEVWRITE("aysnd", ay8910_address_data_w) + AM_RANGE(0xa2, 0xa2) AM_DEVREAD("aysnd", ay8910_r) //Ports a8-ab are originally for communicating with the i8255 PPI on MSX. //( http://map.tni.nl/resources/msx_io_ports.php#ppi ) @@ -137,7 +137,7 @@ static MACHINE_DRIVER_START( pesadelo ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, (float)XTAL_3_579545MHz/2) + MDRV_SOUND_ADD("aysnd", AY8910, (float)XTAL_3_579545MHz/2) MDRV_SOUND_CONFIG(forte2_ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/fortecar.c b/src/mame/drivers/fortecar.c index 9e7c9eacbf9..b1dd9b03936 100644 --- a/src/mame/drivers/fortecar.c +++ b/src/mame/drivers/fortecar.c @@ -124,8 +124,8 @@ static ADDRESS_MAP_START( fortecar_ports, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x20, 0x20) AM_DEVWRITE("crtc", mc6845_address_w) AM_RANGE(0x21, 0x21) AM_DEVWRITE("crtc", mc6845_register_w) - AM_RANGE(0x40, 0x40) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x40, 0x41) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x40, 0x40) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x40, 0x41) AM_DEVWRITE("aysnd", ay8910_address_data_w) AM_RANGE(0x60, 0x63) AM_DEVREADWRITE("fcppi0", ppi8255_r, ppi8255_w)//M5L8255AP // AM_RANGE(0x80, 0x81) //8251A UART AM_RANGE(0xa0, 0xa0) AM_READ_PORT("IN0") //written too,multiplexer? @@ -335,7 +335,7 @@ static MACHINE_DRIVER_START( fortecar ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 1500000) + MDRV_SOUND_ADD("aysnd", AY8910, 1500000) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c index fc81df717ae..8644f11beaf 100644 --- a/src/mame/drivers/fromanc2.c +++ b/src/mame/drivers/fromanc2.c @@ -389,7 +389,7 @@ static ADDRESS_MAP_START( fromanc2_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READWRITE(soundlatch_r, SMH_NOP) // snd cmd (1P) / ? AM_RANGE(0x04, 0x04) AM_READ(soundlatch2_r) // snd cmd (2P) - AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) + AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) AM_RANGE(0x0c, 0x0c) AM_READ(fromanc2_sndcpu_nmi_clr) ADDRESS_MAP_END @@ -610,7 +610,7 @@ static MACHINE_DRIVER_START( fromanc2 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "mono", 0.50) MDRV_SOUND_ROUTE(1, "mono", 0.75) @@ -661,7 +661,7 @@ static MACHINE_DRIVER_START( fromancr ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "mono", 0.50) MDRV_SOUND_ROUTE(1, "mono", 0.75) @@ -709,7 +709,7 @@ static MACHINE_DRIVER_START( fromanc4 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "mono", 0.50) MDRV_SOUND_ROUTE(1, "mono", 0.75) @@ -747,7 +747,7 @@ ROM_START( fromanc2 ) ROM_REGION( 0x0100000, "gfx4", 0 ) // LAYER1 DATA ROM_LOAD( "40-52.bin", 0x000000, 0x100000, CRC(dbb5062d) SHA1(d1be4d675b36ea6ebd602d5c990adcf3c029485e) ) - ROM_REGION( 0x0400000, "ym", 0 ) // SOUND DATA + ROM_REGION( 0x0400000, "ymsnd", 0 ) // SOUND DATA ROM_LOAD( "ic96.bin", 0x000000, 0x200000, CRC(2f1b394c) SHA1(d95dd8231d7873328f2253eaa27374c79d87e21b) ) ROM_LOAD( "ic97.bin", 0x200000, 0x200000, CRC(1d1377fc) SHA1(0dae5dfcbcf4ed6662522e9404fcac0236dce04d) ) ROM_END @@ -780,7 +780,7 @@ ROM_START( fromancr ) ROM_REGION( 0x0200000, "gfx3", 0 ) // TEXT DATA ROM_LOAD( "ic28-29.bin", 0x0000000, 0x200000, CRC(f5e262aa) SHA1(35464d059f4814832bf5cb3bede4b8a600bc8a84) ) - ROM_REGION( 0x0400000, "ym", 0 ) // SOUND DATA + ROM_REGION( 0x0400000, "ymsnd", 0 ) // SOUND DATA ROM_LOAD( "ic81.bin", 0x0000000, 0x200000, CRC(8ab6e343) SHA1(5ae28e6944edb0a4b8d0071ce48e348b6e927ca9) ) ROM_LOAD( "ic82.bin", 0x0200000, 0x200000, CRC(f57daaf8) SHA1(720eadf771c89d8749317b632bbc5e8ff1f6f520) ) ROM_END @@ -816,7 +816,7 @@ ROM_START( fromanc4 ) ROM_REGION( 0x0400000, "gfx3", 0 ) // TEXT DATA ROM_LOAD16_WORD_SWAP( "em33-a00.37", 0x0000000, 0x400000, CRC(a3bd4a34) SHA1(78bd5298e83f89c738c18105c8bc809fa6a35206) ) - ROM_REGION( 0x0800000, "ym", 0 ) // SOUND DATA + ROM_REGION( 0x0800000, "ymsnd", 0 ) // SOUND DATA ROM_LOAD16_WORD_SWAP( "em33-p00.88", 0x0000000, 0x400000, CRC(1c6418d2) SHA1(c66d6b35f342fcbeca5414dbb2ac038d8a2ec2c4) ) ROM_LOAD16_WORD_SWAP( "em33-p01.89", 0x0400000, 0x400000, CRC(615b4e6e) SHA1(a031773ed27de2263e32422a3d11118bdcb2c197) ) ROM_END diff --git a/src/mame/drivers/fromance.c b/src/mame/drivers/fromance.c index 293e9eabc0b..6642563bb04 100644 --- a/src/mame/drivers/fromance.c +++ b/src/mame/drivers/fromance.c @@ -302,7 +302,7 @@ static ADDRESS_MAP_START( nekkyoku_sub_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xe6, 0xe6) AM_READWRITE(fromance_commanddata_r, fromance_busycheck_sub_w) AM_RANGE(0xe7, 0xe7) AM_DEVWRITE("msm", fromance_adpcm_reset_w) AM_RANGE(0xe8, 0xe8) AM_WRITE(fromance_adpcm_w) - AM_RANGE(0xe9, 0xea) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0xe9, 0xea) AM_DEVWRITE("aysnd", ay8910_data_address_w) ADDRESS_MAP_END static ADDRESS_MAP_START( idolmj_sub_io_map, ADDRESS_SPACE_IO, 8 ) @@ -316,7 +316,7 @@ static ADDRESS_MAP_START( idolmj_sub_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x26, 0x26) AM_READWRITE(fromance_commanddata_r, fromance_busycheck_sub_w) AM_RANGE(0x27, 0x27) AM_DEVWRITE("msm", fromance_adpcm_reset_w) AM_RANGE(0x28, 0x28) AM_WRITE(fromance_adpcm_w) - AM_RANGE(0x29, 0x2a) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x29, 0x2a) AM_DEVWRITE("aysnd", ay8910_data_address_w) ADDRESS_MAP_END static ADDRESS_MAP_START( fromance_sub_io_map, ADDRESS_SPACE_IO, 8 ) @@ -330,7 +330,7 @@ static ADDRESS_MAP_START( fromance_sub_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x26, 0x26) AM_READWRITE(fromance_commanddata_r, fromance_busycheck_sub_w) AM_RANGE(0x27, 0x27) AM_DEVWRITE("msm", fromance_adpcm_reset_w) AM_RANGE(0x28, 0x28) AM_WRITE(fromance_adpcm_w) - AM_RANGE(0x2a, 0x2b) AM_DEVWRITE("ym", ym2413_w) + AM_RANGE(0x2a, 0x2b) AM_DEVWRITE("ymsnd", ym2413_w) ADDRESS_MAP_END @@ -1002,7 +1002,7 @@ static MACHINE_DRIVER_START( nekkyoku ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 12000000/6) + MDRV_SOUND_ADD("aysnd", AY8910, 12000000/6) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) MDRV_SOUND_ADD("msm", MSM5205, 384000) @@ -1040,7 +1040,7 @@ static MACHINE_DRIVER_START( idolmj ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 12000000/6) + MDRV_SOUND_ADD("aysnd", AY8910, 12000000/6) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) MDRV_SOUND_ADD("msm", MSM5205, 384000) @@ -1078,7 +1078,7 @@ static MACHINE_DRIVER_START( fromance ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2413, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2413, 3579545) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90) MDRV_SOUND_ADD("msm", MSM5205, 384000) diff --git a/src/mame/drivers/funkybee.c b/src/mame/drivers/funkybee.c index edb45fa351d..f1bab1ac193 100644 --- a/src/mame/drivers/funkybee.c +++ b/src/mame/drivers/funkybee.c @@ -115,8 +115,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_address_data_w) - AM_RANGE(0x02, 0x02) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_address_data_w) + AM_RANGE(0x02, 0x02) AM_DEVREAD("aysnd", ay8910_r) ADDRESS_MAP_END @@ -314,7 +314,7 @@ static MACHINE_DRIVER_START( funkybee ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 1500000) + MDRV_SOUND_ADD("aysnd", AY8910, 1500000) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/funkyjet.c b/src/mame/drivers/funkyjet.c index 8b68107d84f..c5dcfa1c4c1 100644 --- a/src/mame/drivers/funkyjet.c +++ b/src/mame/drivers/funkyjet.c @@ -123,7 +123,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x000000, 0x00ffff) AM_ROM AM_RANGE(0x100000, 0x100001) AM_NOP /* YM2203 - this board doesn't have one */ - AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0x130000, 0x130001) AM_NOP /* This board only has 1 oki chip */ AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) @@ -314,7 +314,7 @@ static MACHINE_DRIVER_START( funkyjet ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 32220000/9) + MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.45) MDRV_SOUND_ROUTE(1, "rspeaker", 0.45) diff --git a/src/mame/drivers/gaelco.c b/src/mame/drivers/gaelco.c index f89fd5dd09b..402f6529770 100644 --- a/src/mame/drivers/gaelco.c +++ b/src/mame/drivers/gaelco.c @@ -161,7 +161,7 @@ static ADDRESS_MAP_START( bigkarnk_snd_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM /* RAM */ AM_RANGE(0x0800, 0x0801) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) /* OKI6295 */ // AM_RANGE(0x0900, 0x0900) AM_WRITENOP /* enable sound output? */ - AM_RANGE(0x0a00, 0x0a01) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) /* YM3812 */ + AM_RANGE(0x0a00, 0x0a01) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w) /* YM3812 */ AM_RANGE(0x0b00, 0x0b00) AM_READ(soundlatch_r) /* Sound latch */ AM_RANGE(0x0c00, 0xffff) AM_ROM /* ROM */ ADDRESS_MAP_END @@ -236,7 +236,7 @@ static MACHINE_DRIVER_START( bigkarnk ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 3580000) + MDRV_SOUND_ADD("ymsnd", YM3812, 3580000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_SOUND_ADD("oki", OKIM6295, 1056000) diff --git a/src/mame/drivers/gaiden.c b/src/mame/drivers/gaiden.c index a6eaf788bac..5868b1abf35 100644 --- a/src/mame/drivers/gaiden.c +++ b/src/mame/drivers/gaiden.c @@ -434,7 +434,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( drgnbowl_sound_port_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x80, 0x80) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xc0, 0xc0) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -932,7 +932,7 @@ static MACHINE_DRIVER_START( drgnbowl ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 4000000) + MDRV_SOUND_ADD("ymsnd", YM2151, 4000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MDRV_SOUND_ADD("oki", OKIM6295, 1000000) diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c index b6f67637c45..bbe469529fd 100644 --- a/src/mame/drivers/galaxian.c +++ b/src/mame/drivers/galaxian.c @@ -884,7 +884,7 @@ static WRITE8_HANDLER( zigzag_ay8910_w ) /* bit 0 = WRITE */ /* bit 1 = C/D */ if ((offset & 1) != 0) - ay8910_data_address_w(devtag_get_device(space->machine, "ay"), offset >> 1, zigzag_ay8910_latch); + ay8910_data_address_w(devtag_get_device(space->machine, "aysnd"), offset >> 1, zigzag_ay8910_latch); break; case 0x100: @@ -976,21 +976,21 @@ static WRITE8_HANDLER( mshuttle_ay8910_cs_w ) static WRITE8_HANDLER( mshuttle_ay8910_control_w ) { if (!mshuttle_ay8910_cs) - ay8910_address_w(devtag_get_device(space->machine, "ay"), offset, data); + ay8910_address_w(devtag_get_device(space->machine, "aysnd"), offset, data); } static WRITE8_HANDLER( mshuttle_ay8910_data_w ) { if (!mshuttle_ay8910_cs) - ay8910_data_w(devtag_get_device(space->machine, "ay"), offset, data); + ay8910_data_w(devtag_get_device(space->machine, "aysnd"), offset, data); } static READ8_HANDLER( mshuttle_ay8910_data_r ) { if (!mshuttle_ay8910_cs) - return ay8910_r(devtag_get_device(space->machine, "ay"), offset); + return ay8910_r(devtag_get_device(space->machine, "aysnd"), offset); return 0xff; } @@ -1387,8 +1387,8 @@ static ADDRESS_MAP_START( jumpbug_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4000, 0x47ff) AM_RAM AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0x0400) AM_RAM_WRITE(galaxian_videoram_w) AM_BASE(&videoram) AM_RANGE(0x5000, 0x50ff) AM_MIRROR(0x0700) AM_RAM_WRITE(galaxian_objram_w) AM_BASE(&spriteram) - AM_RANGE(0x5800, 0x5800) AM_MIRROR(0x00ff) AM_DEVWRITE("ay", ay8910_data_w) - AM_RANGE(0x5900, 0x5900) AM_MIRROR(0x00ff) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x5800, 0x5800) AM_MIRROR(0x00ff) AM_DEVWRITE("aysnd", ay8910_data_w) + AM_RANGE(0x5900, 0x5900) AM_MIRROR(0x00ff) AM_DEVWRITE("aysnd", ay8910_address_w) AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x07ff) AM_READ_PORT("IN0") AM_RANGE(0x6002, 0x6006) AM_MIRROR(0x07f8) AM_WRITE(galaxian_gfxbank_w) AM_RANGE(0x6800, 0x6800) AM_MIRROR(0x07ff) AM_READ_PORT("IN1") @@ -1519,8 +1519,8 @@ static ADDRESS_MAP_START( checkman_sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x03, 0x03) AM_READ(soundlatch_r) - AM_RANGE(0x04, 0x05) AM_DEVWRITE("ay", ay8910_address_data_w) - AM_RANGE(0x06, 0x06) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x04, 0x05) AM_DEVWRITE("aysnd", ay8910_address_data_w) + AM_RANGE(0x06, 0x06) AM_DEVREAD("aysnd", ay8910_r) ADDRESS_MAP_END @@ -1529,8 +1529,8 @@ static ADDRESS_MAP_START( checkmaj_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x0fff) AM_ROM AM_RANGE(0x8000, 0x83ff) AM_RAM - AM_RANGE(0xa000, 0xa001) AM_DEVWRITE("ay", ay8910_address_data_w) - AM_RANGE(0xa002, 0xa002) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0xa000, 0xa001) AM_DEVWRITE("aysnd", ay8910_address_data_w) + AM_RANGE(0xa002, 0xa002) AM_DEVREAD("aysnd", ay8910_r) ADDRESS_MAP_END @@ -1913,7 +1913,7 @@ static MACHINE_DRIVER_START( zigzag ) MDRV_CPU_PROGRAM_MAP(galaxian_map_base) /* no discrete sound */ /* sound hardware */ - MDRV_SOUND_ADD("ay", AY8910, 1789750) + MDRV_SOUND_ADD("aysnd", AY8910, 1789750) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END @@ -1950,7 +1950,7 @@ static MACHINE_DRIVER_START( jumpbug ) MDRV_CPU_PROGRAM_MAP(jumpbug_map) /* sound hardware */ - MDRV_SOUND_ADD("ay", AY8910, 1789750) + MDRV_SOUND_ADD("aysnd", AY8910, 1789750) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END @@ -1965,7 +1965,7 @@ static MACHINE_DRIVER_START( checkman ) MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* NMIs are triggered by the main CPU */ /* sound hardware */ - MDRV_SOUND_ADD("ay", AY8910, 1789750) + MDRV_SOUND_ADD("aysnd", AY8910, 1789750) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END @@ -1984,7 +1984,7 @@ static MACHINE_DRIVER_START( checkmaj ) MDRV_TIMER_ADD_SCANLINE("irq0", checkmaj_irq0_gen, "screen", 0, 8) /* sound hardware */ - MDRV_SOUND_ADD("ay", AY8910, 1620000) + MDRV_SOUND_ADD("aysnd", AY8910, 1620000) MDRV_SOUND_CONFIG(checkmaj_ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2) MACHINE_DRIVER_END @@ -1999,7 +1999,7 @@ static MACHINE_DRIVER_START( mshuttle ) MDRV_CPU_IO_MAP(mshuttle_portmap) /* sound hardware */ - MDRV_SOUND_ADD("ay", AY8910, GALAXIAN_PIXEL_CLOCK/3/4) + MDRV_SOUND_ADD("aysnd", AY8910, GALAXIAN_PIXEL_CLOCK/3/4) MDRV_SOUND_CONFIG(cclimber_ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) diff --git a/src/mame/drivers/galaxold.c b/src/mame/drivers/galaxold.c index efc410aa135..f3cfd549c65 100644 --- a/src/mame/drivers/galaxold.c +++ b/src/mame/drivers/galaxold.c @@ -635,7 +635,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ozon1_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_data_address_w) ADDRESS_MAP_END static ADDRESS_MAP_START( drivfrcg, ADDRESS_SPACE_PROGRAM, 8 ) @@ -686,8 +686,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bongo_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_address_data_w) - AM_RANGE(0x02, 0x02) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_address_data_w) + AM_RANGE(0x02, 0x02) AM_DEVREAD("aysnd", ay8910_r) ADDRESS_MAP_END @@ -875,7 +875,7 @@ static READ8_HANDLER( hexpoola_data_port_r ) static ADDRESS_MAP_START( hexpoola_io, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x00) AM_READNOP AM_RANGE(0x20, 0x3f) AM_WRITE(racknrol_tiles_bank_w) AM_BASE(&racknrol_tiles_bank) - AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READ(hexpoola_data_port_r) AM_DEVWRITE("sn", sn76496_w) + AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READ(hexpoola_data_port_r) AM_DEVWRITE("snsnd", sn76496_w) AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ_PORT("SENSE") ADDRESS_MAP_END @@ -2258,7 +2258,7 @@ static MACHINE_DRIVER_START( ozon1 ) MDRV_PALETTE_LENGTH(32) MDRV_VIDEO_START(galaxold_plain) - MDRV_SOUND_ADD("ay", AY8910, PIXEL_CLOCK/4) + MDRV_SOUND_ADD("aysnd", AY8910, PIXEL_CLOCK/4) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END @@ -2302,7 +2302,7 @@ static MACHINE_DRIVER_START( bongo ) MDRV_VIDEO_START(bongo) MDRV_VIDEO_UPDATE(galaxold) - MDRV_SOUND_ADD("ay", AY8910, PIXEL_CLOCK/4) + MDRV_SOUND_ADD("aysnd", AY8910, PIXEL_CLOCK/4) MDRV_SOUND_CONFIG(bongo_ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END @@ -2447,7 +2447,7 @@ static MACHINE_DRIVER_START( hexpoola ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("sn", SN76496, PIXEL_CLOCK/2) + MDRV_SOUND_ADD("snsnd", SN76496, PIXEL_CLOCK/2) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/galivan.c b/src/mame/drivers/galivan.c index 4df2f32dc23..9ac96ff3227 100644 --- a/src/mame/drivers/galivan.c +++ b/src/mame/drivers/galivan.c @@ -162,7 +162,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE("ym", ym3526_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ymsnd", ym3526_w) AM_RANGE(0x02, 0x02) AM_DEVWRITE("dac1", dac_w) AM_RANGE(0x03, 0x03) AM_DEVWRITE("dac2", dac_w) /* AM_RANGE(0x04, 0x04) AM_READNOP value read and *discarded* */ @@ -467,7 +467,7 @@ static MACHINE_DRIVER_START( galivan ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3526, 8000000/2) + MDRV_SOUND_ADD("ymsnd", YM3526, 8000000/2) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_SOUND_ADD("dac1", DAC, 0) @@ -509,7 +509,7 @@ static MACHINE_DRIVER_START( ninjemak ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3526, 8000000/2) + MDRV_SOUND_ADD("ymsnd", YM3526, 8000000/2) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_SOUND_ADD("dac1", DAC, 0) diff --git a/src/mame/drivers/galspnbl.c b/src/mame/drivers/galspnbl.c index 9fe161452a4..5d235ba9350 100644 --- a/src/mame/drivers/galspnbl.c +++ b/src/mame/drivers/galspnbl.c @@ -72,7 +72,7 @@ static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_ROM AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_RANGE(0xf800, 0xf800) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) - AM_RANGE(0xf810, 0xf811) AM_DEVWRITE("ym", ym3812_w) + AM_RANGE(0xf810, 0xf811) AM_DEVWRITE("ymsnd", ym3812_w) AM_RANGE(0xfc00, 0xfc00) AM_READWRITE(SMH_NOP, SMH_NOP) /* irq ack ?? */ AM_RANGE(0xfc20, 0xfc20) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -234,7 +234,7 @@ static MACHINE_DRIVER_START( galspnbl ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 3579545) + MDRV_SOUND_ADD("ymsnd", YM3812, 3579545) MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/drivers/gameplan.c b/src/mame/drivers/gameplan.c index 64b489c1b83..7db50b74db4 100644 --- a/src/mame/drivers/gameplan.c +++ b/src/mame/drivers/gameplan.c @@ -261,9 +261,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( gameplan_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x1780) AM_RAM /* 6532 internal RAM */ AM_RANGE(0x0800, 0x081f) AM_MIRROR(0x17e0) AM_DEVREADWRITE("riot", riot6532_r, riot6532_w) - AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x1ffc) AM_DEVWRITE("ay", ay8910_address_w) - AM_RANGE(0xa001, 0xa001) AM_MIRROR(0x1ffc) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x1ffc) AM_DEVWRITE("ay", ay8910_data_w) + AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x1ffc) AM_DEVWRITE("aysnd", ay8910_address_w) + AM_RANGE(0xa001, 0xa001) AM_MIRROR(0x1ffc) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x1ffc) AM_DEVWRITE("aysnd", ay8910_data_w) AM_RANGE(0xe000, 0xe7ff) AM_MIRROR(0x1800) AM_ROM ADDRESS_MAP_END @@ -272,9 +272,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( leprechn_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x1780) AM_RAM /* 6532 internal RAM */ AM_RANGE(0x0800, 0x081f) AM_MIRROR(0x17e0) AM_DEVREADWRITE("riot", riot6532_r, riot6532_w) - AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x1ffc) AM_DEVWRITE("ay", ay8910_address_w) - AM_RANGE(0xa001, 0xa001) AM_MIRROR(0x1ffc) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x1ffc) AM_DEVWRITE("ay", ay8910_data_w) + AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x1ffc) AM_DEVWRITE("aysnd", ay8910_address_w) + AM_RANGE(0xa001, 0xa001) AM_MIRROR(0x1ffc) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x1ffc) AM_DEVWRITE("aysnd", ay8910_data_w) AM_RANGE(0xe000, 0xefff) AM_MIRROR(0x1000) AM_ROM ADDRESS_MAP_END @@ -1028,7 +1028,7 @@ static MACHINE_DRIVER_START( gameplan ) /* audio hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, GAMEPLAN_AY8910_CLOCK) + MDRV_SOUND_ADD("aysnd", AY8910, GAMEPLAN_AY8910_CLOCK) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33) diff --git a/src/mame/drivers/gatron.c b/src/mame/drivers/gatron.c index 5fa49f8717a..99d8ab95ffd 100644 --- a/src/mame/drivers/gatron.c +++ b/src/mame/drivers/gatron.c @@ -346,7 +346,7 @@ static ADDRESS_MAP_START( gat_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM AM_RANGE(0x6000, 0x63ff) AM_RAM_WRITE(gat_videoram_w) AM_BASE(&videoram) AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* battery backed RAM */ - AM_RANGE(0xa000, 0xa000) AM_DEVWRITE("sn", sn76496_w) /* PSG */ + AM_RANGE(0xa000, 0xa000) AM_DEVWRITE("snsnd", sn76496_w) /* PSG */ AM_RANGE(0xe000, 0xe000) AM_WRITE(output_port_0_w) /* lamps */ ADDRESS_MAP_END @@ -465,7 +465,7 @@ static MACHINE_DRIVER_START( gat ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("sn", SN76496, MASTER_CLOCK/8 ) /* 2 MHz, guess */ + MDRV_SOUND_ADD("snsnd", SN76496, MASTER_CLOCK/8 ) /* 2 MHz, guess */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.00) MACHINE_DRIVER_END diff --git a/src/mame/drivers/gauntlet.c b/src/mame/drivers/gauntlet.c index a554c0473e5..d8612f1febb 100644 --- a/src/mame/drivers/gauntlet.c +++ b/src/mame/drivers/gauntlet.c @@ -337,7 +337,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1020, 0x102f) AM_MIRROR(0x27c0) AM_READ_PORT("COIN") AM_WRITE(mixer_w) AM_RANGE(0x1030, 0x103f) AM_MIRROR(0x27c0) AM_READWRITE(switch_6502_r, sound_ctl_w) AM_RANGE(0x1800, 0x180f) AM_MIRROR(0x27c0) AM_DEVREADWRITE("pokey", pokey_r, pokey_w) - AM_RANGE(0x1810, 0x1811) AM_MIRROR(0x27ce) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x1810, 0x1811) AM_MIRROR(0x27ce) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x1820, 0x182f) AM_MIRROR(0x27c0) AM_DEVWRITE("tms", tms5220_data_w) AM_RANGE(0x1830, 0x183f) AM_MIRROR(0x27c0) AM_READWRITE(atarigen_6502_irq_ack_r, atarigen_6502_irq_ack_w) AM_RANGE(0x4000, 0xffff) AM_ROM @@ -529,7 +529,7 @@ static MACHINE_DRIVER_START( gauntlet ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, ATARI_CLOCK_14MHz/4) + MDRV_SOUND_ADD("ymsnd", YM2151, ATARI_CLOCK_14MHz/4) MDRV_SOUND_ROUTE(0, "lspeaker", 0.48) MDRV_SOUND_ROUTE(1, "rspeaker", 0.48) diff --git a/src/mame/drivers/gberet.c b/src/mame/drivers/gberet.c index 668282b362b..769342456b2 100644 --- a/src/mame/drivers/gberet.c +++ b/src/mame/drivers/gberet.c @@ -159,7 +159,7 @@ static ADDRESS_MAP_START( gberet_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xe044, 0xe044) AM_WRITE(gberet_flipscreen_w) AM_RANGE(0xf000, 0xf000) AM_WRITE(gberet_coin_counter_w) AM_RANGE(0xf200, 0xf200) AM_READ_PORT("DSW2") AM_WRITENOP // Loads the snd command into the snd latch - AM_RANGE(0xf400, 0xf400) AM_READ_PORT("DSW3") AM_DEVWRITE("sn", sn76496_w) // This address triggers the SN chip to read the data port. + AM_RANGE(0xf400, 0xf400) AM_READ_PORT("DSW3") AM_DEVWRITE("snsnd", sn76496_w) // This address triggers the SN chip to read the data port. AM_RANGE(0xf600, 0xf600) AM_READ_PORT("DSW1") AM_RANGE(0xf601, 0xf601) AM_READ_PORT("P2") AM_RANGE(0xf602, 0xf602) AM_READ_PORT("P1") @@ -179,7 +179,7 @@ static ADDRESS_MAP_START( gberetb_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xe900, 0xe9ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xf000, 0xf000) AM_WRITENOP // coin counter not supported AM_RANGE(0xf200, 0xf200) AM_READ_PORT("DSW2") - AM_RANGE(0xf400, 0xf400) AM_DEVWRITE("sn", sn76496_w) + AM_RANGE(0xf400, 0xf400) AM_DEVWRITE("snsnd", sn76496_w) AM_RANGE(0xf600, 0xf600) AM_READ_PORT("P2") AM_RANGE(0xf601, 0xf601) AM_READ_PORT("DSW1") AM_RANGE(0xf602, 0xf602) AM_READ_PORT("P1") @@ -201,7 +201,7 @@ static ADDRESS_MAP_START( mrgoemon_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xe044, 0xe044) AM_WRITE(mrgoemon_flipscreen_w) AM_RANGE(0xf000, 0xf000) AM_WRITE(mrgoemon_coin_counter_w) AM_RANGE(0xf200, 0xf200) AM_READ_PORT("DSW2") AM_WRITENOP // Loads the snd command into the snd latch - AM_RANGE(0xf400, 0xf400) AM_READ_PORT("DSW3") AM_DEVWRITE("sn", sn76496_w) // This address triggers the SN chip to read the data port. + AM_RANGE(0xf400, 0xf400) AM_READ_PORT("DSW3") AM_DEVWRITE("snsnd", sn76496_w) // This address triggers the SN chip to read the data port. AM_RANGE(0xf600, 0xf600) AM_READ_PORT("DSW1") AM_WRITE(watchdog_reset_w) AM_RANGE(0xf601, 0xf601) AM_READ_PORT("P2") AM_RANGE(0xf602, 0xf602) AM_READ_PORT("P1") @@ -379,7 +379,7 @@ static MACHINE_DRIVER_START( gberet ) // sound hardware MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("sn", SN76496, 18432000/12) + MDRV_SOUND_ADD("snsnd", SN76496, 18432000/12) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/gbusters.c b/src/mame/drivers/gbusters.c index 55a77f348e7..727843b3a78 100644 --- a/src/mame/drivers/gbusters.c +++ b/src/mame/drivers/gbusters.c @@ -147,8 +147,8 @@ static ADDRESS_MAP_START( gbusters_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x87ff) AM_RAM /* RAM */ AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) /* soundlatch_r */ AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE("konami", k007232_r, k007232_w) /* 007232 registers */ - AM_RANGE(0xc001, 0xc001) AM_DEVREAD("ym", ym2151_status_port_r) /* YM 2151 */ - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) /* YM 2151 */ + AM_RANGE(0xc001, 0xc001) AM_DEVREAD("ymsnd", ym2151_status_port_r) /* YM 2151 */ + AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) /* YM 2151 */ AM_RANGE(0xf000, 0xf000) AM_DEVWRITE("konami", gbusters_snd_bankswitch_w) /* 007232 bankswitch? */ ADDRESS_MAP_END @@ -253,7 +253,7 @@ static MACHINE_DRIVER_START( gbusters ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) MDRV_SOUND_ROUTE(0, "mono", 0.60) MDRV_SOUND_ROUTE(1, "mono", 0.60) diff --git a/src/mame/drivers/ginganin.c b/src/mame/drivers/ginganin.c index c462d940500..52113f791db 100644 --- a/src/mame/drivers/ginganin.c +++ b/src/mame/drivers/ginganin.c @@ -166,8 +166,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0802, 0x0802) AM_WRITE(MC6840_write_port_0_w) /* Takahiro Nogi. 1999/09/27 */ AM_RANGE(0x0803, 0x0803) AM_WRITE(MC6840_write_port_1_w) /* Takahiro Nogi. 1999/09/27 */ AM_RANGE(0x1800, 0x1800) AM_READ(soundlatch_r) - AM_RANGE(0x2000, 0x2001) AM_DEVWRITE("ym", y8950_w) - AM_RANGE(0x2800, 0x2801) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x2000, 0x2001) AM_DEVWRITE("ymsnd", y8950_w) + AM_RANGE(0x2800, 0x2801) AM_DEVWRITE("aysnd", ay8910_address_data_w) AM_RANGE(0x4000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END @@ -351,10 +351,10 @@ static MACHINE_DRIVER_START( ginganin ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 3579545 / 2) + MDRV_SOUND_ADD("aysnd", AY8910, 3579545 / 2) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) - MDRV_SOUND_ADD("ym", Y8950, 3579545) + MDRV_SOUND_ADD("ymsnd", Y8950, 3579545) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END @@ -395,7 +395,7 @@ ROM_START( ginganin ) ROM_REGION( 0x08000, "gfx5", 0 ) /* background tilemaps */ ROM_LOAD( "gn_11.bin", 0x00000, 0x08000, CRC(f0d0e605) SHA1(0c541e8e036573be1d99ecb71fdb4568ca8cc269) ) - ROM_REGION( 0x20000, "ym", 0 ) /* samples */ + ROM_REGION( 0x20000, "ymsnd", 0 ) /* samples */ ROM_LOAD( "gn_04.bin", 0x00000, 0x10000, CRC(0ed9133b) SHA1(77f628e8ec28016efac2d906146865ca4ec54bd5) ) ROM_LOAD( "gn_03.bin", 0x10000, 0x10000, CRC(f1ba222c) SHA1(780c0bd0045bac1e1bb3209576383db90504fbf3) ) @@ -430,7 +430,7 @@ ROM_START( ginganina ) ROM_REGION( 0x08000, "gfx5", 0 ) /* background tilemaps */ ROM_LOAD( "gn_11.bin", 0x00000, 0x08000, CRC(f0d0e605) SHA1(0c541e8e036573be1d99ecb71fdb4568ca8cc269) ) - ROM_REGION( 0x20000, "ym", 0 ) /* samples */ + ROM_REGION( 0x20000, "ymsnd", 0 ) /* samples */ ROM_LOAD( "gn_04.bin", 0x00000, 0x10000, CRC(0ed9133b) SHA1(77f628e8ec28016efac2d906146865ca4ec54bd5) ) ROM_LOAD( "gn_03.bin", 0x10000, 0x10000, CRC(f1ba222c) SHA1(780c0bd0045bac1e1bb3209576383db90504fbf3) ) ROM_END diff --git a/src/mame/drivers/gladiatr.c b/src/mame/drivers/gladiatr.c index 1ee91196a8b..fa74dbf642b 100644 --- a/src/mame/drivers/gladiatr.c +++ b/src/mame/drivers/gladiatr.c @@ -411,7 +411,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ppking_cpu2_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0x20, 0x21) AM_READ(qx1_r) AM_WRITE(qx1_w) AM_RANGE(0x40, 0x40) AM_READNOP AM_RANGE(0x60, 0x61) AM_READ(qx2_r) AM_WRITE(qx2_w) @@ -458,7 +458,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( gladiatr_cpu2_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0x20, 0x21) AM_READWRITE(TAITO8741_1_r, TAITO8741_1_w) AM_RANGE(0x40, 0x40) AM_NOP // WRITE(sub_irq_ack_w) AM_RANGE(0x60, 0x61) AM_READWRITE(TAITO8741_2_r, TAITO8741_2_w) @@ -712,7 +712,7 @@ static MACHINE_DRIVER_START( ppking ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, XTAL_12MHz/8) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8) /* verified on pcb */ MDRV_SOUND_CONFIG(ppking_ym2203_interface) MDRV_SOUND_ROUTE(0, "mono", 0.60) MDRV_SOUND_ROUTE(1, "mono", 0.60) @@ -761,7 +761,7 @@ static MACHINE_DRIVER_START( gladiatr ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, XTAL_12MHz/8) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8) /* verified on pcb */ MDRV_SOUND_CONFIG(gladiatr_ym2203_interface) MDRV_SOUND_ROUTE(0, "mono", 0.60) MDRV_SOUND_ROUTE(1, "mono", 0.60) diff --git a/src/mame/drivers/goindol.c b/src/mame/drivers/goindol.c index dbc3aff39f5..c6da4550fb6 100644 --- a/src/mame/drivers/goindol.c +++ b/src/mame/drivers/goindol.c @@ -124,7 +124,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0xa000, 0xa001) AM_DEVWRITE("ym", ym2203_w) + AM_RANGE(0xa000, 0xa001) AM_DEVWRITE("ymsnd", ym2203_w) AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_RANGE(0xd800, 0xd800) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -261,7 +261,7 @@ static MACHINE_DRIVER_START( goindol ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 2000000) + MDRV_SOUND_ADD("ymsnd", YM2203, 2000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_DRIVER_END diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c index b6a05cf3c69..dd056dd1926 100644 --- a/src/mame/drivers/goldstar.c +++ b/src/mame/drivers/goldstar.c @@ -187,8 +187,8 @@ static ADDRESS_MAP_START( goldstar_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xf810, 0xf810) AM_READ_PORT("UNK1") AM_RANGE(0xf811, 0xf811) AM_READ_PORT("UNK2") AM_RANGE(0xf820, 0xf820) AM_READ_PORT("DSW2") - AM_RANGE(0xf830, 0xf830) AM_DEVREADWRITE("ay", ay8910_r, ay8910_data_w) - AM_RANGE(0xf840, 0xf840) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0xf830, 0xf830) AM_DEVREADWRITE("aysnd", ay8910_r, ay8910_data_w) + AM_RANGE(0xf840, 0xf840) AM_DEVWRITE("aysnd", ay8910_address_w) AM_RANGE(0xfa00, 0xfa00) AM_WRITE(goldstar_fa00_w) AM_RANGE(0xfb00, 0xfb00) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xfd00, 0xfdff) AM_READWRITE(SMH_RAM,paletteram_BBGGGRRR_w) AM_BASE(&paletteram) @@ -225,11 +225,11 @@ static ADDRESS_MAP_START( ncb3_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xf822, 0xf822) AM_WRITE(goldstar_fa00_w) // hack (connected to ppi output port?, needed for colour banking) AM_RANGE(0xf820, 0xf823) AM_DEVREADWRITE("ppi8255_2", ppi8255_r, ppi8255_w) /* Input/Output Ports */ - AM_RANGE(0xf830, 0xf830) AM_DEVREADWRITE("ay", ay8910_r, ay8910_data_w) - AM_RANGE(0xf840, 0xf840) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0xf830, 0xf830) AM_DEVREADWRITE("aysnd", ay8910_r, ay8910_data_w) + AM_RANGE(0xf840, 0xf840) AM_DEVWRITE("aysnd", ay8910_address_w) // AM_RANGE(0xf850, 0xf850) AM_WRITE(ncb3_p1_flip_w) // need flip? // AM_RANGE(0xf860, 0xf860) AM_WRITE(ncb3_p2_flip_w) // need flip? - AM_RANGE(0xf870, 0xf870) AM_DEVWRITE("sn", sn76496_w) /* guess... device is initialized, but doesn't seems to be used.*/ + AM_RANGE(0xf870, 0xf870) AM_DEVWRITE("snsnd", sn76496_w) /* guess... device is initialized, but doesn't seems to be used.*/ ADDRESS_MAP_END static ADDRESS_MAP_START( ncb3_readwriteport, ADDRESS_SPACE_IO, 8 ) @@ -326,8 +326,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cm_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x01, 0x01) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x02, 0x03) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x01, 0x01) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x02, 0x03) AM_DEVWRITE("aysnd", ay8910_data_address_w) AM_RANGE(0x04, 0x07) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */ AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) /* DIP switches */ AM_RANGE(0x10, 0x10) AM_WRITE (cm_outport0_w) /* output port */ @@ -342,15 +342,15 @@ static ADDRESS_MAP_START( cmast91_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */ AM_RANGE(0x10, 0x13) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) /* DIP switches */ - AM_RANGE(0x21, 0x21) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x22, 0x23) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x21, 0x21) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x22, 0x23) AM_DEVWRITE("aysnd", ay8910_data_address_w) ADDRESS_MAP_END static ADDRESS_MAP_START( amcoe1_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x01, 0x01) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x02, 0x03) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x01, 0x01) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x02, 0x03) AM_DEVWRITE("aysnd", ay8910_data_address_w) AM_RANGE(0x04, 0x07) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */ AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) /* DIP switches */ AM_RANGE(0x10, 0x10) AM_WRITE (cm_outport0_w) /* output port */ @@ -362,8 +362,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( amcoe2_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x01, 0x01) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x02, 0x03) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x01, 0x01) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x02, 0x03) AM_DEVWRITE("aysnd", ay8910_data_address_w) AM_RANGE(0x04, 0x07) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */ AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) /* DIP switches */ AM_RANGE(0x10, 0x10) AM_WRITE (cm_outport0_w) /* output port */ @@ -393,10 +393,10 @@ static ADDRESS_MAP_START( lucky8_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xb800, 0xb803) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */ AM_RANGE(0xb810, 0xb813) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) /* Input Ports */ AM_RANGE(0xb820, 0xb823) AM_DEVREADWRITE("ppi8255_2", ppi8255_r, ppi8255_w) /* Input/Output Ports */ - AM_RANGE(0xb830, 0xb830) AM_DEVREADWRITE("ay", ay8910_r, ay8910_data_w) - AM_RANGE(0xb840, 0xb840) AM_DEVWRITE("ay", ay8910_address_w) /* no sound... only use both ports for DSWs */ + AM_RANGE(0xb830, 0xb830) AM_DEVREADWRITE("aysnd", ay8910_r, ay8910_data_w) + AM_RANGE(0xb840, 0xb840) AM_DEVWRITE("aysnd", ay8910_address_w) /* no sound... only use both ports for DSWs */ AM_RANGE(0xb850, 0xb850) AM_WRITE(lucky8_outport_w) - AM_RANGE(0xb870, 0xb870) AM_DEVWRITE("sn", sn76496_w) /* sound */ + AM_RANGE(0xb870, 0xb870) AM_DEVWRITE("snsnd", sn76496_w) /* sound */ AM_RANGE(0xf800, 0xffff) AM_RAM ADDRESS_MAP_END @@ -418,7 +418,7 @@ static ADDRESS_MAP_START( kkojnoli_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xb830, 0xb830) AM_WRITENOP /* no ay8910 */ AM_RANGE(0xb840, 0xb840) AM_WRITENOP /* no ay8910 */ AM_RANGE(0xb850, 0xb850) AM_WRITE(lucky8_outport_w) - AM_RANGE(0xb870, 0xb870) AM_DEVWRITE("sn", sn76496_w) /* sound */ + AM_RANGE(0xb870, 0xb870) AM_DEVWRITE("snsnd", sn76496_w) /* sound */ AM_RANGE(0xf800, 0xffff) AM_RAM ADDRESS_MAP_END @@ -453,10 +453,10 @@ static ADDRESS_MAP_START( ladylinr_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xb800, 0xb803) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */ AM_RANGE(0xb810, 0xb813) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) /* DSW bank */ - AM_RANGE(0xb830, 0xb830) AM_DEVREADWRITE("ay", ay8910_r, ay8910_data_w) - AM_RANGE(0xb840, 0xb840) AM_DEVWRITE("ay", ay8910_address_w) /* no sound... only use ports */ + AM_RANGE(0xb830, 0xb830) AM_DEVREADWRITE("aysnd", ay8910_r, ay8910_data_w) + AM_RANGE(0xb840, 0xb840) AM_DEVWRITE("aysnd", ay8910_address_w) /* no sound... only use ports */ AM_RANGE(0xb850, 0xb850) AM_WRITENOP /* just turn off the lamps, if exist */ - AM_RANGE(0xb870, 0xb870) AM_DEVWRITE("sn", sn76496_w) /* sound */ + AM_RANGE(0xb870, 0xb870) AM_DEVWRITE("snsnd", sn76496_w) /* sound */ AM_RANGE(0xf800, 0xffff) AM_RAM ADDRESS_MAP_END @@ -475,10 +475,10 @@ static ADDRESS_MAP_START( wcat3_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xb800, 0xb803) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */ AM_RANGE(0xb810, 0xb813) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) /* Input Ports */ AM_RANGE(0xb820, 0xb823) AM_DEVREADWRITE("ppi8255_2", ppi8255_r, ppi8255_w) /* Input/Output Ports */ - AM_RANGE(0xb830, 0xb830) AM_DEVREADWRITE("ay", ay8910_r, ay8910_data_w) - AM_RANGE(0xb840, 0xb840) AM_DEVWRITE("ay", ay8910_address_w) /* no sound... only use both ports for DSWs */ + AM_RANGE(0xb830, 0xb830) AM_DEVREADWRITE("aysnd", ay8910_r, ay8910_data_w) + AM_RANGE(0xb840, 0xb840) AM_DEVWRITE("aysnd", ay8910_address_w) /* no sound... only use both ports for DSWs */ AM_RANGE(0xb850, 0xb850) AM_WRITE(lucky8_outport_w) - AM_RANGE(0xb870, 0xb870) AM_DEVWRITE("sn", sn76496_w) /* sound */ + AM_RANGE(0xb870, 0xb870) AM_DEVWRITE("snsnd", sn76496_w) /* sound */ // AM_RANGE(0xc000, 0xc003) AM_DEVREADWRITE("ppi8255_3", ppi8255_r, ppi8255_w) /* Other PPI initialized? */ AM_RANGE(0xd000, 0xefff) AM_ROM AM_RANGE(0xf000, 0xffff) AM_RAM @@ -518,8 +518,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( unkch_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) -// AM_RANGE(0x01, 0x01) AM_DEVREAD("ay", ay8910_r) -// AM_RANGE(0x02, 0x03) AM_DEVWRITE("ay", ay8910_data_address_w) +// AM_RANGE(0x01, 0x01) AM_DEVREAD("aysnd", ay8910_r) +// AM_RANGE(0x02, 0x03) AM_DEVWRITE("aysnd", ay8910_data_address_w) // AM_RANGE(0x04, 0x07) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */ // AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) /* DIP switches */ // AM_RANGE(0x10, 0x10) AM_WRITE (cm_outport0_w) /* output port */ @@ -4684,7 +4684,7 @@ static MACHINE_DRIVER_START( goldstar ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, AY_CLOCK) + MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) @@ -4720,7 +4720,7 @@ static MACHINE_DRIVER_START( goldstbl ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, AY_CLOCK) + MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) @@ -4755,7 +4755,7 @@ static MACHINE_DRIVER_START( moonlght ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, AY_CLOCK) + MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) @@ -4858,10 +4858,10 @@ static MACHINE_DRIVER_START( chrygld ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("sn", SN76489, PSG_CLOCK) + MDRV_SOUND_ADD("snsnd", SN76489, PSG_CLOCK) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - MDRV_SOUND_ADD("ay", AY8910, AY_CLOCK) + MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END @@ -4901,10 +4901,10 @@ static MACHINE_DRIVER_START( ncb3 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("sn", SN76489, PSG_CLOCK) + MDRV_SOUND_ADD("snsnd", SN76489, PSG_CLOCK) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - MDRV_SOUND_ADD("ay", AY8910, AY_CLOCK) + MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END @@ -4940,7 +4940,7 @@ static MACHINE_DRIVER_START( cm ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, AY_CLOCK) + MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK) MDRV_SOUND_CONFIG(cm_ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END @@ -4982,7 +4982,7 @@ static MACHINE_DRIVER_START( cmnobmp ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, AY_CLOCK) + MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK) MDRV_SOUND_CONFIG(cm_ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END @@ -5017,7 +5017,7 @@ static MACHINE_DRIVER_START( cmast91 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, AY_CLOCK) + MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK) MDRV_SOUND_CONFIG(cm_ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END @@ -5054,10 +5054,10 @@ static MACHINE_DRIVER_START( lucky8 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("sn", SN76489, PSG_CLOCK) + MDRV_SOUND_ADD("snsnd", SN76489, PSG_CLOCK) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - MDRV_SOUND_ADD("ay", AY8910, AY_CLOCK) + MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK) MDRV_SOUND_CONFIG(lucky8_ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) @@ -5096,7 +5096,7 @@ static MACHINE_DRIVER_START( kkojnoli ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("sn", SN76489, PSG_CLOCK) + MDRV_SOUND_ADD("snsnd", SN76489, PSG_CLOCK) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MACHINE_DRIVER_END @@ -5133,10 +5133,10 @@ static MACHINE_DRIVER_START( ladylinr ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono")//set up a standard mono speaker called 'mono' - MDRV_SOUND_ADD("sn", SN76489, PSG_CLOCK) + MDRV_SOUND_ADD("snsnd", SN76489, PSG_CLOCK) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - MDRV_SOUND_ADD("ay", AY8910, AY_CLOCK) + MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK) MDRV_SOUND_CONFIG(ladylinr_ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END @@ -5174,10 +5174,10 @@ static MACHINE_DRIVER_START( wcat3 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("sn", SN76489, PSG_CLOCK) + MDRV_SOUND_ADD("snsnd", SN76489, PSG_CLOCK) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - MDRV_SOUND_ADD("ay", AY8910, AY_CLOCK) + MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK) MDRV_SOUND_CONFIG(lucky8_ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) @@ -5215,7 +5215,7 @@ static MACHINE_DRIVER_START( amcoe1 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, AY_CLOCK) + MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK) MDRV_SOUND_CONFIG(cm_ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) @@ -5256,7 +5256,7 @@ static MACHINE_DRIVER_START( amcoe1a ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, AY_CLOCK) + MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK) MDRV_SOUND_CONFIG(cm_ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) @@ -5297,7 +5297,7 @@ static MACHINE_DRIVER_START( amcoe2 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, AY_CLOCK) + MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK) MDRV_SOUND_CONFIG(cm_ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.00) /* analyzed for clips */ MACHINE_DRIVER_END @@ -5332,7 +5332,7 @@ static MACHINE_DRIVER_START( nfm ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, AY_CLOCK) + MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK) MDRV_SOUND_CONFIG(cm_ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.00) /* analyzed for clips */ MACHINE_DRIVER_END @@ -5365,7 +5365,7 @@ static MACHINE_DRIVER_START( unkch ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, AY_CLOCK) + MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/gotcha.c b/src/mame/drivers/gotcha.c index 960cb3c8a5f..9622c47ebb3 100644 --- a/src/mame/drivers/gotcha.c +++ b/src/mame/drivers/gotcha.c @@ -128,7 +128,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xc002, 0xc003) AM_DEVWRITE("oki", okim6295_w) // TWO addresses! AM_RANGE(0xc006, 0xc006) AM_READ(soundlatch_r) AM_RANGE(0xd000, 0xd7ff) AM_RAM @@ -287,7 +287,7 @@ static MACHINE_DRIVER_START( gotcha ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 14318180/4) + MDRV_SOUND_ADD("ymsnd", YM2151, 14318180/4) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "mono", 0.80) MDRV_SOUND_ROUTE(1, "mono", 0.80) diff --git a/src/mame/drivers/gradius3.c b/src/mame/drivers/gradius3.c index c80808d705b..93e1a37509f 100644 --- a/src/mame/drivers/gradius3.c +++ b/src/mame/drivers/gradius3.c @@ -210,7 +210,7 @@ static ADDRESS_MAP_START( gradius3_s_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xf000, 0xf000) AM_DEVWRITE("konami", sound_bank_w) /* 007232 bankswitch */ AM_RANGE(0xf010, 0xf010) AM_READ(soundlatch_r) AM_RANGE(0xf020, 0xf02d) AM_DEVREADWRITE("konami", k007232_r, k007232_w) - AM_RANGE(0xf030, 0xf031) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xf030, 0xf031) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xf800, 0xffff) AM_RAM ADDRESS_MAP_END @@ -324,7 +324,7 @@ static MACHINE_DRIVER_START( gradius3 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/gstriker.c b/src/mame/drivers/gstriker.c index 6c7c8e47744..e328990a174 100644 --- a/src/mame/drivers/gstriker.c +++ b/src/mame/drivers/gstriker.c @@ -315,7 +315,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) + AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) AM_RANGE(0x04, 0x04) AM_WRITE(gs_sh_bankswitch_w) AM_RANGE(0x08, 0x08) AM_WRITE(gs_sh_pending_command_clear_w) AM_RANGE(0x0c, 0x0c) AM_READ(soundlatch_r) @@ -574,7 +574,7 @@ static MACHINE_DRIVER_START( gstriker ) MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -614,7 +614,7 @@ static MACHINE_DRIVER_START( vgoal ) MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -652,7 +652,7 @@ ROM_START( gstriker ) ROM_REGION( 0x40000, "ym.deltat", 0 ) ROM_LOAD( "human_scr-gs-106_m532001b-16_3402370.u93", 0x00000, 0x040000, CRC(93c9868c) SHA1(dcecb34e46405155e35aaf134b8547430d23f5a7) ) - ROM_REGION( 0x100000, "ym", 0 ) + ROM_REGION( 0x100000, "ymsnd", 0 ) ROM_LOAD( "scrgs107.u99", 0x00000, 0x100000, CRC(ecc0a01b) SHA1(239e832b7d22925460a8f44eb82e782cd13aba49) ) ROM_REGION( 0x1000, "plds", 0 ) @@ -688,7 +688,7 @@ ROM_START( gstrikera ) ROM_REGION( 0x40000, "ym.deltat", 0 ) ROM_LOAD( "human_scr-gs-106_m532001b-16_3402370.u93", 0x00000, 0x040000, CRC(93c9868c) SHA1(dcecb34e46405155e35aaf134b8547430d23f5a7) ) - ROM_REGION( 0x100000, "ym", 0 ) + ROM_REGION( 0x100000, "ymsnd", 0 ) ROM_LOAD( "scrgs107.u99", 0x00000, 0x100000, CRC(ecc0a01b) SHA1(239e832b7d22925460a8f44eb82e782cd13aba49) ) /* PALs were protected on this version, used the ones from the "gstriker" set */ @@ -726,7 +726,7 @@ ROM_START( vgoalsoc ) ROM_REGION( 0x40000, "ym.deltat", 0 ) ROM_LOAD( "c13_u86.u86", 0x000000, 0x040000, CRC(4b76a162) SHA1(38dcb7536662f5f520e59f3ff746b42e9df789d2) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "c13_u104.104", 0x000000, 0x200000, CRC(8437b6f8) SHA1(79f183dcbf3cde5c77e086e4fdd8341809396e37) ) ROM_END @@ -754,7 +754,7 @@ ROM_START( vgoalsca ) ROM_REGION( 0x40000, "ym.deltat", 0 ) ROM_LOAD( "c13_u86.u86", 0x000000, 0x040000, CRC(4b76a162) SHA1(38dcb7536662f5f520e59f3ff746b42e9df789d2) ) - ROM_REGION( 0x100000, "ym", 0 ) + ROM_REGION( 0x100000, "ymsnd", 0 ) ROM_LOAD( "vgoalc16.104", 0x000000, 0x100000, CRC(6fb06e1b) SHA1(c4584b480fe1165f8e2f887acaa578690514d35d) ) ROM_END @@ -784,7 +784,7 @@ ROM_START( twrldc94 ) ROM_REGION( 0x40000, "ym.deltat", 0 ) ROM_LOAD( "u86", 0x000000, 0x040000, CRC(775f45dc) SHA1(1a740dd880d9f873e93dfc096fbcae1784b4f522) ) - ROM_REGION( 0x100000, "ym", 0 ) + ROM_REGION( 0x100000, "ymsnd", 0 ) ROM_LOAD( "u104", 0x000000, 0x100000, CRC(df07d0af) SHA1(356560e164ff222bc9004fe202f829c93244a6c9) ) ROM_END @@ -814,7 +814,7 @@ ROM_START( twrldc94a ) ROM_REGION( 0x40000, "ym.deltat", 0 ) ROM_LOAD( "u86", 0x000000, 0x040000, CRC(775f45dc) SHA1(1a740dd880d9f873e93dfc096fbcae1784b4f522) ) - ROM_REGION( 0x100000, "ym", 0 ) + ROM_REGION( 0x100000, "ymsnd", 0 ) ROM_LOAD( "u104", 0x000000, 0x100000, CRC(df07d0af) SHA1(356560e164ff222bc9004fe202f829c93244a6c9) ) ROM_END diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c index c274dd235e3..0e65df2f61b 100644 --- a/src/mame/drivers/gticlub.c +++ b/src/mame/drivers/gticlub.c @@ -628,7 +628,7 @@ static ADDRESS_MAP_START( sound_memmap, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_RANGE(0x300000, 0x30000f) AM_READWRITE(K056800_sound_r, K056800_sound_w) - AM_RANGE(0x400000, 0x400fff) AM_DEVREADWRITE("rf", rf5c400_r, rf5c400_w) /* Ricoh RF5C400 */ + AM_RANGE(0x400000, 0x400fff) AM_DEVREADWRITE("rfsnd", rf5c400_r, rf5c400_w) /* Ricoh RF5C400 */ AM_RANGE(0x580000, 0x580001) AM_WRITENOP AM_RANGE(0x600000, 0x600001) AM_WRITENOP ADDRESS_MAP_END @@ -937,7 +937,7 @@ static MACHINE_DRIVER_START( gticlub ) MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("rf", RF5C400, 64000000/4) + MDRV_SOUND_ADD("rfsnd", RF5C400, 64000000/4) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -1003,7 +1003,7 @@ static MACHINE_DRIVER_START( hangplt ) MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("rf", RF5C400, 64000000/4) + MDRV_SOUND_ADD("rfsnd", RF5C400, 64000000/4) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -1024,7 +1024,7 @@ ROM_START( gticlub ) /* Euro version EAA */ ROM_REGION(0x80000, "audiocpu", 0) /* 68k program */ ROM_LOAD16_WORD_SWAP( "688a07.13k", 0x000000, 0x040000, CRC(f0805f06) SHA1(4b87e02b89e7ea812454498603767668e4619025) ) - ROM_REGION(0x800000, "rf", 0) /* sound roms */ + ROM_REGION(0x800000, "rfsnd", 0) /* sound roms */ ROM_LOAD( "688a09.9s", 0x000000, 0x200000, CRC(fb582963) SHA1(ce8fe6a4d7ac7d7f4b6591f9150b1d351e636354) ) ROM_LOAD( "688a10.7s", 0x200000, 0x200000, CRC(b3ddc5f1) SHA1(a3f76c86e85eb17f20efb037c1ad64e9cb8566c8) ) ROM_LOAD( "688a11.5s", 0x400000, 0x200000, CRC(fc706183) SHA1(c8ce6de0588be1023ef48577bc88a4e5effdcd25) ) @@ -1051,7 +1051,7 @@ ROM_START( gticluba ) /* Asia version AAA */ ROM_REGION(0x80000, "audiocpu", 0) /* 68k program */ ROM_LOAD16_WORD_SWAP( "688a07.13k", 0x000000, 0x040000, CRC(f0805f06) SHA1(4b87e02b89e7ea812454498603767668e4619025) ) - ROM_REGION(0x800000, "rf", 0) /* sound roms */ + ROM_REGION(0x800000, "rfsnd", 0) /* sound roms */ ROM_LOAD( "688a09.9s", 0x000000, 0x200000, CRC(fb582963) SHA1(ce8fe6a4d7ac7d7f4b6591f9150b1d351e636354) ) ROM_LOAD( "688a10.7s", 0x200000, 0x200000, CRC(b3ddc5f1) SHA1(a3f76c86e85eb17f20efb037c1ad64e9cb8566c8) ) ROM_LOAD( "688a11.5s", 0x400000, 0x200000, CRC(fc706183) SHA1(c8ce6de0588be1023ef48577bc88a4e5effdcd25) ) @@ -1078,7 +1078,7 @@ ROM_START( gticlubj ) /* Japan version JAA */ ROM_REGION(0x80000, "audiocpu", 0) /* 68k program */ ROM_LOAD16_WORD_SWAP( "688a07.13k", 0x000000, 0x040000, CRC(f0805f06) SHA1(4b87e02b89e7ea812454498603767668e4619025) ) - ROM_REGION(0x800000, "rf", 0) /* sound roms */ + ROM_REGION(0x800000, "rfsnd", 0) /* sound roms */ ROM_LOAD( "688a09.9s", 0x000000, 0x200000, CRC(fb582963) SHA1(ce8fe6a4d7ac7d7f4b6591f9150b1d351e636354) ) ROM_LOAD( "688a10.7s", 0x200000, 0x200000, CRC(b3ddc5f1) SHA1(a3f76c86e85eb17f20efb037c1ad64e9cb8566c8) ) ROM_LOAD( "688a11.5s", 0x400000, 0x200000, CRC(fc706183) SHA1(c8ce6de0588be1023ef48577bc88a4e5effdcd25) ) @@ -1108,7 +1108,7 @@ ROM_START( thunderh ) /* Euro version EAA */ ROM_REGION(0x20000, "dsp", 0) /* 68k program for outboard sound? network? board */ ROM_LOAD16_WORD_SWAP( "680c22.20k", 0x000000, 0x020000, CRC(d93c0ee2) SHA1(4b58418cbb01b51e12d6e7c86b2c81cd35d86248) ) - ROM_REGION(0x800000, "rf", 0) /* sound roms */ + ROM_REGION(0x800000, "rfsnd", 0) /* sound roms */ ROM_LOAD( "680a09.9s", 0x000000, 0x200000, CRC(71c2b049) SHA1(ce360172c8774b31edf16a80104c35b1caf26cd9) ) ROM_LOAD( "680a10.7s", 0x200000, 0x200000, CRC(19882bf3) SHA1(7287da58853c84cbadbfb42bed37f2b0032c4b4d) ) ROM_LOAD( "680a11.5s", 0x400000, 0x200000, CRC(0c74fe3f) SHA1(2e69f8d37552a74bbda65b134f747b4380ed33b0) ) @@ -1138,7 +1138,7 @@ ROM_START( thunderhu ) /* USA version UAA */ ROM_REGION(0x20000, "dsp", 0) /* 68k program for outboard sound? network? board */ ROM_LOAD16_WORD_SWAP( "680c22.20k", 0x000000, 0x020000, CRC(d93c0ee2) SHA1(4b58418cbb01b51e12d6e7c86b2c81cd35d86248) ) - ROM_REGION(0x800000, "rf", 0) /* sound roms */ + ROM_REGION(0x800000, "rfsnd", 0) /* sound roms */ ROM_LOAD( "680a09.9s", 0x000000, 0x200000, CRC(71c2b049) SHA1(ce360172c8774b31edf16a80104c35b1caf26cd9) ) ROM_LOAD( "680a10.7s", 0x200000, 0x200000, CRC(19882bf3) SHA1(7287da58853c84cbadbfb42bed37f2b0032c4b4d) ) ROM_LOAD( "680a11.5s", 0x400000, 0x200000, CRC(0c74fe3f) SHA1(2e69f8d37552a74bbda65b134f747b4380ed33b0) ) @@ -1165,7 +1165,7 @@ ROM_START( slrasslt ) /* USA version UAA */ ROM_REGION(0x80000, "audiocpu", 0) /* 68k program */ ROM_LOAD16_WORD_SWAP( "792a07.10k", 0x000000, 0x080000, CRC(89a65ad1) SHA1(d814ef0b560c8e68da57ad5c6096e4fc05e9913e) ) - ROM_REGION(0x800000, "rf", 0) /* sound roms */ + ROM_REGION(0x800000, "rfsnd", 0) /* sound roms */ ROM_LOAD( "792a09.9s", 0x000000, 0x200000, CRC(7d7ea427) SHA1(a9a311a7c17223cc87140fe2890e20a321464831) ) ROM_LOAD( "792a10.7s", 0x200000, 0x200000, CRC(e585e5d9) SHA1(ec44ad324a66eeea4c45933dda5a8a9a4398879d) ) ROM_LOAD( "792a11.5s", 0x400000, 0x200000, CRC(c9c3a04c) SHA1(f834659f67712c9fcd93b7407669d7f35517b790) ) @@ -1192,7 +1192,7 @@ ROM_START( hangplt ) /* Japan version JAB */ ROM_REGION(0x80000, "audiocpu", 0) /* 68k program */ ROM_LOAD16_WORD_SWAP( "685a07.13k", 0x000000, 0x080000, CRC(5b72fd80) SHA1(a150837fa0d66dc0c3832495a4c8ce4f9b92cd98) ) - ROM_REGION(0x1000000, "rf", 0) /* sound roms */ + ROM_REGION(0x1000000, "rfsnd", 0) /* sound roms */ ROM_LOAD( "685a09.9s", 0x000000, 0x400000, CRC(b8ae40aa) SHA1(eee27a8929e0e805f1045fd9638e661b36a1e3c7) ) ROM_LOAD( "685a10.7s", 0x400000, 0x400000, CRC(fef3dc36) SHA1(566c7469fc452b5965a31fa42291082ec8e48a24) ) diff --git a/src/mame/drivers/guab.c b/src/mame/drivers/guab.c index c75caddf476..ea218423f8b 100644 --- a/src/mame/drivers/guab.c +++ b/src/mame/drivers/guab.c @@ -623,7 +623,7 @@ static WRITE16_HANDLER( io_w ) } case 0x30: { - sn76496_w(devtag_get_device(space->machine, "sn"), 0, data & 0xff); + sn76496_w(devtag_get_device(space->machine, "snsnd"), 0, data & 0xff); break; } case 0x31: @@ -784,7 +784,7 @@ static MACHINE_DRIVER_START( guab ) MDRV_SPEAKER_STANDARD_MONO("mono") /* TODO: Verify clock */ - MDRV_SOUND_ADD("sn", SN76489, 2000000) + MDRV_SOUND_ADD("snsnd", SN76489, 2000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) /* 6840 PTM */ diff --git a/src/mame/drivers/gundealr.c b/src/mame/drivers/gundealr.c index 35aa4f52a03..53dad053c4e 100644 --- a/src/mame/drivers/gundealr.c +++ b/src/mame/drivers/gundealr.c @@ -176,7 +176,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) ADDRESS_MAP_END @@ -484,7 +484,7 @@ static MACHINE_DRIVER_START( gundealr ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 1500000) + MDRV_SOUND_ADD("ymsnd", YM2203, 1500000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_DRIVER_END diff --git a/src/mame/drivers/hanaawas.c b/src/mame/drivers/hanaawas.c index 8780cbfb87d..e6600d21582 100644 --- a/src/mame/drivers/hanaawas.c +++ b/src/mame/drivers/hanaawas.c @@ -92,8 +92,8 @@ static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READWRITE(hanaawas_input_port_0_r, hanaawas_inputs_mux_w) AM_RANGE(0x01, 0x01) AM_READNOP /* it must return 0 */ - AM_RANGE(0x10, 0x10) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x10, 0x11) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x10, 0x10) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x10, 0x11) AM_DEVWRITE("aysnd", ay8910_address_data_w) ADDRESS_MAP_END static INPUT_PORTS_START( hanaawas ) @@ -218,7 +218,7 @@ static MACHINE_DRIVER_START( hanaawas ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 18432000/12) + MDRV_SOUND_ADD("aysnd", AY8910, 18432000/12) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/hcastle.c b/src/mame/drivers/hcastle.c index 21379948ea0..dfe2194c13b 100644 --- a/src/mame/drivers/hcastle.c +++ b/src/mame/drivers/hcastle.c @@ -91,7 +91,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9880, 0x9889) AM_DEVWRITE("konami2", k051649_frequency_w) AM_RANGE(0x988a, 0x988e) AM_DEVWRITE("konami2", k051649_volume_w) AM_RANGE(0x988f, 0x988f) AM_DEVWRITE("konami2", k051649_keyonoff_w) - AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) + AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w) AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE("konami1", k007232_r, k007232_w) AM_RANGE(0xc000, 0xc000) AM_DEVWRITE("konami1", sound_bank_w) /* 7232 bankswitch */ AM_RANGE(0xd000, 0xd000) AM_READ(soundlatch_r) @@ -223,7 +223,7 @@ static MACHINE_DRIVER_START( hcastle ) MDRV_SOUND_ROUTE(0, "mono", 0.44) MDRV_SOUND_ROUTE(1, "mono", 0.50) - MDRV_SOUND_ADD("ym", YM3812, 3579545) + MDRV_SOUND_ADD("ymsnd", YM3812, 3579545) MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70) diff --git a/src/mame/drivers/hexa.c b/src/mame/drivers/hexa.c index e10b230dc88..9b4fab1b810 100644 --- a/src/mame/drivers/hexa.c +++ b/src/mame/drivers/hexa.c @@ -63,8 +63,8 @@ static ADDRESS_MAP_START( hexa_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) AM_RANGE(0xc000, 0xc7ff) AM_RAM - AM_RANGE(0xd001, 0xd001) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0xd000, 0xd001) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0xd001, 0xd001) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0xd000, 0xd001) AM_DEVWRITE("aysnd", ay8910_address_data_w) AM_RANGE(0xd008, 0xd008) AM_WRITE(hexa_d008_w) AM_RANGE(0xd010, 0xd010) AM_WRITE(watchdog_reset_w) /* or IRQ acknowledge, or both */ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(hexa_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) @@ -165,7 +165,7 @@ static MACHINE_DRIVER_START( hexa ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 1500000) + MDRV_SOUND_ADD("aysnd", AY8910, 1500000) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/himesiki.c b/src/mame/drivers/himesiki.c index 696d6c0604a..7c066df12d0 100644 --- a/src/mame/drivers/himesiki.c +++ b/src/mame/drivers/himesiki.c @@ -270,7 +270,7 @@ static const gfx_layout layout3 = }; static GFXDECODE_START( himesiki ) - GFXDECODE_ENTRY( "bg", 0, layout1, 0x000, 16 ) + GFXDECODE_ENTRY( "bgtiles", 0, layout1, 0x000, 16 ) GFXDECODE_ENTRY( "sprites_1", 0, layout2, 0x200, 16 ) GFXDECODE_ENTRY( "sprites_2", 0, layout3, 0x200, 16 ) GFXDECODE_END @@ -321,7 +321,7 @@ ROM_START( himesiki ) ROM_REGION( 0x010000, "sub", 0 ) /* z80 */ ROM_LOAD( "5.6n", 0x00000, 0x08000, CRC(b1214ac7) SHA1(ee5459c28d9c3c2eb3467261716b1259ec486534) ) - ROM_REGION( 0x020000, "bg", 0 ) /* bg */ + ROM_REGION( 0x020000, "bgtiles", 0 ) /* bg */ ROM_LOAD( "3.5f", 0x000000, 0x010000, CRC(73843e60) SHA1(0d8a397d8798e15f3fa7bf7a83e4c2ee44f6fa86) ) ROM_LOAD( "4.5d", 0x010000, 0x010000, CRC(443a3164) SHA1(08aa002214251a870581a01d775f497dd390957c) ) diff --git a/src/mame/drivers/hitpoker.c b/src/mame/drivers/hitpoker.c index 8b48782db1e..6f620c8afdf 100644 --- a/src/mame/drivers/hitpoker.c +++ b/src/mame/drivers/hitpoker.c @@ -226,7 +226,7 @@ static ADDRESS_MAP_START( hitpoker_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xbe53, 0xbe53) AM_READ(eeprom_r) AM_RANGE(0xbe80, 0xbe80) AM_DEVWRITE("crtc", mc6845_address_w) AM_RANGE(0xbe81, 0xbe81) AM_DEVWRITE("crtc", mc6845_register_w) - AM_RANGE(0xbe90, 0xbe91) AM_DEVREADWRITE("ay", ay8910_r,ay8910_address_data_w) + AM_RANGE(0xbe90, 0xbe91) AM_DEVREADWRITE("aysnd", ay8910_r,ay8910_address_data_w) AM_RANGE(0xbea0, 0xbea0) AM_READ_PORT("VBLANK") //probably other bits as well // AM_RANGE(0xbe00, 0xbeff) AM_READ(test_r) AM_RANGE(0xc000, 0xdfff) AM_READWRITE(hitpoker_cram_r,hitpoker_cram_w) @@ -483,7 +483,7 @@ static MACHINE_DRIVER_START( hitpoker ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 1500000) + MDRV_SOUND_ADD("aysnd", AY8910, 1500000) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/hnayayoi.c b/src/mame/drivers/hnayayoi.c index cc8ae7a998a..0ec90940709 100644 --- a/src/mame/drivers/hnayayoi.c +++ b/src/mame/drivers/hnayayoi.c @@ -111,8 +111,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hnayayoi_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE("ym", ym2203_w) - AM_RANGE(0x02, 0x03) AM_DEVREAD("ym", ym2203_r) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ymsnd", ym2203_w) + AM_RANGE(0x02, 0x03) AM_DEVREAD("ymsnd", ym2203_r) AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW3") AM_RANGE(0x06, 0x06) AM_DEVWRITE("msm", adpcm_data_w) // AM_RANGE(0x08, 0x08) AM_WRITENOP // CRT Controller @@ -133,8 +133,8 @@ static ADDRESS_MAP_START( hnfubuki_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x77ff) AM_ROM AM_RANGE(0x7800, 0x7fff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0x8000, 0xfeff) AM_ROM - AM_RANGE(0xff00, 0xff01) AM_DEVWRITE("ym", ym2203_w) - AM_RANGE(0xff02, 0xff03) AM_DEVREAD("ym", ym2203_r) + AM_RANGE(0xff00, 0xff01) AM_DEVWRITE("ymsnd", ym2203_w) + AM_RANGE(0xff02, 0xff03) AM_DEVREAD("ymsnd", ym2203_r) AM_RANGE(0xff04, 0xff04) AM_READ_PORT("DSW3") AM_RANGE(0xff06, 0xff06) AM_DEVWRITE("msm", adpcm_data_w) // AM_RANGE(0xff08, 0xff08) AM_WRITENOP // CRT Controller @@ -159,8 +159,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( untoucha_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x10) AM_DEVWRITE("ym", ym2203_control_port_w) - AM_RANGE(0x11, 0x11) AM_DEVREAD("ym", ym2203_status_port_r) + AM_RANGE(0x10, 0x10) AM_DEVWRITE("ymsnd", ym2203_control_port_w) + AM_RANGE(0x11, 0x11) AM_DEVREAD("ymsnd", ym2203_status_port_r) // AM_RANGE(0x12, 0x12) AM_WRITENOP // CRT Controller AM_RANGE(0x13, 0x13) AM_DEVWRITE("msm", adpcm_data_w) AM_RANGE(0x14, 0x14) AM_READ_PORT("COIN") @@ -173,8 +173,8 @@ static ADDRESS_MAP_START( untoucha_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x28, 0x28) AM_WRITE(dynax_blitter_rev1_start_w) AM_RANGE(0x31, 0x31) AM_DEVWRITE("msm", adpcm_vclk_w) AM_RANGE(0x32, 0x32) AM_DEVWRITE("msm", adpcm_reset_inv_w) - AM_RANGE(0x50, 0x50) AM_DEVWRITE("ym", ym2203_write_port_w) - AM_RANGE(0x51, 0x51) AM_DEVREAD("ym", ym2203_read_port_r) + AM_RANGE(0x50, 0x50) AM_DEVWRITE("ymsnd", ym2203_write_port_w) + AM_RANGE(0x51, 0x51) AM_DEVREAD("ymsnd", ym2203_read_port_r) // AM_RANGE(0x52, 0x52) AM_WRITENOP // CRT Controller ADDRESS_MAP_END @@ -570,7 +570,7 @@ static MACHINE_DRIVER_START( hnayayoi ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 20000000/8) + MDRV_SOUND_ADD("ymsnd", YM2203, 20000000/8) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(0, "mono", 0.25) MDRV_SOUND_ROUTE(1, "mono", 0.25) diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c index 14b125affdf..c3471c4e464 100644 --- a/src/mame/drivers/homedata.c +++ b/src/mame/drivers/homedata.c @@ -372,13 +372,13 @@ static WRITE8_HANDLER( reikaids_upd7807_portc_w ) if (BIT(upd7807_portc,5) && !BIT(data,5)) /* write clock 1->0 */ { - const device_config *device = devtag_get_device(space->machine, "ym"); + const device_config *device = devtag_get_device(space->machine, "ymsnd"); ym2203_w(device, BIT(data,3), upd7807_porta); } if (BIT(upd7807_portc,4) && !BIT(data,4)) /* read clock 1->0 */ { - const device_config *device = devtag_get_device(space->machine, "ym"); + const device_config *device = devtag_get_device(space->machine, "ymsnd"); upd7807_porta = ym2203_r(device, BIT(data,3)); } @@ -527,7 +527,7 @@ static WRITE8_HANDLER( pteacher_upd7807_portc_w ) coin_counter_w(0,~data & 0x80); if (BIT(upd7807_portc,5) && !BIT(data,5)) /* clock 1->0 */ - sn76496_w(devtag_get_device(space->machine, "sn"),0,upd7807_porta); + sn76496_w(devtag_get_device(space->machine, "snsnd"),0,upd7807_porta); upd7807_portc = data; } @@ -579,7 +579,7 @@ static ADDRESS_MAP_START( mrokumei_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x8000) AM_WRITE(mrokumei_blitter_start_w) // in some games also ROM bank switch to access service ROM AM_RANGE(0x8001, 0x8001) AM_WRITE(mrokumei_keyboard_select_w) AM_RANGE(0x8002, 0x8002) AM_WRITE(mrokumei_sound_cmd_w) - AM_RANGE(0x8003, 0x8003) AM_DEVWRITE("sn", sn76496_w) + AM_RANGE(0x8003, 0x8003) AM_DEVWRITE("snsnd", sn76496_w) AM_RANGE(0x8006, 0x8006) AM_WRITE(homedata_blitter_param_w) AM_RANGE(0x8007, 0x8007) AM_WRITE(mrokumei_blitter_bank_w) AM_RANGE(0x8000, 0xffff) AM_ROM @@ -1198,7 +1198,7 @@ static MACHINE_DRIVER_START( mrokumei ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("sn", SN76489A, 16000000/4) // SN76489AN actually + MDRV_SOUND_ADD("snsnd", SN76489A, 16000000/4) // SN76489AN actually MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MDRV_SOUND_ADD("dac", DAC, 0) @@ -1266,7 +1266,7 @@ static MACHINE_DRIVER_START( reikaids ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 3000000) + MDRV_SOUND_ADD("ymsnd", YM2203, 3000000) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(0, "mono", 0.25) MDRV_SOUND_ROUTE(1, "mono", 0.25) @@ -1317,7 +1317,7 @@ static MACHINE_DRIVER_START( pteacher ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("sn", SN76489A, 16000000/4) // SN76489AN actually + MDRV_SOUND_ADD("snsnd", SN76489A, 16000000/4) // SN76489AN actually MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MDRV_SOUND_ADD("dac", DAC, 0) diff --git a/src/mame/drivers/homerun.c b/src/mame/drivers/homerun.c index 305e9bb3028..a5227a10ba3 100644 --- a/src/mame/drivers/homerun.c +++ b/src/mame/drivers/homerun.c @@ -101,7 +101,7 @@ static ADDRESS_MAP_START( homerun_iomap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x40, 0x40) AM_READ_PORT("IN0") AM_RANGE(0x50, 0x50) AM_READ_PORT("IN2") AM_RANGE(0x60, 0x60) AM_READ_PORT("IN1") - AM_RANGE(0x70, 0x71) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x70, 0x71) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) ADDRESS_MAP_END static const ym2203_interface ym2203_config = @@ -210,7 +210,7 @@ static MACHINE_DRIVER_START( homerun ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 6000000/2) + MDRV_SOUND_ADD("ymsnd", YM2203, 6000000/2) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c index 6bbfdbca7f2..423bce6bc87 100644 --- a/src/mame/drivers/hornet.c +++ b/src/mame/drivers/hornet.c @@ -823,7 +823,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_memmap, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_RAM /* Work RAM */ - AM_RANGE(0x200000, 0x200fff) AM_DEVREADWRITE("rf", rf5c400_r, rf5c400_w) /* Ricoh RF5C400 */ + AM_RANGE(0x200000, 0x200fff) AM_DEVREADWRITE("rfsnd", rf5c400_r, rf5c400_w) /* Ricoh RF5C400 */ AM_RANGE(0x300000, 0x30000f) AM_READWRITE(K056800_sound_r, K056800_sound_w) AM_RANGE(0x480000, 0x480001) AM_WRITENOP AM_RANGE(0x4c0000, 0x4c0001) AM_WRITENOP @@ -1117,7 +1117,7 @@ static MACHINE_DRIVER_START( hornet ) MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("rf", RF5C400, 16934400) // value from Guru readme, gives 44100 Hz sample rate + MDRV_SOUND_ADD("rfsnd", RF5C400, 16934400) // value from Guru readme, gives 44100 Hz sample rate MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -1407,7 +1407,7 @@ ROM_START(sscope) ROM_LOAD32_WORD( "830a14.u32", 0x000000, 0x400000, CRC(335793e1) SHA1(d582b53c3853abd59bc728f619a30c27cfc9497c) ) ROM_LOAD32_WORD( "830a13.u24", 0x000002, 0x400000, CRC(d6e7877e) SHA1(b4d0e17ada7dd126ec564a20e7140775b4b3fdb7) ) - ROM_REGION(0x1000000, "rf", 0) /* PCM sample roms */ + ROM_REGION(0x1000000, "rfsnd", 0) /* PCM sample roms */ ROM_LOAD( "830a09.16p", 0x000000, 0x400000, CRC(e4b9f305) SHA1(ce2c6f63bdc9374dde48d8359102b57e48b4fdeb) ) ROM_LOAD( "830a10.14p", 0x400000, 0x400000, CRC(8b8aaf7e) SHA1(49b694dc171c149056b87c15410a6bf37ff2987f) ) @@ -1429,7 +1429,7 @@ ROM_START(sscopea) ROM_LOAD32_WORD( "830a14.u32", 0x000000, 0x400000, CRC(335793e1) SHA1(d582b53c3853abd59bc728f619a30c27cfc9497c) ) ROM_LOAD32_WORD( "830a13.u24", 0x000002, 0x400000, CRC(d6e7877e) SHA1(b4d0e17ada7dd126ec564a20e7140775b4b3fdb7) ) - ROM_REGION(0x1000000, "rf", 0) /* PCM sample roms */ + ROM_REGION(0x1000000, "rfsnd", 0) /* PCM sample roms */ ROM_LOAD( "830a09.16p", 0x000000, 0x400000, CRC(e4b9f305) SHA1(ce2c6f63bdc9374dde48d8359102b57e48b4fdeb) ) ROM_LOAD( "830a10.14p", 0x400000, 0x400000, CRC(8b8aaf7e) SHA1(49b694dc171c149056b87c15410a6bf37ff2987f) ) @@ -1451,7 +1451,7 @@ ROM_START(sscopeb) ROM_LOAD32_WORD( "830a14.u32", 0x000000, 0x400000, CRC(335793e1) SHA1(d582b53c3853abd59bc728f619a30c27cfc9497c) ) ROM_LOAD32_WORD( "830a13.u24", 0x000002, 0x400000, CRC(d6e7877e) SHA1(b4d0e17ada7dd126ec564a20e7140775b4b3fdb7) ) - ROM_REGION(0x1000000, "rf", 0) /* PCM sample roms */ + ROM_REGION(0x1000000, "rfsnd", 0) /* PCM sample roms */ ROM_LOAD( "830a09.16p", 0x000000, 0x400000, CRC(e4b9f305) SHA1(ce2c6f63bdc9374dde48d8359102b57e48b4fdeb) ) ROM_LOAD( "830a10.14p", 0x400000, 0x400000, CRC(8b8aaf7e) SHA1(49b694dc171c149056b87c15410a6bf37ff2987f) ) @@ -1476,7 +1476,7 @@ ROM_START(sscope2) ROM_REGION(0x80000, "audiocpu", 0) /* 68K Program */ ROM_LOAD16_WORD_SWAP("931a08.bin", 0x000000, 0x80000, CRC(1597d604) SHA1(a1eab4d25907930b59ea558b484c3b6ddcb9303c) ) - ROM_REGION(0xc00000, "rf", 0) /* PCM sample roms */ + ROM_REGION(0xc00000, "rfsnd", 0) /* PCM sample roms */ ROM_LOAD( "931a09.bin", 0x000000, 0x400000, CRC(694c354c) SHA1(42f54254a5959e1b341f2801f1ad032c4ed6f329) ) ROM_LOAD( "931a10.bin", 0x400000, 0x400000, CRC(78ceb519) SHA1(e61c0d21b6dc37a9293e72814474f5aee59115ad) ) ROM_LOAD( "931a11.bin", 0x800000, 0x400000, CRC(9c8362b2) SHA1(a8158c4db386e2bbd61dc9a600720f07a1eba294) ) @@ -1503,7 +1503,7 @@ ROM_START(gradius4) ROM_REGION(0x80000, "audiocpu", 0) /* 68K Program */ ROM_LOAD16_WORD_SWAP( "837a08.7s", 0x000000, 0x080000, CRC(c3a7ff56) SHA1(9d8d033277d560b58da151338d14b4758a9235ea) ) - ROM_REGION(0x800000, "rf", 0) /* PCM sample roms */ + ROM_REGION(0x800000, "rfsnd", 0) /* PCM sample roms */ ROM_LOAD( "837a09.16p", 0x000000, 0x400000, CRC(fb8f3dc2) SHA1(69e314ac06308c5a24309abc3d7b05af6c0302a8) ) ROM_LOAD( "837a10.14p", 0x400000, 0x400000, CRC(1419cad2) SHA1(a6369a5c29813fa51e8246d0c091736f32994f3d) ) @@ -1529,7 +1529,7 @@ ROM_START(nbapbp) ROM_REGION(0x80000, "audiocpu", 0) /* 68K Program */ ROM_LOAD16_WORD_SWAP( "778a08.7s", 0x000000, 0x080000, CRC(6259b4bf) SHA1(d0c38870495c9a07984b4b85e736d6477dd44832) ) - ROM_REGION(0x1000000, "rf", 0) /* PCM sample roms */ + ROM_REGION(0x1000000, "rfsnd", 0) /* PCM sample roms */ ROM_LOAD( "778a09.16p", 0x000000, 0x400000, CRC(e8c6fd93) SHA1(dd378b67b3b7dd932e4b39fbf4321e706522247f) ) ROM_LOAD( "778a10.14p", 0x400000, 0x400000, CRC(c6a0857b) SHA1(976734ba56460fcc090619fbba043a3d888c4f4e) ) ROM_LOAD( "778a11.12p", 0x800000, 0x400000, CRC(40199382) SHA1(bee268adf9b6634a4f6bb39278ecd02f2bdcb1f4) ) @@ -1555,7 +1555,7 @@ ROM_START(terabrst) ROM_REGION(0x80000, "audiocpu", 0) /* 68K Program */ ROM_LOAD16_WORD_SWAP( "715a08.7s", 0x000000, 0x080000, CRC(3aa2f4a5) SHA1(bb43e5f5ef4ac51f228d4d825be66d3c720d51ea) ) - ROM_REGION(0x1000000, "rf", 0) /* PCM sample roms */ + ROM_REGION(0x1000000, "rfsnd", 0) /* PCM sample roms */ ROM_LOAD( "715a09.16p", 0x000000, 0x400000, CRC(65845866) SHA1(d2a63d0deef1901e6fa21b55c5f96e1f781dceda) ) ROM_LOAD( "715a10.14p", 0x400000, 0x400000, CRC(294fe71b) SHA1(ac5fff5627df1cee4f1e1867377f208b34334899) ) @@ -1582,7 +1582,7 @@ ROM_START(terabrsta) ROM_REGION(0x80000, "audiocpu", 0) /* 68K Program */ ROM_LOAD16_WORD_SWAP( "715a08.7s", 0x000000, 0x080000, CRC(3aa2f4a5) SHA1(bb43e5f5ef4ac51f228d4d825be66d3c720d51ea) ) - ROM_REGION(0x1000000, "rf", 0) /* PCM sample roms */ + ROM_REGION(0x1000000, "rfsnd", 0) /* PCM sample roms */ ROM_LOAD( "715a09.16p", 0x000000, 0x400000, CRC(65845866) SHA1(d2a63d0deef1901e6fa21b55c5f96e1f781dceda) ) ROM_LOAD( "715a10.14p", 0x400000, 0x400000, CRC(294fe71b) SHA1(ac5fff5627df1cee4f1e1867377f208b34334899) ) diff --git a/src/mame/drivers/hotblock.c b/src/mame/drivers/hotblock.c index a4016c8b153..000d2f3ff85 100644 --- a/src/mame/drivers/hotblock.c +++ b/src/mame/drivers/hotblock.c @@ -109,8 +109,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hotblock_io, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x0000, 0x0000) AM_WRITE(hotblock_port0_w) AM_RANGE(0x0004, 0x0004) AM_READ(hotblock_port4_r) AM_WRITE(hotblock_port4_w) - AM_RANGE(0x8000, 0x8001) AM_DEVWRITE("ay", ay8910_address_data_w) - AM_RANGE(0x8001, 0x8001) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x8000, 0x8001) AM_DEVWRITE("aysnd", ay8910_address_data_w) + AM_RANGE(0x8001, 0x8001) AM_DEVREAD("aysnd", ay8910_r) ADDRESS_MAP_END @@ -211,7 +211,7 @@ static MACHINE_DRIVER_START( hotblock ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 1000000) + MDRV_SOUND_ADD("aysnd", AY8910, 1000000) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/hvyunit.c b/src/mame/drivers/hvyunit.c index 2de23d4cc86..40b627f3534 100644 --- a/src/mame/drivers/hvyunit.c +++ b/src/mame/drivers/hvyunit.c @@ -428,7 +428,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START(sound_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(sound_bankswitch_w) - AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0x04, 0x04) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -668,7 +668,7 @@ static MACHINE_DRIVER_START( hvyunit ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 3000000) + MDRV_SOUND_ADD("ymsnd", YM2203, 3000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MACHINE_DRIVER_END diff --git a/src/mame/drivers/hyhoo.c b/src/mame/drivers/hyhoo.c index 62a50c165c6..3d17c515732 100644 --- a/src/mame/drivers/hyhoo.c +++ b/src/mame/drivers/hyhoo.c @@ -64,8 +64,8 @@ static ADDRESS_MAP_START( hyhoo_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) // AM_RANGE(0x00, 0x00) AM_WRITE(nb1413m3_nmi_clock_w) AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r) - AM_RANGE(0x81, 0x81) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x82, 0x83) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x81, 0x81) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x82, 0x83) AM_DEVWRITE("aysnd", ay8910_data_address_w) AM_RANGE(0x90, 0x90) AM_READ_PORT("SYSTEM") AM_RANGE(0x90, 0x97) AM_WRITE(hyhoo_blitter_w) AM_RANGE(0xa0, 0xa0) AM_READWRITE(nb1413m3_inputport1_r, nb1413m3_inputportsel_w) @@ -277,7 +277,7 @@ static MACHINE_DRIVER_START( hyhoo ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 1250000) + MDRV_SOUND_ADD("aysnd", AY8910, 1250000) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35) diff --git a/src/mame/drivers/hyperspt.c b/src/mame/drivers/hyperspt.c index c0e41ecc5e0..3ac7d99ed14 100644 --- a/src/mame/drivers/hyperspt.c +++ b/src/mame/drivers/hyperspt.c @@ -103,7 +103,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc000, 0xdfff) AM_DEVWRITE("vlm", hyperspt_sound_w) /* speech and output control */ AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("dac", dac_w) AM_RANGE(0xe001, 0xe001) AM_WRITE(konami_SN76496_latch_w) /* Loads the snd command into the snd latch */ - AM_RANGE(0xe002, 0xe002) AM_DEVWRITE("sn", konami_SN76496_w) /* This address triggers the SN chip to read the data port. */ + AM_RANGE(0xe002, 0xe002) AM_DEVWRITE("snsnd", konami_SN76496_w) /* This address triggers the SN chip to read the data port. */ ADDRESS_MAP_END static ADDRESS_MAP_START( soundb_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -115,7 +115,7 @@ static ADDRESS_MAP_START( soundb_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc000, 0xdfff) AM_WRITE(hyprolyb_adpcm_w) /* speech and output control */ AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("dac", dac_w) AM_RANGE(0xe001, 0xe001) AM_WRITE(konami_SN76496_latch_w) /* Loads the snd command into the snd latch */ - AM_RANGE(0xe002, 0xe002) AM_DEVWRITE("sn", konami_SN76496_w) /* This address triggers the SN chip to read the data port. */ + AM_RANGE(0xe002, 0xe002) AM_DEVWRITE("snsnd", konami_SN76496_w) /* This address triggers the SN chip to read the data port. */ ADDRESS_MAP_END static INPUT_PORTS_START( hyperspt ) @@ -327,7 +327,7 @@ static MACHINE_DRIVER_START( hyperspt ) MDRV_SOUND_ADD("dac", DAC, 0) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - MDRV_SOUND_ADD("sn", SN76496, XTAL_14_31818MHz/8) /* verified on pcb */ + MDRV_SOUND_ADD("snsnd", SN76496, XTAL_14_31818MHz/8) /* verified on pcb */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_SOUND_ADD("vlm", VLM5030, XTAL_3_579545MHz) /* verified on pcb */ diff --git a/src/mame/drivers/hyprduel.c b/src/mame/drivers/hyprduel.c index e4e79869bc1..8166f89c9b0 100644 --- a/src/mame/drivers/hyprduel.c +++ b/src/mame/drivers/hyprduel.c @@ -461,7 +461,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hyprduel_map2, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x003fff) AM_RAM AM_SHARE(1) /* shadow ($c00000 - $c03fff : vector) */ AM_RANGE(0x004000, 0x007fff) AM_RAM AM_WRITENOP AM_SHARE(3) /* shadow ($fe4000 - $fe7fff : read only) */ - AM_RANGE(0x400000, 0x400003) AM_DEVREADWRITE8("ym", ym2151_r, ym2151_w, 0x00ff ) + AM_RANGE(0x400000, 0x400003) AM_DEVREADWRITE8("ymsnd", ym2151_r, ym2151_w, 0x00ff ) AM_RANGE(0x400004, 0x400005) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x800000, 0x800001) AM_NOP AM_RANGE(0xc00000, 0xc07fff) AM_RAM AM_SHARE(1) @@ -508,7 +508,7 @@ static ADDRESS_MAP_START( magerror_map2, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x003fff) AM_RAM AM_SHARE(1) /* shadow ($c00000 - $c03fff : vector) */ AM_RANGE(0x004000, 0x007fff) AM_RAM AM_WRITENOP AM_SHARE(3) /* shadow ($fe4000 - $fe7fff : read only) */ AM_RANGE(0x400000, 0x400003) AM_NOP - AM_RANGE(0x800000, 0x800003) AM_READNOP AM_DEVWRITE8("ym", ym2413_w, 0x00ff) + AM_RANGE(0x800000, 0x800003) AM_READNOP AM_DEVWRITE8("ymsnd", ym2413_w, 0x00ff) AM_RANGE(0x800004, 0x800005) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0xc00000, 0xc1ffff) AM_RAM AM_SHARE(1) AM_RANGE(0xfe0000, 0xfe3fff) AM_RAM AM_SHARE(2) @@ -729,7 +729,7 @@ static MACHINE_DRIVER_START( hyprduel ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 4000000) + MDRV_SOUND_ADD("ymsnd", YM2151, 4000000) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) @@ -773,7 +773,7 @@ static MACHINE_DRIVER_START( magerror ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2413, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2413, 3579545) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.00) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00) diff --git a/src/mame/drivers/igs009.c b/src/mame/drivers/igs009.c index 17041d3916c..cb2eec7dd74 100644 --- a/src/mame/drivers/igs009.c +++ b/src/mame/drivers/igs009.c @@ -438,7 +438,7 @@ static ADDRESS_MAP_START( jingbell_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x6492, 0x6492 ) AM_WRITE( jingbell_leds_w ) AM_RANGE( 0x64a0, 0x64a0 ) AM_READ_PORT( "BUTTONS2" ) - AM_RANGE( 0x64b0, 0x64b1 ) AM_DEVWRITE( "ym", ym2413_w ) + AM_RANGE( 0x64b0, 0x64b1 ) AM_DEVWRITE( "ymsnd", ym2413_w ) AM_RANGE( 0x64c0, 0x64c0 ) AM_DEVREADWRITE( "oki", okim6295_r, okim6295_w ) @@ -657,7 +657,7 @@ static MACHINE_DRIVER_START( jingbell ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2413, XTAL_3_579545MHz) + MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_SOUND_ADD("oki", OKIM6295, XTAL_12MHz / 12) diff --git a/src/mame/drivers/igs011.c b/src/mame/drivers/igs011.c index 16702410768..923fdd703ca 100644 --- a/src/mame/drivers/igs011.c +++ b/src/mame/drivers/igs011.c @@ -1197,7 +1197,7 @@ static ADDRESS_MAP_START( drgnwrld, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE( 0x400000, 0x401fff ) AM_RAM_WRITE( igs011_palette ) AM_BASE( &paletteram16 ) AM_RANGE( 0x500000, 0x500001 ) AM_READ_PORT( "COIN" ) AM_RANGE( 0x600000, 0x600001 ) AM_DEVREADWRITE8( "oki", okim6295_r, okim6295_w, 0x00ff ) - AM_RANGE( 0x700000, 0x700003 ) AM_DEVWRITE8( "ym", ym3812_w, 0x00ff ) + AM_RANGE( 0x700000, 0x700003 ) AM_DEVWRITE8( "ymsnd", ym3812_w, 0x00ff ) AM_RANGE( 0x800000, 0x800003 ) AM_WRITE( drgnwrld_magic_w ) AM_RANGE( 0x800002, 0x800003 ) AM_READ ( drgnwrld_magic_r ) AM_RANGE( 0xa20000, 0xa20001 ) AM_WRITE( igs011_priority_w ) @@ -1219,7 +1219,7 @@ static ADDRESS_MAP_START( lhb2, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE( 0x000000, 0x07ffff ) AM_ROM AM_RANGE( 0x100000, 0x103fff ) AM_RAM AM_BASE( &generic_nvram16 ) AM_SIZE( &generic_nvram_size ) AM_RANGE( 0x200000, 0x200001 ) AM_DEVREADWRITE8( "oki", okim6295_r, okim6295_w, 0x00ff ) - AM_RANGE( 0x204000, 0x204003 ) AM_DEVWRITE8( "ym", ym2413_w, 0x00ff ) + AM_RANGE( 0x204000, 0x204003 ) AM_DEVWRITE8( "ymsnd", ym2413_w, 0x00ff ) AM_RANGE( 0x208000, 0x208003 ) AM_WRITE( lhb2_magic_w ) AM_RANGE( 0x208002, 0x208003 ) AM_READ ( lhb2_magic_r ) AM_RANGE( 0x20c000, 0x20cfff ) AM_RAM AM_BASE(&igs011_priority_ram) @@ -2549,7 +2549,7 @@ static MACHINE_DRIVER_START( lhb2 ) // MDRV_GFXDECODE(lhb2) - MDRV_SOUND_ADD("ym", YM2413, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2413, 3579545) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0) MACHINE_DRIVER_END @@ -2560,7 +2560,7 @@ static MACHINE_DRIVER_START( drgnwrld ) MDRV_CPU_PROGRAM_MAP(drgnwrld) MDRV_CPU_VBLANK_INT_HACK(lhb2_interrupt,1+4) // lev5 frequency drives the music tempo - MDRV_SOUND_ADD("ym", YM3812, 3579545) + MDRV_SOUND_ADD("ymsnd", YM3812, 3579545) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/igs017.c b/src/mame/drivers/igs017.c index 40eb1c02010..90a20e0b1f4 100644 --- a/src/mame/drivers/igs017.c +++ b/src/mame/drivers/igs017.c @@ -1111,7 +1111,7 @@ static ADDRESS_MAP_START( iqblocka_io, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0xa000, 0xa000 ) AM_READ_PORT( "BUTTONS" ) - AM_RANGE( 0xb000, 0xb001 ) AM_DEVWRITE( "ym", ym2413_w ) + AM_RANGE( 0xb000, 0xb001 ) AM_DEVWRITE( "ymsnd", ym2413_w ) ADDRESS_MAP_END @@ -2008,7 +2008,7 @@ static MACHINE_DRIVER_START( iqblocka ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2413, XTAL_3_579545MHz) + MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MDRV_SOUND_ADD("oki", OKIM6295, XTAL_16MHz / 16) diff --git a/src/mame/drivers/igspoker.c b/src/mame/drivers/igspoker.c index 497f9a4e731..0d49f4e6aac 100644 --- a/src/mame/drivers/igspoker.c +++ b/src/mame/drivers/igspoker.c @@ -312,7 +312,7 @@ static ADDRESS_MAP_START( igspoker_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x5090, 0x5090) AM_WRITE(custom_io_w) AM_RANGE(0x5091, 0x5091) AM_READ(custom_io_r) AM_WRITE( igs_lamps_w ) /* Keyboard */ AM_RANGE(0x50a0, 0x50a0) AM_READ_PORT("BUTTONS2") /* Not connected */ - AM_RANGE(0x50b0, 0x50b1) AM_DEVWRITE("ym", ym2413_w) + AM_RANGE(0x50b0, 0x50b1) AM_DEVWRITE("ymsnd", ym2413_w) AM_RANGE(0x50c0, 0x50c0) AM_READ(igs_irqack_r) AM_WRITE(igs_irqack_w) AM_RANGE(0x6800, 0x6fff) AM_RAM_WRITE( bg_tile_w ) AM_BASE( &bg_tile_ram ) AM_RANGE(0x7000, 0x77ff) AM_RAM_WRITE( fg_tile_w ) AM_BASE( &fg_tile_ram ) @@ -1582,7 +1582,7 @@ static MACHINE_DRIVER_START( igspoker ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2413, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2413, 3579545) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/imolagp.c b/src/mame/drivers/imolagp.c index c14aac76974..636987d2e2c 100644 --- a/src/mame/drivers/imolagp.c +++ b/src/mame/drivers/imolagp.c @@ -327,10 +327,10 @@ static ADDRESS_MAP_START( imolagp_master, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2802, 0x2802) AM_READ(steerlatch_r) AM_WRITENOP /* AM_RANGE(0x2803, 0x2803) ? */ AM_RANGE(0x3000, 0x3000) AM_WRITE(vreg_control_w) - AM_RANGE(0x37f0, 0x37f0) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x37f0, 0x37f0) AM_DEVWRITE("aysnd", ay8910_address_w) /* AM_RANGE(0x37f7, 0x37f7) ? */ AM_RANGE(0x3800, 0x3800) AM_WRITE(vreg_data_w) - AM_RANGE(0x3810, 0x3810) AM_DEVWRITE("ay", ay8910_data_w) + AM_RANGE(0x3810, 0x3810) AM_DEVWRITE("aysnd", ay8910_data_w) AM_RANGE(0x4000, 0x4000) AM_READ_PORT("DSWA") /* DSWA */ AM_RANGE(0x5000, 0x50ff) AM_WRITE(imola_ledram_w) AM_RANGE(0x47ff, 0x4800) AM_WRITE(transmit_data_w) @@ -430,7 +430,7 @@ static MACHINE_DRIVER_START( imolagp ) MDRV_VIDEO_START(imolagp) MDRV_VIDEO_UPDATE(imolagp) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 2000000) + MDRV_SOUND_ADD("aysnd", AY8910, 2000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/inufuku.c b/src/mame/drivers/inufuku.c index cf0dee99316..aed3d94a8b6 100644 --- a/src/mame/drivers/inufuku.c +++ b/src/mame/drivers/inufuku.c @@ -214,7 +214,7 @@ static ADDRESS_MAP_START( inufuku_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(inufuku_soundrombank_w) AM_RANGE(0x04, 0x04) AM_READWRITE(soundlatch_r, pending_command_clear_w) - AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) + AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) ADDRESS_MAP_END /****************************************************************************** @@ -380,7 +380,7 @@ static MACHINE_DRIVER_START( inufuku ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2610, 32000000/4) + MDRV_SOUND_ADD("ymsnd", YM2610, 32000000/4) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "mono", 0.50) MDRV_SOUND_ROUTE(1, "mono", 0.75) @@ -415,7 +415,7 @@ ROM_START( inufuku ) ROM_LOAD16_WORD_SWAP( "lhmn5kua.u36", 0x0400000, 0x400000, CRC(1ac4402a) SHA1(c15acc6fce4fe0b54e92d14c31a1bd78acf2c8fc) ) ROM_LOAD16_WORD_SWAP( "lhmn5ku9.u38", 0x0800000, 0x400000, CRC(e4e9b1b6) SHA1(4d4ad85fbe6a442d4f8cafad748bcae4af6245b7) ) - ROM_REGION( 0x0400000, "ym", 0 ) // adpcm data + ROM_REGION( 0x0400000, "ymsnd", 0 ) // adpcm data ROM_LOAD( "lhmn5ku6.u53", 0x0000000, 0x400000, CRC(b320c5c9) SHA1(7c99da2d85597a3c008ed61a3aa5f47ad36186ec) ) ROM_END diff --git a/src/mame/drivers/iqblock.c b/src/mame/drivers/iqblock.c index ad4b0307114..027c15f7a7a 100644 --- a/src/mame/drivers/iqblock.c +++ b/src/mame/drivers/iqblock.c @@ -134,7 +134,7 @@ static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x5080, 0x5083) AM_DEVREAD("ppi8255", ppi8255_r) AM_RANGE(0x5090, 0x5090) AM_READ_PORT("SW0") AM_RANGE(0x50a0, 0x50a0) AM_READ_PORT("SW1") - AM_RANGE(0x50b0, 0x50b1) AM_DEVWRITE("ym", ym2413_w) // UM3567_data_port_0_w + AM_RANGE(0x50b0, 0x50b1) AM_DEVWRITE("ymsnd", ym2413_w) // UM3567_data_port_0_w AM_RANGE(0x50c0, 0x50c0) AM_WRITE(iqblock_irqack_w) AM_RANGE(0x7000, 0x7fff) AM_READ(iqblock_bgvideoram_r) AM_RANGE(0x8000, 0xffff) AM_READ(extrarom_r) @@ -292,7 +292,7 @@ static MACHINE_DRIVER_START( iqblock ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2413, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2413, 3579545) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c index 4529c115d23..71132a152dc 100644 --- a/src/mame/drivers/itech8.c +++ b/src/mame/drivers/itech8.c @@ -967,7 +967,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound2203_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0000) AM_WRITENOP AM_RANGE(0x1000, 0x1000) AM_READ(sound_data_r) - AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x0002) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x0002) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0x3000, 0x37ff) AM_RAM AM_RANGE(0x4000, 0x4000) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0x8000, 0xffff) AM_ROM @@ -978,7 +978,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound2608b_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1000, 0x1000) AM_WRITENOP AM_RANGE(0x2000, 0x2000) AM_READ(sound_data_r) - AM_RANGE(0x4000, 0x4003) AM_DEVREADWRITE("ym", ym2608_r, ym2608_w) + AM_RANGE(0x4000, 0x4003) AM_DEVREADWRITE("ymsnd", ym2608_r, ym2608_w) AM_RANGE(0x6000, 0x67ff) AM_RAM AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -988,7 +988,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound3812_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0000) AM_WRITENOP AM_RANGE(0x1000, 0x1000) AM_READ(sound_data_r) - AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) + AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w) AM_RANGE(0x3000, 0x37ff) AM_RAM AM_RANGE(0x4000, 0x4000) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0x5000, 0x5003) AM_DEVREADWRITE("pia", pia6821_r, pia6821_w) @@ -1000,7 +1000,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound3812_external_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0000) AM_WRITENOP AM_RANGE(0x1000, 0x1000) AM_READ(sound_data_r) - AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) + AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w) AM_RANGE(0x3000, 0x37ff) AM_RAM AM_RANGE(0x4000, 0x4000) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0x5000, 0x500f) AM_DEVREADWRITE("via6522_0", via_r, via_w) @@ -1763,7 +1763,7 @@ static MACHINE_DRIVER_START( itech8_sound_ym2203 ) MDRV_CPU_PROGRAM_MAP(sound2203_map) /* sound hardware */ - MDRV_SOUND_ADD("ym", YM2203, CLOCK_8MHz/2) + MDRV_SOUND_ADD("ymsnd", YM2203, CLOCK_8MHz/2) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(0, "mono", 0.07) MDRV_SOUND_ROUTE(1, "mono", 0.07) @@ -1783,7 +1783,7 @@ static MACHINE_DRIVER_START( itech8_sound_ym2608b ) MDRV_CPU_PROGRAM_MAP(sound2608b_map) /* sound hardware */ - MDRV_SOUND_ADD("ym", YM2608, CLOCK_8MHz) + MDRV_SOUND_ADD("ymsnd", YM2608, CLOCK_8MHz) MDRV_SOUND_CONFIG(ym2608b_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) MACHINE_DRIVER_END @@ -1798,7 +1798,7 @@ static MACHINE_DRIVER_START( itech8_sound_ym3812 ) MDRV_PIA6821_ADD("pia", pia_interface) /* sound hardware */ - MDRV_SOUND_ADD("ym", YM3812, CLOCK_8MHz/2) + MDRV_SOUND_ADD("ymsnd", YM3812, CLOCK_8MHz/2) MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) @@ -1815,7 +1815,7 @@ static MACHINE_DRIVER_START( itech8_sound_ym3812_external ) MDRV_CPU_PROGRAM_MAP(sound3812_external_map) /* sound hardware */ - MDRV_SOUND_ADD("ym", YM3812, CLOCK_8MHz/2) + MDRV_SOUND_ADD("ymsnd", YM3812, CLOCK_8MHz/2) MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) @@ -2078,7 +2078,7 @@ ROM_START( grmatch ) ROM_LOAD( "grom5.bin", 0xa0000, 0x20000, CRC(37b47b2e) SHA1(352204d3e95e6db556aacf053c42d0d5871245a7) ) ROM_LOAD( "grom6.bin", 0xc0000, 0x20000, CRC(860ee822) SHA1(2ca821c2fa220065b99b99b7487fe9666f338c75) ) - ROM_REGION( 0x20000, "ym", 0 ) + ROM_REGION( 0x20000, "ymsnd", 0 ) ROM_LOAD( "srom0.bin", 0x00000, 0x20000, CRC(49bce954) SHA1(68a8b11c03722349d673f7383288c63054f0d6f6) ) ROM_END diff --git a/src/mame/drivers/jack.c b/src/mame/drivers/jack.c index c159dca4e84..4d734210c54 100644 --- a/src/mame/drivers/jack.c +++ b/src/mame/drivers/jack.c @@ -181,8 +181,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x40, 0x40) AM_DEVREADWRITE("ay", ay8910_r, ay8910_data_w) - AM_RANGE(0x80, 0x80) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x40, 0x40) AM_DEVREADWRITE("aysnd", ay8910_r, ay8910_data_w) + AM_RANGE(0x80, 0x80) AM_DEVWRITE("aysnd", ay8910_address_w) ADDRESS_MAP_END @@ -865,7 +865,7 @@ static MACHINE_DRIVER_START( jack ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 18000000/12) + MDRV_SOUND_ADD("aysnd", AY8910, 18000000/12) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/jackal.c b/src/mame/drivers/jackal.c index d928a6a9621..9b56591e611 100644 --- a/src/mame/drivers/jackal.c +++ b/src/mame/drivers/jackal.c @@ -117,7 +117,7 @@ static ADDRESS_MAP_START( master_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( slave_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x4000, 0x43ff) AM_RAM_WRITE(SMH_RAM) AM_BASE(&paletteram) // self test only checks 0x4000-0x423f, 007327 should actually go up to 4fff AM_RANGE(0x6000, 0x605f) AM_RAM // SOUND RAM (Self test check 0x6000-605f, 0x7c00-0x7fff) AM_RANGE(0x6060, 0x7fff) AM_RAM AM_SHARE(1) @@ -281,7 +281,7 @@ static MACHINE_DRIVER_START( jackal ) // sound hardware MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK) // verified on pcb + MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK) // verified on pcb MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/jackie.c b/src/mame/drivers/jackie.c index c3acf627614..702ae245cb7 100644 --- a/src/mame/drivers/jackie.c +++ b/src/mame/drivers/jackie.c @@ -297,7 +297,7 @@ static ADDRESS_MAP_START( jackie_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x5090, 0x5090) AM_READ_PORT("BUTTONS1") AM_RANGE(0x5091, 0x5091) AM_WRITE( jackie_lamps_w ) AM_RANGE(0x50a0, 0x50a0) AM_READ_PORT("BUTTONS2") - AM_RANGE(0x50b0, 0x50b1) AM_DEVWRITE("ym", ym2413_w) + AM_RANGE(0x50b0, 0x50b1) AM_DEVWRITE("ymsnd", ym2413_w) AM_RANGE(0x50c0, 0x50c0) AM_READ(igs_irqack_r) AM_WRITE(igs_irqack_w) AM_RANGE(0x6000, 0x60ff) AM_RAM_WRITE( bg_scroll_w ) AM_BASE( &bg_scroll ) AM_RANGE(0x6800, 0x69ff) AM_RAM_WRITE( jackie_reel1_ram_w ) AM_BASE( &jackie_reel1_ram ) @@ -481,7 +481,7 @@ static MACHINE_DRIVER_START( jackie ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2413, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2413, 3579545) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/jailbrek.c b/src/mame/drivers/jailbrek.c index 23b682c5265..1c1c6a0f698 100644 --- a/src/mame/drivers/jailbrek.c +++ b/src/mame/drivers/jailbrek.c @@ -153,7 +153,7 @@ static ADDRESS_MAP_START( jailbrek_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2043, 0x2043) AM_WRITENOP /* ??? */ AM_RANGE(0x2044, 0x2044) AM_WRITE(ctrl_w) /* irq, nmi enable, screen flip */ AM_RANGE(0x3000, 0x307f) AM_RAM /* related to sprites? */ - AM_RANGE(0x3100, 0x3100) AM_READ_PORT("DSW2") AM_DEVWRITE("sn", sn76496_w) + AM_RANGE(0x3100, 0x3100) AM_READ_PORT("DSW2") AM_DEVWRITE("snsnd", sn76496_w) AM_RANGE(0x3200, 0x3200) AM_READ_PORT("DSW3") AM_WRITENOP /* mirror of the previous? */ AM_RANGE(0x3300, 0x3300) AM_READ_PORT("SYSTEM") AM_WRITE(watchdog_reset_w) AM_RANGE(0x3301, 0x3301) AM_READ_PORT("P1") @@ -278,7 +278,7 @@ static MACHINE_DRIVER_START( jailbrek ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("sn", SN76489, MASTER_CLOCK/12) + MDRV_SOUND_ADD("snsnd", SN76489, MASTER_CLOCK/12) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_SOUND_ADD("vlm", VLM5030, VOICE_CLOCK) diff --git a/src/mame/drivers/jangou.c b/src/mame/drivers/jangou.c index 452e04a5d5e..0faa8aa1bcb 100644 --- a/src/mame/drivers/jangou.c +++ b/src/mame/drivers/jangou.c @@ -360,8 +360,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cpu0_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x01,0x01) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x02,0x03) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x01,0x01) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x02,0x03) AM_DEVWRITE("aysnd", ay8910_data_address_w) AM_RANGE(0x10,0x10) AM_READ_PORT("DSW") //dsw + blitter busy flag AM_RANGE(0x10,0x10) AM_WRITE(output_w) AM_RANGE(0x11,0x11) AM_WRITE(mux_w) @@ -431,8 +431,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cntrygrl_cpu0_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x01,0x01) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x02,0x03) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x01,0x01) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x02,0x03) AM_DEVWRITE("aysnd", ay8910_data_address_w) AM_RANGE(0x10,0x10) AM_READ_PORT("DSW") //dsw + blitter busy flag AM_RANGE(0x10,0x10) AM_WRITE(output_w) AM_RANGE(0x11,0x11) AM_WRITE(mux_w) @@ -788,7 +788,7 @@ static MACHINE_DRIVER_START( jangou ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, MASTER_CLOCK / 16) + MDRV_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK / 16) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) diff --git a/src/mame/drivers/jollyjgr.c b/src/mame/drivers/jollyjgr.c index 254a432d7f0..dbcae5b8340 100644 --- a/src/mame/drivers/jollyjgr.c +++ b/src/mame/drivers/jollyjgr.c @@ -151,8 +151,8 @@ static ADDRESS_MAP_START( jollyjgr_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0x8ff8, 0x8ff8) AM_READ_PORT("DSW1") AM_RANGE(0x8ff9, 0x8ff9) AM_READ_PORT("INPUTS") - AM_RANGE(0x8ff8, 0x8ff8) AM_DEVWRITE("ay", ay8910_address_w) - AM_RANGE(0x8ffa, 0x8ffa) AM_READ_PORT("SYSTEM") AM_DEVWRITE("ay", ay8910_data_w) + AM_RANGE(0x8ff8, 0x8ff8) AM_DEVWRITE("aysnd", ay8910_address_w) + AM_RANGE(0x8ffa, 0x8ffa) AM_READ_PORT("SYSTEM") AM_DEVWRITE("aysnd", ay8910_data_w) AM_RANGE(0x8fff, 0x8fff) AM_READ_PORT("DSW2") AM_RANGE(0x8ffc, 0x8ffc) AM_WRITE(jollyjgr_misc_w) AM_RANGE(0x8ffd, 0x8ffd) AM_WRITE(jollyjgr_coin_lookout_w) @@ -420,7 +420,7 @@ static MACHINE_DRIVER_START( jollyjgr ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 3579545) + MDRV_SOUND_ADD("aysnd", AY8910, 3579545) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45) MACHINE_DRIVER_END diff --git a/src/mame/drivers/jongkyo.c b/src/mame/drivers/jongkyo.c index 6111feab2bd..4b4b6e35f0b 100644 --- a/src/mame/drivers/jongkyo.c +++ b/src/mame/drivers/jongkyo.c @@ -204,8 +204,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( jongkyo_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) // R 01 keyboard - AM_RANGE(0x01, 0x01) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x02, 0x03) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x01, 0x01) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x02, 0x03) AM_DEVWRITE("aysnd", ay8910_data_address_w) AM_RANGE(0x10, 0x10) AM_READ_PORT("DSW") AM_WRITE(jongkyo_coin_counter_w) AM_RANGE(0x11, 0x11) AM_READ_PORT("IN0") AM_WRITE(mux_w) @@ -437,7 +437,7 @@ static MACHINE_DRIVER_START( jongkyo ) MDRV_VIDEO_UPDATE(jongkyo) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, JONGKYO_CLOCK/8) + MDRV_SOUND_ADD("aysnd", AY8910, JONGKYO_CLOCK/8) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33) MACHINE_DRIVER_END diff --git a/src/mame/drivers/junofrst.c b/src/mame/drivers/junofrst.c index d9963a6a7b4..55922f18d0c 100644 --- a/src/mame/drivers/junofrst.c +++ b/src/mame/drivers/junofrst.c @@ -203,9 +203,9 @@ static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_ROM AM_RANGE(0x2000, 0x23ff) AM_RAM AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_r) - AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("ay", ay8910_address_w) - AM_RANGE(0x4001, 0x4001) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x4002, 0x4002) AM_DEVWRITE("ay", ay8910_data_w) + AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("aysnd", ay8910_address_w) + AM_RANGE(0x4001, 0x4001) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x4002, 0x4002) AM_DEVWRITE("aysnd", ay8910_data_w) AM_RANGE(0x5000, 0x5000) AM_WRITE(soundlatch2_w) AM_RANGE(0x6000, 0x6000) AM_WRITE(junofrst_i8039_irq_w) ADDRESS_MAP_END @@ -304,7 +304,7 @@ static MACHINE_DRIVER_START( junofrst ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 14318000/8) + MDRV_SOUND_ADD("aysnd", AY8910, 14318000/8) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(0, "filter.0.0", 0.30) MDRV_SOUND_ROUTE(1, "filter.0.1", 0.30) diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c index 4b496294b56..96303a6a3e2 100644 --- a/src/mame/drivers/kaneko16.c +++ b/src/mame/drivers/kaneko16.c @@ -889,7 +889,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( blazeon_soundport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x06, 0x06) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -1921,7 +1921,7 @@ static MACHINE_DRIVER_START( blazeon ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 4000000) + MDRV_SOUND_ADD("ymsnd", YM2151, 4000000) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/kangaroo.c b/src/mame/drivers/kangaroo.c index 8705d35b762..dd9b96b99f0 100644 --- a/src/mame/drivers/kangaroo.c +++ b/src/mame/drivers/kangaroo.c @@ -275,8 +275,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_ROM AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x0c00) AM_RAM AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x0fff) AM_READ(soundlatch_r) - AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x0fff) AM_DEVWRITE("ay", ay8910_data_w) - AM_RANGE(0x8000, 0x8000) AM_MIRROR(0x0fff) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x0fff) AM_DEVWRITE("aysnd", ay8910_data_w) + AM_RANGE(0x8000, 0x8000) AM_MIRROR(0x0fff) AM_DEVWRITE("aysnd", ay8910_address_w) ADDRESS_MAP_END @@ -285,8 +285,8 @@ static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x0000, 0x0fff) AM_ROM AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x0c00) AM_RAM AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x0fff) AM_READ(soundlatch_r) - AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x0fff) AM_DEVWRITE("ay", ay8910_data_w) - AM_RANGE(0x8000, 0x8000) AM_MIRROR(0x0fff) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x0fff) AM_DEVWRITE("aysnd", ay8910_data_w) + AM_RANGE(0x8000, 0x8000) AM_MIRROR(0x0fff) AM_DEVWRITE("aysnd", ay8910_address_w) ADDRESS_MAP_END @@ -453,7 +453,7 @@ static MACHINE_DRIVER_START( nomcu ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, MASTER_CLOCK/8) + MDRV_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/8) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/kingdrby.c b/src/mame/drivers/kingdrby.c index f46803770c0..1bff3be3cd8 100644 --- a/src/mame/drivers/kingdrby.c +++ b/src/mame/drivers/kingdrby.c @@ -375,8 +375,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x40, 0x40) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x40, 0x41) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x40, 0x40) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x40, 0x41) AM_DEVWRITE("aysnd", ay8910_data_address_w) ADDRESS_MAP_END /************************************* @@ -720,7 +720,7 @@ static MACHINE_DRIVER_START( kingdrby ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, CLK_1/8) /* guess */ + MDRV_SOUND_ADD("aysnd", AY8910, CLK_1/8) /* guess */ MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_DRIVER_END diff --git a/src/mame/drivers/kingobox.c b/src/mame/drivers/kingobox.c index 54f41034b3e..21f3704b68f 100644 --- a/src/mame/drivers/kingobox.c +++ b/src/mame/drivers/kingobox.c @@ -112,8 +112,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( kingobox_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_DEVWRITE("dac", dac_w) - AM_RANGE(0x08, 0x08) AM_DEVREADWRITE("ay", ay8910_r, ay8910_data_w) - AM_RANGE(0x0c, 0x0c) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x08, 0x08) AM_DEVREADWRITE("aysnd", ay8910_r, ay8910_data_w) + AM_RANGE(0x0c, 0x0c) AM_DEVWRITE("aysnd", ay8910_address_w) ADDRESS_MAP_END /* Ring King */ @@ -157,8 +157,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ringking_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_DEVWRITE("dac", dac_w) - AM_RANGE(0x02, 0x02) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x02, 0x03) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x02, 0x02) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x02, 0x03) AM_DEVWRITE("aysnd", ay8910_data_address_w) ADDRESS_MAP_END @@ -510,7 +510,7 @@ static MACHINE_DRIVER_START( kingofb ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 1500000) + MDRV_SOUND_ADD("aysnd", AY8910, 1500000) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) @@ -560,7 +560,7 @@ static MACHINE_DRIVER_START( ringking ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 1500000) + MDRV_SOUND_ADD("aysnd", AY8910, 1500000) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) diff --git a/src/mame/drivers/kingpin.c b/src/mame/drivers/kingpin.c index 9b2ed37d440..c4ecf4c022a 100644 --- a/src/mame/drivers/kingpin.c +++ b/src/mame/drivers/kingpin.c @@ -164,7 +164,7 @@ static MACHINE_DRIVER_START( kingpin ) /* MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8912, 1500000) + MDRV_SOUND_ADD("aysnd", AY8912, 1500000) MDRV_SOUND_CONFIG(ay8912_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) */ diff --git a/src/mame/drivers/kncljoe.c b/src/mame/drivers/kncljoe.c index 01bb34cc4aa..72d15fc37b6 100644 --- a/src/mame/drivers/kncljoe.c +++ b/src/mame/drivers/kncljoe.c @@ -120,8 +120,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(M6803_PORT1, M6803_PORT1) AM_DEVREADWRITE("ay", m6803_port1_r, m6803_port1_w) - AM_RANGE(M6803_PORT2, M6803_PORT2) AM_DEVREADWRITE("ay", m6803_port2_r, m6803_port2_w) + AM_RANGE(M6803_PORT1, M6803_PORT1) AM_DEVREADWRITE("aysnd", m6803_port1_r, m6803_port1_w) + AM_RANGE(M6803_PORT2, M6803_PORT2) AM_DEVREADWRITE("aysnd", m6803_port2_r, m6803_port2_w) ADDRESS_MAP_END @@ -286,7 +286,7 @@ static MACHINE_DRIVER_START( kncljoe ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */ + MDRV_SOUND_ADD("aysnd", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */ MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) diff --git a/src/mame/drivers/koikoi.c b/src/mame/drivers/koikoi.c index 3cd12031837..4e4b4d25c1a 100644 --- a/src/mame/drivers/koikoi.c +++ b/src/mame/drivers/koikoi.c @@ -130,8 +130,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( koikoi_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x02, 0x02) AM_WRITENOP //unknown , many writes - AM_RANGE(0x03, 0x03) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x06, 0x07) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x03, 0x03) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x06, 0x07) AM_DEVWRITE("aysnd", ay8910_data_address_w) ADDRESS_MAP_END static INPUT_PORTS_START( koikoi ) @@ -267,7 +267,7 @@ static MACHINE_DRIVER_START( koikoi ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, KOIKOI_CRYSTAL/8) + MDRV_SOUND_ADD("aysnd", AY8910, KOIKOI_CRYSTAL/8) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) MACHINE_DRIVER_END diff --git a/src/mame/drivers/ladyfrog.c b/src/mame/drivers/ladyfrog.c index a121b0de0b2..998d681abc3 100644 --- a/src/mame/drivers/ladyfrog.c +++ b/src/mame/drivers/ladyfrog.c @@ -168,7 +168,7 @@ static ADDRESS_MAP_START( ladyfrog_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_RANGE(0xc800, 0xc801) AM_WRITENOP - AM_RANGE(0xc802, 0xc803) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0xc802, 0xc803) AM_DEVWRITE("aysnd", ay8910_address_data_w) AM_RANGE(0xc900, 0xc90d) AM_DEVWRITE("msm", msm5232_w) AM_RANGE(0xca00, 0xca00) AM_WRITENOP AM_RANGE(0xcb00, 0xcb00) AM_WRITENOP @@ -321,7 +321,7 @@ static MACHINE_DRIVER_START( ladyfrog ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 8000000/4) + MDRV_SOUND_ADD("aysnd", AY8910, 8000000/4) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c index 143712fad1d..e7555724d89 100644 --- a/src/mame/drivers/laserbat.c +++ b/src/mame/drivers/laserbat.c @@ -708,7 +708,7 @@ static MACHINE_DRIVER_START( laserbat ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("sn", SN76477, 0) // output not connected + MDRV_SOUND_ADD("snsnd", SN76477, 0) // output not connected MDRV_SOUND_CONFIG(laserbat_sn76477_interface) MDRV_SOUND_ADD("tms1", TMS3615, 4000000/8/2) // 250 kHz, from second chip's clock out diff --git a/src/mame/drivers/lemmings.c b/src/mame/drivers/lemmings.c index a9235f4222f..5191af85eff 100644 --- a/src/mame/drivers/lemmings.c +++ b/src/mame/drivers/lemmings.c @@ -108,7 +108,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM - AM_RANGE(0x0800, 0x0801) AM_DEVREADWRITE("ym", ym2151_r,ym2151_w) + AM_RANGE(0x0800, 0x0801) AM_DEVREADWRITE("ymsnd", ym2151_r,ym2151_w) AM_RANGE(0x1000, 0x1000) AM_DEVREADWRITE("oki", okim6295_r,okim6295_w) AM_RANGE(0x1800, 0x1800) AM_READWRITE(soundlatch_r,lemmings_sound_ack_w) AM_RANGE(0x8000, 0xffff) AM_ROM @@ -277,7 +277,7 @@ static MACHINE_DRIVER_START( lemmings ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 32220000/9) + MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.45) MDRV_SOUND_ROUTE(1, "rspeaker", 0.45) diff --git a/src/mame/drivers/lockon.c b/src/mame/drivers/lockon.c index 39c9a5da824..06022ab4563 100644 --- a/src/mame/drivers/lockon.c +++ b/src/mame/drivers/lockon.c @@ -207,7 +207,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0x02, 0x02) AM_NOP ADDRESS_MAP_END @@ -491,7 +491,7 @@ static MACHINE_DRIVER_START( lockon ) MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2203, XTAL_16MHz / 4) + MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_16MHz / 4) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.40) MDRV_SOUND_ROUTE(0, "rspeaker", 0.40) diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c index e10e6ac1f53..cfb9b17be29 100644 --- a/src/mame/drivers/looping.c +++ b/src/mame/drivers/looping.c @@ -511,8 +511,8 @@ static ADDRESS_MAP_START( looping_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x3fff) AM_RANGE(0x0000, 0x37ff) AM_ROM AM_RANGE(0x3800, 0x3bff) AM_RAM - AM_RANGE(0x3c00, 0x3c00) AM_MIRROR(0x00f4) AM_DEVREADWRITE("ay", ay8910_r, ay8910_address_w) - AM_RANGE(0x3c02, 0x3c02) AM_MIRROR(0x00f4) AM_READNOP AM_DEVWRITE("ay", ay8910_data_w) + AM_RANGE(0x3c00, 0x3c00) AM_MIRROR(0x00f4) AM_DEVREADWRITE("aysnd", ay8910_r, ay8910_address_w) + AM_RANGE(0x3c02, 0x3c02) AM_MIRROR(0x00f4) AM_READNOP AM_DEVWRITE("aysnd", ay8910_data_w) AM_RANGE(0x3c03, 0x3c03) AM_MIRROR(0x00f6) AM_NOP AM_RANGE(0x3e00, 0x3e00) AM_MIRROR(0x00f4) AM_DEVREADWRITE("tms", SMH_NOP, tms5220_data_w) AM_RANGE(0x3e02, 0x3e02) AM_MIRROR(0x00f4) AM_DEVREADWRITE("tms", tms5220_status_r, SMH_NOP) @@ -522,7 +522,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( looping_sound_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x000, 0x000) AM_WRITE(looping_souint_clr) AM_RANGE(0x001, 0x007) AM_DEVWRITE("dac", looping_sound_sw) - AM_RANGE(0x008, 0x008) AM_DEVWRITE("ay", ay_enable_w) + AM_RANGE(0x008, 0x008) AM_DEVWRITE("aysnd", ay_enable_w) AM_RANGE(0x009, 0x009) AM_DEVWRITE("tms", speech_enable_w) AM_RANGE(0x00a, 0x00a) AM_WRITE(ballon_enable_w) AM_RANGE(0x00b, 0x00f) AM_NOP @@ -638,7 +638,7 @@ static MACHINE_DRIVER_START( looping ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, SOUND_CLOCK/4) + MDRV_SOUND_ADD("aysnd", AY8910, SOUND_CLOCK/4) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20) diff --git a/src/mame/drivers/lordgun.c b/src/mame/drivers/lordgun.c index c27ea21408b..dbfcfe2dcbb 100644 --- a/src/mame/drivers/lordgun.c +++ b/src/mame/drivers/lordgun.c @@ -221,7 +221,7 @@ static WRITE8_DEVICE_HANDLER( lordgun_okibank_w ) } static ADDRESS_MAP_START( lordgun_soundio_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x1000, 0x1001) AM_DEVWRITE( "ym", ym3812_w ) + AM_RANGE(0x1000, 0x1001) AM_DEVWRITE( "ymsnd", ym3812_w ) AM_RANGE(0x2000, 0x2000) AM_DEVREADWRITE( "oki", okim6295_r, okim6295_w ) AM_RANGE(0x3000, 0x3000) AM_READ( soundlatch2_r ) AM_RANGE(0x4000, 0x4000) AM_READ( soundlatch_r ) @@ -234,7 +234,7 @@ static ADDRESS_MAP_START( hfh_soundio_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x3000, 0x3000) AM_READ( soundlatch2_r ) AM_RANGE(0x4000, 0x4000) AM_READ( soundlatch_r ) AM_RANGE(0x5000, 0x5000) AM_READ( SMH_NOP ) - AM_RANGE(0x7000, 0x7001) AM_DEVWRITE( "ym", ym3812_w ) + AM_RANGE(0x7000, 0x7001) AM_DEVWRITE( "ymsnd", ym3812_w ) AM_RANGE(0x7400, 0x7400) AM_DEVREADWRITE( "oki", okim6295_r, okim6295_w ) AM_RANGE(0x7800, 0x7800) AM_DEVREADWRITE( "oki2", okim6295_r, okim6295_w ) ADDRESS_MAP_END @@ -441,7 +441,7 @@ static MACHINE_DRIVER_START( lordgun ) // sound hardware MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM3812, 3579545) + MDRV_SOUND_ADD("ymsnd", YM3812, 3579545) MDRV_SOUND_CONFIG(lordgun_ym3812_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) diff --git a/src/mame/drivers/lsasquad.c b/src/mame/drivers/lsasquad.c index af7a7193705..640d9cc8b81 100644 --- a/src/mame/drivers/lsasquad.c +++ b/src/mame/drivers/lsasquad.c @@ -192,8 +192,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( lsasquad_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym", ym2203_r,ym2203_w) - AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ymsnd", ym2203_r,ym2203_w) + AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("aysnd", ay8910_address_data_w) AM_RANGE(0xd000, 0xd000) AM_READWRITE(lsasquad_sh_sound_command_r,lsasquad_sh_result_w) AM_RANGE(0xd400, 0xd400) AM_WRITE(lsasquad_sh_nmi_disable_w) AM_RANGE(0xd800, 0xd800) AM_WRITE(lsasquad_sh_nmi_enable_w) @@ -361,8 +361,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( daikaiju_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) - AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) + AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("aysnd", ay8910_address_data_w) AM_RANGE(0xd000, 0xd000) AM_READ(daikaiju_sh_sound_command_r) AM_RANGE(0xd400, 0xd400) AM_WRITENOP AM_RANGE(0xd800, 0xd800) AM_READ(daikaiju_sound_status_r) AM_WRITENOP @@ -562,10 +562,10 @@ static MACHINE_DRIVER_START( lsasquad ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 3000000) + MDRV_SOUND_ADD("aysnd", AY8910, 3000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12) - MDRV_SOUND_ADD("ym", YM2203, 3000000) + MDRV_SOUND_ADD("ymsnd", YM2203, 3000000) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(0, "mono", 0.12) MDRV_SOUND_ROUTE(1, "mono", 0.12) @@ -607,10 +607,10 @@ static MACHINE_DRIVER_START( daikaiju ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 3000000) + MDRV_SOUND_ADD("aysnd", AY8910, 3000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12) - MDRV_SOUND_ADD("ym", YM2203, 3000000) + MDRV_SOUND_ADD("ymsnd", YM2203, 3000000) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(0, "mono", 0.12) MDRV_SOUND_ROUTE(1, "mono", 0.12) diff --git a/src/mame/drivers/ltcasino.c b/src/mame/drivers/ltcasino.c index e50d98cbc6a..368ab380669 100644 --- a/src/mame/drivers/ltcasino.c +++ b/src/mame/drivers/ltcasino.c @@ -69,9 +69,9 @@ static ADDRESS_MAP_START( ltcasino_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xec10, 0xec10) AM_READ_PORT("IN4") AM_RANGE(0xec12, 0xec12) AM_READ_PORT("IN5") - AM_RANGE(0xec20, 0xec20) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0xec20, 0xec20) AM_DEVREAD("aysnd", ay8910_r) AM_RANGE(0xec21, 0xec21) AM_READ_PORT("BUTTONS") //ltcasino -> pc: F3F3 (A in service) and F3FD (B in service) - AM_RANGE(0xec20, 0xec21) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0xec20, 0xec21) AM_DEVWRITE("aysnd", ay8910_data_address_w) AM_RANGE(0xec3e, 0xec3e) AM_READNOP //not used AM_RANGE(0xec30, 0xec3f) AM_RAM AM_RANGE(0xf000, 0xffff) AM_ROM @@ -649,7 +649,7 @@ static MACHINE_DRIVER_START( ltcasino ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 1000000) + MDRV_SOUND_ADD("aysnd", AY8910, 1000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4) MACHINE_DRIVER_END diff --git a/src/mame/drivers/lucky74.c b/src/mame/drivers/lucky74.c index 6998804adfc..73b68605145 100644 --- a/src/mame/drivers/lucky74.c +++ b/src/mame/drivers/lucky74.c @@ -831,9 +831,9 @@ static ADDRESS_MAP_START( lucky74_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xf100, 0xf100) AM_DEVWRITE("sn1", sn76496_w) /* SN76489 #1 */ AM_RANGE(0xf200, 0xf203) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) /* Input Ports 2 & 4 */ AM_RANGE(0xf300, 0xf300) AM_DEVWRITE("sn2", sn76496_w) /* SN76489 #2 */ - AM_RANGE(0xf400, 0xf400) AM_DEVWRITE("ay", ay8910_address_w) /* YM2149 control */ + AM_RANGE(0xf400, 0xf400) AM_DEVWRITE("aysnd", ay8910_address_w) /* YM2149 control */ AM_RANGE(0xf500, 0xf500) AM_DEVWRITE("sn3", sn76496_w) /* SN76489 #3 */ - AM_RANGE(0xf600, 0xf600) AM_DEVREADWRITE("ay", ay8910_r, ay8910_data_w) /* YM2149 (Input Port 1) */ + AM_RANGE(0xf600, 0xf600) AM_DEVREADWRITE("aysnd", ay8910_r, ay8910_data_w) /* YM2149 (Input Port 1) */ AM_RANGE(0xf700, 0xf701) AM_READWRITE(usart_8251_r, usart_8251_w) /* USART 8251 port */ AM_RANGE(0xf800, 0xf803) AM_READWRITE(copro_sm7831_r, copro_sm7831_w) /* SM7831 Co-Processor */ ADDRESS_MAP_END @@ -1284,7 +1284,7 @@ static MACHINE_DRIVER_START( lucky74 ) MDRV_SOUND_ADD("sn3", SN76489, C_06B49P_CLKOUT_03) /* 3 MHz. */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - MDRV_SOUND_ADD("ay", AY8910, C_06B49P_CLKOUT_04) /* 1.5 MHz. */ + MDRV_SOUND_ADD("aysnd", AY8910, C_06B49P_CLKOUT_04) /* 1.5 MHz. */ MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.00) /* not routed to audio hardware */ diff --git a/src/mame/drivers/lvcards.c b/src/mame/drivers/lvcards.c index 2e4b9a60c13..6d9acb39b65 100644 --- a/src/mame/drivers/lvcards.c +++ b/src/mame/drivers/lvcards.c @@ -177,8 +177,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( lvcards_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x00, 0x00) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_data_address_w) ADDRESS_MAP_END static ADDRESS_MAP_START( lvpoker_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -495,7 +495,7 @@ static MACHINE_DRIVER_START( lvcards ) // sound hardware MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 18432000/12) + MDRV_SOUND_ADD("aysnd", AY8910, 18432000/12) MDRV_SOUND_CONFIG(lcay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_DRIVER_END diff --git a/src/mame/drivers/m107.c b/src/mame/drivers/m107.c index 376bdf558d5..629d7fdb48f 100644 --- a/src/mame/drivers/m107.c +++ b/src/mame/drivers/m107.c @@ -194,7 +194,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x9ff00, 0x9ffff) AM_WRITENOP /* Irq controller? */ AM_RANGE(0xa0000, 0xa3fff) AM_RAM AM_RANGE(0xa8000, 0xa803f) AM_DEVREADWRITE8("irem", irem_ga20_r, irem_ga20_w, 0x00ff) - AM_RANGE(0xa8040, 0xa8043) AM_DEVREADWRITE8("ym", ym2151_r, ym2151_w, 0x00ff) + AM_RANGE(0xa8040, 0xa8043) AM_DEVREADWRITE8("ymsnd", ym2151_r, ym2151_w, 0x00ff) AM_RANGE(0xa8044, 0xa8045) AM_READWRITE(m107_soundlatch_r, m107_sound_irq_ack_w) AM_RANGE(0xa8046, 0xa8047) AM_WRITE(m107_sound_status_w) AM_RANGE(0xffff0, 0xfffff) AM_ROM @@ -466,7 +466,7 @@ static MACHINE_DRIVER_START( firebarr ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 14318180/4) + MDRV_SOUND_ADD("ymsnd", YM2151, 14318180/4) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.40) MDRV_SOUND_ROUTE(1, "rspeaker", 0.40) diff --git a/src/mame/drivers/m72.c b/src/mame/drivers/m72.c index b678487ee22..6476b98f856 100644 --- a/src/mame/drivers/m72.c +++ b/src/mame/drivers/m72.c @@ -1027,7 +1027,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( rtype_sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x02, 0x02) AM_READ(soundlatch_r) AM_RANGE(0x06, 0x06) AM_WRITE(m72_sound_irq_ack_w) AM_RANGE(0x84, 0x84) AM_READ(m72_sample_r) @@ -1035,7 +1035,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x02, 0x02) AM_READ(soundlatch_r) AM_RANGE(0x06, 0x06) AM_WRITE(m72_sound_irq_ack_w) AM_RANGE(0x82, 0x82) AM_DEVWRITE("dac", m72_sample_w) @@ -1044,7 +1044,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( rtype2_sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x80, 0x80) AM_READ(soundlatch_r) AM_RANGE(0x80, 0x81) AM_WRITE(rtype2_sample_addr_w) AM_RANGE(0x82, 0x82) AM_DEVWRITE("dac", m72_sample_w) @@ -1055,7 +1055,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( poundfor_sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x10, 0x13) AM_WRITE(poundfor_sample_addr_w) - AM_RANGE(0x40, 0x41) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x40, 0x41) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x42, 0x42) AM_READ(soundlatch_r) AM_RANGE(0x42, 0x42) AM_WRITE(m72_sound_irq_ack_w) ADDRESS_MAP_END @@ -1810,7 +1810,7 @@ static MACHINE_DRIVER_START( rtype ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK) + MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -1844,7 +1844,7 @@ static MACHINE_DRIVER_START( m72_base ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK) + MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -1904,7 +1904,7 @@ static MACHINE_DRIVER_START( dkgenm72 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK) + MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -1945,7 +1945,7 @@ static MACHINE_DRIVER_START( xmultipl ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK) + MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -1986,7 +1986,7 @@ static MACHINE_DRIVER_START( dbreed ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK) + MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -2026,7 +2026,7 @@ static MACHINE_DRIVER_START( dbreed72 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK) + MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -2067,7 +2067,7 @@ static MACHINE_DRIVER_START( rtype2 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK) + MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -2107,7 +2107,7 @@ static MACHINE_DRIVER_START( majtitle ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK) + MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -2147,7 +2147,7 @@ static MACHINE_DRIVER_START( hharry ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK) + MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -2188,7 +2188,7 @@ static MACHINE_DRIVER_START( hharryu ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK) + MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -2229,7 +2229,7 @@ static MACHINE_DRIVER_START( poundfor ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK) + MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -2269,7 +2269,7 @@ static MACHINE_DRIVER_START( cosmccop ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK) + MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/m90.c b/src/mame/drivers/m90.c index f0558d02b4d..d299c18343c 100644 --- a/src/mame/drivers/m90.c +++ b/src/mame/drivers/m90.c @@ -149,7 +149,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( m90_sound_cpu_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x80, 0x80) AM_READ(soundlatch_r) AM_RANGE(0x80, 0x81) AM_WRITE(rtype2_sample_addr_w) AM_RANGE(0x82, 0x82) AM_DEVWRITE("dac", m72_sample_w) @@ -159,7 +159,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bbmanw_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x40, 0x41) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x40, 0x41) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x42, 0x42) AM_READWRITE(soundlatch_r, m72_sound_irq_ack_w) // AM_RANGE(0x40, 0x41) AM_WRITE(rtype2_sample_addr_w) // AM_RANGE(0x41, 0x41) AM_READ(m72_sample_r) @@ -729,7 +729,7 @@ static MACHINE_DRIVER_START( m90 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "mono", 0.15) MDRV_SOUND_ROUTE(1, "mono", 0.15) @@ -809,7 +809,7 @@ static MACHINE_DRIVER_START( bombrman ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "mono", 0.15) MDRV_SOUND_ROUTE(1, "mono", 0.15) @@ -853,7 +853,7 @@ static MACHINE_DRIVER_START( bbmanw ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "mono", 0.15) MDRV_SOUND_ROUTE(1, "mono", 0.15) @@ -922,7 +922,7 @@ static MACHINE_DRIVER_START( dynablsb ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "mono", 0.15) MDRV_SOUND_ROUTE(1, "mono", 0.15) diff --git a/src/mame/drivers/m92.c b/src/mame/drivers/m92.c index 86078ab395c..73aff3013ff 100644 --- a/src/mame/drivers/m92.c +++ b/src/mame/drivers/m92.c @@ -422,7 +422,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x9ff00, 0x9ffff) AM_WRITENOP /* Irq controller? */ AM_RANGE(0xa0000, 0xa3fff) AM_RAM AM_RANGE(0xa8000, 0xa803f) AM_DEVREADWRITE8("irem", irem_ga20_r, irem_ga20_w, 0x00ff) - AM_RANGE(0xa8040, 0xa8043) AM_DEVREADWRITE8("ym", ym2151_r, ym2151_w, 0x00ff) + AM_RANGE(0xa8040, 0xa8043) AM_DEVREADWRITE8("ymsnd", ym2151_r, ym2151_w, 0x00ff) AM_RANGE(0xa8044, 0xa8045) AM_READWRITE(m92_soundlatch_r, m92_sound_irq_ack_w) AM_RANGE(0xa8046, 0xa8047) AM_WRITE(m92_sound_status_w) AM_RANGE(0xffff0, 0xfffff) AM_ROM @@ -949,7 +949,7 @@ static MACHINE_DRIVER_START( m92 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 14318180/4) + MDRV_SOUND_ADD("ymsnd", YM2151, 14318180/4) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "mono", 0.40) MDRV_SOUND_ROUTE(1, "mono", 0.40) diff --git a/src/mame/drivers/macs.c b/src/mame/drivers/macs.c index 98c4d58c594..4f01fb59318 100644 --- a/src/mame/drivers/macs.c +++ b/src/mame/drivers/macs.c @@ -74,7 +74,7 @@ static ADDRESS_MAP_START( macs_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd000, 0xdfff) AM_READ(st0016_sprite2_ram_r) AM_WRITE(st0016_sprite2_ram_w) AM_RANGE(0xe000, 0xe7ff) AM_RAM /* work ram ? */ AM_RANGE(0xe800, 0xe87f) AM_RAM AM_BASE(&macs_ram2) - AM_RANGE(0xe900, 0xe9ff) AM_DEVREADWRITE("st", st0016_snd_r, st0016_snd_w) + AM_RANGE(0xe900, 0xe9ff) AM_DEVREADWRITE("stsnd", st0016_snd_r, st0016_snd_w) AM_RANGE(0xea00, 0xebff) AM_READ(st0016_palette_ram_r) AM_WRITE(st0016_palette_ram_w) AM_RANGE(0xec00, 0xec1f) AM_READ(st0016_character_ram_r) AM_WRITE(st0016_character_ram_w) AM_RANGE(0xf000, 0xf7ff) AM_RAMBANK(3) /* common /backup ram ?*/ @@ -424,7 +424,7 @@ static MACHINE_DRIVER_START( macs ) MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("st", ST0016, 0) + MDRV_SOUND_ADD("stsnd", ST0016, 0) MDRV_SOUND_CONFIG(st0016_config) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/madalien.c b/src/mame/drivers/madalien.c index 09a43bd0182..9165c178543 100644 --- a/src/mame/drivers/madalien.c +++ b/src/mame/drivers/madalien.c @@ -112,7 +112,7 @@ static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x03ff) AM_MIRROR(0x1c00) AM_RAM AM_RANGE(0x6000, 0x6003) AM_MIRROR(0x1ffc) AM_RAM /* unknown device in an epoxy block, might be tilt detection */ AM_RANGE(0x8000, 0x8000) AM_MIRROR(0x1ffc) AM_READ(madalien_sound_command_r) - AM_RANGE(0x8000, 0x8001) AM_MIRROR(0x1ffc) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x8000, 0x8001) AM_MIRROR(0x1ffc) AM_DEVWRITE("aysnd", ay8910_address_data_w) AM_RANGE(0x8002, 0x8002) AM_MIRROR(0x1ffc) AM_WRITE(soundlatch2_w) AM_RANGE(0xf800, 0xffff) AM_ROM ADDRESS_MAP_END @@ -188,7 +188,7 @@ static MACHINE_DRIVER_START( madalien ) /* audio hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, SOUND_CLOCK / 4) + MDRV_SOUND_ADD("aysnd", AY8910, SOUND_CLOCK / 4) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE_EX(0, "discrete", 1.0, 0) MDRV_SOUND_ROUTE_EX(1, "discrete", 1.0, 1) diff --git a/src/mame/drivers/magicard.c b/src/mame/drivers/magicard.c index 3edf8530b0c..02075a67499 100644 --- a/src/mame/drivers/magicard.c +++ b/src/mame/drivers/magicard.c @@ -478,7 +478,7 @@ static ADDRESS_MAP_START( magicard_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x001ffc40, 0x001ffc41) AM_MIRROR(0x7fe00000) AM_READ(test_r) AM_RANGE(0x001ffd00, 0x001ffd05) AM_MIRROR(0x7fe00000) AM_WRITE(paletteram_io_w) //RAMDAC /*not the right sound chip,unknown type,it should be an ADPCM with 8 channels.*/ - AM_RANGE(0x001ffd40, 0x001ffd43) AM_MIRROR(0x7fe00000) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) + AM_RANGE(0x001ffd40, 0x001ffd43) AM_MIRROR(0x7fe00000) AM_DEVWRITE8("ymsnd", ym2413_w, 0x00ff) AM_RANGE(0x001ffd80, 0x001ffd81) AM_MIRROR(0x7fe00000) AM_READ(test_r) AM_RANGE(0x001ffd80, 0x001ffd81) AM_MIRROR(0x7fe00000) AM_WRITENOP //? AM_RANGE(0x001fff80, 0x001fffbf) AM_MIRROR(0x7fe00000) AM_RAM //DRAM I/O, not accessed by this game, CD buffer? @@ -543,7 +543,7 @@ static MACHINE_DRIVER_START( magicard ) MDRV_MACHINE_RESET(magicard) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2413, CLOCK_A/12) + MDRV_SOUND_ADD("ymsnd", YM2413, CLOCK_A/12) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/mainevt.c b/src/mame/drivers/mainevt.c index f81e425104e..0f5c5de72c6 100644 --- a/src/mame/drivers/mainevt.c +++ b/src/mame/drivers/mainevt.c @@ -205,7 +205,7 @@ static ADDRESS_MAP_START( devstors_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x83ff) AM_RAM AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE("konami", k007232_r,k007232_w) - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym", ym2151_r,ym2151_w) + AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", ym2151_r,ym2151_w) AM_RANGE(0xe000, 0xe000) AM_WRITE(devstor_sh_irqcontrol_w) AM_RANGE(0xf000, 0xf000) AM_DEVWRITE("konami", dv_sh_bankswitch_w) ADDRESS_MAP_END @@ -441,7 +441,7 @@ static MACHINE_DRIVER_START( devstors ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) MDRV_SOUND_ROUTE(0, "mono", 0.30) MDRV_SOUND_ROUTE(1, "mono", 0.30) diff --git a/src/mame/drivers/matmania.c b/src/mame/drivers/matmania.c index 4aed4ad06f0..fef164ec84f 100644 --- a/src/mame/drivers/matmania.c +++ b/src/mame/drivers/matmania.c @@ -101,7 +101,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( maniach_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_RAM - AM_RANGE(0x2000, 0x2001) AM_DEVWRITE("ym", ym3526_w) + AM_RANGE(0x2000, 0x2001) AM_DEVWRITE("ymsnd", ym3526_w) AM_RANGE(0x2002, 0x2002) AM_DEVWRITE("dac", dac_signed_w) AM_RANGE(0x2004, 0x2004) AM_READ(soundlatch_r) AM_RANGE(0x4000, 0xffff) AM_ROM @@ -357,7 +357,7 @@ static MACHINE_DRIVER_START( maniach ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3526, 3600000) + MDRV_SOUND_ADD("ymsnd", YM3526, 3600000) MDRV_SOUND_CONFIG(ym3526_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/drivers/maygay1b.c b/src/mame/drivers/maygay1b.c index b790d4dd18c..56e1b7f5943 100644 --- a/src/mame/drivers/maygay1b.c +++ b/src/mame/drivers/maygay1b.c @@ -760,15 +760,15 @@ static ADDRESS_MAP_START( m1_memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2070, 0x207f) AM_DEVREADWRITE( "duart68681", duart68681_r, duart68681_w ) - AM_RANGE(0x2090, 0x2091) AM_DEVWRITE("ay", ay8910_address_data_w) - AM_RANGE(0x20B0, 0x20B0) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x2090, 0x2091) AM_DEVWRITE("aysnd", ay8910_address_data_w) + AM_RANGE(0x20B0, 0x20B0) AM_DEVREAD("aysnd", ay8910_r) AM_RANGE(0x20A0, 0x20A3) AM_DEVWRITE("pia", pia6821_w) AM_RANGE(0x20A0, 0x20A3) AM_DEVREAD("pia", pia6821_r) AM_RANGE(0x20C0, 0x20C7) AM_WRITE(m1_latch_w) - AM_RANGE(0x2400, 0x2401) AM_DEVWRITE( "ym", ym2413_w ) + AM_RANGE(0x2400, 0x2401) AM_DEVWRITE( "ymsnd", ym2413_w ) AM_RANGE(0x2800, 0xffff) AM_ROM ADDRESS_MAP_END @@ -804,11 +804,11 @@ static MACHINE_DRIVER_START( m1 ) MDRV_PIA6821_ADD("pia", m1_pia_intf) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay",AY8913, M1_MASTER_CLOCK) + MDRV_SOUND_ADD("aysnd",AY8913, M1_MASTER_CLOCK) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - MDRV_SOUND_ADD("ym", YM2413, M1_MASTER_CLOCK/4) + MDRV_SOUND_ADD("ymsnd", YM2413, M1_MASTER_CLOCK/4) MDRV_SOUND_ADD("msm6376", OKIM6376, M1_MASTER_CLOCK/4) //? MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/drivers/maygayv1.c b/src/mame/drivers/maygayv1.c index 3aba9f38b08..de4a7c0439c 100644 --- a/src/mame/drivers/maygayv1.c +++ b/src/mame/drivers/maygayv1.c @@ -645,7 +645,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x080000, 0x083fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) AM_RANGE(0x100000, 0x17ffff) AM_ROM AM_REGION("maincpu", 0x80000) AM_RANGE(0x820000, 0x820003) AM_READWRITE(maygay_8279_r, maygay_8279_w) - AM_RANGE(0x800000, 0x800003) AM_DEVWRITE8( "ym", ym2413_w, 0xff00 ) + AM_RANGE(0x800000, 0x800003) AM_DEVWRITE8( "ymsnd", ym2413_w, 0xff00 ) AM_RANGE(0x860000, 0x86000d) AM_READWRITE(read_odd, write_odd) AM_RANGE(0x86000e, 0x86000f) AM_WRITE(vsync_int_ctrl) AM_RANGE(0x880000, 0x89ffff) AM_READWRITE(i82716_r, i82716_w) @@ -1025,7 +1025,7 @@ static MACHINE_DRIVER_START( maygayv1 ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym",YM2413, MASTER_CLOCK / 4) + MDRV_SOUND_ADD("ymsnd",YM2413, MASTER_CLOCK / 4) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8) MDRV_SOUND_ADD("upd",UPD7759, UPD7759_STANDARD_CLOCK) diff --git a/src/mame/drivers/mayumi.c b/src/mame/drivers/mayumi.c index 37e13d9128d..7dd35d6ae4d 100644 --- a/src/mame/drivers/mayumi.c +++ b/src/mame/drivers/mayumi.c @@ -88,7 +88,7 @@ static ADDRESS_MAP_START( mayumi_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xc0, 0xc0) AM_WRITE(input_sel_w) AM_RANGE(0xc1, 0xc2) AM_READ(key_matrix_r) // 0xc0-c3 8255ppi AM_RANGE(0xc3, 0xc3) AM_WRITENOP // 0xc0-c3 8255ppi - AM_RANGE(0xd0, 0xd1) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0xd0, 0xd1) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) ADDRESS_MAP_END /****************************************************************************/ @@ -296,7 +296,7 @@ static MACHINE_DRIVER_START( mayumi ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, MCLK/4) + MDRV_SOUND_ADD("ymsnd", YM2203, MCLK/4) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(0, "mono", 0.15) MDRV_SOUND_ROUTE(1, "mono", 0.15) diff --git a/src/mame/drivers/mcatadv.c b/src/mame/drivers/mcatadv.c index f00f31e259c..f2b43a1dd86 100644 --- a/src/mame/drivers/mcatadv.c +++ b/src/mame/drivers/mcatadv.c @@ -219,7 +219,7 @@ static ADDRESS_MAP_START( mcatadv_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM // ROM AM_RANGE(0x4000, 0xbfff) AM_ROMBANK(1) // ROM AM_RANGE(0xc000, 0xdfff) AM_RAM // RAM - AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ym", ym2610_r,ym2610_w) + AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ymsnd", ym2610_r,ym2610_w) AM_RANGE(0xf000, 0xf000) AM_WRITE(mcatadv_sound_bw_w) ADDRESS_MAP_END @@ -237,8 +237,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( nost_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x03) AM_DEVWRITE("ym", ym2610_w) - AM_RANGE(0x04, 0x07) AM_DEVREAD("ym", ym2610_r) + AM_RANGE(0x00, 0x03) AM_DEVWRITE("ymsnd", ym2610_w) + AM_RANGE(0x04, 0x07) AM_DEVREAD("ymsnd", ym2610_r) AM_RANGE(0x40, 0x40) AM_WRITE(mcatadv_sound_bw_w) AM_RANGE(0x80, 0x80) AM_READWRITE(soundlatch_r, soundlatch2_w) ADDRESS_MAP_END @@ -459,7 +459,7 @@ static MACHINE_DRIVER_START( mcatadv ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, XTAL_16MHz/2) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2610, XTAL_16MHz/2) /* verified on pcb */ MDRV_SOUND_CONFIG(mcatadv_ym2610_interface) MDRV_SOUND_ROUTE(0, "lspeaker", 0.32) MDRV_SOUND_ROUTE(0, "rspeaker", 0.32) @@ -509,7 +509,7 @@ ROM_START( mcatadv ) ROM_LOAD( "mca-u61.bin", 0x100000, 0x100000, CRC(51af66c9) SHA1(1055cf78ea286f02003b0d1bf08c2d7829b36f90) ) ROM_LOAD( "mca-u100", 0x200000, 0x080000, CRC(b273f1b0) SHA1(39318fe2aaf2792b85426ec6791b3360ac964de3) ) - ROM_REGION( 0x80000, "ym", 0 ) /* Samples - ADPCM or Delta-T? */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* Samples - ADPCM or Delta-T? */ ROM_LOAD( "mca-u53.bin", 0x00000, 0x80000, CRC(64c76e05) SHA1(379cef5e0cba78d0e886c9cede41985850a3afb7) ) ROM_END @@ -538,7 +538,7 @@ ROM_START( mcatadvj ) ROM_LOAD( "mca-u61.bin", 0x100000, 0x100000, CRC(51af66c9) SHA1(1055cf78ea286f02003b0d1bf08c2d7829b36f90) ) ROM_LOAD( "u100.bin", 0x200000, 0x080000, CRC(e2c311da) SHA1(cc3217484524de94704869eaa9ce1b90393039d8) ) - ROM_REGION( 0x80000, "ym", 0 ) /* Samples - ADPCM or Delta-T? */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* Samples - ADPCM or Delta-T? */ ROM_LOAD( "mca-u53.bin", 0x00000, 0x80000, CRC(64c76e05) SHA1(379cef5e0cba78d0e886c9cede41985850a3afb7) ) ROM_END @@ -567,7 +567,7 @@ ROM_START( catt ) ROM_LOAD( "mca-u61.bin", 0x100000, 0x100000, CRC(51af66c9) SHA1(1055cf78ea286f02003b0d1bf08c2d7829b36f90) ) ROM_LOAD( "mca-u100", 0x200000, 0x080000, CRC(b273f1b0) SHA1(39318fe2aaf2792b85426ec6791b3360ac964de3) ) - ROM_REGION( 0x100000, "ym", 0 ) /* Samples - ADPCM or Delta-T? */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* Samples - ADPCM or Delta-T? */ ROM_LOAD( "u53.bin", 0x00000, 0x100000, CRC(99f2a624) SHA1(799e8e40e8bdcc8fa4cd763a366cc32473038a49) ) ROM_REGION( 0x0400, "plds", 0 ) @@ -600,7 +600,7 @@ ROM_START( nost ) ROM_LOAD( "nos-b1-0.u60", 0x000000, 0x100000, CRC(ba6fd0c7) SHA1(516d6e0c4dc6fb12ec9f30877ea1c582e7440a19) ) ROM_LOAD( "nos-b1-1.u61", 0x100000, 0x080000, CRC(dabd8009) SHA1(1862645b8d6216c3ec2b8dbf74816b8e29dea14f) ) - ROM_REGION( 0x100000, "ym", 0 ) /* Samples - ADPCM or Delta-T? */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* Samples - ADPCM or Delta-T? */ ROM_LOAD( "nossn-00.u53", 0x00000, 0x100000, CRC(3bd1bcbc) SHA1(1bcad43792e985402db4eca122676c2c555f3313) ) ROM_END @@ -629,7 +629,7 @@ ROM_START( nostj ) ROM_LOAD( "nos-b1-0.u60", 0x000000, 0x100000, CRC(ba6fd0c7) SHA1(516d6e0c4dc6fb12ec9f30877ea1c582e7440a19) ) ROM_LOAD( "nos-b1-1.u61", 0x100000, 0x080000, CRC(dabd8009) SHA1(1862645b8d6216c3ec2b8dbf74816b8e29dea14f) ) - ROM_REGION( 0x100000, "ym", 0 ) /* Samples - ADPCM or Delta-T? */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* Samples - ADPCM or Delta-T? */ ROM_LOAD( "nossn-00.u53", 0x00000, 0x100000, CRC(3bd1bcbc) SHA1(1bcad43792e985402db4eca122676c2c555f3313) ) ROM_END @@ -658,7 +658,7 @@ ROM_START( nostk ) ROM_LOAD( "nos-b1-0.u60", 0x000000, 0x100000, CRC(ba6fd0c7) SHA1(516d6e0c4dc6fb12ec9f30877ea1c582e7440a19) ) ROM_LOAD( "nos-b1-1.u61", 0x100000, 0x080000, CRC(dabd8009) SHA1(1862645b8d6216c3ec2b8dbf74816b8e29dea14f) ) - ROM_REGION( 0x100000, "ym", 0 ) /* Samples - ADPCM or Delta-T? */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* Samples - ADPCM or Delta-T? */ ROM_LOAD( "nossn-00.u53", 0x00000, 0x100000, CRC(3bd1bcbc) SHA1(1bcad43792e985402db4eca122676c2c555f3313) ) ROM_END diff --git a/src/mame/drivers/megadriv.c b/src/mame/drivers/megadriv.c index 0b36be3db06..4e99118e18c 100644 --- a/src/mame/drivers/megadriv.c +++ b/src/mame/drivers/megadriv.c @@ -983,8 +983,8 @@ WRITE16_HANDLER( megadriv_vdp_w ) case 0x12: case 0x14: case 0x16: - if (ACCESSING_BITS_0_7) sn76496_w(devtag_get_device(space->machine, "sn"), 0, data & 0xff); - //if (ACCESSING_BITS_8_15) sn76496_w(devtag_get_device(space->machine, "sn"), 0, (data >>8) & 0xff); + if (ACCESSING_BITS_0_7) sn76496_w(devtag_get_device(space->machine, "snsnd"), 0, data & 0xff); + //if (ACCESSING_BITS_8_15) sn76496_w(devtag_get_device(space->machine, "snsnd"), 0, (data >>8) & 0xff); break; default: @@ -1968,7 +1968,7 @@ static ADDRESS_MAP_START( megadriv_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xa00000, 0xa01fff) AM_READWRITE(megadriv_68k_read_z80_ram,megadriv_68k_write_z80_ram) AM_RANGE(0xa02000, 0xa03fff) AM_WRITE(megadriv_68k_write_z80_ram) - AM_RANGE(0xa04000, 0xa04003) AM_DEVREADWRITE8("ym", megadriv_68k_YM2612_read,megadriv_68k_YM2612_write, 0xffff) + AM_RANGE(0xa04000, 0xa04003) AM_DEVREADWRITE8("ymsnd", megadriv_68k_YM2612_read,megadriv_68k_YM2612_write, 0xffff) AM_RANGE(0xa06000, 0xa06001) AM_WRITE(megadriv_68k_z80_bank_write) @@ -2087,7 +2087,7 @@ static TIMER_CALLBACK( megadriv_z80_run_state ) { devtag_reset( machine, "genesis_snd_z80" ); cputag_suspend( machine, "genesis_snd_z80", SUSPEND_REASON_HALT, 1 ); - devtag_reset( machine, "ym" ); + devtag_reset( machine, "ymsnd" ); } else { @@ -2249,7 +2249,7 @@ static WRITE8_HANDLER( megadriv_z80_vdp_write ) case 0x13: case 0x15: case 0x17: - sn76496_w(devtag_get_device(space->machine, "sn"), 0, data); + sn76496_w(devtag_get_device(space->machine, "snsnd"), 0, data); break; default: @@ -2280,7 +2280,7 @@ static WRITE8_HANDLER( z80_write_68k_banked_data ) else if (fulladdress == 0xc00011) { /* quite a few early games write here, most of the later ones don't */ - sn76496_w(devtag_get_device(space->machine, "sn"), 0, data); + sn76496_w(devtag_get_device(space->machine, "snsnd"), 0, data); } else { @@ -2303,7 +2303,7 @@ static READ8_HANDLER( megadriv_z80_unmapped_read ) static ADDRESS_MAP_START( megadriv_z80_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_RAMBANK(1) AM_MIRROR(0x2000) // RAM can be accessed by the 68k - AM_RANGE(0x4000, 0x4003) AM_DEVREADWRITE("ym", ym2612_r,ym2612_w) + AM_RANGE(0x4000, 0x4003) AM_DEVREADWRITE("ymsnd", ym2612_r,ym2612_w) AM_RANGE(0x6000, 0x6000) AM_WRITE(megadriv_z80_z80_bank_w) AM_RANGE(0x6001, 0x6001) AM_WRITE(megadriv_z80_z80_bank_w) // wacky races uses this address @@ -2330,7 +2330,7 @@ static ADDRESS_MAP_START( md_bootleg_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xa00000, 0xa01fff) AM_READWRITE(megadriv_68k_read_z80_ram, megadriv_68k_write_z80_ram) AM_RANGE(0xa02000, 0xa03fff) AM_WRITE(megadriv_68k_write_z80_ram) - AM_RANGE(0xa04000, 0xa04003) AM_DEVREADWRITE8("ym", megadriv_68k_YM2612_read, megadriv_68k_YM2612_write, 0xffff) + AM_RANGE(0xa04000, 0xa04003) AM_DEVREADWRITE8("ymsnd", megadriv_68k_YM2612_read, megadriv_68k_YM2612_write, 0xffff) AM_RANGE(0xa06000, 0xa06001) AM_WRITE(megadriv_68k_z80_bank_write) AM_RANGE(0xa10000, 0xa1001f) AM_READWRITE(megadriv_68k_io_read, megadriv_68k_io_write) @@ -6090,12 +6090,12 @@ MACHINE_DRIVER_START( megadriv ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2612, MASTER_CLOCK_NTSC/7) /* 7.67 MHz */ + MDRV_SOUND_ADD("ymsnd", YM2612, MASTER_CLOCK_NTSC/7) /* 7.67 MHz */ MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) /* sound hardware */ - MDRV_SOUND_ADD("sn", SN76496, MASTER_CLOCK_NTSC/15) + MDRV_SOUND_ADD("snsnd", SN76496, MASTER_CLOCK_NTSC/15) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) /* 3.58 MHz */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker",0.25) /* 3.58 MHz */ MACHINE_DRIVER_END @@ -6134,12 +6134,12 @@ MACHINE_DRIVER_START( megadpal ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2612, MASTER_CLOCK_PAL/7) /* 7.67 MHz */ + MDRV_SOUND_ADD("ymsnd", YM2612, MASTER_CLOCK_PAL/7) /* 7.67 MHz */ MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) /* sound hardware */ - MDRV_SOUND_ADD("sn", SN76496, MASTER_CLOCK_PAL/15) + MDRV_SOUND_ADD("snsnd", SN76496, MASTER_CLOCK_PAL/15) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) /* 3.58 MHz */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker",0.25) /* 3.58 MHz */ MACHINE_DRIVER_END @@ -6402,7 +6402,7 @@ static WRITE8_HANDLER( z80_unmapped_w ) /* sets the megadrive z80 to it's normal ports / map */ void megatech_set_megadrive_z80_as_megadrive_z80(running_machine *machine, const char* tag) { - const device_config *ym = devtag_get_device(machine, "ym"); + const device_config *ym = devtag_get_device(machine, "ymsnd"); /* INIT THE PORTS *********************************************************************************************/ memory_install_readwrite8_handler(cputag_get_address_space(machine, tag, ADDRESS_SPACE_IO), 0x0000, 0xffff, 0, 0, z80_unmapped_port_r, z80_unmapped_port_w); diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c index b90fb7da12c..dd751d2d23c 100644 --- a/src/mame/drivers/megasys1.c +++ b/src/mame/drivers/megasys1.c @@ -394,7 +394,7 @@ static ADDRESS_MAP_START( megasys1A_sound_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x01ffff) AM_ROM AM_RANGE(0x040000, 0x040001) AM_READ(soundlatch_word_r) AM_RANGE(0x060000, 0x060001) AM_WRITE(soundlatch2_word_w) // to main cpu - AM_RANGE(0x080000, 0x080003) AM_DEVREADWRITE8("ym", ym2151_r,ym2151_w, 0x00ff) + AM_RANGE(0x080000, 0x080003) AM_DEVREADWRITE8("ymsnd", ym2151_r,ym2151_w, 0x00ff) AM_RANGE(0x0a0000, 0x0a0001) AM_DEVREAD8("oki1", oki_status_r, 0x00ff) AM_RANGE(0x0a0000, 0x0a0003) AM_DEVWRITE8("oki1", okim6295_w, 0x00ff) AM_RANGE(0x0c0000, 0x0c0001) AM_DEVREAD8("oki2", oki_status_r, 0x00ff) @@ -412,7 +412,7 @@ static ADDRESS_MAP_START( megasys1B_sound_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x01ffff) AM_ROM AM_RANGE(0x040000, 0x040001) AM_READWRITE(soundlatch_word_r,soundlatch2_word_w) /* from/to main cpu */ AM_RANGE(0x060000, 0x060001) AM_READWRITE(soundlatch_word_r,soundlatch2_word_w) /* from/to main cpu */ - AM_RANGE(0x080000, 0x080003) AM_DEVREADWRITE8("ym", ym2151_r,ym2151_w, 0x00ff) + AM_RANGE(0x080000, 0x080003) AM_DEVREADWRITE8("ymsnd", ym2151_r,ym2151_w, 0x00ff) AM_RANGE(0x0a0000, 0x0a0001) AM_DEVREAD8("oki1", oki_status_r, 0x00ff) AM_RANGE(0x0a0000, 0x0a0003) AM_DEVWRITE8("oki1", okim6295_w, 0x00ff) AM_RANGE(0x0c0000, 0x0c0001) AM_DEVREAD8("oki2", oki_status_r, 0x00ff) @@ -436,7 +436,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( z80_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) ADDRESS_MAP_END @@ -1487,7 +1487,7 @@ static MACHINE_DRIVER_START( system_A ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, SOUND_CPU_CLOCK/2) /* 3.5MHz (7MHz / 2) verified */ + MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CPU_CLOCK/2) /* 3.5MHz (7MHz / 2) verified */ MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) @@ -1655,7 +1655,7 @@ static MACHINE_DRIVER_START( system_Z ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 1500000) + MDRV_SOUND_ADD("ymsnd", YM2203, 1500000) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/megatech.c b/src/mame/drivers/megatech.c index 772bd9124b0..d161a1d78e2 100644 --- a/src/mame/drivers/megatech.c +++ b/src/mame/drivers/megatech.c @@ -272,7 +272,7 @@ static void megatech_select_game(running_machine *machine, int gameno) cputag_set_input_line(machine, "genesis_snd_z80", INPUT_LINE_RESET, ASSERT_LINE); cputag_set_input_line(machine, "maincpu", INPUT_LINE_HALT, ASSERT_LINE); cputag_set_input_line(machine, "genesis_snd_z80", INPUT_LINE_HALT, ASSERT_LINE); - devtag_reset(machine, "ym"); + devtag_reset(machine, "ymsnd"); sprintf(tempname, "game%d", gameno); game_region = memory_region(machine, tempname); diff --git a/src/mame/drivers/megazone.c b/src/mame/drivers/megazone.c index ec463d09b03..682a2c1f3d8 100644 --- a/src/mame/drivers/megazone.c +++ b/src/mame/drivers/megazone.c @@ -124,9 +124,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( megazone_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVWRITE("ay", ay8910_address_w) - AM_RANGE(0x00, 0x02) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x02, 0x02) AM_DEVWRITE("ay", ay8910_data_w) + AM_RANGE(0x00, 0x00) AM_DEVWRITE("aysnd", ay8910_address_w) + AM_RANGE(0x00, 0x02) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x02, 0x02) AM_DEVWRITE("aysnd", ay8910_data_w) ADDRESS_MAP_END static ADDRESS_MAP_START( megazone_i8039_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -273,7 +273,7 @@ static MACHINE_DRIVER_START( megazone ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 14318000/8) + MDRV_SOUND_ADD("aysnd", AY8910, 14318000/8) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(0, "filter.0.0", 0.30) MDRV_SOUND_ROUTE(1, "filter.0.1", 0.30) diff --git a/src/mame/drivers/meijinsn.c b/src/mame/drivers/meijinsn.c index 8c750042734..0f270545844 100644 --- a/src/mame/drivers/meijinsn.c +++ b/src/mame/drivers/meijinsn.c @@ -162,8 +162,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( meijinsn_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_address_data_w) - AM_RANGE(0x01, 0x01) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_address_data_w) + AM_RANGE(0x01, 0x01) AM_DEVREAD("aysnd", ay8910_r) AM_RANGE(0x02, 0x02) AM_WRITE(soundlatch_clear_w) AM_RANGE(0x06, 0x06) AM_WRITENOP ADDRESS_MAP_END @@ -335,7 +335,7 @@ static MACHINE_DRIVER_START( meijinsn ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 2000000) + MDRV_SOUND_ADD("aysnd", AY8910, 2000000) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) diff --git a/src/mame/drivers/merit.c b/src/mame/drivers/merit.c index 6a4121fa629..bf7a92a2771 100644 --- a/src/mame/drivers/merit.c +++ b/src/mame/drivers/merit.c @@ -405,8 +405,8 @@ static ADDRESS_MAP_START( trvwhiz_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( trvwhiz_io_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x8000, 0x8000) AM_DEVWRITE("ay", ay8910_address_w) - AM_RANGE(0x8100, 0x8100) AM_DEVWRITE("ay", ay8910_data_w) + AM_RANGE(0x8000, 0x8000) AM_DEVWRITE("aysnd", ay8910_address_w) + AM_RANGE(0x8100, 0x8100) AM_DEVWRITE("aysnd", ay8910_data_w) ADDRESS_MAP_END @@ -426,8 +426,8 @@ static ADDRESS_MAP_START( phrcraze_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( phrcraze_io_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0xc004, 0xc004) AM_MIRROR(0x1cf3) AM_DEVWRITE("ay", ay8910_address_w) - AM_RANGE(0xc104, 0xc104) AM_MIRROR(0x1cf3) AM_DEVWRITE("ay", ay8910_data_w) + AM_RANGE(0xc004, 0xc004) AM_MIRROR(0x1cf3) AM_DEVWRITE("aysnd", ay8910_address_w) + AM_RANGE(0xc104, 0xc104) AM_MIRROR(0x1cf3) AM_DEVWRITE("aysnd", ay8910_data_w) ADDRESS_MAP_END @@ -447,8 +447,8 @@ static ADDRESS_MAP_START( tictac_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( tictac_io_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0xc00c, 0xc00c) AM_MIRROR(0x1cf3) AM_DEVWRITE("ay", ay8910_address_w) - AM_RANGE(0xc10c, 0xc10c) AM_MIRROR(0x1cf3) AM_DEVWRITE("ay", ay8910_data_w) + AM_RANGE(0xc00c, 0xc00c) AM_MIRROR(0x1cf3) AM_DEVWRITE("aysnd", ay8910_address_w) + AM_RANGE(0xc10c, 0xc10c) AM_MIRROR(0x1cf3) AM_DEVWRITE("aysnd", ay8910_data_w) ADDRESS_MAP_END @@ -1197,7 +1197,7 @@ static MACHINE_DRIVER_START( pitboss ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, CRTC_CLOCK) + MDRV_SOUND_ADD("aysnd", AY8910, CRTC_CLOCK) MDRV_SOUND_CONFIG(merit_ay8912_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33) MACHINE_DRIVER_END diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c index 0fb3a0e3bca..a1bba94337b 100644 --- a/src/mame/drivers/meritm.c +++ b/src/mame/drivers/meritm.c @@ -589,8 +589,8 @@ static ADDRESS_MAP_START( meritm_crt250_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x30, 0x33) AM_DEVREADWRITE("ppi8255", ppi8255_r, ppi8255_w) AM_RANGE(0x40, 0x43) AM_DEVREADWRITE("z80pio_0", z80pio_r, z80pio_w) AM_RANGE(0x50, 0x53) AM_DEVREADWRITE("z80pio_1", z80pio_r, z80pio_w) - AM_RANGE(0x80, 0x80) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x80, 0x81) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x80, 0x80) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("aysnd", ay8910_address_data_w) AM_RANGE(0xff, 0xff) AM_WRITE(meritm_crt250_bank_w) ADDRESS_MAP_END @@ -608,8 +608,8 @@ static ADDRESS_MAP_START( meritm_crt250_crt258_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x40, 0x43) AM_DEVREADWRITE("z80pio_0", z80pio_r, z80pio_w) AM_RANGE(0x50, 0x53) AM_DEVREADWRITE("z80pio_1", z80pio_r, z80pio_w) AM_RANGE(0x60, 0x67) AM_READWRITE(pc16552d_0_r,pc16552d_0_w) - AM_RANGE(0x80, 0x80) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x80, 0x81) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x80, 0x80) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("aysnd", ay8910_address_data_w) AM_RANGE(0xff, 0xff) AM_WRITE(meritm_crt250_bank_w) ADDRESS_MAP_END @@ -635,8 +635,8 @@ static ADDRESS_MAP_START( meritm_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x40, 0x43) AM_DEVREADWRITE("z80pio_0", z80pio_r, z80pio_w) AM_RANGE(0x50, 0x53) AM_DEVREADWRITE("z80pio_1", z80pio_r, z80pio_w) AM_RANGE(0x60, 0x67) AM_READWRITE(pc16552d_0_r,pc16552d_0_w) - AM_RANGE(0x80, 0x80) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x80, 0x81) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x80, 0x80) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("aysnd", ay8910_address_data_w) AM_RANGE(0xff, 0xff) AM_WRITE(meritm_bank_w) ADDRESS_MAP_END @@ -1006,7 +1006,7 @@ static MACHINE_DRIVER_START(meritm_crt250) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, SYSTEM_CLK/12) + MDRV_SOUND_ADD("aysnd", AY8910, SYSTEM_CLK/12) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c index ac73bac4f06..e66251e6c19 100644 --- a/src/mame/drivers/metro.c +++ b/src/mame/drivers/metro.c @@ -441,7 +441,7 @@ static WRITE8_HANDLER( metro_portb_w ) { if (!BIT(data,2)) { - const device_config *ym = devtag_get_device(space->machine, "ym"); + const device_config *ym = devtag_get_device(space->machine, "ymsnd"); ym2413_w(ym,BIT(data,1),porta); } portb = data; @@ -480,7 +480,7 @@ static WRITE8_HANDLER( daitorid_portb_w ) if (BIT(portb,6) && !BIT(data,6)) /* clock 1->0 */ { - const device_config *ym = devtag_get_device(space->machine, "ym"); + const device_config *ym = devtag_get_device(space->machine, "ymsnd"); if (!BIT(data,2)) { /* write */ @@ -1315,7 +1315,7 @@ static ADDRESS_MAP_START( gakusai_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x279700, 0x279713) AM_WRITEONLY AM_BASE(&metro_videoregs) // Video Registers AM_RANGE(0x400000, 0x400001) AM_WRITENOP // ? 5 AM_RANGE(0x500000, 0x500001) AM_DEVWRITE("oki", gakusai_oki_bank_lo_w) // Sound - AM_RANGE(0x600000, 0x600003) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) + AM_RANGE(0x600000, 0x600003) AM_DEVWRITE8("ymsnd", ym2413_w, 0x00ff) AM_RANGE(0x700000, 0x700001) AM_DEVREADWRITE8("oki", okim6295_r,okim6295_w, 0x00ff) // Sound AM_RANGE(0xc00000, 0xc00001) AM_READWRITE(gakusai_eeprom_r,gakusai_eeprom_w) // EEPROM AM_RANGE(0xd00000, 0xd00001) AM_DEVWRITE("oki", gakusai_oki_bank_hi_w) @@ -1355,7 +1355,7 @@ static ADDRESS_MAP_START( gakusai2_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x900000, 0x900001) AM_DEVWRITE("oki", gakusai_oki_bank_lo_w) // Sound bank AM_RANGE(0xa00000, 0xa00001) AM_DEVWRITE("oki", gakusai_oki_bank_hi_w) AM_RANGE(0xb00000, 0xb00001) AM_DEVREADWRITE8("oki", okim6295_r,okim6295_w, 0x00ff) // Sound - AM_RANGE(0xc00000, 0xc00003) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) + AM_RANGE(0xc00000, 0xc00003) AM_DEVWRITE8("ymsnd", ym2413_w, 0x00ff) AM_RANGE(0xe00000, 0xe00001) AM_READWRITE(gakusai_eeprom_r,gakusai_eeprom_w) // EEPROM ADDRESS_MAP_END @@ -1421,7 +1421,7 @@ static ADDRESS_MAP_START( dokyusp_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x279700, 0x279713) AM_WRITEONLY AM_BASE(&metro_videoregs) // Video Registers AM_RANGE(0x400000, 0x400001) AM_WRITENOP // ? 5 AM_RANGE(0x500000, 0x500001) AM_DEVWRITE("oki", gakusai_oki_bank_lo_w) // Sound - AM_RANGE(0x600000, 0x600003) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) + AM_RANGE(0x600000, 0x600003) AM_DEVWRITE8("ymsnd", ym2413_w, 0x00ff) AM_RANGE(0x700000, 0x700001) AM_DEVREADWRITE8("oki", okim6295_r,okim6295_w, 0x00ff) // Sound AM_RANGE(0xc00000, 0xc00001) AM_WRITE(dokyusp_eeprom_reset_w) // EEPROM AM_RANGE(0xd00000, 0xd00001) AM_READWRITE(dokyusp_eeprom_r,dokyusp_eeprom_bit_w) // EEPROM @@ -1463,7 +1463,7 @@ static ADDRESS_MAP_START( dokyusei_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800000, 0x800001) AM_DEVWRITE("oki", gakusai_oki_bank_hi_w) // Samples Bank? AM_RANGE(0x900000, 0x900001) AM_WRITENOP // ? 4 AM_RANGE(0xa00000, 0xa00001) AM_DEVWRITE("oki", gakusai_oki_bank_lo_w) // Samples Bank - AM_RANGE(0xc00000, 0xc00003) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) // + AM_RANGE(0xc00000, 0xc00003) AM_DEVWRITE8("ymsnd", ym2413_w, 0x00ff) // AM_RANGE(0xd00000, 0xd00001) AM_DEVREADWRITE8("oki", okim6295_r,okim6295_w, 0x00ff) // Sound ADDRESS_MAP_END @@ -1680,7 +1680,7 @@ static ADDRESS_MAP_START( blzntrnd_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(blzntrnd_sh_bankswitch_w) AM_RANGE(0x40, 0x40) AM_READ(soundlatch_r) AM_WRITENOP - AM_RANGE(0x80, 0x83) AM_DEVREADWRITE("ym", ym2610_r,ym2610_w) + AM_RANGE(0x80, 0x83) AM_DEVREADWRITE("ymsnd", ym2610_r,ym2610_w) ADDRESS_MAP_END static ADDRESS_MAP_START( blzntrnd_map, ADDRESS_SPACE_PROGRAM, 16 ) @@ -1751,7 +1751,7 @@ static ADDRESS_MAP_START( mouja_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x478888, 0x478889) AM_WRITENOP // ?? AM_RANGE(0x479700, 0x479713) AM_WRITEONLY AM_BASE(&metro_videoregs) // Video Registers AM_RANGE(0x800000, 0x800001) AM_DEVWRITE("oki", mouja_sound_rombank_w) - AM_RANGE(0xc00000, 0xc00003) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) + AM_RANGE(0xc00000, 0xc00003) AM_DEVWRITE8("ymsnd", ym2413_w, 0x00ff) AM_RANGE(0xd00000, 0xd00001) AM_DEVREADWRITE8("oki", okim6295_r,okim6295_w, 0xffff) #if 0 AM_RANGE(0x460000, 0x46ffff) AM_READ(metro_bankedrom_r) // Banked ROM @@ -1779,7 +1779,7 @@ static ADDRESS_MAP_START( puzzlet_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE( 0x470000, 0x47dfff ) AM_RAM AM_RANGE( 0x500000, 0x500001 ) AM_DEVREADWRITE8( "oki", okim6295_r, okim6295_w, 0xff00 ) - AM_RANGE( 0x580000, 0x580003 ) AM_DEVWRITE8( "ym", ym2413_w, 0xff00 ) + AM_RANGE( 0x580000, 0x580003 ) AM_DEVWRITE8( "ymsnd", ym2413_w, 0xff00 ) AM_RANGE( 0x700000, 0x71ffff ) AM_READWRITE( SMH_RAM, metro_vram_0_w ) AM_BASE( &metro_vram_0 ) // Layer 0 AM_RANGE( 0x720000, 0x73ffff ) AM_READWRITE( SMH_RAM, metro_vram_1_w ) AM_BASE( &metro_vram_1 ) // Layer 1 @@ -3591,7 +3591,7 @@ static MACHINE_DRIVER_START( daitorid ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 4000000) + MDRV_SOUND_ADD("ymsnd", YM2151, 4000000) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) @@ -3639,7 +3639,7 @@ static MACHINE_DRIVER_START( dharma ) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10) - MDRV_SOUND_ADD("ym", YM2413, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2413, 3579545) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90) MACHINE_DRIVER_END @@ -3681,7 +3681,7 @@ static MACHINE_DRIVER_START( karatour ) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10) - MDRV_SOUND_ADD("ym", YM2413, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2413, 3579545) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90) MACHINE_DRIVER_END @@ -3723,7 +3723,7 @@ static MACHINE_DRIVER_START( 3kokushi ) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10) - MDRV_SOUND_ADD("ym", YM2413, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2413, 3579545) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90) MACHINE_DRIVER_END @@ -3765,7 +3765,7 @@ static MACHINE_DRIVER_START( lastfort ) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10) - MDRV_SOUND_ADD("ym", YM2413, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2413, 3579545) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90) MACHINE_DRIVER_END @@ -3806,7 +3806,7 @@ static MACHINE_DRIVER_START( lastforg ) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10) - MDRV_SOUND_ADD("ym", YM2413, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2413, 3579545) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90) MACHINE_DRIVER_END @@ -3842,7 +3842,7 @@ static MACHINE_DRIVER_START( dokyusei ) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) - MDRV_SOUND_ADD("ym", YM2413, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2413, 8000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90) MACHINE_DRIVER_END @@ -3893,7 +3893,7 @@ static MACHINE_DRIVER_START( dokyusp ) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) - MDRV_SOUND_ADD("ym", YM2413, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2413, 8000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90) MACHINE_DRIVER_END @@ -3931,7 +3931,7 @@ static MACHINE_DRIVER_START( gakusai ) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) - MDRV_SOUND_ADD("ym", YM2413, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2413, 8000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90) MACHINE_DRIVER_END @@ -3969,7 +3969,7 @@ static MACHINE_DRIVER_START( gakusai2 ) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) - MDRV_SOUND_ADD("ym", YM2413, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2413, 8000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90) MACHINE_DRIVER_END @@ -4011,7 +4011,7 @@ static MACHINE_DRIVER_START( pangpoms ) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10) - MDRV_SOUND_ADD("ym", YM2413, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2413, 3579545) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90) MACHINE_DRIVER_END @@ -4053,7 +4053,7 @@ static MACHINE_DRIVER_START( poitto ) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10) - MDRV_SOUND_ADD("ym", YM2413, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2413, 3579545) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90) MACHINE_DRIVER_END @@ -4090,7 +4090,7 @@ static MACHINE_DRIVER_START( pururun ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 4000000) + MDRV_SOUND_ADD("ymsnd", YM2151, 4000000) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) @@ -4138,7 +4138,7 @@ static MACHINE_DRIVER_START( skyalert ) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10) - MDRV_SOUND_ADD("ym", YM2413, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2413, 3579545) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90) MACHINE_DRIVER_END @@ -4180,7 +4180,7 @@ static MACHINE_DRIVER_START( toride2g ) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10) - MDRV_SOUND_ADD("ym", YM2413, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2413, 3579545) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90) MACHINE_DRIVER_END @@ -4216,7 +4216,7 @@ static MACHINE_DRIVER_START( mouja ) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25) - MDRV_SOUND_ADD("ym", YM2413, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2413, 3579545) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.00) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00) MACHINE_DRIVER_END @@ -4252,7 +4252,7 @@ static MACHINE_DRIVER_START( blzntrnd ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) MDRV_SOUND_CONFIG(blzntrnd_ym2610_interface) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -4291,7 +4291,7 @@ static MACHINE_DRIVER_START( gstrik2 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) MDRV_SOUND_CONFIG(blzntrnd_ym2610_interface) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -4362,7 +4362,7 @@ static MACHINE_DRIVER_START( puzzlet ) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) - MDRV_SOUND_ADD("ym", YM2413, XTAL_20MHz/5) + MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_20MHz/5) MDRV_SOUND_ROUTE(0, "lspeaker", 0.90) MDRV_SOUND_ROUTE(1, "rspeaker", 0.90) MACHINE_DRIVER_END @@ -4692,7 +4692,7 @@ ROM_START( blzntrnd ) ROM_REGION( 0x080000, "ym.deltat", 0 ) /* Samples */ ROM_LOAD( "rom8.bin", 0x000000, 0x080000, CRC(565a4086) SHA1(bd5780acfa5affa8705acbfccb0af16bac8ed298) ) - ROM_REGION( 0x400000, "ym", 0 ) /* ? YRW801-M ? */ + ROM_REGION( 0x400000, "ymsnd", 0 ) /* ? YRW801-M ? */ ROM_LOAD( "rom6.bin", 0x000000, 0x200000, CRC(8b8819fc) SHA1(5fd9d2b5088cb676c11d32cac7ba8c5c18e31b64) ) ROM_LOAD( "rom7.bin", 0x200000, 0x200000, CRC(0089a52b) SHA1(d643ac122d62557de27f06ba1413ef757a45a927) ) ROM_END @@ -4776,7 +4776,7 @@ ROM_START( gstrik2 ) ROM_REGION( 0x200000, "ym.deltat", 0 ) /* Samples */ ROM_LOAD( "sndpcm-b.22", 0x000000, 0x200000, CRC(a5d844d2) SHA1(18d644545f0844e66aa53775b67b0a29c7b7c31b) ) - ROM_REGION( 0x400000, "ym", 0 ) /* ? YRW801-M ? */ + ROM_REGION( 0x400000, "ymsnd", 0 ) /* ? YRW801-M ? */ ROM_LOAD( "sndpcm-a.23", 0x000000, 0x200000, CRC(e6d32373) SHA1(8a79d4ea8b27d785fffd80e38d5ae73b7cea7304) ) /* ROM7.27 not populated? */ ROM_END @@ -4816,7 +4816,7 @@ ROM_START( gstrik2e ) ROM_REGION( 0x200000, "ym.deltat", 0 ) /* Samples */ ROM_LOAD( "sndpcm-b.22", 0x000000, 0x200000, BAD_DUMP CRC(a5d844d2) SHA1(18d644545f0844e66aa53775b67b0a29c7b7c31b) ) - ROM_REGION( 0x400000, "ym", 0 ) /* ? YRW801-M ? */ + ROM_REGION( 0x400000, "ymsnd", 0 ) /* ? YRW801-M ? */ ROM_LOAD( "sndpcm-a.23", 0x000000, 0x200000, BAD_DUMP CRC(e6d32373) SHA1(8a79d4ea8b27d785fffd80e38d5ae73b7cea7304) ) /* ROM7.27 not populated? */ ROM_END diff --git a/src/mame/drivers/mexico86.c b/src/mame/drivers/mexico86.c index a99db5ab328..36dfe57bbfd 100644 --- a/src/mame/drivers/mexico86.c +++ b/src/mame/drivers/mexico86.c @@ -86,7 +86,7 @@ static ADDRESS_MAP_START( mexico86_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0xa7ff) AM_RAM AM_SHARE(1) AM_RANGE(0xa800, 0xbfff) AM_RAM - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym", kiki_ym2203_r,ym2203_w) + AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", kiki_ym2203_r,ym2203_w) ADDRESS_MAP_END static ADDRESS_MAP_START( mexico86_m68705_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -430,7 +430,7 @@ static MACHINE_DRIVER_START( mexico86 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 3000000) + MDRV_SOUND_ADD("ymsnd", YM2203, 3000000) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(0, "mono", 0.30) MDRV_SOUND_ROUTE(1, "mono", 0.30) diff --git a/src/mame/drivers/mhavoc.c b/src/mame/drivers/mhavoc.c index 3f61bdd72aa..de1a31d5f19 100644 --- a/src/mame/drivers/mhavoc.c +++ b/src/mame/drivers/mhavoc.c @@ -388,12 +388,12 @@ static INPUT_PORTS_START( mhavoc ) PORT_DIPSETTING( 0x00, DEF_STR( 1C_2C ) ) PORT_DIPSETTING( 0x01, DEF_STR( Free_Play ) ) PORT_DIPNAME( 0x0c, 0x0c, "Right Coin Mechanism" ) PORT_DIPLOCATION("SW2:5,6") - PORT_DIPSETTING( 0x0c, "x1" ) + PORT_DIPSETTING( 0x0c, "x1snd" ) PORT_DIPSETTING( 0x08, "x4" ) PORT_DIPSETTING( 0x04, "x5" ) PORT_DIPSETTING( 0x00, "x6" ) PORT_DIPNAME( 0x10, 0x10, "Left Coin Mechanism" ) PORT_DIPLOCATION("SW2:4") - PORT_DIPSETTING( 0x10, "x1" ) + PORT_DIPSETTING( 0x10, "x1snd" ) PORT_DIPSETTING( 0x00, "x2" ) PORT_DIPNAME( 0xe0, 0xe0, "Bonus Credits" ) PORT_DIPLOCATION("SW2:1,2,3") PORT_DIPSETTING( 0x80, "2 each 4" ) diff --git a/src/mame/drivers/mirderby.c b/src/mame/drivers/mirderby.c index f5c368a1208..ab0f3bee7f1 100644 --- a/src/mame/drivers/mirderby.c +++ b/src/mame/drivers/mirderby.c @@ -134,7 +134,7 @@ static MACHINE_DRIVER_START( mirderby ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 2000000) + MDRV_SOUND_ADD("ymsnd", YM2203, 2000000) MDRV_SOUND_ROUTE(0, "mono", 0.25) MDRV_SOUND_ROUTE(1, "mono", 0.25) MDRV_SOUND_ROUTE(2, "mono", 0.25) diff --git a/src/mame/drivers/missb2.c b/src/mame/drivers/missb2.c index be2b5eee8bf..77ede432082 100644 --- a/src/mame/drivers/missb2.c +++ b/src/mame/drivers/missb2.c @@ -181,7 +181,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0x9000, 0x9000) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) - AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym", ym3526_r, ym3526_w) + AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ymsnd", ym3526_r, ym3526_w) AM_RANGE(0xb000, 0xb000) AM_READ(soundlatch_r) AM_WRITENOP // message for main cpu AM_RANGE(0xb001, 0xb001) AM_READNOP AM_WRITE(bublbobl_sh_nmi_enable_w) // bit 0: message pending for main cpu, bit 1: message pending for sound cpu AM_RANGE(0xb002, 0xb002) AM_WRITE(bublbobl_sh_nmi_disable_w) @@ -385,7 +385,7 @@ static MACHINE_DRIVER_START( missb2 ) // sound hardware MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3526, MAIN_XTAL/8) + MDRV_SOUND_ADD("ymsnd", YM3526, MAIN_XTAL/8) MDRV_SOUND_CONFIG(ym3526_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c index d5fdd597435..2734588cc1c 100644 --- a/src/mame/drivers/mitchell.c +++ b/src/mame/drivers/mitchell.c @@ -373,8 +373,8 @@ static ADDRESS_MAP_START( mitchell_io_map, ADDRESS_SPACE_IO, 8 ) The Mahjong games and Block Block need special input treatment */ AM_RANGE(0x01, 0x01) AM_WRITE(input_w) AM_RANGE(0x02, 0x02) AM_WRITE(pang_bankswitch_w) /* Code bank register */ - AM_RANGE(0x03, 0x03) AM_DEVWRITE("ym", ym2413_data_port_w) - AM_RANGE(0x04, 0x04) AM_DEVWRITE("ym", ym2413_register_port_w) + AM_RANGE(0x03, 0x03) AM_DEVWRITE("ymsnd", ym2413_data_port_w) + AM_RANGE(0x04, 0x04) AM_DEVWRITE("ymsnd", ym2413_register_port_w) AM_RANGE(0x05, 0x05) AM_READ(pang_port5_r) AM_DEVWRITE("oki", okim6295_w) AM_RANGE(0x06, 0x06) AM_WRITENOP /* watchdog? irq ack? */ AM_RANGE(0x07, 0x07) AM_WRITE(pang_video_bank_w) /* Video RAM bank register */ @@ -399,8 +399,8 @@ static ADDRESS_MAP_START( spangbl_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x02) AM_READ(input_r) /* Super Pang needs a kludge to initialize EEPROM. */ AM_RANGE(0x00, 0x00) AM_WRITE(pang_gfxctrl_w) /* Palette bank, layer enable, coin counters, more */ AM_RANGE(0x02, 0x02) AM_WRITE(pang_bankswitch_w) /* Code bank register */ - AM_RANGE(0x03, 0x03) AM_DEVWRITE("ym", ym2413_data_port_w) - AM_RANGE(0x04, 0x04) AM_DEVWRITE("ym", ym2413_register_port_w) + AM_RANGE(0x03, 0x03) AM_DEVWRITE("ymsnd", ym2413_data_port_w) + AM_RANGE(0x04, 0x04) AM_DEVWRITE("ymsnd", ym2413_register_port_w) AM_RANGE(0x05, 0x05) AM_READ(pang_port5_r) AM_RANGE(0x06, 0x06) AM_WRITENOP /* watchdog? irq ack? */ AM_RANGE(0x07, 0x07) AM_WRITE(pang_video_bank_w) /* Video RAM bank register */ @@ -1117,7 +1117,7 @@ static MACHINE_DRIVER_START( mgakuen ) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) - MDRV_SOUND_ADD("ym", YM2413, 4000000) + MDRV_SOUND_ADD("ymsnd", YM2413, 4000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END @@ -1153,7 +1153,7 @@ static MACHINE_DRIVER_START( pang ) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 verified MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) - MDRV_SOUND_ADD("ym",YM2413, XTAL_16MHz/4) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd",YM2413, XTAL_16MHz/4) /* verified on pcb */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END @@ -1283,7 +1283,7 @@ static MACHINE_DRIVER_START( marukin ) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) - MDRV_SOUND_ADD("ym", YM2413, 4000000) + MDRV_SOUND_ADD("ymsnd", YM2413, 4000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/mjsister.c b/src/mame/drivers/mjsister.c index fd86eadaa89..8883d591b73 100644 --- a/src/mame/drivers/mjsister.c +++ b/src/mame/drivers/mjsister.c @@ -160,9 +160,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mjsister_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x01) AM_WRITENOP /* HD46505? */ - AM_RANGE(0x10, 0x10) AM_DEVWRITE("ay", ay8910_address_w) - AM_RANGE(0x11, 0x11) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x12, 0x12) AM_DEVWRITE("ay", ay8910_data_w) + AM_RANGE(0x10, 0x10) AM_DEVWRITE("aysnd", ay8910_address_w) + AM_RANGE(0x11, 0x11) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x12, 0x12) AM_DEVWRITE("aysnd", ay8910_data_w) AM_RANGE(0x20, 0x20) AM_READ(mjsister_keys_r) AM_RANGE(0x21, 0x21) AM_READ_PORT("IN0") AM_RANGE(0x30, 0x30) AM_WRITE(mjsister_banksel1_w) @@ -327,7 +327,7 @@ static MACHINE_DRIVER_START( mjsister ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, MCLK/8) + MDRV_SOUND_ADD("aysnd", AY8910, MCLK/8) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) diff --git a/src/mame/drivers/mlanding.c b/src/mame/drivers/mlanding.c index ed276474532..5a561fabfe1 100644 --- a/src/mame/drivers/mlanding.c +++ b/src/mame/drivers/mlanding.c @@ -492,7 +492,7 @@ static ADDRESS_MAP_START( mlanding_z80_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) AM_RANGE(0x8000, 0x8fff) AM_RAM - AM_RANGE(0x9000, 0x9001) AM_MIRROR(0x00fe) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x9000, 0x9001) AM_MIRROR(0x00fe) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xa000, 0xa001) AM_WRITE(ml_sound_to_main_w) AM_RANGE(0xa001, 0xa001) AM_READ(taitosound_slave_comm_r) @@ -753,7 +753,7 @@ static MACHINE_DRIVER_START( mlanding ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 4000000) + MDRV_SOUND_ADD("ymsnd", YM2151, 4000000) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "mono", 0.50) MDRV_SOUND_ROUTE(1, "mono", 0.50) diff --git a/src/mame/drivers/model1.c b/src/mame/drivers/model1.c index 8ae60cc23f2..741cf9340c4 100644 --- a/src/mame/drivers/model1.c +++ b/src/mame/drivers/model1.c @@ -997,7 +997,7 @@ static ADDRESS_MAP_START( model1_snd, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xc50000, 0xc50001) AM_DEVWRITE( "sega1", m1_snd_mpcm_bnk_w ) AM_RANGE(0xc60000, 0xc60007) AM_DEVREADWRITE8( "sega2", multipcm_r, multipcm_w, 0x00ff ) AM_RANGE(0xc70000, 0xc70001) AM_DEVWRITE( "sega2", m1_snd_mpcm_bnk_w ) - AM_RANGE(0xd00000, 0xd00007) AM_DEVREADWRITE8( "ym", ym3438_r, ym3438_w, 0x00ff ) + AM_RANGE(0xd00000, 0xd00007) AM_DEVREADWRITE8( "ymsnd", ym3438_r, ym3438_w, 0x00ff ) AM_RANGE(0xf00000, 0xf0ffff) AM_RAM ADDRESS_MAP_END @@ -1474,7 +1474,7 @@ static MACHINE_DRIVER_START( model1 ) MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM3438, 8000000) + MDRV_SOUND_ADD("ymsnd", YM3438, 8000000) MDRV_SOUND_ROUTE(0, "lspeaker", 0.60) MDRV_SOUND_ROUTE(1, "rspeaker", 0.60) @@ -1517,7 +1517,7 @@ static MACHINE_DRIVER_START( model1_vr ) MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM3438, 8000000) + MDRV_SOUND_ADD("ymsnd", YM3438, 8000000) MDRV_SOUND_ROUTE(0, "lspeaker", 0.60) MDRV_SOUND_ROUTE(1, "rspeaker", 0.60) diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c index 80c4b6aa1e3..45ea0634f09 100644 --- a/src/mame/drivers/model2.c +++ b/src/mame/drivers/model2.c @@ -1699,7 +1699,7 @@ static ADDRESS_MAP_START( model1_snd, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xc50000, 0xc50001) AM_DEVWRITE( "sega1", m1_snd_mpcm_bnk_w ) AM_RANGE(0xc60000, 0xc60007) AM_DEVREADWRITE8( "sega2", multipcm_r, multipcm_w, 0x00ff ) AM_RANGE(0xc70000, 0xc70001) AM_DEVWRITE( "sega2", m1_snd_mpcm_bnk_w ) - AM_RANGE(0xd00000, 0xd00007) AM_DEVREADWRITE8( "ym", ym3438_r, ym3438_w, 0x00ff ) + AM_RANGE(0xd00000, 0xd00007) AM_DEVREADWRITE8( "ymsnd", ym3438_r, ym3438_w, 0x00ff ) AM_RANGE(0xf00000, 0xf0ffff) AM_RAM ADDRESS_MAP_END @@ -1858,7 +1858,7 @@ static MACHINE_DRIVER_START( model2o ) MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM3438, 8000000) + MDRV_SOUND_ADD("ymsnd", YM3438, 8000000) MDRV_SOUND_ROUTE(0, "lspeaker", 0.60) MDRV_SOUND_ROUTE(1, "rspeaker", 0.60) diff --git a/src/mame/drivers/mole.c b/src/mame/drivers/mole.c index 125e697adbf..b283691621a 100644 --- a/src/mame/drivers/mole.c +++ b/src/mame/drivers/mole.c @@ -117,7 +117,7 @@ static ADDRESS_MAP_START( mole_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x5000, 0x7fff) AM_MIRROR(0x8000) AM_ROM AM_RANGE(0x8000, 0x83ff) AM_RAM_WRITE(mole_videoram_w) AM_BASE(&videoram) AM_RANGE(0x8400, 0x8400) AM_WRITE(mole_tilebank_w) - AM_RANGE(0x8c00, 0x8c01) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x8c00, 0x8c01) AM_DEVWRITE("aysnd", ay8910_data_address_w) AM_RANGE(0x8c40, 0x8c40) AM_WRITENOP // ??? AM_RANGE(0x8c80, 0x8c80) AM_WRITENOP // ??? AM_RANGE(0x8c81, 0x8c81) AM_WRITENOP // ??? @@ -224,7 +224,7 @@ static MACHINE_DRIVER_START( mole ) // sound hardware MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 2000000) + MDRV_SOUND_ADD("aysnd", AY8910, 2000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/moo.c b/src/mame/drivers/moo.c index 12fbbb94b8e..67f39e822f8 100644 --- a/src/mame/drivers/moo.c +++ b/src/mame/drivers/moo.c @@ -404,7 +404,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe22f) AM_DEVREADWRITE("konami", k054539_r,k054539_w) - AM_RANGE(0xec00, 0xec01) AM_DEVREADWRITE("ym", ym2151_r,ym2151_w) + AM_RANGE(0xec00, 0xec01) AM_DEVREADWRITE("ymsnd", ym2151_r,ym2151_w) AM_RANGE(0xf000, 0xf000) AM_WRITE(soundlatch3_w) AM_RANGE(0xf002, 0xf002) AM_READ(soundlatch_r) AM_RANGE(0xf003, 0xf003) AM_READ(soundlatch2_r) @@ -506,7 +506,7 @@ static MACHINE_DRIVER_START( moo ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 4000000) + MDRV_SOUND_ADD("ymsnd", YM2151, 4000000) MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) diff --git a/src/mame/drivers/mosaic.c b/src/mame/drivers/mosaic.c index 5f0e2ee7add..13ef4ef03f4 100644 --- a/src/mame/drivers/mosaic.c +++ b/src/mame/drivers/mosaic.c @@ -116,7 +116,7 @@ static ADDRESS_MAP_START( mosaic_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x3f) AM_WRITENOP /* Z180 internal registers */ AM_RANGE(0x30, 0x30) AM_READNOP /* Z180 internal registers */ - AM_RANGE(0x70, 0x71) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x70, 0x71) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0x72, 0x72) AM_READWRITE(protection_r, protection_w) AM_RANGE(0x74, 0x74) AM_READ_PORT("P1") AM_RANGE(0x76, 0x76) AM_READ_PORT("P2") @@ -126,7 +126,7 @@ static ADDRESS_MAP_START( gfire2_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x3f) AM_WRITENOP /* Z180 internal registers */ AM_RANGE(0x30, 0x30) AM_READNOP /* Z180 internal registers */ - AM_RANGE(0x70, 0x71) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x70, 0x71) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0x72, 0x72) AM_READWRITE(gfire2_protection_r, gfire2_protection_w) AM_RANGE(0x74, 0x74) AM_READ_PORT("P1") AM_RANGE(0x76, 0x76) AM_READ_PORT("P2") @@ -281,7 +281,7 @@ static MACHINE_DRIVER_START( mosaic ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 3000000) + MDRV_SOUND_ADD("ymsnd", YM2203, 3000000) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/mugsmash.c b/src/mame/drivers/mugsmash.c index 10b5fa7e208..c42f8bf7739 100644 --- a/src/mame/drivers/mugsmash.c +++ b/src/mame/drivers/mugsmash.c @@ -202,7 +202,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mugsmash_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("ym", ym2151_r,ym2151_w) + AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("ymsnd", ym2151_r,ym2151_w) AM_RANGE(0x9800, 0x9800) AM_DEVREADWRITE("oki", okim6295_r,okim6295_w) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -429,7 +429,7 @@ static MACHINE_DRIVER_START( mugsmash ) MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 1.00) /* music */ MDRV_SOUND_ROUTE(1, "rspeaker", 1.00) diff --git a/src/mame/drivers/multfish.c b/src/mame/drivers/multfish.c index be904163954..4d9db2b8f41 100644 --- a/src/mame/drivers/multfish.c +++ b/src/mame/drivers/multfish.c @@ -545,9 +545,9 @@ static ADDRESS_MAP_START( multfish_portmap, ADDRESS_SPACE_IO, 8 ) // AM_RANGE(0x35, 0x35) AM_WRITE(multfish_port35_w) // AM_RANGE(0x36, 0x36) AM_WRITE(multfish_port36_w) // AM_RANGE(0x37, 0x37) AM_WRITE(multfish_watchdog_reset_w) - AM_RANGE(0x38, 0x38) AM_DEVWRITE("ay", ay8910_address_w) - AM_RANGE(0x39, 0x39) AM_DEVWRITE("ay", ay8910_data_w) - AM_RANGE(0x3a, 0x3a) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x38, 0x38) AM_DEVWRITE("aysnd", ay8910_address_w) + AM_RANGE(0x39, 0x39) AM_DEVWRITE("aysnd", ay8910_data_w) + AM_RANGE(0x3a, 0x3a) AM_DEVREAD("aysnd", ay8910_r) AM_RANGE(0x90, 0x90) AM_READ(ray_r) @@ -630,7 +630,7 @@ static MACHINE_DRIVER_START( multfish ) MDRV_VIDEO_UPDATE(multfish) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 6000000/4) + MDRV_SOUND_ADD("aysnd", AY8910, 6000000/4) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_DRIVER_END diff --git a/src/mame/drivers/mustache.c b/src/mame/drivers/mustache.c index 03600818876..4021d701ecd 100644 --- a/src/mame/drivers/mustache.c +++ b/src/mame/drivers/mustache.c @@ -223,7 +223,7 @@ static MACHINE_DRIVER_START( mustache ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, YM_CLOCK) + MDRV_SOUND_ADD("ymsnd", YM2151, YM_CLOCK) MDRV_SOUND_CONFIG(t5182_ym2151_interface) MDRV_SOUND_ROUTE(0, "mono", 1.0) MDRV_SOUND_ROUTE(1, "mono", 1.0) diff --git a/src/mame/drivers/namcos1.c b/src/mame/drivers/namcos1.c index 9ab25cb3d69..c5c07941fca 100644 --- a/src/mame/drivers/namcos1.c +++ b/src/mame/drivers/namcos1.c @@ -464,8 +464,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROMBANK(17) /* Banked ROMs */ - AM_RANGE(0x4000, 0x4001) AM_DEVREAD("ym", ym2151_status_port_r) - AM_RANGE(0x4000, 0x4001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x4000, 0x4001) AM_DEVREAD("ymsnd", ym2151_status_port_r) + AM_RANGE(0x4000, 0x4001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x5000, 0x53ff) AM_DEVREADWRITE("namco", namcos1_cus30_r, namcos1_cus30_w) AM_MIRROR(0x400) AM_BASE(&namco_wavedata) /* PSG ( Shared ) */ AM_RANGE(0x7000, 0x77ff) AM_RAMBANK(18) /* TRIRAM (shared) */ AM_RANGE(0x8000, 0x9fff) AM_RAM /* Sound RAM 3 */ @@ -1123,7 +1123,7 @@ static MACHINE_DRIVER_START( ns1 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 3579580) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579580) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) diff --git a/src/mame/drivers/namcos2.c b/src/mame/drivers/namcos2.c index 147bec93b39..132c0521c08 100644 --- a/src/mame/drivers/namcos2.c +++ b/src/mame/drivers/namcos2.c @@ -729,7 +729,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_default_am, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROMBANK(6) /* banked */ - AM_RANGE(0x4000, 0x4001) AM_DEVREADWRITE("ym", ym2151_r,ym2151_w) + AM_RANGE(0x4000, 0x4001) AM_DEVREADWRITE("ymsnd", ym2151_r,ym2151_w) AM_RANGE(0x5000, 0x6fff) AM_DEVREADWRITE("c140", c140_r,c140_w) AM_RANGE(0x7000, 0x77ff) AM_READWRITE(namcos2_dpram_byte_r,namcos2_dpram_byte_w) AM_BASE(&namcos2_dpram) AM_RANGE(0x7800, 0x7fff) AM_READWRITE(namcos2_dpram_byte_r,namcos2_dpram_byte_w) /* mirror */ @@ -1625,7 +1625,7 @@ static MACHINE_DRIVER_START( default ) MDRV_SOUND_ROUTE(0, "lspeaker", 0.75) MDRV_SOUND_ROUTE(1, "rspeaker", 0.75) - MDRV_SOUND_ADD("ym", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */ + MDRV_SOUND_ADD("ymsnd", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */ MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) MACHINE_DRIVER_END @@ -1649,7 +1649,7 @@ static MACHINE_DRIVER_START( default3 ) MDRV_SOUND_ROUTE(0, "lspeaker", 0.45) MDRV_SOUND_ROUTE(1, "rspeaker", 0.45) - MDRV_SOUND_REPLACE("ym", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */ + MDRV_SOUND_REPLACE("ymsnd", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */ MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -1699,7 +1699,7 @@ static MACHINE_DRIVER_START( gollygho ) MDRV_SOUND_ROUTE(0, "lspeaker", 0.75) MDRV_SOUND_ROUTE(1, "rspeaker", 0.75) - MDRV_SOUND_ADD("ym", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */ + MDRV_SOUND_ADD("ymsnd", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */ MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) MACHINE_DRIVER_END @@ -1749,7 +1749,7 @@ static MACHINE_DRIVER_START( finallap ) MDRV_SOUND_ROUTE(0, "lspeaker", 0.75) MDRV_SOUND_ROUTE(1, "rspeaker", 0.75) - MDRV_SOUND_ADD("ym", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */ + MDRV_SOUND_ADD("ymsnd", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */ MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) MACHINE_DRIVER_END @@ -1799,7 +1799,7 @@ static MACHINE_DRIVER_START( sgunner ) MDRV_SOUND_ROUTE(0, "lspeaker", 0.75) MDRV_SOUND_ROUTE(1, "rspeaker", 0.75) - MDRV_SOUND_ADD("ym", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */ + MDRV_SOUND_ADD("ymsnd", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */ MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) MACHINE_DRIVER_END @@ -1849,7 +1849,7 @@ static MACHINE_DRIVER_START( luckywld ) MDRV_SOUND_ROUTE(0, "lspeaker", 0.75) MDRV_SOUND_ROUTE(1, "rspeaker", 0.75) - MDRV_SOUND_ADD("ym", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */ + MDRV_SOUND_ADD("ymsnd", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */ MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) MACHINE_DRIVER_END @@ -1899,7 +1899,7 @@ static MACHINE_DRIVER_START( metlhawk ) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) - MDRV_SOUND_ADD("ym", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */ + MDRV_SOUND_ADD("ymsnd", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */ MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) MACHINE_DRIVER_END diff --git a/src/mame/drivers/namcos21.c b/src/mame/drivers/namcos21.c index 41bea7f0ae2..ade29e40b0a 100644 --- a/src/mame/drivers/namcos21.c +++ b/src/mame/drivers/namcos21.c @@ -1408,7 +1408,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( am_sound_winrun, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROMBANK(6) /* banked */ AM_RANGE(0x3000, 0x3003) AM_WRITENOP /* ? */ - AM_RANGE(0x4000, 0x4001) AM_DEVREADWRITE("ym", ym2151_r,ym2151_w) + AM_RANGE(0x4000, 0x4001) AM_DEVREADWRITE("ymsnd", ym2151_r,ym2151_w) AM_RANGE(0x5000, 0x6fff) AM_DEVREADWRITE("c140", c140_r,c140_w) AM_RANGE(0x7000, 0x77ff) AM_READWRITE(namcos2_dualportram_byte_r,namcos2_dualportram_byte_w) AM_BASE(&mpDualPortRAM) AM_RANGE(0x7800, 0x7fff) AM_READWRITE(namcos2_dualportram_byte_r,namcos2_dualportram_byte_w) /* mirror */ @@ -1582,7 +1582,7 @@ static MACHINE_DRIVER_START( poly_c140_typeA ) MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) - MDRV_SOUND_ADD("ym", YM2151, 3579580) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579580) MDRV_SOUND_ROUTE(0, "lspeaker", 0.30) MDRV_SOUND_ROUTE(1, "rspeaker", 0.30) MACHINE_DRIVER_END @@ -1597,7 +1597,7 @@ static MACHINE_DRIVER_START( poly_c140_typeB ) MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) - MDRV_SOUND_ADD("ym", YM2151, 3579580) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579580) MDRV_SOUND_ROUTE(0, "lspeaker", 0.30) MDRV_SOUND_ROUTE(1, "rspeaker", 0.30) MACHINE_DRIVER_END @@ -1652,7 +1652,7 @@ static MACHINE_DRIVER_START( driveyes ) MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) - MDRV_SOUND_ADD("ym", YM2151, 3579580) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579580) MDRV_SOUND_ROUTE(0, "lspeaker", 0.30) MDRV_SOUND_ROUTE(1, "rspeaker", 0.30) MACHINE_DRIVER_END @@ -1710,7 +1710,7 @@ static MACHINE_DRIVER_START( winrun_c140_typeB ) MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) - MDRV_SOUND_ADD("ym", YM2151, 3579580) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579580) MDRV_SOUND_ROUTE(0, "lspeaker", 0.30) MDRV_SOUND_ROUTE(1, "rspeaker", 0.30) MACHINE_DRIVER_END diff --git a/src/mame/drivers/namcos86.c b/src/mame/drivers/namcos86.c index 27457581454..3ce53e07cf3 100644 --- a/src/mame/drivers/namcos86.c +++ b/src/mame/drivers/namcos86.c @@ -414,7 +414,7 @@ static ADDRESS_MAP_START( NAME##_mcu_map, ADDRESS_SPACE_PROGRAM, 8 ) \ AM_RANGE(0x0080, 0x00ff) AM_RAM \ AM_RANGE(0x1000, 0x13ff) AM_DEVREADWRITE("namco", namcos1_cus30_r,namcos1_cus30_w) /* PSG device, shared RAM */ \ AM_RANGE(0x1400, 0x1fff) AM_RAM \ - AM_RANGE(ADDR_INPUT+0x00, ADDR_INPUT+0x01) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) \ + AM_RANGE(ADDR_INPUT+0x00, ADDR_INPUT+0x01) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) \ AM_RANGE(ADDR_INPUT+0x20, ADDR_INPUT+0x20) AM_READ_PORT("IN0") \ AM_RANGE(ADDR_INPUT+0x21, ADDR_INPUT+0x21) AM_READ_PORT("IN1") \ AM_RANGE(ADDR_INPUT+0x30, ADDR_INPUT+0x30) AM_READ(dsw0_r) \ @@ -1053,7 +1053,7 @@ static MACHINE_DRIVER_START( hopmappy ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 3579580) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579580) MDRV_SOUND_ROUTE(0, "mono", 0.0) MDRV_SOUND_ROUTE(1, "mono", 0.60) /* only right channel is connected */ diff --git a/src/mame/drivers/nbmj8891.c b/src/mame/drivers/nbmj8891.c index 5bea28d929c..db85fb61cb1 100644 --- a/src/mame/drivers/nbmj8891.c +++ b/src/mame/drivers/nbmj8891.c @@ -445,7 +445,7 @@ static ADDRESS_MAP_START( gionbana_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x40, 0x40) AM_WRITE(nbmj8891_clutsel_w) AM_RANGE(0x60, 0x60) AM_WRITE(nbmj8891_romsel_w) AM_RANGE(0x70, 0x70) AM_WRITE(nbmj8891_scrolly_w) - AM_RANGE(0x80, 0x81) AM_DEVWRITE("fm", ym3812_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("fmsnd", ym3812_w) AM_RANGE(0x90, 0x90) AM_READ(nb1413m3_inputport0_r) AM_RANGE(0xa0, 0xa0) AM_READWRITE(nb1413m3_inputport1_r,nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_READWRITE(nb1413m3_inputport2_r,nb1413m3_sndrombank1_w) @@ -464,7 +464,7 @@ static ADDRESS_MAP_START( mgion_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x40, 0x40) AM_WRITE(nbmj8891_clutsel_w) AM_RANGE(0x60, 0x60) AM_WRITE(nbmj8891_romsel_w) AM_RANGE(0x70, 0x70) AM_WRITE(nbmj8891_scrolly_w) - AM_RANGE(0x80, 0x81) AM_DEVWRITE("fm", ym3812_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("fmsnd", ym3812_w) AM_RANGE(0x90, 0x90) AM_READ(nb1413m3_inputport0_r) AM_RANGE(0xa0, 0xa0) AM_READWRITE(nb1413m3_inputport1_r,nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_READWRITE(nb1413m3_inputport2_r,nb1413m3_sndrombank1_w) @@ -485,8 +485,8 @@ static ADDRESS_MAP_START( omotesnd_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x40, 0x4f) AM_WRITE(nbmj8891_clut_w) // AM_RANGE(0x50, 0x50) AM_WRITE(nb1413m3_nmi_clock_w) AM_RANGE(0x70, 0x70) AM_WRITE(nbmj8891_scrolly_w) - AM_RANGE(0x81, 0x81) AM_DEVREAD("fm", ay8910_r) - AM_RANGE(0x82, 0x83) AM_DEVWRITE("fm", ay8910_data_address_w) + AM_RANGE(0x81, 0x81) AM_DEVREAD("fmsnd", ay8910_r) + AM_RANGE(0x82, 0x83) AM_DEVWRITE("fmsnd", ay8910_data_address_w) AM_RANGE(0x90, 0x90) AM_READ(nb1413m3_inputport0_r) AM_WRITENOP AM_RANGE(0xa0, 0xa0) AM_READWRITE(nb1413m3_inputport1_r,nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_READWRITE(nb1413m3_inputport2_r,nb1413m3_sndrombank1_w) @@ -505,7 +505,7 @@ static ADDRESS_MAP_START( hanamomo_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x40, 0x40) AM_WRITE(nbmj8891_clutsel_w) AM_RANGE(0x60, 0x60) AM_WRITE(nbmj8891_romsel_w) AM_RANGE(0x70, 0x70) AM_WRITE(nbmj8891_scrolly_w) - AM_RANGE(0x80, 0x81) AM_DEVWRITE("fm", ym3812_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("fmsnd", ym3812_w) AM_RANGE(0x90, 0x90) AM_READ(nb1413m3_inputport0_r) AM_RANGE(0xa0, 0xa0) AM_READWRITE(nb1413m3_inputport1_r,nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_READWRITE(nb1413m3_inputport2_r,nb1413m3_sndrombank1_w) @@ -524,7 +524,7 @@ static ADDRESS_MAP_START( msjiken_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x50, 0x57) AM_WRITE(nbmj8891_blitter_w) AM_RANGE(0x60, 0x60) AM_WRITE(nbmj8891_romsel_w) AM_RANGE(0x70, 0x70) AM_WRITE(nbmj8891_scrolly_w) - AM_RANGE(0x80, 0x81) AM_DEVWRITE("fm", ym3812_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("fmsnd", ym3812_w) AM_RANGE(0x90, 0x90) AM_READ(nb1413m3_inputport0_r) AM_RANGE(0xa0, 0xa0) AM_READWRITE(nb1413m3_inputport1_r,nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_READWRITE(nb1413m3_inputport2_r,nb1413m3_sndrombank1_w) @@ -543,7 +543,7 @@ static ADDRESS_MAP_START( scandal_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x10, 0x10) AM_WRITE(nbmj8891_romsel_w) AM_RANGE(0x20, 0x20) AM_WRITE(nbmj8891_clutsel_w) AM_RANGE(0x50, 0x50) AM_WRITE(nbmj8891_scrolly_w) - AM_RANGE(0x80, 0x81) AM_DEVWRITE("fm", ym3812_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("fmsnd", ym3812_w) AM_RANGE(0x90, 0x90) AM_READ(nb1413m3_inputport0_r) AM_RANGE(0xa0, 0xa0) AM_READWRITE(nb1413m3_inputport1_r,nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_READWRITE(nb1413m3_inputport2_r,nb1413m3_sndrombank1_w) @@ -562,8 +562,8 @@ static ADDRESS_MAP_START( scandalm_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x20, 0x20) AM_WRITE(nbmj8891_clutsel_w) AM_RANGE(0x40, 0x4f) AM_WRITE(nbmj8891_clut_w) AM_RANGE(0x50, 0x50) AM_WRITE(nbmj8891_scrolly_w) - AM_RANGE(0x81, 0x81) AM_DEVREAD("fm", ay8910_r) - AM_RANGE(0x82, 0x83) AM_DEVWRITE("fm", ay8910_data_address_w) + AM_RANGE(0x81, 0x81) AM_DEVREAD("fmsnd", ay8910_r) + AM_RANGE(0x82, 0x83) AM_DEVWRITE("fmsnd", ay8910_data_address_w) AM_RANGE(0x90, 0x90) AM_READ(nb1413m3_inputport0_r) AM_RANGE(0xa0, 0xa0) AM_READWRITE(nb1413m3_inputport1_r,nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_READWRITE(nb1413m3_inputport2_r,nb1413m3_sndrombank1_w) @@ -583,7 +583,7 @@ static ADDRESS_MAP_START( bananadr_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x30, 0x30) AM_WRITE(nbmj8891_vramsel_w) AM_RANGE(0x40, 0x4f) AM_WRITE(nbmj8891_clut_w) AM_RANGE(0x50, 0x50) AM_WRITE(nbmj8891_scrolly_w) - AM_RANGE(0x80, 0x81) AM_DEVWRITE("fm", ym3812_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("fmsnd", ym3812_w) AM_RANGE(0x90, 0x90) AM_READ(nb1413m3_inputport0_r) AM_RANGE(0xa0, 0xa0) AM_READWRITE(nb1413m3_inputport1_r,nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_READWRITE(nb1413m3_inputport2_r,nb1413m3_sndrombank1_w) @@ -602,7 +602,7 @@ static ADDRESS_MAP_START( lovehous_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x50, 0x57) AM_WRITE(nbmj8891_blitter_w) AM_RANGE(0x60, 0x60) AM_WRITE(nbmj8891_romsel_w) AM_RANGE(0x70, 0x70) AM_WRITE(nbmj8891_scrolly_w) - AM_RANGE(0x80, 0x81) AM_DEVWRITE("fm", ym3812_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("fmsnd", ym3812_w) AM_RANGE(0x90, 0x90) AM_READ(nb1413m3_inputport0_r) //AM_WRITENOP AM_RANGE(0xa0, 0xa0) AM_READWRITE(nb1413m3_inputport1_r,nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_READWRITE(nb1413m3_inputport2_r,nb1413m3_sndrombank1_w) @@ -621,7 +621,7 @@ static ADDRESS_MAP_START( maiko_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x50, 0x57) AM_WRITE(nbmj8891_blitter_w) AM_RANGE(0x60, 0x60) AM_WRITE(nbmj8891_romsel_w) AM_RANGE(0x70, 0x70) AM_WRITE(nbmj8891_scrolly_w) - AM_RANGE(0x80, 0x81) AM_DEVWRITE("fm", ym3812_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("fmsnd", ym3812_w) AM_RANGE(0x90, 0x90) AM_READ(nb1413m3_inputport0_r) AM_RANGE(0xa0, 0xa0) AM_READWRITE(nb1413m3_inputport1_r,nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_READWRITE(nb1413m3_inputport2_r,nb1413m3_sndrombank1_w) @@ -635,8 +635,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( taiwanmb_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r) - AM_RANGE(0x81, 0x81) AM_DEVREAD("fm", ay8910_r) - AM_RANGE(0x82, 0x83) AM_DEVWRITE("fm", ay8910_data_address_w) + AM_RANGE(0x81, 0x81) AM_DEVREAD("fmsnd", ay8910_r) + AM_RANGE(0x82, 0x83) AM_DEVWRITE("fmsnd", ay8910_data_address_w) AM_RANGE(0x90, 0x90) AM_READ(nb1413m3_inputport0_r) //AM_WRITENOP // ? AM_RANGE(0xa0, 0xa0) AM_READWRITE(nb1413m3_inputport1_r,nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_READWRITE(nb1413m3_inputport2_r,nb1413m3_sndrombank1_w) @@ -2632,7 +2632,7 @@ static MACHINE_DRIVER_START( gionbana ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("fm", YM3812, 2500000) + MDRV_SOUND_ADD("fmsnd", YM3812, 2500000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MDRV_SOUND_ADD("dac", DAC, 0) @@ -2663,7 +2663,7 @@ static MACHINE_DRIVER_START( omotesnd ) MDRV_NVRAM_HANDLER(nb1413m3) /* sound hardware */ - MDRV_SOUND_REPLACE("fm", AY8910, 1250000) + MDRV_SOUND_REPLACE("fmsnd", AY8910, 1250000) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35) MACHINE_DRIVER_END @@ -2874,7 +2874,7 @@ static MACHINE_DRIVER_START( mjfocusm ) MDRV_VIDEO_START(nbmj8891_1layer) /* sound hardware */ - MDRV_SOUND_REPLACE("fm", AY8910, 1250000) + MDRV_SOUND_REPLACE("fmsnd", AY8910, 1250000) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35) MACHINE_DRIVER_END @@ -2897,7 +2897,7 @@ static MACHINE_DRIVER_START( taiwanmb ) MDRV_VIDEO_START(nbmj8891_1layer) /* sound hardware */ - MDRV_SOUND_REPLACE("fm", AY8910, 1250000) + MDRV_SOUND_REPLACE("fmsnd", AY8910, 1250000) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35) MACHINE_DRIVER_END diff --git a/src/mame/drivers/nbmj8900.c b/src/mame/drivers/nbmj8900.c index 70c138f58b1..124eb1e5ff7 100644 --- a/src/mame/drivers/nbmj8900.c +++ b/src/mame/drivers/nbmj8900.c @@ -144,7 +144,7 @@ static ADDRESS_MAP_START( ohpaipee_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x60, 0x60) AM_WRITE(nbmj8900_romsel_w) AM_RANGE(0x70, 0x70) AM_WRITE(nbmj8900_scrolly_w) - AM_RANGE(0x80, 0x81) AM_DEVREADWRITE("ym", ym3812_r,ym3812_w) + AM_RANGE(0x80, 0x81) AM_DEVREADWRITE("ymsnd", ym3812_r,ym3812_w) AM_RANGE(0x90, 0x90) AM_READ(nb1413m3_inputport0_r) @@ -353,7 +353,7 @@ static MACHINE_DRIVER_START( ohpaipee ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 2500000) + MDRV_SOUND_ADD("ymsnd", YM3812, 2500000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MDRV_SOUND_ADD("dac", DAC, 0) diff --git a/src/mame/drivers/nbmj8991.c b/src/mame/drivers/nbmj8991.c index 07595e7bd03..d41267208e3 100644 --- a/src/mame/drivers/nbmj8991.c +++ b/src/mame/drivers/nbmj8991.c @@ -254,7 +254,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( galkoku_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x7f) AM_READWRITE(nb1413m3_sndrom_r,nbmj8991_blitter_w) - AM_RANGE(0x80, 0x81) AM_DEVWRITE("fm", ym3812_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("fmsnd", ym3812_w) AM_RANGE(0x90, 0x90) AM_READ(nb1413m3_inputport0_r) AM_RANGE(0xa0, 0xa0) AM_READWRITE(nb1413m3_inputport1_r,nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_READWRITE(nb1413m3_inputport2_r,nb1413m3_sndrombank1_w) @@ -268,8 +268,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hyouban_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x7f) AM_READWRITE(nb1413m3_sndrom_r,nbmj8991_blitter_w) - AM_RANGE(0x81, 0x81) AM_DEVREAD("fm", ay8910_r) - AM_RANGE(0x82, 0x83) AM_DEVWRITE("fm", ay8910_data_address_w) + AM_RANGE(0x81, 0x81) AM_DEVREAD("fmsnd", ay8910_r) + AM_RANGE(0x82, 0x83) AM_DEVWRITE("fmsnd", ay8910_data_address_w) AM_RANGE(0x90, 0x90) AM_READ(nb1413m3_inputport0_r) AM_RANGE(0xa0, 0xa0) AM_READWRITE(nb1413m3_inputport1_r,nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_READWRITE(nb1413m3_inputport2_r,nb1413m3_sndrombank1_w) @@ -320,7 +320,7 @@ static ADDRESS_MAP_START( nbmj8991_sound_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x02, 0x02) AM_DEVWRITE("dac2", DAC_WRITE) AM_RANGE(0x04, 0x04) AM_WRITE(nbmj8991_soundbank_w) AM_RANGE(0x06, 0x06) AM_WRITENOP - AM_RANGE(0x80, 0x81) AM_DEVWRITE("fm", ym3812_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("fmsnd", ym3812_w) ADDRESS_MAP_END @@ -1498,7 +1498,7 @@ static MACHINE_DRIVER_START( nbmjdrv1 ) // galkoku /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("fm", YM3812, 25000000/10) + MDRV_SOUND_ADD("fmsnd", YM3812, 25000000/10) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70) MDRV_SOUND_ADD("dac", DAC, 0) @@ -1537,7 +1537,7 @@ static MACHINE_DRIVER_START( nbmjdrv2 ) // pstadium /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("fm", YM3812, 25000000/6.25) + MDRV_SOUND_ADD("fmsnd", YM3812, 25000000/6.25) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70) MDRV_SOUND_ADD("dac1", DAC, 0) @@ -1554,7 +1554,7 @@ static MACHINE_DRIVER_START( nbmjdrv3 ) MDRV_IMPORT_FROM(nbmjdrv1) /* sound hardware */ - MDRV_SOUND_REPLACE("fm", AY8910, 1250000) + MDRV_SOUND_REPLACE("fmsnd", AY8910, 1250000) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35) MACHINE_DRIVER_END diff --git a/src/mame/drivers/nbmj9195.c b/src/mame/drivers/nbmj9195.c index 872bcce6590..0324298ae36 100644 --- a/src/mame/drivers/nbmj9195.c +++ b/src/mame/drivers/nbmj9195.c @@ -1010,7 +1010,7 @@ static ADDRESS_MAP_START( sailorws_sound_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x56, 0x56) AM_READWRITE(tmpz84c011_1_dir_pc_r,tmpz84c011_1_dir_pc_w) AM_RANGE(0x34, 0x34) AM_READWRITE(tmpz84c011_1_dir_pd_r,tmpz84c011_1_dir_pd_w) AM_RANGE(0x44, 0x44) AM_READWRITE(tmpz84c011_1_dir_pe_r,tmpz84c011_1_dir_pe_w) - AM_RANGE(0x80, 0x81) AM_DEVWRITE("ym", ym3812_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("ymsnd", ym3812_w) ADDRESS_MAP_END /******************************************************************************** @@ -2947,7 +2947,7 @@ static MACHINE_DRIVER_START( NBMJDRV1 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 4000000) + MDRV_SOUND_ADD("ymsnd", YM3812, 4000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70) MDRV_SOUND_ADD("dac1", DAC, 0) diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c index b87514f5e21..8246ea0101a 100644 --- a/src/mame/drivers/nemesis.c +++ b/src/mame/drivers/nemesis.c @@ -565,7 +565,7 @@ static ADDRESS_MAP_START( sal_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE("konami", k007232_r, k007232_w) - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xd000, 0xd000) AM_DEVWRITE("vlm", vlm5030_data_w) AM_RANGE(0xe000, 0xe000) AM_READ(wd_r) /* watchdog?? */ AM_RANGE(0xf000, 0xf000) AM_DEVWRITE("vlm", salamand_speech_start_w) @@ -576,7 +576,7 @@ static ADDRESS_MAP_START( blkpnthr_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE("konami", k007232_r, k007232_w) - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xe000, 0xe000) AM_READ(wd_r) /* watchdog?? */ ADDRESS_MAP_END @@ -587,7 +587,7 @@ static ADDRESS_MAP_START( city_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9880, 0x9889) AM_DEVWRITE("konami2", k051649_frequency_w) AM_RANGE(0x988a, 0x988e) AM_DEVWRITE("konami2", k051649_volume_w) AM_RANGE(0x988f, 0x988f) AM_DEVWRITE("konami2", k051649_keyonoff_w) - AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) + AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w) AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE("konami", k007232_r, k007232_w) AM_RANGE(0xc000, 0xc000) AM_DEVWRITE("konami", city_sound_bank_w) /* 7232 bankswitch */ AM_RANGE(0xd000, 0xd000) AM_READ(soundlatch_r) @@ -1849,7 +1849,7 @@ static MACHINE_DRIVER_START( salamand ) MDRV_SOUND_ROUTE(1, "lspeaker", 0.10) MDRV_SOUND_ROUTE(1, "rspeaker", 0.10) - MDRV_SOUND_ADD("ym", YM2151, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -1894,7 +1894,7 @@ static MACHINE_DRIVER_START( blkpnthr ) MDRV_SOUND_ROUTE(1, "lspeaker", 0.10) MDRV_SOUND_ROUTE(1, "rspeaker", 0.10) - MDRV_SOUND_ADD("ym", YM2151, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -1939,7 +1939,7 @@ static MACHINE_DRIVER_START( citybomb ) MDRV_SOUND_ROUTE(1, "lspeaker", 0.30) MDRV_SOUND_ROUTE(1, "rspeaker", 0.30) - MDRV_SOUND_ADD("ym", YM3812, 3579545) + MDRV_SOUND_ADD("ymsnd", YM3812, 3579545) MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) @@ -1988,7 +1988,7 @@ static MACHINE_DRIVER_START( nyanpani ) MDRV_SOUND_ROUTE(1, "lspeaker", 0.30) MDRV_SOUND_ROUTE(1, "rspeaker", 0.30) - MDRV_SOUND_ADD("ym", YM3812, 3579545) + MDRV_SOUND_ADD("ymsnd", YM3812, 3579545) MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) @@ -2039,7 +2039,7 @@ static MACHINE_DRIVER_START( hcrash ) MDRV_SOUND_ROUTE(1, "lspeaker", 0.10) MDRV_SOUND_ROUTE(1, "rspeaker", 0.10) - MDRV_SOUND_ADD("ym", YM2151, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/neodrvr.c b/src/mame/drivers/neodrvr.c index 5614d83ce74..5ec33d0a5ca 100644 --- a/src/mame/drivers/neodrvr.c +++ b/src/mame/drivers/neodrvr.c @@ -736,7 +736,7 @@ ROM_START( neogeo ) ROM_REGION( 0x20000, "fixedbios", 0 ) ROM_LOAD( "sfix.sfix", 0x000000, 0x20000, CRC(c2ea0cfd) SHA1(fd4a618cdcdbf849374f0a50dd8efe9dbab706c3) ) - ROM_REGION( 0x10000, "ym", ROMREGION_ERASEFF ) + ROM_REGION( 0x10000, "ymsnd", ROMREGION_ERASEFF ) NO_DELTAT_REGION @@ -752,7 +752,7 @@ ROM_START( nam1975 ) /* MVS AND AES VERSION */ /* MB832000 */ NEO_BIOS_AUDIO_256K( "001-m1.bin", CRC(ba874463) SHA1(a83514f4b20301f84a98699900e2593f1c1b8846) ) - ROM_REGION( 0x080000, "ym", 0 ) + ROM_REGION( 0x080000, "ymsnd", 0 ) ROM_LOAD( "001-v1.bin", 0x000000, 0x080000, CRC(a7c3d5e5) SHA1(e3efc86940f91c53b7724c4566cfc21ea1a7a465) ) ROM_REGION( 0x180000, "ym.deltat", 0 ) @@ -778,7 +778,7 @@ ROM_START( bstars ) /* MVS VERSION */ /* MB832000 */ NEO_BIOS_AUDIO_256K( "002-m1.bin", CRC(4ecaa4ee) SHA1(50abfb8eed6cb4887393089f9ccc76f306ef69b5) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "002-v11.bin", 0x000000, 0x080000, CRC(b7b925bd) SHA1(644c92fa90e74998e73714f74b1e0680ee372a07) ) ROM_LOAD( "002-v12.bin", 0x080000, 0x080000, CRC(329f26fc) SHA1(2c8009edc88c6b26f7be5beb2b8d260aac394ee1) ) ROM_LOAD( "002-v13.bin", 0x100000, 0x080000, CRC(0c39f3c8) SHA1(db8f8670639601215707d918d4fb93221460446a) ) @@ -805,7 +805,7 @@ ROM_START( bstarsh ) /* AES VERSION */ /* MB832000 */ NEO_BIOS_AUDIO_256K( "002-m1.bin", CRC(4ecaa4ee) SHA1(50abfb8eed6cb4887393089f9ccc76f306ef69b5) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "002-v11.bin", 0x000000, 0x080000, CRC(b7b925bd) SHA1(644c92fa90e74998e73714f74b1e0680ee372a07) ) ROM_LOAD( "002-v12.bin", 0x080000, 0x080000, CRC(329f26fc) SHA1(2c8009edc88c6b26f7be5beb2b8d260aac394ee1) ) ROM_LOAD( "002-v13.bin", 0x100000, 0x080000, CRC(0c39f3c8) SHA1(db8f8670639601215707d918d4fb93221460446a) ) @@ -833,7 +833,7 @@ ROM_START( tpgolf ) /* MVS AND AES VERSION */ /* TC531001 */ NEO_BIOS_AUDIO_128K( "003-m1.bin", CRC(4cc545e6) SHA1(8e014b8cab3e5b3995756a4ea52ce49c36866377) ) - ROM_REGION( 0x080000, "ym", 0 ) + ROM_REGION( 0x080000, "ymsnd", 0 ) ROM_LOAD( "003-v1.bin", 0x000000, 0x080000, CRC(ff97f1cb) SHA1(defa249d46ae220f7bfa70746f5202bbbcc3e5fe) ) ROM_REGION( 0x200000, "ym.deltat", 0 ) @@ -861,7 +861,7 @@ ROM_START( mahretsu ) NEO_BIOS_AUDIO_128K( "004-m1.bin", CRC(c71fbb3b) SHA1(59c58665b53da61352359d191a0569de5dd1f4b3) ) - ROM_REGION( 0x100000, "ym", 0 ) + ROM_REGION( 0x100000, "ymsnd", 0 ) ROM_LOAD( "004-v11.bin", 0x000000, 0x080000, CRC(b2fb2153) SHA1(36e0cc8927b11105de40188af46f6cf532794c10) ) ROM_LOAD( "004-v12.bin", 0x080000, 0x080000, CRC(8503317b) SHA1(ab22f1aba1e977ab234a4f1d73dc6ed789dbeb85) ) @@ -886,7 +886,7 @@ ROM_START( maglord ) /* MVS VERSION */ /* MB832000 */ NEO_BIOS_AUDIO_256K( "005-m1.bin", CRC(26259f0f) SHA1(4f3e500093d61585048767dbd9fa09b3911a05d6) ) - ROM_REGION( 0x080000, "ym", 0 ) + ROM_REGION( 0x080000, "ymsnd", 0 ) ROM_LOAD( "005-v11.bin", 0x000000, 0x080000, CRC(cc0455fd) SHA1(a8ff4270e7705e263d25ff0b301f503bccea7e59) ) ROM_REGION( 0x100000, "ym.deltat", 0 ) @@ -911,7 +911,7 @@ ROM_START( maglordh ) /* AES VERSION */ /* MB832000 */ NEO_BIOS_AUDIO_256K( "005-m1.bin", CRC(26259f0f) SHA1(4f3e500093d61585048767dbd9fa09b3911a05d6) ) - ROM_REGION( 0x080000, "ym", 0 ) + ROM_REGION( 0x080000, "ymsnd", 0 ) ROM_LOAD( "005-v11.bin", 0x000000, 0x080000, CRC(cc0455fd) SHA1(a8ff4270e7705e263d25ff0b301f503bccea7e59) ) ROM_REGION( 0x100000, "ym.deltat", 0 ) @@ -936,7 +936,7 @@ ROM_START( ridhero ) /* MB832000 */ NEO_BIOS_AUDIO_256K( "006-m1.bin", CRC(92e7b4fe) SHA1(d240056cd632f92bdfaa5e0492c09aa9bd7b0471) ) - ROM_REGION( 0x100000, "ym", 0 ) + ROM_REGION( 0x100000, "ymsnd", 0 ) ROM_LOAD( "006-v11.bin", 0x000000, 0x080000, CRC(cdf74a42) SHA1(a17106cc3f9e5c5d52b4def861c0545a98151da2) ) ROM_LOAD( "006-v12.bin", 0x080000, 0x080000, CRC(e2fd2371) SHA1(cc95297bee7ffbdcb24ac4daeb5307cb39a52067) ) @@ -962,7 +962,7 @@ ROM_START( ridheroh ) /* MB832000 */ NEO_BIOS_AUDIO_256K( "006-m1.bin", CRC(92e7b4fe) SHA1(d240056cd632f92bdfaa5e0492c09aa9bd7b0471) ) - ROM_REGION( 0x100000, "ym", 0 ) + ROM_REGION( 0x100000, "ymsnd", 0 ) ROM_LOAD( "006-v11.bin", 0x000000, 0x080000, CRC(cdf74a42) SHA1(a17106cc3f9e5c5d52b4def861c0545a98151da2) ) ROM_LOAD( "006-v12.bin", 0x080000, 0x080000, CRC(e2fd2371) SHA1(cc95297bee7ffbdcb24ac4daeb5307cb39a52067) ) @@ -988,7 +988,7 @@ ROM_START( alpham2 ) /* MVS AND AES VERSION */ NEO_BIOS_AUDIO_128K( "007-m1.bin", CRC(28dfe2cd) SHA1(1a1a99fb917c6c8db591e3be695ce03f843ee1df) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "007-v1.bin", 0x000000, 0x100000, CRC(cd5db931) SHA1(b59f9f2df29f49470312a6cd20f5669b6aaf51ff) ) ROM_LOAD( "007-v2.bin", 0x100000, 0x100000, CRC(63e9b574) SHA1(1ade4cd0b15c84dd4a0fb7f7abf0885eef3a3f71) ) @@ -1009,7 +1009,7 @@ ROM_START( ncombat ) NEO_BIOS_AUDIO_128K( "009-m1.bin", CRC(b5819863) SHA1(6f2309d51531052dbf7d712993c9e35649db0d84) ) - ROM_REGION( 0x180000, "ym", 0 ) + ROM_REGION( 0x180000, "ymsnd", 0 ) ROM_LOAD( "009-v11.bin", 0x000000, 0x080000, CRC(cf32a59c) SHA1(af5b7fcd8a4aff1307c0a1d937e5f0460c32de79) ) ROM_LOAD( "009-v12.bin", 0x080000, 0x080000, CRC(7b3588b7) SHA1(a4e6d9d4113ff4ce48b371f65e9187d551821d3b) ) ROM_LOAD( "009-v13.bin", 0x100000, 0x080000, CRC(505a01b5) SHA1(9426a4f5b31e16f74e72e61951c189a878f211c5) ) @@ -1034,7 +1034,7 @@ ROM_START( ncombath ) /* MVS AND AES VERSION */ NEO_BIOS_AUDIO_128K( "009-m1.bin", CRC(b5819863) SHA1(6f2309d51531052dbf7d712993c9e35649db0d84) ) - ROM_REGION( 0x180000, "ym", 0 ) + ROM_REGION( 0x180000, "ymsnd", 0 ) ROM_LOAD( "009-v11.bin", 0x000000, 0x080000, CRC(cf32a59c) SHA1(af5b7fcd8a4aff1307c0a1d937e5f0460c32de79) ) ROM_LOAD( "009-v12.bin", 0x080000, 0x080000, CRC(7b3588b7) SHA1(a4e6d9d4113ff4ce48b371f65e9187d551821d3b) ) ROM_LOAD( "009-v13.bin", 0x100000, 0x080000, CRC(505a01b5) SHA1(9426a4f5b31e16f74e72e61951c189a878f211c5) ) @@ -1059,7 +1059,7 @@ ROM_START( cyberlip ) NEO_BIOS_AUDIO_128K( "010-m1.bin", CRC(8be3a078) SHA1(054ec6a061fcc88df1ecbb0a01611a31f37a7709) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "010-v11.bin", 0x000000, 0x080000, CRC(90224d22) SHA1(5443ee6f90d80d43194cb4b4f0e08851a59e7784) ) ROM_LOAD( "010-v12.bin", 0x080000, 0x080000, CRC(a0cf1834) SHA1(8df57a7941bdae7e446a6056039adb012cdde246) ) ROM_LOAD( "010-v13.bin", 0x100000, 0x080000, CRC(ae38bc84) SHA1(c0937b4f89b8b26c8a0e747b234f44ad6a3bf2ba) ) @@ -1087,7 +1087,7 @@ ROM_START( superspy ) /* MVS AND AES VERSION */ /* MB832000 */ NEO_BIOS_AUDIO_256K( "011-m1.bin", CRC(ca661f1b) SHA1(4e3cb57db716ec48487c1b070c3a55a5faf40856) ) - ROM_REGION( 0x180000, "ym", 0 ) + ROM_REGION( 0x180000, "ymsnd", 0 ) ROM_LOAD( "011-v11.bin", 0x000000, 0x100000, CRC(5c674d5c) SHA1(d7b9beddeb247b584cea9ca6c43ec6869809b673) ) ROM_LOAD( "011-v12.bin", 0x100000, 0x080000, CRC(9f513d5a) SHA1(37b04962f0b8e2a74abd35c407337a6151dc4e95) ) @@ -1110,7 +1110,7 @@ ROM_START( mutnat ) /* MVS AND AES VERSION */ /* CXK381003A */ NEO_BIOS_AUDIO_128K( "014-m1.bin", CRC(b6683092) SHA1(623ec7ec2915fb077bf65b4a16c815e071c25259) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "014-v1.bin", 0x000000, 0x100000, CRC(25419296) SHA1(c9fc04987c4e0875d276e1a0fb671740b6f548ad) ) ROM_LOAD( "014-v2.bin", 0x100000, 0x100000, CRC(0de53d5e) SHA1(467f6040da3dfb1974785e95e14c3f608a93720a) ) @@ -1133,7 +1133,7 @@ ROM_START( kotm ) /* TC531001 */ NEO_BIOS_AUDIO_128K( "016-m1.bin", CRC(9da9ca10) SHA1(88b915827d529f39c365d3e41197d5461e07a085) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "016-v1.bin", 0x000000, 0x100000, CRC(86c0a502) SHA1(7fe2db0c64aefdd14d6c36f7fcd6442591e9a014) ) ROM_LOAD( "016-v2.bin", 0x100000, 0x100000, CRC(5bc23ec5) SHA1(f4ff5d20587469daa026d5c812739335ce53cfdf) ) @@ -1156,7 +1156,7 @@ ROM_START( kotmh ) /* AES VERSION */ /* TC531001 */ NEO_BIOS_AUDIO_128K( "016-m1.bin", CRC(9da9ca10) SHA1(88b915827d529f39c365d3e41197d5461e07a085) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "016-v1.bin", 0x000000, 0x100000, CRC(86c0a502) SHA1(7fe2db0c64aefdd14d6c36f7fcd6442591e9a014) ) ROM_LOAD( "016-v2.bin", 0x100000, 0x100000, CRC(5bc23ec5) SHA1(f4ff5d20587469daa026d5c812739335ce53cfdf) ) @@ -1178,7 +1178,7 @@ ROM_START( sengoku ) /* MVS VERSION */ NEO_BIOS_AUDIO_128K( "017-m1.bin", CRC(9b4f34c6) SHA1(7f3a51f47fcbaa598f5c76bc66e2c53c8dfd852d) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "017-v1.bin", 0x000000, 0x100000, CRC(23663295) SHA1(9374a5d9f3de8e6a97c11f07d8b4485ac9d55edb) ) ROM_LOAD( "017-v2.bin", 0x100000, 0x100000, CRC(f61e6765) SHA1(1c9b287996947319eb3d288c3d82932cf01039db) ) @@ -1200,7 +1200,7 @@ ROM_START( sengokh ) /* AES VERSION */ NEO_BIOS_AUDIO_128K( "017-m1.bin", CRC(9b4f34c6) SHA1(7f3a51f47fcbaa598f5c76bc66e2c53c8dfd852d) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "017-v1.bin", 0x000000, 0x100000, CRC(23663295) SHA1(9374a5d9f3de8e6a97c11f07d8b4485ac9d55edb) ) ROM_LOAD( "017-v2.bin", 0x100000, 0x100000, CRC(f61e6765) SHA1(1c9b287996947319eb3d288c3d82932cf01039db) ) @@ -1222,7 +1222,7 @@ ROM_START( burningf ) /* MVS VERSION */ /* HN62321A */ NEO_BIOS_AUDIO_128K( "018-m1.bin", CRC(0c939ee2) SHA1(57d580d3279e66b9fe66bbcc68529d3384a926ff) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "018-v1.bin", 0x000000, 0x100000, CRC(508c9ffc) SHA1(cd3a97a233a4585f8507116aba85884623cccdc4) ) ROM_LOAD( "018-v2.bin", 0x100000, 0x100000, CRC(854ef277) SHA1(4b3083b9c80620064cb44e812a787a700e32a6f3) ) @@ -1244,7 +1244,7 @@ ROM_START( burningfh ) /* HN62321A */ NEO_BIOS_AUDIO_128K( "018-m1.bin", CRC(0c939ee2) SHA1(57d580d3279e66b9fe66bbcc68529d3384a926ff) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "018-v1.bin", 0x000000, 0x100000, CRC(508c9ffc) SHA1(cd3a97a233a4585f8507116aba85884623cccdc4) ) ROM_LOAD( "018-v2.bin", 0x100000, 0x100000, CRC(854ef277) SHA1(4b3083b9c80620064cb44e812a787a700e32a6f3) ) @@ -1266,7 +1266,7 @@ ROM_START( lbowling ) /* TC531001 */ NEO_BIOS_AUDIO_128K( "019-m1.bin", CRC(d568c17d) SHA1(a2e318ed6ad1809c79f3f0853d75e0dd1a2f275c) ) - ROM_REGION( 0x100000, "ym", 0 ) + ROM_REGION( 0x100000, "ymsnd", 0 ) ROM_LOAD( "019-v11.bin", 0x000000, 0x080000, CRC(0fb74872) SHA1(38c555926c77576d63472bc075210c42e9ce13a3) ) ROM_LOAD( "019-v12.bin", 0x080000, 0x080000, CRC(029faa57) SHA1(7bbaa87e38929ab1e32df5f6a2ec0fd5001e7cdb) ) @@ -1288,7 +1288,7 @@ ROM_START( gpilots ) /* MVS VERSION */ /* TC531001 */ NEO_BIOS_AUDIO_128K( "020-m1.bin", CRC(48409377) SHA1(0e212d2c76856a90b2c2fdff675239525972ac43) ) - ROM_REGION( 0x180000, "ym", 0 ) + ROM_REGION( 0x180000, "ymsnd", 0 ) ROM_LOAD( "020-v11.bin", 0x000000, 0x100000, CRC(1b526c8b) SHA1(2801868d2badcf8aaf5d490e010e4049d81d7bc1) ) ROM_LOAD( "020-v12.bin", 0x100000, 0x080000, CRC(4a9e6f03) SHA1(d3ac11f333b03d8a318921bdaefb14598e289a14) ) @@ -1312,7 +1312,7 @@ ROM_START( gpilotsh ) /* AES VERSION */ /* TC531001 */ NEO_BIOS_AUDIO_128K( "020-m1.bin", CRC(48409377) SHA1(0e212d2c76856a90b2c2fdff675239525972ac43) ) - ROM_REGION( 0x180000, "ym", 0 ) + ROM_REGION( 0x180000, "ymsnd", 0 ) ROM_LOAD( "020-v11.bin", 0x000000, 0x100000, CRC(1b526c8b) SHA1(2801868d2badcf8aaf5d490e010e4049d81d7bc1) ) ROM_LOAD( "020-v12.bin", 0x100000, 0x080000, CRC(4a9e6f03) SHA1(d3ac11f333b03d8a318921bdaefb14598e289a14) ) @@ -1335,7 +1335,7 @@ ROM_START( joyjoy ) /* MVS AND AES VERSION */ /* MB832000 */ NEO_BIOS_AUDIO_256K( "021-m1.bin", CRC(5a4be5e8) SHA1(552f025ce0d51c25f42e1a81cf0d08376ca5475d) ) - ROM_REGION( 0x080000, "ym", 0 ) + ROM_REGION( 0x080000, "ymsnd", 0 ) ROM_LOAD( "021-v11.bin", 0x000000, 0x080000, CRC(66c1e5c4) SHA1(7e85420021d4c39c36ed75a1cec567c5610ffce0) ) ROM_REGION( 0x080000, "ym.deltat", 0 ) @@ -1354,7 +1354,7 @@ ROM_START( bjourney ) /* MVS AND AES VERSION */ NEO_BIOS_AUDIO_128K( "022-m1.bin", CRC(8e1d4ab6) SHA1(deabc11ab81e7e68a3e041c03a127ae28d0d7264) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "022-v11.bin", 0x000000, 0x100000, CRC(2cb4ad91) SHA1(169ec7303c4275155a66a88cc08270c24132bb36) ) ROM_LOAD( "022-v22.bin", 0x100000, 0x100000, CRC(65a54d13) SHA1(a591fbcedca8f679dacbebcd554e3aa3fd163e92) ) @@ -1375,7 +1375,7 @@ ROM_START( quizdais ) NEO_BIOS_AUDIO_128K( "023-m1.bin", CRC(2a2105e0) SHA1(26fc13556fda2dbeb7b5b035abd994e302dc7662) ) - ROM_REGION( 0x100000, "ym", 0 ) + ROM_REGION( 0x100000, "ymsnd", 0 ) ROM_LOAD( "023-v1.bin", 0x000000, 0x100000, CRC(a53e5bd3) SHA1(cf115c6478ce155d889e6a5acb962339e08e024b) ) NO_DELTAT_REGION @@ -1393,7 +1393,7 @@ ROM_START( lresort ) NEO_BIOS_AUDIO_128K( "024-m1.bin", CRC(cec19742) SHA1(ab6c6ba7737e68d2420a0617719c6d4c89039c45) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "024-v1.bin", 0x000000, 0x100000, CRC(efdfa063) SHA1(e4609ecbcc1c820758f229da5145f51285b50555) ) ROM_LOAD( "024-v2.bin", 0x100000, 0x100000, CRC(3c7997c0) SHA1(8cb7e8e69892b19d318978370dbc510d51b06a69) ) @@ -1414,7 +1414,7 @@ ROM_START( eightman ) NEO_BIOS_AUDIO_128K( "025-m1.bin", CRC(9927034c) SHA1(205665361c5b2ab4f01ec480dd3c9b69db858d09) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "025-v1.bin", 0x000000, 0x100000, CRC(4558558a) SHA1(a4b277703ed67225c652be0d618daeca65a27b88) ) ROM_LOAD( "025-v2.bin", 0x100000, 0x100000, CRC(c5e052e9) SHA1(fa1119c90ce4c706a6aa0c17d7bc06aa3068d9b2) ) @@ -1435,7 +1435,7 @@ ROM_START( minasan ) NEO_BIOS_AUDIO_128K( "027-m1.bin", CRC(6a915482) SHA1(ce39c41a0b13798b0401ba1dde489619dfbc30ef) ) - ROM_REGION( 0x100000, "ym", 0 ) + ROM_REGION( 0x100000, "ymsnd", 0 ) ROM_LOAD( "027-v11.bin", 0x000000, 0x100000, CRC(59ad4459) SHA1(bbb8ba8a8e337dd2946eefda4757e80d0547d54a) ) ROM_REGION( 0x100000, "ym.deltat", 0 ) @@ -1456,7 +1456,7 @@ ROM_START( legendos ) NEO_BIOS_AUDIO_128K( "029-m1.bin", CRC(8ed64977) SHA1(c2f77213f05b4b2e1962a45e718a9e36cc398cbb) ) - ROM_REGION( 0x100000, "ym", 0 ) + ROM_REGION( 0x100000, "ymsnd", 0 ) ROM_LOAD( "029-v1.bin", 0x000000, 0x100000, CRC(85065452) SHA1(7154b7c59b16c32753ac6b5790fb50b51ce30a20) ) NO_DELTAT_REGION @@ -1476,7 +1476,7 @@ ROM_START( 2020bb ) NEO_BIOS_AUDIO_128K( "030-m1.bin", CRC(4cf466ec) SHA1(6a003b53c7a4af9d7529e2c10f27ffc4e58dcda5) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "030-v1.bin", 0x000000, 0x100000, CRC(d4ca364e) SHA1(b0573744b0ea2ef1e2167a225f0d254883f5af04) ) ROM_LOAD( "030-v2.bin", 0x100000, 0x100000, CRC(54994455) SHA1(76eb62b86e8ed51a77f44313d5cc8091b3f58d57) ) @@ -1498,7 +1498,7 @@ ROM_START( 2020bba ) /* MVS AND AES VERSION */ NEO_BIOS_AUDIO_128K( "030-m1.bin", CRC(4cf466ec) SHA1(6a003b53c7a4af9d7529e2c10f27ffc4e58dcda5) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "030-v1.bin", 0x000000, 0x100000, CRC(d4ca364e) SHA1(b0573744b0ea2ef1e2167a225f0d254883f5af04) ) ROM_LOAD( "030-v2.bin", 0x100000, 0x100000, CRC(54994455) SHA1(76eb62b86e8ed51a77f44313d5cc8091b3f58d57) ) @@ -1519,7 +1519,7 @@ ROM_START( 2020bbh ) NEO_BIOS_AUDIO_128K( "030-m1.bin", CRC(4cf466ec) SHA1(6a003b53c7a4af9d7529e2c10f27ffc4e58dcda5) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "030-v1.bin", 0x000000, 0x100000, CRC(d4ca364e) SHA1(b0573744b0ea2ef1e2167a225f0d254883f5af04) ) ROM_LOAD( "030-v2.bin", 0x100000, 0x100000, CRC(54994455) SHA1(76eb62b86e8ed51a77f44313d5cc8091b3f58d57) ) @@ -1541,7 +1541,7 @@ ROM_START( socbrawl ) /* TC531001 */ NEO_BIOS_AUDIO_128K( "031-m1.bin", CRC(cb37427c) SHA1(99efe9600ebeda48331f396e3203c7588bdb7d24) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "031-v1.bin", 0x000000, 0x100000, CRC(cc78497e) SHA1(895bd647150fae9b2259ef043ed681f4c4de66ea) ) ROM_LOAD( "031-v2.bin", 0x100000, 0x100000, CRC(dda043c6) SHA1(08165a59700ab6b1e523079dd2a3549e520cc594) ) @@ -1563,7 +1563,7 @@ ROM_START( socbrawla ) /* MVS VERSION */ /* TC531001 */ NEO_BIOS_AUDIO_128K( "031-m1.bin", CRC(cb37427c) SHA1(99efe9600ebeda48331f396e3203c7588bdb7d24) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "031-v1.bin", 0x000000, 0x100000, CRC(cc78497e) SHA1(895bd647150fae9b2259ef043ed681f4c4de66ea) ) ROM_LOAD( "031-v2.bin", 0x100000, 0x100000, CRC(dda043c6) SHA1(08165a59700ab6b1e523079dd2a3549e520cc594) ) @@ -1585,7 +1585,7 @@ ROM_START( roboarmy ) /* TC531001 */ NEO_BIOS_AUDIO_128K( "032-m1.bin", CRC(35ec952d) SHA1(8aed30e26d7e2c70dbce5de752df416091066f7b) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "032-v1.bin", 0x000000, 0x100000, CRC(63791533) SHA1(4479e9308cdc906b9e03b985303f4ebedd00512f) ) ROM_LOAD( "032-v2.bin", 0x100000, 0x100000, CRC(eb95de70) SHA1(b34885201116d2b3bbdee15ec7b5961cf5c069e1) ) @@ -1609,7 +1609,7 @@ ROM_START( roboarma ) /* TC531001 */ NEO_BIOS_AUDIO_128K( "032-m1.bin", CRC(35ec952d) SHA1(8aed30e26d7e2c70dbce5de752df416091066f7b) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "032-v1.bin", 0x000000, 0x100000, CRC(63791533) SHA1(4479e9308cdc906b9e03b985303f4ebedd00512f) ) ROM_LOAD( "032-v2.bin", 0x100000, 0x100000, CRC(eb95de70) SHA1(b34885201116d2b3bbdee15ec7b5961cf5c069e1) ) @@ -1632,7 +1632,7 @@ ROM_START( fatfury1 ) NEO_BIOS_AUDIO_128K( "033-m1.bin", CRC(5be10ffd) SHA1(90a5e6cbbc58a7883cd2a3a597180d631a466882) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "033-v1.bin", 0x000000, 0x100000, CRC(212fd20d) SHA1(120c040db8c01a6f140eea03725448bfa9ca98c2) ) ROM_LOAD( "033-v2.bin", 0x100000, 0x100000, CRC(fa2ae47f) SHA1(80d0ba4cd30aab59b6f0db8fa341387bd7388afc) ) @@ -1653,7 +1653,7 @@ ROM_START( fbfrenzy ) /* MVS AND AES VERSION */ NEO_BIOS_AUDIO_128K( "034-m1.bin", CRC(f41b16b8) SHA1(f3e1cfc4cd2c5baece176f169906aa796367d303) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "034-v1.bin", 0x000000, 0x100000, CRC(50c9d0dd) SHA1(2b3f2875b00e5f307d274128bd73c1521a7d901b) ) ROM_LOAD( "034-v2.bin", 0x100000, 0x100000, CRC(5aa15686) SHA1(efe47954827a98d539ba719347c5f8aa60e6338b) ) @@ -1674,7 +1674,7 @@ ROM_START( bakatono ) NEO_BIOS_AUDIO_128K( "036-m1.bin", BAD_DUMP CRC(f1385b96) SHA1(e7e3d1484188a115e262511116aaf466b8b1f428) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "036-v1.bin", 0x000000, 0x100000, CRC(1c335dce) SHA1(493c273fa71bf81861a20af4c4eaae159e169f39) ) ROM_LOAD( "036-v2.bin", 0x100000, 0x100000, CRC(bbf79342) SHA1(45a4f40e415cdf35c3073851506648c8f7d53958) ) @@ -1695,7 +1695,7 @@ ROM_START( crsword ) NEO_BIOS_AUDIO_128K( "037-m1.bin", CRC(9c384263) SHA1(74b86284048669e316c5d241b4aaeb02d59d4dfa) ) - ROM_REGION( 0x100000, "ym", 0 ) + ROM_REGION( 0x100000, "ymsnd", 0 ) ROM_LOAD( "037-v1.bin", 0x000000, 0x100000, CRC(61fedf65) SHA1(98f31d1e23bf7c1f7844e67f14707a704134042e) ) NO_DELTAT_REGION @@ -1716,7 +1716,7 @@ ROM_START( trally ) /* MVS AND AES VERSION */ NEO_BIOS_AUDIO_128K( "038-m1.bin", CRC(0908707e) SHA1(df7489ea6abf84d7f137ba7a8f52a4fd1b088fd7) ) - ROM_REGION( 0x180000, "ym", 0 ) + ROM_REGION( 0x180000, "ymsnd", 0 ) ROM_LOAD( "038-v1.bin", 0x000000, 0x100000, CRC(5ccd9fd5) SHA1(c3c8c758a320c39e4ceb0b6d9f188ed6d122eec4) ) ROM_LOAD( "038-v2.bin", 0x100000, 0x080000, CRC(ddd8d1e6) SHA1(65c819fa2392f264f5a1a0a4967c96775732500b) ) @@ -1738,7 +1738,7 @@ ROM_START( kotm2 ) NEO_BIOS_AUDIO_128K( "039-m1.bin", CRC(0c5b2ad5) SHA1(15eb5ea10fecdbdbcfd06225ae6d88bb239592e7) ) - ROM_REGION( 0x300000, "ym", 0 ) + ROM_REGION( 0x300000, "ymsnd", 0 ) ROM_LOAD( "039-v2.bin", 0x000000, 0x200000, CRC(86d34b25) SHA1(89bdb614b0c63d678962da52e2f596750d20828c) ) ROM_LOAD( "039-v4.bin", 0x200000, 0x100000, CRC(8fa62a0b) SHA1(58ac2fdd73c542eb8178cfc4adfa0e5940183283) ) @@ -1761,7 +1761,7 @@ ROM_START( sengoku2 ) NEO_BIOS_AUDIO_128K( "040-m1.bin", CRC(d4de4bca) SHA1(ecf604d06f01d40b04e285facef66a6ae2d35661) ) - ROM_REGION( 0x300000, "ym", 0 ) + ROM_REGION( 0x300000, "ymsnd", 0 ) ROM_LOAD( "040-v1.bin", 0x000000, 0x200000, CRC(71cb4b5d) SHA1(56d9aca1d476c19c7d0f707176a8fed53e0189b7) ) ROM_LOAD( "040-v2.bin", 0x200000, 0x100000, CRC(c5cece01) SHA1(923a3377dac1919e8c3d9ab316902250caa4785f) ) @@ -1785,7 +1785,7 @@ ROM_START( bstars2 ) /* TC531001 */ NEO_BIOS_AUDIO_128K( "041-m1.bin", CRC(15c177a6) SHA1(3f4abed635102f9bc8b44809750828c82e79b44f) ) - ROM_REGION( 0x280000, "ym", 0 ) + ROM_REGION( 0x280000, "ymsnd", 0 ) ROM_LOAD( "041-v1.bin", 0x000000, 0x100000, CRC(cb1da093) SHA1(4f4d1d5fefa9dda372083c045bf0d268a57ce8f1) ) ROM_LOAD( "041-v2.bin", 0x100000, 0x100000, CRC(1c954a9d) SHA1(159bc6efdd531615461f6e16f83f6d4c4e67c237) ) ROM_LOAD( "041-v3.bin", 0x200000, 0x080000, CRC(afaa0180) SHA1(c4a047e21f093830498a163598ed7bd48a8cf9d1) ) @@ -1807,7 +1807,7 @@ ROM_START( quizdai2 ) NEO_BIOS_AUDIO_128K( "042-m1.bin", CRC(bb19995d) SHA1(ed458fad5a23c6bd0d099927d98c31e1e6562d1b) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "042-v1.bin", 0x000000, 0x100000, CRC(af7f8247) SHA1(99a47014017c20e4e22010c60612b6b7f6efc9e5) ) ROM_LOAD( "042-v2.bin", 0x100000, 0x100000, CRC(c6474b59) SHA1(a6c5054032b698116247b2f09a8b94a1b588c4f1) ) @@ -1829,7 +1829,7 @@ ROM_START( 3countb ) /* MVS AND AES VERSION */ NEO_BIOS_AUDIO_128K( "043-m1.bin", CRC(7eab59cb) SHA1(5ae4107457e091f73960bfba39b589ae36d51ca3) ) - ROM_REGION( 0x400000, "ym", 0 ) + ROM_REGION( 0x400000, "ymsnd", 0 ) ROM_LOAD( "043-v1.bin", 0x000000, 0x200000, CRC(63688ce8) SHA1(5c6ac29a0cc0655a87cfe3ada8706838b86b86e4) ) ROM_LOAD( "043-v2.bin", 0x200000, 0x200000, CRC(c69a827b) SHA1(f5197ea87bb6573fa6aef3a1713c3679c58c1e74) ) @@ -1855,7 +1855,7 @@ ROM_START( aof ) /* MVS AND AES VERSION */ /* TC531001 */ NEO_BIOS_AUDIO_128K( "044-m1.bin", CRC(0987e4bb) SHA1(8fae4b7fac09d46d4727928e609ed9d3711dbded) ) - ROM_REGION( 0x400000, "ym", 0 ) + ROM_REGION( 0x400000, "ymsnd", 0 ) ROM_LOAD( "044-v2.bin", 0x000000, 0x200000, CRC(3ec632ea) SHA1(e3f413f580b57f70d2dae16dbdacb797884d3fce) ) ROM_LOAD( "044-v4.bin", 0x200000, 0x200000, CRC(4b0f8e23) SHA1(105da0cc5ba19869c7147fba8b177500758c232b) ) @@ -1881,7 +1881,7 @@ ROM_START( samsho ) /* MVS VERSION */ NEO_BIOS_AUDIO_128K( "045-m1.bin", CRC(95170640) SHA1(125c502db0693e8d11cef619b090081c14a9a300) ) - ROM_REGION( 0x400000, "ym", 0 ) + ROM_REGION( 0x400000, "ymsnd", 0 ) ROM_LOAD( "045-v1.bin", 0x000000, 0x200000, CRC(37f78a9b) SHA1(6279b497d12fa90b49ab5ac3aae20fb302ec8b81) ) ROM_LOAD( "045-v2.bin", 0x200000, 0x200000, CRC(568b20cf) SHA1(61af858685472a1fad608e230cccc2b108509ddb) ) @@ -1905,7 +1905,7 @@ ROM_START( samshoh ) /* AES VERSION */ NEO_BIOS_AUDIO_128K( "045-m1.bin", CRC(95170640) SHA1(125c502db0693e8d11cef619b090081c14a9a300) ) - ROM_REGION( 0x400000, "ym", 0 ) + ROM_REGION( 0x400000, "ymsnd", 0 ) ROM_LOAD( "045-v1.bin", 0x000000, 0x200000, CRC(37f78a9b) SHA1(6279b497d12fa90b49ab5ac3aae20fb302ec8b81) ) ROM_LOAD( "045-v2.bin", 0x200000, 0x200000, CRC(568b20cf) SHA1(61af858685472a1fad608e230cccc2b108509ddb) ) @@ -1937,7 +1937,7 @@ ROM_START( tophuntr ) /* MVS VERSION */ NEO_BIOS_AUDIO_128K( "046-m1.bin", CRC(3f84bb9f) SHA1(07446040871d11da3c2217ee9d1faf8c3cae7420) ) - ROM_REGION( 0x400000, "ym", 0 ) + ROM_REGION( 0x400000, "ymsnd", 0 ) ROM_LOAD( "046-v1.bin", 0x000000, 0x100000, CRC(c1f9c2db) SHA1(bed95a76afefa46503a12e0f0a9787c4c967ac50) ) ROM_LOAD( "046-v2.bin", 0x100000, 0x100000, CRC(56254a64) SHA1(1cf049cb4c414419859d2c8ee714317a35a85251) ) ROM_LOAD( "046-v3.bin", 0x200000, 0x100000, CRC(58113fb1) SHA1(40972982a63c7adecef840f9882f4165da723ab6) ) @@ -1965,7 +1965,7 @@ ROM_START( tophuntrh ) /* AES VERSION */ NEO_BIOS_AUDIO_128K( "046-m1.bin", CRC(3f84bb9f) SHA1(07446040871d11da3c2217ee9d1faf8c3cae7420) ) - ROM_REGION( 0x400000, "ym", 0 ) + ROM_REGION( 0x400000, "ymsnd", 0 ) ROM_LOAD( "046-v1.bin", 0x000000, 0x100000, CRC(c1f9c2db) SHA1(bed95a76afefa46503a12e0f0a9787c4c967ac50) ) ROM_LOAD( "046-v2.bin", 0x100000, 0x100000, CRC(56254a64) SHA1(1cf049cb4c414419859d2c8ee714317a35a85251) ) ROM_LOAD( "046-v3.bin", 0x200000, 0x100000, CRC(58113fb1) SHA1(40972982a63c7adecef840f9882f4165da723ab6) ) @@ -1993,7 +1993,7 @@ ROM_START( fatfury2 ) /* MVS AND AES VERSION */ NEO_BIOS_AUDIO_128K( "047-m1.bin", CRC(820b0ba7) SHA1(5708248d89446e49184eaadb52f7c61b2b6c13c5) ) - ROM_REGION( 0x400000, "ym", 0 ) + ROM_REGION( 0x400000, "ymsnd", 0 ) ROM_LOAD( "047-v1.bin", 0x000000, 0x200000, CRC(d9d00784) SHA1(f6a91eada8c23aa4518c4b82eeebca69f79d845c) ) ROM_LOAD( "047-v2.bin", 0x200000, 0x200000, CRC(2c9a4b33) SHA1(d4a1c0951c02c8919b3ec32ed96933634ff9e54c) ) @@ -2018,7 +2018,7 @@ ROM_START( janshin ) NEO_BIOS_AUDIO_128K( "048-m1.bin", CRC(310467c7) SHA1(c529961195c9bdf5d1ce70a38ad129002d1f3b5f) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "048-v1.bin", 0x000000, 0x200000, CRC(f1947d2b) SHA1(955ff91ab24eb2a7ec51ff46c9f9f2ec060456b2) ) NO_DELTAT_REGION @@ -2037,7 +2037,7 @@ ROM_START( androdun ) NEO_BIOS_AUDIO_128K( "049-m1.bin", CRC(edd2acf4) SHA1(c4ee6ba834d54b9fc5a854dbc41a05877e090371) ) - ROM_REGION( 0x100000, "ym", 0 ) + ROM_REGION( 0x100000, "ymsnd", 0 ) ROM_LOAD( "049-v1.bin", 0x000000, 0x100000, CRC(ce43cb89) SHA1(47f82e077abb6efc6b1b0490412ae147d5d2acef) ) NO_DELTAT_REGION @@ -2055,7 +2055,7 @@ ROM_START( ncommand ) NEO_BIOS_AUDIO_128K( "050-m1.bin", CRC(6fcf07d3) SHA1(e9ecff4bfec1f5964bf06645f75d80d611b6231c) ) - ROM_REGION( 0x180000, "ym", 0 ) + ROM_REGION( 0x180000, "ymsnd", 0 ) ROM_LOAD( "050-v1.bin", 0x000000, 0x100000, CRC(23c3ab42) SHA1(b6c59bb180f1aa34c95f3ec923f3aafb689d57b0) ) ROM_LOAD( "050-v2.bin", 0x100000, 0x080000, CRC(80b8a984) SHA1(950cf0e78ceffa4037663f1086fbbc88588f49f2) ) @@ -2076,7 +2076,7 @@ ROM_START( viewpoin ) NEO_BIOS_AUDIO_128K( "051-m1.bin", CRC(8e69f29a) SHA1(7a25f4997996434ea1b7d0d1ca9e7aaf966cbd03) ) - ROM_REGION( 0x400000, "ym", 0 ) + ROM_REGION( 0x400000, "ymsnd", 0 ) ROM_LOAD( "051-v1.bin", 0x000000, 0x200000, CRC(019978b6) SHA1(7896a551115fc6ed38b5944e0c8dcb2b2c1c077d) ) ROM_LOAD( "051-v2.bin", 0x200000, 0x200000, CRC(5758f38c) SHA1(da10f4b7d22d9139bbf068bd940be82168a74ca1) ) @@ -2097,7 +2097,7 @@ ROM_START( ssideki ) NEO_BIOS_AUDIO_128K( "052-m1.bin", CRC(49f17d2d) SHA1(70971fcf71ae3a6b2e26e7ade8063941fb178ae5) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "052-v1.bin", 0x000000, 0x200000, CRC(22c097a5) SHA1(328c4e6db0a026f54a633cff1443a3f964a8daea) ) NO_DELTAT_REGION @@ -2119,7 +2119,7 @@ ROM_START( wh1 ) /* MVS VERSION */ NEO_BIOS_AUDIO_128K( "053-m1.bin", CRC(1bd9d04b) SHA1(65cd7b002123ed1a3111e3d942608d0082799ff3) ) - ROM_REGION( 0x300000, "ym", 0 ) + ROM_REGION( 0x300000, "ymsnd", 0 ) ROM_LOAD( "053-v2.bin", 0x000000, 0x200000, CRC(a68df485) SHA1(007fa715423fba72c899cd3db3f4bec13281cf7a) ) ROM_LOAD( "053-v4.bin", 0x200000, 0x100000, CRC(7bea8f66) SHA1(428e8721bd87f7faa756adb1e12672219be46c1d) ) @@ -2143,7 +2143,7 @@ ROM_START( wh1h ) /* AES VERSION */ NEO_BIOS_AUDIO_128K( "053-m1.bin", CRC(1bd9d04b) SHA1(65cd7b002123ed1a3111e3d942608d0082799ff3) ) - ROM_REGION( 0x300000, "ym", 0 ) + ROM_REGION( 0x300000, "ymsnd", 0 ) ROM_LOAD( "053-v2.bin", 0x000000, 0x200000, CRC(a68df485) SHA1(007fa715423fba72c899cd3db3f4bec13281cf7a) ) ROM_LOAD( "053-v4.bin", 0x200000, 0x100000, CRC(7bea8f66) SHA1(428e8721bd87f7faa756adb1e12672219be46c1d) ) @@ -2167,7 +2167,7 @@ ROM_START( wh1ha ) NEO_BIOS_AUDIO_128K( "053-m1.bin", CRC(1bd9d04b) SHA1(65cd7b002123ed1a3111e3d942608d0082799ff3) ) - ROM_REGION( 0x300000, "ym", 0 ) + ROM_REGION( 0x300000, "ymsnd", 0 ) ROM_LOAD( "053-v2.bin", 0x000000, 0x200000, CRC(a68df485) SHA1(007fa715423fba72c899cd3db3f4bec13281cf7a) ) ROM_LOAD( "053-v4.bin", 0x200000, 0x100000, CRC(7bea8f66) SHA1(428e8721bd87f7faa756adb1e12672219be46c1d) ) @@ -2191,7 +2191,7 @@ ROM_START( kof94 ) NEO_BIOS_AUDIO_128K( "055-m1.bin", CRC(f6e77cf5) SHA1(292a3e3a4918ffe72bd1c41acb927b91844e035e) ) - ROM_REGION( 0x600000, "ym", 0 ) + ROM_REGION( 0x600000, "ymsnd", 0 ) ROM_LOAD( "055-v1.bin", 0x000000, 0x200000, CRC(8889596d) SHA1(c9ce713b720511438dbd3fe3bcc7c246f475c6a2) ) ROM_LOAD( "055-v2.bin", 0x200000, 0x200000, CRC(25022b27) SHA1(2b040a831c3c92ac6e4719de38009a0d55b64f6b) ) ROM_LOAD( "055-v3.bin", 0x400000, 0x200000, CRC(83cf32c0) SHA1(34a31a37eb10945b5169e96321bcea06eec33a00) ) @@ -2217,7 +2217,7 @@ ROM_START( aof2 ) NEO_BIOS_AUDIO_128K( "056-m1.bin", CRC(f27e9d52) SHA1(dddae733d87ce7c88ad2580a8f64cb6ff9572e67) ) - ROM_REGION( 0x500000, "ym", 0 ) + ROM_REGION( 0x500000, "ymsnd", 0 ) ROM_LOAD( "056-v1.bin", 0x000000, 0x200000, CRC(4628fde0) SHA1(ece2a50f5270d844d58401b1447d1d856d78ea45) ) ROM_LOAD( "056-v2.bin", 0x200000, 0x200000, CRC(b710e2f2) SHA1(df4da585203eea7554d3ce718eb107e9cb6a0254) ) ROM_LOAD( "056-v3.bin", 0x400000, 0x100000, CRC(d168c301) SHA1(969273d1d11943e81560959359a2c4e69522af0e) ) @@ -2245,7 +2245,7 @@ ROM_START( aof2a ) /* make parent? */ NEO_BIOS_AUDIO_128K( "056-m1.bin", CRC(f27e9d52) SHA1(dddae733d87ce7c88ad2580a8f64cb6ff9572e67) ) - ROM_REGION( 0x500000, "ym", 0 ) + ROM_REGION( 0x500000, "ymsnd", 0 ) ROM_LOAD( "056-v1.bin", 0x000000, 0x200000, CRC(4628fde0) SHA1(ece2a50f5270d844d58401b1447d1d856d78ea45) ) ROM_LOAD( "056-v2.bin", 0x200000, 0x200000, CRC(b710e2f2) SHA1(df4da585203eea7554d3ce718eb107e9cb6a0254) ) ROM_LOAD( "056-v3.bin", 0x400000, 0x100000, CRC(d168c301) SHA1(969273d1d11943e81560959359a2c4e69522af0e) ) @@ -2272,7 +2272,7 @@ ROM_START( wh2 ) NEO_BIOS_AUDIO_128K( "057-m1.bin", CRC(8fa3bc77) SHA1(982f92978671e4ee66630948e6bb7565b37b5dc0) ) - ROM_REGION( 0x400000, "ym", 0 ) + ROM_REGION( 0x400000, "ymsnd", 0 ) ROM_LOAD( "057-v1.bin", 0x000000, 0x200000, CRC(8877e301) SHA1(1bab988d74ea8fd12db201c257ec844622cf5f4e) ) ROM_LOAD( "057-v2.bin", 0x200000, 0x200000, CRC(c1317ff4) SHA1(4c28b2b5998abaeaa5143f2f3a9ba52c6041f4f3) ) @@ -2296,7 +2296,7 @@ ROM_START( fatfursp ) NEO_BIOS_AUDIO_128K( "058-m1.bin", CRC(ccc5186e) SHA1(cf9091c523c182aebfb928c91640b2d72fd70123) ) - ROM_REGION( 0x500000, "ym", 0 ) + ROM_REGION( 0x500000, "ymsnd", 0 ) ROM_LOAD( "058-v1.bin", 0x000000, 0x200000, CRC(55d7ce84) SHA1(05ac6a395d9bf9166925acca176a8d6129f533c8) ) ROM_LOAD( "058-v2.bin", 0x200000, 0x200000, CRC(ee080b10) SHA1(29814fc21bbe30d37745c8918fab00c83a309be4) ) ROM_LOAD( "058-v3.bin", 0x400000, 0x100000, CRC(f9eb3d4a) SHA1(d1747f9460b965f6daf4f881ed4ecd04c5253434) ) @@ -2323,7 +2323,7 @@ ROM_START( fatfursa ) NEO_BIOS_AUDIO_128K( "058-m1.bin", CRC(ccc5186e) SHA1(cf9091c523c182aebfb928c91640b2d72fd70123) ) - ROM_REGION( 0x500000, "ym", 0 ) + ROM_REGION( 0x500000, "ymsnd", 0 ) ROM_LOAD( "058-v1.bin", 0x000000, 0x200000, CRC(55d7ce84) SHA1(05ac6a395d9bf9166925acca176a8d6129f533c8) ) ROM_LOAD( "058-v2.bin", 0x200000, 0x200000, CRC(ee080b10) SHA1(29814fc21bbe30d37745c8918fab00c83a309be4) ) ROM_LOAD( "058-v3.bin", 0x400000, 0x100000, CRC(f9eb3d4a) SHA1(d1747f9460b965f6daf4f881ed4ecd04c5253434) ) @@ -2348,7 +2348,7 @@ ROM_START( savagere ) NEO_BIOS_AUDIO_128K( "059-m1.bin", CRC(29992eba) SHA1(187be624abe8670503edb235ff21ae8fdc3866e0) ) - ROM_REGION( 0x600000, "ym", 0 ) + ROM_REGION( 0x600000, "ymsnd", 0 ) ROM_LOAD( "059-v1.bin", 0x000000, 0x200000, CRC(530c50fd) SHA1(29401cee7f7d2c199c7cb58092e86b28205e81ad) ) ROM_LOAD( "059-v2.bin", 0x200000, 0x200000, CRC(eb6f1cdb) SHA1(7a311388315ea543babf872f62219fdc4d39d013) ) ROM_LOAD( "059-v3.bin", 0x400000, 0x200000, CRC(7038c2f9) SHA1(c1d6f86b24feba03fe009b58199d2eeabe572f4e) ) @@ -2375,7 +2375,7 @@ ROM_START( fightfev ) NEO_BIOS_AUDIO_128K( "060-m1.bin", CRC(0b7c4e65) SHA1(999a1e784de18db3f1332b30bc425836ea6970be) ) - ROM_REGION( 0x300000, "ym", 0 ) + ROM_REGION( 0x300000, "ymsnd", 0 ) ROM_LOAD( "060-v1.bin", 0x000000, 0x200000, CRC(f417c215) SHA1(0f53b8dd056f43b5d880628e8b74c2b27881ffac) ) ROM_LOAD( "060-v2.bin", 0x200000, 0x100000, CRC(efcff7cf) SHA1(e8372303724284a750b706dc6bf7641e4c52bb95) ) @@ -2398,7 +2398,7 @@ ROM_START( fightfeva ) /* MVS VERSION */ NEO_BIOS_AUDIO_128K( "060-m1.bin", CRC(0b7c4e65) SHA1(999a1e784de18db3f1332b30bc425836ea6970be) ) - ROM_REGION( 0x300000, "ym", 0 ) + ROM_REGION( 0x300000, "ymsnd", 0 ) ROM_LOAD( "060-v1.bin", 0x000000, 0x200000, CRC(f417c215) SHA1(0f53b8dd056f43b5d880628e8b74c2b27881ffac) ) ROM_LOAD( "060-v2.bin", 0x200000, 0x100000, CRC(efcff7cf) SHA1(e8372303724284a750b706dc6bf7641e4c52bb95) ) @@ -2419,7 +2419,7 @@ ROM_START( ssideki2 ) NEO_BIOS_AUDIO_128K( "061-m1.bin", CRC(156f6951) SHA1(49686f615f109a02b4f23931f1c84fee13872ffd) ) - ROM_REGION( 0x400000, "ym", 0 ) + ROM_REGION( 0x400000, "ymsnd", 0 ) ROM_LOAD( "061-v1.bin", 0x000000, 0x200000, CRC(f081c8d3) SHA1(fc9da0ddc1ddd1f9ae1443a726815c25e9dc38ae) ) ROM_LOAD( "061-v2.bin", 0x200000, 0x200000, CRC(7cd63302) SHA1(c39984c0ae0a8e76f1fc036344bbb83635c18937) ) @@ -2441,7 +2441,7 @@ ROM_START( spinmast ) NEO_BIOS_AUDIO_128K( "062-m1.bin", CRC(76108b2f) SHA1(08c89a8b746dbb10ff885b41cde344173c2e3699) ) - ROM_REGION( 0x100000, "ym", 0 ) + ROM_REGION( 0x100000, "ymsnd", 0 ) ROM_LOAD( "062-v1.bin", 0x000000, 0x100000, CRC(cc281aef) SHA1(68be154b3e25f837afb4a477600dbe0ee69bec44) ) NO_DELTAT_REGION @@ -2466,7 +2466,7 @@ ROM_START( samsho2 ) /* MVS AND AES VERSION */ NEO_BIOS_AUDIO_128K( "063-m1.bin", CRC(56675098) SHA1(90429fc40d056d480d0e2bbefbc691d9fa260fc4) ) - ROM_REGION( 0x700000, "ym", 0 ) + ROM_REGION( 0x700000, "ymsnd", 0 ) ROM_LOAD( "063-v1.bin", 0x000000, 0x200000, CRC(37703f91) SHA1(a373ebef4c33ba1d8340e826981a58769aada238) ) ROM_LOAD( "063-v2.bin", 0x200000, 0x200000, CRC(0142bde8) SHA1(0be6c53acac44802bf70b6925452f70289a139d9) ) ROM_LOAD( "063-v3.bin", 0x400000, 0x200000, CRC(d07fa5ca) SHA1(1da7f081f8b8fc86a91feacf900f573218d82676) ) @@ -2498,7 +2498,7 @@ ROM_START( samsho2k ) NEO_BIOS_AUDIO_128K( "063-m1.bin", CRC(56675098) SHA1(90429fc40d056d480d0e2bbefbc691d9fa260fc4) ) - ROM_REGION( 0x700000, "ym", 0 ) + ROM_REGION( 0x700000, "ymsnd", 0 ) ROM_LOAD( "063-v1.bin", 0x000000, 0x200000, CRC(37703f91) SHA1(a373ebef4c33ba1d8340e826981a58769aada238) ) ROM_LOAD( "063-v2.bin", 0x200000, 0x200000, CRC(0142bde8) SHA1(0be6c53acac44802bf70b6925452f70289a139d9) ) ROM_LOAD( "063-v3.bin", 0x400000, 0x200000, CRC(d07fa5ca) SHA1(1da7f081f8b8fc86a91feacf900f573218d82676) ) @@ -2526,7 +2526,7 @@ ROM_START( wh2j ) /* MVS VERSION */ NEO_BIOS_AUDIO_128K( "064-m1.bin", CRC(d2eec9d3) SHA1(09478787045f1448d19d064dd3d540d1741fd619) ) - ROM_REGION( 0x400000, "ym", 0 ) + ROM_REGION( 0x400000, "ymsnd", 0 ) ROM_LOAD( "064-v1.bin", 0x000000, 0x200000, CRC(aa277109) SHA1(35c22b15bb0a4d0ab118cb22a2d450d03995a17c) ) ROM_LOAD( "064-v2.bin", 0x200000, 0x200000, CRC(b6527edd) SHA1(2bcf5bfa6e117cf4a3728a5e5f5771313c93f22a) ) @@ -2548,7 +2548,7 @@ ROM_START( wh2jh ) /* AES VERSION */ NEO_BIOS_AUDIO_128K( "064-m1.bin", CRC(d2eec9d3) SHA1(09478787045f1448d19d064dd3d540d1741fd619) ) - ROM_REGION( 0x400000, "ym", 0 ) + ROM_REGION( 0x400000, "ymsnd", 0 ) ROM_LOAD( "064-v1.bin", 0x000000, 0x200000, CRC(aa277109) SHA1(35c22b15bb0a4d0ab118cb22a2d450d03995a17c) ) ROM_LOAD( "064-v2.bin", 0x200000, 0x200000, CRC(b6527edd) SHA1(2bcf5bfa6e117cf4a3728a5e5f5771313c93f22a) ) @@ -2573,7 +2573,7 @@ ROM_START( wjammers ) NEO_BIOS_AUDIO_128K( "065-m1.bin", CRC(52c23cfc) SHA1(809a7e072ad9acbffc25e9bd27cdb97638d09d07) ) - ROM_REGION( 0x400000, "ym", 0 ) + ROM_REGION( 0x400000, "ymsnd", 0 ) ROM_LOAD( "065-v1.bin", 0x000000, 0x100000, CRC(ce8b3698) SHA1(7d75e2a5cf8c90be422f8b425447e81597fe145a) ) ROM_LOAD( "065-v2.bin", 0x100000, 0x100000, CRC(659f9b96) SHA1(62f40365212153bc3b92a1187fa44f6cdc7f7b83) ) ROM_LOAD( "065-v3.bin", 0x200000, 0x100000, CRC(39f73061) SHA1(ec57cd58e7f8569cff925d11e2320d588ce4fe49) ) @@ -2596,7 +2596,7 @@ ROM_START( karnovr ) NEO_BIOS_AUDIO_128K( "066-m1.bin", CRC(030beae4) SHA1(ceb6ee6c09514504efacdbca7b280901e4c97084) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "066-v1.bin", 0x000000, 0x200000, CRC(0b7ea37a) SHA1(34e7d4f6db053674a7e8c8b2e3e398777d5b02e6) ) NO_DELTAT_REGION @@ -2618,7 +2618,7 @@ ROM_START( gururin ) NEO_BIOS_AUDIO_128K( "067-m1.bin", CRC(e777a234) SHA1(9f3974ac07859337bc0203f903c40ae3f60dc1fb) ) - ROM_REGION( 0x80000, "ym", 0 ) + ROM_REGION( 0x80000, "ymsnd", 0 ) ROM_LOAD( "067-v1.bin", 0x000000, 0x80000, CRC(cf23afd0) SHA1(10f87014ee10613f92b04f482f449721a6379db7) ) NO_DELTAT_REGION @@ -2636,7 +2636,7 @@ ROM_START( pspikes2 ) /* MVS VERSION */ NEO_BIOS_AUDIO_128K( "068-mg1.bin", CRC(b1c7911e) SHA1(27b298e7d50981331e17aa642e2e363ffac4333a) ) - ROM_REGION( 0x300000, "ym", 0 ) + ROM_REGION( 0x300000, "ymsnd", 0 ) ROM_LOAD( "068-v1.bin", 0x000000, 0x100000, CRC(2ced86df) SHA1(d6b73d1f31efbd74fb745200d4dade5f80b71541) ) ROM_LOAD( "068-v2.bin", 0x100000, 0x100000, CRC(970851ab) SHA1(6c9b04e9cc6b92133f1154e5bdd9d38d8ef050a7) ) ROM_LOAD( "068-v3.bin", 0x200000, 0x100000, CRC(81ff05aa) SHA1(d74302f38c59055bfc83b39dff798a585314fecd) ) @@ -2661,7 +2661,7 @@ ROM_START( fatfury3 ) /* MVS AND AES VERSION */ NEO_BIOS_AUDIO_128K( "069-m1.bin", CRC(fce72926) SHA1(a40c74f793900b8542f0b8383ce4bf46fca112d4) ) - ROM_REGION( 0xa00000, "ym", 0 ) + ROM_REGION( 0xa00000, "ymsnd", 0 ) ROM_LOAD( "069-v1.bin", 0x000000, 0x400000, CRC(2bdbd4db) SHA1(5f4fecf69c2329d699cbd45829c19303b1e2a80e) ) ROM_LOAD( "069-v2.bin", 0x400000, 0x400000, CRC(a698a487) SHA1(11b8bc53bc26a51f4a408e900e3769958625c4ed) ) ROM_LOAD( "069-v3.bin", 0x800000, 0x200000, CRC(581c5304) SHA1(e9550ec547b4f605afed996b22d711f49b48fa92) ) @@ -2691,7 +2691,7 @@ ROM_START( zupapa ) /* Original Version - Encrypted GFX */ NEO_BIOS_AUDIO_128K( "070-m1.bin", CRC(5a3b3191) SHA1(fa9a9930e18c64e598841fb344c4471d3d2c1964) ) - ROM_REGION( 0x0200000, "ym", 0 ) + ROM_REGION( 0x0200000, "ymsnd", 0 ) ROM_LOAD( "070-v1.bin", 0x000000, 0x200000, CRC(d3a7e1ff) SHA1(4a4a227e10f4af58168f6c26011ea1d414253f92) ) NO_DELTAT_REGION @@ -2710,7 +2710,7 @@ ROM_START( panicbom ) NEO_BIOS_AUDIO_128K( "073-m1.bin", CRC(3cdf5d88) SHA1(6d8365a946fbd0b7c7b896536322638d80f6a764) ) - ROM_REGION( 0x300000, "ym", 0 ) + ROM_REGION( 0x300000, "ymsnd", 0 ) ROM_LOAD( "073-v1.bin", 0x000000, 0x200000, CRC(7fc86d2f) SHA1(aa4234d22157060e0ba97a09c4e85c5276b74099) ) ROM_LOAD( "073-v2.bin", 0x200000, 0x100000, CRC(082adfc7) SHA1(19c168e9a6cadcbed79033c320bcf3a45f846daf) ) @@ -2730,7 +2730,7 @@ ROM_START( aodk ) NEO_BIOS_AUDIO_128K( "074-m1.bin", CRC(5a52a9d1) SHA1(ef913a9a55d29d5dd3beab1ce6039d64ce9b1a5b) ) - ROM_REGION( 0x400000, "ym", 0 ) + ROM_REGION( 0x400000, "ymsnd", 0 ) ROM_LOAD( "074-v1.bin", 0x000000, 0x200000, CRC(7675b8fa) SHA1(29f4facf89d551237b31bf779693cbbbc94e1ede) ) ROM_LOAD( "074-v2.bin", 0x200000, 0x200000, CRC(a9da86e9) SHA1(ff65af61e42b79a75060a352b24077d1fa28c83f) ) @@ -2756,7 +2756,7 @@ ROM_START( sonicwi2 ) NEO_BIOS_AUDIO_128K( "075-m1.bin", CRC(bb828df1) SHA1(eab8e2868173bdaac7c7ed97305a9aa1033fd303) ) - ROM_REGION( 0x300000, "ym", 0 ) + ROM_REGION( 0x300000, "ymsnd", 0 ) ROM_LOAD( "075-v1.bin", 0x000000, 0x200000, CRC(7577e949) SHA1(3ba9f11094dd0cf519f33a16016cfae0d2c6629c) ) ROM_LOAD( "075-v2.bin", 0x200000, 0x100000, CRC(021760cd) SHA1(8a24e38f1d4982c4dcd82718995571ac94cbb390) ) @@ -2777,7 +2777,7 @@ ROM_START( zedblade ) NEO_BIOS_AUDIO_128K( "076-m1.bin", CRC(7b5f3d0a) SHA1(4a301781a57ff236f49492b576ff4858b0ffbdf8) ) - ROM_REGION( 0x500000, "ym", 0 ) + ROM_REGION( 0x500000, "ymsnd", 0 ) ROM_LOAD( "076-v1.bin", 0x000000, 0x200000, CRC(1a21d90c) SHA1(4793ab06421228ad122e359653ed0f1339b90c7a) ) ROM_LOAD( "076-v2.bin", 0x200000, 0x200000, CRC(b61686c3) SHA1(5a3405e833ce36abb7421190438b5cccc8537919) ) ROM_LOAD( "076-v3.bin", 0x400000, 0x100000, CRC(b90658fa) SHA1(b9a4b34565ce3688495c47e35c9b888ef686ae9f) ) @@ -2800,7 +2800,7 @@ ROM_START( galaxyfg ) NEO_BIOS_AUDIO_128K( "078-m1.bin", CRC(8e9e3b10) SHA1(7c44d1dbd4f8d337c99e90361d1dab837df85e31) ) - ROM_REGION( 0x500000, "ym", 0 ) + ROM_REGION( 0x500000, "ymsnd", 0 ) ROM_LOAD( "078-v1.bin", 0x000000, 0x200000, CRC(e3b735ac) SHA1(e16dfac09aef8115a20bae0bef8c86d4e7d0dc4a) ) ROM_LOAD( "078-v2.bin", 0x200000, 0x200000, CRC(6a8e78c2) SHA1(f60b1f8a3a945f279a582745e82f37278ce5d83b) ) ROM_LOAD( "078-v3.bin", 0x400000, 0x100000, CRC(70bca656) SHA1(218b7079c90898e7faa382b386e77f81f415e7ac) ) @@ -2826,7 +2826,7 @@ ROM_START( strhoop ) NEO_BIOS_AUDIO_128K( "079-m1.bin", CRC(bee3455a) SHA1(fd5345d9847982085a9b364fff542580889bf02f) ) - ROM_REGION( 0x280000, "ym", 0 ) + ROM_REGION( 0x280000, "ymsnd", 0 ) ROM_LOAD( "079-v1.bin", 0x000000, 0x200000, CRC(718a2400) SHA1(cefc5d0b302bd4a87ab1fa244ade4482c23c6806) ) ROM_LOAD( "079-v2.bin", 0x200000, 0x080000, CRC(b19884f8) SHA1(5fe910f2029da19ddab4dc95c2292d7fbb086741) ) @@ -2847,7 +2847,7 @@ ROM_START( quizkof ) NEO_BIOS_AUDIO_128K( "080-m1.bin", CRC(f5f44172) SHA1(eaaba1781622901b91bce9257be4e05f84df053b) ) - ROM_REGION( 0x600000, "ym", 0 ) + ROM_REGION( 0x600000, "ymsnd", 0 ) ROM_LOAD( "080-v1.bin", 0x000000, 0x200000, CRC(0be18f60) SHA1(05c8b7d9f5a8583015f31902ad16d9c621f47d4e) ) ROM_LOAD( "080-v2.bin", 0x200000, 0x200000, CRC(4abde3ff) SHA1(0188bfcafa9a1aac302705736a2bcb26b9d684c2) ) ROM_LOAD( "080-v3.bin", 0x400000, 0x200000, CRC(f02844e2) SHA1(8c65ebe146f4ddb6c904f8125cb32767f74c24d5) ) @@ -2870,7 +2870,7 @@ ROM_START( ssideki3 ) NEO_BIOS_AUDIO_128K( "081-m1.bin", CRC(82fcd863) SHA1(b219a5685450f9c24cc195f1c914bc3b292d72c0) ) - ROM_REGION( 0x600000, "ym", 0 ) + ROM_REGION( 0x600000, "ymsnd", 0 ) ROM_LOAD( "081-v1.bin", 0x000000, 0x200000, CRC(201fa1e1) SHA1(9c27cc1b1d075223ed4a90dd02571d09a2f0d076) ) ROM_LOAD( "081-v2.bin", 0x200000, 0x200000, CRC(acf29d96) SHA1(5426985c33aea2efc8ff774b59d34d8b03bd9a85) ) ROM_LOAD( "081-v3.bin", 0x400000, 0x200000, CRC(e524e415) SHA1(8733e1b63471381b16c2b7c64b909745d99c8925) ) @@ -2895,7 +2895,7 @@ ROM_START( doubledr ) NEO_BIOS_AUDIO_128K( "082-m1.bin", CRC(10b144de) SHA1(cf1ed0a447da68240c62bcfd76b1569803f6bf76) ) - ROM_REGION( 0x400000, "ym", 0 ) + ROM_REGION( 0x400000, "ymsnd", 0 ) ROM_LOAD( "082-v1.bin", 0x000000, 0x200000, CRC(cc1128e4) SHA1(bfcfff24bc7fbde0b02b1bc0dffebd5270a0eb04) ) ROM_LOAD( "082-v2.bin", 0x200000, 0x200000, CRC(c3ff5554) SHA1(c685887ad64998e5572607a916b023f8b9efac49) ) @@ -2923,7 +2923,7 @@ ROM_START( pbobblen ) /* MVS VERSION */ NEO_BIOS_AUDIO_128K( "d96-06.m1", CRC(f424368a) SHA1 (5e5bbcaeb82bed2ee17df08f005ca20ad1030723) ) - ROM_REGION( 0x380000, "ym", 0 ) + ROM_REGION( 0x380000, "ymsnd", 0 ) ROM_LOAD( "068-v1.bin", 0x000000, 0x100000, CRC(2ced86df) SHA1(d6b73d1f31efbd74fb745200d4dade5f80b71541) ) /* unused */ ROM_LOAD( "068-v2.bin", 0x100000, 0x100000, CRC(970851ab) SHA1(6c9b04e9cc6b92133f1154e5bdd9d38d8ef050a7) ) /* unused */ ROM_LOAD( "d96-01.v3", 0x200000, 0x100000, CRC(0840cbc4) SHA1 (1adbd7aef44fa80832f63dfb8efdf69fd7256a57) ) @@ -2949,7 +2949,7 @@ ROM_START( kof95 ) NEO_BIOS_AUDIO_128K( "084-m1.bin", CRC(6f2d7429) SHA1(6f8462e4f07af82a5ca3197895d5dcbb67bdaa61) ) - ROM_REGION( 0x900000, "ym", 0 ) + ROM_REGION( 0x900000, "ymsnd", 0 ) ROM_LOAD( "084-v1.bin", 0x000000, 0x400000, CRC(84861b56) SHA1(1b6c91ddaed01f45eb9b7e49d9c2b9b479d50da6) ) ROM_LOAD( "084-v2.bin", 0x400000, 0x200000, CRC(b38a2803) SHA1(dbc2c8606ca09ed7ff20906b022da3cf053b2f09) ) /* 600000-7fffff empty */ @@ -2979,7 +2979,7 @@ ROM_START( kof95h ) /* MVS AND AES VERSION */ NEO_BIOS_AUDIO_128K( "084-m1.bin", CRC(6f2d7429) SHA1(6f8462e4f07af82a5ca3197895d5dcbb67bdaa61) ) - ROM_REGION( 0x900000, "ym", 0 ) + ROM_REGION( 0x900000, "ymsnd", 0 ) ROM_LOAD( "084-v1.bin", 0x000000, 0x400000, CRC(84861b56) SHA1(1b6c91ddaed01f45eb9b7e49d9c2b9b479d50da6) ) ROM_LOAD( "084-v2.bin", 0x400000, 0x200000, CRC(b38a2803) SHA1(dbc2c8606ca09ed7ff20906b022da3cf053b2f09) ) /* 600000-7fffff empty */ @@ -3007,7 +3007,7 @@ ROM_START( tws96 ) NEO_BIOS_AUDIO_128K( "086-m1.bin", CRC(cb82bc5d) SHA1(8e3ecabec25d89adb6e0eed0ef5f94d34a4d5fc0) ) - ROM_REGION( 0x400000, "ym", 0 ) + ROM_REGION( 0x400000, "ymsnd", 0 ) ROM_LOAD( "086-v1.bin", 0x000000, 0x200000, CRC(97bf1986) SHA1(b80d3a37e18d0a52f1e0092dc300989c9647efd1) ) ROM_LOAD( "086-v2.bin", 0x200000, 0x200000, CRC(b7eb05df) SHA1(ff2b55c7021c248cfdcfc9cd3658f2896bcbca38) ) @@ -3032,7 +3032,7 @@ ROM_START( samsho3 ) /* MVS VERSION */ NEO_BIOS_AUDIO_128K( "087-m1.bin", CRC(8e6440eb) SHA1(e3f72150af4e326543b29df71cda27d73ec087c1) ) - ROM_REGION( 0x600000, "ym", 0 ) + ROM_REGION( 0x600000, "ymsnd", 0 ) ROM_LOAD( "087-v1.bin", 0x000000, 0x400000, CRC(84bdd9a0) SHA1(adceceb00569eca13fcc2e0f0d9f0d9b06a06851) ) ROM_LOAD( "087-v2.bin", 0x400000, 0x200000, CRC(ac0f261a) SHA1(5411bdff24cba7fdbc3397d45a70fb468d7a44b3) ) @@ -3058,7 +3058,7 @@ ROM_START( samsho3h ) /* AES VERSION */ NEO_BIOS_AUDIO_128K( "087-m1.bin", CRC(8e6440eb) SHA1(e3f72150af4e326543b29df71cda27d73ec087c1) ) - ROM_REGION( 0x600000, "ym", 0 ) + ROM_REGION( 0x600000, "ymsnd", 0 ) ROM_LOAD( "087-v1.bin", 0x000000, 0x400000, CRC(84bdd9a0) SHA1(adceceb00569eca13fcc2e0f0d9f0d9b06a06851) ) ROM_LOAD( "087-v2.bin", 0x400000, 0x200000, CRC(ac0f261a) SHA1(5411bdff24cba7fdbc3397d45a70fb468d7a44b3) ) @@ -3084,7 +3084,7 @@ ROM_START( fswords ) /* KOREAN VERSION */ NEO_BIOS_AUDIO_128K( "087-m1.bin", CRC(8e6440eb) SHA1(e3f72150af4e326543b29df71cda27d73ec087c1) ) - ROM_REGION( 0x600000, "ym", 0 ) + ROM_REGION( 0x600000, "ymsnd", 0 ) ROM_LOAD( "087-v1.bin", 0x000000, 0x400000, CRC(84bdd9a0) SHA1(adceceb00569eca13fcc2e0f0d9f0d9b06a06851) ) ROM_LOAD( "087-v2.bin", 0x400000, 0x200000, CRC(ac0f261a) SHA1(5411bdff24cba7fdbc3397d45a70fb468d7a44b3) ) @@ -3110,7 +3110,7 @@ ROM_START( stakwin ) NEO_BIOS_AUDIO_128K( "088-m1.bin", CRC(2fe1f499) SHA1(5b747eeef65be04423d2db05e086df9132758a47) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "088-v1.bin", 0x000000, 0x200000, CRC(b7785023) SHA1(d11df1e623434669cd3f97f0feda747b24dac05d) ) NO_DELTAT_REGION @@ -3131,7 +3131,7 @@ ROM_START( pulstar ) NEO_BIOS_AUDIO_128K( "089-m1.bin", CRC(ff3df7c7) SHA1(59d2ef64f734f6026073b365300221909057a512) ) - ROM_REGION( 0x800000, "ym", 0 ) + ROM_REGION( 0x800000, "ymsnd", 0 ) ROM_LOAD( "089-v1.bin", 0x000000, 0x400000, CRC(b458ded2) SHA1(75d659ecb1fd6002188f469fcaafc9907440e624) ) ROM_LOAD( "089-v2.bin", 0x400000, 0x400000, CRC(9d2db551) SHA1(83f7e5db7fb1502ceadcd334df90b11b1bba78e5) ) @@ -3157,7 +3157,7 @@ ROM_START( whp ) NEO_BIOS_AUDIO_128K( "090-m1.bin", CRC(28065668) SHA1(0c60d4afa1dccad0135e733104f056be73b54e4e) ) - ROM_REGION( 0x600000, "ym", 0 ) + ROM_REGION( 0x600000, "ymsnd", 0 ) ROM_LOAD( "090-v1.bin", 0x000000, 0x200000, CRC(30cf2709) SHA1(d1845033f16de2470afd3858ee0efb45176d9ed7) ) ROM_LOAD( "064-v2.bin", 0x200000, 0x200000, CRC(b6527edd) SHA1(2bcf5bfa6e117cf4a3728a5e5f5771313c93f22a) ) ROM_LOAD( "090-v3.bin", 0x400000, 0x200000, CRC(1908a7ce) SHA1(78f31bcfea33eb94752bbf5226c481baec1af5ac) ) @@ -3186,7 +3186,7 @@ ROM_START( kabukikl ) NEO_BIOS_AUDIO_128K( "092-m1.bin", CRC(91957ef6) SHA1(7b6907532a0e02ceb643623cbd689cf228776ed1) ) - ROM_REGION( 0x700000, "ym", 0 ) + ROM_REGION( 0x700000, "ymsnd", 0 ) ROM_LOAD( "092-v1.bin", 0x000000, 0x200000, CRC(69e90596) SHA1(1a2007d7784b3ce90d115980c3353862f1664d45) ) ROM_LOAD( "092-v2.bin", 0x200000, 0x200000, CRC(7abdb75d) SHA1(0bff764889fe02f37877514c7fc450250839f632) ) ROM_LOAD( "092-v3.bin", 0x400000, 0x200000, CRC(eccc98d3) SHA1(b0dfbdb1ea045cb961323ac6906ab342256c3dc7) ) @@ -3209,7 +3209,7 @@ ROM_START( neobombe ) NEO_BIOS_AUDIO_128K( "093-m1.bin", CRC(e81e780b) SHA1(c56c53984e0f92e180e850c60a75f550ee84917c) ) - ROM_REGION( 0x600000, "ym", 0 ) + ROM_REGION( 0x600000, "ymsnd", 0 ) ROM_LOAD( "093-v1.bin", 0x000000, 0x400000, CRC(02abd4b0) SHA1(6bf33ebc9b01cd4a029f6a555694a9835e30ca1b) ) ROM_LOAD( "093-v2.bin", 0x400000, 0x200000, CRC(a92b8b3d) SHA1(b672c97b85d2f52eba3cb26025008ebc7a18312a) ) @@ -3231,7 +3231,7 @@ ROM_START( gowcaizr ) NEO_BIOS_AUDIO_128K( "094-m1.bin", CRC(78c851cb) SHA1(a9923c002e4e2171a564af45cff0958c5d57b275) ) - ROM_REGION( 0x500000, "ym", 0 ) + ROM_REGION( 0x500000, "ymsnd", 0 ) ROM_LOAD( "094-v1.bin", 0x000000, 0x200000, CRC(6c31223c) SHA1(ede3a2806d7d872a0f737626a23ecce200b534e6) ) ROM_LOAD( "094-v2.bin", 0x200000, 0x200000, CRC(8edb776c) SHA1(a9eac5e24f83ccdcf303d63261747b1bad876a24) ) ROM_LOAD( "094-v3.bin", 0x400000, 0x100000, CRC(c63b9285) SHA1(6bbbacfe899e204e74657d6c3f3d05ce75e432f1) ) @@ -3258,7 +3258,7 @@ ROM_START( rbff1 ) /* MVS AND AES VERSION */ NEO_BIOS_AUDIO_128K( "095-m1.bin", CRC(653492a7) SHA1(39e511fb9ed5d2135dc8428a31d0baafb2ab36e0) ) - ROM_REGION( 0xc00000, "ym", 0 ) + ROM_REGION( 0xc00000, "ymsnd", 0 ) ROM_LOAD( "069-v1.bin", 0x000000, 0x400000, CRC(2bdbd4db) SHA1(5f4fecf69c2329d699cbd45829c19303b1e2a80e) ) ROM_LOAD( "069-v2.bin", 0x400000, 0x400000, CRC(a698a487) SHA1(11b8bc53bc26a51f4a408e900e3769958625c4ed) ) ROM_LOAD( "095-v3.bin", 0x800000, 0x400000, CRC(189d1c6c) SHA1(f0b8cd1ee40ea3feeb2800f0723b451ec8240203) ) @@ -3291,7 +3291,7 @@ ROM_START( rbff1a ) /* MVS VERSION */ NEO_BIOS_AUDIO_128K( "095-m1.bin", CRC(653492a7) SHA1(39e511fb9ed5d2135dc8428a31d0baafb2ab36e0) ) - ROM_REGION( 0xc00000, "ym", 0 ) + ROM_REGION( 0xc00000, "ymsnd", 0 ) ROM_LOAD( "069-v1.bin", 0x000000, 0x400000, CRC(2bdbd4db) SHA1(5f4fecf69c2329d699cbd45829c19303b1e2a80e) ) ROM_LOAD( "069-v2.bin", 0x400000, 0x400000, CRC(a698a487) SHA1(11b8bc53bc26a51f4a408e900e3769958625c4ed) ) ROM_LOAD( "095-v3.bin", 0x800000, 0x400000, CRC(189d1c6c) SHA1(f0b8cd1ee40ea3feeb2800f0723b451ec8240203) ) @@ -3318,7 +3318,7 @@ ROM_START( aof3 ) NEO_BIOS_AUDIO_128K( "096-m1.bin", CRC(cb07b659) SHA1(940b379957c2987d7ab0443cb80c3ff58f6ba559) ) - ROM_REGION( 0x600000, "ym", 0 ) + ROM_REGION( 0x600000, "ymsnd", 0 ) ROM_LOAD( "096-v1.bin", 0x000000, 0x200000, CRC(e2c32074) SHA1(69426e7e63fc31a73d1cd056cc9ae6a2c4499407) ) ROM_LOAD( "096-v2.bin", 0x200000, 0x200000, CRC(a290eee7) SHA1(e66a98cd9740188bf999992b417f8feef941cede) ) ROM_LOAD( "096-v3.bin", 0x400000, 0x200000, CRC(199d12ea) SHA1(a883bf34e685487705a8dafdd0b8db15eb360e80) ) @@ -3345,7 +3345,7 @@ ROM_START( aof3k ) /* KOREAN VERSION */ NEO_BIOS_AUDIO_128K( "096-m1.bin", CRC(cb07b659) SHA1(940b379957c2987d7ab0443cb80c3ff58f6ba559) ) - ROM_REGION( 0x600000, "ym", 0 ) + ROM_REGION( 0x600000, "ymsnd", 0 ) ROM_LOAD( "096-v1.bin", 0x000000, 0x200000, CRC(e2c32074) SHA1(69426e7e63fc31a73d1cd056cc9ae6a2c4499407) ) ROM_LOAD( "096-v2.bin", 0x200000, 0x200000, CRC(a290eee7) SHA1(e66a98cd9740188bf999992b417f8feef941cede) ) ROM_LOAD( "096-v3.bin", 0x400000, 0x200000, CRC(199d12ea) SHA1(a883bf34e685487705a8dafdd0b8db15eb360e80) ) @@ -3372,7 +3372,7 @@ ROM_START( sonicwi3 ) NEO_BIOS_AUDIO_128K( "097-m1.bin", CRC(b20e4291) SHA1(0e891ab53f9fded510295dfc7818bc59b4a9dd97) ) - ROM_REGION( 0x600000, "ym", 0 ) + ROM_REGION( 0x600000, "ymsnd", 0 ) ROM_LOAD( "097-v1.bin", 0x000000, 0x400000, CRC(6f885152) SHA1(8175804d5c1420c5d37b733d4a8fa2aa81e59f1b) ) ROM_LOAD( "097-v2.bin", 0x400000, 0x200000, CRC(3359e868) SHA1(b7efd9f1a6dab33271fe8356bcc863aeae1d3ed8) ) @@ -3394,7 +3394,7 @@ ROM_START( turfmast ) NEO_BIOS_AUDIO_128K( "200-m1.bin", CRC(9994ac00) SHA1(7bded797f3b80fd00bcbe451ac0abe6646b19a14) ) - ROM_REGION( 0x800000, "ym", 0 ) + ROM_REGION( 0x800000, "ymsnd", 0 ) ROM_LOAD( "200-v1.bin", 0x000000, 0x200000, CRC(00fd48d2) SHA1(ddfee09328632e598fd51537b3ae8593219b2111) ) ROM_LOAD( "200-v2.bin", 0x200000, 0x200000, CRC(082acb31) SHA1(2f1c053040e9d50a6d45fd7bea1b96742bae694f) ) ROM_LOAD( "200-v3.bin", 0x400000, 0x200000, CRC(7abca053) SHA1(e229bc0ea82a371d6ee8fd9fe442b0fd141d0a71) ) @@ -3416,7 +3416,7 @@ ROM_START( mslug ) NEO_BIOS_AUDIO_128K( "201-m1.bin", CRC(c28b3253) SHA1(fd75bd15aed30266a8b3775f276f997af57d1c06) ) - ROM_REGION( 0x800000, "ym", 0 ) + ROM_REGION( 0x800000, "ymsnd", 0 ) ROM_LOAD( "201-v1.bin", 0x000000, 0x400000, CRC(23d22ed1) SHA1(cd076928468ad6bcc5f19f88cb843ecb5e660681) ) ROM_LOAD( "201-v2.bin", 0x400000, 0x400000, CRC(472cf9db) SHA1(5f79ea9286d22ed208128f9c31ca75552ce08b57) ) @@ -3437,7 +3437,7 @@ ROM_START( puzzledp ) NEO_BIOS_AUDIO_128K( "202-m1.bin", CRC(9c0291ea) SHA1(3fa67c62acba79be6b3a98cc1601e45569fa11ae) ) - ROM_REGION( 0x080000, "ym", 0 ) + ROM_REGION( 0x080000, "ymsnd", 0 ) ROM_LOAD( "202-v1.bin", 0x000000, 0x080000, CRC(debeb8fb) SHA1(49a3d3578c087f1a0050168571ef8d1b08c5dc05) ) NO_DELTAT_REGION @@ -3455,7 +3455,7 @@ ROM_START( mosyougi ) NEO_BIOS_AUDIO_128K( "203-m1.bin", CRC(a602c2c2) SHA1(19fd5d0379244c528b58343f6cbf78b4766fb23d) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "203-v1.bin", 0x000000, 0x200000, CRC(baa2b9a5) SHA1(914782b6c81d9a76ce02251575592b0648434ba3) ) NO_DELTAT_REGION @@ -3473,7 +3473,7 @@ ROM_START( marukodq ) NEO_BIOS_AUDIO_128K( "206-m1.bin", CRC(0e22902e) SHA1(fb8466c342d4abd8bb4cad01c6ceab03f96cdad8) ) - ROM_REGION( 0x400000, "ym", 0 ) + ROM_REGION( 0x400000, "ymsnd", 0 ) ROM_LOAD( "206-v1.bin", 0x000000, 0x200000, CRC(5385eca8) SHA1(1ca171ce74a5885ae8841d0924de21dc0af2214e) ) ROM_LOAD( "206-v2.bin", 0x200000, 0x200000, CRC(f8c55404) SHA1(cecc41e9e08a7ff05b6f62e713fc86a816bf55a2) ) @@ -3494,7 +3494,7 @@ ROM_START( neomrdo ) NEO_BIOS_AUDIO_128K( "207-m1.bin", CRC(81eade02) SHA1(d6d135bc525f3ed14a8c255f0b83d83a52b0659c) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "207-v1.bin", 0x000000, 0x200000, CRC(4143c052) SHA1(561b19bc8811b80f2f42ffc0b5df27132696470a) ) NO_DELTAT_REGION @@ -3513,7 +3513,7 @@ ROM_START( sdodgeb ) NEO_BIOS_AUDIO_128K( "208-m1.bin", CRC(0a5f3325) SHA1(04e0236df478a5452654c823dcb42fea65b6a718) ) - ROM_REGION( 0x400000, "ym", 0 ) + ROM_REGION( 0x400000, "ymsnd", 0 ) ROM_LOAD( "208-v1.bin", 0x000000, 0x200000, CRC(8b53e945) SHA1(beb7d63f6101f8435f35321fddb8479d312505c4) ) ROM_LOAD( "208-v2.bin", 0x200000, 0x200000, CRC(af37ebf8) SHA1(f5c511479483533480f2b9ecf8edd4b7ae64c2d9) ) @@ -3535,7 +3535,7 @@ ROM_START( goalx3 ) NEO_BIOS_AUDIO_128K( "209-m1.bin", CRC(cd758325) SHA1(b51eac634fc646c07210dff993018ad9ebabd3f9) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "209-v1.bin", 0x000000, 0x200000, CRC(ef214212) SHA1(3e05ccaa2d06decb18b379b96f900c0e6b39ce70) ) NO_DELTAT_REGION @@ -3556,7 +3556,7 @@ ROM_START( overtop ) NEO_BIOS_AUDIO_128K( "212-m1.bin", CRC(fcab6191) SHA1(488b8310b0957f0012fe50f73641b606f6ac4a57) ) - ROM_REGION( 0x400000, "ym", 0 ) + ROM_REGION( 0x400000, "ymsnd", 0 ) ROM_LOAD( "212-v1.bin", 0x000000, 0x400000, CRC(013d4ef9) SHA1(438a697c44525bdf78b54432c4f7217ab5667047) ) NO_DELTAT_REGION @@ -3579,7 +3579,7 @@ ROM_START( neodrift ) NEO_BIOS_AUDIO_128K( "213-m1.bin", CRC(200045f1) SHA1(7a6cd1c8d4447ea260d7ff4520c676b8d685f2e4) ) - ROM_REGION( 0x400000, "ym", 0 ) + ROM_REGION( 0x400000, "ymsnd", 0 ) ROM_LOAD( "213-v1.bin", 0x000000, 0x200000, CRC(a421c076) SHA1(129f05c1a28a6493442f47a79c2d3577a1a43ef5) ) ROM_LOAD( "213-v2.bin", 0x200000, 0x200000, CRC(233c7dd9) SHA1(be7f980aa83831b6605aaaf4ec904180bb96c935) ) @@ -3599,7 +3599,7 @@ ROM_START( kof96 ) /* MVS VERSION */ NEO_BIOS_AUDIO_128K( "214-m1.bin", CRC(dabc427c) SHA1(b76722ed142ee7addceb4757424870dbd003e8b3) ) - ROM_REGION( 0xa00000, "ym", 0 ) + ROM_REGION( 0xa00000, "ymsnd", 0 ) ROM_LOAD( "214-v1.bin", 0x000000, 0x400000, CRC(63f7b045) SHA1(1353715f1a8476dca6f8031d9e7a401eacab8159) ) ROM_LOAD( "214-v2.bin", 0x400000, 0x400000, CRC(25929059) SHA1(6a721c4cb8f8dc772774023877d4a9f50d5a9e31) ) ROM_LOAD( "214-v3.bin", 0x800000, 0x200000, CRC(92a2257d) SHA1(5064aec78fa0d104e5dd5869b95382aa170214ee) ) @@ -3626,7 +3626,7 @@ ROM_START( kof96h ) NEO_BIOS_AUDIO_128K( "214-m1.bin", CRC(dabc427c) SHA1(b76722ed142ee7addceb4757424870dbd003e8b3) ) - ROM_REGION( 0xa00000, "ym", 0 ) + ROM_REGION( 0xa00000, "ymsnd", 0 ) ROM_LOAD( "214-v1.bin", 0x000000, 0x400000, CRC(63f7b045) SHA1(1353715f1a8476dca6f8031d9e7a401eacab8159) ) ROM_LOAD( "214-v2.bin", 0x400000, 0x400000, CRC(25929059) SHA1(6a721c4cb8f8dc772774023877d4a9f50d5a9e31) ) ROM_LOAD( "214-v3.bin", 0x800000, 0x200000, CRC(92a2257d) SHA1(5064aec78fa0d104e5dd5869b95382aa170214ee) ) @@ -3653,7 +3653,7 @@ ROM_START( ssideki4 ) NEO_BIOS_AUDIO_128K( "215-m1.bin", CRC(a932081d) SHA1(376a45e19edb780ac8798c41ae2260c8a8a4bba8) ) - ROM_REGION( 0x600000, "ym", 0 ) + ROM_REGION( 0x600000, "ymsnd", 0 ) ROM_LOAD( "215-v1.bin", 0x000000, 0x400000, CRC(877d1409) SHA1(77c58ebffe677ea6369c964ec7975b11df512fa1) ) ROM_LOAD( "215-v2.bin", 0x400000, 0x200000, CRC(1bfa218b) SHA1(344836a578bde3c0ab59b58c8734f868e7403c26) ) @@ -3677,7 +3677,7 @@ ROM_START( kizuna ) NEO_BIOS_AUDIO_128K( "216-m1.bin", CRC(1b096820) SHA1(72852e78c620038f8dafde5e54e02e418c31be9c) ) - ROM_REGION( 0x800000, "ym", 0 ) + ROM_REGION( 0x800000, "ymsnd", 0 ) ROM_LOAD( "059-v1.bin", 0x000000, 0x200000, CRC(530c50fd) SHA1(29401cee7f7d2c199c7cb58092e86b28205e81ad) ) ROM_LOAD( "216-v2.bin", 0x200000, 0x200000, CRC(03667a8d) SHA1(3b0475e553a49f8788f32b0c84f82645cc6b4273) ) ROM_LOAD( "059-v3.bin", 0x400000, 0x200000, CRC(7038c2f9) SHA1(c1d6f86b24feba03fe009b58199d2eeabe572f4e) ) @@ -3707,7 +3707,7 @@ ROM_START( ninjamas ) NEO_BIOS_AUDIO_128K( "217-m1.bin", CRC(d00fb2af) SHA1(6bcaa52e1641cc24288e1f22f4dc98e8d8921b90) ) - ROM_REGION( 0x600000, "ym", 0 ) + ROM_REGION( 0x600000, "ymsnd", 0 ) ROM_LOAD( "217-v1.bin", 0x000000, 0x400000, CRC(1c34e013) SHA1(5368e413d2188c4fd063b6bb7d5f498ff83ea812) ) ROM_LOAD( "217-v2.bin", 0x400000, 0x200000, CRC(22f1c681) SHA1(09da03b2e63d180e55173ff25e8735c4162f027b) ) @@ -3733,7 +3733,7 @@ ROM_START( ragnagrd ) NEO_BIOS_AUDIO_128K( "218-m1.bin", CRC(17028bcf) SHA1(7a4e8f33ce9b41beac2152b8f6003f247699e2e1) ) - ROM_REGION( 0x800000, "ym", 0 ) + ROM_REGION( 0x800000, "ymsnd", 0 ) ROM_LOAD( "218-v1.bin", 0x000000, 0x400000, CRC(61eee7f4) SHA1(5b11b1a0b1b74dfbc2998cbda9f8f7a5e9059957) ) ROM_LOAD( "218-v2.bin", 0x400000, 0x400000, CRC(6104e20b) SHA1(18e8aae3e51e141977d523a10e737ff68fe81910) ) @@ -3759,7 +3759,7 @@ ROM_START( pgoal ) NEO_BIOS_AUDIO_128K( "219-m1.bin", CRC(958efdc8) SHA1(aacc6056b1ff48cde8f241a11a27473cfb4b4aa3) ) - ROM_REGION( 0x400000, "ym", 0 ) + ROM_REGION( 0x400000, "ymsnd", 0 ) ROM_LOAD( "219-v1.bin", 0x000000, 0x200000, CRC(2cc1bd05) SHA1(e204b6d359e5b37661dddc2c1f14d64fd9089f75) ) ROM_LOAD( "219-v2.bin", 0x200000, 0x200000, CRC(06ac1d3f) SHA1(c7f2287e4e8366b78bc26ede7802e2e92d44d7c9) ) @@ -3782,7 +3782,7 @@ ROM_START( magdrop2 ) NEO_BIOS_AUDIO_128K( "221-m1.bin", CRC(bddae628) SHA1(02c77e6aaaed43e39778bf83a3184e7c21db63d4) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "221-v1.bin", 0x000000, 0x200000, CRC(7e5e53e4) SHA1(72b063b2d4acaaf72a20d14ad5bfc90cb64d3fed) ) NO_DELTAT_REGION @@ -3801,7 +3801,7 @@ ROM_START( samsho4 ) NEO_BIOS_AUDIO_128K( "222-m1.bin", CRC(7615bc1b) SHA1(b936f7b341f6fe0921b4c41049734684583e3596) ) - ROM_REGION( 0xa00000, "ym", 0 ) + ROM_REGION( 0xa00000, "ymsnd", 0 ) ROM_LOAD( "222-v1.bin", 0x000000, 0x400000, CRC(7d6ba95f) SHA1(03cb4e0d770e0b332b07b64cacef624460b84c78) ) ROM_LOAD( "222-v2.bin", 0x400000, 0x400000, CRC(6c33bb5d) SHA1(fd5d4e08a962dd0d22c52c91bad5ec7f23cfb901) ) ROM_LOAD( "222-v3.bin", 0x800000, 0x200000, CRC(831ea8c0) SHA1(f2987b7d09bdc4311e972ce8a9ab7ca9802db4db) ) @@ -3828,7 +3828,7 @@ ROM_START( samsho4k ) /* Uses PCBs "NEO-MVS PROGBK1" and "NEO-MVS CHA256 B" */ NEO_BIOS_AUDIO_128K( "222-m1.bin", CRC(7615bc1b) SHA1(b936f7b341f6fe0921b4c41049734684583e3596) ) - ROM_REGION( 0xa00000, "ym", 0 ) + ROM_REGION( 0xa00000, "ymsnd", 0 ) ROM_LOAD( "222-v1.bin", 0x000000, 0x400000, CRC(7d6ba95f) SHA1(03cb4e0d770e0b332b07b64cacef624460b84c78) ) ROM_LOAD( "222-v2.bin", 0x400000, 0x400000, CRC(6c33bb5d) SHA1(fd5d4e08a962dd0d22c52c91bad5ec7f23cfb901) ) ROM_LOAD( "222-v3.bin", 0x800000, 0x200000, CRC(831ea8c0) SHA1(f2987b7d09bdc4311e972ce8a9ab7ca9802db4db) ) @@ -3855,7 +3855,7 @@ ROM_START( rbffspec ) NEO_BIOS_AUDIO_128K( "223-m1.bin", CRC(3fee46bf) SHA1(e750f85233953853618fcdff980a4721af1710a3) ) - ROM_REGION( 0xc00000, "ym", 0 ) + ROM_REGION( 0xc00000, "ymsnd", 0 ) ROM_LOAD( "223-v1.bin", 0x000000, 0x400000, CRC(76673869) SHA1(78a26afa29f73de552ffabdbf3fc4bf26be8ae9e) ) ROM_LOAD( "223-v2.bin", 0x400000, 0x400000, CRC(7a275acd) SHA1(8afe87ce822614262b72a90b371fc79155ac0d0c) ) ROM_LOAD( "223-v3.bin", 0x800000, 0x400000, CRC(5a797fd2) SHA1(94958e334f86d4d71059af8138f255b8d97a3b01) ) @@ -3882,7 +3882,7 @@ ROM_START( twinspri ) NEO_BIOS_AUDIO_128K( "224-m1.bin", CRC(364d6f96) SHA1(779b95a6476089b71f48c8368d9043ee1dba9032) ) - ROM_REGION( 0x600000, "ym", 0 ) + ROM_REGION( 0x600000, "ymsnd", 0 ) ROM_LOAD( "224-v1.bin", 0x000000, 0x400000, CRC(ff57f088) SHA1(1641989b8aac899dbd68aa2332bcdf9b90b33564) ) ROM_LOAD( "224-v2.bin", 0x400000, 0x200000, CRC(7ad26599) SHA1(822030037b7664795bf3d64e1452d0aecc22497e) ) @@ -3904,7 +3904,7 @@ ROM_START( wakuwak7 ) NEO_BIOS_AUDIO_128K( "225-m1.bin", CRC(0634bba6) SHA1(153aaf016440500df7a4454f3f2f2911219cb7d8) ) - ROM_REGION( 0x800000, "ym", 0 ) + ROM_REGION( 0x800000, "ymsnd", 0 ) ROM_LOAD( "225-v1.bin", 0x000000, 0x400000, CRC(6195c6b4) SHA1(66c06b5904aedb256e3997bbec60f8ab50c6ff0c) ) ROM_LOAD( "225-v2.bin", 0x400000, 0x400000, CRC(6159c5fe) SHA1(9015e93416497f1ef877c717afed40f7ecfa42e4) ) @@ -3928,7 +3928,7 @@ ROM_START( stakwin2 ) NEO_BIOS_AUDIO_128K( "227-m1.bin", CRC(c8e5e0f9) SHA1(09bb05ae6f09b59b9e4871fae1fc7c3bafd07394) ) - ROM_REGION( 0x800000, "ym", 0 ) + ROM_REGION( 0x800000, "ymsnd", 0 ) ROM_LOAD( "227-v1.bin", 0x000000, 0x400000, CRC(b8f24181) SHA1(0a3af88d20ff65b82c58325d32c20b99fc07f7f3) ) ROM_LOAD( "227-v2.bin", 0x400000, 0x400000, CRC(ee39e260) SHA1(4ed6802564ce262ebe92c7276424056b70998758) ) @@ -3949,7 +3949,7 @@ ROM_START( ghostlop ) NEO_BIOS_AUDIO_128K( "gl-m1.bin", CRC(fd833b33) SHA1(ab6c218c42cba821654cbdae154efecb69f844f6) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "gl-v1.bin", 0x000000, 0x200000, CRC(c603fce6) SHA1(5a866471d35895b2ae13cbd5d1cb41bf2e72e1b8) ) NO_DELTAT_REGION @@ -3968,7 +3968,7 @@ ROM_START( breakers ) NEO_BIOS_AUDIO_128K( "230-m1.bin", CRC(3951a1c1) SHA1(1e6442a7ea82ada9503d71045dd93e12bd05254f) ) - ROM_REGION( 0x800000, "ym", 0 ) + ROM_REGION( 0x800000, "ymsnd", 0 ) ROM_LOAD( "230-v1.bin", 0x000000, 0x400000, CRC(7f9ed279) SHA1(acd0558960ec29bfc3e3ee99d00e503bebff8513) ) ROM_LOAD( "230-v2.bin", 0x400000, 0x400000, CRC(1d43e420) SHA1(26d09b8b18b4b802dbda4d6f06626c24d0b7c512) ) @@ -3989,7 +3989,7 @@ ROM_START( miexchng ) NEO_BIOS_AUDIO_128K( "231-m1.bin", CRC(de41301b) SHA1(59ce3836ac8f064d56a446c9374f05bcb40fcfd8) ) - ROM_REGION( 0x400000, "ym", 0 ) + ROM_REGION( 0x400000, "ymsnd", 0 ) ROM_LOAD( "231-v1.bin", 0x000000, 0x400000, CRC(113fb898) SHA1(9168ba90c4aa969f69eb11ba3f4d76592d81e05a) ) NO_DELTAT_REGION @@ -4010,7 +4010,7 @@ ROM_START( kof97 ) /* MVS VERSION */ NEO_BIOS_AUDIO_128K( "232-m1.bin", CRC(45348747) SHA1(ed77cbae2b208d1177a9f5f6e8cd57070e90b65b) ) - ROM_REGION( 0xc00000, "ym", 0 ) + ROM_REGION( 0xc00000, "ymsnd", 0 ) ROM_LOAD( "232-v1.bin", 0x000000, 0x400000, CRC(22a2b5b5) SHA1(ebdbc977332e6d93e266755000b43857e0082965) ) ROM_LOAD( "232-v2.bin", 0x400000, 0x400000, CRC(2304e744) SHA1(98d283e2bcc9291a53f52afd35ef76dfb0828432) ) ROM_LOAD( "232-v3.bin", 0x800000, 0x400000, CRC(759eb954) SHA1(54e77c4e9e6b89458e59824e478ddc33a9c72655) ) @@ -4035,7 +4035,7 @@ ROM_START( kof97h ) /* AES VERSION */ NEO_BIOS_AUDIO_128K( "232-m1.bin", CRC(45348747) SHA1(ed77cbae2b208d1177a9f5f6e8cd57070e90b65b) ) - ROM_REGION( 0xc00000, "ym", 0 ) + ROM_REGION( 0xc00000, "ymsnd", 0 ) ROM_LOAD( "232-v1.bin", 0x000000, 0x400000, CRC(22a2b5b5) SHA1(ebdbc977332e6d93e266755000b43857e0082965) ) ROM_LOAD( "232-v2.bin", 0x400000, 0x400000, CRC(2304e744) SHA1(98d283e2bcc9291a53f52afd35ef76dfb0828432) ) ROM_LOAD( "232-v3.bin", 0x800000, 0x400000, CRC(759eb954) SHA1(54e77c4e9e6b89458e59824e478ddc33a9c72655) ) @@ -4059,7 +4059,7 @@ ROM_START( magdrop3 ) NEO_BIOS_AUDIO_128K( "233-m1.bin", CRC(5beaf34e) SHA1(2905d26945932cddc2dd3a1dc5abba8aa3baee14) ) - ROM_REGION( 0x480000, "ym", 0 ) + ROM_REGION( 0x480000, "ymsnd", 0 ) ROM_LOAD( "233-v1.bin", 0x000000, 0x400000, CRC(58839298) SHA1(18cae7bba997c52780761cbf119c4e4b34397a61) ) ROM_LOAD( "233-v2.bin", 0x400000, 0x080000, CRC(d5e30df4) SHA1(bbbc0ff5b975471bd682f85976ac4a93f6d44f2e) ) @@ -4081,7 +4081,7 @@ ROM_START( lastblad ) /* MVS VERSION */ NEO_BIOS_AUDIO_128K( "234-m1.bin", CRC(087628ea) SHA1(48dcf739bb16699af4ab8ed632b7dcb25e470e06) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) ROM_LOAD( "234-v1.bin", 0x000000, 0x400000, CRC(ed66b76f) SHA1(8a05ff06d9b6f01c6c16b3026282eaabb0e25b44) ) ROM_LOAD( "234-v2.bin", 0x400000, 0x400000, CRC(a0e7f6e2) SHA1(753ff74fa9294f695aae511ae01ead119b114a57) ) ROM_LOAD( "234-v3.bin", 0x800000, 0x400000, CRC(a506e1e2) SHA1(b3e04ba1a5cb50b77c6fbe9fe353b9b64b6f3f74) ) @@ -4107,7 +4107,7 @@ ROM_START( lastbladh ) /* AES VERSION */ NEO_BIOS_AUDIO_128K( "234-m1.bin", CRC(087628ea) SHA1(48dcf739bb16699af4ab8ed632b7dcb25e470e06) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) ROM_LOAD( "234-v1.bin", 0x000000, 0x400000, CRC(ed66b76f) SHA1(8a05ff06d9b6f01c6c16b3026282eaabb0e25b44) ) ROM_LOAD( "234-v2.bin", 0x400000, 0x400000, CRC(a0e7f6e2) SHA1(753ff74fa9294f695aae511ae01ead119b114a57) ) ROM_LOAD( "234-v3.bin", 0x800000, 0x400000, CRC(a506e1e2) SHA1(b3e04ba1a5cb50b77c6fbe9fe353b9b64b6f3f74) ) @@ -4133,7 +4133,7 @@ ROM_START( lastsold ) /* KOREAN VERSION */ NEO_BIOS_AUDIO_128K( "234-m1.bin", CRC(087628ea) SHA1(48dcf739bb16699af4ab8ed632b7dcb25e470e06) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) ROM_LOAD( "234-v1.bin", 0x000000, 0x400000, CRC(ed66b76f) SHA1(8a05ff06d9b6f01c6c16b3026282eaabb0e25b44) ) ROM_LOAD( "234-v2.bin", 0x400000, 0x400000, CRC(a0e7f6e2) SHA1(753ff74fa9294f695aae511ae01ead119b114a57) ) ROM_LOAD( "234-v3.bin", 0x800000, 0x400000, CRC(a506e1e2) SHA1(b3e04ba1a5cb50b77c6fbe9fe353b9b64b6f3f74) ) @@ -4158,7 +4158,7 @@ ROM_START( puzzldpr ) NEO_BIOS_AUDIO_128K( "202-m1.bin", CRC(9c0291ea) SHA1(3fa67c62acba79be6b3a98cc1601e45569fa11ae) ) - ROM_REGION( 0x080000, "ym", 0 ) + ROM_REGION( 0x080000, "ymsnd", 0 ) ROM_LOAD( "202-v1.bin", 0x000000, 0x080000, CRC(debeb8fb) SHA1(49a3d3578c087f1a0050168571ef8d1b08c5dc05) ) NO_DELTAT_REGION @@ -4185,7 +4185,7 @@ ROM_START( irrmaze ) ROM_LOAD( "236-m1.bin", 0x00000, 0x20000, CRC(880a1abd) SHA1(905afa157aba700e798243b842792e50729b19a0) ) /* so overwrite it with the real thing */ ROM_RELOAD( 0x10000, 0x20000 ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "236-v1.bin", 0x000000, 0x200000, CRC(5f89c3b4) SHA1(dc8fd561cf8dfdd41696dcf14ea8d2d0ac4eec4b) ) ROM_REGION( 0x100000, "ym.deltat", 0 ) @@ -4204,7 +4204,7 @@ ROM_START( popbounc ) NEO_BIOS_AUDIO_128K( "237-m1.bin", CRC(d4c946dd) SHA1(6ca09040b5db8d89511d627954c783154d58ab01) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "237-v1.bin", 0x000000, 0x200000, CRC(edcb1beb) SHA1(62f086b9968b366b59276ee4ae3c32c4d76fc6ce) ) NO_DELTAT_REGION @@ -4223,7 +4223,7 @@ ROM_START( shocktro ) NEO_BIOS_AUDIO_128K( "238-m1.bin", CRC(075b9518) SHA1(ac21b88a860b9572bf24432b4cadcc96d108055d) ) - ROM_REGION( 0x600000, "ym", 0 ) + ROM_REGION( 0x600000, "ymsnd", 0 ) ROM_LOAD( "238-v1.bin", 0x000000, 0x400000, CRC(260c0bef) SHA1(9c4f80ce4bb205afed11bb8b8926d20748eb5512) ) ROM_LOAD( "238-v2.bin", 0x400000, 0x200000, CRC(4ad7d59e) SHA1(bfdf2684f7f38af4e75ad0068ff9463dc2601598) ) @@ -4249,7 +4249,7 @@ ROM_START( shocktra ) NEO_BIOS_AUDIO_128K( "238-m1.bin", CRC(075b9518) SHA1(ac21b88a860b9572bf24432b4cadcc96d108055d) ) - ROM_REGION( 0x600000, "ym", 0 ) + ROM_REGION( 0x600000, "ymsnd", 0 ) ROM_LOAD( "238-v1.bin", 0x000000, 0x400000, CRC(260c0bef) SHA1(9c4f80ce4bb205afed11bb8b8926d20748eb5512) ) ROM_LOAD( "238-v2.bin", 0x400000, 0x200000, CRC(4ad7d59e) SHA1(bfdf2684f7f38af4e75ad0068ff9463dc2601598) ) @@ -4275,7 +4275,7 @@ ROM_START( blazstar ) NEO_BIOS_AUDIO_128K( "239-m1.bin", CRC(d31a3aea) SHA1(e23abfeb23052f0358edcf2c83401025fe632511) ) - ROM_REGION( 0x800000, "ym", 0 ) + ROM_REGION( 0x800000, "ymsnd", 0 ) ROM_LOAD( "239-v1.bin", 0x000000, 0x400000, CRC(1b8d5bf7) SHA1(67fc1f7e36e92a89cd1d415eb31a2892f57b0d04) ) ROM_LOAD( "239-v2.bin", 0x400000, 0x400000, CRC(74cf0a70) SHA1(b00451a2a30de2517ae3eca35eb1fe985b950eb8) ) @@ -4302,7 +4302,7 @@ ROM_START( rbff2 ) /* MVS VERSION */ /* TC532000DP */ NEO_BIOS_AUDIO_256K( "240-m1.bin", CRC(ed482791) SHA1(1f54a45967cb7842c33aa24be322c9f33ff75ac3) ) - ROM_REGION( 0x0e00000, "ym", 0 ) + ROM_REGION( 0x0e00000, "ymsnd", 0 ) ROM_LOAD( "240-v1.bin", 0x000000, 0x400000, CRC(f796265a) SHA1(736dff37eb91fc856b4d189249fb0de9b6c0813a) ) ROM_LOAD( "240-v2.bin", 0x400000, 0x400000, CRC(2cb3f3bb) SHA1(697e677890892f4b028c9a27c66809ca0a8a9b18) ) //ROM_LOAD( "240-v3.bin", 0x800000, 0x400000, CRC(df77b7fa) SHA1(4df971ce20bdb8c1ce8cc1692a32ac69505ffa9a) ) // bad? @@ -4330,7 +4330,7 @@ ROM_START( rbff2h ) /* AES VERSION */ /* TC532000DP */ NEO_BIOS_AUDIO_256K( "240-m1.bin", CRC(ed482791) SHA1(1f54a45967cb7842c33aa24be322c9f33ff75ac3) ) - ROM_REGION( 0x0e00000, "ym", 0 ) + ROM_REGION( 0x0e00000, "ymsnd", 0 ) ROM_LOAD( "240-v1.bin", 0x000000, 0x400000, CRC(f796265a) SHA1(736dff37eb91fc856b4d189249fb0de9b6c0813a) ) ROM_LOAD( "240-v2.bin", 0x400000, 0x400000, CRC(2cb3f3bb) SHA1(697e677890892f4b028c9a27c66809ca0a8a9b18) ) //ROM_LOAD( "240-v3.bin", 0x800000, 0x400000, CRC(df77b7fa) SHA1(4df971ce20bdb8c1ce8cc1692a32ac69505ffa9a) ) // bad? @@ -4358,7 +4358,7 @@ ROM_START( rbff2k ) /* KOREAN VERSION */ /* TC532000DP */ NEO_BIOS_AUDIO_256K( "240-m1.bin", CRC(ed482791) SHA1(1f54a45967cb7842c33aa24be322c9f33ff75ac3) ) - ROM_REGION( 0x0e00000, "ym", 0 ) + ROM_REGION( 0x0e00000, "ymsnd", 0 ) ROM_LOAD( "240-v1.bin", 0x000000, 0x400000, CRC(f796265a) SHA1(736dff37eb91fc856b4d189249fb0de9b6c0813a) ) ROM_LOAD( "240-v2.bin", 0x400000, 0x400000, CRC(2cb3f3bb) SHA1(697e677890892f4b028c9a27c66809ca0a8a9b18) ) //ROM_LOAD( "240-v3.bin", 0x800000, 0x400000, CRC(df77b7fa) SHA1(4df971ce20bdb8c1ce8cc1692a32ac69505ffa9a) ) // bad? @@ -4385,7 +4385,7 @@ ROM_START( mslug2 ) NEO_BIOS_AUDIO_128K( "241-m1.bin", CRC(94520ebd) SHA1(f8a1551cebcb91e416f30f50581feed7f72899e9) ) - ROM_REGION( 0x800000, "ym", 0 ) + ROM_REGION( 0x800000, "ymsnd", 0 ) ROM_LOAD( "241-v1.bin", 0x000000, 0x400000, CRC(99ec20e8) SHA1(80597707f1fe115eed1941bb0701fc00790ad504) ) ROM_LOAD( "241-v2.bin", 0x400000, 0x400000, CRC(ecb16799) SHA1(b4b4ddc680836ed55942c66d7dfe756314e02211) ) @@ -4408,7 +4408,7 @@ ROM_START( kof98 ) /* encrypted code + protection */ /* TC532000DP */ NEO_BIOS_AUDIO_256K( "242-m1.bin", CRC(4ef7016b) SHA1(4182235e963bd70d398a79abeb54ab4d62887c48) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) ROM_LOAD( "242-v1.bin", 0x000000, 0x400000, CRC(b9ea8051) SHA1(49606f64eb249263b3341b4f50cc1763c390b2af) ) ROM_LOAD( "242-v2.bin", 0x400000, 0x400000, CRC(cc11106e) SHA1(d3108bc05c9bf041d4236b2fa0c66b013aa8db1b) ) ROM_LOAD( "242-v3.bin", 0x800000, 0x400000, CRC(044ea4e1) SHA1(062a2f2e52098d73bc31c9ad66f5db8080395ce8) ) @@ -4437,7 +4437,7 @@ ROM_START( kof98k ) /* encrypted code + protection, only z80 rom is different to /* Correct chip label */ NEO_BIOS_AUDIO_256K( "242-m1k.bin", CRC(ce12da0c) SHA1(e7c01dae2852d543d1a58d55735239f6a5aa05a5) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) ROM_LOAD( "242-v1.bin", 0x000000, 0x400000, CRC(b9ea8051) SHA1(49606f64eb249263b3341b4f50cc1763c390b2af) ) ROM_LOAD( "242-v2.bin", 0x400000, 0x400000, CRC(cc11106e) SHA1(d3108bc05c9bf041d4236b2fa0c66b013aa8db1b) ) ROM_LOAD( "242-v3.bin", 0x800000, 0x400000, CRC(044ea4e1) SHA1(062a2f2e52098d73bc31c9ad66f5db8080395ce8) ) @@ -4466,7 +4466,7 @@ ROM_START( kof98n ) /* TC532000DP */ NEO_BIOS_AUDIO_256K( "242-mg1.bin", CRC(4e7a6b1b) SHA1(b54d08f88713ed0271aa06f9f7c9c572ef555b1a) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) ROM_LOAD( "242-v1.bin", 0x000000, 0x400000, CRC(b9ea8051) SHA1(49606f64eb249263b3341b4f50cc1763c390b2af) ) ROM_LOAD( "242-v2.bin", 0x400000, 0x400000, CRC(cc11106e) SHA1(d3108bc05c9bf041d4236b2fa0c66b013aa8db1b) ) ROM_LOAD( "242-v3.bin", 0x800000, 0x400000, CRC(044ea4e1) SHA1(062a2f2e52098d73bc31c9ad66f5db8080395ce8) ) @@ -4494,7 +4494,7 @@ ROM_START( lastbld2 ) /* MVS AND AES VERSION */ /* later revision */ NEO_BIOS_AUDIO_128K( "243-m1.bin", CRC(acf12d10) SHA1(6e6b98cc1fa44f24a5168877559b0055e6957b60) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) ROM_LOAD( "243-v1.bin", 0x000000, 0x400000, CRC(f7ee6fbb) SHA1(55137bcabeeb590e40a9b8a7c07dd106e4d12a90) ) ROM_LOAD( "243-v2.bin", 0x400000, 0x400000, CRC(aa9e4df6) SHA1(a0b91f63e2552a8ad9e0d1af00e2c38288637161) ) ROM_LOAD( "243-v3.bin", 0x800000, 0x400000, CRC(4ac750b2) SHA1(585a154acc67bd84ea5b944686b78ed082b768d9) ) @@ -4520,7 +4520,7 @@ ROM_START( neocup98 ) NEO_BIOS_AUDIO_128K( "244-m1.bin", CRC(a701b276) SHA1(055550ebc650835bcf8ea4457b2c91bd73e21281) ) - ROM_REGION( 0x600000, "ym", 0 ) + ROM_REGION( 0x600000, "ymsnd", 0 ) ROM_LOAD( "244-v1.bin", 0x000000, 0x400000, CRC(79def46d) SHA1(63414235de2e177654508f1c840040424f8993e6) ) ROM_LOAD( "244-v2.bin", 0x400000, 0x200000, CRC(b231902f) SHA1(9209772e947a2c7ac31b49dd613bf2eab0cb3358) ) @@ -4540,7 +4540,7 @@ ROM_START( breakrev ) NEO_BIOS_AUDIO_128K( "245-m1.bin", CRC(00f31c66) SHA1(8488598415c9b74bce00e05b31d96e3d1625c20d) ) - ROM_REGION( 0x800000, "ym", 0 ) + ROM_REGION( 0x800000, "ymsnd", 0 ) ROM_LOAD( "245-v1.bin", 0x000000, 0x400000, CRC(e255446c) SHA1(b3933340d49d4ba581f3bf1af7ad69d786205790) ) ROM_LOAD( "245-v2.bin", 0x400000, 0x400000, CRC(9068198a) SHA1(71819b0475a5e173a2f9a6e4ff19a94655141c3c) ) @@ -4565,7 +4565,7 @@ ROM_START( shocktr2 ) NEO_BIOS_AUDIO_128K( "246-m1.bin", CRC(d0604ad1) SHA1(fae3cd52a177eadd5f5775ace957cc0f8301e65d) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) ROM_LOAD( "246-v1.bin", 0x000000, 0x400000, CRC(16986fc6) SHA1(cff3103dadf2f4390460456a5bd3fb5f28e21f6a) ) ROM_LOAD( "246-v2.bin", 0x400000, 0x400000, CRC(ada41e83) SHA1(78e37ffaaa5679c8775a3a71f6df7a0d15082bdc) ) ROM_LOAD( "246-v3.bin", 0x800000, 0x200000, CRC(a05ba5db) SHA1(09d739cad323d918f4196f91b654627fcafd8f4d) ) @@ -4589,7 +4589,7 @@ ROM_START( flipshot ) NEO_BIOS_AUDIO_128K( "247-m1.bin", CRC(a9fe0144) SHA1(4cc076ecce9216a373f3dcd7ba28a03d6050e522) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "247-v1.bin", 0x000000, 0x200000, CRC(42ec743d) SHA1(f45b5167ebcbd59300f4e5b05448cd421654102a) ) NO_DELTAT_REGION @@ -4607,7 +4607,7 @@ ROM_START( pbobbl2n ) NEO_BIOS_AUDIO_128K( "248-m1.bin", CRC(883097a9) SHA1(677bf9684c0c7977a9a3f0c1288e430040a53b49) ) - ROM_REGION( 0x800000, "ym", 0 ) + ROM_REGION( 0x800000, "ymsnd", 0 ) ROM_LOAD( "248-v1.bin", 0x000000, 0x400000, CRC(57fde1fa) SHA1(af39bc141fc35b78dcacfd42b3abb29d7e5c2c89) ) ROM_LOAD( "248-v2.bin", 0x400000, 0x400000, CRC(4b966ef3) SHA1(083c0e9fd7b8e506087648cdd8ec4206103984cd) ) @@ -4629,7 +4629,7 @@ ROM_START( ctomaday ) NEO_BIOS_AUDIO_128K( "249-m1.bin", CRC(80328a47) SHA1(34b6b1a81eab1cf38834b2eea55454ce1b6100e2) ) - ROM_REGION( 0x500000, "ym", 0 ) + ROM_REGION( 0x500000, "ymsnd", 0 ) ROM_LOAD( "249-v1.bin", 0x000000, 0x400000, CRC(de7c8f27) SHA1(3681a68a702ab5da8f509b8301d6cada75959332) ) ROM_LOAD( "249-v2.bin", 0x400000, 0x100000, CRC(c8e40119) SHA1(738f525c381ed68c0b8a89318a3e4d0089473c45) ) @@ -4649,7 +4649,7 @@ ROM_START( mslugx ) NEO_BIOS_AUDIO_128K( "250-m1.bin", CRC(fd42a842) SHA1(55769bad4860f64ef53a333e0da9e073db483d6a) ) - ROM_REGION( 0xa00000, "ym", 0 ) + ROM_REGION( 0xa00000, "ymsnd", 0 ) ROM_LOAD( "250-v1.bin", 0x000000, 0x400000, CRC(c79ede73) SHA1(ebfcc67204ff9677cf7972fd5b6b7faabf07280c) ) ROM_LOAD( "250-v2.bin", 0x400000, 0x400000, CRC(ea9aabe1) SHA1(526c42ca9a388f7435569400e2f132e2724c71ff) ) ROM_LOAD( "250-v3.bin", 0x800000, 0x200000, CRC(2ca65102) SHA1(45979d1edb1fc774a415d9386f98d7cb252a2043) ) @@ -4681,7 +4681,7 @@ ROM_START( kof99 ) /* Original Version - Encrypted Code & GFX */ /* AES VERSION NEO_BIOS_AUDIO_128K( "251-m1.bin", CRC(5e74539c) SHA1(6f49a9343cbd026b2c6720ff3fa2e5b1f85e80da) ) - ROM_REGION( 0x0e00000, "ym", 0 ) + ROM_REGION( 0x0e00000, "ymsnd", 0 ) ROM_LOAD( "251-v1.bin", 0x000000, 0x400000, CRC(ef2eecc8) SHA1(8ed13b9db92dba3124bc5ba66e3e275885ece24a) ) ROM_LOAD( "251-v2.bin", 0x400000, 0x400000, CRC(73e211ca) SHA1(0e60fa64cab6255d9721e2b4bc22e3de64c874c5) ) ROM_LOAD( "251-v3.bin", 0x800000, 0x400000, CRC(821901da) SHA1(c6d4975bfaa19a62ed59126cadf2578c0a5c257f) ) @@ -4717,7 +4717,7 @@ ROM_START( kof99a ) /* Original Version - Encrypted Code & GFX */ /* MVS VERSION NEO_BIOS_AUDIO_128K( "251-m1.bin", CRC(5e74539c) SHA1(6f49a9343cbd026b2c6720ff3fa2e5b1f85e80da) ) - ROM_REGION( 0x0e00000, "ym", 0 ) + ROM_REGION( 0x0e00000, "ymsnd", 0 ) ROM_LOAD( "251-v1.bin", 0x000000, 0x400000, CRC(ef2eecc8) SHA1(8ed13b9db92dba3124bc5ba66e3e275885ece24a) ) ROM_LOAD( "251-v2.bin", 0x400000, 0x400000, CRC(73e211ca) SHA1(0e60fa64cab6255d9721e2b4bc22e3de64c874c5) ) ROM_LOAD( "251-v3.bin", 0x800000, 0x400000, CRC(821901da) SHA1(c6d4975bfaa19a62ed59126cadf2578c0a5c257f) ) @@ -4755,7 +4755,7 @@ ROM_START( kof99e ) /* Original Version - Encrypted Code & GFX */ NEO_BIOS_AUDIO_128K( "251-m1.bin", CRC(5e74539c) SHA1(6f49a9343cbd026b2c6720ff3fa2e5b1f85e80da) ) - ROM_REGION( 0x0e00000, "ym", 0 ) + ROM_REGION( 0x0e00000, "ymsnd", 0 ) ROM_LOAD( "251-v1.bin", 0x000000, 0x400000, CRC(ef2eecc8) SHA1(8ed13b9db92dba3124bc5ba66e3e275885ece24a) ) ROM_LOAD( "251-v2.bin", 0x400000, 0x400000, CRC(73e211ca) SHA1(0e60fa64cab6255d9721e2b4bc22e3de64c874c5) ) ROM_LOAD( "251-v3.bin", 0x800000, 0x400000, CRC(821901da) SHA1(c6d4975bfaa19a62ed59126cadf2578c0a5c257f) ) @@ -4791,7 +4791,7 @@ ROM_START( kof99n ) /* Original Version - Encrypted GFX */ NEO_BIOS_AUDIO_128K( "251-m1.bin", CRC(5e74539c) SHA1(6f49a9343cbd026b2c6720ff3fa2e5b1f85e80da) ) - ROM_REGION( 0x0e00000, "ym", 0 ) + ROM_REGION( 0x0e00000, "ymsnd", 0 ) ROM_LOAD( "251-v1.bin", 0x000000, 0x400000, CRC(ef2eecc8) SHA1(8ed13b9db92dba3124bc5ba66e3e275885ece24a) ) ROM_LOAD( "251-v2.bin", 0x400000, 0x400000, CRC(73e211ca) SHA1(0e60fa64cab6255d9721e2b4bc22e3de64c874c5) ) ROM_LOAD( "251-v3.bin", 0x800000, 0x400000, CRC(821901da) SHA1(c6d4975bfaa19a62ed59126cadf2578c0a5c257f) ) @@ -4822,7 +4822,7 @@ ROM_START( kof99p ) /* Prototype Version - Possibly Hacked */ /* Did the Prototype really use the same sound program / voice roms, sound isn't great .. */ NEO_BIOS_AUDIO_128K( "251-m1.bin", CRC(5e74539c) SHA1(6f49a9343cbd026b2c6720ff3fa2e5b1f85e80da) ) - ROM_REGION( 0x0e00000, "ym", 0 ) + ROM_REGION( 0x0e00000, "ymsnd", 0 ) ROM_LOAD( "251-v1.bin", 0x000000, 0x400000, CRC(ef2eecc8) SHA1(8ed13b9db92dba3124bc5ba66e3e275885ece24a) ) ROM_LOAD( "251-v2.bin", 0x400000, 0x400000, CRC(73e211ca) SHA1(0e60fa64cab6255d9721e2b4bc22e3de64c874c5) ) ROM_LOAD( "251-v3.bin", 0x800000, 0x400000, CRC(821901da) SHA1(c6d4975bfaa19a62ed59126cadf2578c0a5c257f) ) @@ -4857,7 +4857,7 @@ ROM_START( ganryu ) /* Original Version - Encrypted GFX */ NEO_BIOS_AUDIO_128K( "252-m1.bin", CRC(30cc4099) SHA1(46453b7aac41855a92724a785372f8daf931d8d4) ) - ROM_REGION( 0x0400000, "ym", 0 ) + ROM_REGION( 0x0400000, "ymsnd", 0 ) ROM_LOAD( "252-v1.bin", 0x000000, 0x400000, CRC(e5946733) SHA1(d5904a50465af03d6ff33399a98f3259721ca0b2) ) NO_DELTAT_REGION @@ -4886,7 +4886,7 @@ ROM_START( garou ) /* Original Version - Encrypted GFX */ /* later revision */ NEO_BIOS_AUDIO_256K( "253-m1.bin", CRC(36a806be) SHA1(90fb44dc0c3fb57946a0f35716056abb84a0f191) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) ROM_LOAD( "253-v1.bin", 0x000000, 0x400000, CRC(263e388c) SHA1(11f05feee170370c4bfc5053af79246a6e3de5dc) ) ROM_LOAD( "253-v2.bin", 0x400000, 0x400000, CRC(2c6bc7be) SHA1(c9c61054ce1a47bf1bf77a31117726b499df24a4) ) ROM_LOAD( "253-v3.bin", 0x800000, 0x400000, CRC(0425b27d) SHA1(986863c98fc3445487242dcf2ea75b075e7f33ee) ) @@ -4922,7 +4922,7 @@ ROM_START( garouo ) /* Original Version - Encrypted GFX */ /* earlier revision * NEO_BIOS_AUDIO_256K( "253-m1.bin", CRC(36a806be) SHA1(90fb44dc0c3fb57946a0f35716056abb84a0f191) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) ROM_LOAD( "253-v1.bin", 0x000000, 0x400000, CRC(263e388c) SHA1(11f05feee170370c4bfc5053af79246a6e3de5dc) ) ROM_LOAD( "253-v2.bin", 0x400000, 0x400000, CRC(2c6bc7be) SHA1(c9c61054ce1a47bf1bf77a31117726b499df24a4) ) ROM_LOAD( "253-v3.bin", 0x800000, 0x400000, CRC(0425b27d) SHA1(986863c98fc3445487242dcf2ea75b075e7f33ee) ) @@ -4951,7 +4951,7 @@ ROM_START( garoup ) /* Prototype Version, seems genuine */ NEO_BIOS_AUDIO_256K( "253-m1p.bin", CRC(bbe464f7) SHA1(f5f8f3e48f5d453f45107085d6f4023bcd24c053) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) ROM_LOAD( "253-v1p.bin", 0x000000, 0x400000, CRC(274f3923) SHA1(4c7a8ad1cd0e3afc1f78de3c2929120ed434f104) ) ROM_LOAD( "253-v2p.bin", 0x400000, 0x400000, CRC(8f86dabe) SHA1(b3d2d9f5c1d97a6e7aee2c674fb6627f41bbb240) ) ROM_LOAD( "253-v3p.bin", 0x800000, 0x400000, CRC(05fd06cd) SHA1(6cd699719614bb87547632ea3d61d92d81fdf563) ) @@ -4985,7 +4985,7 @@ ROM_START( s1945p ) /* Original Version, Encrypted GFX Roms */ NEO_BIOS_AUDIO_128K( "254-m1.bin", CRC(994b4487) SHA1(a4e645a3ababa48a8325980ff022e04a8b51b017) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) ROM_LOAD( "254-v1.bin", 0x000000, 0x400000, CRC(844f58fb) SHA1(e59544457be9f21481eac8b5a39b9cbb502f252d) ) ROM_LOAD( "254-v2.bin", 0x400000, 0x400000, CRC(d9a248f0) SHA1(dd3e0974b753e6f94d0943a002de45668a1b072b) ) ROM_LOAD( "254-v3.bin", 0x800000, 0x400000, CRC(0b0d2d33) SHA1(f8e76af42a997f36a40f66b39de00f68afe6a89c) ) @@ -5019,7 +5019,7 @@ ROM_START( preisle2 ) /* Original Version, Encrypted GFX */ NEO_BIOS_AUDIO_128K( "255-m1.bin", CRC(8efd4014) SHA1(5b73809b6e4e49264d281ef3e5004ac8a9de296d) ) - ROM_REGION( 0x0600000, "ym", 0 ) + ROM_REGION( 0x0600000, "ymsnd", 0 ) ROM_LOAD( "255-v1.bin", 0x000000, 0x400000, CRC(5a14543d) SHA1(7146ac748f846c7e2d5b0bdcf953892e39b648fe) ) ROM_LOAD( "255-v2.bin", 0x400000, 0x200000, CRC(6610d91a) SHA1(b2c6786920dc1712e88c3cc26d2c6c3ac2615bf4) ) @@ -5051,7 +5051,7 @@ ROM_START( mslug3 ) /* Original Version - Encrypted Code & GFX */ /* revision 20 NEO_BIOS_AUDIO_512K( "256-m1.bin", CRC(eaeec116) SHA1(54419dbb21edc8c4b37eaac2e7ad9496d2de037a) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) ROM_LOAD( "256-v1.bin", 0x000000, 0x400000, CRC(f2690241) SHA1(fd56babc1934d10e0d27c32f032f9edda7ca8ce9) ) ROM_LOAD( "256-v2.bin", 0x400000, 0x400000, CRC(7e2a10bd) SHA1(0d587fb9f64cba0315ce2d8a03e2b8fe34936dff) ) ROM_LOAD( "256-v3.bin", 0x800000, 0x400000, CRC(0eaec17c) SHA1(c3ed613cc6993edd6fc0d62a90bcd85de8e21915) ) @@ -5086,7 +5086,7 @@ ROM_START( mslug3h ) /* Original Version - Encrypted GFX */ /* MVS AND AES VERSI NEO_BIOS_AUDIO_512K( "256-m1.bin", CRC(eaeec116) SHA1(54419dbb21edc8c4b37eaac2e7ad9496d2de037a) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) ROM_LOAD( "256-v1.bin", 0x000000, 0x400000, CRC(f2690241) SHA1(fd56babc1934d10e0d27c32f032f9edda7ca8ce9) ) ROM_LOAD( "256-v2.bin", 0x400000, 0x400000, CRC(7e2a10bd) SHA1(0d587fb9f64cba0315ce2d8a03e2b8fe34936dff) ) ROM_LOAD( "256-v3.bin", 0x800000, 0x400000, CRC(0eaec17c) SHA1(c3ed613cc6993edd6fc0d62a90bcd85de8e21915) ) @@ -5123,7 +5123,7 @@ ROM_START( kof2000 ) /* Original Version, Encrypted Code + Sound + GFX Roms */ /* Encrypted */ NEO_BIOS_AUDIO_ENCRYPTED_256K( "257-m1.bin", CRC(4b749113) SHA1(2af2361146edd0ce3966614d90165a5c1afb8de4) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) ROM_LOAD( "257-v1.bin", 0x000000, 0x400000, CRC(17cde847) SHA1(4bcc0205b70dc6d9216b29025450c9c5b08cb65d) ) ROM_LOAD( "257-v2.bin", 0x400000, 0x400000, CRC(1afb20ff) SHA1(57dfd2de058139345ff2b744a225790baaecd5a2) ) ROM_LOAD( "257-v3.bin", 0x800000, 0x400000, CRC(4605036a) SHA1(51b228a0600d38a6ec37aec4822879ec3b0ee106) ) @@ -5158,7 +5158,7 @@ ROM_START( kof2000n ) /* Original Version, Encrypted Sound + GFX Roms */ /* Encrypted */ NEO_BIOS_AUDIO_ENCRYPTED_256K( "257-m1.bin", CRC(4b749113) SHA1(2af2361146edd0ce3966614d90165a5c1afb8de4) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) ROM_LOAD( "257-v1.bin", 0x000000, 0x400000, CRC(17cde847) SHA1(4bcc0205b70dc6d9216b29025450c9c5b08cb65d) ) ROM_LOAD( "257-v2.bin", 0x400000, 0x400000, CRC(1afb20ff) SHA1(57dfd2de058139345ff2b744a225790baaecd5a2) ) ROM_LOAD( "257-v3.bin", 0x800000, 0x400000, CRC(4605036a) SHA1(51b228a0600d38a6ec37aec4822879ec3b0ee106) ) @@ -5192,7 +5192,7 @@ ROM_START( bangbead ) /* Original Version - Encrypted GFX */ NEO_BIOS_AUDIO_128K( "259-m1.bin", CRC(85668ee9) SHA1(7d3f51710cf90c097cd3faaeeef10ceb85cbb3e8) ) - ROM_REGION( 0x500000, "ym", 0 ) + ROM_REGION( 0x500000, "ymsnd", 0 ) ROM_LOAD( "259-v1.bin", 0x000000, 0x400000, CRC(088eb8ab) SHA1(608306e35501dd7d382d9f96b28e7550aa896a03) ) ROM_LOAD( "259-v2.bin", 0x400000, 0x100000, CRC(97528fe9) SHA1(8f5eddbb3a9a225492479d1a44801f3916c8e791) ) @@ -5216,7 +5216,7 @@ ROM_START( bangbedp ) NEO_BIOS_AUDIO_128K( "259-m1.bin", CRC(85668ee9) SHA1(7d3f51710cf90c097cd3faaeeef10ceb85cbb3e8) ) - ROM_REGION( 0x500000, "ym", 0 ) + ROM_REGION( 0x500000, "ymsnd", 0 ) ROM_LOAD( "259-v1p.bin", 0x000000, 0x200000, CRC(e97b9385) SHA1(d213cae6cf5732b8ab1f8a8cf04afee5dfd9a260) ) ROM_LOAD( "259-v2p.bin", 0x200000, 0x200000, CRC(b0cbd70a) SHA1(fc7c8183f8ff9800e8aae7c8d44d962300058cfb) ) ROM_LOAD( "259-v3p.bin", 0x400000, 0x100000, CRC(97528fe9) SHA1(8f5eddbb3a9a225492479d1a44801f3916c8e791) ) @@ -5245,7 +5245,7 @@ ROM_START( nitd ) /* Original Version - Encrypted GFX */ NEO_BIOS_AUDIO_512K( "260-m1.bin", CRC(6407c5e5) SHA1(d273e154cc905b63205a17a1a6d419cac3485a92) ) - ROM_REGION( 0x0400000, "ym", 0 ) + ROM_REGION( 0x0400000, "ymsnd", 0 ) ROM_LOAD( "260-v1.bin", 0x000000, 0x400000, CRC(24b0480c) SHA1(d769e621be52a5cd2e2568891b5f95a48268e1e0) ) NO_DELTAT_REGION @@ -5272,7 +5272,7 @@ ROM_START( sengoku3 ) /* Original Version - Encrypted GFX */ NEO_BIOS_AUDIO_128K( "261-m1.bin", CRC(36ed9cdd) SHA1(78a7d755e9e9f52255ac6228d9d402fd6a02c126) ) - ROM_REGION( 0x0e00000, "ym", 0 ) + ROM_REGION( 0x0e00000, "ymsnd", 0 ) ROM_LOAD( "261-v1.bin", 0x000000, 0x400000, CRC(64c30081) SHA1(f9ebd20cf59b72e864b7274c1bdb6d99ecaf4595) ) ROM_LOAD( "261-v2.bin", 0x400000, 0x400000, CRC(392a9c47) SHA1(7ab90a54089236ca6c3ef1af8e566a8025d38159) ) ROM_LOAD( "261-v3.bin", 0x800000, 0x400000, CRC(c1a7ebe3) SHA1(1d7bb481451f5ee0457e954bb5210300182c3c9c) ) @@ -5304,7 +5304,7 @@ ROM_START( kof2001 ) /* MVS VERSION */ /* Encrypted */ NEO_BIOS_AUDIO_ENCRYPTED_256K( "265-262-m1.bin", CRC(a7f8119f) SHA1(71805b39b8b09c32425cf39f9de59b2f755976c2) ) /* yes it really does have a strange name */ - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) ROM_LOAD( "262-v1-08-e0.bin", 0x000000, 0x400000, CRC(83d49ecf) SHA1(2f2c116e45397652e77fcf5d951fa5f71b639572) ) ROM_LOAD( "262-v2-08-e0.bin", 0x400000, 0x400000, CRC(003f1843) SHA1(bdd58837ad542548bd4053c262f558af88e3b989) ) ROM_LOAD( "262-v3-08-e0.bin", 0x800000, 0x400000, CRC(2ae38dbe) SHA1(4e82b7dd3b899d61907620517a5a27bdaba0725d) ) @@ -5340,7 +5340,7 @@ ROM_START( kof2001h ) /* AES VERSION */ /* Encrypted */ NEO_BIOS_AUDIO_ENCRYPTED_256K( "265-262-m1.bin", CRC(a7f8119f) SHA1(71805b39b8b09c32425cf39f9de59b2f755976c2) ) /* yes it really does have a strange name */ - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) ROM_LOAD( "262-v1-08-e0.bin", 0x000000, 0x400000, CRC(83d49ecf) SHA1(2f2c116e45397652e77fcf5d951fa5f71b639572) ) ROM_LOAD( "262-v2-08-e0.bin", 0x400000, 0x400000, CRC(003f1843) SHA1(bdd58837ad542548bd4053c262f558af88e3b989) ) ROM_LOAD( "262-v3-08-e0.bin", 0x800000, 0x400000, CRC(2ae38dbe) SHA1(4e82b7dd3b899d61907620517a5a27bdaba0725d) ) @@ -5381,7 +5381,7 @@ ROM_START( mslug4 ) /* Original Version - Encrypted GFX */ /* MVS VERSION */ /* Encrypted */ NEO_BIOS_AUDIO_ENCRYPTED_128K( "263-m1.bin", CRC(46ac8228) SHA1(5aeea221050c98e4bb0f16489ce772bf1c80f787) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) /* Encrypted */ ROM_LOAD( "263-v1.bin", 0x000000, 0x800000, CRC(01e9b9cd) SHA1(0b045c2999449f7dab5ae8a42e957d5b6650431e) ) ROM_LOAD( "263-v2.bin", 0x800000, 0x800000, CRC(4ab2bf81) SHA1(77ccfa48f7e3daddef5fe5229a0093eb2f803742) ) @@ -5414,7 +5414,7 @@ ROM_START( mslug4h ) /* Original Version - Encrypted GFX */ /* AES VERSION */ /* Encrypted */ NEO_BIOS_AUDIO_ENCRYPTED_128K( "263-m1.bin", CRC(46ac8228) SHA1(5aeea221050c98e4bb0f16489ce772bf1c80f787) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) /* Encrypted */ ROM_LOAD( "263-v1.bin", 0x000000, 0x800000, CRC(01e9b9cd) SHA1(0b045c2999449f7dab5ae8a42e957d5b6650431e) ) ROM_LOAD( "263-v2.bin", 0x800000, 0x800000, CRC(4ab2bf81) SHA1(77ccfa48f7e3daddef5fe5229a0093eb2f803742) ) @@ -5447,7 +5447,7 @@ ROM_START( rotd ) /* Encrypted Set */ /* MVS VERSION */ /* Encrypted */ NEO_BIOS_AUDIO_ENCRYPTED_128K( "264-m1.bin", CRC(4dbd7b43) SHA1(6b63756b0d2d30bbf13fbd219833c81fd060ef96) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) /* Encrypted */ ROM_LOAD( "264-v1.bin", 0x000000, 0x800000, CRC(fa005812) SHA1(73723126dab5a640ac11955ed6da1bf7a91394f5) ) ROM_LOAD( "264-v2.bin", 0x800000, 0x800000, CRC(c3dc8bf0) SHA1(a105e37262d9500a30fb8a5dac05aa4fab2562a3) ) @@ -5482,7 +5482,7 @@ ROM_START( kof2002 ) /* Encrypted Set */ /* MVS AND AES VERSION */ /* Encrypted */ NEO_BIOS_AUDIO_ENCRYPTED_128K( "265-m1.bin", CRC(85aaa632) SHA1(744fba4ca3bc3a5873838af886efb97a8a316104) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) /* Encrypted */ ROM_LOAD( "265-v1.bin", 0x000000, 0x800000, CRC(15e8f3f5) SHA1(7c9e6426b9fa6db0158baa17a6485ffce057d889) ) ROM_LOAD( "265-v2.bin", 0x800000, 0x800000, CRC(da41d6f9) SHA1(a43021f1e58947dcbe3c8ca5283b20b649f0409d) ) @@ -5517,7 +5517,7 @@ ROM_START( matrim ) /* Encrypted Set */ /* MVS AND AES VERSION */ /* Encrypted */ NEO_BIOS_AUDIO_ENCRYPTED_128K( "266-m1.bin", CRC(456c3e6c) SHA1(5a07d0186198a18d2dda1331093cf29b0b9b2984) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) /* Encrypted */ ROM_LOAD( "266-v1.bin", 0x000000, 0x800000, CRC(a4f83690) SHA1(200d683d8c30ebc6d0ed331aa5bbba39b4e07160) ) ROM_LOAD( "266-v2.bin", 0x800000, 0x800000, CRC(d0f69eda) SHA1(9d7e98976ad433ed8a35d7afffa38130444ba7db) ) @@ -5551,7 +5551,7 @@ ROM_START( pnyaa ) /* Encrypted Set */ /* MVS VERSION */ /* Encrypted */ NEO_BIOS_AUDIO_ENCRYPTED_512K( "267-m1.bin", CRC(c7853ccd) SHA1(1b7a4c5093cf0fe3861ce44fd1d3b30c71ad0abe) ) - ROM_REGION( 0x400000, "ym", 0 ) + ROM_REGION( 0x400000, "ymsnd", 0 ) /* Encrypted */ ROM_LOAD( "267-v1.bin", 0x000000, 0x400000, CRC(e2e8e917) SHA1(7f412d55aebff3d38a225a88c632916295ab0584) ) @@ -5579,7 +5579,7 @@ ROM_START( mslug5 ) /* Encrypted Set */ /* MVS VERSION */ /* Encrypted */ NEO_BIOS_AUDIO_ENCRYPTED_512K( "268-m1.bin", CRC(4a5a6e0e) SHA1(df0f660f2465e1db7be5adfcaf5e88ad61a74a42) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) /* Encrypted */ ROM_LOAD( "268-v1c.bin", 0x000000, 0x800000, CRC(ae31d60c) SHA1(c42285cf4e52fea74247860813e826df5aa7600a) ) ROM_LOAD( "268-v2c.bin", 0x800000, 0x800000, CRC(c40613ed) SHA1(af889570304e2867d7dfea1e94e388c06249fb67) ) @@ -5614,7 +5614,7 @@ ROM_START( mslug5h ) /* Encrypted Set */ /* AES release of the game but is also /* Encrypted */ NEO_BIOS_AUDIO_ENCRYPTED_512K( "268-m1h.bin", CRC(4a5a6e0e) SHA1(df0f660f2465e1db7be5adfcaf5e88ad61a74a42) ) /* Same as MVS above, but different label */ - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) /* Encrypted */ ROM_LOAD( "268-v1c.bin", 0x000000, 0x800000, CRC(ae31d60c) SHA1(c42285cf4e52fea74247860813e826df5aa7600a) ) ROM_LOAD( "268-v2c.bin", 0x800000, 0x800000, CRC(c40613ed) SHA1(af889570304e2867d7dfea1e94e388c06249fb67) ) @@ -5649,7 +5649,7 @@ ROM_START( svc ) /* Encrypted Set */ /* MVS AND AES VERSION */ /* Encrypted */ NEO_BIOS_AUDIO_ENCRYPTED_512K( "269-m1.bin", CRC(f6819d00) SHA1(d3bbe09df502464f104e53501708ac6e2c1832c6) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) /* Encrypted */ ROM_LOAD( "269-v1.bin", 0x000000, 0x800000, CRC(c659b34c) SHA1(1931e8111ef43946f68699f8707334c96f753a1e) ) ROM_LOAD( "269-v2.bin", 0x800000, 0x800000, CRC(dd903835) SHA1(e58d38950a7a8697bb22a1cc7a371ae6664ae8f9) ) @@ -5682,7 +5682,7 @@ ROM_START( samsho5 ) /* Encrypted Set */ /* MVS VERSION */ /* Encrypted */ NEO_BIOS_AUDIO_ENCRYPTED_512K( "270-m1.bin", CRC(49c9901a) SHA1(2623e9765a0eba58fee2de72851e9dc502344a3d) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) /* Encrypted */ ROM_LOAD( "270-v1.bin", 0x000000, 0x800000, CRC(62e434eb) SHA1(1985f5e88f8e866f9683b6cea901aa28c04b80bf) ) ROM_LOAD( "270-v2.bin", 0x800000, 0x800000, CRC(180f3c9a) SHA1(6d7dc2605ead6e78704efa127e7e0dfe621e2c54) ) @@ -5717,7 +5717,7 @@ ROM_START( samsho5h ) /* Encrypted Set, Alternate Set */ /* AES VERSION */ /* Encrypted */ NEO_BIOS_AUDIO_ENCRYPTED_512K( "270-m1.bin", CRC(49c9901a) SHA1(2623e9765a0eba58fee2de72851e9dc502344a3d) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) /* Encrypted */ ROM_LOAD( "270-v1.bin", 0x000000, 0x800000, CRC(62e434eb) SHA1(1985f5e88f8e866f9683b6cea901aa28c04b80bf) ) ROM_LOAD( "270-v2.bin", 0x800000, 0x800000, CRC(180f3c9a) SHA1(6d7dc2605ead6e78704efa127e7e0dfe621e2c54) ) @@ -5753,7 +5753,7 @@ ROM_START( kof2003 ) /* Encrypted Code + Sound + GFX Roms */ /* MVS VERSION */ /* Encrypted */ NEO_BIOS_AUDIO_ENCRYPTED_512K( "271-m1c.bin", CRC(f5515629) SHA1(7516bf1b0207a3c8d41dc30c478f8d8b1f71304b) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) /* Encrypted */ ROM_LOAD( "271-v1c.bin", 0x000000, 0x800000, CRC(ffa3f8c7) SHA1(7cf4a933973ca23b7f87c81151d8659e6ec4bd20) ) ROM_LOAD( "271-v2c.bin", 0x800000, 0x800000, CRC(5382c7d1) SHA1(1bf999705eda80ba1e7b0d6bdd010d9bfb18bd76) ) @@ -5789,7 +5789,7 @@ ROM_START( kof2003h ) /* Encrypted Code + Sound + GFX Roms */ /* Encrypted */ NEO_BIOS_AUDIO_ENCRYPTED_512K( "271-m1k.bin", CRC(48d9affe) SHA1(68f01560b91bbada39001ce01bdeeed5c9bb29f2) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) /* Encrypted */ ROM_LOAD( "271-v1c.bin", 0x000000, 0x800000, CRC(ffa3f8c7) SHA1(7cf4a933973ca23b7f87c81151d8659e6ec4bd20) ) ROM_LOAD( "271-v2c.bin", 0x800000, 0x800000, CRC(5382c7d1) SHA1(1bf999705eda80ba1e7b0d6bdd010d9bfb18bd76) ) @@ -5823,7 +5823,7 @@ ROM_START( samsh5sp ) /* Encrypted Set */ NEO_BIOS_AUDIO_ENCRYPTED_512K( "272-m1.bin", CRC(adeebf40) SHA1(8cbd63dda3fff4de38060405bf70cd9308c9e66e) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) /* Encrypted */ ROM_LOAD( "272-v1.bin", 0x000000, 0x800000, CRC(76a94127) SHA1(c3affd7ff1eb02345cfb755962ec173a8ec34acd) ) ROM_LOAD( "272-v2.bin", 0x800000, 0x800000, CRC(4ba507f1) SHA1(728d139da3fe8a391fd8be4d24bb7fdd4bf9548a) ) @@ -5858,7 +5858,7 @@ ROM_START( samsh5sph ) /* Encrypted Set */ /* Encrypted */ NEO_BIOS_AUDIO_ENCRYPTED_512K( "272-m1.bin", CRC(adeebf40) SHA1(8cbd63dda3fff4de38060405bf70cd9308c9e66e) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) /* Encrypted */ ROM_LOAD( "272-v1.bin", 0x000000, 0x800000, CRC(76a94127) SHA1(c3affd7ff1eb02345cfb755962ec173a8ec34acd) ) ROM_LOAD( "272-v2.bin", 0x800000, 0x800000, CRC(4ba507f1) SHA1(728d139da3fe8a391fd8be4d24bb7fdd4bf9548a) ) @@ -5893,7 +5893,7 @@ ROM_START( samsh5spn ) /* Encrypted Set */ /* Encrypted */ NEO_BIOS_AUDIO_ENCRYPTED_512K( "272-m1.bin", CRC(adeebf40) SHA1(8cbd63dda3fff4de38060405bf70cd9308c9e66e) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) /* Encrypted */ ROM_LOAD( "272-v1.bin", 0x000000, 0x800000, CRC(76a94127) SHA1(c3affd7ff1eb02345cfb755962ec173a8ec34acd) ) ROM_LOAD( "272-v2.bin", 0x800000, 0x800000, CRC(4ba507f1) SHA1(728d139da3fe8a391fd8be4d24bb7fdd4bf9548a) ) @@ -5928,7 +5928,7 @@ ROM_START( jockeygp ) /* Encrypted */ NEO_BIOS_AUDIO_ENCRYPTED_512K( "jgp-m1.bin", CRC(d163c690) SHA1(1dfd04d20c5985037f07cd01000d0b04f3a8f4f4) ) - ROM_REGION( 0x0200000, "ym", 0 ) + ROM_REGION( 0x0200000, "ymsnd", 0 ) ROM_LOAD( "jgp-v1.bin", 0x000000, 0x200000, CRC(443eadba) SHA1(3def3c22f0e276bc4c2fc7ff70ce473c08b0d2df) ) NO_DELTAT_REGION @@ -5947,7 +5947,7 @@ ROM_START( vliner ) NEO_BIOS_AUDIO_64K( "vl-m1.bin", CRC(9b92b7d1) SHA1(2c9b777feb9a8e43fa1bd942aba5afe3b5427d94) ) - ROM_REGION( 0x200000, "ym", ROMREGION_ERASE00 ) + ROM_REGION( 0x200000, "ymsnd", ROMREGION_ERASE00 ) NO_DELTAT_REGION @@ -5964,7 +5964,7 @@ ROM_START( vlinero ) NEO_BIOS_AUDIO_64K( "vl-m1.bin", CRC(9b92b7d1) SHA1(2c9b777feb9a8e43fa1bd942aba5afe3b5427d94) ) - ROM_REGION( 0x200000, "ym", ROMREGION_ERASE00 ) + ROM_REGION( 0x200000, "ymsnd", ROMREGION_ERASE00 ) NO_DELTAT_REGION @@ -6018,7 +6018,7 @@ ROM_START( ms5pcb ) /* Encrypted Set */ ROM_Y_ZOOM - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) /* Encrypted */ ROM_LOAD( "268-v1.bin", 0x000000, 0x1000000, CRC(8458afe5) SHA1(62b4c6e7db763e9ff2697bbcdb43dc5a56b48c68) ) @@ -6052,7 +6052,7 @@ ROM_START( svcpcb ) /* Encrypted Set, JAMMA PCB */ ROM_Y_ZOOM - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) /* Encrypted */ ROM_LOAD( "269-v1.bin", 0x000000, 0x800000, CRC(c659b34c) SHA1(1931e8111ef43946f68699f8707334c96f753a1e) ) ROM_LOAD( "269-v2.bin", 0x800000, 0x800000, CRC(dd903835) SHA1(e58d38950a7a8697bb22a1cc7a371ae6664ae8f9) ) @@ -6085,7 +6085,7 @@ ROM_START( svcpcba ) /* Encrypted Set, JAMMA PCB */ ROM_Y_ZOOM - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) /* Encrypted */ ROM_LOAD( "269-v1a.bin", 0x000000, 0x1000000, CRC(a6af4753) SHA1(ec4f61a526b707a7faec4653b773beb3bf3a17ba) ) @@ -6118,7 +6118,7 @@ ROM_START( kf2k3pcb ) /* Encrypted Set, JAMMA PCB */ ROM_Y_ZOOM - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) /* Encrypted */ ROM_LOAD( "271-v1.bin", 0x000000, 0x1000000, CRC(1d96154b) SHA1(1d4e262b0d30cee79a4edc83bb9706023c736668) ) @@ -6161,7 +6161,7 @@ ROM_START( zintrckb ) NEO_BIOS_AUDIO_128K( "zin-m1.bin", CRC(fd9627ca) SHA1(b640c1f1ff466f734bb1cb5d7b589cb7e8a55346) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "zin-v1.bin", 0x000000, 0x200000, CRC(c09f74f1) SHA1(d0b56a780a6eba85ff092240b1f1cc6718f17c21) ) NO_DELTAT_REGION @@ -6182,7 +6182,7 @@ ROM_START( kof97pls ) NEO_BIOS_AUDIO_128K( "232-m1.bin", CRC(45348747) SHA1(ed77cbae2b208d1177a9f5f6e8cd57070e90b65b) ) - ROM_REGION( 0xc00000, "ym", 0 ) + ROM_REGION( 0xc00000, "ymsnd", 0 ) ROM_LOAD( "232-v1.bin", 0x000000, 0x400000, CRC(22a2b5b5) SHA1(ebdbc977332e6d93e266755000b43857e0082965) ) ROM_LOAD( "232-v2.bin", 0x400000, 0x400000, CRC(2304e744) SHA1(98d283e2bcc9291a53f52afd35ef76dfb0828432) ) ROM_LOAD( "232-v3.bin", 0x800000, 0x400000, CRC(759eb954) SHA1(54e77c4e9e6b89458e59824e478ddc33a9c72655) ) @@ -6207,7 +6207,7 @@ ROM_START( kog ) NEO_BIOS_AUDIO_128K( "232-m1.bin", CRC(45348747) SHA1(ed77cbae2b208d1177a9f5f6e8cd57070e90b65b) ) - ROM_REGION( 0xc00000, "ym", 0 ) + ROM_REGION( 0xc00000, "ymsnd", 0 ) ROM_LOAD( "232-v1.bin", 0x000000, 0x400000, CRC(22a2b5b5) SHA1(ebdbc977332e6d93e266755000b43857e0082965) ) ROM_LOAD( "232-v2.bin", 0x400000, 0x400000, CRC(2304e744) SHA1(98d283e2bcc9291a53f52afd35ef76dfb0828432) ) ROM_LOAD( "232-v3.bin", 0x800000, 0x400000, CRC(759eb954) SHA1(54e77c4e9e6b89458e59824e478ddc33a9c72655) ) @@ -6233,7 +6233,7 @@ ROM_START( lans2004 ) NEO_BIOS_AUDIO_128K( "246-m1.bin", CRC(d0604ad1) SHA1(fae3cd52a177eadd5f5775ace957cc0f8301e65d) ) - ROM_REGION( 0xA00000, "ym", 0 ) + ROM_REGION( 0xA00000, "ymsnd", 0 ) ROM_LOAD( "lnsq-v1.bin", 0x000000, 0x400000, CRC(4408ebc3) SHA1(e3f4d8a7e243a8cf48e97d91bbfec7829c0d9404) ) ROM_LOAD( "lnsq-v2.bin", 0x400000, 0x400000, CRC(3d953975) SHA1(6a4ab02ab3d4416a65343cf16815007cb273f19b) ) ROM_LOAD( "lnsq-v3.bin", 0x800000, 0x200000, CRC(437d1d8e) SHA1(95e015c21707b53ed7223eaa19f6cdcfb4d94f0c) ) @@ -6260,7 +6260,7 @@ ROM_START( garoubl ) /* bootleg of garoup */ NEO_BIOS_AUDIO_512K( "garou-m1.bin", CRC(7c51d002) SHA1(01ffba6cbc8da07804f7b21d8c71c39d64a1a4e2) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) ROM_LOAD( "garou-v1.bin", 0x000000, 0x400000, CRC(98d736e4) SHA1(3edda9a1d45b0e38a85156d24fc8ff2f0011239b) ) ROM_LOAD( "garou-v2.bin", 0x400000, 0x400000, CRC(eb43c03f) SHA1(83c9c168b154e60a64f1033004b2d33e218bbb8b) ) ROM_LOAD( "garou-v3.bin", 0x800000, 0x400000, CRC(10a0f814) SHA1(e86def80d6fb2a38ebc9f3338d22f28c15ce85da) ) @@ -6286,7 +6286,7 @@ ROM_START( mslug3b6 ) /* This "Metal Slug 6" is a hack/bootleg of Metal Slug 3, NEO_BIOS_AUDIO_512K( "256-m1.bin", CRC(eaeec116) SHA1(54419dbb21edc8c4b37eaac2e7ad9496d2de037a) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) ROM_LOAD( "256-v1.bin", 0x000000, 0x400000, CRC(f2690241) SHA1(fd56babc1934d10e0d27c32f032f9edda7ca8ce9) ) ROM_LOAD( "256-v2.bin", 0x400000, 0x400000, CRC(7e2a10bd) SHA1(0d587fb9f64cba0315ce2d8a03e2b8fe34936dff) ) ROM_LOAD( "256-v3.bin", 0x800000, 0x400000, CRC(0eaec17c) SHA1(c3ed613cc6993edd6fc0d62a90bcd85de8e21915) ) @@ -6317,7 +6317,7 @@ ROM_START( nitdbl ) /* Bootleg m1 is 128k, data is identical */ NEO_BIOS_AUDIO_512K( "260-m1.bin", CRC(6407c5e5) SHA1(d273e154cc905b63205a17a1a6d419cac3485a92) ) - ROM_REGION( 0x400000, "ym", 0 ) + ROM_REGION( 0x400000, "ymsnd", 0 ) ROM_LOAD( "nitd-v1.bin", 0x000000, 0x200000, CRC(79008868) SHA1(90bd6aaefd37341297ab1f4ae7246e52facd87d0) ) ROM_LOAD( "nitd-v2.bin", 0x200000, 0x200000, CRC(728558F9) SHA1(309aa7c933c199b2e540a601b363e7af8744fe00) ) @@ -6342,7 +6342,7 @@ ROM_START( cthd2003 ) /* Protected hack/bootleg of kof2001 Phenixsoft */ NEO_BIOS_AUDIO_128K( "5003-m1.bin", CRC(1a8c274b) SHA1(5f6f9c533f4a296a18c741ce59a69cf6f5c836b9) ) /* sound roms are identical to kof2001 */ - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) ROM_LOAD( "262-v1-08-e0.bin", 0x000000, 0x400000, CRC(83d49ecf) SHA1(2f2c116e45397652e77fcf5d951fa5f71b639572) ) ROM_LOAD( "262-v2-08-e0.bin", 0x400000, 0x400000, CRC(003f1843) SHA1(bdd58837ad542548bd4053c262f558af88e3b989) ) ROM_LOAD( "262-v3-08-e0.bin", 0x800000, 0x400000, CRC(2ae38dbe) SHA1(4e82b7dd3b899d61907620517a5a27bdaba0725d) ) @@ -6377,7 +6377,7 @@ ROM_START( ct2k3sp ) /* Protected hack/bootleg of kof2001 Phenixsoft */ NEO_BIOS_AUDIO_128K( "5003-m1.bin", CRC(1a8c274b) SHA1(5f6f9c533f4a296a18c741ce59a69cf6f5c836b9) ) /* sound roms are identical to kof2001 */ - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) ROM_LOAD( "262-v1-08-e0.bin", 0x000000, 0x400000, CRC(83d49ecf) SHA1(2f2c116e45397652e77fcf5d951fa5f71b639572) ) ROM_LOAD( "262-v2-08-e0.bin", 0x400000, 0x400000, CRC(003f1843) SHA1(bdd58837ad542548bd4053c262f558af88e3b989) ) ROM_LOAD( "262-v3-08-e0.bin", 0x800000, 0x400000, CRC(2ae38dbe) SHA1(4e82b7dd3b899d61907620517a5a27bdaba0725d) ) @@ -6413,7 +6413,7 @@ ROM_START( ct2k3sa ) /* Protected hack/bootleg of kof2001 Phenixsoft, alternate NEO_BIOS_AUDIO_128K( "5003-m1.bin", CRC(1a8c274b) SHA1(5f6f9c533f4a296a18c741ce59a69cf6f5c836b9) ) /* Original set has 2x64 mbit sound roms */ - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) ROM_LOAD( "262-v1-08-e0.bin", 0x000000, 0x400000, CRC(83d49ecf) SHA1(2f2c116e45397652e77fcf5d951fa5f71b639572) ) ROM_LOAD( "262-v2-08-e0.bin", 0x400000, 0x400000, CRC(003f1843) SHA1(bdd58837ad542548bd4053c262f558af88e3b989) ) ROM_LOAD( "262-v3-08-e0.bin", 0x800000, 0x400000, CRC(2ae38dbe) SHA1(4e82b7dd3b899d61907620517a5a27bdaba0725d) ) @@ -6445,7 +6445,7 @@ ROM_START( ms4plus ) /* Encrypted */ NEO_BIOS_AUDIO_ENCRYPTED_128K( "263-m1.bin", CRC(46ac8228) SHA1(5aeea221050c98e4bb0f16489ce772bf1c80f787) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) /* Encrypted */ ROM_LOAD( "263-v1.bin", 0x000000, 0x800000, CRC(01e9b9cd) SHA1(0b045c2999449f7dab5ae8a42e957d5b6650431e) ) ROM_LOAD( "263-v2.bin", 0x800000, 0x800000, CRC(4ab2bf81) SHA1(77ccfa48f7e3daddef5fe5229a0093eb2f803742) ) @@ -6474,7 +6474,7 @@ ROM_START( kof2002b ) /* Encrypted */ NEO_BIOS_AUDIO_ENCRYPTED_128K( "265-m1.bin", CRC(85aaa632) SHA1(744fba4ca3bc3a5873838af886efb97a8a316104) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) /* Encrypted */ ROM_LOAD( "265-v1.bin", 0x000000, 0x800000, CRC(15e8f3f5) SHA1(7c9e6426b9fa6db0158baa17a6485ffce057d889) ) ROM_LOAD( "265-v2.bin", 0x800000, 0x800000, CRC(da41d6f9) SHA1(a43021f1e58947dcbe3c8ca5283b20b649f0409d) ) @@ -6502,7 +6502,7 @@ ROM_START( kf2k2pls ) /* Encrypted */ NEO_BIOS_AUDIO_ENCRYPTED_128K( "265-m1.bin", CRC(85aaa632) SHA1(744fba4ca3bc3a5873838af886efb97a8a316104) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) /* Encrypted */ ROM_LOAD( "265-v1.bin", 0x000000, 0x800000, CRC(15e8f3f5) SHA1(7c9e6426b9fa6db0158baa17a6485ffce057d889) ) ROM_LOAD( "265-v2.bin", 0x800000, 0x800000, CRC(da41d6f9) SHA1(a43021f1e58947dcbe3c8ca5283b20b649f0409d) ) @@ -6531,7 +6531,7 @@ ROM_START( kf2k2pla ) /* Encrypted */ NEO_BIOS_AUDIO_ENCRYPTED_128K( "265-m1.bin", CRC(85aaa632) SHA1(744fba4ca3bc3a5873838af886efb97a8a316104) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) /* Encrypted */ ROM_LOAD( "265-v1.bin", 0x000000, 0x800000, CRC(15e8f3f5) SHA1(7c9e6426b9fa6db0158baa17a6485ffce057d889) ) ROM_LOAD( "265-v2.bin", 0x800000, 0x800000, CRC(da41d6f9) SHA1(a43021f1e58947dcbe3c8ca5283b20b649f0409d) ) @@ -6560,7 +6560,7 @@ ROM_START( kf2k2mp ) /* Encrypted */ NEO_BIOS_AUDIO_ENCRYPTED_128K( "265-m1.bin", CRC(85aaa632) SHA1(744fba4ca3bc3a5873838af886efb97a8a316104) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) /* Encrypted */ ROM_LOAD( "265-v1.bin", 0x000000, 0x800000, CRC(15e8f3f5) SHA1(7c9e6426b9fa6db0158baa17a6485ffce057d889) ) ROM_LOAD( "265-v2.bin", 0x800000, 0x800000, CRC(da41d6f9) SHA1(a43021f1e58947dcbe3c8ca5283b20b649f0409d) ) @@ -6587,7 +6587,7 @@ ROM_START( kf2k2mp2 ) /* Encrypted */ NEO_BIOS_AUDIO_ENCRYPTED_128K( "265-m1.bin", CRC(85aaa632) SHA1(744fba4ca3bc3a5873838af886efb97a8a316104) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) /* Encrypted */ ROM_LOAD( "265-v1.bin", 0x000000, 0x800000, CRC(15e8f3f5) SHA1(7c9e6426b9fa6db0158baa17a6485ffce057d889) ) ROM_LOAD( "265-v2.bin", 0x800000, 0x800000, CRC(da41d6f9) SHA1(a43021f1e58947dcbe3c8ca5283b20b649f0409d) ) @@ -6617,7 +6617,7 @@ ROM_START( kof10th ) NEO_BIOS_AUDIO_128K( "kf10-m1.bin", CRC(f6fab859) SHA1(0184aa1394b9f9946d610278b53b846020dd88dc) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) ROM_LOAD( "kf10-v1.bin", 0x000000, 0x800000, CRC(0fc9a58d) SHA1(9d79ef00e2c2abd9f29af5521c2fbe5798bf336f) ) ROM_LOAD( "kf10-v2.bin", 0x800000, 0x800000, CRC(b8c475a4) SHA1(10caf9c69927a223445d2c4b147864c02ce520a8) ) @@ -6655,7 +6655,7 @@ ROM_START( kf10thep ) /* this is a hack of kof2002 much like the various korean NEO_BIOS_AUDIO_128K( "5008-m1.bin", CRC(5a47d9ad) SHA1(0197737934653acc6c97221660d789e9914f3578) ) //NEO_BIOS_AUDIO_128K( "5004-m1.bin", CRC(f6fab859) SHA1(0184aa1394b9f9946d610278b53b846020dd88dc) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) ROM_LOAD( "kf10-v1.bin", 0x000000, 0x800000, CRC(0fc9a58d) SHA1(9d79ef00e2c2abd9f29af5521c2fbe5798bf336f) ) ROM_LOAD( "kf10-v2.bin", 0x800000, 0x800000, CRC(b8c475a4) SHA1(10caf9c69927a223445d2c4b147864c02ce520a8) ) @@ -6689,7 +6689,7 @@ ROM_START( kf2k5uni ) NEO_BIOS_AUDIO_128K( "5006-m1.bin", CRC(9050bfe7) SHA1(765bf3d954f775231b7ef2504bb844cd0b29e3f7) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) ROM_LOAD( "kf10-v1.bin", 0x000000, 0x800000, CRC(0fc9a58d) SHA1(9d79ef00e2c2abd9f29af5521c2fbe5798bf336f) ) ROM_LOAD( "kf10-v2.bin", 0x800000, 0x800000, CRC(b8c475a4) SHA1(10caf9c69927a223445d2c4b147864c02ce520a8) ) @@ -6722,7 +6722,7 @@ ROM_START( kof2k4se ) NEO_BIOS_AUDIO_128K( "k2k4s-m1.bin", CRC(5a47d9ad) SHA1(0197737934653acc6c97221660d789e9914f3578) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) ROM_LOAD( "k2k4s-v2.bin", 0x000000, 0x800000, CRC(e4ddfb3f) SHA1(eb8220ab01c16cf9244b7f3f9912bec0db561b85) ) ROM_LOAD( "k2k4s-v1.bin", 0x800000, 0x800000, CRC(b887d287) SHA1(f593a5722df6f6fac023d189a739a117e976bb2f) ) @@ -6755,7 +6755,7 @@ ROM_START( matrimbl ) NEO_BIOS_AUDIO_128K( "mart-m1.bin", CRC(3ea96ab1) SHA1(e5053c4312f658faed2a34e38325a22ef792d384) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) ROM_LOAD( "mart-v1.bin", 0x000000, 0x400000, CRC(352b0a07) SHA1(19f7cc12f3f6d0fda9c7449816c4c32367447897) ) ROM_LOAD16_WORD_SWAP( "mart-v2.bin", 0x400000, 0x400000, CRC(1e9bd59e) SHA1(0f754e780d0ebb815a92a45ad55f85f6d0181b70) ) ROM_LOAD( "mart-v3.bin", 0x800000, 0x400000, CRC(e8362fcc) SHA1(42d558fd80cabe22a1c09a1fa75741afbcf46b7c) ) @@ -6792,7 +6792,7 @@ ROM_START( ms5plus ) /* Encrypted */ NEO_BIOS_AUDIO_ENCRYPTED_512K( "268-m1.bin", CRC(4a5a6e0e) SHA1(df0f660f2465e1db7be5adfcaf5e88ad61a74a42) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) /* Encrypted */ ROM_LOAD( "268-v1c.bin", 0x000000, 0x800000, CRC(ae31d60c) SHA1(c42285cf4e52fea74247860813e826df5aa7600a) ) ROM_LOAD( "268-v2c.bin", 0x800000, 0x800000, CRC(c40613ed) SHA1(af889570304e2867d7dfea1e94e388c06249fb67) ) @@ -6821,7 +6821,7 @@ ROM_START( pbobblenb ) NEO_BIOS_AUDIO_128K( "um1", CRC(f424368a) SHA1 (5e5bbcaeb82bed2ee17df08f005ca20ad1030723) ) - ROM_REGION( 0x380000, "ym", 0 ) + ROM_REGION( 0x380000, "ymsnd", 0 ) /* 0x000000-0x1fffff empty */ ROM_LOAD( "u8", 0x200000, 0x100000, CRC(0840cbc4) SHA1 (1adbd7aef44fa80832f63dfb8efdf69fd7256a57) ) ROM_LOAD( "u9", 0x300000, 0x080000, CRC(0a548948) SHA1 (e1e4afd17811cb60401c14fbcf0465035165f4fb) ) @@ -6857,7 +6857,7 @@ ROM_START( svcboot ) ROM_Y_ZOOM - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) ROM_LOAD16_WORD_SWAP( "svc-v2.bin", 0x000000, 0x400000, CRC(b5097287) SHA1(3ba3a9b5624879616382ed40337a3d9c50a0f314) ) ROM_LOAD16_WORD_SWAP( "svc-v1.bin", 0x400000, 0x400000, CRC(bd3a391f) SHA1(972bf09b75e99a683ee965bec93b0da8f15d72d9) ) ROM_LOAD16_WORD_SWAP( "svc-v4.bin", 0x800000, 0x400000, CRC(33fc0b37) SHA1(d61017d829f44c7df8795ba10c55c727d9972662) ) @@ -6894,7 +6894,7 @@ ROM_START( svcplus ) ROM_CONTINUE( 0x00000, 0x10000 ) ROM_COPY( "audiocpu", 0x00000, 0x10000, 0x10000 ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) ROM_LOAD16_WORD_SWAP( "svc-v2.bin", 0x000000, 0x400000, CRC(b5097287) SHA1(3ba3a9b5624879616382ed40337a3d9c50a0f314) ) ROM_LOAD16_WORD_SWAP( "svc-v1.bin", 0x400000, 0x400000, CRC(bd3a391f) SHA1(972bf09b75e99a683ee965bec93b0da8f15d72d9) ) ROM_LOAD16_WORD_SWAP( "svc-v4.bin", 0x800000, 0x400000, CRC(33fc0b37) SHA1(d61017d829f44c7df8795ba10c55c727d9972662) ) @@ -6936,7 +6936,7 @@ ROM_START( svcplusa ) ROM_Y_ZOOM - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) ROM_LOAD16_WORD_SWAP( "svc-v2.bin", 0x000000, 0x400000, CRC(b5097287) SHA1(3ba3a9b5624879616382ed40337a3d9c50a0f314) ) ROM_LOAD16_WORD_SWAP( "svc-v1.bin", 0x400000, 0x400000, CRC(bd3a391f) SHA1(972bf09b75e99a683ee965bec93b0da8f15d72d9) ) ROM_LOAD16_WORD_SWAP( "svc-v4.bin", 0x800000, 0x400000, CRC(33fc0b37) SHA1(d61017d829f44c7df8795ba10c55c727d9972662) ) @@ -6972,7 +6972,7 @@ ROM_START( svcsplus ) ROM_CONTINUE( 0x00000, 0x10000 ) ROM_COPY( "audiocpu", 0x00000, 0x10000, 0x10000 ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) ROM_LOAD16_WORD_SWAP( "svc-v2.bin", 0x000000, 0x400000, CRC(b5097287) SHA1(3ba3a9b5624879616382ed40337a3d9c50a0f314) ) ROM_LOAD16_WORD_SWAP( "svc-v1.bin", 0x400000, 0x400000, CRC(bd3a391f) SHA1(972bf09b75e99a683ee965bec93b0da8f15d72d9) ) ROM_LOAD16_WORD_SWAP( "svc-v4.bin", 0x800000, 0x400000, CRC(33fc0b37) SHA1(d61017d829f44c7df8795ba10c55c727d9972662) ) @@ -7002,7 +7002,7 @@ ROM_START( samsho5b ) NEO_BIOS_AUDIO_128K( "ssv-m1.bin", CRC(18114fb1) SHA1(016dc2f328340f3637a9bff373a20973df29f6b8) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) ROM_LOAD( "ssv-v1.bin", 0x000000, 0x400000, CRC(a3609761) SHA1(6dce1dbfd228c739b3716ae1cf08fd7f925d8650) ) ROM_LOAD( "ssv-v2.bin", 0x400000, 0x400000, CRC(cbd6ebd5) SHA1(00211be3fa32035b0947ac65920ea8acae7bfae2) ) ROM_LOAD( "ssv-v3.bin", 0x800000, 0x400000, CRC(6f1c2703) SHA1(8015df3d788cb7926ebbcda64a96964fe102ba27) ) @@ -7030,7 +7030,7 @@ ROM_START( kf2k3bl ) NEO_BIOS_AUDIO_128K( "2k3-m1.bin", CRC(3a4969ff) SHA1(2fc107a023a82053a8df63025829bcf12cee9610) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) /* Encrypted */ ROM_LOAD( "271-v1c.bin", 0x000000, 0x800000, CRC(ffa3f8c7) SHA1(7cf4a933973ca23b7f87c81151d8659e6ec4bd20) ) ROM_LOAD( "271-v2c.bin", 0x800000, 0x800000, CRC(5382c7d1) SHA1(1bf999705eda80ba1e7b0d6bdd010d9bfb18bd76) ) @@ -7059,7 +7059,7 @@ ROM_START( kf2k3bla ) NEO_BIOS_AUDIO_128K( "2k3-m1.bin", CRC(3a4969ff) SHA1(2fc107a023a82053a8df63025829bcf12cee9610) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) /* Encrypted */ ROM_LOAD( "271-v1c.bin", 0x000000, 0x800000, CRC(ffa3f8c7) SHA1(7cf4a933973ca23b7f87c81151d8659e6ec4bd20) ) ROM_LOAD( "271-v2c.bin", 0x800000, 0x800000, CRC(5382c7d1) SHA1(1bf999705eda80ba1e7b0d6bdd010d9bfb18bd76) ) @@ -7088,7 +7088,7 @@ ROM_START( kf2k3pl ) NEO_BIOS_AUDIO_128K( "2k3-m1.bin", CRC(3a4969ff) SHA1(2fc107a023a82053a8df63025829bcf12cee9610) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) /* Encrypted */ ROM_LOAD( "271-v1c.bin", 0x000000, 0x800000, CRC(ffa3f8c7) SHA1(7cf4a933973ca23b7f87c81151d8659e6ec4bd20) ) ROM_LOAD( "271-v2c.bin", 0x800000, 0x800000, CRC(5382c7d1) SHA1(1bf999705eda80ba1e7b0d6bdd010d9bfb18bd76) ) @@ -7115,7 +7115,7 @@ ROM_START( kf2k3upl ) NEO_BIOS_AUDIO_128K( "2k3-m1.bin", CRC(3a4969ff) SHA1(2fc107a023a82053a8df63025829bcf12cee9610) ) - ROM_REGION( 0x1000000, "ym", 0 ) + ROM_REGION( 0x1000000, "ymsnd", 0 ) /* Encrypted */ ROM_LOAD( "271-v1c.bin", 0x000000, 0x800000, CRC(ffa3f8c7) SHA1(7cf4a933973ca23b7f87c81151d8659e6ec4bd20) ) ROM_LOAD( "271-v2c.bin", 0x800000, 0x800000, CRC(5382c7d1) SHA1(1bf999705eda80ba1e7b0d6bdd010d9bfb18bd76) ) @@ -7146,7 +7146,7 @@ ROM_START( diggerma ) /* Unlicensed Prototype, no official game ID # */ NEO_BIOS_AUDIO_64K( "dig-m1.bin", CRC(833cdf1b) SHA1(3a92c79adbe0d37956ea46a4746d6f1cbf7d2c14) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "dig-v1.bin", 0x000000, 0x080000, CRC(ee15bda4) SHA1(fe2206728e6efd02d6302869a98b196eb19a17df) ) NO_DELTAT_REGION @@ -7206,7 +7206,7 @@ ROM_START( 98best44 ) ROM_LOAD( "pt004-m1", 0x00000, 0x20000, CRC(6d77cdaa) SHA1(f88a93b3085b18b6663b4e51fccaa41958aafae1) ) ROM_RELOAD( 0x10000, 0x20000 ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "pt004-v1", 0x000000, 0x200000, CRC(118a84fd) SHA1(9059297a42a329eca47a82327c301853219013bd) ) NO_DELTAT_REGION diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c index ed21e29c61f..752fe05d200 100644 --- a/src/mame/drivers/neogeo.c +++ b/src/mame/drivers/neogeo.c @@ -1167,7 +1167,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( auido_io_map, ADDRESS_SPACE_IO, 8 ) /*AM_RANGE(0x00, 0x00) AM_MIRROR(0xff00) AM_READWRITE(audio_command_r, audio_cpu_clear_nmi_w);*/ /* may not and NMI clear */ AM_RANGE(0x00, 0x00) AM_MIRROR(0xff00) AM_READ(audio_command_r) - AM_RANGE(0x04, 0x07) AM_MIRROR(0xff00) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) + AM_RANGE(0x04, 0x07) AM_MIRROR(0xff00) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) AM_RANGE(0x08, 0x08) AM_MIRROR(0xff00) /* write - NMI enable / acknowledge? (the data written doesn't matter) */ AM_RANGE(0x08, 0x08) AM_MIRROR(0xfff0) AM_MASK(0xfff0) AM_READ(audio_cpu_bank_select_f000_f7ff_r) AM_RANGE(0x09, 0x09) AM_MIRROR(0xfff0) AM_MASK(0xfff0) AM_READ(audio_cpu_bank_select_e000_efff_r) @@ -1337,7 +1337,7 @@ static MACHINE_DRIVER_START( neogeo ) /* audio hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, NEOGEO_YM2610_CLOCK) + MDRV_SOUND_ADD("ymsnd", YM2610, NEOGEO_YM2610_CLOCK) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.60) MDRV_SOUND_ROUTE(0, "rspeaker", 0.60) diff --git a/src/mame/drivers/nightgal.c b/src/mame/drivers/nightgal.c index 199e7852ae9..6a785290738 100644 --- a/src/mame/drivers/nightgal.c +++ b/src/mame/drivers/nightgal.c @@ -393,8 +393,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( nightgal_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x01,0x01) AM_DEVREAD("ay", ay8910_r) //ay read port - AM_RANGE(0x02,0x03) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x01,0x01) AM_DEVREAD("aysnd", ay8910_r) //ay read port + AM_RANGE(0x02,0x03) AM_DEVWRITE("aysnd", ay8910_data_address_w) // AM_RANGE(0x10,0x10) AM_WRITE(output_w) AM_RANGE(0x10,0x10) AM_READ_PORT("DSWC") AM_RANGE(0x11,0x11) AM_READ_PORT("SYSA") @@ -433,7 +433,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sexygal_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00,0x01) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x00,0x01) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) // AM_RANGE(0x10,0x10) AM_WRITE(output_w) AM_RANGE(0x10,0x10) AM_READ_PORT("DSWC") AM_RANGE(0x11,0x11) AM_READ_PORT("SYSA") @@ -722,7 +722,7 @@ static MACHINE_DRIVER_START( nightgal ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, MASTER_CLOCK / 8) + MDRV_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK / 8) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MACHINE_DRIVER_END @@ -739,9 +739,9 @@ static MACHINE_DRIVER_START( sexygal ) MDRV_CPU_PROGRAM_MAP(sexygal_nsc_map) MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) - MDRV_DEVICE_REMOVE("ay") + MDRV_DEVICE_REMOVE("aysnd") - MDRV_SOUND_ADD("ym", YM2203, MASTER_CLOCK / 8) + MDRV_SOUND_ADD("ymsnd", YM2203, MASTER_CLOCK / 8) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MACHINE_DRIVER_END diff --git a/src/mame/drivers/ninjaw.c b/src/mame/drivers/ninjaw.c index ec6e4ba24d8..2afafd2d953 100644 --- a/src/mame/drivers/ninjaw.c +++ b/src/mame/drivers/ninjaw.c @@ -477,7 +477,7 @@ static ADDRESS_MAP_START( ninjaw_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(10) AM_RANGE(0xc000, 0xdfff) AM_RAM - AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ym", ym2610_r,ym2610_w) + AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ymsnd", ym2610_r,ym2610_w) AM_RANGE(0xe200, 0xe200) AM_READNOP AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xe201, 0xe201) AM_READWRITE(taitosound_slave_comm_r,taitosound_slave_comm_w) AM_RANGE(0xe400, 0xe403) AM_WRITE(ninjaw_pancontrol) /* pan */ @@ -732,7 +732,7 @@ static MACHINE_DRIVER_START( ninjaw ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, 16000000/2) + MDRV_SOUND_ADD("ymsnd", YM2610, 16000000/2) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -805,7 +805,7 @@ static MACHINE_DRIVER_START( darius2 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, 16000000/2) + MDRV_SOUND_ADD("ymsnd", YM2610, 16000000/2) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -874,7 +874,7 @@ ROM_START( ninjaw ) // ROM_LOAD( "b31-01.28", 0x00000, 0x80000, CRC(8e8237a7) SHA1(3e181a153d9b4b7f6a620614ea9022285583a5b5) ) /* SCR (screen 3) */ // ROM_LOAD( "b31-02.29", 0x80000, 0x80000, CRC(4c3b4e33) SHA1(f99b379be1af085bf102d4d7cf35803e002fe80b) ) - ROM_REGION( 0x180000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x180000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b31-09.18", 0x000000, 0x80000, CRC(60a73382) SHA1(0ddeb86fcd4d19a58e62bf8564f996d17e36e5c5) ) ROM_LOAD( "b31-10.17", 0x080000, 0x80000, CRC(c6434aef) SHA1(3348ce87882e3f668aa85bbb517975ec1fc9b6fd) ) ROM_LOAD( "b31-11.16", 0x100000, 0x80000, CRC(8da531d4) SHA1(525dfab0a0729e9fb6f0e4c8187bf4ce16321b20) ) @@ -930,7 +930,7 @@ ROM_START( ninjawj ) // ROM_LOAD( "b31-01.28", 0x00000, 0x80000, CRC(8e8237a7) SHA1(3e181a153d9b4b7f6a620614ea9022285583a5b5) ) /* SCR (screen 3) */ // ROM_LOAD( "b31-02.29", 0x80000, 0x80000, CRC(4c3b4e33) SHA1(f99b379be1af085bf102d4d7cf35803e002fe80b) ) - ROM_REGION( 0x180000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x180000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b31-09.18", 0x000000, 0x80000, CRC(60a73382) SHA1(0ddeb86fcd4d19a58e62bf8564f996d17e36e5c5) ) ROM_LOAD( "b31-10.17", 0x080000, 0x80000, CRC(c6434aef) SHA1(3348ce87882e3f668aa85bbb517975ec1fc9b6fd) ) ROM_LOAD( "b31-11.16", 0x100000, 0x80000, CRC(8da531d4) SHA1(525dfab0a0729e9fb6f0e4c8187bf4ce16321b20) ) @@ -978,7 +978,7 @@ ROM_START( darius2 ) ROM_REGION( 0x100000, "gfx3", 0 ) ROM_COPY( "gfx1", 0x000000, 0x000000, 0x100000 ) /* SCR (screens 2+) */ - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c07-10.95", 0x00000, 0x80000, CRC(4bbe0ed9) SHA1(081b73c4e4d4fa548445e5548573099bcb1e9213) ) ROM_LOAD( "c07-11.96", 0x80000, 0x80000, CRC(3c815699) SHA1(0471ff5b0c0da905267f2cee52fd68c8661cccc9) ) diff --git a/src/mame/drivers/niyanpai.c b/src/mame/drivers/niyanpai.c index 6818b538408..9369e8544b8 100644 --- a/src/mame/drivers/niyanpai.c +++ b/src/mame/drivers/niyanpai.c @@ -404,7 +404,7 @@ static ADDRESS_MAP_START( niyanpai_sound_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x56, 0x56) AM_READWRITE(tmpz84c011_0_dir_pc_r, tmpz84c011_0_dir_pc_w) AM_RANGE(0x34, 0x34) AM_READWRITE(tmpz84c011_0_dir_pd_r, tmpz84c011_0_dir_pd_w) AM_RANGE(0x44, 0x44) AM_READWRITE(tmpz84c011_0_dir_pe_r, tmpz84c011_0_dir_pe_w) - AM_RANGE(0x80, 0x81) AM_DEVWRITE("ym", ym3812_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("ymsnd", ym3812_w) ADDRESS_MAP_END @@ -804,7 +804,7 @@ static MACHINE_DRIVER_START( niyanpai ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 4000000) + MDRV_SOUND_ADD("ymsnd", YM3812, 4000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70) MDRV_SOUND_ADD("dac1", DAC, 0) diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c index ac260052071..2e5bd6eee9e 100644 --- a/src/mame/drivers/nmg5.c +++ b/src/mame/drivers/nmg5.c @@ -347,7 +347,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_DEVWRITE("oki", oki_banking_w) - AM_RANGE(0x10, 0x11) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) + AM_RANGE(0x10, 0x11) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w) AM_RANGE(0x18, 0x18) AM_READ(soundlatch_r) AM_RANGE(0x1c, 0x1c) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) ADDRESS_MAP_END @@ -1009,7 +1009,7 @@ static MACHINE_DRIVER_START( nmg5 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 4000000) /* 4MHz */ + MDRV_SOUND_ADD("ymsnd", YM3812, 4000000) /* 4MHz */ MDRV_SOUND_CONFIG(ym3812_intf) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c index 482700dead2..99b4e30d33d 100644 --- a/src/mame/drivers/nmk16.c +++ b/src/mame/drivers/nmk16.c @@ -403,7 +403,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( tharrier_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) ADDRESS_MAP_END //Read input port 1 030c8/ BAD @@ -1084,7 +1084,7 @@ static WRITE8_HANDLER( raphero_sound_rombank_w ) static ADDRESS_MAP_START( raphero_sound_mem_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x0000, 0x7fff ) AM_ROM AM_RANGE( 0x8000, 0xbfff ) AM_READ( SMH_BANK(1) ) - AM_RANGE( 0xc000, 0xc001 ) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w ) + AM_RANGE( 0xc000, 0xc001 ) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w ) AM_RANGE( 0xc800, 0xc800 ) AM_DEVREADWRITE( "oki1", okim6295_r, okim6295_w ) AM_RANGE( 0xc808, 0xc808 ) AM_DEVREADWRITE( "oki2", okim6295_r, okim6295_w ) AM_RANGE( 0xc810, 0xc817 ) AM_WRITE( NMK112_okibank_w ) @@ -1105,7 +1105,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( macross2_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0x80, 0x80) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) AM_RANGE(0x88, 0x88) AM_DEVREADWRITE("oki2", okim6295_r, okim6295_w) AM_RANGE(0x90, 0x97) AM_WRITE(NMK112_okibank_w) @@ -3563,7 +3563,7 @@ static MACHINE_DRIVER_START( tharrier ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 1500000) + MDRV_SOUND_ADD("ymsnd", YM2203, 1500000) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(0, "mono", 0.50) MDRV_SOUND_ROUTE(1, "mono", 0.50) @@ -3609,7 +3609,7 @@ static MACHINE_DRIVER_START( manybloc ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 1500000) + MDRV_SOUND_ADD("ymsnd", YM2203, 1500000) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(0, "mono", 0.50) MDRV_SOUND_ROUTE(1, "mono", 0.50) @@ -3654,7 +3654,7 @@ static MACHINE_DRIVER_START( mustang ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 1500000) + MDRV_SOUND_ADD("ymsnd", YM2203, 1500000) MDRV_SOUND_CONFIG(ym2203_nmk004_interface) MDRV_SOUND_ROUTE(0, "mono", 0.50) MDRV_SOUND_ROUTE(1, "mono", 0.50) @@ -3733,7 +3733,7 @@ static MACHINE_DRIVER_START( bioship ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, BIOSHIP_CRYSTAL2 / 8) /* 1.5 Mhz (verified) */ + MDRV_SOUND_ADD("ymsnd", YM2203, BIOSHIP_CRYSTAL2 / 8) /* 1.5 Mhz (verified) */ MDRV_SOUND_CONFIG(ym2203_nmk004_interface) MDRV_SOUND_ROUTE(0, "mono", 0.50) MDRV_SOUND_ROUTE(1, "mono", 0.50) @@ -3777,7 +3777,7 @@ static MACHINE_DRIVER_START( vandyke ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, XTAL_12MHz/8) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2203_nmk004_interface) MDRV_SOUND_ROUTE(0, "mono", 0.50) MDRV_SOUND_ROUTE(1, "mono", 0.50) @@ -3857,7 +3857,7 @@ static MACHINE_DRIVER_START( acrobatm ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 1500000) /* (verified on pcb) */ + MDRV_SOUND_ADD("ymsnd", YM2203, 1500000) /* (verified on pcb) */ MDRV_SOUND_CONFIG(ym2203_nmk004_interface) MDRV_SOUND_ROUTE(0, "mono", 0.50) MDRV_SOUND_ROUTE(1, "mono", 0.50) @@ -3936,7 +3936,7 @@ static MACHINE_DRIVER_START( tdragon ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, XTAL_12MHz/8) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2203_nmk004_interface) MDRV_SOUND_ROUTE(0, "mono", 0.50) MDRV_SOUND_ROUTE(1, "mono", 0.50) @@ -4016,7 +4016,7 @@ static MACHINE_DRIVER_START( strahl ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 1500000) + MDRV_SOUND_ADD("ymsnd", YM2203, 1500000) MDRV_SOUND_CONFIG(ym2203_nmk004_interface) MDRV_SOUND_ROUTE(0, "mono", 0.50) MDRV_SOUND_ROUTE(1, "mono", 0.50) @@ -4061,7 +4061,7 @@ static MACHINE_DRIVER_START( hachamf ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 1500000) + MDRV_SOUND_ADD("ymsnd", YM2203, 1500000) MDRV_SOUND_CONFIG(ym2203_nmk004_interface) MDRV_SOUND_ROUTE(0, "mono", 0.50) MDRV_SOUND_ROUTE(1, "mono", 0.50) @@ -4105,7 +4105,7 @@ static MACHINE_DRIVER_START( macross ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 1500000) + MDRV_SOUND_ADD("ymsnd", YM2203, 1500000) MDRV_SOUND_CONFIG(ym2203_nmk004_interface) MDRV_SOUND_ROUTE(0, "mono", 0.50) MDRV_SOUND_ROUTE(1, "mono", 0.50) @@ -4149,7 +4149,7 @@ static MACHINE_DRIVER_START( blkheart ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, XTAL_12MHz/8 ) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8 ) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2203_nmk004_interface) MDRV_SOUND_ROUTE(0, "mono", 0.50) MDRV_SOUND_ROUTE(1, "mono", 0.50) @@ -4193,7 +4193,7 @@ static MACHINE_DRIVER_START( gunnail ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 1500000) + MDRV_SOUND_ADD("ymsnd", YM2203, 1500000) MDRV_SOUND_CONFIG(ym2203_nmk004_interface) MDRV_SOUND_ROUTE(0, "mono", 0.50) MDRV_SOUND_ROUTE(1, "mono", 0.50) @@ -4241,7 +4241,7 @@ static MACHINE_DRIVER_START( macross2 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 1500000) + MDRV_SOUND_ADD("ymsnd", YM2203, 1500000) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90) @@ -4286,7 +4286,7 @@ static MACHINE_DRIVER_START( tdragon2 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 1500000) + MDRV_SOUND_ADD("ymsnd", YM2203, 1500000) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) @@ -4330,7 +4330,7 @@ static MACHINE_DRIVER_START( raphero ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 1500000) + MDRV_SOUND_ADD("ymsnd", YM2203, 1500000) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90) @@ -4727,7 +4727,7 @@ static ADDRESS_MAP_START( afega_sound_cpu, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_ROM AM_RANGE(0xf000, 0xf7ff) AM_RAM // RAM AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r) // From Main CPU - AM_RANGE(0xf808, 0xf809) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) // YM2151 + AM_RANGE(0xf808, 0xf809) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) // YM2151 AM_RANGE(0xf80a, 0xf80a) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) // M6295 ADDRESS_MAP_END @@ -4879,7 +4879,7 @@ static MACHINE_DRIVER_START( stagger1 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, XTAL_4MHz) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_4MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(afega_ym2151_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 0.30) MDRV_SOUND_ROUTE(1, "rspeaker", 0.30) diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c index 31103574012..7a789fb8baf 100644 --- a/src/mame/drivers/nwk-tr.c +++ b/src/mame/drivers/nwk-tr.c @@ -909,7 +909,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_memmap, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_RAM /* Work RAM */ - AM_RANGE(0x200000, 0x200fff) AM_DEVREADWRITE("rf", rf5c400_r, rf5c400_w) /* Ricoh RF5C400 */ + AM_RANGE(0x200000, 0x200fff) AM_DEVREADWRITE("rfsnd", rf5c400_r, rf5c400_w) /* Ricoh RF5C400 */ AM_RANGE(0x300000, 0x30000f) AM_READWRITE(K056800_sound_r, K056800_sound_w) AM_RANGE(0x600000, 0x600001) AM_NOP ADDRESS_MAP_END @@ -1073,7 +1073,7 @@ static MACHINE_DRIVER_START( nwktr ) MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("rf", RF5C400, 16934400) // as per Guru readme above + MDRV_SOUND_ADD("rfsnd", RF5C400, 16934400) // as per Guru readme above MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -1124,7 +1124,7 @@ ROM_START(racingj) ROM_REGION(0x80000, "audiocpu", 0) /* 68k program roms */ ROM_LOAD16_WORD_SWAP( "676gna08.7s", 0x000000, 0x080000, CRC(8973f6f2) SHA1(f5648a7e0205f7e979ccacbb52936809ce14a184) ) - ROM_REGION(0x1000000, "rf", 0) /* other roms (textures?) */ + ROM_REGION(0x1000000, "rfsnd", 0) /* other roms (textures?) */ ROM_LOAD( "676a09.16p", 0x000000, 0x400000, CRC(f85c8dc6) SHA1(8b302c80be309b5cc68b75945fcd7b87a56a4c9b) ) ROM_LOAD( "676a10.14p", 0x400000, 0x400000, CRC(7b5b7828) SHA1(aec224d62e4b1e8fdb929d7947ce70d84ba676cf) ) @@ -1148,7 +1148,7 @@ ROM_START(racingj2) ROM_REGION(0x80000, "audiocpu", 0) /* 68k program roms */ ROM_LOAD16_WORD_SWAP( "888a08.7s", 0x000000, 0x080000, CRC(55fbea65) SHA1(ad953f758181731efccadcabc4326e6634c359e8) ) - ROM_REGION(0x1000000, "rf", 0) /* PCM sample roms */ + ROM_REGION(0x1000000, "rfsnd", 0) /* PCM sample roms */ ROM_LOAD( "888a09.16p", 0x000000, 0x400000, CRC(11e2fed2) SHA1(24b8a367b59fedb62c56f066342f2fa87b135fc5) ) ROM_LOAD( "888a10.14p", 0x400000, 0x400000, CRC(328ce610) SHA1(dbbc779a1890c53298c0db129d496df048929496) ) @@ -1171,7 +1171,7 @@ ROM_START(thrilld) ROM_REGION(0x80000, "audiocpu", 0) /* 68k program roms */ ROM_LOAD16_WORD_SWAP( "713a08.7s", 0x000000, 0x080000, CRC(6a72a825) SHA1(abeac99c5343efacabcb0cdff6d34f9f967024db) ) - ROM_REGION(0x1000000, "rf", 0) /* PCM sample roms */ + ROM_REGION(0x1000000, "rfsnd", 0) /* PCM sample roms */ ROM_LOAD( "713a09.16p", 0x000000, 0x400000, CRC(058f250a) SHA1(63b8e60004ec49009633e86b4992c00083def9a8) ) ROM_LOAD( "713a10.14p", 0x400000, 0x400000, CRC(27f9833e) SHA1(1540f00d2571ecb81b914c553682b67fca94bbbd) ) diff --git a/src/mame/drivers/ojankohs.c b/src/mame/drivers/ojankohs.c index 92027ceb3e3..76dba45813f 100644 --- a/src/mame/drivers/ojankohs.c +++ b/src/mame/drivers/ojankohs.c @@ -254,8 +254,8 @@ static ADDRESS_MAP_START( ojankohs_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x03, 0x03) AM_DEVWRITE("msm", ojankohs_adpcm_reset_w) AM_RANGE(0x04, 0x04) AM_WRITE(ojankohs_flipscreen_w) AM_RANGE(0x05, 0x05) AM_WRITE(ojankohs_msm5205_w) - AM_RANGE(0x06, 0x06) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x06, 0x07) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x06, 0x06) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x06, 0x07) AM_DEVWRITE("aysnd", ay8910_data_address_w) AM_RANGE(0x10, 0x10) AM_WRITENOP // unknown AM_RANGE(0x11, 0x11) AM_WRITENOP // unknown ADDRESS_MAP_END @@ -267,8 +267,8 @@ static ADDRESS_MAP_START( ojankoy_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x02, 0x02) AM_READ_PORT("IN1") AM_WRITE(ojankoy_coinctr_w) AM_RANGE(0x04, 0x04) AM_WRITE(ojankohs_flipscreen_w) AM_RANGE(0x05, 0x05) AM_WRITE(ojankohs_msm5205_w) - AM_RANGE(0x06, 0x06) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x06, 0x07) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x06, 0x06) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x06, 0x07) AM_DEVWRITE("aysnd", ay8910_data_address_w) ADDRESS_MAP_END static ADDRESS_MAP_START( ccasino_io_map, ADDRESS_SPACE_IO, 8 ) @@ -279,8 +279,8 @@ static ADDRESS_MAP_START( ccasino_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x03, 0x03) AM_READ(ccasino_dipsw3_r) AM_DEVWRITE("msm", ojankohs_adpcm_reset_w) AM_RANGE(0x04, 0x04) AM_READWRITE(ccasino_dipsw4_r, ojankohs_flipscreen_w) AM_RANGE(0x05, 0x05) AM_WRITE(ojankohs_msm5205_w) - AM_RANGE(0x06, 0x06) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x06, 0x07) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x06, 0x06) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x06, 0x07) AM_DEVWRITE("aysnd", ay8910_data_address_w) AM_RANGE(0x08, 0x0f) AM_WRITE(ccasino_palette_w) // 16bit address access AM_RANGE(0x10, 0x10) AM_WRITENOP AM_RANGE(0x11, 0x11) AM_WRITENOP @@ -293,8 +293,8 @@ static ADDRESS_MAP_START( ojankoc_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xfb, 0xfb) AM_WRITE(ojankoc_ctrl_w) AM_RANGE(0xfc, 0xfd) AM_READ(ojankoc_keymatrix_r) AM_RANGE(0xfd, 0xfd) AM_WRITE(ojankohs_portselect_w) - AM_RANGE(0xfe, 0xff) AM_DEVWRITE("ay", ay8910_data_address_w) - AM_RANGE(0xff, 0xff) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0xfe, 0xff) AM_DEVWRITE("aysnd", ay8910_data_address_w) + AM_RANGE(0xff, 0xff) AM_DEVREAD("aysnd", ay8910_r) ADDRESS_MAP_END @@ -843,7 +843,7 @@ static MACHINE_DRIVER_START( ojankohs ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 12000000/6) + MDRV_SOUND_ADD("aysnd", AY8910, 12000000/6) MDRV_SOUND_CONFIG(ojankohs_ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) @@ -881,7 +881,7 @@ static MACHINE_DRIVER_START( ojankoy ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 12000000/8) + MDRV_SOUND_ADD("aysnd", AY8910, 12000000/8) MDRV_SOUND_CONFIG(ojankoy_ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) @@ -918,7 +918,7 @@ static MACHINE_DRIVER_START( ccasino ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 12000000/8) + MDRV_SOUND_ADD("aysnd", AY8910, 12000000/8) MDRV_SOUND_CONFIG(ojankoy_ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) @@ -954,7 +954,7 @@ static MACHINE_DRIVER_START( ojankoc ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 8000000/4) + MDRV_SOUND_ADD("aysnd", AY8910, 8000000/4) MDRV_SOUND_CONFIG(ojankoc_ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c index efa3b79606d..38c7e959d9a 100644 --- a/src/mame/drivers/olibochu.c +++ b/src/mame/drivers/olibochu.c @@ -239,7 +239,7 @@ static ADDRESS_MAP_START( olibochu_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x6000, 0x63ff) AM_RAM AM_RANGE(0x7000, 0x7000) AM_READ(soundlatch_r) /* likely ay8910 input port, not direct */ - AM_RANGE(0x7000, 0x7001) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x7000, 0x7001) AM_DEVWRITE("aysnd", ay8910_address_data_w) AM_RANGE(0x7004, 0x7004) AM_WRITENOP //sound filter? AM_RANGE(0x7006, 0x7006) AM_WRITENOP //irq ack? ADDRESS_MAP_END @@ -424,7 +424,7 @@ static MACHINE_DRIVER_START( olibochu ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 2000000) + MDRV_SOUND_ADD("aysnd", AY8910, 2000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/oneshot.c b/src/mame/drivers/oneshot.c index 725cb2428c4..3492ec16057 100644 --- a/src/mame/drivers/oneshot.c +++ b/src/mame/drivers/oneshot.c @@ -134,7 +134,7 @@ static ADDRESS_MAP_START( oneshot_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x8000) AM_READWRITE(soundlatch_r,soundlatch_w) AM_RANGE(0x8001, 0x87ff) AM_RAM - AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE("ym", ym3812_r,ym3812_w) + AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE("ymsnd", ym3812_r,ym3812_w) AM_RANGE(0xe010, 0xe010) AM_DEVREADWRITE("oki", okim6295_r,okim6295_w) ADDRESS_MAP_END @@ -372,7 +372,7 @@ static MACHINE_DRIVER_START( oneshot ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 3500000) + MDRV_SOUND_ADD("ymsnd", YM3812, 3500000) MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) @@ -439,7 +439,7 @@ ROM_START( maddonna ) /* no samples for this game */ ROM_REGION( 0x10000, "user1", 0 ) - ROM_LOAD( "x1", 0x00000, 0x10000, CRC(6b213183) SHA1(599c59d155d11edb151bfaed1d24ef964462a447) ) // motherboard rom, zooming? + ROM_LOAD( "x1snd", 0x00000, 0x10000, CRC(6b213183) SHA1(599c59d155d11edb151bfaed1d24ef964462a447) ) // motherboard rom, zooming? ROM_END ROM_START( maddonnb ) @@ -465,7 +465,7 @@ ROM_START( maddonnb ) /* no samples for this game */ ROM_REGION( 0x10000, "user1", 0 ) - ROM_LOAD( "x1", 0x00000, 0x10000, CRC(6b213183) SHA1(599c59d155d11edb151bfaed1d24ef964462a447) ) // motherboard rom, zooming? + ROM_LOAD( "x1snd", 0x00000, 0x10000, CRC(6b213183) SHA1(599c59d155d11edb151bfaed1d24ef964462a447) ) // motherboard rom, zooming? ROM_END diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c index 9150832566a..2f0336782a4 100644 --- a/src/mame/drivers/onetwo.c +++ b/src/mame/drivers/onetwo.c @@ -136,8 +136,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_cpu_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ym", ym3812_status_port_r, ym3812_control_port_w) - AM_RANGE(0x20, 0x20) AM_DEVWRITE("ym", ym3812_write_port_w) + AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ymsnd", ym3812_status_port_r, ym3812_control_port_w) + AM_RANGE(0x20, 0x20) AM_DEVWRITE("ymsnd", ym3812_write_port_w) AM_RANGE(0x40, 0x40) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xc0, 0xc0) AM_WRITE(soundlatch_clear_w) ADDRESS_MAP_END @@ -304,7 +304,7 @@ static MACHINE_DRIVER_START( onetwo ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, MASTER_CLOCK) + MDRV_SOUND_ADD("ymsnd", YM3812, MASTER_CLOCK) MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/drivers/opwolf.c b/src/mame/drivers/opwolf.c index eb434a33e54..c3bba197b67 100644 --- a/src/mame/drivers/opwolf.c +++ b/src/mame/drivers/opwolf.c @@ -536,7 +536,7 @@ static ADDRESS_MAP_START( opwolf_sound_z80_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(10) AM_RANGE(0x8000, 0x8fff) AM_RAM - AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ym", ym2151_r,ym2151_w) + AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2151_r,ym2151_w) AM_RANGE(0x9002, 0x9100) AM_READNOP AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xa001, 0xa001) AM_READWRITE(taitosound_slave_comm_r,taitosound_slave_comm_w) @@ -741,7 +741,7 @@ static MACHINE_DRIVER_START( opwolf ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, SOUND_CPU_CLOCK ) /* 4 MHz */ + MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CPU_CLOCK ) /* 4 MHz */ MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.75) MDRV_SOUND_ROUTE(1, "rspeaker", 0.75) @@ -793,7 +793,7 @@ static MACHINE_DRIVER_START( opwolfb ) /* OSC clocks unknown for the bootleg, bu /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, SOUND_CPU_CLOCK ) + MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CPU_CLOCK ) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.75) MDRV_SOUND_ROUTE(1, "rspeaker", 0.75) diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c index bac5ca2bdd3..c0dd2c2aca9 100644 --- a/src/mame/drivers/othunder.c +++ b/src/mame/drivers/othunder.c @@ -518,7 +518,7 @@ static ADDRESS_MAP_START( z80_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(10) AM_RANGE(0xc000, 0xdfff) AM_RAM - AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) + AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) AM_RANGE(0xe200, 0xe200) AM_READWRITE(SMH_NOP, taitosound_slave_port_w) AM_RANGE(0xe201, 0xe201) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w) AM_RANGE(0xe400, 0xe403) AM_WRITE(othunder_TC0310FAM_w) /* pan */ @@ -719,7 +719,7 @@ static MACHINE_DRIVER_START( othunder ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, 16000000/2) + MDRV_SOUND_ADD("ymsnd", YM2610, 16000000/2) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "2610.0l", 0.25) MDRV_SOUND_ROUTE(0, "2610.0r", 0.25) @@ -771,7 +771,7 @@ ROM_START( othunder ) ROM_REGION16_LE( 0x80000, "user1", 0 ) ROM_LOAD16_WORD( "b67-05.43", 0x00000, 0x80000, CRC(9593e42b) SHA1(54b5538c302a1734ff4b752ab87a8c45d5c6b23d) ) /* index used to create 64x64 sprites on the fly */ - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b67-08", 0x00000, 0x80000, CRC(458f41fb) SHA1(acca7c95acd1ae7a1cc51fb7fe644ad6d00ff5ac) ) ROM_REGION( 0x80000, "ym.deltat", 0 ) /* Delta-T samples */ @@ -807,7 +807,7 @@ ROM_START( othunderu ) ROM_REGION16_LE( 0x80000, "user1", 0 ) ROM_LOAD16_WORD( "b67-05.43", 0x00000, 0x80000, CRC(9593e42b) SHA1(54b5538c302a1734ff4b752ab87a8c45d5c6b23d) ) /* index used to create 64x64 sprites on the fly */ - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b67-08", 0x00000, 0x80000, CRC(458f41fb) SHA1(acca7c95acd1ae7a1cc51fb7fe644ad6d00ff5ac) ) ROM_REGION( 0x80000, "ym.deltat", 0 ) /* Delta-T samples */ @@ -843,7 +843,7 @@ ROM_START( othunderuo ) ROM_REGION16_LE( 0x80000, "user1", 0 ) ROM_LOAD16_WORD( "b67-05.43", 0x00000, 0x80000, CRC(9593e42b) SHA1(54b5538c302a1734ff4b752ab87a8c45d5c6b23d) ) /* index used to create 64x64 sprites on the fly */ - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b67-08", 0x00000, 0x80000, CRC(458f41fb) SHA1(acca7c95acd1ae7a1cc51fb7fe644ad6d00ff5ac) ) ROM_REGION( 0x80000, "ym.deltat", 0 ) /* Delta-T samples */ @@ -879,7 +879,7 @@ ROM_START( othunderj ) ROM_REGION16_LE( 0x80000, "user1", 0 ) ROM_LOAD16_WORD( "b67-05.43", 0x00000, 0x80000, CRC(9593e42b) SHA1(54b5538c302a1734ff4b752ab87a8c45d5c6b23d) ) /* index used to create 64x64 sprites on the fly */ - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b67-08", 0x00000, 0x80000, CRC(458f41fb) SHA1(acca7c95acd1ae7a1cc51fb7fe644ad6d00ff5ac) ) ROM_REGION( 0x80000, "ym.deltat", 0 ) /* Delta-T samples */ diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c index 55078195c54..e703ce58485 100644 --- a/src/mame/drivers/overdriv.c +++ b/src/mame/drivers/overdriv.c @@ -266,7 +266,7 @@ static ADDRESS_MAP_START( overdriv_slave_map, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( overdriv_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0200, 0x0201) AM_DEVREADWRITE("ym", ym2151_r,ym2151_w) + AM_RANGE(0x0200, 0x0201) AM_DEVREADWRITE("ymsnd", ym2151_r,ym2151_w) AM_RANGE(0x0400, 0x042f) AM_DEVREADWRITE("konami1", k053260_r,k053260_w) AM_RANGE(0x0600, 0x062f) AM_DEVREADWRITE("konami2", k053260_r,k053260_w) AM_RANGE(0x0800, 0x0fff) AM_RAM @@ -371,7 +371,7 @@ static MACHINE_DRIVER_START( overdriv ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) MDRV_SOUND_ROUTE(0, "lspeaker", 0.5) MDRV_SOUND_ROUTE(1, "rspeaker", 0.5) diff --git a/src/mame/drivers/pandoras.c b/src/mame/drivers/pandoras.c index c28bdc2aff8..2073876007e 100644 --- a/src/mame/drivers/pandoras.c +++ b/src/mame/drivers/pandoras.c @@ -162,9 +162,9 @@ static ADDRESS_MAP_START( pandoras_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM /* ROM */ AM_RANGE(0x2000, 0x23ff) AM_RAM /* RAM */ AM_RANGE(0x4000, 0x4000) AM_READ(soundlatch_r) /* soundlatch_r */ - AM_RANGE(0x6000, 0x6000) AM_DEVWRITE("ay", ay8910_address_w) /* AY-8910 */ - AM_RANGE(0x6001, 0x6001) AM_DEVREAD("ay", ay8910_r) /* AY-8910 */ - AM_RANGE(0x6002, 0x6002) AM_DEVWRITE("ay", ay8910_data_w) /* AY-8910 */ + AM_RANGE(0x6000, 0x6000) AM_DEVWRITE("aysnd", ay8910_address_w) /* AY-8910 */ + AM_RANGE(0x6001, 0x6001) AM_DEVREAD("aysnd", ay8910_r) /* AY-8910 */ + AM_RANGE(0x6002, 0x6002) AM_DEVWRITE("aysnd", ay8910_data_w) /* AY-8910 */ AM_RANGE(0x8000, 0x8000) AM_WRITE(pandoras_i8039_irqtrigger_w) /* cause INT on the 8039 */ AM_RANGE(0xa000, 0xa000) AM_WRITE(soundlatch2_w) /* sound command to the 8039 */ ADDRESS_MAP_END @@ -355,7 +355,7 @@ static MACHINE_DRIVER_START( pandoras ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 14318000/8) + MDRV_SOUND_ADD("aysnd", AY8910, 14318000/8) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) diff --git a/src/mame/drivers/panicr.c b/src/mame/drivers/panicr.c index 889c48569ee..fedd0045ac9 100644 --- a/src/mame/drivers/panicr.c +++ b/src/mame/drivers/panicr.c @@ -386,7 +386,7 @@ static MACHINE_DRIVER_START( panicr ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK/4) /* 3.579545 MHz */ + MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK/4) /* 3.579545 MHz */ MDRV_SOUND_CONFIG(t5182_ym2151_interface) MDRV_SOUND_ROUTE(0, "mono", 1.0) MDRV_SOUND_ROUTE(1, "mono", 1.0) diff --git a/src/mame/drivers/parodius.c b/src/mame/drivers/parodius.c index 7b311a548de..2a79b6ada33 100644 --- a/src/mame/drivers/parodius.c +++ b/src/mame/drivers/parodius.c @@ -152,7 +152,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( parodius_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_ROM AM_RANGE(0xf000, 0xf7ff) AM_RAM - AM_RANGE(0xf800, 0xf801) AM_DEVREADWRITE("ym", ym2151_r,ym2151_w) + AM_RANGE(0xf800, 0xf801) AM_DEVREADWRITE("ymsnd", ym2151_r,ym2151_w) AM_RANGE(0xfa00, 0xfa00) AM_WRITE(sound_arm_nmi_w) AM_RANGE(0xfc00, 0xfc2f) AM_DEVREADWRITE("konami", k053260_r,k053260_w) ADDRESS_MAP_END @@ -254,7 +254,7 @@ static MACHINE_DRIVER_START( parodius ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/pass.c b/src/mame/drivers/pass.c index 389ea04ecbd..b206f74cc0f 100644 --- a/src/mame/drivers/pass.c +++ b/src/mame/drivers/pass.c @@ -138,7 +138,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( pass_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READ(soundlatch_r) - AM_RANGE(0x70, 0x71) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x70, 0x71) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0x80, 0x80) AM_DEVWRITE("oki", okim6295_w) AM_RANGE(0xc0, 0xc0) AM_WRITE(soundlatch_clear_w) ADDRESS_MAP_END @@ -269,7 +269,7 @@ static MACHINE_DRIVER_START( pass ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 14318180/4) + MDRV_SOUND_ADD("ymsnd", YM2203, 14318180/4) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) MDRV_SOUND_ADD("oki", OKIM6295, 792000) diff --git a/src/mame/drivers/pastelg.c b/src/mame/drivers/pastelg.c index 887f90570e8..613a5369b04 100644 --- a/src/mame/drivers/pastelg.c +++ b/src/mame/drivers/pastelg.c @@ -68,8 +68,8 @@ static ADDRESS_MAP_START( pastelg_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) // AM_RANGE(0x00, 0x00) AM_WRITENOP AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r) - AM_RANGE(0x81, 0x81) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x82, 0x83) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x81, 0x81) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x82, 0x83) AM_DEVWRITE("aysnd", ay8910_data_address_w) AM_RANGE(0x90, 0x90) AM_READ_PORT("SYSTEM") AM_RANGE(0x90, 0x96) AM_WRITE(pastelg_blitter_w) AM_RANGE(0xa0, 0xa0) AM_READWRITE(nb1413m3_inputport1_r, nb1413m3_inputportsel_w) @@ -117,8 +117,8 @@ static WRITE8_HANDLER( threeds_inputportsel_w ) static ADDRESS_MAP_START( threeds_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x81, 0x81) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x82, 0x83) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x81, 0x81) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x82, 0x83) AM_DEVWRITE("aysnd", ay8910_data_address_w) AM_RANGE(0x90, 0x90) AM_READ_PORT("SYSTEM") AM_WRITE( threeds_romsel_w ) AM_RANGE(0xf0, 0xf6) AM_WRITE(pastelg_blitter_w) AM_RANGE(0xa0, 0xa0) AM_READWRITE(threeds_inputport1_r, threeds_inputportsel_w) @@ -426,7 +426,7 @@ static MACHINE_DRIVER_START( pastelg ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 1250000) + MDRV_SOUND_ADD("aysnd", AY8910, 1250000) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35) @@ -485,7 +485,7 @@ static MACHINE_DRIVER_START( threeds ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 1250000) + MDRV_SOUND_ADD("aysnd", AY8910, 1250000) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35) diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c index 44acb532f2f..90aee97c12e 100644 --- a/src/mame/drivers/peplus.c +++ b/src/mame/drivers/peplus.c @@ -741,8 +741,8 @@ static ADDRESS_MAP_START( peplus_iomap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x3000, 0x3fff) AM_READWRITE(peplus_s3000_r, peplus_s3000_w) AM_BASE(&s3000_ram) // Sound and Dipswitches - AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("ay", ay8910_address_w) - AM_RANGE(0x4004, 0x4004) AM_READ_PORT("SW1")/* likely ay8910 input port, not direct */ AM_DEVWRITE("ay", ay8910_data_w) + AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("aysnd", ay8910_address_w) + AM_RANGE(0x4004, 0x4004) AM_READ_PORT("SW1")/* likely ay8910 input port, not direct */ AM_DEVWRITE("aysnd", ay8910_data_w) // Superboard Data AM_RANGE(0x5000, 0x5fff) AM_READWRITE(peplus_s5000_r, peplus_s5000_w) AM_BASE(&s5000_ram) @@ -1045,7 +1045,7 @@ static MACHINE_DRIVER_START( peplus ) // sound hardware MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8912, SOUND_CLOCK) + MDRV_SOUND_ADD("aysnd", AY8912, SOUND_CLOCK) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) MACHINE_DRIVER_END diff --git a/src/mame/drivers/phoenix.c b/src/mame/drivers/phoenix.c index b1279e5f525..5b69ec03e98 100644 --- a/src/mame/drivers/phoenix.c +++ b/src/mame/drivers/phoenix.c @@ -64,8 +64,8 @@ static ADDRESS_MAP_START( survival_memory_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4000, 0x4fff) AM_READWRITE(SMH_BANK(1), phoenix_videoram_w) /* 2 pages selected by bit 0 of the video register */ AM_RANGE(0x5000, 0x53ff) AM_WRITE(phoenix_videoreg_w) AM_RANGE(0x5800, 0x5bff) AM_WRITE(phoenix_scroll_w) - AM_RANGE(0x6800, 0x68ff) AM_DEVWRITE("ay", ay8910_address_w) - AM_RANGE(0x6900, 0x69ff) AM_DEVREADWRITE("ay", ay8910_r, ay8910_data_w) + AM_RANGE(0x6800, 0x68ff) AM_DEVWRITE("aysnd", ay8910_address_w) + AM_RANGE(0x6900, 0x69ff) AM_DEVREADWRITE("aysnd", ay8910_r, ay8910_data_w) AM_RANGE(0x7000, 0x73ff) AM_READ(survival_input_port_0_r) /* IN0 or IN1 */ AM_RANGE(0x7800, 0x7bff) AM_READ_PORT("DSW0") /* DSW */ ADDRESS_MAP_END @@ -550,7 +550,7 @@ static MACHINE_DRIVER_START( survival ) MDRV_SPEAKER_STANDARD_MONO("mono") /* FIXME: check clock */ - MDRV_SOUND_ADD("ay", AY8910, 11000000/4) + MDRV_SOUND_ADD("aysnd", AY8910, 11000000/4) MDRV_SOUND_CONFIG(survival_ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/pingpong.c b/src/mame/drivers/pingpong.c index e817ee894d7..1d835f49820 100644 --- a/src/mame/drivers/pingpong.c +++ b/src/mame/drivers/pingpong.c @@ -104,7 +104,7 @@ static ADDRESS_MAP_START( pingpong_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa980, 0xa980) AM_READ_PORT("DSW2") AM_RANGE(0xa000, 0xa000) AM_WRITE(coin_w) /* coin counters + irq enables */ AM_RANGE(0xa200, 0xa200) AM_WRITENOP /* SN76496 data latch */ - AM_RANGE(0xa400, 0xa400) AM_DEVWRITE("sn", sn76496_w) /* trigger read */ + AM_RANGE(0xa400, 0xa400) AM_DEVWRITE("snsnd", sn76496_w) /* trigger read */ AM_RANGE(0xa600, 0xa600) AM_WRITE(watchdog_reset_w) ADDRESS_MAP_END @@ -125,7 +125,7 @@ static ADDRESS_MAP_START( merlinmm_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa100, 0xa100) AM_READ_PORT("IN2") AM_RANGE(0xa180, 0xa180) AM_READ_PORT("IN3") AM_RANGE(0xa200, 0xa200) AM_WRITENOP /* SN76496 data latch */ - AM_RANGE(0xa400, 0xa400) AM_DEVWRITE("sn", sn76496_w) /* trigger read */ + AM_RANGE(0xa400, 0xa400) AM_DEVWRITE("snsnd", sn76496_w) /* trigger read */ AM_RANGE(0xa600, 0xa600) AM_WRITE(watchdog_reset_w) ADDRESS_MAP_END @@ -478,7 +478,7 @@ static MACHINE_DRIVER_START( pingpong ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("sn", SN76496, 18432000/8) + MDRV_SOUND_ADD("snsnd", SN76496, 18432000/8) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/pipedrm.c b/src/mame/drivers/pipedrm.c index d98cb9f0ca5..3d6a587513a 100644 --- a/src/mame/drivers/pipedrm.c +++ b/src/mame/drivers/pipedrm.c @@ -322,13 +322,13 @@ 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, 0x1b) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) + AM_RANGE(0x18, 0x1b) AM_DEVREADWRITE("ymsnd", 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(0x00, 0x03) AM_MIRROR(0x08) AM_DEVREADWRITE("ym", ym2608_r, ym2608_w) + AM_RANGE(0x00, 0x03) AM_MIRROR(0x08) AM_DEVREADWRITE("ymsnd", 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) ADDRESS_MAP_END @@ -634,7 +634,7 @@ static MACHINE_DRIVER_START( pipedrm ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "mono", 0.50) MDRV_SOUND_ROUTE(1, "mono", 1.0) @@ -673,7 +673,7 @@ static MACHINE_DRIVER_START( hatris ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2608, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2608, 8000000) MDRV_SOUND_CONFIG(ym2608_config) MDRV_SOUND_ROUTE(0, "mono", 0.50) MDRV_SOUND_ROUTE(1, "mono", 1.0) @@ -709,7 +709,7 @@ ROM_START( pipedrm ) ROM_LOAD16_BYTE( "a30.u12", 0x00000, 0x40000, CRC(50bc5e98) SHA1(b351af780d04e67a560935a9eeaedf597ac5bb1f) ) ROM_LOAD16_BYTE( "a29.u2", 0x00001, 0x40000, CRC(a240a448) SHA1(d64169258e91eb09e8685bcdd96b16bf56e82ef1) ) - ROM_REGION( 0x80000, "ym", 0 ) + ROM_REGION( 0x80000, "ymsnd", 0 ) ROM_LOAD( "g71.u118", 0x00000, 0x80000, CRC(488e2fd1) SHA1(8ef8ceb2bd36a245138802f51babf62f17c30942) ) ROM_REGION( 0x80000, "ym.deltat", 0 ) @@ -743,7 +743,7 @@ ROM_START( pipedrmu ) ROM_LOAD16_BYTE( "a30.u12", 0x00000, 0x40000, CRC(50bc5e98) SHA1(b351af780d04e67a560935a9eeaedf597ac5bb1f) ) ROM_LOAD16_BYTE( "a29.u2", 0x00001, 0x40000, CRC(a240a448) SHA1(d64169258e91eb09e8685bcdd96b16bf56e82ef1) ) - ROM_REGION( 0x80000, "ym", 0 ) + ROM_REGION( 0x80000, "ymsnd", 0 ) ROM_LOAD( "g71.u118", 0x00000, 0x80000, CRC(488e2fd1) SHA1(8ef8ceb2bd36a245138802f51babf62f17c30942) ) ROM_REGION( 0x80000, "ym.deltat", 0 ) @@ -778,7 +778,7 @@ ROM_START( pipedrmj ) ROM_LOAD16_BYTE( "a30.u12", 0x00000, 0x40000, CRC(50bc5e98) SHA1(b351af780d04e67a560935a9eeaedf597ac5bb1f) ) ROM_LOAD16_BYTE( "a29.u2", 0x00001, 0x40000, CRC(a240a448) SHA1(d64169258e91eb09e8685bcdd96b16bf56e82ef1) ) - ROM_REGION( 0x80000, "ym", 0 ) + ROM_REGION( 0x80000, "ymsnd", 0 ) ROM_LOAD( "g71.u118", 0x00000, 0x80000, CRC(488e2fd1) SHA1(8ef8ceb2bd36a245138802f51babf62f17c30942) ) ROM_REGION( 0x80000, "ym.deltat", 0 ) @@ -809,7 +809,7 @@ ROM_START( hatris ) ROM_LOAD( "a0-ic55.bin", 0x00000, 0x20000, CRC(7b7bc619) SHA1(b661c772e33aa7352dcdc20c4a9a84ed25ff89d7) ) ROM_LOAD( "a1-ic60.bin", 0x20000, 0x20000, CRC(f74d4168) SHA1(9ac433c4ce61fe402334aa97d32a51cfac634c46) ) - ROM_REGION( 0x20000, "ym", 0 ) + ROM_REGION( 0x20000, "ymsnd", 0 ) ROM_LOAD( "pc-ic53.bin", 0x00000, 0x20000, CRC(07147712) SHA1(97692186e85f3a4a19dbd1bd95ed882e903a3c4a) ) ROM_END @@ -831,7 +831,7 @@ ROM_START( hatrisj ) ROM_LOAD( "a0-ic55.bin", 0x00000, 0x20000, CRC(7b7bc619) SHA1(b661c772e33aa7352dcdc20c4a9a84ed25ff89d7) ) ROM_LOAD( "a1-ic60.bin", 0x20000, 0x20000, CRC(f74d4168) SHA1(9ac433c4ce61fe402334aa97d32a51cfac634c46) ) - ROM_REGION( 0x20000, "ym", 0 ) + ROM_REGION( 0x20000, "ymsnd", 0 ) ROM_LOAD( "pc-ic53.bin", 0x00000, 0x20000, CRC(07147712) SHA1(97692186e85f3a4a19dbd1bd95ed882e903a3c4a) ) ROM_END diff --git a/src/mame/drivers/pipeline.c b/src/mame/drivers/pipeline.c index 48297686a7b..67de4b08b28 100644 --- a/src/mame/drivers/pipeline.c +++ b/src/mame/drivers/pipeline.c @@ -397,7 +397,7 @@ static MACHINE_DRIVER_START( pipeline ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 7372800/4) + MDRV_SOUND_ADD("ymsnd", YM2203, 7372800/4) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) diff --git a/src/mame/drivers/pkscram.c b/src/mame/drivers/pkscram.c index b0353b75a79..d7af8af7658 100644 --- a/src/mame/drivers/pkscram.c +++ b/src/mame/drivers/pkscram.c @@ -98,7 +98,7 @@ static ADDRESS_MAP_START( pkscramble_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x049018, 0x049019) AM_WRITENOP AM_RANGE(0x04901c, 0x04901d) AM_WRITENOP AM_RANGE(0x049020, 0x049021) AM_WRITENOP - AM_RANGE(0x04900c, 0x04900f) AM_DEVREADWRITE8("ym", ym2203_r, ym2203_w, 0x00ff) + AM_RANGE(0x04900c, 0x04900f) AM_DEVREADWRITE8("ymsnd", ym2203_r, ym2203_w, 0x00ff) AM_RANGE(0x052086, 0x052087) AM_WRITENOP ADDRESS_MAP_END @@ -297,7 +297,7 @@ static MACHINE_DRIVER_START( pkscramble ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 12000000/4) + MDRV_SOUND_ADD("ymsnd", YM2203, 12000000/4) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) MACHINE_DRIVER_END diff --git a/src/mame/drivers/popeye.c b/src/mame/drivers/popeye.c index 98db3faea74..b18b998fda0 100644 --- a/src/mame/drivers/popeye.c +++ b/src/mame/drivers/popeye.c @@ -121,11 +121,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( popeye_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_address_data_w) AM_RANGE(0x00, 0x00) AM_READ_PORT("P1") AM_RANGE(0x01, 0x01) AM_READ_PORT("P2") AM_RANGE(0x02, 0x02) AM_READ_PORT("IN0") - AM_RANGE(0x03, 0x03) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x03, 0x03) AM_DEVREAD("aysnd", ay8910_r) ADDRESS_MAP_END @@ -466,7 +466,7 @@ static MACHINE_DRIVER_START( skyskipr ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, XTAL_8MHz/4) + MDRV_SOUND_ADD("aysnd", AY8910, XTAL_8MHz/4) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MACHINE_DRIVER_END diff --git a/src/mame/drivers/ppmast93.c b/src/mame/drivers/ppmast93.c index 2ecb8a10943..ae6c5847e25 100644 --- a/src/mame/drivers/ppmast93.c +++ b/src/mame/drivers/ppmast93.c @@ -196,7 +196,7 @@ static WRITE8_HANDLER(ppmast_sound_w) switch(offset&0xff) { case 0: - case 1: ym2413_w(devtag_get_device(space->machine, "ym"),offset,data); break; + case 1: ym2413_w(devtag_get_device(space->machine, "ymsnd"),offset,data); break; case 2: dac_data_w(devtag_get_device(space->machine, "dac"),data);break; default: logerror("%x %x - %x\n",offset,data,cpu_get_previouspc(space->cpu)); } @@ -369,7 +369,7 @@ static MACHINE_DRIVER_START( ppmast93 ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2413, 5000000/2) + MDRV_SOUND_ADD("ymsnd", YM2413, 5000000/2) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MDRV_SOUND_ADD("dac", DAC, 0) diff --git a/src/mame/drivers/prehisle.c b/src/mame/drivers/prehisle.c index dad736a44ce..63a85a233cb 100644 --- a/src/mame/drivers/prehisle.c +++ b/src/mame/drivers/prehisle.c @@ -69,8 +69,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( prehisle_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ym", ym3812_status_port_r, ym3812_control_port_w) - AM_RANGE(0x20, 0x20) AM_DEVWRITE("ym", ym3812_write_port_w) + AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ymsnd", ym3812_status_port_r, ym3812_control_port_w) + AM_RANGE(0x20, 0x20) AM_DEVWRITE("ymsnd", ym3812_write_port_w) AM_RANGE(0x40, 0x40) AM_DEVWRITE("upd", D7759_write_port_0_w) AM_RANGE(0x80, 0x80) AM_DEVWRITE("upd", D7759_upd_reset_w) ADDRESS_MAP_END @@ -240,7 +240,7 @@ static MACHINE_DRIVER_START( prehisle ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, XTAL_4MHz) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_4MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c index d17eddf6716..20e68420584 100644 --- a/src/mame/drivers/psikyo.c +++ b/src/mame/drivers/psikyo.c @@ -402,7 +402,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sngkace_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) + AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ymsnd", 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) @@ -433,7 +433,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, 0x07) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) + AM_RANGE(0x04, 0x07) AM_DEVREADWRITE("ymsnd", 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 @@ -1213,7 +1213,7 @@ static MACHINE_DRIVER_START( sngkace ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, XTAL_32MHz/4) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2610, XTAL_32MHz/4) /* verified on pcb */ MDRV_SOUND_CONFIG(sngkace_ym2610_interface) MDRV_SOUND_ROUTE(0, "lspeaker", 1.2) MDRV_SOUND_ROUTE(0, "rspeaker", 1.2) @@ -1264,7 +1264,7 @@ static MACHINE_DRIVER_START( gunbird ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) MDRV_SOUND_CONFIG(gunbird_ym2610_interface) MDRV_SOUND_ROUTE(0, "lspeaker", 1.2) MDRV_SOUND_ROUTE(0, "rspeaker", 1.2) @@ -1377,7 +1377,7 @@ ROM_START( samuraia ) ROM_LOAD( "u34.bin", 0x000000, 0x100000, CRC(e6a75bd8) SHA1(1aa84ea54584b6c8b2846194b48bf6d2afa67fee) ) ROM_LOAD( "u35.bin", 0x100000, 0x100000, CRC(c4ca0164) SHA1(c75422de2e0127cdc23d8c223b674a5bd85b00fb) ) - ROM_REGION( 0x100000, "ym", 0 ) /* Samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* Samples */ ROM_LOAD( "u68.bin", 0x000000, 0x100000, CRC(9a7f6c34) SHA1(c549b209bce1d2c6eeb512db198ad20c3f5fb0ea) ) ROM_REGION( 0x040000, "user1", 0 ) /* Sprites LUT */ @@ -1402,7 +1402,7 @@ ROM_START( sngkace ) ROM_LOAD( "u34.bin", 0x000000, 0x100000, CRC(e6a75bd8) SHA1(1aa84ea54584b6c8b2846194b48bf6d2afa67fee) ) ROM_LOAD( "u35.bin", 0x100000, 0x100000, CRC(c4ca0164) SHA1(c75422de2e0127cdc23d8c223b674a5bd85b00fb) ) - ROM_REGION( 0x100000, "ym", 0 ) /* Samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* Samples */ ROM_LOAD( "u68.bin", 0x000000, 0x100000, CRC(9a7f6c34) SHA1(c549b209bce1d2c6eeb512db198ad20c3f5fb0ea) ) ROM_REGION( 0x040000, "user1", 0 ) /* Sprites LUT */ @@ -1413,8 +1413,8 @@ ROM_END static DRIVER_INIT( sngkace ) { { - UINT8 *RAM = memory_region(machine, "ym"); - int len = memory_region_length(machine, "ym"); + UINT8 *RAM = memory_region(machine, "ymsnd"); + int len = memory_region_length(machine, "ymsnd"); int i; /* Bit 6&7 of the samples are swapped. Naughty, naughty... */ @@ -1485,7 +1485,7 @@ ROM_START( gunbird ) ROM_REGION( 0x200000, "gfx2", 0 ) /* Layers 0 + 1 */ ROM_LOAD( "u33.bin", 0x000000, 0x200000, CRC(54494e6b) SHA1(f5d090d2d34d908b56b53a246def194929eba990) ) - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM Samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM Samples */ ROM_LOAD( "u56.bin", 0x000000, 0x100000, CRC(9e07104d) SHA1(3bc54cb755bb3194197706965b532d62b48c4d12) ) ROM_REGION( 0x080000, "ym.deltat", 0 ) /* DELTA-T Samples */ @@ -1515,7 +1515,7 @@ ROM_START( gunbirdk ) ROM_REGION( 0x200000, "gfx2", 0 ) /* Layers 0 + 1 */ ROM_LOAD( "u33.bin", 0x000000, 0x200000, CRC(54494e6b) SHA1(f5d090d2d34d908b56b53a246def194929eba990) ) - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM Samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM Samples */ ROM_LOAD( "u56.bin", 0x000000, 0x100000, CRC(9e07104d) SHA1(3bc54cb755bb3194197706965b532d62b48c4d12) ) ROM_REGION( 0x080000, "ym.deltat", 0 ) /* DELTA-T Samples */ @@ -1545,7 +1545,7 @@ ROM_START( gunbirdj ) ROM_REGION( 0x200000, "gfx2", 0 ) /* Layers 0 + 1 */ ROM_LOAD( "u33.bin", 0x000000, 0x200000, CRC(54494e6b) SHA1(f5d090d2d34d908b56b53a246def194929eba990) ) - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM Samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM Samples */ ROM_LOAD( "u56.bin", 0x000000, 0x100000, CRC(9e07104d) SHA1(3bc54cb755bb3194197706965b532d62b48c4d12) ) ROM_REGION( 0x080000, "ym.deltat", 0 ) /* DELTA-T Samples */ @@ -1576,7 +1576,7 @@ ROM_START( btlkroad ) ROM_REGION( 0x200000, "gfx2", 0 ) /* Layers 0 + 1 */ ROM_LOAD( "u33.bin", 0x000000, 0x200000, CRC(4c8577f1) SHA1(d27043514632954a06667ac63f4a4e4a31870511) ) - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM Samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM Samples */ ROM_LOAD( "u56.bin", 0x000000, 0x100000, CRC(51d73682) SHA1(562038d08e9a4389ffa39f3a659b2a29b94dc156) ) ROM_REGION( 0x080000, "ym.deltat", 0 ) /* DELTA-T Samples */ @@ -1640,7 +1640,7 @@ ROM_START( s1945jn ) ROM_REGION( 0x200000, "gfx2", 0 ) /* Layer 0 + 1 */ ROM_LOAD( "u34.bin", 0x000000, 0x200000, CRC(aaf83e23) SHA1(1c75d09ff42c0c215f8c66c699ca75688c95a05e) ) - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM Samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM Samples */ ROM_LOAD( "u56.bin", 0x000000, 0x100000, CRC(fe1312c2) SHA1(8339a96a0885518d6e22cb3bdb9c2f82d011d86d) ) ROM_REGION( 0x080000, "ym.deltat", 0 ) /* DELTA-T Samples */ diff --git a/src/mame/drivers/puckpkmn.c b/src/mame/drivers/puckpkmn.c index 929ee9ed1be..8d6639c7c46 100644 --- a/src/mame/drivers/puckpkmn.c +++ b/src/mame/drivers/puckpkmn.c @@ -134,7 +134,7 @@ static ADDRESS_MAP_START( puckpkmn_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x700016, 0x700017) AM_READ_PORT("DSW1") AM_RANGE(0x700018, 0x700019) AM_READ_PORT("DSW2") AM_RANGE(0x700022, 0x700023) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) - AM_RANGE(0xa04000, 0xa04003) AM_DEVREADWRITE8("ym", megadriv_68k_YM2612_read, megadriv_68k_YM2612_write, 0xffff) + AM_RANGE(0xa04000, 0xa04003) AM_DEVREADWRITE8("ymsnd", megadriv_68k_YM2612_read, megadriv_68k_YM2612_write, 0xffff) AM_RANGE(0xc00000, 0xc0001f) AM_READWRITE(megadriv_vdp_r, megadriv_vdp_w) AM_RANGE(0xe00000, 0xe0ffff) AM_RAM AM_MIRROR(0x1f0000) AM_BASE(&megadrive_ram) diff --git a/src/mame/drivers/quizdna.c b/src/mame/drivers/quizdna.c index 53c7697be30..5ac23e691b2 100644 --- a/src/mame/drivers/quizdna.c +++ b/src/mame/drivers/quizdna.c @@ -74,7 +74,7 @@ static ADDRESS_MAP_START( quizdna_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x91, 0x91) AM_READ_PORT("SERVICE") AM_RANGE(0xc0, 0xc0) AM_WRITE(quizdna_rombank_w) AM_RANGE(0xd0, 0xd0) AM_WRITE(quizdna_screen_ctrl_w) - AM_RANGE(0xe0, 0xe1) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0xe0, 0xe1) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0xf0, 0xf0) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) ADDRESS_MAP_END @@ -89,7 +89,7 @@ static ADDRESS_MAP_START( gakupara_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x91, 0x91) AM_READ_PORT("SERVICE") AM_RANGE(0xc0, 0xc0) AM_WRITE(quizdna_rombank_w) AM_RANGE(0xd0, 0xd0) AM_WRITE(quizdna_screen_ctrl_w) - AM_RANGE(0xe0, 0xe1) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0xe0, 0xe1) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0xf0, 0xf0) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) ADDRESS_MAP_END @@ -104,7 +104,7 @@ static ADDRESS_MAP_START( gekiretu_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x91, 0x91) AM_READ_PORT("SERVICE") AM_RANGE(0xc0, 0xc0) AM_WRITE(gekiretu_rombank_w) AM_RANGE(0xd0, 0xd0) AM_WRITE(quizdna_screen_ctrl_w) - AM_RANGE(0xe0, 0xe1) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0xe0, 0xe1) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0xf0, 0xf0) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) ADDRESS_MAP_END @@ -477,7 +477,7 @@ static MACHINE_DRIVER_START( quizdna ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, MCLK/4) + MDRV_SOUND_ADD("ymsnd", YM2203, MCLK/4) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(0, "mono", 0.10) MDRV_SOUND_ROUTE(1, "mono", 0.10) diff --git a/src/mame/drivers/quizo.c b/src/mame/drivers/quizo.c index 944e38e99d2..8675334964a 100644 --- a/src/mame/drivers/quizo.c +++ b/src/mame/drivers/quizo.c @@ -128,7 +128,7 @@ static ADDRESS_MAP_START( portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_RANGE(0x10, 0x10) AM_READ_PORT("IN1") AM_RANGE(0x40, 0x40) AM_READ_PORT("IN2") - AM_RANGE(0x50, 0x51) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x50, 0x51) AM_DEVWRITE("aysnd", ay8910_address_data_w) AM_RANGE(0x60, 0x60) AM_WRITE(port60_w) AM_RANGE(0x70, 0x70) AM_WRITE(port70_w) ADDRESS_MAP_END @@ -206,7 +206,7 @@ static MACHINE_DRIVER_START( quizo ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, XTAL2/16 ) + MDRV_SOUND_ADD("aysnd", AY8910, XTAL2/16 ) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/quizpun2.c b/src/mame/drivers/quizpun2.c index 5d462a00aa8..524e01ed925 100644 --- a/src/mame/drivers/quizpun2.c +++ b/src/mame/drivers/quizpun2.c @@ -328,7 +328,7 @@ static ADDRESS_MAP_START( quizpun2_sound_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x00, 0x00 ) AM_WRITE( SMH_NOP ) // IRQ end AM_RANGE( 0x20, 0x20 ) AM_WRITE( SMH_NOP ) // NMI end AM_RANGE( 0x40, 0x40 ) AM_READ( soundlatch_r ) - AM_RANGE( 0x60, 0x61 ) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w ) + AM_RANGE( 0x60, 0x61 ) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w ) ADDRESS_MAP_END @@ -447,7 +447,7 @@ static MACHINE_DRIVER_START( quizpun2 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, XTAL_8MHz / 4 ) // 2 MHz? + MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_8MHz / 4 ) // 2 MHz? MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/rainbow.c b/src/mame/drivers/rainbow.c index 21b5a6286ce..0557b991b9d 100644 --- a/src/mame/drivers/rainbow.c +++ b/src/mame/drivers/rainbow.c @@ -419,7 +419,7 @@ static ADDRESS_MAP_START( rainbow_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) AM_RANGE(0x8000, 0x8fff) AM_RAM - AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ym", ym2151_r,ym2151_w) + AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2151_r,ym2151_w) AM_RANGE(0x9002, 0x9100) AM_READNOP AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xa001, 0xa001) AM_READWRITE(taitosound_slave_comm_r,taitosound_slave_comm_w) @@ -677,7 +677,7 @@ static MACHINE_DRIVER_START( rainbow ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, XTAL_16MHz/4) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_16MHz/4) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "mono", 0.50) MDRV_SOUND_ROUTE(1, "mono", 0.50) diff --git a/src/mame/drivers/rampart.c b/src/mame/drivers/rampart.c index ff68f7b8f6a..afe8afb5668 100644 --- a/src/mame/drivers/rampart.c +++ b/src/mame/drivers/rampart.c @@ -111,7 +111,7 @@ static WRITE16_HANDLER( latch_w ) devtag_reset(space->machine, "oki"); atarigen_set_ym2413_vol(space->machine, ((data >> 1) & 7) * 100 / 7); if (!(data & 0x0001)) - devtag_reset(space->machine, "ym"); + devtag_reset(space->machine, "ymsnd"); } } @@ -136,7 +136,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x3e3f40, 0x3e3f7f) AM_MIRROR(0x010000) AM_RAM_WRITE(atarimo_0_slipram_w) AM_BASE(&atarimo_0_slipram) AM_RANGE(0x3e3f80, 0x3effff) AM_MIRROR(0x010000) AM_RAM AM_RANGE(0x460000, 0x460001) AM_MIRROR(0x019ffe) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0xff00) - AM_RANGE(0x480000, 0x480003) AM_MIRROR(0x019ffc) AM_DEVWRITE8("ym", ym2413_w, 0xff00) + AM_RANGE(0x480000, 0x480003) AM_MIRROR(0x019ffc) AM_DEVWRITE8("ymsnd", ym2413_w, 0xff00) AM_RANGE(0x500000, 0x500fff) AM_MIRROR(0x019000) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE(&atarigen_eeprom) AM_SIZE(&atarigen_eeprom_size) AM_RANGE(0x5a6000, 0x5a6001) AM_MIRROR(0x019ffe) AM_WRITE(atarigen_eeprom_enable_w) AM_RANGE(0x640000, 0x640001) AM_MIRROR(0x019ffe) AM_WRITE(latch_w) @@ -365,7 +365,7 @@ static MACHINE_DRIVER_START( rampart ) MDRV_SOUND_CONFIG(okim6295_interface_pin7low) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) - MDRV_SOUND_ADD("ym", YM2413, MASTER_CLOCK/4) + MDRV_SOUND_ADD("ymsnd", YM2413, MASTER_CLOCK/4) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/rastan.c b/src/mame/drivers/rastan.c index 61517636b00..e81b29e6260 100644 --- a/src/mame/drivers/rastan.c +++ b/src/mame/drivers/rastan.c @@ -248,7 +248,7 @@ static ADDRESS_MAP_START( rastan_s_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) AM_RANGE(0x8000, 0x8fff) AM_RAM - AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xa001, 0xa001) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w) AM_RANGE(0xb000, 0xb000) AM_WRITE(rastan_msm5205_address_w) @@ -412,7 +412,7 @@ static MACHINE_DRIVER_START( rastan ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, XTAL_16MHz/4) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_16MHz/4) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "mono", 0.50) MDRV_SOUND_ROUTE(1, "mono", 0.50) diff --git a/src/mame/drivers/realbrk.c b/src/mame/drivers/realbrk.c index 6319132374c..64aaa08e33a 100644 --- a/src/mame/drivers/realbrk.c +++ b/src/mame/drivers/realbrk.c @@ -172,7 +172,7 @@ ADDRESS_MAP_END /*realbrk specific memory map*/ static ADDRESS_MAP_START( realbrk_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_IMPORT_FROM(base_mem) - AM_RANGE(0x800008, 0x80000b) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) // + AM_RANGE(0x800008, 0x80000b) AM_DEVWRITE8("ymsnd", ym2413_w, 0x00ff) // AM_RANGE(0xc00000, 0xc00001) AM_READ_PORT("IN0") // P1 & P2 (Inputs) AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("IN1") // Coins AM_RANGE(0xc00004, 0xc00005) AM_READWRITE(realbrk_dsw_r,SMH_RAM) AM_BASE(&realbrk_dsw_select) // DSW select @@ -182,7 +182,7 @@ ADDRESS_MAP_END /*pkgnsh specific memory map*/ static ADDRESS_MAP_START( pkgnsh_mem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x800008, 0x80000b) AM_DEVWRITE8("ym", ym2413_w, 0xff00 ) // YM2413 + AM_RANGE(0x800008, 0x80000b) AM_DEVWRITE8("ymsnd", ym2413_w, 0xff00 ) // YM2413 AM_RANGE(0xc00000, 0xc00013) AM_READ(pkgnsh_input_r ) // P1 & P2 (Inputs) AM_RANGE(0xff0000, 0xfffbff) AM_READWRITE(backup_ram_r,backup_ram_w) AM_BASE(&backup_ram) // RAM AM_IMPORT_FROM(base_mem) @@ -190,7 +190,7 @@ ADDRESS_MAP_END /*pkgnshdx specific memory map*/ static ADDRESS_MAP_START( pkgnshdx_mem, ADDRESS_SPACE_PROGRAM, 16) - AM_RANGE(0x800008, 0x80000b) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) // + AM_RANGE(0x800008, 0x80000b) AM_DEVWRITE8("ymsnd", ym2413_w, 0x00ff) // AM_RANGE(0xc00000, 0xc00013) AM_READ(pkgnshdx_input_r ) // P1 & P2 (Inputs) AM_RANGE(0xc00004, 0xc00005) AM_WRITE(SMH_RAM) AM_BASE(&realbrk_dsw_select) // DSW select AM_RANGE(0xff0000, 0xfffbff) AM_READWRITE(backup_ram_dx_r,backup_ram_w) AM_BASE(&backup_ram) // RAM @@ -201,7 +201,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dai2kaku_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x605000, 0x6053ff) AM_READWRITE(SMH_RAM,SMH_RAM) AM_BASE(&realbrk_vram_0ras) // rasterinfo (0) AM_RANGE(0x605400, 0x6057ff) AM_READWRITE(SMH_RAM,SMH_RAM) AM_BASE(&realbrk_vram_1ras) // rasterinfo (1) - AM_RANGE(0x800008, 0x80000b) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) // + AM_RANGE(0x800008, 0x80000b) AM_DEVWRITE8("ymsnd", ym2413_w, 0x00ff) // AM_RANGE(0xc00000, 0xc00001) AM_READ_PORT("IN0") // P1 & P2 (Inputs) AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("IN1") // Coins AM_RANGE(0xc00004, 0xc00005) AM_READWRITE(realbrk_dsw_r,SMH_RAM) AM_BASE(&realbrk_dsw_select) // DSW select @@ -703,7 +703,7 @@ static MACHINE_DRIVER_START( realbrk ) MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) - MDRV_SOUND_ADD("ym", YM2413, XTAL_3_579545MHz) + MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/relief.c b/src/mame/drivers/relief.c index 715edf81559..c8f1c1d6faf 100644 --- a/src/mame/drivers/relief.c +++ b/src/mame/drivers/relief.c @@ -148,7 +148,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0x3fffff) AM_RANGE(0x000000, 0x07ffff) AM_ROM - AM_RANGE(0x140000, 0x140003) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) + AM_RANGE(0x140000, 0x140003) AM_DEVWRITE8("ymsnd", ym2413_w, 0x00ff) AM_RANGE(0x140010, 0x140011) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x140020, 0x140021) AM_WRITE(audio_volume_w) AM_RANGE(0x140030, 0x140031) AM_WRITE(audio_control_w) @@ -322,7 +322,7 @@ static MACHINE_DRIVER_START( relief ) MDRV_SOUND_CONFIG(okim6295_interface_pin7low) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) - MDRV_SOUND_ADD("ym", YM2413, ATARI_CLOCK_14MHz/4) + MDRV_SOUND_ADD("ymsnd", YM2413, ATARI_CLOCK_14MHz/4) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/renegade.c b/src/mame/drivers/renegade.c index 0a270a8ca28..ced2285d3da 100644 --- a/src/mame/drivers/renegade.c +++ b/src/mame/drivers/renegade.c @@ -559,7 +559,7 @@ static ADDRESS_MAP_START( renegade_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1000, 0x1000) AM_READ(soundlatch_r) AM_RANGE(0x1800, 0x1800) AM_WRITENOP // this gets written the same values as 0x2000 AM_RANGE(0x2000, 0x2000) AM_WRITE(adpcm_play_w) - AM_RANGE(0x2800, 0x2801) AM_DEVREADWRITE("ym", ym3526_r,ym3526_w) + AM_RANGE(0x2800, 0x2801) AM_DEVREADWRITE("ymsnd", ym3526_r,ym3526_w) AM_RANGE(0x3000, 0x3000) AM_WRITENOP /* adpcm related? stereo pan? */ AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -807,7 +807,7 @@ static MACHINE_DRIVER_START( renegade ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3526, 12000000/4) + MDRV_SOUND_ADD("ymsnd", YM3526, 12000000/4) MDRV_SOUND_CONFIG(ym3526_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/drivers/rmhaihai.c b/src/mame/drivers/rmhaihai.c index 8599d06389d..48c6c682682 100644 --- a/src/mame/drivers/rmhaihai.c +++ b/src/mame/drivers/rmhaihai.c @@ -186,8 +186,8 @@ static ADDRESS_MAP_START( rmhaihai_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(samples_r) AM_RANGE(0x8000, 0x8000) AM_READWRITE(keyboard_r, SMH_NOP) // ?? AM_RANGE(0x8001, 0x8001) AM_READWRITE(SMH_NOP, keyboard_w) // ?? - AM_RANGE(0x8020, 0x8020) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x8020, 0x8021) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x8020, 0x8020) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x8020, 0x8021) AM_DEVWRITE("aysnd", ay8910_address_data_w) AM_RANGE(0x8040, 0x8040) AM_DEVWRITE("msm", adpcm_w) AM_RANGE(0x8060, 0x8060) AM_WRITE(ctrl_w) AM_RANGE(0x8080, 0x8080) AM_WRITENOP // ?? @@ -209,8 +209,8 @@ static ADDRESS_MAP_START( themj_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(samples_r) AM_RANGE(0x8000, 0x8000) AM_READWRITE(keyboard_r, SMH_NOP) // ?? AM_RANGE(0x8001, 0x8001) AM_READWRITE(SMH_NOP, keyboard_w) // ?? - AM_RANGE(0x8020, 0x8020) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x8020, 0x8021) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x8020, 0x8020) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x8020, 0x8021) AM_DEVWRITE("aysnd", ay8910_address_data_w) AM_RANGE(0x8040, 0x8040) AM_DEVWRITE("msm", adpcm_w) AM_RANGE(0x8060, 0x8060) AM_WRITE(ctrl_w) AM_RANGE(0x8080, 0x8080) AM_WRITENOP // ?? @@ -461,7 +461,7 @@ static MACHINE_DRIVER_START( rmhaihai ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 20000000/16) + MDRV_SOUND_ADD("aysnd", AY8910, 20000000/16) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) diff --git a/src/mame/drivers/rockrage.c b/src/mame/drivers/rockrage.c index 36184eabb63..fdfe153bfea 100644 --- a/src/mame/drivers/rockrage.c +++ b/src/mame/drivers/rockrage.c @@ -125,7 +125,7 @@ static ADDRESS_MAP_START( rockrage_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3000, 0x3000) AM_DEVREAD("vlm", rockrage_VLM5030_busy_r) /* VLM5030 */ AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("vlm", rockrage_speech_w) /* VLM5030 */ AM_RANGE(0x5000, 0x5000) AM_READ(soundlatch_r) /* soundlatch_r */ - AM_RANGE(0x6000, 0x6001) AM_DEVREADWRITE("ym", ym2151_r,ym2151_w) /* YM 2151 */ + AM_RANGE(0x6000, 0x6001) AM_DEVREADWRITE("ymsnd", ym2151_r,ym2151_w) /* YM 2151 */ AM_RANGE(0x7000, 0x77ff) AM_RAM /* RAM */ AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM */ ADDRESS_MAP_END @@ -294,7 +294,7 @@ static MACHINE_DRIVER_START( rockrage ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) MDRV_SOUND_ROUTE(0, "mono", 0.60) MDRV_SOUND_ROUTE(1, "mono", 0.60) diff --git a/src/mame/drivers/rohga.c b/src/mame/drivers/rohga.c index b1132324284..ccf2963b17f 100644 --- a/src/mame/drivers/rohga.c +++ b/src/mame/drivers/rohga.c @@ -269,7 +269,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( rohga_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x000000, 0x00ffff) AM_ROM AM_RANGE(0x100000, 0x100001) AM_NOP - AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ym", ym2151_r,ym2151_w) + AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ymsnd", ym2151_r,ym2151_w) AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE("oki1", okim6295_r,okim6295_w) AM_RANGE(0x130000, 0x130001) AM_DEVREADWRITE("oki2", okim6295_r,okim6295_w) AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) @@ -773,7 +773,7 @@ static MACHINE_DRIVER_START( rohga ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 32220000/9) + MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.78) MDRV_SOUND_ROUTE(1, "rspeaker", 0.78) @@ -818,7 +818,7 @@ static MACHINE_DRIVER_START( wizdfire ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 32220000/9) + MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) @@ -863,7 +863,7 @@ static MACHINE_DRIVER_START( nitrobal ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 32220000/9) + MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) @@ -908,7 +908,7 @@ static MACHINE_DRIVER_START( schmeisr ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 32220000/9) + MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) diff --git a/src/mame/drivers/rollerg.c b/src/mame/drivers/rollerg.c index b4187570b48..cd88e929bcd 100644 --- a/src/mame/drivers/rollerg.c +++ b/src/mame/drivers/rollerg.c @@ -106,7 +106,7 @@ static ADDRESS_MAP_START( rollerg_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0xa000, 0xa02f) AM_DEVREADWRITE("konami", k053260_r,k053260_w) - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym", ym3812_r,ym3812_w) + AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", ym3812_r,ym3812_w) AM_RANGE(0xfc00, 0xfc00) AM_WRITE(sound_arm_nmi_w) ADDRESS_MAP_END @@ -247,7 +247,7 @@ static MACHINE_DRIVER_START( rollerg ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 3579545) + MDRV_SOUND_ADD("ymsnd", YM3812, 3579545) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_SOUND_ADD("konami", K053260, 3579545) diff --git a/src/mame/drivers/roul.c b/src/mame/drivers/roul.c index f1d66990f8d..9777c9f9d14 100644 --- a/src/mame/drivers/roul.c +++ b/src/mame/drivers/roul.c @@ -175,7 +175,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_cpu_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READ(soundlatch_r) - AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_address_data_w) ADDRESS_MAP_END static VIDEO_START(roul) @@ -269,7 +269,7 @@ static MACHINE_DRIVER_START( roul ) MDRV_VIDEO_UPDATE(roul) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 1000000) + MDRV_SOUND_ADD("aysnd", AY8910, 1000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/route16.c b/src/mame/drivers/route16.c index 7fa1cccf877..ca8e6c1ef12 100644 --- a/src/mame/drivers/route16.c +++ b/src/mame/drivers/route16.c @@ -574,7 +574,7 @@ static const ay8910_interface stratvox_ay8910_interface = AY8910_DEFAULT_LOADS, DEVCB_NULL, DEVCB_NULL, - DEVCB_DEVICE_HANDLER("sn", stratvox_sn76477_w), /* SN76477 commands (not used in Route 16?) */ + DEVCB_DEVICE_HANDLER("snsnd", stratvox_sn76477_w), /* SN76477 commands (not used in Route 16?) */ DEVCB_NULL }; @@ -662,7 +662,7 @@ static MACHINE_DRIVER_START( stratvox ) MDRV_SOUND_CONFIG(stratvox_ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) - MDRV_SOUND_ADD("sn", SN76477, 0) + MDRV_SOUND_ADD("snsnd", SN76477, 0) MDRV_SOUND_CONFIG(sn76477_intf) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) diff --git a/src/mame/drivers/royalmah.c b/src/mame/drivers/royalmah.c index 5580f2a3281..2b3eaa2f522 100644 --- a/src/mame/drivers/royalmah.c +++ b/src/mame/drivers/royalmah.c @@ -441,16 +441,16 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( royalmah_iomap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "ay", ay8910_r ) - AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "ay", ay8910_data_address_w ) + AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "aysnd", ay8910_r ) + AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "aysnd", ay8910_data_address_w ) AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w ) AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w ) ADDRESS_MAP_END static ADDRESS_MAP_START( ippatsu_iomap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "ay", ay8910_r ) - AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "ay", ay8910_data_address_w ) + AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "aysnd", ay8910_r ) + AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "aysnd", ay8910_data_address_w ) AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w ) AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w ) AM_RANGE( 0x12, 0x12 ) AM_READ_PORT("DSW2") @@ -459,8 +459,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( suzume_iomap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "ay", ay8910_r ) - AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "ay", ay8910_data_address_w ) + AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "aysnd", ay8910_r ) + AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "aysnd", ay8910_data_address_w ) AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w ) AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w ) AM_RANGE( 0x80, 0x80 ) AM_READ( suzume_dsw_r ) @@ -469,8 +469,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dondenmj_iomap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "ay", ay8910_r ) - AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "ay", ay8910_data_address_w) + AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "aysnd", ay8910_r ) + AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "aysnd", ay8910_data_address_w) AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w ) AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w ) AM_RANGE( 0x85, 0x85 ) AM_READ_PORT("DSW2") // DSW2 @@ -480,8 +480,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( makaijan_iomap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "ay", ay8910_r ) - AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "ay", ay8910_data_address_w) + AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "aysnd", ay8910_r ) + AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "aysnd", ay8910_data_address_w) AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w ) AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w ) AM_RANGE( 0x84, 0x84 ) AM_READ_PORT("DSW2") // DSW2 @@ -491,8 +491,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( daisyari_iomap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "ay", ay8910_r ) - AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "ay", ay8910_data_address_w) + AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "aysnd", ay8910_r ) + AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "aysnd", ay8910_data_address_w) AM_RANGE( 0x10, 0x10 ) AM_WRITE( royalmah_palbank_w ) AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w ) AM_RANGE( 0xc0, 0xc0 ) AM_READWRITE( daisyari_dsw_r, daisyari_bank_w ) @@ -501,16 +501,16 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mjclub_iomap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE( 0x00, 0x00 ) AM_READWRITE( mjclub_dsw_r, mjclub_bank_w ) - AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "ay", ay8910_r ) - AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "ay", ay8910_data_address_w) + AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "aysnd", ay8910_r ) + AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "aysnd", ay8910_data_address_w) AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w ) AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w ) ADDRESS_MAP_END static ADDRESS_MAP_START( mjdiplob_iomap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "ay", ay8910_r ) - AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "ay", ay8910_data_address_w ) + AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "aysnd", ay8910_r ) + AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "aysnd", ay8910_data_address_w ) AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w ) AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w ) AM_RANGE( 0x61, 0x61 ) AM_WRITE(tontonb_bank_w) @@ -520,8 +520,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( tontonb_iomap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "ay", ay8910_r ) - AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "ay", ay8910_data_address_w ) + AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "aysnd", ay8910_r ) + AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "aysnd", ay8910_data_address_w ) AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w ) AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w ) AM_RANGE( 0x44, 0x44 ) AM_WRITE( tontonb_bank_w ) @@ -531,8 +531,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( majs101b_iomap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "ay", ay8910_r ) - AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "ay", ay8910_data_address_w ) + AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "aysnd", ay8910_r ) + AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "aysnd", ay8910_data_address_w ) AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w ) AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w ) AM_RANGE( 0x00, 0x00 ) AM_READWRITE( majs101b_dsw_r, dynax_bank_w ) @@ -540,8 +540,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mjderngr_iomap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "ay", ay8910_r ) - AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "ay", ay8910_data_address_w ) + AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "aysnd", ay8910_r ) + AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "aysnd", ay8910_data_address_w ) // AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_RANGE( 0x10, 0x10 ) AM_WRITE( mjderngr_coin_w ) // palette bank is set separately AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w ) @@ -554,8 +554,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mjapinky_iomap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE( 0x00, 0x00 ) AM_WRITE( mjapinky_bank_w ) - AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "ay", ay8910_r ) - AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "ay", ay8910_data_address_w ) + AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "aysnd", ay8910_r ) + AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "aysnd", ay8910_data_address_w ) AM_RANGE( 0x04, 0x04 ) AM_READ_PORT("DSW2") AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( mjapinky_palbank_w ) AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w ) @@ -767,8 +767,8 @@ static ADDRESS_MAP_START( janptr96_iomap, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x20, 0x20 ) AM_READWRITE( janptr96_unknown_r, janptr96_rambank_w ) AM_RANGE( 0x50, 0x50 ) AM_WRITE( mjderngr_palbank_w ) AM_RANGE( 0x60, 0x6f ) AM_DEVREADWRITE("rtc", msm6242_r, msm6242_w) - AM_RANGE( 0x81, 0x81 ) AM_DEVREAD( "ay", ay8910_r ) - AM_RANGE( 0x82, 0x83 ) AM_DEVWRITE( "ay", ay8910_data_address_w ) + AM_RANGE( 0x81, 0x81 ) AM_DEVREAD( "aysnd", ay8910_r ) + AM_RANGE( 0x82, 0x83 ) AM_DEVWRITE( "aysnd", ay8910_data_address_w ) AM_RANGE( 0x93, 0x93 ) AM_WRITE( input_port_select_w ) AM_RANGE( 0xd8, 0xd8 ) AM_WRITE( janptr96_coin_counter_w ) AM_RANGE( 0xd9, 0xd9 ) AM_READ_PORT("SYSTEM") @@ -798,7 +798,7 @@ static READ8_HANDLER( mjifb_rom_io_r ) { case 0x8000: return input_port_read(space->machine, "DSW4"); // dsw 4 case 0x8200: return input_port_read(space->machine, "DSW3"); // dsw 3 - case 0x9001: return ay8910_r(devtag_get_device(space->machine,"ay"), 0); // inputs + case 0x9001: return ay8910_r(devtag_get_device(space->machine,"aysnd"), 0); // inputs case 0x9011: return input_port_read(space->machine, "SYSTEM"); } @@ -819,8 +819,8 @@ static WRITE8_HANDLER( mjifb_rom_io_w ) switch(offset) { case 0x8e00: palette_base = data & 0x1f; return; - case 0x9002: ay8910_data_w(devtag_get_device(space->machine,"ay"),0,data); return; - case 0x9003: ay8910_address_w(devtag_get_device(space->machine,"ay"),0,data); return; + case 0x9002: ay8910_data_w(devtag_get_device(space->machine,"aysnd"),0,data); return; + case 0x9003: ay8910_address_w(devtag_get_device(space->machine,"aysnd"),0,data); return; case 0x9010: mjifb_coin_counter_w(space,0,data); return; @@ -905,7 +905,7 @@ static READ8_HANDLER( mjdejavu_rom_io_r ) { case 0x8000: return input_port_read(space->machine, "DSW2"); // dsw 2 case 0x8001: return input_port_read(space->machine, "DSW1"); // dsw 1 - case 0x9001: return ay8910_r(devtag_get_device(space->machine,"ay"), 0); // inputs + case 0x9001: return ay8910_r(devtag_get_device(space->machine,"aysnd"), 0); // inputs case 0x9011: return input_port_read(space->machine, "SYSTEM"); } @@ -925,8 +925,8 @@ static WRITE8_HANDLER( mjdejavu_rom_io_w ) switch(offset) { case 0x8802: palette_base = data & 0x1f; return; - case 0x9002: ay8910_data_w(devtag_get_device(space->machine,"ay"),0,data); return; - case 0x9003: ay8910_address_w(devtag_get_device(space->machine,"ay"),0,data); return; + case 0x9002: ay8910_data_w(devtag_get_device(space->machine,"aysnd"),0,data); return; + case 0x9003: ay8910_address_w(devtag_get_device(space->machine,"aysnd"),0,data); return; case 0x9010: mjifb_coin_counter_w(space,0,data); return; case 0x9011: input_port_select_w(space,0,data); return; case 0x9013: @@ -972,8 +972,8 @@ static WRITE8_HANDLER( mjtensin_6ff3_w ) static ADDRESS_MAP_START( mjtensin_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x0000, 0x5fff ) AM_ROM AM_RANGE( 0x6000, 0x6fbf ) AM_RAM - AM_RANGE( 0x6fc1, 0x6fc1 ) AM_DEVREAD( "ay", ay8910_r ) - AM_RANGE( 0x6fc2, 0x6fc3 ) AM_DEVWRITE( "ay", ay8910_data_address_w ) + AM_RANGE( 0x6fc1, 0x6fc1 ) AM_DEVREAD( "aysnd", ay8910_r ) + AM_RANGE( 0x6fc2, 0x6fc3 ) AM_DEVWRITE( "aysnd", ay8910_data_address_w ) AM_RANGE( 0x6fd0, 0x6fd0 ) AM_WRITE( janptr96_coin_counter_w ) AM_RANGE( 0x6fd1, 0x6fd1 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w ) AM_RANGE( 0x6fe0, 0x6fef ) AM_DEVREADWRITE("rtc", msm6242_r, msm6242_w) @@ -1040,8 +1040,8 @@ static WRITE8_HANDLER( cafetime_7fe3_w ) static ADDRESS_MAP_START( cafetime_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x0000, 0x5fff ) AM_ROM AM_RANGE( 0x6000, 0x7eff ) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE( 0x7fc1, 0x7fc1 ) AM_DEVREAD( "ay", ay8910_r ) - AM_RANGE( 0x7fc2, 0x7fc3 ) AM_DEVWRITE( "ay", ay8910_data_address_w ) + AM_RANGE( 0x7fc1, 0x7fc1 ) AM_DEVREAD( "aysnd", ay8910_r ) + AM_RANGE( 0x7fc2, 0x7fc3 ) AM_DEVWRITE( "aysnd", ay8910_data_address_w ) AM_RANGE( 0x7fd0, 0x7fd0 ) AM_WRITE( janptr96_coin_counter_w ) AM_RANGE( 0x7fd1, 0x7fd1 ) AM_READ_PORT("SYSTEM") AM_WRITENOP AM_RANGE( 0x7fd3, 0x7fd3 ) AM_WRITE( input_port_select_w ) @@ -1175,8 +1175,8 @@ static ADDRESS_MAP_START( mjvegasa_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x06000, 0x07fff ) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE( 0x08000, 0x0ffff ) AM_READWRITE(mjvegasa_rom_io_r, mjvegasa_rom_io_w) AM_BASE(&videoram) - AM_RANGE( 0x10001, 0x10001 ) AM_DEVREAD( "ay", ay8910_r ) - AM_RANGE( 0x10002, 0x10003 ) AM_DEVWRITE( "ay", ay8910_data_address_w ) + AM_RANGE( 0x10001, 0x10001 ) AM_DEVREAD( "aysnd", ay8910_r ) + AM_RANGE( 0x10002, 0x10003 ) AM_DEVWRITE( "aysnd", ay8910_data_address_w ) AM_RANGE( 0x10010, 0x10010 ) AM_WRITE( mjvegasa_coin_counter_w ) AM_RANGE( 0x10011, 0x10011 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w ) AM_RANGE( 0x10013, 0x10013 ) AM_WRITE( input_port_select_w ) @@ -3118,7 +3118,7 @@ static MACHINE_DRIVER_START( royalmah ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 18432000/12) + MDRV_SOUND_ADD("aysnd", AY8910, 18432000/12) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33) MACHINE_DRIVER_END diff --git a/src/mame/drivers/rpunch.c b/src/mame/drivers/rpunch.c index dffd3fc796e..6d46f0f8116 100644 --- a/src/mame/drivers/rpunch.c +++ b/src/mame/drivers/rpunch.c @@ -270,7 +270,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_ROM - AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xf200, 0xf200) AM_READ(sound_command_r) AM_RANGE(0xf400, 0xf400) AM_DEVWRITE("upd", upd_control_w) AM_RANGE(0xf600, 0xf600) AM_DEVWRITE("upd", upd_data_w) @@ -506,7 +506,7 @@ static MACHINE_DRIVER_START( rpunch ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, MASTER_CLOCK/4) + MDRV_SOUND_ADD("ymsnd", YM2151, MASTER_CLOCK/4) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "mono", 0.50) MDRV_SOUND_ROUTE(1, "mono", 0.50) diff --git a/src/mame/drivers/sandscrp.c b/src/mame/drivers/sandscrp.c index 6300c089357..3dfe800971c 100644 --- a/src/mame/drivers/sandscrp.c +++ b/src/mame/drivers/sandscrp.c @@ -272,7 +272,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sandscrp_soundport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(sandscrp_bankswitch_w) // ROM Bank - AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) // PORTA/B read + AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) // PORTA/B read AM_RANGE(0x04, 0x04) AM_DEVWRITE("oki", okim6295_w) // OKIM6295 AM_RANGE(0x06, 0x06) AM_WRITE(sandscrp_soundlatch_w) // AM_RANGE(0x07, 0x07) AM_READ(sandscrp_soundlatch_r) // @@ -469,7 +469,7 @@ static MACHINE_DRIVER_START( sandscrp ) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25) - MDRV_SOUND_ADD("ym", YM2203, 4000000) + MDRV_SOUND_ADD("ymsnd", YM2203, 4000000) MDRV_SOUND_CONFIG(ym2203_intf_sandscrp) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25) diff --git a/src/mame/drivers/sangho.c b/src/mame/drivers/sangho.c index cf651f06147..06ddd5c9b76 100644 --- a/src/mame/drivers/sangho.c +++ b/src/mame/drivers/sangho.c @@ -78,7 +78,7 @@ static WRITE8_HANDLER(pzlestar_bank_w) static ADDRESS_MAP_START( pzlestar_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE( 0x7c, 0x7d) AM_DEVWRITE( "ym", ym2413_w ) + AM_RANGE( 0x7c, 0x7d) AM_DEVWRITE( "ymsnd", ym2413_w ) AM_RANGE( 0x91, 0x91) AM_WRITE( pzlestar_bank_w ) AM_RANGE( 0x98, 0x98) AM_READWRITE( v9938_0_vram_r, v9938_0_vram_w ) AM_RANGE( 0x99, 0x99) AM_READWRITE( v9938_0_status_r, v9938_0_command_w ) @@ -93,7 +93,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sexyboom_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE( 0x7c, 0x7d) AM_DEVWRITE( "ym", ym2413_w ) + AM_RANGE( 0x7c, 0x7d) AM_DEVWRITE( "ymsnd", ym2413_w ) AM_RANGE( 0xa0, 0xa0) AM_READ_PORT("P1") AM_RANGE( 0xa1, 0xa1) AM_READ_PORT("P2") AM_RANGE( 0xf0, 0xf0) AM_READWRITE( v9938_0_vram_r,v9938_0_vram_w ) @@ -243,7 +243,7 @@ static MACHINE_DRIVER_START(pzlestar) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2413, 3580000) + MDRV_SOUND_ADD("ymsnd", YM2413, 3580000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END @@ -275,7 +275,7 @@ static MACHINE_DRIVER_START(sexyboom ) MDRV_VIDEO_UPDATE( generic_bitmapped ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2413, 3580000) + MDRV_SOUND_ADD("ymsnd", YM2413, 3580000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/sauro.c b/src/mame/drivers/sauro.c index 9bb18420aa0..a570a32134b 100644 --- a/src/mame/drivers/sauro.c +++ b/src/mame/drivers/sauro.c @@ -172,7 +172,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sauro_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("ym", ym3812_w) + AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("ymsnd", ym3812_w) AM_RANGE(0xa000, 0xa000) AM_DEVWRITE("speech", adpcm_w) AM_RANGE(0xe000, 0xe000) AM_READ(sauro_sound_command_r) AM_RANGE(0xe000, 0xe006) AM_WRITENOP /* echo from write to e0000 */ @@ -190,7 +190,7 @@ static ADDRESS_MAP_START( trckydoc_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xf808, 0xf808) AM_READ_PORT("DSW2") AM_RANGE(0xf810, 0xf810) AM_READ_PORT("P1") AM_RANGE(0xf818, 0xf818) AM_READ_PORT("P2") - AM_RANGE(0xf820, 0xf821) AM_DEVWRITE("ym", ym3812_w) + AM_RANGE(0xf820, 0xf821) AM_DEVWRITE("ymsnd", ym3812_w) AM_RANGE(0xf828, 0xf828) AM_READ(watchdog_reset_r) AM_RANGE(0xf830, 0xf830) AM_WRITE(tecfri_scroll_bg_w) AM_RANGE(0xf838, 0xf838) AM_WRITENOP /* only written at startup */ @@ -353,7 +353,7 @@ static MACHINE_DRIVER_START( tecfri ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, XTAL_20MHz/8) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_20MHz/8) /* verified on pcb */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/sbasketb.c b/src/mame/drivers/sbasketb.c index 9c7a663703f..77d21075dfc 100644 --- a/src/mame/drivers/sbasketb.c +++ b/src/mame/drivers/sbasketb.c @@ -106,7 +106,7 @@ static ADDRESS_MAP_START( sbasketb_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc000, 0xdfff) AM_DEVWRITE("vlm", hyperspt_sound_w) /* speech and output controll */ AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("dac", dac_w) AM_RANGE(0xe001, 0xe001) AM_WRITE(konami_SN76496_latch_w) /* Loads the snd command into the snd latch */ - AM_RANGE(0xe002, 0xe002) AM_DEVWRITE("sn", konami_SN76496_w) /* This address triggers the SN chip to read the data port. */ + AM_RANGE(0xe002, 0xe002) AM_DEVWRITE("snsnd", konami_SN76496_w) /* This address triggers the SN chip to read the data port. */ ADDRESS_MAP_END @@ -214,7 +214,7 @@ static MACHINE_DRIVER_START( sbasketb ) MDRV_SOUND_ADD("dac", DAC, 0) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - MDRV_SOUND_ADD("sn", SN76489, XTAL_14_31818MHz / 8) + MDRV_SOUND_ADD("snsnd", SN76489, XTAL_14_31818MHz / 8) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_SOUND_ADD("vlm", VLM5030, XTAL_3_579545MHz) /* Schematics say 3.58MHz, but board uses 3.579545MHz xtal */ diff --git a/src/mame/drivers/sbowling.c b/src/mame/drivers/sbowling.c index 7142e20028b..00f1e5b4197 100644 --- a/src/mame/drivers/sbowling.c +++ b/src/mame/drivers/sbowling.c @@ -187,8 +187,8 @@ static READ8_HANDLER (controls_r) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x2fff) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_RAM_WRITE(sbw_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0xf800, 0xf801) AM_DEVWRITE("ay", ay8910_address_data_w) - AM_RANGE(0xf801, 0xf801) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0xf800, 0xf801) AM_DEVWRITE("aysnd", ay8910_address_data_w) + AM_RANGE(0xf801, 0xf801) AM_DEVREAD("aysnd", ay8910_r) AM_RANGE(0xfc00, 0xffff) AM_RAM ADDRESS_MAP_END @@ -351,7 +351,7 @@ static MACHINE_DRIVER_START( sbowling ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 19968000 / 16) + MDRV_SOUND_ADD("aysnd", AY8910, 19968000 / 16) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12) MACHINE_DRIVER_END diff --git a/src/mame/drivers/scobra.c b/src/mame/drivers/scobra.c index 0147c346d74..042e8aabe88 100644 --- a/src/mame/drivers/scobra.c +++ b/src/mame/drivers/scobra.c @@ -344,15 +344,15 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hustler_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x40, 0x40) AM_DEVREADWRITE("ay", ay8910_r, ay8910_data_w) - AM_RANGE(0x80, 0x80) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x40, 0x40) AM_DEVREADWRITE("aysnd", ay8910_r, ay8910_data_w) + AM_RANGE(0x80, 0x80) AM_DEVWRITE("aysnd", ay8910_address_w) ADDRESS_MAP_END static ADDRESS_MAP_START( hustlerb_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x40, 0x40) AM_DEVWRITE("ay", ay8910_address_w) - AM_RANGE(0x80, 0x80) AM_DEVREADWRITE("ay", ay8910_r, ay8910_data_w) + AM_RANGE(0x40, 0x40) AM_DEVWRITE("aysnd", ay8910_address_w) + AM_RANGE(0x80, 0x80) AM_DEVREADWRITE("aysnd", ay8910_r, ay8910_data_w) ADDRESS_MAP_END /* stratgyx coinage DIPs are spread accross two input ports */ @@ -1006,7 +1006,7 @@ static MACHINE_DRIVER_START( hustler ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 14318000/8) + MDRV_SOUND_ADD("aysnd", AY8910, 14318000/8) MDRV_SOUND_CONFIG(hustler_ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33) MACHINE_DRIVER_END diff --git a/src/mame/drivers/scotrsht.c b/src/mame/drivers/scotrsht.c index e9e954b28b3..819c2c6f481 100644 --- a/src/mame/drivers/scotrsht.c +++ b/src/mame/drivers/scotrsht.c @@ -101,7 +101,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( scotrsht_sound_port, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) ADDRESS_MAP_END @@ -218,7 +218,7 @@ static MACHINE_DRIVER_START( scotrsht ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 18432000/6) + MDRV_SOUND_ADD("ymsnd", YM2203, 18432000/6) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MACHINE_DRIVER_END diff --git a/src/mame/drivers/segac2.c b/src/mame/drivers/segac2.c index 03c56692eeb..79068dec0c1 100644 --- a/src/mame/drivers/segac2.c +++ b/src/mame/drivers/segac2.c @@ -625,7 +625,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800000, 0x800001) AM_MIRROR(0x13fdfe) AM_READWRITE(prot_r, prot_w) AM_RANGE(0x800200, 0x800201) AM_MIRROR(0x13fdfe) AM_WRITE(control_w) AM_RANGE(0x840000, 0x84001f) AM_MIRROR(0x13fee0) AM_READWRITE(io_chip_r, io_chip_w) - AM_RANGE(0x840100, 0x840107) AM_MIRROR(0x13fef8) AM_DEVREADWRITE8("ym", ym3438_r, ym3438_w, 0x00ff) + AM_RANGE(0x840100, 0x840107) AM_MIRROR(0x13fef8) AM_DEVREADWRITE8("ymsnd", ym3438_r, ym3438_w, 0x00ff) AM_RANGE(0x880100, 0x880101) AM_MIRROR(0x13fefe) AM_WRITE(counter_timer_w) AM_RANGE(0x8c0000, 0x8c0fff) AM_MIRROR(0x13f000) AM_READWRITE(palette_r, palette_w) AM_BASE(&paletteram16) AM_RANGE(0xc00000, 0xc0001f) AM_MIRROR(0x18ff00) AM_READWRITE(megadriv_vdp_r, megadriv_vdp_w) @@ -1389,12 +1389,12 @@ static MACHINE_DRIVER_START( segac ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3438, XL2_CLOCK/7) + MDRV_SOUND_ADD("ymsnd", YM3438, XL2_CLOCK/7) MDRV_SOUND_CONFIG(ym3438_intf) MDRV_SOUND_ROUTE(0, "mono", 0.50) /* right channel not connected */ - MDRV_SOUND_ADD("sn", SN76496, XL2_CLOCK/15) + MDRV_SOUND_ADD("snsnd", SN76496, XL2_CLOCK/15) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/segag80v.c b/src/mame/drivers/segag80v.c index 50e55204648..5600bfaa276 100644 --- a/src/mame/drivers/segag80v.c +++ b/src/mame/drivers/segag80v.c @@ -968,7 +968,7 @@ static MACHINE_DRIVER_START( zektor ) MDRV_SOUND_CONFIG(zektor_samples_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) - MDRV_SOUND_ADD("ay", AY8910, CPU_CLOCK/2/2) + MDRV_SOUND_ADD("aysnd", AY8910, CPU_CLOCK/2/2) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33) /* speech board */ @@ -1367,7 +1367,7 @@ static DRIVER_INIT( spacfury ) static DRIVER_INIT( zektor ) { const address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO); - const device_config *ay = devtag_get_device(machine, "ay"); + const device_config *ay = devtag_get_device(machine, "aysnd"); /* configure security */ sega_security(82); diff --git a/src/mame/drivers/segahang.c b/src/mame/drivers/segahang.c index e95ffca9cf2..7516be33555 100644 --- a/src/mame/drivers/segahang.c +++ b/src/mame/drivers/segahang.c @@ -452,7 +452,7 @@ static ADDRESS_MAP_START( sound_map_2203, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0xc000, 0xc7ff) AM_MIRROR(0x0800) AM_RAM - AM_RANGE(0xd000, 0xd001) AM_MIRROR(0x0ffe) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0xd000, 0xd001) AM_MIRROR(0x0ffe) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0xe000, 0xe0ff) AM_MIRROR(0x0f00) AM_DEVREADWRITE("pcm", sega_pcm_r, sega_pcm_w) ADDRESS_MAP_END @@ -473,7 +473,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_portmap_2151, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x40, 0x40) AM_MIRROR(0x3f) AM_READ(sound_data_r) ADDRESS_MAP_END @@ -939,7 +939,7 @@ static MACHINE_DRIVER_START( sound_board_2203 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2203, MASTER_CLOCK_8MHz/2) + MDRV_SOUND_ADD("ymsnd", YM2203, MASTER_CLOCK_8MHz/2) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.13) MDRV_SOUND_ROUTE(0, "rspeaker", 0.13) @@ -1005,7 +1005,7 @@ static MACHINE_DRIVER_START( sound_board_2151 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, MASTER_CLOCK_8MHz/2) + MDRV_SOUND_ADD("ymsnd", YM2151, MASTER_CLOCK_8MHz/2) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.43) MDRV_SOUND_ROUTE(1, "rspeaker", 0.43) diff --git a/src/mame/drivers/segamsys.c b/src/mame/drivers/segamsys.c index c0a15391048..a11e3aedda5 100644 --- a/src/mame/drivers/segamsys.c +++ b/src/mame/drivers/segamsys.c @@ -1643,7 +1643,7 @@ static void megatech_set_genz80_as_sms_standard_ports(running_machine *machine, /* INIT THE PORTS *********************************************************************************************/ const address_space *io = cputag_get_address_space(machine, tag, ADDRESS_SPACE_IO); - const device_config *sn = devtag_get_device(machine, "sn"); + const device_config *sn = devtag_get_device(machine, "snsnd"); memory_install_readwrite8_handler(io, 0x0000, 0xffff, 0, 0, z80_unmapped_port_r, z80_unmapped_port_w); @@ -1749,7 +1749,7 @@ MACHINE_DRIVER_START( sms ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("sn", SN76496, 3579540) + MDRV_SOUND_ADD("snsnd", SN76496, 3579540) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/segaorun.c b/src/mame/drivers/segaorun.c index 909a8f66662..184167f2cf8 100644 --- a/src/mame/drivers/segaorun.c +++ b/src/mame/drivers/segaorun.c @@ -553,7 +553,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x40, 0x40) AM_MIRROR(0x3f) AM_READ(sound_data_r) ADDRESS_MAP_END @@ -836,7 +836,7 @@ static MACHINE_DRIVER_START( outrundx ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK/4) + MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK/4) MDRV_SOUND_ROUTE(0, "lspeaker", 0.43) MDRV_SOUND_ROUTE(1, "rspeaker", 0.43) diff --git a/src/mame/drivers/segas16a.c b/src/mame/drivers/segas16a.c index 59f6a7a11ad..41668d32f3b 100644 --- a/src/mame/drivers/segas16a.c +++ b/src/mame/drivers/segas16a.c @@ -1003,7 +1003,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x80, 0x80) AM_MIRROR(0x3f) AM_WRITE(n7751_command_w) AM_RANGE(0xc0, 0xc0) AM_MIRROR(0x3f) AM_READ(sound_data_r) ADDRESS_MAP_END @@ -1950,7 +1950,7 @@ static MACHINE_DRIVER_START( system16a ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 4000000) + MDRV_SOUND_ADD("ymsnd", YM2151, 4000000) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.43) @@ -1964,7 +1964,7 @@ static MACHINE_DRIVER_START( system16a_no7751 ) MDRV_DEVICE_REMOVE("n7751") MDRV_DEVICE_REMOVE("dac") - MDRV_SOUND_REPLACE("ym", YM2151, 4000000) + MDRV_SOUND_REPLACE("ymsnd", YM2151, 4000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/segas16b.c b/src/mame/drivers/segas16b.c index 4c554ceb8ca..1edf940f9e2 100644 --- a/src/mame/drivers/segas16b.c +++ b/src/mame/drivers/segas16b.c @@ -1558,7 +1558,7 @@ static void wrestwar_i8751_sim(running_machine *machine) static WRITE16_HANDLER( atomicp_sound_w ) { - ym2413_w(devtag_get_device(space->machine, "ym"), offset, data >> 8); + ym2413_w(devtag_get_device(space->machine, "ymsnd"), offset, data >> 8); } @@ -1785,7 +1785,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x40, 0x40) AM_MIRROR(0x3f) AM_DEVWRITE("upd", upd7759_control_w) AM_RANGE(0x80, 0x80) AM_MIRROR(0x3f) AM_DEVREADWRITE("upd", upd7759_status_r, upd7759_port_w) AM_RANGE(0xc0, 0xc0) AM_MIRROR(0x3f) AM_READ(soundlatch_r) @@ -3264,7 +3264,7 @@ static MACHINE_DRIVER_START( system16b ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, MASTER_CLOCK_8MHz/2) + MDRV_SOUND_ADD("ymsnd", YM2151, MASTER_CLOCK_8MHz/2) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.43) MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK) @@ -3299,7 +3299,7 @@ static MACHINE_DRIVER_START( atomicp ) /* 10MHz CPU Clock verified */ MDRV_MACHINE_RESET(atomicp) /* sound hardware */ - MDRV_SOUND_REPLACE("ym", YM2413, XTAL_20MHz/4) /* 20MHz OSC divided by 4 (verified) */ + MDRV_SOUND_REPLACE("ymsnd", YM2413, XTAL_20MHz/4) /* 20MHz OSC divided by 4 (verified) */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_DEVICE_REMOVE("upd") diff --git a/src/mame/drivers/segas18.c b/src/mame/drivers/segas18.c index 42c61959d08..784a54f40e9 100644 --- a/src/mame/drivers/segas18.c +++ b/src/mame/drivers/segas18.c @@ -605,8 +605,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x9fff) AM_ROM AM_REGION("soundcpu", 0x10000) AM_RANGE(0xa000, 0xbfff) AM_ROMBANK(1) - AM_RANGE(0xc000, 0xc00f) AM_MIRROR(0x0ff0) AM_DEVWRITE("rf", rf5c68_w) - AM_RANGE(0xd000, 0xdfff) AM_DEVREADWRITE("rf", rf5c68_mem_r, rf5c68_mem_w) + AM_RANGE(0xc000, 0xc00f) AM_MIRROR(0x0ff0) AM_DEVWRITE("rfsnd", rf5c68_w) + AM_RANGE(0xd000, 0xdfff) AM_DEVREADWRITE("rfsnd", rf5c68_mem_r, rf5c68_mem_w) AM_RANGE(0xe000, 0xffff) AM_RAM ADDRESS_MAP_END @@ -1293,7 +1293,7 @@ static MACHINE_DRIVER_START( system18 ) MDRV_SOUND_ADD("ym2", YM3438, 8000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) - MDRV_SOUND_ADD("rf", RF5C68, 10000000) + MDRV_SOUND_ADD("rfsnd", RF5C68, 10000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/segas24.c b/src/mame/drivers/segas24.c index f29c482862f..161b6bdd992 100644 --- a/src/mame/drivers/segas24.c +++ b/src/mame/drivers/segas24.c @@ -693,7 +693,7 @@ static void reset_reset(running_machine *machine) cputag_set_input_line(machine, "sub", INPUT_LINE_HALT, ASSERT_LINE); } if(changed & 4) - devtag_reset(machine, "ym"); + devtag_reset(machine, "ymsnd"); prev_resetcontrol = resetcontrol; } @@ -1007,7 +1007,7 @@ static ADDRESS_MAP_START( system24_cpu1_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x404000, 0x40401f) AM_MIRROR(0x1fbfe0) AM_READWRITE(sys24_mixer_r, sys24_mixer_w) AM_RANGE(0x600000, 0x63ffff) AM_MIRROR(0x180000) AM_READWRITE(sys24_sprite_r, sys24_sprite_w) AM_RANGE(0x800000, 0x80007f) AM_MIRROR(0x1ffe00) AM_READWRITE(system24temp_sys16_io_r, system24temp_sys16_io_w) - AM_RANGE(0x800100, 0x800103) AM_MIRROR(0x1ffe00) AM_DEVREADWRITE8("ym", ym2151_r, ym2151_w, 0x00ff) + AM_RANGE(0x800100, 0x800103) AM_MIRROR(0x1ffe00) AM_DEVREADWRITE8("ymsnd", ym2151_r, ym2151_w, 0x00ff) AM_RANGE(0xa00000, 0xa00007) AM_MIRROR(0x0ffff8) AM_READWRITE(irq_r, irq_w) AM_RANGE(0xb00000, 0xb00007) AM_MIRROR(0x07fff0) AM_READWRITE(fdc_r, fdc_w) AM_RANGE(0xb00008, 0xb0000f) AM_MIRROR(0x07fff0) AM_READWRITE(fdc_status_r, fdc_ctrl_w) @@ -1044,7 +1044,7 @@ static ADDRESS_MAP_START( system24_cpu2_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x404000, 0x40401f) AM_MIRROR(0x1fbfe0) AM_READWRITE(sys24_mixer_r, sys24_mixer_w) AM_RANGE(0x600000, 0x63ffff) AM_MIRROR(0x180000) AM_READWRITE(sys24_sprite_r, sys24_sprite_w) AM_RANGE(0x800000, 0x80007f) AM_MIRROR(0x1ffe00) AM_READWRITE(system24temp_sys16_io_r, system24temp_sys16_io_w) - AM_RANGE(0x800100, 0x800103) AM_MIRROR(0x1ffe00) AM_DEVREADWRITE8("ym", ym2151_r, ym2151_w, 0x00ff) + AM_RANGE(0x800100, 0x800103) AM_MIRROR(0x1ffe00) AM_DEVREADWRITE8("ymsnd", ym2151_r, ym2151_w, 0x00ff) AM_RANGE(0xa00000, 0xa00007) AM_MIRROR(0x0ffff8) AM_READWRITE(irq_r, irq_w) AM_RANGE(0xb00000, 0xb00007) AM_MIRROR(0x07fff0) AM_READWRITE(fdc_r, fdc_w) AM_RANGE(0xb00008, 0xb0000f) AM_MIRROR(0x07fff0) AM_READWRITE(fdc_status_r, fdc_ctrl_w) @@ -1800,7 +1800,7 @@ static MACHINE_DRIVER_START( system24 ) MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 4000000) + MDRV_SOUND_ADD("ymsnd", YM2151, 4000000) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c index 9705211a413..54c414a3d09 100644 --- a/src/mame/drivers/segas32.c +++ b/src/mame/drivers/segas32.c @@ -1259,8 +1259,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( system32_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x9fff) AM_ROM AM_REGION("soundcpu", 0x100000) AM_RANGE(0xa000, 0xbfff) AM_ROMBANK(1) - AM_RANGE(0xc000, 0xc00f) AM_MIRROR(0x0ff0) AM_DEVWRITE("rf", rf5c68_w) - AM_RANGE(0xd000, 0xdfff) AM_DEVREADWRITE("rf", rf5c68_mem_r, rf5c68_mem_w) + AM_RANGE(0xc000, 0xc00f) AM_MIRROR(0x0ff0) AM_DEVWRITE("rfsnd", rf5c68_w) + AM_RANGE(0xd000, 0xdfff) AM_DEVREADWRITE("rfsnd", rf5c68_mem_r, rf5c68_mem_w) AM_RANGE(0xe000, 0xffff) AM_RAM AM_BASE(&z80_shared_ram) ADDRESS_MAP_END @@ -1287,7 +1287,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( multi32_sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x80, 0x83) AM_MIRROR(0x0c) AM_DEVREADWRITE("ym", ym3438_r, ym3438_w) + AM_RANGE(0x80, 0x83) AM_MIRROR(0x0c) AM_DEVREADWRITE("ymsnd", ym3438_r, ym3438_w) AM_RANGE(0xa0, 0xaf) AM_WRITE(sound_bank_lo_w) AM_RANGE(0xb0, 0xbf) AM_DEVWRITE("sega", multipcm_bank_w) AM_RANGE(0xc0, 0xcf) AM_WRITE(sound_int_control_lo_w) @@ -2215,7 +2215,7 @@ static MACHINE_DRIVER_START( system32 ) MDRV_SOUND_ROUTE(0, "lspeaker", 0.40) MDRV_SOUND_ROUTE(1, "rspeaker", 0.40) - MDRV_SOUND_ADD("rf", RF5C68, RFC_CLOCK/4) + MDRV_SOUND_ADD("rfsnd", RF5C68, RFC_CLOCK/4) MDRV_SOUND_ROUTE(0, "lspeaker", 0.55) MDRV_SOUND_ROUTE(1, "rspeaker", 0.55) MACHINE_DRIVER_END @@ -2267,7 +2267,7 @@ static MACHINE_DRIVER_START( multi32 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM3438, MASTER_CLOCK/4) + MDRV_SOUND_ADD("ymsnd", YM3438, MASTER_CLOCK/4) MDRV_SOUND_CONFIG(ym3438_config) MDRV_SOUND_ROUTE(1, "lspeaker", 0.40) MDRV_SOUND_ROUTE(0, "rspeaker", 0.40) diff --git a/src/mame/drivers/segaxbd.c b/src/mame/drivers/segaxbd.c index ffdd9bdd420..5095cd982ab 100644 --- a/src/mame/drivers/segaxbd.c +++ b/src/mame/drivers/segaxbd.c @@ -793,7 +793,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x40, 0x40) AM_MIRROR(0x3f) AM_READ(sound_data_r) ADDRESS_MAP_END @@ -1366,7 +1366,7 @@ static MACHINE_DRIVER_START( xboard ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK/4) + MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK/4) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.43) MDRV_SOUND_ROUTE(1, "rspeaker", 0.43) diff --git a/src/mame/drivers/segaybd.c b/src/mame/drivers/segaybd.c index 8969634324d..89468ed6021 100644 --- a/src/mame/drivers/segaybd.c +++ b/src/mame/drivers/segaybd.c @@ -460,7 +460,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x40, 0x40) AM_MIRROR(0x3f) AM_READ(sound_data_r) ADDRESS_MAP_END @@ -858,10 +858,10 @@ static INPUT_PORTS_START( rchase ) PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) ) PORT_DIPNAME( 0x04, 0x04, "Coin #1 multiplier" ) PORT_DIPLOCATION("SWA:3") - PORT_DIPSETTING( 0x04, "x1" ) + PORT_DIPSETTING( 0x04, "x1snd" ) PORT_DIPSETTING( 0x00, "x2" ) PORT_DIPNAME( 0x18, 0x18, "Coin #2 multiplier" ) PORT_DIPLOCATION("SWA:4,5") - PORT_DIPSETTING( 0x18, "x1" ) + PORT_DIPSETTING( 0x18, "x1snd" ) PORT_DIPSETTING( 0x10, "x4" ) PORT_DIPSETTING( 0x08, "x5" ) PORT_DIPSETTING( 0x00, "x6" ) @@ -999,7 +999,7 @@ static MACHINE_DRIVER_START( yboard ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK/8) + MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK/8) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.43) MDRV_SOUND_ROUTE(1, "rspeaker", 0.43) diff --git a/src/mame/drivers/seicross.c b/src/mame/drivers/seicross.c index dd559a8dc46..ab4dc422585 100644 --- a/src/mame/drivers/seicross.c +++ b/src/mame/drivers/seicross.c @@ -133,8 +133,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_MIRROR(0x08) AM_DEVWRITE("ay", ay8910_address_data_w) - AM_RANGE(0x04, 0x04) AM_MIRROR(0x08) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x00, 0x01) AM_MIRROR(0x08) AM_DEVWRITE("aysnd", ay8910_address_data_w) + AM_RANGE(0x04, 0x04) AM_MIRROR(0x08) AM_DEVREAD("aysnd", ay8910_r) ADDRESS_MAP_END @@ -431,7 +431,7 @@ static MACHINE_DRIVER_START( nvram ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 1536000) + MDRV_SOUND_ADD("aysnd", AY8910, 1536000) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c index 2af06a307c3..490294e6222 100644 --- a/src/mame/drivers/seta.c +++ b/src/mame/drivers/seta.c @@ -1601,7 +1601,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( downtown_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x09ffff) AM_ROM // ROM - AM_RANGE(0x100000, 0x103fff) AM_DEVREADWRITE("x1", seta_sound_word_r,seta_sound_word_w) // Sound + AM_RANGE(0x100000, 0x103fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0x200000, 0x200001) AM_NOP // watchdog? (twineagl) AM_RANGE(0x300000, 0x300001) AM_WRITENOP // IRQ enable/acknowledge? AM_RANGE(0x400000, 0x400007) AM_WRITE(twineagl_tilebank_w) // special tile banking to animate water in twineagl @@ -1765,7 +1765,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( atehate_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM AM_RANGE(0x900000, 0x9fffff) AM_RAM // RAM - AM_RANGE(0x100000, 0x103fff) AM_DEVREADWRITE("x1", seta_sound_word_r,seta_sound_word_w) // Sound + AM_RANGE(0x100000, 0x103fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0x200000, 0x200001) AM_WRITENOP // ? watchdog ? AM_RANGE(0x300000, 0x300001) AM_WRITENOP // ? 0 (irq ack lev 2?) AM_RANGE(0x500000, 0x500001) AM_WRITENOP // ? (end of lev 1: bit 4 goes 1,0,1) @@ -1806,7 +1806,7 @@ static ADDRESS_MAP_START( blandia_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xb04000, 0xb0ffff) AM_RAM // (jjsquawk) AM_RANGE(0xb80000, 0xb83fff) AM_RAM_WRITE(seta_vram_2_w) AM_BASE(&seta_vram_2) // VRAM 2&3 AM_RANGE(0xb84000, 0xb8ffff) AM_RAM // (jjsquawk) - AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE("x1", seta_sound_word_r,seta_sound_word_w) // Sound + AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0xd00000, 0xd00007) AM_WRITENOP // ? AM_RANGE(0xe00000, 0xe00001) AM_WRITENOP // ? VBlank IRQ Ack AM_RANGE(0xf00000, 0xf00001) AM_WRITENOP // ? Sound IRQ Ack @@ -1840,7 +1840,7 @@ static ADDRESS_MAP_START( blandiap_map, ADDRESS_SPACE_PROGRAM, 16 ) /**/AM_RANGE(0xa00000, 0xa00607) AM_RAM AM_BASE(&spriteram16) // Sprites Y /**/AM_RANGE(0xa80000, 0xa80001) AM_RAM // ? 0x4000 AM_RANGE(0xb00000, 0xb03fff) AM_RAM AM_BASE(&spriteram16_2) // Sprites Code + X + Attr - AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE("x1", seta_sound_word_r,seta_sound_word_w) // Sound + AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0xd00000, 0xd00007) AM_WRITENOP // ? AM_RANGE(0xe00000, 0xe00001) AM_WRITENOP // ? VBlank IRQ Ack AM_RANGE(0xf00000, 0xf00001) AM_WRITENOP // ? Sound IRQ Ack @@ -1918,7 +1918,7 @@ static ADDRESS_MAP_START( wrofaero_map, ADDRESS_SPACE_PROGRAM, 16 ) /**/AM_RANGE(0xa00000, 0xa00607) AM_RAM AM_BASE(&spriteram16) // Sprites Y /**/AM_RANGE(0xa80000, 0xa80001) AM_RAM // ? 0x4000 AM_RANGE(0xb00000, 0xb03fff) AM_RAM AM_BASE(&spriteram16_2) // Sprites Code + X + Attr - AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE("x1", seta_sound_word_r,seta_sound_word_w) // Sound + AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound #if __uPD71054_TIMER AM_RANGE(0xd00000, 0xd00007) AM_WRITE(timer_regs_w) // ? #else @@ -1950,7 +1950,7 @@ static ADDRESS_MAP_START( jjsquawb_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xa0a000, 0xa0a607) AM_RAM AM_BASE(&spriteram16) // RZ: Sprites Y // AM_RANGE(0xa80000, 0xa80001) AM_RAM // ? 0x4000 AM_RANGE(0xb0c000, 0xb0ffff) AM_RAM AM_BASE(&spriteram16_2) // RZ: Sprites Code + X + Attr - AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE("x1", seta_sound_word_r,seta_sound_word_w) // Sound + AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound #if __uPD71054_TIMER AM_RANGE(0xd00000, 0xd00007) AM_WRITE(timer_regs_w) // ? #else @@ -1977,7 +1977,7 @@ static ADDRESS_MAP_START( orbs_map, ADDRESS_SPACE_PROGRAM, 16 ) //AM_RANGE(0x600000, 0x60000f) AM_READ(krzybowl_input_r ) // P1 AM_RANGE(0x8000f0, 0x8000f1) AM_RAM // NVRAM AM_RANGE(0x800100, 0x8001ff) AM_RAM // NVRAM - AM_RANGE(0xa00000, 0xa03fff) AM_DEVREADWRITE("x1", seta_sound_word_r,seta_sound_word_w) // Sound + AM_RANGE(0xa00000, 0xa03fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0xb00000, 0xb003ff) AM_RAM AM_BASE(&paletteram16) AM_SIZE(&seta_paletteram_size) // Palette AM_RANGE(0xc00000, 0xc03fff) AM_RAM AM_BASE(&spriteram16_2) // Sprites Code + X + Attr /**/AM_RANGE(0xd00000, 0xd00001) AM_RAM // ? 0x4000 @@ -2059,7 +2059,7 @@ static ADDRESS_MAP_START( keroppi_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800100, 0x8001ff) AM_RAM // NVRAM AM_RANGE(0x900000, 0x900001) AM_WRITENOP // ? AM_RANGE(0x900002, 0x900003) AM_WRITE(keroppi_prize_w) // - AM_RANGE(0xa00000, 0xa03fff) AM_DEVREADWRITE("x1", seta_sound_word_r,seta_sound_word_w) // Sound + AM_RANGE(0xa00000, 0xa03fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0xb00000, 0xb003ff) AM_RAM AM_BASE(&paletteram16) AM_SIZE(&seta_paletteram_size) // Palette AM_RANGE(0xc00000, 0xc03fff) AM_RAM AM_BASE(&spriteram16_2) // Sprites Code + X + Attr /**/AM_RANGE(0xd00000, 0xd00001) AM_RAM // ? 0x4000 @@ -2089,7 +2089,7 @@ static ADDRESS_MAP_START( blockcar_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x500000, 0x500001) AM_READ_PORT("P1") // P1 AM_RANGE(0x500002, 0x500003) AM_READ_PORT("P2") // P2 AM_RANGE(0x500004, 0x500005) AM_READ_PORT("COINS") // Coins - AM_RANGE(0xa00000, 0xa03fff) AM_DEVREADWRITE("x1", seta_sound_word_r,seta_sound_word_w) // Sound + AM_RANGE(0xa00000, 0xa03fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0xb00000, 0xb003ff) AM_RAM AM_BASE(&paletteram16) AM_SIZE(&seta_paletteram_size) // Palette AM_RANGE(0xc00000, 0xc03fff) AM_RAM AM_BASE(&spriteram16_2) // Sprites Code + X + Attr /**/AM_RANGE(0xd00000, 0xd00001) AM_RAM // ? 0x4000 @@ -2123,7 +2123,7 @@ static ADDRESS_MAP_START( daioh_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xa80000, 0xa80001) AM_RAM // ? 0x4000 AM_RANGE(0xb00000, 0xb03fff) AM_RAM AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr AM_RANGE(0xb04000, 0xb13fff) AM_RAM - AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE("x1", seta_sound_word_r,seta_sound_word_w) // Sound + AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0xe00000, 0xe00001) AM_WRITENOP // ADDRESS_MAP_END @@ -2136,7 +2136,7 @@ static ADDRESS_MAP_START( drgnunit_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0bffff) AM_ROM // ROM AM_RANGE(0xf00000, 0xf0ffff) AM_RAM // RAM (qzkklogy) AM_RANGE(0xffc000, 0xffffff) AM_RAM // RAM (drgnunit,stg) - AM_RANGE(0x100000, 0x103fff) AM_DEVREADWRITE("x1", seta_sound_word_r,seta_sound_word_w) // Sound + AM_RANGE(0x100000, 0x103fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0x200000, 0x200001) AM_WRITENOP // Watchdog AM_RANGE(0x300000, 0x300001) AM_WRITENOP // ? IRQ Ack AM_RANGE(0x500000, 0x500001) AM_RAM_WRITE(seta_vregs_w) AM_BASE(&seta_vregs) // Coin Lockout + Video Registers @@ -2265,7 +2265,7 @@ static ADDRESS_MAP_START( extdwnhl_map, ADDRESS_SPACE_PROGRAM, 16 ) /**/AM_RANGE(0xa80000, 0xa80001) AM_RAM // ? 0x4000 AM_RANGE(0xb00000, 0xb03fff) AM_RAM AM_BASE(&spriteram16_2) // Sprites Code + X + Attr AM_RANGE(0xb04000, 0xb13fff) AM_RAM // - AM_RANGE(0xe00000, 0xe03fff) AM_DEVREADWRITE("x1", seta_sound_word_r,seta_sound_word_w) // Sound + AM_RANGE(0xe00000, 0xe03fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound ADDRESS_MAP_END @@ -2301,7 +2301,7 @@ static ADDRESS_MAP_START( kamenrid_map, ADDRESS_SPACE_PROGRAM, 16 ) #else AM_RANGE(0xc00000, 0xc00007) AM_WRITENOP // ? #endif - AM_RANGE(0xd00000, 0xd03fff) AM_DEVREADWRITE("x1", seta_sound_word_r,seta_sound_word_w) // Sound + AM_RANGE(0xd00000, 0xd03fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound ADDRESS_MAP_END /* almost identical to kamenrid */ @@ -2329,7 +2329,7 @@ static ADDRESS_MAP_START( madshark_map, ADDRESS_SPACE_PROGRAM, 16 ) #else AM_RANGE(0xc00000, 0xc00007) AM_WRITENOP // ? #endif - AM_RANGE(0xd00000, 0xd03fff) AM_DEVREADWRITE("x1", seta_sound_word_r,seta_sound_word_w) // Sound + AM_RANGE(0xd00000, 0xd03fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound ADDRESS_MAP_END @@ -2374,7 +2374,7 @@ static ADDRESS_MAP_START( krzybowl_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x600000, 0x60000f) AM_READ(krzybowl_input_r) // P1 AM_RANGE(0x8000f0, 0x8000f1) AM_RAM // NVRAM AM_RANGE(0x800100, 0x8001ff) AM_RAM // NVRAM - AM_RANGE(0xa00000, 0xa03fff) AM_DEVREADWRITE("x1", seta_sound_word_r,seta_sound_word_w) // Sound + AM_RANGE(0xa00000, 0xa03fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0xb00000, 0xb003ff) AM_RAM AM_BASE(&paletteram16) AM_SIZE(&seta_paletteram_size) // Palette AM_RANGE(0xc00000, 0xc03fff) AM_RAM AM_BASE(&spriteram16_2) // Sprites Code + X + Attr /**/AM_RANGE(0xd00000, 0xd00001) AM_RAM // ? 0x4000 @@ -2418,7 +2418,7 @@ static ADDRESS_MAP_START( msgundam_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xa80000, 0xa83fff) AM_RAM_WRITE(seta_vram_2_w) AM_BASE(&seta_vram_2) // VRAM 2&3 AM_RANGE(0xb00000, 0xb00005) AM_RAM AM_BASE(&seta_vctrl_0) // VRAM 0&1 Ctrl AM_RANGE(0xb80000, 0xb80005) AM_RAM AM_BASE(&seta_vctrl_2) // VRAM 2&3 Ctrl - AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE("x1", seta_sound_word_r,seta_sound_word_w) // Sound + AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound #if __uPD71054_TIMER AM_RANGE(0xd00000, 0xd00007) AM_WRITE(timer_regs_w) // ? #else @@ -2442,7 +2442,7 @@ static ADDRESS_MAP_START( oisipuzl_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x400004, 0x400005) AM_READ_PORT("COINS") // Coins AM_RANGE(0x400000, 0x400001) AM_WRITENOP // ? IRQ Ack AM_RANGE(0x500000, 0x500005) AM_RAM_WRITE(seta_vregs_w) AM_BASE(&seta_vregs) // Coin Lockout + Video Registers - AM_RANGE(0x700000, 0x703fff) AM_DEVREADWRITE("x1", seta_sound_word_r,seta_sound_word_w) // Sound + AM_RANGE(0x700000, 0x703fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE(seta_vram_0_w) AM_BASE(&seta_vram_0) // VRAM 0&1 AM_RANGE(0x880000, 0x883fff) AM_RAM_WRITE(seta_vram_2_w) AM_BASE(&seta_vram_2) // VRAM 2&3 /**/AM_RANGE(0x900000, 0x900005) AM_RAM AM_BASE(&seta_vctrl_0) // VRAM 0&1 Ctrl @@ -2529,7 +2529,7 @@ static ADDRESS_MAP_START( kiwame_map, ADDRESS_SPACE_PROGRAM, 16 ) /**/AM_RANGE(0x900000, 0x900001) AM_RAM // ? 0x4000 /**/AM_RANGE(0xa00000, 0xa00607) AM_RAM AM_BASE(&spriteram16) // Sprites Y AM_RANGE(0xb00000, 0xb003ff) AM_RAM AM_BASE(&paletteram16) AM_SIZE(&seta_paletteram_size) // Palette - AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE("x1", seta_sound_word_r,seta_sound_word_w) // Sound + AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0xd00000, 0xd00009) AM_READ(kiwame_input_r) // mahjong panel AM_RANGE(0xe00000, 0xe00003) AM_READ(seta_dsw_r) // DSW ADDRESS_MAP_END @@ -2554,7 +2554,7 @@ static WRITE16_HANDLER( thunderl_protection_w ) static ADDRESS_MAP_START( thunderl_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x00ffff) AM_ROM // ROM AM_RANGE(0xffc000, 0xffffff) AM_RAM // RAM - AM_RANGE(0x100000, 0x103fff) AM_DEVREADWRITE("x1", seta_sound_word_r,seta_sound_word_w) // Sound + AM_RANGE(0x100000, 0x103fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0x200000, 0x200001) AM_WRITENOP // ? AM_RANGE(0x300000, 0x300001) AM_WRITENOP // ? AM_RANGE(0x400000, 0x40ffff) AM_WRITE(thunderl_protection_w) // Protection (not in wits) @@ -2640,7 +2640,7 @@ static ADDRESS_MAP_START( umanclub_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xa00000, 0xa00607) AM_RAM AM_BASE(&spriteram16) // Sprites Y /**/AM_RANGE(0xa80000, 0xa80001) AM_RAM // ? 0x4000 AM_RANGE(0xb00000, 0xb03fff) AM_RAM AM_BASE(&spriteram16_2) // Sprites Code + X + Attr - AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE("x1", seta_sound_word_r,seta_sound_word_w) // Sound + AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound ADDRESS_MAP_END @@ -2709,7 +2709,7 @@ static ADDRESS_MAP_START( pairlove_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x500002, 0x500003) AM_READ_PORT("P2") // P2 AM_RANGE(0x500004, 0x500005) AM_READ_PORT("COINS") // Coins AM_RANGE(0x900000, 0x9001ff) AM_READWRITE(pairlove_prot_r,pairlove_prot_w) - AM_RANGE(0xa00000, 0xa03fff) AM_DEVREADWRITE("x1", seta_sound_word_r,seta_sound_word_w) // Sound + AM_RANGE(0xa00000, 0xa03fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0xb00000, 0xb00fff) AM_RAM AM_BASE(&paletteram16) AM_SIZE(&seta_paletteram_size) // Palette AM_RANGE(0xc00000, 0xc03fff) AM_RAM AM_BASE(&spriteram16_2) // Sprites Code + X + Attr AM_RANGE(0xd00000, 0xd00001) AM_RAM // ? 0x4000 @@ -2732,7 +2732,7 @@ static ADDRESS_MAP_START( crazyfgt_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x620000, 0x620003) AM_WRITENOP // protection AM_RANGE(0x630000, 0x630003) AM_READ(seta_dsw_r) AM_RANGE(0x640400, 0x640fff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette - AM_RANGE(0x650000, 0x650003) AM_DEVWRITE8("ym", ym3812_w, 0x00ff) + AM_RANGE(0x650000, 0x650003) AM_DEVWRITE8("ymsnd", ym3812_w, 0x00ff) AM_RANGE(0x658000, 0x658001) AM_DEVWRITE8("oki", okim6295_w, 0x00ff) AM_RANGE(0x670000, 0x670001) AM_READNOP // watchdog? AM_RANGE(0x800000, 0x803fff) AM_WRITE(seta_vram_2_w) AM_BASE(&seta_vram_2) // VRAM 2 @@ -2798,7 +2798,7 @@ static ADDRESS_MAP_START( inttoote_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800000, 0x80001f) AM_DEVREADWRITE8("rtc", msm6242_r, msm6242_w, 0x00ff) // 6242RTC - AM_RANGE(0x900000, 0x903fff) AM_DEVREADWRITE( "x1", seta_sound_word_r, seta_sound_word_w ) // Sound + AM_RANGE(0x900000, 0x903fff) AM_DEVREADWRITE( "x1snd", seta_sound_word_r, seta_sound_word_w ) // Sound AM_RANGE(0xa00000, 0xa00005) AM_WRITE(SMH_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM 0&1 Ctrl AM_RANGE(0xb00000, 0xb03fff) AM_READWRITE(SMH_RAM,seta_vram_0_w) AM_BASE(&seta_vram_0 ) // VRAM 0&1 @@ -2860,7 +2860,7 @@ static ADDRESS_MAP_START( jockeyc_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800000, 0x80001f) AM_DEVREADWRITE8("rtc", msm6242_r, msm6242_w, 0x00ff) // 6242RTC - AM_RANGE(0x900000, 0x903fff) AM_DEVREADWRITE( "x1", seta_sound_word_r, seta_sound_word_w) // Sound + AM_RANGE(0x900000, 0x903fff) AM_DEVREADWRITE( "x1snd", seta_sound_word_r, seta_sound_word_w) // Sound AM_RANGE(0xa00000, 0xa00005) AM_WRITEONLY AM_BASE(&seta_vctrl_0) // VRAM 0&1 Ctrl AM_RANGE(0xb00000, 0xb03fff) AM_RAM_WRITE(seta_vram_0_w) AM_BASE(&seta_vram_0) // VRAM 0&1 @@ -2997,7 +2997,7 @@ static WRITE8_HANDLER( calibr50_soundlatch2_w ) } static ADDRESS_MAP_START( calibr50_sub_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_DEVREADWRITE("x1", seta_sound_r,seta_sound_w) // Sound + AM_RANGE(0x0000, 0x1fff) AM_DEVREADWRITE("x1snd", seta_sound_r,seta_sound_w) // Sound AM_RANGE(0x4000, 0x4000) AM_READ(soundlatch_r) // From Main CPU AM_RANGE(0x4000, 0x4000) AM_WRITE(sub_bankswitch_w) // Bankswitching AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) // Banked ROM @@ -3033,12 +3033,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( utoukond_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xdfff) AM_ROM AM_RANGE(0xe000, 0xefff) AM_RAM - AM_RANGE(0xf000, 0xffff) AM_DEVREADWRITE("x1", seta_sound_r,seta_sound_w) + AM_RANGE(0xf000, 0xffff) AM_DEVREADWRITE("x1snd", seta_sound_r,seta_sound_w) ADDRESS_MAP_END static ADDRESS_MAP_START( utoukond_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ym", ym3438_r, ym3438_w) + AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ymsnd", ym3438_r, ym3438_w) AM_RANGE(0x80, 0x80) AM_WRITENOP //? AM_RANGE(0xc0, 0xc0) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -6872,7 +6872,7 @@ static MACHINE_DRIVER_START( twineagl ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -6912,7 +6912,7 @@ static MACHINE_DRIVER_START( downtown ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END @@ -6973,7 +6973,7 @@ static MACHINE_DRIVER_START( usclssic ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf2) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -7019,7 +7019,7 @@ static MACHINE_DRIVER_START( calibr50 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf2) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END @@ -7059,7 +7059,7 @@ static MACHINE_DRIVER_START( metafox ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -7094,7 +7094,7 @@ static MACHINE_DRIVER_START( atehate ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -7137,7 +7137,7 @@ static MACHINE_DRIVER_START( blandia ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -7169,7 +7169,7 @@ static MACHINE_DRIVER_START( blandiap ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -7204,7 +7204,7 @@ static MACHINE_DRIVER_START( blockcar ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -7239,7 +7239,7 @@ static MACHINE_DRIVER_START( daioh ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -7280,7 +7280,7 @@ static MACHINE_DRIVER_START( drgnunit ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -7314,7 +7314,7 @@ static MACHINE_DRIVER_START( qzkklgy2 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -7361,7 +7361,7 @@ static MACHINE_DRIVER_START( setaroul ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -7396,7 +7396,7 @@ static MACHINE_DRIVER_START( eightfrc ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -7437,7 +7437,7 @@ static MACHINE_DRIVER_START( extdwnhl ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -7498,7 +7498,7 @@ static MACHINE_DRIVER_START( gundhara ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -7538,7 +7538,7 @@ static MACHINE_DRIVER_START( jjsquawk ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -7569,7 +7569,7 @@ static MACHINE_DRIVER_START( jjsquawb ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -7608,7 +7608,7 @@ static MACHINE_DRIVER_START( kamenrid ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -7644,7 +7644,7 @@ static MACHINE_DRIVER_START( orbs ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 14318180) /* 14.318180 MHz */ + MDRV_SOUND_ADD("x1snd", X1_010, 14318180) /* 14.318180 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -7681,7 +7681,7 @@ static MACHINE_DRIVER_START( keroppi ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 14318180) /* 14.318180 MHz */ + MDRV_SOUND_ADD("x1snd", X1_010, 14318180) /* 14.318180 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -7716,7 +7716,7 @@ static MACHINE_DRIVER_START( krzybowl ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -7758,7 +7758,7 @@ static MACHINE_DRIVER_START( madshark ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -7803,7 +7803,7 @@ static MACHINE_DRIVER_START( msgundam ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -7839,7 +7839,7 @@ static MACHINE_DRIVER_START( oisipuzl ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -7910,7 +7910,7 @@ static MACHINE_DRIVER_START( kiwame ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -7948,7 +7948,7 @@ static MACHINE_DRIVER_START( rezon ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -7986,7 +7986,7 @@ static MACHINE_DRIVER_START( thunderl ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -8050,7 +8050,7 @@ static MACHINE_DRIVER_START( wits ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -8085,7 +8085,7 @@ static MACHINE_DRIVER_START( umanclub ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -8124,12 +8124,12 @@ static MACHINE_DRIVER_START( utoukond ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 16000000) + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) MDRV_SOUND_CONFIG(seta_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) - MDRV_SOUND_ADD("ym", YM3438, 16000000/4) /* 4 MHz */ + MDRV_SOUND_ADD("ymsnd", YM3438, 16000000/4) /* 4 MHz */ MDRV_SOUND_CONFIG(utoukond_ym3438_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 0.30) MDRV_SOUND_ROUTE(1, "rspeaker", 0.30) @@ -8172,7 +8172,7 @@ static MACHINE_DRIVER_START( wrofaero ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -8215,7 +8215,7 @@ static MACHINE_DRIVER_START( zingzip ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -8249,7 +8249,7 @@ static MACHINE_DRIVER_START( pairlove ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -8294,7 +8294,7 @@ static MACHINE_DRIVER_START( crazyfgt ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 16000000/4) /* 4 MHz */ + MDRV_SOUND_ADD("ymsnd", YM3812, 16000000/4) /* 4 MHz */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_SOUND_ADD("oki", OKIM6295, 1000000) // clock? @@ -8388,7 +8388,7 @@ static MACHINE_DRIVER_START( inttoote ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 16000000) + MDRV_SOUND_ADD("x1snd", X1_010, 16000000) MDRV_SOUND_CONFIG(seta_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -8478,7 +8478,7 @@ ROM_START( twineagl ) ROM_LOAD( "ua2-7", 0x100000, 0x080000, CRC(fce56907) SHA1(5d0d2d6dfdbadb21f1d61d84b8992ec0e527e18d) ) ROM_LOAD( "ua2-9", 0x180000, 0x080000, CRC(a451eae9) SHA1(c236c92d9ecf56f8d8f4a5ee493e3791be0d3db4) ) - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "ua2-11", 0x000000, 0x080000, CRC(624e6057) SHA1(0e8e4d4b6bc5febf5ca83eea92e3ed06f16e7df0) ) ROM_LOAD( "ua2-12", 0x080000, 0x080000, CRC(3068ff64) SHA1(7c06a48a99ebb9e7f3709f25bd0caa4c9d7a2688) ) ROM_END @@ -8504,7 +8504,7 @@ ROM_START( downtown ) ROM_LOAD( "ud2009.t05", 0x000000, 0x080000, CRC(aee6c581) SHA1(5b2150a308ca12eea8148d0bbff663b3baf0c831) ) ROM_LOAD( "ud2010.t06", 0x080000, 0x080000, CRC(3d399d54) SHA1(7d9036e73fbf0e9c3b976336e3e4786b17b2f4fc) ) - ROM_REGION( 0x080000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x080000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "ud2011.t07", 0x000000, 0x080000, CRC(9c9ff69f) SHA1(3840b654f4f709bc4c03dfe4ee79369d5c70dd62) ) ROM_END @@ -8529,7 +8529,7 @@ ROM_START( downtown2 ) ROM_LOAD( "ud2009.t05", 0x000000, 0x080000, CRC(aee6c581) SHA1(5b2150a308ca12eea8148d0bbff663b3baf0c831) ) ROM_LOAD( "ud2010.t06", 0x080000, 0x080000, CRC(3d399d54) SHA1(7d9036e73fbf0e9c3b976336e3e4786b17b2f4fc) ) - ROM_REGION( 0x080000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x080000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "ud2011.t07", 0x000000, 0x080000, CRC(9c9ff69f) SHA1(3840b654f4f709bc4c03dfe4ee79369d5c70dd62) ) ROM_END @@ -8554,7 +8554,7 @@ ROM_START( downtownj ) ROM_LOAD( "ud2009.t05", 0x000000, 0x080000, CRC(aee6c581) SHA1(5b2150a308ca12eea8148d0bbff663b3baf0c831) ) ROM_LOAD( "ud2010.t06", 0x080000, 0x080000, CRC(3d399d54) SHA1(7d9036e73fbf0e9c3b976336e3e4786b17b2f4fc) ) - ROM_REGION( 0x080000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x080000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "ud2011.t07", 0x000000, 0x080000, CRC(9c9ff69f) SHA1(3840b654f4f709bc4c03dfe4ee79369d5c70dd62) ) ROM_END @@ -8579,7 +8579,7 @@ ROM_START( downtownp ) ROM_LOAD( "ud2009.t05", 0x000000, 0x080000, CRC(aee6c581) SHA1(5b2150a308ca12eea8148d0bbff663b3baf0c831) ) ROM_LOAD( "ud2010.t06", 0x080000, 0x080000, CRC(3d399d54) SHA1(7d9036e73fbf0e9c3b976336e3e4786b17b2f4fc) ) - ROM_REGION( 0x080000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x080000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "ud2011.t07", 0x000000, 0x080000, CRC(9c9ff69f) SHA1(3840b654f4f709bc4c03dfe4ee79369d5c70dd62) ) ROM_END @@ -8620,7 +8620,7 @@ ROM_START( usclssic ) ROM_LOAD16_BYTE( "ue1-022.prm", 0x000, 0x200, CRC(1a23129e) SHA1(110eb54ab83ecb8375164a5c96f522b2737c379c) ) ROM_LOAD16_BYTE( "ue1-023.prm", 0x001, 0x200, CRC(a13192a4) SHA1(86e312e0f7400b7fa08fbe8fced1eb95a32502ca) ) - ROM_REGION( 0x080000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x080000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "ue001005.132", 0x000000, 0x080000, CRC(c5fea37c) SHA1(af4f09dd36af06e50262f607ff14eedc33beffd2) ) ROM_END @@ -8645,7 +8645,7 @@ ROM_START( calibr50 ) ROM_LOAD( "uh001010.u3x", 0x000000, 0x080000, CRC(f986577a) SHA1(8f6c2fca271fed21a1c04e93c3f50dc41348ae30) ) ROM_LOAD( "uh001011.u50", 0x080000, 0x080000, CRC(08620052) SHA1(e2ab49dbabc139e6b276401340085ccab1ae3892) ) - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "uh001013.u60", 0x000000, 0x080000, CRC(09ec0df6) SHA1(57c68d05074ea4a1e133be2ce6e25c594f04a712) ) ROM_LOAD( "uh001012.u46", 0x080000, 0x080000, CRC(bb996547) SHA1(0c8f570ef4454b10a023e0c463001c22a8cf99cd) ) ROM_END @@ -8674,7 +8674,7 @@ ROM_START( arbalest ) ROM_LOAD( "uk001.12", 0x100000, 0x080000, CRC(818a4085) SHA1(fd8b5658fc7f5fa6d3daebb4be17aeabd60c9028) ) ROM_LOAD( "uk001.13", 0x180000, 0x080000, CRC(771fa164) SHA1(a91214318808f991846a828f0e309c0ff430245e) ) - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "uk001.15", 0x000000, 0x080000, CRC(ce9df5dd) SHA1(91d879b774b5b367adb5bd511fda827bc0bae0a9) ) ROM_LOAD( "uk001.14", 0x080000, 0x080000, CRC(016b844a) SHA1(1fe091233746ced358292014393896af730f5940) ) ROM_END @@ -8705,7 +8705,7 @@ ROM_START( metafox ) ROM_LOAD( "up001012", 0x100000, 0x080000, CRC(fed2c5f9) SHA1(81f0f19a500b665c937f5431000ebde7abd97c30) ) ROM_LOAD( "up001013", 0x180000, 0x080000, CRC(adabf9ea) SHA1(db28e4e565e567a97a6b05a4803a55a403e24a0e) ) - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "up001015", 0x000000, 0x080000, CRC(2e20e39f) SHA1(6f8bd4a76ed5c2150015698e7a98044d060157be) ) ROM_LOAD( "up001014", 0x080000, 0x080000, CRC(fca6315e) SHA1(cef2385ec43f8b7a2d655b42c18ef44e46ff7364) ) ROM_END @@ -8736,7 +8736,7 @@ ROM_START( drgnunit ) ROM_LOAD( "scr-3e.bin", 0x0c0000, 0x020000, CRC(1592b8c2) SHA1(d337de280c5ea3704dec9baa04c45e1c837924a9) ) ROM_LOAD( "scr-4e.bin", 0x0e0000, 0x020000, CRC(8201681c) SHA1(7784a68828d728107b0228bb3568129c543cbf40) ) - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "snd-1.bin", 0x000000, 0x020000, CRC(8f47bd0d) SHA1(c55e22ac4294931cfb72ac88a2128891d9f8ee93) ) ROM_LOAD( "snd-2.bin", 0x020000, 0x020000, CRC(65c40ef5) SHA1(726b46144e2216d17b0828abad2f5e7c2305c174) ) ROM_LOAD( "snd-3.bin", 0x040000, 0x020000, CRC(71fbd54e) SHA1(bdaf7ecf1c79c6c8fc82d959186ca2f3304729c8) ) @@ -8758,7 +8758,7 @@ ROM_START( wits ) ROM_LOAD16_BYTE( "un001006.4l", 0x040000, 0x020000, CRC(98a980d4) SHA1(ab2c1ed83bccffabfacc8a185d1fbc3e8aaf210d) ) ROM_LOAD16_BYTE( "un001005.2l", 0x040001, 0x020000, CRC(6f2ce3c0) SHA1(8086b44c7025bc0bffff75cc6c6c7846cc56e8d0) ) - ROM_REGION( 0x40000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x40000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "un001004.12a", 0x000000, 0x020000, CRC(a15ff938) SHA1(fdfdf73e85d89a39cfc5b3c3048a64178200f942) ) ROM_LOAD( "un001003.10a", 0x020000, 0x020000, CRC(3f4b9e55) SHA1(3cecf89ae6a056622affcddec9e10be08761e56d) ) ROM_END @@ -8774,7 +8774,7 @@ ROM_START( thunderl ) ROM_LOAD16_BYTE( "t15", 0x040000, 0x020000, CRC(b97a7b56) SHA1(c08d3586d489947af21f3493356e3a88d79746e8) ) ROM_LOAD16_BYTE( "t14", 0x040001, 0x020000, CRC(79c707be) SHA1(f67fa40c8f6ab0fbce44997fdfbf699fea1f0df6) ) - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "r28", 0x000000, 0x080000, CRC(a043615d) SHA1(e483fa9fd8e922578a9d7b6ced0750643089ca78) ) ROM_LOAD( "r27", 0x080000, 0x080000, CRC(cb8425a3) SHA1(655afa295fbe99acc79c4004f03ed832560cff5b) ) ROM_END @@ -8818,7 +8818,7 @@ ROM_START( rezon ) ROM_REGION( 0x080000, "gfx3", 0 ) /* Layer 2 */ ROM_LOAD( "us001008.u68", 0x000000, 0x080000, CRC(0ab73910) SHA1(78e2c0570c5c6f5e1cdb2fbeae73376923127024) ) // 1xxxxxxxxxxxxxxxxxx = 0xFF - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD16_WORD_SWAP( "us001009.u70", 0x000000, 0x100000, CRC(0d7d2e2b) SHA1(cfba19314ecb0a49ed9ff8df32cd6a3fe37ff526) ) ROM_END @@ -8843,7 +8843,7 @@ ROM_START( rezont ) ROM_REGION( 0x080000, "gfx3", 0 ) /* Layer 2 */ ROM_LOAD( "us001008.u68", 0x000000, 0x080000, CRC(0ab73910) SHA1(78e2c0570c5c6f5e1cdb2fbeae73376923127024) ) // 1xxxxxxxxxxxxxxxxxx = 0xFF - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD16_WORD_SWAP( "us001009.u70", 0x000000, 0x100000, CRC(0d7d2e2b) SHA1(cfba19314ecb0a49ed9ff8df32cd6a3fe37ff526) ) ROM_END @@ -8862,7 +8862,7 @@ ROM_START( stg ) ROM_LOAD( "att01008.u39", 0x000000, 0x080000, CRC(20c47457) SHA1(53ddf8c076aa35fb87edc739bc9e9612a5a1526b) ) // FIRST AND SECOND HALF IDENTICAL ROM_LOAD( "att01007.u42", 0x080000, 0x080000, CRC(ac975544) SHA1(5cdd2c7aada7179d4bdaf8578134c0ef672a2704) ) // FIRST AND SECOND HALF IDENTICAL - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "att01009.u47", 0x000000, 0x080000, CRC(4276b58d) SHA1(a2e77dc3295791520c6cb25dea4e910b5a7bc137) ) ROM_LOAD( "att01010.u55", 0x080000, 0x080000, CRC(fffb2f53) SHA1(0aacb24437e9a6874850313163922d834da27611) ) ROM_END @@ -8888,7 +8888,7 @@ ROM_START( blandia ) ROM_LOAD( "ux001012.068", 0x040000, 0x080000, CRC(f29959f6) SHA1(edccea3d0bf972a07edd6339e18792d089033bff) ) /* The c0000-fffff region is bankswitched */ - ROM_REGION( 0x240000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x240000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "ux001013.069", 0x000000, 0x0c0000, CRC(5cd273cd) SHA1(602e1f10454e2b1c941f2e6983872bb9ca77a542) ) // skip c0000-fffff (banked region) ROM_CONTINUE( 0x100000, 0x040000 ) @@ -8929,7 +8929,7 @@ ROM_START( blandiap ) ROM_LOAD( "v2-3.bin", 0x0a0000, 0x020000, CRC(80ad0c3b) SHA1(00fcbcf7805784d7298b92136e7f256d65029c44) ) /* The c0000-fffff region is bankswitched */ - ROM_REGION( 0x240000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x240000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "s-0.bin", 0x000000, 0x020000, CRC(a5fde408) SHA1(89efcd37ef6c5b313169d74a962a7c074a09b12a) ) ROM_CONTINUE( 0x140000, 0x020000 ) ROM_LOAD( "s-1.bin", 0x020000, 0x020000, CRC(3083f9c4) SHA1(f5d2297c3d680eb1f128fa42a3a7f61badb9853a) ) @@ -8957,7 +8957,7 @@ ROM_START( blockcar ) ROM_LOAD( "bl-chr-0.j3", 0x000000, 0x080000, CRC(a33300ca) SHA1(b0a7ccb77c3e8e33c12b83e254924f30209a4c2c) ) ROM_LOAD( "bl-chr-1.l3", 0x080000, 0x080000, CRC(563de808) SHA1(40b2f9f4a4cb1a019f6419572ee21d66dda7d4af) ) - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "bl-snd-0.a13", 0x000000, 0x080000, CRC(a92dabaf) SHA1(610c1dc0467753dfddaa4b27bc40cb118b0bc7a3) ) ROM_RELOAD( 0x080000, 0x080000 ) ROM_END @@ -8977,7 +8977,7 @@ ROM_START( qzkklogy ) ROM_LOAD( "t2709u42.u39", 0x000000, 0x080000, CRC(194d5704) SHA1(ab2833f7427d0608850c158b813bc49935ac7d6d) ) ROM_LOAD( "t2709u39.u42", 0x080000, 0x080000, CRC(6f95a76d) SHA1(925f5880fb5153c1215d1f5ee1eff5b53a84abea) ) - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "t2709u47.u47", 0x000000, 0x080000, CRC(0ebdad40) SHA1(6558eeaac76d98d91b0be6faa78f531f1e3b9f84) ) ROM_LOAD( "t2709u55.u55", 0x080000, 0x080000, CRC(43960c68) SHA1(9a1901b65f989aa57ab8736ef0be3bac492c081c) ) ROM_END @@ -8991,7 +8991,7 @@ ROM_START( umanclub ) ROM_LOAD( "bp-u-002.u2", 0x000000, 0x080000, CRC(936cbaaa) SHA1(f7932ee310eb792b2776ae8a9d29e1a492761b11) ) ROM_LOAD( "bp-u-001.u1", 0x080000, 0x080000, CRC(87813c48) SHA1(7ec9b08fe0490d277c531e2b6394862df4d5678d) ) - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "uw003.u13", 0x000000, 0x100000, CRC(e2f718eb) SHA1(fd085b68f76c8778816a1b7d47783b9dc20bff12) ) ROM_END @@ -9011,7 +9011,7 @@ ROM_START( zingzip ) ROM_REGION( 0x200000, "gfx3", 0 ) /* Layer 2 */ ROM_LOAD( "uy001010.68", 0x000000, 0x100000, CRC(bdbcdf03) SHA1(857f541697f76086ac6c761a3505678a3d3499df) ) // FIRST AND SECOND HALF IDENTICAL - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "uy001011.70", 0x000000, 0x100000, CRC(bd845f55) SHA1(345b79cfcd8c924d6ba365814286e518438f10bc) ) // uy001017 + uy001018 ROM_END @@ -9023,7 +9023,7 @@ ROM_START( atehate ) ROM_REGION( 0x200000, "gfx1", 0 ) /* Sprites */ ROM_LOAD( "fs001003.gfx", 0x000000, 0x200000, CRC(8b17e431) SHA1(643fc62d5bad9941630ab621ecb3c69ded9d4536) ) - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "fs001004.pcm", 0x000000, 0x100000, CRC(f9344ce5) SHA1(cffbc235f3a8e9a5004e671d924affd321ec9eed) ) ROM_END @@ -9042,7 +9042,7 @@ ROM_START( daioh ) ROM_REGION( 0x200000, "gfx3", 0 ) /* Layer 2 */ ROM_LOAD( "fg1-006", 0x000000, 0x200000, CRC(2052c39a) SHA1(83a444a76e68aa711b0e25a5aa963ca876a6357e) ) - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "fg1-007", 0x000000, 0x100000, CRC(4a2fe9e0) SHA1(e55b6f301f842ff5d3c7a0041856695ac1d8a78f) ) ROM_END @@ -9061,7 +9061,7 @@ ROM_START( msgundam ) ROM_REGION( 0x080000, "gfx3", 0 ) /* Layer 2 */ ROM_LOAD( "fa001005.u24", 0x000000, 0x080000, CRC(8cd7ff86) SHA1(ce7eb90776e21239f8f52e822c636143506c6f9b) ) - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "fa001004.u26", 0x000000, 0x100000, CRC(b965f07c) SHA1(ff7827cc80655465ffbb732d55ba81f21f51a5ca) ) ROM_END @@ -9080,7 +9080,7 @@ ROM_START( msgundam1 ) ROM_REGION( 0x080000, "gfx3", 0 ) /* Layer 2 */ ROM_LOAD( "fa001005.u24", 0x000000, 0x080000, CRC(8cd7ff86) SHA1(ce7eb90776e21239f8f52e822c636143506c6f9b) ) - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "fa001004.u26", 0x000000, 0x100000, CRC(b965f07c) SHA1(ff7827cc80655465ffbb732d55ba81f21f51a5ca) ) ROM_END @@ -9103,7 +9103,7 @@ ROM_START( oisipuzl ) ROM_REGION( 0x080000, "gfx3", 0 ) /* Layer 2 */ ROM_LOAD( "ss1u25.v10", 0x000000, 0x080000, CRC(56840728) SHA1(db61539fd84f0de35ee2077238ba3646c4960cc6) ) - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "ss1u26.v10", 0x000000, 0x080000, CRC(d452336b) SHA1(d3bf3cb383c40911758a60546f121c48087868e3) ) ROM_LOAD( "ss1u27.v10", 0x080000, 0x080000, CRC(17fe921d) SHA1(7fc176b8eefad4f2b8532bfe62e7852d2be185ca) ) ROM_END @@ -9146,7 +9146,7 @@ ROM_START( qzkklgy2 ) ROM_REGION( 0x200000, "gfx2", 0 ) /* Layer 1 */ ROM_LOAD( "fn001005.104", 0x000000, 0x200000, CRC(95726a63) SHA1(e53ffc2815c4858bbfb5ff452c581bccb41854c9) ) - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "fn001006.105", 0x000000, 0x100000, CRC(83f201e6) SHA1(536e74788ad0e07451300a1ad3b127bc9d2d9063) ) ROM_END @@ -9165,7 +9165,7 @@ ROM_START( wrofaero ) ROM_REGION( 0x080000, "gfx3", 0 ) /* Layer 2 */ ROM_LOAD( "u68.bin", 0x000000, 0x080000, CRC(25c0c483) SHA1(2e705e7f0c66c3bc73e78ffb526606ab8be61d99) ) - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "u69.bin", 0x000000, 0x080000, CRC(957ecd41) SHA1(3b37ba44b8b8f0f0de41c8c26c3dfdb391ba572c) ) ROM_LOAD( "u70.bin", 0x080000, 0x080000, CRC(8d756fdf) SHA1(d66712a6aa19252f2c915ac66fc27df031fa9512) ) ROM_END @@ -9193,7 +9193,7 @@ ROM_START( jjsquawk ) ROM_LOAD ( "jj-rom13", 0x080000, 0x080000, CRC(51e29871) SHA1(9d33283bd9a3f57602a55cfc9fafa49edd0be8c5) ) ROM_LOAD16_BYTE( "jj-rom4.040", 0x100000, 0x080000, CRC(a235488e) SHA1(a45d02a4451defbef7fbdab15671955fab8ed76b) ) - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "jj-rom5.040", 0x000000, 0x080000, CRC(d99f2879) SHA1(66e83a6bc9093d19c72bd8ef1ec0523cfe218250) ) ROM_LOAD( "jj-rom6.040", 0x080000, 0x080000, CRC(9df1e478) SHA1(f41b55821187b417ad09e4a1f439c01a107d2674) ) ROM_END @@ -9221,7 +9221,7 @@ ROM_START( jjsquawkb ) ROM_COPY( "gfxtemp", 0x300000, 0x100000, 0x100000 ) - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "1", 0x000000, 0x100000, CRC(181a55b8) SHA1(6fa404f85bad93cc15e80feb61d19bed84602b82) ) /* jj-rom5.040 + jj-rom6.040 from jjsquawk */ ROM_END @@ -9242,7 +9242,7 @@ ROM_START( kamenrid ) ROM_REGION( 0x40000, "gfx3", 0 ) /* Layer 2 */ ROM_COPY( "user1", 0x040000, 0x000000, 0x040000 ) - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "fj001008.26", 0x000000, 0x100000, CRC(45e2b329) SHA1(8526afae1aa9178570c906eb96438f174d174f4d) ) ROM_END @@ -9261,7 +9261,7 @@ ROM_START( eightfrc ) ROM_REGION( 0x100000, "gfx3", 0 ) /* Layer 2 */ ROM_LOAD( "u68.bin", 0x000000, 0x100000, CRC(c17aad22) SHA1(eabbae2142cad3eef6a94d542ea03221c8228e94) ) - ROM_REGION( 0x240000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x240000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "u70.bin", 0x000000, 0x0c0000, CRC(dfdb67a3) SHA1(0fed6fb498dcfc1276facd0ecd2dfde45ff671f2) ) // skip c0000-fffff (banked region) ROM_CONTINUE( 0x100000, 0x040000 ) @@ -9276,7 +9276,7 @@ ROM_START( kiwame ) ROM_REGION( 0x080000, "gfx1", 0 ) /* Sprites */ ROM_LOAD( "fp001003.bin", 0x000000, 0x080000, CRC(0f904421) SHA1(de5810746cfab1a4a7d1b055b1a97bc7fbc173dd) ) - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "fp001006.bin", 0x000000, 0x080000, CRC(96cf395d) SHA1(877b291598e3a42e5003b2f50a16d162348ce72d) ) ROM_LOAD( "fp001005.bin", 0x080000, 0x080000, CRC(65b5fe9a) SHA1(35605be00c7c455551d18386fcb5ad013aa2907e) ) ROM_END @@ -9290,7 +9290,7 @@ ROM_START( krzybowl ) ROM_LOAD( "fv001.003", 0x000000, 0x080000, CRC(7de22749) SHA1(933a11f2d45667348b136d72806fc2e2f6f8d944) ) ROM_LOAD( "fv001.004", 0x080000, 0x080000, CRC(c7d2fe32) SHA1(37291fa78c28be274e1240e081ea253ebe487e5c) ) - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "fv001.005", 0x000000, 0x080000, CRC(5e206062) SHA1(e47cfb6947df178f3547dfe61907571bcb84e4ac) ) ROM_LOAD( "fv001.006", 0x080000, 0x080000, CRC(572a15e7) SHA1(b6a3e99e14a473b78ff48d1a46b20a0862d128e9) ) ROM_END @@ -9308,7 +9308,7 @@ ROM_START( orbs ) /* All eproms are socketed and labelled (handwritten) "ORBS 10 ROM_LOAD( "orbs.u12", 0x100000, 0x080000, CRC(b8c352c2) SHA1(7d6fd1425d9d5cf6a14a1ddceba0ad10e472dfa5) ) ROM_LOAD( "orbs.u11", 0x180000, 0x080000, CRC(58cb38ba) SHA1(1c6c5f7ccb9c81b71bc1cbad080799b97962f262) ) - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "orbs.u15", 0x000000, 0x080000, CRC(bc0e9fe3) SHA1(758a44d07d59af8bbc87602df25dfcdc6cb8d9b3) ) ROM_LOAD( "orbs.u16", 0x080000, 0x080000, CRC(aecd8373) SHA1(5620bcb281a9ea4920cfe81d163827013289c5bf) ) ROM_END @@ -9324,7 +9324,7 @@ ROM_START( keroppi ) ROM_LOAD( "ft-001-005.u12", 0x100000, 0x080000, CRC(de6432a8) SHA1(afee9b29e0b3db4815fc29456044532aee03597e) ) ROM_LOAD( "ft-001-006.u11", 0x180000, 0x080000, CRC(9c500eae) SHA1(3448adef04c9ad2e0b39a283e4eb9c9bac7d4967) ) - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "ft-001-007.u15", 0x000000, 0x080000, CRC(c98dacf0) SHA1(b508433e2383af1e8bd5fda253c9925c48443490) ) ROM_LOAD( "ft-001-008.u16", 0x080000, 0x080000, CRC(b9c4b637) SHA1(82977d10de1048f71525bab5431b031cca510114) ) ROM_END @@ -9344,7 +9344,7 @@ ROM_START( extdwnhl ) ROM_REGION( 0x200000, "gfx3", 0 ) /* Layer 2 */ ROM_LOAD( "fw001006.152", 0x000000, 0x200000, CRC(d00e8ddd) SHA1(e13692034afec1a0e86d19abfb9efa518b374147) ) // FIRST AND SECOND HALF IDENTICAL - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "fw001007.026", 0x080000, 0x080000, CRC(16d84d7a) SHA1(fdc13776ba1ec9c48a33a9f2dfe8a0e55c54d89e) ) // swapped halves ROM_CONTINUE( 0x000000, 0x080000 ) ROM_END @@ -9370,7 +9370,7 @@ ROM_START( gundhara ) ROM_LOAD ( "bpgh-012.u68", 0x000000, 0x200000, CRC(edfda595) SHA1(5942181430d59c0c303cd1cbe753910c26c109a2) ) ROM_LOAD16_BYTE( "bpgh-011.u67", 0x200000, 0x100000, CRC(49aff270) SHA1(de25209e520cd8747042078440ee20866097d0cb) ) - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "bpgh-013.u70", 0x080000, 0x080000, CRC(0fa5d503) SHA1(fd7a80cd25c23e737cc2c3d11de2291e22313b58) ) // swapped halves ROM_CONTINUE( 0x000000, 0x080000 ) ROM_END @@ -9390,7 +9390,7 @@ ROM_START( sokonuke ) ROM_REGION( 0x100, "gfx3", ROMREGION_ERASE ) /* Layer 2 */ /* Unused */ - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "001-006.bin", 0x080000, 0x080000, CRC(ecfac767) SHA1(3d05bdb2c2a8c7eb5fa77b0c4482f98d3947c6d6) ) ROM_CONTINUE( 0x000000, 0x080000 ) ROM_END @@ -9413,7 +9413,7 @@ ROM_START( zombraid ) ROM_LOAD ( "fy001010.68", 0x000000, 0x200000, CRC(8b40ed7a) SHA1(05fcd7947a8419cab5ed2305fba9a671911e4850) ) ROM_LOAD16_BYTE( "fy001009.67", 0x200000, 0x100000, CRC(6bcca641) SHA1(49c9106e6f23e25e5b5917af11fc48d34457c61a) ) - ROM_REGION( 0x480000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x480000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "fy001012.b", 0x000000, 0x080000, CRC(fd30e102) SHA1(ae02f94f69aa301b0c37921ca1117e3ad20467b5) ) // skip 80000-fffff (banked region) ROM_CONTINUE( 0x100000, 0x180000 ) @@ -9441,7 +9441,7 @@ ROM_START( madshark ) ROM_COPY( "user1", 0x100000, 0x000000, 0x100000 ) ROM_COPY( "user1", 0x300000, 0x100000, 0x100000 ) - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "fq001007.26", 0x000000, 0x100000, CRC(e4b33c13) SHA1(c4f9532de7a09c80f5a74c3a386e99a0f546846f) ) ROM_END @@ -9466,7 +9466,7 @@ ROM_START( utoukond ) ROM_LOAD( "93uta07.68", 0x000000, 0x100000, CRC(67bdd036) SHA1(527b6a67e7a62263bee738dc82d6ff289ab54853) ) ROM_LOAD( "93uta06.67", 0x100000, 0x100000, CRC(294c26e4) SHA1(459ec7f8c8db4f1e3906d5db240298405bda991c) ) - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "93uta08.69", 0x000000, 0x100000, CRC(3d50bbcd) SHA1(e9b78d08466e1f9b42f11999bb53b6deceb81a12) ) ROM_END @@ -9479,7 +9479,7 @@ ROM_START( neobattl ) ROM_LOAD( "bp923003.u15", 0x00000, 0x80000, CRC(91ca98a1) SHA1(b02b362e3a6118f52d9e1a262ca11aecef887b00) ) ROM_LOAD( "bp923004.u9", 0x80000, 0x80000, CRC(15c678e3) SHA1(8c0fa41a1f4e7b4e1c90faaeec7f6c910cc3ad0b) ) - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "bp923005.u4", 0x000000, 0x100000, CRC(7c0e37be) SHA1(5d5779de948f986971a82db2a5a4302044c3257a) ) ROM_END @@ -9492,7 +9492,7 @@ ROM_START( pairlove ) ROM_LOAD( "ut2-001-004.5j", 0x000000, 0x080000, CRC(fdc47b26) SHA1(0de51bcf67b909ac9578f0d1b14af8a4c758aacf) ) ROM_LOAD( "ut2-001-005.5l", 0x080000, 0x080000, CRC(076f94a2) SHA1(94b4b41a497dea1b6db5396bd7cd81ebcb217735) ) - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "ut2-001-003.12a", 0x000000, 0x080000, CRC(900219a9) SHA1(3260a900df25beba597bf947a9fbb6f7392827d7) ) ROM_RELOAD( 0x080000, 0x080000 ) ROM_END @@ -9552,7 +9552,7 @@ ROM_START( jockeyc ) ROM_LOAD16_BYTE( "ya-010.prom", 0x000, 0x200, CRC(778094b3) SHA1(270329a0d544dc7a8240d6dab08ccd54ea87ab70) ) ROM_LOAD16_BYTE( "ya-011.prom", 0x001, 0x200, CRC(bd4fe2f6) SHA1(83d9f9db3fbfa2d172f5227c397ea4d5a9687015) ) - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "ya_011_013.u71", 0x00000, 0x80000, CRC(2bccaf47) SHA1(1658643444d575410f11b648e0d7ae6c43fcf1ea) ) ROM_LOAD( "ya_011_012.u64", 0x80000, 0x80000, CRC(a8015ce6) SHA1(bb0b589856ec82e1fd42be9af89b07ba1d17e595) ) ROM_END @@ -9589,7 +9589,7 @@ ROM_START( inttoote ) ROM_LOAD16_BYTE( "ya-010.prom", 0x000, 0x200, CRC(778094b3) SHA1(270329a0d544dc7a8240d6dab08ccd54ea87ab70) ) ROM_LOAD16_BYTE( "ya-011.prom", 0x001, 0x200, CRC(bd4fe2f6) SHA1(83d9f9db3fbfa2d172f5227c397ea4d5a9687015) ) - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "ya_011_013.u71", 0x00000, 0x80000, CRC(2bccaf47) SHA1(1658643444d575410f11b648e0d7ae6c43fcf1ea) ) ROM_LOAD( "ya_011_012.u64", 0x80000, 0x80000, CRC(a8015ce6) SHA1(bb0b589856ec82e1fd42be9af89b07ba1d17e595) ) ROM_END @@ -9627,7 +9627,7 @@ ROM_START( inttootea ) ROM_LOAD16_BYTE( "ya-010.prom", 0x000, 0x200, CRC(778094b3) SHA1(270329a0d544dc7a8240d6dab08ccd54ea87ab70) ) ROM_LOAD16_BYTE( "ya-011.prom", 0x001, 0x200, CRC(bd4fe2f6) SHA1(83d9f9db3fbfa2d172f5227c397ea4d5a9687015) ) - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "ya_011_013.u71", 0x00000, 0x80000, CRC(2bccaf47) SHA1(1658643444d575410f11b648e0d7ae6c43fcf1ea) ) ROM_LOAD( "ya_011_012.u64", 0x80000, 0x80000, CRC(a8015ce6) SHA1(bb0b589856ec82e1fd42be9af89b07ba1d17e595) ) ROM_END @@ -9669,7 +9669,7 @@ ROM_START( setaroul ) ROM_LOAD( "uf0015.u40", 0x300000, 0x080000, CRC(11dc19fa) SHA1(e7084f61d075a61249d924a523c32e7993d9ae46) ) ROM_LOAD( "uf0016.u48", 0x380000, 0x080000, CRC(10f99fa8) SHA1(7ef9a3f71dd071483cf3513ef57e2fcfe8702994) ) - ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "uf1004.u52", 0x000000, 0x020000, CRC(d63ea334) SHA1(93aaf58c90c4f704caae19b63785e471b2c1281a) ) ROM_REGION( 0x400, "proms", 0 ) diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c index 27b6474d8e4..0a2511f6a88 100644 --- a/src/mame/drivers/seta2.c +++ b/src/mame/drivers/seta2.c @@ -549,8 +549,8 @@ static WRITE16_HANDLER( seta2_sound_bank_w ) { if (ACCESSING_BITS_0_7) { - UINT8 *ROM = memory_region( space->machine, "x1" ); - int banks = (memory_region_length( space->machine, "x1" ) - 0x100000) / 0x20000; + UINT8 *ROM = memory_region( space->machine, "x1snd" ); + int banks = (memory_region_length( space->machine, "x1snd" ) - 0x100000) / 0x20000; if (data >= banks) { logerror("CPU #0 PC %06X: invalid sound bank %04X\n",cpu_get_pc(space->cpu),data); @@ -587,7 +587,7 @@ static ADDRESS_MAP_START( grdians_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x700004, 0x700005) AM_READ_PORT("SYSTEM") // Coins AM_RANGE(0x70000c, 0x70000d) AM_READ(watchdog_reset16_r) // Watchdog AM_RANGE(0x800000, 0x800001) AM_WRITE(grdians_lockout_w) - AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE("x1", seta_sound_word_r,seta_sound_word_w) // Sound + AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0xc00000, 0xc3ffff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) // Sprites AM_RANGE(0xc40000, 0xc4ffff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) // Palette AM_RANGE(0xc50000, 0xc5ffff) AM_RAM // cleared @@ -649,7 +649,7 @@ static ADDRESS_MAP_START( gundamex_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x70000a, 0x70000b) AM_READ_PORT("IN1") // P2 AM_RANGE(0x70000c, 0x70000d) AM_WRITE(watchdog_reset16_w) AM_RANGE(0x800000, 0x800001) AM_WRITE(grdians_lockout_w) - AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE("x1", seta_sound_word_r,seta_sound_word_w) // Sound + AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0xc00000, 0xc3ffff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) // Sprites AM_RANGE(0xc40000, 0xc4ffff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16 ) // Palette AM_RANGE(0xc50000, 0xc5ffff) AM_RAM // cleared @@ -710,7 +710,7 @@ static ADDRESS_MAP_START( mj4simai_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x600300, 0x600301) AM_READ_PORT("DSW1") // DSW 1 AM_RANGE(0x600302, 0x600303) AM_READ_PORT("DSW2") // DSW 2 AM_RANGE(0x600300, 0x60030f) AM_WRITE(seta2_sound_bank_w) // Samples Banks - AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE("x1", seta_sound_word_r,seta_sound_word_w) // Sound + AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0xc00000, 0xc3ffff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) // Sprites AM_RANGE(0xc40000, 0xc4ffff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) // Palette AM_RANGE(0xc60000, 0xc6003f) AM_WRITE(seta2_vregs_w) AM_BASE(&seta2_vregs) // Video Registers @@ -733,7 +733,7 @@ static ADDRESS_MAP_START( myangel_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x700300, 0x700301) AM_READ_PORT("DSW1") // DSW 1 AM_RANGE(0x700302, 0x700303) AM_READ_PORT("DSW2") // DSW 2 AM_RANGE(0x700310, 0x70031f) AM_WRITE(seta2_sound_bank_w) // Samples Banks - AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE("x1", seta_sound_word_r,seta_sound_word_w) // Sound + AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0xc00000, 0xc3ffff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) // Sprites AM_RANGE(0xc40000, 0xc4ffff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) // Palette AM_RANGE(0xc60000, 0xc6003f) AM_WRITE(seta2_vregs_w) AM_BASE(&seta2_vregs) // Video Registers @@ -756,7 +756,7 @@ static ADDRESS_MAP_START( myangel2_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x600300, 0x600301) AM_READ_PORT("DSW1") // DSW 1 AM_RANGE(0x600302, 0x600303) AM_READ_PORT("DSW2") // DSW 2 AM_RANGE(0x600300, 0x60030f) AM_WRITE(seta2_sound_bank_w) // Samples Banks - AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE("x1", seta_sound_word_r,seta_sound_word_w) // Sound + AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0xd00000, 0xd3ffff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) // Sprites AM_RANGE(0xd40000, 0xd4ffff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) // Palette AM_RANGE(0xd60000, 0xd6003f) AM_WRITE(seta2_vregs_w) AM_BASE(&seta2_vregs ) // Video Registers @@ -804,7 +804,7 @@ static ADDRESS_MAP_START( pzlbowl_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800000, 0x83ffff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) // Sprites AM_RANGE(0x840000, 0x84ffff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) // Palette AM_RANGE(0x860000, 0x86003f) AM_WRITE(seta2_vregs_w) AM_BASE(&seta2_vregs) // Video Registers - AM_RANGE(0x900000, 0x903fff) AM_DEVREADWRITE("x1", seta_sound_word_r,seta_sound_word_w) // Sound + AM_RANGE(0x900000, 0x903fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0xfffc00, 0xffffff) AM_RAM_WRITE(tmp68301_regs_w) AM_BASE(&tmp68301_regs) // TMP68301 Registers ADDRESS_MAP_END @@ -830,7 +830,7 @@ static ADDRESS_MAP_START( penbros_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xb00000, 0xb3ffff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) // Sprites AM_RANGE(0xb40000, 0xb4ffff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) // Palette AM_RANGE(0xb60000, 0xb6003f) AM_WRITE(seta2_vregs_w) AM_BASE(&seta2_vregs ) - AM_RANGE(0xa00000, 0xa03fff) AM_DEVREADWRITE("x1", seta_sound_word_r,seta_sound_word_w) // Sound + AM_RANGE(0xa00000, 0xa03fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0xfffc00, 0xffffff) AM_RAM_WRITE(tmp68301_regs_w) AM_BASE(&tmp68301_regs) // TMP68301 Registers ADDRESS_MAP_END @@ -874,7 +874,7 @@ static ADDRESS_MAP_START( samshoot_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE( 0x840000, 0x84ffff ) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) // Palette AM_RANGE( 0x860000, 0x86003f ) AM_WRITE(seta2_vregs_w) AM_BASE(&seta2_vregs) // Video Registers - AM_RANGE( 0x900000, 0x903fff ) AM_DEVREADWRITE( "x1", seta_sound_word_r, seta_sound_word_w ) // Sound + AM_RANGE( 0x900000, 0x903fff ) AM_DEVREADWRITE( "x1snd", seta_sound_word_r, seta_sound_word_w ) // Sound AM_RANGE( 0xfffd0a, 0xfffd0b ) AM_READ_PORT("DSW2") // parallel data register (DSW 2) AM_RANGE( 0xfffc00, 0xffffff ) AM_RAM_WRITE( tmp68301_regs_w) AM_BASE(&tmp68301_regs ) // TMP68301 Registers @@ -2318,7 +2318,7 @@ static MACHINE_DRIVER_START( mj4simai ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("x1", X1_010, 50000000/3) + MDRV_SOUND_ADD("x1snd", X1_010, 50000000/3) MDRV_SOUND_CONFIG(x1_010_sound_intf) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -2530,7 +2530,7 @@ ROM_START( gundamex ) ROM_LOAD( "ka001008.u23", 0x1400000, 0x200000, CRC(db55a60a) SHA1(03d118c7284ca86219891c473e2a89489710ea27) ) ROM_FILL( 0x1800000, 0x600000, 0 ) /* 6bpp instead of 8bpp */ - ROM_REGION( 0x300000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x300000, "x1snd", 0 ) /* Samples */ /* Leave 1MB empty (addressable by the chip) */ ROM_LOAD( "ka001015.u28", 0x100000, 0x200000, CRC(ada2843b) SHA1(09d06026031bc7558da511c3c0e29187ea0a0099) ) ROM_END @@ -2559,7 +2559,7 @@ ROM_START( grdians ) ROM_LOAD( "u21.bin", 0x1e00000, 0x200000, CRC(6f95e466) SHA1(28482fad16a3ac9302f152d81552e6f84a44f3e4) ) ROM_CONTINUE( 0x1c00000, 0x200000 ) - ROM_REGION( 0x200000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x200000, "x1snd", 0 ) /* Samples */ /* Leave 1MB empty (addressable by the chip) */ ROM_LOAD( "u32.bin", 0x100000, 0x100000, CRC(cf0f3017) SHA1(8376d3a674f71aec72f52c72758fbc53d9feb1a1) ) ROM_END @@ -2580,7 +2580,7 @@ ROM_START( mj4simai ) ROM_LOAD( "cha-02.u22", 0x1400000, 0x400000, CRC(f6346860) SHA1(4eebd3fa315b97964fa39b88224f9de7622ba881) ) ROM_FILL( 0x1800000, 0x800000, 0 ) /* 6bpp instead of 8bpp */ - ROM_REGION( 0x500000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x500000, "x1snd", 0 ) /* Samples */ /* Leave 1MB empty (addressable by the chip) */ ROM_LOAD( "cha-07.u32", 0x100000, 0x400000, CRC(817519ee) SHA1(ed09740cdbf61a328f7b50eb569cf498fb749416) ) ROM_END @@ -2602,7 +2602,7 @@ ROM_START( myangel ) ROM_LOAD( "kq1-cg7.u21", 0xc00000, 0x200000, CRC(9f48382c) SHA1(80dfc33a55123b5d3cdb3ed97b43a527f0254d61) ) ROM_LOAD( "kq1-cg5.u17", 0xe00000, 0x200000, CRC(a4bc4516) SHA1(0eb11fa54d16bba1b96f9dd943a68949a3bb9a2f) ) - ROM_REGION( 0x300000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x300000, "x1snd", 0 ) /* Samples */ /* Leave 1MB empty (addressable by the chip) */ ROM_LOAD( "kq1-snd.u32", 0x100000, 0x200000, CRC(8ca1b449) SHA1(f54096fb5400843af4879135c96760485b6cb319) ) ROM_END @@ -2624,7 +2624,7 @@ ROM_START( myangel2 ) ROM_LOAD( "kqs1-cg7.u21", 0x1200000, 0x200000, CRC(2c977904) SHA1(2589447f2471cdc414266b34aff552044c680d93) ) ROM_LOAD( "kqs1-cg3.u17", 0x1400000, 0x400000, CRC(de3b2191) SHA1(d7d6ea07b665cfd834747d3c0776b968ce03bc6a) ) - ROM_REGION( 0x500000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x500000, "x1snd", 0 ) /* Samples */ /* Leave 1MB empty (addressable by the chip) */ ROM_LOAD( "kqs1-snd.u32", 0x100000, 0x400000, CRC(792a6b49) SHA1(341b4e8f248b5032217733bada32e353c67e3888) ) ROM_END @@ -2640,7 +2640,7 @@ ROM_START( pzlbowl ) ROM_LOAD( "kuc-u40.i00", 0x800000, 0x400000, CRC(7e49a2cf) SHA1(d24683addbc54515c33fb620ac500e6702bd9e17) ) ROM_LOAD( "kuc-u41.i00", 0xc00000, 0x400000, CRC(2febf19b) SHA1(8081ac590c0463529777b5e4817305a1a6f6ea41) ) - ROM_REGION( 0x500000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x500000, "x1snd", 0 ) /* Samples */ /* Leave 1MB empty (addressable by the chip) */ ROM_LOAD( "kus-u18.i00", 0x100000, 0x400000, CRC(e2b1dfcf) SHA1(fb0b8be119531a1a27efa46ed7b86b05a37ed585) ) ROM_END @@ -2656,7 +2656,7 @@ ROM_START( penbros ) ROM_LOAD( "u40.bin", 0x800000, 0x400000, CRC(dc9e0a96) SHA1(c2c8ccf9039ee0e179b08fdd2d37f29899349cda) ) ROM_FILL( 0xc00000, 0x400000, 0 ) /* 6bpp instead of 8bpp */ - ROM_REGION( 0x300000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x300000, "x1snd", 0 ) /* Samples */ /* Leave 1MB empty (addressable by the chip) */ ROM_LOAD( "u18.bin", 0x100000, 0x200000, CRC(de4e65e2) SHA1(82d4e590c714b3e9bf0ffaf1500deb24fd315595) ) ROM_END @@ -2672,7 +2672,7 @@ ROM_START( deerhunt ) /* Deer Hunting USA V4.3 (11/1/2000) - The "E05" breaks ve ROM_LOAD( "as0903m01.u40", 0x1000000, 0x800000, CRC(e8ef81b3) SHA1(97666942ca6cca5b8ea6451314a2aaabad9e06ba) ) ROM_LOAD( "as0904m01.u41", 0x1800000, 0x800000, CRC(d0f97fdc) SHA1(776c9d42d03a9f61155521212305e1ed696eaf47) ) - ROM_REGION( 0x500000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x500000, "x1snd", 0 ) /* Samples */ /* Leave 1MB empty (addressable by the chip) */ ROM_LOAD( "as0905m01.u18", 0x100000, 0x400000, CRC(8d8165bb) SHA1(aca7051613d260734ee787b4c3db552c336bd600) ) ROM_END @@ -2688,7 +2688,7 @@ ROM_START( deerhunta ) /* Deer Hunting USA V4.2 (xx/x/2000) */ ROM_LOAD( "as0903m01.u40", 0x1000000, 0x800000, CRC(e8ef81b3) SHA1(97666942ca6cca5b8ea6451314a2aaabad9e06ba) ) ROM_LOAD( "as0904m01.u41", 0x1800000, 0x800000, CRC(d0f97fdc) SHA1(776c9d42d03a9f61155521212305e1ed696eaf47) ) - ROM_REGION( 0x500000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x500000, "x1snd", 0 ) /* Samples */ /* Leave 1MB empty (addressable by the chip) */ ROM_LOAD( "as0905m01.u18", 0x100000, 0x400000, CRC(8d8165bb) SHA1(aca7051613d260734ee787b4c3db552c336bd600) ) ROM_END @@ -2704,7 +2704,7 @@ ROM_START( deerhuntb ) /* Deer Hunting USA V4.0 (6/15/2000) */ ROM_LOAD( "as0903m01.u40", 0x1000000, 0x800000, CRC(e8ef81b3) SHA1(97666942ca6cca5b8ea6451314a2aaabad9e06ba) ) ROM_LOAD( "as0904m01.u41", 0x1800000, 0x800000, CRC(d0f97fdc) SHA1(776c9d42d03a9f61155521212305e1ed696eaf47) ) - ROM_REGION( 0x500000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x500000, "x1snd", 0 ) /* Samples */ /* Leave 1MB empty (addressable by the chip) */ ROM_LOAD( "as0905m01.u18", 0x100000, 0x400000, CRC(8d8165bb) SHA1(aca7051613d260734ee787b4c3db552c336bd600) ) ROM_END @@ -2722,7 +2722,7 @@ ROM_START( deerhuntc ) /* Deer Hunting USA V2.x - No version number is printed t ROM_LOAD( "as0903m01.u40", 0x1000000, 0x800000, CRC(e8ef81b3) SHA1(97666942ca6cca5b8ea6451314a2aaabad9e06ba) ) ROM_LOAD( "as0904m01.u41", 0x1800000, 0x800000, CRC(d0f97fdc) SHA1(776c9d42d03a9f61155521212305e1ed696eaf47) ) - ROM_REGION( 0x500000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x500000, "x1snd", 0 ) /* Samples */ /* Leave 1MB empty (addressable by the chip) */ ROM_LOAD( "as0905m01.u18", 0x100000, 0x400000, CRC(8d8165bb) SHA1(aca7051613d260734ee787b4c3db552c336bd600) ) ROM_END @@ -2738,7 +2738,7 @@ ROM_START( turkhunt ) /* V1.0 is currently the only known version */ ROM_LOAD( "asx903m01.u40", 0x1000000, 0x800000, CRC(5f86c322) SHA1(5a72adb99eea176199f172384cb051e2b045ab94) ) ROM_LOAD( "asx904m01.u41", 0x1800000, 0x800000, CRC(c77e0b66) SHA1(0eba30e62e4bd38c198fa6cb69fb94d002ded77a) ) - ROM_REGION( 0x500000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x500000, "x1snd", 0 ) /* Samples */ /* Leave 1MB empty (addressable by the chip) */ ROM_LOAD( "asx905m01.u18", 0x100000, 0x400000, CRC(8d9dd9a9) SHA1(1fc2f3688d2c24c720dca7357bca6bf5f4016c53) ) ROM_END @@ -2754,7 +2754,7 @@ ROM_START( wschamp ) /* Wing Shootiong Championship V2.00 (01/23/2002) */ ROM_LOAD( "as1003m01.u40", 0x1000000, 0x800000, CRC(89618858) SHA1(a8bd07f233482e8f5a256af7ff9577648eb58ef4) ) ROM_LOAD( "as1004m01.u41", 0x1800000, 0x800000, CRC(500c0909) SHA1(73ff27d46b9285f34a50a81c21c54437f21e1939) ) - ROM_REGION( 0x500000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x500000, "x1snd", 0 ) /* Samples */ /* Leave 1MB empty (addressable by the chip) */ ROM_LOAD( "as1005m01.u18", 0x100000, 0x400000, CRC(e4b137b8) SHA1(4d8d15073c51f7d383282cc5755ae5b2eab6226c) ) ROM_END @@ -2770,7 +2770,7 @@ ROM_START( wschampa ) /* Wing Shootiong Championship V1.01 */ ROM_LOAD( "as1003m01.u40", 0x1000000, 0x800000, CRC(89618858) SHA1(a8bd07f233482e8f5a256af7ff9577648eb58ef4) ) ROM_LOAD( "as1004m01.u41", 0x1800000, 0x800000, CRC(500c0909) SHA1(73ff27d46b9285f34a50a81c21c54437f21e1939) ) - ROM_REGION( 0x500000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x500000, "x1snd", 0 ) /* Samples */ /* Leave 1MB empty (addressable by the chip) */ ROM_LOAD( "as1005m01.u18", 0x100000, 0x400000, CRC(e4b137b8) SHA1(4d8d15073c51f7d383282cc5755ae5b2eab6226c) ) ROM_END @@ -2786,7 +2786,7 @@ ROM_START( trophyh ) /* V1.0 is currently the only known version */ ROM_LOAD( "as1103m01.u40", 0x1000000, 0x800000, CRC(adf8a54e) SHA1(bb28bf219d18082246f7964851a5c49b9c0ba7f5) ) ROM_LOAD( "as1104m01.u41", 0x1800000, 0x800000, CRC(387882e9) SHA1(0fdd0c77dabd1066c6f3bd64e357236a76f524ab) ) - ROM_REGION( 0x500000, "x1", 0 ) /* Samples */ + ROM_REGION( 0x500000, "x1snd", 0 ) /* Samples */ /* Leave 1MB empty (addressable by the chip) */ ROM_LOAD( "as1105m01.u18", 0x100000, 0x400000, CRC(633d0df8) SHA1(3401c424f5c207ef438a9269e0c0e7d482771fed) ) ROM_END diff --git a/src/mame/drivers/sf.c b/src/mame/drivers/sf.c index 0879498eaaa..18c36207247 100644 --- a/src/mame/drivers/sf.c +++ b/src/mame/drivers/sf.c @@ -258,7 +258,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_RANGE(0xc800, 0xc800) AM_READ(soundlatch_r) - AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE("ym", ym2151_r,ym2151_w) + AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE("ymsnd", ym2151_r,ym2151_w) ADDRESS_MAP_END /* Yes, _no_ ram */ @@ -835,7 +835,7 @@ static MACHINE_DRIVER_START( sf ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.60) MDRV_SOUND_ROUTE(1, "rspeaker", 0.60) diff --git a/src/mame/drivers/sg1000a.c b/src/mame/drivers/sg1000a.c index 236f28e46f7..f9e14594575 100644 --- a/src/mame/drivers/sg1000a.c +++ b/src/mame/drivers/sg1000a.c @@ -132,7 +132,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x7f, 0x7f) AM_DEVWRITE("sn", sn76496_w) + AM_RANGE(0x7f, 0x7f) AM_DEVWRITE("snsnd", sn76496_w) AM_RANGE(0xbe, 0xbe) AM_READWRITE(TMS9928A_vram_r, TMS9928A_vram_w) AM_RANGE(0xbf, 0xbf) AM_READWRITE(TMS9928A_register_r, TMS9928A_register_w) AM_RANGE(0xdc, 0xdf) AM_DEVREADWRITE("ppi8255", i8255a_r, i8255a_w) @@ -282,7 +282,7 @@ static MACHINE_DRIVER_START( sg1000a ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("sn", SN76489, XTAL_3_579545MHz) + MDRV_SOUND_ADD("snsnd", SN76489, XTAL_3_579545MHz) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/shadfrce.c b/src/mame/drivers/shadfrce.c index 0aa912bd0a2..f68b902fa67 100644 --- a/src/mame/drivers/shadfrce.c +++ b/src/mame/drivers/shadfrce.c @@ -417,7 +417,7 @@ static WRITE8_DEVICE_HANDLER( oki_bankswitch_w ) static ADDRESS_MAP_START( shadfrce_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xc7ff) AM_RAM - AM_RANGE(0xc800, 0xc801) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xc800, 0xc801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xd800, 0xd800) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r) AM_RANGE(0xe800, 0xe800) AM_DEVWRITE("oki", oki_bankswitch_w) @@ -593,7 +593,7 @@ static MACHINE_DRIVER_START( shadfrce ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) diff --git a/src/mame/drivers/shangha3.c b/src/mame/drivers/shangha3.c index 473355eadc4..17471e68f3e 100644 --- a/src/mame/drivers/shangha3.c +++ b/src/mame/drivers/shangha3.c @@ -134,9 +134,9 @@ static ADDRESS_MAP_START( shangha3_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x200008, 0x200009) AM_WRITE(shangha3_blitter_go_w) AM_RANGE(0x20000a, 0x20000b) AM_WRITENOP /* irq ack? */ AM_RANGE(0x20000c, 0x20000d) AM_WRITE(shangha3_coinctrl_w) - AM_RANGE(0x20001e, 0x20001f) AM_DEVREAD8("ay", ay8910_r, 0x00ff) - AM_RANGE(0x20002e, 0x20002f) AM_DEVWRITE8("ay", ay8910_data_w, 0x00ff) - AM_RANGE(0x20003e, 0x20003f) AM_DEVWRITE8("ay", ay8910_address_w, 0x00ff) + AM_RANGE(0x20001e, 0x20001f) AM_DEVREAD8("aysnd", ay8910_r, 0x00ff) + AM_RANGE(0x20002e, 0x20002f) AM_DEVWRITE8("aysnd", ay8910_data_w, 0x00ff) + AM_RANGE(0x20003e, 0x20003f) AM_DEVWRITE8("aysnd", ay8910_address_w, 0x00ff) AM_RANGE(0x20004e, 0x20004f) AM_READWRITE(shangha3_prot_r,shangha3_prot_w) AM_RANGE(0x20006e, 0x20006f) AM_DEVREADWRITE8("oki", okim6295_r,okim6295_w, 0x00ff) AM_RANGE(0x300000, 0x30ffff) AM_RAM AM_BASE(&shangha3_ram) AM_SIZE(&shangha3_ram_size) /* gfx & work ram */ @@ -184,7 +184,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( heberpop_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ym", ym3438_r, ym3438_w) + AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ymsnd", ym3438_r, ym3438_w) AM_RANGE(0x80, 0x80) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xc0, 0xc0) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -502,7 +502,7 @@ static MACHINE_DRIVER_START( shangha3 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 1500000) + MDRV_SOUND_ADD("aysnd", AY8910, 1500000) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) @@ -542,7 +542,7 @@ static MACHINE_DRIVER_START( heberpop ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3438, 8000000) + MDRV_SOUND_ADD("ymsnd", YM3438, 8000000) MDRV_SOUND_CONFIG(ym3438_config) MDRV_SOUND_ROUTE(0, "mono", 0.40) MDRV_SOUND_ROUTE(1, "mono", 0.40) @@ -583,7 +583,7 @@ static MACHINE_DRIVER_START( blocken ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3438, 8000000) + MDRV_SOUND_ADD("ymsnd", YM3438, 8000000) MDRV_SOUND_CONFIG(ym3438_config) MDRV_SOUND_ROUTE(0, "mono", 0.40) MDRV_SOUND_ROUTE(1, "mono", 0.40) diff --git a/src/mame/drivers/shanghai.c b/src/mame/drivers/shanghai.c index 284ae8bd820..6ad0bfcd926 100644 --- a/src/mame/drivers/shanghai.c +++ b/src/mame/drivers/shanghai.c @@ -136,7 +136,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( shanghai_portmap, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x00, 0x01) AM_READWRITE(HD63484_status_r, HD63484_address_w) AM_RANGE(0x02, 0x03) AM_READWRITE(HD63484_data_r, HD63484_data_w) - AM_RANGE(0x20, 0x23) AM_DEVREADWRITE8("ym", ym2203_r, ym2203_w, 0x00ff) + AM_RANGE(0x20, 0x23) AM_DEVREADWRITE8("ymsnd", ym2203_r, ym2203_w, 0x00ff) AM_RANGE(0x40, 0x41) AM_READ_PORT("P1") AM_RANGE(0x44, 0x45) AM_READ_PORT("P2") AM_RANGE(0x48, 0x49) AM_READ_PORT("SYSTEM") @@ -150,7 +150,7 @@ static ADDRESS_MAP_START( shangha2_portmap, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x20, 0x21) AM_READ_PORT("SYSTEM") AM_RANGE(0x30, 0x31) AM_READWRITE(HD63484_status_r, HD63484_address_w) AM_RANGE(0x32, 0x33) AM_READWRITE(HD63484_data_r, HD63484_data_w) - AM_RANGE(0x40, 0x43) AM_DEVREADWRITE8("ym", ym2203_r, ym2203_w, 0x00ff) + AM_RANGE(0x40, 0x43) AM_DEVREADWRITE8("ymsnd", ym2203_r, ym2203_w, 0x00ff) AM_RANGE(0x50, 0x51) AM_WRITE(shanghai_coin_w) ADDRESS_MAP_END @@ -445,7 +445,7 @@ static MACHINE_DRIVER_START( shanghai ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 16000000/4) + MDRV_SOUND_ADD("ymsnd", YM2203, 16000000/4) MDRV_SOUND_CONFIG(sh_ym2203_interface) MDRV_SOUND_ROUTE(0, "mono", 0.15) MDRV_SOUND_ROUTE(1, "mono", 0.15) @@ -477,7 +477,7 @@ static MACHINE_DRIVER_START( shangha2 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 16000000/4) + MDRV_SOUND_ADD("ymsnd", YM2203, 16000000/4) MDRV_SOUND_CONFIG(sh_ym2203_interface) MDRV_SOUND_ROUTE(0, "mono", 0.15) MDRV_SOUND_ROUTE(1, "mono", 0.15) diff --git a/src/mame/drivers/shangkid.c b/src/mame/drivers/shangkid.c index 60488418e69..57f61985f4a 100644 --- a/src/mame/drivers/shangkid.c +++ b/src/mame/drivers/shangkid.c @@ -324,12 +324,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( chinhero_bbx_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_address_data_w) ADDRESS_MAP_END static ADDRESS_MAP_START( shangkid_bbx_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_address_data_w) ADDRESS_MAP_END /***************************************************************************************/ @@ -414,7 +414,7 @@ static MACHINE_DRIVER_START( chinhero ) MDRV_SOUND_ADD("dac", DAC, 0) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) - MDRV_SOUND_ADD("ay", AY8910, XTAL_18_432MHz/12) /* verified on pcb */ + MDRV_SOUND_ADD("aysnd", AY8910, XTAL_18_432MHz/12) /* verified on pcb */ MDRV_SOUND_CONFIG(chinhero_ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) MACHINE_DRIVER_END @@ -439,7 +439,7 @@ static MACHINE_DRIVER_START( shangkid ) /* video hardware */ MDRV_GFXDECODE(shangkid) - MDRV_SOUND_MODIFY("ay") + MDRV_SOUND_MODIFY("aysnd") MDRV_SOUND_CONFIG(shangkid_ay8910_interface) MACHINE_DRIVER_END @@ -463,7 +463,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dynamski_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) /* ports are reversed */ - AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_data_address_w) ADDRESS_MAP_END static MACHINE_DRIVER_START( dynamski ) @@ -491,7 +491,7 @@ static MACHINE_DRIVER_START( dynamski ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 2000000) + MDRV_SOUND_ADD("aysnd", AY8910, 2000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) MACHINE_DRIVER_END diff --git a/src/mame/drivers/shisen.c b/src/mame/drivers/shisen.c index d87c20e7878..f1da8f0fbc5 100644 --- a/src/mame/drivers/shisen.c +++ b/src/mame/drivers/shisen.c @@ -72,7 +72,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( shisen_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x80, 0x80) AM_READ(soundlatch_r) AM_RANGE(0x80, 0x81) AM_WRITE(shisen_sample_addr_w) AM_RANGE(0x82, 0x82) AM_DEVWRITE("dac", m72_sample_w) @@ -248,7 +248,7 @@ static MACHINE_DRIVER_START( shisen ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.5) MDRV_SOUND_ROUTE(1, "rspeaker", 0.5) diff --git a/src/mame/drivers/shootout.c b/src/mame/drivers/shootout.c index 00564163049..23c52c98a68 100644 --- a/src/mame/drivers/shootout.c +++ b/src/mame/drivers/shootout.c @@ -95,7 +95,7 @@ static ADDRESS_MAP_START( shootouj_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1003, 0x1003) AM_READ_PORT("DSW2") AM_RANGE(0x1800, 0x1800) AM_WRITE(shootout_coin_counter_w) AM_RANGE(0x2000, 0x21ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x2800, 0x2801) AM_DEVREADWRITE("ym", ym2203_r,ym2203_w) + AM_RANGE(0x2800, 0x2801) AM_DEVREADWRITE("ymsnd", ym2203_r,ym2203_w) AM_RANGE(0x3000, 0x37ff) AM_RAM_WRITE(shootout_textram_w) AM_BASE(&shootout_textram) AM_RANGE(0x3800, 0x3fff) AM_RAM_WRITE(shootout_videoram_w) AM_BASE(&videoram) AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) @@ -106,7 +106,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( shootout_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM - AM_RANGE(0x4000, 0x4001) AM_DEVREADWRITE("ym", ym2203_r,ym2203_w) + AM_RANGE(0x4000, 0x4001) AM_DEVREADWRITE("ymsnd", ym2203_r,ym2203_w) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) AM_RANGE(0xc000, 0xffff) AM_ROM AM_RANGE(0xd000, 0xd000) AM_WRITE(interrupt_enable_w) @@ -296,7 +296,7 @@ static MACHINE_DRIVER_START( shootout ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 1500000) + MDRV_SOUND_ADD("ymsnd", YM2203, 1500000) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END @@ -326,7 +326,7 @@ static MACHINE_DRIVER_START( shootouj ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 1500000) + MDRV_SOUND_ADD("ymsnd", YM2203, 1500000) MDRV_SOUND_CONFIG(ym2203_interface2) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/shougi.c b/src/mame/drivers/shougi.c index cb2a2689eaf..c0b031270e2 100644 --- a/src/mame/drivers/shougi.c +++ b/src/mame/drivers/shougi.c @@ -278,8 +278,8 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x5000, 0x5000) AM_READ_PORT("P1") AM_RANGE(0x5800, 0x5800) AM_READ_PORT("P2") AM_WRITE(shougi_watchdog_reset_w) /* game won't boot if watchdog doesn't work */ - AM_RANGE(0x6000, 0x6000) AM_DEVWRITE("ay", ay8910_address_w) - AM_RANGE(0x6800, 0x6800) AM_DEVWRITE("ay", ay8910_data_w) + AM_RANGE(0x6000, 0x6000) AM_DEVWRITE("aysnd", ay8910_address_w) + AM_RANGE(0x6800, 0x6800) AM_DEVWRITE("aysnd", ay8910_data_w) AM_RANGE(0x7000, 0x73ff) AM_RAM AM_SHARE(1) /* 2114 x 2 (0x400 x 4bit each) */ AM_RANGE(0x7800, 0x7bff) AM_RAM AM_SHARE(2) /* 2114 x 2 (0x400 x 4bit each) */ @@ -407,7 +407,7 @@ static MACHINE_DRIVER_START( shougi ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 10000000/8) + MDRV_SOUND_ADD("aysnd", AY8910, 10000000/8) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_DRIVER_END diff --git a/src/mame/drivers/sidearms.c b/src/mame/drivers/sidearms.c index d7b86ebabcf..b48a699dd50 100644 --- a/src/mame/drivers/sidearms.c +++ b/src/mame/drivers/sidearms.c @@ -185,7 +185,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( whizz_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x40, 0x40) AM_WRITENOP AM_RANGE(0xc0, 0xc0) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -790,7 +790,7 @@ static MACHINE_DRIVER_START( whizz ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 4000000) + MDRV_SOUND_ADD("ymsnd", YM2151, 4000000) MDRV_SOUND_CONFIG(whizz_ym2151_interface) MDRV_SOUND_ROUTE(0, "mono", 1.0) MDRV_SOUND_ROUTE(1, "mono", 1.0) diff --git a/src/mame/drivers/silkroad.c b/src/mame/drivers/silkroad.c index 0370ccdeaa1..729e8157a36 100644 --- a/src/mame/drivers/silkroad.c +++ b/src/mame/drivers/silkroad.c @@ -169,7 +169,7 @@ static ADDRESS_MAP_START( cpu_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0xc00000, 0xc00003) AM_READ_PORT("INPUTS") AM_RANGE(0xc00004, 0xc00007) AM_READ_PORT("DSW") AM_RANGE(0xc00024, 0xc00027) AM_DEVREADWRITE8("oki1", okim6295_r, okim6295_w, 0x00ff0000) - AM_RANGE(0xc00028, 0xc0002f) AM_DEVREADWRITE8("ym", ym2151_r, ym2151_w, 0x00ff0000) + AM_RANGE(0xc00028, 0xc0002f) AM_DEVREADWRITE8("ymsnd", ym2151_r, ym2151_w, 0x00ff0000) AM_RANGE(0xc00030, 0xc00033) AM_DEVREADWRITE8("oki2", okim6295_r, okim6295_w, 0x00ff0000) AM_RANGE(0xc00034, 0xc00037) AM_DEVWRITE("oki1", silk_6295_bank_w) AM_RANGE(0xc00038, 0xc0003b) AM_WRITE(silk_coin_counter_w) @@ -309,7 +309,7 @@ static MACHINE_DRIVER_START( silkroad ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/simpsons.c b/src/mame/drivers/simpsons.c index 24c84a05231..00b9217be97 100644 --- a/src/mame/drivers/simpsons.c +++ b/src/mame/drivers/simpsons.c @@ -137,7 +137,7 @@ static ADDRESS_MAP_START( z80_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(2) AM_RANGE(0xf000, 0xf7ff) AM_RAM - AM_RANGE(0xf800, 0xf801) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xf800, 0xf801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xfa00, 0xfa00) AM_WRITE(z80_arm_nmi_w) AM_RANGE(0xfc00, 0xfc2f) AM_DEVREADWRITE("konami", k053260_r, k053260_w) AM_RANGE(0xfe00, 0xfe00) AM_WRITE(z80_bankswitch_w) @@ -288,7 +288,7 @@ static MACHINE_DRIVER_START( simpsons ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) /* verified on pcb */ MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) /* only left channel is connected */ MDRV_SOUND_ROUTE(0, "rspeaker", 1.0) MDRV_SOUND_ROUTE(1, "lspeaker", 0.0) diff --git a/src/mame/drivers/skeetsht.c b/src/mame/drivers/skeetsht.c index 811454ddac3..49f233e0f2e 100644 --- a/src/mame/drivers/skeetsht.c +++ b/src/mame/drivers/skeetsht.c @@ -137,7 +137,7 @@ static WRITE8_HANDLER( hc11_porta_w ) static WRITE8_HANDLER( ay8910_w ) { - const device_config *ay = devtag_get_device(space->machine, "ay"); + const device_config *ay = devtag_get_device(space->machine, "aysnd"); if (ay_sel) ay8910_data_w(ay, 0, data); @@ -248,7 +248,7 @@ static MACHINE_DRIVER_START( skeetsht ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 2000000) // ? + MDRV_SOUND_ADD("aysnd", AY8910, 2000000) // ? MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/skyarmy.c b/src/mame/drivers/skyarmy.c index 28f1de73c89..084304f0371 100644 --- a/src/mame/drivers/skyarmy.c +++ b/src/mame/drivers/skyarmy.c @@ -160,8 +160,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( skyarmy_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x04, 0x05) AM_DEVWRITE("ay", ay8910_address_data_w) - AM_RANGE(0x06, 0x06) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x04, 0x05) AM_DEVWRITE("aysnd", ay8910_address_data_w) + AM_RANGE(0x06, 0x06) AM_DEVREAD("aysnd", ay8910_r) ADDRESS_MAP_END static INPUT_PORTS_START( skyarmy ) @@ -258,7 +258,7 @@ static MACHINE_DRIVER_START( skyarmy ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 2500000) + MDRV_SOUND_ADD("aysnd", AY8910, 2500000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) MACHINE_DRIVER_END diff --git a/src/mame/drivers/skylncr.c b/src/mame/drivers/skylncr.c index 0dae4ddbc40..4846ca2b8ad 100644 --- a/src/mame/drivers/skylncr.c +++ b/src/mame/drivers/skylncr.c @@ -377,8 +377,8 @@ static ADDRESS_MAP_START( io_map_skylncr, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x20, 0x20) AM_WRITE( skylncr_coin_w ) - AM_RANGE(0x30, 0x31) AM_DEVWRITE( "ay", ay8910_address_data_w ) - AM_RANGE(0x31, 0x31) AM_DEVREAD( "ay", ay8910_r ) + AM_RANGE(0x30, 0x31) AM_DEVWRITE( "aysnd", ay8910_address_data_w ) + AM_RANGE(0x31, 0x31) AM_DEVREAD( "aysnd", ay8910_r ) AM_RANGE(0x40, 0x41) AM_WRITE( skylncr_paletteram_w ) AM_RANGE(0x50, 0x51) AM_WRITE( skylncr_paletteram2_w ) @@ -527,7 +527,7 @@ static INPUT_PORTS_START( skylncr ) PORT_DIPSETTING( 0x00, "24" ) PORT_DIPNAME( 0x80, 0x00, "Key Out" ) PORT_DIPSETTING( 0x80, "x100" ) - PORT_DIPSETTING( 0x00, "x1" ) + PORT_DIPSETTING( 0x00, "x1snd" ) PORT_START("DSW2") /* $10 (PPI1 port A) */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) @@ -686,7 +686,7 @@ static MACHINE_DRIVER_START( skylncr ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, MASTER_CLOCK/8) + MDRV_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/8) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/slapshot.c b/src/mame/drivers/slapshot.c index 527577fe095..ee59ebe4d19 100644 --- a/src/mame/drivers/slapshot.c +++ b/src/mame/drivers/slapshot.c @@ -315,7 +315,7 @@ static ADDRESS_MAP_START( opwolf3_z80_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(10) AM_RANGE(0xc000, 0xdfff) AM_RAM - AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ym", ym2610_r,ym2610_w) + AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ymsnd", ym2610_r,ym2610_w) AM_RANGE(0xe200, 0xe200) AM_READNOP AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xe201, 0xe201) AM_READWRITE(taitosound_slave_comm_r,taitosound_slave_comm_w) AM_RANGE(0xe400, 0xe403) AM_WRITENOP /* pan */ @@ -545,7 +545,7 @@ static MACHINE_DRIVER_START( slapshot ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610B, 16000000/2) + MDRV_SOUND_ADD("ymsnd", YM2610B, 16000000/2) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -585,7 +585,7 @@ static MACHINE_DRIVER_START( opwolf3 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610B, 16000000/2) + MDRV_SOUND_ADD("ymsnd", YM2610B, 16000000/2) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -618,7 +618,7 @@ ROM_START( slapshot ) ROM_LOAD ( "d71-03.25", 0x300000, 0x100000, CRC(dccef9ec) SHA1(ee7a49727b822cf4c1d7acff994b77ea6191c423) ) ROM_FILL ( 0x200000, 0x100000, 0 ) - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "d71-06.37", 0x00000, 0x80000, CRC(f3324188) SHA1(70dd724441eae8614218bc7f0f51860bd2462f0c) ) /* no Delta-T samples */ @@ -653,7 +653,7 @@ ROM_START( opwolf3 ) ROM_LOAD ( "d74_04.25", 0x600000, 0x200000, CRC(2f385638) SHA1(1ba2ec7d9b1c491e1cc6d7e646e09ef2bc063f25) ) ROM_FILL ( 0x400000, 0x200000, 0 ) - ROM_REGION( 0x200000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x200000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "d74_01.37", 0x000000, 0x200000, CRC(115313e0) SHA1(51a69e7a26960b1328ccefeaec0fb26bdccc39f2) ) /* no Delta-T samples */ @@ -680,7 +680,7 @@ ROM_START( opwolf3u ) ROM_LOAD ( "d74_04.25", 0x600000, 0x200000, CRC(2f385638) SHA1(1ba2ec7d9b1c491e1cc6d7e646e09ef2bc063f25) ) ROM_FILL ( 0x400000, 0x200000, 0 ) - ROM_REGION( 0x200000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x200000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "d74_01.37", 0x000000, 0x200000, CRC(115313e0) SHA1(51a69e7a26960b1328ccefeaec0fb26bdccc39f2) ) /* no Delta-T samples */ diff --git a/src/mame/drivers/slotcarn.c b/src/mame/drivers/slotcarn.c index cbfd780cca3..f879b8d027b 100644 --- a/src/mame/drivers/slotcarn.c +++ b/src/mame/drivers/slotcarn.c @@ -174,8 +174,8 @@ static ADDRESS_MAP_START( slotcarn_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x7000, 0xafff) AM_ROM // spielbud - AM_RANGE(0xb000, 0xb000) AM_DEVWRITE("ay", ay8910_address_w) - AM_RANGE(0xb100, 0xb100) AM_DEVREADWRITE("ay", ay8910_r, ay8910_data_w) + AM_RANGE(0xb000, 0xb000) AM_DEVWRITE("aysnd", ay8910_address_w) + AM_RANGE(0xb100, 0xb100) AM_DEVREADWRITE("aysnd", ay8910_r, ay8910_data_w) AM_RANGE(0xb800, 0xb803) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */ AM_RANGE(0xba00, 0xba03) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) /* Input Ports */ @@ -196,8 +196,8 @@ ADDRESS_MAP_END // spielbud - is the ay mirrored, or are there now 2? static ADDRESS_MAP_START( spielbud_io_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0xb000, 0xb000) AM_DEVWRITE("ay", ay8910_address_w) - AM_RANGE(0xb100, 0xb100) AM_DEVWRITE("ay", ay8910_data_w) + AM_RANGE(0xb000, 0xb000) AM_DEVWRITE("aysnd", ay8910_address_w) + AM_RANGE(0xb100, 0xb100) AM_DEVWRITE("aysnd", ay8910_data_w) ADDRESS_MAP_END /******************************** @@ -619,7 +619,7 @@ static MACHINE_DRIVER_START( slotcarn ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay",AY8910, SND_CLOCK) + MDRV_SOUND_ADD("aysnd",AY8910, SND_CLOCK) MDRV_SOUND_CONFIG(scarn_ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/sms.c b/src/mame/drivers/sms.c index 818fc955a06..5c5d0007559 100644 --- a/src/mame/drivers/sms.c +++ b/src/mame/drivers/sms.c @@ -502,7 +502,7 @@ static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x2000, 0x27ff) AM_RAM AM_RANGE(0x3100, 0x3103) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) - AM_RANGE(0x3381, 0x3382) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x3381, 0x3382) AM_DEVWRITE("aysnd", ay8910_data_address_w) AM_RANGE(0x3400, 0x3400) AM_READ(z80_8088_r) AM_RANGE(0x3500, 0x3501) AM_READWRITE(p03_r, p03_w) ADDRESS_MAP_END @@ -564,7 +564,7 @@ static MACHINE_DRIVER_START( sms ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, XTAL_16MHz/8) + MDRV_SOUND_ADD("aysnd", AY8910, XTAL_16MHz/8) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_DRIVER_END diff --git a/src/mame/drivers/snk68.c b/src/mame/drivers/snk68.c index 9456bf4e1c1..7834bcb8fad 100644 --- a/src/mame/drivers/snk68.c +++ b/src/mame/drivers/snk68.c @@ -187,8 +187,8 @@ static WRITE8_DEVICE_HANDLER( D7759_upd_reset_w ) static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ym", ym3812_status_port_r, ym3812_control_port_w) - AM_RANGE(0x20, 0x20) AM_DEVWRITE("ym", ym3812_write_port_w) + AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ymsnd", ym3812_status_port_r, ym3812_control_port_w) + AM_RANGE(0x20, 0x20) AM_DEVWRITE("ymsnd", ym3812_write_port_w) AM_RANGE(0x40, 0x40) AM_DEVWRITE("upd", D7759_write_port_0_w) AM_RANGE(0x80, 0x80) AM_DEVWRITE("upd", D7759_upd_reset_w) ADDRESS_MAP_END @@ -625,7 +625,7 @@ static MACHINE_DRIVER_START( pow ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, XTAL_8MHz/2) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_8MHz/2) /* verified on pcb */ MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/drivers/snowbros.c b/src/mame/drivers/snowbros.c index d366d3156c8..044207c065a 100644 --- a/src/mame/drivers/snowbros.c +++ b/src/mame/drivers/snowbros.c @@ -198,7 +198,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) + AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w) AM_RANGE(0x04, 0x04) AM_READWRITE(soundlatch_r, soundlatch_w) /* goes back to the main CPU, checked during boot */ ADDRESS_MAP_END @@ -300,7 +300,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( honeydol_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) // not connected? + AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w) // not connected? AM_RANGE(0x04, 0x04) AM_READWRITE(soundlatch_r, soundlatch_w) /* goes back to the main CPU, checked during boot */ ADDRESS_MAP_END @@ -375,7 +375,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hyperpac_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xcfff) AM_ROM AM_RANGE(0xd000, 0xd7ff) AM_RAM - AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE("ym", ym2151_r,ym2151_w) + AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE("ymsnd", ym2151_r,ym2151_w) AM_RANGE(0xf002, 0xf002) AM_DEVREADWRITE("oki",okim6295_r,okim6295_w) AM_RANGE(0xf008, 0xf008) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -1543,7 +1543,7 @@ static MACHINE_DRIVER_START( snowbros ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 3000000) + MDRV_SOUND_ADD("ymsnd", YM3812, 3000000) MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END @@ -1575,7 +1575,7 @@ static MACHINE_DRIVER_START( semicom ) MDRV_GFXDECODE(hyperpac) /* sound hardware */ - MDRV_SOUND_REPLACE("ym", YM2151, 4000000) + MDRV_SOUND_REPLACE("ymsnd", YM2151, 4000000) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "mono", 0.10) MDRV_SOUND_ROUTE(1, "mono", 0.10) @@ -1652,7 +1652,7 @@ static MACHINE_DRIVER_START( honeydol ) /* sound hardware */ - MDRV_SOUND_ADD("ym", YM3812, 3000000) + MDRV_SOUND_ADD("ymsnd", YM3812, 3000000) MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) @@ -1725,7 +1725,7 @@ static MACHINE_DRIVER_START( finalttr ) MDRV_MACHINE_RESET ( finalttr ) - MDRV_SOUND_REPLACE("ym", YM2151, 4000000) + MDRV_SOUND_REPLACE("ymsnd", YM2151, 4000000) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "mono", 0.08) MDRV_SOUND_ROUTE(1, "mono", 0.08) diff --git a/src/mame/drivers/sothello.c b/src/mame/drivers/sothello.c index 658882037cd..930decb6cdb 100644 --- a/src/mame/drivers/sothello.c +++ b/src/mame/drivers/sothello.c @@ -125,7 +125,7 @@ static ADDRESS_MAP_START( maincpu_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x33, 0x33) AM_READ(soundcpu_status_r) AM_RANGE( 0x40, 0x4f) AM_WRITE(soundlatch_w) AM_RANGE( 0x50, 0x50) AM_WRITE(bank_w) - AM_RANGE( 0x60, 0x61) AM_MIRROR(0x02) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE( 0x60, 0x61) AM_MIRROR(0x02) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) /* not sure, but the A1 line is ignored, code @ $8b8 */ AM_RANGE( 0x70, 0x70) AM_WRITE( v9938_0_vram_w ) AM_READ( v9938_0_vram_r ) AM_RANGE( 0x71, 0x71) AM_WRITE( v9938_0_command_w ) AM_READ( v9938_0_status_r ) @@ -377,7 +377,7 @@ static MACHINE_DRIVER_START( sothello ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, YM_CLOCK) + MDRV_SOUND_ADD("ymsnd", YM2203, YM_CLOCK) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(0, "mono", 0.25) MDRV_SOUND_ROUTE(1, "mono", 0.25) diff --git a/src/mame/drivers/spbactn.c b/src/mame/drivers/spbactn.c index 184edcc4d6f..5075a29d031 100644 --- a/src/mame/drivers/spbactn.c +++ b/src/mame/drivers/spbactn.c @@ -195,7 +195,7 @@ static ADDRESS_MAP_START( spbactn_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_ROM AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_RANGE(0xf800, 0xf800) AM_DEVREADWRITE("oki", okim6295_r,okim6295_w) - AM_RANGE(0xf810, 0xf811) AM_DEVWRITE("ym", ym3812_w) + AM_RANGE(0xf810, 0xf811) AM_DEVWRITE("ymsnd", ym3812_w) AM_RANGE(0xfc00, 0xfc00) AM_READNOP AM_WRITENOP /* irq ack ?? */ AM_RANGE(0xfc20, 0xfc20) AM_READ(soundlatch_r) @@ -364,7 +364,7 @@ static MACHINE_DRIVER_START( spbactn ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 3579545) + MDRV_SOUND_ADD("ymsnd", YM3812, 3579545) MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/drivers/spdodgeb.c b/src/mame/drivers/spdodgeb.c index ac1c83cd337..63ec7462ef5 100644 --- a/src/mame/drivers/spdodgeb.c +++ b/src/mame/drivers/spdodgeb.c @@ -287,7 +287,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( spdodgeb_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_RAM AM_RANGE(0x1000, 0x1000) AM_READ(soundlatch_r) - AM_RANGE(0x2800, 0x2801) AM_DEVWRITE("ym", ym3812_w) + AM_RANGE(0x2800, 0x2801) AM_DEVWRITE("ymsnd", ym3812_w) AM_RANGE(0x3800, 0x3807) AM_WRITE(spd_adpcm_w) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -461,7 +461,7 @@ static MACHINE_DRIVER_START( spdodgeb ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM3812, 3000000) + MDRV_SOUND_ADD("ymsnd", YM3812, 3000000) MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) diff --git a/src/mame/drivers/speedatk.c b/src/mame/drivers/speedatk.c index 4b7e3da6176..548ca9f7a06 100644 --- a/src/mame/drivers/speedatk.c +++ b/src/mame/drivers/speedatk.c @@ -198,8 +198,8 @@ static ADDRESS_MAP_START( speedatk_io, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x00) AM_DEVWRITE("crtc", mc6845_address_w) AM_RANGE(0x01, 0x01) AM_DEVWRITE("crtc", mc6845_register_w) AM_RANGE(0x24, 0x24) AM_WRITE(watchdog_reset_w) //watchdog - AM_RANGE(0x40, 0x40) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x40, 0x41) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x40, 0x40) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x40, 0x41) AM_DEVWRITE("aysnd", ay8910_address_data_w) //what's 60-6f for? Seems used only in attract mode... ADDRESS_MAP_END @@ -345,7 +345,7 @@ static MACHINE_DRIVER_START( speedatk ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, MASTER_CLOCK/4) //divider is unknown + MDRV_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/4) //divider is unknown MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MACHINE_DRIVER_END diff --git a/src/mame/drivers/speedbal.c b/src/mame/drivers/speedbal.c index 386343cbc86..73d47285048 100644 --- a/src/mame/drivers/speedbal.c +++ b/src/mame/drivers/speedbal.c @@ -101,7 +101,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_cpu_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w) AM_RANGE(0x40, 0x40) AM_WRITENOP AM_RANGE(0x80, 0x80) AM_WRITENOP AM_RANGE(0x82, 0x82) AM_WRITENOP @@ -257,7 +257,7 @@ static MACHINE_DRIVER_START( speedbal ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 3600000) + MDRV_SOUND_ADD("ymsnd", YM3812, 3600000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/speglsht.c b/src/mame/drivers/speglsht.c index 44483025001..95dd7a99830 100644 --- a/src/mame/drivers/speglsht.c +++ b/src/mame/drivers/speglsht.c @@ -122,7 +122,7 @@ static ADDRESS_MAP_START( st0016_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd000, 0xdfff) AM_READ(st0016_sprite2_ram_r) AM_WRITE(st0016_sprite2_ram_w) AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_RANGE(0xe800, 0xe87f) AM_RAM - AM_RANGE(0xe900, 0xe9ff) AM_DEVREADWRITE("st", st0016_snd_r, st0016_snd_w) + AM_RANGE(0xe900, 0xe9ff) AM_DEVREADWRITE("stsnd", st0016_snd_r, st0016_snd_w) AM_RANGE(0xea00, 0xebff) AM_READ(st0016_palette_ram_r) AM_WRITE(st0016_palette_ram_w) AM_RANGE(0xec00, 0xec1f) AM_READ(st0016_character_ram_r) AM_WRITE(st0016_character_ram_w) AM_RANGE(0xf000, 0xffff) AM_RAM AM_BASE(&shared) @@ -350,7 +350,7 @@ static MACHINE_DRIVER_START( speglsht ) MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("st", ST0016, 0) + MDRV_SOUND_ADD("stsnd", ST0016, 0) MDRV_SOUND_CONFIG(st0016_config) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/splash.c b/src/mame/drivers/splash.c index 6fed4341baa..5d9611ccc6d 100644 --- a/src/mame/drivers/splash.c +++ b/src/mame/drivers/splash.c @@ -138,7 +138,7 @@ static ADDRESS_MAP_START( splash_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd800, 0xd800) AM_WRITE(splash_adpcm_data_w) /* ADPCM data for the MSM5205 chip */ // AM_RANGE(0xe000, 0xe000) AM_WRITENOP /* ??? */ AM_RANGE(0xe800, 0xe800) AM_READ(soundlatch_r) /* Sound latch */ - AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE("ym", ym3812_r,ym3812_w) /* YM3812 */ + AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE("ymsnd", ym3812_r,ym3812_w) /* YM3812 */ AM_RANGE(0xf800, 0xffff) AM_RAM /* RAM */ ADDRESS_MAP_END @@ -182,7 +182,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( roldfrog_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x12, 0x13) AM_DEVWRITE("ym", ym2203_w) + AM_RANGE(0x12, 0x13) AM_DEVWRITE("ymsnd", ym2203_w) AM_RANGE(0x40, 0x40) AM_NOP /* NMI ack */ AM_RANGE(0x70, 0x70) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -421,7 +421,7 @@ static MACHINE_DRIVER_START( splash ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 3000000) + MDRV_SOUND_ADD("ymsnd", YM3812, 3000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MDRV_SOUND_ADD("msm", MSM5205, 384000) @@ -475,7 +475,7 @@ static MACHINE_DRIVER_START( roldfrog ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 3000000) + MDRV_SOUND_ADD("ymsnd", YM2203, 3000000) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(0, "mono", 0.60) MDRV_SOUND_ROUTE(1, "mono", 0.60) @@ -514,7 +514,7 @@ static MACHINE_DRIVER_START( funystrp ) /* sound hardware */ // MDRV_SPEAKER_STANDARD_MONO("mono") -// MDRV_SOUND_ADD("ym", YM3812, 3000000) +// MDRV_SOUND_ADD("ymsnd", YM3812, 3000000) // MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) // MDRV_SOUND_ADD("msm", MSM5205, 384000) diff --git a/src/mame/drivers/spoker.c b/src/mame/drivers/spoker.c index 89c31f65ba5..d48885bbc34 100644 --- a/src/mame/drivers/spoker.c +++ b/src/mame/drivers/spoker.c @@ -208,7 +208,7 @@ static ADDRESS_MAP_START( spoker_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x6492, 0x6492 ) AM_WRITE( spoker_leds_w ) AM_RANGE( 0x64a0, 0x64a0 ) AM_READ_PORT( "BUTTONS2" ) - AM_RANGE( 0x64b0, 0x64b1 ) AM_DEVWRITE( "ym", ym2413_w ) + AM_RANGE( 0x64b0, 0x64b1 ) AM_DEVWRITE( "ymsnd", ym2413_w ) AM_RANGE( 0x64c0, 0x64c0 ) AM_DEVREADWRITE( "oki", okim6295_r, okim6295_w ) @@ -381,7 +381,7 @@ static MACHINE_DRIVER_START( spoker ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2413, XTAL_3_579545MHz) + MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_SOUND_ADD("oki", OKIM6295, XTAL_12MHz / 12) diff --git a/src/mame/drivers/spy.c b/src/mame/drivers/spy.c index e29e2d1b4f4..264fc468b5e 100644 --- a/src/mame/drivers/spy.c +++ b/src/mame/drivers/spy.c @@ -375,7 +375,7 @@ static ADDRESS_MAP_START( spy_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9000, 0x9000) AM_WRITE(sound_bank_w) AM_RANGE(0xa000, 0xa00d) AM_DEVREADWRITE("konami1", k007232_r,k007232_w) AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE("konami2", k007232_r,k007232_w) - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym", ym3812_r,ym3812_w) + AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", ym3812_r,ym3812_w) AM_RANGE(0xd000, 0xd000) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -497,7 +497,7 @@ static MACHINE_DRIVER_START( spy ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 3579545) + MDRV_SOUND_ADD("ymsnd", YM3812, 3579545) MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/drivers/srmp2.c b/src/mame/drivers/srmp2.c index 988e686d0cb..a0bd09cd8d3 100644 --- a/src/mame/drivers/srmp2.c +++ b/src/mame/drivers/srmp2.c @@ -399,8 +399,8 @@ static ADDRESS_MAP_START( srmp2_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xc00000, 0xc00001) AM_WRITENOP /* ??? */ AM_RANGE(0xd00000, 0xd00001) AM_WRITENOP /* ??? */ AM_RANGE(0xe00000, 0xe00001) AM_WRITENOP /* ??? */ - AM_RANGE(0xf00000, 0xf00001) AM_DEVREAD8("ay", ay8910_r, 0x00ff) - AM_RANGE(0xf00000, 0xf00003) AM_DEVWRITE8("ay", ay8910_address_data_w, 0x00ff) + AM_RANGE(0xf00000, 0xf00001) AM_DEVREAD8("aysnd", ay8910_r, 0x00ff) + AM_RANGE(0xf00000, 0xf00003) AM_DEVWRITE8("aysnd", ay8910_address_data_w, 0x00ff) ADDRESS_MAP_END @@ -421,8 +421,8 @@ static ADDRESS_MAP_START( mjyuugi_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xa00000, 0xa00001) AM_READ(srmp2_cchip_status_0_r) /* custom chip status ??? */ AM_RANGE(0xa00000, 0xa00001) AM_DEVWRITE("msm", srmp2_adpcm_code_w) /* ADPCM number */ AM_RANGE(0xa00002, 0xa00003) AM_READ(srmp2_cchip_status_1_r) /* custom chip status ??? */ - AM_RANGE(0xb00000, 0xb00001) AM_DEVREAD8("ay", ay8910_r, 0x00ff) - AM_RANGE(0xb00000, 0xb00003) AM_DEVWRITE8("ay", ay8910_address_data_w, 0x00ff) + AM_RANGE(0xb00000, 0xb00001) AM_DEVREAD8("aysnd", ay8910_r, 0x00ff) + AM_RANGE(0xb00000, 0xb00003) AM_DEVWRITE8("aysnd", ay8910_address_data_w, 0x00ff) AM_RANGE(0xc00000, 0xc00001) AM_WRITENOP /* ??? */ AM_RANGE(0xd00000, 0xd00609) AM_RAM AM_BASE(&spriteram16) /* Sprites Y */ AM_RANGE(0xd02000, 0xd023ff) AM_RAM /* ??? only writes $00fa */ @@ -558,8 +558,8 @@ static ADDRESS_MAP_START( srmp3_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xa1, 0xa1) AM_READ(srmp3_cchip_status_0_r) /* custom chip status ??? */ AM_RANGE(0xc0, 0xc0) AM_READWRITE(srmp3_input_r, srmp3_input_1_w) /* key matrix | I/O ??? */ AM_RANGE(0xc1, 0xc1) AM_READWRITE(srmp3_cchip_status_1_r, srmp3_input_2_w) /* custom chip status ??? | I/O ??? */ - AM_RANGE(0xe0, 0xe1) AM_DEVWRITE("ay", ay8910_address_data_w) - AM_RANGE(0xe2, 0xe2) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0xe0, 0xe1) AM_DEVWRITE("aysnd", ay8910_address_data_w) + AM_RANGE(0xe2, 0xe2) AM_DEVREAD("aysnd", ay8910_r) ADDRESS_MAP_END @@ -1049,7 +1049,7 @@ static MACHINE_DRIVER_START( srmp2 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 20000000/16) + MDRV_SOUND_ADD("aysnd", AY8910, 20000000/16) MDRV_SOUND_CONFIG(srmp2_ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) @@ -1089,7 +1089,7 @@ static MACHINE_DRIVER_START( srmp3 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 16000000/16) + MDRV_SOUND_ADD("aysnd", AY8910, 16000000/16) MDRV_SOUND_CONFIG(srmp2_ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20) @@ -1125,7 +1125,7 @@ static MACHINE_DRIVER_START( mjyuugi ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 16000000/16) + MDRV_SOUND_ADD("aysnd", AY8910, 16000000/16) MDRV_SOUND_CONFIG(srmp2_ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20) diff --git a/src/mame/drivers/srmp5.c b/src/mame/drivers/srmp5.c index f26541b4493..24e3d19d424 100644 --- a/src/mame/drivers/srmp5.c +++ b/src/mame/drivers/srmp5.c @@ -330,7 +330,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( st0016_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) - AM_RANGE(0xe900, 0xe9ff) AM_DEVREADWRITE("st", st0016_snd_r, st0016_snd_w) + AM_RANGE(0xe900, 0xe9ff) AM_DEVREADWRITE("stsnd", st0016_snd_r, st0016_snd_w) AM_RANGE(0xec00, 0xec1f) AM_READ(st0016_character_ram_r) AM_WRITE(st0016_character_ram_w) AM_RANGE(0xf000, 0xffff) AM_RAM ADDRESS_MAP_END @@ -541,7 +541,7 @@ static MACHINE_DRIVER_START( srmp5 ) MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("st", ST0016, 0) + MDRV_SOUND_ADD("stsnd", ST0016, 0) MDRV_SOUND_CONFIG(st0016_config) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/sshangha.c b/src/mame/drivers/sshangha.c index f25f920c44c..bdeb588aadc 100644 --- a/src/mame/drivers/sshangha.c +++ b/src/mame/drivers/sshangha.c @@ -210,7 +210,7 @@ static WRITE8_HANDLER(sshangha_sound_shared_w) /* Note: there's rom data after 0x8000 but the game never seem to call a rom bank, left-over? */ static ADDRESS_MAP_START( sshangha_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym", ym2203_r,ym2203_w) + AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", ym2203_r,ym2203_w) AM_RANGE(0xc200, 0xc201) AM_DEVREADWRITE("oki",okim6295_r,okim6295_w) AM_RANGE(0xf800, 0xf807) AM_READWRITE(sshangha_sound_shared_r,sshangha_sound_shared_w) AM_RANGE(0xf808, 0xffff) AM_RAM @@ -386,7 +386,7 @@ static MACHINE_DRIVER_START( sshangha ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") /* sure it's stereo? */ - MDRV_SOUND_ADD("ym", YM2203, 16000000/4) + MDRV_SOUND_ADD("ymsnd", YM2203, 16000000/4) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.33) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33) diff --git a/src/mame/drivers/ssrj.c b/src/mame/drivers/ssrj.c index ac3c6635b3f..e74325fbaea 100644 --- a/src/mame/drivers/ssrj.c +++ b/src/mame/drivers/ssrj.c @@ -72,8 +72,8 @@ static ADDRESS_MAP_START( ssrj_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xf001, 0xf001) AM_READ(ssrj_wheel_r) AM_RANGE(0xf002, 0xf002) AM_READ_PORT("IN2") AM_RANGE(0xf003, 0xf003) AM_WRITENOP /* unknown */ - AM_RANGE(0xf401, 0xf401) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0xf400, 0xf401) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0xf401, 0xf401) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0xf400, 0xf401) AM_DEVWRITE("aysnd", ay8910_address_data_w) AM_RANGE(0xf800, 0xf800) AM_WRITENOP /* wheel ? */ AM_RANGE(0xfc00, 0xfc00) AM_WRITENOP /* unknown */ ADDRESS_MAP_END @@ -176,7 +176,7 @@ static MACHINE_DRIVER_START( ssrj ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 8000000/5) + MDRV_SOUND_ADD("aysnd", AY8910, 8000000/5) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_DRIVER_END diff --git a/src/mame/drivers/st0016.c b/src/mame/drivers/st0016.c index 231eeca4856..a44a402dc30 100644 --- a/src/mame/drivers/st0016.c +++ b/src/mame/drivers/st0016.c @@ -34,7 +34,7 @@ static ADDRESS_MAP_START( st0016_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd000, 0xdfff) AM_READ(st0016_sprite2_ram_r) AM_WRITE(st0016_sprite2_ram_w) AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_RANGE(0xe800, 0xe87f) AM_RAM /* common ram */ - AM_RANGE(0xe900, 0xe9ff) AM_DEVREADWRITE("st", st0016_snd_r, st0016_snd_w) /* sound regs 8 x $20 bytes, see notes */ + AM_RANGE(0xe900, 0xe9ff) AM_DEVREADWRITE("stsnd", st0016_snd_r, st0016_snd_w) /* sound regs 8 x $20 bytes, see notes */ AM_RANGE(0xea00, 0xebff) AM_READ(st0016_palette_ram_r) AM_WRITE(st0016_palette_ram_w) AM_RANGE(0xec00, 0xec1f) AM_READ(st0016_character_ram_r) AM_WRITE(st0016_character_ram_w) AM_RANGE(0xf000, 0xffff) AM_RAM /* work ram */ @@ -456,7 +456,7 @@ static MACHINE_DRIVER_START( st0016 ) MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("st", ST0016, 0) + MDRV_SOUND_ADD("stsnd", ST0016, 0) MDRV_SOUND_CONFIG(st0016_config) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/statriv2.c b/src/mame/drivers/statriv2.c index 2cddd64fc69..54d82f50ad9 100644 --- a/src/mame/drivers/statriv2.c +++ b/src/mame/drivers/statriv2.c @@ -274,16 +274,16 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( statriv2_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x20, 0x23) AM_DEVREADWRITE("ppi", ppi8255_r, ppi8255_w) AM_RANGE(0x28, 0x2b) AM_READ(question_data_r) AM_WRITEONLY AM_BASE(&question_offset) - AM_RANGE(0xb0, 0xb1) AM_DEVWRITE("ay", ay8910_address_data_w) - AM_RANGE(0xb1, 0xb1) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0xb0, 0xb1) AM_DEVWRITE("aysnd", ay8910_address_data_w) + AM_RANGE(0xb1, 0xb1) AM_DEVREAD("aysnd", ay8910_r) AM_RANGE(0xc0, 0xcf) AM_DEVREADWRITE("tms", tms9927_r, tms9927_w) ADDRESS_MAP_END static ADDRESS_MAP_START( statusbj_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x20, 0x23) AM_DEVREADWRITE("ppi", ppi8255_r, ppi8255_w) - AM_RANGE(0xb0, 0xb1) AM_DEVWRITE("ay", ay8910_address_data_w) - AM_RANGE(0xb1, 0xb1) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0xb0, 0xb1) AM_DEVWRITE("aysnd", ay8910_address_data_w) + AM_RANGE(0xb1, 0xb1) AM_DEVREAD("aysnd", ay8910_r) AM_RANGE(0xc0, 0xcf) AM_DEVREADWRITE("tms", tms9927_r, tms9927_w) ADDRESS_MAP_END @@ -591,7 +591,7 @@ static MACHINE_DRIVER_START( statriv2 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, MASTER_CLOCK/8) + MDRV_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/8) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/subsino.c b/src/mame/drivers/subsino.c index 0d11944c689..6b3128e5a93 100644 --- a/src/mame/drivers/subsino.c +++ b/src/mame/drivers/subsino.c @@ -120,7 +120,7 @@ static ADDRESS_MAP_START( srider_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x0d00c, 0x0d00c ) AM_READ_PORT( "INC" ) - AM_RANGE( 0x0d016, 0x0d017 ) AM_DEVWRITE( "ym", ym3812_w ) + AM_RANGE( 0x0d016, 0x0d017 ) AM_DEVWRITE( "ymsnd", ym3812_w ) AM_RANGE( 0x0d018, 0x0d018 ) AM_DEVWRITE( "oki", okim6295_w ) @@ -285,7 +285,7 @@ static MACHINE_DRIVER_START( victor5 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2413, XTAL_3_579545MHz) + MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_SOUND_ADD("oki", OKIM6295, XTAL_4_433619MHz / 4) @@ -326,7 +326,7 @@ static MACHINE_DRIVER_START( srider ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, XTAL_3_579545MHz) + MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_3_579545MHz) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_SOUND_ADD("oki", OKIM6295, XTAL_4_433619MHz / 4) @@ -360,7 +360,7 @@ static MACHINE_DRIVER_START( crsbingo ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2413, XTAL_3_579545MHz) // unknown clock + MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz) // unknown clock MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) // no OKI diff --git a/src/mame/drivers/suna16.c b/src/mame/drivers/suna16.c index c1898ba33f4..8c564c57a9d 100644 --- a/src/mame/drivers/suna16.c +++ b/src/mame/drivers/suna16.c @@ -214,7 +214,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bssoccer_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM AM_RANGE(0xf000, 0xf7ff) AM_RAM // RAM - AM_RANGE(0xf800, 0xf801) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) // YM2151 + AM_RANGE(0xf800, 0xf801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) // YM2151 AM_RANGE(0xfc00, 0xfc00) AM_READ(soundlatch_r) // From Main CPU AM_RANGE(0xfd00, 0xfd00) AM_WRITE(soundlatch2_w) // To PCM Z80 #1 AM_RANGE(0xfe00, 0xfe00) AM_WRITE(soundlatch3_w) // To PCM Z80 #2 @@ -227,7 +227,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( uballoon_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_ROM // ROM AM_RANGE(0xf000, 0xf7ff) AM_RAM // RAM - AM_RANGE(0xf800, 0xf801) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) // YM2151 + AM_RANGE(0xf800, 0xf801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) // YM2151 AM_RANGE(0xfc00, 0xfc00) AM_READWRITE(soundlatch_r, soundlatch2_w) // To PCM Z80 ADDRESS_MAP_END @@ -238,7 +238,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sunaq_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xe82f) AM_ROM // ROM AM_RANGE(0xe830, 0xf7ff) AM_RAM // RAM (writes to efxx, could be a program bug tho) - AM_RANGE(0xf800, 0xf801) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) // YM2151 + AM_RANGE(0xf800, 0xf801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) // YM2151 AM_RANGE(0xfc00, 0xfc00) AM_READWRITE(soundlatch_r, soundlatch2_w) // To PCM Z80 ADDRESS_MAP_END @@ -248,8 +248,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bestbest_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x0000, 0xbfff ) AM_ROM // ROM - AM_RANGE( 0xc000, 0xc001 ) AM_DEVWRITE( "ym", ym3526_w ) // - AM_RANGE( 0xc002, 0xc003 ) AM_DEVWRITE( "ay", ay8910_address_data_w ) // AY8910 + AM_RANGE( 0xc000, 0xc001 ) AM_DEVWRITE( "ymsnd", ym3526_w ) // + AM_RANGE( 0xc002, 0xc003 ) AM_DEVWRITE( "aysnd", ay8910_address_data_w ) // AY8910 AM_RANGE( 0xe000, 0xe7ff ) AM_RAM // RAM AM_RANGE( 0xf000, 0xf000 ) AM_WRITE( soundlatch2_w ) // To PCM Z80 AM_RANGE( 0xf800, 0xf800 ) AM_READ ( soundlatch_r ) // From Main CPU @@ -796,7 +796,7 @@ static MACHINE_DRIVER_START( bssoccer ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) MDRV_SOUND_ROUTE(0, "lspeaker", 0.20) MDRV_SOUND_ROUTE(1, "rspeaker", 0.20) @@ -856,7 +856,7 @@ static MACHINE_DRIVER_START( uballoon ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) @@ -905,7 +905,7 @@ static MACHINE_DRIVER_START( sunaq ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 14318000/4) + MDRV_SOUND_ADD("ymsnd", YM2151, 14318000/4) MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) @@ -977,12 +977,12 @@ static MACHINE_DRIVER_START( bestbest ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ay", AY8910, 24000000/16) + MDRV_SOUND_ADD("aysnd", AY8910, 24000000/16) MDRV_SOUND_CONFIG(bestbest_ay8910_interface) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) - MDRV_SOUND_ADD("ym", YM3526, 24000000/8) + MDRV_SOUND_ADD("ymsnd", YM3526, 24000000/8) MDRV_SOUND_CONFIG(bestbest_ym3526_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c index cafd08a79dd..55c55e082b1 100644 --- a/src/mame/drivers/suna8.c +++ b/src/mame/drivers/suna8.c @@ -911,10 +911,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hardhead_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM - AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) - AM_RANGE(0xa002, 0xa003) AM_DEVWRITE("ay", ay8910_address_data_w ) + AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w) + AM_RANGE(0xa002, 0xa003) AM_DEVWRITE("aysnd", ay8910_address_data_w ) AM_RANGE(0xc000, 0xc7ff) AM_RAM // RAM - AM_RANGE(0xc800, 0xc800) AM_DEVREAD("ym", ym3812_status_port_r) // ? unsure + AM_RANGE(0xc800, 0xc800) AM_DEVREAD("ymsnd", ym3812_status_port_r) // ? unsure AM_RANGE(0xd000, 0xd000) AM_WRITE(soundlatch2_w ) // AM_RANGE(0xd800, 0xd800) AM_READ(soundlatch_r ) // From Main CPU ADDRESS_MAP_END @@ -946,8 +946,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( brickzn_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM // ROM - AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("ym", ym3812_w ) - AM_RANGE(0xc002, 0xc003) AM_DEVWRITE("ay", ay8910_address_data_w ) + AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("ymsnd", ym3812_w ) + AM_RANGE(0xc002, 0xc003) AM_DEVWRITE("aysnd", ay8910_address_data_w ) AM_RANGE(0xe000, 0xe7ff) AM_RAM // RAM AM_RANGE(0xf000, 0xf000) AM_WRITE(soundlatch2_w ) // To PCM CPU AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r ) // From Main CPU @@ -1437,11 +1437,11 @@ static MACHINE_DRIVER_START( hardhead ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM3812, SUNA8_MASTER_CLOCK / 8) + MDRV_SOUND_ADD("ymsnd", YM3812, SUNA8_MASTER_CLOCK / 8) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) - MDRV_SOUND_ADD("ay", AY8910, SUNA8_MASTER_CLOCK / 16) + MDRV_SOUND_ADD("aysnd", AY8910, SUNA8_MASTER_CLOCK / 16) MDRV_SOUND_CONFIG(hardhead_ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30) @@ -1567,12 +1567,12 @@ static MACHINE_DRIVER_START( brickzn ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM3812, SUNA8_MASTER_CLOCK / 6) + MDRV_SOUND_ADD("ymsnd", YM3812, SUNA8_MASTER_CLOCK / 6) MDRV_SOUND_CONFIG(brickzn_ym3812_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) - MDRV_SOUND_ADD("ay", AY8910, SUNA8_MASTER_CLOCK / 16) + MDRV_SOUND_ADD("aysnd", AY8910, SUNA8_MASTER_CLOCK / 16) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.33) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33) @@ -1667,11 +1667,11 @@ static MACHINE_DRIVER_START( starfigh ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM3812, SUNA8_MASTER_CLOCK / 6) + MDRV_SOUND_ADD("ymsnd", YM3812, SUNA8_MASTER_CLOCK / 6) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) - MDRV_SOUND_ADD("ay", AY8910, SUNA8_MASTER_CLOCK / 16) + MDRV_SOUND_ADD("aysnd", AY8910, SUNA8_MASTER_CLOCK / 16) MDRV_SOUND_CONFIG(starfigh_ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) @@ -1725,11 +1725,11 @@ static MACHINE_DRIVER_START( sparkman ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM3812, SUNA8_MASTER_CLOCK / 6) + MDRV_SOUND_ADD("ymsnd", YM3812, SUNA8_MASTER_CLOCK / 6) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) - MDRV_SOUND_ADD("ay", AY8910, SUNA8_MASTER_CLOCK / 16) + MDRV_SOUND_ADD("aysnd", AY8910, SUNA8_MASTER_CLOCK / 16) MDRV_SOUND_CONFIG(hardhead_ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30) diff --git a/src/mame/drivers/supbtime.c b/src/mame/drivers/supbtime.c index 3f9a7469a2f..31997e3e655 100644 --- a/src/mame/drivers/supbtime.c +++ b/src/mame/drivers/supbtime.c @@ -98,7 +98,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x1fffff) AM_RANGE(0x000000, 0x00ffff) AM_ROM AM_RANGE(0x100000, 0x100001) AM_NOP /* YM2203 - this board doesn't have one */ - AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0x130000, 0x130001) AM_NOP /* This board only has 1 oki chip */ AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) @@ -348,7 +348,7 @@ static MACHINE_DRIVER_START( supbtime ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 32220000/9) + MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "mono", 0.45) MDRV_SOUND_ROUTE(1, "mono", 0.45) @@ -388,7 +388,7 @@ static MACHINE_DRIVER_START( chinatwn ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 32220000/9) + MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "mono", 0.45) MDRV_SOUND_ROUTE(1, "mono", 0.45) diff --git a/src/mame/drivers/supdrapo.c b/src/mame/drivers/supdrapo.c index a9506026e1e..3d411090ea1 100644 --- a/src/mame/drivers/supdrapo.c +++ b/src/mame/drivers/supdrapo.c @@ -58,7 +58,7 @@ static ADDRESS_MAP_START( sdpoker_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8006, 0x8006) AM_READ_PORT("IN5") //dips? AM_RANGE(0x9000, 0x90ff) AM_RAM AM_RANGE(0x9400, 0x9400) AM_READ(sdpoker_rng_r) - AM_RANGE(0x9800, 0x9801) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x9800, 0x9801) AM_DEVWRITE("aysnd", ay8910_data_address_w) ADDRESS_MAP_END static INPUT_PORTS_START( supdrapo ) @@ -266,7 +266,7 @@ static MACHINE_DRIVER_START( supdrapo ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 8000000/2) /* ??? */ + MDRV_SOUND_ADD("aysnd", AY8910, 8000000/2) /* ??? */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/superdq.c b/src/mame/drivers/superdq.c index fbc85e40f63..15eb8b7db9b 100644 --- a/src/mame/drivers/superdq.c +++ b/src/mame/drivers/superdq.c @@ -186,7 +186,7 @@ static ADDRESS_MAP_START( superdq_io, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_RANGE(0x02, 0x02) AM_READ_PORT("DSW1") AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW2") - AM_RANGE(0x04, 0x04) AM_READ(superdq_ld_r) AM_DEVWRITE("sn", sn76496_w) + AM_RANGE(0x04, 0x04) AM_READ(superdq_ld_r) AM_DEVWRITE("snsnd", sn76496_w) AM_RANGE(0x08, 0x08) AM_WRITE(superdq_io_w) AM_RANGE(0x0c, 0x0d) AM_NOP /* HD46505S */ ADDRESS_MAP_END @@ -322,7 +322,7 @@ static MACHINE_DRIVER_START( superdq ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("sn", SN76496, MASTER_CLOCK/8) + MDRV_SOUND_ADD("snsnd", SN76496, MASTER_CLOCK/8) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.8) MDRV_SOUND_ADD("ldsound", LASERDISC, 0) diff --git a/src/mame/drivers/superqix.c b/src/mame/drivers/superqix.c index 2933d7b962e..8d8ea719b77 100644 --- a/src/mame/drivers/superqix.c +++ b/src/mame/drivers/superqix.c @@ -584,8 +584,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( pbillian_port_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x0000, 0x01ff) AM_RAM_WRITE(paletteram_BBGGRRII_w) AM_BASE(&paletteram) - AM_RANGE(0x0401, 0x0401) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x0402, 0x0403) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x0401, 0x0401) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x0402, 0x0403) AM_DEVWRITE("aysnd", ay8910_data_address_w) AM_RANGE(0x0408, 0x0408) AM_READ(pbillian_from_mcu_r) AM_RANGE(0x0408, 0x0408) AM_WRITE(pbillian_z80_mcu_w) AM_RANGE(0x0410, 0x0410) AM_WRITE(pbillian_0410_w) @@ -597,8 +597,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hotsmash_port_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x0000, 0x01ff) AM_RAM_WRITE(paletteram_BBGGRRII_w) AM_BASE(&paletteram) - AM_RANGE(0x0401, 0x0401) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x0402, 0x0403) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x0401, 0x0401) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x0402, 0x0403) AM_DEVWRITE("aysnd", ay8910_data_address_w) AM_RANGE(0x0408, 0x0408) AM_READ(hotsmash_from_mcu_r) AM_RANGE(0x0408, 0x0408) AM_WRITE(hotsmash_z80_mcu_w) AM_RANGE(0x0410, 0x0410) AM_WRITE(pbillian_0410_w) @@ -1052,7 +1052,7 @@ static MACHINE_DRIVER_START( pbillian ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 12000000/8) + MDRV_SOUND_ADD("aysnd", AY8910, 12000000/8) MDRV_SOUND_CONFIG(pbillian_ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) @@ -1088,7 +1088,7 @@ static MACHINE_DRIVER_START( hotsmash ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 12000000/8) + MDRV_SOUND_ADD("aysnd", AY8910, 12000000/8) MDRV_SOUND_CONFIG(hotsmash_ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) diff --git a/src/mame/drivers/supertnk.c b/src/mame/drivers/supertnk.c index a0a49c1bac8..3ca35d3264e 100644 --- a/src/mame/drivers/supertnk.c +++ b/src/mame/drivers/supertnk.c @@ -296,7 +296,7 @@ static ADDRESS_MAP_START( supertnk_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1800, 0x1bff) AM_RAM AM_RANGE(0x1efc, 0x1efc) AM_READ_PORT("JOYS") AM_RANGE(0x1efd, 0x1efd) AM_READ_PORT("INPUTS") - AM_RANGE(0x1efe, 0x1eff) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x1efe, 0x1eff) AM_DEVWRITE("aysnd", ay8910_address_data_w) AM_RANGE(0x1efe, 0x1efe) AM_READ_PORT("DSW") AM_RANGE(0x1eff, 0x1eff) AM_READ_PORT("UNK") AM_RANGE(0x2000, 0x3fff) AM_READWRITE(supertnk_videoram_r, supertnk_videoram_w) AM_SIZE(&supertnk_videoram_size) @@ -434,7 +434,7 @@ static MACHINE_DRIVER_START( supertnk ) /* audio hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 2000000) + MDRV_SOUND_ADD("aysnd", AY8910, 2000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/suprgolf.c b/src/mame/drivers/suprgolf.c index 26f06a246eb..e24a577e75e 100644 --- a/src/mame/drivers/suprgolf.c +++ b/src/mame/drivers/suprgolf.c @@ -285,7 +285,7 @@ static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x05, 0x05) AM_READ(rom_bank_select_r) AM_WRITE(rom_bank_select_w) AM_RANGE(0x06, 0x06) AM_READWRITE( suprgolf_vregs_r,suprgolf_vregs_w ) // AM_RANGE(0x07, 0x07) - AM_RANGE(0x08, 0x09) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x08, 0x09) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0x0c, 0x0c) AM_WRITE(adpcm_data_w) ADDRESS_MAP_END @@ -473,7 +473,7 @@ static MACHINE_DRIVER_START( suprgolf ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 3000000) /* guess */ + MDRV_SOUND_ADD("ymsnd", YM2203, 3000000) /* guess */ MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) diff --git a/src/mame/drivers/suprslam.c b/src/mame/drivers/suprslam.c index 588e1ef0e03..02148f14a6c 100644 --- a/src/mame/drivers/suprslam.c +++ b/src/mame/drivers/suprslam.c @@ -165,7 +165,7 @@ static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(suprslam_sh_bankswitch_w) AM_RANGE(0x04, 0x04) AM_READWRITE(soundlatch_r, pending_command_clear_w) - AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) + AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) ADDRESS_MAP_END /*** INPUT PORTS *************************************************************/ @@ -324,7 +324,7 @@ static MACHINE_DRIVER_START( suprslam ) MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -343,7 +343,7 @@ ROM_START( suprslam ) ROM_LOAD( "eb26ic38.bin", 0x000000, 0x020000, CRC(153f2c50) SHA1(b70f248cfb18239fcd26e36fb36159f219debf2c) ) ROM_RELOAD( 0x010000, 0x020000 ) - ROM_REGION( 0x200000, "ym", 0 ) /* Samples */ + ROM_REGION( 0x200000, "ymsnd", 0 ) /* Samples */ ROM_LOAD( "eb26ic66.bin", 0x000000, 0x200000, CRC(8cb33682) SHA1(0e6189ef0673227d35b9a154e333cc6cf9b65df6) ) ROM_REGION( 0x100000, "ym.deltat", 0 ) /* Samples */ diff --git a/src/mame/drivers/surpratk.c b/src/mame/drivers/surpratk.c index a5e9dd1c619..9a90017c675 100644 --- a/src/mame/drivers/surpratk.c +++ b/src/mame/drivers/surpratk.c @@ -97,7 +97,7 @@ static ADDRESS_MAP_START( surpratk_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x5fa0, 0x5faf) AM_READWRITE(K053244_r, K053244_w) AM_RANGE(0x5fb0, 0x5fbf) AM_WRITE(K053251_w) AM_RANGE(0x5fc0, 0x5fc0) AM_READWRITE(watchdog_reset_r, surpratk_5fc0_w) - AM_RANGE(0x5fd0, 0x5fd1) AM_DEVWRITE("ym", ym2151_w) + AM_RANGE(0x5fd0, 0x5fd1) AM_DEVWRITE("ymsnd", ym2151_w) AM_RANGE(0x5fc4, 0x5fc4) AM_WRITE(surpratk_videobank_w) AM_RANGE(0x4000, 0x7fff) AM_READWRITE(K052109_r, K052109_w) AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM */ @@ -202,7 +202,7 @@ static MACHINE_DRIVER_START( surpratk ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c index b31d078ce59..876d4bb801d 100644 --- a/src/mame/drivers/system16.c +++ b/src/mame/drivers/system16.c @@ -223,7 +223,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( tturfbl_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x40, 0x40) AM_WRITENOP AM_RANGE(0x80, 0x80) AM_NOP ADDRESS_MAP_END @@ -238,7 +238,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xc0, 0xc0) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -264,7 +264,7 @@ static WRITE8_DEVICE_HANDLER( upd7759_bank_w ) //* static ADDRESS_MAP_START( sound_7759_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x40, 0x40) AM_DEVWRITE("7759", upd7759_bank_w) AM_RANGE(0x80, 0x80) AM_DEVWRITE("7759", upd7759_port_w) AM_RANGE(0xc0, 0xc0) AM_READ(soundlatch_r) @@ -328,7 +328,7 @@ static MACHINE_DRIVER_START( system16 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 4000000) + MDRV_SOUND_ADD("ymsnd", YM2151, 4000000) MDRV_SOUND_ROUTE(0, "lspeaker", 0.32) MDRV_SOUND_ROUTE(1, "rspeaker", 0.32) MACHINE_DRIVER_END @@ -1113,7 +1113,7 @@ static MACHINE_DRIVER_START( sys16_datsu_sound_cfg ) MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 4000000) + MDRV_SOUND_ADD("ymsnd", YM2151, 4000000) MDRV_SOUND_ROUTE(0, "lspeaker", 0.32) MDRV_SOUND_ROUTE(1, "rspeaker", 0.32) diff --git a/src/mame/drivers/tail2nos.c b/src/mame/drivers/tail2nos.c index 86cad6e938c..98c693e6e83 100644 --- a/src/mame/drivers/tail2nos.c +++ b/src/mame/drivers/tail2nos.c @@ -94,9 +94,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_port_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x07, 0x07) AM_READWRITE(soundlatch_r, SMH_NOP) /* the write is a clear pending command */ - AM_RANGE(0x08, 0x0b) AM_DEVWRITE("ym", ym2608_w) + AM_RANGE(0x08, 0x0b) AM_DEVWRITE("ymsnd", ym2608_w) #if 0 - AM_RANGE(0x18, 0x1b) AM_DEVREAD("ym", ym2608_r) + AM_RANGE(0x18, 0x1b) AM_DEVREAD("ymsnd", ym2608_r) #endif ADDRESS_MAP_END @@ -263,7 +263,7 @@ static MACHINE_DRIVER_START( tail2nos ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2608, XTAL_8MHz) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2608, XTAL_8MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2608_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -304,7 +304,7 @@ ROM_START( tail2nos ) ROM_REGION( 0x20000, "gfx3", ROMREGION_ERASE00 ) /* gfx data for the 051316 */ /* RAM, not ROM - handled at run time */ - ROM_REGION( 0x20000, "ym", 0 ) /* sound samples */ + ROM_REGION( 0x20000, "ymsnd", 0 ) /* sound samples */ ROM_LOAD( "osb", 0x00000, 0x20000, CRC(d49ab2f5) SHA1(92f7f6c8f35ac39910879dd88d2cfb6db7c848c9) ) ROM_END @@ -339,7 +339,7 @@ ROM_START( sformula ) ROM_REGION( 0x20000, "gfx3", ROMREGION_ERASE00 ) /* gfx data for the 051316 */ /* RAM, not ROM - handled at run time */ - ROM_REGION( 0x20000, "ym", 0 ) /* sound samples */ + ROM_REGION( 0x20000, "ymsnd", 0 ) /* sound samples */ ROM_LOAD( "osb", 0x00000, 0x20000, CRC(d49ab2f5) SHA1(92f7f6c8f35ac39910879dd88d2cfb6db7c848c9) ) ROM_END diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c index 5df907fef21..feea880e8ba 100644 --- a/src/mame/drivers/taito_b.c +++ b/src/mame/drivers/taito_b.c @@ -685,7 +685,7 @@ static ADDRESS_MAP_START( masterw_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) AM_RANGE(0x8000, 0x8fff) AM_RAM - AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xa001, 0xa001) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w) ADDRESS_MAP_END @@ -694,7 +694,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) AM_RANGE(0xc000, 0xdfff) AM_RAM - AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) + AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) AM_RANGE(0xe200, 0xe200) AM_READNOP AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xe201, 0xe201) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w) AM_RANGE(0xe400, 0xe403) AM_WRITENOP /* pan */ @@ -709,7 +709,7 @@ static ADDRESS_MAP_START( viofight_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) AM_RANGE(0x8000, 0x8fff) AM_RAM - AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0xb000, 0xb001) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) /* yes, both addresses for the same chip */ AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xa001, 0xa001) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w) @@ -2111,7 +2111,7 @@ static void mb87078_gain_changed(running_machine *machine, int channel, int perc { if (channel==1) { - const device_config *ym = devtag_get_device(machine, "ym"); + const device_config *ym = devtag_get_device(machine, "ymsnd"); sound_set_output_gain(ym, 0, percent / 100.0); sound_set_output_gain(ym, 1, percent / 100.0); sound_set_output_gain(ym, 2, percent / 100.0); @@ -2168,7 +2168,7 @@ static MACHINE_DRIVER_START( rastsag2 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "mono", 0.25) MDRV_SOUND_ROUTE(1, "mono", 1.0) @@ -2206,7 +2206,7 @@ static MACHINE_DRIVER_START( ashura ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "mono", 0.25) MDRV_SOUND_ROUTE(1, "mono", 1.0) @@ -2244,7 +2244,7 @@ static MACHINE_DRIVER_START( crimec ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "mono", 0.25) MDRV_SOUND_ROUTE(1, "mono", 1.0) @@ -2282,7 +2282,7 @@ static MACHINE_DRIVER_START( tetrist ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "mono", 0.25) MDRV_SOUND_ROUTE(1, "mono", 1.0) @@ -2319,7 +2319,7 @@ static MACHINE_DRIVER_START( tetrista ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 3000000) + MDRV_SOUND_ADD("ymsnd", YM2203, 3000000) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(0, "mono", 0.25) MDRV_SOUND_ROUTE(1, "mono", 0.25) @@ -2358,7 +2358,7 @@ static MACHINE_DRIVER_START( hitice ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 3000000) + MDRV_SOUND_ADD("ymsnd", YM2203, 3000000) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(0, "mono", 0.25) MDRV_SOUND_ROUTE(1, "mono", 0.25) @@ -2401,7 +2401,7 @@ static MACHINE_DRIVER_START( rambo3 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2610, XTAL_16MHz/2) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2610, XTAL_16MHz/2) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "mono", 0.25) MDRV_SOUND_ROUTE(1, "mono", 1.0) @@ -2439,7 +2439,7 @@ static MACHINE_DRIVER_START( rambo3a ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2610, XTAL_16MHz/2) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2610, XTAL_16MHz/2) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "mono", 0.25) MDRV_SOUND_ROUTE(1, "mono", 1.0) @@ -2480,7 +2480,7 @@ static MACHINE_DRIVER_START( pbobble ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2610B, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610B, 8000000) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "mono", 0.25) MDRV_SOUND_ROUTE(1, "mono", 1.0) @@ -2521,7 +2521,7 @@ static MACHINE_DRIVER_START( spacedx ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "mono", 0.25) MDRV_SOUND_ROUTE(1, "mono", 1.0) @@ -2559,7 +2559,7 @@ static MACHINE_DRIVER_START( spacedxo ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "mono", 0.25) MDRV_SOUND_ROUTE(1, "mono", 1.0) @@ -2600,7 +2600,7 @@ static MACHINE_DRIVER_START( qzshowby ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2610B, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610B, 8000000) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "mono", 0.25) MDRV_SOUND_ROUTE(1, "mono", 1.0) @@ -2638,7 +2638,7 @@ static MACHINE_DRIVER_START( viofight ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 3000000) + MDRV_SOUND_ADD("ymsnd", YM2203, 3000000) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(0, "mono", 0.25) MDRV_SOUND_ROUTE(1, "mono", 0.25) @@ -2680,7 +2680,7 @@ static MACHINE_DRIVER_START( masterw ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 3000000) + MDRV_SOUND_ADD("ymsnd", YM2203, 3000000) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(0, "mono", 0.25) MDRV_SOUND_ROUTE(1, "mono", 0.25) @@ -2719,7 +2719,7 @@ static MACHINE_DRIVER_START( silentd ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "mono", 0.25) MDRV_SOUND_ROUTE(1, "mono", 1.0) @@ -2757,7 +2757,7 @@ static MACHINE_DRIVER_START( selfeena ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "mono", 0.25) MDRV_SOUND_ROUTE(1, "mono", 1.0) @@ -2804,7 +2804,7 @@ static MACHINE_DRIVER_START( ryujin ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "mono", 0.25) MDRV_SOUND_ROUTE(1, "mono", 1.0) @@ -2849,7 +2849,7 @@ static MACHINE_DRIVER_START( sbm ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2610B, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610B, 8000000) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "mono", 0.25) MDRV_SOUND_ROUTE(1, "mono", 1.0) @@ -2877,7 +2877,7 @@ ROM_START( rastsag2 ) ROM_LOAD( "b81-03.14", 0x000000, 0x080000, CRC(551b75e6) SHA1(5b8388ee2c6262f359c9e6d04c951ea8dc3901c9) ) ROM_LOAD( "b81-04.15", 0x080000, 0x080000, CRC(cf734e12) SHA1(4201a74468058761454515738fbf3a7b22a66e00) ) - ROM_REGION( 0x80000, "ym", 0 ) + ROM_REGION( 0x80000, "ymsnd", 0 ) ROM_LOAD( "b81-02.2", 0x00000, 0x80000, CRC(20ec3b86) SHA1(fcdcc7f0a09feb824d8d73b1af0aae7ec30fd1ed) ) ROM_REGION( 0x80000, "ym.deltat", 0 ) @@ -2899,7 +2899,7 @@ ROM_START( nastarw ) ROM_LOAD( "b81-03.14", 0x000000, 0x080000, CRC(551b75e6) SHA1(5b8388ee2c6262f359c9e6d04c951ea8dc3901c9) ) ROM_LOAD( "b81-04.15", 0x080000, 0x080000, CRC(cf734e12) SHA1(4201a74468058761454515738fbf3a7b22a66e00) ) - ROM_REGION( 0x80000, "ym", 0 ) + ROM_REGION( 0x80000, "ymsnd", 0 ) ROM_LOAD( "b81-02.2", 0x00000, 0x80000, CRC(20ec3b86) SHA1(fcdcc7f0a09feb824d8d73b1af0aae7ec30fd1ed) ) ROM_REGION( 0x80000, "ym.deltat", 0 ) @@ -2921,7 +2921,7 @@ ROM_START( nastar ) ROM_LOAD( "b81-03.14", 0x000000, 0x080000, CRC(551b75e6) SHA1(5b8388ee2c6262f359c9e6d04c951ea8dc3901c9) ) ROM_LOAD( "b81-04.15", 0x080000, 0x080000, CRC(cf734e12) SHA1(4201a74468058761454515738fbf3a7b22a66e00) ) - ROM_REGION( 0x80000, "ym", 0 ) + ROM_REGION( 0x80000, "ymsnd", 0 ) ROM_LOAD( "b81-02.2", 0x00000, 0x80000, CRC(20ec3b86) SHA1(fcdcc7f0a09feb824d8d73b1af0aae7ec30fd1ed) ) ROM_REGION( 0x80000, "ym.deltat", 0 ) @@ -2947,7 +2947,7 @@ ROM_START( crimec ) ROM_LOAD( "b99-02.18", 0x000000, 0x080000, CRC(2a5d4a26) SHA1(94bdfca9365970a80a639027b195b71cebc5ab9c) ) ROM_LOAD( "b99-01.19", 0x080000, 0x080000, CRC(a19e373a) SHA1(2208c9142473dc2218fd8b97fd6d0c861aeba011) ) - ROM_REGION( 0x80000, "ym", 0 ) + ROM_REGION( 0x80000, "ymsnd", 0 ) ROM_LOAD( "b99-03.37", 0x000000, 0x080000, CRC(dda10df7) SHA1(ffbe1423794035e6f049fddb096b7282610b7cee) ) ROM_END @@ -2966,7 +2966,7 @@ ROM_START( crimecu ) ROM_LOAD( "b99-02.18", 0x000000, 0x080000, CRC(2a5d4a26) SHA1(94bdfca9365970a80a639027b195b71cebc5ab9c) ) ROM_LOAD( "b99-01.19", 0x080000, 0x080000, CRC(a19e373a) SHA1(2208c9142473dc2218fd8b97fd6d0c861aeba011) ) - ROM_REGION( 0x80000, "ym", 0 ) + ROM_REGION( 0x80000, "ymsnd", 0 ) ROM_LOAD( "b99-03.37", 0x000000, 0x080000, CRC(dda10df7) SHA1(ffbe1423794035e6f049fddb096b7282610b7cee) ) ROM_END @@ -2985,7 +2985,7 @@ ROM_START( crimecj ) ROM_LOAD( "b99-02.18", 0x000000, 0x080000, CRC(2a5d4a26) SHA1(94bdfca9365970a80a639027b195b71cebc5ab9c) ) ROM_LOAD( "b99-01.19", 0x080000, 0x080000, CRC(a19e373a) SHA1(2208c9142473dc2218fd8b97fd6d0c861aeba011) ) - ROM_REGION( 0x80000, "ym", 0 ) + ROM_REGION( 0x80000, "ymsnd", 0 ) ROM_LOAD( "b99-03.37", 0x000000, 0x080000, CRC(dda10df7) SHA1(ffbe1423794035e6f049fddb096b7282610b7cee) ) ROM_END @@ -3004,7 +3004,7 @@ ROM_START( ashura ) ROM_LOAD( "c43-02", 0x00000, 0x80000, CRC(105722ae) SHA1(1de5d396d2a4d5948544082c471a15ca1b8e756c) ) ROM_LOAD( "c43-03", 0x80000, 0x80000, CRC(426606ba) SHA1(961ec0a9dc18044adae433337bfa89d951c5207c) ) - ROM_REGION( 0x80000, "ym", 0 ) + ROM_REGION( 0x80000, "ymsnd", 0 ) ROM_LOAD( "c43-01", 0x00000, 0x80000, CRC(db953f37) SHA1(252591b676366d4828acb20c77aa9960ad9b367e) ) ROM_END @@ -3023,7 +3023,7 @@ ROM_START( ashuraj ) ROM_LOAD( "c43-02", 0x00000, 0x80000, CRC(105722ae) SHA1(1de5d396d2a4d5948544082c471a15ca1b8e756c) ) ROM_LOAD( "c43-03", 0x80000, 0x80000, CRC(426606ba) SHA1(961ec0a9dc18044adae433337bfa89d951c5207c) ) - ROM_REGION( 0x80000, "ym", 0 ) + ROM_REGION( 0x80000, "ymsnd", 0 ) ROM_LOAD( "c43-01", 0x00000, 0x80000, CRC(db953f37) SHA1(252591b676366d4828acb20c77aa9960ad9b367e) ) ROM_END @@ -3042,7 +3042,7 @@ ROM_START( ashurau ) ROM_LOAD( "c43-02", 0x00000, 0x80000, CRC(105722ae) SHA1(1de5d396d2a4d5948544082c471a15ca1b8e756c) ) ROM_LOAD( "c43-03", 0x80000, 0x80000, CRC(426606ba) SHA1(961ec0a9dc18044adae433337bfa89d951c5207c) ) - ROM_REGION( 0x80000, "ym", 0 ) + ROM_REGION( 0x80000, "ymsnd", 0 ) ROM_LOAD( "c43-01", 0x00000, 0x80000, CRC(db953f37) SHA1(252591b676366d4828acb20c77aa9960ad9b367e) ) ROM_END @@ -3060,7 +3060,7 @@ ROM_START( tetrist ) ROM_REGION( 0x100000, "gfx1", ROMREGION_ERASE00 ) /* empty (uses only pixel layer) */ - ROM_REGION( 0x80000, "ym", ROMREGION_ERASE00 ) /* adpcm samples */ + ROM_REGION( 0x80000, "ymsnd", ROMREGION_ERASE00 ) /* adpcm samples */ /* empty */ ROM_REGION( 0x80000, "ym.deltat", ROMREGION_ERASE00 ) /* DELTA-T samples */ @@ -3176,7 +3176,7 @@ ROM_START( rambo3 ) ROM_LOAD( "r3-ch2lh.rom", 0x1c0000, 0x020000, CRC(df3bc48f) SHA1(6747a453da4bca0b837f4ef1f1bbe871f15332ed) ) ROM_LOAD( "r3-ch2hh.rom", 0x1e0000, 0x020000, CRC(bf37dfac) SHA1(27e825bd0a4d7ae65714fefeb6fedac501984ba9) ) - ROM_REGION( 0x80000, "ym", 0 ) + ROM_REGION( 0x80000, "ymsnd", 0 ) ROM_LOAD( "r3-a1.rom", 0x00000, 0x20000, CRC(4396fa19) SHA1(cb6d983f210249676c500723041d74fa3fdc517d) ) ROM_LOAD( "r3-a2.rom", 0x20000, 0x20000, CRC(41fe53a8) SHA1(1723046111d0115d3f64c3111c50d51306e88ad0) ) ROM_LOAD( "r3-a3.rom", 0x40000, 0x20000, CRC(e89249ba) SHA1(cd94492a0643e9e1e25b121160914822a6a7723e) ) @@ -3200,7 +3200,7 @@ ROM_START( rambo3a ) ROM_LOAD( "ramb3-01.bin", 0x100000, 0x80000, CRC(c55fcf54) SHA1(6a26ed2541be9e3341f20e74cc49b5366ce7d424) ) ROM_LOAD( "ramb3-02.bin", 0x180000, 0x80000, CRC(9dd014c6) SHA1(0f046d9de57db0272810adde7d49cc348b78f1f7) ) - ROM_REGION( 0x80000, "ym", 0 ) + ROM_REGION( 0x80000, "ymsnd", 0 ) ROM_LOAD( "ramb3-05.bin", 0x00000, 0x80000, CRC(0179dc40) SHA1(89feb708618ae7fa96883473d5c7a09dcc6f452a) ) ROM_END @@ -3221,7 +3221,7 @@ ROM_START( rambo3ae ) ROM_LOAD( "ramb3-01.bin", 0x100000, 0x80000, CRC(c55fcf54) SHA1(6a26ed2541be9e3341f20e74cc49b5366ce7d424) ) ROM_LOAD( "ramb3-02.bin", 0x180000, 0x80000, CRC(9dd014c6) SHA1(0f046d9de57db0272810adde7d49cc348b78f1f7) ) - ROM_REGION( 0x80000, "ym", 0 ) + ROM_REGION( 0x80000, "ymsnd", 0 ) ROM_LOAD( "ramb3-05.bin", 0x00000, 0x80000, CRC(0179dc40) SHA1(89feb708618ae7fa96883473d5c7a09dcc6f452a) ) ROM_END @@ -3238,7 +3238,7 @@ ROM_START( pbobble ) ROM_LOAD( "pb-ic14.bin", 0x00000, 0x80000, CRC(55f90ea4) SHA1(793c79e5b72171124368ad09dd31235252c541f5) ) ROM_LOAD( "pb-ic9.bin", 0x80000, 0x80000, CRC(3253aac9) SHA1(916d85aa96e2914630833292a0655b0389b4a39b) ) - ROM_REGION( 0x100000, "ym", 0 ) + ROM_REGION( 0x100000, "ymsnd", 0 ) ROM_LOAD( "pb-ic15.bin", 0x000000, 0x100000, CRC(0840cbc4) SHA1(1adbd7aef44fa80832f63dfb8efdf69fd7256a57) ) ROM_END @@ -3255,7 +3255,7 @@ ROM_START( spacedx ) ROM_LOAD( "d89-02.14", 0x00000, 0x80000, CRC(c36544b9) SHA1(6bd5257dfb27532621b75f43e31aa351ad2192a2) ) ROM_LOAD( "d89-01.9", 0x80000, 0x80000, CRC(fffa0660) SHA1(de1abe1b1e9d14405b5663103ea4a6119fce7cc5) ) - ROM_REGION( 0x80000, "ym", 0 ) /* adpcm samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* adpcm samples */ ROM_LOAD( "d89-03.15", 0x00000, 0x80000, CRC(218f31a4) SHA1(9f52b9fa8f02003888180524a6e9ee7c9230f55d) ) ROM_REGION( 0x0c00, "plds", 0 ) @@ -3281,7 +3281,7 @@ ROM_START( spacedxj ) ROM_LOAD( "d89-02.14", 0x00000, 0x80000, CRC(c36544b9) SHA1(6bd5257dfb27532621b75f43e31aa351ad2192a2) ) ROM_LOAD( "d89-01.9" , 0x80000, 0x80000, CRC(fffa0660) SHA1(de1abe1b1e9d14405b5663103ea4a6119fce7cc5) ) - ROM_REGION( 0x80000, "ym", 0 ) /* adpcm samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* adpcm samples */ ROM_LOAD( "d89-03.15", 0x00000, 0x80000, CRC(218f31a4) SHA1(9f52b9fa8f02003888180524a6e9ee7c9230f55d) ) ROM_REGION( 0x0c00, "plds", 0 ) @@ -3307,7 +3307,7 @@ ROM_START( spacedxo ) ROM_LOAD( "d89-12.bin",0x00000, 0x80000, CRC(53df86f1) SHA1(f03d77dd54eb455462133a29dd8fec007abedcfd) ) ROM_LOAD( "d89-13.bin",0x80000, 0x80000, CRC(c44c1352) SHA1(78a04fe0ade6e8f9e6bbda7652a54a79b6208fdd) ) - ROM_REGION( 0x80000, "ym", 0 ) /* adpcm samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* adpcm samples */ ROM_LOAD( "d89-03.15", 0x00000, 0x80000, CRC(218f31a4) SHA1(9f52b9fa8f02003888180524a6e9ee7c9230f55d) ) ROM_END @@ -3324,7 +3324,7 @@ ROM_START( qzshowby ) ROM_LOAD( "d72-03.bin", 0x000000, 0x200000, CRC(1de257d0) SHA1(df03b1fb5cd69e2d2eb2088f96f26b0ea9756fb7) ) ROM_LOAD( "d72-02.bin", 0x200000, 0x200000, CRC(bf0da640) SHA1(2b2493904ed0b94dc12b56dae71cc5c25701aef9) ) - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "d72-01.bin", 0x00000, 0x200000, CRC(b82b8830) SHA1(4b2dca16fe072a5ee51de5cf40637e3f1b39f695) ) ROM_END @@ -3468,7 +3468,7 @@ ROM_START( silentd ) ROM_LOAD( "east-03.ic39", 0x200000, 0x100000, CRC(1b9b2846) SHA1(d9c87e130bc3baa949d8a8738daad648fcf284df) ) ROM_LOAD( "east-05.ic40", 0x300000, 0x100000, CRC(e02472c5) SHA1(35572610f6823ec980a928a75abd689197ebe207) ) - ROM_REGION( 0x80000, "ym", 0 ) + ROM_REGION( 0x80000, "ymsnd", 0 ) ROM_LOAD( "east-01.ic1", 0x00000, 0x80000, CRC(b41fff1a) SHA1(54920d13fa2b3000eedab9d0050a299ae743c663) ) ROM_REGION( 0x80000, "ym.deltat", 0 ) @@ -3492,7 +3492,7 @@ ROM_START( silentdj ) ROM_LOAD( "east-03.ic39", 0x200000, 0x100000, CRC(1b9b2846) SHA1(d9c87e130bc3baa949d8a8738daad648fcf284df) ) ROM_LOAD( "east-05.ic40", 0x300000, 0x100000, CRC(e02472c5) SHA1(35572610f6823ec980a928a75abd689197ebe207) ) - ROM_REGION( 0x80000, "ym", 0 ) + ROM_REGION( 0x80000, "ymsnd", 0 ) ROM_LOAD( "east-01.ic1", 0x00000, 0x80000, CRC(b41fff1a) SHA1(54920d13fa2b3000eedab9d0050a299ae743c663) ) ROM_REGION( 0x80000, "ym.deltat", 0 ) @@ -3516,7 +3516,7 @@ ROM_START( silentdu ) ROM_LOAD( "east-03.ic39", 0x200000, 0x100000, CRC(1b9b2846) SHA1(d9c87e130bc3baa949d8a8738daad648fcf284df) ) ROM_LOAD( "east-05.ic40", 0x300000, 0x100000, CRC(e02472c5) SHA1(35572610f6823ec980a928a75abd689197ebe207) ) - ROM_REGION( 0x80000, "ym", 0 ) + ROM_REGION( 0x80000, "ymsnd", 0 ) ROM_LOAD( "east-01.ic1", 0x00000, 0x80000, CRC(b41fff1a) SHA1(54920d13fa2b3000eedab9d0050a299ae743c663) ) ROM_REGION( 0x80000, "ym.deltat", 0 ) @@ -3536,7 +3536,7 @@ ROM_START( selfeena ) ROM_LOAD( "se-04.2", 0x000000, 0x80000, CRC(920ad100) SHA1(69cd2af6218db90632f09a131d2956ab69034643) ) ROM_LOAD( "se-05.1", 0x080000, 0x80000, CRC(d297c995) SHA1(e5ad5a8ce222621c9156c2949916bee6b3099c4e) ) - ROM_REGION( 0x80000, "ym", 0 ) /* adpcm samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* adpcm samples */ ROM_LOAD( "se-06.11", 0x00000, 0x80000, CRC(80d5e772) SHA1(bee4982a3d65210ff86495e36a0b656934b00c7d) ) ROM_END @@ -3555,7 +3555,7 @@ ROM_START( ryujin ) ROM_LOAD( "ryujin07.2", 0x000000, 0x100000, CRC(34f50980) SHA1(432384bd283389bca17611602eb310726c9d78a4) ) ROM_LOAD( "ryujin06.1", 0x100000, 0x100000, CRC(1b85ff34) SHA1(5ad259e6f7aa4a0c08975da73bf41400495f2e61) ) - ROM_REGION( 0x80000, "ym", 0 ) /* adpcm samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* adpcm samples */ ROM_LOAD( "ryujin08.11", 0x00000, 0x80000, CRC(480d040d) SHA1(50add2f304ef34f7f45f25a2a2cf0568d58259ad) ) ROM_END @@ -3580,7 +3580,7 @@ ROM_START( sbm ) ROM_LOAD16_BYTE( "c69-14.ic3", 0x300001, 0x020000, CRC(0ed0272a) SHA1(03b15654213ff71ffc96d3a87657bdeb724e9269) ) /* 340000-3fffff empty */ - ROM_REGION( 0x80000, "ym", 0 ) /* adpcm samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* adpcm samples */ ROM_LOAD( "c69-03.36", 0x00000, 0x80000, CRC(63e6b6e7) SHA1(72574ca7505eee15fabc4996f253505d9dd65898) ) ROM_END diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c index c8409efc0f7..1036115bd27 100644 --- a/src/mame/drivers/taito_f2.c +++ b/src/mame/drivers/taito_f2.c @@ -1166,7 +1166,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(2) AM_RANGE(0xc000, 0xdfff) AM_RAM - AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) + AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) AM_RANGE(0xe200, 0xe200) AM_READNOP AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xe201, 0xe201) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w) AM_RANGE(0xe400, 0xe403) AM_WRITENOP /* pan */ @@ -1182,7 +1182,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cameltrya_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM // I can't see a bank control, but there ARE some bytes past 0x8000 AM_RANGE(0x8000, 0x8fff) AM_RAM - AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xa001, 0xa001) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w) // AM_RANGE(0xb000, 0xb000) AM_WRITE(unknown_w) // probably controlling sample player? @@ -3196,7 +3196,7 @@ static MACHINE_DRIVER_START( taito_f2 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, 24000000/3) /* Was 16000000/2, but only a 24Mhz OSC */ + MDRV_SOUND_ADD("ymsnd", YM2610, 24000000/3) /* Was 16000000/2, but only a 24Mhz OSC */ MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -3641,7 +3641,7 @@ static MACHINE_DRIVER_START( cameltrya ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 24000000/8) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2203, 24000000/8) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(0, "mono", 0.20) MDRV_SOUND_ROUTE(1, "mono", 0.20) @@ -3717,7 +3717,7 @@ ROM_START( finalb ) ROM_LOAD( "b82_10.16", 0x00000, 0x04000, CRC(a38aaaed) SHA1(d476ea516a797e71e0306da54c17ed1759fe1ccd) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b82-02.1", 0x00000, 0x80000, CRC(5dd06bdd) SHA1(6eeaec6743805ba429b0ef58a530bc0740646324) ) ROM_REGION( 0x80000, "ym.deltat", 0 ) /* Delta-T samples */ @@ -3755,7 +3755,7 @@ ROM_START( finalbj ) ROM_LOAD( "b82_10.16", 0x00000, 0x04000, CRC(a38aaaed) SHA1(d476ea516a797e71e0306da54c17ed1759fe1ccd) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b82-02.1", 0x00000, 0x80000, CRC(5dd06bdd) SHA1(6eeaec6743805ba429b0ef58a530bc0740646324) ) ROM_REGION( 0x80000, "ym.deltat", 0 ) /* Delta-T samples */ @@ -3794,7 +3794,7 @@ ROM_START( finalbu ) ROM_LOAD( "b82_10.16", 0x00000, 0x04000, CRC(a38aaaed) SHA1(d476ea516a797e71e0306da54c17ed1759fe1ccd) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b82-02.1", 0x00000, 0x80000, CRC(5dd06bdd) SHA1(6eeaec6743805ba429b0ef58a530bc0740646324) ) ROM_REGION( 0x80000, "ym.deltat", 0 ) /* Delta-T samples */ @@ -3828,7 +3828,7 @@ ROM_START( dondokod ) ROM_LOAD( "b95-08.bin", 0x00000, 0x04000, CRC(b5aa49e1) SHA1(83b0a3434e0d0b9aa581c1acdd0c70308362b923) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b95-04.bin", 0x00000, 0x80000, CRC(ac4c1716) SHA1(06a9def7fa3bd739438f4a1d7b55f70eb904bf54) ) /* no Delta-T samples */ @@ -3854,7 +3854,7 @@ ROM_START( dondokodu ) ROM_LOAD( "b95-08.bin", 0x00000, 0x04000, CRC(b5aa49e1) SHA1(83b0a3434e0d0b9aa581c1acdd0c70308362b923) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b95-04.bin", 0x00000, 0x80000, CRC(ac4c1716) SHA1(06a9def7fa3bd739438f4a1d7b55f70eb904bf54) ) /* no Delta-T samples */ @@ -3880,7 +3880,7 @@ ROM_START( dondokodj ) ROM_LOAD( "b95-08.bin", 0x00000, 0x04000, CRC(b5aa49e1) SHA1(83b0a3434e0d0b9aa581c1acdd0c70308362b923) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b95-04.bin", 0x00000, 0x80000, CRC(ac4c1716) SHA1(06a9def7fa3bd739438f4a1d7b55f70eb904bf54) ) /* no Delta-T samples */ @@ -3904,7 +3904,7 @@ ROM_START( megab ) ROM_LOAD( "c11-12.3", 0x00000, 0x04000, CRC(b11094f1) SHA1(a01e9f7d1f616bb379eaa85ad81b94173b067782) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c11-01.29", 0x00000, 0x80000, CRC(fd1ea532) SHA1(481698b747a421a17bfb8cef96065712d4f3997f) ) ROM_REGION( 0x80000, "ym.deltat", 0 ) /* Delta-T samples */ @@ -3937,7 +3937,7 @@ ROM_START( megabj ) ROM_LOAD( "c11-12.3", 0x00000, 0x04000, CRC(b11094f1) SHA1(a01e9f7d1f616bb379eaa85ad81b94173b067782) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c11-01.29", 0x00000, 0x80000, CRC(fd1ea532) SHA1(481698b747a421a17bfb8cef96065712d4f3997f) ) ROM_REGION( 0x80000, "ym.deltat", 0 ) /* Delta-T samples */ @@ -3965,7 +3965,7 @@ ROM_START( thundfox ) /* Thunder Fox */ ROM_LOAD( "c28-14.3", 0x00000, 0x04000, CRC(45ef3616) SHA1(97bf1de7fd32a378839df1845f7522dae776d997) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c28-06.41", 0x00000, 0x80000, CRC(db6983db) SHA1(b72541aa35c48624478060e7453f01956ff1ceb2) ) ROM_REGION( 0x80000, "ym.deltat", 0 ) /* Delta-T samples */ @@ -4001,7 +4001,7 @@ ROM_START( thundfoxu ) /* Thunder Fox */ ROM_LOAD( "c28-14.3", 0x00000, 0x04000, CRC(45ef3616) SHA1(97bf1de7fd32a378839df1845f7522dae776d997) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c28-06.41", 0x00000, 0x80000, CRC(db6983db) SHA1(b72541aa35c48624478060e7453f01956ff1ceb2) ) ROM_REGION( 0x80000, "ym.deltat", 0 ) /* Delta-T samples */ @@ -4031,7 +4031,7 @@ ROM_START( thundfoxj ) /* Thunder Fox */ ROM_LOAD( "c28-14.3", 0x00000, 0x04000, CRC(45ef3616) SHA1(97bf1de7fd32a378839df1845f7522dae776d997) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c28-06.41", 0x00000, 0x80000, CRC(db6983db) SHA1(b72541aa35c48624478060e7453f01956ff1ceb2) ) ROM_REGION( 0x80000, "ym.deltat", 0 ) /* Delta-T samples */ @@ -4059,7 +4059,7 @@ ROM_START( cameltry ) ROM_LOAD( "c38-08.bin", 0x00000, 0x04000, CRC(7ff78873) SHA1(6574f1c707b8911fa957dd057e1cddc7a1cea99b) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c38-03.bin", 0x000000, 0x020000, CRC(59fa59a7) SHA1(161f11b96a47c8431c33e300f6a509bf804309af) ) /* no Delta-T samples */ ROM_END @@ -4133,7 +4133,7 @@ ROM_START( cameltryj ) ROM_LOAD( "c38-08.bin", 0x00000, 0x04000, CRC(7ff78873) SHA1(6574f1c707b8911fa957dd057e1cddc7a1cea99b) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c38-03.bin", 0x000000, 0x020000, CRC(59fa59a7) SHA1(161f11b96a47c8431c33e300f6a509bf804309af) ) /* no Delta-T samples */ @@ -4157,7 +4157,7 @@ ROM_START( qtorimon ) /* Quiz Torimonochou */ ROM_LOAD( "c41-06.bin", 0x00000, 0x04000, CRC(753a98d8) SHA1(a832a4789194a67a2201da4e4484ab08210e5ccc) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x080000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x080000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c41-03.bin", 0x000000, 0x020000, CRC(b2c18e89) SHA1(32eca1721cd8f47e9a6dcb553208ddd0daa67f83) ) /* no Delta-T samples */ @@ -4181,7 +4181,7 @@ ROM_START( liquidk ) ROM_LOAD( "c49-08.9", 0x00000, 0x04000, CRC(413c310c) SHA1(cecb1c0c9fe3c8b744f95ce29009650a289107ab) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "lk_snd.bin", 0x00000, 0x80000, CRC(474d45a4) SHA1(20cb818d753a185973098007e645f1aa75c5528d) ) /* no Delta-T samples */ @@ -4205,7 +4205,7 @@ ROM_START( liquidku ) ROM_LOAD( "c49-08.9", 0x00000, 0x04000, CRC(413c310c) SHA1(cecb1c0c9fe3c8b744f95ce29009650a289107ab) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "lk_snd.bin", 0x00000, 0x80000, CRC(474d45a4) SHA1(20cb818d753a185973098007e645f1aa75c5528d) ) /* no Delta-T samples */ @@ -4229,7 +4229,7 @@ ROM_START( mizubaku ) ROM_LOAD( "c49-08.9", 0x00000, 0x04000, CRC(413c310c) SHA1(cecb1c0c9fe3c8b744f95ce29009650a289107ab) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "lk_snd.bin", 0x00000, 0x80000, CRC(474d45a4) SHA1(20cb818d753a185973098007e645f1aa75c5528d) ) /* no Delta-T samples */ @@ -4255,7 +4255,7 @@ ROM_START( quizhq ) /* Quiz HQ */ ROM_LOAD( "c53-08.bin", 0x00000, 0x04000, CRC(25187e81) SHA1(c549fbfff6963be93aaf349b240f15b1d578d1f1) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x080000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x080000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c53-04.bin", 0x000000, 0x020000, CRC(99890ad4) SHA1(c9be9d21dc72059c39de81e1b73849cc77d6b95d) ) /* no Delta-T samples */ @@ -4276,7 +4276,7 @@ ROM_START( ssi ) ROM_LOAD( "c64-09.13", 0x00000, 0x04000, CRC(88d7f65c) SHA1(d6383bf8fd035772fa3c57b26b727eefe1aadd93) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x20000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x20000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c64-02.2", 0x00000, 0x20000, CRC(3cb0b907) SHA1(7cbe437fe584575a2f26a582095fd49665c7003e) ) /* no Delta-T samples */ @@ -4299,7 +4299,7 @@ ROM_START( majest12 ) ROM_LOAD( "c64-09.13", 0x00000, 0x04000, CRC(88d7f65c) SHA1(d6383bf8fd035772fa3c57b26b727eefe1aadd93) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x20000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x20000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c64-02.2", 0x00000, 0x20000, CRC(3cb0b907) SHA1(7cbe437fe584575a2f26a582095fd49665c7003e) ) /* no Delta-T samples */ @@ -4390,7 +4390,7 @@ ROM_START( gunfront ) ROM_LOAD( "c71-12.ic49", 0x00000, 0x04000, CRC(0038c7f8) SHA1(405def36e67949219b6f9394333278ec60ad5783) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c71-01.ic29", 0x000000, 0x100000, CRC(0e73105a) SHA1(c5c9743f68a43273e16f5e5179557f2392505a1e) ) /* no Delta-T samples */ @@ -4417,7 +4417,7 @@ ROM_START( gunfrontj ) ROM_LOAD( "c71-12.ic49", 0x00000, 0x04000, CRC(0038c7f8) SHA1(405def36e67949219b6f9394333278ec60ad5783) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c71-01.ic29", 0x000000, 0x100000, CRC(0e73105a) SHA1(c5c9743f68a43273e16f5e5179557f2392505a1e) ) /* no Delta-T samples */ @@ -4441,7 +4441,7 @@ ROM_START( growl ) ROM_LOAD( "c74-12.ic62", 0x00000, 0x04000, CRC(bb6ed668) SHA1(e8c3a15ccbc788ac57d42bd2cabcdb2db6305489) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c74-04.ic28", 0x000000, 0x100000, CRC(2d97edf2) SHA1(d3a995303facdad4f8e1fdda04eaaec4440ff371) ) ROM_REGION( 0x080000, "ym.deltat", 0 ) /* Delta-T samples */ @@ -4468,7 +4468,7 @@ ROM_START( growlu ) ROM_LOAD( "c74-12.ic62", 0x00000, 0x04000, CRC(bb6ed668) SHA1(e8c3a15ccbc788ac57d42bd2cabcdb2db6305489) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c74-04.ic28", 0x000000, 0x100000, CRC(2d97edf2) SHA1(d3a995303facdad4f8e1fdda04eaaec4440ff371) ) ROM_REGION( 0x080000, "ym.deltat", 0 ) /* Delta-T samples */ @@ -4493,7 +4493,7 @@ ROM_START( runark ) ROM_LOAD( "c74-12.ic62", 0x00000, 0x04000, CRC(bb6ed668) SHA1(e8c3a15ccbc788ac57d42bd2cabcdb2db6305489) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c74-04.ic28", 0x000000, 0x100000, CRC(2d97edf2) SHA1(d3a995303facdad4f8e1fdda04eaaec4440ff371) ) ROM_REGION( 0x080000, "ym.deltat", 0 ) /* Delta-T samples */ @@ -4517,7 +4517,7 @@ ROM_START( mjnquest ) /* Mahjong Quest */ ROM_LOAD( "c77-10", 0x00000, 0x04000, CRC(f16b2c1e) SHA1(f6f13429a0b4e0e4c64991f1acc4ecf85dc64364) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x080000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x080000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c77-03", 0x000000, 0x080000, CRC(312f17b1) SHA1(3b45eeb6c6721c532451cb113e6a38da4d8a8cbf) ) /* no Delta-T samples */ @@ -4540,7 +4540,7 @@ ROM_START( mjnquestb ) /* Mahjong Quest (No Nudity) */ ROM_LOAD( "c77-10", 0x00000, 0x04000, CRC(f16b2c1e) SHA1(f6f13429a0b4e0e4c64991f1acc4ecf85dc64364) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x080000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x080000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c77-03", 0x000000, 0x080000, CRC(312f17b1) SHA1(3b45eeb6c6721c532451cb113e6a38da4d8a8cbf) ) /* no Delta-T samples */ @@ -4565,7 +4565,7 @@ ROM_START( footchmp ) ROM_LOAD( "c80-15.70", 0x00000, 0x04000, CRC(05aa7fd7) SHA1(7eb10964ea9f43abcda8444f13733a0753a04580) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x100000, "ym", 0 ) /* YM2610 samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* YM2610 samples */ ROM_LOAD( "c80-03.57", 0x000000, 0x100000, CRC(609938d5) SHA1(54c7a7265dee5cb031fd402f4c74858d73bec652) ) /* no Delta-T samples */ @@ -4592,7 +4592,7 @@ ROM_START( hthero ) ROM_LOAD( "c80-15.70", 0x00000, 0x04000, CRC(05aa7fd7) SHA1(7eb10964ea9f43abcda8444f13733a0753a04580) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c80-03.57", 0x000000, 0x100000, CRC(609938d5) SHA1(54c7a7265dee5cb031fd402f4c74858d73bec652) ) /* no Delta-T samples */ @@ -4617,7 +4617,7 @@ ROM_START( euroch92 ) ROM_LOAD( "ec92_27.rom", 0x00000, 0x04000, CRC(2db48e65) SHA1(43a47ebc91c043a996e966cf808d71256e158494) ) ROM_CONTINUE( 0x10000, 0x0c000 ) - ROM_REGION( 0x100000, "ym", 0 ) /* YM2610 samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* YM2610 samples */ ROM_LOAD( "c80-03.57", 0x000000, 0x100000, CRC(609938d5) SHA1(54c7a7265dee5cb031fd402f4c74858d73bec652) ) // ec92_03.rom /* no Delta-T samples */ @@ -4640,7 +4640,7 @@ ROM_START( koshien ) /* Ah Eikou no Koshien */ ROM_LOAD( "c81-12.bin", 0x00000, 0x04000, CRC(6e8625b6) SHA1(212d384aa6ed43f5389739863afecbf0ad68af14) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x080000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x080000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c81-05.bin", 0x00000, 0x80000, CRC(9c3d71be) SHA1(79f1bb40d8356d9fc93b569c20be15e7fbf34580) ) ROM_REGION( 0x080000, "ym.deltat", 0 ) /* Delta-T samples */ @@ -4672,7 +4672,7 @@ ROM_START( yuyugogo ) /* Yuuyu no QUIZ de GO!GO! */ ROM_LOAD( "c83-11.1" , 0x00000, 0x04000, CRC(461e702a) SHA1(f1f4294a7e8acc50473df15a167ba84595c9eb15) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c83-04.5", 0x000000, 0x100000, CRC(2600093a) SHA1(824fde078e0ded58037bd06f888eac4e7487ac82) ) /* no Delta-T samples */ @@ -4697,7 +4697,7 @@ ROM_START( ninjak ) ROM_LOAD( "c85-14.ic54", 0x00000, 0x04000, CRC(f2a52a51) SHA1(951793c65a3436a7fb36f3058bc7a3b4265a90bb) ) /* SND */ ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c85-04.ic31", 0x00000, 0x80000, CRC(5afb747e) SHA1(e4f03582221f3a97f0e24693aa77264663eb1b47) ) /* SCH-B */ ROM_REGION( 0x80000, "ym.deltat", 0 ) /* Delta-T samples */ @@ -4723,7 +4723,7 @@ ROM_START( ninjakj ) ROM_LOAD( "c85-14.ic54", 0x00000, 0x04000, CRC(f2a52a51) SHA1(951793c65a3436a7fb36f3058bc7a3b4265a90bb) ) /* SND */ ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c85-04.ic31", 0x00000, 0x80000, CRC(5afb747e) SHA1(e4f03582221f3a97f0e24693aa77264663eb1b47) ) /* SCH-B */ ROM_REGION( 0x80000, "ym.deltat", 0 ) /* Delta-T samples */ @@ -4749,7 +4749,7 @@ ROM_START( ninjaku ) ROM_LOAD( "c85-14.ic54", 0x00000, 0x04000, CRC(f2a52a51) SHA1(951793c65a3436a7fb36f3058bc7a3b4265a90bb) ) /* SND */ ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c85-04.ic31", 0x00000, 0x80000, CRC(5afb747e) SHA1(e4f03582221f3a97f0e24693aa77264663eb1b47) ) /* SCH-B */ ROM_REGION( 0x80000, "ym.deltat", 0 ) /* Delta-T samples */ @@ -4772,7 +4772,7 @@ ROM_START( solfigtr ) /* Solitary Fighter */ ROM_LOAD( "c91-07.62", 0x00000, 0x04000, CRC(e471a05a) SHA1(4d9c2b734aac27819673094dc1843e1ca5fe6994) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c91-04.28", 0x00000, 0x80000, CRC(390b1065) SHA1(ee7ba77634854e4896528ff1bbc308de92a5815b) ) /* Channel A */ /* no Delta-T samples */ @@ -4797,7 +4797,7 @@ ROM_START( qzquest ) /* Quiz Quest */ ROM_LOAD( "c92-07.5", 0x00000, 0x04000, CRC(3e313db9) SHA1(44f781c7d3df8eacd745dc0af180cec9e1164b89) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x080000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x080000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c92-04.9", 0x000000, 0x080000, CRC(e421bb43) SHA1(a89157e65b537b31f5837435dae848adde8a86d1) ) /* no Delta-T samples */ @@ -4824,7 +4824,7 @@ ROM_START( pulirula ) ROM_LOAD( "c98-14.rom", 0x00000, 0x04000, CRC(a858e17c) SHA1(4389f43035a94e776a25350a8989dcfdb3e4675a) ) ROM_CONTINUE( 0x10000, 0x1c000 ) /* banked stuff */ - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c98-01.rom", 0x000000, 0x100000, CRC(197f66f5) SHA1(cc5d104033f9ab7d614afd47eeb61a22ef5714ea) ) /* no Delta-T samples */ @@ -4851,7 +4851,7 @@ ROM_START( pulirulaj ) ROM_LOAD( "c98-14.rom", 0x00000, 0x04000, CRC(a858e17c) SHA1(4389f43035a94e776a25350a8989dcfdb3e4675a) ) ROM_CONTINUE( 0x10000, 0x1c000 ) /* banked stuff */ - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c98-01.rom", 0x000000, 0x100000, CRC(197f66f5) SHA1(cc5d104033f9ab7d614afd47eeb61a22ef5714ea) ) /* no Delta-T samples */ @@ -4875,7 +4875,7 @@ ROM_START( metalb ) ROM_LOAD( "d12-13.5", 0x00000, 0x04000, CRC(bcca2649) SHA1(d932134416c951d849ae41598f75609d453ed520) ) ROM_CONTINUE( 0x10000, 0x1c000 ) /* banked stuff */ - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "d12-02.10", 0x000000, 0x100000, CRC(79263e74) SHA1(f9ef222239855d593b5855dbf9ea0376ea349c4b) ) ROM_REGION( 0x080000, "ym.deltat", 0 ) /* Delta-T samples */ @@ -4900,7 +4900,7 @@ ROM_START( metalbj ) ROM_LOAD( "d12-13.5", 0x00000, 0x04000, CRC(bcca2649) SHA1(d932134416c951d849ae41598f75609d453ed520) ) ROM_CONTINUE( 0x10000, 0x1c000 ) /* banked stuff */ - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "d12-02.10", 0x000000, 0x100000, CRC(79263e74) SHA1(f9ef222239855d593b5855dbf9ea0376ea349c4b) ) ROM_REGION( 0x080000, "ym.deltat", 0 ) /* Delta-T samples */ @@ -4923,7 +4923,7 @@ ROM_START( qzchikyu ) ROM_LOAD( "d19-07.5", 0x00000, 0x04000, CRC(a8935f84) SHA1(6f264cf7a52dfb8248b8aeb4ff34477d7ccb0b6d) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "d19-04.9", 0x000000, 0x080000, CRC(d3c44905) SHA1(d00bd4f11523b2123383dd852ee5484d907ff904) ) /* no Delta-T samples */ @@ -4974,7 +4974,7 @@ ROM_START( deadconx ) ROM_LOAD( "d28-10.6", 0x00000, 0x04000, CRC(40805d74) SHA1(172114be692c766622d1235e5c4aa83ad438d9d9) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "d28-03.10", 0x000000, 0x100000, CRC(a1804b52) SHA1(f252c473a71a4cf80d9f984fec08e5ae7524a620) ) /* no Delta-T samples */ @@ -4999,7 +4999,7 @@ ROM_START( deadconxj ) ROM_LOAD( "d28-10.6", 0x00000, 0x04000, CRC(40805d74) SHA1(172114be692c766622d1235e5c4aa83ad438d9d9) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "d28-03.10", 0x000000, 0x100000, CRC(a1804b52) SHA1(f252c473a71a4cf80d9f984fec08e5ae7524a620) ) /* no Delta-T samples */ @@ -5024,7 +5024,7 @@ ROM_START( dinorex ) ROM_LOAD( "d39-12.5", 0x00000, 0x04000, CRC(8292c7c1) SHA1(2ff20726f6cc6d98d860d96b8eb3c10f46b87d58) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "d39-07.10", 0x000000, 0x100000, CRC(28262816) SHA1(6df9a31a2edf1dfc23070b41b1da2c0a9e91d1b0) ) ROM_REGION( 0x080000, "ym.deltat", 0 ) /* Delta-T samples */ @@ -5050,7 +5050,7 @@ ROM_START( dinorexj ) ROM_LOAD( "d39-12.5", 0x00000, 0x04000, CRC(8292c7c1) SHA1(2ff20726f6cc6d98d860d96b8eb3c10f46b87d58) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "d39-07.10", 0x000000, 0x100000, CRC(28262816) SHA1(6df9a31a2edf1dfc23070b41b1da2c0a9e91d1b0) ) ROM_REGION( 0x080000, "ym.deltat", 0 ) /* Delta-T samples */ @@ -5076,7 +5076,7 @@ ROM_START( dinorexu ) ROM_LOAD( "d39-12.5", 0x00000, 0x04000, CRC(8292c7c1) SHA1(2ff20726f6cc6d98d860d96b8eb3c10f46b87d58) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "d39-07.10", 0x000000, 0x100000, CRC(28262816) SHA1(6df9a31a2edf1dfc23070b41b1da2c0a9e91d1b0) ) ROM_REGION( 0x080000, "ym.deltat", 0 ) /* Delta-T samples */ @@ -5100,7 +5100,7 @@ ROM_START( qjinsei ) /* Quiz Jinsei Gekijoh */ ROM_LOAD( "d48-11", 0x00000, 0x04000, CRC(656c5b54) SHA1(650bcc5920838db5c6613bcf30468d6e296ea017) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x080000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x080000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "d48-05", 0x000000, 0x080000, CRC(3fefd058) SHA1(338c35c3a086041d28708d4b17e208b590c926d5) ) /* no Delta-T samples */ @@ -5126,7 +5126,7 @@ ROM_START( qcrayon ) /* Quiz Crayon */ ROM_LOAD( "d55-15", 0x00000, 0x04000, CRC(ba782eff) SHA1(ce24654db49b9694e444e93b9a8d529a86729e03) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "d55-01", 0x000000, 0x100000, CRC(a8309af4) SHA1(dc30b2e019003c58aecaf899668b36dea6e1274e) ) /* no Delta-T samples */ @@ -5151,7 +5151,7 @@ ROM_START( qcrayon2 ) /* Quiz Crayon 2 */ ROM_LOAD( "d63-11", 0x00000, 0x04000, CRC(2c7ac9e5) SHA1(2477fb4415781afddc2f4084eca52f53b7d40480) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "d63-02", 0x000000, 0x100000, CRC(162ae165) SHA1(8b503d096640ec91cf55e05374b293937965c672) ) /* no Delta-T samples */ @@ -5175,7 +5175,7 @@ ROM_START( driftout ) ROM_LOAD( "do_50.rom", 0x00000, 0x04000, CRC(ffe10124) SHA1(a47dfedfa7b352a5db39e7e1ccc666d3c5fb0d75) ) ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "do_snd.rom", 0x00000, 0x80000, CRC(f2deb82b) SHA1(55e39173a475f5ab0b5f573a678a493fb6eefe64) ) /* no Delta-T samples */ diff --git a/src/mame/drivers/taito_h.c b/src/mame/drivers/taito_h.c index b31d5250f6b..a6433ca2d4c 100644 --- a/src/mame/drivers/taito_h.c +++ b/src/mame/drivers/taito_h.c @@ -303,7 +303,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) AM_RANGE(0xc000, 0xdfff) AM_RAM - AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) + AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) AM_RANGE(0xe200, 0xe200) AM_READNOP AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xe201, 0xe201) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w) AM_RANGE(0xe400, 0xe403) AM_WRITENOP /* pan control */ @@ -576,7 +576,7 @@ static MACHINE_DRIVER_START( syvalion ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "mono", 0.25) MDRV_SOUND_ROUTE(1, "mono", 1.0) @@ -616,7 +616,7 @@ static MACHINE_DRIVER_START( recordbr ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "mono", 0.25) MDRV_SOUND_ROUTE(1, "mono", 1.0) @@ -656,7 +656,7 @@ static MACHINE_DRIVER_START( dleague ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "mono", 0.25) MDRV_SOUND_ROUTE(1, "mono", 1.0) @@ -702,7 +702,7 @@ ROM_START( syvalion ) ROM_REGION( 0x80000, "ym.deltat", 0 ) /* samples */ ROM_LOAD( "b51-18.bin", 0x00000, 0x80000, CRC(8b23ac83) SHA1(340b9e7f09c1809a332b41d3fb579f5f8cd6367f) ) - ROM_REGION( 0x80000, "ym", 0 ) /* samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* samples */ ROM_LOAD( "b51-17.bin", 0x00000, 0x80000, CRC(d85096aa) SHA1(dac39ed182e9eda06575f1667c4c1ff9a4a56599) ) ROM_END @@ -730,7 +730,7 @@ ROM_START( recordbr ) ROM_REGION( 0x80000, "ym.deltat", 0 ) /* samples */ ROM_LOAD( "b56-09.bin", 0x00000, 0x80000, CRC(7fd9ee68) SHA1(edc4455b3f6a6f30f418d03c6e53af875542a325) ) - ROM_REGION( 0x80000, "ym", 0 ) /* samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* samples */ ROM_LOAD( "b56-10.bin", 0x00000, 0x80000, CRC(de1bce59) SHA1(aa3aea30d6f53e60d9a0d4ec767e1b261d5efc8a) ) ROM_REGION( 0x02000, "user1", 0 ) /* zoom table / mixing? */ @@ -761,7 +761,7 @@ ROM_START( gogold ) ROM_REGION( 0x80000, "ym.deltat", 0 ) /* samples */ ROM_LOAD( "b56-09.bin", 0x00000, 0x80000, CRC(7fd9ee68) SHA1(edc4455b3f6a6f30f418d03c6e53af875542a325) ) - ROM_REGION( 0x80000, "ym", 0 ) /* samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* samples */ ROM_LOAD( "b56-10.bin", 0x00000, 0x80000, CRC(de1bce59) SHA1(aa3aea30d6f53e60d9a0d4ec767e1b261d5efc8a) ) ROM_REGION( 0x02000, "user1", 0 ) /* zoom table / mixing? */ @@ -796,7 +796,7 @@ ROM_START( dleague ) ROM_REGION( 0x02000, "user1", 0 ) /* zoom table / mixing? */ ROM_LOAD( "c02-18.22", 0x00000, 0x02000, CRC(c88f0bbe) SHA1(18c87c744fbeca35d13033e50f62e5383eb4ec2c) ) - ROM_REGION( 0x80000, "ym", 0 ) /* samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* samples */ ROM_LOAD( "c02-01.31", 0x00000, 0x80000, CRC(d5a3d1aa) SHA1(544f807015b5d854a4d8cb73e4dbae4b953fd440) ) ROM_END diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c index 7b2ed6b45f3..cd2710a886d 100644 --- a/src/mame/drivers/taito_l.c +++ b/src/mame/drivers/taito_l.c @@ -652,7 +652,7 @@ static READ8_HANDLER( horshoes_trackx_hi_r ) AM_RANGE(0xff08, 0xff08) AM_READWRITE(rombankswitch_r, rombankswitch_w) #define COMMON_SINGLE_MAP \ - AM_RANGE(0xa000, 0xa003) AM_DEVREADWRITE("ym", extport_select_and_ym2203_r, ym2203_w) \ + AM_RANGE(0xa000, 0xa003) AM_DEVREADWRITE("ymsnd", extport_select_and_ym2203_r, ym2203_w) \ AM_RANGE(0x8000, 0x9fff) AM_RAM @@ -685,7 +685,7 @@ static ADDRESS_MAP_START( fhawk_3_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x9fff) AM_RAM AM_RANGE(0xe000, 0xe000) AM_READNOP AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xe001, 0xe001) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w) - AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) ADDRESS_MAP_END @@ -718,7 +718,7 @@ static ADDRESS_MAP_START( raimais_3_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(7) AM_RANGE(0xc000, 0xdfff) AM_RAM - AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) + AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) AM_RANGE(0xe200, 0xe200) AM_READNOP AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xe201, 0xe201) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w) AM_RANGE(0xe400, 0xe403) AM_WRITENOP /* pan */ @@ -755,7 +755,7 @@ static ADDRESS_MAP_START( champwr_3_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(7) AM_RANGE(0x8000, 0x8fff) AM_RAM - AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0xa000, 0xa000) AM_READNOP AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xa001, 0xa001) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w) AM_RANGE(0xb000, 0xb000) AM_WRITE(champwr_msm5205_hi_w) @@ -778,7 +778,7 @@ static ADDRESS_MAP_START( kurikint_2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe7ff) AM_READWRITE(shared_r, shared_w) - AM_RANGE(0xe800, 0xe801) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0xe800, 0xe801) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) #if 0 AM_RANGE(0xc000, 0xc000) AM_WRITE(rombank2switch_w) AM_RANGE(0xd000, 0xd000) AM_READ_PORT("DSWA") @@ -886,7 +886,7 @@ static ADDRESS_MAP_START( evilston_2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe7ff) AM_READWRITE(shared_r, shared_w) - AM_RANGE(0xe800, 0xe801) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0xe800, 0xe801) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK(7) ADDRESS_MAP_END @@ -1982,7 +1982,7 @@ static MACHINE_DRIVER_START( fhawk ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 3000000) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2203, 3000000) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2203_interface_triple) MDRV_SOUND_ROUTE(0, "mono", 0.20) MDRV_SOUND_ROUTE(1, "mono", 0.20) @@ -2007,7 +2007,7 @@ static MACHINE_DRIVER_START( champwr ) MDRV_MACHINE_RESET(champwr) /* sound hardware */ - MDRV_SOUND_MODIFY("ym") + MDRV_SOUND_MODIFY("ymsnd") MDRV_SOUND_CONFIG(ym2203_interface_champwr) MDRV_SOUND_ROUTE(0, "mono", 0.20) MDRV_SOUND_ROUTE(1, "mono", 0.20) @@ -2037,7 +2037,7 @@ static MACHINE_DRIVER_START( raimais ) MDRV_MACHINE_RESET(raimais) /* sound hardware */ - MDRV_SOUND_REPLACE("ym", YM2610, 8000000) /* verified on pcb (8Mhz OSC is also for the 2nd z80) */ + MDRV_SOUND_REPLACE("ymsnd", YM2610, 8000000) /* verified on pcb (8Mhz OSC is also for the 2nd z80) */ MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "mono", 0.25) MDRV_SOUND_ROUTE(1, "mono", 1.0) @@ -2078,7 +2078,7 @@ static MACHINE_DRIVER_START( kurikint ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 3000000) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2203, 3000000) /* verified on pcb */ MDRV_SOUND_ROUTE(0, "mono", 0.20) MDRV_SOUND_ROUTE(1, "mono", 0.20) MDRV_SOUND_ROUTE(2, "mono", 0.20) @@ -2123,7 +2123,7 @@ static MACHINE_DRIVER_START( plotting ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 3330000) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2203, 3330000) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2203_interface_single) MDRV_SOUND_ROUTE(0, "mono", 0.20) MDRV_SOUND_ROUTE(1, "mono", 0.20) @@ -2218,7 +2218,7 @@ static MACHINE_DRIVER_START( evilston ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 12000000/4) /* not verified */ + MDRV_SOUND_ADD("ymsnd", YM2203, 12000000/4) /* not verified */ MDRV_SOUND_ROUTE(0, "mono", 0.00) MDRV_SOUND_ROUTE(1, "mono", 0.00) MDRV_SOUND_ROUTE(2, "mono", 0.00) @@ -2245,7 +2245,7 @@ ROM_START( raimais ) ROM_LOAD( "b36-01.bin", 0x00000, 0x80000, CRC(89355cb2) SHA1(433e929fe8b488af84e88486d9679468a3d9677a) ) ROM_LOAD( "b36-02.bin", 0x80000, 0x80000, CRC(e71da5db) SHA1(aa47ae02c359264c0a1f09ecc583eefd1ef1dfa4) ) - ROM_REGION( 0x80000, "ym", 0 ) + ROM_REGION( 0x80000, "ymsnd", 0 ) ROM_LOAD( "b36-03.bin", 0x00000, 0x80000, CRC(96166516) SHA1(a6748218188cbd1b037f6c0845416665c0d55a7b) ) ROM_END @@ -2266,7 +2266,7 @@ ROM_START( raimaisj ) ROM_LOAD( "b36-01.bin", 0x00000, 0x80000, CRC(89355cb2) SHA1(433e929fe8b488af84e88486d9679468a3d9677a) ) ROM_LOAD( "b36-02.bin", 0x80000, 0x80000, CRC(e71da5db) SHA1(aa47ae02c359264c0a1f09ecc583eefd1ef1dfa4) ) - ROM_REGION( 0x80000, "ym", 0 ) + ROM_REGION( 0x80000, "ymsnd", 0 ) ROM_LOAD( "b36-03.bin", 0x00000, 0x80000, CRC(96166516) SHA1(a6748218188cbd1b037f6c0845416665c0d55a7b) ) ROM_END @@ -2287,7 +2287,7 @@ ROM_START( raimaisjo ) ROM_LOAD( "b36-01.bin", 0x00000, 0x80000, CRC(89355cb2) SHA1(433e929fe8b488af84e88486d9679468a3d9677a) ) ROM_LOAD( "b36-02.bin", 0x80000, 0x80000, CRC(e71da5db) SHA1(aa47ae02c359264c0a1f09ecc583eefd1ef1dfa4) ) - ROM_REGION( 0x80000, "ym", 0 ) + ROM_REGION( 0x80000, "ymsnd", 0 ) ROM_LOAD( "b36-03.bin", 0x00000, 0x80000, CRC(96166516) SHA1(a6748218188cbd1b037f6c0845416665c0d55a7b) ) ROM_END diff --git a/src/mame/drivers/taito_o.c b/src/mame/drivers/taito_o.c index 067f826ae69..aed6c4d3a76 100644 --- a/src/mame/drivers/taito_o.c +++ b/src/mame/drivers/taito_o.c @@ -66,7 +66,7 @@ static ADDRESS_MAP_START( parentj_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x01ffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_MIRROR(0x010000) AM_RAM AM_RANGE(0x200000, 0x20000f) AM_READWRITE(io_r, io_w) /* TC0220IOC ? */ - AM_RANGE(0x300000, 0x300003) AM_DEVREADWRITE8("ym", ym2203_r, ym2203_w, 0x00ff) + AM_RANGE(0x300000, 0x300003) AM_DEVREADWRITE8("ymsnd", ym2203_r, ym2203_w, 0x00ff) AM_RANGE(0x400000, 0x420fff) AM_READWRITE(TC0080VCO_word_r, TC0080VCO_word_w) AM_RANGE(0x500800, 0x500fff) AM_RAM AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) ADDRESS_MAP_END @@ -254,7 +254,7 @@ static MACHINE_DRIVER_START( parentj ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 2000000) /*?? MHz */ + MDRV_SOUND_ADD("ymsnd", YM2203, 2000000) /*?? MHz */ MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(0, "mono", 0.25) MDRV_SOUND_ROUTE(0, "mono", 0.25) diff --git a/src/mame/drivers/taito_x.c b/src/mame/drivers/taito_x.c index 9d17d04038d..bff67f1489f 100644 --- a/src/mame/drivers/taito_x.c +++ b/src/mame/drivers/taito_x.c @@ -477,7 +477,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(2) AM_RANGE(0xc000, 0xdfff) AM_RAM - AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) + AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) AM_RANGE(0xe200, 0xe200) AM_READNOP AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xe201, 0xe201) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w) AM_RANGE(0xe400, 0xe403) AM_WRITENOP /* pan */ @@ -491,7 +491,7 @@ static ADDRESS_MAP_START( daisenpu_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(2) AM_RANGE(0xc000, 0xdfff) AM_RAM - AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xe200, 0xe200) AM_READNOP AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xe201, 0xe201) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w) AM_RANGE(0xe400, 0xe403) AM_WRITENOP /* pan */ @@ -931,7 +931,7 @@ static MACHINE_DRIVER_START( superman ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, XTAL_16MHz/2) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2610, XTAL_16MHz/2) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -970,7 +970,7 @@ static MACHINE_DRIVER_START( daisenpu ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, XTAL_16MHz/4) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_16MHz/4) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.45) MDRV_SOUND_ROUTE(1, "rspeaker", 0.45) @@ -1007,7 +1007,7 @@ static MACHINE_DRIVER_START( gigandes ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -1046,7 +1046,7 @@ static MACHINE_DRIVER_START( ballbros ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -1120,7 +1120,7 @@ ROM_START( superman ) ROM_LOAD( "j01_16.bin", 0x100000, 0x80000, CRC(3622ed2f) SHA1(03f4383f6ff8b5f1e26bc6bbef2fb1855d3bb93f) ) /* Plane 2, 3 */ ROM_LOAD( "k01_17.bin", 0x180000, 0x80000, CRC(c34f27e0) SHA1(07ee02c18ce29f35e8ae87d0c1ed80b726c246a6) ) - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "e18_01.bin", 0x00000, 0x80000, CRC(3cf99786) SHA1(f6febf9bda87ca04f0a5890d0e8001c26dfa6c81) ) ROM_END @@ -1141,7 +1141,7 @@ ROM_START( supermanj ) ROM_LOAD( "j01_16.bin", 0x100000, 0x80000, CRC(3622ed2f) SHA1(03f4383f6ff8b5f1e26bc6bbef2fb1855d3bb93f) ) /* Plane 2, 3 */ ROM_LOAD( "k01_17.bin", 0x180000, 0x80000, CRC(c34f27e0) SHA1(07ee02c18ce29f35e8ae87d0c1ed80b726c246a6) ) - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "e18_01.bin", 0x00000, 0x80000, CRC(3cf99786) SHA1(f6febf9bda87ca04f0a5890d0e8001c26dfa6c81) ) ROM_END @@ -1213,7 +1213,7 @@ ROM_START( gigandes ) ROM_REGION( 0x80000, "ym.deltat", 0 ) /* Delta-T samples */ ROM_LOAD( "east-11.16f", 0x00000, 0x80000, CRC(92111f96) SHA1(e781f24761b7a923388f4cda64c7b31388fd64c5) ) - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "east-10.16e", 0x00000, 0x80000, CRC(ca0ac419) SHA1(b29f30a8ff1286c65b741353b6551918a45bcafe) ) ROM_END @@ -1237,7 +1237,7 @@ ROM_START( gigandesj ) ROM_REGION( 0x80000, "ym.deltat", 0 ) /* Delta-T samples */ ROM_LOAD( "east-11.16f", 0x00000, 0x80000, CRC(92111f96) SHA1(e781f24761b7a923388f4cda64c7b31388fd64c5) ) - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "east-10.16e", 0x00000, 0x80000, CRC(ca0ac419) SHA1(b29f30a8ff1286c65b741353b6551918a45bcafe) ) ROM_END @@ -1259,7 +1259,7 @@ ROM_START( kyustrkr ) ROM_REGION( 0x80000, "ym.deltat", 0 ) /* Delta-T samples */ ROM_LOAD( "m-8-5.u2", 0x00000, 0x20000, CRC(d9d90e0a) SHA1(1011548b4fb5f1a194c93ded512e74cda2c06ceb) ) - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "m-8-4.u1", 0x00000, 0x20000, CRC(d3f6047a) SHA1(0db6d762bbe2d68cddf30e06125b904e1021b96d) ) ROM_END @@ -1281,7 +1281,7 @@ ROM_START( ballbros ) ROM_REGION( 0x80000, "ym.deltat", 0 ) /* Delta-T samples */ ROM_LOAD( "east-11", 0x00000, 0x80000, CRC(92111f96) SHA1(e781f24761b7a923388f4cda64c7b31388fd64c5) ) - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "east-10", 0x00000, 0x80000, CRC(ca0ac419) SHA1(b29f30a8ff1286c65b741353b6551918a45bcafe) ) ROM_END diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c index c91557ab1b5..22c39b8742e 100644 --- a/src/mame/drivers/taito_z.c +++ b/src/mame/drivers/taito_z.c @@ -1606,7 +1606,7 @@ static ADDRESS_MAP_START( bshark_cpub_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x110000, 0x113fff) AM_RAM AM_SHARE(1) AM_RANGE(0x400000, 0x400007) AM_WRITE(spacegun_pancontrol) /* pan */ // AM_RANGE(0x40000a, 0x40000b) AM_READ(taitoz_unknown_r) // ??? - AM_RANGE(0x600000, 0x600007) AM_DEVREADWRITE8("ym", ym2610_r, ym2610_w, 0x00ff) + AM_RANGE(0x600000, 0x600007) AM_DEVREADWRITE8("ymsnd", ym2610_r, ym2610_w, 0x00ff) AM_RANGE(0x60000c, 0x60000d) AM_NOP // interrupt controller? AM_RANGE(0x60000e, 0x60000f) AM_NOP AM_RANGE(0x800000, 0x801fff) AM_READWRITE(TC0150ROD_word_r, TC0150ROD_word_w) /* "root ram" */ @@ -1701,7 +1701,7 @@ static ADDRESS_MAP_START( spacegun_cpub_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x20c000, 0x20ffff) AM_RAM AM_RANGE(0x210000, 0x21ffff) AM_RAM AM_SHARE(1) AM_RANGE(0x800000, 0x80000f) AM_READWRITE(spacegun_input_bypass_r, spacegun_output_bypass_w) - AM_RANGE(0xc00000, 0xc00007) AM_DEVREADWRITE8("ym", ym2610_r, ym2610_w, 0x00ff) + AM_RANGE(0xc00000, 0xc00007) AM_DEVREADWRITE8("ymsnd", ym2610_r, ym2610_w, 0x00ff) AM_RANGE(0xc0000c, 0xc0000d) AM_NOP // interrupt controller? AM_RANGE(0xc0000e, 0xc0000f) AM_NOP AM_RANGE(0xc20000, 0xc20007) AM_WRITE(spacegun_pancontrol) /* pan */ @@ -1765,7 +1765,7 @@ static ADDRESS_MAP_START( z80_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(10) AM_RANGE(0xc000, 0xdfff) AM_RAM - AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) + AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) AM_RANGE(0xe200, 0xe200) AM_READNOP AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xe201, 0xe201) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w) AM_RANGE(0xe400, 0xe403) AM_WRITE(taitoz_pancontrol) /* pan */ @@ -2919,7 +2919,7 @@ static MACHINE_DRIVER_START( contcirc ) MDRV_SPEAKER_ADD("rear", 0.0, 0.0, 1.3) MDRV_SPEAKER_ADD("subwoofer", 0.0, 0.0, 1.0) - MDRV_SOUND_ADD("ym", YM2610, 16000000/2) + MDRV_SOUND_ADD("ymsnd", YM2610, 16000000/2) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "subwoofer", 0.20) MDRV_SOUND_ROUTE(1, "2610.1.l", 2.0) @@ -2975,7 +2975,7 @@ static MACHINE_DRIVER_START( chasehq ) MDRV_SPEAKER_ADD("rear", 0.0, 0.0, 1.3) MDRV_SPEAKER_ADD("subwoofer", 0.0, 0.0, 1.0) - MDRV_SOUND_ADD("ym", YM2610, 16000000/2) + MDRV_SOUND_ADD("ymsnd", YM2610, 16000000/2) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "subwoofer", 0.20) MDRV_SOUND_ROUTE(1, "2610.1.l", 1.0) @@ -3029,7 +3029,7 @@ static MACHINE_DRIVER_START( enforce ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, 16000000/2) + MDRV_SOUND_ADD("ymsnd", YM2610, 16000000/2) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -3083,7 +3083,7 @@ static MACHINE_DRIVER_START( bshark ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, 16000000/2) + MDRV_SOUND_ADD("ymsnd", YM2610, 16000000/2) MDRV_SOUND_CONFIG(ym2610_interfaceb) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -3138,7 +3138,7 @@ static MACHINE_DRIVER_START( sci ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, 16000000/2) + MDRV_SOUND_ADD("ymsnd", YM2610, 16000000/2) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -3195,7 +3195,7 @@ static MACHINE_DRIVER_START( nightstr ) MDRV_SPEAKER_ADD("rear", 0.0, 0.0, 1.3) MDRV_SPEAKER_ADD("subwoofer", 0.0, 0.0, 1.0) - MDRV_SOUND_ADD("ym", YM2610, 16000000/2) + MDRV_SOUND_ADD("ymsnd", YM2610, 16000000/2) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "subwoofer", 0.20) MDRV_SOUND_ROUTE(1, "2610.1.l", 2.0) @@ -3249,7 +3249,7 @@ static MACHINE_DRIVER_START( aquajack ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, 16000000/2) + MDRV_SOUND_ADD("ymsnd", YM2610, 16000000/2) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -3301,7 +3301,7 @@ static MACHINE_DRIVER_START( spacegun ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, 16000000/2) + MDRV_SOUND_ADD("ymsnd", YM2610, 16000000/2) MDRV_SOUND_CONFIG(ym2610_interfaceb) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -3356,7 +3356,7 @@ static MACHINE_DRIVER_START( dblaxle ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, 16000000/2) + MDRV_SOUND_ADD("ymsnd", YM2610, 16000000/2) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -3410,7 +3410,7 @@ static MACHINE_DRIVER_START( racingb ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, 16000000/2) + MDRV_SOUND_ADD("ymsnd", YM2610, 16000000/2) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -3468,7 +3468,7 @@ ROM_START( contcirc ) ROM_REGION16_LE( 0x80000, "user1", 0 ) ROM_LOAD16_WORD( "b33-07.64", 0x00000, 0x80000, CRC(151e1f52) SHA1(118c673d74f27c4e76b321cc0e84f166d9f0d412) ) /* STY spritemap */ - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b33-09.18", 0x00000, 0x80000, CRC(1e6724b5) SHA1(48bb96b648605a9ceb88ff3b175a87226583c3d6) ) ROM_LOAD( "b33-10.17", 0x80000, 0x80000, CRC(e9ce03ab) SHA1(17324e8f0422118bc0912eba5750d80469f40b78) ) @@ -3510,7 +3510,7 @@ ROM_START( contcircu ) ROM_REGION16_LE( 0x80000, "user1", 0 ) ROM_LOAD16_WORD( "b33-07.64", 0x00000, 0x80000, CRC(151e1f52) SHA1(118c673d74f27c4e76b321cc0e84f166d9f0d412) ) /* STY spritemap */ - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b33-09.18", 0x00000, 0x80000, CRC(1e6724b5) SHA1(48bb96b648605a9ceb88ff3b175a87226583c3d6) ) ROM_LOAD( "b33-10.17", 0x80000, 0x80000, CRC(e9ce03ab) SHA1(17324e8f0422118bc0912eba5750d80469f40b78) ) @@ -3552,7 +3552,7 @@ ROM_START( contcircua ) ROM_REGION16_LE( 0x80000, "user1", 0 ) ROM_LOAD16_WORD( "b33-07.64", 0x00000, 0x80000, CRC(151e1f52) SHA1(118c673d74f27c4e76b321cc0e84f166d9f0d412) ) /* STY spritemap */ - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b33-09.18", 0x00000, 0x80000, CRC(1e6724b5) SHA1(48bb96b648605a9ceb88ff3b175a87226583c3d6) ) ROM_LOAD( "b33-10.17", 0x80000, 0x80000, CRC(e9ce03ab) SHA1(17324e8f0422118bc0912eba5750d80469f40b78) ) @@ -3602,7 +3602,7 @@ ROM_START( chasehq ) ROM_REGION16_LE( 0x80000, "user1", 0 ) ROM_LOAD16_WORD( "b52-38.34", 0x00000, 0x80000, CRC(5b5bf7f6) SHA1(71dd5b40b83870d351c9ecaccc4fb98c3a6740ae) ) /* STY spritemap */ - ROM_REGION( 0x180000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x180000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b52-115.71", 0x000000, 0x080000, CRC(4e117e93) SHA1(51d893fa21793335878c76f6d5987d99da60be04) ) ROM_LOAD( "b52-114.72", 0x080000, 0x080000, CRC(3a73d6b1) SHA1(419f02a875b30913331db207e344d0eaa275297e) ) ROM_LOAD( "b52-113.73", 0x100000, 0x080000, CRC(2c6a3a05) SHA1(f2f0dfbbbb6930bf53025064ebae9c07a95c6deb) ) @@ -3682,7 +3682,7 @@ ROM_START( chasehqj ) ROM_REGION16_LE( 0x80000, "user1", 0 ) ROM_LOAD16_WORD( "b52-38.34", 0x00000, 0x80000, CRC(5b5bf7f6) SHA1(71dd5b40b83870d351c9ecaccc4fb98c3a6740ae) ) /* STY spritemap */ - ROM_REGION( 0x180000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x180000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b52-41.71", 0x000000, 0x80000, CRC(8204880c) SHA1(4dfd6454b4a4c04db3593e98648afbfe8d1f59ed) ) ROM_LOAD( "b52-40.72", 0x080000, 0x80000, CRC(f0551055) SHA1(4498cd058a52d5e87c6d502e844908a5df3abf2a) ) ROM_LOAD( "b52-39.73", 0x100000, 0x80000, CRC(ac9cbbd3) SHA1(792f41fef37ff35067fd0173d944f90279176649) ) @@ -3762,7 +3762,7 @@ ROM_START( chasehqu ) ROM_REGION16_LE( 0x80000, "user1", 0 ) ROM_LOAD16_WORD( "b52-38.34", 0x00000, 0x80000, CRC(5b5bf7f6) SHA1(71dd5b40b83870d351c9ecaccc4fb98c3a6740ae) ) /* STY spritemap */ - ROM_REGION( 0x180000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x180000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b52-115.71", 0x000000, 0x080000, CRC(4e117e93) SHA1(51d893fa21793335878c76f6d5987d99da60be04) ) ROM_LOAD( "b52-114.72", 0x080000, 0x080000, CRC(3a73d6b1) SHA1(419f02a875b30913331db207e344d0eaa275297e) ) ROM_LOAD( "b52-113.73", 0x100000, 0x080000, CRC(2c6a3a05) SHA1(f2f0dfbbbb6930bf53025064ebae9c07a95c6deb) ) @@ -3901,7 +3901,7 @@ ROM_START( enforce ) ROM_REGION16_LE( 0x80000, "user1", 0 ) ROM_LOAD16_WORD( "b58-05.71", 0x00000, 0x80000, CRC(d1f4991b) SHA1(f1c5a9b8dce994d013290e98fda7bedf73e95900) ) /* STY spritemap */ - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b58-07.11", 0x000000, 0x080000, CRC(eeb5ba08) SHA1(fe40333e09339c76e503ce87b42a89b48d487016) ) ROM_LOAD( "b58-08.12", 0x080000, 0x080000, CRC(049243cf) SHA1(1f3099b6d764114dc4161ed308369d0f3148dc4e) ) @@ -3945,7 +3945,7 @@ ROM_START( bshark ) ROM_REGION16_LE( 0x80000, "user1", 0 ) ROM_LOAD16_WORD( "c34_06.12", 0x00000, 0x80000, CRC(d200b6eb) SHA1(6bfe3a7dde8d4e983521877d2bb176f5d126b763) ) /* STY spritemap */ - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c34_08.127", 0x00000, 0x80000, CRC(89a30450) SHA1(96b96ca5a3e20cdceb9ac5ddf377fb21a9a529fb) ) ROM_REGION( 0x80000, "ym.deltat", 0 ) /* Delta-T samples */ @@ -3987,7 +3987,7 @@ ROM_START( bsharkj ) ROM_REGION16_LE( 0x80000, "user1", 0 ) ROM_LOAD16_WORD( "c34_06.12", 0x00000, 0x80000, CRC(d200b6eb) SHA1(6bfe3a7dde8d4e983521877d2bb176f5d126b763) ) /* STY spritemap */ - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c34_08.127", 0x00000, 0x80000, CRC(89a30450) SHA1(96b96ca5a3e20cdceb9ac5ddf377fb21a9a529fb) ) ROM_REGION( 0x80000, "ym.deltat", 0 ) /* Delta-T samples */ @@ -4031,7 +4031,7 @@ ROM_START( sci ) ROM_REGION16_LE( 0x80000, "user1", 0 ) ROM_LOAD16_WORD( "c09-06.37", 0x00000, 0x80000, CRC(12df6d7b) SHA1(8ce742eb3f7eb6283b5ca32bb520d1cc7684d515) ) /* STY spritemap */ - ROM_REGION( 0x180000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x180000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c09-14.42", 0x000000, 0x080000, CRC(ad78bf46) SHA1(4020744bbdc4b9ec3dee1a9d7b5ffa8def43d7b2) ) ROM_LOAD( "c09-13.43", 0x080000, 0x080000, CRC(d57c41d3) SHA1(3375a1fc6389840544b9fdb96b2fafbc8e3276e2) ) ROM_LOAD( "c09-12.44", 0x100000, 0x080000, CRC(56c99fa5) SHA1(3f9a6bc89d847cc4c99d35f98157ea3f187c0f98) ) @@ -4080,7 +4080,7 @@ ROM_START( scia ) ROM_REGION16_LE( 0x80000, "user1", 0 ) ROM_LOAD16_WORD( "c09-06.37", 0x00000, 0x80000, CRC(12df6d7b) SHA1(8ce742eb3f7eb6283b5ca32bb520d1cc7684d515) ) /* STY spritemap */ - ROM_REGION( 0x180000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x180000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c09-14.42", 0x000000, 0x080000, CRC(ad78bf46) SHA1(4020744bbdc4b9ec3dee1a9d7b5ffa8def43d7b2) ) ROM_LOAD( "c09-13.43", 0x080000, 0x080000, CRC(d57c41d3) SHA1(3375a1fc6389840544b9fdb96b2fafbc8e3276e2) ) ROM_LOAD( "c09-12.44", 0x100000, 0x080000, CRC(56c99fa5) SHA1(3f9a6bc89d847cc4c99d35f98157ea3f187c0f98) ) @@ -4124,7 +4124,7 @@ ROM_START( scij ) ROM_REGION16_LE( 0x80000, "user1", 0 ) ROM_LOAD16_WORD( "c09-06.37", 0x00000, 0x80000, CRC(12df6d7b) SHA1(8ce742eb3f7eb6283b5ca32bb520d1cc7684d515) ) /* STY spritemap */ - ROM_REGION( 0x180000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x180000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c09-10.42", 0x000000, 0x080000, CRC(ad78bf46) SHA1(4020744bbdc4b9ec3dee1a9d7b5ffa8def43d7b2) ) ROM_LOAD( "c09-09.43", 0x080000, 0x080000, CRC(6a655c00) SHA1(5ae1ee422226e386550b69a1f35668c10d3bdcc2) ) ROM_LOAD( "c09-08.44", 0x100000, 0x080000, CRC(7ddfc316) SHA1(47f0ed8eecd4719b4c5cb8762ee6b8bb01686812) ) @@ -4168,7 +4168,7 @@ ROM_START( sciu ) ROM_REGION16_LE( 0x80000, "user1", 0 ) ROM_LOAD16_WORD( "c09-06.37", 0x00000, 0x80000, CRC(12df6d7b) SHA1(8ce742eb3f7eb6283b5ca32bb520d1cc7684d515) ) /* STY spritemap */ - ROM_REGION( 0x180000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x180000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c09-14.42", 0x000000, 0x080000, CRC(ad78bf46) SHA1(4020744bbdc4b9ec3dee1a9d7b5ffa8def43d7b2) ) ROM_LOAD( "c09-13.43", 0x080000, 0x080000, CRC(d57c41d3) SHA1(3375a1fc6389840544b9fdb96b2fafbc8e3276e2) ) ROM_LOAD( "c09-12.44", 0x100000, 0x080000, CRC(56c99fa5) SHA1(3f9a6bc89d847cc4c99d35f98157ea3f187c0f98) ) @@ -4212,7 +4212,7 @@ ROM_START( scin ) ROM_REGION16_LE( 0x80000, "user1", 0 ) ROM_LOAD16_WORD( "c09-06.37", 0x00000, 0x80000, CRC(12df6d7b) SHA1(8ce742eb3f7eb6283b5ca32bb520d1cc7684d515) ) /* STY spritemap */ - ROM_REGION( 0x180000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x180000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c09-14.42", 0x000000, 0x080000, CRC(ad78bf46) SHA1(4020744bbdc4b9ec3dee1a9d7b5ffa8def43d7b2) ) ROM_LOAD( "c09-13.43", 0x080000, 0x080000, CRC(d57c41d3) SHA1(3375a1fc6389840544b9fdb96b2fafbc8e3276e2) ) ROM_LOAD( "c09-12.44", 0x100000, 0x080000, CRC(56c99fa5) SHA1(3f9a6bc89d847cc4c99d35f98157ea3f187c0f98) ) @@ -4262,7 +4262,7 @@ ROM_START( nightstr ) ROM_REGION16_LE( 0x80000, "user1", 0 ) ROM_LOAD16_WORD( "b91-09.bin", 0x00000, 0x80000, CRC(5f247ca2) SHA1(3b89e5d035f27f62a14c5c7a976c804f9bb5c04d) ) /* STY spritemap */ - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b91-13.bin", 0x00000, 0x80000, CRC(8c7bf0f5) SHA1(6e18531991225c24a9722c9fbe1af6ae6e9b866b) ) ROM_LOAD( "b91-12.bin", 0x80000, 0x80000, CRC(da77c7af) SHA1(49662a69b83739e2e0209cabff83995a951383f4) ) @@ -4316,7 +4316,7 @@ ROM_START( nightstru ) ROM_REGION16_LE( 0x80000, "user1", 0 ) ROM_LOAD16_WORD( "b91-09.bin", 0x00000, 0x80000, CRC(5f247ca2) SHA1(3b89e5d035f27f62a14c5c7a976c804f9bb5c04d) ) /* STY spritemap */ - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b91-13.bin", 0x00000, 0x80000, CRC(8c7bf0f5) SHA1(6e18531991225c24a9722c9fbe1af6ae6e9b866b) ) ROM_LOAD( "b91-12.bin", 0x80000, 0x80000, CRC(da77c7af) SHA1(49662a69b83739e2e0209cabff83995a951383f4) ) @@ -4369,7 +4369,7 @@ ROM_START( nightstrj ) ROM_REGION16_LE( 0x80000, "user1", 0 ) ROM_LOAD16_WORD( "b91-09.bin", 0x00000, 0x80000, CRC(5f247ca2) SHA1(3b89e5d035f27f62a14c5c7a976c804f9bb5c04d) ) /* STY spritemap */ - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b91-13.bin", 0x00000, 0x80000, CRC(8c7bf0f5) SHA1(6e18531991225c24a9722c9fbe1af6ae6e9b866b) ) ROM_LOAD( "b91-12.bin", 0x80000, 0x80000, CRC(da77c7af) SHA1(49662a69b83739e2e0209cabff83995a951383f4) ) @@ -4415,7 +4415,7 @@ ROM_START( aquajack ) ROM_REGION16_LE( 0x80000, "user1", 0 ) ROM_LOAD16_WORD( "b77-06.rom", 0x00000, 0x80000, CRC(ce2aed00) SHA1(9c992717914b13eb271122ecf7cca3634b013e56) ) /* STY spritemap */ - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b77-09.rom", 0x00000, 0x80000, CRC(948e5ad9) SHA1(35cd6706470f01b5a244817d10fc65c075ff29b1) ) ROM_REGION( 0x80000, "ym.deltat", 0 ) /* Delta-T samples */ @@ -4456,7 +4456,7 @@ ROM_START( aquajackj ) ROM_REGION16_LE( 0x80000, "user1", 0 ) ROM_LOAD16_WORD( "b77-06.rom", 0x00000, 0x80000, CRC(ce2aed00) SHA1(9c992717914b13eb271122ecf7cca3634b013e56) ) /* STY spritemap */ - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b77-09.rom", 0x00000, 0x80000, CRC(948e5ad9) SHA1(35cd6706470f01b5a244817d10fc65c075ff29b1) ) ROM_REGION( 0x80000, "ym.deltat", 0 ) /* Delta-T samples */ @@ -4492,7 +4492,7 @@ ROM_START( spacegun ) ROM_REGION16_LE( 0x80000, "user1", 0 ) ROM_LOAD16_WORD( "c57-05.36", 0x00000, 0x80000, CRC(6a70eb2e) SHA1(307dd876af65204e86e094b4015ffb4a655824f8) ) /* STY spritemap */ - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c57-07.76", 0x00000, 0x80000, CRC(ad653dc1) SHA1(2ec440f793b0a686233fbe61c9462f8365c42b65) ) ROM_REGION( 0x80000, "ym.deltat", 0 ) /* Delta-T samples */ @@ -4540,7 +4540,7 @@ ROM_START( dblaxle ) ROM_REGION16_LE( 0x80000, "user1", 0 ) ROM_LOAD16_WORD( "c78-04.3", 0x00000, 0x80000, CRC(cc1aa37c) SHA1(cfa2eb338dc81c98c637c2f0b14d2baea8b115f5) ) /* STY spritemap */ - ROM_REGION( 0x180000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x180000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c78-12.33", 0x000000, 0x100000, CRC(b0267404) SHA1(ffd337336ff9b096e3725f733364762f6e6d3fab) ) ROM_LOAD( "c78-13.46", 0x100000, 0x080000, CRC(1b363aa2) SHA1(0aae3988024654e98cc0c784307b1c329c8f0783) ) @@ -4586,7 +4586,7 @@ ROM_START( pwheelsj ) ROM_REGION16_LE( 0x80000, "user1", 0 ) ROM_LOAD16_WORD( "c78-04.3", 0x00000, 0x80000, CRC(cc1aa37c) SHA1(cfa2eb338dc81c98c637c2f0b14d2baea8b115f5) ) /* STY spritemap */ - ROM_REGION( 0x180000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x180000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c78-01.33", 0x000000, 0x100000, CRC(90ff1e72) SHA1(6115e3683bc701922953b644427d1ddb471bf037) ) ROM_LOAD( "c78-02.46", 0x100000, 0x080000, CRC(8882d2b7) SHA1(4d3abac1e50cd5ae79a562f430563032a11e8390) ) @@ -4632,7 +4632,7 @@ ROM_START( racingb ) ROM_REGION16_LE( 0x80000, "user1", 0 ) ROM_LOAD16_WORD( "c84-88.3", 0x00000, 0x80000, CRC(edd1f49c) SHA1(f11c419dcc7da03ef1f1665c1344c27ff35fe867) ) /* STY spritemap */ - ROM_REGION( 0x180000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x180000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c84-86.33", 0x000000, 0x100000, CRC(98d9771e) SHA1(0cbb6b08e1fa5e632309962d7ad7dca448ef4d78) ) ROM_LOAD( "c84-87.46", 0x100000, 0x080000, CRC(9c1dd80c) SHA1(e1bae4e02fd94413fac4683e39e530f9d508d658) ) diff --git a/src/mame/drivers/taitoair.c b/src/mame/drivers/taitoair.c index 2252dcf2e8c..ac253ca145f 100644 --- a/src/mame/drivers/taitoair.c +++ b/src/mame/drivers/taitoair.c @@ -399,7 +399,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) AM_RANGE(0xc000, 0xdfff) AM_RAM - AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) + AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) AM_RANGE(0xe200, 0xe200) AM_READWRITE(SMH_NOP, taitosound_slave_port_w) AM_RANGE(0xe201, 0xe201) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w) AM_RANGE(0xe400, 0xe403) AM_WRITENOP /* pan control */ @@ -631,7 +631,7 @@ static MACHINE_DRIVER_START( airsys ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) MDRV_SOUND_CONFIG(airsys_ym2610_interface) MDRV_SOUND_ROUTE(0, "mono", 0.30) MDRV_SOUND_ROUTE(1, "mono", 0.60) @@ -673,7 +673,7 @@ ROM_START( topland ) ROM_LOAD16_BYTE( "b62-31.29", 0x0c0000, 0x20000, CRC(3feebfe3) SHA1(5b014d7d6fa1daf400ac1a437f551281debfdba6) ) ROM_LOAD16_BYTE( "b62-32.30", 0x0c0001, 0x20000, CRC(66806646) SHA1(d8e0c37b5227d8583d523164ffc6828b4508d5a3) ) - ROM_REGION( 0xa0000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0xa0000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b62-17.5", 0x00000, 0x20000, CRC(36447066) SHA1(91c8cc4e99534b2d533895a342abb22766a20090) ) ROM_LOAD( "b62-16.4", 0x20000, 0x20000, CRC(203a5c27) SHA1(f6fc9322dea8d82bfec3be3fdc8616dc6adf666e) ) ROM_LOAD( "b62-15.3", 0x40000, 0x20000, CRC(e35ffe81) SHA1(f35afdd7cfd4c09907fb062beb5ae46c2286a381) ) @@ -720,7 +720,7 @@ ROM_START( ainferno ) ROM_LOAD16_BYTE( "c45-14.31", 0x0c0000, 0x20000, CRC(481b6f29) SHA1(0b047e805663b144dc2388c86438950fcdc29658) ) ROM_LOAD16_BYTE( "c45-18.43", 0x0c0001, 0x20000, CRC(ba7ecf3b) SHA1(dd073b7bfbf2f88432337027ae9fb6c4f02a538f) ) - ROM_REGION( 0xa0000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0xa0000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c45-01.5", 0x00000, 0x20000, CRC(052997b2) SHA1(3aa8b4f759a1c196de39754a9ccdf4fabdbab388) ) ROM_LOAD( "c45-02.4", 0x20000, 0x20000, CRC(2fc0a88e) SHA1(6a635671fa2518f74015429ce580d7b7f00299ad) ) ROM_LOAD( "c45-03.3", 0x40000, 0x20000, CRC(0e1e5b5f) SHA1(a53d5ba01825f825e31a014cb4808f59ef86f0c9) ) diff --git a/src/mame/drivers/taotaido.c b/src/mame/drivers/taotaido.c index a736a4971ea..c3c1cd07aed 100644 --- a/src/mame/drivers/taotaido.c +++ b/src/mame/drivers/taotaido.c @@ -137,7 +137,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_port_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) + AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) AM_RANGE(0x04, 0x04) AM_WRITE(taotaido_sh_bankswitch_w) AM_RANGE(0x08, 0x08) AM_WRITE(pending_command_clear_w) AM_RANGE(0x0c, 0x0c) AM_READ(soundlatch_r) @@ -358,7 +358,7 @@ static MACHINE_DRIVER_START( taotaido ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -379,7 +379,7 @@ ROM_START( taotaido ) ROM_REGION( 0x100000, "ym.deltat", 0 ) /* sound samples */ ROM_LOAD( "u104.bin", 0x000000, 0x100000, CRC(e89387a9) SHA1(1deeee056af367d1a5aa0722dd3d6c68a82d0489) ) - ROM_REGION( 0x200000, "ym", 0 ) /* sound samples */ + ROM_REGION( 0x200000, "ymsnd", 0 ) /* sound samples */ ROM_LOAD( "u127.bin", 0x00000, 0x200000, CRC(0cf0cb23) SHA1(a87e7159db2fa0d50446cbf45ec9fbf585b8f396) ) ROM_REGION( 0x600000, "gfx1", 0 ) /* Sprites */ @@ -403,7 +403,7 @@ ROM_START( taotaidoa ) ROM_REGION( 0x100000, "ym.deltat", 0 ) /* sound samples */ ROM_LOAD( "u104.bin", 0x000000, 0x100000, CRC(e89387a9) SHA1(1deeee056af367d1a5aa0722dd3d6c68a82d0489) ) - ROM_REGION( 0x200000, "ym", 0 ) /* sound samples */ + ROM_REGION( 0x200000, "ymsnd", 0 ) /* sound samples */ ROM_LOAD( "u127.bin", 0x00000, 0x200000, CRC(0cf0cb23) SHA1(a87e7159db2fa0d50446cbf45ec9fbf585b8f396) ) ROM_REGION( 0x600000, "gfx1", 0 ) /* Sprites */ diff --git a/src/mame/drivers/tatsumi.c b/src/mame/drivers/tatsumi.c index b6cd3df7b36..6c6486edea9 100644 --- a/src/mame/drivers/tatsumi.c +++ b/src/mame/drivers/tatsumi.c @@ -222,7 +222,7 @@ static ADDRESS_MAP_START( apache3_v20_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x00000, 0x01fff) AM_RAM AM_RANGE(0x04000, 0x04003) AM_NOP // piu select .. ? AM_RANGE(0x06000, 0x06001) AM_READ_PORT("IN0") // esw - AM_RANGE(0x08000, 0x08001) AM_DEVREADWRITE("ym", tatsumi_hack_ym2151_r, ym2151_w) + AM_RANGE(0x08000, 0x08001) AM_DEVREADWRITE("ymsnd", tatsumi_hack_ym2151_r, ym2151_w) AM_RANGE(0x0a000, 0x0a000) AM_DEVREADWRITE("oki", tatsumi_hack_oki_r, okim6295_w) AM_RANGE(0x0e000, 0x0e007) AM_READWRITE(apache3_adc_r, apache3_adc_w) //adc select AM_RANGE(0xf0000, 0xfffff) AM_ROM @@ -266,7 +266,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( roundup5_z80_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xdfff) AM_ROM AM_RANGE(0xe000, 0xffef) AM_RAM - AM_RANGE(0xfff0, 0xfff1) AM_DEVREADWRITE("ym", tatsumi_hack_ym2151_r, ym2151_w) + AM_RANGE(0xfff0, 0xfff1) AM_DEVREADWRITE("ymsnd", tatsumi_hack_ym2151_r, ym2151_w) AM_RANGE(0xfff4, 0xfff4) AM_DEVREADWRITE("oki", tatsumi_hack_oki_r, okim6295_w) AM_RANGE(0xfff8, 0xfff8) AM_READ_PORT("IN0") AM_RANGE(0xfff9, 0xfff9) AM_READ_PORT("IN1") @@ -323,7 +323,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cyclwarr_z80_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xdfff) AM_ROM AM_RANGE(0xe000, 0xffef) AM_RAM - AM_RANGE(0xfff0, 0xfff1) AM_DEVREADWRITE("ym", tatsumi_hack_ym2151_r, ym2151_w) + AM_RANGE(0xfff0, 0xfff1) AM_DEVREADWRITE("ymsnd", tatsumi_hack_ym2151_r, ym2151_w) AM_RANGE(0xfff4, 0xfff4) AM_DEVREADWRITE("oki", tatsumi_hack_oki_r, okim6295_w) AM_RANGE(0xfffc, 0xfffc) AM_READ(soundlatch_r) AM_RANGE(0xfffe, 0xfffe) AM_WRITENOP @@ -891,7 +891,7 @@ static MACHINE_DRIVER_START( apache3 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, CLOCK_1 / 4) + MDRV_SOUND_ADD("ymsnd", YM2151, CLOCK_1 / 4) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.45) MDRV_SOUND_ROUTE(1, "rspeaker", 0.45) @@ -934,7 +934,7 @@ static MACHINE_DRIVER_START( roundup5 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, CLOCK_1 / 4) + MDRV_SOUND_ADD("ymsnd", YM2151, CLOCK_1 / 4) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.45) MDRV_SOUND_ROUTE(1, "rspeaker", 0.45) @@ -978,7 +978,7 @@ static MACHINE_DRIVER_START( cyclwarr ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, CLOCK_1 / 4) + MDRV_SOUND_ADD("ymsnd", YM2151, CLOCK_1 / 4) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.45) MDRV_SOUND_ROUTE(1, "rspeaker", 0.45) @@ -1022,7 +1022,7 @@ static MACHINE_DRIVER_START( bigfight ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, CLOCK_1 / 4) + MDRV_SOUND_ADD("ymsnd", YM2151, CLOCK_1 / 4) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.45) MDRV_SOUND_ROUTE(1, "rspeaker", 0.45) diff --git a/src/mame/drivers/tceptor.c b/src/mame/drivers/tceptor.c index b1886c85df2..063462094e7 100644 --- a/src/mame/drivers/tceptor.c +++ b/src/mame/drivers/tceptor.c @@ -200,7 +200,7 @@ static ADDRESS_MAP_START( m6502_a_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0100, 0x01ff) AM_RAM AM_RANGE(0x0200, 0x02ff) AM_RAM AM_RANGE(0x0300, 0x030f) AM_RAM - AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x3000, 0x30ff) AM_RAM AM_SHARE(3) AM_RANGE(0x3c01, 0x3c01) AM_WRITE(SMH_RAM) AM_RANGE(0x8000, 0xffff) AM_ROM @@ -382,7 +382,7 @@ static MACHINE_DRIVER_START( tceptor ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", M6809, 49152000/32) MDRV_CPU_PROGRAM_MAP(m6809_map) - MDRV_CPU_VBLANK_INT("2d", m6809_vb_interrupt) + MDRV_CPU_VBLANK_INT("2dscreen", m6809_vb_interrupt) MDRV_CPU_ADD("audiocpu", M65C02, 49152000/24) MDRV_CPU_PROGRAM_MAP(m6502_a_map) @@ -392,12 +392,12 @@ static MACHINE_DRIVER_START( tceptor ) MDRV_CPU_ADD("sub", M68000, 49152000/4) MDRV_CPU_PROGRAM_MAP(m68k_map) - MDRV_CPU_VBLANK_INT("2d", m68k_vb_interrupt) + MDRV_CPU_VBLANK_INT("2dscreen", m68k_vb_interrupt) MDRV_CPU_ADD("mcu", HD63701, 49152000/8) /* or compatible 6808 with extra instructions */ MDRV_CPU_PROGRAM_MAP(mcu_map) MDRV_CPU_IO_MAP(mcu_io_map) - MDRV_CPU_VBLANK_INT("2d", mcu_vb_interrupt) + MDRV_CPU_VBLANK_INT("2dscreen", mcu_vb_interrupt) MDRV_QUANTUM_TIME(HZ(6000)) @@ -411,7 +411,7 @@ static MACHINE_DRIVER_START( tceptor ) MDRV_PALETTE_LENGTH(4096) MDRV_DEFAULT_LAYOUT(layout_horizont) - MDRV_SCREEN_ADD("2d", RASTER) + MDRV_SCREEN_ADD("2dscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(60.606060) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) @@ -441,7 +441,7 @@ static MACHINE_DRIVER_START( tceptor ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 14318180/4) + MDRV_SOUND_ADD("ymsnd", YM2151, 14318180/4) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/tcl.c b/src/mame/drivers/tcl.c index 3e0318eef4f..b2862838bcc 100644 --- a/src/mame/drivers/tcl.c +++ b/src/mame/drivers/tcl.c @@ -138,7 +138,7 @@ static MACHINE_DRIVER_START( tcl ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 12000000/6) + MDRV_SOUND_ADD("aysnd", AY8910, 12000000/6) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_DRIVER_END diff --git a/src/mame/drivers/tecmo.c b/src/mame/drivers/tecmo.c index 4649b732a4c..c468d475c26 100644 --- a/src/mame/drivers/tecmo.c +++ b/src/mame/drivers/tecmo.c @@ -234,7 +234,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( rygar_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x47ff) AM_RAM - AM_RANGE(0x8000, 0x8001) AM_DEVWRITE("ym", ym3812_w) + AM_RANGE(0x8000, 0x8001) AM_DEVWRITE("ymsnd", ym3812_w) AM_RANGE(0xc000, 0xc000) AM_READ(soundlatch_r) AM_DEVWRITE("msm", tecmo_adpcm_start_w) AM_RANGE(0xd000, 0xd000) AM_WRITE(tecmo_adpcm_end_w) AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("msm", tecmo_adpcm_vol_w) @@ -246,7 +246,7 @@ static ADDRESS_MAP_START( tecmo_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) /* writes code to this area */ AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0xa000, 0xa001) AM_DEVWRITE("ym", ym3812_w) + AM_RANGE(0xa000, 0xa001) AM_DEVWRITE("ymsnd", ym3812_w) AM_RANGE(0xc000, 0xc000) AM_READ(soundlatch_r) AM_DEVWRITE("msm", tecmo_adpcm_start_w) AM_RANGE(0xc400, 0xc400) AM_WRITE(tecmo_adpcm_end_w) AM_RANGE(0xc800, 0xc800) AM_DEVWRITE("msm", tecmo_adpcm_vol_w) @@ -704,7 +704,7 @@ static MACHINE_DRIVER_START( rygar ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, XTAL_4MHz) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_4MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) @@ -763,7 +763,7 @@ static MACHINE_DRIVER_START( backfirt ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, XTAL_4MHz) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_4MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/drivers/tecmo16.c b/src/mame/drivers/tecmo16.c index 290a85d06a5..dc410078257 100644 --- a/src/mame/drivers/tecmo16.c +++ b/src/mame/drivers/tecmo16.c @@ -120,7 +120,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_ROM AM_RANGE(0xf000, 0xfbff) AM_RAM /* Sound RAM */ AM_RANGE(0xfc00, 0xfc00) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) - AM_RANGE(0xfc04, 0xfc05) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xfc04, 0xfc05) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xfc08, 0xfc08) AM_READ(soundlatch_r) AM_RANGE(0xfc0c, 0xfc0c) AM_NOP AM_RANGE(0xfffe, 0xffff) AM_RAM @@ -427,7 +427,7 @@ static MACHINE_DRIVER_START( fstarfrc ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 8000000/2) + MDRV_SOUND_ADD("ymsnd", YM2151, 8000000/2) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.60) MDRV_SOUND_ROUTE(1, "rspeaker", 0.60) diff --git a/src/mame/drivers/terracre.c b/src/mame/drivers/terracre.c index 7804c9f1dc6..27e8067bd95 100644 --- a/src/mame/drivers/terracre.c +++ b/src/mame/drivers/terracre.c @@ -248,7 +248,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_3526_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE("ym", ym3526_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ymsnd", ym3526_w) AM_RANGE(0x02, 0x02) AM_DEVWRITE("dac1", dac_signed_w) AM_RANGE(0x03, 0x03) AM_DEVWRITE("dac2", dac_signed_w) AM_RANGE(0x04, 0x04) AM_READ(soundlatch_clear_r) @@ -568,7 +568,7 @@ static MACHINE_DRIVER_START( amazon ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3526, 4000000) + MDRV_SOUND_ADD("ymsnd", YM3526, 4000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_SOUND_ADD("dac1", DAC, 0) @@ -605,7 +605,7 @@ static MACHINE_DRIVER_START( ym3526 ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3526, 4000000) + MDRV_SOUND_ADD("ymsnd", YM3526, 4000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_SOUND_ADD("dac1", DAC, 0) diff --git a/src/mame/drivers/thedeep.c b/src/mame/drivers/thedeep.c index ee8a49ae242..5713dffe432 100644 --- a/src/mame/drivers/thedeep.c +++ b/src/mame/drivers/thedeep.c @@ -179,7 +179,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM - AM_RANGE(0x0800, 0x0801) AM_DEVWRITE("ym", ym2203_w ) // + AM_RANGE(0x0800, 0x0801) AM_DEVWRITE("ymsnd", ym2203_w ) // AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_r ) // From Main CPU AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -382,7 +382,7 @@ static MACHINE_DRIVER_START( thedeep ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, XTAL_12MHz/4) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) /* verified on pcb */ MDRV_SOUND_CONFIG(thedeep_ym2203_intf) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/thunderx.c b/src/mame/drivers/thunderx.c index a838f2106c7..62fab18055a 100644 --- a/src/mame/drivers/thunderx.c +++ b/src/mame/drivers/thunderx.c @@ -416,7 +416,7 @@ static ADDRESS_MAP_START( scontra_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x87ff) AM_RAM /* RAM */ AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) /* soundlatch_r */ AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE("konami", k007232_r, k007232_w) /* 007232 registers */ - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) /* YM2151 */ + AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) /* YM2151 */ AM_RANGE(0xf000, 0xf000) AM_DEVWRITE("konami", scontra_snd_bankswitch_w) /* 007232 bank select */ ADDRESS_MAP_END @@ -424,7 +424,7 @@ static ADDRESS_MAP_START( thunderx_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) ADDRESS_MAP_END /*************************************************************************** @@ -604,7 +604,7 @@ static MACHINE_DRIVER_START( scontra ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) MDRV_SOUND_ROUTE(0, "mono", 1.0) MDRV_SOUND_ROUTE(1, "mono", 1.0) @@ -645,7 +645,7 @@ static MACHINE_DRIVER_START( thunderx ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) MDRV_SOUND_ROUTE(0, "mono", 1.0) MDRV_SOUND_ROUTE(1, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c index f5d71bfb131..d401836904e 100644 --- a/src/mame/drivers/tmnt.c +++ b/src/mame/drivers/tmnt.c @@ -661,7 +661,7 @@ static ADDRESS_MAP_START( cuebrick_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0a0018, 0x0a0019) AM_READ_PORT("DSW3") AM_RANGE(0x0b0000, 0x0b03ff) AM_READWRITE(cuebrick_nv_r, cuebrick_nv_w) AM_RANGE(0x0b0400, 0x0b0401) AM_WRITE(cuebrick_nvbank_w) - AM_RANGE(0x0c0000, 0x0c0003) AM_DEVREADWRITE8("ym", ym2151_r, ym2151_w, 0xff00) + AM_RANGE(0x0c0000, 0x0c0003) AM_DEVREADWRITE8("ymsnd", ym2151_r, ym2151_w, 0xff00) AM_RANGE(0x100000, 0x107fff) AM_READWRITE(K052109_word_noA12_r, K052109_word_noA12_w) AM_RANGE(0x140000, 0x140007) AM_READWRITE(K051937_word_r, K051937_word_w) AM_RANGE(0x140400, 0x1407ff) AM_READWRITE(K051960_word_r, K051960_word_w) @@ -1158,7 +1158,7 @@ static ADDRESS_MAP_START( mia_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE("konami", k007232_r, k007232_w) - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) ADDRESS_MAP_END @@ -1168,7 +1168,7 @@ static ADDRESS_MAP_START( tmnt_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9000, 0x9000) AM_READWRITE(tmnt_sres_r, tmnt_sres_w) /* title music & UPD7759C reset */ AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE("konami", k007232_r, k007232_w) - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xd000, 0xd000) AM_DEVWRITE("upd", upd7759_port_w) AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("upd", tmnt_upd_start_w) AM_RANGE(0xf000, 0xf000) AM_DEVREAD("upd", tmnt_upd_busy_r) @@ -1178,7 +1178,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( punkshot_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0xf000, 0xf7ff) AM_RAM - AM_RANGE(0xf800, 0xf801) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xf800, 0xf801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xfa00, 0xfa00) AM_WRITE(sound_arm_nmi_w) AM_RANGE(0xfc00, 0xfc2f) AM_DEVREADWRITE("konami", k053260_r, k053260_w) ADDRESS_MAP_END @@ -1187,7 +1187,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( lgtnfght_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xc000, 0xc02f) AM_DEVREADWRITE("konami", k053260_r, k053260_w) ADDRESS_MAP_END @@ -1203,7 +1203,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ssriders_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_ROM AM_RANGE(0xf000, 0xf7ff) AM_RAM - AM_RANGE(0xf800, 0xf801) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xf800, 0xf801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xfa00, 0xfa2f) AM_DEVREADWRITE("konami", k053260_r, k053260_w) AM_RANGE(0xfc00, 0xfc00) AM_WRITE(sound_arm_nmi_w) ADDRESS_MAP_END @@ -1212,7 +1212,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( thndrx2_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_ROM AM_RANGE(0xf000, 0xf7ff) AM_RAM - AM_RANGE(0xf800, 0xf801) AM_MIRROR(0x0010) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xf800, 0xf801) AM_MIRROR(0x0010) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xfa00, 0xfa00) AM_WRITE(sound_arm_nmi_w) AM_RANGE(0xfc00, 0xfc2f) AM_DEVREADWRITE("konami", k053260_r, k053260_w) ADDRESS_MAP_END @@ -2098,7 +2098,7 @@ static MACHINE_DRIVER_START( cuebrick ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) MDRV_SOUND_CONFIG(ym2151_interface_cbj) MDRV_SOUND_ROUTE(0, "mono", 1.0) MDRV_SOUND_ROUTE(1, "mono", 1.0) @@ -2133,7 +2133,7 @@ static MACHINE_DRIVER_START( mia ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) MDRV_SOUND_ROUTE(0, "mono", 1.0) MDRV_SOUND_ROUTE(1, "mono", 1.0) @@ -2182,7 +2182,7 @@ static MACHINE_DRIVER_START( tmnt ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) MDRV_SOUND_ROUTE(0, "mono", 1.0) MDRV_SOUND_ROUTE(1, "mono", 1.0) @@ -2229,7 +2229,7 @@ static MACHINE_DRIVER_START( punkshot ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) MDRV_SOUND_ROUTE(0, "mono", 1.0) MDRV_SOUND_ROUTE(1, "mono", 1.0) @@ -2266,7 +2266,7 @@ static MACHINE_DRIVER_START( lgtnfght ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -2308,7 +2308,7 @@ static MACHINE_DRIVER_START( blswhstl ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) MDRV_SOUND_ROUTE(0, "lspeaker", 0.70) MDRV_SOUND_ROUTE(1, "rspeaker", 0.70) @@ -2457,7 +2457,7 @@ static MACHINE_DRIVER_START( tmnt2 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -2498,7 +2498,7 @@ static MACHINE_DRIVER_START( ssriders ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -2572,7 +2572,7 @@ static MACHINE_DRIVER_START( thndrx2 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c index 1611239a728..f196596e5ee 100644 --- a/src/mame/drivers/tnzs.c +++ b/src/mame/drivers/tnzs.c @@ -785,7 +785,7 @@ static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x9fff) AM_ROMBANK(2) AM_RANGE(0xa000, 0xa000) AM_WRITE(tnzs_bankswitch1_w) - AM_RANGE(0xb000, 0xb001) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0xb000, 0xb001) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0xc000, 0xc001) AM_READWRITE(tnzs_mcu_r, tnzs_mcu_w) /* not present in insectx */ AM_RANGE(0xd000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xefff) AM_RAM AM_SHARE(1) @@ -798,7 +798,7 @@ static ADDRESS_MAP_START( kageki_sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x9fff) AM_ROMBANK(2) AM_RANGE(0xa000, 0xa000) AM_WRITE(tnzs_bankswitch1_w) - AM_RANGE(0xb000, 0xb001) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0xb000, 0xb001) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0xc000, 0xc000) AM_READ_PORT("IN0") AM_RANGE(0xc001, 0xc001) AM_READ_PORT("IN1") AM_RANGE(0xc002, 0xc002) AM_READ_PORT("IN2") @@ -858,7 +858,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( tnzsb_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0x02, 0x02) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -914,7 +914,7 @@ static ADDRESS_MAP_START( jpopnics_sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x9fff) AM_READWRITE(SMH_BANK(2), SMH_ROM) AM_RANGE(0xa000, 0xa000) AM_WRITE(jpopnics_subbankswitch_w) - AM_RANGE(0xb000, 0xb001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xb000, 0xb001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xc000, 0xc000) AM_READ_PORT("IN1") AM_RANGE(0xc001, 0xc001) AM_READ_PORT("IN2") AM_RANGE(0xc600, 0xc600) AM_READ_PORT("DSWA") @@ -1638,7 +1638,7 @@ static MACHINE_DRIVER_START( arknoid2 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, XTAL_12MHz/4) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_DRIVER_END @@ -1677,7 +1677,7 @@ static MACHINE_DRIVER_START( drtoppel ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, XTAL_12MHz/4) + MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_DRIVER_END @@ -1718,7 +1718,7 @@ static MACHINE_DRIVER_START( tnzs ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, XTAL_12MHz/4) + MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_DRIVER_END @@ -1756,7 +1756,7 @@ static MACHINE_DRIVER_START( insectx ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, XTAL_12MHz/4) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_DRIVER_END @@ -1794,7 +1794,7 @@ static MACHINE_DRIVER_START( kageki ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, XTAL_12MHz/4) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) /* verified on pcb */ MDRV_SOUND_CONFIG(kageki_ym2203_interface) MDRV_SOUND_ROUTE(0, "mono", 0.15) MDRV_SOUND_ROUTE(1, "mono", 0.15) @@ -1843,7 +1843,7 @@ static MACHINE_DRIVER_START( tnzsb ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, XTAL_12MHz/4) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2203b_interface) MDRV_SOUND_ROUTE(0, "mono", 1.0) MDRV_SOUND_ROUTE(1, "mono", 1.0) @@ -1863,7 +1863,7 @@ static MACHINE_DRIVER_START( kabukiz ) MDRV_CPU_MODIFY("audiocpu") MDRV_CPU_PROGRAM_MAP(kabukiz_cpu2_map) - MDRV_SOUND_MODIFY("ym") + MDRV_SOUND_MODIFY("ymsnd") MDRV_SOUND_CONFIG(kabukiz_ym2203_interface) MDRV_SOUND_ROUTE(0, "mono", 1.0) MDRV_SOUND_ROUTE(1, "mono", 1.0) @@ -1905,7 +1905,7 @@ static MACHINE_DRIVER_START( jpopnics ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, XTAL_12MHz/4) /* Not verified - Main board Crystal is 12MHz */ + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_12MHz/4) /* Not verified - Main board Crystal is 12MHz */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_DRIVER_END diff --git a/src/mame/drivers/toaplan1.c b/src/mame/drivers/toaplan1.c index 55752337f45..3ee78ac9653 100644 --- a/src/mame/drivers/toaplan1.c +++ b/src/mame/drivers/toaplan1.c @@ -282,7 +282,7 @@ static ADDRESS_MAP_START( rallybik_sound_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x30, 0x30) AM_WRITE(rallybik_coin_w) /* Coin counter/lockout */ AM_RANGE(0x40, 0x40) AM_READ_PORT("DSWA") AM_RANGE(0x50, 0x50) AM_READ_PORT("DSWB") - AM_RANGE(0x60, 0x61) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) + AM_RANGE(0x60, 0x61) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w) AM_RANGE(0x70, 0x70) AM_READ_PORT("TJUMP") ADDRESS_MAP_END @@ -294,7 +294,7 @@ static ADDRESS_MAP_START( truxton_sound_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x30, 0x30) AM_WRITE(toaplan1_coin_w) /* Coin counter/lockout */ AM_RANGE(0x40, 0x40) AM_READ_PORT("DSWA") AM_RANGE(0x50, 0x50) AM_READ_PORT("DSWB") - AM_RANGE(0x60, 0x61) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) + AM_RANGE(0x60, 0x61) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w) AM_RANGE(0x70, 0x70) AM_READ_PORT("TJUMP") ADDRESS_MAP_END @@ -307,7 +307,7 @@ static ADDRESS_MAP_START( hellfire_sound_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x40, 0x40) AM_READ_PORT("P1") AM_RANGE(0x50, 0x50) AM_READ_PORT("P2") AM_RANGE(0x60, 0x60) AM_READ_PORT("SYSTEM") - AM_RANGE(0x70, 0x71) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) + AM_RANGE(0x70, 0x71) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w) ADDRESS_MAP_END static ADDRESS_MAP_START( zerowing_sound_io_map, ADDRESS_SPACE_IO, 8 ) @@ -319,12 +319,12 @@ static ADDRESS_MAP_START( zerowing_sound_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x80, 0x80) AM_READ_PORT("SYSTEM") AM_RANGE(0x88, 0x88) AM_READ_PORT("TJUMP") AM_RANGE(0xa0, 0xa0) AM_WRITE(toaplan1_coin_w) /* Coin counter/lockout */ - AM_RANGE(0xa8, 0xa9) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) + AM_RANGE(0xa8, 0xa9) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w) ADDRESS_MAP_END static ADDRESS_MAP_START( demonwld_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w) AM_RANGE(0x20, 0x20) AM_READ_PORT("TJUMP") AM_RANGE(0x40, 0x40) AM_WRITE(toaplan1_coin_w) /* Coin counter/lockout */ AM_RANGE(0x60, 0x60) AM_READ_PORT("SYSTEM") @@ -336,7 +336,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( outzone_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w) AM_RANGE(0x04, 0x04) AM_WRITE(toaplan1_coin_w) /* Coin counter/lockout */ AM_RANGE(0x08, 0x08) AM_READ_PORT("DSWA") AM_RANGE(0x0c, 0x0c) AM_READ_PORT("DSWB") @@ -1268,7 +1268,7 @@ static MACHINE_DRIVER_START( rallybik ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 28000000/8) + MDRV_SOUND_ADD("ymsnd", YM3812, 28000000/8) MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END @@ -1308,7 +1308,7 @@ static MACHINE_DRIVER_START( truxton ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 28000000/8) + MDRV_SOUND_ADD("ymsnd", YM3812, 28000000/8) MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END @@ -1348,7 +1348,7 @@ static MACHINE_DRIVER_START( hellfire ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 28000000/8) + MDRV_SOUND_ADD("ymsnd", YM3812, 28000000/8) MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END @@ -1388,7 +1388,7 @@ static MACHINE_DRIVER_START( zerowing ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 28000000/8) + MDRV_SOUND_ADD("ymsnd", YM3812, 28000000/8) MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END @@ -1432,7 +1432,7 @@ static MACHINE_DRIVER_START( demonwld ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 28000000/8) + MDRV_SOUND_ADD("ymsnd", YM3812, 28000000/8) MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END @@ -1466,7 +1466,7 @@ static MACHINE_DRIVER_START( samesame ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 28000000/8) + MDRV_SOUND_ADD("ymsnd", YM3812, 28000000/8) MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END @@ -1506,7 +1506,7 @@ static MACHINE_DRIVER_START( outzone ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 28000000/8) + MDRV_SOUND_ADD("ymsnd", YM3812, 28000000/8) MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END @@ -1540,7 +1540,7 @@ static MACHINE_DRIVER_START( vimana ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, XTAL_28MHz/8) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8) /* verified on pcb */ MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c index 34adfc1840f..4aa3352705f 100644 --- a/src/mame/drivers/toaplan2.c +++ b/src/mame/drivers/toaplan2.c @@ -1481,7 +1481,7 @@ static ADDRESS_MAP_START( truxton2_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x700008, 0x700009) AM_READ_PORT("IN2") AM_RANGE(0x70000a, 0x70000b) AM_READ_PORT("SYS") AM_RANGE(0x700010, 0x700011) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) - AM_RANGE(0x700014, 0x700017) AM_DEVREADWRITE8("ym", ym2151_r, ym2151_w, 0x00ff) + AM_RANGE(0x700014, 0x700017) AM_DEVREADWRITE8("ymsnd", ym2151_r, ym2151_w, 0x00ff) AM_RANGE(0x70001e, 0x70001f) AM_WRITE(toaplan2_coin_word_w) /* Coin count/lock */ ADDRESS_MAP_END @@ -1717,7 +1717,7 @@ static ADDRESS_MAP_START( snowbro2_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300008, 0x300009) AM_WRITE(toaplan2_0_scroll_reg_select_w) AM_RANGE(0x30000c, 0x30000d) AM_READWRITE(toaplan2_inputport_0_word_r, toaplan2_0_scroll_reg_data_w) /* VBlank */ AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x500000, 0x500003) AM_DEVREADWRITE8("ym", ym2151_r, ym2151_w, 0x00ff) + AM_RANGE(0x500000, 0x500003) AM_DEVREADWRITE8("ymsnd", ym2151_r, ym2151_w, 0x00ff) AM_RANGE(0x600000, 0x600001) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x700000, 0x700001) AM_READ_PORT("JMPR") AM_RANGE(0x700004, 0x700005) AM_READ_PORT("DSWA") @@ -1877,14 +1877,14 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_z80_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE(&toaplan2_shared_ram) - AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) + AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w) ADDRESS_MAP_END static ADDRESS_MAP_START( raizing_sound_z80_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xdfff) AM_RAM AM_BASE(&raizing_shared_ram) - AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xe004, 0xe004) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xe00e, 0xe00e) AM_WRITE(toaplan2_coin_w) ADDRESS_MAP_END @@ -1894,7 +1894,7 @@ static ADDRESS_MAP_START( bgaregga_sound_z80_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) AM_RANGE(0xc000, 0xdfff) AM_RAM AM_BASE(&raizing_shared_ram) - AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xe004, 0xe004) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xe006, 0xe006) AM_WRITE(raizing_okim6295_bankselect_0) AM_RANGE(0xe008, 0xe008) AM_WRITE(raizing_okim6295_bankselect_1) @@ -1920,7 +1920,7 @@ static ADDRESS_MAP_START( batrider_sound_z80_port, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x46, 0x46) AM_WRITE(raizing_clear_nmi_w) AM_RANGE(0x48, 0x48) AM_READ(soundlatch_r) AM_RANGE(0x4a, 0x4a) AM_READ(soundlatch2_r) - AM_RANGE(0x80, 0x81) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x80, 0x81) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x82, 0x82) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) AM_RANGE(0x84, 0x84) AM_DEVREADWRITE("oki2", okim6295_r, okim6295_w) AM_RANGE(0x88, 0x88) AM_WRITE(batrider_bankswitch_w) @@ -1964,7 +1964,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( V25_kbash_mem, ADDRESS_SPACE_PROGRAM, 8 ) // AM_RANGE(0x00000, 0x03fff) AM_ROM // AM_RANGE(0x00000, 0x007ff) AM_RAM /* External shared RAM (Banked) */ - AM_RANGE(0x04000, 0x04001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x04000, 0x04001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x04002, 0x04002) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) // AM_RANGE(0x04004, 0x04004) AM_DEVWRITE("oki", oki_bankswitch_w) AM_RANGE(0x04008, 0x04008) AM_READ_PORT("IN1") @@ -2028,7 +2028,7 @@ static READ8_HANDLER( kludge_r ) #endif static ADDRESS_MAP_START( V25_rambased_mem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x00000, 0x00001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x00000, 0x00001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x00000, 0x07fff) AM_RAM AM_SHARE(6) AM_BASE(&batsugun_share) // AM_RANGE(0x40000, 0x477ff) AM_RAM AM_SHARE(7) @@ -3463,7 +3463,7 @@ static MACHINE_DRIVER_START( tekipaki ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, XTAL_27MHz/8) + MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_27MHz/8) MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END @@ -3502,7 +3502,7 @@ static MACHINE_DRIVER_START( ghox ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, XTAL_27MHz/8) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_27MHz/8) /* verified on pcb */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END @@ -3564,7 +3564,7 @@ static MACHINE_DRIVER_START( dogyuun ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, XTAL_27MHz/8) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_27MHz/8) /* verified on pcb */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_SOUND_ADD("oki", OKIM6295, XTAL_25MHz/24) /* verified on pcb */ @@ -3654,7 +3654,7 @@ static MACHINE_DRIVER_START( kbash ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, XTAL_27MHz/8) + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_27MHz/8) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_SOUND_ADD("oki", OKIM6295, XTAL_32MHz/32) @@ -3728,7 +3728,7 @@ static MACHINE_DRIVER_START( truxton2 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, XTAL_27MHz/8) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_27MHz/8) /* verified on pcb */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_SOUND_ADD("oki", OKIM6295, XTAL_16MHz/4) /* verified on pcb */ @@ -3770,7 +3770,7 @@ static MACHINE_DRIVER_START( pipibibs ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, XTAL_27MHz/8) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_27MHz/8) /* verified on pcb */ MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END @@ -3810,7 +3810,7 @@ static MACHINE_DRIVER_START( whoopee ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, XTAL_27MHz/8) + MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_27MHz/8) MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END @@ -3849,7 +3849,7 @@ static MACHINE_DRIVER_START( pipibibi ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, XTAL_27MHz/8) + MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_27MHz/8) MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END @@ -3917,7 +3917,7 @@ static MACHINE_DRIVER_START( fixeight ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, XTAL_27MHz/8) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_27MHz/8) /* verified on pcb */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_SOUND_ADD("oki", OKIM6295, XTAL_16MHz/16) /* verified on pcb */ @@ -4022,7 +4022,7 @@ static MACHINE_DRIVER_START( vfive ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, XTAL_27MHz/8) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_27MHz/8) /* verified on pcb */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END @@ -4101,7 +4101,7 @@ static MACHINE_DRIVER_START( batsugun ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, XTAL_27MHz/8) + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_27MHz/8) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_SOUND_CONFIG(batsugun_ym2151_interface) @@ -4139,7 +4139,7 @@ static MACHINE_DRIVER_START( snowbro2 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, XTAL_27MHz/8) + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_27MHz/8) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_SOUND_ADD("oki", OKIM6295, XTAL_27MHz/10) @@ -4181,7 +4181,7 @@ static MACHINE_DRIVER_START( mahoudai ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, XTAL_27MHz/8) + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_27MHz/8) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_SOUND_ADD("oki", OKIM6295, XTAL_32MHz/32) @@ -4223,7 +4223,7 @@ static MACHINE_DRIVER_START( shippumd ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, XTAL_27MHz/8) + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_27MHz/8) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono",1.0) MDRV_SOUND_ADD("oki", OKIM6295, XTAL_32MHz/32) @@ -4265,7 +4265,7 @@ static MACHINE_DRIVER_START( bgaregga ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, XTAL_32MHz/8) + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_32MHz/8) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_SOUND_ADD("oki", OKIM6295, XTAL_32MHz/16) @@ -4307,7 +4307,7 @@ static MACHINE_DRIVER_START( batrider ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, XTAL_32MHz/8) + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_32MHz/8) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_SOUND_ADD("oki1", OKIM6295, XTAL_32MHz/10) diff --git a/src/mame/drivers/toki.c b/src/mame/drivers/toki.c index 1a4e3361fbb..7f8446bc7db 100644 --- a/src/mame/drivers/toki.c +++ b/src/mame/drivers/toki.c @@ -150,7 +150,7 @@ static ADDRESS_MAP_START( tokib_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("msm", toki_adpcm_control_w) /* MSM5205 + ROM bank */ AM_RANGE(0xe400, 0xe400) AM_WRITE(toki_adpcm_data_w) - AM_RANGE(0xec00, 0xec01) AM_MIRROR(0x0008) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) + AM_RANGE(0xec00, 0xec01) AM_MIRROR(0x0008) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w) AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -489,7 +489,7 @@ static MACHINE_DRIVER_START( tokib ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 3579545) + MDRV_SOUND_ADD("ymsnd", YM3812, 3579545) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_SOUND_ADD("msm", MSM5205, 384000) diff --git a/src/mame/drivers/tomcat.c b/src/mame/drivers/tomcat.c index 5f02c0be4d8..a75906e6e7f 100644 --- a/src/mame/drivers/tomcat.c +++ b/src/mame/drivers/tomcat.c @@ -288,7 +288,7 @@ static WRITE8_HANDLER(soundlatches_w) static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_RAM - AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x3000, 0x30df) AM_WRITE(soundlatches_w) AM_RANGE(0x30e0, 0x30e0) AM_NOP // COINRD Inputs: D7 = Coin L, D6 = Coin R, D5 = SOUNDFLAG AM_RANGE(0x5000, 0x507f) AM_RAM // 6532 ram @@ -418,7 +418,7 @@ static MACHINE_DRIVER_START(tomcat) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) - MDRV_SOUND_ADD("ym", YM2151, XTAL_14_31818MHz / 4) + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_14_31818MHz / 4) MDRV_SOUND_ROUTE(0, "lspeaker", 0.60) MDRV_SOUND_ROUTE(1, "rspeaker", 0.60) MACHINE_DRIVER_END diff --git a/src/mame/drivers/topspeed.c b/src/mame/drivers/topspeed.c index 082f4bfa611..c404f226435 100644 --- a/src/mame/drivers/topspeed.c +++ b/src/mame/drivers/topspeed.c @@ -486,7 +486,7 @@ static ADDRESS_MAP_START( z80_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(10) AM_RANGE(0x8000, 0x8fff) AM_RAM - AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xa001, 0xa001) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w) AM_RANGE(0xb000, 0xb000) AM_DEVWRITE("msm", topspeed_msm5205_address_w) @@ -704,7 +704,7 @@ static MACHINE_DRIVER_START( topspeed ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 4000000) + MDRV_SOUND_ADD("ymsnd", YM2151, 4000000) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "mono", 0.30) MDRV_SOUND_ROUTE(1, "mono", 0.30) diff --git a/src/mame/drivers/trackfld.c b/src/mame/drivers/trackfld.c index 78f63488003..1d9a337dc44 100644 --- a/src/mame/drivers/trackfld.c +++ b/src/mame/drivers/trackfld.c @@ -222,7 +222,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x1fff) AM_READ(soundlatch_r) AM_RANGE(0x8000, 0x8000) AM_MIRROR(0x1fff) AM_READ(trackfld_sh_timer_r) AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x1fff) AM_WRITE(konami_SN76496_latch_w) - AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x1fff) AM_DEVWRITE("sn", konami_SN76496_w) + AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x1fff) AM_DEVWRITE("snsnd", konami_SN76496_w) AM_RANGE(0xe000, 0xe000) AM_MIRROR(0x1ff8) AM_DEVWRITE("dac", dac_w) AM_RANGE(0xe001, 0xe001) AM_MIRROR(0x1ff8) AM_NOP /* watch dog ?; reaktor reads here */ AM_RANGE(0xe002, 0xe002) AM_MIRROR(0x1ff8) AM_DEVREAD("vlm", trackfld_speech_r) @@ -236,7 +236,7 @@ static ADDRESS_MAP_START( hyprolyb_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x1fff) AM_READ(soundlatch_r) AM_RANGE(0x8000, 0x8000) AM_MIRROR(0x1fff) AM_READ(trackfld_sh_timer_r) AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x1fff) AM_WRITE(konami_SN76496_latch_w) - AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x1fff) AM_DEVWRITE("sn", konami_SN76496_w) + AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x1fff) AM_DEVWRITE("snsnd", konami_SN76496_w) AM_RANGE(0xe000, 0xe000) AM_MIRROR(0x1ff8) AM_DEVWRITE("dac", dac_w) AM_RANGE(0xe001, 0xe001) AM_MIRROR(0x1ff8) AM_NOP /* watch dog ?; reaktor reads here */ AM_RANGE(0xe002, 0xe002) AM_MIRROR(0x1ff8) AM_READ(hyprolyb_adpcm_busy_r) @@ -723,7 +723,7 @@ static MACHINE_DRIVER_START( trackfld ) MDRV_SOUND_ADD("dac", DAC, 0) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - MDRV_SOUND_ADD("sn", SN76496, SOUND_CLOCK/8) + MDRV_SOUND_ADD("snsnd", SN76496, SOUND_CLOCK/8) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_SOUND_ADD("vlm", VLM5030, VLM_CLOCK) diff --git a/src/mame/drivers/trvmadns.c b/src/mame/drivers/trvmadns.c index 3b32c0dc0cb..a14dec3e538 100644 --- a/src/mame/drivers/trvmadns.c +++ b/src/mame/drivers/trvmadns.c @@ -210,7 +210,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_address_data_w) AM_RANGE(0x02, 0x02) AM_READ_PORT("IN0") AM_RANGE(0x80, 0x80) AM_WRITE(trvmadns_banking_w) ADDRESS_MAP_END @@ -308,7 +308,7 @@ static MACHINE_DRIVER_START( trvmadns ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 10000000/2/4) //? + MDRV_SOUND_ADD("aysnd", AY8910, 10000000/2/4) //? MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/tryout.c b/src/mame/drivers/tryout.c index 7c73299e16d..37a822bc0f2 100644 --- a/src/mame/drivers/tryout.c +++ b/src/mame/drivers/tryout.c @@ -86,7 +86,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_cpu, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM - AM_RANGE(0x4000, 0x4001) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x4000, 0x4001) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) AM_RANGE(0xd000, 0xd000) AM_WRITE(tryout_sound_irq_ack_w) AM_RANGE(0xc000, 0xffff) AM_ROM @@ -223,7 +223,7 @@ static MACHINE_DRIVER_START( tryout ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 1500000) + MDRV_SOUND_ADD("ymsnd", YM2203, 1500000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/tsamurai.c b/src/mame/drivers/tsamurai.c index a039d4fe42c..3b7e49378ec 100644 --- a/src/mame/drivers/tsamurai.c +++ b/src/mame/drivers/tsamurai.c @@ -202,7 +202,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( z80_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_address_data_w) ADDRESS_MAP_END static ADDRESS_MAP_START( z80_m660_io_map, ADDRESS_SPACE_IO, 8 ) @@ -214,7 +214,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( vsgongf_audio_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_address_data_w) ADDRESS_MAP_END static READ8_HANDLER( sound_command1_r ) @@ -283,7 +283,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound3_m660_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_address_data_w) ADDRESS_MAP_END /*******************************************************************************/ @@ -690,7 +690,7 @@ static MACHINE_DRIVER_START( tsamurai ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 2000000) + MDRV_SOUND_ADD("aysnd", AY8910, 2000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) MDRV_SOUND_ADD("dac1", DAC, 0) @@ -738,7 +738,7 @@ static MACHINE_DRIVER_START( m660 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 2000000) + MDRV_SOUND_ADD("aysnd", AY8910, 2000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) MDRV_SOUND_ADD("dac1", DAC, 0) @@ -779,7 +779,7 @@ static MACHINE_DRIVER_START( vsgongf ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 2000000) + MDRV_SOUND_ADD("aysnd", AY8910, 2000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) MDRV_SOUND_ADD("dac", DAC, 0) diff --git a/src/mame/drivers/tugboat.c b/src/mame/drivers/tugboat.c index 6b64c21e5fa..6735df16493 100644 --- a/src/mame/drivers/tugboat.c +++ b/src/mame/drivers/tugboat.c @@ -198,7 +198,7 @@ static MACHINE_RESET( tugboat ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x01ff) AM_RAM AM_BASE(&tugboat_ram) - AM_RANGE(0x1060, 0x1061) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x1060, 0x1061) AM_DEVWRITE("aysnd", ay8910_address_data_w) AM_RANGE(0x10a0, 0x10a1) AM_WRITE(tugboat_hd46505_0_w) /* scrolling is performed changing the start_addr register (0C/0D) */ AM_RANGE(0x10c0, 0x10c1) AM_WRITE(tugboat_hd46505_1_w) AM_RANGE(0x11e4, 0x11e7) AM_DEVREADWRITE("pia0", pia6821_r, pia6821_w) @@ -338,7 +338,7 @@ static MACHINE_DRIVER_START( tugboat ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 2000000) + MDRV_SOUND_ADD("aysnd", AY8910, 2000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35) MACHINE_DRIVER_END diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c index bb5df3e7b5e..3034f6dbff1 100644 --- a/src/mame/drivers/tumbleb.c +++ b/src/mame/drivers/tumbleb.c @@ -691,7 +691,7 @@ static ADDRESS_MAP_START( fncywld_main_map, ADDRESS_SPACE_PROGRAM, 16 ) #else AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) #endif - AM_RANGE(0x100000, 0x100003) AM_DEVREADWRITE8("ym", ym2151_r, ym2151_w, 0x00ff) + AM_RANGE(0x100000, 0x100003) AM_DEVREADWRITE8("ymsnd", ym2151_r, ym2151_w, 0x00ff) AM_RANGE(0x100004, 0x100005) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x140000, 0x140fff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x160000, 0x1607ff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* sprites */ @@ -806,7 +806,7 @@ static WRITE8_HANDLER( oki_sound_bank_w ) static ADDRESS_MAP_START( semicom_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xcfff) AM_ROM AM_RANGE(0xd000, 0xd7ff) AM_RAM - AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xf002, 0xf002) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) // AM_RANGE(0xf006, 0xf006) ?? AM_RANGE(0xf008, 0xf008) AM_READ(soundlatch_r) @@ -841,7 +841,7 @@ static READ8_HANDLER(jumppop_z80latch_r) static ADDRESS_MAP_START( jumppop_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE("ym", ym3812_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ymsnd", ym3812_w) AM_RANGE(0x02, 0x02) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0x03, 0x03) AM_READ(jumppop_z80latch_r) AM_RANGE(0x04, 0x04) AM_NOP @@ -2107,7 +2107,7 @@ static MACHINE_DRIVER_START( fncywld ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 32220000/9) + MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9) MDRV_SOUND_ROUTE(0, "lspeaker", 0.20) MDRV_SOUND_ROUTE(1, "rspeaker", 0.20) @@ -2170,7 +2170,7 @@ static MACHINE_DRIVER_START( htchctch ) /* sound hardware - same as hyperpac */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 3427190) + MDRV_SOUND_ADD("ymsnd", YM2151, 3427190) MDRV_SOUND_CONFIG(semicom_ym2151_interface) MDRV_SOUND_ROUTE(0, "lspeaker", 0.10) MDRV_SOUND_ROUTE(1, "rspeaker", 0.10) @@ -2190,7 +2190,7 @@ static MACHINE_DRIVER_START( bcstory ) MDRV_IMPORT_FROM(htchctch) MDRV_VIDEO_UPDATE( bcstory ) - MDRV_SOUND_REPLACE("ym", YM2151, 3427190) + MDRV_SOUND_REPLACE("ymsnd", YM2151, 3427190) MDRV_SOUND_CONFIG(semicom_ym2151_interface) MDRV_SOUND_ROUTE(0, "lspeaker", 0.10) MDRV_SOUND_ROUTE(1, "rspeaker", 0.10) @@ -2211,7 +2211,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( metlsavr ) MDRV_IMPORT_FROM(cookbib) - MDRV_SOUND_REPLACE("ym", YM2151, 3427190) + MDRV_SOUND_REPLACE("ymsnd", YM2151, 3427190) MDRV_SOUND_CONFIG(semicom_ym2151_interface) MDRV_SOUND_ROUTE(0, "lspeaker", 0.10) MDRV_SOUND_ROUTE(1, "rspeaker", 0.10) @@ -2244,7 +2244,7 @@ static MACHINE_DRIVER_START( jumppop ) MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM3812, 3500000) + MDRV_SOUND_ADD("ymsnd", YM3812, 3500000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.70) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.70) diff --git a/src/mame/drivers/tumblep.c b/src/mame/drivers/tumblep.c index 62c0a8ff2c5..b13d0f8dbee 100644 --- a/src/mame/drivers/tumblep.c +++ b/src/mame/drivers/tumblep.c @@ -130,7 +130,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x000000, 0x00ffff) AM_ROM AM_RANGE(0x100000, 0x100001) AM_NOP /* YM2203 - this board doesn't have one */ - AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0x130000, 0x130001) AM_NOP /* This board only has 1 oki chip */ AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) @@ -309,7 +309,7 @@ static MACHINE_DRIVER_START( tumblep ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 32220000/9) + MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.45) MDRV_SOUND_ROUTE(1, "rspeaker", 0.45) diff --git a/src/mame/drivers/twin16.c b/src/mame/drivers/twin16.c index 9f52cc3e5f2..ca51f5f7fe6 100644 --- a/src/mame/drivers/twin16.c +++ b/src/mame/drivers/twin16.c @@ -231,7 +231,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9000, 0x9000) AM_DEVWRITE("upd", twin16_upd_reset_w) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE("konami", k007232_r, k007232_w) - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xd000, 0xd000) AM_DEVWRITE("upd", upd7759_port_w) AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("upd", twin16_upd_start_w) AM_RANGE(0xf000, 0xf000) AM_DEVREAD("upd", twin16_upd_busy_r) // miaj writes 0 to it @@ -752,7 +752,7 @@ static MACHINE_DRIVER_START( twin16 ) // sound hardware MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 7159160/2) + MDRV_SOUND_ADD("ymsnd", YM2151, 7159160/2) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -807,7 +807,7 @@ static MACHINE_DRIVER_START( fround ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 7159160/2) + MDRV_SOUND_ADD("ymsnd", YM2151, 7159160/2) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/twincobr.c b/src/mame/drivers/twincobr.c index 67eb7b9efb8..59c9defa4c9 100644 --- a/src/mame/drivers/twincobr.c +++ b/src/mame/drivers/twincobr.c @@ -237,7 +237,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w) AM_RANGE(0x10, 0x10) AM_READ_PORT("SYSTEM") /* Twin Cobra - Coin/Start */ AM_RANGE(0x20, 0x20) AM_WRITE(twincobr_coin_w) /* Twin Cobra coin count-lockout */ AM_RANGE(0x40, 0x40) AM_READ_PORT("DSWA") @@ -740,7 +740,7 @@ static MACHINE_DRIVER_START( twincobr ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 28000000/8) + MDRV_SOUND_ADD("ymsnd", YM3812, 28000000/8) MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/twinkle.c b/src/mame/drivers/twinkle.c index 195243bbcd7..450ce3a5a01 100644 --- a/src/mame/drivers/twinkle.c +++ b/src/mame/drivers/twinkle.c @@ -747,14 +747,14 @@ static WRITE16_HANDLER( twinkle_spu_ctrl_w ) static READ16_HANDLER( twinkle_waveram_r ) { - UINT16 *waveram = (UINT16 *)memory_region(space->machine, "rf"); + UINT16 *waveram = (UINT16 *)memory_region(space->machine, "rfsnd"); return waveram[offset]; } static WRITE16_HANDLER( twinkle_waveram_w ) { - UINT16 *waveram = (UINT16 *)memory_region(space->machine, "rf"); + UINT16 *waveram = (UINT16 *)memory_region(space->machine, "rfsnd"); COMBINE_DATA(&waveram[offset]); } @@ -784,7 +784,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x280000, 0x280fff) AM_READWRITE( shared_68k_r, shared_68k_w ) AM_RANGE(0x300000, 0x30000f) AM_DEVREADWRITE("ide", twinkle_ide_r, twinkle_ide_w) // 34000E = ??? - AM_RANGE(0x400000, 0x400fff) AM_DEVREADWRITE("rf", rf5c400_r, rf5c400_w) + AM_RANGE(0x400000, 0x400fff) AM_DEVREADWRITE("rfsnd", rf5c400_r, rf5c400_w) AM_RANGE(0x800000, 0xffffff) AM_READWRITE( twinkle_waveram_r, twinkle_waveram_w ) // 8 MB window wave RAM ADDRESS_MAP_END @@ -962,7 +962,7 @@ static MACHINE_DRIVER_START( twinkle ) MDRV_SOUND_ROUTE( 0, "speakerleft", 0.75 ) MDRV_SOUND_ROUTE( 1, "speakerright", 0.75 ) - MDRV_SOUND_ADD("rf", RF5C400, 32000000/2) + MDRV_SOUND_ADD("rfsnd", RF5C400, 32000000/2) MDRV_SOUND_ROUTE(0, "speakerleft", 1.0) MDRV_SOUND_ROUTE(1, "speakerright", 1.0) @@ -1026,7 +1026,7 @@ INPUT_PORTS_END ROM_REGION32_LE( 0x080000, "audiocpu", 0 )\ ROM_LOAD16_WORD_SWAP( "863a05.2x", 0x000000, 0x080000, CRC(6f42a09e) SHA1(cab5209f90f47b9ee6e721479913ad74e3ba84b1) )\ \ - ROM_REGION(0x1800000, "rf", ROMREGION_ERASE00) + ROM_REGION(0x1800000, "rfsnd", ROMREGION_ERASE00) ROM_START( gq863 ) TWINKLE_BIOS diff --git a/src/mame/drivers/twins.c b/src/mame/drivers/twins.c index 73a00da2105..4ee6796d752 100644 --- a/src/mame/drivers/twins.c +++ b/src/mame/drivers/twins.c @@ -85,8 +85,8 @@ static ADDRESS_MAP_START( twins_map, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( twins_io, ADDRESS_SPACE_IO, 16 ) - AM_RANGE(0x0000, 0x0003) AM_DEVWRITE8("ay", ay8910_address_data_w, 0x00ff) - AM_RANGE(0x0002, 0x0003) AM_DEVREAD8("ay", ay8910_r, 0x00ff) + AM_RANGE(0x0000, 0x0003) AM_DEVWRITE8("aysnd", ay8910_address_data_w, 0x00ff) + AM_RANGE(0x0002, 0x0003) AM_DEVREAD8("aysnd", ay8910_r, 0x00ff) AM_RANGE(0x0004, 0x0005) AM_READWRITE(twins_port4_r, twins_port4_w) AM_RANGE(0x0006, 0x0007) AM_WRITE(port6_pal0_w) AM_RANGE(0x000e, 0x000f) AM_WRITE(porte_paloff0_w) @@ -189,7 +189,7 @@ static MACHINE_DRIVER_START( twins ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 2000000) + MDRV_SOUND_ADD("aysnd", AY8910, 2000000) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END @@ -248,8 +248,8 @@ static ADDRESS_MAP_START( twinsa_io, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x0000, 0x0001) AM_READWRITE(twinsa_unk_r, porte_paloff0_w) AM_RANGE(0x0002, 0x0003) AM_WRITE(porte_paloff0_w) AM_RANGE(0x0004, 0x0005) AM_WRITE(twinsa_port4_w) // palette on this set - AM_RANGE(0x0008, 0x0009) AM_DEVWRITE8("ay", ay8910_address_w, 0x00ff) - AM_RANGE(0x0010, 0x0011) AM_DEVREADWRITE8("ay", ay8910_r, ay8910_data_w, 0x00ff) + AM_RANGE(0x0008, 0x0009) AM_DEVWRITE8("aysnd", ay8910_address_w, 0x00ff) + AM_RANGE(0x0010, 0x0011) AM_DEVREADWRITE8("aysnd", ay8910_r, ay8910_data_w, 0x00ff) AM_RANGE(0x0018, 0x0019) AM_READ(twins_port4_r) AM_WRITE(twins_port4_w) ADDRESS_MAP_END @@ -277,7 +277,7 @@ static MACHINE_DRIVER_START( twinsa ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, XTAL_16MHz/8) /* verified on pcb */ + MDRV_SOUND_ADD("aysnd", AY8910, XTAL_16MHz/8) /* verified on pcb */ MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/tx1.c b/src/mame/drivers/tx1.c index 29b0cb838c6..06e0b4a6b42 100644 --- a/src/mame/drivers/tx1.c +++ b/src/mame/drivers/tx1.c @@ -548,7 +548,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( tx1_sound_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x40, 0x41) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x40, 0x41) AM_DEVWRITE("aysnd", ay8910_data_address_w) ADDRESS_MAP_END @@ -742,7 +742,7 @@ static MACHINE_DRIVER_START( tx1 ) MDRV_SPEAKER_STANDARD_STEREO("frontleft", "frontright") // MDRV_SPEAKER_STANDARD_STEREO("rearleft", "rearright") - MDRV_SOUND_ADD("ay", AY8910, TX1_PIXEL_CLOCK / 8) + MDRV_SOUND_ADD("aysnd", AY8910, TX1_PIXEL_CLOCK / 8) MDRV_SOUND_CONFIG(tx1_ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "frontleft", 0.1) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "frontright", 0.1) diff --git a/src/mame/drivers/ultraman.c b/src/mame/drivers/ultraman.c index f87249a6dc6..3e91b912d65 100644 --- a/src/mame/drivers/ultraman.c +++ b/src/mame/drivers/ultraman.c @@ -141,7 +141,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc000, 0xc000) AM_READ(soundlatch_r) /* Sound latch read */ // AM_RANGE(0xd000, 0xd000) AM_WRITENOP /* ??? */ AM_RANGE(0xe000, 0xe000) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) /* M6295 */ - AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) /* YM2151 */ + AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) /* YM2151 */ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) @@ -272,7 +272,7 @@ static MACHINE_DRIVER_START( ultraman ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 24000000/6) + MDRV_SOUND_ADD("ymsnd", YM2151, 24000000/6) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/unico.c b/src/mame/drivers/unico.c index e8b7339268c..d57563a244b 100644 --- a/src/mame/drivers/unico.c +++ b/src/mame/drivers/unico.c @@ -72,8 +72,8 @@ static ADDRESS_MAP_START( burglarx_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800116, 0x800117) AM_WRITE(SMH_RAM) AM_BASE(&unico_scrollx_1) // AM_RANGE(0x800120, 0x800121) AM_WRITE(SMH_RAM) AM_BASE(&unico_scrolly_1) // AM_RANGE(0x800188, 0x800189) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) // Sound - AM_RANGE(0x80018a, 0x80018b) AM_DEVWRITE8("ym", ym3812_write_port_w, 0xff00 ) // - AM_RANGE(0x80018c, 0x80018d) AM_DEVREADWRITE8("ym", ym3812_status_port_r, ym3812_control_port_w, 0xff00 ) // + AM_RANGE(0x80018a, 0x80018b) AM_DEVWRITE8("ymsnd", ym3812_write_port_w, 0xff00 ) // + AM_RANGE(0x80018c, 0x80018d) AM_DEVREADWRITE8("ymsnd", ym3812_status_port_r, ym3812_control_port_w, 0xff00 ) // AM_RANGE(0x80018e, 0x80018f) AM_DEVWRITE("oki", burglarx_sound_bank_w) // AM_RANGE(0x8001e0, 0x8001e1) AM_WRITENOP // IRQ Ack AM_RANGE(0x904000, 0x907fff) AM_RAM_WRITE(unico_vram_1_w) AM_BASE(&unico_vram_1 ) // Layers @@ -167,8 +167,8 @@ static ADDRESS_MAP_START( zeropnt_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800178, 0x800179) AM_READ(unico_guny_1_msb_r ) // AM_RANGE(0x80017c, 0x80017d) AM_READ(unico_gunx_1_msb_r ) // AM_RANGE(0x800188, 0x800189) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff ) // Sound - AM_RANGE(0x80018a, 0x80018b) AM_DEVWRITE8("ym", ym3812_write_port_w, 0xff00 ) // - AM_RANGE(0x80018c, 0x80018d) AM_DEVREADWRITE8("ym", ym3812_status_port_r, ym3812_control_port_w, 0xff00 ) // + AM_RANGE(0x80018a, 0x80018b) AM_DEVWRITE8("ymsnd", ym3812_write_port_w, 0xff00 ) // + AM_RANGE(0x80018c, 0x80018d) AM_DEVREADWRITE8("ymsnd", ym3812_status_port_r, ym3812_control_port_w, 0xff00 ) // AM_RANGE(0x80018e, 0x80018f) AM_WRITE(zeropnt_sound_bank_w ) // AM_RANGE(0x8001e0, 0x8001e1) AM_WRITE(SMH_RAM ) // ? IRQ Ack AM_RANGE(0x904000, 0x907fff) AM_RAM_WRITE(unico_vram_1_w) AM_BASE(&unico_vram_1 ) // Layers @@ -232,7 +232,7 @@ static ADDRESS_MAP_START( zeropnt2_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x000000, 0x1fffff) AM_ROM // ROM AM_RANGE(0x800018, 0x80001b) AM_READ_PORT("SYSTEM") AM_RANGE(0x800024, 0x800027) AM_DEVREADWRITE8("oki1", okim6295_r, okim6295_w, 0x00ff0000 ) // Sound - AM_RANGE(0x800028, 0x80002f) AM_DEVREADWRITE8("ym", ym2151_r, ym2151_w, 0x00ff0000) // + AM_RANGE(0x800028, 0x80002f) AM_DEVREADWRITE8("ymsnd", ym2151_r, ym2151_w, 0x00ff0000) // AM_RANGE(0x800030, 0x800033) AM_DEVREADWRITE8("oki2", okim6295_r, okim6295_w, 0x00ff0000 ) // AM_RANGE(0x800034, 0x800037) AM_WRITE(zeropnt2_sound_bank_w ) // AM_RANGE(0x800038, 0x80003b) AM_WRITE(zeropnt2_leds_w ) // ? @@ -638,7 +638,7 @@ static MACHINE_DRIVER_START( burglarx ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM3812, 3579545) /* 14.31818MHz OSC divided by 4 */ + MDRV_SOUND_ADD("ymsnd", YM3812, 3579545) /* 14.31818MHz OSC divided by 4 */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) @@ -685,7 +685,7 @@ static MACHINE_DRIVER_START( zeropnt ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM3812, 3579545) /* 14.31818MHz OSC divided by 4 */ + MDRV_SOUND_ADD("ymsnd", YM3812, 3579545) /* 14.31818MHz OSC divided by 4 */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) @@ -729,7 +729,7 @@ static MACHINE_DRIVER_START( zeropnt2 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) MDRV_SOUND_ROUTE(0, "lspeaker", 0.70) MDRV_SOUND_ROUTE(1, "rspeaker", 0.70) diff --git a/src/mame/drivers/usgames.c b/src/mame/drivers/usgames.c index a2f416c60d5..686b116fb7b 100644 --- a/src/mame/drivers/usgames.c +++ b/src/mame/drivers/usgames.c @@ -79,7 +79,7 @@ static ADDRESS_MAP_START( usgames_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2041, 0x2041) AM_DEVWRITE("crtc", mc6845_register_w) AM_RANGE(0x2060, 0x2060) AM_WRITE(usgames_rombank_w) AM_RANGE(0x2070, 0x2070) AM_READ_PORT("UNK2") - AM_RANGE(0x2400, 0x2401) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x2400, 0x2401) AM_DEVWRITE("aysnd", ay8910_address_data_w) AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(usgames_charram_w) AM_BASE(&usgames_charram) AM_RANGE(0x3000, 0x3fff) AM_RAM_WRITE(usgames_videoram_w) AM_BASE(&usgames_videoram) AM_RANGE(0x4000, 0x7fff) AM_READWRITE(SMH_BANK(1), SMH_ROM) @@ -89,7 +89,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( usg185_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE(0x2000, 0x2001) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x2000, 0x2001) AM_DEVWRITE("aysnd", ay8910_address_data_w) AM_RANGE(0x2400, 0x2400) AM_READ_PORT("DSW") AM_RANGE(0x2410, 0x2410) AM_READ_PORT("INPUTS") AM_RANGE(0x2420, 0x2420) AM_WRITE(lamps1_w) @@ -266,7 +266,7 @@ static MACHINE_DRIVER_START( usg32 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 2000000) + MDRV_SOUND_ADD("aysnd", AY8910, 2000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_DRIVER_END diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c index cb07ea88821..56c6c3c80d7 100644 --- a/src/mame/drivers/vamphalf.c +++ b/src/mame/drivers/vamphalf.c @@ -224,8 +224,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( vamphalf_io, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x0c0, 0x0c3) AM_DEVREADWRITE("oki", oki_r, oki_w) - AM_RANGE(0x140, 0x143) AM_DEVWRITE8("ym", ym2151_register_port_w, 0x00ff) - AM_RANGE(0x146, 0x147) AM_DEVREADWRITE8("ym", ym2151_status_port_r, ym2151_data_port_w, 0x00ff) + AM_RANGE(0x140, 0x143) AM_DEVWRITE8("ymsnd", ym2151_register_port_w, 0x00ff) + AM_RANGE(0x146, 0x147) AM_DEVREADWRITE8("ymsnd", ym2151_status_port_r, ym2151_data_port_w, 0x00ff) AM_RANGE(0x1c0, 0x1c3) AM_READ(eeprom_r) AM_RANGE(0x240, 0x243) AM_WRITE(flipscreen_w) AM_RANGE(0x600, 0x603) AM_READ_PORT("SYSTEM") @@ -247,8 +247,8 @@ static ADDRESS_MAP_START( coolmini_io, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x304, 0x307) AM_READ_PORT("P1_P2") AM_RANGE(0x308, 0x30b) AM_WRITE(eeprom_w) AM_RANGE(0x4c0, 0x4c3) AM_DEVREADWRITE("oki", oki_r, oki_w) - AM_RANGE(0x540, 0x543) AM_DEVWRITE8("ym", ym2151_register_port_w, 0x00ff) - AM_RANGE(0x546, 0x547) AM_DEVREADWRITE8("ym", ym2151_status_port_r, ym2151_data_port_w, 0x00ff) + AM_RANGE(0x540, 0x543) AM_DEVWRITE8("ymsnd", ym2151_register_port_w, 0x00ff) + AM_RANGE(0x546, 0x547) AM_DEVREADWRITE8("ymsnd", ym2151_status_port_r, ym2151_data_port_w, 0x00ff) AM_RANGE(0x7c0, 0x7c3) AM_READ(eeprom_r) ADDRESS_MAP_END @@ -257,8 +257,8 @@ static ADDRESS_MAP_START( suplup_io, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x040, 0x043) AM_READ_PORT("P1_P2") AM_RANGE(0x060, 0x063) AM_READ_PORT("SYSTEM") AM_RANGE(0x080, 0x083) AM_DEVREADWRITE("oki", oki_r, oki_w) - AM_RANGE(0x0c0, 0x0c3) AM_DEVWRITE8("ym", ym2151_register_port_w, 0x00ff) - AM_RANGE(0x0c4, 0x0c7) AM_DEVREADWRITE8("ym", ym2151_status_port_r, ym2151_data_port_w, 0x00ff) + AM_RANGE(0x0c0, 0x0c3) AM_DEVWRITE8("ymsnd", ym2151_register_port_w, 0x00ff) + AM_RANGE(0x0c4, 0x0c7) AM_DEVREADWRITE8("ymsnd", ym2151_status_port_r, ym2151_data_port_w, 0x00ff) AM_RANGE(0x100, 0x103) AM_READ(eeprom_r) ADDRESS_MAP_END @@ -276,7 +276,7 @@ static ADDRESS_MAP_START( finalgdr_io, ADDRESS_SPACE_IO, 32 ) AM_RANGE(0x2400, 0x2403) AM_READ(finalgdr_prot_r) AM_RANGE(0x2800, 0x2803) AM_WRITE(finalgdr_backupram_bank_w) AM_RANGE(0x2c00, 0x2dff) AM_READWRITE(finalgdr_backupram_r, finalgdr_backupram_w) - AM_RANGE(0x3000, 0x3007) AM_DEVREADWRITE8("ym", ym2151_r, ym2151_w, 0x0000ff00) + AM_RANGE(0x3000, 0x3007) AM_DEVREADWRITE8("ymsnd", ym2151_r, ym2151_w, 0x0000ff00) AM_RANGE(0x3800, 0x3803) AM_READ_PORT("P1_P2") AM_RANGE(0x3400, 0x3403) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x0000ff00) AM_RANGE(0x3c00, 0x3c03) AM_READ_PORT("SYSTEM") @@ -297,8 +297,8 @@ static ADDRESS_MAP_START( jmpbreak_io, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x2c0, 0x2c3) AM_READ(eeprom_r) AM_RANGE(0x440, 0x443) AM_DEVREADWRITE("oki", oki_r, oki_w) AM_RANGE(0x540, 0x543) AM_READ_PORT("SYSTEM") - AM_RANGE(0x680, 0x683) AM_DEVWRITE8("ym", ym2151_register_port_w, 0x00ff) - AM_RANGE(0x684, 0x687) AM_DEVREADWRITE8("ym", ym2151_status_port_r, ym2151_data_port_w, 0x00ff) + AM_RANGE(0x680, 0x683) AM_DEVWRITE8("ymsnd", ym2151_register_port_w, 0x00ff) + AM_RANGE(0x684, 0x687) AM_DEVREADWRITE8("ymsnd", ym2151_status_port_r, ym2151_data_port_w, 0x00ff) ADDRESS_MAP_END @@ -315,7 +315,7 @@ static ADDRESS_MAP_START( aoh_io, ADDRESS_SPACE_IO, 32 ) AM_RANGE(0x0480, 0x0483) AM_WRITE(eeprom32_w) AM_RANGE(0x0620, 0x0623) AM_DEVREADWRITE8("oki_2", okim6295_r, okim6295_w, 0x0000ff00) AM_RANGE(0x0660, 0x0663) AM_DEVREADWRITE8("oki_1", okim6295_r, okim6295_w, 0x0000ff00) - AM_RANGE(0x0640, 0x0647) AM_DEVREADWRITE8("ym", ym2151_r, ym2151_w, 0x0000ff00) + AM_RANGE(0x0640, 0x0647) AM_DEVREADWRITE8("ymsnd", ym2151_r, ym2151_w, 0x0000ff00) AM_RANGE(0x0680, 0x0683) AM_DEVWRITE("oki_2", aoh_oki_bank_w) ADDRESS_MAP_END @@ -691,7 +691,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( sound_ym_oki ) MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 28000000/8) + MDRV_SOUND_ADD("ymsnd", YM2151, 28000000/8) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -704,7 +704,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( sound_suplup ) MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 14318180/4) + MDRV_SOUND_ADD("ymsnd", YM2151, 14318180/4) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -805,7 +805,7 @@ static MACHINE_DRIVER_START( aoh ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/vastar.c b/src/mame/drivers/vastar.c index e14a43dcd84..6967b9b49c1 100644 --- a/src/mame/drivers/vastar.c +++ b/src/mame/drivers/vastar.c @@ -153,8 +153,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cpu2_port_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_address_data_w) - AM_RANGE(0x02, 0x02) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_address_data_w) + AM_RANGE(0x02, 0x02) AM_DEVREAD("aysnd", ay8910_r) ADDRESS_MAP_END @@ -339,7 +339,7 @@ static MACHINE_DRIVER_START( vastar ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 1500000) + MDRV_SOUND_ADD("aysnd", AY8910, 1500000) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/vball.c b/src/mame/drivers/vball.c index 8250c701b93..4c4d91ac5bc 100644 --- a/src/mame/drivers/vball.c +++ b/src/mame/drivers/vball.c @@ -232,7 +232,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x9800, 0x9803) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xA000, 0xA000) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -441,7 +441,7 @@ static MACHINE_DRIVER_START( vball ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.60) MDRV_SOUND_ROUTE(1, "rspeaker", 0.60) diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c index d96aa892466..fd27e251b6c 100644 --- a/src/mame/drivers/vendetta.c +++ b/src/mame/drivers/vendetta.c @@ -321,7 +321,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_ROM AM_RANGE(0xf000, 0xf7ff) AM_RAM - AM_RANGE(0xf800, 0xf801) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xf800, 0xf801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xfa00, 0xfa00) AM_WRITE(z80_arm_nmi_w) AM_RANGE(0xfc00, 0xfc2f) AM_DEVREADWRITE("konami", k053260_r, k053260_w) ADDRESS_MAP_END @@ -470,7 +470,7 @@ static MACHINE_DRIVER_START( vendetta ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 3579545) /* verified with PCB */ + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) /* verified with PCB */ MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/videopkr.c b/src/mame/drivers/videopkr.c index 14b8ff3a392..6eca36e7d30 100644 --- a/src/mame/drivers/videopkr.c +++ b/src/mame/drivers/videopkr.c @@ -906,7 +906,7 @@ static ADDRESS_MAP_START( i8051_sound_port, ADDRESS_SPACE_IO, 8 ) AM_RANGE(MCS51_PORT_P0, MCS51_PORT_P0) AM_READWRITE(baby_sound_p0_r, baby_sound_p0_w) AM_RANGE(MCS51_PORT_P1, MCS51_PORT_P1) AM_READWRITE(baby_sound_p1_r, baby_sound_p1_w) AM_RANGE(MCS51_PORT_P2, MCS51_PORT_P2) AM_READ(baby_sound_p2_r) AM_DEVWRITE("dac", baby_sound_p2_w) - AM_RANGE(MCS51_PORT_P3, MCS51_PORT_P3) AM_DEVREADWRITE("ay", baby_sound_p3_r, baby_sound_p3_w) + AM_RANGE(MCS51_PORT_P3, MCS51_PORT_P3) AM_DEVREADWRITE("aysnd", baby_sound_p3_r, baby_sound_p3_w) ADDRESS_MAP_END @@ -1239,7 +1239,7 @@ static MACHINE_DRIVER_START( babypkr ) MDRV_GFXDECODE(videodad) MDRV_VIDEO_START(vidadcba) - MDRV_SOUND_ADD("ay", AY8910, CPU_CLOCK / 6) + MDRV_SOUND_ADD("aysnd", AY8910, CPU_CLOCK / 6) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_DRIVER_END diff --git a/src/mame/drivers/vigilant.c b/src/mame/drivers/vigilant.c index 85bb644b99a..e849f810ff3 100644 --- a/src/mame/drivers/vigilant.c +++ b/src/mame/drivers/vigilant.c @@ -119,7 +119,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x80, 0x81) AM_READWRITE(soundlatch_r, vigilant_sample_addr_w) /* STL / STH */ AM_RANGE(0x82, 0x82) AM_DEVWRITE("dac", m72_sample_w) /* COUNT UP */ AM_RANGE(0x83, 0x83) AM_WRITE(m72_sound_irq_ack_w) /* IRQ clear */ @@ -556,7 +556,7 @@ static MACHINE_DRIVER_START( vigilant ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 3579645) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579645) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.55) MDRV_SOUND_ROUTE(1, "rspeaker", 0.55) @@ -658,7 +658,7 @@ static MACHINE_DRIVER_START( kikcubic ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 3579645) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579645) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.55) MDRV_SOUND_ROUTE(1, "rspeaker", 0.55) diff --git a/src/mame/drivers/vmetal.c b/src/mame/drivers/vmetal.c index f12aa6eb9cb..f481475f59c 100644 --- a/src/mame/drivers/vmetal.c +++ b/src/mame/drivers/vmetal.c @@ -228,7 +228,7 @@ static ADDRESS_MAP_START( varia_program_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x178800, 0x1796ff) AM_RAM AM_BASE(&vmetal_videoregs) AM_RANGE(0x179700, 0x179713) AM_WRITE(SMH_RAM) AM_BASE(&metro_videoregs ) // Video Registers - AM_RANGE(0x200000, 0x200001) AM_READ_PORT("P1_P2") AM_DEVWRITE8("es", vmetal_control_w, 0x00ff) + AM_RANGE(0x200000, 0x200001) AM_READ_PORT("P1_P2") AM_DEVWRITE8("essnd", vmetal_control_w, 0x00ff) AM_RANGE(0x200002, 0x200003) AM_READ_PORT("SYSTEM") /* i have no idea whats meant to be going on here .. it seems to read one bit of the dips from some of them, protection ??? */ @@ -252,7 +252,7 @@ static ADDRESS_MAP_START( varia_program_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x400000, 0x400001) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff ) AM_RANGE(0x400002, 0x400003) AM_DEVWRITE8("oki", okim6295_w, 0x00ff) // Volume/channel info - AM_RANGE(0x500000, 0x50000d) AM_DEVWRITE8("es", vmetal_es8712_w, 0x00ff) + AM_RANGE(0x500000, 0x50000d) AM_DEVWRITE8("essnd", vmetal_es8712_w, 0x00ff) AM_RANGE(0xff0000, 0xffffff) AM_RAM ADDRESS_MAP_END @@ -450,7 +450,7 @@ static MACHINE_DRIVER_START( varia ) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75) - MDRV_SOUND_ADD("es", ES8712, 12000) + MDRV_SOUND_ADD("essnd", ES8712, 12000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MACHINE_DRIVER_END @@ -471,7 +471,7 @@ ROM_START( vmetal ) /* Second half is junk */ ROM_LOAD( "8.u9", 0x00000, 0x80000, CRC(c14c001c) SHA1(bad96b5cd40d1c34ef8b702262168ecab8192fb6) ) - ROM_REGION( 0x200000, "es", 0 ) /* Samples */ + ROM_REGION( 0x200000, "essnd", 0 ) /* Samples */ ROM_LOAD( "7.u12", 0x00000, 0x200000, CRC(a88c52f1) SHA1(d74a5a11f84ba6b1042b33a2c156a1071b6fbfe1) ) ROM_END @@ -490,7 +490,7 @@ ROM_START( vmetaln ) /* Second half is junk */ ROM_LOAD( "8.u9", 0x00000, 0x80000, CRC(c14c001c) SHA1(bad96b5cd40d1c34ef8b702262168ecab8192fb6) ) - ROM_REGION( 0x200000, "es", 0 ) /* Samples */ + ROM_REGION( 0x200000, "essnd", 0 ) /* Samples */ ROM_LOAD( "7.u12", 0x00000, 0x200000, CRC(a88c52f1) SHA1(d74a5a11f84ba6b1042b33a2c156a1071b6fbfe1) ) ROM_END diff --git a/src/mame/drivers/volfied.c b/src/mame/drivers/volfied.c index c681e2245a1..d607bc12b3e 100644 --- a/src/mame/drivers/volfied.c +++ b/src/mame/drivers/volfied.c @@ -91,7 +91,7 @@ static ADDRESS_MAP_START( z80_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0x8800, 0x8800) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0x8801, 0x8801) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w) - AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0x9800, 0x9800) AM_WRITENOP /* ? */ ADDRESS_MAP_END @@ -272,7 +272,7 @@ static MACHINE_DRIVER_START( volfied ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, 4000000) + MDRV_SOUND_ADD("ymsnd", YM2203, 4000000) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(0, "mono", 0.15) MDRV_SOUND_ROUTE(1, "mono", 0.15) diff --git a/src/mame/drivers/vpoker.c b/src/mame/drivers/vpoker.c index 1a43cfc62d3..2bff1ec7ac0 100644 --- a/src/mame/drivers/vpoker.c +++ b/src/mame/drivers/vpoker.c @@ -420,7 +420,7 @@ static MACHINE_DRIVER_START( vpoker ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") -// MDRV_SOUND_ADD("ay", AY8910, 8000000/4 /* guess */) +// MDRV_SOUND_ADD("aysnd", AY8910, 8000000/4 /* guess */) // MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_DRIVER_END diff --git a/src/mame/drivers/vroulet.c b/src/mame/drivers/vroulet.c index 3dc0d07f645..b119caada02 100644 --- a/src/mame/drivers/vroulet.c +++ b/src/mame/drivers/vroulet.c @@ -114,8 +114,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( vroulet_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVREAD("ay", ay8910_r) - AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x00, 0x00) AM_DEVREAD("aysnd", ay8910_r) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_data_address_w) AM_RANGE(0x10, 0x13) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) AM_RANGE(0x80, 0x83) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) ADDRESS_MAP_END @@ -287,7 +287,7 @@ static MACHINE_DRIVER_START( vroulet ) // sound hardware MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 2000000) + MDRV_SOUND_ADD("aysnd", AY8910, 2000000) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) diff --git a/src/mame/drivers/wallc.c b/src/mame/drivers/wallc.c index 130793f3d42..256b707775e 100644 --- a/src/mame/drivers/wallc.c +++ b/src/mame/drivers/wallc.c @@ -155,8 +155,8 @@ static ADDRESS_MAP_START( wallc_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xb000, 0xb000) AM_WRITENOP AM_RANGE(0xb100, 0xb100) AM_WRITE(wallc_coin_counter_w) AM_RANGE(0xb200, 0xb200) AM_WRITENOP - AM_RANGE(0xb500, 0xb500) AM_DEVWRITE("ay", ay8910_address_w) - AM_RANGE(0xb600, 0xb600) AM_DEVWRITE("ay", ay8910_data_w) + AM_RANGE(0xb500, 0xb500) AM_DEVWRITE("aysnd", ay8910_address_w) + AM_RANGE(0xb600, 0xb600) AM_DEVWRITE("aysnd", ay8910_data_w) ADDRESS_MAP_END @@ -298,7 +298,7 @@ static MACHINE_DRIVER_START( wallc ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 12288000 / 8) + MDRV_SOUND_ADD("aysnd", AY8910, 12288000 / 8) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_DRIVER_END diff --git a/src/mame/drivers/wardner.c b/src/mame/drivers/wardner.c index 7c36020ec88..19561692f27 100644 --- a/src/mame/drivers/wardner.c +++ b/src/mame/drivers/wardner.c @@ -235,7 +235,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w) ADDRESS_MAP_END @@ -475,7 +475,7 @@ static MACHINE_DRIVER_START( wardner ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 24000000/7) + MDRV_SOUND_ADD("ymsnd", YM3812, 24000000/7) MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/warriorb.c b/src/mame/drivers/warriorb.c index 947a997de54..3583cdb7fc3 100644 --- a/src/mame/drivers/warriorb.c +++ b/src/mame/drivers/warriorb.c @@ -251,7 +251,7 @@ static ADDRESS_MAP_START( z80_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_READWRITE(SMH_BANK(10), SMH_ROM) AM_RANGE(0xc000, 0xdfff) AM_RAM - AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) + AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) AM_RANGE(0xe200, 0xe200) AM_READWRITE(SMH_NOP, taitosound_slave_port_w) AM_RANGE(0xe201, 0xe201) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w) AM_RANGE(0xe400, 0xe403) AM_WRITE(warriorb_pancontrol) /* pan */ @@ -482,7 +482,7 @@ static MACHINE_DRIVER_START( darius2d ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, 16000000/2) + MDRV_SOUND_ADD("ymsnd", YM2610, 16000000/2) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -540,7 +540,7 @@ static MACHINE_DRIVER_START( warriorb ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, 16000000/2) + MDRV_SOUND_ADD("ymsnd", YM2610, 16000000/2) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -594,7 +594,7 @@ ROM_START( darius2d ) // ROM_LOAD( "c07-03.47", 0x00000, 0x80000, CRC(189bafce) SHA1(d885e444523489fe24269b90dec58e0d92cfbd6e) ) // ROM_LOAD( "c07-04.48", 0x80000, 0x80000, CRC(50421e81) SHA1(27ac420602f1dac00dc32903543a518e6f47fb2f) ) - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c07-10.95", 0x00000, 0x80000, CRC(4bbe0ed9) SHA1(081b73c4e4d4fa548445e5548573099bcb1e9213) ) ROM_LOAD( "c07-11.96", 0x80000, 0x80000, CRC(3c815699) SHA1(0471ff5b0c0da905267f2cee52fd68c8661cccc9) ) @@ -640,7 +640,7 @@ ROM_START( darius2do ) // ROM_LOAD( "c07-03.47", 0x00000, 0x80000, CRC(189bafce) SHA1(d885e444523489fe24269b90dec58e0d92cfbd6e) ) // ROM_LOAD( "c07-04.48", 0x80000, 0x80000, CRC(50421e81) SHA1(27ac420602f1dac00dc32903543a518e6f47fb2f) ) - ROM_REGION( 0x100000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c07-10.95", 0x00000, 0x80000, CRC(4bbe0ed9) SHA1(081b73c4e4d4fa548445e5548573099bcb1e9213) ) ROM_LOAD( "c07-11.96", 0x80000, 0x80000, CRC(3c815699) SHA1(0471ff5b0c0da905267f2cee52fd68c8661cccc9) ) @@ -680,7 +680,7 @@ ROM_START( warriorb ) ROM_LOAD( "d24-07.47", 0x000000, 0x100000, CRC(9f50c271) SHA1(1a1b2ae7cb7785e7f66aa26258a6cd2921a29545) ) /* SCR B, screen 2 */ ROM_LOAD( "d24-08.48", 0x100000, 0x100000, CRC(1e6d1528) SHA1(d6843aa67befd7db44f468be16ba2f0efb85d40f) ) - ROM_REGION( 0x300000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x300000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "d24-12.107", 0x000000, 0x100000, CRC(279203a1) SHA1(ed75e811a1f0863c134034457ce2e97372726bdb) ) ROM_LOAD( "d24-10.95", 0x100000, 0x100000, CRC(0e0c716d) SHA1(5e2f334dd484678766c5a71196d9bad0ba0fe8d9) ) ROM_LOAD( "d24-11.118", 0x200000, 0x100000, CRC(15362573) SHA1(8602c9f24134cac6fe1375fb189b152f0c68aeb7) ) diff --git a/src/mame/drivers/wc90.c b/src/mame/drivers/wc90.c index e60cc8a3a20..b31fad031eb 100644 --- a/src/mame/drivers/wc90.c +++ b/src/mame/drivers/wc90.c @@ -155,7 +155,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xf000, 0xf7ff) AM_RAM - AM_RANGE(0xf800, 0xf803) AM_DEVREADWRITE("ym", ym2608_r, ym2608_w) + AM_RANGE(0xf800, 0xf803) AM_DEVREADWRITE("ymsnd", ym2608_r, ym2608_w) AM_RANGE(0xfc00, 0xfc00) AM_READNOP /* ??? adpcm ??? */ AM_RANGE(0xfc10, 0xfc10) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -338,7 +338,7 @@ static MACHINE_DRIVER_START( wc90 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2608, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2608, 8000000) MDRV_SOUND_CONFIG(ym2608_config) MDRV_SOUND_ROUTE(0, "mono", 0.50) MDRV_SOUND_ROUTE(1, "mono", 1.0) @@ -380,7 +380,7 @@ ROM_START( wc90 ) ROM_LOAD( "ic60_14v.bin", 0x40000, 0x20000, CRC(499dfb1b) SHA1(ac67985d36fea18c82a4ea00019d9e6e4bcb5d0d) ) /* sprites */ ROM_LOAD( "ic65_15v.bin", 0x60000, 0x20000, CRC(d8ea5c81) SHA1(ccb3f7d565b1c1b8e874a2df91cda40dde2962ed) ) /* sprites */ - ROM_REGION( 0x20000, "ym", 0 ) /* 64k for ADPCM samples */ + ROM_REGION( 0x20000, "ymsnd", 0 ) /* 64k for ADPCM samples */ ROM_LOAD( "ic82_06.bin", 0x00000, 0x20000, CRC(2fd692ed) SHA1(0273dc39181504320bec0187d074b2f86c821508) ) ROM_END @@ -413,7 +413,7 @@ ROM_START( wc90a ) ROM_LOAD( "ic60_14v.bin", 0x40000, 0x20000, CRC(499dfb1b) SHA1(ac67985d36fea18c82a4ea00019d9e6e4bcb5d0d) ) /* sprites */ ROM_LOAD( "ic65_15v.bin", 0x60000, 0x20000, CRC(d8ea5c81) SHA1(ccb3f7d565b1c1b8e874a2df91cda40dde2962ed) ) /* sprites */ - ROM_REGION( 0x20000, "ym", 0 ) /* 64k for ADPCM samples */ + ROM_REGION( 0x20000, "ymsnd", 0 ) /* 64k for ADPCM samples */ ROM_LOAD( "ic82_06.bin", 0x00000, 0x20000, CRC(2fd692ed) SHA1(0273dc39181504320bec0187d074b2f86c821508) ) ROM_END @@ -446,7 +446,7 @@ ROM_START( wc90b ) ROM_LOAD( "ic60_14v.bin", 0x40000, 0x20000, CRC(499dfb1b) SHA1(ac67985d36fea18c82a4ea00019d9e6e4bcb5d0d) ) /* sprites */ ROM_LOAD( "ic65_15v.bin", 0x60000, 0x20000, CRC(d8ea5c81) SHA1(ccb3f7d565b1c1b8e874a2df91cda40dde2962ed) ) /* sprites */ - ROM_REGION( 0x20000, "ym", 0 ) /* 64k for ADPCM samples */ + ROM_REGION( 0x20000, "ymsnd", 0 ) /* 64k for ADPCM samples */ ROM_LOAD( "ic82_06.bin", 0x00000, 0x20000, CRC(2fd692ed) SHA1(0273dc39181504320bec0187d074b2f86c821508) ) ROM_END @@ -479,7 +479,7 @@ ROM_START( wc90t ) ROM_LOAD( "ic60_14v.bin", 0x40000, 0x20000, CRC(499dfb1b) SHA1(ac67985d36fea18c82a4ea00019d9e6e4bcb5d0d) ) /* sprites */ ROM_LOAD( "ic65_15v.bin", 0x60000, 0x20000, CRC(d8ea5c81) SHA1(ccb3f7d565b1c1b8e874a2df91cda40dde2962ed) ) /* sprites */ - ROM_REGION( 0x20000, "ym", 0 ) /* 64k for ADPCM samples */ + ROM_REGION( 0x20000, "ymsnd", 0 ) /* 64k for ADPCM samples */ ROM_LOAD( "ic82_06.bin", 0x00000, 0x20000, CRC(2fd692ed) SHA1(0273dc39181504320bec0187d074b2f86c821508) ) ROM_END diff --git a/src/mame/drivers/wc90b.c b/src/mame/drivers/wc90b.c index 2916844f73e..ba532ea81de 100644 --- a/src/mame/drivers/wc90b.c +++ b/src/mame/drivers/wc90b.c @@ -193,7 +193,7 @@ static ADDRESS_MAP_START( sound_cpu, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(3) AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("msm", adpcm_control_w) AM_RANGE(0xe400, 0xe400) AM_WRITE(adpcm_data_w) - AM_RANGE(0xe800, 0xe801) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0xe800, 0xe801) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -408,7 +408,7 @@ static MACHINE_DRIVER_START( wc90b ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2203, YM2203_CLOCK) + MDRV_SOUND_ADD("ymsnd", YM2203, YM2203_CLOCK) MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20) diff --git a/src/mame/drivers/wecleman.c b/src/mame/drivers/wecleman.c index 12b9ad67cfd..89b954be45e 100644 --- a/src/mame/drivers/wecleman.c +++ b/src/mame/drivers/wecleman.c @@ -700,7 +700,7 @@ static ADDRESS_MAP_START( wecleman_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9006, 0x9006) AM_WRITENOP // ? AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) // From main CPU AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE("konami", k007232_r, k007232_w) // K007232 (Reading offset 5/b triggers the sample) - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xf000, 0xf000) AM_DEVWRITE("konami", wecleman_K00723216_bank_w) // Samples banking ADDRESS_MAP_END @@ -1116,7 +1116,7 @@ static MACHINE_DRIVER_START( wecleman ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 3579545) + MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) MDRV_SOUND_ROUTE(0, "mono", 0.85) MDRV_SOUND_ROUTE(1, "mono", 0.85) diff --git a/src/mame/drivers/welltris.c b/src/mame/drivers/welltris.c index 147457cd411..f89b9c84e90 100644 --- a/src/mame/drivers/welltris.c +++ b/src/mame/drivers/welltris.c @@ -397,7 +397,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_port_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(welltris_sh_bankswitch_w) - AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) + AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) AM_RANGE(0x10, 0x10) AM_READ(soundlatch_r) AM_RANGE(0x18, 0x18) AM_WRITE(pending_command_clear_w) ADDRESS_MAP_END @@ -743,7 +743,7 @@ static MACHINE_DRIVER_START( welltris ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "mono", 0.25) MDRV_SOUND_ROUTE(1, "mono", 0.75) @@ -783,7 +783,7 @@ ROM_START( welltris ) ROM_REGION( 0x080000, "ym.deltat", 0 ) /* sound samples */ ROM_LOAD( "lh534j11.126", 0x00000, 0x80000, CRC(bf85fb0d) SHA1(358f91bbff2d3260f83b5a0422c0d985d1735cef) ) - ROM_REGION( 0x100000, "ym", 0 ) /* sound samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* sound samples */ ROM_LOAD( "lh534j09.123", 0x00000, 0x80000, CRC(6c2ce9a5) SHA1(a4011ecfb505191c9934ba374933cd11b331d55a) ) ROM_LOAD( "lh534j10.124", 0x80000, 0x80000, CRC(e3682221) SHA1(3e1cda07cf451955dc473eabe007854e5148ae27) ) ROM_END @@ -810,7 +810,7 @@ ROM_START( welltrisj ) ROM_REGION( 0x080000, "ym.deltat", 0 ) /* sound samples */ ROM_LOAD( "lh534j11.126", 0x00000, 0x80000, CRC(bf85fb0d) SHA1(358f91bbff2d3260f83b5a0422c0d985d1735cef) ) - ROM_REGION( 0x100000, "ym", 0 ) /* sound samples */ + ROM_REGION( 0x100000, "ymsnd", 0 ) /* sound samples */ ROM_LOAD( "lh534j09.123", 0x00000, 0x80000, CRC(6c2ce9a5) SHA1(a4011ecfb505191c9934ba374933cd11b331d55a) ) ROM_LOAD( "lh534j10.124", 0x80000, 0x80000, CRC(e3682221) SHA1(3e1cda07cf451955dc473eabe007854e5148ae27) ) ROM_END @@ -839,7 +839,7 @@ ROM_START( quiz18k ) ROM_REGION( 0x040000, "ym.deltat", 0 ) /* sound samples */ ROM_LOAD( "ic126.bin", 0x00000, 0x40000, CRC(7a92fbc9) SHA1(c13be1e84fc8e74c85d25d3357e078bc9e264682) ) - ROM_REGION( 0x140000, "ym", 0 ) /* sound samples */ + ROM_REGION( 0x140000, "ymsnd", 0 ) /* sound samples */ ROM_LOAD( "ic123.bin", 0x00000, 0x80000, CRC(ee4995cf) SHA1(1b47938ddc87709f8d118b86fe62602972c77ced) ) ROM_LOAD( "ic124.bin", 0x80000, 0x40000, CRC(076f58c3) SHA1(bd78f39b85b2697e733896705355e21b8d2a141d) ) ROM_END diff --git a/src/mame/drivers/wgp.c b/src/mame/drivers/wgp.c index 82a19e9046d..b9379d9e3d9 100644 --- a/src/mame/drivers/wgp.c +++ b/src/mame/drivers/wgp.c @@ -691,7 +691,7 @@ static ADDRESS_MAP_START( z80_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK(10)) /* Fallthrough */ AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0xc000, 0xdfff) AM_RAM - AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) + AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) AM_RANGE(0xe200, 0xe200) AM_READWRITE(SMH_NOP,taitosound_slave_port_w) AM_RANGE(0xe201, 0xe201) AM_READWRITE(taitosound_slave_comm_r,taitosound_slave_comm_w) AM_RANGE(0xe400, 0xe403) AM_WRITENOP /* pan */ @@ -986,7 +986,7 @@ static MACHINE_DRIVER_START( wgp ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2610, 16000000/2) + MDRV_SOUND_ADD("ymsnd", YM2610, 16000000/2) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -1037,7 +1037,7 @@ ROM_START( wgp ) ROM_LOAD16_BYTE( "c32-07.69", 0x100000, 0x80000, CRC(743d46bd) SHA1(6b655b3fbfad8b52e38d7388aab564f5fa3e778c) ) ROM_LOAD16_BYTE( "c32-08.68", 0x100001, 0x80000, CRC(faab63b0) SHA1(6e1aaf2642bee7d7bc9e21a7bf7f81d9ff766c50) ) - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c32-11.8", 0x00000, 0x80000, CRC(2b326ff0) SHA1(3c442e3c97234e4514a7bed31644212586869bd0) ) ROM_REGION( 0x80000, "ym.deltat", 0 ) /* Delta-T samples */ @@ -1090,7 +1090,7 @@ ROM_START( wgpj ) ROM_LOAD16_BYTE( "c32-07.69", 0x100000, 0x80000, CRC(743d46bd) SHA1(6b655b3fbfad8b52e38d7388aab564f5fa3e778c) ) ROM_LOAD16_BYTE( "c32-08.68", 0x100001, 0x80000, CRC(faab63b0) SHA1(6e1aaf2642bee7d7bc9e21a7bf7f81d9ff766c50) ) - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c32-11.8", 0x00000, 0x80000, CRC(2b326ff0) SHA1(3c442e3c97234e4514a7bed31644212586869bd0) ) ROM_REGION( 0x80000, "ym.deltat", 0 ) /* Delta-T samples */ @@ -1126,7 +1126,7 @@ ROM_START( wgpjoy ) ROM_LOAD16_BYTE( "c32-07.69", 0x100000, 0x80000, CRC(743d46bd) SHA1(6b655b3fbfad8b52e38d7388aab564f5fa3e778c) ) ROM_LOAD16_BYTE( "c32-08.68", 0x100001, 0x80000, CRC(faab63b0) SHA1(6e1aaf2642bee7d7bc9e21a7bf7f81d9ff766c50) ) - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c32-11.8", 0x00000, 0x80000, CRC(2b326ff0) SHA1(3c442e3c97234e4514a7bed31644212586869bd0) ) ROM_REGION( 0x80000, "ym.deltat", 0 ) /* delta-t samples */ @@ -1162,7 +1162,7 @@ ROM_START( wgpjoya ) /* Older joystick version ??? */ ROM_LOAD16_BYTE( "c32-07.69", 0x100000, 0x80000, CRC(743d46bd) SHA1(6b655b3fbfad8b52e38d7388aab564f5fa3e778c) ) ROM_LOAD16_BYTE( "c32-08.68", 0x100001, 0x80000, CRC(faab63b0) SHA1(6e1aaf2642bee7d7bc9e21a7bf7f81d9ff766c50) ) - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c32-11.8", 0x00000, 0x80000, CRC(2b326ff0) SHA1(3c442e3c97234e4514a7bed31644212586869bd0) ) ROM_REGION( 0x80000, "ym.deltat", 0 ) /* delta-t samples */ @@ -1198,7 +1198,7 @@ ROM_START( wgp2 ) ROM_LOAD16_BYTE( "c32-07.69", 0x100000, 0x80000, CRC(743d46bd) SHA1(6b655b3fbfad8b52e38d7388aab564f5fa3e778c) ) ROM_LOAD16_BYTE( "c32-08.68", 0x100001, 0x80000, CRC(faab63b0) SHA1(6e1aaf2642bee7d7bc9e21a7bf7f81d9ff766c50) ) - ROM_REGION( 0x80000, "ym", 0 ) /* ADPCM samples */ + ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c32-11.8", 0x00000, 0x80000, CRC(2b326ff0) SHA1(3c442e3c97234e4514a7bed31644212586869bd0) ) ROM_REGION( 0x80000, "ym.deltat", 0 ) /* delta-t samples */ diff --git a/src/mame/drivers/wink.c b/src/mame/drivers/wink.c index af514be8c7d..0373f7acbf3 100644 --- a/src/mame/drivers/wink.c +++ b/src/mame/drivers/wink.c @@ -133,8 +133,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( wink_sound_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ay", ay8910_r, ay8910_data_w) - AM_RANGE(0x80, 0x80) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("aysnd", ay8910_r, ay8910_data_w) + AM_RANGE(0x80, 0x80) AM_DEVWRITE("aysnd", ay8910_address_w) ADDRESS_MAP_END static INPUT_PORTS_START( wink ) @@ -351,7 +351,7 @@ static MACHINE_DRIVER_START( wink ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 12000000 / 8) // AY8912 actually + MDRV_SOUND_ADD("aysnd", AY8910, 12000000 / 8) // AY8912 actually MDRV_SOUND_CONFIG(ay8912_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c index b8993e63519..bd93bca65d9 100644 --- a/src/mame/drivers/witch.c +++ b/src/mame/drivers/witch.c @@ -460,7 +460,7 @@ static ADDRESS_MAP_START( map_sub, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x8001) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w) AM_RANGE(0x8008, 0x8009) AM_DEVREADWRITE("ym2", ym2203_r, ym2203_w) - AM_RANGE(0x8010, 0x8016) AM_DEVREADWRITE("es", read_8010, es8712_w) + AM_RANGE(0x8010, 0x8016) AM_DEVREADWRITE("essnd", read_8010, es8712_w) AM_RANGE(0xa000, 0xa00f) AM_READWRITE(read_a00x, write_a00x) AM_RANGE(0xf000, 0xf0ff) AM_RAM AM_SHARE(1) AM_RANGE(0xf180, 0xffff) AM_RAM AM_SHARE(2) @@ -786,7 +786,7 @@ static MACHINE_DRIVER_START( witch ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("es", ES8712, 8000) + MDRV_SOUND_ADD("essnd", ES8712, 8000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_SOUND_ADD("ym1", YM2203, 1500000) @@ -814,7 +814,7 @@ ROM_START( witch ) ROM_REGION( 0x40000, "gfx2", 0 ) ROM_LOAD( "rom.a1", 0x00000, 0x40000, CRC(512300a5) SHA1(1e9ba58d1ddbfb8276c68f6d5c3591e6b77abf21) ) - ROM_REGION( 0x40000, "es", 0 ) + ROM_REGION( 0x40000, "essnd", 0 ) ROM_LOAD( "rom.v10", 0x00000, 0x40000, CRC(62e42371) SHA1(5042abc2176d0c35fd6b698eca4145f93b0a3944) ) ROM_END @@ -833,7 +833,7 @@ ROM_START( pbchmp95 ) ROM_REGION( 0x40000, "gfx2", 0 ) ROM_LOAD( "1.bin", 0x00000, 0x40000, CRC(f6cf7ed6) SHA1(327580a17eb2740fad974a01d97dad0a4bef9881) ) - ROM_REGION( 0x40000, "es", 0 ) + ROM_REGION( 0x40000, "essnd", 0 ) ROM_LOAD( "5.bin", 0x00000, 0x40000, CRC(62e42371) SHA1(5042abc2176d0c35fd6b698eca4145f93b0a3944) ) ROM_END diff --git a/src/mame/drivers/wwfsstar.c b/src/mame/drivers/wwfsstar.c index 6102646c9c5..ad73f09797b 100644 --- a/src/mame/drivers/wwfsstar.c +++ b/src/mame/drivers/wwfsstar.c @@ -189,7 +189,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x9800, 0x9800) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -457,7 +457,7 @@ static MACHINE_DRIVER_START( wwfsstar ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.45) MDRV_SOUND_ROUTE(1, "rspeaker", 0.45) diff --git a/src/mame/drivers/wwfwfest.c b/src/mame/drivers/wwfwfest.c index 5fc5fed52fc..8818b60d2de 100644 --- a/src/mame/drivers/wwfwfest.c +++ b/src/mame/drivers/wwfwfest.c @@ -88,7 +88,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xc7ff) AM_RAM - AM_RANGE(0xc800, 0xc801) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xc800, 0xc801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xd800, 0xd800) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r) AM_RANGE(0xe800, 0xe800) AM_DEVWRITE("oki", oki_bankswitch_w) @@ -417,7 +417,7 @@ static MACHINE_DRIVER_START( wwfwfest ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) MDRV_SOUND_CONFIG(ym2151_config) MDRV_SOUND_ROUTE(0, "mono", 0.45) MDRV_SOUND_ROUTE(1, "mono", 0.45) diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c index dcb730a33cc..b3acc377fd6 100644 --- a/src/mame/drivers/xexex.c +++ b/src/mame/drivers/xexex.c @@ -397,7 +397,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe22f) AM_DEVREADWRITE("konami", k054539_r, k054539_w) - AM_RANGE(0xec00, 0xec01) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xec00, 0xec01) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xf000, 0xf000) AM_WRITE(soundlatch3_w) AM_RANGE(0xf002, 0xf002) AM_READ(soundlatch_r) AM_RANGE(0xf003, 0xf003) AM_READ(soundlatch2_r) @@ -476,7 +476,7 @@ static MACHINE_DRIVER_START( xexex ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 4000000) + MDRV_SOUND_ADD("ymsnd", YM2151, 4000000) MDRV_SOUND_ROUTE(0, "filter1l", 0.50) MDRV_SOUND_ROUTE(0, "filter1r", 0.50) MDRV_SOUND_ROUTE(1, "filter2l", 0.50) diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c index 23a5bf71da6..63612801ef5 100644 --- a/src/mame/drivers/xmen.c +++ b/src/mame/drivers/xmen.c @@ -185,7 +185,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe22f) AM_DEVREADWRITE("konami", k054539_r, k054539_w) - AM_RANGE(0xe800, 0xe801) AM_MIRROR(0x0400) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xe800, 0xe801) AM_MIRROR(0x0400) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xf000, 0xf000) AM_WRITE(soundlatch2_w) AM_RANGE(0xf002, 0xf002) AM_READ(soundlatch_r) AM_RANGE(0xf800, 0xf800) AM_WRITE(sound_bankswitch_w) @@ -378,7 +378,7 @@ static MACHINE_DRIVER_START( xmen ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, XTAL_16MHz/4) /* verified on pcb */ + MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_16MHz/4) /* verified on pcb */ MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) @@ -454,7 +454,7 @@ static MACHINE_DRIVER_START( xmen6p ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM2151, 4000000) + MDRV_SOUND_ADD("ymsnd", YM2151, 4000000) MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) diff --git a/src/mame/drivers/yiear.c b/src/mame/drivers/yiear.c index b310b5218fd..95951b3c165 100644 --- a/src/mame/drivers/yiear.c +++ b/src/mame/drivers/yiear.c @@ -88,7 +88,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0000) AM_DEVREAD("vlm", yiear_speech_r) AM_RANGE(0x4000, 0x4000) AM_WRITE(yiear_control_w) AM_RANGE(0x4800, 0x4800) AM_WRITE(konami_SN76496_latch_w) - AM_RANGE(0x4900, 0x4900) AM_DEVWRITE("sn", konami_SN76496_w) + AM_RANGE(0x4900, 0x4900) AM_DEVWRITE("snsnd", konami_SN76496_w) AM_RANGE(0x4a00, 0x4a00) AM_DEVWRITE("vlm", yiear_VLM5030_control_w) AM_RANGE(0x4b00, 0x4b00) AM_DEVWRITE("vlm", vlm5030_data_w) AM_RANGE(0x4c00, 0x4c00) AM_READ_PORT("DSW1") @@ -219,7 +219,7 @@ static MACHINE_DRIVER_START( yiear ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("sn", SN76496, XTAL_18_432MHz/16) /* verified on pcb */ + MDRV_SOUND_ADD("snsnd", SN76496, XTAL_18_432MHz/16) /* verified on pcb */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MDRV_SOUND_ADD("vlm", VLM5030, XTAL_3_579545MHz) /* verified on pcb */ diff --git a/src/mame/drivers/yunsun16.c b/src/mame/drivers/yunsun16.c index d4fd2f07244..526fcd6dbf9 100644 --- a/src/mame/drivers/yunsun16.c +++ b/src/mame/drivers/yunsun16.c @@ -187,7 +187,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_port_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x11) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w ) + AM_RANGE(0x10, 0x11) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w ) AM_RANGE(0x18, 0x18) AM_READ(soundlatch_r ) // From Main CPU AM_RANGE(0x1c, 0x1c) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w ) // M6295 ADDRESS_MAP_END @@ -609,7 +609,7 @@ static MACHINE_DRIVER_START( magicbub ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM3812, 4000000) + MDRV_SOUND_ADD("ymsnd", YM3812, 4000000) MDRV_SOUND_CONFIG(magicbub_ym3812_intf) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.20) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.20) diff --git a/src/mame/drivers/yunsung8.c b/src/mame/drivers/yunsung8.c index 7cbf726ec3f..85863e7b3a9 100644 --- a/src/mame/drivers/yunsung8.c +++ b/src/mame/drivers/yunsung8.c @@ -158,7 +158,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0xbfff) AM_READWRITE(SMH_BANK(2),SMH_ROM ) // Banked ROM AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("msm", yunsung8_sound_bankswitch_w ) // ROM Bank AM_RANGE(0xe400, 0xe400) AM_WRITE(yunsung8_adpcm_w ) - AM_RANGE(0xec00, 0xec01) AM_DEVWRITE("ym", ym3812_w ) + AM_RANGE(0xec00, 0xec01) AM_DEVWRITE("ymsnd", ym3812_w ) AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r ) // From Main CPU ADDRESS_MAP_END @@ -534,7 +534,7 @@ static MACHINE_DRIVER_START( yunsung8 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ym", YM3812, 4000000) + MDRV_SOUND_ADD("ymsnd", YM3812, 4000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c index 58929718608..7411c7628cc 100644 --- a/src/mame/drivers/zn.c +++ b/src/mame/drivers/zn.c @@ -1214,7 +1214,7 @@ static ADDRESS_MAP_START( fx1a_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK(10)) /* Fallthrough */ AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0xc000, 0xdfff) AM_RAM - AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) + AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) AM_RANGE(0xe200, 0xe200) AM_READWRITE(SMH_NOP, taitosound_slave_port_w) AM_RANGE(0xe201, 0xe201) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w) AM_RANGE(0xe400, 0xe403) AM_WRITENOP /* pan */ @@ -1242,7 +1242,7 @@ static MACHINE_DRIVER_START( coh1000ta ) MDRV_MACHINE_RESET( coh1000ta ) MDRV_NVRAM_HANDLER( coh1000ta ) - MDRV_SOUND_ADD("ym", YM2610B, 16000000/2) + MDRV_SOUND_ADD("ymsnd", YM2610B, 16000000/2) MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -3906,7 +3906,7 @@ ROM_START( mgcldate ) ROM_LOAD( "e32-07.22", 0x0000000, 0x004000, CRC(adf3feb5) SHA1(bae5bc3fad99a92a3492be1b775dab861007eb3b) ) ROM_CONTINUE( 0x0010000, 0x01c000 ) /* banked stuff */ - ROM_REGION( 0x400000, "ym", 0 ) + ROM_REGION( 0x400000, "ymsnd", 0 ) ROM_LOAD( "e32-04.15", 0x0000000, 0x400000, CRC(c72f9eea) SHA1(7ab8b412a8ed00a42016acb7d13d3b074155780a) ) ROM_END @@ -3924,7 +3924,7 @@ ROM_START( mgcldtex ) ROM_LOAD( "e32-10.22", 0x0000000, 0x004000, CRC(adf3feb5) SHA1(bae5bc3fad99a92a3492be1b775dab861007eb3b) ) ROM_CONTINUE( 0x0010000, 0x01c000 ) /* banked stuff */ - ROM_REGION( 0x400000, "ym", 0 ) + ROM_REGION( 0x400000, "ymsnd", 0 ) ROM_LOAD( "e32-04.15", 0x0000000, 0x400000, CRC(c72f9eea) SHA1(7ab8b412a8ed00a42016acb7d13d3b074155780a) ) ROM_END @@ -3942,7 +3942,7 @@ ROM_START( psyforce ) ROM_LOAD( "e22-07.22", 0x0000000, 0x004000, CRC(739af589) SHA1(dbb4d1c6d824a99ccf27168e2c21644e19811523) ) ROM_CONTINUE( 0x0010000, 0x01c000 ) /* banked stuff */ - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "e22-01.15", 0x000000, 0x200000, CRC(808b8340) SHA1(d8bde850dd9b5b71e94ea707d2d728754f907977) ) ROM_END @@ -3960,7 +3960,7 @@ ROM_START( psyforcej ) ROM_LOAD( "e22-07.22", 0x0000000, 0x004000, CRC(739af589) SHA1(dbb4d1c6d824a99ccf27168e2c21644e19811523) ) ROM_CONTINUE( 0x0010000, 0x01c000 ) /* banked stuff */ - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "e22-01.15", 0x000000, 0x200000, CRC(808b8340) SHA1(d8bde850dd9b5b71e94ea707d2d728754f907977) ) ROM_END @@ -3978,7 +3978,7 @@ ROM_START( psyforcex ) ROM_LOAD( "e22-07.22", 0x0000000, 0x004000, CRC(739af589) SHA1(dbb4d1c6d824a99ccf27168e2c21644e19811523) ) ROM_CONTINUE( 0x0010000, 0x01c000 ) /* banked stuff */ - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "e22-01.15", 0x000000, 0x200000, CRC(808b8340) SHA1(d8bde850dd9b5b71e94ea707d2d728754f907977) ) ROM_END @@ -4030,7 +4030,7 @@ ROM_START( sfchamp ) ROM_LOAD( "e18-09.22", 0x0000000, 0x004000, CRC(bb5a5319) SHA1(0bb700cafc157d3af663cc9bebb8167487ff2852) ) ROM_CONTINUE( 0x0010000, 0x01c000 ) /* banked stuff */ - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "e18-01.15", 0x0000000, 0x200000, CRC(dbd1408c) SHA1(ef81064f2f95e5ae25eb1f10d1e78f27f9e294f5) ) ROM_END @@ -4049,7 +4049,7 @@ ROM_START( sfchampj ) ROM_LOAD( "e18-09.22", 0x0000000, 0x004000, CRC(bb5a5319) SHA1(0bb700cafc157d3af663cc9bebb8167487ff2852) ) ROM_CONTINUE( 0x0010000, 0x01c000 ) /* banked stuff */ - ROM_REGION( 0x200000, "ym", 0 ) + ROM_REGION( 0x200000, "ymsnd", 0 ) ROM_LOAD( "e18-01.15", 0x0000000, 0x200000, CRC(dbd1408c) SHA1(ef81064f2f95e5ae25eb1f10d1e78f27f9e294f5) ) ROM_END diff --git a/src/mame/drivers/zodiack.c b/src/mame/drivers/zodiack.c index e3ced265620..c62ed9d898e 100644 --- a/src/mame/drivers/zodiack.c +++ b/src/mame/drivers/zodiack.c @@ -140,7 +140,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_address_data_w) ADDRESS_MAP_END @@ -547,7 +547,7 @@ static MACHINE_DRIVER_START( zodiack ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay", AY8910, 1789750) + MDRV_SOUND_ADD("aysnd", AY8910, 1789750) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/machine/neoboot.c b/src/mame/machine/neoboot.c index 61229dab92c..2e918071b3f 100644 --- a/src/mame/machine/neoboot.c +++ b/src/mame/machine/neoboot.c @@ -653,7 +653,7 @@ void decrypt_kof2k4se_68k( running_machine *machine ) void lans2004_vx_decrypt( running_machine *machine ) { int i; - UINT8 *rom = memory_region( machine, "ym" ); + UINT8 *rom = memory_region( machine, "ymsnd" ); for (i = 0; i < 0xA00000; i++) rom[i] = BITSWAP8(rom[i], 0, 1, 5, 4, 3, 2, 6, 7); } @@ -1067,8 +1067,8 @@ void samsho5b_px_decrypt( running_machine *machine ) void samsho5b_vx_decrypt( running_machine *machine ) { - int vx_size = memory_region_length( machine, "ym" ); - UINT8 *rom = memory_region( machine, "ym" ); + int vx_size = memory_region_length( machine, "ymsnd" ); + UINT8 *rom = memory_region( machine, "ymsnd" ); int i; for( i = 0; i < vx_size; i++ ) diff --git a/src/mame/machine/neocrypt.c b/src/mame/machine/neocrypt.c index bae037ade83..4f055700abe 100644 --- a/src/mame/machine/neocrypt.c +++ b/src/mame/machine/neocrypt.c @@ -1469,8 +1469,8 @@ NeoGeo 'V' (PCM) ROM encryption /* Neo-Pcm2 Drivers for Encrypted V Roms */ void neo_pcm2_snk_1999(running_machine *machine, int value) { /* thanks to Elsemi for the NEO-PCM2 info */ - UINT16 *rom = (UINT16 *)memory_region(machine, "ym"); - int size = memory_region_length(machine, "ym"); + UINT16 *rom = (UINT16 *)memory_region(machine, "ymsnd"); + int size = memory_region_length(machine, "ymsnd"); int i, j; if( rom != NULL ) @@ -1509,7 +1509,7 @@ void neo_pcm2_swap(running_machine *machine, int value) {0xcb,0x29,0x7d,0x43,0xd2,0x3a,0xc2,0xb4}, {0x4b,0xa4,0x63,0x46,0xf0,0x91,0xea,0x62}, {0x4b,0xa4,0x63,0x46,0xf0,0x91,0xea,0x62}}; - UINT8 *src = memory_region(machine, "ym"); + UINT8 *src = memory_region(machine, "ymsnd"); UINT8 *buf = alloc_array_or_die(UINT8, 0x1000000); int i, j, d; diff --git a/src/mame/machine/nmk004.c b/src/mame/machine/nmk004.c index d3f6c1fab8e..793388caf64 100644 --- a/src/mame/machine/nmk004.c +++ b/src/mame/machine/nmk004.c @@ -1021,7 +1021,7 @@ static TIMER_CALLBACK( real_nmk004_init ) memset(&NMK004_state, 0, sizeof(NMK004_state)); NMK004_state.machine = machine; - NMK004_state.ymdevice = devtag_get_device(machine, "ym"); + NMK004_state.ymdevice = devtag_get_device(machine, "ymsnd"); NMK004_state.oki1device = devtag_get_device(machine, "oki1"); NMK004_state.oki2device = devtag_get_device(machine, "oki2"); diff --git a/src/mame/machine/toaplan1.c b/src/mame/machine/toaplan1.c index 46f8474bc94..a954ecc6265 100644 --- a/src/mame/machine/toaplan1.c +++ b/src/mame/machine/toaplan1.c @@ -232,7 +232,7 @@ WRITE16_HANDLER( toaplan1_reset_sound ) if (ACCESSING_BITS_0_7 && (data == 0)) { logerror("PC:%04x Resetting Sound CPU and Sound chip (%08x)\n", cpu_get_previouspc(space->cpu), data); - devtag_reset(space->machine, "ym"); + devtag_reset(space->machine, "ymsnd"); if (cputag_get_cpu(space->machine, "audiocpu") != NULL && cpu_get_type(cputag_get_cpu(space->machine, "audiocpu")) == CPU_Z80) cputag_set_input_line(space->machine, "audiocpu", INPUT_LINE_RESET, PULSE_LINE); } diff --git a/src/mame/video/genesis.c b/src/mame/video/genesis.c index 30315702c60..d2d130ed090 100644 --- a/src/mame/video/genesis.c +++ b/src/mame/video/genesis.c @@ -395,7 +395,7 @@ WRITE16_HANDLER( genesis_vdp_w ) case 0x09: case 0x0a: case 0x0b: - device = devtag_get_device(space->machine, "sn"); + device = devtag_get_device(space->machine, "snsnd"); if (device != NULL && ACCESSING_BITS_0_7) sn76496_w(device, 0, data & 0xff); break; diff --git a/src/mame/video/seta.c b/src/mame/video/seta.c index d29f8e459a0..9b1d73a6dcb 100644 --- a/src/mame/video/seta.c +++ b/src/mame/video/seta.c @@ -279,7 +279,7 @@ WRITE16_HANDLER( seta_vregs_w ) ---- ---- ---- ---0 Coin #0 Counter */ if (ACCESSING_BITS_0_7) { - const device_config *x1_010 = devtag_get_device(space->machine, "x1"); + const device_config *x1_010 = devtag_get_device(space->machine, "x1snd"); seta_coin_lockout_w (space->machine, data & 0x0f); if (x1_010 != NULL) seta_sound_enable_w (x1_010, data & 0x20); @@ -306,8 +306,8 @@ WRITE16_HANDLER( seta_vregs_w ) if (new_bank != seta_samples_bank) { - UINT8 *rom = memory_region(space->machine, "x1"); - int samples_len = memory_region_length(space->machine, "x1"); + UINT8 *rom = memory_region(space->machine, "x1snd"); + int samples_len = memory_region_length(space->machine, "x1snd"); int addr; seta_samples_bank = new_bank; diff --git a/src/mame/video/tceptor.c b/src/mame/video/tceptor.c index cbcb2e62a86..b0351618cc3 100644 --- a/src/mame/video/tceptor.c +++ b/src/mame/video/tceptor.c @@ -534,7 +534,7 @@ VIDEO_UPDATE( tceptor ) int pri; int bg_center = 144 - ((((bg1_scroll_x + bg2_scroll_x ) & 0x1ff) - 288) / 2); - const device_config *_2d_screen = devtag_get_device(screen->machine, "2d"); + const device_config *_2d_screen = devtag_get_device(screen->machine, "2dscreen"); const device_config *_3d_left_screen = devtag_get_device(screen->machine, "3dleft"); const device_config *_3d_right_screen = devtag_get_device(screen->machine, "3dright"); diff --git a/src/mame/video/toaplan2.c b/src/mame/video/toaplan2.c index 7c9b04022b8..41bb7dd3bf2 100644 --- a/src/mame/video/toaplan2.c +++ b/src/mame/video/toaplan2.c @@ -1023,12 +1023,12 @@ static void toaplan2_scroll_reg_data_w(running_machine *machine, offs_t offset, if ((toaplan2_sub_cpu == CPU_2_Z80) && (data == 3)) { /* HACK! When tilted, sound CPU needs to be reset. */ - const device_config *ym = devtag_get_device(machine, "ym"); + const device_config *ym = devtag_get_device(machine, "ymsnd"); if (ym && (sound_get_type(ym) == SOUND_YM3812)) { cputag_set_input_line(machine, "audiocpu", INPUT_LINE_RESET, PULSE_LINE); - devtag_reset(machine, "ym"); + devtag_reset(machine, "ymsnd"); } }