more sound core structure/renaming updates.

You may have to do a clean compile, or delete the affected driver object files.

struct C140interface       to c140_interface
struct cem3394_interface   to cem3394_interface
struct ES5503interface     to es5503_interface
struct ES5505interface     to es5505_interface
struct ES5506interface     to es5506_interface
struct ssg_callbacks       to ssg_callbacks
struct gaelcosnd_interface to gaelcosnd_interface
struct ics2115_interface   to ics2115_interface

I'll stop until my posted question about chip names and upper case is answered.
This commit is contained in:
Derrick Renaud 2008-08-09 05:28:19 +00:00
parent b14904ef68
commit 629498ef38
31 changed files with 71 additions and 59 deletions

View File

@ -40,7 +40,7 @@ static void psg_reset(void *param)
ay8910_reset_ym(info->psg);
}
static const struct ssg_callbacks psgintf =
static const ssg_callbacks psgintf =
{
psg_set_clock,
psg_write,

View File

@ -53,7 +53,7 @@ static void psg_reset(void *param)
ay8910_reset_ym(info->psg);
}
static const struct ssg_callbacks psgintf =
static const ssg_callbacks psgintf =
{
psg_set_clock,
psg_write,

View File

@ -53,7 +53,7 @@ static void psg_reset(void *param)
ay8910_reset_ym(info->psg);
}
static const struct ssg_callbacks psgintf =
static const ssg_callbacks psgintf =
{
psg_set_clock,
psg_write,

View File

@ -457,7 +457,7 @@ static void update_stereo(void *param, stream_sample_t **inputs, stream_sample_t
static void *c140_start(const char *tag, int sndindex, int clock, const void *config)
{
const struct C140interface *intf = config;
const c140_interface *intf = config;
struct c140_info *info;
info = auto_malloc(sizeof(*info));

View File

@ -16,7 +16,8 @@ enum
C140_TYPE_ASIC219
};
struct C140interface {
typedef struct _c140_interface c140_interface;
struct _c140_interface {
int banking_type;
};

View File

@ -317,7 +317,7 @@ static void cem3394_update(void *param, stream_sample_t **inputs, stream_sample_
static void *cem3394_start(const char *tag, int sndindex, int clock, const void *config)
{
const struct cem3394_interface *intf = config;
const cem3394_interface *intf = config;
sound_chip *chip;
chip = auto_malloc(sizeof(*chip));

View File

@ -6,7 +6,8 @@
/* interface */
struct cem3394_interface
typedef struct _cem3394_interface cem3394_interface;
struct _cem3394_interface
{
double vco_zero_freq; /* frequency at 0V for VCO */
double filter_zero_freq; /* frequency at 0V for filter */

View File

@ -226,7 +226,7 @@ static void es5503_pcm_update(void *param, stream_sample_t **inputs, stream_samp
static void *es5503_start(const char *tag, int sndindex, int clock, const void *config)
{
const struct ES5503interface *intf;
const es5503_interface *intf;
int osc;
ES5503Chip *chip;

View File

@ -1,7 +1,8 @@
#ifndef _ES5503_H_
#define _ES5503_H_
struct ES5503interface
typedef struct _es5503_interface es5503_interface;
struct _es5503_interface
{
void (*irq_callback)(running_machine *machine, int state);
read8_machine_func adc_read;

View File

@ -822,7 +822,7 @@ static void es5506_update(void *param, stream_sample_t **inputs, stream_sample_t
static void *es5506_start_common(sound_type sndtype, const char *tag, int sndindex, int clock, const void *config)
{
const struct ES5506interface *intf = config;
const es5506_interface *intf = config;
struct ES5506Chip *chip;
int j;
UINT32 accum_mask;
@ -1501,8 +1501,8 @@ void ES5506_voice_bank_1_w(int voice, int bank)
static void *es5505_start(const char *tag, int sndindex, int clock, const void *config)
{
const struct ES5505interface *intf = config;
struct ES5506interface es5506intf;
const es5505_interface *intf = config;
es5506_interface es5506intf;
memset(&es5506intf, 0, sizeof(es5506intf));

View File

@ -8,7 +8,8 @@
#ifndef ES5506_H
#define ES5506_H
struct ES5505interface
typedef struct _es5505_interface es5505_interface;
struct _es5505_interface
{
const char * region0; /* memory region where the sample ROM lives */
const char * region1; /* memory region where the sample ROM lives */
@ -26,8 +27,8 @@ void ES5505_voice_bank_1_w(int voice, int bank);
struct ES5506interface
typedef struct _es5506_interface es5506_interface;
struct _es5506_interface
{
const char * region0; /* memory region where the sample ROM lives */
const char * region1; /* memory region where the sample ROM lives */

View File

@ -622,7 +622,7 @@ typedef struct
/* Extention Timer and IRQ handler */
FM_TIMERHANDLER timer_handler;
FM_IRQHANDLER IRQ_Handler;
const struct ssg_callbacks *SSG;
const ssg_callbacks *SSG;
} FM_ST;
@ -2261,7 +2261,7 @@ static void YM2203_save_state(YM2203 *F2203, int index)
'rate' is sampling rate
*/
void * YM2203Init(void *param, int index, int clock, int rate,
FM_TIMERHANDLER timer_handler,FM_IRQHANDLER IRQHandler, const struct ssg_callbacks *ssg)
FM_TIMERHANDLER timer_handler,FM_IRQHANDLER IRQHandler, const ssg_callbacks *ssg)
{
YM2203 *F2203;
@ -3489,7 +3489,7 @@ static void YM2608_deltat_status_reset(void *chip, UINT8 changebits)
/* YM2608(OPNA) */
void * YM2608Init(void *param, int index, int clock, int rate,
void *pcmrom,int pcmsize,
FM_TIMERHANDLER timer_handler,FM_IRQHANDLER IRQHandler, const struct ssg_callbacks *ssg)
FM_TIMERHANDLER timer_handler,FM_IRQHANDLER IRQHandler, const ssg_callbacks *ssg)
{
YM2608 *F2608;
@ -4176,7 +4176,7 @@ static void YM2610_deltat_status_reset(void *chip, UINT8 changebits)
void *YM2610Init(void *param, int index, int clock, int rate,
void *pcmroma,int pcmsizea,void *pcmromb,int pcmsizeb,
FM_TIMERHANDLER timer_handler,FM_IRQHANDLER IRQHandler, const struct ssg_callbacks *ssg)
FM_TIMERHANDLER timer_handler,FM_IRQHANDLER IRQHandler, const ssg_callbacks *ssg)
{
YM2610 *F2610;

View File

@ -25,7 +25,8 @@
/* --- external SSG(YM2149/AY-3-8910)emulator interface port */
/* used by YM2203,YM2608,and YM2610 */
struct ssg_callbacks
typedef struct _ssg_callbacks ssg_callbacks;
struct _ssg_callbacks
{
void (*set_clock)(void *param, int clock);
void (*write)(void *param, int address, int data);
@ -121,7 +122,7 @@ typedef void (*FM_IRQHANDLER)(void *param,int irq);
** return 0 = success
*/
void * YM2203Init(void *param, int index, int baseclock, int rate,
FM_TIMERHANDLER TimerHandler,FM_IRQHANDLER IRQHandler, const struct ssg_callbacks *ssg);
FM_TIMERHANDLER TimerHandler,FM_IRQHANDLER IRQHandler, const ssg_callbacks *ssg);
/*
** shutdown the YM2203 emulators
@ -165,7 +166,7 @@ void YM2203Postload(void *chip);
/* -------------------- YM2608(OPNA) Interface -------------------- */
void * YM2608Init(void *param, int index, int baseclock, int rate,
void *pcmroma,int pcmsizea,
FM_TIMERHANDLER TimerHandler,FM_IRQHANDLER IRQHandler, const struct ssg_callbacks *ssg);
FM_TIMERHANDLER TimerHandler,FM_IRQHANDLER IRQHandler, const ssg_callbacks *ssg);
void YM2608Shutdown(void *chip);
void YM2608ResetChip(void *chip);
void YM2608UpdateOne(void *chip, FMSAMPLE **buffer, int length);
@ -180,7 +181,7 @@ void YM2608Postload(void *chip);
/* -------------------- YM2610(OPNB) Interface -------------------- */
void * YM2610Init(void *param, int index, int baseclock, int rate,
void *pcmroma,int pcmasize,void *pcmromb,int pcmbsize,
FM_TIMERHANDLER TimerHandler,FM_IRQHANDLER IRQHandler, const struct ssg_callbacks *ssg);
FM_TIMERHANDLER TimerHandler,FM_IRQHANDLER IRQHandler, const ssg_callbacks *ssg);
void YM2610Shutdown(void *chip);
void YM2610ResetChip(void *chip);
void YM2610UpdateOne(void *chip, FMSAMPLE **buffer, int length);

View File

@ -246,7 +246,7 @@ WRITE16_HANDLER( gaelcosnd_w )
static void *gaelcosnd_start(sound_type sndtype, const char *tag, int sndindex, int clock, const void *config)
{
int j, vol;
const struct gaelcosnd_interface *intf = config;
const gaelcosnd_interface *intf = config;
struct GAELCOSND *info;
info = auto_malloc(sizeof(*info));

View File

@ -1,7 +1,8 @@
#ifndef gaelco_snd_h
#define gaelco_snd_h
struct gaelcosnd_interface
typedef struct _gaelcosnd_interface gaelcosnd_interface;
struct _gaelcosnd_interface
{
const char *gfxregion; /* shared gfx region name */
int banks[4]; /* start of each ROM bank */

View File

@ -42,7 +42,7 @@
enum { V_ON = 1, V_DONE = 2 };
struct ics2115{
const struct ics2115_interface *intf;
const ics2115_interface *intf;
int index;
UINT8 *rom;
INT16 *ulaw;

View File

@ -1,7 +1,8 @@
#ifndef __ICS2115_H__
#define __ICS2115_H__
struct ics2115_interface {
typedef struct _ics2115_interface ics2115_interface;
struct _ics2115_interface {
void (*irq_cb)(running_machine *, int);
};

View File

@ -261,7 +261,7 @@ void taito_f3_soundsystem_reset(running_machine *machine)
//cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, ASSERT_LINE);
}
const struct ES5505interface es5505_interface =
const es5505_interface es5505_taito_f3_config =
{
"ensoniq.0", /* Bank 0: Unused by F3 games? */
"ensoniq.0", /* Bank 1: All games seem to use this */

View File

@ -1,3 +1,4 @@
#include "sound/es5506.h"
READ16_HANDLER(f3_68000_share_r);
WRITE16_HANDLER(f3_68000_share_w);
@ -12,17 +13,17 @@ void f3_68681_reset(void);
void taito_f3_soundsystem_reset(running_machine *machine);
#define TAITO_F3_SOUND_SYSTEM_CPU(freq) \
MDRV_CPU_ADD("audio", M68000, freq) \
MDRV_CPU_ADD("audio", M68000, freq) \
MDRV_CPU_PROGRAM_MAP(f3_sound_map,0) \
#define TAITO_F3_SOUND_SYSTEM_ES5505(freq) \
MDRV_SPEAKER_STANDARD_STEREO("left", "right") \
MDRV_SOUND_ADD("ensoniq", ES5505, freq) \
MDRV_SOUND_CONFIG(es5505_interface) \
MDRV_SOUND_CONFIG(es5505_taito_f3_config) \
MDRV_SOUND_ROUTE(0, "left", 1.0) \
MDRV_SOUND_ROUTE(1, "right", 1.0) \
ADDRESS_MAP_EXTERN(f3_sound_map, 16);
extern const struct ES5505interface es5505_interface;
extern const es5505_interface es5505_taito_f3_config;

View File

@ -29,6 +29,10 @@
/* heard while missiles are seen to be moving. When the red */
/* missiles speed up, there should be more "klunks per second" */
/* with the pitch staying constant. */
/* 8/8/8 D.R. - Who says? According to the schematic the sounds are */
/* correct. Make a video showing otherwise or trace SX0 & SX1 on */
/* a real PCB to find the difference. */
/* Currently it beeps every time a player eats a dot. Seems right. */
/* 2. If "Hard" mode is selected, numerous bugs appear which */
/* could be either an emulation fault or a bad rom. Some */
/* bugs are: */

View File

@ -1156,7 +1156,7 @@ INPUT_PORTS_END
*
*************************************/
static const struct cem3394_interface cem_interface =
static const cem3394_interface cem_interface =
{
431.894,
1300.0,

View File

@ -157,7 +157,7 @@ PORT_START("COIN") /* COINSW & SERVICESW */
PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static const struct gaelcosnd_interface maniacsq_snd_interface =
static const gaelcosnd_interface maniacsq_snd_interface =
{
"gfx1", /* memory region */
{ 0*0x0080000, 1*0x0080000, 0, 0 }, /* start of each ROM bank */
@ -284,7 +284,7 @@ PORT_START("COIN") /* COINSW & Service */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, -6.0 / 240, 0) PORT_SENSITIVITY(35) PORT_KEYDELTA(15) PORT_PLAYER(2)
INPUT_PORTS_END
static const struct gaelcosnd_interface bang_snd_interface =
static const gaelcosnd_interface bang_snd_interface =
{
"gfx1", /* memory region */
{ 0*0x0200000, 1*0x0200000, 2*0x0200000, 3*0x0200000 } /* start of each ROM bank */
@ -489,7 +489,7 @@ PORT_START("COIN") /* COINSW & Service */
PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static const struct gaelcosnd_interface alighunt_snd_interface =
static const gaelcosnd_interface alighunt_snd_interface =
{
"gfx1", /* memory region */
{ 0*0x0400000, 1*0x0400000, 2*0x0400000, 3*0x0400000 } /* start of each ROM bank */
@ -742,7 +742,7 @@ PORT_START("FAKE") /* Fake: To switch between monitors at run time */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE4 ) PORT_TOGGLE
INPUT_PORTS_END
static const struct gaelcosnd_interface touchgo_snd_interface =
static const gaelcosnd_interface touchgo_snd_interface =
{
"gfx1", /* memory region */
{ 0*0x0400000, 1*0x0400000, 0, 0 } /* start of each ROM bank */
@ -945,7 +945,7 @@ PORT_START("COIN") /* COINSW & Service */
/* bits 6 & 7 are used for accessing the NVRAM */
INPUT_PORTS_END
static const struct gaelcosnd_interface snowboar_snd_interface =
static const gaelcosnd_interface snowboar_snd_interface =
{
"gfx1", /* memory region */
{ 0*0x0400000, 1*0x0400000, 0, 0 } /* start of each ROM bank */
@ -1197,7 +1197,7 @@ PORT_START("ANALOG1") /* steering wheel player 2 */
PORT_BIT( 0xff, 0x8A, IPT_PADDLE_V ) PORT_MINMAX(0x00,0xff) PORT_SENSITIVITY(25) PORT_KEYDELTA(25) PORT_REVERSE PORT_NAME("P2 Wheel")
INPUT_PORTS_END
static const struct gaelcosnd_interface wrally2_snd_interface =
static const gaelcosnd_interface wrally2_snd_interface =
{
"gfx1", /* memory region */
{ 0*0x0200000, 1*0x0200000, 0, 0 } /* start of each ROM bank */

View File

@ -2508,7 +2508,7 @@ static void sound_irq(running_machine *machine, int state)
// cpunum_set_input_line(machine, 0, 3, state);
}
static const struct ics2115_interface pgm_ics2115_interface = {
static const ics2115_interface pgm_ics2115_interface = {
sound_irq
};

View File

@ -1508,7 +1508,7 @@ INPUT_PORTS_END
*
*************************************/
static const struct ES5506interface es5506_interface =
static const es5506_interface es5506_config =
{
"ensoniq.0",
"ensoniq.1",
@ -1552,7 +1552,7 @@ static MACHINE_DRIVER_START( timekill )
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("ensoniq", ES5506, SOUND_CLOCK)
MDRV_SOUND_CONFIG(es5506_interface)
MDRV_SOUND_CONFIG(es5506_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END

View File

@ -519,7 +519,7 @@ static void irqhandler(running_machine *machine, int irq)
// cpunum_set_input_line(machine, 1,1,irq ? ASSERT_LINE : CLEAR_LINE);
}
static const struct ES5506interface es5506_interface =
static const es5506_interface es5506_config =
{
"ensoniq.0",
"ensoniq.1",
@ -557,7 +557,7 @@ static MACHINE_DRIVER_START( macrossp )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
MDRV_SOUND_ADD("ensoniq", ES5506, 16000000)
MDRV_SOUND_CONFIG(es5506_interface)
MDRV_SOUND_CONFIG(es5506_config)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
MACHINE_DRIVER_END

View File

@ -326,7 +326,7 @@ static const custom_sound_interface amiga_custom_interface =
};
static const struct ES5503interface es5503_intf =
static const es5503_interface es5503_intf =
{
NULL,
NULL,

View File

@ -1273,7 +1273,7 @@ static INTERRUPT_GEN( mcu_interrupt )
}
}
static const struct C140interface C140_interface_typeA =
static const c140_interface C140_interface_typeA =
{
C140_TYPE_ASIC219
};

View File

@ -1537,7 +1537,7 @@ static GFXDECODE_START( luckywld )
GFXDECODE_ENTRY( "gfx2", 0x000000, chr_layout, 16*256, 16 )
GFXDECODE_END
static const struct C140interface C140_interface =
static const c140_interface c140_config =
{
C140_TYPE_SYSTEM2
};
@ -1615,7 +1615,7 @@ static MACHINE_DRIVER_START( default )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
MDRV_SOUND_ADD("c140", C140, 8000000/374)
MDRV_SOUND_CONFIG(C140_interface)
MDRV_SOUND_CONFIG(c140_config)
MDRV_SOUND_ROUTE(0, "left", 0.75)
MDRV_SOUND_ROUTE(1, "right", 0.75)
@ -1629,7 +1629,7 @@ static MACHINE_DRIVER_START( default2 )
MDRV_IMPORT_FROM(default)
MDRV_SOUND_REPLACE("c140", C140, 8000000/374)
MDRV_SOUND_CONFIG(C140_interface)
MDRV_SOUND_CONFIG(c140_config)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
MACHINE_DRIVER_END
@ -1639,7 +1639,7 @@ static MACHINE_DRIVER_START( default3 )
MDRV_IMPORT_FROM(default)
MDRV_SOUND_REPLACE("c140", C140, 8000000/374)
MDRV_SOUND_CONFIG(C140_interface)
MDRV_SOUND_CONFIG(c140_config)
MDRV_SOUND_ROUTE(0, "left", 0.45)
MDRV_SOUND_ROUTE(1, "right", 0.45)
@ -1689,7 +1689,7 @@ static MACHINE_DRIVER_START( gollygho )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
MDRV_SOUND_ADD("c140", C140, 8000000/374)
MDRV_SOUND_CONFIG(C140_interface)
MDRV_SOUND_CONFIG(c140_config)
MDRV_SOUND_ROUTE(0, "left", 0.75)
MDRV_SOUND_ROUTE(1, "right", 0.75)
@ -1739,7 +1739,7 @@ static MACHINE_DRIVER_START( finallap )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
MDRV_SOUND_ADD("c140", C140, 8000000/374)
MDRV_SOUND_CONFIG(C140_interface)
MDRV_SOUND_CONFIG(c140_config)
MDRV_SOUND_ROUTE(0, "left", 0.75)
MDRV_SOUND_ROUTE(1, "right", 0.75)
@ -1789,7 +1789,7 @@ static MACHINE_DRIVER_START( sgunner )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
MDRV_SOUND_ADD("c140", C140, 8000000/374)
MDRV_SOUND_CONFIG(C140_interface)
MDRV_SOUND_CONFIG(c140_config)
MDRV_SOUND_ROUTE(0, "left", 0.75)
MDRV_SOUND_ROUTE(1, "right", 0.75)
@ -1839,7 +1839,7 @@ static MACHINE_DRIVER_START( luckywld )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
MDRV_SOUND_ADD("c140", C140, 8000000/374)
MDRV_SOUND_CONFIG(C140_interface)
MDRV_SOUND_CONFIG(c140_config)
MDRV_SOUND_ROUTE(0, "left", 0.75)
MDRV_SOUND_ROUTE(1, "right", 0.75)
@ -1889,7 +1889,7 @@ static MACHINE_DRIVER_START( metlhawk )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
MDRV_SOUND_ADD("c140", C140, 8000000/374)
MDRV_SOUND_CONFIG(C140_interface)
MDRV_SOUND_CONFIG(c140_config)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)

View File

@ -1521,12 +1521,12 @@ static GFXDECODE_START( namcos21 )
GFXDECODE_ENTRY( "gfx1", 0x000000, tile_layout, 0x1000, 0x10 )
GFXDECODE_END
static const struct C140interface C140_interface_typeA =
static const c140_interface C140_interface_typeA =
{
C140_TYPE_SYSTEM21_A
};
static const struct C140interface C140_interface_typeB =
static const c140_interface C140_interface_typeB =
{
C140_TYPE_SYSTEM21_B
};

View File

@ -437,7 +437,7 @@ static void sound_irq(running_machine *machine, int level)
cpunum_set_input_line(machine, 1, 0, level);
}
static const struct ics2115_interface pgm_ics2115_interface = {
static const ics2115_interface pgm_ics2115_interface = {
sound_irq
};

View File

@ -2681,7 +2681,7 @@ GFXDECODE_END
***************************************************************************/
static const struct ES5506interface es5506_interface =
static const es5506_interface es5506_config =
{
"ensoniq.0",
"ensoniq.1",
@ -2816,7 +2816,7 @@ static MACHINE_DRIVER_START( ssv )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
MDRV_SOUND_ADD("ensoniq", ES5506, 16000000)
MDRV_SOUND_CONFIG(es5506_interface)
MDRV_SOUND_CONFIG(es5506_config)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
MACHINE_DRIVER_END