diff --git a/src/emu/devcpu.c b/src/emu/devcpu.c index 7e7fe565d80..eeac1013751 100644 --- a/src/emu/devcpu.c +++ b/src/emu/devcpu.c @@ -49,8 +49,8 @@ // cpu_device_config - constructor //------------------------------------------------- -cpu_device_config::cpu_device_config(const machine_config &mconfig, device_type _type, const char *_tag, const device_config *_owner, UINT32 _clock) - : device_config(mconfig, _type, _tag, _owner, _clock), +cpu_device_config::cpu_device_config(const machine_config &mconfig, device_type type, const char *name, const char *tag, const device_config *owner, UINT32 clock) + : device_config(mconfig, type, name, tag, owner, clock), device_config_execute_interface(mconfig, *this), device_config_memory_interface(mconfig, *this), device_config_state_interface(mconfig, *this), @@ -63,8 +63,8 @@ cpu_device_config::cpu_device_config(const machine_config &mconfig, device_type // legacy_cpu_device_config - constructor //------------------------------------------------- -legacy_cpu_device_config::legacy_cpu_device_config(const machine_config &mconfig, device_type _type, const char *_tag, const device_config *_owner, UINT32 _clock) - : cpu_device_config(mconfig, _type, _tag, _owner, _clock), +legacy_cpu_device_config::legacy_cpu_device_config(const machine_config &mconfig, device_type type, const char *tag, const device_config *owner, UINT32 clock) + : cpu_device_config(mconfig, type, "CPU", tag, owner, clock), m_cputype(NULL) { memset(m_space_config, 0, sizeof(m_space_config)); @@ -119,6 +119,7 @@ bool legacy_cpu_device_config::device_process_token(UINT32 entrytype, const mach m_space_config[spacenum].m_internal_map = reinterpret_cast(get_legacy_config_ptr(DEVINFO_PTR_INTERNAL_MEMORY_MAP + spacenum)); m_space_config[spacenum].m_default_map = reinterpret_cast(get_legacy_config_ptr(DEVINFO_PTR_DEFAULT_MEMORY_MAP + spacenum)); } + m_name = get_legacy_config_string(DEVINFO_STR_NAME); return true; } diff --git a/src/emu/devcpu.h b/src/emu/devcpu.h index c5a4f8e46ef..490d8c3f800 100644 --- a/src/emu/devcpu.h +++ b/src/emu/devcpu.h @@ -413,7 +413,7 @@ class cpu_device_config : public device_config, protected: // construction/destruction - cpu_device_config(const machine_config &mconfig, device_type _type, const char *_tag, const device_config *_owner, UINT32 _clock); + cpu_device_config(const machine_config &mconfig, device_type type, const char *name, const char *tag, const device_config *owner, UINT32 clock); }; @@ -433,7 +433,6 @@ public: virtual device_t *alloc_device(running_machine &machine) const; // basic information getters - virtual const char *name() const { return get_legacy_config_string(DEVINFO_STR_NAME); } virtual const rom_entry *rom_region() const { return reinterpret_cast(get_legacy_config_ptr(DEVINFO_PTR_ROM_REGION)); } virtual const machine_config_token *machine_config_tokens() const { return reinterpret_cast(get_legacy_config_ptr(DEVINFO_PTR_MACHINE_CONFIG)); } diff --git a/src/emu/devintrf.c b/src/emu/devintrf.c index 91b4fccaaa0..ccf11dc242d 100644 --- a/src/emu/devintrf.c +++ b/src/emu/devintrf.c @@ -301,7 +301,7 @@ bool device_config_interface::interface_validity_check(const game_driver &driver // device configuration //------------------------------------------------- -device_config::device_config(const machine_config &mconfig, device_type type, const char *_tag, const device_config *owner, UINT32 clock) +device_config::device_config(const machine_config &mconfig, device_type type, const char *name, const char *tag, const device_config *owner, UINT32 clock) : m_next(NULL), m_owner(const_cast(owner)), m_interface_list(NULL), @@ -309,7 +309,8 @@ device_config::device_config(const machine_config &mconfig, device_type type, co m_clock(clock), m_machine_config(mconfig), m_static_config(NULL), - m_tag(_tag) + m_name(name), + m_tag(tag) { memset(m_inline_data, 0, sizeof(m_inline_data)); diff --git a/src/emu/devintrf.h b/src/emu/devintrf.h index 52d51c4ef95..f54a0550332 100644 --- a/src/emu/devintrf.h +++ b/src/emu/devintrf.h @@ -230,7 +230,7 @@ class device_config protected: // construction/destruction - device_config(const machine_config &mconfig, device_type type, const char *tag, const device_config *owner, UINT32 clock); + device_config(const machine_config &mconfig, device_type type, const char *name, const char *tag, const device_config *owner, UINT32 clock); virtual ~device_config(); public: @@ -256,6 +256,7 @@ public: // basic information getters device_type type() const { return m_type; } UINT32 clock() const { return m_clock; } + const char *name() const { return m_name; } const char *tag() const { return m_tag; } const void *static_config() const { return m_static_config; } @@ -275,10 +276,7 @@ protected: virtual void device_config_complete(); virtual bool device_validity_check(const game_driver &driver) const; - // required information overrides public: - virtual const char *name() const = 0; - // optional information overrides virtual const rom_entry *rom_region() const; virtual const machine_config_token *machine_config_tokens() const; @@ -298,6 +296,8 @@ protected: const void * m_static_config; // static device configuration UINT64 m_inline_data[16]; // array of inline configuration values + astring m_name; // name of the device + private: astring m_tag; // tag for this instance }; diff --git a/src/emu/devlegcy.c b/src/emu/devlegcy.c index 676c94f2024..14dcf130aec 100644 --- a/src/emu/devlegcy.c +++ b/src/emu/devlegcy.c @@ -50,7 +50,7 @@ //------------------------------------------------- legacy_device_config_base::legacy_device_config_base(const machine_config &mconfig, device_type type, const char *tag, const device_config *owner, UINT32 clock, device_get_config_func get_config) - : device_config(mconfig, type, tag, owner, clock), + : device_config(mconfig, type, "Legacy Device", tag, owner, clock), m_get_config_func(get_config), m_inline_config(NULL) { @@ -58,6 +58,9 @@ legacy_device_config_base::legacy_device_config_base(const machine_config &mconf UINT32 configlen = (UINT32)get_legacy_config_int(DEVINFO_INT_INLINE_CONFIG_BYTES); if (configlen != 0) m_inline_config = global_alloc_array_clear(UINT8, configlen); + + // set the proper name + m_name = get_legacy_config_string(DEVINFO_STR_NAME); } diff --git a/src/emu/devlegcy.h b/src/emu/devlegcy.h index fb226b8f36a..ad68f598976 100644 --- a/src/emu/devlegcy.h +++ b/src/emu/devlegcy.h @@ -430,7 +430,6 @@ protected: // basic information getters public: - virtual const char *name() const { return get_legacy_config_string(DEVINFO_STR_NAME); } virtual const rom_entry *rom_region() const { return reinterpret_cast(get_legacy_config_ptr(DEVINFO_PTR_ROM_REGION)); } virtual const machine_config_token *machine_config_tokens() const { return reinterpret_cast(get_legacy_config_ptr(DEVINFO_PTR_MACHINE_CONFIG)); } @@ -577,7 +576,6 @@ class legacy_image_device_config_base : public legacy_device_config_base, public device_config_image_interface { public: - virtual const char *name() const { return get_legacy_config_string(DEVINFO_STR_NAME); } virtual iodevice_t image_type() const { return m_type; } virtual const char *image_type_name() const { return device_typename(m_type); } virtual iodevice_t image_type_direct() const { return static_cast(get_legacy_config_int(DEVINFO_INT_IMAGE_TYPE)); } diff --git a/src/emu/diimage.h b/src/emu/diimage.h index 0e1091574e0..27b35286c19 100644 --- a/src/emu/diimage.h +++ b/src/emu/diimage.h @@ -149,7 +149,6 @@ public: virtual ~device_config_image_interface(); // public accessors... for now - virtual const char *name() const = 0; virtual iodevice_t image_type() const = 0; virtual const char *image_type_name() const = 0; virtual iodevice_t image_type_direct() const = 0; diff --git a/src/emu/image.c b/src/emu/image.c index a4ed282eee5..96bf64219f9 100644 --- a/src/emu/image.c +++ b/src/emu/image.c @@ -234,7 +234,7 @@ void image_device_init(running_machine *machine) image_unload_all(machine); fatalerror_exitcode(machine, MAMERR_DEVICE, "Device %s load (%s) failed: %s", - image->image_config().name(), + image->image_config().devconfig().name(), image_basename_str, image_err); } @@ -274,7 +274,7 @@ void image_postdevice_init(running_machine *machine) image_unload_all(machine); fatalerror_exitcode(machine, MAMERR_DEVICE, "Device %s load (%s) failed: %s", - image->image_config().name(), + image->image_config().devconfig().name(), image_basename_str, image_err); } @@ -405,7 +405,7 @@ astring *image_info_astring(running_machine *machine, astring *string) base_filename_noextension = strip_extension(base_filename); /* display device type and filename */ - astring_catprintf(string, "%s: %s\n", image->image_config().name(), base_filename); + astring_catprintf(string, "%s: %s\n", image->image_config().devconfig().name(), base_filename); /* display long filename, if present and doesn't correspond to name */ info = image->longname(); @@ -433,7 +433,7 @@ astring *image_info_astring(running_machine *machine, astring *string) } else { - astring_catprintf(string, "%s: ---\n", image->image_config().name()); + astring_catprintf(string, "%s: ---\n", image->image_config().devconfig().name()); } } return string; diff --git a/src/emu/machine/eeprom.c b/src/emu/machine/eeprom.c index 8c763fd0db6..bd4735bb15f 100644 --- a/src/emu/machine/eeprom.c +++ b/src/emu/machine/eeprom.c @@ -75,7 +75,7 @@ ADDRESS_MAP_END //------------------------------------------------- eeprom_device_config::eeprom_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock) - : device_config(mconfig, static_alloc_device_config, tag, owner, clock), + : device_config(mconfig, static_alloc_device_config, "EEPROM", tag, owner, clock), device_config_memory_interface(mconfig, *this), device_config_nvram_interface(mconfig, *this), m_default_data(NULL), diff --git a/src/emu/machine/eeprom.h b/src/emu/machine/eeprom.h index 319b0ea943c..f5f18eaa561 100644 --- a/src/emu/machine/eeprom.h +++ b/src/emu/machine/eeprom.h @@ -76,9 +76,6 @@ public: static device_config *static_alloc_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock); virtual device_t *alloc_device(running_machine &machine) const; - // basic information getters - virtual const char *name() const { return "EEPROM"; } - // inline configuration indexes enum { diff --git a/src/emu/machine/z80ctc.c b/src/emu/machine/z80ctc.c index d3af85e92e8..800489d9f65 100644 --- a/src/emu/machine/z80ctc.c +++ b/src/emu/machine/z80ctc.c @@ -77,7 +77,7 @@ const int WAITING_FOR_TRIG = 0x100; //------------------------------------------------- z80ctc_device_config::z80ctc_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock) - : device_config(mconfig, static_alloc_device_config, tag, owner, clock), + : device_config(mconfig, static_alloc_device_config, "Zilog Z80 CTC", tag, owner, clock), device_config_z80daisy_interface(mconfig, *this) { } diff --git a/src/emu/machine/z80ctc.h b/src/emu/machine/z80ctc.h index d11d518859d..4960ac4ca0c 100644 --- a/src/emu/machine/z80ctc.h +++ b/src/emu/machine/z80ctc.h @@ -72,9 +72,6 @@ public: static device_config *static_alloc_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock); virtual device_t *alloc_device(running_machine &machine) const; - // basic information getters - virtual const char *name() const { return "Zilog Z80 CTC"; } - protected: // device_config overrides virtual void device_config_complete(); diff --git a/src/emu/machine/z80dart.c b/src/emu/machine/z80dart.c index 57be03af0bf..d855824f566 100644 --- a/src/emu/machine/z80dart.c +++ b/src/emu/machine/z80dart.c @@ -150,7 +150,7 @@ const int Z80DART_WR5_DTR = 0x80; //------------------------------------------------- z80dart_device_config::z80dart_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock) - : device_config(mconfig, static_alloc_device_config, tag, owner, clock), + : device_config(mconfig, static_alloc_device_config, "Zilog Z80 DART", tag, owner, clock), device_config_z80daisy_interface(mconfig, *this) { } diff --git a/src/emu/machine/z80dart.h b/src/emu/machine/z80dart.h index ac67c0a12dd..3742bd2c96f 100644 --- a/src/emu/machine/z80dart.h +++ b/src/emu/machine/z80dart.h @@ -111,9 +111,6 @@ public: static device_config *static_alloc_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock); virtual device_t *alloc_device(running_machine &machine) const; - // basic information getters - virtual const char *name() const { return "Zilog Z80 DART"; } - protected: // device_config overrides virtual void device_config_complete(); diff --git a/src/emu/machine/z80dma.c b/src/emu/machine/z80dma.c index 7d42a9ca565..3727e413e90 100644 --- a/src/emu/machine/z80dma.c +++ b/src/emu/machine/z80dma.c @@ -142,7 +142,7 @@ const int TM_SEARCH_TRANSFER = 0x03; //------------------------------------------------- z80dma_device_config::z80dma_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock) - : device_config(mconfig, static_alloc_device_config, tag, owner, clock), + : device_config(mconfig, static_alloc_device_config, "Z8410", tag, owner, clock), device_config_z80daisy_interface(mconfig, *this) { } diff --git a/src/emu/machine/z80dma.h b/src/emu/machine/z80dma.h index b44516ad9d2..f5f54e41622 100644 --- a/src/emu/machine/z80dma.h +++ b/src/emu/machine/z80dma.h @@ -89,9 +89,6 @@ public: static device_config *static_alloc_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock); virtual device_t *alloc_device(running_machine &machine) const; - // basic information getters - virtual const char *name() const { return "Z8410"; } - protected: // device_config overrides virtual void device_config_complete(); diff --git a/src/emu/machine/z80pio.c b/src/emu/machine/z80pio.c index 5c3a23c96f8..29b85e49bb9 100644 --- a/src/emu/machine/z80pio.c +++ b/src/emu/machine/z80pio.c @@ -54,7 +54,7 @@ const int ICW_MASK_FOLLOWS = 0x10; //------------------------------------------------- z80pio_device_config::z80pio_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock) - : device_config(mconfig, static_alloc_device_config, tag, owner, clock), + : device_config(mconfig, static_alloc_device_config, "Z8420", tag, owner, clock), device_config_z80daisy_interface(mconfig, *this) { } diff --git a/src/emu/machine/z80pio.h b/src/emu/machine/z80pio.h index 83e7225e081..44bef52f3bf 100644 --- a/src/emu/machine/z80pio.h +++ b/src/emu/machine/z80pio.h @@ -87,9 +87,6 @@ public: static device_config *static_alloc_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock); virtual device_t *alloc_device(running_machine &machine) const; - // basic information getters - virtual const char *name() const { return "Z8420"; } - protected: // device_config overrides virtual void device_config_complete(); diff --git a/src/emu/machine/z80sio.c b/src/emu/machine/z80sio.c index b6935265e17..2e2aae7c826 100644 --- a/src/emu/machine/z80sio.c +++ b/src/emu/machine/z80sio.c @@ -295,7 +295,7 @@ inline attotime z80sio_device::sio_channel::compute_time_per_character() //------------------------------------------------- z80sio_device_config::z80sio_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock) - : device_config(mconfig, static_alloc_device_config, tag, owner, clock), + : device_config(mconfig, static_alloc_device_config, "Zilog Z80 SIO", tag, owner, clock), device_config_z80daisy_interface(mconfig, *this) { } diff --git a/src/emu/machine/z80sio.h b/src/emu/machine/z80sio.h index 811e6b30c00..a59d53ebaef 100644 --- a/src/emu/machine/z80sio.h +++ b/src/emu/machine/z80sio.h @@ -58,9 +58,6 @@ public: static device_config *static_alloc_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock); virtual device_t *alloc_device(running_machine &machine) const; - // basic information getters - virtual const char *name() const { return "Zilog Z80 SIO"; } - protected: // device_config overrides virtual void device_config_complete(); diff --git a/src/emu/machine/z80sti.c b/src/emu/machine/z80sti.c index 944e75e878a..faf1539cc16 100644 --- a/src/emu/machine/z80sti.c +++ b/src/emu/machine/z80sti.c @@ -144,7 +144,7 @@ static const int PRESCALER[] = { 0, 4, 10, 16, 50, 64, 100, 200 }; //------------------------------------------------- z80sti_device_config::z80sti_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock) - : device_config(mconfig, static_alloc_device_config, tag, owner, clock), + : device_config(mconfig, static_alloc_device_config, "Mostek MK3801", tag, owner, clock), device_config_z80daisy_interface(mconfig, *this) { } diff --git a/src/emu/machine/z80sti.h b/src/emu/machine/z80sti.h index 586fc2e13d7..f15104e947d 100644 --- a/src/emu/machine/z80sti.h +++ b/src/emu/machine/z80sti.h @@ -106,9 +106,6 @@ public: static device_config *static_alloc_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock); virtual device_t *alloc_device(running_machine &machine) const; - // basic information getters - virtual const char *name() const { return "Mostek MK3801"; } - protected: // device_config overrides virtual void device_config_complete(); diff --git a/src/emu/sound.c b/src/emu/sound.c index 9d05edf12a6..ac91ff0b813 100644 --- a/src/emu/sound.c +++ b/src/emu/sound.c @@ -461,7 +461,7 @@ static TIMER_CALLBACK( sound_update ) //------------------------------------------------- speaker_device_config::speaker_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock) - : device_config(mconfig, static_alloc_device_config, tag, owner, clock), + : device_config(mconfig, static_alloc_device_config, "Speaker", tag, owner, clock), m_x(0.0), m_y(0.0), m_z(0.0) diff --git a/src/emu/sound.h b/src/emu/sound.h index 136cdce1bee..feef7cf5041 100644 --- a/src/emu/sound.h +++ b/src/emu/sound.h @@ -49,9 +49,6 @@ public: static device_config *static_alloc_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock); virtual device_t *alloc_device(running_machine &machine) const; - // basic information getters - virtual const char *name() const { return "Speaker"; } - // indexes to inline data enum { diff --git a/src/emu/sound/okim6295.c b/src/emu/sound/okim6295.c index aec9a688f69..a42534e395d 100644 --- a/src/emu/sound/okim6295.c +++ b/src/emu/sound/okim6295.c @@ -88,7 +88,7 @@ ADDRESS_MAP_END //------------------------------------------------- okim6295_device_config::okim6295_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock) - : device_config(mconfig, static_alloc_device_config, tag, owner, clock), + : device_config(mconfig, static_alloc_device_config, "OKI6295", tag, owner, clock), device_config_sound_interface(mconfig, *this), device_config_memory_interface(mconfig, *this), m_space_config("samples", ENDIANNESS_LITTLE, 8, 18, 0, NULL, *ADDRESS_MAP_NAME(okim6295)) diff --git a/src/emu/sound/okim6295.h b/src/emu/sound/okim6295.h index 86611ecee42..4784355f75b 100644 --- a/src/emu/sound/okim6295.h +++ b/src/emu/sound/okim6295.h @@ -89,9 +89,6 @@ public: static device_config *static_alloc_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock); virtual device_t *alloc_device(running_machine &machine) const; - // basic information getters - virtual const char *name() const { return "OKI6295"; } - // inline configuration indexes enum { diff --git a/src/emu/timer.c b/src/emu/timer.c index f10259d46cf..09b07d1b958 100644 --- a/src/emu/timer.c +++ b/src/emu/timer.c @@ -939,7 +939,7 @@ void timer_print_first_timer(running_machine *machine) //------------------------------------------------- timer_device_config::timer_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock) - : device_config(mconfig, static_alloc_device_config, tag, owner, clock), + : device_config(mconfig, static_alloc_device_config, "Timer", tag, owner, clock), m_type(TIMER_TYPE_GENERIC), m_callback(NULL), m_ptr(NULL), diff --git a/src/emu/timer.h b/src/emu/timer.h index 4c4bc9a442a..10b915a5a3c 100644 --- a/src/emu/timer.h +++ b/src/emu/timer.h @@ -233,9 +233,6 @@ public: static device_config *static_alloc_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock); virtual device_t *alloc_device(running_machine &machine) const; - // basic information getters - virtual const char *name() const { return "Timer"; } - // indexes to inline data enum { diff --git a/src/emu/uiimage.c b/src/emu/uiimage.c index 7da2214cddf..06f2752c5a7 100644 --- a/src/emu/uiimage.c +++ b/src/emu/uiimage.c @@ -898,7 +898,7 @@ static void menu_file_manager_populate(running_machine *machine, ui_menu *menu, /* get the image type/id */ snprintf(buffer, ARRAY_LENGTH(buffer), "%s", - image->image_config().name()); + image->image_config().devconfig().name()); /* get the base name */ entry_basename = image->basename(); diff --git a/src/emu/video.c b/src/emu/video.c index 2bf11d9a89f..8dc476015be 100644 --- a/src/emu/video.c +++ b/src/emu/video.c @@ -1688,7 +1688,7 @@ const attotime screen_device::k_default_frame_period = STATIC_ATTOTIME_IN_HZ(k_d //------------------------------------------------- screen_device_config::screen_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock) - : device_config(mconfig, static_alloc_device_config, tag, owner, clock), + : device_config(mconfig, static_alloc_device_config, "Video Screen", tag, owner, clock), m_type(SCREEN_TYPE_RASTER), m_width(0), m_height(0), diff --git a/src/emu/video.h b/src/emu/video.h index 615fc9ef889..6ef4d8e9242 100644 --- a/src/emu/video.h +++ b/src/emu/video.h @@ -94,9 +94,6 @@ public: static device_config *static_alloc_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock); virtual device_t *alloc_device(running_machine &machine) const; - // basic information getters - virtual const char *name() const { return "Video Screen"; } - // configuration readers screen_type_enum screen_type() const { return m_type; } int width() const { return m_width; } diff --git a/src/mame/drivers/littlerb.c b/src/mame/drivers/littlerb.c index 29655f78c77..c8a5140b699 100644 --- a/src/mame/drivers/littlerb.c +++ b/src/mame/drivers/littlerb.c @@ -172,7 +172,6 @@ public: return auto_alloc(&machine, littlerb_vdp_device(machine, *this)); } - virtual const char *name() const { return "LITTLERBVDP"; } protected: virtual const address_space_config *memory_space_config(int spacenum = 0) const { @@ -190,7 +189,7 @@ littlerb_vdp_device::littlerb_vdp_device(running_machine &_machine, const little } littlerb_vdp_device_config::littlerb_vdp_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock) - : device_config(mconfig, static_alloc_device_config, tag, owner, clock), + : device_config(mconfig, static_alloc_device_config, "LITTLERBVDP", tag, owner, clock), device_config_memory_interface(mconfig, *this), m_space_config("littlerb_vdp", ENDIANNESS_LITTLE, 16,32, 0, NULL, *ADDRESS_MAP_NAME(littlerb_vdp_map8)) { diff --git a/src/mame/drivers/pinkiri8.c b/src/mame/drivers/pinkiri8.c index c9a3a198260..1b77eabece9 100644 --- a/src/mame/drivers/pinkiri8.c +++ b/src/mame/drivers/pinkiri8.c @@ -72,7 +72,6 @@ class janshi_vdp_device_config : public device_config, public: static device_config *static_alloc_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock); virtual device_t *alloc_device(running_machine &machine) const; - virtual const char *name() const { return "JANSHIVDP"; } protected: virtual void device_config_complete(); virtual bool device_validity_check(const game_driver &driver) const; @@ -95,7 +94,7 @@ protected: const device_type JANSHIVDP = janshi_vdp_device_config::static_alloc_device_config; janshi_vdp_device_config::janshi_vdp_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock) - : device_config(mconfig, static_alloc_device_config, tag, owner, clock), + : device_config(mconfig, static_alloc_device_config, "JANSHIVDP", tag, owner, clock), device_config_memory_interface(mconfig, *this), m_space_config("janshi_vdp", ENDIANNESS_LITTLE, 8,24, 0, NULL, *ADDRESS_MAP_NAME(janshi_vdp_map8)) { diff --git a/src/osd/windows/debugwin.c b/src/osd/windows/debugwin.c index f8bbf53f394..8b9007b2579 100644 --- a/src/osd/windows/debugwin.c +++ b/src/osd/windows/debugwin.c @@ -1778,7 +1778,7 @@ static void memory_create_window(running_machine *machine) for (const debug_view_source *source = info->view[0].view->source_list().head(); source != NULL; source = source->next()) { TCHAR *t_name = tstring_from_utf8(source->name()); - int item = SendMessage(info->otherwnd[0], CB_ADDSTRING, 0, (LPARAM)t_name); + SendMessage(info->otherwnd[0], CB_ADDSTRING, 0, (LPARAM)t_name); osd_free(t_name); } const debug_view_source *source = info->view[0].view->source_list().match_device(curcpu); @@ -2085,7 +2085,7 @@ static void disasm_create_window(running_machine *machine) for (const debug_view_source *source = info->view[0].view->source_list().head(); source != NULL; source = source->next()) { TCHAR *t_name = tstring_from_utf8(source->name()); - int item = SendMessage(info->otherwnd[0], CB_ADDSTRING, 0, (LPARAM)t_name); + SendMessage(info->otherwnd[0], CB_ADDSTRING, 0, (LPARAM)t_name); osd_free(t_name); } const debug_view_source *source = info->view[0].view->source_list().match_device(curcpu);