diff options
Diffstat (limited to 'src/emu/sound/cem3394.c')
-rw-r--r-- | src/emu/sound/cem3394.c | 59 |
1 files changed, 30 insertions, 29 deletions
diff --git a/src/emu/sound/cem3394.c b/src/emu/sound/cem3394.c index aa93e5e58cf..09a3c8a176c 100644 --- a/src/emu/sound/cem3394.c +++ b/src/emu/sound/cem3394.c @@ -105,7 +105,8 @@ /* this structure defines the parameters for a channel */ -typedef struct +typedef struct _cem3394_state cem3394_state; +struct _cem3394_state { sound_stream * stream; /* our stream */ void (*external)(const device_config *, int, short *);/* callback to generate external samples */ @@ -135,13 +136,23 @@ typedef struct INT16 *mixer_buffer; INT16 *external_buffer; -} sound_chip; +}; + + +INLINE cem3394_state *get_safe_token(const device_config *device) +{ + assert(device != NULL); + assert(device->token != NULL); + assert(device->type == SOUND); + assert(sound_get_type(device) == SOUND_CEM3394); + return (cem3394_state *)device->token; +} /* generate sound to the mix buffer in mono */ static STREAM_UPDATE( cem3394_update ) { - sound_chip *chip = param; + cem3394_state *chip = param; int int_volume = (chip->volume * chip->mixer_internal) / 256; int ext_volume = (chip->volume * chip->mixer_external) / 256; UINT32 step = chip->step, position, end_position = 0; @@ -315,10 +326,10 @@ static STREAM_UPDATE( cem3394_update ) } -static SND_START( cem3394 ) +static DEVICE_START( cem3394 ) { const cem3394_interface *intf = device->static_config; - sound_chip *chip = device->token; + cem3394_state *chip = get_safe_token(device); chip->device = device; @@ -407,9 +418,9 @@ INLINE UINT32 compute_db_volume(double voltage) } -void cem3394_set_voltage(int chipnum, int input, double voltage) +void cem3394_set_voltage(const device_config *device, int input, double voltage) { - sound_chip *chip = sndti_token(SOUND_CEM3394, chipnum); + cem3394_state *chip = get_safe_token(device); double temp; /* don't do anything if no change */ @@ -501,9 +512,9 @@ void cem3394_set_voltage(int chipnum, int input, double voltage) } -double cem3394_get_parameter(int chipnum, int input) +double cem3394_get_parameter(const device_config *device, int input) { - sound_chip *chip = sndti_token(SOUND_CEM3394, chipnum); + cem3394_state *chip = get_safe_token(device); double voltage = chip->values[input]; switch (input) @@ -557,34 +568,24 @@ double cem3394_get_parameter(int chipnum, int input) * Generic get_info **************************************************************************/ -static SND_SET_INFO( cem3394 ) -{ - switch (state) - { - /* no parameters to set */ - } -} - - -SND_GET_INFO( cem3394 ) +DEVICE_GET_INFO( cem3394 ) { switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case SNDINFO_INT_TOKEN_BYTES: info->i = sizeof(sound_chip); break; + case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(cem3394_state); break; /* --- the following bits of info are returned as pointers to data or functions --- */ - case SNDINFO_PTR_SET_INFO: info->set_info = SND_SET_INFO_NAME( cem3394 ); break; - case SNDINFO_PTR_START: info->start = SND_START_NAME( cem3394 ); break; - case SNDINFO_PTR_STOP: /* nothing */ break; - case SNDINFO_PTR_RESET: /* nothing */ break; + case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( cem3394 ); break; + case DEVINFO_FCT_STOP: /* nothing */ break; + case DEVINFO_FCT_RESET: /* nothing */ break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case SNDINFO_STR_NAME: strcpy(info->s, "CEM3394"); break; - case SNDINFO_STR_CORE_FAMILY: strcpy(info->s, "Analog Synth"); break; - case SNDINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case SNDINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case SNDINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "CEM3394"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Analog Synth"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break; } } |