diff options
author | 2012-09-03 15:00:20 +0000 | |
---|---|---|
committer | 2012-09-03 15:00:20 +0000 | |
commit | 071eb8de4be2099c033a0c49554d5b690f5e969b (patch) | |
tree | 329c0e27c2e33cb213894b157193d37e381135e5 | |
parent | eb4aa7ad05d6ebc74bd88f19ca815e694734f9c7 (diff) |
Cleanup and some inheritance fixes (no whatsnew)
223 files changed, 30 insertions, 6824 deletions
diff --git a/.gitattributes b/.gitattributes index 11c586a7101..e2d86a5ef81 100644 --- a/.gitattributes +++ b/.gitattributes @@ -869,7 +869,6 @@ src/emu/devcpu.c svneol=native#text/plain src/emu/devcpu.h svneol=native#text/plain src/emu/device.c svneol=native#text/plain src/emu/device.h svneol=native#text/plain -src/emu/devlegcy.c svneol=native#text/plain src/emu/devlegcy.h svneol=native#text/plain src/emu/didisasm.c svneol=native#text/plain src/emu/didisasm.h svneol=native#text/plain diff --git a/src/emu/devlegcy.c b/src/emu/devlegcy.c deleted file mode 100644 index 11a05e15042..00000000000 --- a/src/emu/devlegcy.c +++ /dev/null @@ -1,194 +0,0 @@ -/*************************************************************************** - - devlegcy.c - - Legacy device helpers. - -**************************************************************************** - - Copyright Aaron Giles - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - * Neither the name 'MAME' nor the names of its contributors may be - used to endorse or promote products derived from this software - without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY AARON GILES ''AS IS'' AND ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL AARON GILES BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -***************************************************************************/ - -#include "emu.h" -#include "devlegcy.h" - - -//************************************************************************** -// LEGACY DEVICE CONFIGURATION -//************************************************************************** - -//------------------------------------------------- -// legacy_device_base - constructor -//------------------------------------------------- - -legacy_device_base::legacy_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, device_get_config_func get_config) - : device_t(mconfig, type, "Legacy Device", tag, owner, clock), - m_get_config_func(get_config), - m_token(NULL) -{ - // set the proper name - m_name = get_legacy_string(DEVINFO_STR_NAME); - m_shortname = get_legacy_string(DEVINFO_STR_SHORTNAME); - m_searchpath = m_shortname; - - // create the token - int tokenbytes = get_legacy_int(DEVINFO_INT_TOKEN_BYTES); - if (tokenbytes != 0) - m_token = global_alloc_array_clear(UINT8, tokenbytes); -} - - -//------------------------------------------------- -// ~legacy_device_base - destructor -//------------------------------------------------- - -legacy_device_base::~legacy_device_base() -{ - global_free(m_token); -} - - -//------------------------------------------------- -// get_legacy_int - return a legacy -// configuration parameter as an integer -//------------------------------------------------- - -INT64 legacy_device_base::get_legacy_int(UINT32 state) const -{ - deviceinfo info = { 0 }; - (*m_get_config_func)(this, state, &info); - return info.i; -} - - -//------------------------------------------------- -// get_legacy_ptr - return a legacy -// configuration parameter as a pointer -//------------------------------------------------- - -void *legacy_device_base::get_legacy_ptr(UINT32 state) const -{ - deviceinfo info = { 0 }; - (*m_get_config_func)(this, state, &info); - return info.p; -} - - -//------------------------------------------------- -// get_legacy_fct - return a legacy -// configuration parameter as a function pointer -//------------------------------------------------- - -genf *legacy_device_base::get_legacy_fct(UINT32 state) const -{ - deviceinfo info = { 0 }; - (*m_get_config_func)(this, state, &info); - return info.f; -} - - -//------------------------------------------------- -// get_legacy_string - return a legacy -// configuration parameter as a string pointer -//------------------------------------------------- - -const char *legacy_device_base::get_legacy_string(UINT32 state) const -{ - deviceinfo info; - info.s = get_temp_string_buffer(); - (*m_get_config_func)(this, state, &info); - return info.s; -} - - -//------------------------------------------------- -// device_start - called to start up a device -//------------------------------------------------- - -void legacy_device_base::device_start() -{ - device_start_func start_func = reinterpret_cast<device_start_func>(get_legacy_fct(DEVINFO_FCT_START)); - assert(start_func != NULL); - (*start_func)(this); -} - - -//------------------------------------------------- -// device_reset - called to reset a device -//------------------------------------------------- - -void legacy_device_base::device_reset() -{ - device_reset_func reset_func = reinterpret_cast<device_reset_func>(get_legacy_fct(DEVINFO_FCT_RESET)); - if (reset_func != NULL) - (*reset_func)(this); -} - - -//------------------------------------------------- -// device_stop - called to stop a device -//------------------------------------------------- - -void legacy_device_base::device_stop() -{ - if (started()) - { - device_stop_func stop_func = reinterpret_cast<device_stop_func>(get_legacy_fct(DEVINFO_FCT_STOP)); - if (stop_func != NULL) - (*stop_func)(this); - } -} - - -//************************************************************************** -// LEGACY SOUND DEVICE -//************************************************************************** - -//------------------------------------------------- -// legacy_sound_device_base - constructor -//------------------------------------------------- - -legacy_sound_device_base::legacy_sound_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, device_get_config_func get_config) - : legacy_device_base(mconfig, type, tag, owner, clock, get_config), - device_sound_interface(mconfig, *this) -{ -} - - -//------------------------------------------------- -// sound_stream_update - handle a stream update -//------------------------------------------------- - -void legacy_sound_device_base::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) -{ - // should never get here - fatalerror("legacy_sound_device_base::sound_stream_update called; not applicable to legacy sound devices\n"); -} diff --git a/src/emu/devlegcy.h b/src/emu/devlegcy.h index 41378ac6aab..874c731476e 100644 --- a/src/emu/devlegcy.h +++ b/src/emu/devlegcy.h @@ -135,29 +135,6 @@ enum // MACROS //************************************************************************** -// macro for declaring the configuration and device classes of a legacy device -#define _DECLARE_LEGACY_DEVICE(name, basename, deviceclass, basedeviceclass) \ - \ -DEVICE_GET_INFO( basename ); \ - \ -class deviceclass : public basedeviceclass \ -{ \ -public: \ - deviceclass(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock); \ -}; \ - \ -extern const device_type name - -// macro for defining the implementation needed for configuration and device classes -#define _DEFINE_LEGACY_DEVICE(name, basename, deviceclass, basedeviceclass) \ - \ -deviceclass::deviceclass(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock) \ - : basedeviceclass(mconfig, type, tag, owner, clock, DEVICE_GET_INFO_NAME(basename)) \ -{ \ -} \ - \ -const device_type name = &legacy_device_creator<deviceclass> - // this template function creates a stub which constructs a device template<class _DeviceClass> device_t *legacy_device_creator(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -165,20 +142,6 @@ device_t *legacy_device_creator(const machine_config &mconfig, const char *tag, return global_alloc(_DeviceClass(mconfig, &legacy_device_creator<_DeviceClass>, tag, owner, clock)); } - -// reduced macros that are easier to use, and map to the above two macros -#define DECLARE_LEGACY_DEVICE(name, basename) _DECLARE_LEGACY_DEVICE(name, basename, basename##_device, legacy_device_base) -#define DECLARE_LEGACY_SOUND_DEVICE(name, basename) _DECLARE_LEGACY_DEVICE(name, basename, basename##_device, legacy_sound_device_base) - -#define DEFINE_LEGACY_DEVICE(name, basename) _DEFINE_LEGACY_DEVICE(name, basename, basename##_device, legacy_device_base) -#define DEFINE_LEGACY_SOUND_DEVICE(name, basename) _DEFINE_LEGACY_DEVICE(name, basename, basename##_device, legacy_sound_device_base) - - -// macros to wrap legacy device functions -#define DEVICE_GET_INFO_NAME(name) device_get_config_##name -#define DEVICE_GET_INFO(name) void DEVICE_GET_INFO_NAME(name)(const device_t *device, UINT32 state, deviceinfo *info) -#define DEVICE_GET_INFO_CALL(name) DEVICE_GET_INFO_NAME(name)(device, state, info) - #define DEVICE_START_NAME(name) device_start_##name #define DEVICE_START(name) void DEVICE_START_NAME(name)(device_t *device) #define DEVICE_START_CALL(name) DEVICE_START_NAME(name)(device) @@ -195,98 +158,11 @@ device_t *legacy_device_creator(const machine_config &mconfig, const char *tag, // TYPE DEFINITIONS //************************************************************************** -union deviceinfo; -class machine_config; class device_t; char *get_temp_string_buffer(void); -resource_pool &machine_get_pool(running_machine &machine); - - -// device interface function types -typedef void (*device_get_config_func)(const device_t *device, UINT32 state, deviceinfo *info); - typedef void (*device_start_func)(device_t *device); typedef void (*device_stop_func)(device_t *device); typedef void (*device_reset_func)(device_t *device); -// the actual deviceinfo union -union deviceinfo -{ - INT64 i; // generic integers - void * p; // generic pointers - genf * f; // generic function pointers - char * s; // generic strings - - device_start_func start; // DEVINFO_FCT_START - device_stop_func stop; // DEVINFO_FCT_STOP - device_reset_func reset; // DEVINFO_FCT_RESET - const rom_entry * romregion; // DEVINFO_PTR_ROM_REGION - machine_config_constructor machine_config; // DEVINFO_PTR_MACHINE_CONFIG - ioport_constructor ipt; // DEVINFO_PTR_INPUT_PORTS - address_map_constructor internal_map8; // DEVINFO_PTR_INTERNAL_MEMORY_MAP - address_map_constructor internal_map16; // DEVINFO_PTR_INTERNAL_MEMORY_MAP - address_map_constructor internal_map32; // DEVINFO_PTR_INTERNAL_MEMORY_MAP - address_map_constructor internal_map64; // DEVINFO_PTR_INTERNAL_MEMORY_MAP - address_map_constructor default_map8; // DEVINFO_PTR_DEFAULT_MEMORY_MAP - address_map_constructor default_map16; // DEVINFO_PTR_DEFAULT_MEMORY_MAP - address_map_constructor default_map32; // DEVINFO_PTR_DEFAULT_MEMORY_MAP - address_map_constructor default_map64; // DEVINFO_PTR_DEFAULT_MEMORY_MAP -}; - - -// ======================> legacy_device_base - -// legacy_device_base serves as a common base class for legacy devices -class legacy_device_base : public device_t -{ -protected: - // construction/destruction - legacy_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, device_get_config_func get_config); - virtual ~legacy_device_base(); - -public: - // access to legacy token - void *token() const { assert(m_token != NULL); return m_token; } - -protected: - // device-level overrides - virtual const rom_entry *device_rom_region() const { return reinterpret_cast<const rom_entry *>(get_legacy_ptr(DEVINFO_PTR_ROM_REGION)); } - virtual machine_config_constructor device_mconfig_additions() const { return reinterpret_cast<machine_config_constructor>(get_legacy_ptr(DEVINFO_PTR_MACHINE_CONFIG)); } - virtual ioport_constructor device_input_ports() const { return reinterpret_cast<ioport_constructor>(get_legacy_ptr(DEVINFO_PTR_INPUT_PORTS)); } - virtual void device_start(); - virtual void device_reset(); - virtual void device_stop(); - - // access to legacy configuration info - INT64 get_legacy_int(UINT32 state) const; - void *get_legacy_ptr(UINT32 state) const; - genf *get_legacy_fct(UINT32 state) const; - const char *get_legacy_string(UINT32 state) const; - - // configuration state - device_get_config_func m_get_config_func; - - // internal state - void * m_token; -}; - - - -// ======================> legacy_sound_device_base - -// legacy_sound_device is a legacy_device_base with a sound interface -class legacy_sound_device_base : public legacy_device_base, - public device_sound_interface -{ -protected: - // construction/destruction - legacy_sound_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, device_get_config_func get_config); - - // sound stream update overrides - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); -}; - - - #endif /* __DEVLEGCY_H__ */ diff --git a/src/emu/emu.mak b/src/emu/emu.mak index 87af2b45e70..ee79e13173a 100644 --- a/src/emu/emu.mak +++ b/src/emu/emu.mak @@ -57,7 +57,6 @@ EMUOBJS = \ $(EMUOBJ)/devcb.o \ $(EMUOBJ)/devcpu.o \ $(EMUOBJ)/device.o \ - $(EMUOBJ)/devlegcy.o \ $(EMUOBJ)/didisasm.o \ $(EMUOBJ)/diexec.o \ $(EMUOBJ)/diimage.o \ diff --git a/src/emu/machine/6525tpi.c b/src/emu/machine/6525tpi.c index 73595a6eb96..000fee687fb 100644 --- a/src/emu/machine/6525tpi.c +++ b/src/emu/machine/6525tpi.c @@ -197,29 +197,6 @@ static DEVICE_RESET( tpi6525 ) tpi6525->in_c = 0xff; } - -DEVICE_GET_INFO( tpi6525 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(tpi6525_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( tpi6525 ); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( tpi6525 ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "6525 TPI"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "6525 TPI"); 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 MESS Team"); break; - } -} - - /*************************************************************************** IMPLEMENTATION ***************************************************************************/ diff --git a/src/emu/machine/68681.c b/src/emu/machine/68681.c index a4ff2f1dfe8..395d244b073 100644 --- a/src/emu/machine/68681.c +++ b/src/emu/machine/68681.c @@ -903,31 +903,6 @@ static DEVICE_RESET(duart68681) duart68681->channel[1].tx_timer->adjust(attotime::never, 1); } -/*------------------------------------------------- - device get info callback --------------------------------------------------*/ - -DEVICE_GET_INFO(duart68681) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(duart68681_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(duart68681); break; - case DEVINFO_FCT_STOP: /* nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(duart68681);break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "DUART 68681"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "DUART"); 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; - } -} - const device_type DUART68681 = &device_creator<duart68681_device>; duart68681_device::duart68681_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/machine/74148.c b/src/emu/machine/74148.c index 5426221d562..2bb59b429de 100644 --- a/src/emu/machine/74148.c +++ b/src/emu/machine/74148.c @@ -214,21 +214,6 @@ static DEVICE_RESET( ttl74148 ) state->last_enable_output = -1; } - -DEVICE_GET_INFO(ttl74148) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(ttl74148_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(ttl74148); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(ttl74148); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "74148"); break; - } -} - const device_type TTL74148 = &device_creator<ttl74148_device>; ttl74148_device::ttl74148_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/machine/74153.c b/src/emu/machine/74153.c index 7ec0a7cea53..199b0203d3b 100644 --- a/src/emu/machine/74153.c +++ b/src/emu/machine/74153.c @@ -176,21 +176,6 @@ static DEVICE_RESET( ttl74153 ) state->last_output[1] = -1; } -DEVICE_GET_INFO(ttl74153) -{ - switch (state) - { - - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(ttl74153_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(ttl74153); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(ttl74153); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "74153"); break; - } -} - const device_type TTL74153 = &device_creator<ttl74153_device>; ttl74153_device::ttl74153_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/machine/adc083x.c b/src/emu/machine/adc083x.c index b5bb54726ce..b813c6decba 100644 --- a/src/emu/machine/adc083x.c +++ b/src/emu/machine/adc083x.c @@ -505,51 +505,6 @@ static DEVICE_RESET( adc0831 ) adc083x->state = STATE_IDLE; } -/*------------------------------------------------- - device definition --------------------------------------------------*/ - -DEVICE_GET_INFO(adc0831) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(adc0831_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(adc0831); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(adc0831); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "A/D Converters 0831"); break; - } -} - -DEVICE_GET_INFO(adc0832) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "A/D Converters 0832"); break; - default: DEVICE_GET_INFO_CALL(adc0831); break; - } -} - -DEVICE_GET_INFO(adc0834) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "A/D Converters 0834"); break; - default: DEVICE_GET_INFO_CALL(adc0831); break; - } -} - -DEVICE_GET_INFO(adc0838) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "A/D Converters 0838"); break; - default: DEVICE_GET_INFO_CALL(adc0831); break; - } -} - const device_type ADC0831 = &device_creator<adc0831_device>; adc0831_device::adc0831_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/machine/adc1038.c b/src/emu/machine/adc1038.c index 0628486bb54..d3b1a59440c 100644 --- a/src/emu/machine/adc1038.c +++ b/src/emu/machine/adc1038.c @@ -161,24 +161,6 @@ static DEVICE_RESET( adc1038 ) adc1038->sars = 1; } -/*------------------------------------------------- - device definition --------------------------------------------------*/ - -DEVICE_GET_INFO(adc1038) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(adc1038_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(adc1038); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(adc1038); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "A/D Converters 1038"); break; - } -} - const device_type ADC1038 = &device_creator<adc1038_device>; adc1038_device::adc1038_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/machine/adc1213x.c b/src/emu/machine/adc1213x.c index cf833f471dc..d123dced2a2 100644 --- a/src/emu/machine/adc1213x.c +++ b/src/emu/machine/adc1213x.c @@ -354,42 +354,6 @@ static DEVICE_RESET( adc12138 ) adc1213x->acq_time = ADC1213X_ACQUISITION_TIME_10_CCLK; } -/*------------------------------------------------- - device definition --------------------------------------------------*/ - -DEVICE_GET_INFO(adc12138) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(adc12138_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(adc12138); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(adc12138); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "A/D Converter 12138"); break; - } -} - -DEVICE_GET_INFO(adc12130) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "A/D Converter 12130"); break; - default: DEVICE_GET_INFO_CALL(adc12138); break; - } -} - -DEVICE_GET_INFO(adc12132) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "A/D Converter 12132"); break; - default: DEVICE_GET_INFO_CALL(adc12138); break; - } -} - const device_type ADC12130 = &device_creator<adc12130_device>; adc12130_device::adc12130_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/machine/idectrl.c b/src/emu/machine/idectrl.c index 284b95df744..b4a420f9a26 100644 --- a/src/emu/machine/idectrl.c +++ b/src/emu/machine/idectrl.c @@ -1943,31 +1943,6 @@ SLOT_INTERFACE_START(ide_devices) SLOT_INTERFACE("hdd", IDE_HARDDISK) SLOT_INTERFACE_END -/*------------------------------------------------- - device get info callback --------------------------------------------------*/ - -DEVICE_GET_INFO( ide_controller ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(ide_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(ide_controller); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(ide_controller);break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "IDE Controller"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Disk Controller"); 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; - } -} - - const device_type IDE_CONTROLLER = &device_creator<ide_controller_device>; ide_controller_device::ide_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/machine/k053252.c b/src/emu/machine/k053252.c index 5896f133244..8b019a24517 100644 --- a/src/emu/machine/k053252.c +++ b/src/emu/machine/k053252.c @@ -231,27 +231,6 @@ static DEVICE_RESET( k053252 ) } -DEVICE_GET_INFO( k053252 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(k053252_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(k053252); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(k053252); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Konami 053252"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Konami Video IC"); 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 MAME Team"); break; - } -} - const device_type K053252 = &device_creator<k053252_device>; k053252_device::k053252_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/machine/latch8.c b/src/emu/machine/latch8.c index cc260d14199..d84fd06f8f4 100644 --- a/src/emu/machine/latch8.c +++ b/src/emu/machine/latch8.c @@ -232,27 +232,6 @@ static DEVICE_RESET( latch8 ) } -DEVICE_GET_INFO( latch8 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(latch8_t); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(latch8);break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(latch8);break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "8 bit latch"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Latches"); 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; - } -} - const device_type LATCH8 = &device_creator<latch8_device>; latch8_device::latch8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/machine/mb14241.c b/src/emu/machine/mb14241.c index 049e12cb9ed..cb14b53008d 100644 --- a/src/emu/machine/mb14241.c +++ b/src/emu/machine/mb14241.c @@ -68,20 +68,6 @@ static DEVICE_RESET( mb14241 ) mb14241->shift_count = 0; } -DEVICE_GET_INFO(mb14241) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(mb14241_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(mb14241); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(mb14241); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "MB14241"); break; - } -} - const device_type MB14241 = &device_creator<mb14241_device>; mb14241_device::mb14241_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/machine/mb87078.c b/src/emu/machine/mb87078.c index 47fa5437600..de48be6633c 100644 --- a/src/emu/machine/mb87078.c +++ b/src/emu/machine/mb87078.c @@ -266,20 +266,6 @@ static DEVICE_RESET( mb87078 ) mb87078_reset_comp_w(device, 1); } -DEVICE_GET_INFO(mb87078) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(mb87078_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(mb87078); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(mb87078); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "Fujitsu MB87078"); break; - } -} - const device_type MB87078 = &device_creator<mb87078_device>; mb87078_device::mb87078_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/machine/pd4990a.c b/src/emu/machine/pd4990a.c index 24d2b61e1da..7c244bb75b6 100644 --- a/src/emu/machine/pd4990a.c +++ b/src/emu/machine/pd4990a.c @@ -521,24 +521,6 @@ static DEVICE_RESET( upd4990a ) upd4990a->command_line = 0; } -/*------------------------------------------------- - device definition --------------------------------------------------*/ - -DEVICE_GET_INFO(upd4990a) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(upd4990a_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(upd4990a); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(upd4990a); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "NEC uPD4990A"); break; - } -} - const device_type UPD4990A = &device_creator<upd4990a_device>; upd4990a_device::upd4990a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/machine/pic8259.c b/src/emu/machine/pic8259.c index ff663534405..2f52daf52df 100644 --- a/src/emu/machine/pic8259.c +++ b/src/emu/machine/pic8259.c @@ -448,27 +448,6 @@ static DEVICE_RESET( pic8259 ) { pic8259->master = pic8259->sp_en_func(); } - -DEVICE_GET_INFO( pic8259 ) { - switch ( state ) { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(pic8259_t); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(pic8259); break; - case DEVINFO_FCT_STOP: /* nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(pic8259); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Intel PIC8259"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "PIC8259"); break; - case DEVINFO_STR_VERSION: strcpy(info->s, "1.00"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright the MAME and MESS Teams"); break; - } -} - - const device_type PIC8259 = &device_creator<pic8259_device>; pic8259_device::pic8259_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/machine/pit8253.c b/src/emu/machine/pit8253.c index 8274f5c5870..25681190933 100644 --- a/src/emu/machine/pit8253.c +++ b/src/emu/machine/pit8253.c @@ -1154,40 +1154,6 @@ static DEVICE_RESET( pit8253 ) { } } - -DEVICE_GET_INFO( pit8253 ) { - switch ( state ) { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(pit8253_t); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(pit8253); break; - case DEVINFO_FCT_STOP: /* nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(pit8253); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Intel PIT8253"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "PIT8253"); break; - case DEVINFO_STR_VERSION: strcpy(info->s, "1.00"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright the MAME and MESS Teams"); break; - } -} - - -DEVICE_GET_INFO( pit8254 ) { - switch ( state ) { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Intel PIT8254"); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(pit8254); break; - - default: DEVICE_GET_INFO_CALL(pit8253); break; - } -} - - const device_type PIT8253 = &device_creator<pit8253_device>; pit8253_device::pit8253_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/machine/rp5h01.c b/src/emu/machine/rp5h01.c index 69a376431e3..16c51ca0f78 100644 --- a/src/emu/machine/rp5h01.c +++ b/src/emu/machine/rp5h01.c @@ -222,24 +222,6 @@ static DEVICE_RESET( rp5h01 ) rp5h01->old_clock = -1; } -/*------------------------------------------------- - device definition --------------------------------------------------*/ - -DEVICE_GET_INFO(rp5h01) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(rp5h01_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(rp5h01); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(rp5h01); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "RP5H01"); break; - } -} - const device_type RP5H01 = &device_creator<rp5h01_device>; rp5h01_device::rp5h01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/machine/smc91c9x.c b/src/emu/machine/smc91c9x.c index 274fe27dfa0..90f5878c967 100644 --- a/src/emu/machine/smc91c9x.c +++ b/src/emu/machine/smc91c9x.c @@ -584,50 +584,6 @@ static DEVICE_RESET( smc91c9x ) } -/*------------------------------------------------- - device get info callback --------------------------------------------------*/ - -static DEVICE_GET_INFO( smc91c9x ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(smc91c9x_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(smc91c9x); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(smc91c9x);break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: /* provided by subclasses */ break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "SMC91C9X Ethernet Controller");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; - } -} - -DEVICE_GET_INFO( smc91c94 ) -{ - switch (state) - { - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "SMC91C94"); break; - default: DEVICE_GET_INFO_CALL(smc91c9x); break; - } -} - -DEVICE_GET_INFO( smc91c96 ) -{ - switch (state) - { - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "SMC91C96"); break; - default: DEVICE_GET_INFO_CALL(smc91c9x); break; - } -} - smc91c9x_device::smc91c9x_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) { diff --git a/src/emu/machine/tms6100.c b/src/emu/machine/tms6100.c index 2ea90c02f6e..c7569dd3053 100644 --- a/src/emu/machine/tms6100.c +++ b/src/emu/machine/tms6100.c @@ -260,34 +260,6 @@ READ_LINE_DEVICE_HANDLER( tms6100_data_r ) return tms->data; } -/*------------------------------------------------- - TMS 6100 device definition --------------------------------------------------*/ - -DEVICE_GET_INFO(tms6100) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(tms6100_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(tms6100); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(tms6100); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "TMS6100"); break; - } -} - -DEVICE_GET_INFO(m58819) -{ - switch (state) - { - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(m58819); break; - case DEVINFO_STR_NAME: strcpy(info->s, "M58819"); break; - default: DEVICE_GET_INFO_CALL(tms6100); break; - } -} - const device_type TMS6100 = &device_creator<tms6100_device>; tms6100_device::tms6100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/machine/upd4701.c b/src/emu/machine/upd4701.c index 5d120bc6600..4c3ad6b0467 100644 --- a/src/emu/machine/upd4701.c +++ b/src/emu/machine/upd4701.c @@ -301,24 +301,6 @@ static DEVICE_RESET( upd4701 ) upd4701->cf = 1; } -/*------------------------------------------------- - device definition --------------------------------------------------*/ - -DEVICE_GET_INFO(upd4701) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(upd4701_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(upd4701); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(upd4701); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "NEC uPD4701 Encoder"); break; - } -} - const device_type UPD4701 = &device_creator<upd4701_device>; upd4701_device::upd4701_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/machine/wd17xx.c b/src/emu/machine/wd17xx.c index 6373628d3fc..8249b54025d 100644 --- a/src/emu/machine/wd17xx.c +++ b/src/emu/machine/wd17xx.c @@ -2099,235 +2099,6 @@ void wd17xx_reset(device_t *device) DEVICE_RESET_CALL( wd1770 ); } - -/*************************************************************************** - DEVICE GETINFO -***************************************************************************/ - -DEVICE_GET_INFO(wd1770) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(wd1770_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(wd1770); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(wd1770); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "WD1770"); break; - } -} - -DEVICE_GET_INFO(fd1771) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "FD1771"); break; - default: DEVICE_GET_INFO_CALL(wd1770); break; - } -} - -DEVICE_GET_INFO(fd1781) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "FD1781"); break; - default: DEVICE_GET_INFO_CALL(wd1770); break; - } -} - -DEVICE_GET_INFO(fd1791) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "FD1791"); break; - default: DEVICE_GET_INFO_CALL(wd1770); break; - } -} - -DEVICE_GET_INFO(fd1792) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "FD1792"); break; - default: DEVICE_GET_INFO_CALL(wd1770); break; - } -} - -DEVICE_GET_INFO(fd1793) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "FD1793"); break; - default: DEVICE_GET_INFO_CALL(wd1770); break; - } -} - -DEVICE_GET_INFO(fd1794) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "FD1794"); break; - default: DEVICE_GET_INFO_CALL(wd1770); break; - } -} - -DEVICE_GET_INFO(fd1795) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "FD1795"); break; - default: DEVICE_GET_INFO_CALL(wd1770); break; - } -} - -DEVICE_GET_INFO(fd1797) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "FD1797"); break; - default: DEVICE_GET_INFO_CALL(wd1770); break; - } -} - -DEVICE_GET_INFO(fd1761) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "FD1761"); break; - default: DEVICE_GET_INFO_CALL(wd1770); break; - } -} - -DEVICE_GET_INFO(fd1762) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "FD1762"); break; - default: DEVICE_GET_INFO_CALL(wd1770); break; - } -} - -DEVICE_GET_INFO(fd1763) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "FD1763"); break; - default: DEVICE_GET_INFO_CALL(wd1770); break; - } -} - -DEVICE_GET_INFO(fd1764) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "FD1764"); break; - default: DEVICE_GET_INFO_CALL(wd1770); break; - } -} - -DEVICE_GET_INFO(fd1765) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "FD1765"); break; - default: DEVICE_GET_INFO_CALL(wd1770); break; - } -} - -DEVICE_GET_INFO(fd1767) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "FD1767"); break; - default: DEVICE_GET_INFO_CALL(wd1770); break; - } -} - -DEVICE_GET_INFO(wd2791) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "WD2791"); break; - default: DEVICE_GET_INFO_CALL(wd1770); break; - } -} - -DEVICE_GET_INFO(wd2793) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "WD2793"); break; - default: DEVICE_GET_INFO_CALL(wd1770); break; - } -} - -DEVICE_GET_INFO(wd2795) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "WD2795"); break; - default: DEVICE_GET_INFO_CALL(wd1770); break; - } -} - -DEVICE_GET_INFO(wd2797) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "WD2797"); break; - default: DEVICE_GET_INFO_CALL(wd1770); break; - } -} - -DEVICE_GET_INFO(wd1772) -{ - switch (state) - { - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(wd1772); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "WD1772"); break; - - default: DEVICE_GET_INFO_CALL(wd1770); break; - } -} - -DEVICE_GET_INFO(wd1773) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "WD1773"); break; - default: DEVICE_GET_INFO_CALL(wd1770); break; - } -} - -DEVICE_GET_INFO(mb8866) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "MB8866"); break; - default: DEVICE_GET_INFO_CALL(wd1770); break; - } -} - -DEVICE_GET_INFO(mb8876) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "MB8876"); break; - default: DEVICE_GET_INFO_CALL(wd1770); break; - } -} - -DEVICE_GET_INFO(mb8877) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "MB8877"); break; - default: DEVICE_GET_INFO_CALL(wd1770); break; - } -} - const device_type FD1771 = &device_creator<fd1771_device>; fd1771_device::fd1771_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/2151intf.c b/src/emu/sound/2151intf.c index 61a236ae1da..0c976d38987 100644 --- a/src/emu/sound/2151intf.c +++ b/src/emu/sound/2151intf.c @@ -119,33 +119,6 @@ WRITE8_DEVICE_HANDLER( ym2151_register_port_w ) { ym2151_w(device, 0, data); } WRITE8_DEVICE_HANDLER( ym2151_data_port_w ) { ym2151_w(device, 1, data); } - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( ym2151 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(ym2151_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( ym2151 ); break; - case DEVINFO_FCT_STOP: info->stop = DEVICE_STOP_NAME( ym2151 ); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( ym2151 ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "YM2151"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Yamaha FM"); 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; - } -} - - const device_type YM2151 = &device_creator<ym2151_device>; ym2151_device::ym2151_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/2203intf.c b/src/emu/sound/2203intf.c index ae929ed355f..60bd0318e7f 100644 --- a/src/emu/sound/2203intf.c +++ b/src/emu/sound/2203intf.c @@ -181,33 +181,6 @@ READ8_DEVICE_HANDLER( ym2203_read_port_r ) { return ym2203_r(device, 1); } WRITE8_DEVICE_HANDLER( ym2203_control_port_w ) { ym2203_w(device, 0, data); } WRITE8_DEVICE_HANDLER( ym2203_write_port_w ) { ym2203_w(device, 1, data); } - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( ym2203 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(ym2203_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( ym2203 ); break; - case DEVINFO_FCT_STOP: info->stop = DEVICE_STOP_NAME( ym2203 ); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( ym2203 ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "YM2203"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Yamaha FM"); 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; - } -} - - const device_type YM2203 = &device_creator<ym2203_device>; ym2203_device::ym2203_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/2413intf.c b/src/emu/sound/2413intf.c index 6ea45579363..6d2a7a32928 100644 --- a/src/emu/sound/2413intf.c +++ b/src/emu/sound/2413intf.c @@ -115,33 +115,6 @@ WRITE8_DEVICE_HANDLER( ym2413_w ) WRITE8_DEVICE_HANDLER( ym2413_register_port_w ) { ym2413_w(device, 0, data); } WRITE8_DEVICE_HANDLER( ym2413_data_port_w ) { ym2413_w(device, 1, data); } - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( ym2413 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(ym2413_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( ym2413 ); break; - case DEVINFO_FCT_STOP: info->stop = DEVICE_STOP_NAME( ym2413 ); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( ym2413 ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "YM2413"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Yamaha FM"); 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; - } -} - - const device_type YM2413 = &device_creator<ym2413_device>; ym2413_device::ym2413_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/2608intf.c b/src/emu/sound/2608intf.c index be99536f274..d4f4ee2feda 100644 --- a/src/emu/sound/2608intf.c +++ b/src/emu/sound/2608intf.c @@ -204,34 +204,6 @@ WRITE8_DEVICE_HANDLER( ym2608_control_port_b_w ) { ym2608_w(device, 2, data); } WRITE8_DEVICE_HANDLER( ym2608_data_port_a_w ) { ym2608_w(device, 1, data); } WRITE8_DEVICE_HANDLER( ym2608_data_port_b_w ) { ym2608_w(device, 3, data); } - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( ym2608 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(ym2608_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( ym2608 ); break; - case DEVINFO_FCT_STOP: info->stop = DEVICE_STOP_NAME( ym2608 ); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( ym2608 ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "YM2608"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Yamaha FM"); 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; - } -} - - const device_type YM2608 = &device_creator<ym2608_device>; ym2608_device::ym2608_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/2610intf.c b/src/emu/sound/2610intf.c index ec019e94536..c2db5cbbd64 100644 --- a/src/emu/sound/2610intf.c +++ b/src/emu/sound/2610intf.c @@ -217,45 +217,6 @@ WRITE8_DEVICE_HANDLER( ym2610_control_port_b_w ) { ym2610_w(device, 2, data); } WRITE8_DEVICE_HANDLER( ym2610_data_port_a_w ) { ym2610_w(device, 1, data); } WRITE8_DEVICE_HANDLER( ym2610_data_port_b_w ) { ym2610_w(device, 3, data); } - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( ym2610 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(ym2610_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( ym2610 ); break; - case DEVINFO_FCT_STOP: info->stop = DEVICE_STOP_NAME( ym2610 ); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( ym2610 ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "YM2610"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Yamaha FM"); 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; - } -} - -DEVICE_GET_INFO( ym2610b ) -{ - switch (state) - { - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "YM2610B"); break; - - default: DEVICE_GET_INFO_CALL(ym2610); break; - } -} - - const device_type YM2610 = &device_creator<ym2610_device>; ym2610_device::ym2610_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/2612intf.c b/src/emu/sound/2612intf.c index f1e58eb7cdd..7513746d7f4 100644 --- a/src/emu/sound/2612intf.c +++ b/src/emu/sound/2612intf.c @@ -157,47 +157,6 @@ WRITE8_DEVICE_HANDLER( ym2612_control_port_b_w ) { ym2612_w(device, 2, data); } WRITE8_DEVICE_HANDLER( ym2612_data_port_a_w ) { ym2612_w(device, 1, data); } WRITE8_DEVICE_HANDLER( ym2612_data_port_b_w ) { ym2612_w(device, 3, data); } - - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( ym2612 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(ym2612_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( ym2612 ); break; - case DEVINFO_FCT_STOP: info->stop = DEVICE_STOP_NAME( ym2612 ); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( ym2612 ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "YM2612"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Yamaha FM"); 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; - } -} - - -DEVICE_GET_INFO( ym3438 ) -{ - switch (state) - { - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "YM3438"); break; - - default: DEVICE_GET_INFO_CALL(ym2612); break; - } -} - - const device_type YM2612 = &device_creator<ym2612_device>; ym2612_device::ym2612_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/262intf.c b/src/emu/sound/262intf.c index 8c257156fb4..2ae7b9003f1 100644 --- a/src/emu/sound/262intf.c +++ b/src/emu/sound/262intf.c @@ -131,33 +131,6 @@ WRITE8_DEVICE_HANDLER( ymf262_register_b_w ) { ymf262_w(device, 2, data); } WRITE8_DEVICE_HANDLER( ymf262_data_a_w ) { ymf262_w(device, 1, data); } WRITE8_DEVICE_HANDLER( ymf262_data_b_w ) { ymf262_w(device, 3, data); } - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( ymf262 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(ymf262_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( ymf262 ); break; - case DEVINFO_FCT_STOP: info->stop = DEVICE_STOP_NAME( ymf262 ); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( ymf262 ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "YMF262"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Yamaha FM"); 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; - } -} - - const device_type YMF262 = &device_creator<ymf262_device>; ymf262_device::ymf262_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/3526intf.c b/src/emu/sound/3526intf.c index 789a4be28e1..cf4c974a364 100644 --- a/src/emu/sound/3526intf.c +++ b/src/emu/sound/3526intf.c @@ -145,32 +145,6 @@ WRITE8_DEVICE_HANDLER( ym3526_control_port_w ) { ym3526_w(device, 0, data); } WRITE8_DEVICE_HANDLER( ym3526_write_port_w ) { ym3526_w(device, 1, data); } -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( ym3526 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(ym3526_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( ym3526 ); break; - case DEVINFO_FCT_STOP: info->stop = DEVICE_STOP_NAME( ym3526 ); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( ym3526 ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "YM3526"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Yamaha FM"); 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; - } -} - - const device_type YM3526 = &device_creator<ym3526_device>; ym3526_device::ym3526_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/3812intf.c b/src/emu/sound/3812intf.c index 02b5bb15dab..af0eba38939 100644 --- a/src/emu/sound/3812intf.c +++ b/src/emu/sound/3812intf.c @@ -141,32 +141,6 @@ WRITE8_DEVICE_HANDLER( ym3812_control_port_w ) { ym3812_w(device, 0, data); } WRITE8_DEVICE_HANDLER( ym3812_write_port_w ) { ym3812_w(device, 1, data); } -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( ym3812 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(ym3812_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( ym3812 ); break; - case DEVINFO_FCT_STOP: info->stop = DEVICE_STOP_NAME( ym3812 ); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( ym3812 ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "YM3812"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Yamaha FM"); 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; - } -} - - const device_type YM3812 = &device_creator<ym3812_device>; ym3812_device::ym3812_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/8950intf.c b/src/emu/sound/8950intf.c index 13c365689f5..b81b1a81073 100644 --- a/src/emu/sound/8950intf.c +++ b/src/emu/sound/8950intf.c @@ -174,32 +174,6 @@ WRITE8_DEVICE_HANDLER( y8950_control_port_w ) { y8950_w(device, 0, data); } WRITE8_DEVICE_HANDLER( y8950_write_port_w ) { y8950_w(device, 1, data); } -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( y8950 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(y8950_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( y8950 ); break; - case DEVINFO_FCT_STOP: info->stop = DEVICE_STOP_NAME( y8950 ); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( y8950 ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Y8950"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Yamaha FM"); 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; - } -} - - const device_type Y8950 = &device_creator<y8950_device>; y8950_device::y8950_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/aica.c b/src/emu/sound/aica.c index 1a1aa88b4f9..dac69178d21 100644 --- a/src/emu/sound/aica.c +++ b/src/emu/sound/aica.c @@ -1354,32 +1354,6 @@ READ16_DEVICE_HANDLER( aica_midi_out_r ) return val; } -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( aica ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(aica_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( aica ); break; - case DEVINFO_FCT_STOP: info->start = DEVICE_STOP_NAME( aica ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "AICA"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Sega/Yamaha custom"); break; - case DEVINFO_STR_VERSION: strcpy(info->s, "1.0.1"); 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; - } -} - - - const device_type AICA = &device_creator<aica_device>; aica_device::aica_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/astrocde.c b/src/emu/sound/astrocde.c index dac4a27fc29..35b9f67efff 100644 --- a/src/emu/sound/astrocde.c +++ b/src/emu/sound/astrocde.c @@ -302,35 +302,6 @@ WRITE8_DEVICE_HANDLER( astrocade_sound_w ) chip->reg[offset & 7] = data; } - - -/************************************* - * - * Get/set info callbacks - * - *************************************/ - -DEVICE_GET_INFO( astrocade ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(astrocade_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( astrocade ); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( astrocade ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Astrocade"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Bally"); break; - case DEVINFO_STR_VERSION: strcpy(info->s, "2.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; - } -} - - const device_type ASTROCADE = &device_creator<astrocade_device>; astrocade_device::astrocade_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/ay8910.c b/src/emu/sound/ay8910.c index 78e97d5c54d..b6ea27b2218 100644 --- a/src/emu/sound/ay8910.c +++ b/src/emu/sound/ay8910.c @@ -975,100 +975,6 @@ static DEVICE_RESET( ay8910 ) ay8910_reset_ym(get_safe_token(device)); } -DEVICE_GET_INFO( ay8910 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(ay8910_context); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( ay8910 ); break; - case DEVINFO_FCT_STOP: info->stop = DEVICE_STOP_NAME( ay8910 ); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( ay8910 ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "AY-3-8910A"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "PSG"); 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; - } -} - -DEVICE_GET_INFO( ay8912 ) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "AY-3-8912A"); break; - default: DEVICE_GET_INFO_CALL(ay8910); break; - } -} - -DEVICE_GET_INFO( ay8913 ) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "AY-3-8913A"); break; - default: DEVICE_GET_INFO_CALL(ay8910); break; - } -} - -DEVICE_GET_INFO( ay8914 ) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "AY-3-8914"); break; - default: DEVICE_GET_INFO_CALL(ay8910); break; - } -} - -DEVICE_GET_INFO( ay8930 ) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "AY8930"); break; - default: DEVICE_GET_INFO_CALL(ay8910); break; - } -} - -DEVICE_GET_INFO( ym2149 ) -{ - switch (state) - { - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( ym2149 ); break; - case DEVINFO_STR_NAME: strcpy(info->s, "YM2149"); break; - default: DEVICE_GET_INFO_CALL(ay8910); break; - } -} - -DEVICE_GET_INFO( ym3439 ) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "YM3439"); break; - default: DEVICE_GET_INFO_CALL(ym2149); break; - } -} - -DEVICE_GET_INFO( ymz284 ) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "YMZ284"); break; - default: DEVICE_GET_INFO_CALL(ym2149); break; - } -} - -DEVICE_GET_INFO( ymz294 ) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "YMZ294"); break; - default: DEVICE_GET_INFO_CALL(ym2149); break; - } -} - /************************************* * * Read/Write Handlers diff --git a/src/emu/sound/beep.c b/src/emu/sound/beep.c index 29844737f39..4c9d88d7d3c 100644 --- a/src/emu/sound/beep.c +++ b/src/emu/sound/beep.c @@ -163,32 +163,6 @@ void beep_set_volume(device_t *device, int volume) downcast<beep_device *>(device)->set_output_gain(0, volume); } - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( beep ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(beep_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( beep ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Beep"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Beep"); 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 The MESS Team"); break; - } -} - - const device_type BEEP = &device_creator<beep_device>; beep_device::beep_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/c140.c b/src/emu/sound/c140.c index bf13c26d4a7..7fc4955cb5d 100644 --- a/src/emu/sound/c140.c +++ b/src/emu/sound/c140.c @@ -475,35 +475,6 @@ static DEVICE_START( c140 ) info->mixer_buffer_right = info->mixer_buffer_left + info->sample_rate; } - - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( c140 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(c140_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( c140 ); 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 DEVINFO_STR_NAME: strcpy(info->s, "C140"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Namco PCM"); 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; - } -} - - const device_type C140 = &device_creator<c140_device>; c140_device::c140_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/c6280.c b/src/emu/sound/c6280.c index 59ab9e5e595..1af7c056442 100644 --- a/src/emu/sound/c6280.c +++ b/src/emu/sound/c6280.c @@ -344,34 +344,6 @@ WRITE8_DEVICE_HANDLER( c6280_w ) c6280_write(info, offset, data); } - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( c6280 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(c6280_t); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( c6280 ); 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 DEVINFO_STR_NAME: strcpy(info->s, "HuC6280"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "????"); 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; - } -} - - const device_type C6280 = &device_creator<c6280_device>; c6280_device::c6280_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/cdda.c b/src/emu/sound/cdda.c index 309891154b2..f7fea928c75 100644 --- a/src/emu/sound/cdda.c +++ b/src/emu/sound/cdda.c @@ -313,32 +313,6 @@ void cdda_set_channel_volume(device_t *device, int channel, int volume) cdda->stream->set_output_gain(channel,volume / 100.0); } -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( cdda ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(cdda_info); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( cdda ); 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 DEVINFO_STR_NAME: strcpy(info->s, "CD/DA"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "CD Audio"); 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; - } -} - - const device_type CDDA = &device_creator<cdda_device>; cdda_device::cdda_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/cem3394.c b/src/emu/sound/cem3394.c index 388baf1e9a2..fe5ee1ee855 100644 --- a/src/emu/sound/cem3394.c +++ b/src/emu/sound/cem3394.c @@ -557,35 +557,6 @@ double cem3394_get_parameter(device_t *device, int input) return 0.0; } - - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( cem3394 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - 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 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 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; - } -} - - const device_type CEM3394 = &device_creator<cem3394_device>; cem3394_device::cem3394_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/digitalk.c b/src/emu/sound/digitalk.c index 2410e2b052e..726bd3d5285 100644 --- a/src/emu/sound/digitalk.c +++ b/src/emu/sound/digitalk.c @@ -659,21 +659,6 @@ static DEVICE_START(digitalker) digitalker_register_for_save(dg); } -DEVICE_GET_INFO(digitalker) -{ - switch(state) { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(digitalker); break; - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(digitalker); break; - case DEVINFO_FCT_STOP: break; - case DEVINFO_FCT_RESET: break; - case DEVINFO_STR_NAME: strcpy(info->s, "Digitalker"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "National Semiconductor"); 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 Olivier Galibert"); break; - } -} - void digitalker_0_cs_w(device_t *device, int line) { digitalker *dg = get_safe_token(device); diff --git a/src/emu/sound/dmadac.c b/src/emu/sound/dmadac.c index 2d7a4c3e173..c91f017d523 100644 --- a/src/emu/sound/dmadac.c +++ b/src/emu/sound/dmadac.c @@ -234,34 +234,6 @@ void dmadac_set_volume(dmadac_sound_device **devlist, UINT8 num_channels, UINT16 } } - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( dmadac_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(dmadac_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( dmadac ); 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 DEVINFO_STR_NAME: strcpy(info->s, "DMA-driven DAC"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "DAC"); 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; - } -} - - const device_type DMADAC = &device_creator<dmadac_sound_device>; dmadac_sound_device::dmadac_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/es5506.c b/src/emu/sound/es5506.c index d3610110d0d..45a80b8f408 100644 --- a/src/emu/sound/es5506.c +++ b/src/emu/sound/es5506.c @@ -2153,60 +2153,6 @@ void es5505_voice_bank_w(device_t *device, int voice, int bank) chip->voice[voice].exbank=bank; } - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( es5505 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(es5506_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( es5505 ); break; - case DEVINFO_FCT_STOP: info->stop = DEVICE_STOP_NAME( es5505 ); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( es5505 ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "ES5505"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Ensoniq Wavetable"); 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; - } -} - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( es5506 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(es5506_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( es5506 ); break; - case DEVINFO_FCT_STOP: info->stop = DEVICE_STOP_NAME( es5506 ); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( es5506 ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "ES5506"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Ensoniq Wavetable"); 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; - } -} - - const device_type ES5505 = &device_creator<es5505_device>; es5505_device::es5505_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -2216,6 +2162,13 @@ es5505_device::es5505_device(const machine_config &mconfig, const char *tag, dev 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) + : device_t(mconfig, type, name, tag, owner, clock), + device_sound_interface(mconfig, *this) +{ + m_token = global_alloc_array_clear(UINT8, sizeof(es5506_state)); +} + //------------------------------------------------- // device_config_complete - perform any // operations now that the configuration is @@ -2267,10 +2220,8 @@ void es5505_device::sound_stream_update(sound_stream &stream, stream_sample_t ** const device_type ES5506 = &device_creator<es5506_device>; 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) + : es5505_device(mconfig, ES5506, "ES5506", tag, owner, clock) { - m_token = global_alloc_array_clear(UINT8, sizeof(es5506_state)); } //------------------------------------------------- diff --git a/src/emu/sound/es5506.h b/src/emu/sound/es5506.h index 7c7ca841837..ccaaa269bab 100644 --- a/src/emu/sound/es5506.h +++ b/src/emu/sound/es5506.h @@ -30,6 +30,7 @@ class es5505_device : public device_t, { public: es5505_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + es5505_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock); ~es5505_device() { global_free(m_token); } // access to legacy token @@ -67,15 +68,10 @@ READ8_DEVICE_HANDLER( es5506_r ); WRITE8_DEVICE_HANDLER( es5506_w ); void es5506_voice_bank_w(device_t *device, int voice, int bank); -class es5506_device : public device_t, - public device_sound_interface +class es5506_device : public es5505_device { public: es5506_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - ~es5506_device() { global_free(m_token); } - - // access to legacy token - void *token() const { assert(m_token != NULL); return m_token; } protected: // device-level overrides virtual void device_config_complete(); @@ -87,7 +83,6 @@ protected: virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); private: // internal state - void *m_token; }; extern const device_type ES5506; diff --git a/src/emu/sound/es8712.c b/src/emu/sound/es8712.c index 191621756bf..63ff2bc7c5a 100644 --- a/src/emu/sound/es8712.c +++ b/src/emu/sound/es8712.c @@ -379,34 +379,6 @@ WRITE8_DEVICE_HANDLER( es8712_w ) chip->start &= 0xfffff; chip->end &= 0xfffff; } - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( es8712 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(es8712_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( es8712 ); break; - case DEVINFO_FCT_STOP: /* nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( es8712 ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "ES8712"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Excellent Systems ADPCM"); 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; - } -} - - const device_type ES8712 = &device_creator<es8712_device>; es8712_device::es8712_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/flt_rc.c b/src/emu/sound/flt_rc.c index ed5fb61cfd6..94c4e9d2850 100644 --- a/src/emu/sound/flt_rc.c +++ b/src/emu/sound/flt_rc.c @@ -111,32 +111,6 @@ void filter_rc_set_RC(device_t *device, int type, double R1, double R2, double R } -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( filter_rc ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(filter_rc_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( filter_rc ); 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 DEVINFO_STR_NAME: strcpy(info->s, "RC Filter"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Filters"); 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; - } -} - - const device_type FILTER_RC = &device_creator<filter_rc_device>; filter_rc_device::filter_rc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/flt_vol.c b/src/emu/sound/flt_vol.c index 9f173a16c8f..68e2f07c81a 100644 --- a/src/emu/sound/flt_vol.c +++ b/src/emu/sound/flt_vol.c @@ -44,34 +44,6 @@ void flt_volume_set_volume(device_t *device, float volume) info->gain = (int)(volume * 256); } - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( filter_volume ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(filter_volume_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( filter_volume ); 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 DEVINFO_STR_NAME: strcpy(info->s, "Volume Filter"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Filters"); 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; - } -} - - const device_type FILTER_VOLUME = &device_creator<filter_volume_device>; filter_volume_device::filter_volume_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/gaelco.c b/src/emu/sound/gaelco.c index 0a889cf421c..248ea4314c5 100644 --- a/src/emu/sound/gaelco.c +++ b/src/emu/sound/gaelco.c @@ -284,61 +284,6 @@ static DEVICE_STOP( gaelco ) } - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( gaelco_gae1 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(gaelco_sound_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( gaelco ); break; - case DEVINFO_FCT_STOP: info->stop = DEVICE_STOP_NAME( gaelco ); break; - case DEVINFO_FCT_RESET: /* nothing */ break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Gaelco GAE1"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Gaelco custom"); 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; - } -} - - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( gaelco_cg1v ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(gaelco_sound_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( gaelco ); break; - case DEVINFO_FCT_STOP: info->stop = DEVICE_STOP_NAME( gaelco ); break; - case DEVINFO_FCT_RESET: /* nothing */ break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Gaelco CG1V"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Gaelco custom"); 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; - } -} - - const device_type GAELCO_GAE1 = &device_creator<gaelco_gae1_device>; gaelco_gae1_device::gaelco_gae1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/hc55516.c b/src/emu/sound/hc55516.c index 109dde9c51b..0c5e6700bef 100644 --- a/src/emu/sound/hc55516.c +++ b/src/emu/sound/hc55516.c @@ -294,56 +294,6 @@ int hc55516_clock_state_r(device_t *device) } - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( hc55516 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(hc55516_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( hc55516 ); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( hc55516 ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "HC-55516"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "CVSD"); break; - case DEVINFO_STR_VERSION: strcpy(info->s, "2.1"); 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; - } -} - - -DEVICE_GET_INFO( mc3417 ) -{ - switch (state) - { - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( mc3417 ); break; - case DEVINFO_FCT_RESET: /* chip has no reset pin */ break; - case DEVINFO_STR_NAME: strcpy(info->s, "MC3417"); break; - default: DEVICE_GET_INFO_CALL(hc55516); break; - } -} - - -DEVICE_GET_INFO( mc3418 ) -{ - switch (state) - { - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( mc3418 ); break; - case DEVINFO_FCT_RESET: /* chip has no reset pin */ break; - case DEVINFO_STR_NAME: strcpy(info->s, "MC3418"); break; - default: DEVICE_GET_INFO_CALL(hc55516); break; - } -} - - const device_type HC55516 = &device_creator<hc55516_device>; hc55516_device::hc55516_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/iremga20.c b/src/emu/sound/iremga20.c index ac277b9d81e..985da18bcf7 100644 --- a/src/emu/sound/iremga20.c +++ b/src/emu/sound/iremga20.c @@ -264,35 +264,6 @@ static DEVICE_START( iremga20 ) } } - - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( iremga20 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(ga20_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( iremga20 ); break; - case DEVINFO_FCT_STOP: /* nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( iremga20 ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Irem GA20"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Irem custom"); 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; - } -} - - const device_type IREMGA20 = &device_creator<iremga20_device>; iremga20_device::iremga20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/k005289.c b/src/emu/sound/k005289.c index b70c590b844..78297c7a0a3 100644 --- a/src/emu/sound/k005289.c +++ b/src/emu/sound/k005289.c @@ -245,35 +245,6 @@ WRITE8_DEVICE_HANDLER( k005289_keylatch_B_w ) k005289_recompute(info); } - - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( k005289 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(k005289_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( k005289 ); 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 DEVINFO_STR_NAME: strcpy(info->s, "K005289"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Konami custom"); 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; - } -} - - const device_type K005289 = &device_creator<k005289_device>; k005289_device::k005289_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/k007232.c b/src/emu/sound/k007232.c index 9d86997e9b8..6ef4da8711b 100644 --- a/src/emu/sound/k007232.c +++ b/src/emu/sound/k007232.c @@ -443,36 +443,6 @@ void k007232_set_bank( device_t *device, int chABank, int chBBank ) /*****************************************************************************/ - - - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( k007232 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(KDAC_A_PCM); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( k007232 ); 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 DEVINFO_STR_NAME: strcpy(info->s, "K007232"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Konami custom"); 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; - } -} - - const device_type K007232 = &device_creator<k007232_device>; k007232_device::k007232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/k051649.c b/src/emu/sound/k051649.c index ecc8a882a32..e9be04e8d67 100644 --- a/src/emu/sound/k051649.c +++ b/src/emu/sound/k051649.c @@ -281,35 +281,6 @@ READ8_DEVICE_HANDLER ( k051649_test_r ) return 0xff; } - - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( k051649 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(k051649_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( k051649 ); break; - case DEVINFO_FCT_STOP: /* nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( k051649 ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "K051649"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Konami custom"); 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; - } -} - - const device_type K051649 = &device_creator<k051649_device>; k051649_device::k051649_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/k053260.c b/src/emu/sound/k053260.c index 25dfa41b2ba..06d19b1eec3 100644 --- a/src/emu/sound/k053260.c +++ b/src/emu/sound/k053260.c @@ -437,32 +437,6 @@ READ8_DEVICE_HANDLER( k053260_r ) return ic->regs[offset]; } -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( k053260 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(k053260_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( k053260 ); break; - case DEVINFO_FCT_STOP: /* nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( k053260 ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "K053260"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Konami custom"); 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; - } -} - - const device_type K053260 = &device_creator<k053260_device>; k053260_device::k053260_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/k056800.c b/src/emu/sound/k056800.c index 6a6159b77cd..b88bd165608 100644 --- a/src/emu/sound/k056800.c +++ b/src/emu/sound/k056800.c @@ -164,21 +164,6 @@ static DEVICE_RESET( k056800 ) k056800->sound_cpu_irq1_enable = 0; } - -DEVICE_GET_INFO(k056800) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(k056800_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(k056800); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(k056800); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "Konami 056800 MIRAC"); break; - } -} - const device_type K056800 = &device_creator<k056800_device>; k056800_device::k056800_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/mos6560.c b/src/emu/sound/mos6560.c index a78c45c4062..b0c2fc8991a 100644 --- a/src/emu/sound/mos6560.c +++ b/src/emu/sound/mos6560.c @@ -951,25 +951,6 @@ static DEVICE_RESET( mos6560 ) mos6560->noisesamples = 1; } - -/*------------------------------------------------- - Device definition --------------------------------------------------*/ - -DEVICE_GET_INFO(mos6560) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(mos6560_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(mos6560); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(mos6560); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "MOS 6560 / 6561 VIC"); break; - } -} - const device_type MOS656X = &device_creator<mos6560_device>; mos6560_device::mos6560_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/msm5205.c b/src/emu/sound/msm5205.c index 25f5317f4ed..b434972b515 100644 --- a/src/emu/sound/msm5205.c +++ b/src/emu/sound/msm5205.c @@ -341,42 +341,6 @@ void msm5205_change_clock_w(device_t *device, INT32 clock) voice->timer->adjust(period, 0, period); } - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( msm5205 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(msm5205_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( msm5205 ); break; - case DEVINFO_FCT_STOP: /* nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( msm5205 ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "MSM5205"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "ADPCM"); 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; - } -} - -DEVICE_GET_INFO( msm6585 ) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "MSM6585"); break; - default: DEVICE_GET_INFO_CALL(msm5205); break; - } -} - - const device_type MSM5205 = &device_creator<msm5205_device>; msm5205_device::msm5205_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/msm5232.c b/src/emu/sound/msm5232.c index 6561c6f9161..e9237e7b379 100644 --- a/src/emu/sound/msm5232.c +++ b/src/emu/sound/msm5232.c @@ -850,34 +850,6 @@ void msm5232_set_clock(device_t *device, int clock) } } - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( msm5232 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(msm5232_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( msm5232 ); break; - case DEVINFO_FCT_STOP: info->stop = DEVICE_STOP_NAME( msm5232 ); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( msm5232 ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "MSM5232"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Oki Tone"); break; - case DEVINFO_STR_VERSION: strcpy(info->s, "1.1"); 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; - } -} - - const device_type MSM5232 = &device_creator<msm5232_device>; msm5232_device::msm5232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/multipcm.c b/src/emu/sound/multipcm.c index b03d1bc604b..eae6fd797bf 100644 --- a/src/emu/sound/multipcm.c +++ b/src/emu/sound/multipcm.c @@ -673,33 +673,6 @@ void multipcm_set_bank(device_t *device, UINT32 leftoffs, UINT32 rightoffs) } - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( multipcm ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(MultiPCM); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( multipcm ); 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 DEVINFO_STR_NAME: strcpy(info->s, "Sega/Yamaha 315-5560"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Sega custom"); break; - case DEVINFO_STR_VERSION: strcpy(info->s, "2.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; - } -} - - const device_type MULTIPCM = &device_creator<multipcm_device>; multipcm_device::multipcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/n63701x.c b/src/emu/sound/n63701x.c index 0ab68ae368e..1fbadefbddd 100644 --- a/src/emu/sound/n63701x.c +++ b/src/emu/sound/n63701x.c @@ -154,37 +154,6 @@ WRITE8_DEVICE_HANDLER( namco_63701x_w ) } } - - - - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( namco_63701x ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(namco_63701x); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( namco_63701x ); 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 DEVINFO_STR_NAME: strcpy(info->s, "Namco 63701X"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Namco custom"); 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; - } -} - - const device_type NAMCO_63701X = &device_creator<namco_63701x_device>; namco_63701x_device::namco_63701x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/namco.c b/src/emu/sound/namco.c index b255309a3d3..c08a147f6a2 100644 --- a/src/emu/sound/namco.c +++ b/src/emu/sound/namco.c @@ -812,85 +812,6 @@ WRITE8_DEVICE_HANDLER( namco_snd_sharedram_w ) } } - - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( namco ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(namco_sound); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( namco ); 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 DEVINFO_STR_NAME: strcpy(info->s, "Namco"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Namco custom"); 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; - } -} - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( namco_15xx ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(namco_sound); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( namco ); 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 DEVINFO_STR_NAME: strcpy(info->s, "Namco 15XX"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Namco custom"); 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; - } -} - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( namco_cus30 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(namco_sound); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( namco ); 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 DEVINFO_STR_NAME: strcpy(info->s, "Namco CUS30"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Namco custom"); 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; - } -} - - const device_type NAMCO = &device_creator<namco_device>; namco_device::namco_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/nes_apu.c b/src/emu/sound/nes_apu.c index d42e8bfa572..a7792bd838a 100644 --- a/src/emu/sound/nes_apu.c +++ b/src/emu/sound/nes_apu.c @@ -765,33 +765,6 @@ static DEVICE_START( nesapu ) #endif } - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( nesapu ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(nesapu_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( nesapu ); 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 DEVINFO_STR_NAME: strcpy(info->s, "N2A03"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Nintendo custom"); 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; - } -} - - const device_type NES = &device_creator<nesapu_device>; nesapu_device::nesapu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/nile.c b/src/emu/sound/nile.c index da61d1b6431..5214b05df38 100644 --- a/src/emu/sound/nile.c +++ b/src/emu/sound/nile.c @@ -230,34 +230,6 @@ static DEVICE_START( nile ) info->stream = device->machine().sound().stream_alloc(*device, 0, 2, 44100, info, nile_update); } - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( nile ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(nile_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( nile ); 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 DEVINFO_STR_NAME: strcpy(info->s, "NiLe"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Seta custom"); 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; - } -} - - const device_type NILE = &device_creator<nile_device>; nile_device::nile_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/okim6258.c b/src/emu/sound/okim6258.c index 2ac8ef908e9..8a21113985c 100644 --- a/src/emu/sound/okim6258.c +++ b/src/emu/sound/okim6258.c @@ -353,34 +353,6 @@ WRITE8_DEVICE_HANDLER( okim6258_ctrl_w ) } - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( okim6258 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(okim6258_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(okim6258); break; - case DEVINFO_FCT_STOP: /* nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(okim6258); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "OKI6258"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "OKI ADPCM"); 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; - } -} - - const device_type OKIM6258 = &device_creator<okim6258_device>; okim6258_device::okim6258_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/okim6376.c b/src/emu/sound/okim6376.c index 1a63d21d220..622426c1695 100644 --- a/src/emu/sound/okim6376.c +++ b/src/emu/sound/okim6376.c @@ -619,33 +619,6 @@ WRITE8_DEVICE_HANDLER( okim6376_w ) } - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( okim6376 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(okim6376_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( okim6376 ); break; - case DEVINFO_FCT_STOP: /* nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( okim6376 ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "OKI6376"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "OKI ADPCM"); 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; - } -} - - const device_type OKIM6376 = &device_creator<okim6376_device>; okim6376_device::okim6376_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/qsound.c b/src/emu/sound/qsound.c index f691fdd3c22..25a6b1c8c08 100644 --- a/src/emu/sound/qsound.c +++ b/src/emu/sound/qsound.c @@ -370,35 +370,6 @@ static STREAM_UPDATE( qsound_update ) fwrite(datap[1], samples*sizeof(QSOUND_SAMPLE), 1, chip->fpRawDataR); } - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( qsound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(qsound_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( qsound ); break; - case DEVINFO_FCT_STOP: info->stop = DEVICE_STOP_NAME( qsound ); break; - case DEVINFO_FCT_RESET: /* Nothing */ break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Q-Sound"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Capcom custom"); 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; - } -} - -/**************** end of file ****************/ - const device_type QSOUND = &device_creator<qsound_device>; qsound_device::qsound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/rf5c400.c b/src/emu/sound/rf5c400.c index 75e2d9f2217..34d6440680a 100644 --- a/src/emu/sound/rf5c400.c +++ b/src/emu/sound/rf5c400.c @@ -558,31 +558,6 @@ WRITE16_DEVICE_HANDLER( rf5c400_w ) } } -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( rf5c400 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(rf5c400_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( rf5c400 ); 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 DEVINFO_STR_NAME: strcpy(info->s, "RF5C400"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Ricoh PCM"); break; - case DEVINFO_STR_VERSION: strcpy(info->s, "1.1"); 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 & hoot development team"); break; - } -} - const device_type RF5C400 = &device_creator<rf5c400_device>; rf5c400_device::rf5c400_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/rf5c68.c b/src/emu/sound/rf5c68.c index 756f2b23189..8fbfa2f7610 100644 --- a/src/emu/sound/rf5c68.c +++ b/src/emu/sound/rf5c68.c @@ -258,35 +258,6 @@ WRITE8_DEVICE_HANDLER( rf5c68_mem_w ) chip->data[chip->wbank * 0x1000 + offset] = data; } - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( rf5c68 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(rf5c68_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( rf5c68 ); 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 DEVINFO_STR_NAME: strcpy(info->s, "RF5C68"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Ricoh PCM"); 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; - } -} - -/**************** end of file ****************/ - const device_type RF5C68 = &device_creator<rf5c68_device>; rf5c68_device::rf5c68_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/s14001a.c b/src/emu/sound/s14001a.c index 17f46bbe09a..e66d670bc81 100644 --- a/src/emu/sound/s14001a.c +++ b/src/emu/sound/s14001a.c @@ -629,25 +629,6 @@ void s14001a_set_volume(device_t *device, int volume) chip->VSU1000_amp = volume; } -DEVICE_GET_INFO( s14001a ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(S14001AChip); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( s14001a ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "S14001A"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "TSI S14001A"); break; - case DEVINFO_STR_VERSION: strcpy(info->s, "1.32"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Jonathan Gevaryahu"); break; - } -} - const device_type S14001A = &device_creator<s14001a_device>; s14001a_device::s14001a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/s2636.c b/src/emu/sound/s2636.c index 1fd7ad08658..53149a3bcde 100644 --- a/src/emu/sound/s2636.c +++ b/src/emu/sound/s2636.c @@ -82,23 +82,6 @@ static DEVICE_START(s2636_sound) token->channel = device->machine().sound().stream_alloc(*device, 0, 1, device->machine().sample_rate(), 0, s2636_update); } - -DEVICE_GET_INFO( s2636_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(s2636_sound); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(s2636_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "S2636"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - const device_type S2636_SOUND = &device_creator<s2636_sound_device>; s2636_sound_device::s2636_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/saa1099.c b/src/emu/sound/saa1099.c index b85a062905a..404d096829b 100644 --- a/src/emu/sound/saa1099.c +++ b/src/emu/sound/saa1099.c @@ -436,33 +436,6 @@ WRITE8_DEVICE_HANDLER( saa1099_data_w ) } } - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( saa1099 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(saa1099_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( saa1099 ); 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 DEVINFO_STR_NAME: strcpy(info->s, "SAA1099"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Philips"); 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; - } -} - - const device_type SAA1099 = &device_creator<saa1099_device>; saa1099_device::saa1099_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/scsp.c b/src/emu/sound/scsp.c index a324bcb0dd9..4254525c24a 100644 --- a/src/emu/sound/scsp.c +++ b/src/emu/sound/scsp.c @@ -1359,34 +1359,6 @@ READ16_DEVICE_HANDLER( scsp_midi_out_r ) return val; } - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( scsp ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(scsp_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( scsp ); 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 DEVINFO_STR_NAME: strcpy(info->s, "SCSP"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Sega/Yamaha custom"); break; - case DEVINFO_STR_VERSION: strcpy(info->s, "2.1.1"); 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; - } -} - - const device_type SCSP = &device_creator<scsp_device>; scsp_device::scsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/segapcm.c b/src/emu/sound/segapcm.c index 4e975f19be8..a0ed8f93958 100644 --- a/src/emu/sound/segapcm.c +++ b/src/emu/sound/segapcm.c @@ -148,34 +148,6 @@ READ8_DEVICE_HANDLER( sega_pcm_r ) return spcm->ram[offset & 0x07ff]; } - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( segapcm ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(segapcm_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( segapcm ); 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 DEVINFO_STR_NAME: strcpy(info->s, "Sega PCM"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Sega custom"); 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; - } -} - - const device_type SEGAPCM = &device_creator<segapcm_device>; segapcm_device::segapcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/sid6581.c b/src/emu/sound/sid6581.c index d80e5ca7bbf..a7b0a32667b 100644 --- a/src/emu/sound/sid6581.c +++ b/src/emu/sound/sid6581.c @@ -83,48 +83,6 @@ WRITE8_DEVICE_HANDLER ( sid6581_w ) sid6581_port_w(get_sid(device), offset, data); } - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( sid6581 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(_SID6581); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( sid6581 ); break; - case DEVINFO_FCT_STOP: info->stop = NULL; break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( sid ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "SID6581"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "SID"); 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 The MESS Team"); break; - } -} - - -DEVICE_GET_INFO( sid8580 ) -{ - switch (state) - { - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( sid8580 ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "SID8580"); break; - default: DEVICE_GET_INFO_CALL(sid6581); break; - } -} - - const device_type SID6581 = &device_creator<sid6581_device>; sid6581_device::sid6581_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/sn76477.c b/src/emu/sound/sn76477.c index a893af0a0a3..a04f3ef0e09 100644 --- a/src/emu/sound/sn76477.c +++ b/src/emu/sound/sn76477.c @@ -2467,23 +2467,6 @@ static DEVICE_STOP( sn76477 ) close_wav_file(sn); } - -DEVICE_GET_INFO( sn76477 ) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(sn76477_state); break; - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( sn76477 ); break; - case DEVINFO_FCT_STOP: info->stop = DEVICE_STOP_NAME( sn76477 ); break; - case DEVINFO_STR_NAME: strcpy(info->s, "SN76477"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Analog"); break; - case DEVINFO_STR_VERSION: strcpy(info->s, "2.1"); 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; - } -} - - const device_type SN76477 = &device_creator<sn76477_device>; sn76477_device::sn76477_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/sn76496.c b/src/emu/sound/sn76496.c index 722bdfa6ab9..f0ae1a78064 100644 --- a/src/emu/sound/sn76496.c +++ b/src/emu/sound/sn76496.c @@ -486,123 +486,6 @@ static DEVICE_START( segapsg ) generic_start(device, 0x8000, 0x01, 0x08, TRUE, FALSE, 8, FALSE); // todo: verify; from smspower wiki, assumed to have same invert as gamegear } - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( sn76496 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(sn76496_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( sn76496 ); 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 DEVINFO_STR_NAME: strcpy(info->s, "SN76496"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "TI PSG"); break; - case DEVINFO_STR_VERSION: strcpy(info->s, "1.1"); 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; - } -} - -DEVICE_GET_INFO( sn76489 ) -{ - switch (state) - { - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( sn76489 ); break; - case DEVINFO_STR_NAME: strcpy(info->s, "SN76489"); break; - default: DEVICE_GET_INFO_CALL(sn76496); break; - } -} - -DEVICE_GET_INFO( sn76489a ) -{ - switch (state) - { - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( sn76489a ); break; - case DEVINFO_STR_NAME: strcpy(info->s, "SN76489A"); break; - default: DEVICE_GET_INFO_CALL(sn76496); break; - } -} - -DEVICE_GET_INFO( u8106 ) -{ - switch (state) - { - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( u8106 ); break; - case DEVINFO_STR_NAME: strcpy(info->s, "U8106"); break; - default: DEVICE_GET_INFO_CALL(sn76496); break; - } -} - -DEVICE_GET_INFO( y2404 ) -{ - switch (state) - { - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( y2404 ); break; - case DEVINFO_STR_NAME: strcpy(info->s, "Y2404"); break; - default: DEVICE_GET_INFO_CALL(sn76496); break; - } -} - -DEVICE_GET_INFO( sn76494 ) -{ - switch (state) - { - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( sn76494 ); break; - case DEVINFO_STR_NAME: strcpy(info->s, "SN76494"); break; - default: DEVICE_GET_INFO_CALL(sn76496); break; - } -} - -DEVICE_GET_INFO( sn94624 ) -{ - switch (state) - { - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( sn94624 ); break; - case DEVINFO_STR_NAME: strcpy(info->s, "SN94624"); break; - default: DEVICE_GET_INFO_CALL(sn76496); break; - } -} - -DEVICE_GET_INFO( ncr7496 ) -{ - switch (state) - { - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( ncr7496 ); break; - case DEVINFO_STR_NAME: strcpy(info->s, "NCR7496"); break; - default: DEVICE_GET_INFO_CALL(sn76496); break; - } -} - -DEVICE_GET_INFO( gamegear ) -{ - switch (state) - { - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( gamegear ); break; - case DEVINFO_STR_NAME: strcpy(info->s, "Game Gear PSG"); break; - default: DEVICE_GET_INFO_CALL(sn76496); break; - } -} - -DEVICE_GET_INFO( segapsg ) -{ - switch (state) - { - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( segapsg ); break; - case DEVINFO_STR_NAME: strcpy(info->s, "SEGA VDP PSG"); break; - default: DEVICE_GET_INFO_CALL(sn76496); break; - } -} - - const device_type SN76496 = &device_creator<sn76496_device>; sn76496_device::sn76496_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/snkwave.c b/src/emu/sound/snkwave.c index 818af278f23..cc612f0362b 100644 --- a/src/emu/sound/snkwave.c +++ b/src/emu/sound/snkwave.c @@ -159,33 +159,6 @@ WRITE8_DEVICE_HANDLER( snkwave_w ) update_waveform(chip, offset - 2, data); } - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( snkwave ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(snkwave_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( snkwave ); 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 DEVINFO_STR_NAME: strcpy(info->s, "SNK Wave"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "SNK Wave"); 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; - } -} - const device_type SNKWAVE = &device_creator<snkwave_device>; snkwave_device::snkwave_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/sp0250.c b/src/emu/sound/sp0250.c index d32981c2803..f11827eb1e4 100644 --- a/src/emu/sound/sp0250.c +++ b/src/emu/sound/sp0250.c @@ -238,34 +238,6 @@ UINT8 sp0250_drq_r(device_t *device) } - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( sp0250 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(sp0250_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( sp0250 ); 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 DEVINFO_STR_NAME: strcpy(info->s, "SP0250"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "GI speech"); break; - case DEVINFO_STR_VERSION: strcpy(info->s, "1.1"); 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; - } -} - - - const device_type SP0250 = &device_creator<sp0250_device>; sp0250_device::sp0250_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/sp0256.c b/src/emu/sound/sp0256.c index 1f5f155956b..a8176f0df13 100644 --- a/src/emu/sound/sp0256.c +++ b/src/emu/sound/sp0256.c @@ -1365,31 +1365,6 @@ void sp0256_set_clock(device_t *device, int clock) sp->stream->set_sample_rate(clock / CLOCK_DIVIDER); } -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( sp0256 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(sp0256_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( sp0256 ); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( sp0256 ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "SP0256"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "GI"); 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 Joseph Zbiciak, tim lindner"); break; - } -} - - const device_type SP0256 = &device_creator<sp0256_device>; sp0256_device::sp0256_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/speaker.c b/src/emu/sound/speaker.c index 1fae77f3b55..545030f0f06 100644 --- a/src/emu/sound/speaker.c +++ b/src/emu/sound/speaker.c @@ -418,32 +418,6 @@ static double get_filtered_volume(speaker_state *sp) } -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( speaker_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(speaker_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( speaker ); 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 DEVINFO_STR_NAME: strcpy(info->s, "Speaker"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Speaker"); 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 The MESS Team"); break; - } -} - - const device_type SPEAKER_SOUND = &device_creator<speaker_sound_device>; speaker_sound_device::speaker_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/st0016.c b/src/emu/sound/st0016.c index 739b5a6aa7d..321585f1900 100644 --- a/src/emu/sound/st0016.c +++ b/src/emu/sound/st0016.c @@ -145,34 +145,6 @@ static DEVICE_START( st0016 ) info->stream = device->machine().sound().stream_alloc(*device, 0, 2, 44100, info, st0016_update); } - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( st0016 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(st0016_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( st0016 ); 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 DEVINFO_STR_NAME: strcpy(info->s, "ST0016"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Seta custom"); 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; - } -} - - const device_type ST0016 = &device_creator<st0016_device>; st0016_device::st0016_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/t6w28.c b/src/emu/sound/t6w28.c index ab1448c9f02..fb6abb46986 100644 --- a/src/emu/sound/t6w28.c +++ b/src/emu/sound/t6w28.c @@ -365,33 +365,6 @@ static DEVICE_START( t6w28 ) device->save_item(NAME(chip->Output)); } - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( t6w28 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(t6w28_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( t6w28 ); 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 DEVINFO_STR_NAME: strcpy(info->s, "T6W28"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "PSG"); 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; - } -} - - const device_type T6W28 = &device_creator<t6w28_device>; t6w28_device::t6w28_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/tiaintf.c b/src/emu/sound/tiaintf.c index 94114c80429..977f6872cd5 100644 --- a/src/emu/sound/tiaintf.c +++ b/src/emu/sound/tiaintf.c @@ -47,35 +47,6 @@ WRITE8_DEVICE_HANDLER( tia_sound_w ) tia_write(info->chip, offset, data); } - - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( tia ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(tia_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( tia ); break; - case DEVINFO_FCT_STOP: info->stop = DEVICE_STOP_NAME( tia ); break; - case DEVINFO_FCT_RESET: /* Nothing */ break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "TIA"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Atari custom"); 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; - } -} - - const device_type TIA = &device_creator<tia_device>; tia_device::tia_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/tms3615.c b/src/emu/sound/tms3615.c index a051f965ae8..3133c1c062e 100644 --- a/src/emu/sound/tms3615.c +++ b/src/emu/sound/tms3615.c @@ -94,32 +94,6 @@ static DEVICE_START( tms3615 ) tms->basefreq = device->clock(); } -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( tms3615 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(tms_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( tms3615 ); 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 DEVINFO_STR_NAME: strcpy(info->s, "TMS3615"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "TI PSG"); 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; - } -} - - const device_type TMS3615 = &device_creator<tms3615_device>; tms3615_device::tms3615_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/tms36xx.c b/src/emu/sound/tms36xx.c index 53057650aae..5fe06604124 100644 --- a/src/emu/sound/tms36xx.c +++ b/src/emu/sound/tms36xx.c @@ -524,34 +524,6 @@ static DEVICE_START( tms36xx ) } - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( tms36xx ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(tms_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( tms36xx ); 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 DEVINFO_STR_NAME: strcpy(info->s, "TMS36XX"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "TI PSG"); 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; - } -} - - const device_type TMS36XX = &device_creator<tms36xx_device>; tms36xx_device::tms36xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/tms5110.c b/src/emu/sound/tms5110.c index 95f209381b8..f293b1488dd 100644 --- a/src/emu/sound/tms5110.c +++ b/src/emu/sound/tms5110.c @@ -1497,95 +1497,6 @@ WRITE_LINE_DEVICE_HANDLER( tmsprom_enable_w ) TMS 5110 device definition -------------------------------------------------*/ - -DEVICE_GET_INFO(tms5110) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(tms5110_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(tms5110); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(tms5110); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "TMS5110"); break; - } -} - -DEVICE_GET_INFO(tms5100) -{ - switch (state) - { - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(tms5100); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "TMS5100"); break; - default: DEVICE_GET_INFO_CALL(tms5110); break; - } -} - -DEVICE_GET_INFO(tms5110a) -{ - switch (state) - { - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(tms5110a); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "TMS5110A"); break; - default: DEVICE_GET_INFO_CALL(tms5110); break; - } -} - -DEVICE_GET_INFO(cd2801) -{ - switch (state) - { - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(cd2801); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "CD2801"); break; - default: DEVICE_GET_INFO_CALL(tms5110); break; - } -} - -DEVICE_GET_INFO(tmc0281) -{ - switch (state) - { - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(tmc0281); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "TMC0281"); break; - default: DEVICE_GET_INFO_CALL(tms5110); break; - } -} - -DEVICE_GET_INFO(cd2802) -{ - switch (state) - { - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(cd2802); break; - case DEVINFO_STR_NAME: strcpy(info->s, "CD2802"); break; - default: DEVICE_GET_INFO_CALL(tms5110); break; - } -} - -DEVICE_GET_INFO(m58817) -{ - switch (state) - { - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(m58817); break; - case DEVINFO_STR_NAME: strcpy(info->s, "M58817"); break; - default: DEVICE_GET_INFO_CALL(tms5110); break; - } -} - -DEVICE_GET_INFO(tmsprom) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(tmsprom_state); break; - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(tmsprom); break; - case DEVINFO_STR_NAME: strcpy(info->s, "TMSPROM"); break; - } -} - const device_type TMS5110 = &device_creator<tms5110_device>; tms5110_device::tms5110_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/tms5220.c b/src/emu/sound/tms5220.c index 2c8e5872c7e..08a53296e7b 100644 --- a/src/emu/sound/tms5220.c +++ b/src/emu/sound/tms5220.c @@ -2004,59 +2004,6 @@ void tms5220_set_frequency(device_t *device, int frequency) tms->clock = frequency; } - - -/*------------------------------------------------- - device definition --------------------------------------------------*/ - -DEVICE_GET_INFO(tms5220) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(tms5220_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(tms5220); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(tms5220); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "TMS5220"); break; - } -} - -DEVICE_GET_INFO(tms5220c) -{ - switch (state) - { - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(tms5220c); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "TMS5220C"); break; - default: DEVICE_GET_INFO_CALL(tms5220); break; - } -} - -DEVICE_GET_INFO(tmc0285) -{ - switch (state) - { - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(tmc0285); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "TMC0285"); break; - default: DEVICE_GET_INFO_CALL(tms5220); break; - } -} - -DEVICE_GET_INFO(tms5200) -{ - switch (state) - { - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(tms5200); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "TMS5200"); break; - default: DEVICE_GET_INFO_CALL(tms5220); break; - } -} - const device_type TMS5220C = &device_creator<tms5220c_device>; tms5220c_device::tms5220c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/upd7759.c b/src/emu/sound/upd7759.c index 7061d8a2540..25e830c2c01 100644 --- a/src/emu/sound/upd7759.c +++ b/src/emu/sound/upd7759.c @@ -739,34 +739,6 @@ void upd7759_set_bank_base(device_t *device, UINT32 base) chip->romoffset = base; } - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( upd7759 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(upd7759_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( upd7759 ); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( upd7759 ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "UPD7759"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "NEC ADPCM"); 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; - } -} - - const device_type UPD7759 = &device_creator<upd7759_device>; upd7759_device::upd7759_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/vlm5030.c b/src/emu/sound/vlm5030.c index 18eddd31591..8e563103161 100644 --- a/src/emu/sound/vlm5030.c +++ b/src/emu/sound/vlm5030.c @@ -688,33 +688,6 @@ static DEVICE_START( vlm5030 ) device->machine().save().register_postload(save_prepost_delegate(FUNC(vlm5030_restore_state), chip)); } - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( vlm5030 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(vlm5030_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( vlm5030 ); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( vlm5030 ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "VLM5030"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "VLM speech"); 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; - } -} - - const device_type VLM5030 = &device_creator<vlm5030_device>; vlm5030_device::vlm5030_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/vrender0.c b/src/emu/sound/vrender0.c index 93fb3d646d9..276e2dba8f1 100644 --- a/src/emu/sound/vrender0.c +++ b/src/emu/sound/vrender0.c @@ -239,34 +239,6 @@ static void VR0_RenderAudio(vr0_state *VR0, int nsamples,stream_sample_t *l,stre } - - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( vrender0 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(vr0_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( vrender0 ); 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 DEVINFO_STR_NAME: strcpy(info->s, "VRender0"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "???"); 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; - } -} - - const device_type VRENDER0 = &device_creator<vrender0_device>; vrender0_device::vrender0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/wave.c b/src/emu/sound/wave.c index fc2b8255774..38fca82df48 100644 --- a/src/emu/sound/wave.c +++ b/src/emu/sound/wave.c @@ -82,33 +82,6 @@ static DEVICE_START( wave ) } - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( wave ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = 0; break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( wave ); 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 DEVINFO_STR_NAME: strcpy(info->s, "Cassette"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Cassette"); 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 The MESS Team"); break; - } -} - - const device_type WAVE = &device_creator<wave_device>; wave_device::wave_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/x1_010.c b/src/emu/sound/x1_010.c index e5d9bfa3d32..ba9d5038acb 100644 --- a/src/emu/sound/x1_010.c +++ b/src/emu/sound/x1_010.c @@ -284,33 +284,6 @@ WRITE16_DEVICE_HANDLER( seta_sound_word_w ) } - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( x1_010 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(x1_010_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( x1_010 ); 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 DEVINFO_STR_NAME: strcpy(info->s, "X1-010"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Seta custom"); 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; - } -} - - const device_type X1_010 = &device_creator<x1_010_device>; x1_010_device::x1_010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/ymf271.c b/src/emu/sound/ymf271.c index 2bebd6c4a76..dc789f3f26b 100644 --- a/src/emu/sound/ymf271.c +++ b/src/emu/sound/ymf271.c @@ -1810,32 +1810,6 @@ static DEVICE_RESET( ymf271 ) } } -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( ymf271 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(YMF271Chip); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( ymf271 ); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( ymf271 ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "YMF271"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Yamaha FM"); 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; - } -} - - const device_type YMF271 = &device_creator<ymf271_device>; ymf271_device::ymf271_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/ymf278b.c b/src/emu/sound/ymf278b.c index 5756ed926d9..d49f59981d1 100644 --- a/src/emu/sound/ymf278b.c +++ b/src/emu/sound/ymf278b.c @@ -1085,32 +1085,6 @@ static DEVICE_START( ymf278b ) } -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( ymf278b ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(YMF278BChip); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( ymf278b ); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->start = DEVICE_RESET_NAME( ymf278b ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "YMF278B"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Yamaha FM"); 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; - } -} - - const device_type YMF278B = &device_creator<ymf278b_device>; ymf278b_device::ymf278b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/ymz280b.c b/src/emu/sound/ymz280b.c index f0e31e6bcde..5de7b51a97c 100644 --- a/src/emu/sound/ymz280b.c +++ b/src/emu/sound/ymz280b.c @@ -1046,33 +1046,6 @@ WRITE8_DEVICE_HANDLER( ymz280b_w ) } - -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( ymz280b ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(ymz280b_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( ymz280b ); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->start = DEVICE_RESET_NAME( ymz280b ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "YMZ280B"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Yamaha Wavetable"); 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; - } -} - - const device_type YMZ280B = &device_creator<ymz280b_device>; ymz280b_device::ymz280b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/sound/zsg2.c b/src/emu/sound/zsg2.c index a9494cd4933..7d93970064b 100644 --- a/src/emu/sound/zsg2.c +++ b/src/emu/sound/zsg2.c @@ -231,32 +231,6 @@ static DEVICE_START( zsg2 ) info->bank_samples = device->machine().root_device().memregion(intf->samplergn)->base(); } -/************************************************************************** - * Generic get_info - **************************************************************************/ - -DEVICE_GET_INFO( zsg2 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(zsg2_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( zsg2 ); 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 DEVINFO_STR_NAME: strcpy(info->s, "ZSG-2"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Zoom custom"); 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; - } -} - - const device_type ZSG2 = &device_creator<zsg2_device>; zsg2_device::zsg2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/video/hd63484.c b/src/emu/video/hd63484.c index c057bd86b2d..79c2d810d8f 100644 --- a/src/emu/video/hd63484.c +++ b/src/emu/video/hd63484.c @@ -1577,20 +1577,6 @@ static DEVICE_RESET( hd63484 ) hd63484->fifo_counter = 0; } -DEVICE_GET_INFO(hd63484) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(hd63484_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(hd63484); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(hd63484); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "HD63484"); break; - } -} - const device_type HD63484 = &device_creator<hd63484_device>; hd63484_device::hd63484_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/video/i8275.c b/src/emu/video/i8275.c index 129f247c868..35bb3e28dca 100644 --- a/src/emu/video/i8275.c +++ b/src/emu/video/i8275.c @@ -588,27 +588,6 @@ static DEVICE_RESET( i8275 ) i8275->blink = 0; } -DEVICE_GET_INFO( i8275 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(i8275_t); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(i8275); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(i8275); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Intel 8275"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Intel 8275"); 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 MESS Team"); break; - } -} - const device_type I8275 = &device_creator<i8275_device>; i8275_device::i8275_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/video/s2636.c b/src/emu/video/s2636.c index ed5bc615fdf..66ce63d0f39 100644 --- a/src/emu/video/s2636.c +++ b/src/emu/video/s2636.c @@ -365,18 +365,6 @@ static DEVICE_START( s2636 ) device->save_item(NAME(*s2636->collision_bitmap)); } -DEVICE_GET_INFO(s2636) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(s2636_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(s2636); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "Signetics 2636"); break; - } -} - const device_type S2636 = &device_creator<s2636_device>; s2636_device::s2636_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/video/saa5050.c b/src/emu/video/saa5050.c index 9feb6083263..b1eeebd79a0 100644 --- a/src/emu/video/saa5050.c +++ b/src/emu/video/saa5050.c @@ -381,20 +381,6 @@ static DEVICE_RESET( saa5050 ) } -DEVICE_GET_INFO(saa5050) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(saa5050_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(saa5050); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(saa5050); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "SAA5050"); break; - } -} - const device_type SAA5050 = &device_creator<saa5050_device>; saa5050_device::saa5050_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/video/tlc34076.c b/src/emu/video/tlc34076.c index e6dc7225d6d..64ac208d4ac 100644 --- a/src/emu/video/tlc34076.c +++ b/src/emu/video/tlc34076.c @@ -281,20 +281,6 @@ static DEVICE_START( tlc34076 ) state_save_register_global(device->machine(), state->dacbits); } -DEVICE_GET_INFO(tlc34076) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(tlc34076_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(tlc34076); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(tlc34076); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "TLC34076"); break; - } -} - const device_type TLC34076 = &device_creator<tlc34076_device>; tlc34076_device::tlc34076_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/video/tms9927.c b/src/emu/video/tms9927.c index 00c764eaca0..4a9ae778126 100644 --- a/src/emu/video/tms9927.c +++ b/src/emu/video/tms9927.c @@ -307,56 +307,6 @@ static DEVICE_RESET( tms9927 ) { } - -DEVICE_GET_INFO( tms9927 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(tms9927_state); break; - - /* --- the following bits of info are returned as pointers to functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(tms9927); break; - case DEVINFO_FCT_STOP: info->stop = DEVICE_STOP_NAME(tms9927); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(tms9927); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "TMS9927"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "TMS9927 CRTC"); 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; - } -} - -DEVICE_GET_INFO( crt5027 ) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "CRT5027"); break; - default: DEVICE_GET_INFO_CALL(tms9927); break; - } -} - -DEVICE_GET_INFO( crt5037 ) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "CRT5037"); break; - default: DEVICE_GET_INFO_CALL(tms9927); break; - } -} - -DEVICE_GET_INFO( crt5057 ) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "CRT5057"); break; - default: DEVICE_GET_INFO_CALL(tms9927); break; - } -} - - const device_type TMS9927 = &device_creator<tms9927_device>; tms9927_device::tms9927_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/video/voodoo.c b/src/emu/video/voodoo.c index c396407eb48..266a52f75e3 100644 --- a/src/emu/video/voodoo.c +++ b/src/emu/video/voodoo.c @@ -5028,64 +5028,6 @@ static DEVICE_RESET( voodoo ) soft_reset(v); } - -/*------------------------------------------------- - device definition --------------------------------------------------*/ - -DEVICE_GET_INFO(voodoo) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(voodoo_state); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(voodoo); break; - - case DEVINFO_FCT_STOP: info->stop = DEVICE_STOP_NAME(voodoo); break; - } -} - - -DEVICE_GET_INFO(voodoo_1) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "3dfx Voodoo Graphics"); break; - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(voodoo_1); break; - default: DEVICE_GET_INFO_CALL(voodoo); break; - } -} - -DEVICE_GET_INFO(voodoo_2) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "3dfx Voodoo 2"); break; - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(voodoo_2); break; - default: DEVICE_GET_INFO_CALL(voodoo); break; - } -} -DEVICE_GET_INFO(voodoo_banshee) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "3dfx Voodoo Banshee"); break; - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(voodoo_banshee); break; - default: DEVICE_GET_INFO_CALL(voodoo); break; - } -} - -DEVICE_GET_INFO(voodoo_3) -{ - switch (state) - { - case DEVINFO_STR_NAME: strcpy(info->s, "3dfx Voodoo 3"); break; - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(voodoo_3); break; - default: DEVICE_GET_INFO_CALL(voodoo); break; - } -} - - /*************************************************************************** COMMAND HANDLERS ***************************************************************************/ diff --git a/src/mame/audio/amiga.c b/src/mame/audio/amiga.c index d04e341bb84..e945df4392b 100644 --- a/src/mame/audio/amiga.c +++ b/src/mame/audio/amiga.c @@ -278,23 +278,6 @@ static DEVICE_START( amiga_sound ) } -DEVICE_GET_INFO( amiga_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(amiga_audio); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(amiga_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Amiga Paula"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - - const device_type AMIGA = &device_creator<amiga_sound_device>; amiga_sound_device::amiga_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/audio/beezer.c b/src/mame/audio/beezer.c index 591dd3434d6..0bc952d3bbc 100644 --- a/src/mame/audio/beezer.c +++ b/src/mame/audio/beezer.c @@ -479,23 +479,6 @@ static DEVICE_RESET( beezer_sound ) } -DEVICE_GET_INFO( beezer_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(beezer_sound_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(beezer_sound); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(beezer_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "beezer SFX"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - /************************************* * * 6840 timer handlers diff --git a/src/mame/audio/cps3.c b/src/mame/audio/cps3.c index 65b2a2a821e..95550689b9e 100644 --- a/src/mame/audio/cps3.c +++ b/src/mame/audio/cps3.c @@ -117,23 +117,6 @@ static DEVICE_START( cps3_sound ) state->m_stream = device->machine().sound().stream_alloc(*device, 0, 2, device->clock() / 384, NULL, cps3_stream_update); } -DEVICE_GET_INFO( cps3_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(cps3_sound_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(cps3_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "CPS3 Custom"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - - WRITE32_DEVICE_HANDLER( cps3_sound_w ) { cps3_sound_state *state = get_safe_token(device); diff --git a/src/mame/audio/exidy.c b/src/mame/audio/exidy.c index dc2ff39c47c..48fdf8fa8ae 100644 --- a/src/mame/audio/exidy.c +++ b/src/mame/audio/exidy.c @@ -511,24 +511,6 @@ static DEVICE_RESET( exidy_sound ) } -DEVICE_GET_INFO( exidy_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(exidy_sound_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(exidy_sound); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(exidy_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Exidy SFX"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - - /************************************* * * 6532 interface @@ -903,22 +885,6 @@ static DEVICE_RESET( venture_sound ) } -DEVICE_GET_INFO( venture_sound ) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(exidy_sound_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(venture_sound); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(venture_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Exidy SFX+PSG"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - const device_type EXIDY_VENTURE = &device_creator<venture_sound_device>; venture_sound_device::venture_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -1186,23 +1152,6 @@ static DEVICE_RESET( victory_sound ) } -DEVICE_GET_INFO( victory_sound ) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(exidy_sound_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(victory_sound); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(victory_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Exidy SFX+PSG+Speech"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - - const device_type EXIDY_VICTORY = &device_creator<victory_sound_device>; victory_sound_device::victory_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/audio/exidy440.c b/src/mame/audio/exidy440.c index 80cc3315349..0f39e8034ac 100644 --- a/src/mame/audio/exidy440.c +++ b/src/mame/audio/exidy440.c @@ -989,24 +989,6 @@ ADDRESS_MAP_END * *************************************/ -DEVICE_GET_INFO( exidy440_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(exidy440_audio_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(exidy440_sound); break; - case DEVINFO_FCT_STOP: info->stop = DEVICE_STOP_NAME(exidy440_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Exidy 440 CVSD"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - - const device_type EXIDY440 = &device_creator<exidy440_sound_device>; exidy440_sound_device::exidy440_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/audio/flower.c b/src/mame/audio/flower.c index 3f0112a1872..29fc109f7a8 100644 --- a/src/mame/audio/flower.c +++ b/src/mame/audio/flower.c @@ -238,25 +238,6 @@ static DEVICE_RESET( flower_sound ) } } -DEVICE_GET_INFO( flower_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(flower_sound_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(flower_sound); break; - case DEVINFO_FCT_RESET: info->start = DEVICE_RESET_NAME(flower_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Flower Custom"); 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; - } -} - - /********************************************************************************/ #if FLOWER_VERBOSE diff --git a/src/mame/audio/geebee.c b/src/mame/audio/geebee.c index eee82b65982..f14679508d2 100644 --- a/src/mame/audio/geebee.c +++ b/src/mame/audio/geebee.c @@ -144,22 +144,6 @@ static DEVICE_START( geebee_sound ) state->m_volume_timer = machine.scheduler().timer_alloc(FUNC(volume_decay), state); } -DEVICE_GET_INFO( geebee_sound ) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(geebee_sound_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(geebee_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Gee Bee Custom"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - - const device_type GEEBEE = &device_creator<geebee_sound_device>; geebee_sound_device::geebee_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/audio/gomoku.c b/src/mame/audio/gomoku.c index c22ae8c03a6..30c4eb98e14 100644 --- a/src/mame/audio/gomoku.c +++ b/src/mame/audio/gomoku.c @@ -209,23 +209,6 @@ static DEVICE_START( gomoku_sound ) } -DEVICE_GET_INFO( gomoku_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(gomoku_sound_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(gomoku_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Gomoku Custom"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - - /********************************************************************************/ WRITE8_DEVICE_HANDLER( gomoku_sound1_w ) diff --git a/src/mame/audio/gridlee.c b/src/mame/audio/gridlee.c index 132ad2bf0c0..433d21be805 100644 --- a/src/mame/audio/gridlee.c +++ b/src/mame/audio/gridlee.c @@ -80,24 +80,6 @@ static DEVICE_START( gridlee_sound ) } -DEVICE_GET_INFO( gridlee_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(gridlee_sound_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(gridlee_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Gridlee Custom"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - - - WRITE8_DEVICE_HANDLER( gridlee_sound_w ) { gridlee_sound_state *state = get_safe_token(device); diff --git a/src/mame/audio/hyprolyb.c b/src/mame/audio/hyprolyb.c index 396d540295e..04c497c1ad1 100644 --- a/src/mame/audio/hyprolyb.c +++ b/src/mame/audio/hyprolyb.c @@ -136,23 +136,6 @@ MACHINE_CONFIG_FRAGMENT( hyprolyb_adpcm ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -/***************************************************************************** - DEVICE DEFINITION -*****************************************************************************/ -DEVICE_GET_INFO(hyprolyb_adpcm) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(hyprolyb_adpcm_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(hyprolyb_adpcm); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(hyprolyb_adpcm); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "Hyper Olympics Audio"); break; - } -} - const device_type HYPROLYB_ADPCM = &device_creator<hyprolyb_adpcm_device>; hyprolyb_adpcm_device::hyprolyb_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/audio/irem.c b/src/mame/audio/irem.c index 1f6e4a56c1f..d02f1a81c0a 100644 --- a/src/mame/audio/irem.c +++ b/src/mame/audio/irem.c @@ -486,21 +486,6 @@ MACHINE_CONFIG_DERIVED( m62_audio, irem_audio_base ) MCFG_CPU_PROGRAM_MAP(m62_sound_map) MACHINE_CONFIG_END -/***************************************************************************** - DEVICE DEFINITION -*****************************************************************************/ -DEVICE_GET_INFO(irem_audio) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(irem_audio_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(irem_audio); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "Irem Audio"); break; - } -} - const device_type IREM_AUDIO = &device_creator<irem_audio_device>; irem_audio_device::irem_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/audio/leland.c b/src/mame/audio/leland.c index dc80bdda580..6de4f5bf808 100644 --- a/src/mame/audio/leland.c +++ b/src/mame/audio/leland.c @@ -280,23 +280,6 @@ static DEVICE_START( leland_sound ) } -DEVICE_GET_INFO( leland_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(leland_sound_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(leland_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Leland DAC"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - - void leland_dac_update(device_t *device, int dacnum, UINT8 sample) { leland_sound_state *state = get_safe_token(device); @@ -588,41 +571,6 @@ static DEVICE_START( redline_80186_sound ) } -DEVICE_GET_INFO( leland_80186_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(leland_sound_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(leland_80186_sound); break; - case DEVINFO_FCT_RESET: info->start = DEVICE_RESET_NAME(leland_80186_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Leland 80186 DAC"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - - -DEVICE_GET_INFO( redline_80186_sound ) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(leland_sound_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(redline_80186_sound); break; - case DEVINFO_FCT_RESET: info->start = DEVICE_RESET_NAME(leland_80186_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Redline Racer 80186 DAC"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - - const device_type LELAND = &device_creator<leland_sound_device>; leland_sound_device::leland_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/audio/m72.c b/src/mame/audio/m72.c index 42fdf7706c7..98469b6ccce 100644 --- a/src/mame/audio/m72.c +++ b/src/mame/audio/m72.c @@ -254,23 +254,6 @@ WRITE8_DEVICE_HANDLER( m72_sample_w ) state->sample_addr = (state->sample_addr + 1) & (state->samples_size - 1); } -DEVICE_GET_INFO( m72_audio ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(m72_audio_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(m72_audio); break; - case DEVINFO_FCT_RESET: info->start = DEVICE_RESET_NAME(m72_audio); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "M72 Custom"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - const device_type M72 = &device_creator<m72_audio_device>; m72_audio_device::m72_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/audio/micro3d.c b/src/mame/audio/micro3d.c index 92ec8bfacf6..ebd0c46da4b 100644 --- a/src/mame/audio/micro3d.c +++ b/src/mame/audio/micro3d.c @@ -334,23 +334,6 @@ static DEVICE_RESET( micro3d_sound ) state->dac[3] = 255; } -DEVICE_GET_INFO( micro3d_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(noise_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(micro3d_sound); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(micro3d_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Microprose Custom"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - /*************************************************************************** diff --git a/src/mame/audio/namco52.c b/src/mame/audio/namco52.c index 93418de6458..e1716a1260f 100644 --- a/src/mame/audio/namco52.c +++ b/src/mame/audio/namco52.c @@ -224,28 +224,6 @@ static DEVICE_START( namco_52xx ) } -/*------------------------------------------------- - device definition --------------------------------------------------*/ - -DEVICE_GET_INFO(namco_52xx) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(namco_52xx_state); break; - - case DEVINFO_PTR_ROM_REGION: info->romregion = ROM_NAME(namco_52xx); break; - - case DEVINFO_PTR_MACHINE_CONFIG: info->machine_config = MACHINE_CONFIG_NAME(namco_52xx); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(namco_52xx); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "Namco 52xx"); break; - - case DEVINFO_STR_SHORTNAME: strcpy(info->s, "namco52"); break; - } -} - const device_type NAMCO_52XX = &device_creator<namco_52xx_device>; namco_52xx_device::namco_52xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/audio/namco54.c b/src/mame/audio/namco54.c index 6e2ebea19fa..7c825acc5ab 100644 --- a/src/mame/audio/namco54.c +++ b/src/mame/audio/namco54.c @@ -180,29 +180,6 @@ static DEVICE_START( namco_54xx ) } -/*------------------------------------------------- - device definition --------------------------------------------------*/ - -DEVICE_GET_INFO(namco_54xx) -{ - switch (state) - { - - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(namco_54xx_state); break; - - case DEVINFO_PTR_ROM_REGION: info->romregion = ROM_NAME(namco_54xx); break; - - case DEVINFO_PTR_MACHINE_CONFIG: info->machine_config = MACHINE_CONFIG_NAME(namco_54xx); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(namco_54xx); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "Namco 54xx"); break; - - case DEVINFO_STR_SHORTNAME: strcpy(info->s, "namco54"); break; - } -} - const device_type NAMCO_54XX = &device_creator<namco_54xx_device>; namco_54xx_device::namco_54xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/audio/phoenix.c b/src/mame/audio/phoenix.c index 18a024006df..2e65bd09fe3 100644 --- a/src/mame/audio/phoenix.c +++ b/src/mame/audio/phoenix.c @@ -571,23 +571,6 @@ static DEVICE_START( phoenix_sound ) register_state(device); } -DEVICE_GET_INFO( phoenix_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(phoenix_sound_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(phoenix_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Phoenix Custom"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - - const device_type PHOENIX = &device_creator<phoenix_sound_device>; phoenix_sound_device::phoenix_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/audio/pleiads.c b/src/mame/audio/pleiads.c index e64ad079adf..4f78237c56c 100644 --- a/src/mame/audio/pleiads.c +++ b/src/mame/audio/pleiads.c @@ -562,23 +562,6 @@ static DEVICE_START( pleiads_sound ) DEVICE_START_CALL(common_sh_start); } -DEVICE_GET_INFO( pleiads_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(pleiads_sound_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(pleiads_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Pleiads Custom"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - - static DEVICE_START( naughtyb_sound ) { pleiads_sound_state *state = get_safe_token(device); @@ -638,23 +621,6 @@ static DEVICE_START( naughtyb_sound ) DEVICE_START_CALL(common_sh_start); } -DEVICE_GET_INFO( naughtyb_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(pleiads_sound_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(naughtyb_sound);break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Naughty Boy Custom"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - - static DEVICE_START( popflame_sound ) { pleiads_sound_state *state = get_safe_token(device); @@ -714,23 +680,6 @@ static DEVICE_START( popflame_sound ) DEVICE_START_CALL(common_sh_start); } -DEVICE_GET_INFO( popflame_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(pleiads_sound_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(popflame_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Pop Flamer Custom"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - - const device_type PLEIADS = &device_creator<pleiads_sound_device>; pleiads_sound_device::pleiads_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/audio/polepos.c b/src/mame/audio/polepos.c index 33f0a5bb500..e216bd6eae2 100644 --- a/src/mame/audio/polepos.c +++ b/src/mame/audio/polepos.c @@ -139,24 +139,6 @@ static DEVICE_RESET( polepos_sound ) filter2_reset(&state->m_filter_engine[loop]); } -DEVICE_GET_INFO( polepos_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(polepos_sound_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(polepos_sound); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(polepos_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Pole Position Custom"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - - /************************************/ /* Write LSB of engine sound */ /************************************/ diff --git a/src/mame/audio/redbaron.c b/src/mame/audio/redbaron.c index b3d5eec94ed..baeeab4754d 100644 --- a/src/mame/audio/redbaron.c +++ b/src/mame/audio/redbaron.c @@ -226,24 +226,6 @@ static DEVICE_START( redbaron_sound ) state->m_channel = device->machine().sound().stream_alloc(*device, 0, 1, OUTPUT_RATE, 0, redbaron_sound_update); } - -DEVICE_GET_INFO( redbaron_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(redbaron_sound_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(redbaron_sound);break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Red Baron Custom"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - - const device_type REDBARON = &device_creator<redbaron_sound_device>; redbaron_sound_device::redbaron_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/audio/segag80r.c b/src/mame/audio/segag80r.c index 6c09bf82682..e2ae5e8c141 100644 --- a/src/mame/audio/segag80r.c +++ b/src/mame/audio/segag80r.c @@ -27,8 +27,6 @@ #define SEGA005_555_TIMER_FREQ (1.44 / ((15000 + 2 * 4700) * 1.5e-6)) #define SEGA005_COUNTER_FREQ (100000) /* unknown, just a guess */ -DEVICE_GET_INFO( sega005_sound ); - class sega005_sound_device : public device_t, public device_sound_interface { @@ -627,20 +625,6 @@ static DEVICE_START( sega005_sound ) } -DEVICE_GET_INFO( sega005_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(sega005_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "005 Custom"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - - static STREAM_UPDATE( sega005_stream_update ) { segag80r_state *state = device->machine().driver_data<segag80r_state>(); diff --git a/src/mame/audio/segasnd.c b/src/mame/audio/segasnd.c index 0b3118e40e1..598160fcf7b 100644 --- a/src/mame/audio/segasnd.c +++ b/src/mame/audio/segasnd.c @@ -181,22 +181,6 @@ static DEVICE_START( speech_sound ) } -DEVICE_GET_INFO( speech_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(speech_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(speech_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Sega Speech Sound Board"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - const device_type SEGASPEECH = &device_creator<speech_sound_device>; speech_sound_device::speech_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -900,23 +884,6 @@ static DEVICE_START( usb_sound ) } -DEVICE_GET_INFO( usb_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(usb_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(usb_sound); break; - case DEVINFO_FCT_RESET: info->start = DEVICE_RESET_NAME(usb_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Sega Universal Sound Board"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - const device_type SEGAUSB = &device_creator<usb_sound_device>; usb_sound_device::usb_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/audio/seibu.c b/src/mame/audio/seibu.c index f97dd4d4d6f..e2b2ff21d9a 100644 --- a/src/mame/audio/seibu.c +++ b/src/mame/audio/seibu.c @@ -194,23 +194,6 @@ static DEVICE_START( seibu_adpcm ) state->m_adpcm.reset(); } -DEVICE_GET_INFO( seibu_adpcm ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(seibu_adpcm_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(seibu_adpcm); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Seibu ADPCM"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - - // "decrypt" is a bit flowery here, as it's probably just line-swapping to // simplify PCB layout/routing rather than intentional protection, but it // still fits, especially since the Z80s for all these games are truly encrypted. diff --git a/src/mame/audio/snes_snd.c b/src/mame/audio/snes_snd.c index aa90bdbe205..81a51134281 100644 --- a/src/mame/audio/snes_snd.c +++ b/src/mame/audio/snes_snd.c @@ -1359,24 +1359,6 @@ static DEVICE_RESET( snes_sound ) spc700_reset(device); } -/*------------------------------------------------- - Device definition --------------------------------------------------*/ - -DEVICE_GET_INFO(snes_sound) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(snes_sound_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(snes_sound); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(snes_sound); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "SNES Custom DSP (SPC700)"); break; - } -} - const device_type SNES = &device_creator<snes_sound_device>; snes_sound_device::snes_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/audio/snk6502.c b/src/mame/audio/snk6502.c index 38cb1687037..ee3074ba5fa 100644 --- a/src/mame/audio/snk6502.c +++ b/src/mame/audio/snk6502.c @@ -665,22 +665,6 @@ static DEVICE_START( snk6502_sound ) state->m_tone_stream = device->machine().sound().stream_alloc(*device, 0, 1, SAMPLE_RATE, NULL, snk6502_tone_update); } -DEVICE_GET_INFO( snk6502_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(snk6502_sound_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(snk6502_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "snk6502 Custom"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - int snk6502_music0_playing(running_machine &machine) { device_t *device = machine.device("snk6502"); diff --git a/src/mame/audio/taitosnd.c b/src/mame/audio/taitosnd.c index 13db082dc48..6bbcf5c3ae5 100644 --- a/src/mame/audio/taitosnd.c +++ b/src/mame/audio/taitosnd.c @@ -313,20 +313,6 @@ static DEVICE_RESET( tc0140syt ) } } -DEVICE_GET_INFO(tc0140syt) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(tc0140syt_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(tc0140syt); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(tc0140syt); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "Taito TC0140SYT"); break; - } -} - const device_type TC0140SYT = &device_creator<tc0140syt_device>; tc0140syt_device::tc0140syt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/audio/tiamc1.c b/src/mame/audio/tiamc1.c index f979e3e4ad8..c79458020b2 100644 --- a/src/mame/audio/tiamc1.c +++ b/src/mame/audio/tiamc1.c @@ -330,24 +330,6 @@ static DEVICE_START( tiamc1_sound ) } -DEVICE_GET_INFO( tiamc1_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(tiamc1_sound_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(tiamc1_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "TIA-MC1 Custom"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - - - const device_type TIAMC1 = &device_creator<tiamc1_sound_device>; tiamc1_sound_device::tiamc1_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/audio/timeplt.c b/src/mame/audio/timeplt.c index f9e7caf5091..988a8b864ec 100644 --- a/src/mame/audio/timeplt.c +++ b/src/mame/audio/timeplt.c @@ -261,18 +261,6 @@ MACHINE_CONFIG_END DEVICE DEFINITION *****************************************************************************/ -DEVICE_GET_INFO(timeplt_audio) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(timeplt_audio_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(timeplt_audio); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "Time Pilot Audio"); break; - } -} - const device_type TIMEPLT_AUDIO = &device_creator<timeplt_audio_device>; timeplt_audio_device::timeplt_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/audio/trackfld.c b/src/mame/audio/trackfld.c index b432ef782b8..8991370a857 100644 --- a/src/mame/audio/trackfld.c +++ b/src/mame/audio/trackfld.c @@ -161,20 +161,6 @@ WRITE8_HANDLER( konami_sh_irqtrigger_w ) DEVICE DEFINITION *****************************************************************************/ -DEVICE_GET_INFO(trackfld_audio) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(trackfld_audio_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(trackfld_audio); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(trackfld_audio); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "Track And Field Audio"); break; - } -} - const device_type TRACKFLD_AUDIO = &device_creator<trackfld_audio_device>; trackfld_audio_device::trackfld_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/audio/tx1.c b/src/mame/audio/tx1.c index 508fb74f615..b65e41cabcf 100644 --- a/src/mame/audio/tx1.c +++ b/src/mame/audio/tx1.c @@ -320,24 +320,6 @@ static DEVICE_RESET( tx1_sound ) state->m_step0 = state->m_step1 = state->m_step2 = 0; } -DEVICE_GET_INFO( tx1_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(tx1_sound_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(tx1_sound); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(tx1_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "TX-1 Custom"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - - /************************************* * * Buggy Boy @@ -591,30 +573,11 @@ static DEVICE_RESET( buggyboy_sound ) state->m_noise_lfsrd = 0; } -DEVICE_GET_INFO( buggyboy_sound ) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(tx1_sound_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(buggyboy_sound); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(buggyboy_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Buggy Boy Custom"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - - const device_type BUGGYBOY = &device_creator<buggyboy_sound_device>; buggyboy_sound_device::buggyboy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : device_t(mconfig, BUGGYBOY, "Buggy Boy Custom", tag, owner, clock), - device_sound_interface(mconfig, *this) + : tx1_sound_device(mconfig, BUGGYBOY, "Buggy Boy Custom", tag, owner, clock) { - m_token = global_alloc_array_clear(UINT8, sizeof(tx1_sound_state)); } //------------------------------------------------- @@ -665,6 +628,12 @@ tx1_sound_device::tx1_sound_device(const machine_config &mconfig, const char *ta m_token = global_alloc_array_clear(UINT8, sizeof(tx1_sound_state)); } +tx1_sound_device::tx1_sound_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) +{ + m_token = global_alloc_array_clear(UINT8, sizeof(tx1_sound_state)); +} //------------------------------------------------- // device_config_complete - perform any // operations now that the configuration is diff --git a/src/mame/audio/warpwarp.c b/src/mame/audio/warpwarp.c index 0f3d13379ad..bc20abf894c 100644 --- a/src/mame/audio/warpwarp.c +++ b/src/mame/audio/warpwarp.c @@ -241,22 +241,6 @@ static DEVICE_START( warpwarp_sound ) } -DEVICE_GET_INFO( warpwarp_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(warpwarp_sound_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(warpwarp_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Warp Warp Custom"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - const device_type WARPWARP = &device_creator<warpwarp_sound_device>; diff --git a/src/mame/audio/wiping.c b/src/mame/audio/wiping.c index d5fc35f3d44..45c45a4b0ef 100644 --- a/src/mame/audio/wiping.c +++ b/src/mame/audio/wiping.c @@ -210,24 +210,6 @@ static DEVICE_START( wiping_sound ) } -DEVICE_GET_INFO( wiping_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(wiping_sound_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(wiping_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Wiping Custom"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - - - /********************************************************************************/ WRITE8_DEVICE_HANDLER( wiping_sound_w ) diff --git a/src/mame/drivers/mjkjidai.c b/src/mame/drivers/mjkjidai.c index 790a2a9ad9d..bad7c32e8f4 100644 --- a/src/mame/drivers/mjkjidai.c +++ b/src/mame/drivers/mjkjidai.c @@ -101,21 +101,6 @@ static DEVICE_START( mjkjidai_adpcm ) state->m_adpcm.reset(); } -DEVICE_GET_INFO( mjkjidai_adpcm ) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(mjkjidai_adpcm_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(mjkjidai_adpcm);break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Custom ADPCM"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - const device_type MJKJIDAI = &device_creator<mjkjidai_adpcm_device>; mjkjidai_adpcm_device::mjkjidai_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/drivers/ninjaw.c b/src/mame/drivers/ninjaw.c index 504fed57373..f8fba72ca4e 100644 --- a/src/mame/drivers/ninjaw.c +++ b/src/mame/drivers/ninjaw.c @@ -673,19 +673,6 @@ static DEVICE_START( subwoofer ) return 0; } -static DEVICE_GET_INFO( subwoofer ) -{ - switch (state) - { - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(subwoofer); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Subwoofer"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - class subwoofer_device : public device_t, public device_sound_interface { diff --git a/src/mame/drivers/renegade.c b/src/mame/drivers/renegade.c index f744476eb35..59e323d19c5 100644 --- a/src/mame/drivers/renegade.c +++ b/src/mame/drivers/renegade.c @@ -191,22 +191,6 @@ static DEVICE_START( renegade_adpcm ) state->m_adpcm.reset(); } -DEVICE_GET_INFO( renegade_adpcm ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(renegade_adpcm_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(renegade_adpcm);break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Renegade Custom ADPCM"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - const device_type RENEGADE_ADPCM = &device_creator<renegade_adpcm_device>; renegade_adpcm_device::renegade_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/drivers/warriorb.c b/src/mame/drivers/warriorb.c index 80e6482a428..f7bceb638e7 100644 --- a/src/mame/drivers/warriorb.c +++ b/src/mame/drivers/warriorb.c @@ -435,36 +435,6 @@ static const ym2610_interface ym2610_config = irqhandler }; - -/************************************************************** - SUBWOOFEr(SOUND) -**************************************************************/ - -#if 0 -static DEVICE_START( subwoofer ) -{ - /* Adjust the lowpass filter of the first three YM2610 channels */ - - mixer_set_lowpass_frequency(0, 20); - mixer_set_lowpass_frequency(1, 20); - mixer_set_lowpass_frequency(2, 20); -} - -static DEVICE_GET_INFO( subwoofer ) -{ - switch (state) - { - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(subwoofer); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Subwoofer"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} -#endif - - /*********************************************************** MACHINE DRIVERS ***********************************************************/ diff --git a/src/mame/includes/tx1.h b/src/mame/includes/tx1.h index 46a0f4f0428..eb6046bd7a5 100644 --- a/src/mame/includes/tx1.h +++ b/src/mame/includes/tx1.h @@ -178,12 +178,17 @@ WRITE8_DEVICE_HANDLER( bb_ym1_a_w ); WRITE8_DEVICE_HANDLER( bb_ym2_a_w ); WRITE8_DEVICE_HANDLER( bb_ym2_b_w ); -class buggyboy_sound_device : public device_t, - public device_sound_interface + +WRITE8_DEVICE_HANDLER( tx1_ay8910_a_w ); +WRITE8_DEVICE_HANDLER( tx1_ay8910_b_w ); + +class tx1_sound_device : public device_t, + public device_sound_interface { public: - buggyboy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - ~buggyboy_sound_device() { global_free(m_token); } + tx1_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + tx1_sound_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock); + ~tx1_sound_device() { global_free(m_token); } // access to legacy token void *token() const { assert(m_token != NULL); return m_token; } @@ -200,21 +205,12 @@ private: void *m_token; }; -extern const device_type BUGGYBOY; - - -WRITE8_DEVICE_HANDLER( tx1_ay8910_a_w ); -WRITE8_DEVICE_HANDLER( tx1_ay8910_b_w ); +extern const device_type TX1; -class tx1_sound_device : public device_t, - public device_sound_interface +class buggyboy_sound_device : public tx1_sound_device { public: - tx1_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - ~tx1_sound_device() { global_free(m_token); } - - // access to legacy token - void *token() const { assert(m_token != NULL); return m_token; } + buggyboy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // device-level overrides virtual void device_config_complete(); @@ -225,11 +221,9 @@ protected: virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); private: // internal state - void *m_token; }; -extern const device_type TX1; - +extern const device_type BUGGYBOY; /*----------- defined in video/tx1.c -----------*/ diff --git a/src/mame/machine/buggychl.c b/src/mame/machine/buggychl.c index af5363fa498..60aacf129c3 100644 --- a/src/mame/machine/buggychl.c +++ b/src/mame/machine/buggychl.c @@ -235,25 +235,6 @@ static DEVICE_RESET( buggychl_mcu ) state->m_ddr_c = 0; } -/***************************************************************************** - DEVICE DEFINITION -*****************************************************************************/ - -DEVICE_GET_INFO(buggychl_mcu) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(buggychl_mcu_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(buggychl_mcu); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(buggychl_mcu); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "BuggyChl MCU"); break; - - } -} - const device_type BUGGYCHL_MCU = &device_creator<buggychl_mcu_device>; buggychl_mcu_device::buggychl_mcu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/machine/cd32.c b/src/mame/machine/cd32.c index d4b9767e27e..32faee37b63 100644 --- a/src/mame/machine/cd32.c +++ b/src/mame/machine/cd32.c @@ -913,26 +913,6 @@ WRITE32_DEVICE_HANDLER( amiga_akiko32_w ) } } -/*------------------------------------------------- - device definition --------------------------------------------------*/ - -DEVICE_GET_INFO(akiko) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(akiko_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(akiko); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(akiko); break; - - case DEVINFO_FCT_STOP: info->stop = DEVICE_STOP_NAME(akiko); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "Akiko"); break; - } -} - const device_type AKIKO = &device_creator<akiko_device>; akiko_device::akiko_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/machine/decocass.c b/src/mame/machine/decocass.c index 759dbd5dda2..f31efb2784c 100644 --- a/src/mame/machine/decocass.c +++ b/src/mame/machine/decocass.c @@ -2280,31 +2280,6 @@ static DEVICE_RESET( decocass_tape ) } -/*------------------------------------------------- - device get info callback --------------------------------------------------*/ - -DEVICE_GET_INFO( decocass_tape ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(tape_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(decocass_tape); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(decocass_tape);break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "DECO Cassette Tape"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Tape Controller"); 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; - } -} - - const device_type DECOCASS_TAPE = &device_creator<decocass_tape_device>; decocass_tape_device::decocass_tape_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/machine/gaelco3d.c b/src/mame/machine/gaelco3d.c index 25493573b50..19d92bcac9a 100644 --- a/src/mame/machine/gaelco3d.c +++ b/src/mame/machine/gaelco3d.c @@ -498,28 +498,6 @@ static DEVICE_STOP( gaelco_serial ) osd_sharedmem_free(state->m_os_shmem); } -DEVICE_GET_INFO( gaelco_serial ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(gaelco_serial_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(gaelco_serial);break; - case DEVINFO_FCT_STOP: info->stop = DEVICE_STOP_NAME(gaelco_serial);break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(gaelco_serial);break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "gaelco_serial"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "SERIAL"); 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; - } -} - - const device_type GAELCO_SERIAL = &device_creator<gaelco_serial_device>; gaelco_serial_device::gaelco_serial_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/machine/gaelco3d.h b/src/mame/machine/gaelco3d.h index 0b7086e522c..deb34dde466 100644 --- a/src/mame/machine/gaelco3d.h +++ b/src/mame/machine/gaelco3d.h @@ -88,6 +88,3 @@ private: }; extern const device_type GAELCO_SERIAL; - - -//DEVICE_GET_INFO( gaelco_serial ); diff --git a/src/mame/machine/mathbox.c b/src/mame/machine/mathbox.c index 01323775554..331f1b1f983 100644 --- a/src/mame/machine/mathbox.c +++ b/src/mame/machine/mathbox.c @@ -338,28 +338,6 @@ static DEVICE_RESET( mathbox ) } -DEVICE_GET_INFO( mathbox ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(mathbox_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(mathbox);break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(mathbox);break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "MATHBOX"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "I/O devices"); 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; - } -} - - const device_type MATHBOX = &device_creator<mathbox_device>; mathbox_device::mathbox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/machine/namco06.c b/src/mame/machine/namco06.c index 0361c8a3367..619411a4280 100644 --- a/src/mame/machine/namco06.c +++ b/src/mame/machine/namco06.c @@ -288,27 +288,6 @@ static DEVICE_RESET( namco_06xx ) } -/*------------------------------------------------- - device definition --------------------------------------------------*/ - -DEVICE_GET_INFO(namco_06xx) -{ - switch (state) - { - - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(namco_06xx_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(namco_06xx); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(namco_06xx); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "Namco 06xx"); break; - - case DEVINFO_STR_SHORTNAME: strcpy(info->s, "namco06xx"); break; - } -} - const device_type NAMCO_06XX = &device_creator<namco_06xx_device>; namco_06xx_device::namco_06xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/machine/namco50.c b/src/mame/machine/namco50.c index 24b34333098..8a74ef6f800 100644 --- a/src/mame/machine/namco50.c +++ b/src/mame/machine/namco50.c @@ -292,28 +292,6 @@ static DEVICE_START( namco_50xx ) } -/*------------------------------------------------- - device definition --------------------------------------------------*/ - -DEVICE_GET_INFO(namco_50xx) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(namco_50xx_state); break; - - case DEVINFO_PTR_ROM_REGION: info->romregion = ROM_NAME(namco_50xx); break; - - case DEVINFO_PTR_MACHINE_CONFIG: info->machine_config = MACHINE_CONFIG_NAME(namco_50xx); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(namco_50xx); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "Namco 50xx"); break; - - case DEVINFO_STR_SHORTNAME: strcpy(info->s, "namco50"); break; - } -} - const device_type NAMCO_50XX = &device_creator<namco_50xx_device>; namco_50xx_device::namco_50xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/machine/namco51.c b/src/mame/machine/namco51.c index d1cad09d93a..775dd178919 100644 --- a/src/mame/machine/namco51.c +++ b/src/mame/machine/namco51.c @@ -440,31 +440,6 @@ static DEVICE_RESET( namco_51xx ) } -/*------------------------------------------------- - device definition --------------------------------------------------*/ - -DEVICE_GET_INFO(namco_51xx) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(namco_51xx_state); break; - - case DEVINFO_PTR_ROM_REGION: info->romregion = ROM_NAME(namco_51xx); break; - - case DEVINFO_PTR_MACHINE_CONFIG: info->machine_config = MACHINE_CONFIG_NAME(namco_51xx); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(namco_51xx); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(namco_51xx); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "Namco 51xx"); break; - - case DEVINFO_STR_SHORTNAME: strcpy(info->s, "namco51"); break; - - } -} - const device_type NAMCO_51XX = &device_creator<namco_51xx_device>; namco_51xx_device::namco_51xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/machine/namco53.c b/src/mame/machine/namco53.c index 2bde8e8599c..c673c66e074 100644 --- a/src/mame/machine/namco53.c +++ b/src/mame/machine/namco53.c @@ -192,28 +192,6 @@ static DEVICE_START( namco_53xx ) } -/*------------------------------------------------- - device definition --------------------------------------------------*/ - -DEVICE_GET_INFO(namco_53xx) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(namco_53xx_state); break; - - case DEVINFO_PTR_ROM_REGION: info->romregion = ROM_NAME(namco_53xx); break; - - case DEVINFO_PTR_MACHINE_CONFIG: info->machine_config = MACHINE_CONFIG_NAME(namco_53xx); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(namco_53xx); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "Namco 53xx"); break; - - case DEVINFO_STR_SHORTNAME: strcpy(info->s, "namco53"); break; - } -} - const device_type NAMCO_53XX = &device_creator<namco_53xx_device>; namco_53xx_device::namco_53xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/machine/namco62.c b/src/mame/machine/namco62.c index c4a1b528136..30f56f12d14 100644 --- a/src/mame/machine/namco62.c +++ b/src/mame/machine/namco62.c @@ -85,28 +85,6 @@ static DEVICE_START( namco_62xx ) } -/*------------------------------------------------- - device definition --------------------------------------------------*/ - -DEVICE_GET_INFO(namco_62xx) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(namco_62xx_state); break; - - case DEVINFO_PTR_ROM_REGION: info->romregion = ROM_NAME(namco_62xx); break; - - case DEVINFO_PTR_MACHINE_CONFIG: info->machine_config = MACHINE_CONFIG_NAME(namco_62xx); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(namco_62xx); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "Namco 62xx"); break; - - case DEVINFO_STR_SHORTNAME: strcpy(info->s, "namco62"); break; - } -} - const device_type NAMCO_62XX = &device_creator<namco_62xx_device>; namco_62xx_device::namco_62xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/machine/namcoio.c b/src/mame/machine/namcoio.c index beb6ef2fa65..c14914a2c03 100644 --- a/src/mame/machine/namcoio.c +++ b/src/mame/machine/namcoio.c @@ -544,20 +544,6 @@ static DEVICE_RESET( namcoio ) namcoio_set_reset_line(device, PULSE_LINE); } -DEVICE_GET_INFO(namcoio) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(namcoio_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(namcoio); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(namcoio); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "Namco 56xx, 58xx & 59xx"); break; - } -} - const device_type NAMCO56XX = &device_creator<namcoio_device>; namcoio_device::namcoio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/machine/nmk112.c b/src/mame/machine/nmk112.c index 2639ff59263..06c8b24e8a9 100644 --- a/src/mame/machine/nmk112.c +++ b/src/mame/machine/nmk112.c @@ -152,25 +152,6 @@ static DEVICE_RESET( nmk112 ) } } - -/***************************************************************************** - DEVICE DEFINITION -*****************************************************************************/ - -DEVICE_GET_INFO(nmk112) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(nmk112_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(nmk112); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(nmk112); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "NMK 112"); break; - } -} - const device_type NMK112 = &device_creator<nmk112_device>; nmk112_device::nmk112_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/machine/taitoio.c b/src/mame/machine/taitoio.c index d031a72ef76..421416aa961 100644 --- a/src/mame/machine/taitoio.c +++ b/src/mame/machine/taitoio.c @@ -510,70 +510,6 @@ static DEVICE_RESET( tc0640fio ) tc0640fio->regs[i] = 0; } -DEVICE_GET_INFO( tc0220ioc ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(tc0220ioc_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(tc0220ioc); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(tc0220ioc); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Taito TC0220IOC"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Taito I/O"); 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 MAME Team"); break; - } -} - -DEVICE_GET_INFO( tc0510nio ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(tc0510nio_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(tc0510nio); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(tc0510nio); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Taito TC0510NIO"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Taito I/O"); 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 MAME Team"); break; - } -} - -DEVICE_GET_INFO( tc0640fio ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(tc0640fio_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(tc0640fio); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(tc0640fio); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Taito TC0640FIO"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Taito I/O"); 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 MAME Team"); break; - } -} - - const device_type TC0220IOC = &device_creator<tc0220ioc_device>; tc0220ioc_device::tc0220ioc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/video/atarirle.c b/src/mame/video/atarirle.c index f397c20dfb8..7b055cef4c8 100644 --- a/src/mame/video/atarirle.c +++ b/src/mame/video/atarirle.c @@ -371,25 +371,6 @@ static DEVICE_START( atarirle ) } -DEVICE_GET_INFO( atarirle ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(atarirle_data); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(atarirle); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Atari RLE"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Atari RLE Video IC"); 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 MAME Team"); break; - } -} - const device_type ATARIRLE = &device_creator<atarirle_device>; atarirle_device::atarirle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/video/deco16ic.c b/src/mame/video/deco16ic.c index ea23a94be2f..830610b3152 100644 --- a/src/mame/video/deco16ic.c +++ b/src/mame/video/deco16ic.c @@ -988,28 +988,6 @@ static DEVICE_RESET( deco16ic ) } -DEVICE_GET_INFO( deco16ic ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(deco16ic_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(deco16ic); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(deco16ic); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Data East IC 55 / 56 / 74 / 141"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Data East Video IC"); 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 MAME Team"); break; - } -} - - const device_type DECO16IC = &device_creator<deco16ic_device>; deco16ic_device::deco16ic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/video/decocomn.c b/src/mame/video/decocomn.c index af063fd21c9..344daa39943 100644 --- a/src/mame/video/decocomn.c +++ b/src/mame/video/decocomn.c @@ -140,28 +140,6 @@ static DEVICE_RESET( decocomn ) } -DEVICE_GET_INFO( decocomn ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(decocomn_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(decocomn); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(decocomn); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Data East Common Video Functions"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Data East Video IC"); 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 MAME Team"); break; - } -} - - const device_type DECOCOMN = &device_creator<decocomn_device>; decocomn_device::decocomn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/video/kan_pand.c b/src/mame/video/kan_pand.c index 1a1624a8ead..5cbb308006d 100644 --- a/src/mame/video/kan_pand.c +++ b/src/mame/video/kan_pand.c @@ -325,20 +325,6 @@ static DEVICE_RESET( kaneko_pandora ) pandora->clear_bitmap = 1; } -DEVICE_GET_INFO(kaneko_pandora) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(kaneko_pandora_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(kaneko_pandora); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(kaneko_pandora); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "Kaneko Pandora - PX79C480FP-3"); break; - } -} - const device_type KANEKO_PANDORA = &device_creator<kaneko_pandora_device>; kaneko_pandora_device::kaneko_pandora_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/video/konicdev.c b/src/mame/video/konicdev.c index 01ead405994..1b7bd848b88 100644 --- a/src/mame/video/konicdev.c +++ b/src/mame/video/konicdev.c @@ -10274,442 +10274,6 @@ READ16_DEVICE_HANDLER( k053244_reg_word_r ) return(k053244->regs[offset * 2] << 8 | k053244->regs[offset * 2 + 1]); } - - -/***************************************************************************/ -/* */ -/* DEVICE_GET_INFOs */ -/* */ -/***************************************************************************/ - - -DEVICE_GET_INFO( k007121 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(k007121_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(k007121); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(k007121); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Konami 007121"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Konami Video IC"); 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 MAME Team"); break; - } -} - - -DEVICE_GET_INFO( k007342 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(k007342_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(k007342); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(k007342); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Konami 007342"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Konami Video IC"); 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 MAME Team"); break; - } -} - - -DEVICE_GET_INFO( k007420 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(k007420_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(k007420); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(k007420); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Konami 007420"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Konami Video IC"); 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 MAME Team"); break; - } -} - - -DEVICE_GET_INFO( k052109 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(k052109_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(k052109); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(k052109); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Konami 052109"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Konami Video IC"); 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 MAME Team"); break; - } -} - -DEVICE_GET_INFO( k051960 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(k051960_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(k051960); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(k051960); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Konami 051960"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Konami Video IC"); 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 MAME Team"); break; - } -} - -DEVICE_GET_INFO( k05324x ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(k05324x_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(k05324x); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(k05324x); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Konami 053244 & 053245"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Konami Video IC"); 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 MAME Team"); break; - } -} - -DEVICE_GET_INFO( k053247 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(k053247_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(k053247); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(k053247); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Konami 053246 & 053247"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Konami Video IC"); 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 MAME Team"); break; - } -} - -DEVICE_GET_INFO( k055673 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(k053247_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(k055673); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(k053247); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Konami 055673"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Konami Video IC"); 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 MAME Team"); break; - } -} - -DEVICE_GET_INFO( k051316 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(k051316_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(k051316); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(k051316); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Konami 051316"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Konami Video IC"); 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 MAME Team"); break; - } -} - -DEVICE_GET_INFO( k053936 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(k053936_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(k053936); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(k053936); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Konami 053936"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Konami Video IC"); 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 MAME Team"); break; - } -} - -DEVICE_GET_INFO( k053251 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(k053251_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(k053251); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(k053251); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Konami 053251"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Konami Video IC"); 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 MAME Team"); break; - } -} - -DEVICE_GET_INFO( k054000 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(k054000_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(k054000); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(k054000); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Konami 054000"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Konami Video IC"); 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 MAME Team"); break; - } -} - -DEVICE_GET_INFO( k051733 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(k051733_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(k051733); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(k051733); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Konami 051733"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Konami Video IC"); 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 MAME Team"); break; - } -} - -DEVICE_GET_INFO( k056832 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(k056832_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(k056832); 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 DEVINFO_STR_NAME: strcpy(info->s, "Konami 056832"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Konami Video IC"); 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 MAME Team"); break; - } -} - -DEVICE_GET_INFO( k055555 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(k055555_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(k055555); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(k055555); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Konami 055555"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Konami Video IC"); 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 MAME Team"); break; - } -} - -DEVICE_GET_INFO( k054338 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(k054338_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(k054338); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(k054338); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Konami 054338"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Konami Video IC"); 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 MAME Team"); break; - } -} - -DEVICE_GET_INFO( k001006 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(k001006_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(k001006); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(k001006); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Konami 001006"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Konami Video IC"); 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 MAME Team"); break; - } -} - - -DEVICE_GET_INFO( k001005 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(k001005_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(k001005); break; - case DEVINFO_FCT_STOP: info->stop = DEVICE_STOP_NAME(k001005); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(k001005); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Konami 001005"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Konami Video IC"); 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 MAME Team"); break; - } -} - - -DEVICE_GET_INFO( k001604 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(k001604_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(k001604); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(k001604); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Konami 001604"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Konami Video IC"); 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 MAME Team"); break; - } -} - - -DEVICE_GET_INFO( k037122 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(k037122_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(k037122); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(k037122); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Konami 0371222"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Konami Video IC"); 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 MAME Team"); break; - } -} - - const device_type K007121 = &device_creator<k007121_device>; k007121_device::k007121_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/video/taitoic.c b/src/mame/video/taitoic.c index 1638023dfbd..d4ea6fd9d8b 100644 --- a/src/mame/video/taitoic.c +++ b/src/mame/video/taitoic.c @@ -5122,224 +5122,6 @@ static DEVICE_RESET( tc0180vcu ) tc0180vcu->video_control = 0; } - -/***************************************************************************/ -/* */ -/* DEVICE_GET_INFOs */ -/* */ -/***************************************************************************/ - -DEVICE_GET_INFO( pc080sn ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(pc080sn_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(pc080sn); 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 DEVINFO_STR_NAME: strcpy(info->s, "Taito PC080SN"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Taito Video IC"); 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 MAME Team"); break; - } -} - -DEVICE_GET_INFO( pc090oj ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(pc090oj_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(pc090oj); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(pc090oj); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Taito PC090OJ"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Taito Video IC"); 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 MAME Team"); break; - } -} - -DEVICE_GET_INFO( tc0080vco ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(tc0080vco_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(tc0080vco); 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 DEVINFO_STR_NAME: strcpy(info->s, "Taito TC0080VCO"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Taito Video IC"); 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 MAME Team"); break; - } -} - -DEVICE_GET_INFO( tc0110pcr ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(tc0110pcr_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(tc0110pcr); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(tc0110pcr); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Taito TC0110PCR"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Taito Video IC"); 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 MAME Team"); break; - } -} - -DEVICE_GET_INFO( tc0100scn ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(tc0100scn_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(tc0100scn); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(tc0100scn); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Taito TC0100SCN"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Taito Video IC"); 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 MAME Team"); break; - } -} - -DEVICE_GET_INFO( tc0280grd ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(tc0280grd_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(tc0280grd); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(tc0280grd); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Taito TC0280GRD & TC0430GRW"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Taito Video IC"); 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 MAME Team"); break; - } -} - -DEVICE_GET_INFO( tc0360pri ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(tc0360pri_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(tc0360pri); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(tc0360pri); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Taito TC0360PRI"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Taito Video IC"); 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 MAME Team"); break; - } -} - -DEVICE_GET_INFO( tc0480scp ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(tc0480scp_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(tc0480scp); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(tc0480scp); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Taito TC0480SCP"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Taito Video IC"); 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 MAME Team"); break; - } -} - -DEVICE_GET_INFO( tc0150rod ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(tc0150rod_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(tc0150rod); 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 DEVINFO_STR_NAME: strcpy(info->s, "Taito TC0150ROD"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Taito Video IC"); 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 MAME Team"); break; - } -} - -DEVICE_GET_INFO( tc0180vcu ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(tc0180vcu_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(tc0180vcu); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(tc0180vcu); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Taito TC0180VCU"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Taito Video IC"); 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 MAME Team"); break; - } -} - - const device_type PC080SN = &device_creator<pc080sn_device>; pc080sn_device::pc080sn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mame/video/vrender0.c b/src/mame/video/vrender0.c index b66043e107e..ac28d432974 100644 --- a/src/mame/video/vrender0.c +++ b/src/mame/video/vrender0.c @@ -601,19 +601,6 @@ static DEVICE_RESET( vr0video ) vr0->LastPalUpdate = 0xffffffff; } -DEVICE_GET_INFO(vr0video) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(vr0video_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(vr0video); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(vr0video); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "VRender0"); break; - } -} const device_type VIDEO_VRENDER0 = &device_creator<vr0video_device>; vr0video_device::vr0video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/audio/channelf.c b/src/mess/audio/channelf.c index e6eb25af5c3..2a6939ace66 100644 --- a/src/mess/audio/channelf.c +++ b/src/mess/audio/channelf.c @@ -132,23 +132,6 @@ static DEVICE_START(channelf_sound) state->envelope = 0; } - -DEVICE_GET_INFO( channelf_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(channelf_sound_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(channelf_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Channel F"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - const device_type CHANNELF = &device_creator<channelf_sound_device>; channelf_sound_device::channelf_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/audio/dave.c b/src/mess/audio/dave.c index 29bbe1b2c5a..000c3177769 100644 --- a/src/mess/audio/dave.c +++ b/src/mess/audio/dave.c @@ -817,23 +817,6 @@ b0 = 1: Enable 1kHz/50Hz/TG latch -DEVICE_GET_INFO( dave_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(dave_t); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(dave_sound); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(dave_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Dave"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - const device_type DAVE = &device_creator<dave_sound_device>; dave_sound_device::dave_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/audio/gb.c b/src/mess/audio/gb.c index bb2ab554f3c..7e72f6ad349 100644 --- a/src/mess/audio/gb.c +++ b/src/mess/audio/gb.c @@ -756,22 +756,6 @@ static DEVICE_START( gameboy_sound ) } -DEVICE_GET_INFO( gameboy_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(gb_sound_t); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(gameboy_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "LR35902"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - const device_type GAMEBOY = &device_creator<gameboy_sound_device>; gameboy_sound_device::gameboy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/audio/gmaster.c b/src/mess/audio/gmaster.c index b558637111a..b4812e84ed3 100644 --- a/src/mess/audio/gmaster.c +++ b/src/mess/audio/gmaster.c @@ -66,23 +66,6 @@ static DEVICE_START( gmaster_sound ) token->mixer_channel = device->machine().sound().stream_alloc(*device, 0, 1, device->machine().sample_rate(), 0, gmaster_update); } - -DEVICE_GET_INFO( gmaster_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(gmaster_sound); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(gmaster_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Game Master Custom"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - const device_type GMASTER = &device_creator<gmaster_sound_device>; gmaster_sound_device::gmaster_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/audio/lynx.c b/src/mess/audio/lynx.c index 349b2637018..69c75c22f34 100644 --- a/src/mess/audio/lynx.c +++ b/src/mess/audio/lynx.c @@ -501,41 +501,6 @@ static DEVICE_START(lynx2_sound) } -DEVICE_GET_INFO( lynx_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(lynx_sound_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(lynx_sound); break; - case DEVINFO_FCT_RESET: info->start = DEVICE_RESET_NAME(lynx_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Mikey"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - - -DEVICE_GET_INFO( lynx2_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(lynx_sound_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(lynx2_sound); break; - case DEVINFO_FCT_RESET: info->start = DEVICE_RESET_NAME(lynx_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Mikey (Lynx II)"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - const device_type LYNX = &device_creator<lynx_sound_device>; lynx_sound_device::lynx_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/audio/mac.c b/src/mess/audio/mac.c index c9bad8a6617..8fb4bfa3ee1 100644 --- a/src/mess/audio/mac.c +++ b/src/mess/audio/mac.c @@ -188,22 +188,6 @@ void mac_sh_updatebuffer(device_t *device) } -DEVICE_GET_INFO( mac_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(mac_sound); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(mac_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Mac Custom"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - const device_type MAC_SOUND = &device_creator<mac_sound_device>; mac_sound_device::mac_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/audio/mea8000.c b/src/mess/audio/mea8000.c index b7c67cacd8c..072c000b336 100644 --- a/src/mess/audio/mea8000.c +++ b/src/mess/audio/mea8000.c @@ -701,27 +701,6 @@ static DEVICE_START( mea8000 ) } -/************************** configuration ****************************/ - -DEVICE_GET_INFO( mea8000 ) { - switch ( state ) { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(mea8000_t); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(mea8000); break; - case DEVINFO_FCT_STOP: /* nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(mea8000); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Philips / Signetics MEA 8000 speech synthesizer"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "MEA8000"); break; - case DEVINFO_STR_VERSION: strcpy(info->s, "1.00"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright the MAME and MESS Teams"); break; - } -} - const device_type MEA8000 = &device_creator<mea8000_device>; mea8000_device::mea8000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/audio/socrates.c b/src/mess/audio/socrates.c index 5d8480f2633..4ac055fe014 100644 --- a/src/mess/audio/socrates.c +++ b/src/mess/audio/socrates.c @@ -143,25 +143,6 @@ void socrates_snd_reg4_w(device_t *device, int data) * Generic get_info **************************************************************************/ -DEVICE_GET_INFO( socrates_snd ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(SocratesASIC); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( socrates_snd ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Socrates Sound"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Socrates Sound"); 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 Jonathan Gevaryahu and The MESS Team"); break; - } -} - const device_type SOCRATES = &device_creator<socrates_snd_device>; socrates_snd_device::socrates_snd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/audio/special.c b/src/mess/audio/special.c index 4ca9f626705..76ebc7f0a8c 100644 --- a/src/mess/audio/special.c +++ b/src/mess/audio/special.c @@ -72,22 +72,6 @@ void specimx_set_input(device_t *device, int index, int state) } -DEVICE_GET_INFO( specimx_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(specimx_sound_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(specimx_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Specialist MX Custom"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - const device_type SPECIMX = &device_creator<specimx_sound_device>; specimx_sound_device::specimx_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/audio/svision.c b/src/mess/audio/svision.c index 9a678e36e85..df5119aee71 100644 --- a/src/mess/audio/svision.c +++ b/src/mess/audio/svision.c @@ -298,23 +298,6 @@ static DEVICE_START( svision_sound ) state->mixer_channel = device->machine().sound().stream_alloc(*device, 0, 2, device->machine().sample_rate(), 0, svision_update); } - -DEVICE_GET_INFO( svision_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(svision_sound_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(svision_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Super Vision Custom"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - const device_type SVISION = &device_creator<svision_sound_device>; svision_sound_device::svision_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/audio/t6721.c b/src/mess/audio/t6721.c index e3b7a56173f..c3eea9e0749 100644 --- a/src/mess/audio/t6721.c +++ b/src/mess/audio/t6721.c @@ -284,25 +284,6 @@ static DEVICE_RESET( t6721 ) t6721->writeindex = 0; } - -/*------------------------------------------------- - device definition --------------------------------------------------*/ - -DEVICE_GET_INFO(t6721) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(t6721_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(t6721); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(t6721); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "Toshiba 6721A"); break; - } -} - const device_type T6721 = &device_creator<t6721_device>; t6721_device::t6721_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/audio/upd1771.c b/src/mess/audio/upd1771.c index a082db8fdd2..ac471cfeb29 100644 --- a/src/mess/audio/upd1771.c +++ b/src/mess/audio/upd1771.c @@ -459,27 +459,6 @@ static DEVICE_STOP( upd1771c ) } -DEVICE_GET_INFO( upd1771c ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(upd1771_state); break; - - /* --- the following bits of info are returned as pointers to functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( upd1771c ); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( upd1771c ); break; - case DEVINFO_FCT_STOP: info->stop = DEVICE_STOP_NAME( upd1771c ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "NEC uPD1771C 017"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "NEC uPD1771"); 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 the MAME & MESS Teams"); break; - } -} - const device_type UPD1771C = &device_creator<upd1771c_device>; upd1771c_device::upd1771c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/audio/vc4000.c b/src/mess/audio/vc4000.c index ed8a4bc06ed..24db3e19a3d 100644 --- a/src/mess/audio/vc4000.c +++ b/src/mess/audio/vc4000.c @@ -82,23 +82,6 @@ static DEVICE_START(vc4000_sound) token->channel = device->machine().sound().stream_alloc(*device, 0, 1, device->machine().sample_rate(), 0, vc4000_update); } - -DEVICE_GET_INFO( vc4000_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(vc4000_sound); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(vc4000_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "VC 4000 Custom"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - const device_type VC4000 = &device_creator<vc4000_sound_device>; vc4000_sound_device::vc4000_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/audio/wswan.c b/src/mess/audio/wswan.c index bde1f6f612d..28a7eb7af06 100644 --- a/src/mess/audio/wswan.c +++ b/src/mess/audio/wswan.c @@ -249,22 +249,6 @@ static DEVICE_START(wswan_sound) } -DEVICE_GET_INFO( wswan_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(wswan_sound_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(wswan_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "WonderSwan Custom"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - const device_type WSWAN = &device_creator<wswan_sound_device>; wswan_sound_device::wswan_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/drivers/pv1000.c b/src/mess/drivers/pv1000.c index 3caf4df7086..f429a52ab18 100644 --- a/src/mess/drivers/pv1000.c +++ b/src/mess/drivers/pv1000.c @@ -340,20 +340,6 @@ static DEVICE_START( pv1000_sound ) } -DEVICE_GET_INFO( pv1000_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(pv1000_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "NEC D65010G031"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - - /* Interrupt is triggering 16 times during vblank. */ /* we have chosen to trigger on scanlines 195, 199, 203, 207, 211, 215, 219, 223, 227, 231, 235, 239, 243, 247, 251, 255 */ static TIMER_CALLBACK( d65010_irq_on_cb ) diff --git a/src/mess/includes/apollo.h b/src/mess/includes/apollo.h index 363a867bc04..8427acaa5a5 100644 --- a/src/mess/includes/apollo.h +++ b/src/mess/includes/apollo.h @@ -329,8 +329,6 @@ extern const device_type APOLLO_MONO19I; MCFG_FRAGMENT_ADD(apollo_mono19i) \ MCFG_DEVICE_ADD(_tag, APOLLO_MONO19I, 0) -DEVICE_GET_INFO( apollo_mono19i ); - MACHINE_CONFIG_EXTERN( apollo_mono19i ); class apollo_mono15i_device : public apollo_mono_device @@ -353,8 +351,6 @@ extern const device_type APOLLO_MONO15I; MCFG_FRAGMENT_ADD(apollo_mono15i) \ MCFG_DEVICE_ADD(_tag, APOLLO_MONO15I, 0) -DEVICE_GET_INFO( apollo_mono15i ); - MACHINE_CONFIG_EXTERN( apollo_mono15i ); READ16_DEVICE_HANDLER( apollo_mcr_r ) ; diff --git a/src/mess/machine/990_tap.c b/src/mess/machine/990_tap.c index 27c3fda5a7b..7a41a5ac298 100644 --- a/src/mess/machine/990_tap.c +++ b/src/mess/machine/990_tap.c @@ -1066,29 +1066,6 @@ static DEVICE_START(tap_990) } -DEVICE_GET_INFO( tap_990 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(tap_990_t); break; - - /* --- the following bits of info are returned as pointers --- */ - case DEVINFO_PTR_MACHINE_CONFIG: info->machine_config = MACHINE_CONFIG_NAME(tap_990); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(tap_990); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Generic TI990 Tape Controller"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "TI990 Tape Controller"); 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 the MESS Team"); break; - } -} - const device_type TI990_TAPE_CTRL = &device_creator<tap_990_device>; tap_990_device::tap_990_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/machine/apollo.c b/src/mess/machine/apollo.c index fb0e7779bf0..29c318fabe0 100644 --- a/src/mess/machine/apollo.c +++ b/src/mess/machine/apollo.c @@ -146,27 +146,6 @@ static DEVICE_RESET(apollo_config) config = device->machine().root_device().ioport("apollo_config")->read(); } -/*------------------------------------------------- - device get info callback - -------------------------------------------------*/ - -DEVICE_GET_INFO(apollo_config) -{ - switch (state) - { - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(apollo_config); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(apollo_config);break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Apollo Configuration");break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Configuration"); 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; - } -} - class apollo_config_device : public device_t { public: diff --git a/src/mess/machine/applefdc.c b/src/mess/machine/applefdc.c index 28fb4b468b4..93bf5f4f2fc 100644 --- a/src/mess/machine/applefdc.c +++ b/src/mess/machine/applefdc.c @@ -735,32 +735,6 @@ UINT8 applefdc_get_lines(device_t *device) ***************************************************************************/ /*------------------------------------------------- - DEVICE_GET_INFO(applefdc_base) - device get info - callback --------------------------------------------------*/ - -static DEVICE_GET_INFO(applefdc_base) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(applefdc_token); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: /* Nothing */ break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(applefdc); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_FAMILY: strcpy(info->s, "Apple FDC"); break; - case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - - - -/*------------------------------------------------- DEVICE_START(oldfdc) - device start callback -------------------------------------------------*/ @@ -773,27 +747,6 @@ static DEVICE_START(oldfdc) /*------------------------------------------------- - DEVICE_GET_INFO(applefdc) - device get info - callback --------------------------------------------------*/ - -DEVICE_GET_INFO(applefdc) -{ - switch (state) - { - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Apple FDC"); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(oldfdc); break; - - default: DEVICE_GET_INFO_CALL(applefdc_base); break; - } -} - - - -/*------------------------------------------------- DEVICE_START(iwm) - device start callback -------------------------------------------------*/ @@ -804,28 +757,6 @@ static DEVICE_START(iwm) } - -/*------------------------------------------------- - DEVICE_GET_INFO(iwm) - device get info - callback --------------------------------------------------*/ - -DEVICE_GET_INFO(iwm) -{ - switch (state) - { - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Apple IWM (Integrated Woz Machine)"); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(iwm); break; - - default: DEVICE_GET_INFO_CALL(applefdc_base); break; - } -} - - - /*------------------------------------------------- DEVICE_START(iwm) - device start callback @@ -837,26 +768,6 @@ static DEVICE_START(swim) } - -/*------------------------------------------------- - DEVICE_GET_INFO(swim) - device get info - callback --------------------------------------------------*/ - -DEVICE_GET_INFO(swim) -{ - switch (state) - { - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Apple SWIM (Steve Woz Integrated Machine)"); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(swim); break; - - default: DEVICE_GET_INFO_CALL(applefdc_base); break; - } -} - applefdc_base_device::applefdc_base_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) { diff --git a/src/mess/machine/at45dbxx.c b/src/mess/machine/at45dbxx.c index 49fe9ef76a1..b479d984032 100644 --- a/src/mess/machine/at45dbxx.c +++ b/src/mess/machine/at45dbxx.c @@ -414,59 +414,6 @@ NVRAM_HANDLER( at45dbxx ) #endif -/*------------------------------------------------- - DEVICE_GET_INFO( at45db041 ) --------------------------------------------------*/ - -DEVICE_GET_INFO( at45db041 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(at45dbxx_t); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(at45db041); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(at45dbxx); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "AT45DB041"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "AT45DBxx"); 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: /* Nothing */ break; - } -} - -DEVICE_GET_INFO( at45db081 ) -{ - switch (state) - { - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "AT45DB081"); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(at45db081); break; - - default: DEVICE_GET_INFO_CALL(at45db041); break; - } -} - -DEVICE_GET_INFO( at45db161 ) -{ - switch (state) - { - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "AT45DB161"); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(at45db161); break; - - default: DEVICE_GET_INFO_CALL(at45db041); break; - } -} - const device_type AT45DB041 = &device_creator<at45db041_device>; at45db041_device::at45db041_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/machine/atarifdc.c b/src/mess/machine/atarifdc.c index 457ba5aa1f7..0e65e5eaeef 100644 --- a/src/mess/machine/atarifdc.c +++ b/src/mess/machine/atarifdc.c @@ -816,30 +816,6 @@ static DEVICE_RESET(atari_fdc) { } -DEVICE_GET_INFO( atari_fdc ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(atari_fdc_t); break; - - /* --- the following bits of info are returned as pointers --- */ - case DEVINFO_PTR_MACHINE_CONFIG: info->machine_config = MACHINE_CONFIG_NAME(atari_fdc); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(atari_fdc); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(atari_fdc); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Atari FDC"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Atari FDC"); 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 the MESS Team"); break; - } -} - const device_type ATARI_FDC = &device_creator<atari_fdc_device>; atari_fdc_device::atari_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/machine/ay31015.c b/src/mess/machine/ay31015.c index d35e2e4f727..ce0823f1af8 100644 --- a/src/mess/machine/ay31015.c +++ b/src/mess/machine/ay31015.c @@ -716,32 +716,6 @@ static DEVICE_RESET( ay31015 ) } -/*------------------------------------------------- - DEVICE_GET_INFO(ay31015) - device getinfo - function --------------------------------------------------*/ - -DEVICE_GET_INFO( ay31015 ) -{ - switch(state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(ay31015_t); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(ay31015); break; - case DEVINFO_FCT_STOP: /* nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( ay31015 ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "AY-3-1015"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "AY-3-1015/AY-5-1013 UARTs"); break; - case DEVINFO_STR_VERSION: strcpy(info->s, "1.00"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright the MAME and MESS Teams"); break; - } -} - const device_type AY31015 = &device_creator<ay31015_device>; ay31015_device::ay31015_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/machine/beta.c b/src/mess/machine/beta.c index 33fd2538695..89ede09aacf 100644 --- a/src/mess/machine/beta.c +++ b/src/mess/machine/beta.c @@ -328,36 +328,6 @@ static DEVICE_RESET( beta_disk ) { } -/*------------------------------------------------- - DEVICE_GET_INFO( beta_disk ) --------------------------------------------------*/ - -DEVICE_GET_INFO( beta_disk ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(beta_disk_state); break; - - /* --- the following bits of info are returned as pointers --- */ - case DEVINFO_PTR_ROM_REGION: info->romregion = ROM_NAME(beta_disk); break; - case DEVINFO_PTR_MACHINE_CONFIG: info->machine_config = MACHINE_CONFIG_NAME(beta_disk); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(beta_disk); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(beta_disk); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Beta Disk Interface"); break; - case DEVINFO_STR_SHORTNAME: strcpy(info->s, "betadisk"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Beta Disk Interface"); 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 the MESS Team"); break; - } -} - const device_type BETA_DISK = &device_creator<beta_disk_device>; beta_disk_device::beta_disk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/machine/ds1315.c b/src/mess/machine/ds1315.c index 75bf04fdbff..eadc093b102 100644 --- a/src/mess/machine/ds1315.c +++ b/src/mess/machine/ds1315.c @@ -239,31 +239,6 @@ static void ds1315_input_raw_data(device_t *device) } -/*------------------------------------------------- - DEVICE_GET_INFO( ds1315 ) --------------------------------------------------*/ - -DEVICE_GET_INFO( ds1315 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(ds1315_t); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(ds1315); 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 DEVINFO_STR_NAME: strcpy(info->s, "Dallas Semiconductor DS1315"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Dallas Semiconductor DS1315"); 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: /* Nothing */ break; - } -} - const device_type DS1315 = &device_creator<ds1315_device>; ds1315_device::ds1315_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/machine/e05a03.c b/src/mess/machine/e05a03.c index 5a8ea7a5ca0..e3b90bc9a71 100644 --- a/src/mess/machine/e05a03.c +++ b/src/mess/machine/e05a03.c @@ -110,28 +110,6 @@ static DEVICE_RESET( e05a03 ) e05a03->cndlp = 1; } -DEVICE_GET_INFO( e05a03 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(e05a03_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(e05a03); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(e05a03); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "E05A03"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Epson printer gate array"); 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 MESS Team"); break; - } -} - - /*************************************************************************** IMPLEMENTATION ***************************************************************************/ diff --git a/src/mess/machine/er59256.c b/src/mess/machine/er59256.c index e319ffdd6da..58b6898201c 100644 --- a/src/mess/machine/er59256.c +++ b/src/mess/machine/er59256.c @@ -223,31 +223,6 @@ static void decode_command(er59256_t *er59256) er59256->command=CMD_INVALID; } -/*------------------------------------------------- - DEVICE_GET_INFO( er59256 ) --------------------------------------------------*/ - -DEVICE_GET_INFO( er59256 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(er59256_t); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(er59256); break; - case DEVINFO_FCT_STOP: info->stop = DEVICE_STOP_NAME(er59256); break; - case DEVINFO_FCT_RESET: /* Nothing */ break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Microchip ER59256 serial eeprom."); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Microchip ER59256 serial eeprom."); 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: /* Nothing */ break; - } -} - const device_type ER59256 = &device_creator<er59256_device>; er59256_device::er59256_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/machine/hd63450.c b/src/mess/machine/hd63450.c index 7a40d5162c7..fee45682dff 100644 --- a/src/mess/machine/hd63450.c +++ b/src/mess/machine/hd63450.c @@ -461,27 +461,6 @@ int hd63450_get_error_vector(device_t* device, int channel) return dmac->reg[channel].eiv; } -DEVICE_GET_INFO(hd63450) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(hd63450_t); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(hd63450); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: /*info->reset = DEVICE_RESET_NAME(hd63450);*/ break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Hitachi HD63450"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "DMA Controller"); 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 the MESS Team"); break; - } -} - READ16_DEVICE_HANDLER(hd63450_r) { return hd63450_read(device,offset,mem_mask); } WRITE16_DEVICE_HANDLER(hd63450_w) { hd63450_write(device,offset,data,mem_mask); } diff --git a/src/mess/machine/i8271.c b/src/mess/machine/i8271.c index 5bc1871324b..75564b776ed 100644 --- a/src/mess/machine/i8271.c +++ b/src/mess/machine/i8271.c @@ -1575,27 +1575,6 @@ static DEVICE_RESET( i8271 ) } -DEVICE_GET_INFO( i8271 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(i8271_t); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(i8271); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(i8271); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Intel 8271"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Intel 8271"); 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 MESS Team"); break; - } -} - const device_type I8271 = &device_creator<i8271_device>; i8271_device::i8271_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/machine/kr2376.c b/src/mess/machine/kr2376.c index 8130e78c76e..bfb832a0ec4 100644 --- a/src/mess/machine/kr2376.c +++ b/src/mess/machine/kr2376.c @@ -372,27 +372,6 @@ static DEVICE_START( kr2376 ) device->save_item(NAME(kr2376->data)); } -DEVICE_GET_INFO( kr2376 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(kr2376_t); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(kr2376); 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 DEVINFO_STR_NAME: strcpy(info->s, "SMC KR2376"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "SMC"); 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 MESS Team"); break; - } -} - const device_type KR2376 = &device_creator<kr2376_device>; kr2376_device::kr2376_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/machine/mc68328.c b/src/mess/machine/mc68328.c index 74e6daf723a..4143c8ff6fd 100644 --- a/src/mess/machine/mc68328.c +++ b/src/mess/machine/mc68328.c @@ -2808,27 +2808,6 @@ static DEVICE_START( mc68328 ) mc68328_register_state_save(device); } -DEVICE_GET_INFO( mc68328 ) -{ - switch ( state ) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(mc68328_t); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(mc68328); break; - case DEVINFO_FCT_STOP: /* nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(mc68328); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Motorola MC68328 (DragonBall) Integrated Processor"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "MC68328"); break; - case DEVINFO_STR_VERSION: strcpy(info->s, "1.00"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright the MESS Teams and Ryan Holtz"); break; - } -} - const device_type MC68328 = &device_creator<mc68328_device>; mc68328_device::mc68328_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/machine/mc6843.c b/src/mess/machine/mc6843.c index 7ebf42461f2..13c69bc6807 100644 --- a/src/mess/machine/mc6843.c +++ b/src/mess/machine/mc6843.c @@ -830,27 +830,6 @@ static DEVICE_START( mc6843 ) } -/************************** configuration ****************************/ - -DEVICE_GET_INFO( mc6843 ) { - switch ( state ) { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(mc6843_t); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(mc6843); break; - case DEVINFO_FCT_STOP: /* nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(mc6843); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Motorola MC6843 floppy controller"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "MC6843"); break; - case DEVINFO_STR_VERSION: strcpy(info->s, "1.00"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright the MAME and MESS Teams"); break; - } -} - const device_type MC6843 = &device_creator<mc6843_device>; mc6843_device::mc6843_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/machine/mc6846.c b/src/mess/machine/mc6846.c index 993e74e5696..9f7d17143dc 100644 --- a/src/mess/machine/mc6846.c +++ b/src/mess/machine/mc6846.c @@ -609,28 +609,6 @@ static DEVICE_START( mc6846 ) } -/************************** configuration ****************************/ - - -DEVICE_GET_INFO( mc6846 ) { - switch ( state ) { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(mc6846_t); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(mc6846); break; - case DEVINFO_FCT_STOP: /* nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(mc6846); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Motorola MC6846 programmable timer"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "MC6846"); break; - case DEVINFO_STR_VERSION: strcpy(info->s, "1.00"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright the MAME and MESS Teams"); break; - } -} - const device_type MC6846 = &device_creator<mc6846_device>; mc6846_device::mc6846_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/machine/mc6854.c b/src/mess/machine/mc6854.c index da808f12c4b..6159f100378 100644 --- a/src/mess/machine/mc6854.c +++ b/src/mess/machine/mc6854.c @@ -1039,28 +1039,6 @@ static DEVICE_START( mc6854 ) -/************************** configuration ****************************/ - - -DEVICE_GET_INFO( mc6854 ) { - switch ( state ) { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(mc6854_t); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(mc6854); break; - case DEVINFO_FCT_STOP: /* nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(mc6854); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Motorola MC6854 ADLC"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "MC6854"); break; - case DEVINFO_STR_VERSION: strcpy(info->s, "1.00"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright the MAME and MESS Teams"); break; - } -} - const device_type MC6854 = &device_creator<mc6854_device>; mc6854_device::mc6854_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/machine/micropolis.c b/src/mess/machine/micropolis.c index 6518df301a9..910ce8c0bf5 100644 --- a/src/mess/machine/micropolis.c +++ b/src/mess/machine/micropolis.c @@ -377,25 +377,6 @@ void micropolis_reset(device_t *device) DEVICE_RESET_CALL( micropolis ); } - -/*************************************************************************** - DEVICE GETINFO -***************************************************************************/ - -DEVICE_GET_INFO(micropolis) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(micropolis_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(micropolis); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(micropolis); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "MICROPOLIS"); break; - } -} - const device_type MICROPOLIS = &device_creator<micropolis_device>; micropolis_device::micropolis_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/machine/mm58274c.c b/src/mess/machine/mm58274c.c index 7298d95c62e..92518a0e3f4 100644 --- a/src/mess/machine/mm58274c.c +++ b/src/mess/machine/mm58274c.c @@ -517,27 +517,6 @@ static DEVICE_RESET( mm58274c ) mm58274c->tenths = 0; } -DEVICE_GET_INFO( mm58274c ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(mm58274c_t); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(mm58274c); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(mm58274c); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "National Semiconductor MM58274C");break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "National Semiconductor MM58274C");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 MESS Team"); break; - } -} - const device_type MM58274C = &device_creator<mm58274c_device>; mm58274c_device::mm58274c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/machine/mos6530.c b/src/mess/machine/mos6530.c index a36dcf3830c..c4c9734763c 100644 --- a/src/mess/machine/mos6530.c +++ b/src/mess/machine/mos6530.c @@ -434,27 +434,6 @@ static DEVICE_RESET( mos6530 ) } -DEVICE_GET_INFO( mos6530 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(mos6530_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(mos6530); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(mos6530); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "MOS6530"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "MOS6500"); 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 MESS Team"); break; - } -} - const device_type MOS6530 = &device_creator<mos6530_device>; mos6530_device::mos6530_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/machine/omti8621.c b/src/mess/machine/omti8621.c index e6227e61c0b..cdd52b9c426 100644 --- a/src/mess/machine/omti8621.c +++ b/src/mess/machine/omti8621.c @@ -1334,31 +1334,6 @@ static DEVICE_RESET( omti8621 ) omti_reset(state); } -/*------------------------------------------------- - device get info callback --------------------------------------------------*/ - -DEVICE_GET_INFO( omti8621 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(omti8621_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(omti8621); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(omti8621); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "OMTI 8621"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Winchester Disk Controller");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; - } -} - const device_type OMTI8621 = &device_creator<omti8621_device>; omti8621_device::omti8621_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/machine/pc_lpt.c b/src/mess/machine/pc_lpt.c index 7bf4be57c4f..61a4d95f0d0 100644 --- a/src/mess/machine/pc_lpt.c +++ b/src/mess/machine/pc_lpt.c @@ -115,31 +115,6 @@ static DEVICE_RESET( pc_lpt ) lpt->data = 0xff; } -DEVICE_GET_INFO( pc_lpt ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(pc_lpt_state); break; - - /* --- the following bits of info are returned as pointers --- */ - case DEVINFO_PTR_MACHINE_CONFIG: info->machine_config = MACHINE_CONFIG_NAME(pc_lpt); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(pc_lpt); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(pc_lpt); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "PC-LPT"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Parallel port"); 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 MESS Team"); break; - } -} - - /*************************************************************************** IMPLEMENTATION ***************************************************************************/ diff --git a/src/mess/machine/pcf8593.c b/src/mess/machine/pcf8593.c index b68d89ac7a0..4afb667aa8f 100644 --- a/src/mess/machine/pcf8593.c +++ b/src/mess/machine/pcf8593.c @@ -445,31 +445,6 @@ NVRAM_HANDLER( pcf8593 ) #endif -/*------------------------------------------------- - DEVICE_GET_INFO( pcf8593 ) --------------------------------------------------*/ - -DEVICE_GET_INFO( pcf8593 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(pcf8593_t); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(pcf8593); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(pcf8593); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "PCF8593 RTC"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "PCF8593 RTC"); 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: /* Nothing */ break; - } -} - const device_type PCF8593 = &device_creator<pcf8593_device>; pcf8593_device::pcf8593_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/machine/pf10.c b/src/mess/machine/pf10.c index 15f5c71260c..815395bb53a 100644 --- a/src/mess/machine/pf10.c +++ b/src/mess/machine/pf10.c @@ -101,32 +101,6 @@ static DEVICE_RESET( pf10 ) { } -DEVICE_GET_INFO( pf10 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(pf10_state); break; - - /* --- the following bits of info are returned as pointers --- */ - case DEVINFO_PTR_MACHINE_CONFIG: info->machine_config = MACHINE_CONFIG_NAME(pf10); break; - case DEVINFO_PTR_ROM_REGION: info->romregion = ROM_NAME(pf10); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(pf10); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(pf10); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "PF-10"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Floppy drive"); 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 MESS Team"); break; - } -} - - /*************************************************************************** IMPLEMENTATION ***************************************************************************/ diff --git a/src/mess/machine/s3c44b0.c b/src/mess/machine/s3c44b0.c index c49449f0ad6..a61c8371363 100644 --- a/src/mess/machine/s3c44b0.c +++ b/src/mess/machine/s3c44b0.c @@ -2035,25 +2035,6 @@ DEVICE_START( s3c44b0 ) space->install_legacy_readwrite_handler( *device, 0x01f80020, 0x01f8003b, 0, 0, FUNC(s3c44b0_bdma_1_r), FUNC(s3c44b0_bdma_1_w)); } -DEVICE_GET_INFO( s3c44b0 ) -{ - switch ( state ) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(s3c44b0_t); break; -// case DEVINFO_INT_CLASS: info->i = DEVICE_CLASS_PERIPHERAL; break; - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(s3c44b0); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(s3c44b0); break; - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_FAMILY: strcpy(info->s, "S3C44B0"); break; - case DEVINFO_STR_VERSION: strcpy(info->s, "1.00"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright the MESS Team"); break; - case DEVINFO_STR_NAME: strcpy(info->s, "Samsung S3C44B0"); break; - } -} - const device_type S3C44B0 = &device_creator<s3c44b0_device>; s3c44b0_device::s3c44b0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/machine/s3c44b0.h b/src/mess/machine/s3c44b0.h index 0a89ff79e4a..8be2620954a 100644 --- a/src/mess/machine/s3c44b0.h +++ b/src/mess/machine/s3c44b0.h @@ -103,8 +103,6 @@ struct _s3c44b0_interface PROTOTYPES *******************************************************************************/ -DEVICE_GET_INFO( s3c44b0 ); - VIDEO_START( s3c44b0 ); SCREEN_UPDATE_RGB32( s3c44b0 ); diff --git a/src/mess/machine/sst39vfx.c b/src/mess/machine/sst39vfx.c index 34a801c96f2..bdba5c31c27 100644 --- a/src/mess/machine/sst39vfx.c +++ b/src/mess/machine/sst39vfx.c @@ -178,46 +178,6 @@ NVRAM_HANDLER( sst39vfx ) } #endif - -/*------------------------------------------------- - DEVICE_GET_INFO( sst39vf020 ) --------------------------------------------------*/ - -DEVICE_GET_INFO( sst39vf020 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(sst39vfx_t); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(sst39vf020); 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 DEVINFO_STR_NAME: strcpy(info->s, "SST39VF020"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "SST39VFxx"); 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: /* Nothing */ break; - } -} - -DEVICE_GET_INFO( sst39vf400a ) -{ - switch (state) - { - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "SST39VF400A"); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(sst39vf400a); break; - - default: DEVICE_GET_INFO_CALL(sst39vf020); break; - } -} - const device_type SST39VF020 = &device_creator<sst39vf020_device>; sst39vf020_device::sst39vf020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/machine/strata.c b/src/mess/machine/strata.c index 64c46e8f976..6fa6dd99f4c 100644 --- a/src/mess/machine/strata.c +++ b/src/mess/machine/strata.c @@ -99,25 +99,6 @@ static DEVICE_START( strataflash ) strata->prot_regs[i] = device->machine().rand(); } -DEVICE_GET_INFO( strataflash ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(strata_t); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(strataflash); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Intel 28F640J5"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Intel 28F640J5"); 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 MESS Team"); break; - } -} - const device_type STRATAFLASH = &device_creator<strataflash_device>; strataflash_device::strataflash_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/machine/tf20.c b/src/mess/machine/tf20.c index bec571fbbb9..d0633a3c3a3 100644 --- a/src/mess/machine/tf20.c +++ b/src/mess/machine/tf20.c @@ -358,32 +358,6 @@ static DEVICE_RESET( tf20 ) prg->install_rom(0x0000, 0x07ff, 0, 0x7800, cpu->region()->base()); } -DEVICE_GET_INFO( tf20 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(tf20_state); break; - - /* --- the following bits of info are returned as pointers --- */ - case DEVINFO_PTR_MACHINE_CONFIG: info->machine_config = MACHINE_CONFIG_NAME(tf20); break; - case DEVINFO_PTR_ROM_REGION: info->romregion = ROM_NAME(tf20); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(tf20); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(tf20); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "TF-20"); break; - case DEVINFO_STR_SHORTNAME: strcpy(info->s, "tf20"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Floppy drive"); 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 MESS Team"); break; - } -} - const device_type TF20 = &device_creator<tf20_device>; tf20_device::tf20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/machine/upd7002.c b/src/mess/machine/upd7002.c index 07cb4d4268e..2ba476cf950 100644 --- a/src/mess/machine/upd7002.c +++ b/src/mess/machine/upd7002.c @@ -209,27 +209,6 @@ static DEVICE_RESET( uPD7002 ) uPD7002->conversion_counter = 0; } -DEVICE_GET_INFO( uPD7002 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(uPD7002_t); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(uPD7002); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(uPD7002); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "uPD7002"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "uPD7002"); 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 MESS Team"); break; - } -} - const device_type UPD7002 = &device_creator<uPD7002_device>; uPD7002_device::uPD7002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/machine/upd71071.c b/src/mess/machine/upd71071.c index 637e26a0814..57a9e444315 100644 --- a/src/mess/machine/upd71071.c +++ b/src/mess/machine/upd71071.c @@ -417,27 +417,6 @@ static WRITE8_DEVICE_HANDLER(upd71071_write) } } -DEVICE_GET_INFO(upd71071) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(upd71071_t); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(upd71071); 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 DEVINFO_STR_NAME: strcpy(info->s, "NEC uPD71071"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "DMA Controller"); 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 the MESS Team"); break; - } -} - READ8_DEVICE_HANDLER(upd71071_r) { return upd71071_read(device,offset); } WRITE8_DEVICE_HANDLER(upd71071_w) { upd71071_write(device,offset,data); } diff --git a/src/mess/machine/upd765.c b/src/mess/machine/upd765.c index 3d5ad35cc45..72acd93b342 100644 --- a/src/mess/machine/upd765.c +++ b/src/mess/machine/upd765.c @@ -2476,70 +2476,6 @@ static DEVICE_RESET( upd765 ) upd765_reset(device,0); } -DEVICE_GET_INFO( upd765a ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(upd765_t); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(upd765a); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(upd765); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "UPD765A"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "UPD765A"); 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 MESS Team"); break; - } -} - - -DEVICE_GET_INFO( upd765b ) -{ - switch (state) - { - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "UPD765B"); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(upd765b); break; - - default: DEVICE_GET_INFO_CALL(upd765a); break; - } -} - -DEVICE_GET_INFO( smc37c78 ) -{ - switch (state) - { - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "SMC37C78"); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(smc37c78); break; - - default: DEVICE_GET_INFO_CALL(upd765a); break; - } -} - -DEVICE_GET_INFO( upd72065 ) -{ - switch (state) - { - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "UPD72065"); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(upd72065); break; - - default: DEVICE_GET_INFO_CALL(upd765a); break; - } -} - const device_type UPD765A = &device_creator<upd765a_device>; upd765a_device::upd765a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/video/733_asr.c b/src/mess/video/733_asr.c index 0a5740bb0ba..c6420f81c80 100644 --- a/src/mess/video/733_asr.c +++ b/src/mess/video/733_asr.c @@ -216,26 +216,6 @@ static DEVICE_RESET( asr733 ) asr_field_interrupt(device); } -DEVICE_GET_INFO( asr733 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(asr_t); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(asr733); break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(asr733); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "733 ASR"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "733 ASR Video"); 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 MESS Team"); break; - } -} - const device_type ASR733 = &device_creator<asr733_device>; asr733_device::asr733_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/video/911_vdt.c b/src/mess/video/911_vdt.c index 32bf93eaf06..386fe1113fa 100644 --- a/src/mess/video/911_vdt.c +++ b/src/mess/video/911_vdt.c @@ -268,25 +268,6 @@ static DEVICE_START( vdt911 ) vdt->beep_timer = device->machine().scheduler().timer_alloc(FUNC(beep_callback)); } -DEVICE_GET_INFO( vdt911 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(vdt_t); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(vdt911); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "911 VDT"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "911 VDT Video"); 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 MESS Team"); break; - } -} - const device_type VDT911 = &device_creator<vdt911_device>; vdt911_device::vdt911_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/video/apollo.c b/src/mess/video/apollo.c index a43c82fde56..5e122b81085 100644 --- a/src/mess/video/apollo.c +++ b/src/mess/video/apollo.c @@ -834,48 +834,6 @@ static DEVICE_RESET( apollo_mono15i ) { DEVICE_RESET_CALL(apollo_mono19i); } -/*------------------------------------------------- - DEVICE_GET_INFO( apollo_mono19i/15i ) - -------------------------------------------------*/ - -DEVICE_GET_INFO( apollo_mono19i ) { - switch (state) { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(screen_data_t); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(apollo_mono19i); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(apollo_mono19i); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Apollo 19\" Monochrome Screen"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Terminal"); 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 the MESS Team"); break; - } -} - -DEVICE_GET_INFO( apollo_mono15i ) { - switch (state) { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(screen_data_t); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(apollo_mono15i); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(apollo_mono15i); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "Apollo 15\" Monochrome Screen"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "Terminal"); 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 the MESS Team"); break; - } -} - apollo_mono_device::apollo_mono_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) { diff --git a/src/mess/video/crt.c b/src/mess/video/crt.c index 22d7aac6403..617a46cedeb 100644 --- a/src/mess/video/crt.c +++ b/src/mess/video/crt.c @@ -99,25 +99,6 @@ static DEVICE_START( crt ) } -DEVICE_GET_INFO( crt ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(crt_t); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(crt); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "CRT Video"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "CRT Video"); 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 MESS Team"); break; - } -} - const device_type CRT = &device_creator<crt_device>; crt_device::crt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/video/dl1416.c b/src/mess/video/dl1416.c index ef086263165..aac3b5eee25 100644 --- a/src/mess/video/dl1416.c +++ b/src/mess/video/dl1416.c @@ -171,47 +171,6 @@ static DEVICE_RESET( dl1416 ) } -DEVICE_GET_INFO( dl1416 ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(dl1416_state); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( dl1416 ); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( dl1416 ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "DL1416"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "DL1416"); break; - case DEVINFO_STR_VERSION: strcpy(info->s, "1.1"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright MESS Team"); break; - } -} - -DEVICE_GET_INFO( dl1416b ) -{ - switch (state) - { - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "DL1416B"); break; - default: DEVICE_GET_INFO_CALL(dl1416); break; - } -} - -DEVICE_GET_INFO( dl1416t ) -{ - switch (state) - { - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "DL1416T"); break; - default: DEVICE_GET_INFO_CALL(dl1416); break; - } -} - /***************************************************************************** IMPLEMENTATION *****************************************************************************/ diff --git a/src/mess/video/k1ge.c b/src/mess/video/k1ge.c index 0ac86acf7c0..12dd583ea59 100644 --- a/src/mess/video/k1ge.c +++ b/src/mess/video/k1ge.c @@ -892,37 +892,6 @@ static DEVICE_RESET( k1ge ) } -DEVICE_GET_INFO( k1ge ) -{ - switch ( state ) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof( k1ge_t ); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( k1ge ); break; - case DEVINFO_FCT_STOP: break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( k1ge ); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy( info->s, "SNK K1GE" ); break; - case DEVINFO_STR_FAMILY: strcpy( info->s, "KxGE" ); break; - case DEVINFO_STR_VERSION: strcpy( info->s, "1.0" ); break; - case DEVINFO_STR_SOURCE_FILE: strcpy( info->s, __FILE__ ); - case DEVINFO_STR_CREDITS: strcpy( info->s, "Copyright the MESS team" ); break; - } -} - - -DEVICE_GET_INFO( k2ge ) -{ - switch ( state ) - { - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( k2ge ); break; - default: DEVICE_GET_INFO_CALL( k1ge ); break; - } -} - const device_type K1GE = &device_creator<k1ge_device>; k1ge_device::k1ge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/video/odyssey2.c b/src/mess/video/odyssey2.c index 6ca1b97b1df..8647fe46e06 100644 --- a/src/mess/video/odyssey2.c +++ b/src/mess/video/odyssey2.c @@ -619,19 +619,6 @@ static DEVICE_START( odyssey2_sound ) } -DEVICE_GET_INFO( odyssey2_sound ) -{ - switch (state) - { - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(odyssey2_sound); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "P8244/P8245"); break; - case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; - } -} - STREAM_UPDATE( odyssey2_sh_update ) { odyssey2_state *state = device->machine().driver_data<odyssey2_state>(); diff --git a/src/mess/video/saa505x.c b/src/mess/video/saa505x.c index d19de1e7d87..1b7ad3a24b3 100644 --- a/src/mess/video/saa505x.c +++ b/src/mess/video/saa505x.c @@ -3406,25 +3406,6 @@ static DEVICE_START( saa505x ) tt->intf = (const saa505x_interface *)device->static_config(); } -DEVICE_GET_INFO( saa505x ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(teletext_t); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(saa505x); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "SAA505x Video"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "SAA505x Video"); 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 MESS Team"); break; - } -} - const device_type SAA505X = &device_creator<saa505x_device>; saa505x_device::saa505x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/video/vdc8563.c b/src/mess/video/vdc8563.c index 653153f37b5..7ed4240dc20 100644 --- a/src/mess/video/vdc8563.c +++ b/src/mess/video/vdc8563.c @@ -658,24 +658,6 @@ static DEVICE_RESET( vdc8563 ) vdc8563->changed = 0; } -/*------------------------------------------------- - device definition --------------------------------------------------*/ - -DEVICE_GET_INFO(vdc8563) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(vdc8563_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(vdc8563); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(vdc8563); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "8563 / 8568 VDC"); break; - } -} - const device_type VDC8563 = &device_creator<vdc8563_device>; vdc8563_device::vdc8563_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/video/vic4567.c b/src/mess/video/vic4567.c index 146f982b64c..cd13bb7acc7 100644 --- a/src/mess/video/vic4567.c +++ b/src/mess/video/vic4567.c @@ -2150,24 +2150,6 @@ static DEVICE_RESET( vic3 ) } -/*------------------------------------------------- - device definition --------------------------------------------------*/ - -DEVICE_GET_INFO(vic3) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(vic3_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(vic3); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(vic3); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "4567 VIC III"); break; - } -} - const device_type VIC3 = &device_creator<vic3_device>; vic3_device::vic3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/video/vic6567.c b/src/mess/video/vic6567.c index c9713a6d9c2..fde3a985888 100644 --- a/src/mess/video/vic6567.c +++ b/src/mess/video/vic6567.c @@ -2800,24 +2800,6 @@ static DEVICE_RESET( vic2 ) } -/*------------------------------------------------- - device definition --------------------------------------------------*/ - -DEVICE_GET_INFO(vic2) -{ - switch (state) - { - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(vic2_state); break; - - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(vic2); break; - - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(vic2); break; - - case DEVINFO_STR_NAME: strcpy(info->s, "6567 / 6569 VIC II"); break; - } -} - const device_type VIC2 = &device_creator<vic2_device>; vic2_device::vic2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/mess/video/vtvideo.c b/src/mess/video/vtvideo.c index b162766d914..87f24fb1097 100644 --- a/src/mess/video/vtvideo.c +++ b/src/mess/video/vtvideo.c @@ -448,31 +448,6 @@ static DEVICE_RESET( vt_video ) vt->skip_lines = 2; // for 60Hz } -/*------------------------------------------------- - DEVICE_GET_INFO( vt100_video ) --------------------------------------------------*/ - -DEVICE_GET_INFO( vt100_video ) -{ - switch (state) - { - /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(vt_video_t); break; - - /* --- the following bits of info are returned as pointers to data or functions --- */ - case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(vt_video); break; - case DEVINFO_FCT_STOP: /* Nothing */ break; - case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(vt_video); break; - - /* --- the following bits of info are returned as NULL-terminated strings --- */ - case DEVINFO_STR_NAME: strcpy(info->s, "VT100 Video"); break; - case DEVINFO_STR_FAMILY: strcpy(info->s, "VTxxx Video"); 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 MESS Team"); break; - } -} - const device_type VT100_VIDEO = &device_creator<vt100_video_device>; vt100_video_device::vt100_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) |