diff options
author | 2009-01-18 18:22:46 +0000 | |
---|---|---|
committer | 2009-01-18 18:22:46 +0000 | |
commit | 68a0e2c86aa75b8f2aa273421a04625987e64ba2 (patch) | |
tree | 40098bbfc8e80166d730eb82cb333baab884fa3d /src | |
parent | 0335419d51f78de7963fc879ae508a6e14cdbdc3 (diff) |
Removed redundant config parameter from SND_START.
Diffstat (limited to 'src')
51 files changed, 63 insertions, 63 deletions
diff --git a/src/emu/sndintrf.c b/src/emu/sndintrf.c index a0e86d6092b..0bc4731b0c3 100644 --- a/src/emu/sndintrf.c +++ b/src/emu/sndintrf.c @@ -138,7 +138,7 @@ int sndintrf_init_sound(running_machine *machine, int sndnum, const char *tag, s /* start the chip, tagging all its streams */ current_sound_start = &sound[sndnum]; start = (snd_start_func)sndtype_get_info_fct(sndtype, SNDINFO_PTR_START); - info->device->token = (*start)(info->device, clock, config); + info->device->token = (*start)(info->device, clock); current_sound_start = NULL; VPRINTF((" token = %p\n", info->device->token)); diff --git a/src/emu/sndintrf.h b/src/emu/sndintrf.h index 07b140a79dc..efdbd741bea 100644 --- a/src/emu/sndintrf.h +++ b/src/emu/sndintrf.h @@ -78,8 +78,8 @@ enum #define SND_SET_INFO_CALL(name) SND_SET_INFO_NAME(name)(device, state, info) #define SND_START_NAME(name) snd_start_##name -#define SND_START(name) void *SND_START_NAME(name)(const device_config *device, int clock, const void *config) -#define SND_START_CALL(name) SND_START_NAME(name)(device, clock, config) +#define SND_START(name) void *SND_START_NAME(name)(const device_config *device, int clock) +#define SND_START_CALL(name) SND_START_NAME(name)(device, clock) #define SND_STOP_NAME(name) snd_stop_##name #define SND_STOP(name) void SND_STOP_NAME(name)(const device_config *device) @@ -101,7 +101,7 @@ typedef union _sndinfo sndinfo; /* define the various callback functions */ typedef void (*snd_get_info_func)(const device_config *device, UINT32 state, sndinfo *info); typedef void (*snd_set_info_func)(const device_config *device, UINT32 state, sndinfo *info); -typedef void *(*snd_start_func)(const device_config *device, int clock, const void *config); +typedef void *(*snd_start_func)(const device_config *device, int clock); typedef void (*snd_stop_func)(const device_config *device); typedef void (*snd_reset_func)(const device_config *device); diff --git a/src/emu/sound/2151intf.c b/src/emu/sound/2151intf.c index bff659efc07..ee8de7d2a11 100644 --- a/src/emu/sound/2151intf.c +++ b/src/emu/sound/2151intf.c @@ -45,7 +45,7 @@ static SND_START( ym2151 ) info = auto_malloc(sizeof(*info)); memset(info, 0, sizeof(*info)); - info->intf = config ? config : &dummy; + info->intf = device->static_config ? device->static_config : &dummy; rate = clock/64; diff --git a/src/emu/sound/2203intf.c b/src/emu/sound/2203intf.c index 056cb1065f8..0c98e9ce2a5 100644 --- a/src/emu/sound/2203intf.c +++ b/src/emu/sound/2203intf.c @@ -116,7 +116,7 @@ static SND_START( ym2203 ) }, NULL }; - const ym2203_interface *intf = config ? config : &generic_2203; + const ym2203_interface *intf = device->static_config ? device->static_config : &generic_2203; struct ym2203_info *info; int rate = clock/72; /* ??? */ diff --git a/src/emu/sound/2608intf.c b/src/emu/sound/2608intf.c index 3f88f733f15..fbe3c64ec3f 100644 --- a/src/emu/sound/2608intf.c +++ b/src/emu/sound/2608intf.c @@ -129,7 +129,7 @@ static SND_START( ym2608 ) }, NULL }; - const ym2608_interface *intf = config ? config : &generic_2608; + const ym2608_interface *intf = device->static_config ? device->static_config : &generic_2608; int rate = clock/72; void *pcmbufa; int pcmsizea; diff --git a/src/emu/sound/2610intf.c b/src/emu/sound/2610intf.c index 1b6563b5c1b..cabd80cb83a 100644 --- a/src/emu/sound/2610intf.c +++ b/src/emu/sound/2610intf.c @@ -129,7 +129,7 @@ static SND_START( ym2610 ) AY8910_DEFAULT_LOADS, NULL, NULL, NULL, NULL }; - const ym2610_interface *intf = config ? config : &generic_2610; + const ym2610_interface *intf = device->static_config ? device->static_config : &generic_2610; int rate = clock/72; void *pcmbufa,*pcmbufb; int pcmsizea,pcmsizeb; @@ -196,7 +196,7 @@ static SND_START( ym2610b ) AY8910_DEFAULT_LOADS, NULL, NULL, NULL, NULL }; - const ym2610_interface *intf = config ? config : &generic_2610; + const ym2610_interface *intf = device->static_config ? device->static_config : &generic_2610; int rate = clock/72; void *pcmbufa,*pcmbufb; int pcmsizea,pcmsizeb; diff --git a/src/emu/sound/2612intf.c b/src/emu/sound/2612intf.c index ec77d93bdbb..cf0608852c3 100644 --- a/src/emu/sound/2612intf.c +++ b/src/emu/sound/2612intf.c @@ -96,7 +96,7 @@ static SND_START( ym2612 ) info = auto_malloc(sizeof(*info)); memset(info, 0, sizeof(*info)); - info->intf = config ? config : &dummy; + info->intf = device->static_config ? device->static_config : &dummy; info->device = device; /* FM init */ diff --git a/src/emu/sound/262intf.c b/src/emu/sound/262intf.c index 793ba451823..31601de3681 100644 --- a/src/emu/sound/262intf.c +++ b/src/emu/sound/262intf.c @@ -76,7 +76,7 @@ static SND_START( ymf262 ) info = auto_malloc(sizeof(*info)); memset(info, 0, sizeof(*info)); - info->intf = config ? config : &dummy; + info->intf = device->static_config ? device->static_config : &dummy; info->device = device; /* stream system initialize */ diff --git a/src/emu/sound/3812intf.c b/src/emu/sound/3812intf.c index 0f0793d41ec..945cd534dd6 100644 --- a/src/emu/sound/3812intf.c +++ b/src/emu/sound/3812intf.c @@ -88,7 +88,7 @@ static SND_START( ym3812 ) info = auto_malloc(sizeof(*info)); memset(info, 0, sizeof(*info)); - info->intf = config ? config : &dummy; + info->intf = device->static_config ? device->static_config : &dummy; info->device = device; /* stream system initialize */ @@ -259,7 +259,7 @@ static SND_START( ym3526 ) info = auto_malloc(sizeof(*info)); memset(info, 0, sizeof(*info)); - info->intf = config ? config : &dummy; + info->intf = device->static_config ? device->static_config : &dummy; info->device = device; /* stream system initialize */ @@ -455,7 +455,7 @@ static SND_START( y8950 ) info = auto_malloc(sizeof(*info)); memset(info, 0, sizeof(*info)); - info->intf = config ? config : &dummy; + info->intf = device->static_config ? device->static_config : &dummy; info->device = device; /* stream system initialize */ diff --git a/src/emu/sound/5110intf.c b/src/emu/sound/5110intf.c index c44fa8e6147..9e02f7d9862 100644 --- a/src/emu/sound/5110intf.c +++ b/src/emu/sound/5110intf.c @@ -71,7 +71,7 @@ static SND_START( tms5110 ) info = auto_malloc(sizeof(*info)); memset(info, 0, sizeof(*info)); - info->intf = config ? config : &dummy; + info->intf = device->static_config ? device->static_config : &dummy; info->table = device->region; info->chip = tms5110_create(device, TMS5110_IS_5110A); diff --git a/src/emu/sound/5220intf.c b/src/emu/sound/5220intf.c index af0288a87b2..b2b68aae904 100644 --- a/src/emu/sound/5220intf.c +++ b/src/emu/sound/5220intf.c @@ -48,7 +48,7 @@ static SND_START( tms5220 ) info = auto_malloc(sizeof(*info)); memset(info, 0, sizeof(*info)); - info->intf = config ? config : &dummy; + info->intf = device->static_config ? device->static_config : &dummy; info->chip = tms5220_create(device); if (!info->chip) diff --git a/src/emu/sound/aica.c b/src/emu/sound/aica.c index 2e18bec743f..c39b1481350 100644 --- a/src/emu/sound/aica.c +++ b/src/emu/sound/aica.c @@ -1285,7 +1285,7 @@ static SND_START( aica ) AICA = auto_malloc(sizeof(*AICA)); memset(AICA, 0, sizeof(*AICA)); - intf = config; + intf = device->static_config; // init the emulation AICA_Init(device, AICA, intf); diff --git a/src/emu/sound/ay8910.c b/src/emu/sound/ay8910.c index 25594666c8e..267f9463d16 100644 --- a/src/emu/sound/ay8910.c +++ b/src/emu/sound/ay8910.c @@ -818,7 +818,7 @@ static SND_START( ay8910 ) AY8910_DEFAULT_LOADS, NULL, NULL, NULL, NULL }; - const ay8910_interface *intf = (config ? config : &generic_ay8910); + const ay8910_interface *intf = (device->static_config ? device->static_config : &generic_ay8910); return ay8910_start_ym(SOUND_AY8910, device, clock, intf); } @@ -830,7 +830,7 @@ static SND_START( ym2149 ) AY8910_DEFAULT_LOADS, NULL, NULL, NULL, NULL }; - const ay8910_interface *intf = (config ? config : &generic_ay8910); + const ay8910_interface *intf = (device->static_config ? device->static_config : &generic_ay8910); return ay8910_start_ym(SOUND_YM2149, device, clock, intf); } diff --git a/src/emu/sound/c140.c b/src/emu/sound/c140.c index a70718de926..d1d615025a0 100644 --- a/src/emu/sound/c140.c +++ b/src/emu/sound/c140.c @@ -456,7 +456,7 @@ static STREAM_UPDATE( update_stereo ) static SND_START( c140 ) { - const c140_interface *intf = config; + const c140_interface *intf = device->static_config; struct c140_info *info; info = auto_malloc(sizeof(*info)); diff --git a/src/emu/sound/cdda.c b/src/emu/sound/cdda.c index a864af63af7..0bab6475fcb 100644 --- a/src/emu/sound/cdda.c +++ b/src/emu/sound/cdda.c @@ -54,7 +54,7 @@ static SND_START( cdda ) /* allocate an audio cache */ info->audio_cache = auto_malloc( CD_MAX_SECTOR_DATA * MAX_SECTORS ); - intf = config; + intf = device->static_config; info->stream = stream_create(device, 0, 2, 44100, info, cdda_update); diff --git a/src/emu/sound/cem3394.c b/src/emu/sound/cem3394.c index c1734774ff3..43fcf8eb1b5 100644 --- a/src/emu/sound/cem3394.c +++ b/src/emu/sound/cem3394.c @@ -317,7 +317,7 @@ static STREAM_UPDATE( cem3394_update ) static SND_START( cem3394 ) { - const cem3394_interface *intf = config; + const cem3394_interface *intf = device->static_config; sound_chip *chip; chip = auto_malloc(sizeof(*chip)); diff --git a/src/emu/sound/custom.c b/src/emu/sound/custom.c index cdb563bbd64..036ddfc15d7 100644 --- a/src/emu/sound/custom.c +++ b/src/emu/sound/custom.c @@ -18,10 +18,10 @@ static SND_START( custom ) memset(info, 0, sizeof(*info)); /* stash a pointer and call the start routine */ - info->intf = config; + info->intf = device->static_config; if (info->intf->start) { - info->token = (*info->intf->start)(device, clock, config); + info->token = (*info->intf->start)(device, clock, device->static_config); if (!info->token) return NULL; } diff --git a/src/emu/sound/discrete.c b/src/emu/sound/discrete.c index d65a3b88cca..c5dcf091a84 100644 --- a/src/emu/sound/discrete.c +++ b/src/emu/sound/discrete.c @@ -247,7 +247,7 @@ node_description *discrete_find_node(void *chip, int node) static SND_START( discrete ) { - discrete_sound_block *intf = (discrete_sound_block *)config; + discrete_sound_block *intf = (discrete_sound_block *)device->static_config; discrete_info *info; char name[32]; diff --git a/src/emu/sound/es5503.c b/src/emu/sound/es5503.c index 8e1fa24060d..edf1741fa1a 100644 --- a/src/emu/sound/es5503.c +++ b/src/emu/sound/es5503.c @@ -232,7 +232,7 @@ static SND_START( es5503 ) chip = auto_malloc(sizeof(*chip)); memset(chip, 0, sizeof(*chip)); - intf = config; + intf = device->static_config; chip->irq_callback = intf->irq_callback; chip->adc_read = intf->adc_read; diff --git a/src/emu/sound/es5506.c b/src/emu/sound/es5506.c index 4cb3e4ef472..60fe357ccd1 100644 --- a/src/emu/sound/es5506.c +++ b/src/emu/sound/es5506.c @@ -876,7 +876,7 @@ static void *es5506_start_common(const device_config *device, int clock, const v static SND_START( es5506 ) { - return es5506_start_common(device, clock, config, SOUND_ES5506); + return es5506_start_common(device, clock, device->static_config, SOUND_ES5506); } @@ -1503,7 +1503,7 @@ void es5506_voice_bank_1_w(int voice, int bank) static SND_START( es5505 ) { - const es5505_interface *intf = config; + const es5505_interface *intf = device->static_config; es5506_interface es5506intf; memset(&es5506intf, 0, sizeof(es5506intf)); diff --git a/src/emu/sound/flt_rc.c b/src/emu/sound/flt_rc.c index c87f2367f78..d5a4aa63f0c 100644 --- a/src/emu/sound/flt_rc.c +++ b/src/emu/sound/flt_rc.c @@ -83,7 +83,7 @@ static void set_RC_info(struct filter_rc_info *info, int type, double R1, double static SND_START( filter_rc ) { struct filter_rc_info *info; - const flt_rc_config *conf = config; + const flt_rc_config *conf = device->static_config; info = auto_malloc(sizeof(*info)); memset(info, 0, sizeof(*info)); diff --git a/src/emu/sound/gaelco.c b/src/emu/sound/gaelco.c index 41cf7f0d67e..96d72785689 100644 --- a/src/emu/sound/gaelco.c +++ b/src/emu/sound/gaelco.c @@ -242,10 +242,10 @@ WRITE16_HANDLER( gaelcosnd_w ) CG-1V/GAE1 Init ============================================================================*/ -static void *gaelcosnd_start(sound_type sndtype, const device_config *device, int clock, const void *config) +static void *gaelcosnd_start(sound_type sndtype, const device_config *device, int clock) { int j, vol; - const gaelcosnd_interface *intf = config; + const gaelcosnd_interface *intf = device->static_config; struct GAELCOSND *info; info = auto_malloc(sizeof(*info)); @@ -277,12 +277,12 @@ static void *gaelcosnd_start(sound_type sndtype, const device_config *device, in static SND_START( gaelco_gae1 ) { - return gaelcosnd_start(SOUND_GAELCO_GAE1, device, clock, config); + return gaelcosnd_start(SOUND_GAELCO_GAE1, device, clock); } static SND_START( gaelco_cg1v ) { - return gaelcosnd_start(SOUND_GAELCO_CG1V, device, clock, config); + return gaelcosnd_start(SOUND_GAELCO_CG1V, device, clock); } diff --git a/src/emu/sound/ics2115.c b/src/emu/sound/ics2115.c index 74189d7fb2d..3a7d8934f30 100644 --- a/src/emu/sound/ics2115.c +++ b/src/emu/sound/ics2115.c @@ -448,7 +448,7 @@ static SND_START( ics2115 ) memset(chip, 0, sizeof(*chip)); chip->device = device; - chip->intf = config; + chip->intf = device->static_config; chip->rom = device->region; chip->timer[0].timer = timer_alloc(device->machine, timer_cb_0, chip); chip->timer[1].timer = timer_alloc(device->machine, timer_cb_1, chip); diff --git a/src/emu/sound/k007232.c b/src/emu/sound/k007232.c index 47b06e7d709..88e3abfc10e 100644 --- a/src/emu/sound/k007232.c +++ b/src/emu/sound/k007232.c @@ -302,7 +302,7 @@ static SND_START( k007232 ) info = auto_malloc(sizeof(*info)); memset(info, 0, sizeof(*info)); - info->intf = (config != NULL) ? config : &defintrf; + info->intf = (device->static_config != NULL) ? device->static_config : &defintrf; /* Set up the chips */ diff --git a/src/emu/sound/k053260.c b/src/emu/sound/k053260.c index f082b5c6bac..945a1213989 100644 --- a/src/emu/sound/k053260.c +++ b/src/emu/sound/k053260.c @@ -211,7 +211,7 @@ static SND_START( k053260 ) /* Initialize our chip structure */ ic->device = device; - ic->intf = (config != NULL) ? config : &defintrf; + ic->intf = (device->static_config != NULL) ? device->static_config : &defintrf; ic->mode = 0; ic->rom = device->region; diff --git a/src/emu/sound/k054539.c b/src/emu/sound/k054539.c index 69e7d57391b..eca42424b44 100644 --- a/src/emu/sound/k054539.c +++ b/src/emu/sound/k054539.c @@ -642,7 +642,7 @@ static SND_START( k054539 ) info->k054539_gain[i] = 1.0; info->k054539_flags = K054539_RESET_FLAGS; - info->intf = (config != NULL) ? config : &defintrf; + info->intf = (device->static_config != NULL) ? device->static_config : &defintrf; /* I've tried various equations on volume control but none worked consistently. diff --git a/src/emu/sound/msm5205.c b/src/emu/sound/msm5205.c index 80a76116a50..27fd3562652 100644 --- a/src/emu/sound/msm5205.c +++ b/src/emu/sound/msm5205.c @@ -179,7 +179,7 @@ static SND_START( msm5205 ) sndintrf_register_token(voice); /* save a global pointer to our interface */ - voice->intf = config; + voice->intf = device->static_config; voice->device = device; voice->clock = clock; diff --git a/src/emu/sound/msm5232.c b/src/emu/sound/msm5232.c index 249be4e314b..a92f0c24bfe 100644 --- a/src/emu/sound/msm5232.c +++ b/src/emu/sound/msm5232.c @@ -780,7 +780,7 @@ static STREAM_UPDATE( MSM5232_update_one ) static SND_START( msm5232 ) { - const msm5232_interface *intf = config; + const msm5232_interface *intf = device->static_config; int rate = clock/CLOCK_RATE_DIVIDER; MSM5232 *chip; diff --git a/src/emu/sound/namco.c b/src/emu/sound/namco.c index 883906aa422..a4f147432b3 100644 --- a/src/emu/sound/namco.c +++ b/src/emu/sound/namco.c @@ -356,7 +356,7 @@ static STREAM_UPDATE( namco_update_stereo ) static SND_START( namco ) { sound_channel *voice; - const namco_interface *intf = config; + const namco_interface *intf = device->static_config; int clock_multiple; struct namco_sound *chip; diff --git a/src/emu/sound/namco52.c b/src/emu/sound/namco52.c index 4c587eda65d..ea1f23720ff 100644 --- a/src/emu/sound/namco52.c +++ b/src/emu/sound/namco52.c @@ -140,7 +140,7 @@ static SND_START( namco_52xx ) chip = auto_malloc(sizeof(*chip)); memset(chip, 0, sizeof(*chip)); - chip->intf = config; + chip->intf = device->static_config; chip->rom = device->region; chip->rom_len = device->regionbytes; diff --git a/src/emu/sound/nes_apu.c b/src/emu/sound/nes_apu.c index 839c5f71df4..58af0303bda 100644 --- a/src/emu/sound/nes_apu.c +++ b/src/emu/sound/nes_apu.c @@ -670,7 +670,7 @@ static STREAM_UPDATE( nes_psg_update_sound ) /* INITIALIZE APU SYSTEM */ static SND_START( nesapu ) { - const nes_interface *intf = config; + const nes_interface *intf = device->static_config; struct nesapu_info *info; int rate = clock / 4; int i; diff --git a/src/emu/sound/okim6258.c b/src/emu/sound/okim6258.c index 1ffa1db9757..0049bcc9c1f 100644 --- a/src/emu/sound/okim6258.c +++ b/src/emu/sound/okim6258.c @@ -184,7 +184,7 @@ static void okim6258_state_save_register(struct okim6258 *info, const device_con static SND_START( okim6258 ) { - const okim6258_interface *intf = config; + const okim6258_interface *intf = device->static_config; struct okim6258 *info; info = auto_malloc(sizeof(*info)); diff --git a/src/emu/sound/okim6295.c b/src/emu/sound/okim6295.c index d04427fece3..6e572b3d093 100644 --- a/src/emu/sound/okim6295.c +++ b/src/emu/sound/okim6295.c @@ -319,7 +319,7 @@ static void okim6295_state_save_register(struct okim6295 *info, const device_con static SND_START( okim6295 ) { - const okim6295_interface *intf = config; + const okim6295_interface *intf = device->static_config; struct okim6295 *info; int voice; int divisor = intf->pin7 ? 132 : 165; diff --git a/src/emu/sound/pokey.c b/src/emu/sound/pokey.c index 7169626debf..aeb6b89f788 100644 --- a/src/emu/sound/pokey.c +++ b/src/emu/sound/pokey.c @@ -615,8 +615,8 @@ static SND_START( pokey ) chip = auto_malloc(sizeof(*chip)); memset(chip, 0, sizeof(*chip)); - if (config) - memcpy(&chip->intf, config, sizeof(pokey_interface)); + if (device->static_config) + memcpy(&chip->intf, device->static_config, sizeof(pokey_interface)); chip->device = device; chip->clock_period = ATTOTIME_IN_HZ(clock); diff --git a/src/emu/sound/psx.c b/src/emu/sound/psx.c index 6a2792d9913..12d4436d841 100644 --- a/src/emu/sound/psx.c +++ b/src/emu/sound/psx.c @@ -259,7 +259,7 @@ static SND_START( psxspu ) chip = auto_malloc(sizeof(*chip)); memset(chip, 0, sizeof(*chip)); - chip->intf = config; + chip->intf = device->static_config; chip->device = device; chip->g_p_n_psxram = *(chip->intf->p_psxram); diff --git a/src/emu/sound/samples.c b/src/emu/sound/samples.c index 16345de00ea..4fa4e787bba 100644 --- a/src/emu/sound/samples.c +++ b/src/emu/sound/samples.c @@ -523,7 +523,7 @@ static STATE_POSTLOAD( samples_postload ) static SND_START( samples ) { int i; - const samples_interface *intf = config; + const samples_interface *intf = device->static_config; struct samples_info *info; info = auto_malloc(sizeof(*info)); diff --git a/src/emu/sound/scsp.c b/src/emu/sound/scsp.c index a70dae01e38..75972e1c5b4 100644 --- a/src/emu/sound/scsp.c +++ b/src/emu/sound/scsp.c @@ -1230,7 +1230,7 @@ static SND_START( scsp ) SCSP = auto_malloc(sizeof(*SCSP)); memset(SCSP, 0, sizeof(*SCSP)); - intf = config; + intf = device->static_config; // init the emulation SCSP_Init(device, SCSP, intf); diff --git a/src/emu/sound/segapcm.c b/src/emu/sound/segapcm.c index 61b8cbc6d17..779a4f25f9d 100644 --- a/src/emu/sound/segapcm.c +++ b/src/emu/sound/segapcm.c @@ -78,7 +78,7 @@ static STREAM_UPDATE( SEGAPCM_update ) static SND_START( segapcm ) { - const sega_pcm_interface *intf = config; + const sega_pcm_interface *intf = device->static_config; int mask, rom_mask, len; struct segapcm *spcm; diff --git a/src/emu/sound/sn76477.c b/src/emu/sound/sn76477.c index 3ba5f6dc41a..33eaaf8e159 100644 --- a/src/emu/sound/sn76477.c +++ b/src/emu/sound/sn76477.c @@ -2393,7 +2393,7 @@ static SND_START( sn76477 ) #if TEST_MODE == 0 - intf = (sn76477_interface *)config; + intf = (sn76477_interface *)device->static_config; #else intf = &test_interface; #endif diff --git a/src/emu/sound/snkwave.c b/src/emu/sound/snkwave.c index 621ee12337a..54ab16e41c8 100644 --- a/src/emu/sound/snkwave.c +++ b/src/emu/sound/snkwave.c @@ -103,7 +103,7 @@ static SND_START( snkwave ) { struct snkwave_sound *chip; - assert(config == 0); + assert(device->static_config == 0); chip = auto_malloc(sizeof(*chip)); memset(chip, 0, sizeof(*chip)); diff --git a/src/emu/sound/sp0250.c b/src/emu/sound/sp0250.c index 77d49e23c3e..71cb6296249 100644 --- a/src/emu/sound/sp0250.c +++ b/src/emu/sound/sp0250.c @@ -194,7 +194,7 @@ static STREAM_UPDATE( sp0250_update ) static SND_START( sp0250 ) { - const struct sp0250_interface *intf = config; + const struct sp0250_interface *intf = device->static_config; struct sp0250 *sp; sp = auto_malloc(sizeof(*sp)); diff --git a/src/emu/sound/sp0256.c b/src/emu/sound/sp0256.c index 1ce005c2419..c26ae3f60c9 100644 --- a/src/emu/sound/sp0256.c +++ b/src/emu/sound/sp0256.c @@ -1171,7 +1171,7 @@ static STREAM_UPDATE( sp0256_update ) static SND_START( sp0256 ) { - const sp0256_interface *intf = config; + const sp0256_interface *intf = device->static_config; struct sp0256 *sp; sp = auto_malloc(sizeof(*sp)); diff --git a/src/emu/sound/st0016.c b/src/emu/sound/st0016.c index 83b64ae11ce..519993ef107 100644 --- a/src/emu/sound/st0016.c +++ b/src/emu/sound/st0016.c @@ -126,7 +126,7 @@ static STREAM_UPDATE( st0016_update ) static SND_START( st0016 ) { - const st0016_interface *intf = config; + const st0016_interface *intf = device->static_config; struct st0016_info *info; info = auto_malloc(sizeof(*info)); diff --git a/src/emu/sound/tms36xx.c b/src/emu/sound/tms36xx.c index bbb4a875f33..936c7ee1152 100644 --- a/src/emu/sound/tms36xx.c +++ b/src/emu/sound/tms36xx.c @@ -494,7 +494,7 @@ static SND_START( tms36xx ) tms = auto_malloc(sizeof(*tms)); memset(tms, 0, sizeof(*tms)); - tms->intf = config; + tms->intf = device->static_config; tms->channel = stream_create(device, 0, 1, clock * 64, tms, tms36xx_sound_update); tms->samplerate = clock * 64; diff --git a/src/emu/sound/upd7759.c b/src/emu/sound/upd7759.c index 7fdb0297020..7586b2faa92 100644 --- a/src/emu/sound/upd7759.c +++ b/src/emu/sound/upd7759.c @@ -629,7 +629,7 @@ static void register_for_save(struct upd7759_chip *chip, const device_config *de static SND_START( upd7759 ) { static const upd7759_interface defintrf = { 0 }; - const upd7759_interface *intf = (config != NULL) ? config : &defintrf; + const upd7759_interface *intf = (device->static_config != NULL) ? device->static_config : &defintrf; struct upd7759_chip *chip; chip = auto_malloc(sizeof(*chip)); diff --git a/src/emu/sound/vlm5030.c b/src/emu/sound/vlm5030.c index 8cdbfd5b763..4e728063ebb 100644 --- a/src/emu/sound/vlm5030.c +++ b/src/emu/sound/vlm5030.c @@ -647,7 +647,7 @@ static SND_START( vlm5030 ) memset(chip, 0, sizeof(*chip)); chip->device = device; - chip->intf = (config != NULL) ? config : &defintrf; + chip->intf = (device->static_config != NULL) ? device->static_config : &defintrf; emulation_rate = clock / 440; diff --git a/src/emu/sound/vrender0.c b/src/emu/sound/vrender0.c index 95e64b6d0c2..0376bd315bd 100644 --- a/src/emu/sound/vrender0.c +++ b/src/emu/sound/vrender0.c @@ -102,7 +102,7 @@ static SND_START( vrender0 ) VR0 = auto_malloc(sizeof(*VR0)); memset(VR0, 0, sizeof(*VR0)); - intf=config; + intf=device->static_config; memcpy(&(VR0->Intf),intf,sizeof(vr0_interface)); memset(VR0->SOUNDREGS,0,sizeof(VR0->SOUNDREGS)); diff --git a/src/emu/sound/x1_010.c b/src/emu/sound/x1_010.c index 0d00d72fefe..3ac261aef90 100644 --- a/src/emu/sound/x1_010.c +++ b/src/emu/sound/x1_010.c @@ -194,7 +194,7 @@ static STREAM_UPDATE( seta_update ) static SND_START( x1_010 ) { int i; - const x1_010_interface *intf = config; + const x1_010_interface *intf = device->static_config; struct x1_010_info *info; info = auto_malloc(sizeof(*info)); diff --git a/src/emu/sound/ymf271.c b/src/emu/sound/ymf271.c index 5bc88676a1b..043c4fff619 100644 --- a/src/emu/sound/ymf271.c +++ b/src/emu/sound/ymf271.c @@ -1750,7 +1750,7 @@ static SND_START( ymf271 ) chip->device = device; chip->clock = clock; - intf = (config != NULL) ? config : &defintrf; + intf = (device->static_config != NULL) ? device->static_config : &defintrf; ymf271_init(device, chip, device->region, intf->irq_callback, intf->ext_read, intf->ext_write); chip->stream = stream_create(device, 0, 2, clock/384, chip, ymf271_update); diff --git a/src/emu/sound/ymf278b.c b/src/emu/sound/ymf278b.c index 28ad89280d3..06dca0b966a 100644 --- a/src/emu/sound/ymf278b.c +++ b/src/emu/sound/ymf278b.c @@ -675,7 +675,7 @@ static SND_START( ymf278b ) chip = auto_malloc(sizeof(*chip)); memset(chip, 0, sizeof(*chip)); - intf = (config != NULL) ? config : &defintrf; + intf = (device->static_config != NULL) ? device->static_config : &defintrf; ymf278b_init(device->machine, chip, device->region, intf->irq_callback, clock); chip->stream = stream_create(device, 0, 2, clock/768, chip, ymf278b_pcm_update); diff --git a/src/emu/sound/ymz280b.c b/src/emu/sound/ymz280b.c index 905032a842f..8f53b53130d 100644 --- a/src/emu/sound/ymz280b.c +++ b/src/emu/sound/ymz280b.c @@ -630,7 +630,7 @@ static STREAM_UPDATE( ymz280b_update ) static SND_START( ymz280b ) { static const ymz280b_interface defintrf = { 0 }; - const ymz280b_interface *intf = (config != NULL) ? config : &defintrf; + const ymz280b_interface *intf = (device->static_config != NULL) ? device->static_config : &defintrf; struct YMZ280BChip *chip; chip = auto_malloc(sizeof(*chip)); |