Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-04 17:38:08 +03:00
Code Issues Actions 36 Packages Projects Releases Wiki Activity

Updated structure and naming conventions of the following sound interfaces.

Browse Source 
struct CustomSound_interface to custom_sound_interface
struct Samplesinterface to samples_interface
struct SN76477interface to SN76477_interface
struct AY8910interface to AY8910_interface
This commit is contained in:
Derrick Renaud 2008-08-08 01:50:00 +00:00
parent 3f73ea77f0
commit cc94c8207d
258 changed files with 597 additions and 576 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/emu/audit.c
View File

@ -130,7 +130,7 @@ int audit_samples(core_options *options, const game_driver *gamedrv, audit_recor
for (sndnum = 0; sndnum < ARRAY_LENGTH(config->sound); sndnum++)
if (config->sound[sndnum].type == SOUND_SAMPLES)
{
const struct Samplesinterface *intf = (const struct Samplesinterface *)config->sound[sndnum].config;
const samples_interface *intf = (const samples_interface *)config->sound[sndnum].config;
if (intf->samplenames != NULL)
{
@ -155,7 +155,7 @@ int audit_samples(core_options *options, const game_driver *gamedrv, audit_recor
for (sndnum = 0; sndnum < ARRAY_LENGTH(config->sound); sndnum++)
if (config->sound[sndnum].type == SOUND_SAMPLES)
{
const struct Samplesinterface *intf = (const struct Samplesinterface *)config->sound[sndnum].config;
const samples_interface *intf = (const samples_interface *)config->sound[sndnum].config;
const char *sharedname = NULL;
if (intf->samplenames != NULL)

2
src/emu/clifront.c
View File

@ -565,7 +565,7 @@ int cli_info_listsamples(core_options *options, const char *gamename)
for (sndnum = 0; sndnum < MAX_SOUND && config->sound[sndnum].type != SOUND_DUMMY; sndnum++)
if (config->sound[sndnum].type == SOUND_SAMPLES)
{
const char *const *samplenames = ((const struct Samplesinterface *)config->sound[sndnum].config)->samplenames;
const char *const *samplenames = ((const samples_interface *)config->sound[sndnum].config)->samplenames;
int sampnum;
/* if the list is legit, walk it and print the sample info */

4
src/emu/info.c
View File

@ -499,7 +499,7 @@ static void print_game_sampleof(FILE *out, const game_driver *game, const machin
for (sndnum = 0; sndnum < ARRAY_LENGTH(config->sound) && config->sound[sndnum].type != SOUND_DUMMY; sndnum++)
if (config->sound[sndnum].type == SOUND_SAMPLES)
{
const char *const *samplenames = ((const struct Samplesinterface *)config->sound[sndnum].config)->samplenames;
const char *const *samplenames = ((const samples_interface *)config->sound[sndnum].config)->samplenames;
if (samplenames != NULL)
{
int sampnum;
@ -533,7 +533,7 @@ static void print_game_sample(FILE *out, const game_driver *game, const machine_
for (sndnum = 0; sndnum < ARRAY_LENGTH(config->sound) && config->sound[sndnum].type != SOUND_DUMMY; sndnum++)
if (config->sound[sndnum].type == SOUND_SAMPLES)
{
const char *const *samplenames = ((const struct Samplesinterface *)config->sound[sndnum].config)->samplenames;
const char *const *samplenames = ((const samples_interface *)config->sound[sndnum].config)->samplenames;
if (samplenames != NULL)
{
int sampnum;

6
src/emu/machine/laserdsc.c
View File

@ -304,7 +304,7 @@ static void read_track_data(laserdisc_state *ld);
static void process_track_data(const device_config *device);
static void fake_metadata(UINT32 track, UINT8 which, vbi_metadata *metadata);
static void render_display(UINT16 *videodata, UINT32 rowpixels, UINT32 width, int frame);
static void *custom_start(int clock, const struct CustomSound_interface *config);
static void *custom_start(int clock, const custom_sound_interface *config);
static void custom_stream_callback(void *param, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
/* Pioneer PR-7820 implementation */
@ -351,7 +351,7 @@ static void vp932_state_changed(laserdisc_state *ld, UINT8 oldstate);
GLOBAL VARIABLES
***************************************************************************/
const struct CustomSound_interface laserdisc_custom_interface =
const custom_sound_interface laserdisc_custom_interface =
{
custom_start
};
@ -1484,7 +1484,7 @@ static void render_display(UINT16 *videodata, UINT32 rowpixels, UINT32 width, in
for laserdiscs
-------------------------------------------------*/
static void *custom_start(int clock, const struct CustomSound_interface *config)
static void *custom_start(int clock, const custom_sound_interface *config)
{
sound_token *token = auto_malloc(sizeof(*token));
token->stream = stream_create(0, 2, 48000, token, custom_stream_callback);

4
src/emu/machine/laserdsc.h
View File

@ -14,6 +14,8 @@
#ifndef __LASERDSC_H__
#define __LASERDSC_H__
#include "sound/custom.h"
/***************************************************************************
@ -92,7 +94,7 @@ struct _laserdisc_config
GLOBAL VARIABLES
***************************************************************************/
extern const struct CustomSound_interface laserdisc_custom_interface;
extern const custom_sound_interface laserdisc_custom_interface;

2
src/emu/sound/2203intf.h
View File

@ -5,7 +5,7 @@
struct YM2203interface
{
const struct AY8910interface ay8910_intf;
const AY8910_interface ay8910_intf;
void (*handler)(running_machine *machine, int irq);
};

2
src/emu/sound/2608intf.h
View File

@ -6,7 +6,7 @@
struct YM2608interface
{
const struct AY8910interface ay8910_intf;
const AY8910_interface ay8910_intf;
void ( *handler )( running_machine *machine, int irq ); /* IRQ handler for the YM2608 */
};

4
src/emu/sound/2610intf.c
View File

@ -123,7 +123,7 @@ static STATE_POSTLOAD( ym2610_postload )
static void *ym2610_start(const char *tag, int sndindex, int clock, const void *config)
{
static const struct YM2610interface generic_2610 = { 0 };
static const struct AY8910interface generic_ay8910 =
static const AY8910_interface generic_ay8910 =
{
AY8910_LEGACY_OUTPUT | AY8910_SINGLE_OUTPUT,
AY8910_DEFAULT_LOADS,
@ -189,7 +189,7 @@ static void ym2610b_stream_update(void *param, stream_sample_t **inputs, stream_
static void *ym2610b_start(const char *tag, int sndindex, int clock, const void *config)
{
static const struct YM2610interface generic_2610 = { 0 };
static const struct AY8910interface generic_ay8910 =
static const AY8910_interface generic_ay8910 =
{
AY8910_LEGACY_OUTPUT | AY8910_SINGLE_OUTPUT,
AY8910_DEFAULT_LOADS,

12
src/emu/sound/ay8910.c
View File

@ -164,7 +164,7 @@ struct _ay8910_context
int streams;
int ready;
sound_stream *channel;
const struct AY8910interface *intf;
const AY8910_interface *intf;
INT32 register_latch;
UINT8 regs[16];
INT32 last_enable;
@ -657,7 +657,7 @@ static void ay8910_statesave(ay8910_context *psg, int sndindex)
*
*************************************/
void *ay8910_start_ym(sound_type chip_type, int sndindex, int clock, const struct AY8910interface *intf)
void *ay8910_start_ym(sound_type chip_type, int sndindex, int clock, const AY8910_interface *intf)
{
ay8910_context *info;
@ -818,25 +818,25 @@ int ay8910_read_ym(void *chip)
static void *ay8910_start(const char *tag, int sndindex, int clock, const void *config)
{
static const struct AY8910interface generic_ay8910 =
static const AY8910_interface generic_ay8910 =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
NULL, NULL, NULL, NULL
};
const struct AY8910interface *intf = (config ? config : &generic_ay8910);
const AY8910_interface *intf = (config ? config : &generic_ay8910);
return ay8910_start_ym(SOUND_AY8910, sndindex+16, clock, intf);
}
static void *ym2149_start(const char *tag, int sndindex, int clock, const void *config)
{
static const struct AY8910interface generic_ay8910 =
static const AY8910_interface generic_ay8910 =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
NULL, NULL, NULL, NULL
};
const struct AY8910interface *intf = (config ? config : &generic_ay8910);
const AY8910_interface *intf = (config ? config : &generic_ay8910);
return ay8910_start_ym(SOUND_YM2149, sndindex+16, clock, intf);
}

8
src/emu/sound/ay8910.h
View File

@ -56,10 +56,11 @@ YMZ294: 0 I/O port
* mixing modul (i.e. mpatrol ties 6 channels from
* AY-3-8910 together). Do not use it now.
*/
/* TODO: implement mixing modul */
/* TODO: implement mixing module */
#define AY8910_RAW_OUTPUT (8)
struct AY8910interface
typedef struct _AY8910_interface AY8910_interface;
struct _AY8910_interface
{
int flags; /* Flags */
int res_load[3]; /* Load on channel in ohms */
@ -69,6 +70,7 @@ struct AY8910interface
write8_machine_func portBwrite;
};
void ay8910_set_volume(int chip,int channel,int volume);
@ -122,7 +124,7 @@ WRITE16_HANDLER( AY8910_write_port_4_msb_w );
/*********** An interface for SSG of YM2203 ***********/
void *ay8910_start_ym(sound_type chip_type, int sndindex, int clock, const struct AY8910interface *intf);
void *ay8910_start_ym(sound_type chip_type, int sndindex, int clock, const AY8910_interface *intf);
void ay8910_stop_ym(void *chip);
void ay8910_reset_ym(void *chip);

2
src/emu/sound/custom.c
View File

@ -4,7 +4,7 @@
struct custom_info
{
const struct CustomSound_interface *intf;
const custom_sound_interface *intf;
void * token;
};

5
src/emu/sound/custom.h
View File

@ -1,9 +1,10 @@
#ifndef CUSTOM_H
#define CUSTOM_H
struct CustomSound_interface
typedef struct _custom_sound_interface custom_sound_interface;
struct _custom_sound_interface
{
void *(*start)(int clock, const struct CustomSound_interface *config);
void *(*start)(int clock, const custom_sound_interface *config);
void (*stop)(void *token);
void (*reset)(void *token);
void *extra_data;

2
src/emu/sound/samples.c
View File

@ -532,7 +532,7 @@ static STATE_POSTLOAD( samples_postload )
static void *samples_start(const char *tag, int sndindex, int clock, const void *config)
{
int i;
const struct Samplesinterface *intf = config;
const samples_interface *intf = config;
struct samples_info *info;
info = auto_malloc(sizeof(*info));

3
src/emu/sound/samples.h
View File

@ -14,7 +14,8 @@ struct loaded_samples
struct loaded_sample sample[1]; /* array of samples */
};
struct Samplesinterface
typedef struct _samples_interface samples_interface;
struct _samples_interface
{
int channels; /* number of discrete audio channels needed */
const char *const *samplenames;

6
src/emu/sound/sn76477.c
View File

@ -98,7 +98,7 @@
#if TEST_MODE
#include "input.h"
static const struct SN76477interface empty_interface =
static const SN76477_interface empty_interface =
{
0, /* 4 noise_clock_res */
0, /* 5 filter_res */
@ -2390,11 +2390,11 @@ static void state_save_register(struct SN76477 *sn)
static void *sn76477_start(const char *tag, int sndindex, int clock, const void *config)
{
struct SN76477 *sn;
struct SN76477interface *intf;
SN76477_interface *intf;
#if TEST_MODE == 0
intf = (struct SN76477interface *)config;
intf = (SN76477_interface *)config;
#else
intf = &test_interface;
#endif

3
src/emu/sound/sn76477.h
View File

@ -46,7 +46,8 @@
*
*****************************************************************************/
struct SN76477interface
typedef struct _SN76477_interface SN76477_interface;
struct _SN76477_interface
{
double noise_clock_res;
double noise_filter_res;

4
src/mame/audio/8080bw.c
View File

@ -109,7 +109,7 @@ static const char *const lrescue_sample_names[] =
0
};
const struct Samplesinterface lrescue_samples_interface =
const samples_interface lrescue_samples_interface =
{
4, /* 4 channels */
lrescue_sample_names
@ -665,7 +665,7 @@ WRITE8_HANDLER( polaris_sh_port_3_w )
#define SCHASER_4V SCHASER_HSYNC /2 /4
#define SCHASER_8V SCHASER_HSYNC /2 /8
const struct SN76477interface schaser_sn76477_interface =
const SN76477_interface schaser_sn76477_interface =
{
RES_K( 47), /* 4 noise_res */
RES_K(330), /* 5 filter_res */

2
src/mame/audio/amiga.c
View File

@ -262,7 +262,7 @@ static void amiga_stream_update(void *param, stream_sample_t **inputs, stream_sa
*
*************************************/
void *amiga_sh_start(int clock, const struct CustomSound_interface *config)
void *amiga_sh_start(int clock, const custom_sound_interface *config)
{
int i;

4
src/mame/audio/astrof.c
View File

@ -174,7 +174,7 @@ static const char *const astrof_sample_names[] =
};
static const struct Samplesinterface astrof_samples_interface =
static const samples_interface astrof_samples_interface =
{
4, /* 4 channels */
astrof_sample_names
@ -237,7 +237,7 @@ WRITE8_HANDLER( tomahawk_audio_w )
}
static const struct SN76477interface tomahawk_sn76477_interface =
static const SN76477_interface tomahawk_sn76477_interface =
{
0, /* 4 noise_res (N/C) */
0, /* 5 filter_res (N/C) */

2
src/mame/audio/attckufo.c
View File

@ -208,7 +208,7 @@ static void attckufo_update (void *param,stream_sample_t **inputs, stream_sample
/************************************/
void *attckufo_custom_start(int clock, const struct CustomSound_interface *config)
void *attckufo_custom_start(int clock, const custom_sound_interface *config)
{
int i;

2
src/mame/audio/blockade.c
View File

@ -62,7 +62,7 @@ static const char *const blockade_sample_names[] =
0
};
const struct Samplesinterface blockade_samples_interface =
const samples_interface blockade_samples_interface =
{
1, /* 1 channel */
blockade_sample_names

2
src/mame/audio/bzone.c
View File

@ -271,7 +271,7 @@ static void bzone_sound_update(void *param, stream_sample_t **inputs, stream_sam
}
}
void *bzone_sh_start(int clock, const struct CustomSound_interface *config)
void *bzone_sh_start(int clock, const custom_sound_interface *config)
{
int i;

2
src/mame/audio/carnival.c
View File

@ -98,7 +98,7 @@ static const char *const carnival_sample_names[] =
};
static const struct Samplesinterface carnival_samples_interface =
static const samples_interface carnival_samples_interface =
{
10,
carnival_sample_names

4
src/mame/audio/cclimber.c
View File

@ -77,7 +77,7 @@ WRITE8_HANDLER( cclimber_sample_trigger_w )
}
const struct AY8910interface cclimber_ay8910_interface =
const AY8910_interface cclimber_ay8910_interface =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
@ -87,7 +87,7 @@ const struct AY8910interface cclimber_ay8910_interface =
NULL
};
const struct Samplesinterface cclimber_samples_interface =
const samples_interface cclimber_samples_interface =
{
1,
NULL,

32
src/mame/audio/cinemat.c
View File

@ -151,7 +151,7 @@ static const char *const spacewar_sample_names[] =
0
};
static const struct Samplesinterface spacewar_samples_interface =
static const samples_interface spacewar_samples_interface =
{
8,
spacewar_sample_names
@ -228,7 +228,7 @@ static const char *const barrier_sample_names[] =
0
};
static const struct Samplesinterface barrier_samples_interface =
static const samples_interface barrier_samples_interface =
{
3,
barrier_sample_names
@ -279,7 +279,7 @@ static const char *const speedfrk_sample_names[] =
NULL
};
static const struct Samplesinterface speedfrk_samples_interface =
static const samples_interface speedfrk_samples_interface =
{
1,
speedfrk_sample_names
@ -342,7 +342,7 @@ static const char *const starhawk_sample_names[] =
NULL
};
static const struct Samplesinterface starhawk_samples_interface =
static const samples_interface starhawk_samples_interface =
{
5,
starhawk_sample_names
@ -416,7 +416,7 @@ static const char *const sundance_sample_names[] =
0
};
static const struct Samplesinterface sundance_samples_interface =
static const samples_interface sundance_samples_interface =
{
6,
sundance_sample_names
@ -484,7 +484,7 @@ static const char *const tailg_sample_names[] =
NULL
};
static const struct Samplesinterface tailg_samples_interface =
static const samples_interface tailg_samples_interface =
{
6,
tailg_sample_names
@ -570,7 +570,7 @@ static const char *const warrior_sample_names[] =
NULL
};
static const struct Samplesinterface warrior_samples_interface =
static const samples_interface warrior_samples_interface =
{
5,
warrior_sample_names
@ -639,7 +639,7 @@ static const char *const armora_sample_names[] =
NULL
};
static const struct Samplesinterface armora_samples_interface =
static const samples_interface armora_samples_interface =
{
7,
armora_sample_names
@ -738,7 +738,7 @@ static const char *const ripoff_sample_names[] =
NULL
};
static const struct Samplesinterface ripoff_samples_interface =
static const samples_interface ripoff_samples_interface =
{
6,
ripoff_sample_names
@ -823,7 +823,7 @@ static const char *const starcas_sample_names[] =
0
};
static const struct Samplesinterface starcas_samples_interface =
static const samples_interface starcas_samples_interface =
{
8,
starcas_sample_names
@ -935,7 +935,7 @@ static const char *const solarq_sample_names[] =
NULL
};
static const struct Samplesinterface solarq_samples_interface =
static const samples_interface solarq_samples_interface =
{
8,
solarq_sample_names
@ -1074,7 +1074,7 @@ static const char *const boxingb_sample_names[] =
NULL
};
static const struct Samplesinterface boxingb_samples_interface =
static const samples_interface boxingb_samples_interface =
{
12,
boxingb_sample_names
@ -1203,7 +1203,7 @@ static const char *const wotw_sample_names[] =
0
};
static const struct Samplesinterface wotw_samples_interface =
static const samples_interface wotw_samples_interface =
{
8,
wotw_sample_names
@ -1315,7 +1315,7 @@ static const char *const wotwc_sample_names[] =
0
};
static const struct Samplesinterface wotwc_samples_interface =
static const samples_interface wotwc_samples_interface =
{
8,
wotwc_sample_names
@ -1469,7 +1469,7 @@ static WRITE8_HANDLER( sound_output_w )
}
static const struct AY8910interface demon_ay8910_interface_1 =
static const AY8910_interface demon_ay8910_interface_1 =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
@ -1479,7 +1479,7 @@ static const struct AY8910interface demon_ay8910_interface_1 =
sound_portb_w
};
static const struct AY8910interface demon_ay8910_interface_3 =
static const AY8910_interface demon_ay8910_interface_3 =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,

8
src/mame/audio/circus.c
View File

@ -13,7 +13,7 @@ static const char *const circus_sample_names[] =
0
};
const struct Samplesinterface circus_samples_interface =
const samples_interface circus_samples_interface =
{
3, /* 3 channels */
circus_sample_names
@ -26,7 +26,7 @@ static const char *const crash_sample_names[] =
0
};
const struct Samplesinterface crash_samples_interface =
const samples_interface crash_samples_interface =
{
1, /* 1 channel */
crash_sample_names
@ -42,7 +42,7 @@ static const char *const ripcord_sample_names[] =
0
};
const struct Samplesinterface ripcord_samples_interface =
const samples_interface ripcord_samples_interface =
{
4, /* 4 channels */
ripcord_sample_names
@ -59,7 +59,7 @@ static const char *const robotbwl_sample_names[] =
0
};
const struct Samplesinterface robotbwl_samples_interface =
const samples_interface robotbwl_samples_interface =
{
5, /* 5 channels */
robotbwl_sample_names

2
src/mame/audio/cps3.c
View File

@ -97,7 +97,7 @@ static void cps3_stream_update(void *param, stream_sample_t **inputs, stream_sam
}
void *cps3_sh_start(int clock, const struct CustomSound_interface *config)
void *cps3_sh_start(int clock, const custom_sound_interface *config)
{
/* Allocate the stream */
cps3_stream = stream_create(0, 2, clock / 384, NULL, cps3_stream_update);

4
src/mame/audio/crbaloon.c
View File

@ -136,7 +136,7 @@ DISCRETE_SOUND_END
static const struct SN76477interface sn76477_interface =
static const SN76477_interface crbaloon_sn76477_interface =
{
RES_K( 47), /* 4 noise_res */
RES_K(330), /* 5 filter_res */
@ -170,7 +170,7 @@ MACHINE_DRIVER_START( crbaloon_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("sn", SN76477, 0)
MDRV_SOUND_CONFIG(sn76477_interface)
MDRV_SOUND_CONFIG(crbaloon_sn76477_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MDRV_SOUND_ADD("discrete", DISCRETE, 0)

2
src/mame/audio/depthch.c
View File

@ -29,7 +29,7 @@ static const char *const depthch_sample_names[] =
};
static const struct Samplesinterface depthch_samples_interface =
static const samples_interface depthch_samples_interface =
{
4,
depthch_sample_names

2
src/mame/audio/dkong.c
View File

@ -996,7 +996,7 @@ Addresses found at @0x510, cpu2
0
};
static const struct Samplesinterface radarsc1_samples_interface =
static const samples_interface radarsc1_samples_interface =
{
8,
radarsc1_sample_names

12
src/mame/audio/exidy.c
View File

@ -338,7 +338,7 @@ static void exidy_stream_update(void *param, stream_sample_t **inputs, stream_sa
*
*************************************/
void *exidy_sh6840_sh_start(int clock, const struct CustomSound_interface *config)
void *exidy_sh6840_sh_start(int clock, const custom_sound_interface *config)
{
int sample_rate = SH8253_CLOCK;
@ -626,7 +626,7 @@ static const pia6821_interface venture_pia_1_intf =
};
static void *venture_common_sh_start(int clock, const struct CustomSound_interface *config, int _has_tms5220)
static void *venture_common_sh_start(int clock, const custom_sound_interface *config, int _has_tms5220)
{
int i;
@ -652,7 +652,7 @@ static void *venture_common_sh_start(int clock, const struct CustomSound_interfa
}
static void *venture_sh_start(int clock, const struct CustomSound_interface *config)
static void *venture_sh_start(int clock, const custom_sound_interface *config)
{
pia_config(0, &venture_pia_0_intf);
pia_config(1, &venture_pia_1_intf);
@ -676,7 +676,7 @@ static void venture_sh_reset(void *token)
}
static const struct CustomSound_interface venture_custom_interface =
static const custom_sound_interface venture_custom_interface =
{
venture_sh_start,
0,
@ -848,7 +848,7 @@ static const pia6821_interface victory_pia_e5_intf =
};
static void *victory_sh_start(int clock, const struct CustomSound_interface *config)
static void *victory_sh_start(int clock, const custom_sound_interface *config)
{
pia_config(1, &victory_pia_e5_intf);
@ -873,7 +873,7 @@ static void victory_sh_reset(void *token)
}
static const struct CustomSound_interface victory_custom_interface =
static const custom_sound_interface victory_custom_interface =
{
victory_sh_start,
0,

4
src/mame/audio/exidy440.c
View File

@ -131,7 +131,7 @@ static void fir_filter(INT32 *input, INT16 *output, int count);
*
*************************************/
static void *exidy440_sh_start(int clock, const struct CustomSound_interface *config)
static void *exidy440_sh_start(int clock, const custom_sound_interface *config)
{
int i, length;
@ -914,7 +914,7 @@ ADDRESS_MAP_END
*
*************************************/
static const struct CustomSound_interface custom_interface =
static const custom_sound_interface custom_interface =
{
exidy440_sh_start,
exidy440_sh_stop

2
src/mame/audio/flower.c
View File

@ -155,7 +155,7 @@ static void flower_update_mono(void *param, stream_sample_t **inputs, stream_sam
void * flower_sh_start(int clock, const struct CustomSound_interface *config)
void * flower_sh_start(int clock, const custom_sound_interface *config)
{
sound_channel *voice;
int i;

4
src/mame/audio/galaxian.c
View File

@ -554,14 +554,14 @@ static TIMER_CALLBACK( galaxian_sh_update )
}
const struct Samplesinterface galaxian_samples_interface =
const samples_interface galaxian_samples_interface =
{
5,
NULL,
galaxian_sh_start
};
const struct Samplesinterface galaxian_custom_interface =
const samples_interface galaxian_custom_interface =
{
5,
NULL,

2
src/mame/audio/geebee.c
View File

@ -112,7 +112,7 @@ static void geebee_sound_update(void *param, stream_sample_t **inputs, stream_sa
}
}
void *geebee_sh_start(int clock, const struct CustomSound_interface *config)
void *geebee_sh_start(int clock, const custom_sound_interface *config)
{
int i;

2
src/mame/audio/gomoku.c
View File

@ -163,7 +163,7 @@ static void gomoku_update_mono(void *param, stream_sample_t **inputs, stream_sam
void *gomoku_sh_start(int clock, const struct CustomSound_interface *config)
void *gomoku_sh_start(int clock, const custom_sound_interface *config)
{
sound_channel *voice;
int ch;

2
src/mame/audio/gridlee.c
View File

@ -64,7 +64,7 @@ static void gridlee_stream_update(void *param, stream_sample_t **inputs, stream_
*
*************************************/
void *gridlee_sh_start(int clock, const struct CustomSound_interface *config)
void *gridlee_sh_start(int clock, const custom_sound_interface *config)
{
/* allocate the stream */
gridlee_stream = stream_create(0, 1, Machine->sample_rate, NULL, gridlee_stream_update);

2
src/mame/audio/invinco.c
View File

@ -35,7 +35,7 @@ static const char *const invinco_sample_names[] =
};
static const struct Samplesinterface invinco_samples_interface =
static const samples_interface invinco_samples_interface =
{
8,
invinco_sample_names

4
src/mame/audio/irem.c
View File

@ -197,7 +197,7 @@ static void adpcm_int(running_machine *machine, int data)
* and put with 470 KOhm to gnd.
* The following is a approximation */
static const struct AY8910interface irem_ay8910_interface_1 =
static const AY8910_interface irem_ay8910_interface_1 =
{
AY8910_SINGLE_OUTPUT,
{470, 0, 0},
@ -207,7 +207,7 @@ static const struct AY8910interface irem_ay8910_interface_1 =
ay8910_0_portb_w
};
static const struct AY8910interface irem_ay8910_interface_2 =
static const AY8910_interface irem_ay8910_interface_2 =
{
AY8910_SINGLE_OUTPUT,
{470, 0, 0},

6
src/mame/audio/leland.c
View File

@ -133,7 +133,7 @@ static void leland_update(void *param, stream_sample_t **inputs, stream_sample_t
}
void *leland_sh_start(int clock, const struct CustomSound_interface *config)
void *leland_sh_start(int clock, const custom_sound_interface *config)
{
/* reset globals */
dac_buffer[0] = dac_buffer[1] = NULL;
@ -502,7 +502,7 @@ static void leland_80186_extern_update(void *param, stream_sample_t **inputs, st
static TIMER_CALLBACK( internal_timer_int );
static TIMER_CALLBACK( dma_timer_callback );
void *leland_80186_sh_start(int clock, const struct CustomSound_interface *config)
void *leland_80186_sh_start(int clock, const custom_sound_interface *config)
{
int i;
@ -543,7 +543,7 @@ void *leland_80186_sh_start(int clock, const struct CustomSound_interface *confi
}
void *redline_80186_sh_start(int clock, const struct CustomSound_interface *config)
void *redline_80186_sh_start(int clock, const custom_sound_interface *config)
{
void *result = leland_80186_sh_start(clock, config);
is_redline = 1;

4
src/mame/audio/mario.c
View File

@ -428,7 +428,7 @@ ADDRESS_MAP_END
*
*************************************/
static const struct AY8910interface ay8910_interface =
static const AY8910_interface ay8910_config =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
@ -476,7 +476,7 @@ MACHINE_DRIVER_START( masao_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("ay", AY8910, 14318000/6)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_CONFIG(ay8910_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END

4
src/mame/audio/mcr.c
View File

@ -444,7 +444,7 @@ void ssio_set_custom_output(int which, int mask, write8_machine_func handler)
/********* sound interfaces ***********/
static const struct AY8910interface ssio_ay8910_interface_1 =
static const AY8910_interface ssio_ay8910_interface_1 =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
@ -454,7 +454,7 @@ static const struct AY8910interface ssio_ay8910_interface_1 =
ssio_portb0_w
};
static const struct AY8910interface ssio_ay8910_interface_2 =
static const AY8910_interface ssio_ay8910_interface_2 =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,

22
src/mame/audio/mw8080bw.c
View File

@ -127,7 +127,7 @@ static const char *const seawolf_sample_names[] =
};
static const struct Samplesinterface seawolf_samples_interface =
static const samples_interface seawolf_samples_interface =
{
5, /* 5 channels */
seawolf_sample_names
@ -187,7 +187,7 @@ static const char *const gunfight_sample_names[] =
};
static const struct Samplesinterface gunfight_samples_interface =
static const samples_interface gunfight_samples_interface =
{
1, /* 1 channel */
gunfight_sample_names
@ -1606,7 +1606,7 @@ static const char *const gmissile_sample_names[] =
};
static const struct Samplesinterface gmissile_samples_interface =
static const samples_interface gmissile_samples_interface =
{
1, /* 1 channel */
gmissile_sample_names
@ -1704,7 +1704,7 @@ static const char *const m4_sample_names[] =
};
static const struct Samplesinterface m4_samples_interface =
static const samples_interface m4_samples_interface =
{
2, /* 2 channels */
m4_sample_names
@ -1992,7 +1992,7 @@ static const char *const clowns_sample_names[] =
0
};
static const struct Samplesinterface clowns_samples_interface =
static const samples_interface clowns_samples_interface =
{
1, /* 1 channel */
clowns_sample_names
@ -2177,7 +2177,7 @@ WRITE8_HANDLER( dogpatch_audio_w )
* Apr 2007, D.R.
*************************************/
static const struct SN76477interface spcenctr_sn76477_interface =
static const SN76477_interface spcenctr_sn76477_interface =
{
0, /* 4 noise_res (N/C) */
0, /* 5 filter_res (N/C) */
@ -2759,7 +2759,7 @@ static const char *const phantom2_sample_names[] =
};
static const struct Samplesinterface phantom2_samples_interface =
static const samples_interface phantom2_samples_interface =
{
2, /* 2 channels */
phantom2_sample_names
@ -2993,7 +2993,7 @@ WRITE8_HANDLER( bowler_audio_6_w )
*
*************************************/
static const struct SN76477interface invaders_sn76477_interface =
static const SN76477_interface invaders_sn76477_interface =
{
0, /* 4 noise_res (N/C) */
0, /* 5 filter_res (N/C) */
@ -3038,7 +3038,7 @@ static const char *const invaders_sample_names[] =
};
static const struct Samplesinterface invaders_samples_interface =
static const samples_interface invaders_samples_interface =
{
6, /* 6 channels */
invaders_sample_names
@ -3816,7 +3816,7 @@ WRITE8_HANDLER( blueshrk_audio_w )
*
*************************************/
static const struct SN76477interface invad2ct_p1_sn76477_interface =
static const SN76477_interface invad2ct_p1_sn76477_interface =
{
0, /* 4 noise_res (N/C) */
0, /* 5 filter_res (N/C) */
@ -3844,7 +3844,7 @@ static const struct SN76477interface invad2ct_p1_sn76477_interface =
};
static const struct SN76477interface invad2ct_p2_sn76477_interface =
static const SN76477_interface invad2ct_p2_sn76477_interface =
{
0, /* 4 noise_res (N/C) */
0, /* 5 filter_res (N/C) */

4
src/mame/audio/n8080.c
View File

@ -30,7 +30,7 @@ static int mono_flop[3];
static const struct SN76477interface sheriff_sn76477_interface =
static const SN76477_interface sheriff_sn76477_interface =
{
RES_K(36) , /* 04 */
RES_K(100) , /* 05 */
@ -58,7 +58,7 @@ static const struct SN76477interface sheriff_sn76477_interface =
};
static const struct SN76477interface spacefev_sn76477_interface =
static const SN76477_interface spacefev_sn76477_interface =
{
RES_K(36) , /* 04 */
RES_K(150) , /* 05 */

2
src/mame/audio/phoenix.c
View File

@ -426,7 +426,7 @@ WRITE8_HANDLER( phoenix_sound_control_b_w )
mm6221aa_tune_w(0, data >> 6);
}
void *phoenix_sh_start(int clock, const struct CustomSound_interface *config)
void *phoenix_sh_start(int clock, const custom_sound_interface *config)
{
int i, j;
UINT32 shiftreg;

8
src/mame/audio/pleiads.c
View File

@ -455,7 +455,7 @@ WRITE8_HANDLER( pleiads_sound_control_c_w )
sound_latch_c = data;
}
static void *common_sh_start(const struct CustomSound_interface *config, const char *name)
static void *common_sh_start(const custom_sound_interface *config, const char *name)
{
int i, j;
UINT32 shiftreg;
@ -483,7 +483,7 @@ static void *common_sh_start(const struct CustomSound_interface *config, const c
return auto_malloc(1);
}
void *pleiads_sh_start(int clock, const struct CustomSound_interface *config)
void *pleiads_sh_start(int clock, const custom_sound_interface *config)
{
/* The real values are _unknown_!
* I took the ones from Naughty Boy / Pop Flamer
@ -544,7 +544,7 @@ void *pleiads_sh_start(int clock, const struct CustomSound_interface *config)
return common_sh_start(config, "Custom (Pleiads)");
}
void *naughtyb_sh_start(int clock, const struct CustomSound_interface *config)
void *naughtyb_sh_start(int clock, const custom_sound_interface *config)
{
/* charge 10u??? through 330K (R??) -> 3.3s */
pa5_charge_time = 3.3;
@ -601,7 +601,7 @@ void *naughtyb_sh_start(int clock, const struct CustomSound_interface *config)
return common_sh_start(config, "Custom (Naughty Boy)");
}
void *popflame_sh_start(int clock, const struct CustomSound_interface *config)
void *popflame_sh_start(int clock, const custom_sound_interface *config)
{
/* charge 10u (C63 in Pop Flamer) through 330K -> 3.3s */
pa5_charge_time = 3.3;

2
src/mame/audio/polepos.c
View File

@ -100,7 +100,7 @@ static void engine_sound_update(void *param, stream_sample_t **inputs, stream_sa
/************************************/
/* Sound handler start */
/************************************/
void *polepos_sh_start(int clock, const struct CustomSound_interface *config)
void *polepos_sh_start(int clock, const custom_sound_interface *config)
{
stream = stream_create(0, 1, OUTPUT_RATE, NULL, engine_sound_update);
sample_msb = sample_lsb = 0;

2
src/mame/audio/pulsar.c
View File

@ -52,7 +52,7 @@ static const char *const pulsar_sample_names[] =
};
static const struct Samplesinterface pulsar_samples_interface =
static const samples_interface pulsar_samples_interface =
{
12,
pulsar_sample_names

4
src/mame/audio/redalert.c
View File

@ -125,7 +125,7 @@ static WRITE8_HANDLER( redalert_ay8910_latch_2_w )
}
static const struct AY8910interface redalert_ay8910_interface =
static const AY8910_interface redalert_ay8910_interface =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
@ -311,7 +311,7 @@ static ADDRESS_MAP_START( demoneye_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static const struct AY8910interface demoneye_ay8910_interface =
static const AY8910_interface demoneye_ay8910_interface =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,

2
src/mame/audio/redbaron.c
View File

@ -169,7 +169,7 @@ static void redbaron_sound_update(void *param, stream_sample_t **inputs, stream_
}
}
void *redbaron_sh_start(int clock, const struct CustomSound_interface *config)
void *redbaron_sh_start(int clock, const custom_sound_interface *config)
{
int i;

24
src/mame/audio/rockola.c
View File

@ -55,7 +55,7 @@ static int Sound0StopOnRollover;
static UINT8 LastPort1;
const struct CustomSound_interface custom_interface =
const custom_sound_interface custom_interface =
{
rockola_sh_start
};
@ -73,7 +73,7 @@ static const char *const sasuke_sample_names[] =
0
};
const struct Samplesinterface sasuke_samples_interface =
const samples_interface sasuke_samples_interface =
{
4, /* 4 channels */
sasuke_sample_names
@ -108,7 +108,7 @@ static const char *const vanguard_sample_names[] =
0
};
const struct Samplesinterface vanguard_samples_interface =
const samples_interface vanguard_samples_interface =
{
3, /* 3 channel */
vanguard_sample_names
@ -135,14 +135,14 @@ static const char *const fantasy_sample_names[] =
0
};
const struct Samplesinterface fantasy_samples_interface =
const samples_interface fantasy_samples_interface =
{
1, /* 1 channel */
fantasy_sample_names
};
const struct SN76477interface sasuke_sn76477_intf_1 =
const SN76477_interface sasuke_sn76477_intf_1 =
{
RES_K(470), /* 4 noise_res */
RES_K(150), /* 5 filter_res */
@ -171,7 +171,7 @@ const struct SN76477interface sasuke_sn76477_intf_1 =
// ic48 GND: 2,22,26,27,28 +5V: 1,15,25
};
const struct SN76477interface sasuke_sn76477_intf_2 =
const SN76477_interface sasuke_sn76477_intf_2 =
{
RES_K(340), /* 4 noise_res */
RES_K(47), /* 5 filter_res */
@ -200,7 +200,7 @@ const struct SN76477interface sasuke_sn76477_intf_2 =
// ic51 GND: 2,26,27 +5V: 1,15,22,25,28
};
const struct SN76477interface sasuke_sn76477_intf_3 =
const SN76477_interface sasuke_sn76477_intf_3 =
{
RES_K(330), /* 4 noise_res */
RES_K(47), /* 5 filter_res */
@ -229,7 +229,7 @@ const struct SN76477interface sasuke_sn76477_intf_3 =
// ic52 GND: 2,22,27,28 +5V: 1,15,25,26
};
const struct SN76477interface satansat_sn76477_intf =
const SN76477_interface satansat_sn76477_intf =
{
RES_K(470), /* 4 noise_res */
RES_M(1.5), /* 5 filter_res */
@ -258,7 +258,7 @@ const struct SN76477interface satansat_sn76477_intf =
// ??? GND: 2,26,27 +5V: 15,25
};
const struct SN76477interface vanguard_sn76477_intf_1 =
const SN76477_interface vanguard_sn76477_intf_1 =
{
RES_K(470), /* 4 noise_res */
RES_M(1.5), /* 5 filter_res */
@ -287,7 +287,7 @@ const struct SN76477interface vanguard_sn76477_intf_1 =
// SHOT A GND: 2,9,26,27 +5V: 15,25
};
const struct SN76477interface vanguard_sn76477_intf_2 =
const SN76477_interface vanguard_sn76477_intf_2 =
{
RES_K(10), /* 4 noise_res */
RES_K(30), /* 5 filter_res */
@ -316,7 +316,7 @@ const struct SN76477interface vanguard_sn76477_intf_2 =
// SHOT B GND: 1,2,26,27 +5V: 15,25,28
};
const struct SN76477interface fantasy_sn76477_intf =
const SN76477_interface fantasy_sn76477_intf =
{
RES_K(470), /* 4 noise_res */
RES_M(1.5), /* 5 filter_res */
@ -629,7 +629,7 @@ void rockola_set_music_clock(double clock_time)
tone_clock = 0;
}
void *rockola_sh_start(int clock, const struct CustomSound_interface *config)
void *rockola_sh_start(int clock, const custom_sound_interface *config)
{
// adjusted
rockola_set_music_freq(43000);

4
src/mame/audio/scramble.c
View File

@ -378,7 +378,7 @@ static const struct TMS5110interface ad2083_tms5110_interface =
};
static const struct AY8910interface ad2083_ay8910_interface_1 =
static const AY8910_interface ad2083_ay8910_interface_1 =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
@ -388,7 +388,7 @@ static const struct AY8910interface ad2083_ay8910_interface_1 =
NULL
};
static const struct AY8910interface ad2083_ay8910_interface_2 =
static const AY8910_interface ad2083_ay8910_interface_2 =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,

14
src/mame/audio/segag80r.c
View File

@ -197,7 +197,7 @@ static const char *const astrob_sample_names[] =
};
static const struct Samplesinterface astrob_samples_interface =
static const samples_interface astrob_samples_interface =
{
11,
astrob_sample_names
@ -339,7 +339,7 @@ WRITE8_HANDLER( astrob_sound_w )
*************************************/
static SOUND_START( 005 );
static void *sega005_custom_start(int clock, const struct CustomSound_interface *config);
static void *sega005_custom_start(int clock, const custom_sound_interface *config);
static void sega005_stream_update(void *param, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
static TIMER_CALLBACK( sega005_auto_timer );
@ -412,14 +412,14 @@ static const char *const sega005_sample_names[] =
};
static const struct Samplesinterface sega005_samples_interface =
static const samples_interface sega005_samples_interface =
{
7,
sega005_sample_names
};
static const struct CustomSound_interface sega005_custom_interface =
static const custom_sound_interface sega005_custom_interface =
{
sega005_custom_start
};
@ -576,7 +576,7 @@ WRITE8_HANDLER( sega005_sound_b_w )
*
*************************************/
static void *sega005_custom_start(int clock, const struct CustomSound_interface *config)
static void *sega005_custom_start(int clock, const custom_sound_interface *config)
{
/* create the stream */
sega005_stream = stream_create(0, 1, SEGA005_COUNTER_FREQ, NULL, sega005_stream_update);
@ -653,7 +653,7 @@ static const char *const spaceod_sample_names[] =
};
static const struct Samplesinterface spaceod_samples_interface =
static const samples_interface spaceod_samples_interface =
{
11,
spaceod_sample_names
@ -778,7 +778,7 @@ static const char *const monsterb_sample_names[] =
};
static const struct Samplesinterface monsterb_samples_interface =
static const samples_interface monsterb_samples_interface =
{
2,
monsterb_sample_names

4
src/mame/audio/segasnd.c
View File

@ -640,7 +640,7 @@ static void usb_stream_update(void *param, stream_sample_t **inputs, stream_samp
}
static void *usb_start(int clock, const struct CustomSound_interface *config)
static void *usb_start(int clock, const custom_sound_interface *config)
{
filter_state temp;
int tchan, tgroup;
@ -902,7 +902,7 @@ ADDRESS_MAP_END
*
*************************************/
static const struct CustomSound_interface usb_custom_interface =
static const custom_sound_interface usb_custom_interface =
{
usb_start
};

4
src/mame/audio/seibu.c
View File

@ -168,7 +168,7 @@ static void seibu_adpcm_callback(void *param, stream_sample_t **inputs, stream_s
}
}
static void *seibu_adpcm_start(int clock, const struct CustomSound_interface *config)
static void *seibu_adpcm_start(int clock, const custom_sound_interface *config)
{
int i;
@ -472,7 +472,7 @@ const struct YM3812interface seibu_ym3812_interface =
seibu_ym3812_irqhandler
};
const struct CustomSound_interface seibu_adpcm_interface =
const custom_sound_interface seibu_adpcm_interface =
{
seibu_adpcm_start,
seibu_adpcm_stop

2
src/mame/audio/seibu.h
View File

@ -63,7 +63,7 @@ WRITE8_HANDLER( seibu_adpcm_adr_2_w );
WRITE8_HANDLER( seibu_adpcm_ctl_2_w );
extern const struct YM3812interface seibu_ym3812_interface;
extern const struct CustomSound_interface seibu_adpcm_interface;
extern const custom_sound_interface seibu_adpcm_interface;
extern const struct YM2151interface seibu_ym2151_interface;
extern const struct YM2203interface seibu_ym2203_interface;

2
src/mame/audio/snes.c
View File

@ -1136,7 +1136,7 @@ static TIMER_CALLBACK( snes_spc_timer )
}
}
void *snes_sh_start(int clock, const struct CustomSound_interface *config)
void *snes_sh_start(int clock, const custom_sound_interface *config)
{
UINT8 ii;

2
src/mame/audio/spacefb.c
View File

@ -77,7 +77,7 @@ static const char *const spacefb_sample_names[] =
};
static const struct Samplesinterface spacefb_samples_interface =
static const samples_interface spacefb_samples_interface =
{
3,
spacefb_sample_names

4
src/mame/audio/targ.c
View File

@ -174,7 +174,7 @@ static void targ_audio_start(void)
}
static const struct Samplesinterface spectar_samples_interface =
static const samples_interface spectar_samples_interface =
{
4, /* number of channel */
sample_names,
@ -182,7 +182,7 @@ static const struct Samplesinterface spectar_samples_interface =
};
static const struct Samplesinterface targ_samples_interface =
static const samples_interface targ_samples_interface =
{
4, /* number of channel */
sample_names,

2
src/mame/audio/tiamc1.c
View File

@ -280,7 +280,7 @@ static void tiamc1_sound_update(void *param, stream_sample_t **inputs, stream_sa
}
}
void *tiamc1_sh_start(int clock, const struct CustomSound_interface *config)
void *tiamc1_sh_start(int clock, const custom_sound_interface *config)
{
int i, j;

2
src/mame/audio/timeplt.c
View File

@ -152,7 +152,7 @@ ADDRESS_MAP_END
*
*************************************/
static const struct AY8910interface timeplt_ay8910_interface =
static const AY8910_interface timeplt_ay8910_interface =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,

2
src/mame/audio/triplhnt.c
View File

@ -16,7 +16,7 @@ static const char *const triplhnt_sample_names[] =
0
};
const struct Samplesinterface triplhnt_samples_interface =
const samples_interface triplhnt_samples_interface =
{
2, /* 2 channels */
triplhnt_sample_names

6
src/mame/audio/turbo.c
View File

@ -180,7 +180,7 @@ static const char *const turbo_sample_names[] =
};
static const struct Samplesinterface turbo_samples_interface =
static const samples_interface turbo_samples_interface =
{
10,
turbo_sample_names
@ -436,7 +436,7 @@ static const char *const subroc3d_sample_names[] =
};
static const struct Samplesinterface subroc3d_samples_interface =
static const samples_interface subroc3d_samples_interface =
{
12,
subroc3d_sample_names
@ -589,7 +589,7 @@ static const char *const buckrog_sample_names[]=
};
static const struct Samplesinterface buckrog_samples_interface =
static const samples_interface buckrog_samples_interface =
{
6, /* 6 channels */
buckrog_sample_names

4
src/mame/audio/tx1.c
View File

@ -274,7 +274,7 @@ static void tx1_stream_update(void *param, stream_sample_t **inputs, stream_samp
}
void *tx1_sh_start(int clock, const struct CustomSound_interface *config)
void *tx1_sh_start(int clock, const custom_sound_interface *config)
{
static const int r0[4] = { 390e3, 180e3, 180e3, 180e3 };
static const int r1[3] = { 180e3, 390e3, 56e3 };
@ -495,7 +495,7 @@ static void buggyboy_stream_update(void *param, stream_sample_t **inputs, stream
}
}
void *buggyboy_sh_start(int clock, const struct CustomSound_interface *config)
void *buggyboy_sh_start(int clock, const custom_sound_interface *config)
{
static const int resistors[4] = { 330000, 220000, 330000, 220000 };
double aweights[4];

2
src/mame/audio/vicdual.c
View File

@ -113,7 +113,7 @@ static const char *const frogs_sample_names[] =
0
};
static const struct Samplesinterface frogs_samples_interface =
static const samples_interface frogs_samples_interface =
{
5, /* 5 channels */
frogs_sample_names

2
src/mame/audio/warpwarp.c
View File

@ -204,7 +204,7 @@ static void warpwarp_sound_update(void *param, stream_sample_t **inputs, stream_
}
}
void *warpwarp_sh_start(int clock, const struct CustomSound_interface *config)
void *warpwarp_sh_start(int clock, const custom_sound_interface *config)
{
int i;

2
src/mame/audio/wiping.c
View File

@ -162,7 +162,7 @@ static void wiping_update_mono(void *param, stream_sample_t **inputs, stream_sam
void *wiping_sh_start(int clock, const struct CustomSound_interface *config)
void *wiping_sh_start(int clock, const custom_sound_interface *config)
{
sound_channel *voice;

4
src/mame/audio/zaxxon.c
View File

@ -100,7 +100,7 @@ static const char *const zaxxon_sample_names[] =
};
static const struct Samplesinterface zaxxon_samples_interface =
static const samples_interface zaxxon_samples_interface =
{
12,
zaxxon_sample_names
@ -206,7 +206,7 @@ static const char *const congo_sample_names[] =
};
static const struct Samplesinterface congo_samples_interface =
static const samples_interface congo_samples_interface =
{
5, /* 5 channels */
congo_sample_names

6
src/mame/drivers/40love.c
View File

@ -1003,7 +1003,7 @@ static GFXDECODE_START( 40love )
GFXDECODE_ENTRY( "gfx1", 0, sprite_layout, 0, 64 )
GFXDECODE_END
static const struct AY8910interface ay8910_interface =
static const AY8910_interface ay8910_config =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
@ -1055,7 +1055,7 @@ static MACHINE_DRIVER_START( 40love )
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("ay", AY8910, 2000000)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_CONFIG(ay8910_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MDRV_SOUND_ADD("msm", MSM5232, 8000000/4)
@ -1110,7 +1110,7 @@ static MACHINE_DRIVER_START( undoukai )
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("ay", AY8910, 2000000)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_CONFIG(ay8910_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MDRV_SOUND_ADD("msm", MSM5232, 8000000/4)

4
src/mame/drivers/aeroboto.c
View File

@ -218,7 +218,7 @@ GFXDECODE_END
static const struct AY8910interface ay8910_interface =
static const AY8910_interface ay8910_config =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
@ -259,7 +259,7 @@ static MACHINE_DRIVER_START( formatz )
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("ay1", AY8910, XTAL_10MHz/8) /* verified on pcb */
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_CONFIG(ay8910_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MDRV_SOUND_ADD("ay2", AY8910, XTAL_10MHz/16) /* verified on pcb */

2
src/mame/drivers/alg.c
View File

@ -449,7 +449,7 @@ INPUT_PORTS_END
*
*************************************/
static const struct CustomSound_interface amiga_custom_interface =
static const custom_sound_interface amiga_custom_interface =
{
amiga_sh_start
};

4
src/mame/drivers/alpha68k.c
View File

@ -1858,7 +1858,7 @@ GFXDECODE_END
/******************************************************************************/
static const struct AY8910interface ay8910_interface =
static const AY8910_interface ay8910_config =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
@ -2024,7 +2024,7 @@ static MACHINE_DRIVER_START( jongbou )
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("ay", AY8910, 2000000)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_CONFIG(ay8910_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
MACHINE_DRIVER_END

4
src/mame/drivers/ambush.c
View File

@ -159,7 +159,7 @@ static GFXDECODE_START( ambush )
GFXDECODE_END
static const struct AY8910interface ay8910_interface_1 =
static const AY8910_interface ay8910_interface_1 =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
@ -169,7 +169,7 @@ static const struct AY8910interface ay8910_interface_1 =
NULL
};
static const struct AY8910interface ay8910_interface_2 =
static const AY8910_interface ay8910_interface_2 =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,

4
src/mame/drivers/ampoker2.c
View File

@ -1001,7 +1001,7 @@ GFXDECODE_END
* AY8910 Interfase *
*******************/
static const struct AY8910interface ay8910_interface =
static const AY8910_interface ay8910_config =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
@ -1044,7 +1044,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_CONFIG(ay8910_interface)
MDRV_SOUND_CONFIG(ay8910_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END

4
src/mame/drivers/arabian.c
View File

@ -331,7 +331,7 @@ INPUT_PORTS_END
*
*************************************/
static const struct AY8910interface ay8910_interface =
static const AY8910_interface ay8910_config =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
@ -374,7 +374,7 @@ static MACHINE_DRIVER_START( arabian )
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("ay", AY8910, MAIN_OSC/4/2)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_CONFIG(ay8910_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END

2
src/mame/drivers/arcadia.c
View File

@ -267,7 +267,7 @@ INPUT_PORTS_END
*
*************************************/
static const struct CustomSound_interface amiga_custom_interface =
static const custom_sound_interface amiga_custom_interface =
{
amiga_sh_start
};

4
src/mame/drivers/arkanoid.c
View File

@ -735,7 +735,7 @@ GFXDECODE_END
/* Sound Interfaces */
static const struct AY8910interface ay8910_interface =
static const AY8910_interface ay8910_config =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
@ -780,7 +780,7 @@ static MACHINE_DRIVER_START( arkanoid )
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_CONFIG(ay8910_interface)
MDRV_SOUND_CONFIG(ay8910_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_DRIVER_END

2
src/mame/drivers/astinvad.c
View File

@ -491,7 +491,7 @@ static const char *const astinvad_sample_names[] =
0
};
static const struct Samplesinterface astinvad_samples_interface =
static const samples_interface astinvad_samples_interface =
{
6, /* channels */
astinvad_sample_names

8
src/mame/drivers/astrocde.c
View File

@ -507,7 +507,7 @@ static z80ctc_interface ctc_intf =
};
static const struct AY8910interface ay8912_interface =
static const AY8910_interface ay8912_interface =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
@ -1217,19 +1217,19 @@ static const char *const seawolf_sample_names[] =
0
};
static const struct Samplesinterface seawolf2_samples_interface =
static const samples_interface seawolf2_samples_interface =
{
10, /* 5*2 channels */
seawolf_sample_names
};
static const struct Samplesinterface wow_samples_interface =
static const samples_interface wow_samples_interface =
{
1,
wow_sample_names
};
static const struct Samplesinterface gorf_samples_interface =
static const samples_interface gorf_samples_interface =
{
1,
gorf_sample_names

2
src/mame/drivers/ataxx.c
View File

@ -291,7 +291,7 @@ INPUT_PORTS_END
*
*************************************/
static const struct CustomSound_interface i80186_custom_interface =
static const custom_sound_interface i80186_custom_interface =
{
leland_80186_sh_start
};

2
src/mame/drivers/attckufo.c
View File

@ -46,7 +46,7 @@ LOIPOIO-B
#include "includes/attckufo.h"
static const struct CustomSound_interface attckufo_sound_interface =
static const custom_sound_interface attckufo_sound_interface =
{
attckufo_custom_start
};

10
src/mame/drivers/bagman.c
View File

@ -429,7 +429,7 @@ GFXDECODE_END
static const struct AY8910interface ay8910_interface =
static const AY8910_interface ay8910_config =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
@ -439,7 +439,7 @@ static const struct AY8910interface ay8910_interface =
NULL
};
static const struct AY8910interface ay8910_interface_2 =
static const AY8910_interface ay8910_interface_2 =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
@ -482,7 +482,7 @@ static MACHINE_DRIVER_START( bagman )
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("ay", AY8910, 1500000)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_CONFIG(ay8910_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MDRV_SOUND_ADD("tms", TMS5110A, 640000)
@ -518,7 +518,7 @@ static MACHINE_DRIVER_START( pickin )
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_CONFIG(ay8910_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
/* maybe */
@ -573,7 +573,7 @@ static MACHINE_DRIVER_START( botanic )
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_CONFIG(ay8910_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MDRV_SOUND_ADD("ay2", AY8910, 1500000)

2
src/mame/drivers/berzerk.c
View File

@ -465,7 +465,7 @@ static VIDEO_UPDATE( berzerk )
*
*************************************/
static const struct CustomSound_interface berzerk_custom_interface =
static const custom_sound_interface berzerk_custom_interface =
{
exidy_sh6840_sh_start,
0,

4
src/mame/drivers/bking.c
View File

@ -432,7 +432,7 @@ static WRITE8_HANDLER( portb_w )
if (data != 0x00) logerror("portB = %02x\n",data);
}
static const struct AY8910interface ay8910_interface =
static const AY8910_interface ay8910_config =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
@ -480,7 +480,7 @@ static MACHINE_DRIVER_START( bking )
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MDRV_SOUND_ADD("ay2", AY8910, XTAL_6MHz/4)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_CONFIG(ay8910_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MDRV_SOUND_ADD("dac", DAC, 0)

4
src/mame/drivers/blueprnt.c
View File

@ -248,7 +248,7 @@ GFXDECODE_END
/* Sound Interfaces */
static const struct AY8910interface ay8910_interface_1 =
static const AY8910_interface ay8910_interface_1 =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
@ -258,7 +258,7 @@ static const struct AY8910interface ay8910_interface_1 =
NULL
};
static const struct AY8910interface ay8910_interface_2 =
static const AY8910_interface ay8910_interface_2 =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,

4
src/mame/drivers/bmcbowl.c
View File

@ -460,7 +460,7 @@ static WRITE8_HANDLER(input_mux_w)
}
static const struct AY8910interface ay8910_interface =
static const AY8910_interface ay8910_config =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
@ -517,7 +517,7 @@ static MACHINE_DRIVER_START( bmcbowl )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
MDRV_SOUND_ADD("ay", AY8910, 3579545/2)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_CONFIG(ay8910_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)

4
src/mame/drivers/buggychl.c
View File

@ -376,7 +376,7 @@ static WRITE8_HANDLER( portB_1_w )
}
static const struct AY8910interface ay8910_interface_1 =
static const AY8910_interface ay8910_interface_1 =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
@ -386,7 +386,7 @@ static const struct AY8910interface ay8910_interface_1 =
portB_0_w
};
static const struct AY8910interface ay8910_interface_2 =
static const AY8910_interface ay8910_interface_2 =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,

4
src/mame/drivers/bzone.c
View File

@ -552,7 +552,7 @@ static const struct POKEYinterface bzone_pokey_interface =
};
static const struct CustomSound_interface bzone_custom_interface =
static const custom_sound_interface bzone_custom_interface =
{
bzone_sh_start
};
@ -565,7 +565,7 @@ static const struct POKEYinterface redbaron_pokey_interface =
};
static const struct CustomSound_interface redbaron_custom_interface =
static const custom_sound_interface redbaron_custom_interface =
{
redbaron_sh_start
};

4
src/mame/drivers/calomega.c
View File

@ -1882,7 +1882,7 @@ static MACHINE_RESET( calomega )
* Sound Interfaces *
*************************/
static const struct AY8910interface sys903_ay8912_intf =
static const AY8910_interface sys903_ay8912_intf =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
@ -1892,7 +1892,7 @@ static const struct AY8910interface sys903_ay8912_intf =
NULL
};
static const struct AY8910interface sys905_ay8912_intf =
static const AY8910_interface sys905_ay8912_intf =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,

4
src/mame/drivers/carrera.c
View File

@ -269,7 +269,7 @@ static READ8_HANDLER( unknown_r )
}
/* these are set as input, but I have no idea which input port it uses is for the AY */
static const struct AY8910interface ay8910_interface =
static const AY8910_interface ay8910_config =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
@ -315,7 +315,7 @@ static MACHINE_DRIVER_START( carrera )
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("ay", AY8910, MASTER_CLOCK/12)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_CONFIG(ay8910_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_DRIVER_END

2
src/mame/drivers/centiped.c
View File

@ -1543,7 +1543,7 @@ GFXDECODE_END
*
*************************************/
static const struct AY8910interface centipdb_ay8910_interface =
static const AY8910_interface centipdb_ay8910_interface =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,

4
src/mame/drivers/chaknpop.c
View File

@ -77,7 +77,7 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc000, 0xffff) AM_WRITE(SMH_BANK1) // bitmap plane 1-4
ADDRESS_MAP_END
static const struct AY8910interface ay8910_interface_1 =
static const AY8910_interface ay8910_interface_1 =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
@ -87,7 +87,7 @@ static const struct AY8910interface ay8910_interface_1 =
NULL
};
static const struct AY8910interface ay8910_interface_2 =
static const AY8910_interface ay8910_interface_2 =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,

4
src/mame/drivers/changela.c
View File

@ -457,7 +457,7 @@ static INPUT_PORTS_START( changela )
INPUT_PORTS_END
static const struct AY8910interface ay8910_interface_1 =
static const AY8910_interface ay8910_interface_1 =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
@ -467,7 +467,7 @@ static const struct AY8910interface ay8910_interface_1 =
NULL
};
static const struct AY8910interface ay8910_interface_2 =
static const AY8910_interface ay8910_interface_2 =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,

4
src/mame/drivers/cherrym.c
View File

@ -361,7 +361,7 @@ static GFXDECODE_START( cherrym )
GFXDECODE_ENTRY( "gfx2", 0x0020, spritelayout, 0, 16 )
GFXDECODE_END
static const struct AY8910interface ay8910_interface =
static const AY8910_interface ay8910_config =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
@ -399,7 +399,7 @@ static MACHINE_DRIVER_START( cmv801 )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("ay", AY8910,18432000/12)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_CONFIG(ay8910_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END

4
src/mame/drivers/cherrym2.c
View File

@ -341,7 +341,7 @@ static GFXDECODE_START( alt )
GFXDECODE_END
static const struct AY8910interface ay8910_interface =
static const AY8910_interface ay8910_config =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
@ -378,7 +378,7 @@ static MACHINE_DRIVER_START( cm2v841 )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("ay", AY8910,18432000/12)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_CONFIG(ay8910_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END

4
src/mame/drivers/cidelsa.c
View File

@ -159,7 +159,7 @@ static WRITE8_HANDLER( draco_ay8910_port_b_w )
*/
}
static const struct AY8910interface ay8910_interface =
static const AY8910_interface ay8910_config =
{
AY8910_SINGLE_OUTPUT,
AY8910_DEFAULT_LOADS,
@ -719,7 +719,7 @@ static MACHINE_DRIVER_START( draco )
MDRV_SOUND_ADD("cdp", CDP1869, DRACO_CHR2)
MDRV_SOUND_ADD("ay", AY8910, DRACO_SND_CHR1)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_CONFIG(ay8910_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END

4
src/mame/drivers/clshroad.c
View File

@ -36,7 +36,7 @@ VIDEO_START( clshroad );
VIDEO_UPDATE( clshroad );
extern UINT8 *wiping_soundregs;
void *wiping_sh_start(int clock, const struct CustomSound_interface *config);
void *wiping_sh_start(int clock, const custom_sound_interface *config);
WRITE8_HANDLER( wiping_sound_w );
@ -272,7 +272,7 @@ GFXDECODE_END
static const struct CustomSound_interface custom_interface =
static const custom_sound_interface custom_interface =
{
wiping_sh_start
};

2
src/mame/drivers/coinmstr.c
View File

@ -619,7 +619,7 @@ static MACHINE_RESET( trailblz )
pia_reset();
}
static const struct AY8910interface ay8912_interface =
static const AY8910_interface ay8912_interface =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,

4
src/mame/drivers/cosmic.c
View File

@ -864,7 +864,7 @@ static const char *const panic_sample_names[] =
0
};
static const struct Samplesinterface panic_samples_interface =
static const samples_interface panic_samples_interface =
{
9, /* 9 channels */
panic_sample_names
@ -891,7 +891,7 @@ static const char *const cosmicg_sample_names[] =
0
};
static const struct Samplesinterface cosmicg_samples_interface =
static const samples_interface cosmicg_samples_interface =
{
9, /* 9 channels */
cosmicg_sample_names

4
src/mame/drivers/couple.c
View File

@ -119,7 +119,7 @@ static WRITE8_HANDLER( merit_prot_w )
}
#if 0
static const struct AY8910interface ay8910_interface =
static const AY8910_interface ay8910_config =
{
input_port_4_r,
};
@ -386,7 +386,7 @@ static MACHINE_DRIVER_START( couple )
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("ay", AY8910, 4000000)
// MDRV_SOUND_CONFIG(ay8910_interface)
// MDRV_SOUND_CONFIG(ay8910_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END

Some files were not shown because too many files have changed in this diff Show More