diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2012-09-03 17:29:55 +0000 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2012-09-03 17:29:55 +0000 |
commit | f3d1a457841b4790de2573e13bc8a7816ff8bd4b (patch) | |
tree | 7a1c1f7d8bd6960c5990818bc4f6f2b01382b5c3 /src/emu/sound/es5506.c | |
parent | 8bb6de3fe62937e8ae97609e1512c527535de18e (diff) |
Fixed inheritance (no whatsnew)
Diffstat (limited to 'src/emu/sound/es5506.c')
-rw-r--r-- | src/emu/sound/es5506.c | 94 |
1 files changed, 17 insertions, 77 deletions
diff --git a/src/emu/sound/es5506.c b/src/emu/sound/es5506.c index 45a80b8f408..6db1ebcf9e2 100644 --- a/src/emu/sound/es5506.c +++ b/src/emu/sound/es5506.c @@ -1570,26 +1570,6 @@ static DEVICE_START( es5505 ) } - -/********************************************************************************************** - - DEVICE_STOP( es5505 ) -- stop emulation of the ES5505 - -***********************************************************************************************/ - -static DEVICE_STOP( es5505 ) -{ - DEVICE_STOP_CALL( es5506 ); -} - - -static DEVICE_RESET( es5505 ) -{ - DEVICE_RESET_CALL( es5506 ); -} - - - /********************************************************************************************** es5505_reg_write -- handle a write to the selected ES5505 register @@ -2153,16 +2133,16 @@ void es5505_voice_bank_w(device_t *device, int voice, int bank) chip->voice[voice].exbank=bank; } -const device_type ES5505 = &device_creator<es5505_device>; +const device_type ES5506 = &device_creator<es5506_device>; -es5505_device::es5505_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : device_t(mconfig, ES5505, "ES5505", tag, owner, clock), +es5506_device::es5506_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) + : device_t(mconfig, ES5506, "ES5506", tag, owner, clock), device_sound_interface(mconfig, *this) { m_token = global_alloc_array_clear(UINT8, sizeof(es5506_state)); } -es5505_device::es5505_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) +es5506_device::es5506_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, type, name, tag, owner, clock), device_sound_interface(mconfig, *this) { @@ -2175,7 +2155,7 @@ es5505_device::es5505_device(const machine_config &mconfig, device_type type, co // complete //------------------------------------------------- -void es5505_device::device_config_complete() +void es5506_device::device_config_complete() { } @@ -2183,54 +2163,44 @@ void es5505_device::device_config_complete() // device_start - device-specific startup //------------------------------------------------- -void es5505_device::device_start() +void es5506_device::device_start() { - DEVICE_START_NAME( es5505 )(this); + DEVICE_START_NAME( es5506 )(this); } //------------------------------------------------- // device_reset - device-specific reset //------------------------------------------------- -void es5505_device::device_reset() +void es5506_device::device_reset() { - DEVICE_RESET_NAME( es5505 )(this); + DEVICE_RESET_NAME( es5506 )(this); } //------------------------------------------------- // device_stop - device-specific stop //------------------------------------------------- -void es5505_device::device_stop() +void es5506_device::device_stop() { - DEVICE_STOP_NAME( es5505 )(this); + DEVICE_STOP_NAME( es5506 )(this); } //------------------------------------------------- // sound_stream_update - handle a stream update //------------------------------------------------- -void es5505_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) +void es5506_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) { // should never get here fatalerror("sound_stream_update called; not applicable to legacy sound devices\n"); } -const device_type ES5506 = &device_creator<es5506_device>; - -es5506_device::es5506_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : es5505_device(mconfig, ES5506, "ES5506", tag, owner, clock) -{ -} - -//------------------------------------------------- -// device_config_complete - perform any -// operations now that the configuration is -// complete -//------------------------------------------------- +const device_type ES5505 = &device_creator<es5505_device>; -void es5506_device::device_config_complete() +es5505_device::es5505_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) + : es5506_device(mconfig, ES5505, "ES5505", tag, owner, clock) { } @@ -2238,37 +2208,7 @@ void es5506_device::device_config_complete() // device_start - device-specific startup //------------------------------------------------- -void es5506_device::device_start() -{ - DEVICE_START_NAME( es5506 )(this); -} - -//------------------------------------------------- -// device_reset - device-specific reset -//------------------------------------------------- - -void es5506_device::device_reset() -{ - DEVICE_RESET_NAME( es5506 )(this); -} - -//------------------------------------------------- -// device_stop - device-specific stop -//------------------------------------------------- - -void es5506_device::device_stop() -{ - DEVICE_STOP_NAME( es5506 )(this); -} - -//------------------------------------------------- -// sound_stream_update - handle a stream update -//------------------------------------------------- - -void es5506_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) +void es5505_device::device_start() { - // should never get here - fatalerror("sound_stream_update called; not applicable to legacy sound devices\n"); + DEVICE_START_NAME( es5505 )(this); } - - |