diff options
Diffstat (limited to 'src/devices/bus')
1522 files changed, 4214 insertions, 4235 deletions
diff --git a/src/devices/bus/a1bus/a1bus.cpp b/src/devices/bus/a1bus/a1bus.cpp index c3ebc73c6de..b0ea52156ca 100644 --- a/src/devices/bus/a1bus/a1bus.cpp +++ b/src/devices/bus/a1bus/a1bus.cpp @@ -24,21 +24,19 @@ const device_type A1BUS_SLOT = &device_creator<a1bus_slot_device>; //------------------------------------------------- // a1bus_slot_device - constructor //------------------------------------------------- -a1bus_slot_device::a1bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a1bus_slot_device::a1bus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A1BUS_SLOT, "Apple I Slot", tag, owner, clock, "a1bus_slot", __FILE__), - device_slot_interface(mconfig, *this), - m_a1bus_tag(nullptr), - m_a1bus_slottag(nullptr) + device_slot_interface(mconfig, *this) { } -a1bus_slot_device::a1bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a1bus_slot_device::a1bus_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_interface(mconfig, *this), m_a1bus_tag(nullptr), m_a1bus_slottag(nullptr) + device_slot_interface(mconfig, *this) { } -void a1bus_slot_device::static_set_a1bus_slot(device_t &device, const char *tag, const char *slottag) +void a1bus_slot_device::static_set_a1bus_slot(device_t &device, std::string tag, std::string slottag) { a1bus_slot_device &a1bus_card = dynamic_cast<a1bus_slot_device &>(device); a1bus_card.m_a1bus_tag = tag; @@ -62,7 +60,7 @@ void a1bus_slot_device::device_start() const device_type A1BUS = &device_creator<a1bus_device>; -void a1bus_device::static_set_cputag(device_t &device, const char *tag) +void a1bus_device::static_set_cputag(device_t &device, std::string tag) { a1bus_device &a1bus = downcast<a1bus_device &>(device); a1bus.m_cputag = tag; @@ -76,17 +74,17 @@ void a1bus_device::static_set_cputag(device_t &device, const char *tag) // a1bus_device - constructor //------------------------------------------------- -a1bus_device::a1bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a1bus_device::a1bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A1BUS, "Apple I Bus", tag, owner, clock, "a1bus", __FILE__), m_maincpu(nullptr), m_out_irq_cb(*this), - m_out_nmi_cb(*this), m_device(nullptr), m_cputag(nullptr) + m_out_nmi_cb(*this), m_device(nullptr) { } -a1bus_device::a1bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a1bus_device::a1bus_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr), m_out_irq_cb(*this), - m_out_nmi_cb(*this), m_device(nullptr), m_cputag(nullptr) + m_out_nmi_cb(*this), m_device(nullptr) { } //------------------------------------------------- @@ -140,7 +138,7 @@ void a1bus_device::install_device(offs_t start, offs_t end, read8_delegate rhand m_maincpu->space(AS_PROGRAM).install_readwrite_handler(start, end, rhandler, whandler); } -void a1bus_device::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data) +void a1bus_device::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, std::string tag, UINT8 *data) { // printf("install_bank: %s @ %x->%x mask %x mirror %x\n", tag, start, end, mask, mirror); m_maincpu = machine().device<cpu_device>(m_cputag); @@ -169,7 +167,7 @@ WRITE_LINE_MEMBER( a1bus_device::nmi_w ) { m_out_nmi_cb(state); } device_a1bus_card_interface::device_a1bus_card_interface(const machine_config &mconfig, device_t &device) : device_slot_card_interface(mconfig, device), m_a1bus(nullptr), - m_a1bus_tag(nullptr), m_a1bus_slottag(nullptr), m_next(nullptr) + m_next(nullptr) { } @@ -182,7 +180,7 @@ device_a1bus_card_interface::~device_a1bus_card_interface() { } -void device_a1bus_card_interface::static_set_a1bus_tag(device_t &device, const char *tag, const char *slottag) +void device_a1bus_card_interface::static_set_a1bus_tag(device_t &device, std::string tag, std::string slottag) { device_a1bus_card_interface &a1bus_card = dynamic_cast<device_a1bus_card_interface &>(device); a1bus_card.m_a1bus_tag = tag; diff --git a/src/devices/bus/a1bus/a1bus.h b/src/devices/bus/a1bus/a1bus.h index e9726073ddb..70b9532167b 100644 --- a/src/devices/bus/a1bus/a1bus.h +++ b/src/devices/bus/a1bus/a1bus.h @@ -49,17 +49,18 @@ class a1bus_slot_device : public device_t, { public: // construction/destruction - a1bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - a1bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a1bus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a1bus_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides virtual void device_start() override; // inline configuration - static void static_set_a1bus_slot(device_t &device, const char *tag, const char *slottag); + static void static_set_a1bus_slot(device_t &device, std::string tag, std::string slottag); protected: // configuration - const char *m_a1bus_tag, *m_a1bus_slottag; + std::string m_a1bus_tag; + std::string m_a1bus_slottag; }; // device type definition @@ -72,11 +73,11 @@ class a1bus_device : public device_t { public: // construction/destruction - a1bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - a1bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a1bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a1bus_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // inline configuration - static void static_set_cputag(device_t &device, const char *tag); + static void static_set_cputag(device_t &device, std::string tag); template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<a1bus_device &>(device).m_out_irq_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<a1bus_device &>(device).m_out_nmi_cb.set_callback(object); } @@ -87,7 +88,7 @@ public: void set_nmi_line(int state); void install_device(offs_t start, offs_t end, read8_delegate rhandler, write8_delegate whandler); - void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data); + void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, std::string tag, UINT8 *data); DECLARE_WRITE_LINE_MEMBER( irq_w ); DECLARE_WRITE_LINE_MEMBER( nmi_w ); @@ -104,7 +105,7 @@ protected: devcb_write_line m_out_nmi_cb; device_a1bus_card_interface *m_device; - const char *m_cputag; + std::string m_cputag; }; @@ -135,10 +136,11 @@ public: void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, char *tag, UINT8 *data); // inline configuration - static void static_set_a1bus_tag(device_t &device, const char *tag, const char *slottag); + static void static_set_a1bus_tag(device_t &device, std::string tag, std::string slottag); public: a1bus_device *m_a1bus; - const char *m_a1bus_tag, *m_a1bus_slottag; + std::string m_a1bus_tag; + std::string m_a1bus_slottag; device_a1bus_card_interface *m_next; }; diff --git a/src/devices/bus/a1bus/a1cassette.cpp b/src/devices/bus/a1bus/a1cassette.cpp index 7168133647c..090aa58bfcd 100644 --- a/src/devices/bus/a1bus/a1cassette.cpp +++ b/src/devices/bus/a1bus/a1cassette.cpp @@ -56,14 +56,14 @@ const rom_entry *a1bus_cassette_device::device_rom_region() const // LIVE DEVICE //************************************************************************** -a1bus_cassette_device::a1bus_cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a1bus_cassette_device::a1bus_cassette_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A1BUS_CASSETTE, "Apple I cassette board", tag, owner, clock, "a1cass", __FILE__), device_a1bus_card_interface(mconfig, *this), m_cassette(*this, "cassette"), m_rom(nullptr), m_cassette_output_flipflop(0) { } -a1bus_cassette_device::a1bus_cassette_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a1bus_cassette_device::a1bus_cassette_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a1bus_card_interface(mconfig, *this), m_cassette(*this, "cassette"), m_rom(nullptr), m_cassette_output_flipflop(0) diff --git a/src/devices/bus/a1bus/a1cassette.h b/src/devices/bus/a1bus/a1cassette.h index 482704b31cf..c63353979dd 100644 --- a/src/devices/bus/a1bus/a1cassette.h +++ b/src/devices/bus/a1bus/a1cassette.h @@ -24,8 +24,8 @@ class a1bus_cassette_device: { public: // construction/destruction - a1bus_cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - a1bus_cassette_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a1bus_cassette_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a1bus_cassette_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a1bus/a1cffa.cpp b/src/devices/bus/a1bus/a1cffa.cpp index 912401a0642..e9a29649c97 100644 --- a/src/devices/bus/a1bus/a1cffa.cpp +++ b/src/devices/bus/a1bus/a1cffa.cpp @@ -51,14 +51,14 @@ const rom_entry *a1bus_cffa_device::device_rom_region() const // LIVE DEVICE //************************************************************************** -a1bus_cffa_device::a1bus_cffa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a1bus_cffa_device::a1bus_cffa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A1BUS_CFFA, "CFFA Compact Flash for Apple I", tag, owner, clock, "cffa1", __FILE__), device_a1bus_card_interface(mconfig, *this), m_ata(*this, CFFA_ATA_TAG), m_rom(nullptr), m_lastdata(0), m_writeprotect(false) { } -a1bus_cffa_device::a1bus_cffa_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a1bus_cffa_device::a1bus_cffa_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a1bus_card_interface(mconfig, *this), m_ata(*this, CFFA_ATA_TAG), m_rom(nullptr), m_lastdata(0), m_writeprotect(false) diff --git a/src/devices/bus/a1bus/a1cffa.h b/src/devices/bus/a1bus/a1cffa.h index d395468891b..738d1bcbcc2 100644 --- a/src/devices/bus/a1bus/a1cffa.h +++ b/src/devices/bus/a1bus/a1cffa.h @@ -25,8 +25,8 @@ class a1bus_cffa_device: { public: // construction/destruction - a1bus_cffa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - a1bus_cffa_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a1bus_cffa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a1bus_cffa_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a2bus/a2alfam2.cpp b/src/devices/bus/a2bus/a2alfam2.cpp index 3e701a636fd..7c6b0cb40af 100644 --- a/src/devices/bus/a2bus/a2alfam2.cpp +++ b/src/devices/bus/a2bus/a2alfam2.cpp @@ -82,7 +82,7 @@ machine_config_constructor a2bus_aesms_device::device_mconfig_additions() const // LIVE DEVICE //************************************************************************** -a2bus_sn76489_device::a2bus_sn76489_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_sn76489_device::a2bus_sn76489_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_sn1(*this, SN1_TAG), @@ -92,13 +92,13 @@ a2bus_sn76489_device::a2bus_sn76489_device(const machine_config &mconfig, device { } -a2bus_alfam2_device::a2bus_alfam2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_alfam2_device::a2bus_alfam2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a2bus_sn76489_device(mconfig, A2BUS_ALFAM2, "ALF MC1 / Apple Music II", tag, owner, clock, "a2alfam2", __FILE__) { m_has4thsn = false; } -a2bus_aesms_device::a2bus_aesms_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_aesms_device::a2bus_aesms_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a2bus_sn76489_device(mconfig, A2BUS_ALFAM2, "Applied Engineering Super Music Synthesizer", tag, owner, clock, "a2aesms", __FILE__) { m_has4thsn = true; diff --git a/src/devices/bus/a2bus/a2alfam2.h b/src/devices/bus/a2bus/a2alfam2.h index b02792afe9a..fad3d592470 100644 --- a/src/devices/bus/a2bus/a2alfam2.h +++ b/src/devices/bus/a2bus/a2alfam2.h @@ -25,7 +25,7 @@ class a2bus_sn76489_device: { public: // construction/destruction - a2bus_sn76489_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_sn76489_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -54,13 +54,13 @@ protected: class a2bus_alfam2_device : public a2bus_sn76489_device { public: - a2bus_alfam2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_alfam2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; class a2bus_aesms_device : public a2bus_sn76489_device { public: - a2bus_aesms_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_aesms_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; }; diff --git a/src/devices/bus/a2bus/a2applicard.cpp b/src/devices/bus/a2bus/a2applicard.cpp index cb647b6476b..d62e29e8a6b 100644 --- a/src/devices/bus/a2bus/a2applicard.cpp +++ b/src/devices/bus/a2bus/a2applicard.cpp @@ -75,14 +75,14 @@ const rom_entry *a2bus_applicard_device::device_rom_region() const // LIVE DEVICE //************************************************************************** -a2bus_applicard_device::a2bus_applicard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_applicard_device::a2bus_applicard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_z80(*this, Z80_TAG), m_bROMAtZ80Zero(false), m_z80stat(false), m_6502stat(false), m_toz80(0), m_to6502(0), m_z80rom(nullptr) { } -a2bus_applicard_device::a2bus_applicard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_applicard_device::a2bus_applicard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_APPLICARD, "PCPI Applicard", tag, owner, clock, "a2aplcrd", __FILE__), device_a2bus_card_interface(mconfig, *this), m_z80(*this, Z80_TAG), m_bROMAtZ80Zero(false), m_z80stat(false), m_6502stat(false), m_toz80(0), m_to6502(0), m_z80rom(nullptr) diff --git a/src/devices/bus/a2bus/a2applicard.h b/src/devices/bus/a2bus/a2applicard.h index e1bb4b4d685..53e21d5751a 100644 --- a/src/devices/bus/a2bus/a2applicard.h +++ b/src/devices/bus/a2bus/a2applicard.h @@ -24,8 +24,8 @@ class a2bus_applicard_device: { public: // construction/destruction - a2bus_applicard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - a2bus_applicard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_applicard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_applicard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a2bus/a2arcadebd.cpp b/src/devices/bus/a2bus/a2arcadebd.cpp index dcad400f8b1..2ef20951e61 100644 --- a/src/devices/bus/a2bus/a2arcadebd.cpp +++ b/src/devices/bus/a2bus/a2arcadebd.cpp @@ -57,7 +57,7 @@ machine_config_constructor a2bus_arcboard_device::device_mconfig_additions() con // LIVE DEVICE //************************************************************************** -a2bus_arcboard_device::a2bus_arcboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_arcboard_device::a2bus_arcboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_ARCADEBOARD, "Third Millenium Engineering Arcade Board", tag, owner, clock, "a2arcbd", __FILE__), device_a2bus_card_interface(mconfig, *this), m_tms(*this, TMS_TAG), @@ -65,7 +65,7 @@ a2bus_arcboard_device::a2bus_arcboard_device(const machine_config &mconfig, cons { } -a2bus_arcboard_device::a2bus_arcboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_arcboard_device::a2bus_arcboard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_tms(*this, TMS_TAG), diff --git a/src/devices/bus/a2bus/a2arcadebd.h b/src/devices/bus/a2bus/a2arcadebd.h index 1268244ca9f..e16f7faff0a 100644 --- a/src/devices/bus/a2bus/a2arcadebd.h +++ b/src/devices/bus/a2bus/a2arcadebd.h @@ -26,8 +26,8 @@ class a2bus_arcboard_device: { public: // construction/destruction - a2bus_arcboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - a2bus_arcboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_arcboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a2bus_arcboard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a2bus/a2bus.cpp b/src/devices/bus/a2bus/a2bus.cpp index 5fd03495c87..1ef42988001 100644 --- a/src/devices/bus/a2bus/a2bus.cpp +++ b/src/devices/bus/a2bus/a2bus.cpp @@ -88,19 +88,19 @@ const device_type A2BUS_SLOT = &device_creator<a2bus_slot_device>; //------------------------------------------------- // a2bus_slot_device - constructor //------------------------------------------------- -a2bus_slot_device::a2bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_slot_device::a2bus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_SLOT, "Apple II Slot", tag, owner, clock, "a2bus_slot", __FILE__), - device_slot_interface(mconfig, *this), m_a2bus_tag(nullptr), m_a2bus_slottag(nullptr) + device_slot_interface(mconfig, *this) { } -a2bus_slot_device::a2bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_slot_device::a2bus_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_interface(mconfig, *this), m_a2bus_tag(nullptr), m_a2bus_slottag(nullptr) + device_slot_interface(mconfig, *this) { } -void a2bus_slot_device::static_set_a2bus_slot(device_t &device, const char *tag, const char *slottag) +void a2bus_slot_device::static_set_a2bus_slot(device_t &device, std::string tag, std::string slottag) { a2bus_slot_device &a2bus_card = dynamic_cast<a2bus_slot_device &>(device); a2bus_card.m_a2bus_tag = tag; @@ -124,7 +124,7 @@ void a2bus_slot_device::device_start() const device_type A2BUS = &device_creator<a2bus_device>; -void a2bus_device::static_set_cputag(device_t &device, const char *tag) +void a2bus_device::static_set_cputag(device_t &device, std::string tag) { a2bus_device &a2bus = downcast<a2bus_device &>(device); a2bus.m_cputag = tag; @@ -138,19 +138,19 @@ void a2bus_device::static_set_cputag(device_t &device, const char *tag) // a2bus_device - constructor //------------------------------------------------- -a2bus_device::a2bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_device::a2bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS, "Apple II Bus", tag, owner, clock, "a2bus", __FILE__), m_maincpu(nullptr), m_maincpu_space(nullptr), m_out_irq_cb(*this), m_out_nmi_cb(*this), - m_out_inh_cb(*this), m_cputag(nullptr), m_slot_irq_mask(0), m_slot_nmi_mask(0) + m_out_inh_cb(*this), m_slot_irq_mask(0), m_slot_nmi_mask(0) { } -a2bus_device::a2bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_device::a2bus_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr), m_maincpu_space(nullptr), m_out_irq_cb(*this), m_out_nmi_cb(*this), - m_out_inh_cb(*this), m_cputag(nullptr), m_slot_irq_mask(0), m_slot_nmi_mask(0) + m_out_inh_cb(*this), m_slot_irq_mask(0), m_slot_nmi_mask(0) { } //------------------------------------------------- @@ -297,7 +297,7 @@ WRITE_LINE_MEMBER( a2bus_device::nmi_w ) { m_out_nmi_cb(state); } device_a2bus_card_interface::device_a2bus_card_interface(const machine_config &mconfig, device_t &device) : device_slot_card_interface(mconfig, device), m_a2bus(nullptr), - m_a2bus_tag(nullptr), m_a2bus_slottag(nullptr), m_slot(0), m_next(nullptr) + m_slot(0), m_next(nullptr) { } @@ -310,7 +310,7 @@ device_a2bus_card_interface::~device_a2bus_card_interface() { } -void device_a2bus_card_interface::static_set_a2bus_tag(device_t &device, const char *tag, const char *slottag) +void device_a2bus_card_interface::static_set_a2bus_tag(device_t &device, std::string tag, std::string slottag) { device_a2bus_card_interface &a2bus_card = dynamic_cast<device_a2bus_card_interface &>(device); a2bus_card.m_a2bus_tag = tag; @@ -320,7 +320,7 @@ void device_a2bus_card_interface::static_set_a2bus_tag(device_t &device, const c void device_a2bus_card_interface::set_a2bus_device() { // extract the slot number from the last digit of the slot tag - int tlen = strlen(m_a2bus_slottag); + int tlen = m_a2bus_slottag.length(); m_slot = (m_a2bus_slottag[tlen-1] - '0'); diff --git a/src/devices/bus/a2bus/a2bus.h b/src/devices/bus/a2bus/a2bus.h index 07d4e57781d..7bfa03213c8 100644 --- a/src/devices/bus/a2bus/a2bus.h +++ b/src/devices/bus/a2bus/a2bus.h @@ -63,17 +63,18 @@ class a2bus_slot_device : public device_t, { public: // construction/destruction - a2bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - a2bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a2bus_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides virtual void device_start() override; // inline configuration - static void static_set_a2bus_slot(device_t &device, const char *tag, const char *slottag); + static void static_set_a2bus_slot(device_t &device, std::string tag, std::string slottag); protected: // configuration - const char *m_a2bus_tag, *m_a2bus_slottag; + std::string m_a2bus_tag; + std::string m_a2bus_slottag; }; // device type definition @@ -88,11 +89,11 @@ class a2bus_device : public device_t friend class a2bus_mcms2_device; public: // construction/destruction - a2bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - a2bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a2bus_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // inline configuration - static void static_set_cputag(device_t &device, const char *tag); + static void static_set_cputag(device_t &device, std::string tag); template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<a2bus_device &>(device).m_out_irq_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<a2bus_device &>(device).m_out_nmi_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_inh_callback(device_t &device, _Object object) { return downcast<a2bus_device &>(device).m_out_inh_cb.set_callback(object); } @@ -128,7 +129,7 @@ protected: devcb_write8 m_out_inh_cb; device_a2bus_card_interface *m_device_list[8]; - const char *m_cputag; + std::string m_cputag; UINT8 m_slot_irq_mask; UINT8 m_slot_nmi_mask; @@ -186,10 +187,11 @@ public: void slot_dma_write_no_space(UINT16 offset, UINT8 data) { m_a2bus->dma_nospace_w(offset, data); } // inline configuration - static void static_set_a2bus_tag(device_t &device, const char *tag, const char *slottag); + static void static_set_a2bus_tag(device_t &device, std::string tag, std::string slottag); public: a2bus_device *m_a2bus; - const char *m_a2bus_tag, *m_a2bus_slottag; + std::string m_a2bus_tag; + std::string m_a2bus_slottag; int m_slot; device_a2bus_card_interface *m_next; }; diff --git a/src/devices/bus/a2bus/a2cffa.cpp b/src/devices/bus/a2bus/a2cffa.cpp index aa7f6336ce2..d259e49cbdc 100644 --- a/src/devices/bus/a2bus/a2cffa.cpp +++ b/src/devices/bus/a2bus/a2cffa.cpp @@ -83,20 +83,20 @@ const rom_entry *a2bus_cffa2_6502_device::device_rom_region() const // LIVE DEVICE //************************************************************************** -a2bus_cffa2000_device::a2bus_cffa2000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_cffa2000_device::a2bus_cffa2000_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_ata(*this, CFFA2_ATA_TAG), m_rom(nullptr), m_lastdata(0), m_lastreaddata(0), m_writeprotect(false), m_inwritecycle(false) { } -a2bus_cffa2_device::a2bus_cffa2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_cffa2_device::a2bus_cffa2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a2bus_cffa2000_device(mconfig, A2BUS_CFFA2, "CFFA2000 Compact Flash (65C02 firmware, www.dreher.net)", tag, owner, clock, "a2cffa2", __FILE__), device_nvram_interface(mconfig, *this) { } -a2bus_cffa2_6502_device::a2bus_cffa2_6502_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_cffa2_6502_device::a2bus_cffa2_6502_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a2bus_cffa2000_device(mconfig, A2BUS_CFFA2, "CFFA2000 Compact Flash (6502 firmware, www.dreher.net)", tag, owner, clock, "a2cffa02", __FILE__), device_nvram_interface(mconfig, *this) { diff --git a/src/devices/bus/a2bus/a2cffa.h b/src/devices/bus/a2bus/a2cffa.h index 4215bde504f..9444ee48a9b 100644 --- a/src/devices/bus/a2bus/a2cffa.h +++ b/src/devices/bus/a2bus/a2cffa.h @@ -26,7 +26,7 @@ class a2bus_cffa2000_device: { public: // construction/destruction - a2bus_cffa2000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_cffa2000_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -57,7 +57,7 @@ private: class a2bus_cffa2_device : public a2bus_cffa2000_device, public device_nvram_interface { public: - a2bus_cffa2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_cffa2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device_config_nvram_interface overrides @@ -69,7 +69,7 @@ protected: class a2bus_cffa2_6502_device : public a2bus_cffa2000_device, public device_nvram_interface { public: - a2bus_cffa2_6502_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_cffa2_6502_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual const rom_entry *device_rom_region() const override; protected: diff --git a/src/devices/bus/a2bus/a2corvus.cpp b/src/devices/bus/a2bus/a2corvus.cpp index 6e33d0be8fa..e17edcb4870 100644 --- a/src/devices/bus/a2bus/a2corvus.cpp +++ b/src/devices/bus/a2bus/a2corvus.cpp @@ -101,14 +101,14 @@ const rom_entry *a2bus_corvus_device::device_rom_region() const // LIVE DEVICE //************************************************************************** -a2bus_corvus_device::a2bus_corvus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_corvus_device::a2bus_corvus_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_corvushd(*this, CORVUS_HD_TAG), m_rom(nullptr) { } -a2bus_corvus_device::a2bus_corvus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_corvus_device::a2bus_corvus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_CORVUS, "Corvus Flat Cable interface", tag, owner, clock, "a2corvus", __FILE__), device_a2bus_card_interface(mconfig, *this), m_corvushd(*this, CORVUS_HD_TAG), m_rom(nullptr) diff --git a/src/devices/bus/a2bus/a2corvus.h b/src/devices/bus/a2bus/a2corvus.h index e7751089e33..461822fe3ab 100644 --- a/src/devices/bus/a2bus/a2corvus.h +++ b/src/devices/bus/a2bus/a2corvus.h @@ -26,8 +26,8 @@ class a2bus_corvus_device: { public: // construction/destruction - a2bus_corvus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - a2bus_corvus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_corvus_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_corvus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a2bus/a2diskii.cpp b/src/devices/bus/a2bus/a2diskii.cpp index 488b675a5f9..ce7e603a765 100644 --- a/src/devices/bus/a2bus/a2diskii.cpp +++ b/src/devices/bus/a2bus/a2diskii.cpp @@ -90,19 +90,19 @@ const rom_entry *a2bus_floppy_device::device_rom_region() const // LIVE DEVICE //************************************************************************** -a2bus_floppy_device::a2bus_floppy_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_floppy_device::a2bus_floppy_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_fdc(*this, FDC_TAG), m_rom(nullptr) { } -a2bus_diskii_device::a2bus_diskii_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_diskii_device::a2bus_diskii_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a2bus_floppy_device(mconfig, A2BUS_DISKII, "Apple Disk II controller", tag, owner, clock, "a2diskii", __FILE__) { } -a2bus_iwmflop_device::a2bus_iwmflop_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_iwmflop_device::a2bus_iwmflop_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a2bus_floppy_device(mconfig, A2BUS_IWM_FDC, "Apple IWM floppy card", tag, owner, clock, "a2iwm_flop", __FILE__) { } diff --git a/src/devices/bus/a2bus/a2diskii.h b/src/devices/bus/a2bus/a2diskii.h index 9e01464893e..d803926581c 100644 --- a/src/devices/bus/a2bus/a2diskii.h +++ b/src/devices/bus/a2bus/a2diskii.h @@ -25,7 +25,7 @@ class a2bus_floppy_device: { public: // construction/destruction - a2bus_floppy_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_floppy_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -49,13 +49,13 @@ private: class a2bus_diskii_device: public a2bus_floppy_device { public: - a2bus_diskii_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_diskii_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; class a2bus_iwmflop_device: public a2bus_floppy_device { public: - a2bus_iwmflop_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_iwmflop_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; }; diff --git a/src/devices/bus/a2bus/a2diskiing.cpp b/src/devices/bus/a2bus/a2diskiing.cpp index 474e228b6fa..fd9533c879a 100644 --- a/src/devices/bus/a2bus/a2diskiing.cpp +++ b/src/devices/bus/a2bus/a2diskiing.cpp @@ -68,7 +68,7 @@ const rom_entry *a2bus_diskiing_device::device_rom_region() const // LIVE DEVICE //************************************************************************** -a2bus_diskiing_device::a2bus_diskiing_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_diskiing_device::a2bus_diskiing_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_DISKIING, "Apple Disk II NG controller", tag, owner, clock, "a2diskiing", __FILE__), device_a2bus_card_interface(mconfig, *this), m_wozfdc(*this, WOZFDC_TAG), diff --git a/src/devices/bus/a2bus/a2diskiing.h b/src/devices/bus/a2bus/a2diskiing.h index 28cfa664be0..7826e7cadcb 100644 --- a/src/devices/bus/a2bus/a2diskiing.h +++ b/src/devices/bus/a2bus/a2diskiing.h @@ -28,7 +28,7 @@ class a2bus_diskiing_device: { public: // construction/destruction - a2bus_diskiing_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_diskiing_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a2bus/a2dx1.cpp b/src/devices/bus/a2bus/a2dx1.cpp index 0cd70077cea..71350591e0d 100644 --- a/src/devices/bus/a2bus/a2dx1.cpp +++ b/src/devices/bus/a2bus/a2dx1.cpp @@ -48,14 +48,14 @@ machine_config_constructor a2bus_dx1_device::device_mconfig_additions() const // LIVE DEVICE //************************************************************************** -a2bus_dx1_device::a2bus_dx1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_dx1_device::a2bus_dx1_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_dac(*this, DAC_TAG), m_volume(0), m_lastdac(0) { } -a2bus_dx1_device::a2bus_dx1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_dx1_device::a2bus_dx1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_DX1, "Decillonix DX-1", tag, owner, clock, "a2dx1", __FILE__), device_a2bus_card_interface(mconfig, *this), m_dac(*this, DAC_TAG), m_volume(0), m_lastdac(0) diff --git a/src/devices/bus/a2bus/a2dx1.h b/src/devices/bus/a2bus/a2dx1.h index ce349ab15d9..d7448a7a671 100644 --- a/src/devices/bus/a2bus/a2dx1.h +++ b/src/devices/bus/a2bus/a2dx1.h @@ -25,8 +25,8 @@ class a2bus_dx1_device: { public: // construction/destruction - a2bus_dx1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - a2bus_dx1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_dx1_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_dx1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a2bus/a2eauxslot.cpp b/src/devices/bus/a2bus/a2eauxslot.cpp index f1d4836d37b..e8601235b46 100644 --- a/src/devices/bus/a2bus/a2eauxslot.cpp +++ b/src/devices/bus/a2bus/a2eauxslot.cpp @@ -26,21 +26,19 @@ const device_type A2EAUXSLOT_SLOT = &device_creator<a2eauxslot_slot_device>; //------------------------------------------------- // a2eauxslot_slot_device - constructor //------------------------------------------------- -a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2EAUXSLOT_SLOT, "Apple IIe AUX Slot", tag, owner, clock, "a2eauxslot_slot", __FILE__), - device_slot_interface(mconfig, *this), - m_a2eauxslot_tag(nullptr), - m_a2eauxslot_slottag(nullptr) + device_slot_interface(mconfig, *this) { } -a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_interface(mconfig, *this), m_a2eauxslot_tag(nullptr), m_a2eauxslot_slottag(nullptr) + device_slot_interface(mconfig, *this) { } -void a2eauxslot_slot_device::static_set_a2eauxslot_slot(device_t &device, const char *tag, const char *slottag) +void a2eauxslot_slot_device::static_set_a2eauxslot_slot(device_t &device, std::string tag, std::string slottag) { a2eauxslot_slot_device &a2eauxslot_card = dynamic_cast<a2eauxslot_slot_device &>(device); a2eauxslot_card.m_a2eauxslot_tag = tag; @@ -64,7 +62,7 @@ void a2eauxslot_slot_device::device_start() const device_type A2EAUXSLOT = &device_creator<a2eauxslot_device>; -void a2eauxslot_device::static_set_cputag(device_t &device, const char *tag) +void a2eauxslot_device::static_set_cputag(device_t &device, std::string tag) { a2eauxslot_device &a2eauxslot = downcast<a2eauxslot_device &>(device); a2eauxslot.m_cputag = tag; @@ -78,17 +76,17 @@ void a2eauxslot_device::static_set_cputag(device_t &device, const char *tag) // a2eauxslot_device - constructor //------------------------------------------------- -a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2EAUXSLOT, "Apple IIe AUX Bus", tag, owner, clock, "a2eauxslot", __FILE__), m_maincpu(nullptr), m_out_irq_cb(*this), - m_out_nmi_cb(*this), m_device(nullptr), m_cputag(nullptr) + m_out_nmi_cb(*this), m_device(nullptr) { } -a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr), m_out_irq_cb(*this), - m_out_nmi_cb(*this), m_device(nullptr), m_cputag(nullptr) + m_out_nmi_cb(*this), m_device(nullptr) { } //------------------------------------------------- @@ -155,7 +153,7 @@ WRITE_LINE_MEMBER( a2eauxslot_device::nmi_w ) { m_out_nmi_cb(state); } device_a2eauxslot_card_interface::device_a2eauxslot_card_interface(const machine_config &mconfig, device_t &device) : device_slot_card_interface(mconfig, device), m_a2eauxslot(nullptr), - m_a2eauxslot_tag(nullptr), m_a2eauxslot_slottag(nullptr), m_slot(0), m_next(nullptr) + m_slot(0), m_next(nullptr) { } @@ -168,7 +166,7 @@ device_a2eauxslot_card_interface::~device_a2eauxslot_card_interface() { } -void device_a2eauxslot_card_interface::static_set_a2eauxslot_tag(device_t &device, const char *tag, const char *slottag) +void device_a2eauxslot_card_interface::static_set_a2eauxslot_tag(device_t &device, std::string tag, std::string slottag) { device_a2eauxslot_card_interface &a2eauxslot_card = dynamic_cast<device_a2eauxslot_card_interface &>(device); a2eauxslot_card.m_a2eauxslot_tag = tag; diff --git a/src/devices/bus/a2bus/a2eauxslot.h b/src/devices/bus/a2bus/a2eauxslot.h index 06d83a9435d..04972cfa347 100644 --- a/src/devices/bus/a2bus/a2eauxslot.h +++ b/src/devices/bus/a2bus/a2eauxslot.h @@ -47,17 +47,18 @@ class a2eauxslot_slot_device : public device_t, { public: // construction/destruction - a2eauxslot_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - a2eauxslot_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2eauxslot_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a2eauxslot_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides virtual void device_start() override; // inline configuration - static void static_set_a2eauxslot_slot(device_t &device, const char *tag, const char *slottag); + static void static_set_a2eauxslot_slot(device_t &device, std::string tag, std::string slottag); protected: // configuration - const char *m_a2eauxslot_tag, *m_a2eauxslot_slottag; + std::string m_a2eauxslot_tag; + std::string m_a2eauxslot_slottag; }; // device type definition @@ -71,11 +72,11 @@ class a2eauxslot_device : public device_t { public: // construction/destruction - a2eauxslot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - a2eauxslot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2eauxslot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a2eauxslot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // inline configuration - static void static_set_cputag(device_t &device, const char *tag); + static void static_set_cputag(device_t &device, std::string tag); template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<a2eauxslot_device &>(device).m_out_irq_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<a2eauxslot_device &>(device).m_out_nmi_cb.set_callback(object); } @@ -100,7 +101,7 @@ protected: devcb_write_line m_out_nmi_cb; device_a2eauxslot_card_interface *m_device; - const char *m_cputag; + std::string m_cputag; }; @@ -135,10 +136,11 @@ public: void lower_slot_nmi() { m_a2eauxslot->set_nmi_line(CLEAR_LINE); } // inline configuration - static void static_set_a2eauxslot_tag(device_t &device, const char *tag, const char *slottag); + static void static_set_a2eauxslot_tag(device_t &device, std::string tag, std::string slottag); public: a2eauxslot_device *m_a2eauxslot; - const char *m_a2eauxslot_tag, *m_a2eauxslot_slottag; + std::string m_a2eauxslot_tag; + std::string m_a2eauxslot_slottag; int m_slot; device_a2eauxslot_card_interface *m_next; }; diff --git a/src/devices/bus/a2bus/a2echoii.cpp b/src/devices/bus/a2bus/a2echoii.cpp index e6be96b5d85..f388782337f 100644 --- a/src/devices/bus/a2bus/a2echoii.cpp +++ b/src/devices/bus/a2bus/a2echoii.cpp @@ -48,14 +48,14 @@ machine_config_constructor a2bus_echoii_device::device_mconfig_additions() const // LIVE DEVICE //************************************************************************** -a2bus_echoii_device::a2bus_echoii_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_echoii_device::a2bus_echoii_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_tms(*this, TMS_TAG) { } -a2bus_echoii_device::a2bus_echoii_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_echoii_device::a2bus_echoii_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_ECHOII, "Street Electronics Echo II", tag, owner, clock, "a2echoii", __FILE__), device_a2bus_card_interface(mconfig, *this), m_tms(*this, TMS_TAG) diff --git a/src/devices/bus/a2bus/a2echoii.h b/src/devices/bus/a2bus/a2echoii.h index 70a83b5fd8b..64f974d141f 100644 --- a/src/devices/bus/a2bus/a2echoii.h +++ b/src/devices/bus/a2bus/a2echoii.h @@ -25,8 +25,8 @@ class a2bus_echoii_device: { public: // construction/destruction - a2bus_echoii_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - a2bus_echoii_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_echoii_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_echoii_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a2bus/a2eext80col.cpp b/src/devices/bus/a2bus/a2eext80col.cpp index c3e9af48cac..f718df1ea56 100644 --- a/src/devices/bus/a2bus/a2eext80col.cpp +++ b/src/devices/bus/a2bus/a2eext80col.cpp @@ -27,13 +27,13 @@ const device_type A2EAUX_EXT80COL = &device_creator<a2eaux_ext80col_device>; // LIVE DEVICE //************************************************************************** -a2eaux_ext80col_device::a2eaux_ext80col_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2eaux_ext80col_device::a2eaux_ext80col_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2EAUX_EXT80COL, "Apple IIe Extended 80-Column Card", tag, owner, clock, "a2eext80", __FILE__), device_a2eauxslot_card_interface(mconfig, *this) { } -a2eaux_ext80col_device::a2eaux_ext80col_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2eaux_ext80col_device::a2eaux_ext80col_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2eauxslot_card_interface(mconfig, *this) { diff --git a/src/devices/bus/a2bus/a2eext80col.h b/src/devices/bus/a2bus/a2eext80col.h index 01c56a7a714..3152e357546 100644 --- a/src/devices/bus/a2bus/a2eext80col.h +++ b/src/devices/bus/a2bus/a2eext80col.h @@ -24,8 +24,8 @@ class a2eaux_ext80col_device: { public: // construction/destruction - a2eaux_ext80col_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - a2eaux_ext80col_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2eaux_ext80col_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a2eaux_ext80col_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); protected: virtual void device_start() override; diff --git a/src/devices/bus/a2bus/a2eramworks3.cpp b/src/devices/bus/a2bus/a2eramworks3.cpp index b7d6897b82d..ea70075436f 100644 --- a/src/devices/bus/a2bus/a2eramworks3.cpp +++ b/src/devices/bus/a2bus/a2eramworks3.cpp @@ -28,14 +28,14 @@ const device_type A2EAUX_RAMWORKS3 = &device_creator<a2eaux_ramworks3_device>; // LIVE DEVICE //************************************************************************** -a2eaux_ramworks3_device::a2eaux_ramworks3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2eaux_ramworks3_device::a2eaux_ramworks3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2EAUX_RAMWORKS3, "Applied Engineering RamWorks III", tag, owner, clock, "a2erwks3", __FILE__), device_a2eauxslot_card_interface(mconfig, *this), m_bank(0) { } -a2eaux_ramworks3_device::a2eaux_ramworks3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2eaux_ramworks3_device::a2eaux_ramworks3_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2eauxslot_card_interface(mconfig, *this), m_bank(0) { diff --git a/src/devices/bus/a2bus/a2eramworks3.h b/src/devices/bus/a2bus/a2eramworks3.h index 7978a405512..28d4a41c305 100644 --- a/src/devices/bus/a2bus/a2eramworks3.h +++ b/src/devices/bus/a2bus/a2eramworks3.h @@ -24,8 +24,8 @@ class a2eaux_ramworks3_device: { public: // construction/destruction - a2eaux_ramworks3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - a2eaux_ramworks3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2eaux_ramworks3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a2eaux_ramworks3_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); protected: virtual void device_start() override; diff --git a/src/devices/bus/a2bus/a2estd80col.cpp b/src/devices/bus/a2bus/a2estd80col.cpp index 706f32d6a55..102e6176ab9 100644 --- a/src/devices/bus/a2bus/a2estd80col.cpp +++ b/src/devices/bus/a2bus/a2estd80col.cpp @@ -27,13 +27,13 @@ const device_type A2EAUX_STD80COL = &device_creator<a2eaux_std80col_device>; // LIVE DEVICE //************************************************************************** -a2eaux_std80col_device::a2eaux_std80col_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2eaux_std80col_device::a2eaux_std80col_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2EAUX_STD80COL, "Apple IIe Standard 80-Column Card", tag, owner, clock, "a2estd80", __FILE__), device_a2eauxslot_card_interface(mconfig, *this) { } -a2eaux_std80col_device::a2eaux_std80col_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2eaux_std80col_device::a2eaux_std80col_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2eauxslot_card_interface(mconfig, *this) { diff --git a/src/devices/bus/a2bus/a2estd80col.h b/src/devices/bus/a2bus/a2estd80col.h index 3c76459e951..ccf73070d6a 100644 --- a/src/devices/bus/a2bus/a2estd80col.h +++ b/src/devices/bus/a2bus/a2estd80col.h @@ -24,8 +24,8 @@ class a2eaux_std80col_device: { public: // construction/destruction - a2eaux_std80col_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - a2eaux_std80col_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2eaux_std80col_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a2eaux_std80col_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); protected: virtual void device_start() override; diff --git a/src/devices/bus/a2bus/a2hsscsi.cpp b/src/devices/bus/a2bus/a2hsscsi.cpp index fa2744c995e..f335ac5e181 100644 --- a/src/devices/bus/a2bus/a2hsscsi.cpp +++ b/src/devices/bus/a2bus/a2hsscsi.cpp @@ -113,7 +113,7 @@ const rom_entry *a2bus_hsscsi_device::device_rom_region() const // LIVE DEVICE //************************************************************************** -a2bus_hsscsi_device::a2bus_hsscsi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_hsscsi_device::a2bus_hsscsi_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_ncr5380(*this, SCSI_5380_TAG), @@ -121,7 +121,7 @@ a2bus_hsscsi_device::a2bus_hsscsi_device(const machine_config &mconfig, device_t { } -a2bus_hsscsi_device::a2bus_hsscsi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_hsscsi_device::a2bus_hsscsi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_HSSCSI, "Apple II High-Speed SCSI Card", tag, owner, clock, "a2hsscsi", __FILE__), device_a2bus_card_interface(mconfig, *this), m_ncr5380(*this, SCSI_5380_TAG), diff --git a/src/devices/bus/a2bus/a2hsscsi.h b/src/devices/bus/a2bus/a2hsscsi.h index d4d07ce04ea..52c464e457d 100644 --- a/src/devices/bus/a2bus/a2hsscsi.h +++ b/src/devices/bus/a2bus/a2hsscsi.h @@ -25,8 +25,8 @@ class a2bus_hsscsi_device: { public: // construction/destruction - a2bus_hsscsi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - a2bus_hsscsi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_hsscsi_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_hsscsi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a2bus/a2lang.cpp b/src/devices/bus/a2bus/a2lang.cpp index 9a0b21dca36..0a25aafebda 100644 --- a/src/devices/bus/a2bus/a2lang.cpp +++ b/src/devices/bus/a2bus/a2lang.cpp @@ -34,14 +34,14 @@ const device_type A2BUS_LANG = &device_creator<a2bus_lang_device>; // LIVE DEVICE //************************************************************************** -a2bus_lang_device::a2bus_lang_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_lang_device::a2bus_lang_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_LANG, "Apple II Language Card", tag, owner, clock, "a2lang", __FILE__), device_a2bus_card_interface(mconfig, *this) { last_offset = -1; } -a2bus_lang_device::a2bus_lang_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_lang_device::a2bus_lang_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this) { diff --git a/src/devices/bus/a2bus/a2lang.h b/src/devices/bus/a2bus/a2lang.h index 2fd14b5bd86..da600f06b23 100644 --- a/src/devices/bus/a2bus/a2lang.h +++ b/src/devices/bus/a2bus/a2lang.h @@ -24,8 +24,8 @@ class a2bus_lang_device: { public: // construction/destruction - a2bus_lang_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - a2bus_lang_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_lang_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a2bus_lang_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); protected: virtual void device_start() override; diff --git a/src/devices/bus/a2bus/a2mcms.cpp b/src/devices/bus/a2bus/a2mcms.cpp index ad7f621d6c8..17cf0e7bc2d 100644 --- a/src/devices/bus/a2bus/a2mcms.cpp +++ b/src/devices/bus/a2bus/a2mcms.cpp @@ -68,14 +68,14 @@ machine_config_constructor a2bus_mcms1_device::device_mconfig_additions() const // LIVE DEVICE - Card 1 //************************************************************************** -a2bus_mcms1_device::a2bus_mcms1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_mcms1_device::a2bus_mcms1_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_mcms(*this, ENGINE_TAG) { } -a2bus_mcms1_device::a2bus_mcms1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_mcms1_device::a2bus_mcms1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_MCMS1, "Mountain Computer Music System (card 1)", tag, owner, clock, "a2mcms1", __FILE__), device_a2bus_card_interface(mconfig, *this), m_mcms(*this, ENGINE_TAG) @@ -149,13 +149,13 @@ WRITE_LINE_MEMBER(a2bus_mcms1_device::irq_w) // LIVE DEVICE - Card 2 //************************************************************************** -a2bus_mcms2_device::a2bus_mcms2_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_mcms2_device::a2bus_mcms2_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_card1(nullptr), m_engine(nullptr) { } -a2bus_mcms2_device::a2bus_mcms2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_mcms2_device::a2bus_mcms2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_MCMS2, "Mountain Computer Music System (card 2)", tag, owner, clock, "a2mcms2", __FILE__), device_a2bus_card_interface(mconfig, *this), m_card1(nullptr), m_engine(nullptr) { @@ -212,7 +212,7 @@ void a2bus_mcms2_device::write_cnxx(address_space &space, UINT8 offset, UINT8 da Sound device implementation */ -mcms_device::mcms_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +mcms_device::mcms_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MCMS, "Mountain Computer Music System engine", tag, owner, clock, "msmseng", __FILE__), device_sound_interface(mconfig, *this), m_write_irq(*this), m_stream(nullptr), m_timer(nullptr), m_clrtimer(nullptr), m_pBusDevice(nullptr), m_enabled(false), m_mastervol(0), m_rand(0) diff --git a/src/devices/bus/a2bus/a2mcms.h b/src/devices/bus/a2bus/a2mcms.h index 5f48b165a12..afbf0d80ae5 100644 --- a/src/devices/bus/a2bus/a2mcms.h +++ b/src/devices/bus/a2bus/a2mcms.h @@ -26,7 +26,7 @@ class mcms_device : public device_t, public device_sound_interface { public: // construction/destruction - mcms_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + mcms_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_WRITE8_MEMBER(voiceregs_w); DECLARE_WRITE8_MEMBER(control_w); @@ -65,8 +65,8 @@ class a2bus_mcms1_device: { public: // construction/destruction - a2bus_mcms1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - a2bus_mcms1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_mcms1_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_mcms1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -96,8 +96,8 @@ class a2bus_mcms2_device: { public: // construction/destruction - a2bus_mcms2_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - a2bus_mcms2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_mcms2_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_mcms2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: virtual void device_start() override; diff --git a/src/devices/bus/a2bus/a2memexp.cpp b/src/devices/bus/a2bus/a2memexp.cpp index 9832b3160e2..2c58b61d256 100644 --- a/src/devices/bus/a2bus/a2memexp.cpp +++ b/src/devices/bus/a2bus/a2memexp.cpp @@ -73,13 +73,13 @@ const rom_entry *a2bus_ramfactor_device::device_rom_region() const // LIVE DEVICE //************************************************************************** -a2bus_memexp_device::a2bus_memexp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_memexp_device::a2bus_memexp_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_isramfactor(false), m_bankhior(0), m_addrmask(0), m_rom(nullptr), m_wptr(0), m_liveptr(0) { } -a2bus_memexpapple_device::a2bus_memexpapple_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_memexpapple_device::a2bus_memexpapple_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a2bus_memexp_device(mconfig, A2BUS_MEMEXP, "Apple II Memory Expansion Card", tag, owner, clock, "a2memexp", __FILE__) { m_isramfactor = false; @@ -87,7 +87,7 @@ a2bus_memexpapple_device::a2bus_memexpapple_device(const machine_config &mconfig m_addrmask = 0xfffff; } -a2bus_ramfactor_device::a2bus_ramfactor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_ramfactor_device::a2bus_ramfactor_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a2bus_memexp_device(mconfig, A2BUS_RAMFACTOR, "Applied Engineering RamFactor", tag, owner, clock, "a2ramfac", __FILE__) { m_isramfactor = true; diff --git a/src/devices/bus/a2bus/a2memexp.h b/src/devices/bus/a2bus/a2memexp.h index 8ce49163db1..a99f94eb89c 100644 --- a/src/devices/bus/a2bus/a2memexp.h +++ b/src/devices/bus/a2bus/a2memexp.h @@ -24,7 +24,7 @@ class a2bus_memexp_device: { public: // construction/destruction - a2bus_memexp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_memexp_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -54,13 +54,13 @@ private: class a2bus_memexpapple_device : public a2bus_memexp_device { public: - a2bus_memexpapple_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_memexpapple_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; class a2bus_ramfactor_device : public a2bus_memexp_device { public: - a2bus_ramfactor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_ramfactor_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual const rom_entry *device_rom_region() const override; }; diff --git a/src/devices/bus/a2bus/a2midi.cpp b/src/devices/bus/a2bus/a2midi.cpp index 79281f85ee2..41423ddfdd2 100644 --- a/src/devices/bus/a2bus/a2midi.cpp +++ b/src/devices/bus/a2bus/a2midi.cpp @@ -59,7 +59,7 @@ machine_config_constructor a2bus_midi_device::device_mconfig_additions() const // LIVE DEVICE //************************************************************************** -a2bus_midi_device::a2bus_midi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_midi_device::a2bus_midi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_MIDI, "6850 MIDI card", tag, owner, clock, "a2midi", __FILE__), device_a2bus_card_interface(mconfig, *this), m_ptm(*this, MIDI_PTM_TAG), @@ -68,7 +68,7 @@ a2bus_midi_device::a2bus_midi_device(const machine_config &mconfig, const char * { } -a2bus_midi_device::a2bus_midi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_midi_device::a2bus_midi_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_ptm(*this, MIDI_PTM_TAG), diff --git a/src/devices/bus/a2bus/a2midi.h b/src/devices/bus/a2bus/a2midi.h index 9f3abfe0f7f..d8d37d2241a 100644 --- a/src/devices/bus/a2bus/a2midi.h +++ b/src/devices/bus/a2bus/a2midi.h @@ -25,8 +25,8 @@ class a2bus_midi_device: { public: // construction/destruction - a2bus_midi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - a2bus_midi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_midi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a2bus_midi_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a2bus/a2mockingboard.cpp b/src/devices/bus/a2bus/a2mockingboard.cpp index 749c14621fa..cc53ae3f6cd 100644 --- a/src/devices/bus/a2bus/a2mockingboard.cpp +++ b/src/devices/bus/a2bus/a2mockingboard.cpp @@ -120,7 +120,7 @@ machine_config_constructor a2bus_echoplus_device::device_mconfig_additions() con // LIVE DEVICE //************************************************************************** -a2bus_ayboard_device::a2bus_ayboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_ayboard_device::a2bus_ayboard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_via1(*this, VIA1_TAG), @@ -132,21 +132,21 @@ a2bus_ayboard_device::a2bus_ayboard_device(const machine_config &mconfig, device { } -a2bus_mockingboard_device::a2bus_mockingboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_mockingboard_device::a2bus_mockingboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a2bus_ayboard_device(mconfig, A2BUS_MOCKINGBOARD, "Sweet Micro Systems Mockingboard", tag, owner, clock, "a2mockbd", __FILE__) { m_isPhasor = false; m_PhasorNative = false; } -a2bus_phasor_device::a2bus_phasor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_phasor_device::a2bus_phasor_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a2bus_ayboard_device(mconfig, A2BUS_PHASOR, "Applied Engineering Phasor", tag, owner, clock, "a2phasor", __FILE__) { m_isPhasor = true; m_PhasorNative = false; } -a2bus_echoplus_device::a2bus_echoplus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_echoplus_device::a2bus_echoplus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a2bus_ayboard_device(mconfig, A2BUS_ECHOPLUS, "Street Electronics Echo Plus", tag, owner, clock, "a2echop", __FILE__), m_tms(*this, E2P_TMS_TAG) { diff --git a/src/devices/bus/a2bus/a2mockingboard.h b/src/devices/bus/a2bus/a2mockingboard.h index 4e7025bbe59..e9771d771bf 100644 --- a/src/devices/bus/a2bus/a2mockingboard.h +++ b/src/devices/bus/a2bus/a2mockingboard.h @@ -27,7 +27,7 @@ class a2bus_ayboard_device: { public: // construction/destruction - a2bus_ayboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_ayboard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -65,13 +65,13 @@ private: class a2bus_mockingboard_device : public a2bus_ayboard_device { public: - a2bus_mockingboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_mockingboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; class a2bus_phasor_device : public a2bus_ayboard_device { public: - a2bus_phasor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_phasor_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; }; @@ -79,7 +79,7 @@ public: class a2bus_echoplus_device : public a2bus_ayboard_device { public: - a2bus_echoplus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_echoplus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; diff --git a/src/devices/bus/a2bus/a2pic.cpp b/src/devices/bus/a2bus/a2pic.cpp index f47f964f192..9613445725f 100644 --- a/src/devices/bus/a2bus/a2pic.cpp +++ b/src/devices/bus/a2bus/a2pic.cpp @@ -98,7 +98,7 @@ const rom_entry *a2bus_pic_device::device_rom_region() const // LIVE DEVICE //************************************************************************** -a2bus_pic_device::a2bus_pic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_pic_device::a2bus_pic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_PIC, "Apple Parallel Interface Card", tag, owner, clock, "a2pic", __FILE__), device_a2bus_card_interface(mconfig, *this), m_dsw1(*this, "DSW1"), @@ -109,7 +109,7 @@ a2bus_pic_device::a2bus_pic_device(const machine_config &mconfig, const char *ta { } -a2bus_pic_device::a2bus_pic_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_pic_device::a2bus_pic_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_dsw1(*this, "DSW1"), diff --git a/src/devices/bus/a2bus/a2pic.h b/src/devices/bus/a2bus/a2pic.h index 997e4a342a6..83481d66a8d 100644 --- a/src/devices/bus/a2bus/a2pic.h +++ b/src/devices/bus/a2bus/a2pic.h @@ -24,8 +24,8 @@ class a2bus_pic_device: { public: // construction/destruction - a2bus_pic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - a2bus_pic_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_pic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a2bus_pic_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a2bus/a2sam.cpp b/src/devices/bus/a2bus/a2sam.cpp index 7cdabc64b74..e63cb32a0a0 100644 --- a/src/devices/bus/a2bus/a2sam.cpp +++ b/src/devices/bus/a2bus/a2sam.cpp @@ -48,14 +48,14 @@ machine_config_constructor a2bus_sam_device::device_mconfig_additions() const // LIVE DEVICE //************************************************************************** -a2bus_sam_device::a2bus_sam_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_sam_device::a2bus_sam_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_dac(*this, DAC_TAG) { } -a2bus_sam_device::a2bus_sam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_sam_device::a2bus_sam_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_SAM, "Don't Ask Software SAM", tag, owner, clock, "a2sam", __FILE__), device_a2bus_card_interface(mconfig, *this), m_dac(*this, DAC_TAG) diff --git a/src/devices/bus/a2bus/a2sam.h b/src/devices/bus/a2bus/a2sam.h index 5574a75c27c..541303ad108 100644 --- a/src/devices/bus/a2bus/a2sam.h +++ b/src/devices/bus/a2bus/a2sam.h @@ -25,8 +25,8 @@ class a2bus_sam_device: { public: // construction/destruction - a2bus_sam_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - a2bus_sam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_sam_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_sam_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a2bus/a2scsi.cpp b/src/devices/bus/a2bus/a2scsi.cpp index 50a715893bf..d9e0c0cb48a 100644 --- a/src/devices/bus/a2bus/a2scsi.cpp +++ b/src/devices/bus/a2bus/a2scsi.cpp @@ -106,7 +106,7 @@ const rom_entry *a2bus_scsi_device::device_rom_region() const // LIVE DEVICE //************************************************************************** -a2bus_scsi_device::a2bus_scsi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_scsi_device::a2bus_scsi_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_ncr5380(*this, SCSI_5380_TAG), @@ -114,7 +114,7 @@ a2bus_scsi_device::a2bus_scsi_device(const machine_config &mconfig, device_type { } -a2bus_scsi_device::a2bus_scsi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_scsi_device::a2bus_scsi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_SCSI, "Apple II SCSI Card", tag, owner, clock, "a2scsi", __FILE__), device_a2bus_card_interface(mconfig, *this), m_ncr5380(*this, SCSI_5380_TAG), diff --git a/src/devices/bus/a2bus/a2scsi.h b/src/devices/bus/a2bus/a2scsi.h index b6132577846..b82213d6053 100644 --- a/src/devices/bus/a2bus/a2scsi.h +++ b/src/devices/bus/a2bus/a2scsi.h @@ -25,8 +25,8 @@ class a2bus_scsi_device: { public: // construction/destruction - a2bus_scsi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - a2bus_scsi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_scsi_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_scsi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a2bus/a2softcard.cpp b/src/devices/bus/a2bus/a2softcard.cpp index e7477c468c6..757f268d9ab 100644 --- a/src/devices/bus/a2bus/a2softcard.cpp +++ b/src/devices/bus/a2bus/a2softcard.cpp @@ -51,14 +51,14 @@ machine_config_constructor a2bus_softcard_device::device_mconfig_additions() con // LIVE DEVICE //************************************************************************** -a2bus_softcard_device::a2bus_softcard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_softcard_device::a2bus_softcard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_z80(*this, Z80_TAG), m_bEnabled(false), m_FirstZ80Boot(false) { } -a2bus_softcard_device::a2bus_softcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_softcard_device::a2bus_softcard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_SOFTCARD, "Microsoft SoftCard", tag, owner, clock, "a2softcard", __FILE__), device_a2bus_card_interface(mconfig, *this), m_z80(*this, Z80_TAG), m_bEnabled(false), m_FirstZ80Boot(false) diff --git a/src/devices/bus/a2bus/a2softcard.h b/src/devices/bus/a2bus/a2softcard.h index 906d8e14c12..9a2101d67a9 100644 --- a/src/devices/bus/a2bus/a2softcard.h +++ b/src/devices/bus/a2bus/a2softcard.h @@ -24,8 +24,8 @@ class a2bus_softcard_device: { public: // construction/destruction - a2bus_softcard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - a2bus_softcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_softcard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_softcard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a2bus/a2ssc.cpp b/src/devices/bus/a2bus/a2ssc.cpp index d2765ebc557..2fa361f573d 100644 --- a/src/devices/bus/a2bus/a2ssc.cpp +++ b/src/devices/bus/a2bus/a2ssc.cpp @@ -127,7 +127,7 @@ const rom_entry *a2bus_ssc_device::device_rom_region() const // LIVE DEVICE //************************************************************************** -a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_SSC, "Apple Super Serial Card", tag, owner, clock, "a2ssc", __FILE__), device_a2bus_card_interface(mconfig, *this), m_dsw1(*this, "DSW1"), @@ -137,7 +137,7 @@ a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, const char *ta { } -a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_dsw1(*this, "DSW1"), diff --git a/src/devices/bus/a2bus/a2ssc.h b/src/devices/bus/a2bus/a2ssc.h index bca78273307..e3297f41345 100644 --- a/src/devices/bus/a2bus/a2ssc.h +++ b/src/devices/bus/a2bus/a2ssc.h @@ -24,8 +24,8 @@ class a2bus_ssc_device: { public: // construction/destruction - a2bus_ssc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - a2bus_ssc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_ssc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a2bus_ssc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a2bus/a2swyft.cpp b/src/devices/bus/a2bus/a2swyft.cpp index d47e7770937..125057060b4 100644 --- a/src/devices/bus/a2bus/a2swyft.cpp +++ b/src/devices/bus/a2bus/a2swyft.cpp @@ -45,13 +45,13 @@ const rom_entry *a2bus_swyft_device::device_rom_region() const // LIVE DEVICE //************************************************************************** -a2bus_swyft_device::a2bus_swyft_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_swyft_device::a2bus_swyft_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_SWYFT, "IAI SwyftCard", tag, owner, clock, "a2swyft", __FILE__), device_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_rombank(0), m_inh_state(0) { } -a2bus_swyft_device::a2bus_swyft_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_swyft_device::a2bus_swyft_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_rombank(0), m_inh_state(0) { diff --git a/src/devices/bus/a2bus/a2swyft.h b/src/devices/bus/a2bus/a2swyft.h index 564a76ac6b9..9714689744f 100644 --- a/src/devices/bus/a2bus/a2swyft.h +++ b/src/devices/bus/a2bus/a2swyft.h @@ -24,8 +24,8 @@ class a2bus_swyft_device: { public: // construction/destruction - a2bus_swyft_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - a2bus_swyft_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_swyft_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a2bus_swyft_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/a2bus/a2themill.cpp b/src/devices/bus/a2bus/a2themill.cpp index e8cc3d338c9..35bd88add2a 100644 --- a/src/devices/bus/a2bus/a2themill.cpp +++ b/src/devices/bus/a2bus/a2themill.cpp @@ -67,14 +67,14 @@ machine_config_constructor a2bus_themill_device::device_mconfig_additions() cons // LIVE DEVICE //************************************************************************** -a2bus_themill_device::a2bus_themill_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_themill_device::a2bus_themill_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_6809(*this, M6809_TAG), m_bEnabled(false), m_flipAddrSpace(false), m_6809Mode(false), m_status(0) { } -a2bus_themill_device::a2bus_themill_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_themill_device::a2bus_themill_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_THEMILL, "Stellation Two The Mill", tag, owner, clock, "a2themill", __FILE__), device_a2bus_card_interface(mconfig, *this), m_6809(*this, M6809_TAG), m_bEnabled(false), m_flipAddrSpace(false), m_6809Mode(false), m_status(0) diff --git a/src/devices/bus/a2bus/a2themill.h b/src/devices/bus/a2bus/a2themill.h index 763aec5f9df..7fdade36f17 100644 --- a/src/devices/bus/a2bus/a2themill.h +++ b/src/devices/bus/a2bus/a2themill.h @@ -24,8 +24,8 @@ class a2bus_themill_device: { public: // construction/destruction - a2bus_themill_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - a2bus_themill_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_themill_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_themill_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a2bus/a2thunderclock.cpp b/src/devices/bus/a2bus/a2thunderclock.cpp index 881acd496ce..60518688e1e 100644 --- a/src/devices/bus/a2bus/a2thunderclock.cpp +++ b/src/devices/bus/a2bus/a2thunderclock.cpp @@ -76,14 +76,14 @@ const rom_entry *a2bus_thunderclock_device::device_rom_region() const // LIVE DEVICE //************************************************************************** -a2bus_thunderclock_device::a2bus_thunderclock_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_thunderclock_device::a2bus_thunderclock_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_upd1990ac(*this, THUNDERCLOCK_UPD1990_TAG), m_rom(nullptr), m_dataout(0) { } -a2bus_thunderclock_device::a2bus_thunderclock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_thunderclock_device::a2bus_thunderclock_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_THUNDERCLOCK, "ThunderWare ThunderClock Plus", tag, owner, clock, "a2thunpl", __FILE__), device_a2bus_card_interface(mconfig, *this), m_upd1990ac(*this, THUNDERCLOCK_UPD1990_TAG), m_rom(nullptr), m_dataout(0) diff --git a/src/devices/bus/a2bus/a2thunderclock.h b/src/devices/bus/a2bus/a2thunderclock.h index 55ab8fe4389..898491fdb5a 100644 --- a/src/devices/bus/a2bus/a2thunderclock.h +++ b/src/devices/bus/a2bus/a2thunderclock.h @@ -25,8 +25,8 @@ class a2bus_thunderclock_device: { public: // construction/destruction - a2bus_thunderclock_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - a2bus_thunderclock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_thunderclock_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_thunderclock_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a2bus/a2ultraterm.cpp b/src/devices/bus/a2bus/a2ultraterm.cpp index 6f7722e46ea..932424f6aa0 100644 --- a/src/devices/bus/a2bus/a2ultraterm.cpp +++ b/src/devices/bus/a2bus/a2ultraterm.cpp @@ -138,19 +138,19 @@ const rom_entry *a2bus_ultratermenh_device::device_rom_region() const // LIVE DEVICE //************************************************************************** -a2bus_videx160_device::a2bus_videx160_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_videx160_device::a2bus_videx160_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_chrrom(nullptr), m_framecnt(0), m_ctrl1(0), m_ctrl2(0), m_crtc(*this, ULTRATERM_MC6845_NAME), m_rambank(0) { } -a2bus_ultraterm_device::a2bus_ultraterm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_ultraterm_device::a2bus_ultraterm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a2bus_videx160_device(mconfig, A2BUS_ULTRATERM, "Videx UltraTerm (original)", tag, owner, clock, "a2ulttrm", __FILE__) { } -a2bus_ultratermenh_device::a2bus_ultratermenh_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_ultratermenh_device::a2bus_ultratermenh_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a2bus_videx160_device(mconfig, A2BUS_ULTRATERMENH, "Videx UltraTerm (enhanced //e)", tag, owner, clock, "a2ultrme", __FILE__) { } diff --git a/src/devices/bus/a2bus/a2ultraterm.h b/src/devices/bus/a2bus/a2ultraterm.h index cbd435106cf..957cf2ae5d3 100644 --- a/src/devices/bus/a2bus/a2ultraterm.h +++ b/src/devices/bus/a2bus/a2ultraterm.h @@ -25,7 +25,7 @@ class a2bus_videx160_device: { public: // construction/destruction - a2bus_videx160_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_videx160_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -59,7 +59,7 @@ private: class a2bus_ultraterm_device : public a2bus_videx160_device { public: - a2bus_ultraterm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_ultraterm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual const rom_entry *device_rom_region() const override; }; @@ -67,7 +67,7 @@ public: class a2bus_ultratermenh_device : public a2bus_videx160_device { public: - a2bus_ultratermenh_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_ultratermenh_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual const rom_entry *device_rom_region() const override; }; diff --git a/src/devices/bus/a2bus/a2videoterm.cpp b/src/devices/bus/a2bus/a2videoterm.cpp index 4fc271c604f..fe994dcb38b 100644 --- a/src/devices/bus/a2bus/a2videoterm.cpp +++ b/src/devices/bus/a2bus/a2videoterm.cpp @@ -172,7 +172,7 @@ const rom_entry *a2bus_aevm80_device::device_rom_region() const // LIVE DEVICE //************************************************************************** -a2bus_videx80_device::a2bus_videx80_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_videx80_device::a2bus_videx80_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_chrrom(nullptr), m_framecnt(0), m_crtc(*this, VIDEOTERM_MC6845_NAME), m_rambank(0), @@ -180,32 +180,32 @@ a2bus_videx80_device::a2bus_videx80_device(const machine_config &mconfig, device { } -a2bus_videoterm_device::a2bus_videoterm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_videoterm_device::a2bus_videoterm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a2bus_videx80_device(mconfig, A2BUS_VIDEOTERM, "Videx VideoTerm", tag, owner, clock, "a2vidtrm", __FILE__) { } -a2bus_ap16_device::a2bus_ap16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_ap16_device::a2bus_ap16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a2bus_videx80_device(mconfig, A2BUS_IBSAP16, "IBS AP-16 80 column card", tag, owner, clock, "a2ap16", __FILE__) { } -a2bus_ap16alt_device::a2bus_ap16alt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_ap16alt_device::a2bus_ap16alt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a2bus_videx80_device(mconfig, A2BUS_IBSAP16ALT, "IBS AP-16 80 column card (alt. version)", tag, owner, clock, "a2ap16a", __FILE__) { } -a2bus_vtc1_device::a2bus_vtc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_vtc1_device::a2bus_vtc1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a2bus_videx80_device(mconfig, A2BUS_VTC1, "Unknown VideoTerm clone #1", tag, owner, clock, "a2vtc1", __FILE__) { } -a2bus_vtc2_device::a2bus_vtc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_vtc2_device::a2bus_vtc2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a2bus_videx80_device(mconfig, A2BUS_VTC2, "Unknown VideoTerm clone #2", tag, owner, clock, "a2vtc2", __FILE__) { } -a2bus_aevm80_device::a2bus_aevm80_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_aevm80_device::a2bus_aevm80_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a2bus_videx80_device(mconfig, A2BUS_AEVIEWMASTER80, "Applied Engineering Viewmaster 80", tag, owner, clock, "a2aevm80", __FILE__) { } diff --git a/src/devices/bus/a2bus/a2videoterm.h b/src/devices/bus/a2bus/a2videoterm.h index 654103879ec..024cfa16ba7 100644 --- a/src/devices/bus/a2bus/a2videoterm.h +++ b/src/devices/bus/a2bus/a2videoterm.h @@ -25,7 +25,7 @@ class a2bus_videx80_device: { public: // construction/destruction - a2bus_videx80_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_videx80_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -60,7 +60,7 @@ public: class a2bus_videoterm_device : public a2bus_videx80_device { public: - a2bus_videoterm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_videoterm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual const rom_entry *device_rom_region() const override; }; @@ -68,7 +68,7 @@ public: class a2bus_ap16_device : public a2bus_videx80_device { public: - a2bus_ap16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_ap16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual const rom_entry *device_rom_region() const override; @@ -79,7 +79,7 @@ public: class a2bus_ap16alt_device : public a2bus_videx80_device { public: - a2bus_ap16alt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_ap16alt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual const rom_entry *device_rom_region() const override; @@ -89,7 +89,7 @@ public: class a2bus_vtc1_device : public a2bus_videx80_device { public: - a2bus_vtc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_vtc1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual const rom_entry *device_rom_region() const override; }; @@ -97,7 +97,7 @@ public: class a2bus_vtc2_device : public a2bus_videx80_device { public: - a2bus_vtc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_vtc2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual const rom_entry *device_rom_region() const override; }; @@ -105,7 +105,7 @@ public: class a2bus_aevm80_device : public a2bus_videx80_device { public: - a2bus_aevm80_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_aevm80_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual const rom_entry *device_rom_region() const override; }; diff --git a/src/devices/bus/a2bus/a2vulcan.cpp b/src/devices/bus/a2bus/a2vulcan.cpp index f917d179ffd..343978daeca 100644 --- a/src/devices/bus/a2bus/a2vulcan.cpp +++ b/src/devices/bus/a2bus/a2vulcan.cpp @@ -114,19 +114,19 @@ const rom_entry *a2bus_vulcangold_device::device_rom_region() const // LIVE DEVICE //************************************************************************** -a2bus_vulcanbase_device::a2bus_vulcanbase_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_vulcanbase_device::a2bus_vulcanbase_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_ata(*this, VULCAN_ATA_TAG), m_rom(nullptr), m_lastdata(0), m_rombank(0), m_rambank(0), m_last_read_was_0(false) { } -a2bus_vulcan_device::a2bus_vulcan_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_vulcan_device::a2bus_vulcan_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a2bus_vulcanbase_device(mconfig, A2BUS_VULCAN, "Applied Engineering Vulcan IDE controller", tag, owner, clock, "a2vulcan", __FILE__) { } -a2bus_vulcangold_device::a2bus_vulcangold_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_vulcangold_device::a2bus_vulcangold_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a2bus_vulcanbase_device(mconfig, A2BUS_VULCAN, "Applied Engineering Vulcan Gold IDE controller", tag, owner, clock, "a2vulgld", __FILE__) { } diff --git a/src/devices/bus/a2bus/a2vulcan.h b/src/devices/bus/a2bus/a2vulcan.h index 25871c70fcb..6a961abaf24 100644 --- a/src/devices/bus/a2bus/a2vulcan.h +++ b/src/devices/bus/a2bus/a2vulcan.h @@ -25,7 +25,7 @@ class a2bus_vulcanbase_device: { public: // construction/destruction - a2bus_vulcanbase_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_vulcanbase_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -55,7 +55,7 @@ private: class a2bus_vulcan_device : public a2bus_vulcanbase_device { public: - a2bus_vulcan_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_vulcan_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual const rom_entry *device_rom_region() const override; protected: @@ -67,7 +67,7 @@ protected: class a2bus_vulcangold_device : public a2bus_vulcanbase_device { public: - a2bus_vulcangold_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_vulcangold_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual const rom_entry *device_rom_region() const override; }; diff --git a/src/devices/bus/a2bus/a2zipdrive.cpp b/src/devices/bus/a2bus/a2zipdrive.cpp index 8213a63e010..d8b83825d68 100644 --- a/src/devices/bus/a2bus/a2zipdrive.cpp +++ b/src/devices/bus/a2bus/a2zipdrive.cpp @@ -69,14 +69,14 @@ const rom_entry *a2bus_zipdrivebase_device::device_rom_region() const // LIVE DEVICE //************************************************************************** -a2bus_zipdrivebase_device::a2bus_zipdrivebase_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_zipdrivebase_device::a2bus_zipdrivebase_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_ata(*this, ZIPDRIVE_ATA_TAG), m_rom(nullptr), m_lastdata(0) { } -a2bus_zipdrive_device::a2bus_zipdrive_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_zipdrive_device::a2bus_zipdrive_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a2bus_zipdrivebase_device(mconfig, A2BUS_ZIPDRIVE, "Zip Technologies ZipDrive", tag, owner, clock, "a2zipdrv", __FILE__) { } diff --git a/src/devices/bus/a2bus/a2zipdrive.h b/src/devices/bus/a2bus/a2zipdrive.h index 43af97dd532..71ac4baed7d 100644 --- a/src/devices/bus/a2bus/a2zipdrive.h +++ b/src/devices/bus/a2bus/a2zipdrive.h @@ -27,7 +27,7 @@ class a2bus_zipdrivebase_device: { public: // construction/destruction - a2bus_zipdrivebase_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_zipdrivebase_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -54,7 +54,7 @@ private: class a2bus_zipdrive_device : public a2bus_zipdrivebase_device { public: - a2bus_zipdrive_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_zipdrive_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; // device type definition diff --git a/src/devices/bus/a2bus/corvfdc01.cpp b/src/devices/bus/a2bus/corvfdc01.cpp index c8f93b725d1..0c31cb9d641 100644 --- a/src/devices/bus/a2bus/corvfdc01.cpp +++ b/src/devices/bus/a2bus/corvfdc01.cpp @@ -110,7 +110,7 @@ const rom_entry *a2bus_corvfdc01_device::device_rom_region() const // LIVE DEVICE //************************************************************************** -a2bus_corvfdc01_device::a2bus_corvfdc01_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_corvfdc01_device::a2bus_corvfdc01_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_wdfdc(*this, FDC01_FDC_TAG), @@ -121,7 +121,7 @@ a2bus_corvfdc01_device::a2bus_corvfdc01_device(const machine_config &mconfig, de { } -a2bus_corvfdc01_device::a2bus_corvfdc01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_corvfdc01_device::a2bus_corvfdc01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_CORVFDC01, "Corvus Systems Floppy Controller", tag, owner, clock, "crvfdc01", __FILE__), device_a2bus_card_interface(mconfig, *this), m_wdfdc(*this, FDC01_FDC_TAG), diff --git a/src/devices/bus/a2bus/corvfdc01.h b/src/devices/bus/a2bus/corvfdc01.h index 256ebd45ca3..83a6add1402 100644 --- a/src/devices/bus/a2bus/corvfdc01.h +++ b/src/devices/bus/a2bus/corvfdc01.h @@ -26,8 +26,8 @@ class a2bus_corvfdc01_device: { public: // construction/destruction - a2bus_corvfdc01_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - a2bus_corvfdc01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_corvfdc01_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_corvfdc01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a2bus/corvfdc02.cpp b/src/devices/bus/a2bus/corvfdc02.cpp index 870fc194bfb..6caf19439a7 100644 --- a/src/devices/bus/a2bus/corvfdc02.cpp +++ b/src/devices/bus/a2bus/corvfdc02.cpp @@ -80,7 +80,7 @@ const rom_entry *a2bus_corvfdc02_device::device_rom_region() const // LIVE DEVICE //************************************************************************** -a2bus_corvfdc02_device::a2bus_corvfdc02_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_corvfdc02_device::a2bus_corvfdc02_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_fdc(*this, FDC02_FDC_TAG), @@ -91,7 +91,7 @@ a2bus_corvfdc02_device::a2bus_corvfdc02_device(const machine_config &mconfig, de { } -a2bus_corvfdc02_device::a2bus_corvfdc02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_corvfdc02_device::a2bus_corvfdc02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_CORVFDC02, "Corvus Systems Buffered Floppy Controller", tag, owner, clock, "crvfdc02", __FILE__), device_a2bus_card_interface(mconfig, *this), m_fdc(*this, FDC02_FDC_TAG), diff --git a/src/devices/bus/a2bus/corvfdc02.h b/src/devices/bus/a2bus/corvfdc02.h index b47aba0b10f..f448134c71b 100644 --- a/src/devices/bus/a2bus/corvfdc02.h +++ b/src/devices/bus/a2bus/corvfdc02.h @@ -26,8 +26,8 @@ class a2bus_corvfdc02_device: { public: // construction/destruction - a2bus_corvfdc02_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - a2bus_corvfdc02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_corvfdc02_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_corvfdc02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a2bus/ezcgi.cpp b/src/devices/bus/a2bus/ezcgi.cpp index e85db228ad2..373efb48e26 100644 --- a/src/devices/bus/a2bus/ezcgi.cpp +++ b/src/devices/bus/a2bus/ezcgi.cpp @@ -96,42 +96,42 @@ machine_config_constructor a2bus_ezcgi_9958_device::device_mconfig_additions() c // LIVE DEVICE //************************************************************************** -a2bus_ezcgi_device::a2bus_ezcgi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_ezcgi_device::a2bus_ezcgi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_EZCGI, "E-Z Color Graphics Interface", tag, owner, clock, "a2ezcgi", __FILE__), device_a2bus_card_interface(mconfig, *this), m_tms(*this, TMS_TAG) { } -a2bus_ezcgi_device::a2bus_ezcgi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_ezcgi_device::a2bus_ezcgi_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_tms(*this, TMS_TAG) { } -a2bus_ezcgi_9938_device::a2bus_ezcgi_9938_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_ezcgi_9938_device::a2bus_ezcgi_9938_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_EZCGI_9938, "E-Z Color Graphics Interface (TMS9938)", tag, owner, clock, "a2ezcgi3", __FILE__), device_a2bus_card_interface(mconfig, *this), m_tms(*this, TMS_TAG) { } -a2bus_ezcgi_9938_device::a2bus_ezcgi_9938_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_ezcgi_9938_device::a2bus_ezcgi_9938_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_tms(*this, TMS_TAG) { } -a2bus_ezcgi_9958_device::a2bus_ezcgi_9958_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_ezcgi_9958_device::a2bus_ezcgi_9958_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_EZCGI_9958, "E-Z Color Graphics Interface (TMS9958)", tag, owner, clock, "a2ezcgi5", __FILE__), device_a2bus_card_interface(mconfig, *this), m_tms(*this, TMS_TAG) { } -a2bus_ezcgi_9958_device::a2bus_ezcgi_9958_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_ezcgi_9958_device::a2bus_ezcgi_9958_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_tms(*this, TMS_TAG) diff --git a/src/devices/bus/a2bus/ezcgi.h b/src/devices/bus/a2bus/ezcgi.h index 275ec0fd77e..bfcf64de5f3 100644 --- a/src/devices/bus/a2bus/ezcgi.h +++ b/src/devices/bus/a2bus/ezcgi.h @@ -28,8 +28,8 @@ class a2bus_ezcgi_device: { public: // construction/destruction - a2bus_ezcgi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - a2bus_ezcgi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_ezcgi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a2bus_ezcgi_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -53,8 +53,8 @@ class a2bus_ezcgi_9938_device: { public: // construction/destruction - a2bus_ezcgi_9938_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - a2bus_ezcgi_9938_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_ezcgi_9938_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a2bus_ezcgi_9938_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -78,8 +78,8 @@ class a2bus_ezcgi_9958_device: { public: // construction/destruction - a2bus_ezcgi_9958_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - a2bus_ezcgi_9958_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_ezcgi_9958_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a2bus_ezcgi_9958_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a2bus/laser128.cpp b/src/devices/bus/a2bus/laser128.cpp index 5357f3cc31d..45b8589f734 100644 --- a/src/devices/bus/a2bus/laser128.cpp +++ b/src/devices/bus/a2bus/laser128.cpp @@ -42,14 +42,14 @@ machine_config_constructor a2bus_laser128_device::device_mconfig_additions() con // LIVE DEVICE //************************************************************************** -a2bus_laser128_device::a2bus_laser128_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_laser128_device::a2bus_laser128_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_slot7_bank(0), m_slot7_ram_bank(0) { } -a2bus_laser128_device::a2bus_laser128_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_laser128_device::a2bus_laser128_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_LASER128, "VTech Laser 128 Internal Device", tag, owner, clock, "a2laser128", __FILE__), device_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_slot7_bank(0), m_slot7_ram_bank(0) { diff --git a/src/devices/bus/a2bus/laser128.h b/src/devices/bus/a2bus/laser128.h index 55c46f63730..db73a34efd4 100644 --- a/src/devices/bus/a2bus/laser128.h +++ b/src/devices/bus/a2bus/laser128.h @@ -24,8 +24,8 @@ class a2bus_laser128_device: { public: // construction/destruction - a2bus_laser128_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - a2bus_laser128_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_laser128_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_laser128_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a2bus/mouse.cpp b/src/devices/bus/a2bus/mouse.cpp index 3d4e11d3487..012b850f025 100644 --- a/src/devices/bus/a2bus/mouse.cpp +++ b/src/devices/bus/a2bus/mouse.cpp @@ -172,7 +172,7 @@ const rom_entry *a2bus_mouse_device::device_rom_region() const // LIVE DEVICE //************************************************************************** -a2bus_mouse_device::a2bus_mouse_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_mouse_device::a2bus_mouse_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_pia(*this, MOUSE_PIA_TAG), @@ -186,7 +186,7 @@ a2bus_mouse_device::a2bus_mouse_device(const machine_config &mconfig, device_typ m_rom_bank = 0; } -a2bus_mouse_device::a2bus_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_mouse_device::a2bus_mouse_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_MOUSE, "Apple II Mouse Card", tag, owner, clock, "a2mouse", __FILE__), device_a2bus_card_interface(mconfig, *this), m_pia(*this, MOUSE_PIA_TAG), diff --git a/src/devices/bus/a2bus/mouse.h b/src/devices/bus/a2bus/mouse.h index 669487f1ec4..bbb4f7da770 100644 --- a/src/devices/bus/a2bus/mouse.h +++ b/src/devices/bus/a2bus/mouse.h @@ -26,8 +26,8 @@ class a2bus_mouse_device: { public: // construction/destruction - a2bus_mouse_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - a2bus_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_mouse_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_mouse_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a2bus/ramcard128k.cpp b/src/devices/bus/a2bus/ramcard128k.cpp index 4616bf54ecf..80bbb452586 100644 --- a/src/devices/bus/a2bus/ramcard128k.cpp +++ b/src/devices/bus/a2bus/ramcard128k.cpp @@ -28,13 +28,13 @@ const device_type A2BUS_RAMCARD128K = &device_creator<a2bus_ssramcard_device>; // LIVE DEVICE //************************************************************************** -a2bus_ssramcard_device::a2bus_ssramcard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_ssramcard_device::a2bus_ssramcard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_inh_state(0), m_last_offset(0), m_dxxx_bank(0), m_main_bank(0) { } -a2bus_ssramcard_device::a2bus_ssramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_ssramcard_device::a2bus_ssramcard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_RAMCARD128K, "Saturn Systems 128K Extended Language Card", tag, owner, clock, "ssram128", __FILE__), device_a2bus_card_interface(mconfig, *this), m_inh_state(0), m_last_offset(0), m_dxxx_bank(0), m_main_bank(0) { diff --git a/src/devices/bus/a2bus/ramcard128k.h b/src/devices/bus/a2bus/ramcard128k.h index c70f188c955..4609e1cb47f 100644 --- a/src/devices/bus/a2bus/ramcard128k.h +++ b/src/devices/bus/a2bus/ramcard128k.h @@ -24,8 +24,8 @@ class a2bus_ssramcard_device: { public: // construction/destruction - a2bus_ssramcard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - a2bus_ssramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_ssramcard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_ssramcard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: virtual void device_start() override; diff --git a/src/devices/bus/a2bus/ramcard16k.cpp b/src/devices/bus/a2bus/ramcard16k.cpp index 1d679b2be8c..c5332917b29 100644 --- a/src/devices/bus/a2bus/ramcard16k.cpp +++ b/src/devices/bus/a2bus/ramcard16k.cpp @@ -28,13 +28,13 @@ const device_type A2BUS_RAMCARD16K = &device_creator<a2bus_ramcard_device>; // LIVE DEVICE //************************************************************************** -a2bus_ramcard_device::a2bus_ramcard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_ramcard_device::a2bus_ramcard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_inh_state(0), m_last_offset(0), m_dxxx_bank(0) { } -a2bus_ramcard_device::a2bus_ramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_ramcard_device::a2bus_ramcard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_RAMCARD16K, "Apple II 16K Language Card", tag, owner, clock, "a2ram16k", __FILE__), device_a2bus_card_interface(mconfig, *this), m_inh_state(0), m_last_offset(0), m_dxxx_bank(0) { diff --git a/src/devices/bus/a2bus/ramcard16k.h b/src/devices/bus/a2bus/ramcard16k.h index b604801a362..180b09f66a4 100644 --- a/src/devices/bus/a2bus/ramcard16k.h +++ b/src/devices/bus/a2bus/ramcard16k.h @@ -24,8 +24,8 @@ class a2bus_ramcard_device: { public: // construction/destruction - a2bus_ramcard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - a2bus_ramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_ramcard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_ramcard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: virtual void device_start() override; diff --git a/src/devices/bus/a2bus/timemasterho.cpp b/src/devices/bus/a2bus/timemasterho.cpp index 9b8543613f2..ec0a8eb2cc5 100644 --- a/src/devices/bus/a2bus/timemasterho.cpp +++ b/src/devices/bus/a2bus/timemasterho.cpp @@ -121,7 +121,7 @@ const rom_entry *a2bus_timemasterho_device::device_rom_region() const // LIVE DEVICE //************************************************************************** -a2bus_timemasterho_device::a2bus_timemasterho_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a2bus_timemasterho_device::a2bus_timemasterho_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_pia(*this, TIMEMASTER_PIA_TAG), @@ -131,7 +131,7 @@ a2bus_timemasterho_device::a2bus_timemasterho_device(const machine_config &mconf m_started = false; } -a2bus_timemasterho_device::a2bus_timemasterho_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2bus_timemasterho_device::a2bus_timemasterho_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_TIMEMASTERHO, "Applied Engineering TimeMaster H.O.", tag, owner, clock, "a2tmstho", __FILE__), device_a2bus_card_interface(mconfig, *this), m_pia(*this, TIMEMASTER_PIA_TAG), diff --git a/src/devices/bus/a2bus/timemasterho.h b/src/devices/bus/a2bus/timemasterho.h index d1442593efc..b8f62830051 100644 --- a/src/devices/bus/a2bus/timemasterho.h +++ b/src/devices/bus/a2bus/timemasterho.h @@ -26,8 +26,8 @@ class a2bus_timemasterho_device: { public: // construction/destruction - a2bus_timemasterho_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - a2bus_timemasterho_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2bus_timemasterho_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_timemasterho_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a7800/a78_slot.cpp b/src/devices/bus/a7800/a78_slot.cpp index 0509753a1c3..67c9fd1bb8c 100644 --- a/src/devices/bus/a7800/a78_slot.cpp +++ b/src/devices/bus/a7800/a78_slot.cpp @@ -62,7 +62,7 @@ device_a78_cart_interface::~device_a78_cart_interface () // rom_alloc - alloc the space for the cart //------------------------------------------------- -void device_a78_cart_interface::rom_alloc(UINT32 size, const char *tag) +void device_a78_cart_interface::rom_alloc(UINT32 size, std::string tag) { if (m_rom == nullptr) { @@ -112,7 +112,7 @@ void device_a78_cart_interface::nvram_alloc(UINT32 size) //------------------------------------------------- // a78_cart_slot_device - constructor //------------------------------------------------- -a78_cart_slot_device::a78_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a78_cart_slot_device::a78_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A78_CART_SLOT, "Atari 7800 Cartridge Slot", tag, owner, clock, "a78_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), m_cart(nullptr), m_type(0) diff --git a/src/devices/bus/a7800/a78_slot.h b/src/devices/bus/a7800/a78_slot.h index cbdc38741f2..622a4ba405c 100644 --- a/src/devices/bus/a7800/a78_slot.h +++ b/src/devices/bus/a7800/a78_slot.h @@ -53,7 +53,7 @@ public: virtual DECLARE_WRITE8_MEMBER(write_30xx) {} virtual DECLARE_WRITE8_MEMBER(write_40xx) {} - void rom_alloc(UINT32 size, const char *tag); + void rom_alloc(UINT32 size, std::string tag); void ram_alloc(UINT32 size); void nvram_alloc(UINT32 size); UINT8* get_rom_base() { return m_rom; } @@ -86,7 +86,7 @@ class a78_cart_slot_device : public device_t, { public: // construction/destruction - a78_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a78_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~a78_cart_slot_device(); // device-level overrides diff --git a/src/devices/bus/a7800/cpuwiz.cpp b/src/devices/bus/a7800/cpuwiz.cpp index 2ec5b34e0e9..7a8236425fd 100644 --- a/src/devices/bus/a7800/cpuwiz.cpp +++ b/src/devices/bus/a7800/cpuwiz.cpp @@ -40,24 +40,24 @@ const device_type A78_ROM_MEGACART = &device_creator<a78_megacart_device>; const device_type A78_ROM_P450_VB = &device_creator<a78_rom_p450_vb_device>; -a78_versaboard_device::a78_versaboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +a78_versaboard_device::a78_versaboard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : a78_rom_sg_device(mconfig, type, name, tag, owner, clock, shortname, source), m_ram_bank(0) { } -a78_versaboard_device::a78_versaboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a78_versaboard_device::a78_versaboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a78_rom_sg_device(mconfig, A78_ROM_VERSABOARD, "Atari 7800 VersaBoard Cart", tag, owner, clock, "a78_versaboard", __FILE__), m_ram_bank(0) { } -a78_megacart_device::a78_megacart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a78_megacart_device::a78_megacart_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a78_versaboard_device(mconfig, A78_ROM_MEGACART, "Atari 7800 MegaCart+", tag, owner, clock, "a78_megacart", __FILE__) { } -a78_rom_p450_vb_device::a78_rom_p450_vb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a78_rom_p450_vb_device::a78_rom_p450_vb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a78_versaboard_device(mconfig, A78_ROM_P450_VB, "Atari 7800 VersaBoard + POKEY @ 0x0450 Cart", tag, owner, clock, "a78_versapokey", __FILE__), m_pokey450(*this, "pokey450") { diff --git a/src/devices/bus/a7800/cpuwiz.h b/src/devices/bus/a7800/cpuwiz.h index 1decc581446..6ad4d2780d7 100644 --- a/src/devices/bus/a7800/cpuwiz.h +++ b/src/devices/bus/a7800/cpuwiz.h @@ -13,8 +13,8 @@ class a78_versaboard_device : public a78_rom_sg_device { public: // construction/destruction - a78_versaboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - a78_versaboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a78_versaboard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a78_versaboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -35,7 +35,7 @@ class a78_megacart_device : public a78_versaboard_device { public: // construction/destruction - a78_megacart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a78_megacart_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_WRITE8_MEMBER(write_40xx) override; @@ -50,7 +50,7 @@ class a78_rom_p450_vb_device : public a78_versaboard_device { public: // construction/destruction - a78_rom_p450_vb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a78_rom_p450_vb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a7800/hiscore.cpp b/src/devices/bus/a7800/hiscore.cpp index 3448fb85808..c2118524341 100644 --- a/src/devices/bus/a7800/hiscore.cpp +++ b/src/devices/bus/a7800/hiscore.cpp @@ -20,7 +20,7 @@ const device_type A78_HISCORE = &device_creator<a78_hiscore_device>; -a78_hiscore_device::a78_hiscore_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a78_hiscore_device::a78_hiscore_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a78_rom_device(mconfig, A78_HISCORE, "Atari 7800 High Score Cart", tag, owner, clock, "a78_highscore", __FILE__), m_hscslot(*this, "hsc_slot") { diff --git a/src/devices/bus/a7800/hiscore.h b/src/devices/bus/a7800/hiscore.h index 3f8d7422d8b..ea853ca036c 100644 --- a/src/devices/bus/a7800/hiscore.h +++ b/src/devices/bus/a7800/hiscore.h @@ -13,7 +13,7 @@ class a78_hiscore_device : public a78_rom_device { public: // construction/destruction - a78_hiscore_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a78_hiscore_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a7800/rom.cpp b/src/devices/bus/a7800/rom.cpp index d7f2f41b7fd..264d844c8c2 100644 --- a/src/devices/bus/a7800/rom.cpp +++ b/src/devices/bus/a7800/rom.cpp @@ -42,102 +42,102 @@ const device_type A78_ROM_P450_SG_RAM = &device_creator<a78_rom_p450_sg_ram_devi const device_type A78_ROM_P450_SG9 = &device_creator<a78_rom_p450_sg9_device>; -a78_rom_device::a78_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +a78_rom_device::a78_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a78_cart_interface( mconfig, *this ) { } -a78_rom_device::a78_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a78_rom_device::a78_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A78_ROM, "Atari 7800 ROM Carts w/no Bankswitch", tag, owner, clock, "a78_rom", __FILE__), device_a78_cart_interface( mconfig, *this ) { } -a78_rom_pokey_device::a78_rom_pokey_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +a78_rom_pokey_device::a78_rom_pokey_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : a78_rom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_pokey(*this, "pokey") { } -a78_rom_pokey_device::a78_rom_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a78_rom_pokey_device::a78_rom_pokey_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a78_rom_device(mconfig, A78_ROM_POKEY, "Atari 7800 ROM Carts w/no Bankswitch + POKEY", tag, owner, clock, "a78_rom_pok", __FILE__), m_pokey(*this, "pokey") { } -a78_rom_sg_device::a78_rom_sg_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +a78_rom_sg_device::a78_rom_sg_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : a78_rom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_bank(0) { } -a78_rom_sg_device::a78_rom_sg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a78_rom_sg_device::a78_rom_sg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a78_rom_device(mconfig, A78_ROM_SG, "Atari 7800 ROM Carts w/SuperGame Bankswitch", tag, owner, clock, "a78_rom_sg", __FILE__), m_bank(0) { } -a78_rom_sg_pokey_device::a78_rom_sg_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a78_rom_sg_pokey_device::a78_rom_sg_pokey_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a78_rom_sg_device(mconfig, A78_ROM_SG_POKEY, "Atari 7800 ROM Carts w/SuperGame Bankswitch + POKEY", tag, owner, clock, "a78_rom_sgp", __FILE__), m_pokey(*this, "pokey") { } -a78_rom_sg_ram_device::a78_rom_sg_ram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +a78_rom_sg_ram_device::a78_rom_sg_ram_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : a78_rom_sg_device(mconfig, type, name, tag, owner, clock, shortname, source) { } -a78_rom_sg_ram_device::a78_rom_sg_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a78_rom_sg_ram_device::a78_rom_sg_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a78_rom_sg_device(mconfig, A78_ROM_SG_RAM, "Atari 7800 ROM Carts w/SuperGame Bankswitch + RAM", tag, owner, clock, "a78_rom_sgr", __FILE__) { } -a78_rom_sg9_device::a78_rom_sg9_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +a78_rom_sg9_device::a78_rom_sg9_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : a78_rom_sg_device(mconfig, type, name, tag, owner, clock, shortname, source) { } -a78_rom_sg9_device::a78_rom_sg9_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a78_rom_sg9_device::a78_rom_sg9_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a78_rom_sg_device(mconfig, A78_ROM_SG9, "Atari 7800 ROM Carts w/SuperGame 9Banks", tag, owner, clock, "a78_rom_sg9", __FILE__) { } -a78_rom_abs_device::a78_rom_abs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a78_rom_abs_device::a78_rom_abs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a78_rom_device(mconfig, A78_ROM_ABSOLUTE, "Atari 7800 ROM Carts w/Absolute Bankswitch", tag, owner, clock, "a78_rom_abs", __FILE__), m_bank(0) { } -a78_rom_act_device::a78_rom_act_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a78_rom_act_device::a78_rom_act_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a78_rom_device(mconfig, A78_ROM_ACTIVISION, "Atari 7800 ROM Carts w/Activision Bankswitch", tag, owner, clock, "a78_rom_act", __FILE__), m_bank(0) { } -a78_rom_p450_device::a78_rom_p450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a78_rom_p450_device::a78_rom_p450_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a78_rom_device(mconfig, A78_ROM_P450, "Atari 7800 ROM Carts w/POKEY @ 0x0450", tag, owner, clock, "a78_p450_t0", __FILE__), m_pokey450(*this, "pokey450") { } -a78_rom_p450_pokey_device::a78_rom_p450_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a78_rom_p450_pokey_device::a78_rom_p450_pokey_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a78_rom_pokey_device(mconfig, A78_ROM_P450_POKEY, "Atari 7800 ROM Carts w/no Bankswitch + POKEY + POKEY @ 0x0450", tag, owner, clock, "a78_p450_t1", __FILE__), m_pokey450(*this, "pokey450") { } -a78_rom_p450_sg_ram_device::a78_rom_p450_sg_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a78_rom_p450_sg_ram_device::a78_rom_p450_sg_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a78_rom_sg_ram_device(mconfig, A78_ROM_P450_SG_RAM, "Atari 7800 ROM Carts w/SuperGame Bankswitch + RAM + POKEY @ 0x0450", tag, owner, clock, "a78_p450_t6", __FILE__), m_pokey450(*this, "pokey450") { } -a78_rom_p450_sg9_device::a78_rom_p450_sg9_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a78_rom_p450_sg9_device::a78_rom_p450_sg9_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a78_rom_sg9_device(mconfig, A78_ROM_P450_SG9, "Atari 7800 ROM Carts w/SuperGame 9Banks + POKEY @ 0x0450", tag, owner, clock, "a78_p450_ta", __FILE__), m_pokey450(*this, "pokey450") { diff --git a/src/devices/bus/a7800/rom.h b/src/devices/bus/a7800/rom.h index 7c7f6507e38..93a30672966 100644 --- a/src/devices/bus/a7800/rom.h +++ b/src/devices/bus/a7800/rom.h @@ -14,8 +14,8 @@ class a78_rom_device : public device_t, { public: // construction/destruction - a78_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - a78_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a78_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a78_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -32,8 +32,8 @@ class a78_rom_pokey_device : public a78_rom_device { public: // construction/destruction - a78_rom_pokey_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - a78_rom_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a78_rom_pokey_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a78_rom_pokey_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -53,8 +53,8 @@ class a78_rom_sg_device : public a78_rom_device { public: // construction/destruction - a78_rom_sg_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - a78_rom_sg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a78_rom_sg_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a78_rom_sg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -75,7 +75,7 @@ class a78_rom_sg_pokey_device : public a78_rom_sg_device { public: // construction/destruction - a78_rom_sg_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a78_rom_sg_pokey_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -95,8 +95,8 @@ class a78_rom_sg_ram_device : public a78_rom_sg_device { public: // construction/destruction - a78_rom_sg_ram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - a78_rom_sg_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a78_rom_sg_ram_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a78_rom_sg_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_40xx) override; @@ -110,8 +110,8 @@ class a78_rom_sg9_device : public a78_rom_sg_device { public: // construction/destruction - a78_rom_sg9_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - a78_rom_sg9_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a78_rom_sg9_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a78_rom_sg9_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_40xx) override; @@ -125,7 +125,7 @@ class a78_rom_abs_device : public a78_rom_device { public: // construction/destruction - a78_rom_abs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a78_rom_abs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -146,7 +146,7 @@ class a78_rom_act_device : public a78_rom_device { public: // construction/destruction - a78_rom_act_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a78_rom_act_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -169,7 +169,7 @@ class a78_rom_p450_device : public a78_rom_device { public: // construction/destruction - a78_rom_p450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a78_rom_p450_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; @@ -188,7 +188,7 @@ class a78_rom_p450_pokey_device : public a78_rom_pokey_device { public: // construction/destruction - a78_rom_p450_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a78_rom_p450_pokey_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; @@ -207,7 +207,7 @@ class a78_rom_p450_sg_ram_device : public a78_rom_sg_ram_device { public: // construction/destruction - a78_rom_p450_sg_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a78_rom_p450_sg_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; @@ -226,7 +226,7 @@ class a78_rom_p450_sg9_device : public a78_rom_sg9_device { public: // construction/destruction - a78_rom_p450_sg9_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a78_rom_p450_sg9_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a7800/xboard.cpp b/src/devices/bus/a7800/xboard.cpp index af05c663440..33f1079a015 100644 --- a/src/devices/bus/a7800/xboard.cpp +++ b/src/devices/bus/a7800/xboard.cpp @@ -56,7 +56,7 @@ const device_type A78_XBOARD = &device_creator<a78_xboard_device>; const device_type A78_XM = &device_creator<a78_xm_device>; -a78_xboard_device::a78_xboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +a78_xboard_device::a78_xboard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : a78_rom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_xbslot(*this, "xb_slot"), m_pokey(*this, "xb_pokey"), m_reg(0), m_ram_bank(0) @@ -64,7 +64,7 @@ a78_xboard_device::a78_xboard_device(const machine_config &mconfig, device_type } -a78_xboard_device::a78_xboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a78_xboard_device::a78_xboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a78_rom_device(mconfig, A78_XBOARD, "Atari 7800 XBoarD expansion", tag, owner, clock, "a78_xboard", __FILE__), m_xbslot(*this, "xb_slot"), m_pokey(*this, "xb_pokey"), m_reg(0), m_ram_bank(0) @@ -72,7 +72,7 @@ a78_xboard_device::a78_xboard_device(const machine_config &mconfig, const char * } -a78_xm_device::a78_xm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a78_xm_device::a78_xm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a78_xboard_device(mconfig, A78_XM, "Atari 7800 XM expansion module", tag, owner, clock, "a78_xm", __FILE__), m_ym(*this, "xm_ym2151"), m_ym_enabled(0) { diff --git a/src/devices/bus/a7800/xboard.h b/src/devices/bus/a7800/xboard.h index 772a6c0e3e6..c02c8a91d8c 100644 --- a/src/devices/bus/a7800/xboard.h +++ b/src/devices/bus/a7800/xboard.h @@ -15,8 +15,8 @@ class a78_xboard_device : public a78_rom_device { public: // construction/destruction - a78_xboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - a78_xboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a78_xboard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a78_xboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -42,7 +42,7 @@ class a78_xm_device : public a78_xboard_device { public: // construction/destruction - a78_xm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a78_xm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/a800/a800_slot.cpp b/src/devices/bus/a800/a800_slot.cpp index b2e46a421da..19f51ea9c7d 100644 --- a/src/devices/bus/a800/a800_slot.cpp +++ b/src/devices/bus/a800/a800_slot.cpp @@ -59,7 +59,7 @@ device_a800_cart_interface::~device_a800_cart_interface () // rom_alloc - alloc the space for the cart //------------------------------------------------- -void device_a800_cart_interface::rom_alloc(UINT32 size, const char *tag) +void device_a800_cart_interface::rom_alloc(UINT32 size, std::string tag) { if (m_rom == nullptr) { @@ -101,14 +101,14 @@ void device_a800_cart_interface::nvram_alloc(UINT32 size) //------------------------------------------------- // ****_cart_slot_device - constructor //------------------------------------------------- -a800_cart_slot_device::a800_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a800_cart_slot_device::a800_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), m_cart(nullptr), m_type(0) { } -a800_cart_slot_device::a800_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a800_cart_slot_device::a800_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A800_CART_SLOT, "Atari 8bit Cartridge Slot", tag, owner, clock, "a800_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), m_cart(nullptr), m_type(0) @@ -116,13 +116,13 @@ a800_cart_slot_device::a800_cart_slot_device(const machine_config &mconfig, cons } -a5200_cart_slot_device::a5200_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a5200_cart_slot_device::a5200_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a800_cart_slot_device(mconfig, A5200_CART_SLOT, "Atari 5200 Cartridge Slot", tag, owner, clock, "a5200_cart_slot", __FILE__) { } -xegs_cart_slot_device::xegs_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +xegs_cart_slot_device::xegs_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a800_cart_slot_device(mconfig, XEGS_CART_SLOT, "Atari XEGS Cartridge Slot", tag, owner, clock, "xegs_cart_slot", __FILE__) { } diff --git a/src/devices/bus/a800/a800_slot.h b/src/devices/bus/a800/a800_slot.h index 6efdd0839e9..d20816ad5d6 100644 --- a/src/devices/bus/a800/a800_slot.h +++ b/src/devices/bus/a800/a800_slot.h @@ -56,7 +56,7 @@ public: virtual DECLARE_WRITE8_MEMBER(write_80xx) {} virtual DECLARE_WRITE8_MEMBER(write_d5xx) {} - void rom_alloc(UINT32 size, const char *tag); + void rom_alloc(UINT32 size, std::string tag); void ram_alloc(UINT32 size); void nvram_alloc(UINT32 size); UINT8* get_rom_base() { return m_rom; } @@ -85,8 +85,8 @@ class a800_cart_slot_device : public device_t, { public: // construction/destruction - a800_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - a800_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a800_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a800_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~a800_cart_slot_device(); // device-level overrides @@ -136,7 +136,7 @@ class a5200_cart_slot_device : public a800_cart_slot_device { public: // construction/destruction - a5200_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a5200_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~a5200_cart_slot_device(); virtual const char *file_extensions() const override { return "bin,rom,car,a52"; } @@ -151,7 +151,7 @@ class xegs_cart_slot_device : public a800_cart_slot_device { public: // construction/destruction - xegs_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + xegs_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~xegs_cart_slot_device(); virtual const char *file_extensions() const override { return "bin,rom,car"; } diff --git a/src/devices/bus/a800/a8sio.cpp b/src/devices/bus/a800/a8sio.cpp index 54f45ecb208..aa3b843a096 100644 --- a/src/devices/bus/a800/a8sio.cpp +++ b/src/devices/bus/a800/a8sio.cpp @@ -48,19 +48,19 @@ const device_type A8SIO_SLOT = &device_creator<a8sio_slot_device>; //------------------------------------------------- // a8sio_slot_device - constructor //------------------------------------------------- -a8sio_slot_device::a8sio_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a8sio_slot_device::a8sio_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A8SIO_SLOT, "Atari 8 bit SIO Slot", tag, owner, clock, "a8sio_slot", __FILE__) - , device_slot_interface(mconfig, *this), m_a8sio_tag(nullptr), m_a8sio_slottag(nullptr) + , device_slot_interface(mconfig, *this) { } -a8sio_slot_device::a8sio_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +a8sio_slot_device::a8sio_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_interface(mconfig, *this), m_a8sio_tag(nullptr), m_a8sio_slottag(nullptr) + device_slot_interface(mconfig, *this) { } -void a8sio_slot_device::static_set_a8sio_slot(device_t &device, const char *tag, const char *slottag) +void a8sio_slot_device::static_set_a8sio_slot(device_t &device, std::string tag, std::string slottag) { a8sio_slot_device &a8sio_ext = dynamic_cast<a8sio_slot_device &>(device); a8sio_ext.m_a8sio_tag = tag; @@ -98,7 +98,7 @@ const device_type A8SIO = &device_creator<a8sio_device>; // a8sio_device - constructor //------------------------------------------------- -a8sio_device::a8sio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a8sio_device::a8sio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A8SIO, "Atari 8 biot SIO", tag, owner, clock, "a8sio", __FILE__) , m_out_clock_in_cb(*this) , m_out_data_in_cb(*this) @@ -106,7 +106,7 @@ a8sio_device::a8sio_device(const machine_config &mconfig, const char *tag, devic { } -a8sio_device::a8sio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +a8sio_device::a8sio_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) , m_out_clock_in_cb(*this) , m_out_data_in_cb(*this) @@ -182,7 +182,6 @@ WRITE8_MEMBER( a8sio_device::audio_in_w ) device_a8sio_card_interface::device_a8sio_card_interface(const machine_config &mconfig, device_t &device) : device_slot_card_interface(mconfig, device) , m_a8sio(nullptr) - , m_a8sio_tag(nullptr), m_a8sio_slottag(nullptr) { } @@ -195,7 +194,7 @@ device_a8sio_card_interface::~device_a8sio_card_interface() { } -void device_a8sio_card_interface::static_set_a8sio_tag(device_t &device, const char *tag, const char *slottag) +void device_a8sio_card_interface::static_set_a8sio_tag(device_t &device, std::string tag, std::string slottag) { device_a8sio_card_interface &a8sio_card = dynamic_cast<device_a8sio_card_interface &>(device); a8sio_card.m_a8sio_tag = tag; diff --git a/src/devices/bus/a800/a8sio.h b/src/devices/bus/a800/a8sio.h index 0a06c0c93b8..60a54d53cf0 100644 --- a/src/devices/bus/a800/a8sio.h +++ b/src/devices/bus/a800/a8sio.h @@ -54,19 +54,19 @@ class a8sio_slot_device : public device_t, { public: // construction/destruction - a8sio_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - a8sio_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a8sio_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a8sio_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides virtual void device_start() override; // inline configuration - static void static_set_a8sio_slot(device_t &device, const char *tag, const char *slottag); + static void static_set_a8sio_slot(device_t &device, std::string tag, std::string slottag); protected: // configuration - const char *m_a8sio_tag; - const char *m_a8sio_slottag; + std::string m_a8sio_tag; + std::string m_a8sio_slottag; }; @@ -80,8 +80,8 @@ class a8sio_device : public device_t { public: // construction/destruction - a8sio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - a8sio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a8sio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a8sio_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // inline configuration template<class _Object> static devcb_base &set_clock_in_callback(device_t &device, _Object object) { return downcast<a8sio_device &>(device).m_out_clock_in_cb.set_callback(object); } @@ -128,14 +128,14 @@ public: void set_a8sio_device(); // inline configuration - static void static_set_a8sio_tag(device_t &device, const char *tag, const char *slottag); + static void static_set_a8sio_tag(device_t &device, std::string tag, std::string slottag); virtual DECLARE_WRITE_LINE_MEMBER( motor_w ); public: a8sio_device *m_a8sio; - const char *m_a8sio_tag; - const char *m_a8sio_slottag; + std::string m_a8sio_tag; + std::string m_a8sio_slottag; }; diff --git a/src/devices/bus/a800/cassette.cpp b/src/devices/bus/a800/cassette.cpp index 3a6406d44a1..15e273c7096 100644 --- a/src/devices/bus/a800/cassette.cpp +++ b/src/devices/bus/a800/cassette.cpp @@ -44,7 +44,7 @@ machine_config_constructor a8sio_cassette_device::device_mconfig_additions() con // LIVE DEVICE //************************************************************************** -a8sio_cassette_device::a8sio_cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a8sio_cassette_device::a8sio_cassette_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A8SIO_CASSETTE, "Atari 8 bit cassette", tag, owner, clock, "a8sio_cass", __FILE__) , device_a8sio_card_interface(mconfig, *this) , m_cassette(*this, "cassette"), m_read_timer(nullptr) @@ -53,7 +53,7 @@ a8sio_cassette_device::a8sio_cassette_device(const machine_config &mconfig, cons { } -a8sio_cassette_device::a8sio_cassette_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +a8sio_cassette_device::a8sio_cassette_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) , device_a8sio_card_interface(mconfig, *this) , m_cassette(*this, "cassette"), m_read_timer(nullptr) diff --git a/src/devices/bus/a800/cassette.h b/src/devices/bus/a800/cassette.h index d3bb24bbc4f..94b63b0894f 100644 --- a/src/devices/bus/a800/cassette.h +++ b/src/devices/bus/a800/cassette.h @@ -27,8 +27,8 @@ class a8sio_cassette_device { public: // construction/destruction - a8sio_cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - a8sio_cassette_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a8sio_cassette_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a8sio_cassette_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a800/oss.cpp b/src/devices/bus/a800/oss.cpp index 5cdc7e72126..3671352cc34 100644 --- a/src/devices/bus/a800/oss.cpp +++ b/src/devices/bus/a800/oss.cpp @@ -21,26 +21,26 @@ const device_type A800_ROM_OSS43 = &device_creator<a800_rom_oss43_device>; const device_type A800_ROM_OSS91 = &device_creator<a800_rom_oss91_device>; -a800_rom_oss8k_device::a800_rom_oss8k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a800_rom_oss8k_device::a800_rom_oss8k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a800_rom_device(mconfig, A800_ROM_OSS8K, "Atari 800 ROM Carts OSS 8K", tag, owner, clock, "a800_oss8k", __FILE__), m_bank(0) { } -a800_rom_oss34_device::a800_rom_oss34_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a800_rom_oss34_device::a800_rom_oss34_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a800_rom_device(mconfig, A800_ROM_OSS34, "Atari 800 ROM Carts OSS-034M", tag, owner, clock, "a800_034m", __FILE__), m_bank(0) { } -a800_rom_oss43_device::a800_rom_oss43_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a800_rom_oss43_device::a800_rom_oss43_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a800_rom_device(mconfig, A800_ROM_OSS43, "Atari 800 ROM Carts OSS-043M", tag, owner, clock, "a800_043m", __FILE__), m_bank(0) { } -a800_rom_oss91_device::a800_rom_oss91_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a800_rom_oss91_device::a800_rom_oss91_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a800_rom_device(mconfig, A800_ROM_OSS91, "Atari 800 ROM Carts OSS-M091", tag, owner, clock, "a800_m091", __FILE__), m_bank(0) { } diff --git a/src/devices/bus/a800/oss.h b/src/devices/bus/a800/oss.h index 20524eedd64..2eee7810b9e 100644 --- a/src/devices/bus/a800/oss.h +++ b/src/devices/bus/a800/oss.h @@ -12,7 +12,7 @@ class a800_rom_oss8k_device : public a800_rom_device { public: // construction/destruction - a800_rom_oss8k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a800_rom_oss8k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -32,7 +32,7 @@ class a800_rom_oss34_device : public a800_rom_device { public: // construction/destruction - a800_rom_oss34_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a800_rom_oss34_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -52,7 +52,7 @@ class a800_rom_oss43_device : public a800_rom_device { public: // construction/destruction - a800_rom_oss43_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a800_rom_oss43_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -72,7 +72,7 @@ class a800_rom_oss91_device : public a800_rom_device { public: // construction/destruction - a800_rom_oss91_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a800_rom_oss91_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/a800/rom.cpp b/src/devices/bus/a800/rom.cpp index 1a21ab92039..4fdae4c4b7b 100644 --- a/src/devices/bus/a800/rom.cpp +++ b/src/devices/bus/a800/rom.cpp @@ -30,69 +30,69 @@ const device_type A5200_ROM_2CHIPS = &device_creator<a5200_rom_2chips_device>; const device_type A5200_ROM_BBSB = &device_creator<a5200_rom_bbsb_device>; -a800_rom_device::a800_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +a800_rom_device::a800_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a800_cart_interface( mconfig, *this ) { } -a800_rom_device::a800_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a800_rom_device::a800_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A800_ROM, "Atari 800 ROM Carts", tag, owner, clock, "a800_rom", __FILE__), device_a800_cart_interface( mconfig, *this ) { } -a800_rom_bbsb_device::a800_rom_bbsb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a800_rom_bbsb_device::a800_rom_bbsb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a800_rom_device(mconfig, A800_ROM_BBSB, "Atari 800 ROM Cart BBSB", tag, owner, clock, "a800_bbsb", __FILE__) { } -xegs_rom_device::xegs_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +xegs_rom_device::xegs_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a800_rom_device(mconfig, XEGS_ROM, "Atari XEGS 64K ROM Carts", tag, owner, clock, "a800_xegs", __FILE__), m_bank(0) { } -a800_rom_williams_device::a800_rom_williams_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a800_rom_williams_device::a800_rom_williams_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a800_rom_device(mconfig, A800_ROM_WILLIAMS, "Atari 800 64K ROM Carts Williams", tag, owner, clock, "a800_williams", __FILE__), m_bank(0) { } -a800_rom_express_device::a800_rom_express_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a800_rom_express_device::a800_rom_express_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a800_rom_device(mconfig, A800_ROM_EXPRESS, "Atari 800 64K ROM Carts Express/Diamond", tag, owner, clock, "a800_express", __FILE__), m_bank(0) { } -a800_rom_turbo_device::a800_rom_turbo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a800_rom_turbo_device::a800_rom_turbo_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a800_rom_device(mconfig, A800_ROM_TURBO, "Atari 800 64K ROM Carts Turbosoft", tag, owner, clock, "a800_turbo", __FILE__), m_bank(0) { } -a800_rom_telelink2_device::a800_rom_telelink2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a800_rom_telelink2_device::a800_rom_telelink2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a800_rom_device(mconfig, A800_ROM_TELELINK2, "Atari 800 64K ROM Cart Telelink II", tag, owner, clock, "a800_tlink2", __FILE__) { } -a800_rom_microcalc_device::a800_rom_microcalc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a800_rom_microcalc_device::a800_rom_microcalc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a800_rom_device(mconfig, A800_ROM_MICROCALC, "Atari 800 64K ROM Cart SITSA MicroCalc", tag, owner, clock, "a800_sitsa", __FILE__), m_bank(0) { } -a5200_rom_2chips_device::a5200_rom_2chips_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a5200_rom_2chips_device::a5200_rom_2chips_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a800_rom_device(mconfig, A5200_ROM_2CHIPS, "Atari 5200 ROM Cart 16K in 2 Chips", tag, owner, clock, "a5200_16k2c", __FILE__) { } -a5200_rom_bbsb_device::a5200_rom_bbsb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a5200_rom_bbsb_device::a5200_rom_bbsb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a800_rom_device(mconfig, A5200_ROM_BBSB, "Atari 5200 ROM Cart BBSB", tag, owner, clock, "a5200_bbsb", __FILE__) { } diff --git a/src/devices/bus/a800/rom.h b/src/devices/bus/a800/rom.h index f02b5be43ef..03ed54272ab 100644 --- a/src/devices/bus/a800/rom.h +++ b/src/devices/bus/a800/rom.h @@ -13,8 +13,8 @@ class a800_rom_device : public device_t, { public: // construction/destruction - a800_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - a800_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a800_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a800_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -30,7 +30,7 @@ class a800_rom_bbsb_device : public a800_rom_device { public: // construction/destruction - a800_rom_bbsb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a800_rom_bbsb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -50,7 +50,7 @@ class a800_rom_williams_device : public a800_rom_device { public: // construction/destruction - a800_rom_williams_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a800_rom_williams_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -70,7 +70,7 @@ class a800_rom_express_device : public a800_rom_device { public: // construction/destruction - a800_rom_express_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a800_rom_express_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -90,7 +90,7 @@ class a800_rom_blizzard_device : public a800_rom_device { public: // construction/destruction - a800_rom_blizzard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a800_rom_blizzard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -106,7 +106,7 @@ class a800_rom_turbo_device : public a800_rom_device { public: // construction/destruction - a800_rom_turbo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a800_rom_turbo_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -126,7 +126,7 @@ class a800_rom_telelink2_device : public a800_rom_device { public: // construction/destruction - a800_rom_telelink2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a800_rom_telelink2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual DECLARE_READ8_MEMBER(read_80xx) override; virtual DECLARE_WRITE8_MEMBER(write_80xx) override; @@ -141,7 +141,7 @@ class a800_rom_microcalc_device : public a800_rom_device { public: // construction/destruction - a800_rom_microcalc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a800_rom_microcalc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -161,7 +161,7 @@ class xegs_rom_device : public a800_rom_device { public: // construction/destruction - xegs_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + xegs_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -181,7 +181,7 @@ class a5200_rom_2chips_device : public a800_rom_device { public: // construction/destruction - a5200_rom_2chips_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a5200_rom_2chips_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual DECLARE_READ8_MEMBER(read_80xx) override; }; @@ -193,7 +193,7 @@ class a5200_rom_bbsb_device : public a800_rom_device { public: // construction/destruction - a5200_rom_bbsb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a5200_rom_bbsb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/a800/sparta.cpp b/src/devices/bus/a800/sparta.cpp index 44204cd7fa7..c5981e225ae 100644 --- a/src/devices/bus/a800/sparta.cpp +++ b/src/devices/bus/a800/sparta.cpp @@ -18,7 +18,7 @@ const device_type A800_ROM_SPARTADOS = &device_creator<a800_rom_spartados_device>; -a800_rom_spartados_device::a800_rom_spartados_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a800_rom_spartados_device::a800_rom_spartados_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a800_rom_device(mconfig, A800_ROM_SPARTADOS, "Atari 800 SpartaDOS ROM Carts", tag, owner, clock, "a800_sparta", __FILE__), m_bank(0), m_subslot_enabled(0) diff --git a/src/devices/bus/a800/sparta.h b/src/devices/bus/a800/sparta.h index 5588cb464fd..586d1c7f7b1 100644 --- a/src/devices/bus/a800/sparta.h +++ b/src/devices/bus/a800/sparta.h @@ -12,7 +12,7 @@ class a800_rom_spartados_device : public a800_rom_device { public: // construction/destruction - a800_rom_spartados_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a800_rom_spartados_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/abcbus/abc890.cpp b/src/devices/bus/abcbus/abc890.cpp index dc2b88106ae..34fa28a8de4 100644 --- a/src/devices/bus/abcbus/abc890.cpp +++ b/src/devices/bus/abcbus/abc890.cpp @@ -186,39 +186,39 @@ machine_config_constructor abc856_t::device_mconfig_additions() const // abc890_t - constructor //------------------------------------------------- -abc890_t::abc890_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +abc890_t::abc890_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_abcbus_card_interface(mconfig, *this) { } -abc890_t::abc890_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +abc890_t::abc890_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ABC890, "ABC 890", tag, owner, clock, "abc890", __FILE__), device_abcbus_card_interface(mconfig, *this) { } -abc_expansion_unit_t::abc_expansion_unit_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +abc_expansion_unit_t::abc_expansion_unit_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : abc890_t(mconfig, ABC_EXPANSION_UNIT, "ABC Expansion Unit", tag, owner, clock, "abcexp", __FILE__) { } -abc894_t::abc894_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +abc894_t::abc894_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : abc890_t(mconfig, ABC894, "ABC 894", tag, owner, clock, "abc894", __FILE__) { } -abc850_t::abc850_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +abc850_t::abc850_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : abc890_t(mconfig, ABC850, "ABC 850", tag, owner, clock, "abc850", __FILE__) { } -abc852_t::abc852_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +abc852_t::abc852_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : abc890_t(mconfig, ABC852, "ABC 852", tag, owner, clock, "abc852", __FILE__) { } -abc856_t::abc856_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +abc856_t::abc856_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : abc890_t(mconfig, ABC856, "ABC 856", tag, owner, clock, "abc856", __FILE__) { } diff --git a/src/devices/bus/abcbus/abc890.h b/src/devices/bus/abcbus/abc890.h index 0cedef00e45..aefebfe0249 100644 --- a/src/devices/bus/abcbus/abc890.h +++ b/src/devices/bus/abcbus/abc890.h @@ -27,8 +27,8 @@ class abc890_t : public device_t, { public: // construction/destruction - abc890_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - abc890_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + abc890_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + abc890_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -58,7 +58,7 @@ class abc_expansion_unit_t : public abc890_t { public: // construction/destruction - abc_expansion_unit_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + abc_expansion_unit_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -71,7 +71,7 @@ class abc894_t : public abc890_t { public: // construction/destruction - abc894_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + abc894_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -84,7 +84,7 @@ class abc850_t : public abc890_t { public: // construction/destruction - abc850_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + abc850_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -97,7 +97,7 @@ class abc852_t : public abc890_t { public: // construction/destruction - abc852_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + abc852_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -110,7 +110,7 @@ class abc856_t : public abc890_t { public: // construction/destruction - abc856_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + abc856_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/abcbus/abcbus.cpp b/src/devices/bus/abcbus/abcbus.cpp index 4bec92bc417..5ef954a49e5 100644 --- a/src/devices/bus/abcbus/abcbus.cpp +++ b/src/devices/bus/abcbus/abcbus.cpp @@ -37,7 +37,7 @@ device_abcbus_card_interface::device_abcbus_card_interface(const machine_config // abcbus_slot_t - constructor //------------------------------------------------- -abcbus_slot_t::abcbus_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +abcbus_slot_t::abcbus_slot_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ABCBUS_SLOT, "ABCBUS slot", tag, owner, clock, "abcbus_slot", __FILE__), device_slot_interface(mconfig, *this), m_write_irq(*this), diff --git a/src/devices/bus/abcbus/abcbus.h b/src/devices/bus/abcbus/abcbus.h index 24ecb23b7ff..e676078db25 100644 --- a/src/devices/bus/abcbus/abcbus.h +++ b/src/devices/bus/abcbus/abcbus.h @@ -205,7 +205,7 @@ class abcbus_slot_t : public device_t, { public: // construction/destruction - abcbus_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + abcbus_slot_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template<class _irq> void set_irq_callback(_irq irq) { m_write_irq.set_callback(irq); } template<class _nmi> void set_nmi_callback(_nmi nmi) { m_write_nmi.set_callback(nmi); } diff --git a/src/devices/bus/abcbus/fd2.cpp b/src/devices/bus/abcbus/fd2.cpp index 6a7c4cc5f4d..c84c857689c 100644 --- a/src/devices/bus/abcbus/fd2.cpp +++ b/src/devices/bus/abcbus/fd2.cpp @@ -276,7 +276,7 @@ machine_config_constructor abc_fd2_t::device_mconfig_additions() const // abc_fd2_t - constructor //------------------------------------------------- -abc_fd2_t::abc_fd2_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +abc_fd2_t::abc_fd2_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ABC_FD2, "ABC FD2", tag, owner, clock, "abc_fd2", __FILE__), device_abcbus_card_interface(mconfig, *this), m_maincpu(*this, Z80_TAG), diff --git a/src/devices/bus/abcbus/fd2.h b/src/devices/bus/abcbus/fd2.h index 752c97d818b..b3c53467cea 100644 --- a/src/devices/bus/abcbus/fd2.h +++ b/src/devices/bus/abcbus/fd2.h @@ -32,7 +32,7 @@ class abc_fd2_t : public device_t, { public: // construction/destruction - abc_fd2_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + abc_fd2_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/abcbus/hdc.cpp b/src/devices/bus/abcbus/hdc.cpp index 7450f60819e..0d0e0d29c08 100644 --- a/src/devices/bus/abcbus/hdc.cpp +++ b/src/devices/bus/abcbus/hdc.cpp @@ -111,7 +111,7 @@ machine_config_constructor abc_hdc_device::device_mconfig_additions() const // abc_hdc_device - constructor //------------------------------------------------- -abc_hdc_device::abc_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +abc_hdc_device::abc_hdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ABC_HDC, "ABC HDC", tag, owner, clock, "abc_hdc", __FILE__), device_abcbus_card_interface(mconfig, *this), m_maincpu(*this, Z80_TAG) diff --git a/src/devices/bus/abcbus/hdc.h b/src/devices/bus/abcbus/hdc.h index 565a3302a88..53a67561a03 100644 --- a/src/devices/bus/abcbus/hdc.h +++ b/src/devices/bus/abcbus/hdc.h @@ -30,7 +30,7 @@ class abc_hdc_device : public device_t, { public: // construction/destruction - abc_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + abc_hdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/abcbus/lux10828.cpp b/src/devices/bus/abcbus/lux10828.cpp index 32bc5e619bc..9efd8f38041 100644 --- a/src/devices/bus/abcbus/lux10828.cpp +++ b/src/devices/bus/abcbus/lux10828.cpp @@ -403,7 +403,7 @@ ioport_constructor luxor_55_10828_device::device_input_ports() const // luxor_55_10828_device - constructor //------------------------------------------------- -luxor_55_10828_device::luxor_55_10828_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +luxor_55_10828_device::luxor_55_10828_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, LUXOR_55_10828, "Luxor 55 10828", tag, owner, clock, "lux10828", __FILE__), device_abcbus_card_interface(mconfig, *this), m_maincpu(*this, Z80_TAG), diff --git a/src/devices/bus/abcbus/lux10828.h b/src/devices/bus/abcbus/lux10828.h index 1d48f042013..e04f9caf51a 100644 --- a/src/devices/bus/abcbus/lux10828.h +++ b/src/devices/bus/abcbus/lux10828.h @@ -54,7 +54,7 @@ class luxor_55_10828_device : public device_t, { public: // construction/destruction - luxor_55_10828_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + luxor_55_10828_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_WRITE8_MEMBER( ctrl_w ); DECLARE_WRITE8_MEMBER( status_w ); diff --git a/src/devices/bus/abcbus/lux21046.cpp b/src/devices/bus/abcbus/lux21046.cpp index 733aee9538e..b7245a93b6f 100644 --- a/src/devices/bus/abcbus/lux21046.cpp +++ b/src/devices/bus/abcbus/lux21046.cpp @@ -740,7 +740,7 @@ ioport_constructor abc850_floppy_device::device_input_ports() const // luxor_55_21046_device - constructor //------------------------------------------------- -luxor_55_21046_device::luxor_55_21046_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +luxor_55_21046_device::luxor_55_21046_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, LUXOR_55_21046, "Luxor 55 21046", tag, owner, clock, "lux21046", __FILE__), device_abcbus_card_interface(mconfig, *this), m_maincpu(*this, Z80_TAG), @@ -760,7 +760,7 @@ luxor_55_21046_device::luxor_55_21046_device(const machine_config &mconfig, cons { } -luxor_55_21046_device::luxor_55_21046_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +luxor_55_21046_device::luxor_55_21046_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_abcbus_card_interface(mconfig, *this), m_maincpu(*this, Z80_TAG), @@ -780,27 +780,27 @@ luxor_55_21046_device::luxor_55_21046_device(const machine_config &mconfig, devi { } -abc830_device::abc830_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +abc830_device::abc830_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : luxor_55_21046_device(mconfig, ABC830, "ABC 830", tag, owner, clock, "abc830", __FILE__) { } -abc832_device::abc832_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +abc832_device::abc832_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : luxor_55_21046_device(mconfig, ABC832, "ABC 832", tag, owner, clock, "abc832", __FILE__) { } -abc834_device::abc834_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +abc834_device::abc834_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : luxor_55_21046_device(mconfig, ABC834, "ABC 834", tag, owner, clock, "abc834", __FILE__) { } -abc838_device::abc838_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +abc838_device::abc838_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : luxor_55_21046_device(mconfig, ABC838, "ABC 838", tag, owner, clock, "abc838", __FILE__) { } -abc850_floppy_device::abc850_floppy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +abc850_floppy_device::abc850_floppy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : luxor_55_21046_device(mconfig, ABC850_FLOPPY, "ABC 850 floppy", tag, owner, clock, "lux21046", __FILE__) { } diff --git a/src/devices/bus/abcbus/lux21046.h b/src/devices/bus/abcbus/lux21046.h index da6a5ef5c66..b1916bf5e62 100644 --- a/src/devices/bus/abcbus/lux21046.h +++ b/src/devices/bus/abcbus/lux21046.h @@ -53,8 +53,8 @@ class luxor_55_21046_device : public device_t, { public: // construction/destruction - luxor_55_21046_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - luxor_55_21046_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + luxor_55_21046_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + luxor_55_21046_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -123,7 +123,7 @@ class abc830_device : public luxor_55_21046_device { public: // construction/destruction - abc830_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + abc830_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -137,7 +137,7 @@ class abc832_device : public luxor_55_21046_device { public: // construction/destruction - abc832_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + abc832_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -151,7 +151,7 @@ class abc834_device : public luxor_55_21046_device { public: // construction/destruction - abc834_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + abc834_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -165,7 +165,7 @@ class abc838_device : public luxor_55_21046_device { public: // construction/destruction - abc838_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + abc838_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -179,7 +179,7 @@ class abc850_floppy_device : public luxor_55_21046_device { public: // construction/destruction - abc850_floppy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + abc850_floppy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/abcbus/lux21056.cpp b/src/devices/bus/abcbus/lux21056.cpp index f506c1b8e01..537a33eabf2 100644 --- a/src/devices/bus/abcbus/lux21056.cpp +++ b/src/devices/bus/abcbus/lux21056.cpp @@ -337,7 +337,7 @@ ioport_constructor luxor_55_21056_device::device_input_ports() const // luxor_55_21056_device - constructor //------------------------------------------------- -luxor_55_21056_device::luxor_55_21056_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +luxor_55_21056_device::luxor_55_21056_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, LUXOR_55_21056, "Luxor 55 21056", tag, owner, clock, "lux21056", __FILE__), device_abcbus_card_interface(mconfig, *this), m_maincpu(*this, Z80_TAG), diff --git a/src/devices/bus/abcbus/lux21056.h b/src/devices/bus/abcbus/lux21056.h index c5fde193476..5263ec87443 100644 --- a/src/devices/bus/abcbus/lux21056.h +++ b/src/devices/bus/abcbus/lux21056.h @@ -31,7 +31,7 @@ class luxor_55_21056_device : public device_t, { public: // construction/destruction - luxor_55_21056_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + luxor_55_21056_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/abcbus/lux4105.cpp b/src/devices/bus/abcbus/lux4105.cpp index 3f5c5ea76f5..3b60d9306d0 100644 --- a/src/devices/bus/abcbus/lux4105.cpp +++ b/src/devices/bus/abcbus/lux4105.cpp @@ -174,7 +174,7 @@ inline void luxor_4105_device::update_trrq_int() // luxor_4105_device - constructor //------------------------------------------------- -luxor_4105_device::luxor_4105_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +luxor_4105_device::luxor_4105_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, LUXOR_4105, "Luxor 4105", tag, owner, clock, "lux4105", __FILE__), device_abcbus_card_interface(mconfig, *this), m_sasibus(*this, SASIBUS_TAG), diff --git a/src/devices/bus/abcbus/lux4105.h b/src/devices/bus/abcbus/lux4105.h index b1c2731db8d..71925983463 100644 --- a/src/devices/bus/abcbus/lux4105.h +++ b/src/devices/bus/abcbus/lux4105.h @@ -37,7 +37,7 @@ class luxor_4105_device : public device_t, { public: // construction/destruction - luxor_4105_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + luxor_4105_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/abcbus/memcard.cpp b/src/devices/bus/abcbus/memcard.cpp index c7fbd2f3f31..92756bb837d 100644 --- a/src/devices/bus/abcbus/memcard.cpp +++ b/src/devices/bus/abcbus/memcard.cpp @@ -109,7 +109,7 @@ const rom_entry *abc_memory_card_t::device_rom_region() const // abc_memory_card_t - constructor //------------------------------------------------- -abc_memory_card_t::abc_memory_card_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +abc_memory_card_t::abc_memory_card_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ABC_MEMORY_CARD, "ABC Memory Card", tag, owner, clock, "abc_mem", __FILE__), device_abcbus_card_interface(mconfig, *this), m_dos_rom(*this, "dos"), diff --git a/src/devices/bus/abcbus/memcard.h b/src/devices/bus/abcbus/memcard.h index 7fb79f435fe..eab6ac18d68 100644 --- a/src/devices/bus/abcbus/memcard.h +++ b/src/devices/bus/abcbus/memcard.h @@ -27,7 +27,7 @@ class abc_memory_card_t : public device_t, { public: // construction/destruction - abc_memory_card_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + abc_memory_card_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/abcbus/ram.cpp b/src/devices/bus/abcbus/ram.cpp index a91e29bd9c7..0d702bcd0ec 100644 --- a/src/devices/bus/abcbus/ram.cpp +++ b/src/devices/bus/abcbus/ram.cpp @@ -26,7 +26,7 @@ const device_type ABC80_16KB_RAM_CARD = &device_creator<abc80_16kb_ram_card_t>; // abc80_16kb_ram_card_t - constructor //------------------------------------------------- -abc80_16kb_ram_card_t::abc80_16kb_ram_card_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +abc80_16kb_ram_card_t::abc80_16kb_ram_card_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ABC80_16KB_RAM_CARD, "ABC 80 16KB RAM card", tag, owner, clock, "abc80_16kb", __FILE__), device_abcbus_card_interface(mconfig, *this), m_ram(*this, "ram") diff --git a/src/devices/bus/abcbus/ram.h b/src/devices/bus/abcbus/ram.h index 1be225d3008..ec6eb42529c 100644 --- a/src/devices/bus/abcbus/ram.h +++ b/src/devices/bus/abcbus/ram.h @@ -27,7 +27,7 @@ class abc80_16kb_ram_card_t : public device_t, { public: // construction/destruction - abc80_16kb_ram_card_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + abc80_16kb_ram_card_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/abcbus/sio.cpp b/src/devices/bus/abcbus/sio.cpp index fe4d93ac2e7..0cda86586a0 100644 --- a/src/devices/bus/abcbus/sio.cpp +++ b/src/devices/bus/abcbus/sio.cpp @@ -101,7 +101,7 @@ machine_config_constructor abc_sio_device::device_mconfig_additions() const // abc_sio_device - constructor //------------------------------------------------- -abc_sio_device::abc_sio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +abc_sio_device::abc_sio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ABC_SIO, "ABC SIO", tag, owner, clock, "abcsio", __FILE__), device_abcbus_card_interface(mconfig, *this), m_ctc(*this, Z80CTC_TAG), diff --git a/src/devices/bus/abcbus/sio.h b/src/devices/bus/abcbus/sio.h index e76b4ad07a4..ef44545bd88 100644 --- a/src/devices/bus/abcbus/sio.h +++ b/src/devices/bus/abcbus/sio.h @@ -23,7 +23,7 @@ class abc_sio_device : public device_t, { public: // construction/destruction - abc_sio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + abc_sio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/abcbus/slutprov.cpp b/src/devices/bus/abcbus/slutprov.cpp index bd1184c15c5..b7f04ffbffd 100644 --- a/src/devices/bus/abcbus/slutprov.cpp +++ b/src/devices/bus/abcbus/slutprov.cpp @@ -40,7 +40,7 @@ const rom_entry *abc_slutprov_device::device_rom_region() const // abc_slutprov_device - constructor //------------------------------------------------- -abc_slutprov_device::abc_slutprov_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +abc_slutprov_device::abc_slutprov_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ABC_SLUTPROV, "Slutprov", tag, owner, clock, "slutprov", __FILE__), device_abcbus_card_interface(mconfig, *this) { diff --git a/src/devices/bus/abcbus/slutprov.h b/src/devices/bus/abcbus/slutprov.h index f5b7cf661fb..e8b533eb44f 100644 --- a/src/devices/bus/abcbus/slutprov.h +++ b/src/devices/bus/abcbus/slutprov.h @@ -21,7 +21,7 @@ class abc_slutprov_device : public device_t, { public: // construction/destruction - abc_slutprov_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + abc_slutprov_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/abcbus/turbo.cpp b/src/devices/bus/abcbus/turbo.cpp index 449f4697a48..78ffcea8096 100644 --- a/src/devices/bus/abcbus/turbo.cpp +++ b/src/devices/bus/abcbus/turbo.cpp @@ -109,7 +109,7 @@ machine_config_constructor turbo_kontroller_device::device_mconfig_additions() c // turbo_kontroller_device - constructor //------------------------------------------------- -turbo_kontroller_device::turbo_kontroller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +turbo_kontroller_device::turbo_kontroller_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, TURBO_KONTROLLER, "Turbo-Kontroller", tag, owner, clock, "unidisk", __FILE__), device_abcbus_card_interface(mconfig, *this), m_maincpu(*this, Z80_TAG) diff --git a/src/devices/bus/abcbus/turbo.h b/src/devices/bus/abcbus/turbo.h index b4678c4b14c..dda38cd6f00 100644 --- a/src/devices/bus/abcbus/turbo.h +++ b/src/devices/bus/abcbus/turbo.h @@ -29,7 +29,7 @@ class turbo_kontroller_device : public device_t, { public: // construction/destruction - turbo_kontroller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + turbo_kontroller_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/abcbus/uni800.cpp b/src/devices/bus/abcbus/uni800.cpp index 9d22dc0a6cd..1a95eecaa4d 100644 --- a/src/devices/bus/abcbus/uni800.cpp +++ b/src/devices/bus/abcbus/uni800.cpp @@ -71,7 +71,7 @@ const rom_entry *abc_uni800_device::device_rom_region() const // abc_uni800_device - constructor //------------------------------------------------- -abc_uni800_device::abc_uni800_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +abc_uni800_device::abc_uni800_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ABC_UNI800, "UNI-800", tag, owner, clock, "uni800", __FILE__), device_abcbus_card_interface(mconfig, *this) { diff --git a/src/devices/bus/abcbus/uni800.h b/src/devices/bus/abcbus/uni800.h index be1d9086c4e..94d57681324 100644 --- a/src/devices/bus/abcbus/uni800.h +++ b/src/devices/bus/abcbus/uni800.h @@ -21,7 +21,7 @@ class abc_uni800_device : public device_t, { public: // construction/destruction - abc_uni800_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + abc_uni800_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/abckb/abc77.cpp b/src/devices/bus/abckb/abc77.cpp index ecf70d0864b..ff11b75977b 100644 --- a/src/devices/bus/abckb/abc77.cpp +++ b/src/devices/bus/abckb/abc77.cpp @@ -421,7 +421,7 @@ inline void abc77_device::key_down(int state) // abc77_device - constructor //------------------------------------------------- -abc77_device::abc77_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +abc77_device::abc77_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ABC77, "Luxor ABC 77", tag, owner, clock, "abc77", __FILE__), abc_keyboard_interface(mconfig, *this), m_maincpu(*this, I8035_TAG), @@ -446,7 +446,7 @@ abc77_device::abc77_device(const machine_config &mconfig, const char *tag, devic { } -abc77_device::abc77_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +abc77_device::abc77_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), abc_keyboard_interface(mconfig, *this), m_maincpu(*this, I8035_TAG), @@ -471,7 +471,7 @@ abc77_device::abc77_device(const machine_config &mconfig, device_type type, cons { } -abc55_device::abc55_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +abc55_device::abc55_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : abc77_device(mconfig, ABC55, "Luxor ABC 55", tag, owner, clock, "abc55", __FILE__) { } diff --git a/src/devices/bus/abckb/abc77.h b/src/devices/bus/abckb/abc77.h index 340dd86f8c6..6283989fe3c 100644 --- a/src/devices/bus/abckb/abc77.h +++ b/src/devices/bus/abckb/abc77.h @@ -30,8 +30,8 @@ class abc77_device : public device_t, { public: // construction/destruction - abc77_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - abc77_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + abc77_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + abc77_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -100,7 +100,7 @@ class abc55_device : public abc77_device { public: // construction/destruction - abc55_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + abc55_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/abckb/abc800kb.cpp b/src/devices/bus/abckb/abc800kb.cpp index 511b1fe7c91..deae6c27c3a 100644 --- a/src/devices/bus/abckb/abc800kb.cpp +++ b/src/devices/bus/abckb/abc800kb.cpp @@ -332,7 +332,7 @@ inline void abc800_keyboard_device::key_down(int state) // abc800_keyboard_device - constructor //------------------------------------------------- -abc800_keyboard_device::abc800_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +abc800_keyboard_device::abc800_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ABC800_KEYBOARD, "ABC-800 Keyboard", tag, owner, clock, "abc800kb", __FILE__), abc_keyboard_interface(mconfig, *this), m_maincpu(*this, I8048_TAG), diff --git a/src/devices/bus/abckb/abc800kb.h b/src/devices/bus/abckb/abc800kb.h index 61e55826d54..6f0872415e7 100644 --- a/src/devices/bus/abckb/abc800kb.h +++ b/src/devices/bus/abckb/abc800kb.h @@ -30,7 +30,7 @@ class abc800_keyboard_device : public device_t, { public: // construction/destruction - abc800_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + abc800_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/abckb/abc99.cpp b/src/devices/bus/abckb/abc99.cpp index 8dc4d9e75c7..e03b68fd62a 100644 --- a/src/devices/bus/abckb/abc99.cpp +++ b/src/devices/bus/abckb/abc99.cpp @@ -485,7 +485,7 @@ inline void abc99_device::scan_mouse() // abc99_device - constructor //------------------------------------------------- -abc99_device::abc99_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +abc99_device::abc99_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ABC99, "Luxor ABC 99", tag, owner, clock, "abc99", __FILE__), abc_keyboard_interface(mconfig, *this), m_serial_timer(nullptr), m_mouse_timer(nullptr), m_maincpu(*this, I8035_Z2_TAG), diff --git a/src/devices/bus/abckb/abc99.h b/src/devices/bus/abckb/abc99.h index 5ca05436a0b..aef36067156 100644 --- a/src/devices/bus/abckb/abc99.h +++ b/src/devices/bus/abckb/abc99.h @@ -29,7 +29,7 @@ class abc99_device : public device_t, { public: // construction/destruction - abc99_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + abc99_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/abckb/abckb.cpp b/src/devices/bus/abckb/abckb.cpp index 6eeab0fdc67..78398af3d3e 100644 --- a/src/devices/bus/abckb/abckb.cpp +++ b/src/devices/bus/abckb/abckb.cpp @@ -42,7 +42,7 @@ abc_keyboard_interface::abc_keyboard_interface(const machine_config &mconfig, de // abc_keyboard_port_device - constructor //------------------------------------------------- -abc_keyboard_port_device::abc_keyboard_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +abc_keyboard_port_device::abc_keyboard_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ABC_KEYBOARD_PORT, "Luxor ABC keyboard port", tag, owner, clock, "abc_keyboard_port", __FILE__), device_slot_interface(mconfig, *this), m_out_rx_handler(*this), diff --git a/src/devices/bus/abckb/abckb.h b/src/devices/bus/abckb/abckb.h index 513350acc53..96d9efb5327 100644 --- a/src/devices/bus/abckb/abckb.h +++ b/src/devices/bus/abckb/abckb.h @@ -45,7 +45,7 @@ class abc_keyboard_port_device : public device_t, { public: // construction/destruction - abc_keyboard_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + abc_keyboard_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template<class _Object> static devcb_base &set_out_rx_handler(device_t &device, _Object object) { return downcast<abc_keyboard_port_device &>(device).m_out_rx_handler.set_callback(object); } template<class _Object> static devcb_base &set_out_trxc_handler(device_t &device, _Object object) { return downcast<abc_keyboard_port_device &>(device).m_out_trxc_handler.set_callback(object); } diff --git a/src/devices/bus/adam/adamlink.cpp b/src/devices/bus/adam/adamlink.cpp index 1ae12b1156f..8c6ee5d283a 100644 --- a/src/devices/bus/adam/adamlink.cpp +++ b/src/devices/bus/adam/adamlink.cpp @@ -26,7 +26,7 @@ const device_type ADAMLINK = &device_creator<adamlink_device>; // adamlink_device - constructor //------------------------------------------------- -adamlink_device::adamlink_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +adamlink_device::adamlink_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ADAMLINK, "AdamLink modem", tag, owner, clock, "adamlink", __FILE__), device_adam_expansion_slot_card_interface(mconfig, *this) { diff --git a/src/devices/bus/adam/adamlink.h b/src/devices/bus/adam/adamlink.h index 25818966ef6..c3fa0ea1761 100644 --- a/src/devices/bus/adam/adamlink.h +++ b/src/devices/bus/adam/adamlink.h @@ -27,7 +27,7 @@ class adamlink_device : public device_t, { public: // construction/destruction - adamlink_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + adamlink_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/adam/exp.cpp b/src/devices/bus/adam/exp.cpp index 3c43a400ff0..47e8f8ca385 100644 --- a/src/devices/bus/adam/exp.cpp +++ b/src/devices/bus/adam/exp.cpp @@ -51,7 +51,7 @@ device_adam_expansion_slot_card_interface::device_adam_expansion_slot_card_inter // adam_expansion_slot_device - constructor //------------------------------------------------- -adam_expansion_slot_device::adam_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +adam_expansion_slot_device::adam_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ADAM_EXPANSION_SLOT, "ADAM expansion slot", tag, owner, clock, "adam_expansion_slot", __FILE__), device_slot_interface(mconfig, *this), device_image_interface(mconfig, *this), diff --git a/src/devices/bus/adam/exp.h b/src/devices/bus/adam/exp.h index bd764c667c9..51847b7d499 100644 --- a/src/devices/bus/adam/exp.h +++ b/src/devices/bus/adam/exp.h @@ -53,7 +53,7 @@ class adam_expansion_slot_device : public device_t, { public: // construction/destruction - adam_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + adam_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~adam_expansion_slot_device() { } template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<adam_expansion_slot_device &>(device).m_write_irq.set_callback(object); } diff --git a/src/devices/bus/adam/ide.cpp b/src/devices/bus/adam/ide.cpp index 54d4240f7db..490c01493ff 100644 --- a/src/devices/bus/adam/ide.cpp +++ b/src/devices/bus/adam/ide.cpp @@ -88,7 +88,7 @@ machine_config_constructor powermate_ide_device::device_mconfig_additions() cons // powermate_ide_device - constructor //------------------------------------------------- -powermate_ide_device::powermate_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +powermate_ide_device::powermate_ide_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ADAM_IDE, "Powermate HP IDE", tag, owner, clock, "adam_ide", __FILE__), device_adam_expansion_slot_card_interface(mconfig, *this), m_ata(*this, ATA_TAG), diff --git a/src/devices/bus/adam/ide.h b/src/devices/bus/adam/ide.h index f26f42a3c1d..91eaa71842a 100644 --- a/src/devices/bus/adam/ide.h +++ b/src/devices/bus/adam/ide.h @@ -29,7 +29,7 @@ class powermate_ide_device : public device_t, { public: // construction/destruction - powermate_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + powermate_ide_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/adam/ram.cpp b/src/devices/bus/adam/ram.cpp index 6852de8959a..0278f38fe93 100644 --- a/src/devices/bus/adam/ram.cpp +++ b/src/devices/bus/adam/ram.cpp @@ -26,7 +26,7 @@ const device_type ADAM_RAM = &device_creator<adam_ram_expansion_device>; // adam_ram_expansion_device - constructor //------------------------------------------------- -adam_ram_expansion_device::adam_ram_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +adam_ram_expansion_device::adam_ram_expansion_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ADAM_RAM, "Adam 64KB RAM expansion", tag, owner, clock, "adam_ram", __FILE__), device_adam_expansion_slot_card_interface(mconfig, *this), m_ram(*this, "ram") diff --git a/src/devices/bus/adam/ram.h b/src/devices/bus/adam/ram.h index 5fabdd7e602..49e2e34a31c 100644 --- a/src/devices/bus/adam/ram.h +++ b/src/devices/bus/adam/ram.h @@ -27,7 +27,7 @@ class adam_ram_expansion_device : public device_t, { public: // construction/destruction - adam_ram_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + adam_ram_expansion_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/adamnet/adamnet.cpp b/src/devices/bus/adamnet/adamnet.cpp index 487ce1b22d9..b17ebc8a551 100644 --- a/src/devices/bus/adamnet/adamnet.cpp +++ b/src/devices/bus/adamnet/adamnet.cpp @@ -51,7 +51,7 @@ device_adamnet_card_interface::~device_adamnet_card_interface() //------------------------------------------------- // adamnet_slot_device - constructor //------------------------------------------------- -adamnet_slot_device::adamnet_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +adamnet_slot_device::adamnet_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ADAMNET_SLOT, "ADAMnet slot", tag, owner, clock, "adamnet_slot", __FILE__), device_slot_interface(mconfig, *this), m_bus(nullptr) { @@ -79,7 +79,7 @@ void adamnet_slot_device::device_start() // adamnet_device - constructor //------------------------------------------------- -adamnet_device::adamnet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +adamnet_device::adamnet_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ADAMNET, "ADAMnet bus", tag, owner, clock, "adamnet", __FILE__), m_txd(1), m_reset(CLEAR_LINE) @@ -202,7 +202,7 @@ void adamnet_device::txd_w(device_t *device, int state) while (entry) { - if (!strcmp(entry->m_device->tag(), device->tag())) + if (entry->m_device->tag() == device->tag()) { if (entry->m_txd != state) { diff --git a/src/devices/bus/adamnet/adamnet.h b/src/devices/bus/adamnet/adamnet.h index 5ce906d270d..5f8b0d800b7 100644 --- a/src/devices/bus/adamnet/adamnet.h +++ b/src/devices/bus/adamnet/adamnet.h @@ -48,7 +48,7 @@ class adamnet_device : public device_t { public: // construction/destruction - adamnet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + adamnet_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void add_device(device_t *target); @@ -93,7 +93,7 @@ class adamnet_slot_device : public device_t, { public: // construction/destruction - adamnet_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + adamnet_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/adamnet/ddp.cpp b/src/devices/bus/adamnet/ddp.cpp index 2a2f674d0c3..fa37cfdb7c8 100644 --- a/src/devices/bus/adamnet/ddp.cpp +++ b/src/devices/bus/adamnet/ddp.cpp @@ -118,7 +118,7 @@ machine_config_constructor adam_digital_data_pack_device::device_mconfig_additio // adam_digital_data_pack_device - constructor //------------------------------------------------- -adam_digital_data_pack_device::adam_digital_data_pack_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +adam_digital_data_pack_device::adam_digital_data_pack_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ADAM_DDP, "Adam DDP", tag, owner, clock, "adam_ddp", __FILE__), device_adamnet_card_interface(mconfig, *this), m_maincpu(*this, M6801_TAG), diff --git a/src/devices/bus/adamnet/ddp.h b/src/devices/bus/adamnet/ddp.h index 1a2a2402d03..e514a546bf5 100644 --- a/src/devices/bus/adamnet/ddp.h +++ b/src/devices/bus/adamnet/ddp.h @@ -30,7 +30,7 @@ class adam_digital_data_pack_device : public device_t, { public: // construction/destruction - adam_digital_data_pack_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + adam_digital_data_pack_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/adamnet/fdc.cpp b/src/devices/bus/adamnet/fdc.cpp index e83ac70766d..731c61b40bf 100644 --- a/src/devices/bus/adamnet/fdc.cpp +++ b/src/devices/bus/adamnet/fdc.cpp @@ -177,7 +177,7 @@ ioport_constructor adam_fdc_device::device_input_ports() const // adam_fdc_device - constructor //------------------------------------------------- -adam_fdc_device::adam_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +adam_fdc_device::adam_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ADAM_FDC, "Adam FDC", tag, owner, clock, "adam_fdc", __FILE__), device_adamnet_card_interface(mconfig, *this), m_maincpu(*this, M6801_TAG), diff --git a/src/devices/bus/adamnet/fdc.h b/src/devices/bus/adamnet/fdc.h index a8cd3d17648..72230d4e011 100644 --- a/src/devices/bus/adamnet/fdc.h +++ b/src/devices/bus/adamnet/fdc.h @@ -30,7 +30,7 @@ class adam_fdc_device : public device_t, { public: // construction/destruction - adam_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + adam_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/adamnet/kb.cpp b/src/devices/bus/adamnet/kb.cpp index a9cc31b8edf..0499dbc3450 100644 --- a/src/devices/bus/adamnet/kb.cpp +++ b/src/devices/bus/adamnet/kb.cpp @@ -222,7 +222,7 @@ ioport_constructor adam_keyboard_device::device_input_ports() const // adam_keyboard_device - constructor //------------------------------------------------- -adam_keyboard_device::adam_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +adam_keyboard_device::adam_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ADAM_KB, "Adam keyboard", tag, owner, clock, "adam_kb", __FILE__), device_adamnet_card_interface(mconfig, *this), m_maincpu(*this, M6801_TAG), diff --git a/src/devices/bus/adamnet/kb.h b/src/devices/bus/adamnet/kb.h index a9cb98450dd..8c392ab0364 100644 --- a/src/devices/bus/adamnet/kb.h +++ b/src/devices/bus/adamnet/kb.h @@ -28,7 +28,7 @@ class adam_keyboard_device : public device_t, { public: // construction/destruction - adam_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + adam_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/adamnet/printer.cpp b/src/devices/bus/adamnet/printer.cpp index 7de2db87b2e..fc302d397df 100644 --- a/src/devices/bus/adamnet/printer.cpp +++ b/src/devices/bus/adamnet/printer.cpp @@ -100,7 +100,7 @@ machine_config_constructor adam_printer_device::device_mconfig_additions() const // adam_printer_device - constructor //------------------------------------------------- -adam_printer_device::adam_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +adam_printer_device::adam_printer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ADAM_PRN, "Adam printer", tag, owner, clock, "adam_prn", __FILE__), device_adamnet_card_interface(mconfig, *this), m_maincpu(*this, M6801_TAG) diff --git a/src/devices/bus/adamnet/printer.h b/src/devices/bus/adamnet/printer.h index 13025fe5393..e671dce4a2c 100644 --- a/src/devices/bus/adamnet/printer.h +++ b/src/devices/bus/adamnet/printer.h @@ -28,7 +28,7 @@ class adam_printer_device : public device_t, { public: // construction/destruction - adam_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + adam_printer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/adamnet/spi.cpp b/src/devices/bus/adamnet/spi.cpp index 29da38c0b7b..ee1afeee648 100644 --- a/src/devices/bus/adamnet/spi.cpp +++ b/src/devices/bus/adamnet/spi.cpp @@ -109,7 +109,7 @@ machine_config_constructor adam_spi_device::device_mconfig_additions() const // adam_spi_device - constructor //------------------------------------------------- -adam_spi_device::adam_spi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +adam_spi_device::adam_spi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ADAM_SPI, "Adam SPI", tag, owner, clock, "adam_spi", __FILE__), device_adamnet_card_interface(mconfig, *this), m_maincpu(*this, M6801_TAG) diff --git a/src/devices/bus/adamnet/spi.h b/src/devices/bus/adamnet/spi.h index 81abae409e3..7341a3dbbd2 100644 --- a/src/devices/bus/adamnet/spi.h +++ b/src/devices/bus/adamnet/spi.h @@ -31,7 +31,7 @@ class adam_spi_device : public device_t, { public: // construction/destruction - adam_spi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + adam_spi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/amiga/zorro/a2052.cpp b/src/devices/bus/amiga/zorro/a2052.cpp index dc2727d2117..bd1849061c0 100644 --- a/src/devices/bus/amiga/zorro/a2052.cpp +++ b/src/devices/bus/amiga/zorro/a2052.cpp @@ -50,7 +50,7 @@ ioport_constructor a2052_device::device_input_ports() const // a2052_device - constructor //------------------------------------------------- -a2052_device::a2052_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2052_device::a2052_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2052, "CBM A2052 Fast Memory", tag, owner, clock, "a2052", __FILE__), device_zorro2_card_interface(mconfig, *this), m_config(*this, "config") diff --git a/src/devices/bus/amiga/zorro/a2052.h b/src/devices/bus/amiga/zorro/a2052.h index 0c06bac9395..d107d43690c 100644 --- a/src/devices/bus/amiga/zorro/a2052.h +++ b/src/devices/bus/amiga/zorro/a2052.h @@ -28,7 +28,7 @@ class a2052_device : public device_t, public device_zorro2_card_interface, publi { public: // construction/destruction - a2052_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2052_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/amiga/zorro/a2232.cpp b/src/devices/bus/amiga/zorro/a2232.cpp index 4cf44853c46..50368699611 100644 --- a/src/devices/bus/amiga/zorro/a2232.cpp +++ b/src/devices/bus/amiga/zorro/a2232.cpp @@ -151,7 +151,7 @@ machine_config_constructor a2232_device::device_mconfig_additions() const // a2232_device - constructor //------------------------------------------------- -a2232_device::a2232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2232_device::a2232_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2232, "CBM A2232 Serial Card", tag, owner, clock, "a2232", __FILE__), device_zorro2_card_interface(mconfig, *this), m_iocpu(*this, "iocpu"), diff --git a/src/devices/bus/amiga/zorro/a2232.h b/src/devices/bus/amiga/zorro/a2232.h index 2611d243bdb..e6d69df130b 100644 --- a/src/devices/bus/amiga/zorro/a2232.h +++ b/src/devices/bus/amiga/zorro/a2232.h @@ -34,7 +34,7 @@ class a2232_device : public device_t, public device_zorro2_card_interface, publi { public: // construction/destruction - a2232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2232_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // cpu WRITE8_MEMBER( int2_w ); diff --git a/src/devices/bus/amiga/zorro/a590.cpp b/src/devices/bus/amiga/zorro/a590.cpp index 1d66ba99f6e..376e8cd2879 100644 --- a/src/devices/bus/amiga/zorro/a590.cpp +++ b/src/devices/bus/amiga/zorro/a590.cpp @@ -191,7 +191,7 @@ const rom_entry *dmac_hdc_device::device_rom_region() const // dmac_hdc_device - constructor //------------------------------------------------- -dmac_hdc_device::dmac_hdc_device(const machine_config &mconfig, device_type type, const char *tag, +dmac_hdc_device::dmac_hdc_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, const char *shortname) : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__), m_int6(false), @@ -200,7 +200,7 @@ dmac_hdc_device::dmac_hdc_device(const machine_config &mconfig, device_type type { } -a590_device::a590_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a590_device::a590_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : dmac_hdc_device(mconfig, A590, tag, owner, clock, "CBM A590 HD Controller", "a590"), device_exp_card_interface(mconfig, *this), m_dips(*this, "dips"), @@ -210,7 +210,7 @@ a590_device::a590_device(const machine_config &mconfig, const char *tag, device_ { } -a2091_device::a2091_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2091_device::a2091_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : dmac_hdc_device(mconfig, A2091, tag, owner, clock, "CBM A2091 HD Controller", "a2091"), device_zorro2_card_interface(mconfig, *this), m_jp1(*this, "jp1"), diff --git a/src/devices/bus/amiga/zorro/a590.h b/src/devices/bus/amiga/zorro/a590.h index 488585fd0cb..f787d51f260 100644 --- a/src/devices/bus/amiga/zorro/a590.h +++ b/src/devices/bus/amiga/zorro/a590.h @@ -29,7 +29,7 @@ class dmac_hdc_device : public device_t { public: // construction/destruction - dmac_hdc_device(const machine_config &mconfig, device_type type, const char *tag, + dmac_hdc_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, const char *shortname); // optional information overrides @@ -71,7 +71,7 @@ class a590_device : public dmac_hdc_device, public device_exp_card_interface { public: // construction/destruction - a590_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a590_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides @@ -102,7 +102,7 @@ class a2091_device : public dmac_hdc_device, public device_zorro2_card_interface { public: // construction/destruction - a2091_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a2091_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/amiga/zorro/action_replay.cpp b/src/devices/bus/amiga/zorro/action_replay.cpp index 03711e56f1c..510ad153466 100644 --- a/src/devices/bus/amiga/zorro/action_replay.cpp +++ b/src/devices/bus/amiga/zorro/action_replay.cpp @@ -97,7 +97,7 @@ const rom_entry *action_replay_mk3_device::device_rom_region() const // action_replay_device - constructor //------------------------------------------------- -action_replay_device::action_replay_device(const machine_config &mconfig, device_type type, const char *tag, +action_replay_device::action_replay_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, const char *shortname) : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__), device_exp_card_interface(mconfig, *this), @@ -105,17 +105,17 @@ action_replay_device::action_replay_device(const machine_config &mconfig, device { } -action_replay_mk1_device::action_replay_mk1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +action_replay_mk1_device::action_replay_mk1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : action_replay_device(mconfig, ACTION_REPLAY_MK1, tag, owner, clock, "Datel Action Replay MK-I", "amiga_ar1") { } -action_replay_mk2_device::action_replay_mk2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +action_replay_mk2_device::action_replay_mk2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : action_replay_device(mconfig, ACTION_REPLAY_MK1, tag, owner, clock, "Datel Action Replay MK-II", "amiga_ar2") { } -action_replay_mk3_device::action_replay_mk3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +action_replay_mk3_device::action_replay_mk3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : action_replay_device(mconfig, ACTION_REPLAY_MK1, tag, owner, clock, "Datel Action Replay MK-III", "amiga_ar3") { } diff --git a/src/devices/bus/amiga/zorro/action_replay.h b/src/devices/bus/amiga/zorro/action_replay.h index 7e1eb942796..f9f50173e3a 100644 --- a/src/devices/bus/amiga/zorro/action_replay.h +++ b/src/devices/bus/amiga/zorro/action_replay.h @@ -27,7 +27,7 @@ class action_replay_device : public device_t, public device_exp_card_interface { public: // construction/destruction - action_replay_device(const machine_config &mconfig, device_type type, const char *tag, + action_replay_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, const char *shortname); // optional information overrides @@ -48,7 +48,7 @@ class action_replay_mk1_device : public action_replay_device { public: // construction/destruction - action_replay_mk1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + action_replay_mk1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -58,7 +58,7 @@ class action_replay_mk2_device : public action_replay_device { public: // construction/destruction - action_replay_mk2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + action_replay_mk2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -68,7 +68,7 @@ class action_replay_mk3_device : public action_replay_device { public: // construction/destruction - action_replay_mk3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + action_replay_mk3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/amiga/zorro/buddha.cpp b/src/devices/bus/amiga/zorro/buddha.cpp index 6f21e86d9be..45ca9968307 100644 --- a/src/devices/bus/amiga/zorro/buddha.cpp +++ b/src/devices/bus/amiga/zorro/buddha.cpp @@ -67,7 +67,7 @@ const rom_entry *buddha_device::device_rom_region() const // buddha_device - constructor //------------------------------------------------- -buddha_device::buddha_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +buddha_device::buddha_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, BUDDHA, "Buddha IDE controller", tag, owner, clock, "buddha", __FILE__), device_zorro2_card_interface(mconfig, *this), m_ata_0(*this, "ata_0"), diff --git a/src/devices/bus/amiga/zorro/buddha.h b/src/devices/bus/amiga/zorro/buddha.h index f8e213db69d..171cf6ef2d9 100644 --- a/src/devices/bus/amiga/zorro/buddha.h +++ b/src/devices/bus/amiga/zorro/buddha.h @@ -29,7 +29,7 @@ class buddha_device : public device_t, public device_zorro2_card_interface, publ { public: // construction/destruction - buddha_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + buddha_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // speed register DECLARE_READ16_MEMBER( speed_r ); diff --git a/src/devices/bus/amiga/zorro/zorro.cpp b/src/devices/bus/amiga/zorro/zorro.cpp index 72f4eaed43d..b5a8e2768c9 100644 --- a/src/devices/bus/amiga/zorro/zorro.cpp +++ b/src/devices/bus/amiga/zorro/zorro.cpp @@ -21,22 +21,20 @@ const device_type ZORRO_SLOT = &device_creator<zorro_slot_device>; // zorro_slot_device - constructor //------------------------------------------------- -zorro_slot_device::zorro_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +zorro_slot_device::zorro_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ZORRO_SLOT, "Zorro slot", tag, owner, clock, "zorro_slot", __FILE__), - device_slot_interface(mconfig, *this), - m_zorro_tag(nullptr) + device_slot_interface(mconfig, *this) { } zorro_slot_device::zorro_slot_device(const machine_config &mconfig, device_type type, const char *name, - const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : + std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_interface(mconfig, *this), - m_zorro_tag(nullptr) + device_slot_interface(mconfig, *this) { } -void zorro_slot_device::set_zorro_slot(device_t &device, device_t *owner, const char *zorro_tag) +void zorro_slot_device::set_zorro_slot(device_t &device, device_t *owner, std::string zorro_tag) { zorro_slot_device &zorro_card = dynamic_cast<zorro_slot_device &>(device); zorro_card.m_owner = owner; @@ -68,10 +66,9 @@ void zorro_slot_device::device_start() //------------------------------------------------- zorro_device::zorro_device(const machine_config &mconfig, device_type type, const char *name, - const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : + std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_space(nullptr), - m_cputag(nullptr), m_ovr_handler(*this), m_int2_handler(*this), m_int6_handler(*this) @@ -82,7 +79,7 @@ zorro_device::zorro_device(const machine_config &mconfig, device_type type, cons // set_cputag - set cpu we are attached to //------------------------------------------------- -void zorro_device::set_cputag(device_t &device, const char *tag) +void zorro_device::set_cputag(device_t &device, std::string tag) { zorro_device &zorro = downcast<zorro_device &>(device); zorro.m_cputag = tag; @@ -120,7 +117,7 @@ const device_type EXP_SLOT = &device_creator<exp_slot_device>; // exp_slot_device - constructor //------------------------------------------------- -exp_slot_device::exp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +exp_slot_device::exp_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : zorro_device(mconfig, EXP_SLOT, "86-pin expansion slot", tag, owner, clock, "exp_slot", __FILE__), m_ipl_handler(*this), m_dev(nullptr) @@ -128,7 +125,7 @@ exp_slot_device::exp_slot_device(const machine_config &mconfig, const char *tag, } exp_slot_device::exp_slot_device(const machine_config &mconfig, device_type type, const char *name, - const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : + std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : zorro_device(mconfig, type, name, tag, owner, clock, shortname, source), m_ipl_handler(*this), m_dev(nullptr) @@ -186,7 +183,7 @@ const device_type ZORRO2 = &device_creator<zorro2_device>; // zorro2_device - constructor //------------------------------------------------- -zorro2_device::zorro2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +zorro2_device::zorro2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : zorro_device(mconfig, ZORRO2, "Zorro-II bus", tag, owner, clock, "zorro2", __FILE__), m_eint1_handler(*this), m_eint4_handler(*this), @@ -197,7 +194,7 @@ zorro2_device::zorro2_device(const machine_config &mconfig, const char *tag, dev } zorro2_device::zorro2_device(const machine_config &mconfig, device_type type, const char *name, - const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : + std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : zorro_device(mconfig, type, name, tag, owner, clock, shortname, source), m_eint1_handler(*this), m_eint4_handler(*this), diff --git a/src/devices/bus/amiga/zorro/zorro.h b/src/devices/bus/amiga/zorro/zorro.h index fb14b7f09ca..ad52934f200 100644 --- a/src/devices/bus/amiga/zorro/zorro.h +++ b/src/devices/bus/amiga/zorro/zorro.h @@ -228,19 +228,19 @@ class zorro_slot_device : public device_t, public device_slot_interface { public: // construction/destruction - zorro_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + zorro_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); zorro_slot_device(const machine_config &mconfig, device_type type, const char *name, - const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides virtual void device_start() override; // inline configuration - static void set_zorro_slot(device_t &device, device_t *owner, const char *zorro_tag); + static void set_zorro_slot(device_t &device, device_t *owner, std::string zorro_tag); protected: // configuration - const char *m_zorro_tag; + std::string m_zorro_tag; }; // device type definition @@ -253,10 +253,10 @@ class zorro_device : public device_t public: // construction/destruction zorro_device(const machine_config &mconfig, device_type type, const char *name, - const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // static configuration helpers - static void set_cputag(device_t &device, const char *tag); + static void set_cputag(device_t &device, std::string tag); template<class _Object> static devcb_base &set_int2_handler(device_t &device, _Object object) { return downcast<zorro_device &>(device).m_int2_handler.set_callback(object); } @@ -285,7 +285,7 @@ protected: virtual void device_start() override; private: - const char *m_cputag; + std::string m_cputag; devcb_write_line m_ovr_handler; devcb_write_line m_int2_handler; @@ -298,9 +298,9 @@ class exp_slot_device : public zorro_device { public: // construction/destruction - exp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + exp_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); exp_slot_device(const machine_config &mconfig, device_type type, const char *name, - const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); template<class _Object> static devcb_base &set_ipl_handler(device_t &device, _Object object) { return downcast<exp_slot_device &>(device).m_ipl_handler.set_callback(object); } @@ -334,9 +334,9 @@ class zorro2_device : public zorro_device { public: // construction/destruction - zorro2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + zorro2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); zorro2_device(const machine_config &mconfig, device_type type, const char *name, - const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); ~zorro2_device(); template<class _Object> static devcb_base &set_eint1_handler(device_t &device, _Object object) diff --git a/src/devices/bus/apf/rom.cpp b/src/devices/bus/apf/rom.cpp index 9eb83e4f12c..c4f89d584dd 100644 --- a/src/devices/bus/apf/rom.cpp +++ b/src/devices/bus/apf/rom.cpp @@ -22,24 +22,24 @@ const device_type APF_ROM_BASIC = &device_creator<apf_basic_device>; const device_type APF_ROM_SPACEDST = &device_creator<apf_spacedst_device>; -apf_rom_device::apf_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +apf_rom_device::apf_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_apf_cart_interface( mconfig, *this ) { } -apf_rom_device::apf_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +apf_rom_device::apf_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, APF_ROM_STD, "APF Standard Carts", tag, owner, clock, "apf_rom", __FILE__), device_apf_cart_interface( mconfig, *this ) { } -apf_basic_device::apf_basic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +apf_basic_device::apf_basic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : apf_rom_device(mconfig, APF_ROM_BASIC, "APF BASIC Carts", tag, owner, clock, "apf_basic", __FILE__) { } -apf_spacedst_device::apf_spacedst_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +apf_spacedst_device::apf_spacedst_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : apf_rom_device(mconfig, APF_ROM_SPACEDST, "APF Space Destroyer Cart", tag, owner, clock, "apf_spacedst", __FILE__) { } diff --git a/src/devices/bus/apf/rom.h b/src/devices/bus/apf/rom.h index d7c3b748014..54706a528a5 100644 --- a/src/devices/bus/apf/rom.h +++ b/src/devices/bus/apf/rom.h @@ -13,8 +13,8 @@ class apf_rom_device : public device_t, { public: // construction/destruction - apf_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - apf_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + apf_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + apf_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override {} @@ -30,7 +30,7 @@ class apf_basic_device : public apf_rom_device { public: // construction/destruction - apf_basic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + apf_basic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(extra_rom) override; @@ -42,7 +42,7 @@ class apf_spacedst_device : public apf_rom_device { public: // construction/destruction - apf_spacedst_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + apf_spacedst_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_ram) override; diff --git a/src/devices/bus/apf/slot.cpp b/src/devices/bus/apf/slot.cpp index eb2e17d9f80..20e1cc287ed 100644 --- a/src/devices/bus/apf/slot.cpp +++ b/src/devices/bus/apf/slot.cpp @@ -45,7 +45,7 @@ device_apf_cart_interface::~device_apf_cart_interface() // rom_alloc - alloc the space for the cart //------------------------------------------------- -void device_apf_cart_interface::rom_alloc(UINT32 size, const char *tag) +void device_apf_cart_interface::rom_alloc(UINT32 size, std::string tag) { if (m_rom == nullptr) { @@ -72,7 +72,7 @@ void device_apf_cart_interface::ram_alloc(UINT32 size) //------------------------------------------------- // apf_cart_slot_device - constructor //------------------------------------------------- -apf_cart_slot_device::apf_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +apf_cart_slot_device::apf_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, APF_CART_SLOT, "APF Cartridge Slot", tag, owner, clock, "apf_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), diff --git a/src/devices/bus/apf/slot.h b/src/devices/bus/apf/slot.h index e8260ab55bc..5266b2d17ab 100644 --- a/src/devices/bus/apf/slot.h +++ b/src/devices/bus/apf/slot.h @@ -32,7 +32,7 @@ public: virtual DECLARE_READ8_MEMBER(read_ram) { return 0xff; } virtual DECLARE_WRITE8_MEMBER(write_ram) {} - void rom_alloc(UINT32 size, const char *tag); + void rom_alloc(UINT32 size, std::string tag); void ram_alloc(UINT32 size); UINT8* get_rom_base() { return m_rom; } UINT8* get_ram_base() { return &m_ram[0]; } @@ -57,7 +57,7 @@ class apf_cart_slot_device : public device_t, { public: // construction/destruction - apf_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + apf_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~apf_cart_slot_device(); // device-level overrides diff --git a/src/devices/bus/apricot/expansion.cpp b/src/devices/bus/apricot/expansion.cpp index 5dd7eb5ae58..bca4c71705c 100644 --- a/src/devices/bus/apricot/expansion.cpp +++ b/src/devices/bus/apricot/expansion.cpp @@ -19,14 +19,14 @@ const device_type APRICOT_EXPANSION_SLOT = &device_creator<apricot_expansion_slo // apricot_expansion_slot_device - constructor //------------------------------------------------- -apricot_expansion_slot_device::apricot_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +apricot_expansion_slot_device::apricot_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, APRICOT_EXPANSION_SLOT, "Apricot Expansion Slot", tag, owner, clock, "apricot_exp_slot", __FILE__), device_slot_interface(mconfig, *this) { } apricot_expansion_slot_device::apricot_expansion_slot_device(const machine_config &mconfig, device_type type, const char *name, - const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : + std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_slot_interface(mconfig, *this) { @@ -58,7 +58,7 @@ const device_type APRICOT_EXPANSION_BUS = &device_creator<apricot_expansion_bus_ // apricot_expansion_bus_device - constructor //------------------------------------------------- -apricot_expansion_bus_device::apricot_expansion_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +apricot_expansion_bus_device::apricot_expansion_bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, APRICOT_EXPANSION_BUS, "Apricot Expansion Bus", tag, owner, clock, "apricot_exp_bus", __FILE__), m_program(nullptr), m_io(nullptr), @@ -69,7 +69,7 @@ apricot_expansion_bus_device::apricot_expansion_bus_device(const machine_config m_ext1_handler(*this), m_ext2_handler(*this), m_int2_handler(*this), - m_int3_handler(*this), m_cpu_tag(nullptr), m_iop_tag(nullptr) + m_int3_handler(*this) { } @@ -126,7 +126,7 @@ void apricot_expansion_bus_device::add_card(device_apricot_expansion_card_interf // set_cpu_tag - set cpu we are attached to //------------------------------------------------- -void apricot_expansion_bus_device::set_cpu_tag(device_t &device, device_t *owner, const char *tag) +void apricot_expansion_bus_device::set_cpu_tag(device_t &device, device_t *owner, std::string tag) { apricot_expansion_bus_device &bus = dynamic_cast<apricot_expansion_bus_device &>(device); bus.m_cpu_tag = tag; @@ -136,7 +136,7 @@ void apricot_expansion_bus_device::set_cpu_tag(device_t &device, device_t *owner // set_iop_tag - set iop we are attached to //------------------------------------------------- -void apricot_expansion_bus_device::set_iop_tag(device_t &device, device_t *owner, const char *tag) +void apricot_expansion_bus_device::set_iop_tag(device_t &device, device_t *owner, std::string tag) { apricot_expansion_bus_device &bus = dynamic_cast<apricot_expansion_bus_device &>(device); bus.m_iop_tag = tag; diff --git a/src/devices/bus/apricot/expansion.h b/src/devices/bus/apricot/expansion.h index fc581f50fb4..94a5f4f8fbd 100644 --- a/src/devices/bus/apricot/expansion.h +++ b/src/devices/bus/apricot/expansion.h @@ -97,9 +97,9 @@ class apricot_expansion_slot_device : public device_t, public device_slot_interf { public: // construction/destruction - apricot_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + apricot_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); apricot_expansion_slot_device(const machine_config &mconfig, device_type type, const char *name, - const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides virtual void device_start() override; @@ -115,7 +115,7 @@ class apricot_expansion_bus_device : public device_t { public: // construction/destruction - apricot_expansion_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + apricot_expansion_bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~apricot_expansion_bus_device(); template<class _Object> static devcb_base &set_dma1_handler(device_t &device, _Object object) @@ -137,8 +137,8 @@ public: { return downcast<apricot_expansion_bus_device &>(device).m_int3_handler.set_callback(object); } // inline configuration - static void set_cpu_tag(device_t &device, device_t *owner, const char *tag); - static void set_iop_tag(device_t &device, device_t *owner, const char *tag); + static void set_cpu_tag(device_t &device, device_t *owner, std::string tag); + static void set_iop_tag(device_t &device, device_t *owner, std::string tag); void add_card(device_apricot_expansion_card_interface *card); @@ -174,8 +174,8 @@ private: devcb_write_line m_int3_handler; // configuration - const char *m_cpu_tag; - const char *m_iop_tag; + std::string m_cpu_tag; + std::string m_iop_tag; }; // device type definition diff --git a/src/devices/bus/apricot/ram.cpp b/src/devices/bus/apricot/ram.cpp index 2221ae37227..f72356e3a99 100644 --- a/src/devices/bus/apricot/ram.cpp +++ b/src/devices/bus/apricot/ram.cpp @@ -42,7 +42,7 @@ ioport_constructor apricot_256k_ram_device::device_input_ports() const // apricot_256k_ram_device - constructor //------------------------------------------------- -apricot_256k_ram_device::apricot_256k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +apricot_256k_ram_device::apricot_256k_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, APRICOT_256K_RAM, "Apricot 256K RAM Expansion Board", tag, owner, clock, "apricot_256k_ram", __FILE__), device_apricot_expansion_card_interface(mconfig, *this), m_sw(*this, "sw") @@ -96,7 +96,7 @@ ioport_constructor apricot_128k_ram_device::device_input_ports() const // apricot_128_512k_ram_device - constructor //------------------------------------------------- -apricot_128k_ram_device::apricot_128k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +apricot_128k_ram_device::apricot_128k_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, APRICOT_128K_RAM, "Apricot 128/512K RAM Expansion Board (128K)", tag, owner, clock, "apricot_128k_ram", __FILE__), device_apricot_expansion_card_interface(mconfig, *this), m_strap(*this, "strap") @@ -150,7 +150,7 @@ ioport_constructor apricot_512k_ram_device::device_input_ports() const // apricot_128_512k_ram_device - constructor //------------------------------------------------- -apricot_512k_ram_device::apricot_512k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +apricot_512k_ram_device::apricot_512k_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, APRICOT_512K_RAM, "Apricot 128/512K RAM Expansion Board (512K)", tag, owner, clock, "apricot_512k_ram", __FILE__), device_apricot_expansion_card_interface(mconfig, *this), m_strap(*this, "strap") diff --git a/src/devices/bus/apricot/ram.h b/src/devices/bus/apricot/ram.h index c2b2f771953..0f7eefd7e99 100644 --- a/src/devices/bus/apricot/ram.h +++ b/src/devices/bus/apricot/ram.h @@ -26,7 +26,7 @@ class apricot_256k_ram_device : public device_t, public device_apricot_expansion { public: // construction/destruction - apricot_256k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + apricot_256k_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: virtual ioport_constructor device_input_ports() const override; @@ -46,7 +46,7 @@ class apricot_128k_ram_device : public device_t, public device_apricot_expansion { public: // construction/destruction - apricot_128k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + apricot_128k_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: virtual ioport_constructor device_input_ports() const override; @@ -66,7 +66,7 @@ class apricot_512k_ram_device : public device_t, public device_apricot_expansion { public: // construction/destruction - apricot_512k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + apricot_512k_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/arcadia/rom.cpp b/src/devices/bus/arcadia/rom.cpp index 5a6186aa8de..d1734061b56 100644 --- a/src/devices/bus/arcadia/rom.cpp +++ b/src/devices/bus/arcadia/rom.cpp @@ -22,19 +22,19 @@ const device_type ARCADIA_ROM_STD = &device_creator<arcadia_rom_device>; const device_type ARCADIA_ROM_GOLF = &device_creator<arcadia_golf_device>; -arcadia_rom_device::arcadia_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +arcadia_rom_device::arcadia_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_arcadia_cart_interface( mconfig, *this ) { } -arcadia_rom_device::arcadia_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +arcadia_rom_device::arcadia_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ARCADIA_ROM_STD, "Emerson Arcadia Standard Carts", tag, owner, clock, "arcadia_rom", __FILE__), device_arcadia_cart_interface( mconfig, *this ) { } -arcadia_golf_device::arcadia_golf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +arcadia_golf_device::arcadia_golf_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : arcadia_rom_device(mconfig, ARCADIA_ROM_GOLF, "Emerson Arcadia Golf Cart", tag, owner, clock, "arcadia_golf", __FILE__) { } diff --git a/src/devices/bus/arcadia/rom.h b/src/devices/bus/arcadia/rom.h index 3e1c55e60c0..57b51cb7baf 100644 --- a/src/devices/bus/arcadia/rom.h +++ b/src/devices/bus/arcadia/rom.h @@ -13,8 +13,8 @@ class arcadia_rom_device : public device_t, { public: // construction/destruction - arcadia_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - arcadia_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + arcadia_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + arcadia_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override {} @@ -31,7 +31,7 @@ class arcadia_golf_device : public arcadia_rom_device { public: // construction/destruction - arcadia_golf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + arcadia_golf_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/bus/arcadia/slot.cpp b/src/devices/bus/arcadia/slot.cpp index 3a6aee846ab..760b899bc38 100644 --- a/src/devices/bus/arcadia/slot.cpp +++ b/src/devices/bus/arcadia/slot.cpp @@ -45,7 +45,7 @@ device_arcadia_cart_interface::~device_arcadia_cart_interface() // rom_alloc - alloc the space for the cart //------------------------------------------------- -void device_arcadia_cart_interface::rom_alloc(UINT32 size, const char *tag) +void device_arcadia_cart_interface::rom_alloc(UINT32 size, std::string tag) { if (m_rom == nullptr) { @@ -62,7 +62,7 @@ void device_arcadia_cart_interface::rom_alloc(UINT32 size, const char *tag) //------------------------------------------------- // arcadia_cart_slot_device - constructor //------------------------------------------------- -arcadia_cart_slot_device::arcadia_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +arcadia_cart_slot_device::arcadia_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, EA2001_CART_SLOT, "Emerson Arcadia Cartridge Slot", tag, owner, clock, "arcadia_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), diff --git a/src/devices/bus/arcadia/slot.h b/src/devices/bus/arcadia/slot.h index e018b40595d..1bbf8467f23 100644 --- a/src/devices/bus/arcadia/slot.h +++ b/src/devices/bus/arcadia/slot.h @@ -29,7 +29,7 @@ public: virtual DECLARE_READ8_MEMBER(read_rom) { return 0xff; } virtual DECLARE_READ8_MEMBER(extra_rom) { return 0xff; } - void rom_alloc(UINT32 size, const char *tag); + void rom_alloc(UINT32 size, std::string tag); UINT8* get_rom_base() { return m_rom; } UINT32 get_rom_size() { return m_rom_size; } @@ -48,7 +48,7 @@ class arcadia_cart_slot_device : public device_t, { public: // construction/destruction - arcadia_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + arcadia_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~arcadia_cart_slot_device(); // device-level overrides diff --git a/src/devices/bus/astrocde/exp.cpp b/src/devices/bus/astrocde/exp.cpp index 2d6e7eb51b3..5c81eb6b4ef 100644 --- a/src/devices/bus/astrocde/exp.cpp +++ b/src/devices/bus/astrocde/exp.cpp @@ -35,7 +35,7 @@ device_astrocade_card_interface::~device_astrocade_card_interface() //------------------------------------------------- // astrocade_exp_device - constructor //------------------------------------------------- -astrocade_exp_device::astrocade_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +astrocade_exp_device::astrocade_exp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ASTROCADE_EXP_SLOT, "Bally Astrocade expansion", tag, owner, clock, "astrocde_exp", __FILE__), device_slot_interface(mconfig, *this), m_card_mounted(false), m_card(nullptr) diff --git a/src/devices/bus/astrocde/exp.h b/src/devices/bus/astrocde/exp.h index b2d6e3643ea..31326a2db29 100644 --- a/src/devices/bus/astrocde/exp.h +++ b/src/devices/bus/astrocde/exp.h @@ -25,7 +25,7 @@ class astrocade_exp_device : public device_t, { public: // construction/destruction - astrocade_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + astrocade_exp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~astrocade_exp_device(); // device-level overrides diff --git a/src/devices/bus/astrocde/ram.cpp b/src/devices/bus/astrocde/ram.cpp index 95ebb6816aa..c63a13af887 100644 --- a/src/devices/bus/astrocde/ram.cpp +++ b/src/devices/bus/astrocde/ram.cpp @@ -68,45 +68,45 @@ const device_type ASTROCADE_WHITERAM = &device_creator<astrocade_whiteram_dev const device_type ASTROCADE_RL64RAM = &device_creator<astrocade_rl64ram_device>; -astrocade_blueram_4k_device::astrocade_blueram_4k_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +astrocade_blueram_4k_device::astrocade_blueram_4k_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_astrocade_card_interface(mconfig, *this), m_write_prot(*this, "RAM_PROTECT") { } -astrocade_blueram_4k_device::astrocade_blueram_4k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +astrocade_blueram_4k_device::astrocade_blueram_4k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ASTROCADE_BLUERAM_4K, "Bally Astrocade Blue RAM 4K", tag, owner, clock, "astrocade_br4", __FILE__), device_astrocade_card_interface(mconfig, *this), m_write_prot(*this, "RAM_PROTECT") { } -astrocade_blueram_16k_device::astrocade_blueram_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +astrocade_blueram_16k_device::astrocade_blueram_16k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : astrocade_blueram_4k_device(mconfig, ASTROCADE_BLUERAM_16K, "Bally Astrocade Blue RAM 16K", tag, owner, clock, "astrocade_br16", __FILE__) { } -astrocade_blueram_32k_device::astrocade_blueram_32k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +astrocade_blueram_32k_device::astrocade_blueram_32k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : astrocade_blueram_4k_device(mconfig, ASTROCADE_BLUERAM_32K, "Bally Astrocade Blue RAM 32K", tag, owner, clock, "astrocade_br32", __FILE__) { } -astrocade_viper_sys1_device::astrocade_viper_sys1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +astrocade_viper_sys1_device::astrocade_viper_sys1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ASTROCADE_VIPER_SYS1, "Bally Astrocade Viper System 1", tag, owner, clock, "astrocade_vs1", __FILE__), device_astrocade_card_interface(mconfig, *this), m_write_prot(*this, "RAM_PROTECT") { } -astrocade_whiteram_device::astrocade_whiteram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +astrocade_whiteram_device::astrocade_whiteram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ASTROCADE_WHITERAM, "Bally Astrocade Lil' White RAM 32K", tag, owner, clock, "astrocade_lwr", __FILE__), device_astrocade_card_interface(mconfig, *this), m_write_prot(*this, "RAM_PROTECT") { } -astrocade_rl64ram_device::astrocade_rl64ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +astrocade_rl64ram_device::astrocade_rl64ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ASTROCADE_RL64RAM, "Bally Astrocade R&L RAM 64K", tag, owner, clock, "astrocade_rl64", __FILE__), device_astrocade_card_interface(mconfig, *this), m_write_prot(*this, "RAM_PROTECT") diff --git a/src/devices/bus/astrocde/ram.h b/src/devices/bus/astrocde/ram.h index 673e7bef8d9..b279056b9cb 100644 --- a/src/devices/bus/astrocde/ram.h +++ b/src/devices/bus/astrocde/ram.h @@ -13,8 +13,8 @@ class astrocade_blueram_4k_device : public device_t, { public: // construction/destruction - astrocade_blueram_4k_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - astrocade_blueram_4k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + astrocade_blueram_4k_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + astrocade_blueram_4k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override { m_ram.resize(0x1000); save_item(NAME(m_ram)); } @@ -36,7 +36,7 @@ class astrocade_blueram_16k_device : public astrocade_blueram_4k_device { public: // construction/destruction - astrocade_blueram_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + astrocade_blueram_16k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void device_start() override { m_ram.resize(0x4000); save_item(NAME(m_ram)); } }; @@ -47,7 +47,7 @@ class astrocade_blueram_32k_device : public astrocade_blueram_4k_device { public: // construction/destruction - astrocade_blueram_32k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + astrocade_blueram_32k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void device_start() override { m_ram.resize(0x8000); save_item(NAME(m_ram)); } }; @@ -59,7 +59,7 @@ class astrocade_viper_sys1_device : public device_t, { public: // construction/destruction - astrocade_viper_sys1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + astrocade_viper_sys1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override { m_ram.resize(0x4000); save_item(NAME(m_ram)); } @@ -82,7 +82,7 @@ class astrocade_whiteram_device : public device_t, { public: // construction/destruction - astrocade_whiteram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + astrocade_whiteram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override { m_ram.resize(0x8000); save_item(NAME(m_ram)); } @@ -105,7 +105,7 @@ class astrocade_rl64ram_device : public device_t, { public: // construction/destruction - astrocade_rl64ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + astrocade_rl64ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override { m_ram.resize(0xb000); save_item(NAME(m_ram)); } diff --git a/src/devices/bus/astrocde/rom.cpp b/src/devices/bus/astrocde/rom.cpp index 201a4d1afe6..31a9bc0934f 100644 --- a/src/devices/bus/astrocde/rom.cpp +++ b/src/devices/bus/astrocde/rom.cpp @@ -22,24 +22,24 @@ const device_type ASTROCADE_ROM_256K = &device_creator<astrocade_rom_256k_device const device_type ASTROCADE_ROM_512K = &device_creator<astrocade_rom_512k_device>; -astrocade_rom_device::astrocade_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +astrocade_rom_device::astrocade_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_astrocade_cart_interface(mconfig, *this) { } -astrocade_rom_device::astrocade_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +astrocade_rom_device::astrocade_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ASTROCADE_ROM_STD, "Bally Astrocade Standard Carts", tag, owner, clock, "astrocade_rom", __FILE__), device_astrocade_cart_interface(mconfig, *this) { } -astrocade_rom_256k_device::astrocade_rom_256k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +astrocade_rom_256k_device::astrocade_rom_256k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : astrocade_rom_device(mconfig, ASTROCADE_ROM_256K, "Bally Astrocade 256K Carts", tag, owner, clock, "astrocade_256k", __FILE__), m_base_bank(0) { } -astrocade_rom_512k_device::astrocade_rom_512k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +astrocade_rom_512k_device::astrocade_rom_512k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : astrocade_rom_device(mconfig, ASTROCADE_ROM_512K, "Bally Astrocade 512K Carts", tag, owner, clock, "astrocade_512k", __FILE__), m_base_bank(0) { } diff --git a/src/devices/bus/astrocde/rom.h b/src/devices/bus/astrocde/rom.h index 28fcb0d43bb..531e10bbbb2 100644 --- a/src/devices/bus/astrocde/rom.h +++ b/src/devices/bus/astrocde/rom.h @@ -13,8 +13,8 @@ class astrocade_rom_device : public device_t, { public: // construction/destruction - astrocade_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - astrocade_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + astrocade_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + astrocade_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override {} @@ -30,7 +30,7 @@ class astrocade_rom_256k_device : public astrocade_rom_device { public: // construction/destruction - astrocade_rom_256k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + astrocade_rom_256k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void device_start() override; virtual void device_reset() override; @@ -48,7 +48,7 @@ class astrocade_rom_512k_device : public astrocade_rom_device { public: // construction/destruction - astrocade_rom_512k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + astrocade_rom_512k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void device_start() override; virtual void device_reset() override; diff --git a/src/devices/bus/astrocde/slot.cpp b/src/devices/bus/astrocde/slot.cpp index 8ae7bbe8c15..0faaf550865 100644 --- a/src/devices/bus/astrocde/slot.cpp +++ b/src/devices/bus/astrocde/slot.cpp @@ -45,7 +45,7 @@ device_astrocade_cart_interface::~device_astrocade_cart_interface() // rom_alloc - alloc the space for the cart //------------------------------------------------- -void device_astrocade_cart_interface::rom_alloc(UINT32 size, const char *tag) +void device_astrocade_cart_interface::rom_alloc(UINT32 size, std::string tag) { if (m_rom == nullptr) { @@ -62,7 +62,7 @@ void device_astrocade_cart_interface::rom_alloc(UINT32 size, const char *tag) //------------------------------------------------- // astrocade_cart_slot_device - constructor //------------------------------------------------- -astrocade_cart_slot_device::astrocade_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +astrocade_cart_slot_device::astrocade_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ASTROCADE_CART_SLOT, "Bally Astrocade Cartridge Slot", tag, owner, clock, "astrocade_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), diff --git a/src/devices/bus/astrocde/slot.h b/src/devices/bus/astrocde/slot.h index 1a28ccf4b96..2a22a3a64a0 100644 --- a/src/devices/bus/astrocde/slot.h +++ b/src/devices/bus/astrocde/slot.h @@ -29,7 +29,7 @@ public: // reading and writing virtual DECLARE_READ8_MEMBER(read_rom) { return 0xff; } - void rom_alloc(UINT32 size, const char *tag); + void rom_alloc(UINT32 size, std::string tag); UINT8* get_rom_base() { return m_rom; } UINT32 get_rom_size() { return m_rom_size; } @@ -48,7 +48,7 @@ class astrocade_cart_slot_device : public device_t, { public: // construction/destruction - astrocade_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + astrocade_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~astrocade_cart_slot_device(); // device-level overrides diff --git a/src/devices/bus/bml3/bml3bus.cpp b/src/devices/bus/bml3/bml3bus.cpp index 0438cc58997..d28e7f49ca8 100644 --- a/src/devices/bus/bml3/bml3bus.cpp +++ b/src/devices/bus/bml3/bml3bus.cpp @@ -60,19 +60,19 @@ const device_type BML3BUS_SLOT = &device_creator<bml3bus_slot_device>; //------------------------------------------------- // bml3bus_slot_device - constructor //------------------------------------------------- -bml3bus_slot_device::bml3bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +bml3bus_slot_device::bml3bus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, BML3BUS_SLOT, "Hitachi MB-6890 Slot", tag, owner, clock, "bml3bus_slot", __FILE__), - device_slot_interface(mconfig, *this), m_bml3bus_tag(nullptr), m_bml3bus_slottag(nullptr) + device_slot_interface(mconfig, *this) { } -bml3bus_slot_device::bml3bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +bml3bus_slot_device::bml3bus_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_interface(mconfig, *this), m_bml3bus_tag(nullptr), m_bml3bus_slottag(nullptr) + device_slot_interface(mconfig, *this) { } -void bml3bus_slot_device::static_set_bml3bus_slot(device_t &device, const char *tag, const char *slottag) +void bml3bus_slot_device::static_set_bml3bus_slot(device_t &device, std::string tag, std::string slottag) { bml3bus_slot_device &bml3bus_card = dynamic_cast<bml3bus_slot_device &>(device); bml3bus_card.m_bml3bus_tag = tag; @@ -96,7 +96,7 @@ void bml3bus_slot_device::device_start() const device_type BML3BUS = &device_creator<bml3bus_device>; -void bml3bus_device::static_set_cputag(device_t &device, const char *tag) +void bml3bus_device::static_set_cputag(device_t &device, std::string tag) { bml3bus_device &bml3bus = downcast<bml3bus_device &>(device); bml3bus.m_cputag = tag; @@ -110,19 +110,19 @@ void bml3bus_device::static_set_cputag(device_t &device, const char *tag) // bml3bus_device - constructor //------------------------------------------------- -bml3bus_device::bml3bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +bml3bus_device::bml3bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, BML3BUS, "Hitachi MB-6890 Bus", tag, owner, clock, "bml3bus", __FILE__), m_maincpu(nullptr), m_out_nmi_cb(*this), m_out_irq_cb(*this), - m_out_firq_cb(*this), m_cputag(nullptr) + m_out_firq_cb(*this) { } -bml3bus_device::bml3bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +bml3bus_device::bml3bus_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr), m_out_nmi_cb(*this), m_out_irq_cb(*this), - m_out_firq_cb(*this), m_cputag(nullptr) + m_out_firq_cb(*this) { } //------------------------------------------------- @@ -204,7 +204,7 @@ WRITE_LINE_MEMBER( bml3bus_device::firq_w ) { m_out_firq_cb(state); } device_bml3bus_card_interface::device_bml3bus_card_interface(const machine_config &mconfig, device_t &device) : device_slot_card_interface(mconfig, device), m_bml3bus(nullptr), - m_bml3bus_tag(nullptr), m_bml3bus_slottag(nullptr), m_slot(0), m_next(nullptr) + m_slot(0), m_next(nullptr) { } @@ -217,7 +217,7 @@ device_bml3bus_card_interface::~device_bml3bus_card_interface() { } -void device_bml3bus_card_interface::static_set_bml3bus_tag(device_t &device, const char *tag, const char *slottag) +void device_bml3bus_card_interface::static_set_bml3bus_tag(device_t &device, std::string tag, std::string slottag) { device_bml3bus_card_interface &bml3bus_card = dynamic_cast<device_bml3bus_card_interface &>(device); bml3bus_card.m_bml3bus_tag = tag; @@ -227,7 +227,7 @@ void device_bml3bus_card_interface::static_set_bml3bus_tag(device_t &device, con void device_bml3bus_card_interface::set_bml3bus_device() { // extract the slot number from the last digit of the slot tag - int tlen = strlen(m_bml3bus_slottag); + int tlen = strlen(m_bml3bus_slottag.c_str()); m_slot = (m_bml3bus_slottag[tlen-1] - '1'); diff --git a/src/devices/bus/bml3/bml3bus.h b/src/devices/bus/bml3/bml3bus.h index 36c20f4159e..a7c9b82d63a 100644 --- a/src/devices/bus/bml3/bml3bus.h +++ b/src/devices/bus/bml3/bml3bus.h @@ -56,17 +56,18 @@ class bml3bus_slot_device : public device_t, { public: // construction/destruction - bml3bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - bml3bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + bml3bus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + bml3bus_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides virtual void device_start() override; // inline configuration - static void static_set_bml3bus_slot(device_t &device, const char *tag, const char *slottag); + static void static_set_bml3bus_slot(device_t &device, std::string tag, std::string slottag); protected: // configuration - const char *m_bml3bus_tag, *m_bml3bus_slottag; + std::string m_bml3bus_tag; + std::string m_bml3bus_slottag; }; // device type definition @@ -79,11 +80,11 @@ class bml3bus_device : public device_t { public: // construction/destruction - bml3bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - bml3bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + bml3bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + bml3bus_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // inline configuration - static void static_set_cputag(device_t &device, const char *tag); + static void static_set_cputag(device_t &device, std::string tag); template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<bml3bus_device &>(device).m_out_nmi_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<bml3bus_device &>(device).m_out_irq_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_firq_callback(device_t &device, _Object object) { return downcast<bml3bus_device &>(device).m_out_firq_cb.set_callback(object); } @@ -112,7 +113,7 @@ protected: devcb_write_line m_out_firq_cb; device_bml3bus_card_interface *m_device_list[BML3BUS_MAX_SLOTS]; - const char *m_cputag; + std::string m_cputag; }; @@ -142,10 +143,11 @@ public: void lower_slot_firq() { m_bml3bus->set_firq_line(CLEAR_LINE); } // inline configuration - static void static_set_bml3bus_tag(device_t &device, const char *tag, const char *slottag); + static void static_set_bml3bus_tag(device_t &device, std::string tag, std::string slottag); public: bml3bus_device *m_bml3bus; - const char *m_bml3bus_tag, *m_bml3bus_slottag; + std::string m_bml3bus_tag; + std::string m_bml3bus_slottag; int m_slot; device_bml3bus_card_interface *m_next; }; diff --git a/src/devices/bus/bml3/bml3kanji.cpp b/src/devices/bus/bml3/bml3kanji.cpp index 0b0d4f519e2..105fac45a7f 100644 --- a/src/devices/bus/bml3/bml3kanji.cpp +++ b/src/devices/bus/bml3/bml3kanji.cpp @@ -72,7 +72,7 @@ WRITE8_MEMBER( bml3bus_kanji_device::bml3_kanji_w ) // LIVE DEVICE //************************************************************************** -bml3bus_kanji_device::bml3bus_kanji_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +bml3bus_kanji_device::bml3bus_kanji_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, BML3BUS_KANJI, "Hitachi MP-9740 Kanji Character ROM Card", tag, owner, clock, "bml3kanji", __FILE__), device_bml3bus_card_interface(mconfig, *this), m_kanji_addr(0), m_rom(nullptr) { diff --git a/src/devices/bus/bml3/bml3kanji.h b/src/devices/bus/bml3/bml3kanji.h index 8a1c8dd24df..443b04cff36 100644 --- a/src/devices/bus/bml3/bml3kanji.h +++ b/src/devices/bus/bml3/bml3kanji.h @@ -24,7 +24,7 @@ class bml3bus_kanji_device: { public: // construction/destruction - bml3bus_kanji_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + bml3bus_kanji_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/bml3/bml3mp1802.cpp b/src/devices/bus/bml3/bml3mp1802.cpp index 911d72c725e..9435c1499aa 100644 --- a/src/devices/bus/bml3/bml3mp1802.cpp +++ b/src/devices/bus/bml3/bml3mp1802.cpp @@ -106,7 +106,7 @@ WRITE8_MEMBER( bml3bus_mp1802_device::bml3_mp1802_w) // LIVE DEVICE //************************************************************************** -bml3bus_mp1802_device::bml3bus_mp1802_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +bml3bus_mp1802_device::bml3bus_mp1802_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, BML3BUS_MP1802, "Hitachi MP-1802 Floppy Controller Card", tag, owner, clock, "bml3mp1802", __FILE__), device_bml3bus_card_interface(mconfig, *this), m_fdc(*this, "fdc"), diff --git a/src/devices/bus/bml3/bml3mp1802.h b/src/devices/bus/bml3/bml3mp1802.h index de42c95261a..75dcddf1747 100644 --- a/src/devices/bus/bml3/bml3mp1802.h +++ b/src/devices/bus/bml3/bml3mp1802.h @@ -28,7 +28,7 @@ class bml3bus_mp1802_device: { public: // construction/destruction - bml3bus_mp1802_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + bml3bus_mp1802_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/bml3/bml3mp1805.cpp b/src/devices/bus/bml3/bml3mp1805.cpp index e1b2317b7c6..3622e65a1cd 100644 --- a/src/devices/bus/bml3/bml3mp1805.cpp +++ b/src/devices/bus/bml3/bml3mp1805.cpp @@ -137,7 +137,7 @@ WRITE8_MEMBER( bml3bus_mp1805_device::bml3_mp1805_w) // LIVE DEVICE //************************************************************************** -bml3bus_mp1805_device::bml3bus_mp1805_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +bml3bus_mp1805_device::bml3bus_mp1805_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, BML3BUS_MP1805, "Hitachi MP-1805 Floppy Controller Card", tag, owner, clock, "bml3mp1805", __FILE__), device_bml3bus_card_interface(mconfig, *this), m_mc6843(*this, "mc6843"), m_rom(nullptr) diff --git a/src/devices/bus/bml3/bml3mp1805.h b/src/devices/bus/bml3/bml3mp1805.h index 57ffdfefcaa..0f79aa21eda 100644 --- a/src/devices/bus/bml3/bml3mp1805.h +++ b/src/devices/bus/bml3/bml3mp1805.h @@ -27,7 +27,7 @@ class bml3bus_mp1805_device: { public: // construction/destruction - bml3bus_mp1805_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + bml3bus_mp1805_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/bw2/exp.cpp b/src/devices/bus/bw2/exp.cpp index c79e85fa90a..63de9efa15f 100644 --- a/src/devices/bus/bw2/exp.cpp +++ b/src/devices/bus/bw2/exp.cpp @@ -51,7 +51,7 @@ device_bw2_expansion_slot_interface::~device_bw2_expansion_slot_interface() // bw2_expansion_slot_device - constructor //------------------------------------------------- -bw2_expansion_slot_device::bw2_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +bw2_expansion_slot_device::bw2_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, BW2_EXPANSION_SLOT, "Bondwell 2 expansion port", tag, owner, clock, "bw2_expansion_slot", __FILE__), device_slot_interface(mconfig, *this), m_cart(nullptr) { diff --git a/src/devices/bus/bw2/exp.h b/src/devices/bus/bw2/exp.h index b9d4fbcc0d8..4e05e8362e6 100644 --- a/src/devices/bus/bw2/exp.h +++ b/src/devices/bus/bw2/exp.h @@ -74,7 +74,7 @@ class bw2_expansion_slot_device : public device_t, { public: // construction/destruction - bw2_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + bw2_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~bw2_expansion_slot_device(); // computer interface diff --git a/src/devices/bus/bw2/ramcard.cpp b/src/devices/bus/bw2/ramcard.cpp index 16f5da689cc..7cc916768be 100644 --- a/src/devices/bus/bw2/ramcard.cpp +++ b/src/devices/bus/bw2/ramcard.cpp @@ -46,7 +46,7 @@ const rom_entry *bw2_ramcard_device::device_rom_region() const // bw2_ramcard_device - constructor //------------------------------------------------- -bw2_ramcard_device::bw2_ramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +bw2_ramcard_device::bw2_ramcard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, BW2_RAMCARD, "RAMCARD", tag, owner, clock, "bw2_ramcard", __FILE__), device_bw2_expansion_slot_interface(mconfig, *this), m_rom(*this, "ramcard"), diff --git a/src/devices/bus/bw2/ramcard.h b/src/devices/bus/bw2/ramcard.h index da66c4d670d..ec4975f9674 100644 --- a/src/devices/bus/bw2/ramcard.h +++ b/src/devices/bus/bw2/ramcard.h @@ -27,7 +27,7 @@ class bw2_ramcard_device : public device_t, { public: // construction/destruction - bw2_ramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + bw2_ramcard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/c64/16kb.cpp b/src/devices/bus/c64/16kb.cpp index 2964073aa1a..bfe8c19c6b1 100644 --- a/src/devices/bus/c64/16kb.cpp +++ b/src/devices/bus/c64/16kb.cpp @@ -73,7 +73,7 @@ ioport_constructor c64_16kb_cartridge_device::device_input_ports() const // c64_16kb_cartridge_device - constructor //------------------------------------------------- -c64_16kb_cartridge_device::c64_16kb_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_16kb_cartridge_device::c64_16kb_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_16KB, "C64 16KB EPROM cartridge", tag, owner, clock, "c64_16kb", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_sw1(*this, "SW1"), diff --git a/src/devices/bus/c64/16kb.h b/src/devices/bus/c64/16kb.h index fd4b7a50fcb..78a07d07e20 100644 --- a/src/devices/bus/c64/16kb.h +++ b/src/devices/bus/c64/16kb.h @@ -30,7 +30,7 @@ class c64_16kb_cartridge_device : public device_t, { public: // construction/destruction - c64_16kb_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_16kb_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/c64/4dxh.cpp b/src/devices/bus/c64/4dxh.cpp index 2dd54543203..fd36ad3dd9e 100644 --- a/src/devices/bus/c64/4dxh.cpp +++ b/src/devices/bus/c64/4dxh.cpp @@ -61,7 +61,7 @@ ioport_constructor c64_4dxh_device::device_input_ports() const // c64_4dxh_device - constructor //------------------------------------------------- -c64_4dxh_device::c64_4dxh_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_4dxh_device::c64_4dxh_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_4DXH, "C64 DXH 4-Player Adapter", tag, owner, clock, "c64_4dxh", __FILE__), device_pet_user_port_interface(mconfig, *this) { diff --git a/src/devices/bus/c64/4dxh.h b/src/devices/bus/c64/4dxh.h index a8a0a684fe5..f1133ab4df2 100644 --- a/src/devices/bus/c64/4dxh.h +++ b/src/devices/bus/c64/4dxh.h @@ -28,7 +28,7 @@ class c64_4dxh_device : public device_t, { public: // construction/destruction - c64_4dxh_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_4dxh_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/c64/4ksa.cpp b/src/devices/bus/c64/4ksa.cpp index 749053fde32..2002b98b14b 100644 --- a/src/devices/bus/c64/4ksa.cpp +++ b/src/devices/bus/c64/4ksa.cpp @@ -61,7 +61,7 @@ ioport_constructor c64_4ksa_device::device_input_ports() const // c64_4ksa_device - constructor //------------------------------------------------- -c64_4ksa_device::c64_4ksa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_4ksa_device::c64_4ksa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_4KSA, "C64 Kingsoft 4-Player Adapter", tag, owner, clock, "c64_4ksa", __FILE__), device_pet_user_port_interface(mconfig, *this) { diff --git a/src/devices/bus/c64/4ksa.h b/src/devices/bus/c64/4ksa.h index bbb61e0bf73..311917056a7 100644 --- a/src/devices/bus/c64/4ksa.h +++ b/src/devices/bus/c64/4ksa.h @@ -28,7 +28,7 @@ class c64_4ksa_device : public device_t, { public: // construction/destruction - c64_4ksa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_4ksa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/c64/4tba.cpp b/src/devices/bus/c64/4tba.cpp index 56266f5d916..d93911e0928 100644 --- a/src/devices/bus/c64/4tba.cpp +++ b/src/devices/bus/c64/4tba.cpp @@ -61,7 +61,7 @@ ioport_constructor c64_4tba_device::device_input_ports() const // c64_4tba_device - constructor //------------------------------------------------- -c64_4tba_device::c64_4tba_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_4tba_device::c64_4tba_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_4TBA, "C64 Tie Break Adapter", tag, owner, clock, "c64_4tba", __FILE__), device_pet_user_port_interface(mconfig, *this) { diff --git a/src/devices/bus/c64/4tba.h b/src/devices/bus/c64/4tba.h index c7505d0d49a..8b467ecc7ca 100644 --- a/src/devices/bus/c64/4tba.h +++ b/src/devices/bus/c64/4tba.h @@ -28,7 +28,7 @@ class c64_4tba_device : public device_t, { public: // construction/destruction - c64_4tba_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_4tba_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/c64/bn1541.cpp b/src/devices/bus/c64/bn1541.cpp index d93e629aaa7..1be704eafb1 100644 --- a/src/devices/bus/c64/bn1541.cpp +++ b/src/devices/bus/c64/bn1541.cpp @@ -60,7 +60,7 @@ device_c64_floppy_parallel_interface::~device_c64_floppy_parallel_interface() // c64_bn1541_device - constructor //------------------------------------------------- -c64_bn1541_device::c64_bn1541_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_bn1541_device::c64_bn1541_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_BN1541, "C64 Burst Nibbler 1541/1571 Parallel Cable", tag, owner, clock, "c64_bn1541", __FILE__), device_pet_user_port_interface(mconfig, *this), device_c64_floppy_parallel_interface(mconfig, *this), m_parallel_output(0) @@ -84,7 +84,7 @@ void c64_bn1541_device::device_start() { if (subdevice->interface(m_other) && subdevice != this) { - if (LOG) logerror("Parallel device %s\n", subdevice->tag()); + if (LOG) logerror("Parallel device %s\n", subdevice->tag().c_str()); // grab the first 1541/1571 and run to the hills m_other->m_other = this; diff --git a/src/devices/bus/c64/bn1541.h b/src/devices/bus/c64/bn1541.h index a3f0a1834b6..6c906beca80 100644 --- a/src/devices/bus/c64/bn1541.h +++ b/src/devices/bus/c64/bn1541.h @@ -48,7 +48,7 @@ class c64_bn1541_device : public device_t, { public: // construction/destruction - c64_bn1541_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_bn1541_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/c64/c128_comal80.cpp b/src/devices/bus/c64/c128_comal80.cpp index 25accd52fa0..56b900183ea 100644 --- a/src/devices/bus/c64/c128_comal80.cpp +++ b/src/devices/bus/c64/c128_comal80.cpp @@ -26,7 +26,7 @@ const device_type C128_COMAL80 = &device_creator<c128_comal80_cartridge_device>; // c128_comal80_cartridge_device - constructor //------------------------------------------------- -c128_comal80_cartridge_device::c128_comal80_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c128_comal80_cartridge_device::c128_comal80_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C128_COMAL80, "C128 COMAL 80 cartridge", tag, owner, clock, "c128_comal80", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_bank(0) diff --git a/src/devices/bus/c64/c128_comal80.h b/src/devices/bus/c64/c128_comal80.h index e403cd8b10f..59c65fab5da 100644 --- a/src/devices/bus/c64/c128_comal80.h +++ b/src/devices/bus/c64/c128_comal80.h @@ -28,7 +28,7 @@ class c128_comal80_cartridge_device : public device_t, { public: // construction/destruction - c128_comal80_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c128_comal80_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/c64/c128_partner.cpp b/src/devices/bus/c64/c128_partner.cpp index fe751585099..fe61c4b9ffa 100644 --- a/src/devices/bus/c64/c128_partner.cpp +++ b/src/devices/bus/c64/c128_partner.cpp @@ -76,7 +76,7 @@ ioport_constructor partner128_t::device_input_ports() const // partner128_t - constructor //------------------------------------------------- -partner128_t::partner128_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +partner128_t::partner128_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C128_PARTNER, "PARTNER 128", tag, owner, clock, "c128_partner", __FILE__), device_c64_expansion_card_interface(mconfig, *this), //device_vcs_control_port_interface(mconfig, *this), diff --git a/src/devices/bus/c64/c128_partner.h b/src/devices/bus/c64/c128_partner.h index 1ba872ca121..37a91031a9c 100644 --- a/src/devices/bus/c64/c128_partner.h +++ b/src/devices/bus/c64/c128_partner.h @@ -29,7 +29,7 @@ class partner128_t : public device_t, { public: // construction/destruction - partner128_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + partner128_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/c64/comal80.cpp b/src/devices/bus/c64/comal80.cpp index b72c9182b7c..34e76c3785a 100644 --- a/src/devices/bus/c64/comal80.cpp +++ b/src/devices/bus/c64/comal80.cpp @@ -26,7 +26,7 @@ const device_type C64_COMAL80 = &device_creator<c64_comal80_cartridge_device>; // c64_comal80_cartridge_device - constructor //------------------------------------------------- -c64_comal80_cartridge_device::c64_comal80_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_comal80_cartridge_device::c64_comal80_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_COMAL80, "C64 COMAL 80 cartridge", tag, owner, clock, "c64_comal80", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_bank(0) diff --git a/src/devices/bus/c64/comal80.h b/src/devices/bus/c64/comal80.h index b77adf1a8bd..f7d0a630e6c 100644 --- a/src/devices/bus/c64/comal80.h +++ b/src/devices/bus/c64/comal80.h @@ -28,7 +28,7 @@ class c64_comal80_cartridge_device : public device_t, { public: // construction/destruction - c64_comal80_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_comal80_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/c64/cpm.cpp b/src/devices/bus/c64/cpm.cpp index 33659b4e977..b45b87d8fed 100644 --- a/src/devices/bus/c64/cpm.cpp +++ b/src/devices/bus/c64/cpm.cpp @@ -129,7 +129,7 @@ inline void c64_cpm_cartridge_device::update_signals() // c64_cpm_cartridge_device - constructor //------------------------------------------------- -c64_cpm_cartridge_device::c64_cpm_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_cpm_cartridge_device::c64_cpm_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_CPM, "C64 CP/M cartridge", tag, owner, clock, "c64_cpm", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_maincpu(*this, Z80_TAG), diff --git a/src/devices/bus/c64/cpm.h b/src/devices/bus/c64/cpm.h index 1e10bc810ce..e1914a49986 100644 --- a/src/devices/bus/c64/cpm.h +++ b/src/devices/bus/c64/cpm.h @@ -28,7 +28,7 @@ class c64_cpm_cartridge_device : public device_t, { public: // construction/destruction - c64_cpm_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_cpm_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/c64/currah_speech.cpp b/src/devices/bus/c64/currah_speech.cpp index 8e73f0801f1..01b7fa270f1 100644 --- a/src/devices/bus/c64/currah_speech.cpp +++ b/src/devices/bus/c64/currah_speech.cpp @@ -154,7 +154,7 @@ void c64_currah_speech_cartridge_device::set_osc1(int voice, int intonation) // c64_currah_speech_cartridge_device - constructor //------------------------------------------------- -c64_currah_speech_cartridge_device::c64_currah_speech_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_currah_speech_cartridge_device::c64_currah_speech_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_CURRAH_SPEECH, "C64 Currah Speech", tag, owner, clock, "c64_cs", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_nsp(*this, SP0256_TAG) diff --git a/src/devices/bus/c64/currah_speech.h b/src/devices/bus/c64/currah_speech.h index 1ca31571bbd..4913c19b582 100644 --- a/src/devices/bus/c64/currah_speech.h +++ b/src/devices/bus/c64/currah_speech.h @@ -29,7 +29,7 @@ class c64_currah_speech_cartridge_device : public device_t, { public: // construction/destruction - c64_currah_speech_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_currah_speech_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/c64/dela_ep256.cpp b/src/devices/bus/c64/dela_ep256.cpp index f4c86f20db5..301e8945f00 100644 --- a/src/devices/bus/c64/dela_ep256.cpp +++ b/src/devices/bus/c64/dela_ep256.cpp @@ -61,7 +61,7 @@ machine_config_constructor c64_dela_ep256_cartridge_device::device_mconfig_addit // c64_dela_ep256_cartridge_device - constructor //------------------------------------------------- -c64_dela_ep256_cartridge_device::c64_dela_ep256_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_dela_ep256_cartridge_device::c64_dela_ep256_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_DELA_EP256, "C64 Dela 256KB EPROM cartridge", tag, owner, clock, "delep256", __FILE__), device_c64_expansion_card_interface(mconfig, *this) { diff --git a/src/devices/bus/c64/dela_ep256.h b/src/devices/bus/c64/dela_ep256.h index df5ce8580e5..8ed17515807 100644 --- a/src/devices/bus/c64/dela_ep256.h +++ b/src/devices/bus/c64/dela_ep256.h @@ -30,7 +30,7 @@ class c64_dela_ep256_cartridge_device : public device_t, { public: // construction/destruction - c64_dela_ep256_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_dela_ep256_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/c64/dela_ep64.cpp b/src/devices/bus/c64/dela_ep64.cpp index 25aeb844deb..237413cab7c 100644 --- a/src/devices/bus/c64/dela_ep64.cpp +++ b/src/devices/bus/c64/dela_ep64.cpp @@ -48,7 +48,7 @@ machine_config_constructor c64_dela_ep64_cartridge_device::device_mconfig_additi // c64_dela_ep64_cartridge_device - constructor //------------------------------------------------- -c64_dela_ep64_cartridge_device::c64_dela_ep64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_dela_ep64_cartridge_device::c64_dela_ep64_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_DELA_EP64, "C64 Rex 64KB EPROM cartridge", tag, owner, clock, "c64_dela_ep64", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_eprom1(*this, "eprom1"), diff --git a/src/devices/bus/c64/dela_ep64.h b/src/devices/bus/c64/dela_ep64.h index db1da8feca0..9347bd1cd7a 100644 --- a/src/devices/bus/c64/dela_ep64.h +++ b/src/devices/bus/c64/dela_ep64.h @@ -30,7 +30,7 @@ class c64_dela_ep64_cartridge_device : public device_t, { public: // construction/destruction - c64_dela_ep64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_dela_ep64_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/c64/dela_ep7x8.cpp b/src/devices/bus/c64/dela_ep7x8.cpp index dc3a036cb14..688e40a47d0 100644 --- a/src/devices/bus/c64/dela_ep7x8.cpp +++ b/src/devices/bus/c64/dela_ep7x8.cpp @@ -58,7 +58,7 @@ machine_config_constructor c64_dela_ep7x8_cartridge_device::device_mconfig_addit // c64_dela_ep7x8_cartridge_device - constructor //------------------------------------------------- -c64_dela_ep7x8_cartridge_device::c64_dela_ep7x8_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_dela_ep7x8_cartridge_device::c64_dela_ep7x8_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_DELA_EP7X8, "C64 Dela 7x8KB EPROM cartridge", tag, owner, clock, "ep7x8", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_eprom1(*this, "rom1"), diff --git a/src/devices/bus/c64/dela_ep7x8.h b/src/devices/bus/c64/dela_ep7x8.h index 904eda891e2..3842dc9efba 100644 --- a/src/devices/bus/c64/dela_ep7x8.h +++ b/src/devices/bus/c64/dela_ep7x8.h @@ -30,7 +30,7 @@ class c64_dela_ep7x8_cartridge_device : public device_t, { public: // construction/destruction - c64_dela_ep7x8_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_dela_ep7x8_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/c64/dinamic.cpp b/src/devices/bus/c64/dinamic.cpp index d52af7ba74e..d1eec518d24 100644 --- a/src/devices/bus/c64/dinamic.cpp +++ b/src/devices/bus/c64/dinamic.cpp @@ -26,7 +26,7 @@ const device_type C64_DINAMIC = &device_creator<c64_dinamic_cartridge_device>; // c64_dinamic_cartridge_device - constructor //------------------------------------------------- -c64_dinamic_cartridge_device::c64_dinamic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_dinamic_cartridge_device::c64_dinamic_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_DINAMIC, "C64 Dinamic cartridge", tag, owner, clock, "c64_dinamic", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_bank(0) diff --git a/src/devices/bus/c64/dinamic.h b/src/devices/bus/c64/dinamic.h index 234f14c43eb..d02946dd10d 100644 --- a/src/devices/bus/c64/dinamic.h +++ b/src/devices/bus/c64/dinamic.h @@ -28,7 +28,7 @@ class c64_dinamic_cartridge_device : public device_t, { public: // construction/destruction - c64_dinamic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_dinamic_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/c64/dqbb.cpp b/src/devices/bus/c64/dqbb.cpp index 6e98707587a..f504847fda7 100644 --- a/src/devices/bus/c64/dqbb.cpp +++ b/src/devices/bus/c64/dqbb.cpp @@ -35,7 +35,7 @@ const device_type C64_DQBB = &device_creator<c64_dqbb_cartridge_device>; // c64_dqbb_cartridge_device - constructor //------------------------------------------------- -c64_dqbb_cartridge_device::c64_dqbb_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_dqbb_cartridge_device::c64_dqbb_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_DQBB, "C64 Double Quick Brown Box cartridge", tag, owner, clock, "c64_dqbb", __FILE__), device_c64_expansion_card_interface(mconfig, *this), device_nvram_interface(mconfig, *this), diff --git a/src/devices/bus/c64/dqbb.h b/src/devices/bus/c64/dqbb.h index f826cf5e165..a19b8beef5b 100644 --- a/src/devices/bus/c64/dqbb.h +++ b/src/devices/bus/c64/dqbb.h @@ -30,7 +30,7 @@ class c64_dqbb_cartridge_device : public device_t, { public: // construction/destruction - c64_dqbb_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_dqbb_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/c64/easy_calc_result.cpp b/src/devices/bus/c64/easy_calc_result.cpp index db7e35b3067..97c180b87b9 100644 --- a/src/devices/bus/c64/easy_calc_result.cpp +++ b/src/devices/bus/c64/easy_calc_result.cpp @@ -47,7 +47,7 @@ const device_type C64_EASY_CALC_RESULT = &device_creator<c64_easy_calc_result_ca // c64_easy_calc_result_cartridge_device - constructor //------------------------------------------------- -c64_easy_calc_result_cartridge_device::c64_easy_calc_result_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_easy_calc_result_cartridge_device::c64_easy_calc_result_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_EASY_CALC_RESULT, "C64 Easy Calc Result cartridge", tag, owner, clock, "c64_easy_calc_result", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_bank(0) { diff --git a/src/devices/bus/c64/easy_calc_result.h b/src/devices/bus/c64/easy_calc_result.h index 791692c04c7..db5558baec5 100644 --- a/src/devices/bus/c64/easy_calc_result.h +++ b/src/devices/bus/c64/easy_calc_result.h @@ -28,7 +28,7 @@ class c64_easy_calc_result_cartridge_device : public device_t, { public: // construction/destruction - c64_easy_calc_result_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_easy_calc_result_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/c64/easyflash.cpp b/src/devices/bus/c64/easyflash.cpp index 007190c8ec9..53e19e5205d 100644 --- a/src/devices/bus/c64/easyflash.cpp +++ b/src/devices/bus/c64/easyflash.cpp @@ -80,7 +80,7 @@ ioport_constructor c64_easyflash_cartridge_device::device_input_ports() const // c64_easyflash_cartridge_device - constructor //------------------------------------------------- -c64_easyflash_cartridge_device::c64_easyflash_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_easyflash_cartridge_device::c64_easyflash_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_EASYFLASH, "C64 EasyFlash cartridge", tag, owner, clock, "c64_easyflash", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_flash_roml(*this, AM29F040_0_TAG), diff --git a/src/devices/bus/c64/easyflash.h b/src/devices/bus/c64/easyflash.h index 265abf19771..dd444067149 100644 --- a/src/devices/bus/c64/easyflash.h +++ b/src/devices/bus/c64/easyflash.h @@ -29,7 +29,7 @@ class c64_easyflash_cartridge_device : public device_t, { public: // construction/destruction - c64_easyflash_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_easyflash_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/c64/epyx_fast_load.cpp b/src/devices/bus/c64/epyx_fast_load.cpp index ebe3863088c..c14b9234bdf 100644 --- a/src/devices/bus/c64/epyx_fast_load.cpp +++ b/src/devices/bus/c64/epyx_fast_load.cpp @@ -36,7 +36,7 @@ const device_type C64_EPYX_FAST_LOAD = &device_creator<c64_epyx_fast_load_cartri // c64_epyx_fast_load_cartridge_device - constructor //------------------------------------------------- -c64_epyx_fast_load_cartridge_device::c64_epyx_fast_load_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_epyx_fast_load_cartridge_device::c64_epyx_fast_load_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_EPYX_FAST_LOAD, "C64 Epyx Fast Load cartridge", tag, owner, clock, "c64_epyx_fast_load", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_exrom_timer(nullptr) { diff --git a/src/devices/bus/c64/epyx_fast_load.h b/src/devices/bus/c64/epyx_fast_load.h index c65f3842d12..63f638d7f01 100644 --- a/src/devices/bus/c64/epyx_fast_load.h +++ b/src/devices/bus/c64/epyx_fast_load.h @@ -28,7 +28,7 @@ class c64_epyx_fast_load_cartridge_device : public device_t, { public: // construction/destruction - c64_epyx_fast_load_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_epyx_fast_load_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/c64/exos.cpp b/src/devices/bus/c64/exos.cpp index 0b0ce6c8257..10b37d501c8 100644 --- a/src/devices/bus/c64/exos.cpp +++ b/src/devices/bus/c64/exos.cpp @@ -26,7 +26,7 @@ const device_type C64_EXOS = &device_creator<c64_exos_cartridge_device>; // c64_exos_cartridge_device - constructor //------------------------------------------------- -c64_exos_cartridge_device::c64_exos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_exos_cartridge_device::c64_exos_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_EXOS, "C64 ExOS cartridge", tag, owner, clock, "c64_exos", __FILE__), device_c64_expansion_card_interface(mconfig, *this) { diff --git a/src/devices/bus/c64/exos.h b/src/devices/bus/c64/exos.h index 7f4785098f4..ce0db0da503 100644 --- a/src/devices/bus/c64/exos.h +++ b/src/devices/bus/c64/exos.h @@ -28,7 +28,7 @@ class c64_exos_cartridge_device : public device_t, { public: // construction/destruction - c64_exos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_exos_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/c64/exp.cpp b/src/devices/bus/c64/exp.cpp index 47e2a20cc14..b2513711114 100644 --- a/src/devices/bus/c64/exp.cpp +++ b/src/devices/bus/c64/exp.cpp @@ -56,7 +56,7 @@ device_c64_expansion_card_interface::~device_c64_expansion_card_interface() // c64_expansion_slot_device - constructor //------------------------------------------------- -c64_expansion_slot_device::c64_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_expansion_slot_device::c64_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_EXPANSION_SLOT, "C64 expansion port", tag, owner, clock, "c64_expansion_slot", __FILE__), device_slot_interface(mconfig, *this), device_image_interface(mconfig, *this), diff --git a/src/devices/bus/c64/exp.h b/src/devices/bus/c64/exp.h index d72a91475be..ce283e7b0a7 100644 --- a/src/devices/bus/c64/exp.h +++ b/src/devices/bus/c64/exp.h @@ -101,7 +101,7 @@ class c64_expansion_slot_device : public device_t, { public: // construction/destruction - c64_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<c64_expansion_slot_device &>(device).m_write_irq.set_callback(object); } template<class _Object> static devcb_base &set_nmi_wr_callback(device_t &device, _Object object) { return downcast<c64_expansion_slot_device &>(device).m_write_nmi.set_callback(object); } diff --git a/src/devices/bus/c64/fcc.cpp b/src/devices/bus/c64/fcc.cpp index 0757ae94e76..437b0a28c2d 100644 --- a/src/devices/bus/c64/fcc.cpp +++ b/src/devices/bus/c64/fcc.cpp @@ -118,7 +118,7 @@ ioport_constructor c64_final_chesscard_device::device_input_ports() const // c64_final_chesscard_device - constructor //------------------------------------------------- -c64_final_chesscard_device::c64_final_chesscard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_final_chesscard_device::c64_final_chesscard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_FCC, "Final ChessCard", tag, owner, clock, "c64_fcc", __FILE__), device_c64_expansion_card_interface(mconfig, *this), device_nvram_interface(mconfig, *this), diff --git a/src/devices/bus/c64/fcc.h b/src/devices/bus/c64/fcc.h index a2952e34c0f..79c0aa3d335 100644 --- a/src/devices/bus/c64/fcc.h +++ b/src/devices/bus/c64/fcc.h @@ -29,7 +29,7 @@ class c64_final_chesscard_device : public device_t, { public: // construction/destruction - c64_final_chesscard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_final_chesscard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/c64/final.cpp b/src/devices/bus/c64/final.cpp index 4087201c5cb..6cf7b11ac23 100644 --- a/src/devices/bus/c64/final.cpp +++ b/src/devices/bus/c64/final.cpp @@ -62,7 +62,7 @@ ioport_constructor c64_final_cartridge_device::device_input_ports() const // c64_final_cartridge_device - constructor //------------------------------------------------- -c64_final_cartridge_device::c64_final_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_final_cartridge_device::c64_final_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_FINAL, "C64 Final cartridge", tag, owner, clock, "c64_final", __FILE__), device_c64_expansion_card_interface(mconfig, *this) { diff --git a/src/devices/bus/c64/final.h b/src/devices/bus/c64/final.h index cbf7fab0b73..01aa4fd29bd 100644 --- a/src/devices/bus/c64/final.h +++ b/src/devices/bus/c64/final.h @@ -28,7 +28,7 @@ class c64_final_cartridge_device : public device_t, { public: // construction/destruction - c64_final_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_final_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/c64/final3.cpp b/src/devices/bus/c64/final3.cpp index a72963123ba..090213dd980 100644 --- a/src/devices/bus/c64/final3.cpp +++ b/src/devices/bus/c64/final3.cpp @@ -63,7 +63,7 @@ ioport_constructor c64_final3_cartridge_device::device_input_ports() const // c64_final3_cartridge_device - constructor //------------------------------------------------- -c64_final3_cartridge_device::c64_final3_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_final3_cartridge_device::c64_final3_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_FINAL3, "C64 Final Cartridge III", tag, owner, clock, "c64_final3", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_bank(0), m_hidden(0) { diff --git a/src/devices/bus/c64/final3.h b/src/devices/bus/c64/final3.h index 42c1e1aa9f8..ef7aa4c9ac9 100644 --- a/src/devices/bus/c64/final3.h +++ b/src/devices/bus/c64/final3.h @@ -28,7 +28,7 @@ class c64_final3_cartridge_device : public device_t, { public: // construction/destruction - c64_final3_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_final3_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/c64/fun_play.cpp b/src/devices/bus/c64/fun_play.cpp index 971521773a7..f4a1da22e5b 100644 --- a/src/devices/bus/c64/fun_play.cpp +++ b/src/devices/bus/c64/fun_play.cpp @@ -26,7 +26,7 @@ const device_type C64_FUN_PLAY = &device_creator<c64_fun_play_cartridge_device>; // c64_fun_play_cartridge_device - constructor //------------------------------------------------- -c64_fun_play_cartridge_device::c64_fun_play_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_fun_play_cartridge_device::c64_fun_play_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_FUN_PLAY, "C64 Fun Play cartridge", tag, owner, clock, "c64_fun_play", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_bank(0) diff --git a/src/devices/bus/c64/fun_play.h b/src/devices/bus/c64/fun_play.h index 8e4e7528eb7..58e77a8481e 100644 --- a/src/devices/bus/c64/fun_play.h +++ b/src/devices/bus/c64/fun_play.h @@ -28,7 +28,7 @@ class c64_fun_play_cartridge_device : public device_t, { public: // construction/destruction - c64_fun_play_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_fun_play_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/c64/geocable.cpp b/src/devices/bus/c64/geocable.cpp index 3b6acc54d2a..9b93f3e138b 100644 --- a/src/devices/bus/c64/geocable.cpp +++ b/src/devices/bus/c64/geocable.cpp @@ -55,7 +55,7 @@ machine_config_constructor c64_geocable_device::device_mconfig_additions() const // c64_geocable_device - constructor //------------------------------------------------- -c64_geocable_device::c64_geocable_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_geocable_device::c64_geocable_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_GEOCABLE, "C64 geoCable", tag, owner, clock, "c64_geocable", __FILE__), device_pet_user_port_interface(mconfig, *this), m_centronics(*this, CENTRONICS_TAG) diff --git a/src/devices/bus/c64/geocable.h b/src/devices/bus/c64/geocable.h index 6b823b9a668..dcbbdd666e8 100644 --- a/src/devices/bus/c64/geocable.h +++ b/src/devices/bus/c64/geocable.h @@ -29,7 +29,7 @@ class c64_geocable_device : public device_t, { public: // construction/destruction - c64_geocable_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_geocable_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/c64/georam.cpp b/src/devices/bus/c64/georam.cpp index ccdcebedc40..ee66fdde137 100644 --- a/src/devices/bus/c64/georam.cpp +++ b/src/devices/bus/c64/georam.cpp @@ -26,7 +26,7 @@ const device_type C64_GEORAM = &device_creator<c64_georam_cartridge_device>; // c64_georam_cartridge_device - constructor //------------------------------------------------- -c64_georam_cartridge_device::c64_georam_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_georam_cartridge_device::c64_georam_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_GEORAM, "C64 GeoRAM cartridge", tag, owner, clock, "c64_georam", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_ram(*this, "ram"), diff --git a/src/devices/bus/c64/georam.h b/src/devices/bus/c64/georam.h index bf1a431244d..9b90267e2fa 100644 --- a/src/devices/bus/c64/georam.h +++ b/src/devices/bus/c64/georam.h @@ -28,7 +28,7 @@ class c64_georam_cartridge_device : public device_t, { public: // construction/destruction - c64_georam_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_georam_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/c64/ide64.cpp b/src/devices/bus/c64/ide64.cpp index 01def305dd5..4bbfb8972ff 100644 --- a/src/devices/bus/c64/ide64.cpp +++ b/src/devices/bus/c64/ide64.cpp @@ -94,7 +94,7 @@ ioport_constructor c64_ide64_cartridge_device::device_input_ports() const // c64_ide64_cartridge_device - constructor //------------------------------------------------- -c64_ide64_cartridge_device::c64_ide64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_ide64_cartridge_device::c64_ide64_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_IDE64, "C64 IDE64 cartridge", tag, owner, clock, "c64_ide64", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_flash_rom(*this, AT29C010A_TAG), diff --git a/src/devices/bus/c64/ide64.h b/src/devices/bus/c64/ide64.h index cfe6e1cd27f..9895ca50adc 100644 --- a/src/devices/bus/c64/ide64.h +++ b/src/devices/bus/c64/ide64.h @@ -32,7 +32,7 @@ class c64_ide64_cartridge_device : public device_t, { public: // construction/destruction - c64_ide64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_ide64_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/c64/ieee488.cpp b/src/devices/bus/c64/ieee488.cpp index 974c9df0cb5..6b02fef96fc 100644 --- a/src/devices/bus/c64/ieee488.cpp +++ b/src/devices/bus/c64/ieee488.cpp @@ -173,7 +173,7 @@ machine_config_constructor c64_ieee488_device::device_mconfig_additions() const // c64_ieee488_device - constructor //------------------------------------------------- -c64_ieee488_device::c64_ieee488_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_ieee488_device::c64_ieee488_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_IEEE488, "IEEE-488", tag, owner, clock, "c64_ieee488", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_tpi(*this, MOS6525_TAG), diff --git a/src/devices/bus/c64/ieee488.h b/src/devices/bus/c64/ieee488.h index ca11ff7f5dc..dea4499da84 100644 --- a/src/devices/bus/c64/ieee488.h +++ b/src/devices/bus/c64/ieee488.h @@ -29,7 +29,7 @@ class c64_ieee488_device : public device_t, { public: // construction/destruction - c64_ieee488_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_ieee488_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/c64/kingsoft.cpp b/src/devices/bus/c64/kingsoft.cpp index 2826920320f..ca5e22eaac4 100644 --- a/src/devices/bus/c64/kingsoft.cpp +++ b/src/devices/bus/c64/kingsoft.cpp @@ -26,7 +26,7 @@ const device_type C64_KINGSOFT = &device_creator<c64_kingsoft_cartridge_device>; // c64_kingsoft_cartridge_device - constructor //------------------------------------------------- -c64_kingsoft_cartridge_device::c64_kingsoft_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_kingsoft_cartridge_device::c64_kingsoft_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_KINGSOFT, "C64 Kingsoft cartridge", tag, owner, clock, "c64_kingsoft", __FILE__), device_c64_expansion_card_interface(mconfig, *this) { diff --git a/src/devices/bus/c64/kingsoft.h b/src/devices/bus/c64/kingsoft.h index ab9dea5d935..dec43f4870c 100644 --- a/src/devices/bus/c64/kingsoft.h +++ b/src/devices/bus/c64/kingsoft.h @@ -28,7 +28,7 @@ class c64_kingsoft_cartridge_device : public device_t, { public: // construction/destruction - c64_kingsoft_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_kingsoft_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/c64/mach5.cpp b/src/devices/bus/c64/mach5.cpp index b285d35b221..45c1e16fe45 100644 --- a/src/devices/bus/c64/mach5.cpp +++ b/src/devices/bus/c64/mach5.cpp @@ -51,7 +51,7 @@ ioport_constructor c64_mach5_cartridge_device::device_input_ports() const // c64_mach5_cartridge_device - constructor //------------------------------------------------- -c64_mach5_cartridge_device::c64_mach5_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_mach5_cartridge_device::c64_mach5_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_MACH5, "C64 MACH5 cartridge", tag, owner, clock, "c64_mach5", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_s1(*this, "S1"), m_c128(false) diff --git a/src/devices/bus/c64/mach5.h b/src/devices/bus/c64/mach5.h index a41114ccffe..c5c3f2cb45f 100644 --- a/src/devices/bus/c64/mach5.h +++ b/src/devices/bus/c64/mach5.h @@ -27,7 +27,7 @@ class c64_mach5_cartridge_device : public device_t, { public: // construction/destruction - c64_mach5_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_mach5_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/c64/magic_desk.cpp b/src/devices/bus/c64/magic_desk.cpp index e315b4eeba0..2928aedf201 100644 --- a/src/devices/bus/c64/magic_desk.cpp +++ b/src/devices/bus/c64/magic_desk.cpp @@ -26,7 +26,7 @@ const device_type C64_MAGIC_DESK = &device_creator<c64_magic_desk_cartridge_devi // c64_magic_desk_cartridge_device - constructor //------------------------------------------------- -c64_magic_desk_cartridge_device::c64_magic_desk_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_magic_desk_cartridge_device::c64_magic_desk_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_MAGIC_DESK, "C64 Magic Desk cartridge", tag, owner, clock, "c64_magic_desk", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_bank(0) diff --git a/src/devices/bus/c64/magic_desk.h b/src/devices/bus/c64/magic_desk.h index 601805fabaa..46a4d420f22 100644 --- a/src/devices/bus/c64/magic_desk.h +++ b/src/devices/bus/c64/magic_desk.h @@ -28,7 +28,7 @@ class c64_magic_desk_cartridge_device : public device_t, { public: // construction/destruction - c64_magic_desk_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_magic_desk_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/c64/magic_formel.cpp b/src/devices/bus/c64/magic_formel.cpp index b6f9605ee45..ac77dbd35c3 100644 --- a/src/devices/bus/c64/magic_formel.cpp +++ b/src/devices/bus/c64/magic_formel.cpp @@ -162,7 +162,7 @@ ioport_constructor c64_magic_formel_cartridge_device::device_input_ports() const // c64_magic_formel_cartridge_device - constructor //------------------------------------------------- -c64_magic_formel_cartridge_device::c64_magic_formel_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_magic_formel_cartridge_device::c64_magic_formel_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_MAGIC_FORMEL, "C64 Magic Formel cartridge", tag, owner, clock, "c64_magic_formel", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_pia(*this, MC6821_TAG), diff --git a/src/devices/bus/c64/magic_formel.h b/src/devices/bus/c64/magic_formel.h index ecf439e5606..d8c48d1a486 100644 --- a/src/devices/bus/c64/magic_formel.h +++ b/src/devices/bus/c64/magic_formel.h @@ -28,7 +28,7 @@ class c64_magic_formel_cartridge_device : public device_t, { public: // construction/destruction - c64_magic_formel_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_magic_formel_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/c64/magic_voice.cpp b/src/devices/bus/c64/magic_voice.cpp index 264f6f87f05..f6006bf0a9e 100644 --- a/src/devices/bus/c64/magic_voice.cpp +++ b/src/devices/bus/c64/magic_voice.cpp @@ -260,7 +260,7 @@ machine_config_constructor c64_magic_voice_cartridge_device::device_mconfig_addi // c64_magic_voice_cartridge_device - constructor //------------------------------------------------- -c64_magic_voice_cartridge_device::c64_magic_voice_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_magic_voice_cartridge_device::c64_magic_voice_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_MAGIC_VOICE, "C64 Magic Voice cartridge", tag, owner, clock, "c64_magic_voice", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_vslsi(*this, T6721A_TAG), diff --git a/src/devices/bus/c64/magic_voice.h b/src/devices/bus/c64/magic_voice.h index f5e8af19e59..f4a472570d8 100644 --- a/src/devices/bus/c64/magic_voice.h +++ b/src/devices/bus/c64/magic_voice.h @@ -30,7 +30,7 @@ class c64_magic_voice_cartridge_device : public device_t, { public: // construction/destruction - c64_magic_voice_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_magic_voice_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/c64/midi_maplin.cpp b/src/devices/bus/c64/midi_maplin.cpp index 7a143391129..5cd0142a918 100644 --- a/src/devices/bus/c64/midi_maplin.cpp +++ b/src/devices/bus/c64/midi_maplin.cpp @@ -78,7 +78,7 @@ machine_config_constructor c64_maplin_midi_cartridge_device::device_mconfig_addi // c64_maplin_midi_cartridge_device - constructor //------------------------------------------------- -c64_maplin_midi_cartridge_device::c64_maplin_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_maplin_midi_cartridge_device::c64_maplin_midi_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_MIDI_MAPLIN, "C64 Maplin MIDI", tag, owner, clock, "c64_midimap", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_acia(*this, MC6850_TAG) diff --git a/src/devices/bus/c64/midi_maplin.h b/src/devices/bus/c64/midi_maplin.h index ac088c2f631..0f597e7f24b 100644 --- a/src/devices/bus/c64/midi_maplin.h +++ b/src/devices/bus/c64/midi_maplin.h @@ -27,7 +27,7 @@ class c64_maplin_midi_cartridge_device : public device_t, { public: // construction/destruction - c64_maplin_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_maplin_midi_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/c64/midi_namesoft.cpp b/src/devices/bus/c64/midi_namesoft.cpp index cd1553b6187..10cdb8e852f 100644 --- a/src/devices/bus/c64/midi_namesoft.cpp +++ b/src/devices/bus/c64/midi_namesoft.cpp @@ -78,7 +78,7 @@ machine_config_constructor c64_namesoft_midi_cartridge_device::device_mconfig_ad // c64_namesoft_midi_cartridge_device - constructor //------------------------------------------------- -c64_namesoft_midi_cartridge_device::c64_namesoft_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_namesoft_midi_cartridge_device::c64_namesoft_midi_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_MIDI_NAMESOFT, "C64 Namesoft MIDI", tag, owner, clock, "c64_midins", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_acia(*this, MC6850_TAG) diff --git a/src/devices/bus/c64/midi_namesoft.h b/src/devices/bus/c64/midi_namesoft.h index 048ea6b123f..e37fbecf7b5 100644 --- a/src/devices/bus/c64/midi_namesoft.h +++ b/src/devices/bus/c64/midi_namesoft.h @@ -27,7 +27,7 @@ class c64_namesoft_midi_cartridge_device : public device_t, { public: // construction/destruction - c64_namesoft_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_namesoft_midi_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/c64/midi_passport.cpp b/src/devices/bus/c64/midi_passport.cpp index 2948503f675..62b45d69977 100644 --- a/src/devices/bus/c64/midi_passport.cpp +++ b/src/devices/bus/c64/midi_passport.cpp @@ -97,7 +97,7 @@ machine_config_constructor c64_passport_midi_cartridge_device::device_mconfig_ad // c64_passport_midi_cartridge_device - constructor //------------------------------------------------- -c64_passport_midi_cartridge_device::c64_passport_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_passport_midi_cartridge_device::c64_passport_midi_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_MIDI_PASSPORT, "C64 Passport MIDI", tag, owner, clock, "c64_midipp", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_acia(*this, MC6850_TAG), diff --git a/src/devices/bus/c64/midi_passport.h b/src/devices/bus/c64/midi_passport.h index ff7be2185a1..eb6a6ef8d28 100644 --- a/src/devices/bus/c64/midi_passport.h +++ b/src/devices/bus/c64/midi_passport.h @@ -28,7 +28,7 @@ class c64_passport_midi_cartridge_device : public device_t, { public: // construction/destruction - c64_passport_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_passport_midi_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/c64/midi_sci.cpp b/src/devices/bus/c64/midi_sci.cpp index 40e2c56cbfc..7b808d48ba5 100644 --- a/src/devices/bus/c64/midi_sci.cpp +++ b/src/devices/bus/c64/midi_sci.cpp @@ -78,7 +78,7 @@ machine_config_constructor c64_sequential_midi_cartridge_device::device_mconfig_ // c64_sequential_midi_cartridge_device - constructor //------------------------------------------------- -c64_sequential_midi_cartridge_device::c64_sequential_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_sequential_midi_cartridge_device::c64_sequential_midi_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_MIDI_SCI, "C64 Sequential Circuits MIDI", tag, owner, clock, "c64_midisci", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_acia(*this, MC6850_TAG) diff --git a/src/devices/bus/c64/midi_sci.h b/src/devices/bus/c64/midi_sci.h index 6ab277b3ef1..f2f6e39cf67 100644 --- a/src/devices/bus/c64/midi_sci.h +++ b/src/devices/bus/c64/midi_sci.h @@ -27,7 +27,7 @@ class c64_sequential_midi_cartridge_device : public device_t, { public: // construction/destruction - c64_sequential_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_sequential_midi_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/c64/midi_siel.cpp b/src/devices/bus/c64/midi_siel.cpp index cce956a1427..07b9a17150b 100644 --- a/src/devices/bus/c64/midi_siel.cpp +++ b/src/devices/bus/c64/midi_siel.cpp @@ -78,7 +78,7 @@ machine_config_constructor c64_siel_midi_cartridge_device::device_mconfig_additi // c64_siel_midi_cartridge_device - constructor //------------------------------------------------- -c64_siel_midi_cartridge_device::c64_siel_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_siel_midi_cartridge_device::c64_siel_midi_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_MIDI_SIEL, "C64 Siel MIDI", tag, owner, clock, "c64_midisiel", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_acia(*this, MC6850_TAG) diff --git a/src/devices/bus/c64/midi_siel.h b/src/devices/bus/c64/midi_siel.h index 12787d4999c..ac22ad6dfcb 100644 --- a/src/devices/bus/c64/midi_siel.h +++ b/src/devices/bus/c64/midi_siel.h @@ -27,7 +27,7 @@ class c64_siel_midi_cartridge_device : public device_t, { public: // construction/destruction - c64_siel_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_siel_midi_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/c64/mikro_assembler.cpp b/src/devices/bus/c64/mikro_assembler.cpp index 2578d4ae5b4..c701b1f960a 100644 --- a/src/devices/bus/c64/mikro_assembler.cpp +++ b/src/devices/bus/c64/mikro_assembler.cpp @@ -26,7 +26,7 @@ const device_type C64_MIKRO_ASSEMBLER = &device_creator<c64_mikro_assembler_cart // c64_mikro_assembler_cartridge_device - constructor //------------------------------------------------- -c64_mikro_assembler_cartridge_device::c64_mikro_assembler_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_mikro_assembler_cartridge_device::c64_mikro_assembler_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_MIKRO_ASSEMBLER, "C64 Mikro Assembler cartridge", tag, owner, clock, "c64_mikro_assembler", __FILE__), device_c64_expansion_card_interface(mconfig, *this) { diff --git a/src/devices/bus/c64/mikro_assembler.h b/src/devices/bus/c64/mikro_assembler.h index 6b742fbb0f3..76fee63cf90 100644 --- a/src/devices/bus/c64/mikro_assembler.h +++ b/src/devices/bus/c64/mikro_assembler.h @@ -28,7 +28,7 @@ class c64_mikro_assembler_cartridge_device : public device_t, { public: // construction/destruction - c64_mikro_assembler_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_mikro_assembler_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/c64/multiscreen.cpp b/src/devices/bus/c64/multiscreen.cpp index 1c54b055986..fe83dc3f42f 100644 --- a/src/devices/bus/c64/multiscreen.cpp +++ b/src/devices/bus/c64/multiscreen.cpp @@ -139,7 +139,7 @@ machine_config_constructor c64_multiscreen_cartridge_device::device_mconfig_addi // c64_multiscreen_cartridge_device - constructor //------------------------------------------------- -c64_multiscreen_cartridge_device::c64_multiscreen_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_multiscreen_cartridge_device::c64_multiscreen_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_MULTISCREEN, "C64 Multiscreen cartridge", tag, owner, clock, "c64_mscr", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_bank(0) { diff --git a/src/devices/bus/c64/multiscreen.h b/src/devices/bus/c64/multiscreen.h index 1b56cdda70f..3d5ca96ee85 100644 --- a/src/devices/bus/c64/multiscreen.h +++ b/src/devices/bus/c64/multiscreen.h @@ -30,7 +30,7 @@ class c64_multiscreen_cartridge_device : public device_t, { public: // construction/destruction - c64_multiscreen_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_multiscreen_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/c64/music64.cpp b/src/devices/bus/c64/music64.cpp index 723acad7fa7..7f319dee82f 100644 --- a/src/devices/bus/c64/music64.cpp +++ b/src/devices/bus/c64/music64.cpp @@ -149,7 +149,7 @@ ioport_constructor c64_music64_cartridge_device::device_input_ports() const // c64_music64_cartridge_device - constructor //------------------------------------------------- -c64_music64_cartridge_device::c64_music64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_music64_cartridge_device::c64_music64_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_MUSIC64, "C64 Music 64 cartridge", tag, owner, clock, "c64_music64", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_exp(*this, C64_EXPANSION_SLOT_TAG), diff --git a/src/devices/bus/c64/music64.h b/src/devices/bus/c64/music64.h index 8af27d6601e..73251d44e0f 100644 --- a/src/devices/bus/c64/music64.h +++ b/src/devices/bus/c64/music64.h @@ -27,7 +27,7 @@ class c64_music64_cartridge_device : public device_t, { public: // construction/destruction - c64_music64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_music64_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/c64/neoram.cpp b/src/devices/bus/c64/neoram.cpp index 91019bdb9aa..aea90042a26 100644 --- a/src/devices/bus/c64/neoram.cpp +++ b/src/devices/bus/c64/neoram.cpp @@ -26,7 +26,7 @@ const device_type C64_NEORAM = &device_creator<c64_neoram_cartridge_device>; // c64_neoram_cartridge_device - constructor //------------------------------------------------- -c64_neoram_cartridge_device::c64_neoram_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_neoram_cartridge_device::c64_neoram_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_NEORAM, "C64 NeoRAM cartridge", tag, owner, clock, "c64_neoram", __FILE__), device_c64_expansion_card_interface(mconfig, *this), device_nvram_interface(mconfig, *this), diff --git a/src/devices/bus/c64/neoram.h b/src/devices/bus/c64/neoram.h index f9e28d23c0a..90bedd9a06e 100644 --- a/src/devices/bus/c64/neoram.h +++ b/src/devices/bus/c64/neoram.h @@ -29,7 +29,7 @@ class c64_neoram_cartridge_device : public device_t, { public: // construction/destruction - c64_neoram_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_neoram_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/c64/ocean.cpp b/src/devices/bus/c64/ocean.cpp index 496651a1b25..c76bc9c40b5 100644 --- a/src/devices/bus/c64/ocean.cpp +++ b/src/devices/bus/c64/ocean.cpp @@ -48,7 +48,7 @@ const device_type C64_OCEAN = &device_creator<c64_ocean_cartridge_device>; // c64_ocean_cartridge_device - constructor //------------------------------------------------- -c64_ocean_cartridge_device::c64_ocean_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_ocean_cartridge_device::c64_ocean_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_OCEAN, "C64 Ocean cartridge", tag, owner, clock, "c64_ocean", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_bank(0) diff --git a/src/devices/bus/c64/ocean.h b/src/devices/bus/c64/ocean.h index 49697d758e7..8598c53d8b7 100644 --- a/src/devices/bus/c64/ocean.h +++ b/src/devices/bus/c64/ocean.h @@ -28,7 +28,7 @@ class c64_ocean_cartridge_device : public device_t, { public: // construction/destruction - c64_ocean_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_ocean_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/c64/pagefox.cpp b/src/devices/bus/c64/pagefox.cpp index b6df18e03c1..d45c2927726 100644 --- a/src/devices/bus/c64/pagefox.cpp +++ b/src/devices/bus/c64/pagefox.cpp @@ -48,7 +48,7 @@ const device_type C64_PAGEFOX = &device_creator<c64_pagefox_cartridge_device>; // c64_pagefox_cartridge_device - constructor //------------------------------------------------- -c64_pagefox_cartridge_device::c64_pagefox_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_pagefox_cartridge_device::c64_pagefox_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_PAGEFOX, "C64 Pagefox cartridge", tag, owner, clock, "c64_pagefox", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_ram(*this, "ram"), m_bank(0) diff --git a/src/devices/bus/c64/pagefox.h b/src/devices/bus/c64/pagefox.h index 7b68ce54c07..fbc0c582cbc 100644 --- a/src/devices/bus/c64/pagefox.h +++ b/src/devices/bus/c64/pagefox.h @@ -28,7 +28,7 @@ class c64_pagefox_cartridge_device : public device_t, { public: // construction/destruction - c64_pagefox_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_pagefox_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/c64/partner.cpp b/src/devices/bus/c64/partner.cpp index 4feb8022b08..b8094728da3 100644 --- a/src/devices/bus/c64/partner.cpp +++ b/src/devices/bus/c64/partner.cpp @@ -76,7 +76,7 @@ ioport_constructor c64_partner_cartridge_device::device_input_ports() const // c64_partner_cartridge_device - constructor //------------------------------------------------- -c64_partner_cartridge_device::c64_partner_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_partner_cartridge_device::c64_partner_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_PARTNER, "C64 PARTNER 64 cartridge", tag, owner, clock, "c64_partner", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_ram(*this, "ram"), diff --git a/src/devices/bus/c64/partner.h b/src/devices/bus/c64/partner.h index 640cb7daab5..05769f499e1 100644 --- a/src/devices/bus/c64/partner.h +++ b/src/devices/bus/c64/partner.h @@ -27,7 +27,7 @@ class c64_partner_cartridge_device : public device_t, { public: // construction/destruction - c64_partner_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_partner_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/c64/prophet64.cpp b/src/devices/bus/c64/prophet64.cpp index bd61247eed3..6b2e52169fd 100644 --- a/src/devices/bus/c64/prophet64.cpp +++ b/src/devices/bus/c64/prophet64.cpp @@ -26,7 +26,7 @@ const device_type C64_PROPHET64 = &device_creator<c64_prophet64_cartridge_device // c64_prophet64_cartridge_device - constructor //------------------------------------------------- -c64_prophet64_cartridge_device::c64_prophet64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_prophet64_cartridge_device::c64_prophet64_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_PROPHET64, "PROPHET64", tag, owner, clock, "c64_prophet64", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_bank(0) diff --git a/src/devices/bus/c64/prophet64.h b/src/devices/bus/c64/prophet64.h index e8e810da9e6..15d825ddcce 100644 --- a/src/devices/bus/c64/prophet64.h +++ b/src/devices/bus/c64/prophet64.h @@ -27,7 +27,7 @@ class c64_prophet64_cartridge_device : public device_t, { public: // construction/destruction - c64_prophet64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_prophet64_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/c64/ps64.cpp b/src/devices/bus/c64/ps64.cpp index af9ea9d2402..05988e85bee 100644 --- a/src/devices/bus/c64/ps64.cpp +++ b/src/devices/bus/c64/ps64.cpp @@ -100,7 +100,7 @@ machine_config_constructor c64_ps64_cartridge_device::device_mconfig_additions() // c64_ps64_cartridge_device - constructor //------------------------------------------------- -c64_ps64_cartridge_device::c64_ps64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_ps64_cartridge_device::c64_ps64_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_PS64, "C64 PS-64", tag, owner, clock, "c64_ps64", __FILE__), device_c64_expansion_card_interface(mconfig, *this) { diff --git a/src/devices/bus/c64/ps64.h b/src/devices/bus/c64/ps64.h index 5f2e87d7bcb..18610965186 100644 --- a/src/devices/bus/c64/ps64.h +++ b/src/devices/bus/c64/ps64.h @@ -29,7 +29,7 @@ class c64_ps64_cartridge_device : public device_t, { public: // construction/destruction - c64_ps64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_ps64_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/c64/reu.cpp b/src/devices/bus/c64/reu.cpp index 4883ada757b..61156396ccc 100644 --- a/src/devices/bus/c64/reu.cpp +++ b/src/devices/bus/c64/reu.cpp @@ -58,7 +58,7 @@ machine_config_constructor c64_reu_cartridge_device::device_mconfig_additions() // c64_reu_cartridge_device - constructor //------------------------------------------------- -c64_reu_cartridge_device::c64_reu_cartridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, int jp1, size_t ram_size, const char *shortname, const char *source) : +c64_reu_cartridge_device::c64_reu_cartridge_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, int jp1, size_t ram_size, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_c64_expansion_card_interface(mconfig, *this), m_dmac(*this, MOS8726R1_TAG), @@ -70,13 +70,13 @@ c64_reu_cartridge_device::c64_reu_cartridge_device(const machine_config &mconfig { } -c64_reu1700_cartridge_device::c64_reu1700_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +c64_reu1700_cartridge_device::c64_reu1700_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : c64_reu_cartridge_device(mconfig, C64_REU1700, "1700 REU", tag, owner, clock, TYPE_1700, 0, 128 * 1024, "c64_1700reu", __FILE__) { } -c64_reu1750_cartridge_device::c64_reu1750_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +c64_reu1750_cartridge_device::c64_reu1750_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : c64_reu_cartridge_device(mconfig, C64_REU1750, "1750 REU", tag, owner, clock, TYPE_1750, 1, 256 * 1024, "c64_1750reu", __FILE__) { } -c64_reu1764_cartridge_device::c64_reu1764_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +c64_reu1764_cartridge_device::c64_reu1764_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : c64_reu_cartridge_device(mconfig, C64_REU1764, "1764 REU", tag, owner, clock, TYPE_1764, 1, 512 * 1024, "c64_1764reu", __FILE__) { } diff --git a/src/devices/bus/c64/reu.h b/src/devices/bus/c64/reu.h index c0fb6252ac3..637830d84e9 100644 --- a/src/devices/bus/c64/reu.h +++ b/src/devices/bus/c64/reu.h @@ -31,7 +31,7 @@ class c64_reu_cartridge_device : public device_t, { public: // construction/destruction - c64_reu_cartridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, int jp1, size_t ram_size, const char *shortname, const char *source); + c64_reu_cartridge_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, int jp1, size_t ram_size, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -68,7 +68,7 @@ class c64_reu1700_cartridge_device : public c64_reu_cartridge_device { public: // construction/destruction - c64_reu1700_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_reu1700_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; @@ -78,7 +78,7 @@ class c64_reu1750_cartridge_device : public c64_reu_cartridge_device { public: // construction/destruction - c64_reu1750_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_reu1750_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; // ======================> c64_reu1700_cartridge_device @@ -87,7 +87,7 @@ class c64_reu1764_cartridge_device : public c64_reu_cartridge_device { public: // construction/destruction - c64_reu1764_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_reu1764_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/bus/c64/rex.cpp b/src/devices/bus/c64/rex.cpp index 5a4a0abaf78..5e55e54e345 100644 --- a/src/devices/bus/c64/rex.cpp +++ b/src/devices/bus/c64/rex.cpp @@ -26,7 +26,7 @@ const device_type C64_REX = &device_creator<c64_rex_cartridge_device>; // c64_rex_cartridge_device - constructor //------------------------------------------------- -c64_rex_cartridge_device::c64_rex_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_rex_cartridge_device::c64_rex_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_REX, "C64 Rex cartridge", tag, owner, clock, "c64_rex", __FILE__), device_c64_expansion_card_interface(mconfig, *this) { diff --git a/src/devices/bus/c64/rex.h b/src/devices/bus/c64/rex.h index d5f17dfdd5b..58c80ade38b 100644 --- a/src/devices/bus/c64/rex.h +++ b/src/devices/bus/c64/rex.h @@ -28,7 +28,7 @@ class c64_rex_cartridge_device : public device_t, { public: // construction/destruction - c64_rex_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_rex_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/c64/rex_ep256.cpp b/src/devices/bus/c64/rex_ep256.cpp index ecb5e3983e4..17b936e4300 100644 --- a/src/devices/bus/c64/rex_ep256.cpp +++ b/src/devices/bus/c64/rex_ep256.cpp @@ -61,7 +61,7 @@ machine_config_constructor c64_rex_ep256_cartridge_device::device_mconfig_additi // c64_rex_ep256_cartridge_device - constructor //------------------------------------------------- -c64_rex_ep256_cartridge_device::c64_rex_ep256_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_rex_ep256_cartridge_device::c64_rex_ep256_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_REX_EP256, "C64 Rex 256KB EPROM cartridge", tag, owner, clock, "rexep256", __FILE__), device_c64_expansion_card_interface(mconfig, *this) { diff --git a/src/devices/bus/c64/rex_ep256.h b/src/devices/bus/c64/rex_ep256.h index abd5f53618b..6bf18ee4e38 100644 --- a/src/devices/bus/c64/rex_ep256.h +++ b/src/devices/bus/c64/rex_ep256.h @@ -30,7 +30,7 @@ class c64_rex_ep256_cartridge_device : public device_t, { public: // construction/destruction - c64_rex_ep256_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_rex_ep256_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/c64/ross.cpp b/src/devices/bus/c64/ross.cpp index 1a074958aa0..a50a446cced 100644 --- a/src/devices/bus/c64/ross.cpp +++ b/src/devices/bus/c64/ross.cpp @@ -26,7 +26,7 @@ const device_type C64_ROSS = &device_creator<c64_ross_cartridge_device>; // c64_ross_cartridge_device - constructor //------------------------------------------------- -c64_ross_cartridge_device::c64_ross_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_ross_cartridge_device::c64_ross_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_ROSS, "C64 Ross cartridge", tag, owner, clock, "c64_ross", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_bank(0) { diff --git a/src/devices/bus/c64/ross.h b/src/devices/bus/c64/ross.h index 6f88948927b..feae79caf76 100644 --- a/src/devices/bus/c64/ross.h +++ b/src/devices/bus/c64/ross.h @@ -28,7 +28,7 @@ class c64_ross_cartridge_device : public device_t, { public: // construction/destruction - c64_ross_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_ross_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/c64/sfx_sound_expander.cpp b/src/devices/bus/c64/sfx_sound_expander.cpp index 8c3f7291620..f73b9007246 100644 --- a/src/devices/bus/c64/sfx_sound_expander.cpp +++ b/src/devices/bus/c64/sfx_sound_expander.cpp @@ -180,7 +180,7 @@ inline offs_t c64_sfx_sound_expander_cartridge_device::get_offset(offs_t offset, // c64_sfx_sound_expander_cartridge_device - constructor //------------------------------------------------- -c64_sfx_sound_expander_cartridge_device::c64_sfx_sound_expander_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_sfx_sound_expander_cartridge_device::c64_sfx_sound_expander_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_SFX_SOUND_EXPANDER, "C64 SFX Sound Expander cartridge", tag, owner, clock, "c64_sfxse", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_opl(*this, YM3526_TAG), diff --git a/src/devices/bus/c64/sfx_sound_expander.h b/src/devices/bus/c64/sfx_sound_expander.h index b51fd23e751..6d0bf440d0d 100644 --- a/src/devices/bus/c64/sfx_sound_expander.h +++ b/src/devices/bus/c64/sfx_sound_expander.h @@ -28,7 +28,7 @@ class c64_sfx_sound_expander_cartridge_device : public device_t, { public: // construction/destruction - c64_sfx_sound_expander_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_sfx_sound_expander_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/c64/silverrock.cpp b/src/devices/bus/c64/silverrock.cpp index 4ae1dd4ab75..f4a05961cc9 100644 --- a/src/devices/bus/c64/silverrock.cpp +++ b/src/devices/bus/c64/silverrock.cpp @@ -59,7 +59,7 @@ const device_type C64_SILVERROCK = &device_creator<c64_silverrock_cartridge_devi // c64_silverrock_cartridge_device - constructor //------------------------------------------------- -c64_silverrock_cartridge_device::c64_silverrock_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_silverrock_cartridge_device::c64_silverrock_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_SILVERROCK, "C64 SilverRock cartridge", tag, owner, clock, "c64_silverrock", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_bank(0) { diff --git a/src/devices/bus/c64/silverrock.h b/src/devices/bus/c64/silverrock.h index 6450e555fa7..28496f8f46a 100644 --- a/src/devices/bus/c64/silverrock.h +++ b/src/devices/bus/c64/silverrock.h @@ -28,7 +28,7 @@ class c64_silverrock_cartridge_device : public device_t, { public: // construction/destruction - c64_silverrock_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_silverrock_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/c64/simons_basic.cpp b/src/devices/bus/c64/simons_basic.cpp index 01baf228189..6bb3e058a46 100644 --- a/src/devices/bus/c64/simons_basic.cpp +++ b/src/devices/bus/c64/simons_basic.cpp @@ -26,7 +26,7 @@ const device_type C64_SIMONS_BASIC = &device_creator<c64_simons_basic_cartridge_ // c64_simons_basic_cartridge_device - constructor //------------------------------------------------- -c64_simons_basic_cartridge_device::c64_simons_basic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_simons_basic_cartridge_device::c64_simons_basic_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_SIMONS_BASIC, "Simons' BASIC", tag, owner, clock, "c64_simons_basic", __FILE__), device_c64_expansion_card_interface(mconfig, *this) { diff --git a/src/devices/bus/c64/simons_basic.h b/src/devices/bus/c64/simons_basic.h index 7193fee1aa3..19257a539cd 100644 --- a/src/devices/bus/c64/simons_basic.h +++ b/src/devices/bus/c64/simons_basic.h @@ -28,7 +28,7 @@ class c64_simons_basic_cartridge_device : public device_t, { public: // construction/destruction - c64_simons_basic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_simons_basic_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/c64/stardos.cpp b/src/devices/bus/c64/stardos.cpp index 4c92982c695..a8cde9557b6 100644 --- a/src/devices/bus/c64/stardos.cpp +++ b/src/devices/bus/c64/stardos.cpp @@ -112,7 +112,7 @@ void c64_stardos_cartridge_device::charge_io2_capacitor() // c64_stardos_cartridge_device - constructor //------------------------------------------------- -c64_stardos_cartridge_device::c64_stardos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_stardos_cartridge_device::c64_stardos_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_STARDOS, "C64 StarDOS cartridge", tag, owner, clock, "c64_stardos", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_io1_charge(0), diff --git a/src/devices/bus/c64/stardos.h b/src/devices/bus/c64/stardos.h index 63b37867da7..6cb72c602f8 100644 --- a/src/devices/bus/c64/stardos.h +++ b/src/devices/bus/c64/stardos.h @@ -29,7 +29,7 @@ class c64_stardos_cartridge_device : public device_t, { public: // construction/destruction - c64_stardos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_stardos_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/c64/std.cpp b/src/devices/bus/c64/std.cpp index 6fa3abfef1d..2b5e50ea849 100644 --- a/src/devices/bus/c64/std.cpp +++ b/src/devices/bus/c64/std.cpp @@ -26,7 +26,7 @@ const device_type C64_STD = &device_creator<c64_standard_cartridge_device>; // c64_standard_cartridge_device - constructor //------------------------------------------------- -c64_standard_cartridge_device::c64_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_standard_cartridge_device::c64_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_STD, "C64 standard cartridge", tag, owner, clock, "c64_standard", __FILE__), device_c64_expansion_card_interface(mconfig, *this) { diff --git a/src/devices/bus/c64/std.h b/src/devices/bus/c64/std.h index 16bbdb9f4ff..64f05e1faef 100644 --- a/src/devices/bus/c64/std.h +++ b/src/devices/bus/c64/std.h @@ -28,7 +28,7 @@ class c64_standard_cartridge_device : public device_t, { public: // construction/destruction - c64_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/c64/structured_basic.cpp b/src/devices/bus/c64/structured_basic.cpp index f299246e118..42898aaca35 100644 --- a/src/devices/bus/c64/structured_basic.cpp +++ b/src/devices/bus/c64/structured_basic.cpp @@ -26,7 +26,7 @@ const device_type C64_STRUCTURED_BASIC = &device_creator<c64_structured_basic_ca // c64_structured_basic_cartridge_device - constructor //------------------------------------------------- -c64_structured_basic_cartridge_device::c64_structured_basic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_structured_basic_cartridge_device::c64_structured_basic_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_STRUCTURED_BASIC, "C64 Structured Basic cartridge", tag, owner, clock, "c64_structured_basic", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_bank(0) diff --git a/src/devices/bus/c64/structured_basic.h b/src/devices/bus/c64/structured_basic.h index b061da08921..37ea95d54d6 100644 --- a/src/devices/bus/c64/structured_basic.h +++ b/src/devices/bus/c64/structured_basic.h @@ -28,7 +28,7 @@ class c64_structured_basic_cartridge_device : public device_t, { public: // construction/destruction - c64_structured_basic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_structured_basic_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/c64/super_explode.cpp b/src/devices/bus/c64/super_explode.cpp index 90c88ba1001..4757c359cde 100644 --- a/src/devices/bus/c64/super_explode.cpp +++ b/src/devices/bus/c64/super_explode.cpp @@ -36,7 +36,7 @@ const device_type C64_SUPER_EXPLODE = &device_creator<c64_super_explode_cartridg // c64_super_explode_cartridge_device - constructor //------------------------------------------------- -c64_super_explode_cartridge_device::c64_super_explode_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_super_explode_cartridge_device::c64_super_explode_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_SUPER_EXPLODE, "C64 Super Explode! cartridge", tag, owner, clock, "c64_super_explode", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_bank(0), m_exrom_timer(nullptr) { diff --git a/src/devices/bus/c64/super_explode.h b/src/devices/bus/c64/super_explode.h index d460791bef3..25892a4c821 100644 --- a/src/devices/bus/c64/super_explode.h +++ b/src/devices/bus/c64/super_explode.h @@ -28,7 +28,7 @@ class c64_super_explode_cartridge_device : public device_t, { public: // construction/destruction - c64_super_explode_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_super_explode_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/c64/super_games.cpp b/src/devices/bus/c64/super_games.cpp index 53d1f932e7a..ea4e356db8b 100644 --- a/src/devices/bus/c64/super_games.cpp +++ b/src/devices/bus/c64/super_games.cpp @@ -26,7 +26,7 @@ const device_type C64_SUPER_GAMES = &device_creator<c64_super_games_cartridge_de // c64_super_games_cartridge_device - constructor //------------------------------------------------- -c64_super_games_cartridge_device::c64_super_games_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_super_games_cartridge_device::c64_super_games_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_SUPER_GAMES, "C64 Super Games cartridge", tag, owner, clock, "c64_super_games", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_bank(0) diff --git a/src/devices/bus/c64/super_games.h b/src/devices/bus/c64/super_games.h index 321a5c8ef92..18b6fb13267 100644 --- a/src/devices/bus/c64/super_games.h +++ b/src/devices/bus/c64/super_games.h @@ -28,7 +28,7 @@ class c64_super_games_cartridge_device : public device_t, { public: // construction/destruction - c64_super_games_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_super_games_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/c64/supercpu.cpp b/src/devices/bus/c64/supercpu.cpp index cb8a28e2198..4ee7220b28b 100644 --- a/src/devices/bus/c64/supercpu.cpp +++ b/src/devices/bus/c64/supercpu.cpp @@ -118,7 +118,7 @@ ioport_constructor c64_supercpu_device::device_input_ports() const // c64_supercpu_device - constructor //------------------------------------------------- -c64_supercpu_device::c64_supercpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_supercpu_device::c64_supercpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_SUPERCPU, "SuperCPU", tag, owner, clock, "c64_supercpu", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_maincpu(*this, G65816_TAG), diff --git a/src/devices/bus/c64/supercpu.h b/src/devices/bus/c64/supercpu.h index df799261faf..8631ae4aafc 100644 --- a/src/devices/bus/c64/supercpu.h +++ b/src/devices/bus/c64/supercpu.h @@ -28,7 +28,7 @@ class c64_supercpu_device : public device_t, { public: // construction/destruction - c64_supercpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_supercpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/c64/sw8k.cpp b/src/devices/bus/c64/sw8k.cpp index d8864e5ceb9..ec49a6f7c58 100644 --- a/src/devices/bus/c64/sw8k.cpp +++ b/src/devices/bus/c64/sw8k.cpp @@ -71,7 +71,7 @@ ioport_constructor c64_switchable_8k_cartridge_device::device_input_ports() cons // c64_switchable_8k_cartridge_device - constructor //------------------------------------------------- -c64_switchable_8k_cartridge_device::c64_switchable_8k_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_switchable_8k_cartridge_device::c64_switchable_8k_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_SW8K, "C64 Switchable 8K cartridge", tag, owner, clock, "c64_sw8k", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_sw(*this, "SW"), m_bank(0) diff --git a/src/devices/bus/c64/sw8k.h b/src/devices/bus/c64/sw8k.h index d6a753e1f1b..e3c1a5fe989 100644 --- a/src/devices/bus/c64/sw8k.h +++ b/src/devices/bus/c64/sw8k.h @@ -28,7 +28,7 @@ class c64_switchable_8k_cartridge_device : public device_t, { public: // construction/destruction - c64_switchable_8k_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_switchable_8k_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/c64/swiftlink.cpp b/src/devices/bus/c64/swiftlink.cpp index 14e0b224da5..c04cb185ee2 100644 --- a/src/devices/bus/c64/swiftlink.cpp +++ b/src/devices/bus/c64/swiftlink.cpp @@ -99,7 +99,7 @@ ioport_constructor c64_swiftlink_cartridge_device::device_input_ports() const // c64_swiftlink_cartridge_device - constructor //------------------------------------------------- -c64_swiftlink_cartridge_device::c64_swiftlink_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_swiftlink_cartridge_device::c64_swiftlink_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_SWIFTLINK, "C64 SwiftLink cartridge", tag, owner, clock, "c64_swiftlink", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_acia(*this, MOS6551_TAG), diff --git a/src/devices/bus/c64/swiftlink.h b/src/devices/bus/c64/swiftlink.h index 9a364845094..154b10eb14e 100644 --- a/src/devices/bus/c64/swiftlink.h +++ b/src/devices/bus/c64/swiftlink.h @@ -29,7 +29,7 @@ class c64_swiftlink_cartridge_device : public device_t, { public: // construction/destruction - c64_swiftlink_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_swiftlink_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/c64/system3.cpp b/src/devices/bus/c64/system3.cpp index 9bc4a33f7dd..b442fde9491 100644 --- a/src/devices/bus/c64/system3.cpp +++ b/src/devices/bus/c64/system3.cpp @@ -26,7 +26,7 @@ const device_type C64_SYSTEM3 = &device_creator<c64_system3_cartridge_device>; // c64_system3_cartridge_device - constructor //------------------------------------------------- -c64_system3_cartridge_device::c64_system3_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_system3_cartridge_device::c64_system3_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_SYSTEM3, "C64 System 3 cartridge", tag, owner, clock, "c64_system3", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_bank(0) diff --git a/src/devices/bus/c64/system3.h b/src/devices/bus/c64/system3.h index fef5c100217..51f8a2d726b 100644 --- a/src/devices/bus/c64/system3.h +++ b/src/devices/bus/c64/system3.h @@ -28,7 +28,7 @@ class c64_system3_cartridge_device : public device_t, { public: // construction/destruction - c64_system3_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_system3_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/c64/tdos.cpp b/src/devices/bus/c64/tdos.cpp index 9ce8c14f22a..061cc7a6cdb 100644 --- a/src/devices/bus/c64/tdos.cpp +++ b/src/devices/bus/c64/tdos.cpp @@ -201,7 +201,7 @@ ioport_constructor c64_tdos_cartridge_device::device_input_ports() const // c64_tdos_cartridge_device - constructor //------------------------------------------------- -c64_tdos_cartridge_device::c64_tdos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_tdos_cartridge_device::c64_tdos_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_TDOS, "C64 TDOS cartridge", tag, owner, clock, "c64_tdos", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_ssda(*this, MC68A52P_TAG), diff --git a/src/devices/bus/c64/tdos.h b/src/devices/bus/c64/tdos.h index 42c08cbd1c8..7754f728ba9 100644 --- a/src/devices/bus/c64/tdos.h +++ b/src/devices/bus/c64/tdos.h @@ -28,7 +28,7 @@ class c64_tdos_cartridge_device : public device_t, { public: // construction/destruction - c64_tdos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_tdos_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/c64/turbo232.cpp b/src/devices/bus/c64/turbo232.cpp index 1dd43b2011d..8333d807826 100644 --- a/src/devices/bus/c64/turbo232.cpp +++ b/src/devices/bus/c64/turbo232.cpp @@ -98,7 +98,7 @@ ioport_constructor c64_turbo232_cartridge_device::device_input_ports() const // c64_turbo232_cartridge_device - constructor //------------------------------------------------- -c64_turbo232_cartridge_device::c64_turbo232_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_turbo232_cartridge_device::c64_turbo232_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_TURBO232, "C64 Turbo232 cartridge", tag, owner, clock, "c64_turbo232", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_acia(*this, MOS6551_TAG), diff --git a/src/devices/bus/c64/turbo232.h b/src/devices/bus/c64/turbo232.h index 4f80cec374f..f59b2fdb684 100644 --- a/src/devices/bus/c64/turbo232.h +++ b/src/devices/bus/c64/turbo232.h @@ -29,7 +29,7 @@ class c64_turbo232_cartridge_device : public device_t, { public: // construction/destruction - c64_turbo232_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_turbo232_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/c64/vizastar.cpp b/src/devices/bus/c64/vizastar.cpp index d635ffec656..7e86462817c 100644 --- a/src/devices/bus/c64/vizastar.cpp +++ b/src/devices/bus/c64/vizastar.cpp @@ -58,7 +58,7 @@ const device_type C64_VIZASTAR = &device_creator<c64_vizastar_cartridge_device>; // c64_vizastar_cartridge_device - constructor //------------------------------------------------- -c64_vizastar_cartridge_device::c64_vizastar_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_vizastar_cartridge_device::c64_vizastar_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_VIZASTAR, "VizaStar 64 XL4", tag, owner, clock, "c64_vizastar", __FILE__), device_c64_expansion_card_interface(mconfig, *this) { diff --git a/src/devices/bus/c64/vizastar.h b/src/devices/bus/c64/vizastar.h index 4c24f9705be..1cf800beb8d 100644 --- a/src/devices/bus/c64/vizastar.h +++ b/src/devices/bus/c64/vizastar.h @@ -28,7 +28,7 @@ class c64_vizastar_cartridge_device : public device_t, { public: // construction/destruction - c64_vizastar_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_vizastar_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/c64/vw64.cpp b/src/devices/bus/c64/vw64.cpp index 3288e492a43..09fc6c0b341 100644 --- a/src/devices/bus/c64/vw64.cpp +++ b/src/devices/bus/c64/vw64.cpp @@ -66,7 +66,7 @@ const device_type C64_VW64 = &device_creator<c64_vizawrite_cartridge_device>; // c64_vizawrite_cartridge_device - constructor //------------------------------------------------- -c64_vizawrite_cartridge_device::c64_vizawrite_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_vizawrite_cartridge_device::c64_vizawrite_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_VW64, "VizaWrite 64", tag, owner, clock, "c64_vizawrite", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_game_timer(nullptr) { diff --git a/src/devices/bus/c64/vw64.h b/src/devices/bus/c64/vw64.h index 906ca3b0b27..7b51c0362f3 100644 --- a/src/devices/bus/c64/vw64.h +++ b/src/devices/bus/c64/vw64.h @@ -28,7 +28,7 @@ class c64_vizawrite_cartridge_device : public device_t, { public: // construction/destruction - c64_vizawrite_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_vizawrite_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/c64/warp_speed.cpp b/src/devices/bus/c64/warp_speed.cpp index d625fa5ea7d..5cb79c90352 100644 --- a/src/devices/bus/c64/warp_speed.cpp +++ b/src/devices/bus/c64/warp_speed.cpp @@ -85,7 +85,7 @@ ioport_constructor c64_warp_speed_cartridge_device::device_input_ports() const // c64_warp_speed_cartridge_device - constructor //------------------------------------------------- -c64_warp_speed_cartridge_device::c64_warp_speed_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_warp_speed_cartridge_device::c64_warp_speed_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_WARP_SPEED, "C64 Warp Speed cartridge", tag, owner, clock, "c64_warp_speed", __FILE__), device_c64_expansion_card_interface(mconfig, *this) { diff --git a/src/devices/bus/c64/warp_speed.h b/src/devices/bus/c64/warp_speed.h index b3eeca48809..05ffa39019b 100644 --- a/src/devices/bus/c64/warp_speed.h +++ b/src/devices/bus/c64/warp_speed.h @@ -28,7 +28,7 @@ class c64_warp_speed_cartridge_device : public device_t, { public: // construction/destruction - c64_warp_speed_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_warp_speed_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/c64/westermann.cpp b/src/devices/bus/c64/westermann.cpp index 6a758428a1f..8b27430453b 100644 --- a/src/devices/bus/c64/westermann.cpp +++ b/src/devices/bus/c64/westermann.cpp @@ -26,7 +26,7 @@ const device_type C64_WESTERMANN = &device_creator<c64_westermann_cartridge_devi // c64_westermann_cartridge_device - constructor //------------------------------------------------- -c64_westermann_cartridge_device::c64_westermann_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_westermann_cartridge_device::c64_westermann_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_WESTERMANN, "C64 Westermann cartridge", tag, owner, clock, "c64_westermann", __FILE__), device_c64_expansion_card_interface(mconfig, *this) { diff --git a/src/devices/bus/c64/westermann.h b/src/devices/bus/c64/westermann.h index 220b5390925..d4de04b7299 100644 --- a/src/devices/bus/c64/westermann.h +++ b/src/devices/bus/c64/westermann.h @@ -28,7 +28,7 @@ class c64_westermann_cartridge_device : public device_t, { public: // construction/destruction - c64_westermann_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_westermann_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/c64/xl80.cpp b/src/devices/bus/c64/xl80.cpp index c1f7fe0f1dd..4b754e0199c 100644 --- a/src/devices/bus/c64/xl80.cpp +++ b/src/devices/bus/c64/xl80.cpp @@ -158,7 +158,7 @@ machine_config_constructor c64_xl80_device::device_mconfig_additions() const // c64_xl80_device - constructor //------------------------------------------------- -c64_xl80_device::c64_xl80_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_xl80_device::c64_xl80_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_XL80, "XL 80", tag, owner, clock, "c64_xl80", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_crtc(*this, HD46505SP_TAG), diff --git a/src/devices/bus/c64/xl80.h b/src/devices/bus/c64/xl80.h index b167b549265..620eeaca17d 100644 --- a/src/devices/bus/c64/xl80.h +++ b/src/devices/bus/c64/xl80.h @@ -29,7 +29,7 @@ class c64_xl80_device : public device_t, { public: // construction/destruction - c64_xl80_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_xl80_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/c64/zaxxon.cpp b/src/devices/bus/c64/zaxxon.cpp index 5406c584876..d2f398fe2ac 100644 --- a/src/devices/bus/c64/zaxxon.cpp +++ b/src/devices/bus/c64/zaxxon.cpp @@ -26,7 +26,7 @@ const device_type C64_ZAXXON = &device_creator<c64_zaxxon_cartridge_device>; // c64_zaxxon_cartridge_device - constructor //------------------------------------------------- -c64_zaxxon_cartridge_device::c64_zaxxon_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_zaxxon_cartridge_device::c64_zaxxon_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_ZAXXON, "C64 Zaxxon cartridge", tag, owner, clock, "c64_zaxxon", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_bank(0) diff --git a/src/devices/bus/c64/zaxxon.h b/src/devices/bus/c64/zaxxon.h index 28b8eecc911..381dff60c41 100644 --- a/src/devices/bus/c64/zaxxon.h +++ b/src/devices/bus/c64/zaxxon.h @@ -28,7 +28,7 @@ class c64_zaxxon_cartridge_device : public device_t, { public: // construction/destruction - c64_zaxxon_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_zaxxon_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/cbm2/24k.cpp b/src/devices/bus/cbm2/24k.cpp index a31c58a7aaf..51356ef95cd 100644 --- a/src/devices/bus/cbm2/24k.cpp +++ b/src/devices/bus/cbm2/24k.cpp @@ -26,7 +26,7 @@ const device_type CBM2_24K = &device_creator<cbm2_24k_cartridge_device>; // cbm2_24k_cartridge_device - constructor //------------------------------------------------- -cbm2_24k_cartridge_device::cbm2_24k_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +cbm2_24k_cartridge_device::cbm2_24k_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CBM2_24K, "24K RAM/ROM cartridge", tag, owner, clock, "cbm2_24k", __FILE__), device_cbm2_expansion_card_interface(mconfig, *this), m_ram(*this, "ram") diff --git a/src/devices/bus/cbm2/24k.h b/src/devices/bus/cbm2/24k.h index 6d39d0dd5d5..7c4334edfed 100644 --- a/src/devices/bus/cbm2/24k.h +++ b/src/devices/bus/cbm2/24k.h @@ -27,7 +27,7 @@ class cbm2_24k_cartridge_device : public device_t, { public: // construction/destruction - cbm2_24k_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cbm2_24k_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/cbm2/exp.cpp b/src/devices/bus/cbm2/exp.cpp index fd4993760c3..7869aef5817 100644 --- a/src/devices/bus/cbm2/exp.cpp +++ b/src/devices/bus/cbm2/exp.cpp @@ -62,7 +62,7 @@ device_cbm2_expansion_card_interface::~device_cbm2_expansion_card_interface() // cbm2_expansion_slot_device - constructor //------------------------------------------------- -cbm2_expansion_slot_device::cbm2_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +cbm2_expansion_slot_device::cbm2_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CBM2_EXPANSION_SLOT, "CBM-II expansion port", tag, owner, clock, "cbm2_expansion_slot", __FILE__), device_slot_interface(mconfig, *this), device_image_interface(mconfig, *this), m_card(nullptr) diff --git a/src/devices/bus/cbm2/exp.h b/src/devices/bus/cbm2/exp.h index ce5daf10dbb..c91349e0e2f 100644 --- a/src/devices/bus/cbm2/exp.h +++ b/src/devices/bus/cbm2/exp.h @@ -65,7 +65,7 @@ class cbm2_expansion_slot_device : public device_t, { public: // construction/destruction - cbm2_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cbm2_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // computer interface UINT8 read(address_space &space, offs_t offset, UINT8 data, int csbank1, int csbank2, int csbank3); diff --git a/src/devices/bus/cbm2/hrg.cpp b/src/devices/bus/cbm2/hrg.cpp index e0e9bf667ba..b2e2a087529 100644 --- a/src/devices/bus/cbm2/hrg.cpp +++ b/src/devices/bus/cbm2/hrg.cpp @@ -147,7 +147,7 @@ machine_config_constructor cbm2_hrg_b_t::device_mconfig_additions() const // cbm2_hrg_t - constructor //------------------------------------------------- -cbm2_hrg_t::cbm2_hrg_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +cbm2_hrg_t::cbm2_hrg_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_cbm2_expansion_card_interface(mconfig, *this), m_gdc(*this, EF9366_TAG), @@ -155,12 +155,12 @@ cbm2_hrg_t::cbm2_hrg_t(const machine_config &mconfig, device_type type, const ch { } -cbm2_hrg_a_t::cbm2_hrg_a_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +cbm2_hrg_a_t::cbm2_hrg_a_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : cbm2_hrg_t(mconfig, CBM2_HRG_A, "CBM 500/600/700 High Resolution Graphics (A)", tag, owner, clock, "cbm2_hrga", __FILE__) { } -cbm2_hrg_b_t::cbm2_hrg_b_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +cbm2_hrg_b_t::cbm2_hrg_b_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : cbm2_hrg_t(mconfig, CBM2_HRG_B, "CBM 500/600/700 High Resolution Graphics (B)", tag, owner, clock, "cbm2_hrgb", __FILE__) { } diff --git a/src/devices/bus/cbm2/hrg.h b/src/devices/bus/cbm2/hrg.h index 67e0f25ad90..2562e4c8971 100644 --- a/src/devices/bus/cbm2/hrg.h +++ b/src/devices/bus/cbm2/hrg.h @@ -28,7 +28,7 @@ class cbm2_hrg_t : public device_t, { public: // construction/destruction - cbm2_hrg_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + cbm2_hrg_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -54,7 +54,7 @@ class cbm2_hrg_a_t : public cbm2_hrg_t { public: // construction/destruction - cbm2_hrg_a_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cbm2_hrg_a_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -67,7 +67,7 @@ class cbm2_hrg_b_t : public cbm2_hrg_t { public: // construction/destruction - cbm2_hrg_b_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cbm2_hrg_b_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/cbm2/std.cpp b/src/devices/bus/cbm2/std.cpp index e6e697927dc..0a98dd10450 100644 --- a/src/devices/bus/cbm2/std.cpp +++ b/src/devices/bus/cbm2/std.cpp @@ -26,7 +26,7 @@ const device_type CBM2_STD = &device_creator<cbm2_standard_cartridge_device>; // cbm2_standard_cartridge_device - constructor //------------------------------------------------- -cbm2_standard_cartridge_device::cbm2_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +cbm2_standard_cartridge_device::cbm2_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CBM2_STD, "CBM-II standard cartridge", tag, owner, clock, "cbm2_standard", __FILE__), device_cbm2_expansion_card_interface(mconfig, *this) { diff --git a/src/devices/bus/cbm2/std.h b/src/devices/bus/cbm2/std.h index 1645958e40b..553e5d95c0e 100644 --- a/src/devices/bus/cbm2/std.h +++ b/src/devices/bus/cbm2/std.h @@ -27,7 +27,7 @@ class cbm2_standard_cartridge_device : public device_t, { public: // construction/destruction - cbm2_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cbm2_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/cbm2/user.cpp b/src/devices/bus/cbm2/user.cpp index b6271071a9b..373736b709d 100644 --- a/src/devices/bus/cbm2/user.cpp +++ b/src/devices/bus/cbm2/user.cpp @@ -42,7 +42,7 @@ device_cbm2_user_port_interface::device_cbm2_user_port_interface(const machine_c // cbm2_user_port_device - constructor //------------------------------------------------- -cbm2_user_port_device::cbm2_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +cbm2_user_port_device::cbm2_user_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CBM2_USER_PORT, "CBM2 user port", tag, owner, clock, "cbm2_user_port", __FILE__), device_slot_interface(mconfig, *this), m_write_irq(*this), diff --git a/src/devices/bus/cbm2/user.h b/src/devices/bus/cbm2/user.h index 58810f02f3f..89dda70b95c 100644 --- a/src/devices/bus/cbm2/user.h +++ b/src/devices/bus/cbm2/user.h @@ -105,7 +105,7 @@ class cbm2_user_port_device : public device_t, { public: // construction/destruction - cbm2_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cbm2_user_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~cbm2_user_port_device() { } template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<cbm2_user_port_device &>(device).m_write_irq.set_callback(object); } diff --git a/src/devices/bus/cbmiec/c1526.cpp b/src/devices/bus/cbmiec/c1526.cpp index da2cf7197c0..0ee77d48ce9 100644 --- a/src/devices/bus/cbmiec/c1526.cpp +++ b/src/devices/bus/cbmiec/c1526.cpp @@ -170,7 +170,7 @@ ioport_constructor c4023_t::device_input_ports() const // c1526_base_t - constructor //------------------------------------------------- -c1526_base_t:: c1526_base_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +c1526_base_t:: c1526_base_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) { } @@ -180,7 +180,7 @@ c1526_base_t:: c1526_base_t(const machine_config &mconfig, device_type type, con // c1526_t - constructor //------------------------------------------------- -c1526_t::c1526_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c1526_t::c1526_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : c1526_base_t(mconfig, C1526, "1526", tag, owner, clock, "c1526", __FILE__), device_cbm_iec_interface(mconfig, *this) { @@ -191,7 +191,7 @@ c1526_t::c1526_t(const machine_config &mconfig, const char *tag, device_t *owner // c4023_t - constructor //------------------------------------------------- -c4023_t::c4023_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c4023_t::c4023_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : c1526_base_t(mconfig, C4023, "4023", tag, owner, clock, "c4023", __FILE__), device_ieee488_interface(mconfig, *this) { diff --git a/src/devices/bus/cbmiec/c1526.h b/src/devices/bus/cbmiec/c1526.h index deba3be2ce7..98510b774bf 100644 --- a/src/devices/bus/cbmiec/c1526.h +++ b/src/devices/bus/cbmiec/c1526.h @@ -28,7 +28,7 @@ class c1526_base_t : public device_t { public: // construction/destruction - c1526_base_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + c1526_base_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); protected: // device-level overrides @@ -44,7 +44,7 @@ class c1526_t : public c1526_base_t, { public: // construction/destruction - c1526_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c1526_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -66,7 +66,7 @@ class c4023_t : public c1526_base_t, { public: // construction/destruction - c4023_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c4023_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/cbmiec/c1541.cpp b/src/devices/bus/cbmiec/c1541.cpp index 6e1be701b64..1c3e48f0929 100644 --- a/src/devices/bus/cbmiec/c1541.cpp +++ b/src/devices/bus/cbmiec/c1541.cpp @@ -999,7 +999,7 @@ inline void c1541_base_t::set_iec_data() // c1541_base_t - constructor //------------------------------------------------- -c1541_base_t:: c1541_base_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +c1541_base_t:: c1541_base_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_cbm_iec_interface(mconfig, *this), device_c64_floppy_parallel_interface(mconfig, *this), @@ -1020,7 +1020,7 @@ c1541_base_t:: c1541_base_t(const machine_config &mconfig, device_type type, con // c1540_t - constructor //------------------------------------------------- -c1540_t::c1540_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +c1540_t::c1540_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : c1541_base_t(mconfig, C1540, "C1540", tag, owner, clock, "c1540", __FILE__) { } @@ -1028,7 +1028,7 @@ c1540_t::c1540_t(const machine_config &mconfig, const char *tag, device_t *owner // c1541_t - constructor //------------------------------------------------- -c1541_t::c1541_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +c1541_t::c1541_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : c1541_base_t(mconfig, C1541, "C1541", tag, owner, clock, "c1541", __FILE__) { } @@ -1036,7 +1036,7 @@ c1541_t::c1541_t(const machine_config &mconfig, const char *tag, device_t *owner // c1541c_t - constructor //------------------------------------------------- -c1541c_t::c1541c_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +c1541c_t::c1541c_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : c1541_base_t(mconfig, C1541C, "C1541C", tag, owner, clock, "c1541c", __FILE__) { } @@ -1044,7 +1044,7 @@ c1541c_t::c1541c_t(const machine_config &mconfig, const char *tag, device_t *own // c1541ii_t - constructor //------------------------------------------------- -c1541ii_t::c1541ii_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +c1541ii_t::c1541ii_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : c1541_base_t(mconfig, C1541II, "C1541-II", tag, owner, clock, "c1541ii", __FILE__) { } @@ -1052,7 +1052,7 @@ c1541ii_t::c1541ii_t(const machine_config &mconfig, const char *tag, device_t *o // sx1541_t - constructor //------------------------------------------------- -sx1541_t::sx1541_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sx1541_t::sx1541_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : c1541_base_t(mconfig, SX1541, "SX1541", tag, owner, clock, "sx1541", __FILE__) { } @@ -1060,7 +1060,7 @@ sx1541_t::sx1541_t(const machine_config &mconfig, const char *tag, device_t *own // fsd1_t - constructor //------------------------------------------------- -fsd1_t::fsd1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +fsd1_t::fsd1_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : c1541_base_t(mconfig, FSD1, "FSD-1", tag, owner, clock, "fsd1", __FILE__) { } @@ -1068,7 +1068,7 @@ fsd1_t::fsd1_t(const machine_config &mconfig, const char *tag, device_t *owner, // fsd2_t - constructor //------------------------------------------------- -fsd2_t::fsd2_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +fsd2_t::fsd2_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : c1541_base_t(mconfig, FSD2, "FSD-2", tag, owner, clock, "fsd2", __FILE__) { } @@ -1076,7 +1076,7 @@ fsd2_t::fsd2_t(const machine_config &mconfig, const char *tag, device_t *owner, // csd1_t - constructor //------------------------------------------------- -csd1_t::csd1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +csd1_t::csd1_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : c1541_base_t(mconfig, CSD1, "CSD-1", tag, owner, clock, "csd1", __FILE__) { } @@ -1084,7 +1084,7 @@ csd1_t::csd1_t(const machine_config &mconfig, const char *tag, device_t *owner, // c1541_dolphin_dos_t - constructor //------------------------------------------------- -c1541_dolphin_dos_t::c1541_dolphin_dos_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +c1541_dolphin_dos_t::c1541_dolphin_dos_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : c1541_base_t(mconfig, C1541_DOLPHIN_DOS, "C1541 Dolphin-DOS 2.0", tag, owner, clock, "c1541dd", __FILE__) { } @@ -1092,7 +1092,7 @@ c1541_dolphin_dos_t::c1541_dolphin_dos_t(const machine_config &mconfig, const ch // c1541_professional_dos_v1_t - constructor //------------------------------------------------- -c1541_professional_dos_v1_t::c1541_professional_dos_v1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +c1541_professional_dos_v1_t::c1541_professional_dos_v1_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : c1541_base_t(mconfig, C1541_PROFESSIONAL_DOS_V1, "C1541 Professional-DOS v1", tag, owner, clock, "c1541pd", __FILE__) { } @@ -1100,7 +1100,7 @@ c1541_professional_dos_v1_t::c1541_professional_dos_v1_t(const machine_config &m // c1541_prologic_dos_classic_t - constructor //------------------------------------------------- -c1541_prologic_dos_classic_t::c1541_prologic_dos_classic_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +c1541_prologic_dos_classic_t::c1541_prologic_dos_classic_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : c1541_base_t(mconfig, C1541_PROLOGIC_DOS_CLASSIC, "C1541 ProLogic-DOS Classic", tag, owner, clock, "c1541pdc", __FILE__), m_pia(*this, MC6821_TAG), m_cent_data_out(*this, "cent_data_out"), @@ -1113,7 +1113,7 @@ c1541_prologic_dos_classic_t::c1541_prologic_dos_classic_t(const machine_config // indus_gt_t - constructor //------------------------------------------------- -indus_gt_t::indus_gt_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +indus_gt_t::indus_gt_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : c1541_base_t(mconfig, INDUS_GT, "Indus GT", tag, owner, clock, "indusgt", __FILE__) { } diff --git a/src/devices/bus/cbmiec/c1541.h b/src/devices/bus/cbmiec/c1541.h index df03b9429af..19fff953a76 100644 --- a/src/devices/bus/cbmiec/c1541.h +++ b/src/devices/bus/cbmiec/c1541.h @@ -42,7 +42,7 @@ class c1541_base_t : public device_t, { public: // construction/destruction - c1541_base_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + c1541_base_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -105,7 +105,7 @@ class c1540_t : public c1541_base_t { public: // construction/destruction - c1540_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c1540_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -118,7 +118,7 @@ class c1541_t : public c1541_base_t { public: // construction/destruction - c1541_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c1541_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -131,7 +131,7 @@ class c1541c_t : public c1541_base_t { public: // construction/destruction - c1541c_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c1541c_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -148,7 +148,7 @@ class c1541ii_t : public c1541_base_t { public: // construction/destruction - c1541ii_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c1541ii_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -161,7 +161,7 @@ class sx1541_t : public c1541_base_t { public: // construction/destruction - sx1541_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sx1541_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -174,7 +174,7 @@ class fsd1_t : public c1541_base_t { public: // construction/destruction - fsd1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + fsd1_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -187,7 +187,7 @@ class fsd2_t : public c1541_base_t { public: // construction/destruction - fsd2_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + fsd2_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -203,7 +203,7 @@ class csd1_t : public c1541_base_t { public: // construction/destruction - csd1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + csd1_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -216,7 +216,7 @@ class c1541_dolphin_dos_t : public c1541_base_t { public: // construction/destruction - c1541_dolphin_dos_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c1541_dolphin_dos_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -230,7 +230,7 @@ class c1541_professional_dos_v1_t : public c1541_base_t { public: // construction/destruction - c1541_professional_dos_v1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c1541_professional_dos_v1_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -244,7 +244,7 @@ class c1541_prologic_dos_classic_t : public c1541_base_t { public: // construction/destruction - c1541_prologic_dos_classic_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c1541_prologic_dos_classic_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -274,7 +274,7 @@ class indus_gt_t : public c1541_base_t { public: // construction/destruction - indus_gt_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + indus_gt_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/cbmiec/c1571.cpp b/src/devices/bus/cbmiec/c1571.cpp index 976455387ae..ff907c7a537 100644 --- a/src/devices/bus/cbmiec/c1571.cpp +++ b/src/devices/bus/cbmiec/c1571.cpp @@ -830,7 +830,7 @@ ioport_constructor c1571_t::device_input_ports() const // c1571_t - constructor //------------------------------------------------- -c1571_t::c1571_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +c1571_t::c1571_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_cbm_iec_interface(mconfig, *this), device_c64_floppy_parallel_interface(mconfig, *this), @@ -853,7 +853,7 @@ c1571_t::c1571_t(const machine_config &mconfig, device_type type, const char *na { } -c1571_t::c1571_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +c1571_t::c1571_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C1571, "C1571", tag, owner, clock, "c1571", __FILE__), device_cbm_iec_interface(mconfig, *this), device_c64_floppy_parallel_interface(mconfig, *this), @@ -881,7 +881,7 @@ c1571_t::c1571_t(const machine_config &mconfig, const char *tag, device_t *owner // c1570_t - constructor //------------------------------------------------- -c1570_t::c1570_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +c1570_t::c1570_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : c1571_t(mconfig, C1570, "C1570", tag, owner, clock, "c1570", __FILE__) { } @@ -891,7 +891,7 @@ c1570_t::c1570_t(const machine_config &mconfig, const char *tag, device_t *owner // c1571cr_t - constructor //------------------------------------------------- -c1571cr_t::c1571cr_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +c1571cr_t::c1571cr_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : c1571_t(mconfig, C1571CR, "C1571CR", tag, owner, clock, "c1571cr", __FILE__) { } @@ -901,7 +901,7 @@ c1571cr_t::c1571cr_t(const machine_config &mconfig, const char *tag, device_t *o // mini_chief_t - constructor //------------------------------------------------- -mini_chief_t::mini_chief_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +mini_chief_t::mini_chief_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : c1571_t(mconfig, MINI_CHIEF, "ICT Mini Chief", tag, owner, clock, "minichif", __FILE__) { } diff --git a/src/devices/bus/cbmiec/c1571.h b/src/devices/bus/cbmiec/c1571.h index cd0da9a3a3d..0a09a24a5fb 100644 --- a/src/devices/bus/cbmiec/c1571.h +++ b/src/devices/bus/cbmiec/c1571.h @@ -44,8 +44,8 @@ class c1571_t : public device_t, { public: // construction/destruction - c1571_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - c1571_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c1571_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + c1571_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -131,7 +131,7 @@ class c1570_t : public c1571_t { public: // construction/destruction - c1570_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c1570_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -145,7 +145,7 @@ class c1571cr_t : public c1571_t { public: // construction/destruction - c1571cr_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c1571cr_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -162,7 +162,7 @@ class mini_chief_t : public c1571_t { public: // construction/destruction - mini_chief_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + mini_chief_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/cbmiec/c1581.cpp b/src/devices/bus/cbmiec/c1581.cpp index e13317654a2..892e3980ddf 100644 --- a/src/devices/bus/cbmiec/c1581.cpp +++ b/src/devices/bus/cbmiec/c1581.cpp @@ -326,7 +326,7 @@ ioport_constructor c1581_t::device_input_ports() const // c1581_t - constructor //------------------------------------------------- -c1581_t::c1581_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +c1581_t::c1581_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_cbm_iec_interface(mconfig, *this), m_maincpu(*this, M6502_TAG), @@ -342,7 +342,7 @@ c1581_t::c1581_t(const machine_config &mconfig, device_type type, const char *na { } -c1581_t::c1581_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +c1581_t::c1581_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C1581, "C1581", tag, owner, clock, "c1581", __FILE__), device_cbm_iec_interface(mconfig, *this), m_maincpu(*this, M6502_TAG), @@ -363,7 +363,7 @@ c1581_t::c1581_t(const machine_config &mconfig, const char *tag, device_t *owner // c1563_t - constructor //------------------------------------------------- -c1563_t::c1563_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +c1563_t::c1563_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : c1581_t(mconfig, C1563, "C1563", tag, owner, clock, "c1563", __FILE__) { } diff --git a/src/devices/bus/cbmiec/c1581.h b/src/devices/bus/cbmiec/c1581.h index adcbaf63468..f1a3ac04dae 100644 --- a/src/devices/bus/cbmiec/c1581.h +++ b/src/devices/bus/cbmiec/c1581.h @@ -39,8 +39,8 @@ class c1581_t : public device_t, { public: // construction/destruction - c1581_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - c1581_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c1581_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + c1581_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -96,7 +96,7 @@ class c1563_t : public c1581_t { public: // construction/destruction - c1563_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c1563_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/cbmiec/c64_nl10.cpp b/src/devices/bus/cbmiec/c64_nl10.cpp index 970baa2f941..a5258e65e8f 100644 --- a/src/devices/bus/cbmiec/c64_nl10.cpp +++ b/src/devices/bus/cbmiec/c64_nl10.cpp @@ -46,7 +46,7 @@ const rom_entry *c64_nl10_interface_device::device_rom_region() const // c64_nl10_interface_device - constructor //------------------------------------------------- -c64_nl10_interface_device::c64_nl10_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +c64_nl10_interface_device::c64_nl10_interface_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_NL10_INTERFACE, "Star NL-10 C64 Interface Cartridge", tag, owner, clock, "c64_nl10", __FILE__), device_cbm_iec_interface(mconfig, *this) { diff --git a/src/devices/bus/cbmiec/c64_nl10.h b/src/devices/bus/cbmiec/c64_nl10.h index 143758c98e4..8f6a4613b43 100644 --- a/src/devices/bus/cbmiec/c64_nl10.h +++ b/src/devices/bus/cbmiec/c64_nl10.h @@ -27,7 +27,7 @@ class c64_nl10_interface_device : public device_t, { public: // construction/destruction - c64_nl10_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_nl10_interface_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/cbmiec/cbmiec.cpp b/src/devices/bus/cbmiec/cbmiec.cpp index 7e893614f3f..7bde16f342f 100644 --- a/src/devices/bus/cbmiec/cbmiec.cpp +++ b/src/devices/bus/cbmiec/cbmiec.cpp @@ -245,7 +245,7 @@ device_cbm_iec_interface::~device_cbm_iec_interface() // cbm_iec_slot_device - constructor //------------------------------------------------- -cbm_iec_slot_device::cbm_iec_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +cbm_iec_slot_device::cbm_iec_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CBM_IEC_SLOT, "CBM IEC slot", tag, owner, clock, "cbm_iec_slot", __FILE__), device_slot_interface(mconfig, *this), m_address(0) { @@ -282,7 +282,7 @@ void cbm_iec_slot_device::device_start() // cbm_iec_device - constructor //------------------------------------------------- -cbm_iec_device::cbm_iec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +cbm_iec_device::cbm_iec_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CBM_IEC, "CBM IEC bus", tag, owner, clock, "cbm_iec", __FILE__), m_write_srq(*this), m_write_atn(*this), @@ -378,7 +378,7 @@ void cbm_iec_device::set_signal(device_t *device, int signal, int state) { if (m_line[signal] != state) { - if (LOG) logerror("CBM IEC: '%s' %s %u\n", tag(), SIGNAL_NAME[signal], state); + if (LOG) logerror("CBM IEC: '%s' %s %u\n", tag().c_str(), SIGNAL_NAME[signal], state); m_line[signal] = state; changed = true; } @@ -389,11 +389,11 @@ void cbm_iec_device::set_signal(device_t *device, int signal, int state) while (entry) { - if (!strcmp(entry->m_device->tag(), device->tag())) + if (entry->m_device->tag()==device->tag()) { if (entry->m_line[signal] != state) { - if (LOG) logerror("CBM IEC: '%s' %s %u\n", device->tag(), SIGNAL_NAME[signal], state); + if (LOG) logerror("CBM IEC: '%s' %s %u\n", device->tag().c_str(), SIGNAL_NAME[signal], state); entry->m_line[signal] = state; changed = true; } diff --git a/src/devices/bus/cbmiec/cbmiec.h b/src/devices/bus/cbmiec/cbmiec.h index d950a8c19e1..93a6136bd76 100644 --- a/src/devices/bus/cbmiec/cbmiec.h +++ b/src/devices/bus/cbmiec/cbmiec.h @@ -76,7 +76,7 @@ class cbm_iec_device : public device_t { public: // construction/destruction - cbm_iec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cbm_iec_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template<class _write> void set_srq_callback(_write wr) { m_write_srq.set_callback(wr); } template<class _write> void set_atn_callback(_write wr) { m_write_atn.set_callback(wr); } @@ -159,7 +159,7 @@ class cbm_iec_slot_device : public device_t, { public: // construction/destruction - cbm_iec_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cbm_iec_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void set_address(int address) { m_address = address; } int get_address() { return m_address; } diff --git a/src/devices/bus/cbmiec/cmdhd.cpp b/src/devices/bus/cbmiec/cmdhd.cpp index d3025700fa7..5ee2b05f7b8 100644 --- a/src/devices/bus/cbmiec/cmdhd.cpp +++ b/src/devices/bus/cbmiec/cmdhd.cpp @@ -108,7 +108,7 @@ machine_config_constructor cmd_hd_device::device_mconfig_additions() const // cmd_hd_device - constructor //------------------------------------------------- -cmd_hd_device::cmd_hd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +cmd_hd_device::cmd_hd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CMD_HD, "HD", tag, owner, clock, "cmdhd", __FILE__), device_cbm_iec_interface(mconfig, *this), m_maincpu(*this, M6502_TAG), diff --git a/src/devices/bus/cbmiec/cmdhd.h b/src/devices/bus/cbmiec/cmdhd.h index 2a1a244affe..b19af5c3089 100644 --- a/src/devices/bus/cbmiec/cmdhd.h +++ b/src/devices/bus/cbmiec/cmdhd.h @@ -40,7 +40,7 @@ class cmd_hd_device : public device_t, { public: // construction/destruction - cmd_hd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cmd_hd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/cbmiec/diag264_lb_iec.cpp b/src/devices/bus/cbmiec/diag264_lb_iec.cpp index d9c2e5ed303..232291e9607 100644 --- a/src/devices/bus/cbmiec/diag264_lb_iec.cpp +++ b/src/devices/bus/cbmiec/diag264_lb_iec.cpp @@ -26,7 +26,7 @@ const device_type DIAG264_SERIAL_LOOPBACK = &device_creator<diag264_serial_loopb // diag264_serial_loopback_device - constructor //------------------------------------------------- -diag264_serial_loopback_device::diag264_serial_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +diag264_serial_loopback_device::diag264_serial_loopback_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, DIAG264_SERIAL_LOOPBACK, "Diag264 Serial Loopback", tag, owner, clock, "diag264_serial_loopback", __FILE__), device_cbm_iec_interface(mconfig, *this) { diff --git a/src/devices/bus/cbmiec/diag264_lb_iec.h b/src/devices/bus/cbmiec/diag264_lb_iec.h index b76c1fc696e..083f66aba39 100644 --- a/src/devices/bus/cbmiec/diag264_lb_iec.h +++ b/src/devices/bus/cbmiec/diag264_lb_iec.h @@ -27,7 +27,7 @@ class diag264_serial_loopback_device : public device_t, { public: // construction/destruction - diag264_serial_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + diag264_serial_loopback_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/cbmiec/fd2000.cpp b/src/devices/bus/cbmiec/fd2000.cpp index d31b9d97507..e8fce1bf343 100644 --- a/src/devices/bus/cbmiec/fd2000.cpp +++ b/src/devices/bus/cbmiec/fd2000.cpp @@ -274,7 +274,7 @@ machine_config_constructor fd2000_device::device_mconfig_additions() const // fd2000_device - constructor //------------------------------------------------- -fd2000_device::fd2000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +fd2000_device::fd2000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, FD2000, "FD-2000", tag, owner, clock, "fd2000", __FILE__), device_cbm_iec_interface(mconfig, *this), m_maincpu(*this, G65SC02PI2_TAG), @@ -284,7 +284,7 @@ fd2000_device::fd2000_device(const machine_config &mconfig, const char *tag, dev { } -fd2000_device::fd2000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source) +fd2000_device::fd2000_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_cbm_iec_interface(mconfig, *this), m_maincpu(*this, R65C02P4_TAG), @@ -299,7 +299,7 @@ fd2000_device::fd2000_device(const machine_config &mconfig, device_type type, co // fd4000_device - constructor //------------------------------------------------- -fd4000_device::fd4000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +fd4000_device::fd4000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : fd2000_device(mconfig, FD4000, "FD-4000", tag, owner, clock, TYPE_FD4000, "fd4000", __FILE__ ) { } diff --git a/src/devices/bus/cbmiec/fd2000.h b/src/devices/bus/cbmiec/fd2000.h index 90f6db128ca..10a83d99de0 100644 --- a/src/devices/bus/cbmiec/fd2000.h +++ b/src/devices/bus/cbmiec/fd2000.h @@ -39,8 +39,8 @@ class fd2000_device : public device_t, { public: // construction/destruction - fd2000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - fd2000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source); + fd2000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + fd2000_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source); enum { @@ -84,7 +84,7 @@ class fd4000_device : public fd2000_device { public: // construction/destruction - fd4000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + fd4000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/bus/cbmiec/interpod.cpp b/src/devices/bus/cbmiec/interpod.cpp index f15d014a00a..d26069b92f0 100644 --- a/src/devices/bus/cbmiec/interpod.cpp +++ b/src/devices/bus/cbmiec/interpod.cpp @@ -153,7 +153,7 @@ machine_config_constructor interpod_device::device_mconfig_additions() const // interpod_device - constructor //------------------------------------------------- -interpod_device::interpod_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +interpod_device::interpod_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, INTERPOD, "Interpod", tag, owner, clock, "interpod", __FILE__), device_cbm_iec_interface(mconfig, *this), m_maincpu(*this, R6502_TAG), diff --git a/src/devices/bus/cbmiec/interpod.h b/src/devices/bus/cbmiec/interpod.h index 0de21651381..70596295722 100644 --- a/src/devices/bus/cbmiec/interpod.h +++ b/src/devices/bus/cbmiec/interpod.h @@ -49,7 +49,7 @@ class interpod_device : public device_t, { public: // construction/destruction - interpod_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + interpod_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/cbmiec/serialbox.cpp b/src/devices/bus/cbmiec/serialbox.cpp index c3b653cb030..297691ec61b 100644 --- a/src/devices/bus/cbmiec/serialbox.cpp +++ b/src/devices/bus/cbmiec/serialbox.cpp @@ -93,7 +93,7 @@ machine_config_constructor serial_box_device::device_mconfig_additions() const // serial_box_device - constructor //------------------------------------------------- -serial_box_device::serial_box_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +serial_box_device::serial_box_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SERIAL_BOX, "Serial Box", tag, owner, clock, "serbox", __FILE__), device_cbm_iec_interface(mconfig, *this), m_maincpu(*this, M6502_TAG) diff --git a/src/devices/bus/cbmiec/serialbox.h b/src/devices/bus/cbmiec/serialbox.h index 93c558b9512..2ebf8dbaa87 100644 --- a/src/devices/bus/cbmiec/serialbox.h +++ b/src/devices/bus/cbmiec/serialbox.h @@ -36,7 +36,7 @@ class serial_box_device : public device_t, { public: // construction/destruction - serial_box_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + serial_box_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/cbmiec/vic1515.cpp b/src/devices/bus/cbmiec/vic1515.cpp index 61f19761d7a..6a4c8bb2415 100644 --- a/src/devices/bus/cbmiec/vic1515.cpp +++ b/src/devices/bus/cbmiec/vic1515.cpp @@ -108,7 +108,7 @@ ioport_constructor vic1515_t::device_input_ports() const // vic1515_t - constructor //------------------------------------------------- -vic1515_t::vic1515_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +vic1515_t::vic1515_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VIC1515, "VIC-1515", tag, owner, clock, "vic1515", __FILE__), device_cbm_iec_interface(mconfig, *this) { diff --git a/src/devices/bus/cbmiec/vic1515.h b/src/devices/bus/cbmiec/vic1515.h index d726bdb4087..969e2e64bd3 100644 --- a/src/devices/bus/cbmiec/vic1515.h +++ b/src/devices/bus/cbmiec/vic1515.h @@ -28,7 +28,7 @@ class vic1515_t : public device_t, { public: // construction/destruction - vic1515_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vic1515_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/cbmiec/vic1520.cpp b/src/devices/bus/cbmiec/vic1520.cpp index 55cd372f385..3d42a17d38d 100644 --- a/src/devices/bus/cbmiec/vic1520.cpp +++ b/src/devices/bus/cbmiec/vic1520.cpp @@ -136,7 +136,7 @@ ioport_constructor vic1520_t::device_input_ports() const // vic1520_t - constructor //------------------------------------------------- -vic1520_t::vic1520_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +vic1520_t::vic1520_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VIC1520, "VIC-1520", tag, owner, clock, "vic1520", __FILE__), device_cbm_iec_interface(mconfig, *this) { diff --git a/src/devices/bus/cbmiec/vic1520.h b/src/devices/bus/cbmiec/vic1520.h index 61bd5e314ef..a9ca1a6afeb 100644 --- a/src/devices/bus/cbmiec/vic1520.h +++ b/src/devices/bus/cbmiec/vic1520.h @@ -28,7 +28,7 @@ class vic1520_t : public device_t, { public: // construction/destruction - vic1520_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vic1520_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/centronics/comxpl80.cpp b/src/devices/bus/centronics/comxpl80.cpp index 4c7bc354d42..8609637e908 100644 --- a/src/devices/bus/centronics/comxpl80.cpp +++ b/src/devices/bus/centronics/comxpl80.cpp @@ -158,7 +158,7 @@ ioport_constructor comx_pl80_device::device_input_ports() const // comx_pl80_device - constructor //------------------------------------------------- -comx_pl80_device::comx_pl80_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +comx_pl80_device::comx_pl80_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, COMX_PL80, "COMX PL-80", tag, owner, clock, "comx_pl80", __FILE__), device_centronics_peripheral_interface(mconfig, *this), m_plotter(*this, "PLOTTER"), diff --git a/src/devices/bus/centronics/comxpl80.h b/src/devices/bus/centronics/comxpl80.h index 96821d1f5eb..5196e4434f7 100644 --- a/src/devices/bus/centronics/comxpl80.h +++ b/src/devices/bus/centronics/comxpl80.h @@ -28,7 +28,7 @@ class comx_pl80_device : public device_t, { public: // construction/destruction - comx_pl80_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + comx_pl80_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/centronics/covox.cpp b/src/devices/bus/centronics/covox.cpp index 71a89f66219..5b7e1fac4c3 100644 --- a/src/devices/bus/centronics/covox.cpp +++ b/src/devices/bus/centronics/covox.cpp @@ -33,7 +33,7 @@ MACHINE_CONFIG_END // centronics_covox_device - constructor //------------------------------------------------- -centronics_covox_device::centronics_covox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +centronics_covox_device::centronics_covox_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CENTRONICS_COVOX, "Covox Speech Thing", tag, owner, clock, "covox", __FILE__), device_centronics_peripheral_interface( mconfig, *this ), m_dac(*this, "dac"), @@ -88,7 +88,7 @@ MACHINE_CONFIG_END // centronics_covox_stereo_device - constructor //------------------------------------------------- -centronics_covox_stereo_device::centronics_covox_stereo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +centronics_covox_stereo_device::centronics_covox_stereo_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CENTRONICS_COVOX_STEREO, "Covox (Stereo-in-1)", tag, owner, clock, "covox_stereo", __FILE__), device_centronics_peripheral_interface( mconfig, *this ), m_dac_left(*this, "dac_left"), diff --git a/src/devices/bus/centronics/covox.h b/src/devices/bus/centronics/covox.h index 68eeff2212f..63d10ec050c 100644 --- a/src/devices/bus/centronics/covox.h +++ b/src/devices/bus/centronics/covox.h @@ -21,7 +21,7 @@ class centronics_covox_device : public device_t, { public: // construction/destruction - centronics_covox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + centronics_covox_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -57,7 +57,7 @@ class centronics_covox_stereo_device : public device_t, { public: // construction/destruction - centronics_covox_stereo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + centronics_covox_stereo_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/centronics/ctronics.cpp b/src/devices/bus/centronics/ctronics.cpp index 34d2e21f022..b490c122d73 100644 --- a/src/devices/bus/centronics/ctronics.cpp +++ b/src/devices/bus/centronics/ctronics.cpp @@ -12,7 +12,7 @@ const device_type CENTRONICS = &device_creator<centronics_device>; -centronics_device::centronics_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +centronics_device::centronics_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CENTRONICS, "Centronics", tag, owner, clock, "centronics", __FILE__), device_slot_interface(mconfig, *this), m_strobe_handler(*this), diff --git a/src/devices/bus/centronics/ctronics.h b/src/devices/bus/centronics/ctronics.h index 51f13348051..6631d713466 100644 --- a/src/devices/bus/centronics/ctronics.h +++ b/src/devices/bus/centronics/ctronics.h @@ -102,7 +102,7 @@ class centronics_device : public device_t, friend class device_centronics_peripheral_interface; public: - centronics_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + centronics_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template<class _Object> static devcb_base &set_strobe_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_strobe_handler.set_callback(object); } template<class _Object> static devcb_base &set_data0_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_data0_handler.set_callback(object); } diff --git a/src/devices/bus/centronics/digiblst.cpp b/src/devices/bus/centronics/digiblst.cpp index 9fdbfd5c279..c510d94d7d7 100644 --- a/src/devices/bus/centronics/digiblst.cpp +++ b/src/devices/bus/centronics/digiblst.cpp @@ -33,7 +33,7 @@ MACHINE_CONFIG_END // centronics_covox_device - constructor //------------------------------------------------- -centronics_digiblaster_device::centronics_digiblaster_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +centronics_digiblaster_device::centronics_digiblaster_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CENTRONICS_DIGIBLASTER, "Digiblaster (DIY)", tag, owner, clock, "digiblst", __FILE__), device_centronics_peripheral_interface( mconfig, *this ), m_dac(*this, "dac"), diff --git a/src/devices/bus/centronics/digiblst.h b/src/devices/bus/centronics/digiblst.h index cec32eef1e9..f12d0616f4b 100644 --- a/src/devices/bus/centronics/digiblst.h +++ b/src/devices/bus/centronics/digiblst.h @@ -27,7 +27,7 @@ class centronics_digiblaster_device : public device_t, { public: // construction/destruction - centronics_digiblaster_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + centronics_digiblaster_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/centronics/dsjoy.cpp b/src/devices/bus/centronics/dsjoy.cpp index de9b1138ec8..2d6aef97c25 100644 --- a/src/devices/bus/centronics/dsjoy.cpp +++ b/src/devices/bus/centronics/dsjoy.cpp @@ -5,7 +5,7 @@ const device_type DEMPA_SHINBUNSHA_JOYSTICK = &device_creator<dempa_shinbunsha_joystick_device>; -dempa_shinbunsha_joystick_device::dempa_shinbunsha_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +dempa_shinbunsha_joystick_device::dempa_shinbunsha_joystick_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, DEMPA_SHINBUNSHA_JOYSTICK, "Dempa Shinbunsha Joystick", tag, owner, clock, "dempa_shinbunsha_joystick", __FILE__), device_centronics_peripheral_interface( mconfig, *this ), m_lptjoy(*this, "lptjoy"), diff --git a/src/devices/bus/centronics/dsjoy.h b/src/devices/bus/centronics/dsjoy.h index c23ddf87e11..ac9450ae5d8 100644 --- a/src/devices/bus/centronics/dsjoy.h +++ b/src/devices/bus/centronics/dsjoy.h @@ -18,7 +18,7 @@ class dempa_shinbunsha_joystick_device : public device_t, { public: // construction/destruction - dempa_shinbunsha_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + dempa_shinbunsha_joystick_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/centronics/epson_ex800.cpp b/src/devices/bus/centronics/epson_ex800.cpp index c8a1acc54a6..7e3d8f207e1 100644 --- a/src/devices/bus/centronics/epson_ex800.cpp +++ b/src/devices/bus/centronics/epson_ex800.cpp @@ -357,7 +357,7 @@ ioport_constructor epson_ex800_t::device_input_ports() const // epson_ex800_t - constructor //------------------------------------------------- -epson_ex800_t::epson_ex800_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +epson_ex800_t::epson_ex800_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, EPSON_EX800, "Epson EX-800", tag, owner, clock, "ex800", __FILE__), device_centronics_peripheral_interface(mconfig, *this), m_maincpu(*this, "maincpu"), diff --git a/src/devices/bus/centronics/epson_ex800.h b/src/devices/bus/centronics/epson_ex800.h index 2b28229c0df..bc14909b896 100644 --- a/src/devices/bus/centronics/epson_ex800.h +++ b/src/devices/bus/centronics/epson_ex800.h @@ -29,7 +29,7 @@ class epson_ex800_t : public device_t, { public: // construction/destruction - epson_ex800_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + epson_ex800_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/centronics/epson_lx800.cpp b/src/devices/bus/centronics/epson_lx800.cpp index 546c6e9439b..6a6e632bdc0 100644 --- a/src/devices/bus/centronics/epson_lx800.cpp +++ b/src/devices/bus/centronics/epson_lx800.cpp @@ -199,7 +199,7 @@ ioport_constructor epson_lx800_t::device_input_ports() const // epson_lx800_t - constructor //------------------------------------------------- -epson_lx800_t::epson_lx800_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +epson_lx800_t::epson_lx800_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, EPSON_LX800, "Epson LX-800", tag, owner, clock, "lx800", __FILE__), device_centronics_peripheral_interface(mconfig, *this), m_maincpu(*this, "maincpu"), @@ -207,7 +207,7 @@ epson_lx800_t::epson_lx800_t(const machine_config &mconfig, const char *tag, dev { } -epson_lx800_t::epson_lx800_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +epson_lx800_t::epson_lx800_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__), device_centronics_peripheral_interface(mconfig, *this), m_maincpu(*this, "maincpu"), diff --git a/src/devices/bus/centronics/epson_lx800.h b/src/devices/bus/centronics/epson_lx800.h index 89e88ceb6d9..044d97a36c3 100644 --- a/src/devices/bus/centronics/epson_lx800.h +++ b/src/devices/bus/centronics/epson_lx800.h @@ -30,8 +30,8 @@ class epson_lx800_t : public device_t, { public: // construction/destruction - epson_lx800_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - epson_lx800_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + epson_lx800_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + epson_lx800_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/centronics/epson_lx810l.cpp b/src/devices/bus/centronics/epson_lx810l.cpp index 3c599360dd8..1cfdbc37818 100644 --- a/src/devices/bus/centronics/epson_lx810l.cpp +++ b/src/devices/bus/centronics/epson_lx810l.cpp @@ -285,7 +285,7 @@ INPUT_CHANGED_MEMBER(epson_lx810l_t::online_sw) // epson_lx810l_t - constructor //------------------------------------------------- -epson_lx810l_t::epson_lx810l_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +epson_lx810l_t::epson_lx810l_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, EPSON_LX810L, "Epson LX-810L", tag, owner, clock, "lx810l", __FILE__), device_centronics_peripheral_interface(mconfig, *this), m_maincpu(*this, "maincpu"), @@ -306,7 +306,7 @@ epson_lx810l_t::epson_lx810l_t(const machine_config &mconfig, const char *tag, d { } -epson_lx810l_t::epson_lx810l_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +epson_lx810l_t::epson_lx810l_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__), device_centronics_peripheral_interface(mconfig, *this), m_maincpu(*this, "maincpu"), @@ -327,7 +327,7 @@ epson_lx810l_t::epson_lx810l_t(const machine_config &mconfig, device_type type, { } -epson_ap2000_t::epson_ap2000_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +epson_ap2000_t::epson_ap2000_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : epson_lx810l_t(mconfig, EPSON_AP2000, "Epson ActionPrinter 2000", tag, owner, clock, "ap2000", __FILE__) { } diff --git a/src/devices/bus/centronics/epson_lx810l.h b/src/devices/bus/centronics/epson_lx810l.h index 072f30500bd..491874e73d3 100644 --- a/src/devices/bus/centronics/epson_lx810l.h +++ b/src/devices/bus/centronics/epson_lx810l.h @@ -40,10 +40,10 @@ class epson_lx810l_t : public device_t, { public: // construction/destruction - epson_lx810l_t(const machine_config &mconfig, const char *tag, + epson_lx810l_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); epson_lx810l_t(const machine_config &mconfig, device_type type, - const char *name, const char *tag, device_t *owner, + const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides @@ -143,7 +143,7 @@ class epson_ap2000_t : public epson_lx810l_t { public: // construction/destruction - epson_ap2000_t(const machine_config &mconfig, const char *tag, + epson_ap2000_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides diff --git a/src/devices/bus/centronics/nec_p72.cpp b/src/devices/bus/centronics/nec_p72.cpp index 8ef53e54513..2bb400c63fc 100644 --- a/src/devices/bus/centronics/nec_p72.cpp +++ b/src/devices/bus/centronics/nec_p72.cpp @@ -79,14 +79,14 @@ void nec_p72_t::device_start() // nec_p72_t - constructor //------------------------------------------------- -nec_p72_t::nec_p72_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nec_p72_t::nec_p72_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NEC_P72, "NEC PinWrite P72", tag, owner, clock, "p72", __FILE__), device_centronics_peripheral_interface(mconfig, *this), m_maincpu(*this, "maincpu") { } -nec_p72_t::nec_p72_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +nec_p72_t::nec_p72_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__), device_centronics_peripheral_interface(mconfig, *this), m_maincpu(*this, "maincpu") diff --git a/src/devices/bus/centronics/nec_p72.h b/src/devices/bus/centronics/nec_p72.h index ef7c67f85f1..0aac9f9f23d 100644 --- a/src/devices/bus/centronics/nec_p72.h +++ b/src/devices/bus/centronics/nec_p72.h @@ -21,10 +21,10 @@ class nec_p72_t : public device_t, { public: // construction/destruction - nec_p72_t(const machine_config &mconfig, const char *tag, + nec_p72_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); nec_p72_t(const machine_config &mconfig, device_type type, - const char *name, const char *tag, device_t *owner, + const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides diff --git a/src/devices/bus/centronics/printer.cpp b/src/devices/bus/centronics/printer.cpp index 50ca485c094..d8d5943ccfb 100644 --- a/src/devices/bus/centronics/printer.cpp +++ b/src/devices/bus/centronics/printer.cpp @@ -24,7 +24,7 @@ MACHINE_CONFIG_END // centronics_printer_device - constructor //------------------------------------------------- -centronics_printer_device::centronics_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +centronics_printer_device::centronics_printer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CENTRONICS_PRINTER, "Centronics Printer", tag, owner, clock, "centronics_printer", __FILE__), device_centronics_peripheral_interface( mconfig, *this ), m_strobe(0), diff --git a/src/devices/bus/centronics/printer.h b/src/devices/bus/centronics/printer.h index 7e0ce223e7f..e5337d1401f 100644 --- a/src/devices/bus/centronics/printer.h +++ b/src/devices/bus/centronics/printer.h @@ -15,7 +15,7 @@ class centronics_printer_device : public device_t, { public: // construction/destruction - centronics_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + centronics_printer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual DECLARE_WRITE_LINE_MEMBER( input_strobe ) override; virtual DECLARE_WRITE_LINE_MEMBER( input_data0 ) override { if (state) m_data |= 0x01; else m_data &= ~0x01; } diff --git a/src/devices/bus/cgenie/expansion/expansion.cpp b/src/devices/bus/cgenie/expansion/expansion.cpp index 632d921ef9c..05ba12b9e32 100644 --- a/src/devices/bus/cgenie/expansion/expansion.cpp +++ b/src/devices/bus/cgenie/expansion/expansion.cpp @@ -26,7 +26,7 @@ const device_type EXPANSION_SLOT = &device_creator<expansion_slot_device>; // expansion_slot_device - constructor //------------------------------------------------- -expansion_slot_device::expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +expansion_slot_device::expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, EXPANSION_SLOT, "Expansion Slot", tag, owner, clock, "expansion_slot", __FILE__), device_slot_interface(mconfig, *this), m_program(nullptr), diff --git a/src/devices/bus/cgenie/expansion/expansion.h b/src/devices/bus/cgenie/expansion/expansion.h index c465561d300..5d5c620a9bb 100644 --- a/src/devices/bus/cgenie/expansion/expansion.h +++ b/src/devices/bus/cgenie/expansion/expansion.h @@ -70,7 +70,7 @@ class expansion_slot_device : public device_t, public device_slot_interface { public: // construction/destruction - expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~expansion_slot_device(); void set_program_space(address_space *program); diff --git a/src/devices/bus/cgenie/expansion/floppy.cpp b/src/devices/bus/cgenie/expansion/floppy.cpp index c3099cd533c..4a719c7b7e3 100644 --- a/src/devices/bus/cgenie/expansion/floppy.cpp +++ b/src/devices/bus/cgenie/expansion/floppy.cpp @@ -103,7 +103,7 @@ machine_config_constructor cgenie_fdc_device::device_mconfig_additions() const // cgenie_fdc_device - constructor //------------------------------------------------- -cgenie_fdc_device::cgenie_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +cgenie_fdc_device::cgenie_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CGENIE_FDC, "Floppy Disc Controller", tag, owner, clock, "cgenie_fdc", __FILE__), device_expansion_interface(mconfig, *this), m_fdc(*this, "fd1793"), diff --git a/src/devices/bus/cgenie/expansion/floppy.h b/src/devices/bus/cgenie/expansion/floppy.h index 540b2febebe..74a0dd809c1 100644 --- a/src/devices/bus/cgenie/expansion/floppy.h +++ b/src/devices/bus/cgenie/expansion/floppy.h @@ -27,7 +27,7 @@ class cgenie_fdc_device : public device_t, public device_expansion_interface { public: // construction/destruction - cgenie_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cgenie_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_ADDRESS_MAP(mmio, 8); diff --git a/src/devices/bus/cgenie/parallel/joystick.cpp b/src/devices/bus/cgenie/parallel/joystick.cpp index de520ba0669..0edf3f01f7b 100644 --- a/src/devices/bus/cgenie/parallel/joystick.cpp +++ b/src/devices/bus/cgenie/parallel/joystick.cpp @@ -92,7 +92,7 @@ ioport_constructor cgenie_joystick_device::device_input_ports() const // cgenie_joystick_device - constructor //------------------------------------------------- -cgenie_joystick_device::cgenie_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +cgenie_joystick_device::cgenie_joystick_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CGENIE_JOYSTICK, "Joystick Interface EG2013", tag, owner, clock, "cgenie_joystick", __FILE__), device_parallel_interface(mconfig, *this), m_joy(*this, "JOY"), @@ -125,7 +125,7 @@ void cgenie_joystick_device::device_reset() void cgenie_joystick_device::pa_w(UINT8 data) { if (VERBOSE) - logerror("%s: pa_w %02x\n", tag(), data); + logerror("%s: pa_w %02x\n", tag().c_str(), data); // d0 to d5 connected m_select = data & 0x3f; @@ -147,7 +147,7 @@ UINT8 cgenie_joystick_device::pb_r() data |= m_joy[0]->read() > m_select ? 0x80 : 0x00; if (VERBOSE) - logerror("%s: pb_r %02x\n", tag(), data); + logerror("%s: pb_r %02x\n", tag().c_str(), data); return data; } diff --git a/src/devices/bus/cgenie/parallel/joystick.h b/src/devices/bus/cgenie/parallel/joystick.h index bbdb32e5444..950f8fc5e26 100644 --- a/src/devices/bus/cgenie/parallel/joystick.h +++ b/src/devices/bus/cgenie/parallel/joystick.h @@ -25,7 +25,7 @@ class cgenie_joystick_device : public device_t, public device_parallel_interface { public: // construction/destruction - cgenie_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cgenie_joystick_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: virtual void device_start() override; diff --git a/src/devices/bus/cgenie/parallel/parallel.cpp b/src/devices/bus/cgenie/parallel/parallel.cpp index d147a550135..88e426c5f46 100644 --- a/src/devices/bus/cgenie/parallel/parallel.cpp +++ b/src/devices/bus/cgenie/parallel/parallel.cpp @@ -26,7 +26,7 @@ const device_type PARALLEL_SLOT = &device_creator<parallel_slot_device>; // parallel_slot_device - constructor //------------------------------------------------- -parallel_slot_device::parallel_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +parallel_slot_device::parallel_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PARALLEL_SLOT, "Parallel Slot", tag, owner, clock, "parallel_slot", __FILE__), device_slot_interface(mconfig, *this), m_cart(nullptr) diff --git a/src/devices/bus/cgenie/parallel/parallel.h b/src/devices/bus/cgenie/parallel/parallel.h index 3c8bd6bf8c0..7f721a69df8 100644 --- a/src/devices/bus/cgenie/parallel/parallel.h +++ b/src/devices/bus/cgenie/parallel/parallel.h @@ -46,7 +46,7 @@ class parallel_slot_device : public device_t, public device_slot_interface { public: // construction/destruction - parallel_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + parallel_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~parallel_slot_device(); // IOA diff --git a/src/devices/bus/cgenie/parallel/printer.cpp b/src/devices/bus/cgenie/parallel/printer.cpp index f9963844dd5..267e53deb00 100644 --- a/src/devices/bus/cgenie/parallel/printer.cpp +++ b/src/devices/bus/cgenie/parallel/printer.cpp @@ -50,7 +50,7 @@ machine_config_constructor cgenie_printer_device::device_mconfig_additions() con // cgenie_printer_device - constructor //------------------------------------------------- -cgenie_printer_device::cgenie_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +cgenie_printer_device::cgenie_printer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CGENIE_PRINTER, "Printer Interface EG2012", tag, owner, clock, "cgenie_printer", __FILE__), device_parallel_interface(mconfig, *this), m_centronics(*this, "centronics"), @@ -106,7 +106,7 @@ WRITE_LINE_MEMBER( cgenie_printer_device::fault_w ) void cgenie_printer_device::pa_w(UINT8 data) { if (VERBOSE) - logerror("%s: pa_w %02x\n", tag(), data); + logerror("%s: pa_w %02x\n", tag().c_str(), data); m_latch->write(data); } @@ -126,7 +126,7 @@ UINT8 cgenie_printer_device::pb_r() void cgenie_printer_device::pb_w(UINT8 data) { if (VERBOSE) - logerror("%s: pa_w %02x\n", tag(), data); + logerror("%s: pa_w %02x\n", tag().c_str(), data); m_centronics->write_strobe(BIT(data, 0)); } diff --git a/src/devices/bus/cgenie/parallel/printer.h b/src/devices/bus/cgenie/parallel/printer.h index 6faec62f308..97ae6942db8 100644 --- a/src/devices/bus/cgenie/parallel/printer.h +++ b/src/devices/bus/cgenie/parallel/printer.h @@ -26,7 +26,7 @@ class cgenie_printer_device : public device_t, public device_parallel_interface { public: // construction/destruction - cgenie_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cgenie_printer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_WRITE_LINE_MEMBER(busy_w); DECLARE_WRITE_LINE_MEMBER(perror_w); diff --git a/src/devices/bus/chanf/rom.cpp b/src/devices/bus/chanf/rom.cpp index 858e52ad2e3..05ba7bc14fa 100644 --- a/src/devices/bus/chanf/rom.cpp +++ b/src/devices/bus/chanf/rom.cpp @@ -31,39 +31,39 @@ const device_type CHANF_ROM_MULTI_OLD = &device_creator<chanf_multi_old_device>; const device_type CHANF_ROM_MULTI_FINAL = &device_creator<chanf_multi_final_device>; -chanf_rom_device::chanf_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +chanf_rom_device::chanf_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_channelf_cart_interface( mconfig, *this ), m_addr_latch(0), m_addr(0), m_read_write(0), m_data0(0) { } -chanf_rom_device::chanf_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +chanf_rom_device::chanf_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CHANF_ROM_STD, "Channel F Standard Carts", tag, owner, clock, "chanf_rom", __FILE__), device_channelf_cart_interface( mconfig, *this ), m_addr_latch(0), m_addr(0), m_read_write(0), m_data0(0) { } -chanf_maze_device::chanf_maze_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +chanf_maze_device::chanf_maze_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : chanf_rom_device(mconfig, CHANF_ROM_MAZE, "Channel F Maze Cart", tag, owner, clock, "chanf_maze", __FILE__) { } -chanf_hangman_device::chanf_hangman_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +chanf_hangman_device::chanf_hangman_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : chanf_rom_device(mconfig, CHANF_ROM_HANGMAN, "Channel F Hangman Cart", tag, owner, clock, "chanf_hang", __FILE__) { } -chanf_chess_device::chanf_chess_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +chanf_chess_device::chanf_chess_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : chanf_rom_device(mconfig, CHANF_ROM_CHESS, "Channel F Chess Cart", tag, owner, clock, "chanf_chess", __FILE__) { } -chanf_multi_old_device::chanf_multi_old_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +chanf_multi_old_device::chanf_multi_old_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : chanf_rom_device(mconfig, CHANF_ROM_MULTI_OLD, "Channel F Multigame (Earlier Version) Cart", tag, owner, clock, "chanf_multi_old", __FILE__), m_base_bank(0) { } -chanf_multi_final_device::chanf_multi_final_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +chanf_multi_final_device::chanf_multi_final_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : chanf_rom_device(mconfig, CHANF_ROM_MULTI_FINAL, "Channel F Multigame (Final Version) Cart", tag, owner, clock, "chanf_multi_fin", __FILE__), m_base_bank(0), m_half_bank(0) { } diff --git a/src/devices/bus/chanf/rom.h b/src/devices/bus/chanf/rom.h index 4591865ec05..1114302d97e 100644 --- a/src/devices/bus/chanf/rom.h +++ b/src/devices/bus/chanf/rom.h @@ -13,8 +13,8 @@ class chanf_rom_device : public device_t, { public: // construction/destruction - chanf_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - chanf_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + chanf_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + chanf_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override {} @@ -42,7 +42,7 @@ class chanf_maze_device : public chanf_rom_device { public: // construction/destruction - chanf_maze_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + chanf_maze_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -60,7 +60,7 @@ class chanf_hangman_device : public chanf_rom_device { public: // construction/destruction - chanf_hangman_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + chanf_hangman_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -78,7 +78,7 @@ class chanf_chess_device : public chanf_rom_device { public: // construction/destruction - chanf_chess_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + chanf_chess_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_ram) override { return common_read_3853(offset); } @@ -92,7 +92,7 @@ class chanf_multi_old_device : public chanf_rom_device { public: // construction/destruction - chanf_multi_old_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + chanf_multi_old_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -115,7 +115,7 @@ class chanf_multi_final_device : public chanf_rom_device { public: // construction/destruction - chanf_multi_final_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + chanf_multi_final_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/chanf/slot.cpp b/src/devices/bus/chanf/slot.cpp index 72045151cca..5665c841957 100644 --- a/src/devices/bus/chanf/slot.cpp +++ b/src/devices/bus/chanf/slot.cpp @@ -45,7 +45,7 @@ device_channelf_cart_interface::~device_channelf_cart_interface() // rom_alloc - alloc the space for the cart //------------------------------------------------- -void device_channelf_cart_interface::rom_alloc(UINT32 size, const char *tag) +void device_channelf_cart_interface::rom_alloc(UINT32 size, std::string tag) { if (m_rom == nullptr) { @@ -72,7 +72,7 @@ void device_channelf_cart_interface::ram_alloc(UINT32 size) //------------------------------------------------- // channelf_cart_slot_device - constructor //------------------------------------------------- -channelf_cart_slot_device::channelf_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +channelf_cart_slot_device::channelf_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CHANF_CART_SLOT, "Fairchild Channel F Cartridge Slot", tag, owner, clock, "cf_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), diff --git a/src/devices/bus/chanf/slot.h b/src/devices/bus/chanf/slot.h index 78ee692640e..e2619f6eee6 100644 --- a/src/devices/bus/chanf/slot.h +++ b/src/devices/bus/chanf/slot.h @@ -35,7 +35,7 @@ public: virtual DECLARE_WRITE8_MEMBER(write_ram) {} virtual DECLARE_WRITE8_MEMBER(write_bank) {} - void rom_alloc(UINT32 size, const char *tag); + void rom_alloc(UINT32 size, std::string tag); void ram_alloc(UINT32 size); UINT8* get_rom_base() { return m_rom; } UINT8* get_ram_base() { return &m_ram[0]; } @@ -60,7 +60,7 @@ class channelf_cart_slot_device : public device_t, { public: // construction/destruction - channelf_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + channelf_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~channelf_cart_slot_device(); // device-level overrides diff --git a/src/devices/bus/coco/coco_232.cpp b/src/devices/bus/coco/coco_232.cpp index a1b9c673c4b..b9fee1a1476 100644 --- a/src/devices/bus/coco/coco_232.cpp +++ b/src/devices/bus/coco/coco_232.cpp @@ -41,7 +41,7 @@ const device_type COCO_232 = &device_creator<coco_232_device>; // coco_232_device - constructor //------------------------------------------------- -coco_232_device::coco_232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +coco_232_device::coco_232_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, COCO_232, "CoCo RS-232 PAK", tag, owner, clock, "coco_232", __FILE__), device_cococart_interface( mconfig, *this ), m_uart(*this, UART_TAG) diff --git a/src/devices/bus/coco/coco_232.h b/src/devices/bus/coco/coco_232.h index 708d89cccf4..f96c7afd580 100644 --- a/src/devices/bus/coco/coco_232.h +++ b/src/devices/bus/coco/coco_232.h @@ -21,7 +21,7 @@ class coco_232_device : { public: // construction/destruction - coco_232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + coco_232_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/coco/coco_dwsock.cpp b/src/devices/bus/coco/coco_dwsock.cpp index e48b3e565d1..ad7581bff23 100644 --- a/src/devices/bus/coco/coco_dwsock.cpp +++ b/src/devices/bus/coco/coco_dwsock.cpp @@ -65,7 +65,7 @@ INPUT_CHANGED_MEMBER(beckerport_device::drivewire_port_changed) // beckerport_device - constructor / destructor //------------------------------------------------- -beckerport_device::beckerport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +beckerport_device::beckerport_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, COCO_DWSOCK, "Virtual Becker Port", tag, owner, clock, "coco_dwsock", __FILE__), m_hostname(nullptr), m_dwconfigport(*this, DRIVEWIRE_PORT_TAG), m_dwtcpport(0) { diff --git a/src/devices/bus/coco/coco_dwsock.h b/src/devices/bus/coco/coco_dwsock.h index 1d1fe71c3d3..87cbd5fb707 100644 --- a/src/devices/bus/coco/coco_dwsock.h +++ b/src/devices/bus/coco/coco_dwsock.h @@ -25,7 +25,7 @@ class beckerport_device : public device_t { public: - beckerport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + beckerport_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~beckerport_device(); // optional information overrides diff --git a/src/devices/bus/coco/coco_fdc.cpp b/src/devices/bus/coco/coco_fdc.cpp index 6e434ea3e0a..4efe5cb6f9a 100644 --- a/src/devices/bus/coco/coco_fdc.cpp +++ b/src/devices/bus/coco/coco_fdc.cpp @@ -177,7 +177,7 @@ const device_type COCO_FDC = &device_creator<coco_fdc_device>; //------------------------------------------------- // coco_fdc_device - constructor //------------------------------------------------- -coco_fdc_device::coco_fdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +coco_fdc_device::coco_fdc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_cococart_interface( mconfig, *this ), m_owner(nullptr), m_dskreg(0), m_drq(0), m_intrq(0), m_wd17xx(*this, WD_TAG), @@ -187,7 +187,7 @@ coco_fdc_device::coco_fdc_device(const machine_config &mconfig, device_type type { } -coco_fdc_device::coco_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +coco_fdc_device::coco_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, COCO_FDC, "CoCo FDC", tag, owner, clock, "coco_fdc", __FILE__), device_cococart_interface( mconfig, *this ), m_owner(nullptr), m_dskreg(0), m_drq(0), m_intrq(0), m_wd17xx(*this, WD_TAG), @@ -444,11 +444,11 @@ const device_type DRAGON_FDC = &device_creator<dragon_fdc_device>; //------------------------------------------------- // dragon_fdc_device - constructor //------------------------------------------------- -dragon_fdc_device::dragon_fdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +dragon_fdc_device::dragon_fdc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : coco_fdc_device(mconfig, type, name, tag, owner, clock, shortname, source) { } -dragon_fdc_device::dragon_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +dragon_fdc_device::dragon_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : coco_fdc_device(mconfig, DRAGON_FDC, "Dragon FDC", tag, owner, clock, "dragon_fdc", __FILE__) { } @@ -613,7 +613,7 @@ const device_type SDTANDY_FDC = &device_creator<sdtandy_fdc_device>; // sdtandy_fdc_device - constructor //------------------------------------------------- -sdtandy_fdc_device::sdtandy_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sdtandy_fdc_device::sdtandy_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : dragon_fdc_device(mconfig, SDTANDY_FDC, "SDTANDY FDC", tag, owner, clock, "sdtandy_fdc", __FILE__) { } @@ -645,7 +645,7 @@ const device_type COCO_FDC_V11 = &device_creator<coco_fdc_v11_device>; // coco_fdc_v11_device - constructor //------------------------------------------------- -coco_fdc_v11_device::coco_fdc_v11_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +coco_fdc_v11_device::coco_fdc_v11_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : coco_fdc_device(mconfig, COCO_FDC_V11, "CoCo FDC v1.1", tag, owner, clock, "coco_fdc_v11", __FILE__) { } @@ -673,7 +673,7 @@ ROM_END const device_type COCO3_HDB1 = &device_creator<coco3_hdb1_device>; -coco3_hdb1_device::coco3_hdb1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +coco3_hdb1_device::coco3_hdb1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : coco_fdc_device(mconfig, COCO3_HDB1, "CoCo3 HDB-DOS", tag, owner, clock, "coco3_hdb1", __FILE__) { } @@ -698,7 +698,7 @@ const device_type CP400_FDC = &device_creator<cp400_fdc_device>; // cp400_fdc_device - constructor //------------------------------------------------- -cp400_fdc_device::cp400_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +cp400_fdc_device::cp400_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : coco_fdc_device(mconfig, CP400_FDC, "CP400 FDC", tag, owner, clock, "cp400_fdc", __FILE__) { } diff --git a/src/devices/bus/coco/coco_fdc.h b/src/devices/bus/coco/coco_fdc.h index 2799d15e0ee..ddca5d388d2 100644 --- a/src/devices/bus/coco/coco_fdc.h +++ b/src/devices/bus/coco/coco_fdc.h @@ -34,8 +34,8 @@ class coco_fdc_device : { public: // construction/destruction - coco_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - coco_fdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + coco_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + coco_fdc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); DECLARE_FLOPPY_FORMATS(floppy_formats); @@ -89,7 +89,7 @@ class coco_fdc_v11_device : { public: // construction/destruction - coco_fdc_v11_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + coco_fdc_v11_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -106,7 +106,7 @@ class coco3_hdb1_device : { public: // construction/destruction - coco3_hdb1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + coco3_hdb1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -123,7 +123,7 @@ class cp400_fdc_device : { public: // construction/destruction - cp400_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cp400_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -140,8 +140,8 @@ class dragon_fdc_device : { public: // construction/destruction - dragon_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - dragon_fdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + dragon_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + dragon_fdc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -166,7 +166,7 @@ class sdtandy_fdc_device : { public: // construction/destruction - sdtandy_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sdtandy_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/coco/coco_multi.cpp b/src/devices/bus/coco/coco_multi.cpp index 18033158c45..b94f6eb6e84 100644 --- a/src/devices/bus/coco/coco_multi.cpp +++ b/src/devices/bus/coco/coco_multi.cpp @@ -138,7 +138,7 @@ const device_type COCO_MULTIPAK = &device_creator<coco_multipak_device>; // coco_multipak_device - constructor //------------------------------------------------- -coco_multipak_device::coco_multipak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +coco_multipak_device::coco_multipak_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, COCO_MULTIPAK, "CoCo Multi-Pak Interface", tag, owner, clock, "coco_multipak", __FILE__), device_cococart_interface( mconfig, *this ), m_owner(nullptr), m_select(0) { diff --git a/src/devices/bus/coco/coco_multi.h b/src/devices/bus/coco/coco_multi.h index 3ffb91413eb..7892351110b 100644 --- a/src/devices/bus/coco/coco_multi.h +++ b/src/devices/bus/coco/coco_multi.h @@ -30,7 +30,7 @@ class coco_multipak_device : { public: // construction/destruction - coco_multipak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + coco_multipak_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/coco/coco_orch90.cpp b/src/devices/bus/coco/coco_orch90.cpp index 8f02d8612db..d792c7db143 100644 --- a/src/devices/bus/coco/coco_orch90.cpp +++ b/src/devices/bus/coco/coco_orch90.cpp @@ -38,7 +38,7 @@ const device_type COCO_ORCH90 = &device_creator<coco_orch90_device>; // coco_orch90_device - constructor //------------------------------------------------- -coco_orch90_device::coco_orch90_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +coco_orch90_device::coco_orch90_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, COCO_ORCH90, "CoCo Orch-90 PAK", tag, owner, clock, "coco_orch90", __FILE__), device_cococart_interface( mconfig, *this ), m_left_dac(nullptr), m_right_dac(nullptr) { diff --git a/src/devices/bus/coco/coco_orch90.h b/src/devices/bus/coco/coco_orch90.h index 0dcc521ba85..9d6cc76884f 100644 --- a/src/devices/bus/coco/coco_orch90.h +++ b/src/devices/bus/coco/coco_orch90.h @@ -21,7 +21,7 @@ class coco_orch90_device : { public: // construction/destruction - coco_orch90_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + coco_orch90_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/coco/coco_pak.cpp b/src/devices/bus/coco/coco_pak.cpp index 1a861fa3bed..711a2ffa2d6 100644 --- a/src/devices/bus/coco/coco_pak.cpp +++ b/src/devices/bus/coco/coco_pak.cpp @@ -39,13 +39,13 @@ const device_type COCO_PAK = &device_creator<coco_pak_device>; //------------------------------------------------- // coco_pak_device - constructor //------------------------------------------------- -coco_pak_device::coco_pak_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +coco_pak_device::coco_pak_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_cococart_interface( mconfig, *this ), m_cart(nullptr), m_owner(nullptr) { } -coco_pak_device::coco_pak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +coco_pak_device::coco_pak_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, COCO_PAK, "CoCo Program PAK", tag, owner, clock, "cocopak", __FILE__), device_cococart_interface( mconfig, *this ), m_cart(nullptr), m_owner(nullptr) { @@ -125,7 +125,7 @@ const device_type COCO_PAK_BANKED = &device_creator<coco_pak_banked_device>; // coco_pak_device - constructor //------------------------------------------------- -coco_pak_banked_device::coco_pak_banked_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +coco_pak_banked_device::coco_pak_banked_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : coco_pak_device(mconfig, COCO_PAK_BANKED, "CoCo Program PAK (Banked)", tag, owner, clock, "cocopak_banked", __FILE__) { } diff --git a/src/devices/bus/coco/coco_pak.h b/src/devices/bus/coco/coco_pak.h index 7915fd9923d..019046e04fd 100644 --- a/src/devices/bus/coco/coco_pak.h +++ b/src/devices/bus/coco/coco_pak.h @@ -20,8 +20,8 @@ class coco_pak_device : { public: // construction/destruction - coco_pak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - coco_pak_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + coco_pak_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + coco_pak_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -49,7 +49,7 @@ class coco_pak_banked_device : { public: // construction/destruction - coco_pak_banked_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + coco_pak_banked_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/coco/cococart.cpp b/src/devices/bus/coco/cococart.cpp index 66cbc1dc121..fe84d67a2da 100644 --- a/src/devices/bus/coco/cococart.cpp +++ b/src/devices/bus/coco/cococart.cpp @@ -35,7 +35,7 @@ const device_type COCOCART_SLOT = &device_creator<cococart_slot_device>; //------------------------------------------------- // cococart_slot_device - constructor //------------------------------------------------- -cococart_slot_device::cococart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +cococart_slot_device::cococart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, COCOCART_SLOT, "CoCo Cartridge Slot", tag, owner, clock, "cococart_slot", __FILE__), device_slot_interface(mconfig, *this), device_image_interface(mconfig, *this), diff --git a/src/devices/bus/coco/cococart.h b/src/devices/bus/coco/cococart.h index f92459b4388..2762d742c3b 100644 --- a/src/devices/bus/coco/cococart.h +++ b/src/devices/bus/coco/cococart.h @@ -75,7 +75,7 @@ class cococart_slot_device : public device_t, { public: // construction/destruction - cococart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cococart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template<class _Object> static devcb_base &static_set_cart_callback(device_t &device, _Object object) { return downcast<cococart_slot_device &>(device).m_cart_callback.set_callback(object); } template<class _Object> static devcb_base &static_set_nmi_callback(device_t &device, _Object object) { return downcast<cococart_slot_device &>(device).m_nmi_callback.set_callback(object); } diff --git a/src/devices/bus/coleco/ctrl.cpp b/src/devices/bus/coleco/ctrl.cpp index 5b53be7c3cf..f2dcd08c56e 100644 --- a/src/devices/bus/coleco/ctrl.cpp +++ b/src/devices/bus/coleco/ctrl.cpp @@ -44,7 +44,7 @@ device_colecovision_control_port_interface::device_colecovision_control_port_int // colecovision_control_port_device - constructor //------------------------------------------------- -colecovision_control_port_device::colecovision_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +colecovision_control_port_device::colecovision_control_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, COLECOVISION_CONTROL_PORT, "ColecoVision control port", tag, owner, clock, "colecovision_control_port", __FILE__), device_slot_interface(mconfig, *this), m_device(nullptr), m_write_irq(*this) diff --git a/src/devices/bus/coleco/ctrl.h b/src/devices/bus/coleco/ctrl.h index a8c82ee23c4..c11a5bc75f0 100644 --- a/src/devices/bus/coleco/ctrl.h +++ b/src/devices/bus/coleco/ctrl.h @@ -67,7 +67,7 @@ class colecovision_control_port_device : public device_t, { public: // construction/destruction - colecovision_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + colecovision_control_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~colecovision_control_port_device() { } // static configuration helpers diff --git a/src/devices/bus/coleco/exp.cpp b/src/devices/bus/coleco/exp.cpp index 05a53b584a5..ce2e2b8d771 100644 --- a/src/devices/bus/coleco/exp.cpp +++ b/src/devices/bus/coleco/exp.cpp @@ -52,7 +52,7 @@ void device_colecovision_cartridge_interface::rom_alloc(size_t size) // colecovision_cartridge_slot_device - constructor //------------------------------------------------- -colecovision_cartridge_slot_device::colecovision_cartridge_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +colecovision_cartridge_slot_device::colecovision_cartridge_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, COLECOVISION_CARTRIDGE_SLOT, "ColecoVision cartridge port", tag, owner, clock, "coleco_cartridge_port", __FILE__), device_slot_interface(mconfig, *this), device_image_interface(mconfig, *this), m_card(nullptr) diff --git a/src/devices/bus/coleco/exp.h b/src/devices/bus/coleco/exp.h index e64e3c8d6d1..4c146f88e8e 100644 --- a/src/devices/bus/coleco/exp.h +++ b/src/devices/bus/coleco/exp.h @@ -66,7 +66,7 @@ class colecovision_cartridge_slot_device : public device_t, { public: // construction/destruction - colecovision_cartridge_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + colecovision_cartridge_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~colecovision_cartridge_slot_device() { } // computer interface diff --git a/src/devices/bus/coleco/hand.cpp b/src/devices/bus/coleco/hand.cpp index a00a1d89f4c..13d9407cdc5 100644 --- a/src/devices/bus/coleco/hand.cpp +++ b/src/devices/bus/coleco/hand.cpp @@ -89,7 +89,7 @@ ioport_constructor coleco_hand_controller_t::device_input_ports() const // coleco_hand_controller_t - constructor //------------------------------------------------- -coleco_hand_controller_t::coleco_hand_controller_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +coleco_hand_controller_t::coleco_hand_controller_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, COLECO_HAND_CONTROLLER, "ColecoVision Hand Controller", tag, owner, clock, "coleco_hand", __FILE__), device_colecovision_control_port_interface(mconfig, *this), m_io_common0(*this, "COMMON0"), diff --git a/src/devices/bus/coleco/hand.h b/src/devices/bus/coleco/hand.h index a43632e66db..f65831c42c3 100644 --- a/src/devices/bus/coleco/hand.h +++ b/src/devices/bus/coleco/hand.h @@ -27,7 +27,7 @@ class coleco_hand_controller_t : public device_t, { public: // construction/destruction - coleco_hand_controller_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + coleco_hand_controller_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/coleco/sac.cpp b/src/devices/bus/coleco/sac.cpp index 01a62b49323..e92d1cb81c8 100644 --- a/src/devices/bus/coleco/sac.cpp +++ b/src/devices/bus/coleco/sac.cpp @@ -101,7 +101,7 @@ ioport_constructor coleco_super_action_controller_t::device_input_ports() const // coleco_super_action_controller_t - constructor //------------------------------------------------- -coleco_super_action_controller_t::coleco_super_action_controller_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +coleco_super_action_controller_t::coleco_super_action_controller_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, COLECO_SUPER_ACTION_CONTROLLER, "ColecoVision Super Action Controller", tag, owner, clock, "coleco_sac", __FILE__), device_colecovision_control_port_interface(mconfig, *this), m_io_common0(*this, "COMMON0"), diff --git a/src/devices/bus/coleco/sac.h b/src/devices/bus/coleco/sac.h index 51dcfae357f..614fce08d3f 100644 --- a/src/devices/bus/coleco/sac.h +++ b/src/devices/bus/coleco/sac.h @@ -27,7 +27,7 @@ class coleco_super_action_controller_t : public device_t, { public: // construction/destruction - coleco_super_action_controller_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + coleco_super_action_controller_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/coleco/std.cpp b/src/devices/bus/coleco/std.cpp index f66a0463eae..c9fb068ebfa 100644 --- a/src/devices/bus/coleco/std.cpp +++ b/src/devices/bus/coleco/std.cpp @@ -26,7 +26,7 @@ const device_type COLECOVISION_STANDARD = &device_creator<colecovision_standard_ // colecovision_standard_cartridge_device - constructor //------------------------------------------------- -colecovision_standard_cartridge_device::colecovision_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +colecovision_standard_cartridge_device::colecovision_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, COLECOVISION_STANDARD, "ColecoVision standard cartridge", tag, owner, clock, "colecovision_standard", __FILE__), device_colecovision_cartridge_interface(mconfig, *this) { diff --git a/src/devices/bus/coleco/std.h b/src/devices/bus/coleco/std.h index 4afde3809c9..4904e729d4d 100644 --- a/src/devices/bus/coleco/std.h +++ b/src/devices/bus/coleco/std.h @@ -26,7 +26,7 @@ class colecovision_standard_cartridge_device : public device_t, { public: // construction/destruction - colecovision_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + colecovision_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/coleco/xin1.cpp b/src/devices/bus/coleco/xin1.cpp index e46b65eeadd..0f0b9ce6ee7 100644 --- a/src/devices/bus/coleco/xin1.cpp +++ b/src/devices/bus/coleco/xin1.cpp @@ -26,7 +26,7 @@ const device_type COLECOVISION_XIN1 = &device_creator<colecovision_xin1_cartridg // colecovision_xin1_cartridge_device - constructor //------------------------------------------------- -colecovision_xin1_cartridge_device::colecovision_xin1_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +colecovision_xin1_cartridge_device::colecovision_xin1_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, COLECOVISION_XIN1, "ColecoVision X-in-1 cartridge", tag, owner, clock, "colecovision_xin1", __FILE__), device_colecovision_cartridge_interface(mconfig, *this), m_current_offset(0) diff --git a/src/devices/bus/coleco/xin1.h b/src/devices/bus/coleco/xin1.h index defe4d8d4fa..2e437300fe1 100644 --- a/src/devices/bus/coleco/xin1.h +++ b/src/devices/bus/coleco/xin1.h @@ -26,7 +26,7 @@ class colecovision_xin1_cartridge_device : public device_t, { public: // construction/destruction - colecovision_xin1_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + colecovision_xin1_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/compucolor/floppy.cpp b/src/devices/bus/compucolor/floppy.cpp index b69bbe014b0..10986f490e4 100644 --- a/src/devices/bus/compucolor/floppy.cpp +++ b/src/devices/bus/compucolor/floppy.cpp @@ -84,7 +84,7 @@ device_compucolor_floppy_port_interface::device_compucolor_floppy_port_interface // compucolor_floppy_port_device - constructor //------------------------------------------------- -compucolor_floppy_port_device::compucolor_floppy_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +compucolor_floppy_port_device::compucolor_floppy_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : rs232_port_device(mconfig, COMPUCOLOR_FLOPPY_PORT, "Compucolor Floppy Port", tag, owner, clock, "compclr_flp_port", __FILE__), m_dev(nullptr) { } @@ -94,7 +94,7 @@ compucolor_floppy_port_device::compucolor_floppy_port_device(const machine_confi // compucolor_floppy_device - constructor //------------------------------------------------- -compucolor_floppy_device::compucolor_floppy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +compucolor_floppy_device::compucolor_floppy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, COMPUCOLOR_FLOPPY, "Compucolor floppy", tag, owner, clock, "compclr_flp", __FILE__), device_compucolor_floppy_port_interface(mconfig, *this), m_floppy(*this, "floppy:525sssd"), diff --git a/src/devices/bus/compucolor/floppy.h b/src/devices/bus/compucolor/floppy.h index f17772c88fe..eda50424f43 100644 --- a/src/devices/bus/compucolor/floppy.h +++ b/src/devices/bus/compucolor/floppy.h @@ -50,7 +50,7 @@ public: class compucolor_floppy_port_device : public rs232_port_device { public: - compucolor_floppy_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + compucolor_floppy_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~compucolor_floppy_port_device() { } DECLARE_WRITE_LINE_MEMBER( rw_w ) { if (m_dev) m_dev->rw_w(state); } @@ -74,7 +74,7 @@ class compucolor_floppy_device : public device_t, { public: // construction/destruction - compucolor_floppy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + compucolor_floppy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_FLOPPY_FORMATS( floppy_formats ); diff --git a/src/devices/bus/comx35/clm.cpp b/src/devices/bus/comx35/clm.cpp index b9cc57b836f..9f20a87c5da 100644 --- a/src/devices/bus/comx35/clm.cpp +++ b/src/devices/bus/comx35/clm.cpp @@ -172,7 +172,7 @@ machine_config_constructor comx_clm_device::device_mconfig_additions() const // comx_clm_device - constructor //------------------------------------------------- -comx_clm_device::comx_clm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +comx_clm_device::comx_clm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, COMX_CLM, "COMX 80 Column Card", tag, owner, clock, "comx_clm", __FILE__), device_comx_expansion_card_interface(mconfig, *this), m_crtc(*this, MC6845_TAG), diff --git a/src/devices/bus/comx35/clm.h b/src/devices/bus/comx35/clm.h index 131a57b2cd9..7d831fc41df 100644 --- a/src/devices/bus/comx35/clm.h +++ b/src/devices/bus/comx35/clm.h @@ -28,7 +28,7 @@ class comx_clm_device : public device_t, { public: // construction/destruction - comx_clm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + comx_clm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/comx35/eprom.cpp b/src/devices/bus/comx35/eprom.cpp index 56be84b4902..bb48207f7bf 100644 --- a/src/devices/bus/comx35/eprom.cpp +++ b/src/devices/bus/comx35/eprom.cpp @@ -56,7 +56,7 @@ const rom_entry *comx_epr_device::device_rom_region() const // comx_epr_device - constructor //------------------------------------------------- -comx_epr_device::comx_epr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +comx_epr_device::comx_epr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, COMX_EPR, "COMX-35 F&M EPROM Switchboard", tag, owner, clock, "comx_epr", __FILE__), device_comx_expansion_card_interface(mconfig, *this), m_rom(*this, "f800"), diff --git a/src/devices/bus/comx35/eprom.h b/src/devices/bus/comx35/eprom.h index 3d30b7e312a..b0b1a75f592 100644 --- a/src/devices/bus/comx35/eprom.h +++ b/src/devices/bus/comx35/eprom.h @@ -27,7 +27,7 @@ class comx_epr_device : public device_t, { public: // construction/destruction - comx_epr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + comx_epr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/comx35/exp.cpp b/src/devices/bus/comx35/exp.cpp index cd64a1b49a8..95034532aac 100644 --- a/src/devices/bus/comx35/exp.cpp +++ b/src/devices/bus/comx35/exp.cpp @@ -42,7 +42,7 @@ device_comx_expansion_card_interface::device_comx_expansion_card_interface(const // comx_expansion_slot_device - constructor //------------------------------------------------- -comx_expansion_slot_device::comx_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +comx_expansion_slot_device::comx_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, COMX_EXPANSION_SLOT, "COMX-35 expansion slot", tag, owner, clock, "comx_expansion_slot", __FILE__), device_slot_interface(mconfig, *this), m_write_irq(*this), m_card(nullptr) diff --git a/src/devices/bus/comx35/exp.h b/src/devices/bus/comx35/exp.h index 02325753396..4286ea488e5 100644 --- a/src/devices/bus/comx35/exp.h +++ b/src/devices/bus/comx35/exp.h @@ -75,7 +75,7 @@ class comx_expansion_slot_device : public device_t, { public: // construction/destruction - comx_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + comx_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~comx_expansion_slot_device() { } template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<comx_expansion_slot_device &>(device).m_write_irq.set_callback(object); } diff --git a/src/devices/bus/comx35/expbox.cpp b/src/devices/bus/comx35/expbox.cpp index ce0dec61006..d752e3f0e31 100644 --- a/src/devices/bus/comx35/expbox.cpp +++ b/src/devices/bus/comx35/expbox.cpp @@ -129,7 +129,7 @@ machine_config_constructor comx_eb_device::device_mconfig_additions() const // comx_eb_device - constructor //------------------------------------------------- -comx_eb_device::comx_eb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +comx_eb_device::comx_eb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, COMX_EB, "COMX-35E Expansion Box", tag, owner, clock, "comx_eb", __FILE__), device_comx_expansion_card_interface(mconfig, *this), m_rom(*this, "e000"), diff --git a/src/devices/bus/comx35/expbox.h b/src/devices/bus/comx35/expbox.h index 0b479c79326..3e2267f90c5 100644 --- a/src/devices/bus/comx35/expbox.h +++ b/src/devices/bus/comx35/expbox.h @@ -34,7 +34,7 @@ class comx_eb_device : public device_t, { public: // construction/destruction - comx_eb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + comx_eb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_WRITE_LINE_MEMBER( slot1_irq_w ) { m_irq[0] = state; set_irq(); } DECLARE_WRITE_LINE_MEMBER( slot2_irq_w ) { m_irq[1] = state; set_irq(); } diff --git a/src/devices/bus/comx35/fdc.cpp b/src/devices/bus/comx35/fdc.cpp index e2c5066873a..7b5e1cc9a73 100644 --- a/src/devices/bus/comx35/fdc.cpp +++ b/src/devices/bus/comx35/fdc.cpp @@ -122,7 +122,7 @@ machine_config_constructor comx_fd_device::device_mconfig_additions() const // comx_fd_device - constructor //------------------------------------------------- -comx_fd_device::comx_fd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +comx_fd_device::comx_fd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, COMX_FD, "COMX FD", tag, owner, clock, "comx_fd", __FILE__), device_comx_expansion_card_interface(mconfig, *this), m_fdc(*this, WD1770_TAG), diff --git a/src/devices/bus/comx35/fdc.h b/src/devices/bus/comx35/fdc.h index cdcb23a363e..c2fe9e34fed 100644 --- a/src/devices/bus/comx35/fdc.h +++ b/src/devices/bus/comx35/fdc.h @@ -29,7 +29,7 @@ class comx_fd_device : public device_t, { public: // construction/destruction - comx_fd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + comx_fd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/comx35/joycard.cpp b/src/devices/bus/comx35/joycard.cpp index 2408693f1b8..a5c73ff2da9 100644 --- a/src/devices/bus/comx35/joycard.cpp +++ b/src/devices/bus/comx35/joycard.cpp @@ -66,7 +66,7 @@ ioport_constructor comx_joy_device::device_input_ports() const // comx_joy_device - constructor //------------------------------------------------- -comx_joy_device::comx_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +comx_joy_device::comx_joy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, COMX_JOY, "COMX JoyCard", tag, owner, clock, "comx_joy", __FILE__), device_comx_expansion_card_interface(mconfig, *this), m_joy1(*this, "JOY1"), diff --git a/src/devices/bus/comx35/joycard.h b/src/devices/bus/comx35/joycard.h index 318c5265069..5d2fde3d87b 100644 --- a/src/devices/bus/comx35/joycard.h +++ b/src/devices/bus/comx35/joycard.h @@ -27,7 +27,7 @@ class comx_joy_device : public device_t, { public: // construction/destruction - comx_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + comx_joy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/comx35/printer.cpp b/src/devices/bus/comx35/printer.cpp index 2f36fffd9bd..af7479e24b9 100644 --- a/src/devices/bus/comx35/printer.cpp +++ b/src/devices/bus/comx35/printer.cpp @@ -86,7 +86,7 @@ machine_config_constructor comx_prn_device::device_mconfig_additions() const // comx_prn_device - constructor //------------------------------------------------- -comx_prn_device::comx_prn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +comx_prn_device::comx_prn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, COMX_PRN, "COMX-35 Printer Card", tag, owner, clock, "comx_prn", __FILE__), device_comx_expansion_card_interface(mconfig, *this), m_centronics(*this, CENTRONICS_TAG), diff --git a/src/devices/bus/comx35/printer.h b/src/devices/bus/comx35/printer.h index 8f0a2d2fcaf..4c942a06acf 100644 --- a/src/devices/bus/comx35/printer.h +++ b/src/devices/bus/comx35/printer.h @@ -29,7 +29,7 @@ class comx_prn_device : public device_t, { public: // construction/destruction - comx_prn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + comx_prn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/comx35/ram.cpp b/src/devices/bus/comx35/ram.cpp index 0e096c5dc15..bfe694d83d7 100644 --- a/src/devices/bus/comx35/ram.cpp +++ b/src/devices/bus/comx35/ram.cpp @@ -33,7 +33,7 @@ const device_type COMX_RAM = &device_creator<comx_ram_device>; // comx_ram_device - constructor //------------------------------------------------- -comx_ram_device::comx_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +comx_ram_device::comx_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, COMX_RAM, "COMX-35 RAM Card", tag, owner, clock, "comx_ram", __FILE__), device_comx_expansion_card_interface(mconfig, *this), m_ram(*this, "ram"), diff --git a/src/devices/bus/comx35/ram.h b/src/devices/bus/comx35/ram.h index c74a54066f4..d76261a7103 100644 --- a/src/devices/bus/comx35/ram.h +++ b/src/devices/bus/comx35/ram.h @@ -27,7 +27,7 @@ class comx_ram_device : public device_t, { public: // construction/destruction - comx_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + comx_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/comx35/thermal.cpp b/src/devices/bus/comx35/thermal.cpp index e74b62978d6..b5cfd571e8d 100644 --- a/src/devices/bus/comx35/thermal.cpp +++ b/src/devices/bus/comx35/thermal.cpp @@ -51,7 +51,7 @@ const rom_entry *comx_thm_device::device_rom_region() const // comx_thm_device - constructor //------------------------------------------------- -comx_thm_device::comx_thm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +comx_thm_device::comx_thm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, COMX_THM, "COMX-35 Thermal Printer Card", tag, owner, clock, "comx_thm", __FILE__), device_comx_expansion_card_interface(mconfig, *this), m_rom(*this, "c000") diff --git a/src/devices/bus/comx35/thermal.h b/src/devices/bus/comx35/thermal.h index 7d16f2a3d06..5fae0807a47 100644 --- a/src/devices/bus/comx35/thermal.h +++ b/src/devices/bus/comx35/thermal.h @@ -27,7 +27,7 @@ class comx_thm_device : public device_t, { public: // construction/destruction - comx_thm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + comx_thm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/cpc/amdrum.cpp b/src/devices/bus/cpc/amdrum.cpp index 87e5af428ce..545be8cc46e 100644 --- a/src/devices/bus/cpc/amdrum.cpp +++ b/src/devices/bus/cpc/amdrum.cpp @@ -34,7 +34,7 @@ machine_config_constructor cpc_amdrum_device::device_mconfig_additions() const // LIVE DEVICE //************************************************************************** -cpc_amdrum_device::cpc_amdrum_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +cpc_amdrum_device::cpc_amdrum_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CPC_AMDRUM, "Amdrum", tag, owner, clock, "cpc_amdrum", __FILE__), device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), diff --git a/src/devices/bus/cpc/amdrum.h b/src/devices/bus/cpc/amdrum.h index 5a3df11d273..65afa46e131 100644 --- a/src/devices/bus/cpc/amdrum.h +++ b/src/devices/bus/cpc/amdrum.h @@ -24,7 +24,7 @@ class cpc_amdrum_device : public device_t, { public: // construction/destruction - cpc_amdrum_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cpc_amdrum_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/cpc/brunword4.cpp b/src/devices/bus/cpc/brunword4.cpp index c4cbc0b0b1f..139762255e1 100644 --- a/src/devices/bus/cpc/brunword4.cpp +++ b/src/devices/bus/cpc/brunword4.cpp @@ -62,7 +62,7 @@ const rom_entry *cpc_brunword4_device::device_rom_region() const return ROM_NAME( cpc_brunword4 ); } -cpc_brunword4_device::cpc_brunword4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +cpc_brunword4_device::cpc_brunword4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CPC_BRUNWORD_MK4, "Brunword Elite MK4", tag, owner, clock, "cpc_brunword4", __FILE__), device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_rombank_active(false), m_bank_sel(0) { diff --git a/src/devices/bus/cpc/brunword4.h b/src/devices/bus/cpc/brunword4.h index 4a65bf3402d..12b6b46e0bf 100644 --- a/src/devices/bus/cpc/brunword4.h +++ b/src/devices/bus/cpc/brunword4.h @@ -14,7 +14,7 @@ class cpc_brunword4_device : public device_t, { public: // construction/destruction - cpc_brunword4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cpc_brunword4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/cpc/cpc_pds.cpp b/src/devices/bus/cpc/cpc_pds.cpp index 1bff1c869a0..68a9e673e81 100644 --- a/src/devices/bus/cpc/cpc_pds.cpp +++ b/src/devices/bus/cpc/cpc_pds.cpp @@ -35,7 +35,7 @@ machine_config_constructor cpc_pds_device::device_mconfig_additions() const // LIVE DEVICE //************************************************************************** -cpc_pds_device::cpc_pds_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +cpc_pds_device::cpc_pds_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CPC_PDS, "Programmers Development System (CPC Target)", tag, owner, clock, "cpc_pds", __FILE__), device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_pio(*this,"pio") diff --git a/src/devices/bus/cpc/cpc_pds.h b/src/devices/bus/cpc/cpc_pds.h index 54d68e431fd..61175271584 100644 --- a/src/devices/bus/cpc/cpc_pds.h +++ b/src/devices/bus/cpc/cpc_pds.h @@ -33,7 +33,7 @@ class cpc_pds_device : public device_t, { public: // construction/destruction - cpc_pds_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cpc_pds_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/cpc/cpc_rom.cpp b/src/devices/bus/cpc/cpc_rom.cpp index d0d59ea4452..849ffd3e9b3 100644 --- a/src/devices/bus/cpc/cpc_rom.cpp +++ b/src/devices/bus/cpc/cpc_rom.cpp @@ -47,7 +47,7 @@ machine_config_constructor cpc_rom_device::device_mconfig_additions() const // LIVE DEVICE //************************************************************************** -cpc_rom_device::cpc_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +cpc_rom_device::cpc_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CPC_ROM, "ROM Box", tag, owner, clock, "cpc_rom", __FILE__), device_cpc_expansion_card_interface(mconfig, *this) { @@ -79,7 +79,7 @@ const device_type ROMSLOT = &device_creator<rom_image_device>; // rom_image_device - constructor //------------------------------------------------- -rom_image_device::rom_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +rom_image_device::rom_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ROMSLOT, "ROM image", tag, owner, clock, "rom_image", __FILE__), device_image_interface(mconfig, *this), m_base(nullptr) { diff --git a/src/devices/bus/cpc/cpc_rom.h b/src/devices/bus/cpc/cpc_rom.h index ee758aba761..cfb3b66a9aa 100644 --- a/src/devices/bus/cpc/cpc_rom.h +++ b/src/devices/bus/cpc/cpc_rom.h @@ -21,7 +21,7 @@ class rom_image_device : public device_t, { public: // construction/destruction - rom_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + rom_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~rom_image_device(); // image-level overrides @@ -65,7 +65,7 @@ class cpc_rom_device : public device_t, { public: // construction/destruction - cpc_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cpc_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/cpc/cpc_rs232.cpp b/src/devices/bus/cpc/cpc_rs232.cpp index ccf4165edf1..6b5d965d3f5 100644 --- a/src/devices/bus/cpc/cpc_rs232.cpp +++ b/src/devices/bus/cpc/cpc_rs232.cpp @@ -80,7 +80,7 @@ const rom_entry *cpc_ams_rs232_device::device_rom_region() const // LIVE DEVICE //************************************************************************** -cpc_rs232_device::cpc_rs232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +cpc_rs232_device::cpc_rs232_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CPC_RS232, "Pace RS232C interface", tag, owner, clock, "cpc_ser", __FILE__), device_cpc_expansion_card_interface(mconfig, *this), m_pit(*this,"pit"), @@ -89,7 +89,7 @@ cpc_rs232_device::cpc_rs232_device(const machine_config &mconfig, const char *ta { } -cpc_rs232_device::cpc_rs232_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +cpc_rs232_device::cpc_rs232_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_cpc_expansion_card_interface(mconfig, *this), m_pit(*this,"pit"), @@ -98,7 +98,7 @@ cpc_rs232_device::cpc_rs232_device(const machine_config &mconfig, device_type ty { } -cpc_ams_rs232_device::cpc_ams_rs232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +cpc_ams_rs232_device::cpc_ams_rs232_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : cpc_rs232_device(mconfig, CPC_RS232_AMS, "Amstrad RS232C interface", tag, owner, clock, "cpc_serams", __FILE__) { } diff --git a/src/devices/bus/cpc/cpc_rs232.h b/src/devices/bus/cpc/cpc_rs232.h index 0124a685ea8..e355d1242c4 100644 --- a/src/devices/bus/cpc/cpc_rs232.h +++ b/src/devices/bus/cpc/cpc_rs232.h @@ -20,8 +20,8 @@ class cpc_rs232_device : public device_t, { public: // construction/destruction - cpc_rs232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - cpc_rs232_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + cpc_rs232_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + cpc_rs232_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -52,7 +52,7 @@ class cpc_ams_rs232_device : public cpc_rs232_device { public: // construction/destruction - cpc_ams_rs232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cpc_ams_rs232_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/cpc/cpc_ssa1.cpp b/src/devices/bus/cpc/cpc_ssa1.cpp index a86847d100c..827efdce9c0 100644 --- a/src/devices/bus/cpc/cpc_ssa1.cpp +++ b/src/devices/bus/cpc/cpc_ssa1.cpp @@ -158,7 +158,7 @@ machine_config_constructor cpc_dkspeech_device::device_mconfig_additions() const // LIVE DEVICE //************************************************************************** -cpc_ssa1_device::cpc_ssa1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +cpc_ssa1_device::cpc_ssa1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CPC_SSA1, "SSA-1", tag, owner, clock, "cpc_ssa1", __FILE__), device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_rom(nullptr), m_lrq(1), m_sby(0), @@ -166,7 +166,7 @@ cpc_ssa1_device::cpc_ssa1_device(const machine_config &mconfig, const char *tag, { } -cpc_dkspeech_device::cpc_dkspeech_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +cpc_dkspeech_device::cpc_dkspeech_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CPC_DKSPEECH, "DK'Tronics Speech Synthesiser", tag, owner, clock, "cpc_dkspeech", __FILE__), device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_rom(nullptr), m_lrq(1), m_sby(0), diff --git a/src/devices/bus/cpc/cpc_ssa1.h b/src/devices/bus/cpc/cpc_ssa1.h index e47112511f5..1d30b99ceb8 100644 --- a/src/devices/bus/cpc/cpc_ssa1.h +++ b/src/devices/bus/cpc/cpc_ssa1.h @@ -53,7 +53,7 @@ class cpc_ssa1_device : public device_t, { public: // construction/destruction - cpc_ssa1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cpc_ssa1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -89,7 +89,7 @@ class cpc_dkspeech_device : public device_t, { public: // construction/destruction - cpc_dkspeech_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cpc_dkspeech_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/cpc/cpcexp.cpp b/src/devices/bus/cpc/cpcexp.cpp index 69ad0887282..1d6f76627cd 100644 --- a/src/devices/bus/cpc/cpcexp.cpp +++ b/src/devices/bus/cpc/cpcexp.cpp @@ -42,7 +42,7 @@ device_cpc_expansion_card_interface::~device_cpc_expansion_card_interface() // LIVE DEVICE //************************************************************************** -cpc_expansion_slot_device::cpc_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +cpc_expansion_slot_device::cpc_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CPC_EXPANSION_SLOT, "Amstrad CPC expansion port", tag, owner, clock, "cpc_expansion_slot", __FILE__), device_slot_interface(mconfig, *this), m_out_irq_cb(*this), diff --git a/src/devices/bus/cpc/cpcexp.h b/src/devices/bus/cpc/cpcexp.h index ffde80ef655..0ffe527d971 100644 --- a/src/devices/bus/cpc/cpcexp.h +++ b/src/devices/bus/cpc/cpcexp.h @@ -117,7 +117,7 @@ class cpc_expansion_slot_device : public device_t, { public: // construction/destruction - cpc_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cpc_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~cpc_expansion_slot_device(); template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<cpc_expansion_slot_device &>(device).m_out_irq_cb.set_callback(object); } diff --git a/src/devices/bus/cpc/ddi1.cpp b/src/devices/bus/cpc/ddi1.cpp index c9b4adb1a2d..02ec3187c1c 100644 --- a/src/devices/bus/cpc/ddi1.cpp +++ b/src/devices/bus/cpc/ddi1.cpp @@ -61,7 +61,7 @@ machine_config_constructor cpc_ddi1_device::device_mconfig_additions() const // LIVE DEVICE //************************************************************************** -cpc_ddi1_device::cpc_ddi1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +cpc_ddi1_device::cpc_ddi1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CPC_DDI1, "DDI-1", tag, owner, clock, "cpc_ddi1", __FILE__), device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_fdc(*this,"upd765"), diff --git a/src/devices/bus/cpc/ddi1.h b/src/devices/bus/cpc/ddi1.h index 600098a3e53..c1f93f81179 100644 --- a/src/devices/bus/cpc/ddi1.h +++ b/src/devices/bus/cpc/ddi1.h @@ -20,7 +20,7 @@ class cpc_ddi1_device : public device_t, { public: // construction/destruction - cpc_ddi1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cpc_ddi1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/cpc/doubler.cpp b/src/devices/bus/cpc/doubler.cpp index 9876263c323..5736a54111c 100644 --- a/src/devices/bus/cpc/doubler.cpp +++ b/src/devices/bus/cpc/doubler.cpp @@ -36,7 +36,7 @@ machine_config_constructor cpc_doubler_device::device_mconfig_additions() const // LIVE DEVICE //************************************************************************** -cpc_doubler_device::cpc_doubler_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +cpc_doubler_device::cpc_doubler_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CPC_DOUBLER, "Draysoft Doubler", tag, owner, clock, "cpc_doubler", __FILE__), device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_tape(*this,"doubler_tape") diff --git a/src/devices/bus/cpc/doubler.h b/src/devices/bus/cpc/doubler.h index 6c429618789..dca244ec910 100644 --- a/src/devices/bus/cpc/doubler.h +++ b/src/devices/bus/cpc/doubler.h @@ -21,7 +21,7 @@ class cpc_doubler_device : public device_t, { public: // construction/destruction - cpc_doubler_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cpc_doubler_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/cpc/hd20.cpp b/src/devices/bus/cpc/hd20.cpp index 3e19640be8e..338bfc3f342 100644 --- a/src/devices/bus/cpc/hd20.cpp +++ b/src/devices/bus/cpc/hd20.cpp @@ -48,7 +48,7 @@ const rom_entry *cpc_hd20_device::device_rom_region() const // LIVE DEVICE //************************************************************************** -cpc_hd20_device::cpc_hd20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +cpc_hd20_device::cpc_hd20_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CPC_HD20, "Dobbertin HD20", tag, owner, clock, "cpc_hd20", __FILE__), device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_hdc(*this,"hdc") diff --git a/src/devices/bus/cpc/hd20.h b/src/devices/bus/cpc/hd20.h index 3d4f48837fd..f0dd5d296ca 100644 --- a/src/devices/bus/cpc/hd20.h +++ b/src/devices/bus/cpc/hd20.h @@ -23,7 +23,7 @@ class cpc_hd20_device : public device_t, { public: // construction/destruction - cpc_hd20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cpc_hd20_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/cpc/magicsound.cpp b/src/devices/bus/cpc/magicsound.cpp index c289db92ddd..67600fde21e 100644 --- a/src/devices/bus/cpc/magicsound.cpp +++ b/src/devices/bus/cpc/magicsound.cpp @@ -70,7 +70,7 @@ machine_config_constructor al_magicsound_device::device_mconfig_additions() cons // LIVE DEVICE //************************************************************************** -al_magicsound_device::al_magicsound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +al_magicsound_device::al_magicsound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, AL_MAGICSOUND, "Magic Sound Board", tag, owner, clock, "al_magicsound", __FILE__), device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_dac1(*this,"dac1"), diff --git a/src/devices/bus/cpc/magicsound.h b/src/devices/bus/cpc/magicsound.h index 519e820bac4..633548417e9 100644 --- a/src/devices/bus/cpc/magicsound.h +++ b/src/devices/bus/cpc/magicsound.h @@ -38,7 +38,7 @@ class al_magicsound_device : public device_t, { public: // construction/destruction - al_magicsound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + al_magicsound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/cpc/mface2.cpp b/src/devices/bus/cpc/mface2.cpp index bb4354041bc..bdc6ccba58c 100644 --- a/src/devices/bus/cpc/mface2.cpp +++ b/src/devices/bus/cpc/mface2.cpp @@ -308,7 +308,7 @@ ioport_constructor cpc_multiface2_device::device_input_ports() const // LIVE DEVICE //************************************************************************** -cpc_multiface2_device::cpc_multiface2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +cpc_multiface2_device::cpc_multiface2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CPC_MFACE2, "Multiface II", tag, owner, clock, "cpc_mf2", __FILE__), device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_multiface_ram(nullptr), m_multiface_flags(0), m_romdis(0) { diff --git a/src/devices/bus/cpc/mface2.h b/src/devices/bus/cpc/mface2.h index c64872af18b..fe0ade65d6e 100644 --- a/src/devices/bus/cpc/mface2.h +++ b/src/devices/bus/cpc/mface2.h @@ -36,7 +36,7 @@ class cpc_multiface2_device : public device_t, { public: // construction/destruction - cpc_multiface2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cpc_multiface2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/cpc/playcity.cpp b/src/devices/bus/cpc/playcity.cpp index 8d6fd109453..9d4ffb8730b 100644 --- a/src/devices/bus/cpc/playcity.cpp +++ b/src/devices/bus/cpc/playcity.cpp @@ -52,7 +52,7 @@ machine_config_constructor cpc_playcity_device::device_mconfig_additions() const // LIVE DEVICE //************************************************************************** -cpc_playcity_device::cpc_playcity_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +cpc_playcity_device::cpc_playcity_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CPC_PLAYCITY, "PlayCity", tag, owner, clock, "cpc_playcity", __FILE__), device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_ctc(*this,"ctc"), diff --git a/src/devices/bus/cpc/playcity.h b/src/devices/bus/cpc/playcity.h index 757ffb23c45..d361e9f8777 100644 --- a/src/devices/bus/cpc/playcity.h +++ b/src/devices/bus/cpc/playcity.h @@ -28,7 +28,7 @@ class cpc_playcity_device : public device_t, { public: // construction/destruction - cpc_playcity_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cpc_playcity_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/cpc/smartwatch.cpp b/src/devices/bus/cpc/smartwatch.cpp index e4304323932..6c002d93236 100644 --- a/src/devices/bus/cpc/smartwatch.cpp +++ b/src/devices/bus/cpc/smartwatch.cpp @@ -45,7 +45,7 @@ const rom_entry *cpc_smartwatch_device::device_rom_region() const // LIVE DEVICE //************************************************************************** -cpc_smartwatch_device::cpc_smartwatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +cpc_smartwatch_device::cpc_smartwatch_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CPC_SMARTWATCH, "Dobbertin Smartwatch", tag, owner, clock, "cpc_smartwatch", __FILE__), device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_rtc(*this,"rtc"), m_bank(nullptr) diff --git a/src/devices/bus/cpc/smartwatch.h b/src/devices/bus/cpc/smartwatch.h index b4741bed193..d28aa477eb2 100644 --- a/src/devices/bus/cpc/smartwatch.h +++ b/src/devices/bus/cpc/smartwatch.h @@ -21,7 +21,7 @@ class cpc_smartwatch_device : public device_t, { public: // construction/destruction - cpc_smartwatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cpc_smartwatch_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/cpc/symbfac2.cpp b/src/devices/bus/cpc/symbfac2.cpp index c80d22da6c6..d6d65b829e1 100644 --- a/src/devices/bus/cpc/symbfac2.cpp +++ b/src/devices/bus/cpc/symbfac2.cpp @@ -71,7 +71,7 @@ ioport_constructor cpc_symbiface2_device::device_input_ports() const // LIVE DEVICE //************************************************************************** -cpc_symbiface2_device::cpc_symbiface2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +cpc_symbiface2_device::cpc_symbiface2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CPC_SYMBIFACE2, "SYMBiFACE II", tag, owner, clock, "cpc_symf2", __FILE__), device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_ide(*this,"ide"), diff --git a/src/devices/bus/cpc/symbfac2.h b/src/devices/bus/cpc/symbfac2.h index 04bc55bae4d..94bd83479f6 100644 --- a/src/devices/bus/cpc/symbfac2.h +++ b/src/devices/bus/cpc/symbfac2.h @@ -20,7 +20,7 @@ class cpc_symbiface2_device : public device_t, { public: // construction/destruction - cpc_symbiface2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cpc_symbiface2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/cpc/transtape.cpp b/src/devices/bus/cpc/transtape.cpp index 311918e9bda..a914a4883eb 100644 --- a/src/devices/bus/cpc/transtape.cpp +++ b/src/devices/bus/cpc/transtape.cpp @@ -42,7 +42,7 @@ ioport_constructor cpc_transtape_device::device_input_ports() const // LIVE DEVICE //************************************************************************** -cpc_transtape_device::cpc_transtape_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +cpc_transtape_device::cpc_transtape_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CPC_TRANSTAPE, "HM Transtape", tag, owner, clock, "cpc_transtape", __FILE__), device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_cpu(nullptr), m_space(nullptr), m_ram(nullptr), m_rom_active(false), diff --git a/src/devices/bus/cpc/transtape.h b/src/devices/bus/cpc/transtape.h index bb1a70e6ecc..6d42e395e29 100644 --- a/src/devices/bus/cpc/transtape.h +++ b/src/devices/bus/cpc/transtape.h @@ -18,7 +18,7 @@ class cpc_transtape_device : public device_t, { public: // construction/destruction - cpc_transtape_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cpc_transtape_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/crvision/rom.cpp b/src/devices/bus/crvision/rom.cpp index 875a2b40fbc..24eb7942a36 100644 --- a/src/devices/bus/crvision/rom.cpp +++ b/src/devices/bus/crvision/rom.cpp @@ -26,44 +26,44 @@ const device_type CRVISION_ROM_16K = &device_creator<crvision_rom16k_device>; const device_type CRVISION_ROM_18K = &device_creator<crvision_rom18k_device>; -crvision_rom_device::crvision_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +crvision_rom_device::crvision_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_crvision_cart_interface(mconfig, *this) { } -crvision_rom_device::crvision_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +crvision_rom_device::crvision_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CRVISION_ROM_4K, "CreatiVision 4K Carts", tag, owner, clock, "crvision_4k", __FILE__), device_crvision_cart_interface(mconfig, *this) { } -crvision_rom6k_device::crvision_rom6k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +crvision_rom6k_device::crvision_rom6k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : crvision_rom_device(mconfig, CRVISION_ROM_6K, "CreatiVision 6K Carts", tag, owner, clock, "crvision_6k", __FILE__) { } -crvision_rom8k_device::crvision_rom8k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +crvision_rom8k_device::crvision_rom8k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : crvision_rom_device(mconfig, CRVISION_ROM_8K, "CreatiVision 8K Carts", tag, owner, clock, "crvision_8k", __FILE__) { } -crvision_rom10k_device::crvision_rom10k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +crvision_rom10k_device::crvision_rom10k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : crvision_rom_device(mconfig, CRVISION_ROM_10K, "CreatiVision 10K Carts", tag, owner, clock, "crvision_10k", __FILE__) { } -crvision_rom12k_device::crvision_rom12k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +crvision_rom12k_device::crvision_rom12k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : crvision_rom_device(mconfig, CRVISION_ROM_12K, "CreatiVision 12K Carts", tag, owner, clock, "crvision_12k", __FILE__) { } -crvision_rom16k_device::crvision_rom16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +crvision_rom16k_device::crvision_rom16k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : crvision_rom_device(mconfig, CRVISION_ROM_16K, "CreatiVision 16K Carts", tag, owner, clock, "crvision_16k", __FILE__) { } -crvision_rom18k_device::crvision_rom18k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +crvision_rom18k_device::crvision_rom18k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : crvision_rom_device(mconfig, CRVISION_ROM_18K, "CreatiVision 18K Carts", tag, owner, clock, "crvision_18k", __FILE__) { } diff --git a/src/devices/bus/crvision/rom.h b/src/devices/bus/crvision/rom.h index 8a025d6c5d1..31ba846ab97 100644 --- a/src/devices/bus/crvision/rom.h +++ b/src/devices/bus/crvision/rom.h @@ -13,8 +13,8 @@ class crvision_rom_device : public device_t, { public: // construction/destruction - crvision_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - crvision_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + crvision_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + crvision_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override {} @@ -30,7 +30,7 @@ class crvision_rom6k_device : public crvision_rom_device { public: // construction/destruction - crvision_rom6k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + crvision_rom6k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_rom80) override; @@ -42,7 +42,7 @@ class crvision_rom8k_device : public crvision_rom_device { public: // construction/destruction - crvision_rom8k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + crvision_rom8k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_rom80) override; @@ -54,7 +54,7 @@ class crvision_rom10k_device : public crvision_rom_device { public: // construction/destruction - crvision_rom10k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + crvision_rom10k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_rom40) override; @@ -67,7 +67,7 @@ class crvision_rom12k_device : public crvision_rom_device { public: // construction/destruction - crvision_rom12k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + crvision_rom12k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_rom40) override; @@ -80,7 +80,7 @@ class crvision_rom16k_device : public crvision_rom_device { public: // construction/destruction - crvision_rom16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + crvision_rom16k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_rom80) override; @@ -92,7 +92,7 @@ class crvision_rom18k_device : public crvision_rom_device { public: // construction/destruction - crvision_rom18k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + crvision_rom18k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_rom40) override; diff --git a/src/devices/bus/crvision/slot.cpp b/src/devices/bus/crvision/slot.cpp index 74c9eb28645..82f3ddd0d96 100644 --- a/src/devices/bus/crvision/slot.cpp +++ b/src/devices/bus/crvision/slot.cpp @@ -45,7 +45,7 @@ device_crvision_cart_interface::~device_crvision_cart_interface() // rom_alloc - alloc the space for the cart //------------------------------------------------- -void device_crvision_cart_interface::rom_alloc(UINT32 size, const char *tag) +void device_crvision_cart_interface::rom_alloc(UINT32 size, std::string tag) { if (m_rom == nullptr) { @@ -62,7 +62,7 @@ void device_crvision_cart_interface::rom_alloc(UINT32 size, const char *tag) //------------------------------------------------- // crvision_cart_slot_device - constructor //------------------------------------------------- -crvision_cart_slot_device::crvision_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +crvision_cart_slot_device::crvision_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CRVISION_CART_SLOT, "CreatiVision Cartridge Slot", tag, owner, clock, "crvision_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), diff --git a/src/devices/bus/crvision/slot.h b/src/devices/bus/crvision/slot.h index d3bb02d6790..d69db100645 100644 --- a/src/devices/bus/crvision/slot.h +++ b/src/devices/bus/crvision/slot.h @@ -34,7 +34,7 @@ public: virtual DECLARE_READ8_MEMBER(read_rom40) { return 0xff; } virtual DECLARE_READ8_MEMBER(read_rom80) { return 0xff; } - void rom_alloc(UINT32 size, const char *tag); + void rom_alloc(UINT32 size, std::string tag); UINT8* get_rom_base() { return m_rom; } UINT32 get_rom_size() { return m_rom_size; } @@ -53,7 +53,7 @@ class crvision_cart_slot_device : public device_t, { public: // construction/destruction - crvision_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + crvision_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~crvision_cart_slot_device(); // device-level overrides diff --git a/src/devices/bus/dmv/dmvbus.cpp b/src/devices/bus/dmv/dmvbus.cpp index ab1b079405d..8c545dc397c 100644 --- a/src/devices/bus/dmv/dmvbus.cpp +++ b/src/devices/bus/dmv/dmvbus.cpp @@ -194,7 +194,7 @@ device_dmvslot_interface::~device_dmvslot_interface() //------------------------------------------------- // dmvcart_slot_device - constructor //------------------------------------------------- -dmvcart_slot_device::dmvcart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +dmvcart_slot_device::dmvcart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, DMVCART_SLOT, "Decision Mate V cartridge slot", tag, owner, clock, "dmvcart_slot", __FILE__), device_slot_interface(mconfig, *this), m_prog_read_cb(*this), diff --git a/src/devices/bus/dmv/dmvbus.h b/src/devices/bus/dmv/dmvbus.h index da7f8f68d35..89f02e424c6 100644 --- a/src/devices/bus/dmv/dmvbus.h +++ b/src/devices/bus/dmv/dmvbus.h @@ -55,7 +55,7 @@ class dmvcart_slot_device : public device_t, { public: // construction/destruction - dmvcart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + dmvcart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~dmvcart_slot_device(); template<class _Object> static devcb_base &set_prog_read_callback(device_t &device, _Object object) { return downcast<dmvcart_slot_device &>(device).m_prog_read_cb.set_callback(object); } diff --git a/src/devices/bus/dmv/k210.cpp b/src/devices/bus/dmv/k210.cpp index 0a49a824df0..eb37e5709da 100644 --- a/src/devices/bus/dmv/k210.cpp +++ b/src/devices/bus/dmv/k210.cpp @@ -51,7 +51,7 @@ const device_type DMV_K210 = &device_creator<dmv_k210_device>; // dmv_k210_device - constructor //------------------------------------------------- -dmv_k210_device::dmv_k210_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +dmv_k210_device::dmv_k210_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, DMV_K210, "K210 Centronics", tag, owner, clock, "dmv_k210", __FILE__), device_dmvslot_interface( mconfig, *this ), m_ppi(*this, "ppi8255"), diff --git a/src/devices/bus/dmv/k210.h b/src/devices/bus/dmv/k210.h index 1939c5c051e..c96801106d1 100644 --- a/src/devices/bus/dmv/k210.h +++ b/src/devices/bus/dmv/k210.h @@ -22,7 +22,7 @@ class dmv_k210_device : { public: // construction/destruction - dmv_k210_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + dmv_k210_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/dmv/k220.cpp b/src/devices/bus/dmv/k220.cpp index cd1c55a39a6..ee8299bbc58 100644 --- a/src/devices/bus/dmv/k220.cpp +++ b/src/devices/bus/dmv/k220.cpp @@ -132,7 +132,7 @@ const device_type DMV_K220 = &device_creator<dmv_k220_device>; // dmv_k220_device - constructor //------------------------------------------------- -dmv_k220_device::dmv_k220_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +dmv_k220_device::dmv_k220_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, DMV_K220, "K220 diagnostic", tag, owner, clock, "dmv_k220", __FILE__), device_dmvslot_interface( mconfig, *this ), m_pit(*this, "pit8253"), diff --git a/src/devices/bus/dmv/k220.h b/src/devices/bus/dmv/k220.h index 0f405946ec6..12b1329d997 100644 --- a/src/devices/bus/dmv/k220.h +++ b/src/devices/bus/dmv/k220.h @@ -22,7 +22,7 @@ class dmv_k220_device : { public: // construction/destruction - dmv_k220_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + dmv_k220_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/dmv/k230.cpp b/src/devices/bus/dmv/k230.cpp index 5f5dd5f509d..3beccbdf7ac 100644 --- a/src/devices/bus/dmv/k230.cpp +++ b/src/devices/bus/dmv/k230.cpp @@ -106,7 +106,7 @@ const device_type DMV_K235 = &device_creator<dmv_k235_device>; // dmv_k230_device - constructor //------------------------------------------------- -dmv_k230_device::dmv_k230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +dmv_k230_device::dmv_k230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, DMV_K230, "K230 8088 without interrupt controller", tag, owner, clock, "dmv_k230", __FILE__), device_dmvslot_interface( mconfig, *this ), m_maincpu(*this, "maincpu"), @@ -114,7 +114,7 @@ dmv_k230_device::dmv_k230_device(const machine_config &mconfig, const char *tag, { } -dmv_k230_device::dmv_k230_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +dmv_k230_device::dmv_k230_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_dmvslot_interface( mconfig, *this ), m_maincpu(*this, "maincpu"), @@ -126,7 +126,7 @@ dmv_k230_device::dmv_k230_device(const machine_config &mconfig, device_type type // dmv_k231_device - constructor //------------------------------------------------- -dmv_k231_device::dmv_k231_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +dmv_k231_device::dmv_k231_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : dmv_k230_device(mconfig, DMV_K231, "K231 8088 without interrupt controller", tag, owner, clock, "dmv_k231", __FILE__) { } @@ -135,7 +135,7 @@ dmv_k231_device::dmv_k231_device(const machine_config &mconfig, const char *tag, // dmv_k234_device - constructor //------------------------------------------------- -dmv_k234_device::dmv_k234_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +dmv_k234_device::dmv_k234_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : dmv_k230_device(mconfig, DMV_K234, "K234 68008", tag, owner, clock, "dmv_k234", __FILE__), m_snr(0) { } @@ -144,7 +144,7 @@ dmv_k234_device::dmv_k234_device(const machine_config &mconfig, const char *tag, // dmv_k235_device - constructor //------------------------------------------------- -dmv_k235_device::dmv_k235_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +dmv_k235_device::dmv_k235_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : dmv_k230_device(mconfig, DMV_K235, "K235 8088 with interrupt controller", tag, owner, clock, "dmv_k235", __FILE__), m_pic(*this, "pic8259"), m_dsw(*this, "DSW") diff --git a/src/devices/bus/dmv/k230.h b/src/devices/bus/dmv/k230.h index d05d6ef8317..993e449f2aa 100644 --- a/src/devices/bus/dmv/k230.h +++ b/src/devices/bus/dmv/k230.h @@ -29,8 +29,8 @@ class dmv_k230_device : { public: // construction/destruction - dmv_k230_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - dmv_k230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + dmv_k230_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + dmv_k230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -69,7 +69,7 @@ class dmv_k231_device : { public: // construction/destruction - dmv_k231_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + dmv_k231_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -83,7 +83,7 @@ class dmv_k234_device : { public: // construction/destruction - dmv_k234_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + dmv_k234_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER(snr_r); DECLARE_WRITE8_MEMBER(snr_w); @@ -113,7 +113,7 @@ class dmv_k235_device : { public: // construction/destruction - dmv_k235_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + dmv_k235_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // optional information overrides diff --git a/src/devices/bus/dmv/k233.cpp b/src/devices/bus/dmv/k233.cpp index 8668f7ab81f..4ef0a841960 100644 --- a/src/devices/bus/dmv/k233.cpp +++ b/src/devices/bus/dmv/k233.cpp @@ -28,7 +28,7 @@ const device_type DMV_K233 = &device_creator<dmv_k233_device>; // dmv_k233_device - constructor //------------------------------------------------- -dmv_k233_device::dmv_k233_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +dmv_k233_device::dmv_k233_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, DMV_K233, "K233 16K Shared RAM", tag, owner, clock, "dmv_k233", __FILE__), device_dmvslot_interface( mconfig, *this ), m_enabled(false), diff --git a/src/devices/bus/dmv/k233.h b/src/devices/bus/dmv/k233.h index f736dee2d4a..4860b4644c6 100644 --- a/src/devices/bus/dmv/k233.h +++ b/src/devices/bus/dmv/k233.h @@ -20,7 +20,7 @@ class dmv_k233_device : { public: // construction/destruction - dmv_k233_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + dmv_k233_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/dmv/k801.cpp b/src/devices/bus/dmv/k801.cpp index 5bc586c09b5..98f1984ddf1 100644 --- a/src/devices/bus/dmv/k801.cpp +++ b/src/devices/bus/dmv/k801.cpp @@ -111,7 +111,7 @@ const device_type DMV_K213 = &device_creator<dmv_k213_device>; // dmv_k801_device - constructor //------------------------------------------------- -dmv_k801_device::dmv_k801_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +dmv_k801_device::dmv_k801_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, DMV_K801, "K801 RS-232 Switchable Interface", tag, owner, clock, "dmv_k801", __FILE__), device_dmvslot_interface( mconfig, *this ), m_epci(*this, "epci"), @@ -119,7 +119,7 @@ dmv_k801_device::dmv_k801_device(const machine_config &mconfig, const char *tag, { } -dmv_k801_device::dmv_k801_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +dmv_k801_device::dmv_k801_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_dmvslot_interface( mconfig, *this ), m_epci(*this, "epci"), @@ -131,13 +131,13 @@ dmv_k801_device::dmv_k801_device(const machine_config &mconfig, device_type type // dmv_k211_device - constructor //------------------------------------------------- -dmv_k211_device::dmv_k211_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +dmv_k211_device::dmv_k211_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : dmv_k801_device(mconfig, DMV_K211, "K211 RS-232 Communications Interface", tag, owner, clock, "dmv_k211", __FILE__) { } -dmv_k211_device::dmv_k211_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +dmv_k211_device::dmv_k211_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : dmv_k801_device(mconfig, type, name, tag, owner, clock, shortname, source) { } @@ -146,7 +146,7 @@ dmv_k211_device::dmv_k211_device(const machine_config &mconfig, device_type type // dmv_k212_device - constructor //------------------------------------------------- -dmv_k212_device::dmv_k212_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +dmv_k212_device::dmv_k212_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : dmv_k211_device(mconfig, DMV_K212, "K212 RS-232 Printer Interface", tag, owner, clock, "dmv_k212", __FILE__) { } @@ -155,7 +155,7 @@ dmv_k212_device::dmv_k212_device(const machine_config &mconfig, const char *tag, // dmv_k213_device - constructor //------------------------------------------------- -dmv_k213_device::dmv_k213_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +dmv_k213_device::dmv_k213_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : dmv_k211_device(mconfig, DMV_K213, "K213 RS-232 Plotter Interface", tag, owner, clock, "dmv_k213", __FILE__) { } diff --git a/src/devices/bus/dmv/k801.h b/src/devices/bus/dmv/k801.h index 0b67b6c5d71..9c74b5f1a84 100644 --- a/src/devices/bus/dmv/k801.h +++ b/src/devices/bus/dmv/k801.h @@ -23,8 +23,8 @@ class dmv_k801_device : { public: // construction/destruction - dmv_k801_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - dmv_k801_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + dmv_k801_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + dmv_k801_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual ioport_constructor device_input_ports() const override; @@ -55,8 +55,8 @@ class dmv_k211_device : { public: // construction/destruction - dmv_k211_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - dmv_k211_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + dmv_k211_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + dmv_k211_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual ioport_constructor device_input_ports() const override; @@ -75,7 +75,7 @@ class dmv_k212_device : { public: // construction/destruction - dmv_k212_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + dmv_k212_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; @@ -89,7 +89,7 @@ class dmv_k213_device : { public: // construction/destruction - dmv_k213_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + dmv_k213_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/dmv/k803.cpp b/src/devices/bus/dmv/k803.cpp index 00de36c9c24..83fd0cbf187 100644 --- a/src/devices/bus/dmv/k803.cpp +++ b/src/devices/bus/dmv/k803.cpp @@ -49,7 +49,7 @@ const device_type DMV_K803 = &device_creator<dmv_k803_device>; // dmv_k803_device - constructor //------------------------------------------------- -dmv_k803_device::dmv_k803_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +dmv_k803_device::dmv_k803_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, DMV_K803, "K803 RTC", tag, owner, clock, "dmv_k803", __FILE__), device_dmvslot_interface( mconfig, *this ), m_rtc(*this, "rtc"), diff --git a/src/devices/bus/dmv/k803.h b/src/devices/bus/dmv/k803.h index c6a7d70af4d..75531d3bab3 100644 --- a/src/devices/bus/dmv/k803.h +++ b/src/devices/bus/dmv/k803.h @@ -21,7 +21,7 @@ class dmv_k803_device : { public: // construction/destruction - dmv_k803_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + dmv_k803_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/dmv/k806.cpp b/src/devices/bus/dmv/k806.cpp index 9e79c9d90d6..3b671841385 100644 --- a/src/devices/bus/dmv/k806.cpp +++ b/src/devices/bus/dmv/k806.cpp @@ -75,7 +75,7 @@ const device_type DMV_K806 = &device_creator<dmv_k806_device>; // dmv_k806_device - constructor //------------------------------------------------- -dmv_k806_device::dmv_k806_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +dmv_k806_device::dmv_k806_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, DMV_K806, "K806 mouse", tag, owner, clock, "dmv_k806", __FILE__), device_dmvslot_interface( mconfig, *this ), m_mcu(*this, "mcu"), diff --git a/src/devices/bus/dmv/k806.h b/src/devices/bus/dmv/k806.h index 1c25f9b6102..0e1b2d564c9 100644 --- a/src/devices/bus/dmv/k806.h +++ b/src/devices/bus/dmv/k806.h @@ -22,7 +22,7 @@ class dmv_k806_device : { public: // construction/destruction - dmv_k806_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + dmv_k806_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/dmv/ram.cpp b/src/devices/bus/dmv/ram.cpp index b53bc26a63c..997bcd6d199 100644 --- a/src/devices/bus/dmv/ram.cpp +++ b/src/devices/bus/dmv/ram.cpp @@ -32,7 +32,7 @@ const device_type DMV_K208 = &device_creator<dmv_k208_device>; // dmv_ram_device - constructor //------------------------------------------------- -dmv_ram_device::dmv_ram_device(const machine_config &mconfig, device_type type, UINT32 size, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +dmv_ram_device::dmv_ram_device(const machine_config &mconfig, device_type type, UINT32 size, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_dmvslot_interface( mconfig, *this ), m_ram(nullptr), m_size(size) @@ -43,7 +43,7 @@ dmv_ram_device::dmv_ram_device(const machine_config &mconfig, device_type type, // dmv_k200_device - constructor //------------------------------------------------- -dmv_k200_device::dmv_k200_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +dmv_k200_device::dmv_k200_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : dmv_ram_device(mconfig, DMV_K200, 1, "K200 64K RAM expansion", tag, owner, clock, "dmv_k200", __FILE__) { } @@ -52,7 +52,7 @@ dmv_k200_device::dmv_k200_device(const machine_config &mconfig, const char *tag, // dmv_k202_device - constructor //------------------------------------------------- -dmv_k202_device::dmv_k202_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +dmv_k202_device::dmv_k202_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : dmv_ram_device(mconfig, DMV_K202, 3, "K202 192K RAM expansion", tag, owner, clock, "dmv_k202", __FILE__) { } @@ -61,7 +61,7 @@ dmv_k202_device::dmv_k202_device(const machine_config &mconfig, const char *tag, // dmv_k208_device - constructor //------------------------------------------------- -dmv_k208_device::dmv_k208_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +dmv_k208_device::dmv_k208_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : dmv_ram_device(mconfig, DMV_K208, 7 , "K208 448K RAM expansion", tag, owner, clock, "dmv_k208", __FILE__) { } diff --git a/src/devices/bus/dmv/ram.h b/src/devices/bus/dmv/ram.h index 3aceebe9165..848e2848de1 100644 --- a/src/devices/bus/dmv/ram.h +++ b/src/devices/bus/dmv/ram.h @@ -20,7 +20,7 @@ class dmv_ram_device : { public: // construction/destruction - dmv_ram_device(const machine_config &mconfig, device_type type, UINT32 size, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + dmv_ram_device(const machine_config &mconfig, device_type type, UINT32 size, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); protected: // device-level overrides @@ -41,7 +41,7 @@ class dmv_k200_device : { public: // construction/destruction - dmv_k200_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + dmv_k200_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; @@ -50,7 +50,7 @@ class dmv_k202_device : { public: // construction/destruction - dmv_k202_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + dmv_k202_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; @@ -59,7 +59,7 @@ class dmv_k208_device : { public: // construction/destruction - dmv_k208_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + dmv_k208_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/bus/ecbbus/ecbbus.cpp b/src/devices/bus/ecbbus/ecbbus.cpp index c96d49da103..0425835e1f9 100644 --- a/src/devices/bus/ecbbus/ecbbus.cpp +++ b/src/devices/bus/ecbbus/ecbbus.cpp @@ -26,9 +26,9 @@ const device_type ECBBUS_SLOT = &device_creator<ecbbus_slot_device>; // ecbbus_slot_device - constructor //------------------------------------------------- -ecbbus_slot_device::ecbbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +ecbbus_slot_device::ecbbus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ECBBUS_SLOT, "ECB bus slot", tag, owner, clock, "ecbbus_slot", __FILE__), - device_slot_interface(mconfig, *this), m_bus_tag(nullptr), m_bus_num(0), m_bus(nullptr) + device_slot_interface(mconfig, *this), m_bus_num(0), m_bus(nullptr) { } @@ -37,7 +37,7 @@ ecbbus_slot_device::ecbbus_slot_device(const machine_config &mconfig, const char // static_set_ecbbus_slot - //------------------------------------------------- -void ecbbus_slot_device::static_set_ecbbus_slot(device_t &device, const char *tag, int num) +void ecbbus_slot_device::static_set_ecbbus_slot(device_t &device, std::string tag, int num) { ecbbus_slot_device &ecbbus_card = dynamic_cast<ecbbus_slot_device &>(device); ecbbus_card.m_bus_tag = tag; @@ -90,7 +90,7 @@ device_ecbbus_card_interface::device_ecbbus_card_interface(const machine_config // ecbbus_device - constructor //------------------------------------------------- -ecbbus_device::ecbbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +ecbbus_device::ecbbus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ECBBUS, "ECB bus", tag, owner, clock, "ecbbus", __FILE__), m_write_irq(*this), m_write_nmi(*this) diff --git a/src/devices/bus/ecbbus/ecbbus.h b/src/devices/bus/ecbbus/ecbbus.h index 90bb67bced9..478de6871b0 100644 --- a/src/devices/bus/ecbbus/ecbbus.h +++ b/src/devices/bus/ecbbus/ecbbus.h @@ -94,17 +94,17 @@ class ecbbus_slot_device : public device_t, { public: // construction/destruction - ecbbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ecbbus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; // inline configuration - static void static_set_ecbbus_slot(device_t &device, const char *tag, int num); + static void static_set_ecbbus_slot(device_t &device, std::string tag, int num); private: // configuration - const char *m_bus_tag; + std::string m_bus_tag; int m_bus_num; ecbbus_device *m_bus; }; @@ -125,7 +125,7 @@ class ecbbus_device : public device_t { public: // construction/destruction - ecbbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ecbbus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<ecbbus_device &>(device).m_write_irq.set_callback(object); } template<class _Object> static devcb_base &set_nmi_wr_callback(device_t &device, _Object object) { return downcast<ecbbus_device &>(device).m_write_nmi.set_callback(object); } diff --git a/src/devices/bus/ecbbus/grip.cpp b/src/devices/bus/ecbbus/grip.cpp index 75ba3961754..baab230eb08 100644 --- a/src/devices/bus/ecbbus/grip.cpp +++ b/src/devices/bus/ecbbus/grip.cpp @@ -613,7 +613,7 @@ ioport_constructor grip_device::device_input_ports() const // grip_device - constructor //------------------------------------------------- -grip_device::grip_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +grip_device::grip_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ECB_GRIP21, "GRIP-2.1", tag, owner, clock, "grip", __FILE__), device_ecbbus_card_interface(mconfig, *this), m_ppi(*this, I8255A_TAG), diff --git a/src/devices/bus/ecbbus/grip.h b/src/devices/bus/ecbbus/grip.h index 7f7abe6d0a1..1c3561fb316 100644 --- a/src/devices/bus/ecbbus/grip.h +++ b/src/devices/bus/ecbbus/grip.h @@ -35,7 +35,7 @@ class grip_device : public device_t, { public: // construction/destruction - grip_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + grip_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/econet/e01.cpp b/src/devices/bus/econet/e01.cpp index ed60ccc2d28..71da0802380 100644 --- a/src/devices/bus/econet/e01.cpp +++ b/src/devices/bus/econet/e01.cpp @@ -77,7 +77,7 @@ const device_type E01 = &device_creator<e01_device>; const device_type E01S = &device_creator<e01s_device>; -e01s_device::e01s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +e01s_device::e01s_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :e01_device(mconfig, E01S, "Acorn FileStore E01S", tag, owner, clock, "e01s", __FILE__) { m_variant = TYPE_E01S; } @@ -372,7 +372,7 @@ inline void e01_device::hdc_irq_enable(int enabled) // e01_device - constructor //------------------------------------------------- -e01_device::e01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +e01_device::e01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, E01, "Acorn FileStore E01", tag, owner, clock, "e01" , __FILE__), device_econet_interface(mconfig, *this), m_maincpu(*this, R65C102_TAG), @@ -402,7 +402,7 @@ e01_device::e01_device(const machine_config &mconfig, const char *tag, device_t } -e01_device::e01_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +e01_device::e01_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_econet_interface(mconfig, *this), m_maincpu(*this, R65C102_TAG), diff --git a/src/devices/bus/econet/e01.h b/src/devices/bus/econet/e01.h index e83b9a0b6bd..ef3d1fcb4bd 100644 --- a/src/devices/bus/econet/e01.h +++ b/src/devices/bus/econet/e01.h @@ -28,8 +28,8 @@ class e01_device : public device_t, { public: // construction/destruction - e01_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - e01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + e01_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + e01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); enum { @@ -121,7 +121,7 @@ class e01s_device : public e01_device { public: // construction/destruction - e01s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + e01s_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/bus/econet/econet.cpp b/src/devices/bus/econet/econet.cpp index e56d843db32..cd5615b1d10 100644 --- a/src/devices/bus/econet/econet.cpp +++ b/src/devices/bus/econet/econet.cpp @@ -53,7 +53,7 @@ device_econet_interface::device_econet_interface(const machine_config &mconfig, // econet_slot_device - constructor //------------------------------------------------- -econet_slot_device::econet_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +econet_slot_device::econet_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ECONET_SLOT, "Econet station", tag, owner, clock, "econet_slot", __FILE__), device_slot_interface(mconfig, *this), m_address(0), m_econet(nullptr) { @@ -100,7 +100,7 @@ inline void econet_device::set_signal(device_t *device, int signal, int state) { if (m_line[signal] != state) { - if (LOG) logerror("Econet: '%s' %s %u\n", tag(), SIGNAL_NAME[signal], state); + if (LOG) logerror("Econet: '%s' %s %u\n", tag().c_str(), SIGNAL_NAME[signal], state); m_line[signal] = state; changed = true; } @@ -111,11 +111,11 @@ inline void econet_device::set_signal(device_t *device, int signal, int state) while (entry) { - if (!strcmp(entry->m_device->tag(), device->tag())) + if (entry->m_device->tag() == device->tag()) { if (entry->m_line[signal] != state) { - if (LOG) logerror("Econet: '%s' %s %u\n", device->tag(), SIGNAL_NAME[signal], state); + if (LOG) logerror("Econet: '%s' %s %u\n", device->tag().c_str(), SIGNAL_NAME[signal], state); entry->m_line[signal] = state; changed = true; } @@ -193,7 +193,7 @@ inline int econet_device::get_signal(int signal) // econet_device - constructor //------------------------------------------------- -econet_device::econet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +econet_device::econet_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ECONET, "Econet", tag, owner, clock, "econet", __FILE__), m_write_clk(*this), m_write_data(*this) diff --git a/src/devices/bus/econet/econet.h b/src/devices/bus/econet/econet.h index e37cf989696..625baa35358 100644 --- a/src/devices/bus/econet/econet.h +++ b/src/devices/bus/econet/econet.h @@ -56,7 +56,7 @@ class econet_device : public device_t { public: // construction/destruction - econet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + econet_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template<class _Object> static devcb_base &set_clk_wr_callback(device_t &device, _Object object) { return downcast<econet_device &>(device).m_write_clk.set_callback(object); } template<class _Object> static devcb_base &set_data_wr_callback(device_t &device, _Object object) { return downcast<econet_device &>(device).m_write_data.set_callback(object); } @@ -116,7 +116,7 @@ class econet_slot_device : public device_t, { public: // construction/destruction - econet_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + econet_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/ep64/exdos.cpp b/src/devices/bus/ep64/exdos.cpp index d5910c07ee3..9fd7d6b6754 100644 --- a/src/devices/bus/ep64/exdos.cpp +++ b/src/devices/bus/ep64/exdos.cpp @@ -131,7 +131,7 @@ machine_config_constructor ep64_exdos_device::device_mconfig_additions() const // ep64_exdos_device - constructor //------------------------------------------------- -ep64_exdos_device::ep64_exdos_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +ep64_exdos_device::ep64_exdos_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, EP64_EXDOS, "EXDOS", tag, owner, clock, "ep64_exdos", __FILE__), device_ep64_expansion_bus_card_interface(mconfig, *this), m_fdc(*this, WD1770_TAG), diff --git a/src/devices/bus/ep64/exdos.h b/src/devices/bus/ep64/exdos.h index dac02daa1b4..80658598bb9 100644 --- a/src/devices/bus/ep64/exdos.h +++ b/src/devices/bus/ep64/exdos.h @@ -29,7 +29,7 @@ class ep64_exdos_device : public device_t, { public: // construction/destruction - ep64_exdos_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ep64_exdos_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/ep64/exp.cpp b/src/devices/bus/ep64/exp.cpp index 8f9ef82fd19..85bd3e67651 100644 --- a/src/devices/bus/ep64/exp.cpp +++ b/src/devices/bus/ep64/exp.cpp @@ -42,7 +42,7 @@ device_ep64_expansion_bus_card_interface::device_ep64_expansion_bus_card_interfa // ep64_expansion_bus_slot_device - constructor //------------------------------------------------- -ep64_expansion_bus_slot_device::ep64_expansion_bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +ep64_expansion_bus_slot_device::ep64_expansion_bus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, EP64_EXPANSION_BUS_SLOT, "Enterprise Sixty Four expansion bus slot", tag, owner, clock, "ep64_expansion_bus_slot", __FILE__), device_slot_interface(mconfig, *this), m_write_irq(*this), diff --git a/src/devices/bus/ep64/exp.h b/src/devices/bus/ep64/exp.h index a80f05b76f9..ff2aa946d70 100644 --- a/src/devices/bus/ep64/exp.h +++ b/src/devices/bus/ep64/exp.h @@ -97,9 +97,9 @@ class ep64_expansion_bus_slot_device : public device_t, public: // construction/destruction - ep64_expansion_bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ep64_expansion_bus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - static void static_set_dave_tag(device_t &device, const char* tag) { downcast<ep64_expansion_bus_slot_device &>(device).m_dave.set_tag(tag); } + static void static_set_dave_tag(device_t &device, std::string tag) { downcast<ep64_expansion_bus_slot_device &>(device).m_dave.set_tag(tag); } template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<ep64_expansion_bus_slot_device &>(device).m_write_irq.set_callback(object); } template<class _Object> static devcb_base &set_nmi_wr_callback(device_t &device, _Object object) { return downcast<ep64_expansion_bus_slot_device &>(device).m_write_nmi.set_callback(object); } template<class _Object> static devcb_base &set_wait_wr_callback(device_t &device, _Object object) { return downcast<ep64_expansion_bus_slot_device &>(device).m_write_wait.set_callback(object); } diff --git a/src/devices/bus/epson_sio/epson_sio.cpp b/src/devices/bus/epson_sio/epson_sio.cpp index 88e50bb9cdc..c0608102709 100644 --- a/src/devices/bus/epson_sio/epson_sio.cpp +++ b/src/devices/bus/epson_sio/epson_sio.cpp @@ -52,7 +52,7 @@ device_epson_sio_interface::~device_epson_sio_interface() // epson_sio_device - constructor //------------------------------------------------- -epson_sio_device::epson_sio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +epson_sio_device::epson_sio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, EPSON_SIO, "EPSON SIO port", tag, owner, clock, "epson_sio", __FILE__), device_slot_interface(mconfig, *this), m_cart(nullptr), m_write_rx(*this), diff --git a/src/devices/bus/epson_sio/epson_sio.h b/src/devices/bus/epson_sio/epson_sio.h index c59b3d6ddc1..c856e101c1c 100644 --- a/src/devices/bus/epson_sio/epson_sio.h +++ b/src/devices/bus/epson_sio/epson_sio.h @@ -41,7 +41,7 @@ class epson_sio_device : public device_t, { public: // construction/destruction - epson_sio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + epson_sio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~epson_sio_device(); // callbacks diff --git a/src/devices/bus/epson_sio/pf10.cpp b/src/devices/bus/epson_sio/pf10.cpp index 7096aee3fce..7f2799c7b0a 100644 --- a/src/devices/bus/epson_sio/pf10.cpp +++ b/src/devices/bus/epson_sio/pf10.cpp @@ -91,7 +91,7 @@ machine_config_constructor epson_pf10_device::device_mconfig_additions() const // epson_pf10_device - constructor //------------------------------------------------- -epson_pf10_device::epson_pf10_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +epson_pf10_device::epson_pf10_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, EPSON_PF10, "EPSON PF-10 Portable Floppy Unit", tag, owner, clock, "epson_pf10", __FILE__), device_epson_sio_interface(mconfig, *this), m_cpu(*this, "maincpu"), @@ -145,41 +145,41 @@ void epson_pf10_device::device_timer(emu_timer &timer, device_timer_id id, int p READ8_MEMBER( epson_pf10_device::port1_r ) { - logerror("%s: port1_r(%02x)\n", tag(), m_port1); + logerror("%s: port1_r(%02x)\n", tag().c_str(), m_port1); return m_port1; } WRITE8_MEMBER( epson_pf10_device::port1_w ) { - logerror("%s: port1_w(%02x)\n", tag(), data); + logerror("%s: port1_w(%02x)\n", tag().c_str(), data); } READ8_MEMBER( epson_pf10_device::port2_r ) { - logerror("%s: port2_r(%02x)\n", tag(), m_port2); + logerror("%s: port2_r(%02x)\n", tag().c_str(), m_port2); return m_port2; } WRITE8_MEMBER( epson_pf10_device::port2_w ) { m_floppy->mon_w(data & PORT2_MON); - logerror("%s: port2_w(%02x)\n", tag(), data); + logerror("%s: port2_w(%02x)\n", tag().c_str(), data); } READ8_MEMBER( epson_pf10_device::fdc_r ) { - logerror("%s: fdc_r @ %04x\n", tag(), offset); + logerror("%s: fdc_r @ %04x\n", tag().c_str(), offset); return 0xff; } WRITE8_MEMBER( epson_pf10_device::fdc_w ) { - logerror("%s: fdc_w @ %04x (%02x)\n", tag(), offset, data); + logerror("%s: fdc_w @ %04x (%02x)\n", tag().c_str(), offset, data); } WRITE8_MEMBER( epson_pf10_device::fdc_tc_w ) { - logerror("%s: fdc_tc_w(%02x)\n", tag(), data); + logerror("%s: fdc_tc_w(%02x)\n", tag().c_str(), data); } diff --git a/src/devices/bus/epson_sio/pf10.h b/src/devices/bus/epson_sio/pf10.h index 4a648bbd997..9907ab82dfa 100644 --- a/src/devices/bus/epson_sio/pf10.h +++ b/src/devices/bus/epson_sio/pf10.h @@ -28,7 +28,7 @@ class epson_pf10_device : public device_t, { public: // construction/destruction - epson_pf10_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + epson_pf10_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/epson_sio/tf20.cpp b/src/devices/bus/epson_sio/tf20.cpp index 07fdf31e858..bec456149cc 100644 --- a/src/devices/bus/epson_sio/tf20.cpp +++ b/src/devices/bus/epson_sio/tf20.cpp @@ -126,7 +126,7 @@ machine_config_constructor epson_tf20_device::device_mconfig_additions() const // epson_tf20_device - constructor //------------------------------------------------- -epson_tf20_device::epson_tf20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +epson_tf20_device::epson_tf20_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, EPSON_TF20, "EPSON TF-20 Dual Floppy Disk Drive", tag, owner, clock, "epson_tf20", __FILE__), device_epson_sio_interface(mconfig, *this), m_cpu(*this, "19b"), @@ -197,7 +197,7 @@ void epson_tf20_device::device_timer(emu_timer &timer, device_timer_id id, int p break; case 1: - logerror("%s: tc off\n", tag()); + logerror("%s: tc off\n", tag().c_str()); m_fdc->tc_w(false); break; } diff --git a/src/devices/bus/epson_sio/tf20.h b/src/devices/bus/epson_sio/tf20.h index 3e76b3dab27..8172cf91b6d 100644 --- a/src/devices/bus/epson_sio/tf20.h +++ b/src/devices/bus/epson_sio/tf20.h @@ -30,7 +30,7 @@ class epson_tf20_device : public device_t, { public: // construction/destruction - epson_tf20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + epson_tf20_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/gameboy/gb_slot.cpp b/src/devices/bus/gameboy/gb_slot.cpp index 55555a8d4b2..9130f4ddd29 100644 --- a/src/devices/bus/gameboy/gb_slot.cpp +++ b/src/devices/bus/gameboy/gb_slot.cpp @@ -59,7 +59,7 @@ device_gb_cart_interface::~device_gb_cart_interface() // rom_alloc - alloc the space for the cart //------------------------------------------------- -void device_gb_cart_interface::rom_alloc(UINT32 size, const char *tag) +void device_gb_cart_interface::rom_alloc(UINT32 size, std::string tag) { if (m_rom == nullptr) { @@ -137,7 +137,7 @@ void device_gb_cart_interface::ram_map_setup(UINT8 banks) //------------------------------------------------- // base_gb_cart_slot_device - constructor //------------------------------------------------- -base_gb_cart_slot_device::base_gb_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +base_gb_cart_slot_device::base_gb_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), @@ -146,12 +146,12 @@ base_gb_cart_slot_device::base_gb_cart_slot_device(const machine_config &mconfig { } -gb_cart_slot_device::gb_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +gb_cart_slot_device::gb_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : base_gb_cart_slot_device(mconfig, GB_CART_SLOT, "Game Boy Cartridge Slot", tag, owner, clock, "gb_cart_slot", __FILE__) { } -megaduck_cart_slot_device::megaduck_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +megaduck_cart_slot_device::megaduck_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : base_gb_cart_slot_device(mconfig, MEGADUCK_CART_SLOT, "Megaduck Cartridge Slot", tag, owner, clock, "megaduck_cart_slot", __FILE__) { } diff --git a/src/devices/bus/gameboy/gb_slot.h b/src/devices/bus/gameboy/gb_slot.h index a0108ec03c7..3f6109e7d2d 100644 --- a/src/devices/bus/gameboy/gb_slot.h +++ b/src/devices/bus/gameboy/gb_slot.h @@ -61,7 +61,7 @@ public: virtual DECLARE_READ8_MEMBER(read_ram) { return 0xff; } virtual DECLARE_WRITE8_MEMBER(write_ram) {} - void rom_alloc(UINT32 size, const char *tag); + void rom_alloc(UINT32 size, std::string tag); void ram_alloc(UINT32 size); UINT8* get_rom_base() { return m_rom; } UINT8* get_ram_base() { return &m_ram[0]; } @@ -108,7 +108,7 @@ class base_gb_cart_slot_device : public device_t, { public: // construction/destruction - base_gb_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + base_gb_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); virtual ~base_gb_cart_slot_device(); // device-level overrides @@ -164,7 +164,7 @@ class gb_cart_slot_device : public base_gb_cart_slot_device { public: // construction/destruction - gb_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gb_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; @@ -174,7 +174,7 @@ class megaduck_cart_slot_device : public base_gb_cart_slot_device { public: // construction/destruction - megaduck_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + megaduck_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // image-level overrides virtual bool call_load() override; diff --git a/src/devices/bus/gameboy/mbc.cpp b/src/devices/bus/gameboy/mbc.cpp index cfac868834f..3526d4658a2 100644 --- a/src/devices/bus/gameboy/mbc.cpp +++ b/src/devices/bus/gameboy/mbc.cpp @@ -37,112 +37,112 @@ const device_type GB_ROM_ROCKMAN8 = &device_creator<gb_rom_rockman8_device>; const device_type GB_ROM_SM3SP = &device_creator<gb_rom_sm3sp_device>; -gb_rom_mbc_device::gb_rom_mbc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +gb_rom_mbc_device::gb_rom_mbc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_gb_cart_interface( mconfig, *this ), m_ram_enable(0) { } -gb_rom_mbc1_device::gb_rom_mbc1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +gb_rom_mbc1_device::gb_rom_mbc1_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : gb_rom_mbc_device(mconfig, type, name, tag, owner, clock, shortname, source), m_mode(0), m_mask(0x1f), m_shift(0) { } -gb_rom_mbc1_device::gb_rom_mbc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +gb_rom_mbc1_device::gb_rom_mbc1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : gb_rom_mbc_device(mconfig, GB_ROM_MBC1, "GB MBC1 Carts", tag, owner, clock, "gb_rom_mbc1", __FILE__), m_mode(0), m_mask(0x1f), m_shift(0) { } -gb_rom_mbc2_device::gb_rom_mbc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +gb_rom_mbc2_device::gb_rom_mbc2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : gb_rom_mbc_device(mconfig, GB_ROM_MBC2, "GB MBC2 Carts", tag, owner, clock, "gb_rom_mbc2", __FILE__) { } -gb_rom_mbc3_device::gb_rom_mbc3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +gb_rom_mbc3_device::gb_rom_mbc3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : gb_rom_mbc_device(mconfig, GB_ROM_MBC3, "GB MBC3 Carts", tag, owner, clock, "gb_rom_mbc3", __FILE__) { } -gb_rom_mbc5_device::gb_rom_mbc5_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +gb_rom_mbc5_device::gb_rom_mbc5_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : gb_rom_mbc_device(mconfig, type, name, tag, owner, clock, shortname, source) { } -gb_rom_mbc5_device::gb_rom_mbc5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +gb_rom_mbc5_device::gb_rom_mbc5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : gb_rom_mbc_device(mconfig, GB_ROM_MBC5, "GB MBC5 Carts", tag, owner, clock, "gb_rom_mbc5", __FILE__) { } -gb_rom_mbc6_device::gb_rom_mbc6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +gb_rom_mbc6_device::gb_rom_mbc6_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : gb_rom_mbc_device(mconfig, GB_ROM_MBC6, "GB MBC6 Carts", tag, owner, clock, "gb_rom_mbc6", __FILE__), m_latch1(0), m_latch2(0), m_bank_4000(0), m_bank_6000(0) { } -gb_rom_mbc7_device::gb_rom_mbc7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +gb_rom_mbc7_device::gb_rom_mbc7_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : gb_rom_mbc_device(mconfig, GB_ROM_MBC7, "GB MBC7 Carts", tag, owner, clock, "gb_rom_mbc7", __FILE__) { } -gb_rom_m161_device::gb_rom_m161_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +gb_rom_m161_device::gb_rom_m161_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : gb_rom_mbc_device(mconfig, GB_ROM_M161_M12, "GB M161-M12 Carts", tag, owner, clock, "gb_rom_m161m12", __FILE__), m_base_bank(0) { } -gb_rom_mmm01_device::gb_rom_mmm01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +gb_rom_mmm01_device::gb_rom_mmm01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : gb_rom_mbc_device(mconfig, GB_ROM_MMM01, "GB MMM01 Carts", tag, owner, clock, "gb_rom_mmm01", __FILE__), m_bank_mask(0), m_bank(0), m_reg(0) { } -gb_rom_sachen_mmc1_device::gb_rom_sachen_mmc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +gb_rom_sachen_mmc1_device::gb_rom_sachen_mmc1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : gb_rom_mbc_device(mconfig, GB_ROM_SACHEN1, "GB Sachen MMC1 Carts", tag, owner, clock, "gb_rom_sachen1", __FILE__), m_base_bank(0), m_mask(0), m_mode(0), m_unlock_cnt(0) { } -gb_rom_sachen_mmc1_device::gb_rom_sachen_mmc1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +gb_rom_sachen_mmc1_device::gb_rom_sachen_mmc1_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : gb_rom_mbc_device(mconfig, type, name, tag, owner, clock, shortname, source), m_base_bank(0), m_mask(0), m_mode(0), m_unlock_cnt(0) { } -gb_rom_sachen_mmc2_device::gb_rom_sachen_mmc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +gb_rom_sachen_mmc2_device::gb_rom_sachen_mmc2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : gb_rom_sachen_mmc1_device(mconfig, GB_ROM_SACHEN2, "GB Sachen MMC2 Carts", tag, owner, clock, "gb_rom_sachen2", __FILE__) { } -gb_rom_188in1_device::gb_rom_188in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +gb_rom_188in1_device::gb_rom_188in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : gb_rom_mbc1_device(mconfig, GB_ROM_188IN1, "GB 188in1", tag, owner, clock, "gb_rom_188in1", __FILE__), m_game_base(0) { } -gb_rom_sintax_device::gb_rom_sintax_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +gb_rom_sintax_device::gb_rom_sintax_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : gb_rom_mbc_device(mconfig, GB_ROM_SINTAX, "GB MBC5 Sintax Carts", tag, owner, clock, "gb_rom_sintax", __FILE__), m_bank_mask(0), m_bank(0), m_reg(0), m_currentxor(0), m_xor2(0), m_xor3(0), m_xor4(0), m_xor5(0), m_sintax_mode(0) { } -gb_rom_chongwu_device::gb_rom_chongwu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +gb_rom_chongwu_device::gb_rom_chongwu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : gb_rom_mbc5_device(mconfig, GB_ROM_CHONGWU, "GB Chong Wu Xiao Jing Ling", tag, owner, clock, "gb_rom_chongwu", __FILE__), m_protection_checked(0) { } -gb_rom_licheng_device::gb_rom_licheng_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +gb_rom_licheng_device::gb_rom_licheng_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : gb_rom_mbc5_device(mconfig, GB_ROM_LICHENG, "GB MBC5 Li Cheng Carts", tag, owner, clock, "gb_rom_licheng", __FILE__) { } -gb_rom_digimon_device::gb_rom_digimon_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +gb_rom_digimon_device::gb_rom_digimon_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : gb_rom_mbc5_device(mconfig, GB_ROM_DIGIMON, "GB Digimon", tag, owner, clock, "gb_rom_digimon", __FILE__) { } -gb_rom_rockman8_device::gb_rom_rockman8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +gb_rom_rockman8_device::gb_rom_rockman8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : gb_rom_mbc_device(mconfig, GB_ROM_ROCKMAN8, "GB MBC1 Rockman 8", tag, owner, clock, "gb_rom_rockman8", __FILE__), m_bank_mask(0), m_bank(0), m_reg(0) { } -gb_rom_sm3sp_device::gb_rom_sm3sp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +gb_rom_sm3sp_device::gb_rom_sm3sp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : gb_rom_mbc_device(mconfig, GB_ROM_SM3SP, "GB MBC1 Super Mario 3 Special", tag, owner, clock, "gb_rom_sm3sp", __FILE__), m_bank_mask(0), m_bank(0), m_reg(0), m_mode(0) { } diff --git a/src/devices/bus/gameboy/mbc.h b/src/devices/bus/gameboy/mbc.h index f1041e4541f..b1d52c865e9 100644 --- a/src/devices/bus/gameboy/mbc.h +++ b/src/devices/bus/gameboy/mbc.h @@ -13,7 +13,7 @@ class gb_rom_mbc_device : public device_t, { public: // construction/destruction - gb_rom_mbc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + gb_rom_mbc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides virtual void device_start() override { shared_start(); }; @@ -42,8 +42,8 @@ public: }; // construction/destruction - gb_rom_mbc1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - gb_rom_mbc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gb_rom_mbc1_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + gb_rom_mbc1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override { shared_start(); save_item(NAME(m_mode)); }; @@ -65,7 +65,7 @@ class gb_rom_mbc2_device : public gb_rom_mbc_device { public: // construction/destruction - gb_rom_mbc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gb_rom_mbc2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override { shared_start(); }; @@ -83,7 +83,7 @@ class gb_rom_mbc3_device : public gb_rom_mbc_device { public: // construction/destruction - gb_rom_mbc3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gb_rom_mbc3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -102,8 +102,8 @@ class gb_rom_mbc5_device : public gb_rom_mbc_device { public: // construction/destruction - gb_rom_mbc5_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - gb_rom_mbc5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gb_rom_mbc5_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + gb_rom_mbc5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override { shared_start(); }; @@ -121,7 +121,7 @@ class gb_rom_mbc6_device : public gb_rom_mbc_device { public: // construction/destruction - gb_rom_mbc6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gb_rom_mbc6_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -141,7 +141,7 @@ class gb_rom_mbc7_device : public gb_rom_mbc_device { public: // construction/destruction - gb_rom_mbc7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gb_rom_mbc7_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override { shared_start(); }; @@ -160,7 +160,7 @@ class gb_rom_m161_device : public gb_rom_mbc_device public: // construction/destruction - gb_rom_m161_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gb_rom_m161_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -179,7 +179,7 @@ class gb_rom_mmm01_device : public gb_rom_mbc_device { public: // construction/destruction - gb_rom_mmm01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gb_rom_mmm01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -203,8 +203,8 @@ public: }; // construction/destruction - gb_rom_sachen_mmc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - gb_rom_sachen_mmc1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + gb_rom_sachen_mmc1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + gb_rom_sachen_mmc1_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides virtual void device_start() override; @@ -231,7 +231,7 @@ public: }; // construction/destruction - gb_rom_sachen_mmc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gb_rom_sachen_mmc2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -248,7 +248,7 @@ class gb_rom_188in1_device : public gb_rom_mbc1_device { public: // construction/destruction - gb_rom_188in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gb_rom_188in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override { shared_start(); save_item(NAME(m_game_base)); }; @@ -267,7 +267,7 @@ class gb_rom_sintax_device : public gb_rom_mbc_device { public: // construction/destruction - gb_rom_sintax_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gb_rom_sintax_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -290,7 +290,7 @@ class gb_rom_chongwu_device : public gb_rom_mbc5_device { public: // construction/destruction - gb_rom_chongwu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gb_rom_chongwu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -306,7 +306,7 @@ class gb_rom_licheng_device : public gb_rom_mbc5_device { public: // construction/destruction - gb_rom_licheng_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gb_rom_licheng_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual DECLARE_WRITE8_MEMBER(write_bank) override; }; @@ -317,7 +317,7 @@ class gb_rom_digimon_device : public gb_rom_mbc5_device { public: // construction/destruction - gb_rom_digimon_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gb_rom_digimon_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override { shared_start(); }; @@ -334,7 +334,7 @@ class gb_rom_rockman8_device : public gb_rom_mbc_device { public: // construction/destruction - gb_rom_rockman8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gb_rom_rockman8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override { shared_start(); }; @@ -353,7 +353,7 @@ class gb_rom_sm3sp_device : public gb_rom_mbc_device { public: // construction/destruction - gb_rom_sm3sp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gb_rom_sm3sp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override { shared_start(); }; diff --git a/src/devices/bus/gameboy/rom.cpp b/src/devices/bus/gameboy/rom.cpp index ff10094c3d0..130d16b52dc 100644 --- a/src/devices/bus/gameboy/rom.cpp +++ b/src/devices/bus/gameboy/rom.cpp @@ -29,51 +29,51 @@ const device_type GB_ROM_LASAMA = &device_creator<gb_rom_lasama_device>; const device_type MEGADUCK_ROM = &device_creator<megaduck_rom_device>; -gb_rom_device::gb_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +gb_rom_device::gb_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_gb_cart_interface( mconfig, *this ) { } -gb_rom_device::gb_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +gb_rom_device::gb_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, GB_STD_ROM, "GB Carts", tag, owner, clock, "gb_rom", __FILE__), device_gb_cart_interface( mconfig, *this ) { } -gb_rom_tama5_device::gb_rom_tama5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +gb_rom_tama5_device::gb_rom_tama5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : gb_rom_device(mconfig, GB_ROM_TAMA5, "GB Tamagotchi", tag, owner, clock, "gb_rom_tama5", __FILE__), m_tama5_data(0), m_tama5_addr(0), m_tama5_cmd(0), m_rtc_reg(0) { } -gb_rom_wisdom_device::gb_rom_wisdom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +gb_rom_wisdom_device::gb_rom_wisdom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : gb_rom_device(mconfig, GB_ROM_WISDOM, "GB Wisdom Tree Carts", tag, owner, clock, "gb_rom_wisdom", __FILE__) { } -gb_rom_yong_device::gb_rom_yong_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +gb_rom_yong_device::gb_rom_yong_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : gb_rom_device(mconfig, GB_ROM_YONG, "GB Yong Yong Carts", tag, owner, clock, "gb_rom_yong", __FILE__) { } -gb_rom_atvrac_device::gb_rom_atvrac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +gb_rom_atvrac_device::gb_rom_atvrac_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : gb_rom_device(mconfig, GB_ROM_ATVRAC, "GB ATV Racin'", tag, owner, clock, "gb_rom_atvrac", __FILE__) { } -gb_rom_lasama_device::gb_rom_lasama_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +gb_rom_lasama_device::gb_rom_lasama_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : gb_rom_device(mconfig, GB_ROM_LASAMA, "GB LaSaMa", tag, owner, clock, "gb_rom_lasama", __FILE__) { } -megaduck_rom_device::megaduck_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +megaduck_rom_device::megaduck_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_gb_cart_interface( mconfig, *this ) { } -megaduck_rom_device::megaduck_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +megaduck_rom_device::megaduck_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MEGADUCK_ROM, "MegaDuck Carts", tag, owner, clock, "megaduck_rom", __FILE__), device_gb_cart_interface( mconfig, *this ) { diff --git a/src/devices/bus/gameboy/rom.h b/src/devices/bus/gameboy/rom.h index 343d30195b0..9e0932ad2fb 100644 --- a/src/devices/bus/gameboy/rom.h +++ b/src/devices/bus/gameboy/rom.h @@ -13,8 +13,8 @@ class gb_rom_device : public device_t, { public: // construction/destruction - gb_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - gb_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gb_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + gb_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override { shared_start(); }; @@ -34,7 +34,7 @@ class gb_rom_tama5_device : public gb_rom_device { public: // construction/destruction - gb_rom_tama5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gb_rom_tama5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -55,7 +55,7 @@ class gb_rom_wisdom_device : public gb_rom_device { public: // construction/destruction - gb_rom_wisdom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gb_rom_wisdom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override { shared_start(); }; @@ -71,7 +71,7 @@ class gb_rom_yong_device : public gb_rom_device { public: // construction/destruction - gb_rom_yong_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gb_rom_yong_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override { shared_start(); }; @@ -87,7 +87,7 @@ class gb_rom_atvrac_device : public gb_rom_device { public: // construction/destruction - gb_rom_atvrac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gb_rom_atvrac_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override { shared_start(); }; @@ -103,7 +103,7 @@ class gb_rom_lasama_device : public gb_rom_device { public: // construction/destruction - gb_rom_lasama_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gb_rom_lasama_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override { shared_start(); }; @@ -121,8 +121,8 @@ class megaduck_rom_device :public device_t, { public: // construction/destruction - megaduck_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - megaduck_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + megaduck_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + megaduck_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/gamegear/ggext.cpp b/src/devices/bus/gamegear/ggext.cpp index fa09f4272a1..bce50a8c527 100644 --- a/src/devices/bus/gamegear/ggext.cpp +++ b/src/devices/bus/gamegear/ggext.cpp @@ -54,7 +54,7 @@ device_gg_ext_port_interface::~device_gg_ext_port_interface() // gg_ext_port_device - constructor //------------------------------------------------- -gg_ext_port_device::gg_ext_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +gg_ext_port_device::gg_ext_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, GG_EXT_PORT, "EXT Port", tag, owner, clock, "gg_ext_port", __FILE__), device_slot_interface(mconfig, *this), m_device(nullptr), m_th_pin_handler(*this), diff --git a/src/devices/bus/gamegear/ggext.h b/src/devices/bus/gamegear/ggext.h index 0388838daaa..ac65aac63b4 100644 --- a/src/devices/bus/gamegear/ggext.h +++ b/src/devices/bus/gamegear/ggext.h @@ -52,7 +52,7 @@ class gg_ext_port_device : public device_t, { public: // construction/destruction - gg_ext_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gg_ext_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~gg_ext_port_device(); // static configuration helpers diff --git a/src/devices/bus/gamegear/smsctrladp.cpp b/src/devices/bus/gamegear/smsctrladp.cpp index 54b9139b433..067c98687e1 100644 --- a/src/devices/bus/gamegear/smsctrladp.cpp +++ b/src/devices/bus/gamegear/smsctrladp.cpp @@ -26,7 +26,7 @@ const device_type SMS_CTRL_ADAPTOR = &device_creator<sms_ctrl_adaptor_device>; // sms_ctrl_adaptor_device - constructor //------------------------------------------------- -sms_ctrl_adaptor_device::sms_ctrl_adaptor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sms_ctrl_adaptor_device::sms_ctrl_adaptor_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SMS_CTRL_ADAPTOR, "SMS Controller Adaptor", tag, owner, clock, "sms_ctrl_adaptor", __FILE__), device_gg_ext_port_interface(mconfig, *this), m_subctrl_port(*this, "ctrl") diff --git a/src/devices/bus/gamegear/smsctrladp.h b/src/devices/bus/gamegear/smsctrladp.h index e06dc76163f..eaebc9f7c29 100644 --- a/src/devices/bus/gamegear/smsctrladp.h +++ b/src/devices/bus/gamegear/smsctrladp.h @@ -30,7 +30,7 @@ class sms_ctrl_adaptor_device : public device_t, { public: // construction/destruction - sms_ctrl_adaptor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sms_ctrl_adaptor_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_WRITE_LINE_MEMBER(th_pin_w); DECLARE_READ32_MEMBER(pixel_r); diff --git a/src/devices/bus/gba/gba_slot.cpp b/src/devices/bus/gba/gba_slot.cpp index 217f3f9e954..83ee37755ff 100644 --- a/src/devices/bus/gba/gba_slot.cpp +++ b/src/devices/bus/gba/gba_slot.cpp @@ -46,7 +46,7 @@ device_gba_cart_interface::~device_gba_cart_interface() // rom_alloc - alloc the space for the cart //------------------------------------------------- -void device_gba_cart_interface::rom_alloc(UINT32 size, const char *tag) +void device_gba_cart_interface::rom_alloc(UINT32 size, std::string tag) { if (m_rom == nullptr) { @@ -74,7 +74,7 @@ void device_gba_cart_interface::nvram_alloc(UINT32 size) //------------------------------------------------- // gba_cart_slot_device - constructor //------------------------------------------------- -gba_cart_slot_device::gba_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +gba_cart_slot_device::gba_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, GBA_CART_SLOT, "Game Boy Advance Cartridge Slot", tag, owner, clock, "gba_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), diff --git a/src/devices/bus/gba/gba_slot.h b/src/devices/bus/gba/gba_slot.h index 9d9a6a48be7..55a01a30827 100644 --- a/src/devices/bus/gba/gba_slot.h +++ b/src/devices/bus/gba/gba_slot.h @@ -36,7 +36,7 @@ public: virtual DECLARE_READ32_MEMBER(read_ram) { return 0xffffffff; } virtual DECLARE_WRITE32_MEMBER(write_ram) {}; - void rom_alloc(UINT32 size, const char *tag); + void rom_alloc(UINT32 size, std::string tag); void nvram_alloc(UINT32 size); UINT32* get_rom_base() { return m_rom; } UINT32* get_nvram_base() { return &m_nvram[0]; } @@ -61,7 +61,7 @@ class gba_cart_slot_device : public device_t, { public: // construction/destruction - gba_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gba_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~gba_cart_slot_device(); // device-level overrides diff --git a/src/devices/bus/gba/rom.cpp b/src/devices/bus/gba/rom.cpp index 8e857dfe004..13e773bca18 100644 --- a/src/devices/bus/gba/rom.cpp +++ b/src/devices/bus/gba/rom.cpp @@ -29,40 +29,40 @@ const device_type GBA_ROM_FLASH = &device_creator<gba_rom_flash_device>; const device_type GBA_ROM_FLASH1M = &device_creator<gba_rom_flash1m_device>; -gba_rom_device::gba_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +gba_rom_device::gba_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_gba_cart_interface( mconfig, *this ) { } -gba_rom_device::gba_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +gba_rom_device::gba_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, GBA_ROM_STD, "GBA Carts", tag, owner, clock, "gba_rom", __FILE__), device_gba_cart_interface( mconfig, *this ) { } -gba_rom_sram_device::gba_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +gba_rom_sram_device::gba_rom_sram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : gba_rom_device(mconfig, GBA_ROM_SRAM, "GBA Carts + SRAM", tag, owner, clock, "gba_sram", __FILE__) { } -gba_rom_eeprom_device::gba_rom_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +gba_rom_eeprom_device::gba_rom_eeprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : gba_rom_device(mconfig, GBA_ROM_EEPROM, "GBA Carts + EEPROM", tag, owner, clock, "gba_eeprom", __FILE__) { } -gba_rom_eeprom64_device::gba_rom_eeprom64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +gba_rom_eeprom64_device::gba_rom_eeprom64_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : gba_rom_device(mconfig, GBA_ROM_EEPROM64, "GBA Carts + EEPROM 64K", tag, owner, clock, "gba_eeprom64", __FILE__) { } -gba_rom_flash_device::gba_rom_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +gba_rom_flash_device::gba_rom_flash_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : gba_rom_device(mconfig, GBA_ROM_FLASH, "GBA Carts + Panasonic Flash", tag, owner, clock, "gba_flash", __FILE__), m_flash_mask(0), m_flash(*this, "flash") { } -gba_rom_flash1m_device::gba_rom_flash1m_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +gba_rom_flash1m_device::gba_rom_flash1m_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : gba_rom_device(mconfig, GBA_ROM_FLASH1M, "GBA Carts + Sanyo Flash", tag, owner, clock, "gba_flash1m", __FILE__), m_flash_mask(0), m_flash(*this, "flash") { diff --git a/src/devices/bus/gba/rom.h b/src/devices/bus/gba/rom.h index f9a3c16cb2e..d9f58bddac4 100644 --- a/src/devices/bus/gba/rom.h +++ b/src/devices/bus/gba/rom.h @@ -14,8 +14,8 @@ class gba_rom_device : public device_t, { public: // construction/destruction - gba_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - gba_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gba_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + gba_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -31,7 +31,7 @@ class gba_rom_sram_device : public gba_rom_device { public: // construction/destruction - gba_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gba_rom_sram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ32_MEMBER(read_ram) override; @@ -44,7 +44,7 @@ class gba_rom_flash_device : public gba_rom_device { public: // construction/destruction - gba_rom_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gba_rom_flash_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -66,7 +66,7 @@ class gba_rom_flash1m_device : public gba_rom_device { public: // construction/destruction - gba_rom_flash1m_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gba_rom_flash1m_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -127,7 +127,7 @@ class gba_rom_eeprom_device : public gba_rom_device { public: // construction/destruction - gba_rom_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gba_rom_eeprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -147,7 +147,7 @@ class gba_rom_eeprom64_device : public gba_rom_device { public: // construction/destruction - gba_rom_eeprom64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gba_rom_eeprom64_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/generic/ram.cpp b/src/devices/bus/generic/ram.cpp index 3767ddae724..969d0a0bfa9 100644 --- a/src/devices/bus/generic/ram.cpp +++ b/src/devices/bus/generic/ram.cpp @@ -34,14 +34,14 @@ const device_type GENERIC_RAM_64K_LINEAR = &device_creator<generic_ram_64k_linea const device_type GENERIC_RAM_128K_LINEAR = &device_creator<generic_ram_128k_linear_device>; -generic_ram_plain_device::generic_ram_plain_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 size, const char *shortname, const char *source) +generic_ram_plain_device::generic_ram_plain_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 size, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_generic_cart_interface(mconfig, *this), m_size(size) { } -generic_ram_linear_device::generic_ram_linear_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 size, const char *shortname, const char *source) +generic_ram_linear_device::generic_ram_linear_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 size, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_generic_cart_interface(mconfig, *this), m_size(size) @@ -49,32 +49,32 @@ generic_ram_linear_device::generic_ram_linear_device(const machine_config &mconf } -generic_ram_32k_plain_device::generic_ram_32k_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +generic_ram_32k_plain_device::generic_ram_32k_plain_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : generic_ram_plain_device(mconfig, GENERIC_RAM_32K_PLAIN, "Generic RAM 32K (plain mapping)", tag, owner, clock, 0x8000, "generic_ram32p", __FILE__) { } -generic_ram_64k_plain_device::generic_ram_64k_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +generic_ram_64k_plain_device::generic_ram_64k_plain_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : generic_ram_plain_device(mconfig, GENERIC_RAM_64K_PLAIN, "Generic RAM 64K (plain mapping)", tag, owner, clock, 0x10000, "generic_ram64p", __FILE__) { } -generic_ram_128k_plain_device::generic_ram_128k_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +generic_ram_128k_plain_device::generic_ram_128k_plain_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : generic_ram_plain_device(mconfig, GENERIC_RAM_128K_PLAIN, "Generic RAM 128K (plain mapping)", tag, owner, clock, 0x20000, "generic_ram128p", __FILE__) { } -generic_ram_32k_linear_device::generic_ram_32k_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +generic_ram_32k_linear_device::generic_ram_32k_linear_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : generic_ram_linear_device(mconfig, GENERIC_RAM_32K_LINEAR, "Generic RAM 32K (linear mapping)", tag, owner, clock, 0x8000, "generic_ram32l", __FILE__) { } -generic_ram_64k_linear_device::generic_ram_64k_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +generic_ram_64k_linear_device::generic_ram_64k_linear_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : generic_ram_linear_device(mconfig, GENERIC_RAM_64K_LINEAR, "Generic RAM 64K (linear mapping)", tag, owner, clock, 0x10000, "generic_ram64l", __FILE__) { } -generic_ram_128k_linear_device::generic_ram_128k_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +generic_ram_128k_linear_device::generic_ram_128k_linear_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : generic_ram_linear_device(mconfig, GENERIC_RAM_128K_LINEAR, "Generic RAM 128K (linear mapping)", tag, owner, clock, 0x20000, "generic_ram128l", __FILE__) { } diff --git a/src/devices/bus/generic/ram.h b/src/devices/bus/generic/ram.h index 487aa5aae1b..673015f2020 100644 --- a/src/devices/bus/generic/ram.h +++ b/src/devices/bus/generic/ram.h @@ -13,7 +13,7 @@ class generic_ram_plain_device : public device_t, { public: // construction/destruction - generic_ram_plain_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 size, const char *shortname, const char *source); + generic_ram_plain_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 size, const char *shortname, const char *source); // device-level overrides virtual void device_start() override; @@ -34,7 +34,7 @@ class generic_ram_linear_device : public device_t, { public: // construction/destruction - generic_ram_linear_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 size, const char *shortname, const char *source); + generic_ram_linear_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 size, const char *shortname, const char *source); // device-level overrides virtual void device_start() override; @@ -54,21 +54,21 @@ class generic_ram_32k_plain_device : public generic_ram_plain_device { public: // construction/destruction - generic_ram_32k_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + generic_ram_32k_plain_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; class generic_ram_64k_plain_device : public generic_ram_plain_device { public: // construction/destruction - generic_ram_64k_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + generic_ram_64k_plain_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; class generic_ram_128k_plain_device : public generic_ram_plain_device { public: // construction/destruction - generic_ram_128k_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + generic_ram_128k_plain_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; @@ -78,21 +78,21 @@ class generic_ram_32k_linear_device : public generic_ram_linear_device { public: // construction/destruction - generic_ram_32k_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + generic_ram_32k_linear_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; class generic_ram_64k_linear_device : public generic_ram_linear_device { public: // construction/destruction - generic_ram_64k_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + generic_ram_64k_linear_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; class generic_ram_128k_linear_device : public generic_ram_linear_device { public: // construction/destruction - generic_ram_128k_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + generic_ram_128k_linear_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/bus/generic/rom.cpp b/src/devices/bus/generic/rom.cpp index a816040e229..d1358c458af 100644 --- a/src/devices/bus/generic/rom.cpp +++ b/src/devices/bus/generic/rom.cpp @@ -31,28 +31,28 @@ const device_type GENERIC_ROM_LINEAR = &device_creator<generic_rom_linear_device const device_type GENERIC_ROMRAM_PLAIN = &device_creator<generic_romram_plain_device>; -generic_rom_device::generic_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +generic_rom_device::generic_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_generic_cart_interface(mconfig, *this) { } -generic_rom_plain_device::generic_rom_plain_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +generic_rom_plain_device::generic_rom_plain_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : generic_rom_device(mconfig, type, name, tag, owner, clock, shortname, source) { } -generic_rom_plain_device::generic_rom_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +generic_rom_plain_device::generic_rom_plain_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : generic_rom_device(mconfig, GENERIC_ROM_PLAIN, "Generic ROM (plain mapping)", tag, owner, clock, "generic_rom_plain", __FILE__) { } -generic_rom_linear_device::generic_rom_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +generic_rom_linear_device::generic_rom_linear_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : generic_rom_device(mconfig, GENERIC_ROM_LINEAR, "Generic ROM (linear mapping)", tag, owner, clock, "generic_rom_linear", __FILE__) { } -generic_romram_plain_device::generic_romram_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +generic_romram_plain_device::generic_romram_plain_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : generic_rom_plain_device(mconfig, GENERIC_ROMRAM_PLAIN, "Generic ROM + RAM (plain mapping)", tag, owner, clock, "generic_romram_plain", __FILE__) { } diff --git a/src/devices/bus/generic/rom.h b/src/devices/bus/generic/rom.h index 73489ab0932..7e889c19388 100644 --- a/src/devices/bus/generic/rom.h +++ b/src/devices/bus/generic/rom.h @@ -13,7 +13,7 @@ class generic_rom_device : public device_t, { public: // construction/destruction - generic_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + generic_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides virtual void device_start() override {} @@ -26,8 +26,8 @@ class generic_rom_plain_device : public generic_rom_device { public: // construction/destruction - generic_rom_plain_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - generic_rom_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + generic_rom_plain_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + generic_rom_plain_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_rom) override; @@ -42,7 +42,7 @@ class generic_romram_plain_device : public generic_rom_plain_device { public: // construction/destruction - generic_romram_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + generic_romram_plain_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_ram) override; @@ -56,7 +56,7 @@ class generic_rom_linear_device : public generic_rom_device { public: // construction/destruction - generic_rom_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + generic_rom_linear_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_rom) override; diff --git a/src/devices/bus/generic/slot.cpp b/src/devices/bus/generic/slot.cpp index 4f3af4df411..ea8f532c18d 100644 --- a/src/devices/bus/generic/slot.cpp +++ b/src/devices/bus/generic/slot.cpp @@ -55,7 +55,7 @@ device_generic_cart_interface::~device_generic_cart_interface() // rom_alloc - alloc the space for the cart //------------------------------------------------- -void device_generic_cart_interface::rom_alloc(size_t size, int width, endianness_t endian, const char *tag) +void device_generic_cart_interface::rom_alloc(size_t size, int width, endianness_t endian, std::string tag) { if (m_rom == nullptr) { @@ -83,7 +83,7 @@ void device_generic_cart_interface::ram_alloc(UINT32 size) //------------------------------------------------- // generic_slot_device - constructor //------------------------------------------------- -generic_slot_device::generic_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +generic_slot_device::generic_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, GENERIC_SOCKET, "Generic ROM Socket / RAM Socket / Cartridge Slot", tag, owner, clock, "generic_socket", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), diff --git a/src/devices/bus/generic/slot.h b/src/devices/bus/generic/slot.h index 6a12c1cd84c..0e13b5ff788 100644 --- a/src/devices/bus/generic/slot.h +++ b/src/devices/bus/generic/slot.h @@ -25,7 +25,7 @@ public: virtual DECLARE_READ8_MEMBER(read_ram) { return 0xff; } virtual DECLARE_WRITE8_MEMBER(write_ram) {}; - virtual void rom_alloc(size_t size, int width, endianness_t end, const char *tag); + virtual void rom_alloc(size_t size, int width, endianness_t end, std::string tag); virtual void ram_alloc(UINT32 size); UINT8* get_rom_base() { return m_rom; } @@ -88,7 +88,7 @@ class generic_slot_device : public device_t, { public: // construction/destruction - generic_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + generic_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~generic_slot_device(); static void static_set_device_load(device_t &device, device_image_load_delegate callback) { downcast<generic_slot_device &>(device).m_device_image_load = callback; } diff --git a/src/devices/bus/ieee488/c2031.cpp b/src/devices/bus/ieee488/c2031.cpp index 0e455c35b67..880c924660b 100644 --- a/src/devices/bus/ieee488/c2031.cpp +++ b/src/devices/bus/ieee488/c2031.cpp @@ -397,7 +397,7 @@ inline int c2031_device::get_device_number() // c2031_device - constructor //------------------------------------------------- -c2031_device::c2031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +c2031_device::c2031_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C2031, "C2031", tag, owner, clock, "c2031", __FILE__), device_ieee488_interface(mconfig, *this), m_maincpu(*this, M6502_TAG), diff --git a/src/devices/bus/ieee488/c2031.h b/src/devices/bus/ieee488/c2031.h index ccc2c31621a..e9753cba6d6 100644 --- a/src/devices/bus/ieee488/c2031.h +++ b/src/devices/bus/ieee488/c2031.h @@ -30,7 +30,7 @@ class c2031_device : public device_t, { public: // construction/destruction - c2031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c2031_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/ieee488/c2040.cpp b/src/devices/bus/ieee488/c2040.cpp index 55dd8f9a072..dd5f99e5455 100644 --- a/src/devices/bus/ieee488/c2040.cpp +++ b/src/devices/bus/ieee488/c2040.cpp @@ -674,7 +674,7 @@ inline void c2040_t::update_ieee_signals() // c2040_t - constructor //------------------------------------------------- -c2040_t::c2040_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +c2040_t::c2040_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_ieee488_interface(mconfig, *this), m_maincpu(*this, M6502_TAG), @@ -694,7 +694,7 @@ c2040_t::c2040_t(const machine_config &mconfig, device_type type, const char *na { } -c2040_t::c2040_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c2040_t::c2040_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C2040, "C2040", tag, owner, clock, "c2040", __FILE__), device_ieee488_interface(mconfig, *this), m_maincpu(*this, M6502_TAG), @@ -719,7 +719,7 @@ c2040_t::c2040_t(const machine_config &mconfig, const char *tag, device_t *owner // c3040_t - constructor //------------------------------------------------- -c3040_t::c3040_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c3040_t::c3040_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : c2040_t(mconfig, C3040, "C3040", tag, owner, clock, "c3040", __FILE__) { } @@ -727,7 +727,7 @@ c3040_t::c3040_t(const machine_config &mconfig, const char *tag, device_t *owner // c4040_t - constructor //------------------------------------------------- -c4040_t::c4040_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c4040_t::c4040_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : c2040_t(mconfig, C4040, "C4040", tag, owner, clock, "c4040", __FILE__) { } diff --git a/src/devices/bus/ieee488/c2040.h b/src/devices/bus/ieee488/c2040.h index 74539e6524d..fd102976e8d 100644 --- a/src/devices/bus/ieee488/c2040.h +++ b/src/devices/bus/ieee488/c2040.h @@ -32,8 +32,8 @@ class c2040_t : public device_t, { public: // construction/destruction - c2040_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - c2040_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c2040_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + c2040_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -95,7 +95,7 @@ class c3040_t : public c2040_t { public: // construction/destruction - c3040_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c3040_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -111,7 +111,7 @@ class c4040_t : public c2040_t { public: // construction/destruction - c4040_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c4040_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/ieee488/c2040fdc.cpp b/src/devices/bus/ieee488/c2040fdc.cpp index b39ab1d23a3..47908c8745c 100644 --- a/src/devices/bus/ieee488/c2040fdc.cpp +++ b/src/devices/bus/ieee488/c2040fdc.cpp @@ -69,7 +69,7 @@ const rom_entry *c2040_fdc_t::device_rom_region() const // c2040_fdc_t - constructor //------------------------------------------------- -c2040_fdc_t::c2040_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c2040_fdc_t::c2040_fdc_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C2040_FDC, "C2040 FDC", tag, owner, clock, "c2040fdc", __FILE__), m_write_sync(*this), m_write_ready(*this), diff --git a/src/devices/bus/ieee488/c2040fdc.h b/src/devices/bus/ieee488/c2040fdc.h index a056a8f0b60..d4f5a1ef5d3 100644 --- a/src/devices/bus/ieee488/c2040fdc.h +++ b/src/devices/bus/ieee488/c2040fdc.h @@ -45,7 +45,7 @@ class c2040_fdc_t : public device_t { public: // construction/destruction - c2040_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c2040_fdc_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template<class _Object> static devcb_base &set_sync_wr_callback(device_t &device, _Object object) { return downcast<c2040_fdc_t &>(device).m_write_sync.set_callback(object); } template<class _Object> static devcb_base &set_ready_wr_callback(device_t &device, _Object object) { return downcast<c2040_fdc_t &>(device).m_write_ready.set_callback(object); } diff --git a/src/devices/bus/ieee488/c8050.cpp b/src/devices/bus/ieee488/c8050.cpp index ead9fad37a5..710cd8e03bb 100644 --- a/src/devices/bus/ieee488/c8050.cpp +++ b/src/devices/bus/ieee488/c8050.cpp @@ -817,7 +817,7 @@ inline void c8050_t::update_ieee_signals() // c8050_t - constructor //------------------------------------------------- -c8050_t::c8050_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +c8050_t::c8050_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_ieee488_interface(mconfig, *this), m_maincpu(*this, M6502_TAG), @@ -836,7 +836,7 @@ c8050_t::c8050_t(const machine_config &mconfig, device_type type, const char *na { } -c8050_t::c8050_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c8050_t::c8050_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C8050, "C8050", tag, owner, clock, "c8050", __FILE__), device_ieee488_interface(mconfig, *this), m_maincpu(*this, M6502_TAG), @@ -860,7 +860,7 @@ c8050_t::c8050_t(const machine_config &mconfig, const char *tag, device_t *owner // c8250_t - constructor //------------------------------------------------- -c8250_t::c8250_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c8250_t::c8250_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : c8050_t(mconfig, C8250, "C8250", tag, owner, clock, "c8250", __FILE__) { } @@ -868,7 +868,7 @@ c8250_t::c8250_t(const machine_config &mconfig, const char *tag, device_t *owner // c8250lp_t - constructor //------------------------------------------------- -c8250lp_t::c8250lp_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c8250lp_t::c8250lp_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : c8050_t(mconfig, C8250LP, "C8250LP", tag, owner, clock, "c8250lp", __FILE__) { } @@ -876,7 +876,7 @@ c8250lp_t::c8250lp_t(const machine_config &mconfig, const char *tag, device_t *o // sfd1001_t - constructor //------------------------------------------------- -sfd1001_t::sfd1001_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sfd1001_t::sfd1001_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : c8050_t(mconfig, SFD1001, "SFD1001", tag, owner, clock, "sfd1001", __FILE__) { } diff --git a/src/devices/bus/ieee488/c8050.h b/src/devices/bus/ieee488/c8050.h index 71bd9ae42cf..a9cb8b27546 100644 --- a/src/devices/bus/ieee488/c8050.h +++ b/src/devices/bus/ieee488/c8050.h @@ -32,8 +32,8 @@ class c8050_t : public device_t, { public: // construction/destruction - c8050_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - c8050_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c8050_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + c8050_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -86,7 +86,7 @@ class c8250_t : public c8050_t { public: // construction/destruction - c8250_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c8250_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -101,7 +101,7 @@ class c8250lp_t : public c8050_t { public: // construction/destruction - c8250lp_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c8250lp_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -117,7 +117,7 @@ class sfd1001_t : public c8050_t { public: // construction/destruction - sfd1001_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sfd1001_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/ieee488/c8050fdc.cpp b/src/devices/bus/ieee488/c8050fdc.cpp index 5e2e91676c0..039187f2b9f 100644 --- a/src/devices/bus/ieee488/c8050fdc.cpp +++ b/src/devices/bus/ieee488/c8050fdc.cpp @@ -71,7 +71,7 @@ const rom_entry *c8050_fdc_t::device_rom_region() const // c8050_fdc_t - constructor //------------------------------------------------- -c8050_fdc_t::c8050_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c8050_fdc_t::c8050_fdc_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C8050_FDC, "Commodore 8050 FDC", tag, owner, clock, "c8050fdc", __FILE__), m_write_sync(*this), m_write_ready(*this), diff --git a/src/devices/bus/ieee488/c8050fdc.h b/src/devices/bus/ieee488/c8050fdc.h index 4f82962f524..9a1fb1592eb 100644 --- a/src/devices/bus/ieee488/c8050fdc.h +++ b/src/devices/bus/ieee488/c8050fdc.h @@ -47,7 +47,7 @@ class c8050_fdc_t : public device_t { public: // construction/destruction - c8050_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c8050_fdc_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template<class _Object> static devcb_base &set_sync_wr_callback(device_t &device, _Object object) { return downcast<c8050_fdc_t &>(device).m_write_sync.set_callback(object); } template<class _Object> static devcb_base &set_ready_wr_callback(device_t &device, _Object object) { return downcast<c8050_fdc_t &>(device).m_write_ready.set_callback(object); } diff --git a/src/devices/bus/ieee488/c8280.cpp b/src/devices/bus/ieee488/c8280.cpp index 05c39c7ffdd..bf24ae43de8 100644 --- a/src/devices/bus/ieee488/c8280.cpp +++ b/src/devices/bus/ieee488/c8280.cpp @@ -382,7 +382,7 @@ inline void c8280_t::update_ieee_signals() // c8280_t - constructor //------------------------------------------------- -c8280_t::c8280_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c8280_t::c8280_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C8280, "C8280", tag, owner, clock, "c8280", __FILE__), device_ieee488_interface(mconfig, *this), m_maincpu(*this, M6502_DOS_TAG), diff --git a/src/devices/bus/ieee488/c8280.h b/src/devices/bus/ieee488/c8280.h index a7f17aaf55c..1118ca60bcb 100644 --- a/src/devices/bus/ieee488/c8280.h +++ b/src/devices/bus/ieee488/c8280.h @@ -31,7 +31,7 @@ class c8280_t : public device_t, { public: // construction/destruction - c8280_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c8280_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/ieee488/d9060.cpp b/src/devices/bus/ieee488/d9060.cpp index 68b63589ed9..136c96fb7c6 100644 --- a/src/devices/bus/ieee488/d9060.cpp +++ b/src/devices/bus/ieee488/d9060.cpp @@ -483,7 +483,7 @@ inline void d9060_base_t::update_ieee_signals() // d9060_base_t - constructor //------------------------------------------------- -d9060_base_t::d9060_base_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source) +d9060_base_t::d9060_base_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_ieee488_interface(mconfig, *this), m_maincpu(*this, M6502_DOS_TAG), @@ -507,7 +507,7 @@ d9060_base_t::d9060_base_t(const machine_config &mconfig, device_type type, cons // d9060_t - constructor //------------------------------------------------- -d9060_t::d9060_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +d9060_t::d9060_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : d9060_base_t(mconfig, D9060, "D9060", tag, owner, clock, TYPE_9060, "d9060", __FILE__) { } @@ -515,7 +515,7 @@ d9060_t::d9060_t(const machine_config &mconfig, const char *tag, device_t *owner // d9090_t - constructor //------------------------------------------------- -d9090_t::d9090_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +d9090_t::d9090_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : d9060_base_t(mconfig, D9090, "D9090", tag, owner, clock, TYPE_9090, "d9090", __FILE__) { } diff --git a/src/devices/bus/ieee488/d9060.h b/src/devices/bus/ieee488/d9060.h index 104daec4a11..8cc737c620f 100644 --- a/src/devices/bus/ieee488/d9060.h +++ b/src/devices/bus/ieee488/d9060.h @@ -38,7 +38,7 @@ public: }; // construction/destruction - d9060_base_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source); + d9060_base_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -98,7 +98,7 @@ class d9060_t : public d9060_base_t { public: // construction/destruction - d9060_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + d9060_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; @@ -108,7 +108,7 @@ class d9090_t : public d9060_base_t { public: // construction/destruction - d9090_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + d9090_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/bus/ieee488/hardbox.cpp b/src/devices/bus/ieee488/hardbox.cpp index c03f147250d..dbf6efb89fc 100644 --- a/src/devices/bus/ieee488/hardbox.cpp +++ b/src/devices/bus/ieee488/hardbox.cpp @@ -346,7 +346,7 @@ ioport_constructor hardbox_device::device_input_ports() const // hardbox_device - constructor //------------------------------------------------- -hardbox_device::hardbox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +hardbox_device::hardbox_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, HARDBOX, "HardBox", tag, owner, clock, "hardbox", __FILE__), device_ieee488_interface(mconfig, *this), m_maincpu(*this, Z80_TAG), diff --git a/src/devices/bus/ieee488/hardbox.h b/src/devices/bus/ieee488/hardbox.h index cbaa26d335c..d76b824c2df 100644 --- a/src/devices/bus/ieee488/hardbox.h +++ b/src/devices/bus/ieee488/hardbox.h @@ -31,7 +31,7 @@ class hardbox_device : public device_t, { public: // construction/destruction - hardbox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + hardbox_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/ieee488/ieee488.cpp b/src/devices/bus/ieee488/ieee488.cpp index 38a1f538404..7dc9f17a6f7 100644 --- a/src/devices/bus/ieee488/ieee488.cpp +++ b/src/devices/bus/ieee488/ieee488.cpp @@ -63,7 +63,7 @@ device_ieee488_interface::~device_ieee488_interface() // ieee488_slot_device - constructor //------------------------------------------------- -ieee488_slot_device::ieee488_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +ieee488_slot_device::ieee488_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, IEEE488_SLOT, "IEEE-488 slot", tag, owner, clock, "ieee488_slot", __FILE__), device_slot_interface(mconfig, *this), m_address(0) { @@ -100,7 +100,7 @@ void ieee488_slot_device::device_start() // ieee488_device - constructor //------------------------------------------------- -ieee488_device::ieee488_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ieee488_device::ieee488_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, IEEE488, "IEEE-488 bus", tag, owner, clock, "ieee488", __FILE__), m_write_eoi(*this), m_write_dav(*this), @@ -193,7 +193,7 @@ void ieee488_device::set_signal(device_t *device, int signal, int state) { if (m_line[signal] != state) { - if (LOG) logerror("%s IEEE488: '%s' %s %u\n", machine().describe_context(), tag(), SIGNAL_NAME[signal], state); + if (LOG) logerror("%s IEEE488: '%s' %s %u\n", machine().describe_context(), tag().c_str(), SIGNAL_NAME[signal], state); m_line[signal] = state; changed = true; } @@ -204,11 +204,11 @@ void ieee488_device::set_signal(device_t *device, int signal, int state) while (entry) { - if (!strcmp(entry->m_device->tag(), device->tag())) + if (entry->m_device->tag() == device->tag()) { if (entry->m_line[signal] != state) { - if (LOG) logerror("%s IEEE488: '%s' %s %u\n", machine().describe_context(), device->tag(), SIGNAL_NAME[signal], state); + if (LOG) logerror("%s IEEE488: '%s' %s %u\n", machine().describe_context(), device->tag().c_str(), SIGNAL_NAME[signal], state); entry->m_line[signal] = state; changed = true; } @@ -317,7 +317,7 @@ void ieee488_device::set_data(device_t *device, UINT8 data) { if (device == this) { - if (LOG) logerror("%s IEEE488: '%s' DIO %02x\n", machine().describe_context(), tag(), data); + if (LOG) logerror("%s IEEE488: '%s' DIO %02x\n", machine().describe_context(), tag().c_str(), data); m_dio = data; } @@ -327,11 +327,11 @@ void ieee488_device::set_data(device_t *device, UINT8 data) while (entry) { - if (!strcmp(entry->m_device->tag(), device->tag())) + if (entry->m_device->tag() == device->tag()) { if (entry->m_dio != data) { - if (LOG) logerror("%s IEEE488: '%s' DIO %02x\n", machine().describe_context(), device->tag(), data); + if (LOG) logerror("%s IEEE488: '%s' DIO %02x\n", machine().describe_context(), device->tag().c_str(), data); entry->m_dio = data; } } diff --git a/src/devices/bus/ieee488/ieee488.h b/src/devices/bus/ieee488/ieee488.h index f14189e83d9..96fea841c5b 100644 --- a/src/devices/bus/ieee488/ieee488.h +++ b/src/devices/bus/ieee488/ieee488.h @@ -90,7 +90,7 @@ class ieee488_device : public device_t { public: // construction/destruction - ieee488_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ieee488_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template<class _write> void set_eoi_callback(_write wr) { m_write_eoi.set_callback(wr); } template<class _write> void set_dav_callback(_write wr) { m_write_dav.set_callback(wr); } @@ -199,7 +199,7 @@ class ieee488_slot_device : public device_t, { public: // construction/destruction - ieee488_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ieee488_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void set_address(int address) { m_address = address; } int get_address() { return m_address; } diff --git a/src/devices/bus/ieee488/shark.cpp b/src/devices/bus/ieee488/shark.cpp index bdb11f6d261..58d3bfd9e73 100644 --- a/src/devices/bus/ieee488/shark.cpp +++ b/src/devices/bus/ieee488/shark.cpp @@ -127,7 +127,7 @@ ioport_constructor mshark_device::device_input_ports() const // mshark_device - constructor //------------------------------------------------- -mshark_device::mshark_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +mshark_device::mshark_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SHARK, "Mator SHARK", tag, owner, clock, "mshark", __FILE__), device_ieee488_interface(mconfig, *this), m_maincpu(*this, I8085_TAG) diff --git a/src/devices/bus/ieee488/shark.h b/src/devices/bus/ieee488/shark.h index 50a9c967244..cfe3ab1bc28 100644 --- a/src/devices/bus/ieee488/shark.h +++ b/src/devices/bus/ieee488/shark.h @@ -28,7 +28,7 @@ class mshark_device : public device_t, { public: // construction/destruction - mshark_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + mshark_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/ieee488/softbox.cpp b/src/devices/bus/ieee488/softbox.cpp index 0536b4aba07..97dae5c2c39 100644 --- a/src/devices/bus/ieee488/softbox.cpp +++ b/src/devices/bus/ieee488/softbox.cpp @@ -326,7 +326,7 @@ ioport_constructor softbox_device::device_input_ports() const // softbox_device - constructor //------------------------------------------------- -softbox_device::softbox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +softbox_device::softbox_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SOFTBOX, "PET SoftBox", tag, owner, clock, "pet_softbox", __FILE__), device_ieee488_interface(mconfig, *this), m_maincpu(*this, Z80_TAG), diff --git a/src/devices/bus/ieee488/softbox.h b/src/devices/bus/ieee488/softbox.h index d8de28d031c..122638fa04f 100644 --- a/src/devices/bus/ieee488/softbox.h +++ b/src/devices/bus/ieee488/softbox.h @@ -33,7 +33,7 @@ class softbox_device : public device_t, { public: // construction/destruction - softbox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + softbox_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/imi7000/imi5000h.cpp b/src/devices/bus/imi7000/imi5000h.cpp index cea944b9eaf..abb41dd073f 100644 --- a/src/devices/bus/imi7000/imi5000h.cpp +++ b/src/devices/bus/imi7000/imi5000h.cpp @@ -445,7 +445,7 @@ ioport_constructor imi5000h_device::device_input_ports() const // imi5000h_device - constructor //------------------------------------------------- -imi5000h_device::imi5000h_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +imi5000h_device::imi5000h_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, IMI5000H, "IMI 5000H", tag, owner, clock, "imi5000h", __FILE__), device_imi7000_interface(mconfig, *this), m_maincpu(*this, Z80_TAG), diff --git a/src/devices/bus/imi7000/imi5000h.h b/src/devices/bus/imi7000/imi5000h.h index cb37319f6c1..1f748388e8e 100644 --- a/src/devices/bus/imi7000/imi5000h.h +++ b/src/devices/bus/imi7000/imi5000h.h @@ -33,7 +33,7 @@ class imi5000h_device : public device_t, { public: // construction/destruction - imi5000h_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + imi5000h_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/imi7000/imi7000.cpp b/src/devices/bus/imi7000/imi7000.cpp index 8d6baaf0ef1..01101cceeb5 100644 --- a/src/devices/bus/imi7000/imi7000.cpp +++ b/src/devices/bus/imi7000/imi7000.cpp @@ -50,7 +50,7 @@ device_imi7000_interface::device_imi7000_interface(const machine_config &mconfig // imi7000_slot_device - constructor //------------------------------------------------- -imi7000_slot_device::imi7000_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +imi7000_slot_device::imi7000_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, IMI7000_SLOT, "IMI 7000 slot", tag, owner, clock, "imi7000_slot", __FILE__), device_slot_interface(mconfig, *this), m_card(nullptr) { @@ -75,7 +75,7 @@ void imi7000_slot_device::device_start() // imi7000_bus_device - constructor //------------------------------------------------- -imi7000_bus_device::imi7000_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +imi7000_bus_device::imi7000_bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, IMI7000_BUS, "IMI 7000 bus", tag, owner, clock, "imi7000", __FILE__) { } diff --git a/src/devices/bus/imi7000/imi7000.h b/src/devices/bus/imi7000/imi7000.h index e374fedb6d9..5f9ba38a72a 100644 --- a/src/devices/bus/imi7000/imi7000.h +++ b/src/devices/bus/imi7000/imi7000.h @@ -74,7 +74,7 @@ class imi7000_bus_device : public device_t { public: // construction/destruction - imi7000_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + imi7000_bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides @@ -91,7 +91,7 @@ class imi7000_slot_device : public device_t, { public: // construction/destruction - imi7000_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + imi7000_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/intv/ecs.cpp b/src/devices/bus/intv/ecs.cpp index b855bb73143..4f619f3ed3c 100644 --- a/src/devices/bus/intv/ecs.cpp +++ b/src/devices/bus/intv/ecs.cpp @@ -27,7 +27,7 @@ const device_type INTV_ROM_ECS = &device_creator<intv_ecs_device>; -intv_ecs_device::intv_ecs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +intv_ecs_device::intv_ecs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : intv_rom_device(mconfig, INTV_ROM_ECS, "Intellivision ECS Expansion", tag, owner, clock, "intv_ecs", __FILE__), m_snd(*this, "ay8914"), m_subslot(*this, "subslot"), diff --git a/src/devices/bus/intv/ecs.h b/src/devices/bus/intv/ecs.h index 3dc2f37e7b6..7057e9429de 100644 --- a/src/devices/bus/intv/ecs.h +++ b/src/devices/bus/intv/ecs.h @@ -15,7 +15,7 @@ class intv_ecs_device : public intv_rom_device { public: // construction/destruction - intv_ecs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + intv_ecs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/intv/rom.cpp b/src/devices/bus/intv/rom.cpp index 74b5664a6fc..c037fe3bbac 100644 --- a/src/devices/bus/intv/rom.cpp +++ b/src/devices/bus/intv/rom.cpp @@ -23,29 +23,29 @@ const device_type INTV_ROM_GFACT = &device_creator<intv_gfact_device>; const device_type INTV_ROM_WSMLB = &device_creator<intv_wsmlb_device>; -intv_rom_device::intv_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +intv_rom_device::intv_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_intv_cart_interface( mconfig, *this ) { } -intv_rom_device::intv_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +intv_rom_device::intv_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, INTV_ROM_STD, "Intellivision Standard Carts", tag, owner, clock, "intv_rom", __FILE__), device_intv_cart_interface( mconfig, *this ) { } -intv_ram_device::intv_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +intv_ram_device::intv_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : intv_rom_device(mconfig, INTV_ROM_RAM, "Intellivision Carts w/RAM", tag, owner, clock, "intv_ram", __FILE__) { } -intv_gfact_device::intv_gfact_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +intv_gfact_device::intv_gfact_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : intv_rom_device(mconfig, INTV_ROM_GFACT, "Intellivision Game Factory Cart", tag, owner, clock, "intv_gfact", __FILE__) { } -intv_wsmlb_device::intv_wsmlb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +intv_wsmlb_device::intv_wsmlb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : intv_rom_device(mconfig, INTV_ROM_WSMLB, "Intellivision World Series Baseball Cart", tag, owner, clock, "intv_wsmlb", __FILE__) { } diff --git a/src/devices/bus/intv/rom.h b/src/devices/bus/intv/rom.h index ec1b153071d..887c67f0ea8 100644 --- a/src/devices/bus/intv/rom.h +++ b/src/devices/bus/intv/rom.h @@ -13,8 +13,8 @@ class intv_rom_device : public device_t, { public: // construction/destruction - intv_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - intv_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + intv_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + intv_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ16_MEMBER(read_rom04) override { return INTV_ROM16_READ(offset + 0x0400); } @@ -44,7 +44,7 @@ class intv_ram_device : public intv_rom_device { public: // construction/destruction - intv_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + intv_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ16_MEMBER(read_ram) override { return (int)m_ram[offset & (m_ram.size() - 1)]; } @@ -57,7 +57,7 @@ class intv_gfact_device : public intv_rom_device { public: // construction/destruction - intv_gfact_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + intv_gfact_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ16_MEMBER(read_ram) override { return (int)m_ram[offset & (m_ram.size() - 1)]; } @@ -70,7 +70,7 @@ class intv_wsmlb_device : public intv_rom_device { public: // construction/destruction - intv_wsmlb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + intv_wsmlb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/bus/intv/slot.cpp b/src/devices/bus/intv/slot.cpp index 87f36e14bac..55fcc4a834e 100644 --- a/src/devices/bus/intv/slot.cpp +++ b/src/devices/bus/intv/slot.cpp @@ -116,7 +116,7 @@ device_intv_cart_interface::~device_intv_cart_interface() // rom_alloc - alloc the space for the cart //------------------------------------------------- -void device_intv_cart_interface::rom_alloc(UINT32 size, const char *tag) +void device_intv_cart_interface::rom_alloc(UINT32 size, std::string tag) { if (m_rom == nullptr) { @@ -144,7 +144,7 @@ void device_intv_cart_interface::ram_alloc(UINT32 size) //------------------------------------------------- // intv_cart_slot_device - constructor //------------------------------------------------- -intv_cart_slot_device::intv_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +intv_cart_slot_device::intv_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, INTV_CART_SLOT, "Intellivision Cartridge Slot", tag, owner, clock, "intv_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), diff --git a/src/devices/bus/intv/slot.h b/src/devices/bus/intv/slot.h index 7d970f18a52..b5b77544df6 100644 --- a/src/devices/bus/intv/slot.h +++ b/src/devices/bus/intv/slot.h @@ -66,7 +66,7 @@ public: virtual DECLARE_WRITE16_MEMBER(write_rome0) {} virtual DECLARE_WRITE16_MEMBER(write_romf0) {} - void rom_alloc(UINT32 size, const char *tag); + void rom_alloc(UINT32 size, std::string tag); void ram_alloc(UINT32 size); UINT8* get_rom_base() { return m_rom; } UINT8* get_ram_base() { return &m_ram[0]; } @@ -92,7 +92,7 @@ class intv_cart_slot_device : public device_t, { public: // construction/destruction - intv_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + intv_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~intv_cart_slot_device(); // device-level overrides diff --git a/src/devices/bus/intv/voice.cpp b/src/devices/bus/intv/voice.cpp index ea2c7db82f4..d60bc7c82b3 100644 --- a/src/devices/bus/intv/voice.cpp +++ b/src/devices/bus/intv/voice.cpp @@ -21,7 +21,7 @@ const device_type INTV_ROM_VOICE = &device_creator<intv_voice_device>; -intv_voice_device::intv_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +intv_voice_device::intv_voice_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : intv_rom_device(mconfig, INTV_ROM_VOICE, "Intellivision Intellivoice Expansion", tag, owner, clock, "intv_voice", __FILE__), m_speech(*this, "sp0256_speech"), m_subslot(*this, "subslot"), diff --git a/src/devices/bus/intv/voice.h b/src/devices/bus/intv/voice.h index 0301c6d67b0..5bba4e23c27 100644 --- a/src/devices/bus/intv/voice.h +++ b/src/devices/bus/intv/voice.h @@ -14,7 +14,7 @@ class intv_voice_device : public intv_rom_device { public: // construction/destruction - intv_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + intv_voice_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/iq151/disc2.cpp b/src/devices/bus/iq151/disc2.cpp index ba2cbf36137..c6ffb3251e1 100644 --- a/src/devices/bus/iq151/disc2.cpp +++ b/src/devices/bus/iq151/disc2.cpp @@ -48,7 +48,7 @@ const device_type IQ151_DISC2 = &device_creator<iq151_disc2_device>; // iq151_disc2_device - constructor //------------------------------------------------- -iq151_disc2_device::iq151_disc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +iq151_disc2_device::iq151_disc2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, IQ151_DISC2, "IQ151 Disc2", tag, owner, clock, "iq151_disc2", __FILE__), device_iq151cart_interface( mconfig, *this ), m_fdc(*this, "fdc"), m_rom(nullptr), m_rom_enabled(false) diff --git a/src/devices/bus/iq151/disc2.h b/src/devices/bus/iq151/disc2.h index 37bb1c7c26d..40a4e8da827 100644 --- a/src/devices/bus/iq151/disc2.h +++ b/src/devices/bus/iq151/disc2.h @@ -21,7 +21,7 @@ class iq151_disc2_device : { public: // construction/destruction - iq151_disc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + iq151_disc2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/iq151/grafik.cpp b/src/devices/bus/iq151/grafik.cpp index 4d4a5f93bef..99ae6859e5b 100644 --- a/src/devices/bus/iq151/grafik.cpp +++ b/src/devices/bus/iq151/grafik.cpp @@ -37,7 +37,7 @@ const device_type IQ151_GRAFIK = &device_creator<iq151_grafik_device>; // iq151_grafik_device - constructor //------------------------------------------------- -iq151_grafik_device::iq151_grafik_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +iq151_grafik_device::iq151_grafik_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, IQ151_GRAFIK, "IQ151 grafik", tag, owner, clock, "iq151_grafik", __FILE__), device_iq151cart_interface( mconfig, *this ), m_ppi8255(*this, "ppi8255"), m_posx(0), m_posy(0), m_all(0), m_pen(0), m_fast(0), m_ev(0), m_ex(0), m_sel(0) diff --git a/src/devices/bus/iq151/grafik.h b/src/devices/bus/iq151/grafik.h index 47a6287ec91..61479a37e6f 100644 --- a/src/devices/bus/iq151/grafik.h +++ b/src/devices/bus/iq151/grafik.h @@ -21,7 +21,7 @@ class iq151_grafik_device : { public: // construction/destruction - iq151_grafik_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + iq151_grafik_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/iq151/iq151.cpp b/src/devices/bus/iq151/iq151.cpp index 3d4ef7abe05..07a89d1bb36 100644 --- a/src/devices/bus/iq151/iq151.cpp +++ b/src/devices/bus/iq151/iq151.cpp @@ -53,7 +53,7 @@ device_iq151cart_interface::~device_iq151cart_interface() //------------------------------------------------- // iq151cart_slot_device - constructor //------------------------------------------------- -iq151cart_slot_device::iq151cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +iq151cart_slot_device::iq151cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, IQ151CART_SLOT, "IQ151 cartridge slot", tag, owner, clock, "iq151cart_slot", __FILE__), device_slot_interface(mconfig, *this), device_image_interface(mconfig, *this), diff --git a/src/devices/bus/iq151/iq151.h b/src/devices/bus/iq151/iq151.h index 292362f0d45..003624480d4 100644 --- a/src/devices/bus/iq151/iq151.h +++ b/src/devices/bus/iq151/iq151.h @@ -77,7 +77,7 @@ class iq151cart_slot_device : public device_t, { public: // construction/destruction - iq151cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + iq151cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~iq151cart_slot_device(); template<class _Object> static devcb_base &set_out_irq0_callback(device_t &device, _Object object) { return downcast<iq151cart_slot_device &>(device).m_out_irq0_cb.set_callback(object); } diff --git a/src/devices/bus/iq151/minigraf.cpp b/src/devices/bus/iq151/minigraf.cpp index 1a8e9d182a0..806bd83b64a 100644 --- a/src/devices/bus/iq151/minigraf.cpp +++ b/src/devices/bus/iq151/minigraf.cpp @@ -47,7 +47,7 @@ const device_type IQ151_MINIGRAF = &device_creator<iq151_minigraf_device>; // iq151_minigraf_device - constructor //------------------------------------------------- -iq151_minigraf_device::iq151_minigraf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +iq151_minigraf_device::iq151_minigraf_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, IQ151_MINIGRAF, "IQ151 Minigraf", tag, owner, clock, "iq151_minigraf", __FILE__), device_iq151cart_interface( mconfig, *this ), m_rom(nullptr), m_posx(0), m_posy(0), m_pen(0), m_control(0), m_paper(nullptr) { diff --git a/src/devices/bus/iq151/minigraf.h b/src/devices/bus/iq151/minigraf.h index 6632fa31aa4..0e649aa0673 100644 --- a/src/devices/bus/iq151/minigraf.h +++ b/src/devices/bus/iq151/minigraf.h @@ -20,7 +20,7 @@ class iq151_minigraf_device : { public: // construction/destruction - iq151_minigraf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + iq151_minigraf_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/iq151/ms151a.cpp b/src/devices/bus/iq151/ms151a.cpp index 99da92c6d61..b7812c65334 100644 --- a/src/devices/bus/iq151/ms151a.cpp +++ b/src/devices/bus/iq151/ms151a.cpp @@ -46,7 +46,7 @@ const device_type IQ151_MS151A = &device_creator<iq151_ms151a_device>; // iq151_ms151a_device - constructor //------------------------------------------------- -iq151_ms151a_device::iq151_ms151a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +iq151_ms151a_device::iq151_ms151a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, IQ151_MS151A, "IQ151 MS151A", tag, owner, clock, "iq151_ms151a", __FILE__), device_iq151cart_interface( mconfig, *this ), m_rom(nullptr), m_posx(0), m_posy(0), m_pen(0), m_paper(nullptr) { diff --git a/src/devices/bus/iq151/ms151a.h b/src/devices/bus/iq151/ms151a.h index 1d794e1081d..5db01006c3a 100644 --- a/src/devices/bus/iq151/ms151a.h +++ b/src/devices/bus/iq151/ms151a.h @@ -20,7 +20,7 @@ class iq151_ms151a_device : { public: // construction/destruction - iq151_ms151a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + iq151_ms151a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/iq151/rom.cpp b/src/devices/bus/iq151/rom.cpp index 3229e2ac2f8..d6e0d025144 100644 --- a/src/devices/bus/iq151/rom.cpp +++ b/src/devices/bus/iq151/rom.cpp @@ -41,7 +41,7 @@ const device_type IQ151_AMOS3 = &device_creator<iq151_amos3_device>; // iq151_rom_device - constructor //------------------------------------------------- -iq151_rom_device::iq151_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +iq151_rom_device::iq151_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_iq151cart_interface(mconfig, *this), m_rom(nullptr) { @@ -83,7 +83,7 @@ UINT8* iq151_rom_device::get_cart_base() // iq151_basic6_device - constructor //------------------------------------------------- -iq151_basic6_device::iq151_basic6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +iq151_basic6_device::iq151_basic6_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : iq151_rom_device(mconfig, IQ151_BASIC6, "IQ151 BASIC6", tag, owner, clock, "iq151_basic6", __FILE__) { } @@ -108,7 +108,7 @@ void iq151_basic6_device::read(offs_t offset, UINT8 &data) // iq151_basicg_device - constructor //------------------------------------------------- -iq151_basicg_device::iq151_basicg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +iq151_basicg_device::iq151_basicg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : iq151_rom_device(mconfig, IQ151_BASICG, "IQ151 BASICG", tag, owner, clock, "iq151_basicg", __FILE__) { } @@ -134,7 +134,7 @@ void iq151_basicg_device::read(offs_t offset, UINT8 &data) // iq151_amos1_device - constructor //------------------------------------------------- -iq151_amos1_device::iq151_amos1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +iq151_amos1_device::iq151_amos1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : iq151_rom_device(mconfig, IQ151_AMOS1, "IQ151 AMOS cart 1", tag, owner, clock, "iq151_amos1", __FILE__), m_active(true) { @@ -168,7 +168,7 @@ void iq151_amos1_device::io_write(offs_t offset, UINT8 data) // iq151_amos2_device - constructor //------------------------------------------------- -iq151_amos2_device::iq151_amos2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +iq151_amos2_device::iq151_amos2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : iq151_rom_device(mconfig, IQ151_AMOS2, "IQ151 AMOS cart 2", tag, owner, clock, "iq151_amos2", __FILE__), m_active(false) { @@ -202,7 +202,7 @@ void iq151_amos2_device::io_write(offs_t offset, UINT8 data) // iq151_amos3_device - constructor //------------------------------------------------- -iq151_amos3_device::iq151_amos3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +iq151_amos3_device::iq151_amos3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : iq151_rom_device(mconfig, IQ151_AMOS3, "IQ151 AMOS cart 3", tag, owner, clock, "iq151_amos3", __FILE__), m_active(true) { diff --git a/src/devices/bus/iq151/rom.h b/src/devices/bus/iq151/rom.h index b1c5a42cc22..c9ef60c7a0a 100644 --- a/src/devices/bus/iq151/rom.h +++ b/src/devices/bus/iq151/rom.h @@ -21,7 +21,7 @@ class iq151_rom_device : { public: // construction/destruction - iq151_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + iq151_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -44,7 +44,7 @@ class iq151_basic6_device : { public: // construction/destruction - iq151_basic6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + iq151_basic6_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // iq151cart_interface overrides @@ -58,7 +58,7 @@ class iq151_basicg_device : { public: // construction/destruction - iq151_basicg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + iq151_basicg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // iq151cart_interface overrides @@ -73,7 +73,7 @@ class iq151_amos1_device : { public: // construction/destruction - iq151_amos1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + iq151_amos1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // iq151cart_interface overrides @@ -91,7 +91,7 @@ class iq151_amos2_device : { public: // construction/destruction - iq151_amos2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + iq151_amos2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // iq151cart_interface overrides @@ -109,7 +109,7 @@ class iq151_amos3_device : { public: // construction/destruction - iq151_amos3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + iq151_amos3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // iq151cart_interface overrides diff --git a/src/devices/bus/iq151/staper.cpp b/src/devices/bus/iq151/staper.cpp index 9bd55c4d986..9876c0cb918 100644 --- a/src/devices/bus/iq151/staper.cpp +++ b/src/devices/bus/iq151/staper.cpp @@ -44,7 +44,7 @@ const device_type IQ151_STAPER = &device_creator<iq151_staper_device>; // iq151_staper_device - constructor //------------------------------------------------- -iq151_staper_device::iq151_staper_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +iq151_staper_device::iq151_staper_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, IQ151_STAPER, "IQ151 STAPER", tag, owner, clock, "iq151_staper", __FILE__), device_iq151cart_interface( mconfig, *this ), m_ppi(*this, "ppi8255"), diff --git a/src/devices/bus/iq151/staper.h b/src/devices/bus/iq151/staper.h index 426f87116f0..5569c6f109d 100644 --- a/src/devices/bus/iq151/staper.h +++ b/src/devices/bus/iq151/staper.h @@ -22,7 +22,7 @@ class iq151_staper_device : { public: // construction/destruction - iq151_staper_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + iq151_staper_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/iq151/video32.cpp b/src/devices/bus/iq151/video32.cpp index a5ce59a51db..1f3e0d187d1 100644 --- a/src/devices/bus/iq151/video32.cpp +++ b/src/devices/bus/iq151/video32.cpp @@ -57,7 +57,7 @@ const device_type IQ151_VIDEO32 = &device_creator<iq151_video32_device>; // iq151_video32_device - constructor //------------------------------------------------- -iq151_video32_device::iq151_video32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +iq151_video32_device::iq151_video32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, IQ151_VIDEO32, "IQ151 video32", tag, owner, clock, "iq151_video32", __FILE__), device_iq151cart_interface( mconfig, *this ), m_videoram(nullptr), m_chargen(nullptr), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/devices/bus/iq151/video32.h b/src/devices/bus/iq151/video32.h index d8b3a1e93eb..4c789edcc57 100644 --- a/src/devices/bus/iq151/video32.h +++ b/src/devices/bus/iq151/video32.h @@ -20,7 +20,7 @@ class iq151_video32_device : { public: // construction/destruction - iq151_video32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + iq151_video32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/iq151/video64.cpp b/src/devices/bus/iq151/video64.cpp index d58cca76aec..03c2161d815 100644 --- a/src/devices/bus/iq151/video64.cpp +++ b/src/devices/bus/iq151/video64.cpp @@ -57,7 +57,7 @@ const device_type IQ151_VIDEO64 = &device_creator<iq151_video64_device>; // iq151_video64_device - constructor //------------------------------------------------- -iq151_video64_device::iq151_video64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +iq151_video64_device::iq151_video64_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, IQ151_VIDEO64, "IQ151 video64", tag, owner, clock, "iq151_video64", __FILE__), device_iq151cart_interface( mconfig, *this ), m_videoram(nullptr), m_chargen(nullptr), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/devices/bus/iq151/video64.h b/src/devices/bus/iq151/video64.h index 0162e107e31..df3a9ace45b 100644 --- a/src/devices/bus/iq151/video64.h +++ b/src/devices/bus/iq151/video64.h @@ -20,7 +20,7 @@ class iq151_video64_device : { public: // construction/destruction - iq151_video64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + iq151_video64_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/isa/3c503.cpp b/src/devices/bus/isa/3c503.cpp index f0522e7fdbd..2138662060d 100644 --- a/src/devices/bus/isa/3c503.cpp +++ b/src/devices/bus/isa/3c503.cpp @@ -18,7 +18,7 @@ machine_config_constructor el2_3c503_device::device_mconfig_additions() const { return MACHINE_CONFIG_NAME(el2_3c503_config); } -el2_3c503_device::el2_3c503_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) +el2_3c503_device::el2_3c503_device(const machine_config& mconfig, std::string tag, device_t* owner, UINT32 clock) : device_t(mconfig, EL2_3C503, "3C503 Network Adapter", tag, owner, clock, "el2_3c503", __FILE__), device_isa8_card_interface(mconfig, *this), m_dp8390(*this, "dp8390d"), diff --git a/src/devices/bus/isa/3c503.h b/src/devices/bus/isa/3c503.h index 5a31c2948fe..75303641cf8 100644 --- a/src/devices/bus/isa/3c503.h +++ b/src/devices/bus/isa/3c503.h @@ -13,7 +13,7 @@ class el2_3c503_device: public device_t, public device_isa8_card_interface { public: - el2_3c503_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + el2_3c503_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; void el2_3c503_irq_w(int state); diff --git a/src/devices/bus/isa/3c505.cpp b/src/devices/bus/isa/3c505.cpp index 2cb640e91d5..d7bff0f5442 100644 --- a/src/devices/bus/isa/3c505.cpp +++ b/src/devices/bus/isa/3c505.cpp @@ -303,7 +303,7 @@ const device_type ISA16_3C505 = &device_creator<threecom3c505_device> ; // threecom3c505_device - constructor //------------------------------------------------- -threecom3c505_device::threecom3c505_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +threecom3c505_device::threecom3c505_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA16_3C505, "3Com 3C505 Network Adaptor", tag, owner, clock, "3c505", __FILE__), device_network_interface(mconfig, *this, 10.0f), device_isa16_card_interface(mconfig, *this), @@ -313,7 +313,7 @@ threecom3c505_device::threecom3c505_device(const machine_config &mconfig, const { } -threecom3c505_device::threecom3c505_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock) +threecom3c505_device::threecom3c505_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, type, "3Com 3C505 Network Adaptor", tag, owner, clock, "3c505", __FILE__), device_network_interface(mconfig, *this, 10.0f), device_isa16_card_interface(mconfig, *this), @@ -432,8 +432,8 @@ const char *threecom3c505_device::cpu_context() /* if we have an executing CPU, output data */ if (cpu != nullptr) { - sprintf(statebuf, "%d.%03d %s pc=%08x - %s", s, ms, cpu->tag(), - cpu->safe_pcbase(), tag()); + sprintf(statebuf, "%d.%03d %s pc=%08x - %s", s, ms, cpu->tag().c_str(), + cpu->safe_pcbase(), tag().c_str()); } else { diff --git a/src/devices/bus/isa/3c505.h b/src/devices/bus/isa/3c505.h index e31317792da..3095dc4eae9 100644 --- a/src/devices/bus/isa/3c505.h +++ b/src/devices/bus/isa/3c505.h @@ -123,8 +123,8 @@ class threecom3c505_device: public device_t, { public: // construction/destruction - threecom3c505_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - threecom3c505_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock); + threecom3c505_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + threecom3c505_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock); // device register I/O virtual DECLARE_READ16_MEMBER(read); diff --git a/src/devices/bus/isa/adlib.cpp b/src/devices/bus/isa/adlib.cpp index 42e2afd9604..59a573ac359 100644 --- a/src/devices/bus/isa/adlib.cpp +++ b/src/devices/bus/isa/adlib.cpp @@ -61,7 +61,7 @@ machine_config_constructor isa8_adlib_device::device_mconfig_additions() const // isa8_adlib_device - constructor //------------------------------------------------- -isa8_adlib_device::isa8_adlib_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +isa8_adlib_device::isa8_adlib_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_ADLIB, "Ad Lib Sound Card", tag, owner, clock, "isa_adlib", __FILE__), device_isa8_card_interface( mconfig, *this ), m_ym3812(*this, "ym3812") diff --git a/src/devices/bus/isa/adlib.h b/src/devices/bus/isa/adlib.h index da22516fd72..cc4b2d87a24 100644 --- a/src/devices/bus/isa/adlib.h +++ b/src/devices/bus/isa/adlib.h @@ -21,7 +21,7 @@ class isa8_adlib_device : { public: // construction/destruction - isa8_adlib_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa8_adlib_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/isa/aga.cpp b/src/devices/bus/isa/aga.cpp index 9146f2ce581..ce3194ad28f 100644 --- a/src/devices/bus/isa/aga.cpp +++ b/src/devices/bus/isa/aga.cpp @@ -56,7 +56,7 @@ const device_type ISA8_AGA = &device_creator<isa8_aga_device>; // isa8_aga_device - constructor //------------------------------------------------- -isa8_aga_device::isa8_aga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_aga_device::isa8_aga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t( mconfig, ISA8_AGA, "AGA", tag, owner, clock, "aga", __FILE__), device_isa8_card_interface(mconfig, *this), m_palette(*this, "palette"), @@ -78,7 +78,7 @@ isa8_aga_device::isa8_aga_device(const machine_config &mconfig, const char *tag, { } -isa8_aga_device::isa8_aga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +isa8_aga_device::isa8_aga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_isa8_card_interface(mconfig, *this), m_palette(*this, "palette"), @@ -164,7 +164,7 @@ const device_type ISA8_AGA_PC200 = &device_creator<isa8_aga_pc200_device>; // isa8_aga_pc200_device - constructor //------------------------------------------------- -isa8_aga_pc200_device::isa8_aga_pc200_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_aga_pc200_device::isa8_aga_pc200_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : isa8_aga_device( mconfig, ISA8_AGA_PC200, "AGA PC200", tag, owner, clock, "aga_pc200", __FILE__), m_port8(0), m_portd(0), diff --git a/src/devices/bus/isa/aga.h b/src/devices/bus/isa/aga.h index c0c80ac29bb..e9a312f4569 100644 --- a/src/devices/bus/isa/aga.h +++ b/src/devices/bus/isa/aga.h @@ -37,8 +37,8 @@ class isa8_aga_device : { public: // construction/destruction - isa8_aga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - isa8_aga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + isa8_aga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + isa8_aga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides virtual void device_start() override; // optional information overrides @@ -106,7 +106,7 @@ class isa8_aga_pc200_device : { public: // construction/destruction - isa8_aga_pc200_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa8_aga_pc200_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; // optional information overrides diff --git a/src/devices/bus/isa/aha1542.cpp b/src/devices/bus/isa/aha1542.cpp index cc557c47eaa..1faebfc73ee 100644 --- a/src/devices/bus/isa/aha1542.cpp +++ b/src/devices/bus/isa/aha1542.cpp @@ -183,7 +183,7 @@ machine_config_constructor aha1542_device::device_mconfig_additions() const return MACHINE_CONFIG_NAME( aha1542 ); } -aha1542_device::aha1542_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +aha1542_device::aha1542_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, AHA1542, "AHA1542 SCSI Controller", tag, owner, clock, "aha1542", __FILE__ ), device_isa16_card_interface(mconfig, *this) { diff --git a/src/devices/bus/isa/aha1542.h b/src/devices/bus/isa/aha1542.h index ecbe2f158d2..428a48c7185 100644 --- a/src/devices/bus/isa/aha1542.h +++ b/src/devices/bus/isa/aha1542.h @@ -30,7 +30,7 @@ class aha1542_device : public device_t, { public: // construction/destruction - aha1542_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + aha1542_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/isa/cga.cpp b/src/devices/bus/isa/cga.cpp index 888318f65d7..0adbdee5758 100644 --- a/src/devices/bus/isa/cga.cpp +++ b/src/devices/bus/isa/cga.cpp @@ -304,7 +304,7 @@ const rom_entry *isa8_cga_device::device_rom_region() const // isa8_cga_device - constructor //------------------------------------------------- -isa8_cga_device::isa8_cga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_cga_device::isa8_cga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_CGA, "IBM Color/Graphics Monitor Adapter", tag, owner, clock, "cga", __FILE__), device_isa8_card_interface(mconfig, *this), m_cga_config(*this, "cga_config"), m_framecnt(0), m_mode_control(0), m_color_select(0), @@ -320,7 +320,7 @@ isa8_cga_device::isa8_cga_device(const machine_config &mconfig, const char *tag, m_superimpose = false; } -isa8_cga_device::isa8_cga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +isa8_cga_device::isa8_cga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_isa8_card_interface(mconfig, *this), m_cga_config(*this, "cga_config"), m_framecnt(0), m_mode_control(0), m_color_select(0), @@ -443,7 +443,7 @@ const device_type ISA8_CGA_POISK2 = &device_creator<isa8_cga_poisk2_device>; // isa8_cga_poisk2_device - constructor //------------------------------------------------- -isa8_cga_poisk2_device::isa8_cga_poisk2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_cga_poisk2_device::isa8_cga_poisk2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : isa8_cga_device( mconfig, ISA8_CGA_POISK2, "ISA8_CGA_POISK2", tag, owner, clock, "cga_poisk2", __FILE__) { m_chr_gen_offset[0] = 0x0000; @@ -472,13 +472,13 @@ const device_type ISA8_CGA_SUPERIMPOSE = &device_creator<isa8_cga_superimpose_de // isa8_cga_superimpose_device - constructor //------------------------------------------------- -isa8_cga_superimpose_device::isa8_cga_superimpose_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_cga_superimpose_device::isa8_cga_superimpose_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : isa8_cga_device( mconfig, ISA8_CGA_SUPERIMPOSE, "ISA8_CGA_SUPERIMPOSE", tag, owner, clock, "cga_superimpose", __FILE__) { m_superimpose = true; } -isa8_cga_superimpose_device::isa8_cga_superimpose_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +isa8_cga_superimpose_device::isa8_cga_superimpose_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : isa8_cga_device( mconfig, type, name, tag, owner, clock, shortname, source) { m_superimpose = true; @@ -1548,7 +1548,7 @@ const UINT8 isa8_cga_pc1512_device::mc6845_writeonce_register[31] = // isa8_cga_pc1512_device - constructor //------------------------------------------------- -isa8_cga_pc1512_device::isa8_cga_pc1512_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_cga_pc1512_device::isa8_cga_pc1512_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : isa8_cga_device( mconfig, ISA8_CGA_PC1512, "ISA8_CGA_PC1512", tag, owner, clock, "cga_pc1512", __FILE__), m_write(0), m_read(0), m_mc6845_address(0) { m_vram_size = 0x10000; @@ -1677,7 +1677,7 @@ const device_type ISA8_WYSE700 = &device_creator<isa8_wyse700_device>; // isa8_wyse700_device - constructor //------------------------------------------------- -isa8_wyse700_device::isa8_wyse700_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_wyse700_device::isa8_wyse700_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : isa8_cga_device( mconfig, ISA8_WYSE700, "Wyse 700", tag, owner, clock, "wyse700", __FILE__), m_bank_offset(0), m_bank_base(0), m_control(0) { m_vram_size = 0x20000; @@ -1765,7 +1765,7 @@ const device_type ISA8_EC1841_0002 = &device_creator<isa8_ec1841_0002_device>; // isa8_ec1841_0002_device - constructor //------------------------------------------------- -isa8_ec1841_0002_device::isa8_ec1841_0002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_ec1841_0002_device::isa8_ec1841_0002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : isa8_cga_device( mconfig, ISA8_EC1841_0002, "EC 1841.0002 (CGA)", tag, owner, clock, "ec1841_0002", __FILE__), m_p3df(0) { } @@ -1845,7 +1845,7 @@ const device_type ISA8_CGA_MC1502 = &device_creator<isa8_cga_mc1502_device>; // isa8_cga_mc1502_device - constructor //------------------------------------------------- -isa8_cga_mc1502_device::isa8_cga_mc1502_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_cga_mc1502_device::isa8_cga_mc1502_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : isa8_cga_device( mconfig, ISA8_CGA_MC1502, "MC1502 CGA", tag, owner, clock, "cga_mc1502", __FILE__) { m_vram_size = 0x8000; @@ -1874,7 +1874,7 @@ const device_type ISA8_CGA_ISKR1031 = &device_creator<isa8_cga_iskr1031_device>; // isa8_cga_iskr1031_device - constructor //------------------------------------------------- -isa8_cga_iskr1031_device::isa8_cga_iskr1031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_cga_iskr1031_device::isa8_cga_iskr1031_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : isa8_cga_device( mconfig, ISA8_CGA_ISKR1031, "Iskra-1031 CGA", tag, owner, clock, "cga_iskr1031", __FILE__) { } @@ -1899,7 +1899,7 @@ const device_type ISA8_CGA_ISKR1030M = &device_creator<isa8_cga_iskr1030m_device // isa8_cga_iskr1030m_device - constructor //------------------------------------------------- -isa8_cga_iskr1030m_device::isa8_cga_iskr1030m_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_cga_iskr1030m_device::isa8_cga_iskr1030m_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : isa8_cga_device( mconfig, ISA8_CGA_ISKR1030M, "Iskra-1030M CGA", tag, owner, clock, "cga_iskr1030m", __FILE__) { } @@ -1930,7 +1930,7 @@ machine_config_constructor isa8_cga_m24_device::device_mconfig_additions() const { return MACHINE_CONFIG_NAME( m24 ); } -isa8_cga_m24_device::isa8_cga_m24_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_cga_m24_device::isa8_cga_m24_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : isa8_cga_device( mconfig, ISA8_CGA_M24, "Olivetti M24 CGA", tag, owner, clock, "cga_m24", __FILE__), m_mode2(0), m_index(0) { m_vram_size = 0x8000; diff --git a/src/devices/bus/isa/cga.h b/src/devices/bus/isa/cga.h index 09212df65fc..7a3adcd15b3 100644 --- a/src/devices/bus/isa/cga.h +++ b/src/devices/bus/isa/cga.h @@ -26,8 +26,8 @@ class isa8_cga_device : public: // construction/destruction - isa8_cga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - isa8_cga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + isa8_cga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + isa8_cga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); virtual MC6845_UPDATE_ROW( crtc_update_row ); MC6845_UPDATE_ROW( cga_text_inten_update_row ); @@ -97,8 +97,8 @@ class isa8_cga_superimpose_device : { public: // construction/destruction - isa8_cga_superimpose_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - isa8_cga_superimpose_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + isa8_cga_superimpose_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + isa8_cga_superimpose_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); }; // device type definition @@ -112,7 +112,7 @@ class isa8_cga_poisk2_device : { public: // construction/destruction - isa8_cga_poisk2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa8_cga_poisk2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; }; @@ -128,7 +128,7 @@ class isa8_cga_pc1512_device : { public: // construction/destruction - isa8_cga_pc1512_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa8_cga_pc1512_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; virtual const rom_entry *device_rom_region() const override; @@ -170,7 +170,7 @@ class isa8_wyse700_device : { public: // construction/destruction - isa8_wyse700_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa8_wyse700_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -200,7 +200,7 @@ class isa8_ec1841_0002_device : { public: // construction/destruction - isa8_ec1841_0002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa8_ec1841_0002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides @@ -226,7 +226,7 @@ class isa8_cga_iskr1030m_device : { public: // construction/destruction - isa8_cga_iskr1030m_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa8_cga_iskr1030m_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual const rom_entry *device_rom_region() const override; }; @@ -240,7 +240,7 @@ class isa8_cga_iskr1031_device : { public: // construction/destruction - isa8_cga_iskr1031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa8_cga_iskr1031_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual const rom_entry *device_rom_region() const override; }; @@ -254,7 +254,7 @@ class isa8_cga_mc1502_device : { public: // construction/destruction - isa8_cga_mc1502_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa8_cga_mc1502_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; }; @@ -268,7 +268,7 @@ class isa8_cga_m24_device : { public: // construction/destruction - isa8_cga_m24_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa8_cga_m24_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; // optional information overrides //virtual const rom_entry *device_rom_region() const; diff --git a/src/devices/bus/isa/com.cpp b/src/devices/bus/isa/com.cpp index 9a15b0b2e1f..676fde0c221 100644 --- a/src/devices/bus/isa/com.cpp +++ b/src/devices/bus/isa/com.cpp @@ -95,13 +95,13 @@ machine_config_constructor isa8_com_device::device_mconfig_additions() const // isa8_com_device - constructor //------------------------------------------------- -isa8_com_device::isa8_com_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_com_device::isa8_com_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_COM, "Communications Adapter PC/XT", tag, owner, clock, "isa_com", __FILE__), device_isa8_card_interface(mconfig, *this) { } -isa8_com_device::isa8_com_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +isa8_com_device::isa8_com_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_isa8_card_interface(mconfig, *this) { @@ -188,7 +188,7 @@ machine_config_constructor isa8_com_at_device::device_mconfig_additions() const // isa8_com_device - constructor //------------------------------------------------- -isa8_com_at_device::isa8_com_at_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_com_at_device::isa8_com_at_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : isa8_com_device(mconfig, ISA8_COM_AT, "Communications Adapter", tag, owner, clock, "isa_com_at", __FILE__) { } diff --git a/src/devices/bus/isa/com.h b/src/devices/bus/isa/com.h index 807d390ef83..a514a586022 100644 --- a/src/devices/bus/isa/com.h +++ b/src/devices/bus/isa/com.h @@ -21,8 +21,8 @@ class isa8_com_device : { public: // construction/destruction - isa8_com_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - isa8_com_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + isa8_com_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + isa8_com_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -45,7 +45,7 @@ class isa8_com_at_device : { public: // construction/destruction - isa8_com_at_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa8_com_at_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/isa/dectalk.cpp b/src/devices/bus/isa/dectalk.cpp index 169748eeae6..75e043be992 100644 --- a/src/devices/bus/isa/dectalk.cpp +++ b/src/devices/bus/isa/dectalk.cpp @@ -4,7 +4,7 @@ const device_type ISA8_DECTALK = &device_creator<dectalk_isa_device>; -dectalk_isa_device::dectalk_isa_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) : +dectalk_isa_device::dectalk_isa_device(const machine_config& mconfig, std::string tag, device_t* owner, UINT32 clock) : device_t(mconfig, ISA8_DECTALK, "DECTalk-PC", tag, owner, clock, "dectalk_isa", __FILE__), device_isa8_card_interface(mconfig, *this), m_cmd(0), diff --git a/src/devices/bus/isa/dectalk.h b/src/devices/bus/isa/dectalk.h index 5d9d11f44ca..b0908cd4428 100644 --- a/src/devices/bus/isa/dectalk.h +++ b/src/devices/bus/isa/dectalk.h @@ -13,7 +13,7 @@ class dectalk_isa_device : public device_t, public device_isa8_card_interface { public: - dectalk_isa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + dectalk_isa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/isa/ega.cpp b/src/devices/bus/isa/ega.cpp index 85d943b92ac..59e82fcbb8a 100644 --- a/src/devices/bus/isa/ega.cpp +++ b/src/devices/bus/isa/ega.cpp @@ -570,7 +570,7 @@ ioport_constructor isa8_ega_device::device_input_ports() const // isa8_ega_device - constructor //------------------------------------------------- -isa8_ega_device::isa8_ega_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_ega_device::isa8_ega_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_EGA, "IBM Enhanced Graphics Adapter", tag, owner, clock, "ega", __FILE__), device_isa8_card_interface(mconfig, *this), m_crtc_ega(nullptr), m_vram(nullptr), m_videoram(nullptr), m_charA(nullptr), m_charB(nullptr), m_misc_output(0), m_feature_control(0), m_frame_cnt(0), m_hsync(0), m_vsync(0), m_vblank(0), m_display_enable(0), m_video_mode(0), @@ -578,7 +578,7 @@ isa8_ega_device::isa8_ega_device(const machine_config &mconfig, const char *tag, { } -isa8_ega_device::isa8_ega_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +isa8_ega_device::isa8_ega_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_isa8_card_interface(mconfig, *this), m_crtc_ega(nullptr), m_vram(nullptr), m_videoram(nullptr), m_charA(nullptr), m_charB(nullptr), m_misc_output(0), m_feature_control(0), m_frame_cnt(0), m_hsync(0), m_vsync(0), m_vblank(0), m_display_enable(0), m_video_mode(0), diff --git a/src/devices/bus/isa/ega.h b/src/devices/bus/isa/ega.h index 99dac11e1aa..6edb0dba81a 100644 --- a/src/devices/bus/isa/ega.h +++ b/src/devices/bus/isa/ega.h @@ -21,8 +21,8 @@ class isa8_ega_device : { public: // construction/destruction - isa8_ega_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - isa8_ega_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + isa8_ega_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + isa8_ega_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/isa/fdc.cpp b/src/devices/bus/isa/fdc.cpp index a7698784a26..4bf1b974227 100644 --- a/src/devices/bus/isa/fdc.cpp +++ b/src/devices/bus/isa/fdc.cpp @@ -72,7 +72,7 @@ static MACHINE_CONFIG_FRAGMENT( cfg_superio ) MACHINE_CONFIG_END -isa8_fdc_device::isa8_fdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +isa8_fdc_device::isa8_fdc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_isa8_card_interface(mconfig, *this), fdc(*this, "fdc") @@ -115,7 +115,7 @@ void isa8_fdc_device::eop_w(int state) fdc->tc_w(state == ASSERT_LINE); } -isa8_fdc_xt_device::isa8_fdc_xt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : isa8_fdc_device(mconfig, ISA8_FDC_XT, "ISA 8bits XT FDC hookup", tag, owner, clock, "isa8_fdc_xt", __FILE__) +isa8_fdc_xt_device::isa8_fdc_xt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : isa8_fdc_device(mconfig, ISA8_FDC_XT, "ISA 8bits XT FDC hookup", tag, owner, clock, "isa8_fdc_xt", __FILE__) { } @@ -124,7 +124,7 @@ machine_config_constructor isa8_fdc_xt_device::device_mconfig_additions() const return MACHINE_CONFIG_NAME(cfg_xt); } -isa8_fdc_at_device::isa8_fdc_at_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : isa8_fdc_device(mconfig, ISA8_FDC_AT, "ISA 8bits AT FDC hookup", tag, owner, clock, "isa8_fdc_at", __FILE__) +isa8_fdc_at_device::isa8_fdc_at_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : isa8_fdc_device(mconfig, ISA8_FDC_AT, "ISA 8bits AT FDC hookup", tag, owner, clock, "isa8_fdc_at", __FILE__) { } @@ -133,7 +133,7 @@ machine_config_constructor isa8_fdc_at_device::device_mconfig_additions() const return MACHINE_CONFIG_NAME(cfg_at); } -isa8_fdc_smc_device::isa8_fdc_smc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : isa8_fdc_device(mconfig, ISA8_FDC_XT, "ISA 8bits SMC FDC hookup", tag, owner, clock, "isa8_fdc_smc", __FILE__) +isa8_fdc_smc_device::isa8_fdc_smc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : isa8_fdc_device(mconfig, ISA8_FDC_XT, "ISA 8bits SMC FDC hookup", tag, owner, clock, "isa8_fdc_smc", __FILE__) { } @@ -142,7 +142,7 @@ machine_config_constructor isa8_fdc_smc_device::device_mconfig_additions() const return MACHINE_CONFIG_NAME(cfg_smc); } -isa8_fdc_ps2_device::isa8_fdc_ps2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : isa8_fdc_device(mconfig, ISA8_FDC_PS2, "ISA 8bits PS/2 FDC hookup", tag, owner, clock, "isa8_fdc_ps2", __FILE__) +isa8_fdc_ps2_device::isa8_fdc_ps2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : isa8_fdc_device(mconfig, ISA8_FDC_PS2, "ISA 8bits PS/2 FDC hookup", tag, owner, clock, "isa8_fdc_ps2", __FILE__) { } @@ -151,7 +151,7 @@ machine_config_constructor isa8_fdc_ps2_device::device_mconfig_additions() const return MACHINE_CONFIG_NAME(cfg_ps2); } -isa8_fdc_superio_device::isa8_fdc_superio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : isa8_fdc_device(mconfig, ISA8_FDC_SUPERIO, "ISA 8bits SUPERIO FDC hookup", tag, owner, clock, "isa8_fdc_superio", __FILE__) +isa8_fdc_superio_device::isa8_fdc_superio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : isa8_fdc_device(mconfig, ISA8_FDC_SUPERIO, "ISA 8bits SUPERIO FDC hookup", tag, owner, clock, "isa8_fdc_superio", __FILE__) { } diff --git a/src/devices/bus/isa/fdc.h b/src/devices/bus/isa/fdc.h index 1848df8cd0a..3a2c85b7d01 100644 --- a/src/devices/bus/isa/fdc.h +++ b/src/devices/bus/isa/fdc.h @@ -26,7 +26,7 @@ class isa8_fdc_device : { public: // construction/destruction - isa8_fdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + isa8_fdc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); required_device<pc_fdc_interface> fdc; @@ -46,31 +46,31 @@ protected: class isa8_fdc_xt_device : public isa8_fdc_device { public: - isa8_fdc_xt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa8_fdc_xt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; }; class isa8_fdc_at_device : public isa8_fdc_device { public: - isa8_fdc_at_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa8_fdc_at_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; }; class isa8_fdc_smc_device : public isa8_fdc_device { public: - isa8_fdc_smc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa8_fdc_smc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; }; class isa8_fdc_ps2_device : public isa8_fdc_device { public: - isa8_fdc_ps2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa8_fdc_ps2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; }; class isa8_fdc_superio_device : public isa8_fdc_device { public: - isa8_fdc_superio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa8_fdc_superio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; }; diff --git a/src/devices/bus/isa/finalchs.cpp b/src/devices/bus/isa/finalchs.cpp index 94601de84da..0e19e95a865 100644 --- a/src/devices/bus/isa/finalchs.cpp +++ b/src/devices/bus/isa/finalchs.cpp @@ -89,7 +89,7 @@ machine_config_constructor isa8_finalchs_device::device_mconfig_additions() cons // isa8_finalchs_device - constructor //------------------------------------------------- -isa8_finalchs_device::isa8_finalchs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +isa8_finalchs_device::isa8_finalchs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_FINALCHS, "Final Chess Card", tag, owner, clock, "finalchs", __FILE__), device_isa8_card_interface( mconfig, *this ), m_FCH_latch_data(0) { diff --git a/src/devices/bus/isa/finalchs.h b/src/devices/bus/isa/finalchs.h index b964310b6ba..43eba15911d 100644 --- a/src/devices/bus/isa/finalchs.h +++ b/src/devices/bus/isa/finalchs.h @@ -20,7 +20,7 @@ class isa8_finalchs_device : { public: // construction/destruction - isa8_finalchs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa8_finalchs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER(finalchs_r); DECLARE_WRITE8_MEMBER(finalchs_w); diff --git a/src/devices/bus/isa/gblaster.cpp b/src/devices/bus/isa/gblaster.cpp index 22cb5edd328..da40cafc8b5 100644 --- a/src/devices/bus/isa/gblaster.cpp +++ b/src/devices/bus/isa/gblaster.cpp @@ -96,7 +96,7 @@ machine_config_constructor isa8_gblaster_device::device_mconfig_additions() cons // isa8_gblaster_device - constructor //------------------------------------------------- -isa8_gblaster_device::isa8_gblaster_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_gblaster_device::isa8_gblaster_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_GAME_BLASTER, "Game Blaster Sound Card", tag, owner, clock, "isa_gblaster", __FILE__), device_isa8_card_interface(mconfig, *this), m_saa1099_1(*this, "saa1099.1"), diff --git a/src/devices/bus/isa/gblaster.h b/src/devices/bus/isa/gblaster.h index 7dad823033a..93522760e0d 100644 --- a/src/devices/bus/isa/gblaster.h +++ b/src/devices/bus/isa/gblaster.h @@ -21,7 +21,7 @@ class isa8_gblaster_device : { public: // construction/destruction - isa8_gblaster_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa8_gblaster_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/isa/gus.cpp b/src/devices/bus/isa/gus.cpp index 2928aaa252c..28d790d81f8 100644 --- a/src/devices/bus/isa/gus.cpp +++ b/src/devices/bus/isa/gus.cpp @@ -350,7 +350,7 @@ void gf1_device::sound_stream_update(sound_stream &stream, stream_sample_t **inp // gf1_device - constructor //------------------------------------------------- -gf1_device::gf1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +gf1_device::gf1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : acia6850_device(mconfig, GGF1, "Gravis GF1", tag, owner, clock, "gf1", __FILE__), device_sound_interface( mconfig, *this ), m_dma_dram_ctrl(0), m_dma_start_addr(0), m_dram_addr(0), m_timer_ctrl(0), m_timer1_count(0), m_timer2_count(0), m_timer1_value(0), m_timer2_value(0), m_sampling_freq(0), m_sampling_ctrl(0), m_joy_trim_dac(0), m_reset(0), m_active_voices(0), m_irq_source(0), m_stream(nullptr), m_timer1(nullptr), m_timer2(nullptr), m_dmatimer(nullptr), m_voltimer(nullptr), m_current_voice(0), m_current_reg(0), m_adlib_cmd(0), m_mix_ctrl(0), m_gf1_irq(0), m_midi_irq(0), m_dma_channel1(0), m_dma_channel2(0), m_irq_combine(0), m_dma_combine(0), m_adlib_timer_cmd(0), m_adlib_timer1_enable(0), m_adlib_timer2_enable(0), m_adlib_status(0), m_adlib_data(0), m_voice_irq_ptr(0), m_voice_irq_current(0), m_dma_16bit(0), m_statread(0), m_sb_data_2xc(0), m_sb_data_2xe(0), m_reg_ctrl(0), m_fake_adlib_status(0), m_dma_current(0), m_txirq(0), m_rxirq(0), m_txirq_handler(*this), @@ -1273,7 +1273,7 @@ ioport_constructor isa16_gus_device::device_input_ports() const } -isa16_gus_device::isa16_gus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa16_gus_device::isa16_gus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA16_GUS, "Gravis Ultrasound", tag, owner, clock, "isa_gus", __FILE__), device_isa16_card_interface( mconfig, *this ), m_gf1(*this, "gf1"), m_irq_status(0) diff --git a/src/devices/bus/isa/gus.h b/src/devices/bus/isa/gus.h index eb4413d3bd8..3626e645963 100644 --- a/src/devices/bus/isa/gus.h +++ b/src/devices/bus/isa/gus.h @@ -121,7 +121,7 @@ class gf1_device : { public: // construction/destruction - gf1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gf1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template<class _Object> static devcb_base &set_txirq_handler(device_t &device, _Object object) { return downcast<gf1_device &>(device).m_txirq_handler.set_callback(object); } template<class _Object> static devcb_base &set_rxirq_handler(device_t &device, _Object object) { return downcast<gf1_device &>(device).m_rxirq_handler.set_callback(object); } @@ -267,7 +267,7 @@ class isa16_gus_device : public device_isa16_card_interface { public: - isa16_gus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa16_gus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void set_irq(UINT8 source); void reset_irq(UINT8 source); void set_midi_irq(UINT8 source); diff --git a/src/devices/bus/isa/hdc.cpp b/src/devices/bus/isa/hdc.cpp index 7708d341abd..6bf46ee72c0 100644 --- a/src/devices/bus/isa/hdc.cpp +++ b/src/devices/bus/isa/hdc.cpp @@ -161,7 +161,7 @@ const device_type XT_HDC = &device_creator<xt_hdc_device>; const device_type EC1841_HDC = &device_creator<ec1841_device>; const device_type ST11M_HDC = &device_creator<st11m_device>; -xt_hdc_device::xt_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +xt_hdc_device::xt_hdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, XT_HDC, "Generic PC-XT Fixed Disk Controller", tag, owner, clock, "xt_hdc", __FILE__), buffer_ptr(nullptr), csb(0), status(0), error(0), m_current_cmd(0), m_irq_handler(*this), m_drq_handler(*this), drv(0), timer(nullptr), data_cnt(0), hdc_control(0), hdcdma_src(nullptr), hdcdma_dst(nullptr), hdcdma_read(0), hdcdma_write(0), hdcdma_size(0) @@ -169,14 +169,14 @@ xt_hdc_device::xt_hdc_device(const machine_config &mconfig, const char *tag, dev m_type = STANDARD; } -xt_hdc_device::xt_hdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +xt_hdc_device::xt_hdc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), buffer_ptr(nullptr), csb(0), status(0), error(0), m_type(0), m_current_cmd(0), m_irq_handler(*this), m_drq_handler(*this), drv(0), timer(nullptr), data_cnt(0), hdc_control(0), hdcdma_src(nullptr), hdcdma_dst(nullptr), hdcdma_read(0), hdcdma_write(0), hdcdma_size(0) { } -ec1841_device::ec1841_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +ec1841_device::ec1841_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : xt_hdc_device(mconfig, EC1841_HDC, "EC1841 Fixed Disk Controller", tag, owner, clock, "ec1481", __FILE__), m_irq_handler(*this), m_drq_handler(*this) @@ -184,7 +184,7 @@ ec1841_device::ec1841_device(const machine_config &mconfig, const char *tag, dev m_type = EC1841; } -st11m_device::st11m_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +st11m_device::st11m_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : xt_hdc_device(mconfig, EC1841_HDC, "Seagate ST11M Fixed Disk Controller", tag, owner, clock, "st11m", __FILE__), m_irq_handler(*this), m_drq_handler(*this) @@ -918,21 +918,21 @@ ioport_constructor isa8_hdc_device::device_input_ports() const // isa8_hdc_device - constructor //------------------------------------------------- -isa8_hdc_device::isa8_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_hdc_device::isa8_hdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_HDC, "Fixed Disk Controller Card", tag, owner, clock, "hdc", __FILE__), device_isa8_card_interface(mconfig, *this), m_hdc(*this,"hdc"), dip(0) { } -isa8_hdc_device::isa8_hdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +isa8_hdc_device::isa8_hdc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_isa8_card_interface(mconfig, *this), m_hdc(*this,"hdc"), dip(0) { } -isa8_hdc_ec1841_device::isa8_hdc_ec1841_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_hdc_ec1841_device::isa8_hdc_ec1841_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : isa8_hdc_device( mconfig, ISA8_HDC_EC1841, "EC1841 HDC", tag, owner, clock, "hdc_ec1841", __FILE__), m_hdc(*this,"hdc") { diff --git a/src/devices/bus/isa/hdc.h b/src/devices/bus/isa/hdc.h index 994af2ea3ba..afd8c46e0b8 100644 --- a/src/devices/bus/isa/hdc.h +++ b/src/devices/bus/isa/hdc.h @@ -31,8 +31,8 @@ class xt_hdc_device : { public: // construction/destruction - xt_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - xt_hdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + xt_hdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + xt_hdc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<xt_hdc_device &>(device).m_irq_handler.set_callback(object); } template<class _Object> static devcb_base &set_drq_handler(device_t &device, _Object object) { return downcast<xt_hdc_device &>(device).m_drq_handler.set_callback(object); } @@ -114,7 +114,7 @@ private: class ec1841_device : public xt_hdc_device { public: - ec1841_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ec1841_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: devcb_write_line m_irq_handler; devcb_write_line m_drq_handler; @@ -123,7 +123,7 @@ protected: class st11m_device : public xt_hdc_device { public: - st11m_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + st11m_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: devcb_write_line m_irq_handler; @@ -142,8 +142,8 @@ class isa8_hdc_device : { public: // construction/destruction - isa8_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - isa8_hdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + isa8_hdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + isa8_hdc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); DECLARE_READ8_MEMBER(pc_hdc_r); DECLARE_WRITE8_MEMBER(pc_hdc_w); @@ -171,7 +171,7 @@ public: class isa8_hdc_ec1841_device : public isa8_hdc_device { public: - isa8_hdc_ec1841_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa8_hdc_ec1841_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/isa/ibm_mfc.cpp b/src/devices/bus/isa/ibm_mfc.cpp index b6445c9385f..9be7925d652 100644 --- a/src/devices/bus/isa/ibm_mfc.cpp +++ b/src/devices/bus/isa/ibm_mfc.cpp @@ -447,7 +447,7 @@ const rom_entry *isa8_ibm_mfc_device::device_rom_region() const // isa8_ibm_mfc_device - constructor //------------------------------------------------- -isa8_ibm_mfc_device::isa8_ibm_mfc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_ibm_mfc_device::isa8_ibm_mfc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_IBM_MFC, "IBM PC Music Feature Card", tag, owner, clock, "ibm_mfc", __FILE__), device_isa8_card_interface(mconfig, *this), m_tcr(0), m_pc_ppi_c(0), m_z80_ppi_c(0), m_pc_irq_state(0), m_z80_irq_state(0), m_cpu(*this, "ibm_mfc"), diff --git a/src/devices/bus/isa/ibm_mfc.h b/src/devices/bus/isa/ibm_mfc.h index 4a86972d838..cbfb00d506a 100644 --- a/src/devices/bus/isa/ibm_mfc.h +++ b/src/devices/bus/isa/ibm_mfc.h @@ -30,7 +30,7 @@ class isa8_ibm_mfc_device : public device_t, { public: // Construction/destruction - isa8_ibm_mfc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa8_ibm_mfc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER( ppi0_i_a ); DECLARE_WRITE8_MEMBER( ppi0_o_b ); diff --git a/src/devices/bus/isa/ide.cpp b/src/devices/bus/isa/ide.cpp index be638b76a7f..c62ec060a2e 100644 --- a/src/devices/bus/isa/ide.cpp +++ b/src/devices/bus/isa/ide.cpp @@ -86,7 +86,7 @@ ioport_constructor isa16_ide_device::device_input_ports() const // isa16_ide_device - constructor //------------------------------------------------- -isa16_ide_device::isa16_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +isa16_ide_device::isa16_ide_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA16_IDE, "IDE Fixed Drive Adapter", tag, owner, clock, "isa_ide", __FILE__), device_isa16_card_interface( mconfig, *this ), m_is_primary(true), diff --git a/src/devices/bus/isa/ide.h b/src/devices/bus/isa/ide.h index 7a59e15da20..cc4d8ae4c07 100644 --- a/src/devices/bus/isa/ide.h +++ b/src/devices/bus/isa/ide.h @@ -20,7 +20,7 @@ class isa16_ide_device : public device_t, { public: // construction/destruction - isa16_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa16_ide_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/isa/isa.cpp b/src/devices/bus/isa/isa.cpp index 0d8f0c777e1..308d5c487a9 100644 --- a/src/devices/bus/isa/isa.cpp +++ b/src/devices/bus/isa/isa.cpp @@ -24,17 +24,16 @@ const device_type ISA8_SLOT = &device_creator<isa8_slot_device>; //------------------------------------------------- // isa8_slot_device - constructor //------------------------------------------------- -isa8_slot_device::isa8_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_slot_device::isa8_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_SLOT, "ISA8_SLOT", tag, owner, clock, "isa8_slot", __FILE__), device_slot_interface(mconfig, *this), - m_owner(nullptr), - m_isa_tag(nullptr) + m_owner(nullptr) { } -isa8_slot_device::isa8_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +isa8_slot_device::isa8_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_interface(mconfig, *this), m_owner(nullptr), m_isa_tag(nullptr) + device_slot_interface(mconfig, *this), m_owner(nullptr) { } @@ -74,7 +73,7 @@ const device_type ISA16_SLOT = &device_creator<isa16_slot_device>; //------------------------------------------------- // isa16_slot_device - constructor //------------------------------------------------- -isa16_slot_device::isa16_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa16_slot_device::isa16_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : isa8_slot_device(mconfig, ISA16_SLOT, "ISA16_SLOT", tag, owner, clock, "isa16_slot", __FILE__) { } @@ -103,7 +102,7 @@ void isa16_slot_device::device_start() const device_type ISA8 = &device_creator<isa8_device>; -void isa8_device::static_set_cputag(device_t &device, const char *tag) +void isa8_device::static_set_cputag(device_t &device, std::string tag) { isa8_device &isa = downcast<isa8_device &>(device); isa.m_cputag = tag; @@ -135,7 +134,7 @@ void isa8_device::device_config_complete() // isa8_device - constructor //------------------------------------------------- -isa8_device::isa8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_device::isa8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8, "ISA8", tag, owner, clock, "isa8", __FILE__), device_memory_interface(mconfig, *this), m_program_config("ISA 8-bit program", ENDIANNESS_LITTLE, 8, 24, 0, nullptr), @@ -150,7 +149,7 @@ isa8_device::isa8_device(const machine_config &mconfig, const char *tag, device_ m_out_irq7_cb(*this), m_out_drq1_cb(*this), m_out_drq2_cb(*this), - m_out_drq3_cb(*this), m_cputag(nullptr), + m_out_drq3_cb(*this), m_write_iochck(*this) { for(int i=0;i<8;i++) @@ -163,7 +162,7 @@ isa8_device::isa8_device(const machine_config &mconfig, const char *tag, device_ m_allocspaces = false; } -isa8_device::isa8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +isa8_device::isa8_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_memory_interface(mconfig, *this), m_program_config("ISA 8-bit program", ENDIANNESS_LITTLE, 8, 24, 0, nullptr), @@ -178,7 +177,7 @@ isa8_device::isa8_device(const machine_config &mconfig, device_type type, const m_out_irq7_cb(*this), m_out_drq1_cb(*this), m_out_drq2_cb(*this), - m_out_drq3_cb(*this), m_cputag(nullptr), + m_out_drq3_cb(*this), m_write_iochck(*this) { for(int i=0;i<8;i++) @@ -320,7 +319,7 @@ void isa8_device::install_device(offs_t start, offs_t end, offs_t mask, offs_t m } -void isa8_device::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data) +void isa8_device::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, std::string tag, UINT8 *data) { m_prgspace->install_readwrite_bank(start, end, mask, mirror, tag ); machine().root_device().membank(tag)->set_base(data); @@ -331,7 +330,7 @@ void isa8_device::unmap_bank(offs_t start, offs_t end, offs_t mask, offs_t mirro m_prgspace->unmap_readwrite(start, end, mask, mirror); } -void isa8_device::install_rom(device_t *dev, offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, const char *region) +void isa8_device::install_rom(device_t *dev, offs_t start, offs_t end, offs_t mask, offs_t mirror, std::string tag, const char *region) { if (machine().root_device().memregion("isa")) { UINT8 *src = dev->memregion(region)->base(); @@ -462,7 +461,7 @@ const device_type ISA16 = &device_creator<isa16_device>; // isa16_device - constructor //------------------------------------------------- -isa16_device::isa16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa16_device::isa16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : isa8_device(mconfig, ISA16, "ISA16", tag, owner, clock, "isa16", __FILE__), m_out_irq10_cb(*this), m_out_irq11_cb(*this), diff --git a/src/devices/bus/isa/isa.h b/src/devices/bus/isa/isa.h index a93fddd6acb..5c8ee7a3151 100644 --- a/src/devices/bus/isa/isa.h +++ b/src/devices/bus/isa/isa.h @@ -162,8 +162,8 @@ class isa8_slot_device : public device_t, { public: // construction/destruction - isa8_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - isa8_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + isa8_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + isa8_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides virtual void device_start() override; @@ -186,10 +186,10 @@ class isa8_device : public device_t, { public: // construction/destruction - isa8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - isa8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + isa8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + isa8_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // inline configuration - static void static_set_cputag(device_t &device, const char *tag); + static void static_set_cputag(device_t &device, std::string tag); static void static_set_custom_spaces(device_t &device); template<class _iochck> void set_iochck_callback(_iochck iochck) { m_write_iochck.set_callback(iochck); } template<class _Object> static devcb_base &set_out_irq2_callback(device_t &device, _Object object) { return downcast<isa8_device &>(device).m_out_irq2_cb.set_callback(object); } @@ -220,8 +220,8 @@ public: { m_iospace->install_device(addrstart, addrend, device, map, bits, unitmask); } - void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data); - void install_rom(device_t *dev, offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, const char *region); + void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, std::string tag, UINT8 *data); + void install_rom(device_t *dev, offs_t start, offs_t end, offs_t mask, offs_t mirror, std::string tag, const char *region); void install_memory(offs_t start, offs_t end, offs_t mask, offs_t mirror, read8_delegate rhandler, write8_delegate whandler); void unmap_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror); @@ -284,7 +284,7 @@ protected: device_isa8_card_interface *m_dma_device[8]; bool m_dma_eop[8]; - const char *m_cputag; + std::string m_cputag; bool m_nmi_enabled; private: @@ -328,7 +328,7 @@ class isa16_slot_device : public isa8_slot_device { public: // construction/destruction - isa16_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa16_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -345,7 +345,7 @@ class isa16_device : public isa8_device { public: // construction/destruction - isa16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template<class _Object> static devcb_base &set_out_irq10_callback(device_t &device, _Object object) { return downcast<isa16_device &>(device).m_out_irq10_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_irq11_callback(device_t &device, _Object object) { return downcast<isa16_device &>(device).m_out_irq11_cb.set_callback(object); } diff --git a/src/devices/bus/isa/lpt.cpp b/src/devices/bus/isa/lpt.cpp index 1baa190b034..2d3bf079aea 100644 --- a/src/devices/bus/isa/lpt.cpp +++ b/src/devices/bus/isa/lpt.cpp @@ -12,7 +12,7 @@ const device_type ISA8_LPT = &device_creator<isa8_lpt_device>; -isa8_lpt_device::isa8_lpt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_lpt_device::isa8_lpt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_LPT, "Printer Adapter", tag, owner, clock, "isa_lpt", __FILE__), device_isa8_card_interface(mconfig, *this), m_is_primary(false) diff --git a/src/devices/bus/isa/lpt.h b/src/devices/bus/isa/lpt.h index 6626198b430..12f8b7a4698 100644 --- a/src/devices/bus/isa/lpt.h +++ b/src/devices/bus/isa/lpt.h @@ -23,7 +23,7 @@ class isa8_lpt_device : public device_t, { public: // construction/destruction - isa8_lpt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa8_lpt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/isa/mach32.cpp b/src/devices/bus/isa/mach32.cpp index f041455a9ad..51054d22fee 100644 --- a/src/devices/bus/isa/mach32.cpp +++ b/src/devices/bus/isa/mach32.cpp @@ -22,14 +22,14 @@ const device_type ATIMACH64_8514A = &device_creator<mach64_8514a_device>; */ // 8514/A device -mach32_8514a_device::mach32_8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +mach32_8514a_device::mach32_8514a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : mach8_device(mconfig, ATIMACH32_8514A, "ATi mach32 (2D acceleration module)", tag, owner, clock, "mach32_8514a", __FILE__), m_chip_ID(0), m_membounds(0) { } -mach32_8514a_device::mach32_8514a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +mach32_8514a_device::mach32_8514a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : mach8_device(mconfig, type, name, tag, owner, clock, shortname, source), m_chip_ID(0), m_membounds(0) @@ -38,13 +38,13 @@ mach32_8514a_device::mach32_8514a_device(const machine_config &mconfig, device_t // SVGA device -mach32_device::mach32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +mach32_device::mach32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ati_vga_device(mconfig, ATIMACH32, "ATi mach32", tag, owner, clock, "mach32", __FILE__), m_8514a(*this,"8514a") { } -mach32_device::mach32_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +mach32_device::mach32_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : ati_vga_device(mconfig, type, name, tag, owner, clock, shortname, source), m_8514a(*this,"8514a") { @@ -95,25 +95,25 @@ void mach32_device::device_reset() */ // 8514/A device -mach64_8514a_device::mach64_8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +mach64_8514a_device::mach64_8514a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : mach32_8514a_device(mconfig, ATIMACH64_8514A, "ATi mach64 (2D acceleration module)", tag, owner, clock, "mach64_8514a", __FILE__) { } -mach64_8514a_device::mach64_8514a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +mach64_8514a_device::mach64_8514a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : mach32_8514a_device(mconfig, type, name, tag, owner, clock, shortname, source) { } // SVGA device -mach64_device::mach64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +mach64_device::mach64_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : mach32_device(mconfig, ATIMACH64, "ATi mach64", tag, owner, clock, "mach64", __FILE__), m_8514a(*this,"8514a") { } -mach64_device::mach64_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +mach64_device::mach64_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : mach32_device(mconfig, type, name, tag, owner, clock, shortname, source), m_8514a(*this,"8514a") { diff --git a/src/devices/bus/isa/mach32.h b/src/devices/bus/isa/mach32.h index 4f57f55faf9..52758769a75 100644 --- a/src/devices/bus/isa/mach32.h +++ b/src/devices/bus/isa/mach32.h @@ -18,8 +18,8 @@ class mach32_8514a_device : public mach8_device { public: // construction/destruction - mach32_8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - mach32_8514a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + mach32_8514a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mach32_8514a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); DECLARE_READ16_MEMBER(mach32_chipid_r) { return m_chip_ID; } DECLARE_WRITE16_MEMBER(mach32_clksel_w) { mach8.clksel = data; } // read only on the mach8 @@ -40,8 +40,8 @@ class mach32_device : public ati_vga_device { public: // construction/destruction - mach32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - mach32_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + mach32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mach32_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); required_device<mach32_8514a_device> m_8514a; // provides accelerated 2D drawing, derived from the Mach8 device @@ -137,8 +137,8 @@ class mach64_8514a_device : public mach32_8514a_device { public: // construction/destruction - mach64_8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - mach64_8514a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + mach64_8514a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mach64_8514a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); protected: virtual void device_start() override; @@ -151,8 +151,8 @@ class mach64_device : public mach32_device { public: // construction/destruction - mach64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - mach64_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + mach64_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mach64_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); required_device<mach64_8514a_device> m_8514a; // provides accelerated 2D drawing, derived from the Mach8 device diff --git a/src/devices/bus/isa/mc1502_fdc.cpp b/src/devices/bus/isa/mc1502_fdc.cpp index 0a482f3a3f9..f60ff49ebd5 100644 --- a/src/devices/bus/isa/mc1502_fdc.cpp +++ b/src/devices/bus/isa/mc1502_fdc.cpp @@ -189,7 +189,7 @@ WRITE8_MEMBER( mc1502_fdc_device::mc1502_fdc_w ) // mc1502_fdc_device - constructor //------------------------------------------------- -mc1502_fdc_device::mc1502_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +mc1502_fdc_device::mc1502_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MC1502_FDC, "MC-1502 floppy", tag, owner, clock, "mc1502_fdc", __FILE__), device_isa8_card_interface( mconfig, *this ), m_fdc(*this, "fdc"), motor_on(0), motor_timer(nullptr) diff --git a/src/devices/bus/isa/mc1502_fdc.h b/src/devices/bus/isa/mc1502_fdc.h index c254aa3b791..baed65dca9e 100644 --- a/src/devices/bus/isa/mc1502_fdc.h +++ b/src/devices/bus/isa/mc1502_fdc.h @@ -26,7 +26,7 @@ class mc1502_fdc_device : public device_t, { public: // construction/destruction - mc1502_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + mc1502_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/isa/mc1502_rom.cpp b/src/devices/bus/isa/mc1502_rom.cpp index 9a12c5ec712..7bf8009a424 100644 --- a/src/devices/bus/isa/mc1502_rom.cpp +++ b/src/devices/bus/isa/mc1502_rom.cpp @@ -44,7 +44,7 @@ const rom_entry *mc1502_rom_device::device_rom_region() const // mc1502_rom_device - constructor //------------------------------------------------- -mc1502_rom_device::mc1502_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +mc1502_rom_device::mc1502_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MC1502_ROM, "MC-1502 ROM cart", tag, owner, clock, "mc1502_rom", __FILE__), device_isa8_card_interface( mconfig, *this ) { diff --git a/src/devices/bus/isa/mc1502_rom.h b/src/devices/bus/isa/mc1502_rom.h index d4423247991..bcaa7da17a4 100644 --- a/src/devices/bus/isa/mc1502_rom.h +++ b/src/devices/bus/isa/mc1502_rom.h @@ -23,7 +23,7 @@ class mc1502_rom_device : public device_t, { public: // construction/destruction - mc1502_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + mc1502_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/isa/mda.cpp b/src/devices/bus/isa/mda.cpp index c8456886f02..3cebdb0db0b 100644 --- a/src/devices/bus/isa/mda.cpp +++ b/src/devices/bus/isa/mda.cpp @@ -150,7 +150,7 @@ const rom_entry *isa8_mda_device::device_rom_region() const // isa8_mda_device - constructor //------------------------------------------------- -isa8_mda_device::isa8_mda_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_mda_device::isa8_mda_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_MDA, "IBM Monochrome Display and Printer Adapter", tag, owner, clock, "isa_ibm_mda", __FILE__), device_isa8_card_interface(mconfig, *this), m_framecnt(0), m_mode_control(0), m_update_row_type(-1), m_chr_gen(nullptr), m_vsync(0), m_hsync(0), m_pixel(0), @@ -158,7 +158,7 @@ isa8_mda_device::isa8_mda_device(const machine_config &mconfig, const char *tag, { } -isa8_mda_device::isa8_mda_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +isa8_mda_device::isa8_mda_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_isa8_card_interface(mconfig, *this), m_framecnt(0), m_mode_control(0), m_update_row_type(-1), m_chr_gen(nullptr), m_vsync(0), m_hsync(0), m_pixel(0), @@ -580,7 +580,7 @@ const rom_entry *isa8_hercules_device::device_rom_region() const // isa8_hercules_device - constructor //------------------------------------------------- -isa8_hercules_device::isa8_hercules_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_hercules_device::isa8_hercules_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : isa8_mda_device(mconfig, ISA8_HERCULES, "Hercules Graphics Card", tag, owner, clock, "isa_hercules", __FILE__), m_configuration_switch(0) { } @@ -786,7 +786,7 @@ machine_config_constructor isa8_ec1840_0002_device::device_mconfig_additions() c // isa8_ec1840_0002_device - constructor //------------------------------------------------- -isa8_ec1840_0002_device::isa8_ec1840_0002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_ec1840_0002_device::isa8_ec1840_0002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : isa8_mda_device( mconfig, ISA8_EC1840_0002, "EC 1840.0002 (MDA)", tag, owner, clock, "ec1840_0002", __FILE__), m_soft_chr_gen(nullptr) { } diff --git a/src/devices/bus/isa/mda.h b/src/devices/bus/isa/mda.h index c6cf72b29ad..dc0edb10927 100644 --- a/src/devices/bus/isa/mda.h +++ b/src/devices/bus/isa/mda.h @@ -22,8 +22,8 @@ public: friend class isa8_hercules_device; // construction/destruction - isa8_mda_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - isa8_mda_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + isa8_mda_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + isa8_mda_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -71,7 +71,7 @@ class isa8_hercules_device : { public: // construction/destruction - isa8_hercules_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa8_hercules_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; virtual const rom_entry *device_rom_region() const override; @@ -104,7 +104,7 @@ class isa8_ec1840_0002_device : { public: // construction/destruction - isa8_ec1840_0002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa8_ec1840_0002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/isa/mpu401.cpp b/src/devices/bus/isa/mpu401.cpp index 420a753b750..612bbd848ee 100644 --- a/src/devices/bus/isa/mpu401.cpp +++ b/src/devices/bus/isa/mpu401.cpp @@ -66,7 +66,7 @@ machine_config_constructor isa8_mpu401_device::device_mconfig_additions() const // isa8_adlib_device - constructor //------------------------------------------------- -isa8_mpu401_device::isa8_mpu401_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +isa8_mpu401_device::isa8_mpu401_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_MPU401, "Roland MPU-401 MIDI Interface", tag, owner, clock, "isa_mpu401", __FILE__), device_isa8_card_interface( mconfig, *this ), m_mpu401(*this, MPU_CORE_TAG) diff --git a/src/devices/bus/isa/mpu401.h b/src/devices/bus/isa/mpu401.h index cdf70fe2acf..3274f5b4f1e 100644 --- a/src/devices/bus/isa/mpu401.h +++ b/src/devices/bus/isa/mpu401.h @@ -21,7 +21,7 @@ class isa8_mpu401_device : { public: // construction/destruction - isa8_mpu401_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa8_mpu401_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); required_device<mpu401_device> m_mpu401; diff --git a/src/devices/bus/isa/mufdc.cpp b/src/devices/bus/isa/mufdc.cpp index bb1b6fc8af4..585b1e25ed4 100644 --- a/src/devices/bus/isa/mufdc.cpp +++ b/src/devices/bus/isa/mufdc.cpp @@ -129,7 +129,7 @@ const rom_entry *fdcmag_device::device_rom_region() const // mufdc_device - constructor //------------------------------------------------- -mufdc_device::mufdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name, const char *shortname) : +mufdc_device::mufdc_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, const char *shortname) : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__), device_isa8_card_interface( mconfig, *this ), m_fdc(*this, "fdc"), @@ -137,12 +137,12 @@ mufdc_device::mufdc_device(const machine_config &mconfig, device_type type, cons { } -fdc344_device::fdc344_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +fdc344_device::fdc344_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : mufdc_device(mconfig, ISA8_FDC344, tag, owner, clock, "Ably-Tech FDC-344", "fdc344") { } -fdcmag_device::fdcmag_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +fdcmag_device::fdcmag_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : mufdc_device(mconfig, ISA8_FDCMAG, tag, owner, clock, "Magitronic Multi Floppy Controller Card", "fdcmag") { } diff --git a/src/devices/bus/isa/mufdc.h b/src/devices/bus/isa/mufdc.h index 976558e90cd..0897d85a964 100644 --- a/src/devices/bus/isa/mufdc.h +++ b/src/devices/bus/isa/mufdc.h @@ -36,7 +36,7 @@ class mufdc_device : public device_t, { public: // construction/destruction - mufdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name, const char *shortname); + mufdc_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, const char *shortname); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -67,7 +67,7 @@ class fdc344_device : public mufdc_device { public: // construction/destruction - fdc344_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + fdc344_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual const rom_entry *device_rom_region() const override; @@ -79,7 +79,7 @@ class fdcmag_device : public mufdc_device { public: // construction/destruction - fdcmag_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + fdcmag_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/isa/ne1000.cpp b/src/devices/bus/isa/ne1000.cpp index 65ee0019430..f6b51a1d145 100644 --- a/src/devices/bus/isa/ne1000.cpp +++ b/src/devices/bus/isa/ne1000.cpp @@ -16,7 +16,7 @@ machine_config_constructor ne1000_device::device_mconfig_additions() const { return MACHINE_CONFIG_NAME(ne1000_config); } -ne1000_device::ne1000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ne1000_device::ne1000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NE1000, "NE1000 Network Adapter", tag, owner, clock, "ne1000", __FILE__), device_isa8_card_interface(mconfig, *this), m_dp8390(*this, "dp8390d"), diff --git a/src/devices/bus/isa/ne1000.h b/src/devices/bus/isa/ne1000.h index 96f98673477..2154777a93d 100644 --- a/src/devices/bus/isa/ne1000.h +++ b/src/devices/bus/isa/ne1000.h @@ -13,7 +13,7 @@ class ne1000_device: public device_t, public device_isa8_card_interface { public: - ne1000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ne1000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/isa/ne2000.cpp b/src/devices/bus/isa/ne2000.cpp index 3937e14a920..34767447e0c 100644 --- a/src/devices/bus/isa/ne2000.cpp +++ b/src/devices/bus/isa/ne2000.cpp @@ -17,7 +17,7 @@ machine_config_constructor ne2000_device::device_mconfig_additions() const { return MACHINE_CONFIG_NAME(ne2000_config); } -ne2000_device::ne2000_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) +ne2000_device::ne2000_device(const machine_config& mconfig, std::string tag, device_t* owner, UINT32 clock) : device_t(mconfig, NE2000, "NE2000 Network Adapter", tag, owner, clock, "ne2000", __FILE__), device_isa16_card_interface(mconfig, *this), m_dp8390(*this, "dp8390d"), diff --git a/src/devices/bus/isa/ne2000.h b/src/devices/bus/isa/ne2000.h index ac7d56772a7..15665ab220c 100644 --- a/src/devices/bus/isa/ne2000.h +++ b/src/devices/bus/isa/ne2000.h @@ -11,7 +11,7 @@ class ne2000_device: public device_t, public device_isa16_card_interface { public: - ne2000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ne2000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/isa/num9rev.cpp b/src/devices/bus/isa/num9rev.cpp index 3ed1967df06..28070986816 100644 --- a/src/devices/bus/isa/num9rev.cpp +++ b/src/devices/bus/isa/num9rev.cpp @@ -77,7 +77,7 @@ machine_config_constructor isa8_number_9_rev_device::device_mconfig_additions() // isa16_vga_device - constructor //------------------------------------------------- -isa8_number_9_rev_device::isa8_number_9_rev_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_number_9_rev_device::isa8_number_9_rev_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_NUM_9_REV, "Number Nine Revolution 512x32/1024x8", tag, owner, clock, "number_9_rev", __FILE__), device_isa8_card_interface(mconfig, *this), m_upd7220(*this, "upd7220"), diff --git a/src/devices/bus/isa/num9rev.h b/src/devices/bus/isa/num9rev.h index bf185d5eb62..8ddfb404acd 100644 --- a/src/devices/bus/isa/num9rev.h +++ b/src/devices/bus/isa/num9rev.h @@ -22,7 +22,7 @@ class isa8_number_9_rev_device : { public: // construction/destruction - isa8_number_9_rev_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa8_number_9_rev_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/isa/omti8621.cpp b/src/devices/bus/isa/omti8621.cpp index 5f42c31200b..c0db457dbd0 100644 --- a/src/devices/bus/isa/omti8621.cpp +++ b/src/devices/bus/isa/omti8621.cpp @@ -51,7 +51,7 @@ class omti_disk_image_device : public device_t, { public: // construction/destruction - omti_disk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + omti_disk_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // image-level overrides virtual iodevice_t image_type() const override { return IO_HARDDISK; } @@ -192,8 +192,8 @@ static const char *cpu_context(const device_t *device) { int s = t / osd_ticks_per_second(); int ms = (t % osd_ticks_per_second()) / 1000; - sprintf(statebuf, "%d.%03d %s pc=%08x - %s", s, ms, cpu->tag(), - cpu->safe_pcbase(), device->tag()); + sprintf(statebuf, "%d.%03d %s pc=%08x - %s", s, ms, cpu->tag().c_str(), + cpu->safe_pcbase(), device->tag().c_str()); } else { strcpy(statebuf, "(no context)"); } @@ -373,19 +373,19 @@ void omti8621_device::device_reset() const device_type ISA16_OMTI8621 = &device_creator<omti8621_pc_device>; -omti8621_pc_device::omti8621_pc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +omti8621_pc_device::omti8621_pc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : omti8621_device(mconfig, ISA16_OMTI8621, tag, owner, clock) { } const device_type ISA16_OMTI8621_APOLLO = &device_creator<omti8621_apollo_device>; -omti8621_apollo_device::omti8621_apollo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +omti8621_apollo_device::omti8621_apollo_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : omti8621_device(mconfig, ISA16_OMTI8621_APOLLO, tag, owner, clock) { } -omti8621_device::omti8621_device(const machine_config &mconfig, device_type type,const char *tag, device_t *owner, UINT32 clock) +omti8621_device::omti8621_device(const machine_config &mconfig, device_type type,std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, type, "OMTI 8621 ESDI/floppy controller", tag, owner, clock, "omti8621", __FILE__), device_isa16_card_interface(mconfig, *this), m_fdc(*this, OMTI_FDC_TAG), @@ -785,7 +785,7 @@ void omti8621_device::log_command(const UINT8 cdb[], const UINT16 cdb_length) break; } text += "\n"; - logerror(text.c_str()); + logerror("%s",text.c_str()); } } @@ -813,7 +813,7 @@ void omti8621_device::log_data() text += " ..."; } text += "\n"; - logerror(text.c_str()); + logerror("%s",text.c_str()); } } @@ -1309,7 +1309,7 @@ void omti8621_device::eop_w(int state) // device type definition const device_type OMTI_DISK = &device_creator<omti_disk_image_device>; -omti_disk_image_device::omti_disk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +omti_disk_image_device::omti_disk_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, OMTI_DISK, "OMTI8621 ESDI disk", tag, owner, clock, "omti_disk_image", __FILE__), device_image_interface(mconfig, *this), m_type(0), m_cylinders(0), m_heads(0), m_sectors(0), m_sectorbytes(0), m_sector_count(0), m_image(nullptr) { diff --git a/src/devices/bus/isa/omti8621.h b/src/devices/bus/isa/omti8621.h index 04dff836316..f5a9e2934ce 100644 --- a/src/devices/bus/isa/omti8621.h +++ b/src/devices/bus/isa/omti8621.h @@ -33,7 +33,7 @@ class omti_disk_image_device; class omti8621_device : public device_t, public device_isa16_card_interface { public: - omti8621_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock); + omti8621_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock); ~omti8621_device() {} DECLARE_READ16_MEMBER(read); @@ -130,7 +130,7 @@ private: class omti8621_pc_device : public omti8621_device { public: - omti8621_pc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + omti8621_pc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; extern const device_type ISA16_OMTI8621; @@ -140,7 +140,7 @@ extern const device_type ISA16_OMTI8621; class omti8621_apollo_device : public omti8621_device { public: - omti8621_apollo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + omti8621_apollo_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // get sector diskaddr of logical unit lun into data_buffer UINT32 get_sector(INT32 diskaddr, UINT8 *data_buffer, UINT32 length, UINT8 lun); diff --git a/src/devices/bus/isa/p1_fdc.cpp b/src/devices/bus/isa/p1_fdc.cpp index 4ba01ed47da..11e07cfdd3e 100644 --- a/src/devices/bus/isa/p1_fdc.cpp +++ b/src/devices/bus/isa/p1_fdc.cpp @@ -171,7 +171,7 @@ WRITE8_MEMBER( p1_fdc_device::p1_fdc_w ) // p1_fdc_device - constructor //------------------------------------------------- -p1_fdc_device::p1_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +p1_fdc_device::p1_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, P1_FDC, "Poisk-1 floppy B504", tag, owner, clock, "p1_fdc", __FILE__), device_isa8_card_interface( mconfig, *this ), m_fdc(*this, "fdc") diff --git a/src/devices/bus/isa/p1_fdc.h b/src/devices/bus/isa/p1_fdc.h index f40748085d8..87f604f0f7e 100644 --- a/src/devices/bus/isa/p1_fdc.h +++ b/src/devices/bus/isa/p1_fdc.h @@ -26,7 +26,7 @@ class p1_fdc_device : public device_t, { public: // construction/destruction - p1_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + p1_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/isa/p1_hdc.cpp b/src/devices/bus/isa/p1_hdc.cpp index eb8d68524eb..4f8c691d7a4 100644 --- a/src/devices/bus/isa/p1_hdc.cpp +++ b/src/devices/bus/isa/p1_hdc.cpp @@ -115,7 +115,7 @@ WRITE8_MEMBER(p1_hdc_device::p1_HDC_w) // p1_hdc_device - constructor //------------------------------------------------- -p1_hdc_device::p1_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +p1_hdc_device::p1_hdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, P1_HDC, "Poisk-1 MFM disk B942", tag, owner, clock, "p1_hdc", __FILE__), device_isa8_card_interface( mconfig, *this ), m_hdc(*this, KM1809VG7_TAG) diff --git a/src/devices/bus/isa/p1_hdc.h b/src/devices/bus/isa/p1_hdc.h index 7d4e0af3486..1236c71e6a1 100644 --- a/src/devices/bus/isa/p1_hdc.h +++ b/src/devices/bus/isa/p1_hdc.h @@ -26,7 +26,7 @@ class p1_hdc_device : public device_t, { public: // construction/destruction - p1_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + p1_hdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/isa/p1_rom.cpp b/src/devices/bus/isa/p1_rom.cpp index bd078972a04..7c92e76bb82 100644 --- a/src/devices/bus/isa/p1_rom.cpp +++ b/src/devices/bus/isa/p1_rom.cpp @@ -49,7 +49,7 @@ const rom_entry *p1_rom_device::device_rom_region() const // p1_rom_device - constructor //------------------------------------------------- -p1_rom_device::p1_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +p1_rom_device::p1_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, P1_ROM, "Poisk-1 ROM cart", tag, owner, clock, "p1_rom", __FILE__), device_isa8_card_interface( mconfig, *this ) { diff --git a/src/devices/bus/isa/p1_rom.h b/src/devices/bus/isa/p1_rom.h index 4d0cffcbaea..86422f4fff2 100644 --- a/src/devices/bus/isa/p1_rom.h +++ b/src/devices/bus/isa/p1_rom.h @@ -23,7 +23,7 @@ class p1_rom_device : public device_t, { public: // construction/destruction - p1_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + p1_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/isa/pc1640_iga.cpp b/src/devices/bus/isa/pc1640_iga.cpp index 05c989fcbe1..519c1f57d75 100644 --- a/src/devices/bus/isa/pc1640_iga.cpp +++ b/src/devices/bus/isa/pc1640_iga.cpp @@ -67,7 +67,7 @@ const rom_entry *isa8_pc1640_iga_device::device_rom_region() const // isa8_pc1640_iga_device - constructor //------------------------------------------------- -isa8_pc1640_iga_device::isa8_pc1640_iga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +isa8_pc1640_iga_device::isa8_pc1640_iga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : isa8_ega_device(mconfig, ISA8_PC1640_IGA, "Amstrad PC1640 IGA", tag, owner, clock, "pc1640_iga", __FILE__) { } diff --git a/src/devices/bus/isa/pc1640_iga.h b/src/devices/bus/isa/pc1640_iga.h index c0e055b7424..04485b48799 100644 --- a/src/devices/bus/isa/pc1640_iga.h +++ b/src/devices/bus/isa/pc1640_iga.h @@ -27,7 +27,7 @@ class isa8_pc1640_iga_device : public isa8_ega_device { public: // construction/destruction - isa8_pc1640_iga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa8_pc1640_iga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/isa/pds.cpp b/src/devices/bus/isa/pds.cpp index 235e0acdd02..fdaf1cab944 100644 --- a/src/devices/bus/isa/pds.cpp +++ b/src/devices/bus/isa/pds.cpp @@ -20,7 +20,7 @@ const device_type ISA8_PDS = &device_creator<isa8_pds_device>; -isa8_pds_device::isa8_pds_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +isa8_pds_device::isa8_pds_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_PDS, "Programmers Development System", tag, owner, clock, "isa_pds", __FILE__), device_isa8_card_interface( mconfig, *this ), m_ppi(*this,"pds_ppi") diff --git a/src/devices/bus/isa/pds.h b/src/devices/bus/isa/pds.h index eb98c3abb83..20bddb8c1de 100644 --- a/src/devices/bus/isa/pds.h +++ b/src/devices/bus/isa/pds.h @@ -18,7 +18,7 @@ class isa8_pds_device : public device_isa8_card_interface { public: - isa8_pds_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa8_pds_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER(ppi_r); DECLARE_WRITE8_MEMBER(ppi_w); diff --git a/src/devices/bus/isa/pgc.cpp b/src/devices/bus/isa/pgc.cpp index c22631d405b..2c7484f584d 100644 --- a/src/devices/bus/isa/pgc.cpp +++ b/src/devices/bus/isa/pgc.cpp @@ -203,7 +203,7 @@ ioport_constructor isa8_pgc_device::device_input_ports() const // isa8_pgc_device - constructor //------------------------------------------------- -isa8_pgc_device::isa8_pgc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_pgc_device::isa8_pgc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_PGC, "IBM Professional Graphics Controller", tag, owner, clock, "isa_ibm_pgc", __FILE__), device_isa8_card_interface(mconfig, *this), m_cpu(*this, "maincpu"), @@ -212,7 +212,7 @@ isa8_pgc_device::isa8_pgc_device(const machine_config &mconfig, const char *tag, { } -isa8_pgc_device::isa8_pgc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +isa8_pgc_device::isa8_pgc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_isa8_card_interface(mconfig, *this), m_cpu(*this, "maincpu"), diff --git a/src/devices/bus/isa/pgc.h b/src/devices/bus/isa/pgc.h index cf83eb8ae1d..d86084ec61c 100644 --- a/src/devices/bus/isa/pgc.h +++ b/src/devices/bus/isa/pgc.h @@ -23,8 +23,8 @@ class isa8_pgc_device : { public: // construction/destruction - isa8_pgc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - isa8_pgc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + isa8_pgc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + isa8_pgc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/isa/s3virge.cpp b/src/devices/bus/isa/s3virge.cpp index 965e47e50f0..2d3950e678c 100644 --- a/src/devices/bus/isa/s3virge.cpp +++ b/src/devices/bus/isa/s3virge.cpp @@ -20,27 +20,27 @@ const device_type S3VIRGE = &device_creator<s3virge_vga_device>; const device_type S3VIRGEDX = &device_creator<s3virgedx_vga_device>; const device_type S3VIRGEDX1 = &device_creator<s3virgedx_rev1_vga_device>; -s3virge_vga_device::s3virge_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +s3virge_vga_device::s3virge_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : s3_vga_device(mconfig, S3VIRGE, "S3 86C325", tag, owner, clock, "virge_vga", __FILE__) { } -s3virge_vga_device::s3virge_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +s3virge_vga_device::s3virge_vga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : s3_vga_device(mconfig, type, name, tag, owner, clock, shortname, source) { } -s3virgedx_vga_device::s3virgedx_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +s3virgedx_vga_device::s3virgedx_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : s3virge_vga_device(mconfig, S3VIRGEDX, "S3 86C375", tag, owner, clock, "virgedx_vga", __FILE__) { } -s3virgedx_vga_device::s3virgedx_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +s3virgedx_vga_device::s3virgedx_vga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : s3virge_vga_device(mconfig, type, name, tag, owner, clock, shortname, source) { } -s3virgedx_rev1_vga_device::s3virgedx_rev1_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +s3virgedx_rev1_vga_device::s3virgedx_rev1_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : s3virgedx_vga_device(mconfig, S3VIRGEDX1, "S3 86C375 (rev 1)", tag, owner, clock, "virgedx_r1", __FILE__) { } diff --git a/src/devices/bus/isa/s3virge.h b/src/devices/bus/isa/s3virge.h index 1b7f6796e95..4a7bad4b8c2 100644 --- a/src/devices/bus/isa/s3virge.h +++ b/src/devices/bus/isa/s3virge.h @@ -19,8 +19,8 @@ class s3virge_vga_device : public s3_vga_device { public: // construction/destruction - s3virge_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - s3virge_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + s3virge_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + s3virge_vga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); virtual READ8_MEMBER(port_03b0_r) override; virtual WRITE8_MEMBER(port_03b0_w) override; @@ -51,8 +51,8 @@ class s3virgedx_vga_device : public s3virge_vga_device { public: // construction/destruction - s3virgedx_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - s3virgedx_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + s3virgedx_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + s3virgedx_vga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); protected: // device-level overrides @@ -66,7 +66,7 @@ class s3virgedx_rev1_vga_device : public s3virgedx_vga_device { public: // construction/destruction - s3virgedx_rev1_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + s3virgedx_rev1_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/isa/sb16.cpp b/src/devices/bus/isa/sb16.cpp index 87c09592b6d..fe23a851278 100644 --- a/src/devices/bus/isa/sb16.cpp +++ b/src/devices/bus/isa/sb16.cpp @@ -678,7 +678,7 @@ WRITE8_MEMBER( sb16_lle_device::mpu401_w ) } -sb16_lle_device::sb16_lle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sb16_lle_device::sb16_lle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA16_SB16, "SoundBlaster 16 Audio Adapter LLE", tag, owner, clock, "sb16", __FILE__), device_isa16_card_interface(mconfig, *this), m_dacl(*this, "dacl"), diff --git a/src/devices/bus/isa/sb16.h b/src/devices/bus/isa/sb16.h index ff4c8a4a8f0..db5dce31d34 100644 --- a/src/devices/bus/isa/sb16.h +++ b/src/devices/bus/isa/sb16.h @@ -22,7 +22,7 @@ class sb16_lle_device : public device_t, { public: // construction/destruction - sb16_lle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sb16_lle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/isa/sblaster.cpp b/src/devices/bus/isa/sblaster.cpp index 6895716c7af..f416f10e4a4 100644 --- a/src/devices/bus/isa/sblaster.cpp +++ b/src/devices/bus/isa/sblaster.cpp @@ -1101,7 +1101,7 @@ machine_config_constructor isa16_sblaster16_device::device_mconfig_additions() c // LIVE DEVICE //************************************************************************** -sb_device::sb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source) : +sb_device::sb_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_serial_interface(mconfig, *this), m_dacl(*this, "sbdacl"), @@ -1111,14 +1111,14 @@ sb_device::sb_device(const machine_config &mconfig, device_type type, const char { } -sb8_device::sb8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source) : +sb8_device::sb8_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source) : sb_device(mconfig, type, tag, owner, clock, name, shortname, source), device_isa8_card_interface(mconfig, *this), m_ym3812(*this, "ym3812") { } -sb16_device::sb16_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source) : +sb16_device::sb16_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source) : sb_device(mconfig, type, tag, owner, clock, name, shortname, source), device_isa16_card_interface(mconfig, *this) { @@ -1128,19 +1128,19 @@ sb16_device::sb16_device(const machine_config &mconfig, device_type type, const // isa8_sblaster_device - constructor //------------------------------------------------- -isa8_sblaster1_0_device::isa8_sblaster1_0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_sblaster1_0_device::isa8_sblaster1_0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sb8_device(mconfig, ISA8_SOUND_BLASTER_1_0, tag, owner, clock, "Sound Blaster 1.0", "isa_sblaster1_0", __FILE__), m_saa1099_1(*this, "saa1099.1"), m_saa1099_2(*this, "saa1099.2") { } -isa8_sblaster1_5_device::isa8_sblaster1_5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_sblaster1_5_device::isa8_sblaster1_5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sb8_device(mconfig, ISA8_SOUND_BLASTER_1_5, tag, owner, clock, "Sound Blaster 1.5", "isa_sblaster1_5", __FILE__) { } -isa16_sblaster16_device::isa16_sblaster16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa16_sblaster16_device::isa16_sblaster16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sb16_device(mconfig, ISA16_SOUND_BLASTER_16, tag, owner, clock, "Sound Blaster 16", "isa_sblaster_16", __FILE__) { } diff --git a/src/devices/bus/isa/sblaster.h b/src/devices/bus/isa/sblaster.h index 25bdc0f4b56..01c3921244b 100644 --- a/src/devices/bus/isa/sblaster.h +++ b/src/devices/bus/isa/sblaster.h @@ -97,7 +97,7 @@ class sb_device : { public: // construction/destruction - sb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source); + sb_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source); required_device<dac_device> m_dacl; required_device<dac_device> m_dacr; @@ -158,7 +158,7 @@ class sb8_device : public sb_device, { public: // construction/destruction - sb8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source); + sb8_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source); DECLARE_READ8_MEMBER(ym3812_16_r); DECLARE_WRITE8_MEMBER(ym3812_16_w); @@ -176,7 +176,7 @@ class isa8_sblaster1_0_device : public sb8_device { public: // construction/destruction - isa8_sblaster1_0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa8_sblaster1_0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -198,7 +198,7 @@ class isa8_sblaster1_5_device : public sb8_device { public: // construction/destruction - isa8_sblaster1_5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa8_sblaster1_5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -212,7 +212,7 @@ class sb16_device : public sb_device, { public: // construction/destruction - sb16_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source); + sb16_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source); DECLARE_READ8_MEMBER(mpu401_r); DECLARE_WRITE8_MEMBER(mpu401_w); DECLARE_READ8_MEMBER(mixer_r); @@ -237,7 +237,7 @@ class isa16_sblaster16_device : public sb16_device { public: // construction/destruction - isa16_sblaster16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa16_sblaster16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/isa/sc499.cpp b/src/devices/bus/isa/sc499.cpp index 4effacb3394..620524c5f14 100644 --- a/src/devices/bus/isa/sc499.cpp +++ b/src/devices/bus/isa/sc499.cpp @@ -314,7 +314,7 @@ const device_type SC499 = &device_creator<sc499_device>; // sc499_device - constructor //------------------------------------------------- -sc499_device::sc499_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sc499_device::sc499_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SC499, "Archive SC-499", tag, owner, clock, "sc499", __FILE__), device_isa8_card_interface(mconfig, *this), m_iobase(*this, "IO_BASE"), @@ -413,7 +413,7 @@ const char *sc499_device::cpu_context() int s = t / osd_ticks_per_second(); int ms = (t % osd_ticks_per_second()) / 1000; - sprintf(statebuf, "%d.%03d%s:", s, ms, tag()); + sprintf(statebuf, "%d.%03d%s:", s, ms, tag().c_str()); return statebuf; } @@ -1279,7 +1279,7 @@ void sc499_device::block_set_filemark() const device_type SC499_CTAPE = &device_creator<sc499_ctape_image_device>; -sc499_ctape_image_device::sc499_ctape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sc499_ctape_image_device::sc499_ctape_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SC499_CTAPE, "Cartridge Tape", tag, owner, clock, "sc499_ctape", __FILE__), device_image_interface(mconfig, *this) { diff --git a/src/devices/bus/isa/sc499.h b/src/devices/bus/isa/sc499.h index 8c63f810073..75f24f2090c 100644 --- a/src/devices/bus/isa/sc499.h +++ b/src/devices/bus/isa/sc499.h @@ -26,7 +26,7 @@ class sc499_ctape_image_device : public device_t, public device_image_interface { public: // construction/destruction - sc499_ctape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sc499_ctape_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // image-level overrides virtual bool call_load() override; @@ -61,7 +61,7 @@ class sc499_device: public device_t, public device_isa8_card_interface { public: // construction/destruction - sc499_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sc499_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); required_ioport m_iobase; required_ioport m_irqdrq; diff --git a/src/devices/bus/isa/side116.cpp b/src/devices/bus/isa/side116.cpp index 460ee5f54fd..cca754454f0 100644 --- a/src/devices/bus/isa/side116.cpp +++ b/src/devices/bus/isa/side116.cpp @@ -86,7 +86,7 @@ const rom_entry *side116_device::device_rom_region() const // side116_device - constructor //------------------------------------------------- -side116_device::side116_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +side116_device::side116_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_SIDE116, "Acculogic sIDE-1/16 IDE Disk Controller", tag, owner, clock, "side116", __FILE__), device_isa8_card_interface( mconfig, *this ), m_ata(*this, "ata"), diff --git a/src/devices/bus/isa/side116.h b/src/devices/bus/isa/side116.h index 1c9592de531..92c5e8981fe 100644 --- a/src/devices/bus/isa/side116.h +++ b/src/devices/bus/isa/side116.h @@ -29,7 +29,7 @@ class side116_device : public device_t, { public: // construction/destruction - side116_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + side116_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/isa/ssi2001.cpp b/src/devices/bus/isa/ssi2001.cpp index 4a77e870190..7ff98721b15 100644 --- a/src/devices/bus/isa/ssi2001.cpp +++ b/src/devices/bus/isa/ssi2001.cpp @@ -18,7 +18,7 @@ machine_config_constructor ssi2001_device::device_mconfig_additions() const return MACHINE_CONFIG_NAME( ssi2001 ); } -ssi2001_device::ssi2001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +ssi2001_device::ssi2001_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_SSI2001, "Innovation SSI-2001 Audio Adapter", tag, owner, clock, "ssi2001", __FILE__), device_isa8_card_interface(mconfig, *this), m_joy(*this, "pc_joy"), diff --git a/src/devices/bus/isa/ssi2001.h b/src/devices/bus/isa/ssi2001.h index 8a58cbb8bf8..808d6dab6f3 100644 --- a/src/devices/bus/isa/ssi2001.h +++ b/src/devices/bus/isa/ssi2001.h @@ -19,7 +19,7 @@ class ssi2001_device : public device_t, { public: // construction/destruction - ssi2001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ssi2001_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/isa/stereo_fx.cpp b/src/devices/bus/isa/stereo_fx.cpp index b730ad3a670..a1a968119eb 100644 --- a/src/devices/bus/isa/stereo_fx.cpp +++ b/src/devices/bus/isa/stereo_fx.cpp @@ -186,7 +186,7 @@ READ8_MEMBER( stereo_fx_device::invalid_r ) return 0xff; } -stereo_fx_device::stereo_fx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +stereo_fx_device::stereo_fx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_STEREO_FX, "ATI Stereo F/X Audio Adapter", tag, owner, clock, "stereo_fx", __FILE__), device_isa8_card_interface(mconfig, *this), m_dacl(*this, "dacl"), diff --git a/src/devices/bus/isa/stereo_fx.h b/src/devices/bus/isa/stereo_fx.h index 9ec059a2640..5c2c5b39afc 100644 --- a/src/devices/bus/isa/stereo_fx.h +++ b/src/devices/bus/isa/stereo_fx.h @@ -21,7 +21,7 @@ class stereo_fx_device : public device_t, { public: // construction/destruction - stereo_fx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + stereo_fx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/isa/svga_cirrus.cpp b/src/devices/bus/isa/svga_cirrus.cpp index 3e6f6ca1196..c49114187da 100644 --- a/src/devices/bus/isa/svga_cirrus.cpp +++ b/src/devices/bus/isa/svga_cirrus.cpp @@ -59,7 +59,7 @@ const rom_entry *isa16_svga_cirrus_device::device_rom_region() const // isa16_vga_device - constructor //------------------------------------------------- -isa16_svga_cirrus_device::isa16_svga_cirrus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa16_svga_cirrus_device::isa16_svga_cirrus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA16_SVGA_CIRRUS, "Diamond Speedstar Pro SE ISA Graphics Card (BIOS v1.00)", tag, owner, clock, "dm_clgd5430", __FILE__), device_isa16_card_interface(mconfig, *this), m_vga(nullptr) { @@ -145,7 +145,7 @@ const rom_entry *isa16_svga_cirrus_gd542x_device::device_rom_region() const // isa16_vga_device - constructor //------------------------------------------------- -isa16_svga_cirrus_gd542x_device::isa16_svga_cirrus_gd542x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa16_svga_cirrus_gd542x_device::isa16_svga_cirrus_gd542x_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA16_SVGA_CIRRUS_GD542X, "Generic Cirrus Logic GD542x Graphics Card (BIOS v1.20)", tag, owner, clock, "clgd542x", __FILE__), device_isa16_card_interface(mconfig, *this), m_vga(nullptr) { diff --git a/src/devices/bus/isa/svga_cirrus.h b/src/devices/bus/isa/svga_cirrus.h index a26e9503e1b..1a1357ae783 100644 --- a/src/devices/bus/isa/svga_cirrus.h +++ b/src/devices/bus/isa/svga_cirrus.h @@ -19,7 +19,7 @@ class isa16_svga_cirrus_device : { public: // construction/destruction - isa16_svga_cirrus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa16_svga_cirrus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -40,7 +40,7 @@ class isa16_svga_cirrus_gd542x_device : { public: // construction/destruction - isa16_svga_cirrus_gd542x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa16_svga_cirrus_gd542x_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/isa/svga_s3.cpp b/src/devices/bus/isa/svga_s3.cpp index f4874db3fc9..dd234f4a1c2 100644 --- a/src/devices/bus/isa/svga_s3.cpp +++ b/src/devices/bus/isa/svga_s3.cpp @@ -70,7 +70,7 @@ const rom_entry *isa16_svga_s3_device::device_rom_region() const // isa16_vga_device - constructor //------------------------------------------------- -isa16_svga_s3_device::isa16_svga_s3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa16_svga_s3_device::isa16_svga_s3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA16_SVGA_S3, "Number Nine 9FX Vision 330 (S3 764) Graphics Card", tag, owner, clock, "s3_764", __FILE__), device_isa16_card_interface(mconfig, *this), m_vga(nullptr), m_8514(nullptr) { @@ -182,7 +182,7 @@ const rom_entry *isa16_s3virge_device::device_rom_region() const // isa16_vga_device - constructor //------------------------------------------------- -isa16_s3virge_device::isa16_s3virge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa16_s3virge_device::isa16_s3virge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA16_S3VIRGE, "S3 ViRGE Graphics Card", tag, owner, clock, "s3virge", __FILE__), device_isa16_card_interface(mconfig, *this), m_vga(nullptr) { @@ -269,7 +269,7 @@ const rom_entry *isa16_s3virgedx_device::device_rom_region() const // isa16_vga_device - constructor //------------------------------------------------- -isa16_s3virgedx_device::isa16_s3virgedx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa16_s3virgedx_device::isa16_s3virgedx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA16_S3VIRGEDX, "S3 ViRGE/DX Graphics Card", tag, owner, clock, "s3virgedx", __FILE__), device_isa16_card_interface(mconfig, *this), m_vga(nullptr) { @@ -357,7 +357,7 @@ const rom_entry *isa16_stealth3d2kpro_device::device_rom_region() const // isa16_vga_device - constructor //------------------------------------------------- -isa16_stealth3d2kpro_device::isa16_stealth3d2kpro_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa16_stealth3d2kpro_device::isa16_stealth3d2kpro_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA16_DMS3D2KPRO, "Diamond Stealth 3D 2000 Pro", tag, owner, clock, "dms3d2kp", __FILE__), device_isa16_card_interface(mconfig, *this), m_vga(nullptr) { diff --git a/src/devices/bus/isa/svga_s3.h b/src/devices/bus/isa/svga_s3.h index fba9bfd6769..b066e5d33b6 100644 --- a/src/devices/bus/isa/svga_s3.h +++ b/src/devices/bus/isa/svga_s3.h @@ -22,7 +22,7 @@ class isa16_svga_s3_device : { public: // construction/destruction - isa16_svga_s3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa16_svga_s3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -44,7 +44,7 @@ class isa16_s3virge_device : { public: // construction/destruction - isa16_s3virge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa16_s3virge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -65,7 +65,7 @@ class isa16_s3virgedx_device : { public: // construction/destruction - isa16_s3virgedx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa16_s3virgedx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -86,7 +86,7 @@ class isa16_stealth3d2kpro_device : { public: // construction/destruction - isa16_stealth3d2kpro_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa16_stealth3d2kpro_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/isa/svga_trident.cpp b/src/devices/bus/isa/svga_trident.cpp index ded9d629fe3..2dece3d3d5e 100644 --- a/src/devices/bus/isa/svga_trident.cpp +++ b/src/devices/bus/isa/svga_trident.cpp @@ -61,7 +61,7 @@ const rom_entry *isa16_svga_tgui9680_device::device_rom_region() const // isa8_vga_device - constructor //------------------------------------------------- -isa16_svga_tgui9680_device::isa16_svga_tgui9680_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa16_svga_tgui9680_device::isa16_svga_tgui9680_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA16_SVGA_TGUI9680, "Trident TGUI9680 Graphics Card (BIOS X5.5 (02) 02/13/96)", tag, owner, clock, "tgui9680", __FILE__), device_isa16_card_interface(mconfig, *this), m_vga(nullptr) { diff --git a/src/devices/bus/isa/svga_trident.h b/src/devices/bus/isa/svga_trident.h index 7ce5479735b..79bd48ae17c 100644 --- a/src/devices/bus/isa/svga_trident.h +++ b/src/devices/bus/isa/svga_trident.h @@ -26,7 +26,7 @@ class isa16_svga_tgui9680_device : { public: // construction/destruction - isa16_svga_tgui9680_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa16_svga_tgui9680_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/isa/svga_tseng.cpp b/src/devices/bus/isa/svga_tseng.cpp index 6fff06c78ad..1c39cefbefd 100644 --- a/src/devices/bus/isa/svga_tseng.cpp +++ b/src/devices/bus/isa/svga_tseng.cpp @@ -59,7 +59,7 @@ const rom_entry *isa8_svga_et4k_device::device_rom_region() const // isa8_vga_device - constructor //------------------------------------------------- -isa8_svga_et4k_device::isa8_svga_et4k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_svga_et4k_device::isa8_svga_et4k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_SVGA_ET4K, "SVGA Tseng ET4000 Graphics Card", tag, owner, clock, "et4000", __FILE__), device_isa8_card_interface(mconfig, *this), m_vga(nullptr) { diff --git a/src/devices/bus/isa/svga_tseng.h b/src/devices/bus/isa/svga_tseng.h index 4762fed3ec0..3ae2089f3b4 100644 --- a/src/devices/bus/isa/svga_tseng.h +++ b/src/devices/bus/isa/svga_tseng.h @@ -21,7 +21,7 @@ class isa8_svga_et4k_device : { public: // construction/destruction - isa8_svga_et4k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa8_svga_et4k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/isa/trident.cpp b/src/devices/bus/isa/trident.cpp index 4f47bdd7212..4ea0bba34a3 100644 --- a/src/devices/bus/isa/trident.cpp +++ b/src/devices/bus/isa/trident.cpp @@ -19,7 +19,7 @@ const device_type TRIDENT_VGA = &device_creator<trident_vga_device>; #define LOG (1) #define LOG_ACCEL (1) -trident_vga_device::trident_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +trident_vga_device::trident_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : svga_device(mconfig, TRIDENT_VGA, "Trident TGUI9680", tag, owner, clock, "trident_vga", __FILE__) { } diff --git a/src/devices/bus/isa/trident.h b/src/devices/bus/isa/trident.h index db470ec2838..727ff46795a 100644 --- a/src/devices/bus/isa/trident.h +++ b/src/devices/bus/isa/trident.h @@ -16,7 +16,7 @@ class trident_vga_device : public svga_device { public: // construction/destruction - trident_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + trident_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual READ8_MEMBER(port_03c0_r) override; virtual WRITE8_MEMBER(port_03c0_w) override; diff --git a/src/devices/bus/isa/vga.cpp b/src/devices/bus/isa/vga.cpp index 390834c8d5b..4f6fd2bec92 100644 --- a/src/devices/bus/isa/vga.cpp +++ b/src/devices/bus/isa/vga.cpp @@ -49,7 +49,7 @@ const rom_entry *isa8_vga_device::device_rom_region() const // isa8_vga_device - constructor //------------------------------------------------- -isa8_vga_device::isa8_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_vga_device::isa8_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_VGA, "IBM VGA Graphics Card", tag, owner, clock, "ibm_vga", __FILE__), device_isa8_card_interface(mconfig, *this), m_vga(nullptr) { diff --git a/src/devices/bus/isa/vga.h b/src/devices/bus/isa/vga.h index 4707b3c0d61..1281992fb65 100644 --- a/src/devices/bus/isa/vga.h +++ b/src/devices/bus/isa/vga.h @@ -21,7 +21,7 @@ class isa8_vga_device : { public: // construction/destruction - isa8_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa8_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/isa/vga_ati.cpp b/src/devices/bus/isa/vga_ati.cpp index 490a26dc90c..64184b877df 100644 --- a/src/devices/bus/isa/vga_ati.cpp +++ b/src/devices/bus/isa/vga_ati.cpp @@ -146,19 +146,19 @@ const rom_entry *isa16_vga_mach64_device::device_rom_region() const // isa8_vga_device - constructor //------------------------------------------------- -isa16_vga_gfxultra_device::isa16_vga_gfxultra_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa16_vga_gfxultra_device::isa16_vga_gfxultra_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA16_VGA_GFXULTRA, "ATi Graphics Ultra Card", tag, owner, clock, "gfxultra", __FILE__), device_isa16_card_interface(mconfig, *this), m_vga(nullptr), m_8514(nullptr) { } -isa16_vga_gfxultrapro_device::isa16_vga_gfxultrapro_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa16_vga_gfxultrapro_device::isa16_vga_gfxultrapro_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA16_SVGA_GFXULTRAPRO, "ATi Graphics Ultra Pro Card", tag, owner, clock, "gfxultrp", __FILE__), device_isa16_card_interface(mconfig, *this), m_vga(nullptr) { } -isa16_vga_mach64_device::isa16_vga_mach64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa16_vga_mach64_device::isa16_vga_mach64_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA16_SVGA_MACH64, "ATi mach64 Card", tag, owner, clock, "mach64", __FILE__), device_isa16_card_interface(mconfig, *this), m_vga(nullptr) { diff --git a/src/devices/bus/isa/vga_ati.h b/src/devices/bus/isa/vga_ati.h index 616667ef17b..a9df5c92fcb 100644 --- a/src/devices/bus/isa/vga_ati.h +++ b/src/devices/bus/isa/vga_ati.h @@ -29,7 +29,7 @@ class isa16_vga_gfxultra_device : { public: // construction/destruction - isa16_vga_gfxultra_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa16_vga_gfxultra_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -51,7 +51,7 @@ class isa16_vga_gfxultrapro_device : { public: // construction/destruction - isa16_vga_gfxultrapro_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa16_vga_gfxultrapro_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -72,7 +72,7 @@ class isa16_vga_mach64_device : { public: // construction/destruction - isa16_vga_mach64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa16_vga_mach64_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/isa/wd1002a_wx1.cpp b/src/devices/bus/isa/wd1002a_wx1.cpp index 29df9cec729..6515d3981e3 100644 --- a/src/devices/bus/isa/wd1002a_wx1.cpp +++ b/src/devices/bus/isa/wd1002a_wx1.cpp @@ -45,7 +45,7 @@ const rom_entry *isa8_wd1002a_wx1_device::device_rom_region() const // isa8_wd1002a_wx1_device - constructor //------------------------------------------------- -isa8_wd1002a_wx1_device::isa8_wd1002a_wx1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +isa8_wd1002a_wx1_device::isa8_wd1002a_wx1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_WD1002A_WX1, "WD1002A-WX1", tag, owner, clock, "wd1002a_wx1", __FILE__), device_isa8_card_interface( mconfig, *this ) { diff --git a/src/devices/bus/isa/wd1002a_wx1.h b/src/devices/bus/isa/wd1002a_wx1.h index 86715ed367e..645be0521f0 100644 --- a/src/devices/bus/isa/wd1002a_wx1.h +++ b/src/devices/bus/isa/wd1002a_wx1.h @@ -27,7 +27,7 @@ class isa8_wd1002a_wx1_device : public device_t, { public: // construction/destruction - isa8_wd1002a_wx1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isa8_wd1002a_wx1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/isa/wdxt_gen.cpp b/src/devices/bus/isa/wdxt_gen.cpp index abd262cd918..1276b42f444 100644 --- a/src/devices/bus/isa/wdxt_gen.cpp +++ b/src/devices/bus/isa/wdxt_gen.cpp @@ -189,7 +189,7 @@ machine_config_constructor wdxt_gen_device::device_mconfig_additions() const // wdxt_gen_device - constructor //------------------------------------------------- -wdxt_gen_device::wdxt_gen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +wdxt_gen_device::wdxt_gen_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_WDXT_GEN, "Western Digital WDXT-GEN (Amstrad PC1512/1640)", tag, owner, clock, "wdxt_gen", __FILE__), device_isa8_card_interface(mconfig, *this), m_maincpu(*this, WD1015_TAG), diff --git a/src/devices/bus/isa/wdxt_gen.h b/src/devices/bus/isa/wdxt_gen.h index 5185b2d8def..04f0058265e 100644 --- a/src/devices/bus/isa/wdxt_gen.h +++ b/src/devices/bus/isa/wdxt_gen.h @@ -39,7 +39,7 @@ class wdxt_gen_device : public device_t, { public: // construction/destruction - wdxt_gen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + wdxt_gen_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/isa/xtide.cpp b/src/devices/bus/isa/xtide.cpp index fcd0750e5a3..a08b5e56809 100644 --- a/src/devices/bus/isa/xtide.cpp +++ b/src/devices/bus/isa/xtide.cpp @@ -299,7 +299,7 @@ const rom_entry *xtide_device::device_rom_region() const // xtide_device - constructor //------------------------------------------------- -xtide_device::xtide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +xtide_device::xtide_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_XTIDE, "XT-IDE Fixed Drive Adapter", tag, owner, clock, "isa8_xtide", __FILE__), device_isa8_card_interface( mconfig, *this ), m_ata(*this, "ata"), diff --git a/src/devices/bus/isa/xtide.h b/src/devices/bus/isa/xtide.h index a8113ebe9db..faff6ea91eb 100644 --- a/src/devices/bus/isa/xtide.h +++ b/src/devices/bus/isa/xtide.h @@ -19,7 +19,7 @@ class xtide_device : public device_t, { public: // construction/destruction - xtide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + xtide_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/isbx/compis_fdc.cpp b/src/devices/bus/isbx/compis_fdc.cpp index 2718f57c78f..99a637dc57e 100644 --- a/src/devices/bus/isbx/compis_fdc.cpp +++ b/src/devices/bus/isbx/compis_fdc.cpp @@ -80,7 +80,7 @@ machine_config_constructor compis_fdc_device::device_mconfig_additions() const // compis_fdc_device - constructor //------------------------------------------------- -compis_fdc_device::compis_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +compis_fdc_device::compis_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, COMPIS_FDC, "Compis FDC", tag, owner, clock, "compis_fdc", __FILE__), device_isbx_card_interface(mconfig, *this), m_fdc(*this, I8272_TAG), diff --git a/src/devices/bus/isbx/compis_fdc.h b/src/devices/bus/isbx/compis_fdc.h index d97bc4eb468..044f154fcd0 100644 --- a/src/devices/bus/isbx/compis_fdc.h +++ b/src/devices/bus/isbx/compis_fdc.h @@ -29,7 +29,7 @@ class compis_fdc_device : public device_t, { public: // construction/destruction - compis_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + compis_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/isbx/isbc_218a.cpp b/src/devices/bus/isbx/isbc_218a.cpp index bb1eea2b194..47e697a9185 100644 --- a/src/devices/bus/isbx/isbc_218a.cpp +++ b/src/devices/bus/isbx/isbc_218a.cpp @@ -79,7 +79,7 @@ machine_config_constructor isbc_218a_device::device_mconfig_additions() const // isbc_218a_device - constructor //------------------------------------------------- -isbc_218a_device::isbc_218a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isbc_218a_device::isbc_218a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISBC_218A, "ISBX 218a for ISBC", tag, owner, clock, "isbc_218a", __FILE__), device_isbx_card_interface(mconfig, *this), m_fdc(*this, I8272_TAG), diff --git a/src/devices/bus/isbx/isbc_218a.h b/src/devices/bus/isbx/isbc_218a.h index 5fc354a725f..0c502f86043 100644 --- a/src/devices/bus/isbx/isbc_218a.h +++ b/src/devices/bus/isbx/isbc_218a.h @@ -29,7 +29,7 @@ class isbc_218a_device : public device_t, { public: // construction/destruction - isbc_218a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isbc_218a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/isbx/isbx.cpp b/src/devices/bus/isbx/isbx.cpp index e71aa5e5454..083bc3db427 100644 --- a/src/devices/bus/isbx/isbx.cpp +++ b/src/devices/bus/isbx/isbx.cpp @@ -37,7 +37,7 @@ device_isbx_card_interface::device_isbx_card_interface(const machine_config &mco // isbx_slot_device - constructor //------------------------------------------------- -isbx_slot_device::isbx_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isbx_slot_device::isbx_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISBX_SLOT, "iSBX bus slot", tag, owner, clock, "isbx_slot", __FILE__), device_slot_interface(mconfig, *this), m_write_mintr0(*this), diff --git a/src/devices/bus/isbx/isbx.h b/src/devices/bus/isbx/isbx.h index cb90fbd27b1..a2663eba73c 100644 --- a/src/devices/bus/isbx/isbx.h +++ b/src/devices/bus/isbx/isbx.h @@ -102,7 +102,7 @@ class isbx_slot_device : public device_t, { public: // construction/destruction - isbx_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + isbx_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template<class _mintr0> void set_mintr0_callback(_mintr0 mintr0) { m_write_mintr0.set_callback(mintr0); } template<class _mintr1> void set_mintr1_callback(_mintr1 mintr1) { m_write_mintr1.set_callback(mintr1); } diff --git a/src/devices/bus/kc/d002.cpp b/src/devices/bus/kc/d002.cpp index fdb36a8c34d..fcebf8be39e 100644 --- a/src/devices/bus/kc/d002.cpp +++ b/src/devices/bus/kc/d002.cpp @@ -108,7 +108,7 @@ const device_type KC_D002 = &device_creator<kc_d002_device>; // kc_d002_device - constructor //------------------------------------------------- -kc_d002_device::kc_d002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +kc_d002_device::kc_d002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, KC_D002, "D002 Bus Driver", tag, owner, clock, "kc_d002", __FILE__), device_kcexp_interface( mconfig, *this ), m_slot(nullptr) { diff --git a/src/devices/bus/kc/d002.h b/src/devices/bus/kc/d002.h index 00c85448643..2a8c2c11d8b 100644 --- a/src/devices/bus/kc/d002.h +++ b/src/devices/bus/kc/d002.h @@ -23,7 +23,7 @@ class kc_d002_device : { public: // construction/destruction - kc_d002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + kc_d002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/kc/d004.cpp b/src/devices/bus/kc/d004.cpp index 4895c5419c4..661f7a56359 100644 --- a/src/devices/bus/kc/d004.cpp +++ b/src/devices/bus/kc/d004.cpp @@ -128,7 +128,7 @@ const device_type KC_D004_GIDE = &device_creator<kc_d004_gide_device>; // kc_d004_device - constructor //------------------------------------------------- -kc_d004_device::kc_d004_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +kc_d004_device::kc_d004_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, KC_D004, "D004 Floppy Disk Interface", tag, owner, clock, "kc_d004", __FILE__), device_kcexp_interface( mconfig, *this ), m_cpu(*this, Z80_TAG), @@ -141,7 +141,7 @@ kc_d004_device::kc_d004_device(const machine_config &mconfig, const char *tag, d { } -kc_d004_device::kc_d004_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +kc_d004_device::kc_d004_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_kcexp_interface( mconfig, *this ), m_cpu(*this, Z80_TAG), @@ -382,7 +382,7 @@ WRITE_LINE_MEMBER(kc_d004_device::fdc_irq) // kc_d004_gide_device - constructor //------------------------------------------------- -kc_d004_gide_device::kc_d004_gide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +kc_d004_gide_device::kc_d004_gide_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : kc_d004_device(mconfig, KC_D004, "D004 Floppy Disk + GIDE Interface", tag, owner, clock, "kc_d004gide", __FILE__), m_ata(*this, ATA_TAG), m_ata_data(0), m_lh(0) { @@ -433,7 +433,7 @@ READ8_MEMBER(kc_d004_gide_device::gide_r) UINT8 rtc_addr = (offset >> 8) & 0x0f; // TODO RTC-72421 - logerror("GIDE %s read RTC 0x%02x\n", tag(), rtc_addr); + logerror("GIDE %s read RTC 0x%02x\n", tag().c_str(), rtc_addr); data = 0; } else @@ -481,7 +481,7 @@ WRITE8_MEMBER(kc_d004_gide_device::gide_w) UINT8 rtc_addr = (offset >> 8) & 0x0f; // TODO RTC-72421 - logerror("GIDE %s wrire RTC 0x%02x 0x%02x\n", tag(), rtc_addr, data); + logerror("GIDE %s wrire RTC 0x%02x 0x%02x\n", tag().c_str(), rtc_addr, data); } else { diff --git a/src/devices/bus/kc/d004.h b/src/devices/bus/kc/d004.h index ceb0a848876..4ce9ad0d15f 100644 --- a/src/devices/bus/kc/d004.h +++ b/src/devices/bus/kc/d004.h @@ -26,8 +26,8 @@ class kc_d004_device : { public: // construction/destruction - kc_d004_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - kc_d004_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + kc_d004_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + kc_d004_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -86,7 +86,7 @@ class kc_d004_gide_device : { public: // construction/destruction - kc_d004_gide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + kc_d004_gide_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/kc/kc.cpp b/src/devices/bus/kc/kc.cpp index a5a46802998..c58179df7c9 100644 --- a/src/devices/bus/kc/kc.cpp +++ b/src/devices/bus/kc/kc.cpp @@ -153,25 +153,25 @@ device_kcexp_interface::~device_kcexp_interface() //------------------------------------------------- // kcexp_slot_device - constructor //------------------------------------------------- -kcexp_slot_device::kcexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +kcexp_slot_device::kcexp_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, KCEXP_SLOT, "KC85 Expansion Slot", tag, owner, clock, "kcexp_slot", __FILE__), device_slot_interface(mconfig, *this), m_out_irq_cb(*this), m_out_nmi_cb(*this), - m_out_halt_cb(*this), m_cart(nullptr), m_next_slot_tag(nullptr), m_next_slot(nullptr) + m_out_halt_cb(*this), m_cart(nullptr), m_next_slot(nullptr) { } -kcexp_slot_device::kcexp_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +kcexp_slot_device::kcexp_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_slot_interface(mconfig, *this), m_out_irq_cb(*this), m_out_nmi_cb(*this), - m_out_halt_cb(*this), m_cart(nullptr), m_next_slot_tag(nullptr), m_next_slot(nullptr) + m_out_halt_cb(*this), m_cart(nullptr), m_next_slot(nullptr) { } -void kcexp_slot_device::static_set_next_slot(device_t &device, const char *next_slot_tag) +void kcexp_slot_device::static_set_next_slot(device_t &device, std::string next_slot_tag) { kcexp_slot_device &kc_slot = dynamic_cast<kcexp_slot_device &>(device); @@ -193,7 +193,7 @@ kcexp_slot_device::~kcexp_slot_device() void kcexp_slot_device::device_start() { m_cart = dynamic_cast<device_kcexp_interface *>(get_card_device()); - m_next_slot = m_next_slot_tag ? owner()->subdevice<kcexp_slot_device>(m_next_slot_tag) : nullptr; + m_next_slot = !m_next_slot_tag.empty() ? owner()->subdevice<kcexp_slot_device>(m_next_slot_tag) : nullptr; // resolve callbacks m_out_irq_cb.resolve_safe(); @@ -273,7 +273,7 @@ void kcexp_slot_device::io_write(offs_t offset, UINT8 data) WRITE_LINE_MEMBER( kcexp_slot_device::mei_w ) { - if (LOG) logerror("KCEXP '%s': %s MEI line\n", tag(), state != CLEAR_LINE ? "ASSERT": "CLEAR"); + if (LOG) logerror("KCEXP '%s': %s MEI line\n", tag().c_str(), state != CLEAR_LINE ? "ASSERT": "CLEAR"); if (m_cart) m_cart->mei_w(state); @@ -285,7 +285,7 @@ WRITE_LINE_MEMBER( kcexp_slot_device::mei_w ) WRITE_LINE_MEMBER( kcexp_slot_device::meo_w ) { - if (LOG) logerror("KCEXP '%s': %s MEO line\n", tag(), state != CLEAR_LINE ? "ASSERT": "CLEAR"); + if (LOG) logerror("KCEXP '%s': %s MEO line\n", tag().c_str(), state != CLEAR_LINE ? "ASSERT": "CLEAR"); if (m_next_slot) m_next_slot->mei_w(state); @@ -299,7 +299,7 @@ WRITE_LINE_MEMBER( kcexp_slot_device::meo_w ) //------------------------------------------------- // kccart_slot_device - constructor //------------------------------------------------- -kccart_slot_device::kccart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +kccart_slot_device::kccart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : kcexp_slot_device(mconfig, KCCART_SLOT, "KC85 Cartridge Slot", tag, owner, clock, "kccart_slot", __FILE__), device_image_interface(mconfig, *this) { diff --git a/src/devices/bus/kc/kc.h b/src/devices/bus/kc/kc.h index e31007ea85e..9b3d5bf489c 100644 --- a/src/devices/bus/kc/kc.h +++ b/src/devices/bus/kc/kc.h @@ -42,8 +42,8 @@ class kcexp_slot_device : public device_t, { public: // construction/destruction - kcexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - kcexp_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + kcexp_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + kcexp_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); virtual ~kcexp_slot_device(); template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<kcexp_slot_device &>(device).m_out_irq_cb.set_callback(object); } @@ -54,7 +54,7 @@ public: virtual void device_start() override; // inline configuration - static void static_set_next_slot(device_t &device, const char *next_module_tag); + static void static_set_next_slot(device_t &device, std::string next_module_tag); // reading and writing virtual UINT8 module_id_r(); @@ -72,7 +72,7 @@ public: device_kcexp_interface* m_cart; - const char* m_next_slot_tag; + std::string m_next_slot_tag; kcexp_slot_device* m_next_slot; }; @@ -83,7 +83,7 @@ class kccart_slot_device : public kcexp_slot_device, { public: // construction/destruction - kccart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + kccart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~kccart_slot_device(); // device-level overrides diff --git a/src/devices/bus/kc/ram.cpp b/src/devices/bus/kc/ram.cpp index c10b99d0d70..50f50be3efe 100644 --- a/src/devices/bus/kc/ram.cpp +++ b/src/devices/bus/kc/ram.cpp @@ -42,13 +42,13 @@ const device_type KC_M036 = &device_creator<kc_m036_device>; // kc_m011_device - constructor //------------------------------------------------- -kc_m011_device::kc_m011_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +kc_m011_device::kc_m011_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, KC_M011, "M011 64KB RAM", tag, owner, clock, "kc_m011", __FILE__), device_kcexp_interface( mconfig, *this ), m_slot(nullptr), m_mei(0), m_ram(nullptr), m_enabled(0), m_write_enabled(0), m_base(0), m_segment(0) { } -kc_m011_device::kc_m011_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +kc_m011_device::kc_m011_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_kcexp_interface( mconfig, *this ), m_slot(nullptr), m_mei(0), m_ram(nullptr), m_enabled(0), m_write_enabled(0), m_base(0), m_segment(0) { @@ -62,7 +62,7 @@ void kc_m011_device::device_start() { m_slot = dynamic_cast<kcexp_slot_device *>(owner()); - m_ram = machine().memory().region_alloc(tag(), get_ram_size(), 1, ENDIANNESS_LITTLE)->base(); + m_ram = machine().memory().region_alloc(tag().c_str(), get_ram_size(), 1, ENDIANNESS_LITTLE)->base(); memset(m_ram, 0, get_ram_size()); } @@ -147,7 +147,7 @@ WRITE_LINE_MEMBER( kc_m011_device::mei_w ) // kc_m022_device - constructor //------------------------------------------------- -kc_m022_device::kc_m022_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +kc_m022_device::kc_m022_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : kc_m011_device(mconfig, KC_M022, "M022 16KB RAM", tag, owner, clock, "kc_m022", __FILE__) { } @@ -192,7 +192,7 @@ void kc_m022_device::write(offs_t offset, UINT8 data) // kc_m032_device - constructor //------------------------------------------------- -kc_m032_device::kc_m032_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +kc_m032_device::kc_m032_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : kc_m011_device(mconfig, KC_M032, "M032 256KB segmented RAM", tag, owner, clock, "kc_m032", __FILE__) { } @@ -261,7 +261,7 @@ void kc_m032_device::write(offs_t offset, UINT8 data) // kc_m034_device - constructor //------------------------------------------------- -kc_m034_device::kc_m034_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +kc_m034_device::kc_m034_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : kc_m011_device(mconfig, KC_M034, "M034 512KB segmented RAM", tag, owner, clock, "kc_m034", __FILE__) { } @@ -330,7 +330,7 @@ void kc_m034_device::write(offs_t offset, UINT8 data) // kc_m035_device - constructor //------------------------------------------------- -kc_m035_device::kc_m035_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +kc_m035_device::kc_m035_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : kc_m011_device(mconfig, KC_M035, "M035 1MB segmented RAM", tag, owner, clock, "kc_m035", __FILE__) { } @@ -388,7 +388,7 @@ void kc_m035_device::write(offs_t offset, UINT8 data) // kc_m036_device - constructor //------------------------------------------------- -kc_m036_device::kc_m036_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +kc_m036_device::kc_m036_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : kc_m011_device(mconfig, KC_M036, "M036 128KB segmented RAM", tag, owner, clock, "kc_m036", __FILE__) { } diff --git a/src/devices/bus/kc/ram.h b/src/devices/bus/kc/ram.h index 0cc441a5fa0..83fbd778f35 100644 --- a/src/devices/bus/kc/ram.h +++ b/src/devices/bus/kc/ram.h @@ -20,8 +20,8 @@ class kc_m011_device : { public: // construction/destruction - kc_m011_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - kc_m011_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + kc_m011_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + kc_m011_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); protected: // device-level overrides @@ -59,7 +59,7 @@ class kc_m022_device : { public: // construction/destruction - kc_m022_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + kc_m022_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // kcexp_interface overrides @@ -80,7 +80,7 @@ class kc_m032_device : { public: // construction/destruction - kc_m032_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + kc_m032_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides @@ -105,7 +105,7 @@ class kc_m034_device : { public: // construction/destruction - kc_m034_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + kc_m034_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides @@ -130,7 +130,7 @@ class kc_m035_device : { public: // construction/destruction - kc_m035_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + kc_m035_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // kcexp_interface overrides @@ -152,7 +152,7 @@ class kc_m036_device : { public: // construction/destruction - kc_m036_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + kc_m036_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/kc/rom.cpp b/src/devices/bus/kc/rom.cpp index 404089110a0..ec78ec3f198 100644 --- a/src/devices/bus/kc/rom.cpp +++ b/src/devices/bus/kc/rom.cpp @@ -42,13 +42,13 @@ const device_type KC_M033 = &device_creator<kc_m033_device>; // kc_8k_device - constructor //------------------------------------------------- -kc_8k_device::kc_8k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +kc_8k_device::kc_8k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, KC_STANDARD, "Standard", tag, owner, clock, "kc_8k", __FILE__), device_kcexp_interface( mconfig, *this ), m_slot(nullptr), m_mei(0), m_rom(nullptr), m_enabled(0), m_base(0) { } -kc_8k_device::kc_8k_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +kc_8k_device::kc_8k_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_kcexp_interface( mconfig, *this ), m_slot(nullptr), m_mei(0), m_rom(nullptr), m_enabled(0), m_base(0) { @@ -142,7 +142,7 @@ WRITE_LINE_MEMBER( kc_8k_device::mei_w ) // kc_m006_device - constructor //------------------------------------------------- -kc_m006_device::kc_m006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +kc_m006_device::kc_m006_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : kc_8k_device(mconfig, KC_M006, "M006 BASIC", tag, owner, clock, "kc_m006", __FILE__) { } @@ -184,7 +184,7 @@ void kc_m006_device::read(offs_t offset, UINT8 &data) // kc_m033_device - constructor //------------------------------------------------- -kc_m033_device::kc_m033_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +kc_m033_device::kc_m033_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : kc_8k_device(mconfig, KC_M033, "M033 TypeStar", tag, owner, clock, "kc_m033", __FILE__), m_bank(0) { } diff --git a/src/devices/bus/kc/rom.h b/src/devices/bus/kc/rom.h index 4310b98ea3b..48ae2763f96 100644 --- a/src/devices/bus/kc/rom.h +++ b/src/devices/bus/kc/rom.h @@ -20,8 +20,8 @@ class kc_8k_device : { public: // construction/destruction - kc_8k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - kc_8k_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + kc_8k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + kc_8k_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides @@ -56,7 +56,7 @@ class kc_m006_device : { public: // construction/destruction - kc_m006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + kc_m006_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // kcexp_interface overrides @@ -73,7 +73,7 @@ class kc_m033_device : { public: // construction/destruction - kc_m033_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + kc_m033_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/lpci/cirrus.cpp b/src/devices/bus/lpci/cirrus.cpp index 61cea36a3e9..61902a741c0 100644 --- a/src/devices/bus/lpci/cirrus.cpp +++ b/src/devices/bus/lpci/cirrus.cpp @@ -83,7 +83,7 @@ const device_type CIRRUS = &device_creator<cirrus_device>; // cirrus_device - constructor //------------------------------------------------- -cirrus_device::cirrus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +cirrus_device::cirrus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CIRRUS, "CIRRUS", tag, owner, clock, "cirrus", __FILE__), pci_device_interface( mconfig, *this ) { diff --git a/src/devices/bus/lpci/cirrus.h b/src/devices/bus/lpci/cirrus.h index 9b06a0c7878..e62c49ea70e 100644 --- a/src/devices/bus/lpci/cirrus.h +++ b/src/devices/bus/lpci/cirrus.h @@ -20,7 +20,7 @@ class cirrus_device : public device_t, { public: // construction/destruction - cirrus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cirrus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual UINT32 pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask) override; virtual void pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask) override; diff --git a/src/devices/bus/lpci/i82371ab.cpp b/src/devices/bus/lpci/i82371ab.cpp index 9f5a9de2edd..3bb5db34ffe 100644 --- a/src/devices/bus/lpci/i82371ab.cpp +++ b/src/devices/bus/lpci/i82371ab.cpp @@ -22,7 +22,7 @@ const device_type I82371AB = &device_creator<i82371ab_device>; -i82371ab_device::i82371ab_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +i82371ab_device::i82371ab_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : southbridge_device(mconfig, I82371AB, "Intel 82371AB", tag, owner, clock, "i82371ab", __FILE__), pci_device_interface( mconfig, *this ) { diff --git a/src/devices/bus/lpci/i82371ab.h b/src/devices/bus/lpci/i82371ab.h index ec5ec8b3be2..54e24614b71 100644 --- a/src/devices/bus/lpci/i82371ab.h +++ b/src/devices/bus/lpci/i82371ab.h @@ -21,7 +21,7 @@ class i82371ab_device : public southbridge_device, { public: // construction/destruction - i82371ab_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + i82371ab_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual UINT32 pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask) override; virtual void pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask) override; diff --git a/src/devices/bus/lpci/i82371sb.cpp b/src/devices/bus/lpci/i82371sb.cpp index de9cbc365e7..0003690f8d2 100644 --- a/src/devices/bus/lpci/i82371sb.cpp +++ b/src/devices/bus/lpci/i82371sb.cpp @@ -27,7 +27,7 @@ const device_type I82371SB = &device_creator<i82371sb_device>; -i82371sb_device::i82371sb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +i82371sb_device::i82371sb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : southbridge_device(mconfig, I82371SB, "Intel 82371SB", tag, owner, clock, "i82371sb", __FILE__), pci_device_interface( mconfig, *this ) { diff --git a/src/devices/bus/lpci/i82371sb.h b/src/devices/bus/lpci/i82371sb.h index 9e5b3c14b2a..4c7d8048d3b 100644 --- a/src/devices/bus/lpci/i82371sb.h +++ b/src/devices/bus/lpci/i82371sb.h @@ -21,7 +21,7 @@ class i82371sb_device : public southbridge_device, { public: // construction/destruction - i82371sb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + i82371sb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual UINT32 pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask) override; virtual void pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask) override; diff --git a/src/devices/bus/lpci/i82439tx.cpp b/src/devices/bus/lpci/i82439tx.cpp index e2c64f49473..82a519dbb57 100644 --- a/src/devices/bus/lpci/i82439tx.cpp +++ b/src/devices/bus/lpci/i82439tx.cpp @@ -16,11 +16,9 @@ const device_type I82439TX = &device_creator<i82439tx_device>; -i82439tx_device::i82439tx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +i82439tx_device::i82439tx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : northbridge_device(mconfig, I82439TX, "Intel 82439TX", tag, owner, clock, "i82439tx", __FILE__), pci_device_interface( mconfig, *this ), - m_cpu_tag( nullptr ), - m_region_tag( nullptr ), m_space(nullptr), m_rom(nullptr) { diff --git a/src/devices/bus/lpci/i82439tx.h b/src/devices/bus/lpci/i82439tx.h index a0179af8265..1243f37f52c 100644 --- a/src/devices/bus/lpci/i82439tx.h +++ b/src/devices/bus/lpci/i82439tx.h @@ -27,10 +27,10 @@ class i82439tx_device : public northbridge_device, { public: // construction/destruction - i82439tx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + i82439tx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - static void static_set_cpu(device_t &device, const char *tag) { dynamic_cast<i82439tx_device &>(device).m_cpu_tag = tag; } - static void static_set_region(device_t &device, const char *tag) { dynamic_cast<i82439tx_device &>(device).m_region_tag = tag; } + static void static_set_cpu(device_t &device, std::string tag) { dynamic_cast<i82439tx_device &>(device).m_cpu_tag = tag; } + static void static_set_region(device_t &device, std::string tag) { dynamic_cast<i82439tx_device &>(device).m_region_tag = tag; } virtual UINT32 pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask) override; virtual void pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask) override; @@ -43,8 +43,8 @@ protected: void i82439tx_configure_memory(UINT8 val, offs_t begin, offs_t end); private: - const char *m_cpu_tag; - const char *m_region_tag; + std::string m_cpu_tag; + std::string m_region_tag; address_space *m_space; UINT8 *m_rom; diff --git a/src/devices/bus/lpci/mpc105.cpp b/src/devices/bus/lpci/mpc105.cpp index 74780b7159f..1d3ac1b8f9a 100644 --- a/src/devices/bus/lpci/mpc105.cpp +++ b/src/devices/bus/lpci/mpc105.cpp @@ -29,10 +29,9 @@ const device_type MPC105 = &device_creator<mpc105_device>; // mpc105_device - constructor //------------------------------------------------- -mpc105_device::mpc105_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +mpc105_device::mpc105_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MPC105, "MPC105", tag, owner, clock, "mpc105", __FILE__), pci_device_interface( mconfig, *this ), - m_cpu_tag(nullptr), m_bank_base_default(0), m_bank_base(0), m_bank_enable(0), diff --git a/src/devices/bus/lpci/mpc105.h b/src/devices/bus/lpci/mpc105.h index f890432dca4..5d353737a9a 100644 --- a/src/devices/bus/lpci/mpc105.h +++ b/src/devices/bus/lpci/mpc105.h @@ -28,9 +28,9 @@ class mpc105_device : public device_t, { public: // construction/destruction - mpc105_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + mpc105_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - static void static_set_cpu(device_t &device, const char *tag) { dynamic_cast<mpc105_device &>(device).m_cpu_tag = tag; } + static void static_set_cpu(device_t &device, std::string tag) { dynamic_cast<mpc105_device &>(device).m_cpu_tag = tag; } static void static_set_bank_base_default(device_t &device, int bank_base_default) { dynamic_cast<mpc105_device &>(device).m_bank_base_default = bank_base_default; } virtual UINT32 pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask) override; @@ -44,7 +44,7 @@ protected: void update_memory(); private: - const char *m_cpu_tag; + std::string m_cpu_tag; int m_bank_base_default; int m_bank_base; UINT8 m_bank_enable; diff --git a/src/devices/bus/lpci/northbridge.cpp b/src/devices/bus/lpci/northbridge.cpp index ec5a0a8582a..c159ba8b313 100644 --- a/src/devices/bus/lpci/northbridge.cpp +++ b/src/devices/bus/lpci/northbridge.cpp @@ -13,7 +13,7 @@ // GLOBAL VARIABLES //************************************************************************** -northbridge_device::northbridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +northbridge_device::northbridge_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(*this, ":maincpu"), m_ram(*this, ":" RAM_TAG) diff --git a/src/devices/bus/lpci/northbridge.h b/src/devices/bus/lpci/northbridge.h index 73c21086b8f..2f76be6d457 100644 --- a/src/devices/bus/lpci/northbridge.h +++ b/src/devices/bus/lpci/northbridge.h @@ -20,7 +20,7 @@ class northbridge_device : { public: // construction/destruction - northbridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + northbridge_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); protected: // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/lpci/pci.cpp b/src/devices/bus/lpci/pci.cpp index aa095a8cd4e..848234d2241 100644 --- a/src/devices/bus/lpci/pci.cpp +++ b/src/devices/bus/lpci/pci.cpp @@ -89,7 +89,7 @@ const device_type PCI_BUS = &device_creator<pci_bus_device>; //------------------------------------------------- // pci_bus_device - constructor //------------------------------------------------- -pci_bus_device::pci_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +pci_bus_device::pci_bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PCI_BUS, "PCI Bus", tag, owner, clock, "pci_bus", __FILE__), m_busnum(0), m_father(nullptr), m_address(0), m_devicenum(0), m_busnumber(0), m_busnumaddr(nullptr) { @@ -130,7 +130,7 @@ READ32_MEMBER( pci_bus_device::read ) } if (LOG_PCI) - logerror("read('%s'): offset=%d result=0x%08X\n", tag(), offset, result); + logerror("read('%s'): offset=%d result=0x%08X\n", tag().c_str(), offset, result); return result; } @@ -162,7 +162,7 @@ WRITE32_MEMBER( pci_bus_device::write ) offset %= 2; if (LOG_PCI) - logerror("write('%s'): offset=%d data=0x%08X\n", tag(), offset, data); + logerror("write('%s'): offset=%d data=0x%08X\n", tag().c_str(), offset, data); switch (offset) { @@ -314,7 +314,7 @@ pci_device_interface::~pci_device_interface() const device_type PCI_CONNECTOR = &device_creator<pci_connector>; -pci_connector::pci_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +pci_connector::pci_connector(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PCI_CONNECTOR, "PCI device connector abstraction", tag, owner, clock, "pci_connector", __FILE__), device_slot_interface(mconfig, *this) { diff --git a/src/devices/bus/lpci/pci.h b/src/devices/bus/lpci/pci.h index fbf37faa83a..a0659974c8a 100644 --- a/src/devices/bus/lpci/pci.h +++ b/src/devices/bus/lpci/pci.h @@ -33,7 +33,7 @@ class pci_connector: public device_t, public device_slot_interface { public: - pci_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + pci_connector(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~pci_connector(); pci_device_interface *get_device(); @@ -50,7 +50,7 @@ class pci_bus_device : public device_t { public: // construction/destruction - pci_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + pci_bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ32_MEMBER( read ); DECLARE_WRITE32_MEMBER( write ); @@ -60,7 +60,7 @@ public: void set_busnum(int busnum) { m_busnum = busnum; } void set_father(const char *father) { m_father = father; } - void set_device(int num, const char *tag) { + void set_device(int num, std::string tag) { m_devtag[num] = tag; } pci_bus_device *pci_search_bustree(int busnum, int devicenum, pci_bus_device *pcibus); @@ -75,7 +75,7 @@ protected: private: UINT8 m_busnum; - const char * m_devtag[32]; + std::string m_devtag[32]; pci_device_interface *m_device[32]; const char * m_father; diff --git a/src/devices/bus/lpci/southbridge.cpp b/src/devices/bus/lpci/southbridge.cpp index e7858521437..47d6d5ef32e 100644 --- a/src/devices/bus/lpci/southbridge.cpp +++ b/src/devices/bus/lpci/southbridge.cpp @@ -127,7 +127,7 @@ machine_config_constructor southbridge_device::device_mconfig_additions() const return MACHINE_CONFIG_NAME( southbridge ); } -southbridge_device::southbridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +southbridge_device::southbridge_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(*this, ":maincpu"), m_pic8259_master(*this, "pic8259_master"), diff --git a/src/devices/bus/lpci/southbridge.h b/src/devices/bus/lpci/southbridge.h index 5e280192dd4..8d798723dc3 100644 --- a/src/devices/bus/lpci/southbridge.h +++ b/src/devices/bus/lpci/southbridge.h @@ -41,7 +41,7 @@ class southbridge_device : { public: // construction/destruction - southbridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + southbridge_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/lpci/vt82c505.cpp b/src/devices/bus/lpci/vt82c505.cpp index 15ba12b403b..3d805116218 100644 --- a/src/devices/bus/lpci/vt82c505.cpp +++ b/src/devices/bus/lpci/vt82c505.cpp @@ -17,7 +17,7 @@ const device_type VT82C505 = &device_creator<vt82c505_device>; -vt82c505_device::vt82c505_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +vt82c505_device::vt82c505_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VT82C505, "VIA VT82C505 PCI bridge", tag, owner, clock, "vt82c505", __FILE__), pci_device_interface( mconfig, *this ) { @@ -43,7 +43,7 @@ UINT32 vt82c505_device::pci_read(pci_bus_device *pcibus, int function, int offse result = 0x00000100; break; } - logerror("%s: PCI read func %i, offset %02x, result %08x\n",tag(),function,offset,result); + logerror("%s: PCI read func %i, offset %02x, result %08x\n", tag().c_str(),function,offset,result); return result; } @@ -59,23 +59,23 @@ void vt82c505_device::pci_write(pci_bus_device *pcibus, int function, int offset if(ACCESSING_BITS_0_7) // RX87: memory window 1 A31:24 { m_window_addr[0] = (m_window_addr[0] & 0xff00) | (data & 0x000000ff); - logerror("%s: memory window #1 A31:24 set: %04x\n",tag(),m_window_addr[0]); + logerror("%s: memory window #1 A31:24 set: %04x\n", tag().c_str(),m_window_addr[0]); } break; case 0x88: if(ACCESSING_BITS_24_31) // RX88: memory window 1 A23:16 { m_window_addr[0] = (m_window_addr[0] & 0x00ff) | ((data & 0xff000000) >> 24); - logerror("%s: memory window #1 A23:16 set: %04x\n",tag(),m_window_addr[0]); + logerror("%s: memory window #1 A23:16 set: %04x\n", tag().c_str(),m_window_addr[0]); } if(ACCESSING_BITS_16_23) // RX89: memory window 1 attributes { m_window_attr[0] = ((data & 0x00ff0000) >> 16); - logerror("%s: memory window #1 attributes set: %02x\n",tag(),m_window_attr[0]); + logerror("%s: memory window #1 attributes set: %02x\n", tag().c_str(),m_window_attr[0]); } break; } - logerror("%s: PCI write func %i, offset %02x, data %08x\n",tag(),function,offset,data); + logerror("%s: PCI write func %i, offset %02x, data %08x\n", tag().c_str(),function,offset,data); } //------------------------------------------------- diff --git a/src/devices/bus/lpci/vt82c505.h b/src/devices/bus/lpci/vt82c505.h index 68bb3358b00..7a55592420d 100644 --- a/src/devices/bus/lpci/vt82c505.h +++ b/src/devices/bus/lpci/vt82c505.h @@ -16,7 +16,7 @@ class vt82c505_device : public device_t, { public: // construction/destruction - vt82c505_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vt82c505_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual UINT32 pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask) override; virtual void pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask) override; diff --git a/src/devices/bus/macpds/macpds.cpp b/src/devices/bus/macpds/macpds.cpp index 61fae5f3a17..95dcb55c249 100644 --- a/src/devices/bus/macpds/macpds.cpp +++ b/src/devices/bus/macpds/macpds.cpp @@ -26,21 +26,19 @@ const device_type MACPDS_SLOT = &device_creator<macpds_slot_device>; //------------------------------------------------- // macpds_slot_device - constructor //------------------------------------------------- -macpds_slot_device::macpds_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +macpds_slot_device::macpds_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MACPDS_SLOT, "Mac 68000 Processor-Direct Slot", tag, owner, clock, "macpds_slot", __FILE__), - device_slot_interface(mconfig, *this), - m_macpds_tag(nullptr), - m_macpds_slottag(nullptr) + device_slot_interface(mconfig, *this) { } -macpds_slot_device::macpds_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +macpds_slot_device::macpds_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_interface(mconfig, *this), m_macpds_tag(nullptr), m_macpds_slottag(nullptr) + device_slot_interface(mconfig, *this) { } -void macpds_slot_device::static_set_macpds_slot(device_t &device, const char *tag, const char *slottag) +void macpds_slot_device::static_set_macpds_slot(device_t &device, std::string tag, std::string slottag) { macpds_slot_device &macpds_card = dynamic_cast<macpds_slot_device &>(device); macpds_card.m_macpds_tag = tag; @@ -64,7 +62,7 @@ void macpds_slot_device::device_start() const device_type MACPDS = &device_creator<macpds_device>; -void macpds_device::static_set_cputag(device_t &device, const char *tag) +void macpds_device::static_set_cputag(device_t &device, std::string tag) { macpds_device &macpds = downcast<macpds_device &>(device); macpds.m_cputag = tag; @@ -78,13 +76,13 @@ void macpds_device::static_set_cputag(device_t &device, const char *tag) // macpds_device - constructor //------------------------------------------------- -macpds_device::macpds_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, MACPDS, "MACPDS", tag, owner, clock, "macpds", __FILE__), m_maincpu(nullptr), m_cputag(nullptr) +macpds_device::macpds_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : + device_t(mconfig, MACPDS, "MACPDS", tag, owner, clock, "macpds", __FILE__), m_maincpu(nullptr) { } -macpds_device::macpds_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : - device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr), m_cputag(nullptr) +macpds_device::macpds_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : + device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr) { } //------------------------------------------------- @@ -121,7 +119,7 @@ void macpds_device::install_device(offs_t start, offs_t end, read16_delegate rha m_maincpu->space(AS_PROGRAM).install_readwrite_handler(start, end, rhandler, whandler, mask); } -void macpds_device::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data) +void macpds_device::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, std::string tag, UINT8 *data) { // printf("install_bank: %s @ %x->%x mask %x mirror %x\n", tag, start, end, mask, mirror); m_maincpu = machine().device<cpu_device>(m_cputag); @@ -151,7 +149,7 @@ void macpds_device::set_irq_line(int line, int state) device_macpds_card_interface::device_macpds_card_interface(const machine_config &mconfig, device_t &device) : device_slot_card_interface(mconfig, device), m_macpds(nullptr), - m_macpds_tag(nullptr), m_macpds_slottag(nullptr), m_next(nullptr) + m_next(nullptr) { } @@ -164,7 +162,7 @@ device_macpds_card_interface::~device_macpds_card_interface() { } -void device_macpds_card_interface::static_set_macpds_tag(device_t &device, const char *tag, const char *slottag) +void device_macpds_card_interface::static_set_macpds_tag(device_t &device, std::string tag, std::string slottag) { device_macpds_card_interface &macpds_card = dynamic_cast<device_macpds_card_interface &>(device); macpds_card.m_macpds_tag = tag; @@ -177,14 +175,14 @@ void device_macpds_card_interface::set_macpds_device() m_macpds->add_macpds_card(this); } -void device_macpds_card_interface::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data) +void device_macpds_card_interface::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, std::string tag, UINT8 *data) { char bank[256]; // append an underscore and the slot name to the bank so it's guaranteed unique - strcpy(bank, tag); + strcpy(bank, tag.c_str()); strcat(bank, "_"); - strcat(bank, m_macpds_slottag); + strcat(bank, m_macpds_slottag.c_str()); m_macpds->install_bank(start, end, mask, mirror, bank, data); } diff --git a/src/devices/bus/macpds/macpds.h b/src/devices/bus/macpds/macpds.h index db572d553f2..084958930e9 100644 --- a/src/devices/bus/macpds/macpds.h +++ b/src/devices/bus/macpds/macpds.h @@ -51,17 +51,18 @@ class macpds_slot_device : public device_t, { public: // construction/destruction - macpds_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - macpds_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + macpds_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + macpds_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides virtual void device_start() override; // inline configuration - static void static_set_macpds_slot(device_t &device, const char *tag, const char *slottag); + static void static_set_macpds_slot(device_t &device, std::string tag, std::string slottag); protected: // configuration - const char *m_macpds_tag, *m_macpds_slottag; + std::string m_macpds_tag; + std::string m_macpds_slottag; }; // device type definition @@ -75,15 +76,15 @@ class macpds_device : public device_t { public: // construction/destruction - macpds_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - macpds_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + macpds_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + macpds_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // inline configuration - static void static_set_cputag(device_t &device, const char *tag); + static void static_set_cputag(device_t &device, std::string tag); void add_macpds_card(device_macpds_card_interface *card); void install_device(offs_t start, offs_t end, read8_delegate rhandler, write8_delegate whandler, UINT32 mask=0xffffffff); void install_device(offs_t start, offs_t end, read16_delegate rhandler, write16_delegate whandler, UINT32 mask=0xffffffff); - void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data); + void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, std::string tag, UINT8 *data); void set_irq_line(int line, int state); protected: @@ -95,7 +96,7 @@ protected: cpu_device *m_maincpu; simple_list<device_macpds_card_interface> m_device_list; - const char *m_cputag; + std::string m_cputag; }; @@ -118,14 +119,15 @@ public: void set_macpds_device(); // helper functions for card devices - void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data); + void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, std::string tag, UINT8 *data); void install_rom(device_t *dev, const char *romregion, UINT32 addr); // inline configuration - static void static_set_macpds_tag(device_t &device, const char *tag, const char *slottag); + static void static_set_macpds_tag(device_t &device, std::string tag, std::string slottag); public: macpds_device *m_macpds; - const char *m_macpds_tag, *m_macpds_slottag; + std::string m_macpds_tag; + std::string m_macpds_slottag; device_macpds_card_interface *m_next; }; diff --git a/src/devices/bus/macpds/pds_tpdfpd.cpp b/src/devices/bus/macpds/pds_tpdfpd.cpp index f89a210888f..56747e6ec07 100644 --- a/src/devices/bus/macpds/pds_tpdfpd.cpp +++ b/src/devices/bus/macpds/pds_tpdfpd.cpp @@ -86,7 +86,7 @@ const rom_entry *macpds_sedisplay_device::device_rom_region() const // macpds_sedisplay_device - constructor //------------------------------------------------- -macpds_sedisplay_device::macpds_sedisplay_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +macpds_sedisplay_device::macpds_sedisplay_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PDS_SEDISPLAY, "Radius SE Full Page Display", tag, owner, clock, "pds_sefp", __FILE__), device_video_interface(mconfig, *this), device_macpds_card_interface(mconfig, *this), m_vram(nullptr), m_vbl_disable(0), m_count(0), m_clutoffs(0), m_timer(nullptr) @@ -95,7 +95,7 @@ macpds_sedisplay_device::macpds_sedisplay_device(const machine_config &mconfig, m_screen_tag = m_assembled_tag.c_str(); } -macpds_sedisplay_device::macpds_sedisplay_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +macpds_sedisplay_device::macpds_sedisplay_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), device_macpds_card_interface(mconfig, *this), m_vram(nullptr), m_vbl_disable(0), m_count(0), m_clutoffs(0), m_timer(nullptr) diff --git a/src/devices/bus/macpds/pds_tpdfpd.h b/src/devices/bus/macpds/pds_tpdfpd.h index 218c30f959b..88f0d5bb12f 100644 --- a/src/devices/bus/macpds/pds_tpdfpd.h +++ b/src/devices/bus/macpds/pds_tpdfpd.h @@ -21,8 +21,8 @@ class macpds_sedisplay_device : { public: // construction/destruction - macpds_sedisplay_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - macpds_sedisplay_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + macpds_sedisplay_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + macpds_sedisplay_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/megadrive/eeprom.cpp b/src/devices/bus/megadrive/eeprom.cpp index 1a432d6f6d6..3eb3833855f 100644 --- a/src/devices/bus/megadrive/eeprom.cpp +++ b/src/devices/bus/megadrive/eeprom.cpp @@ -60,46 +60,46 @@ const device_type MD_EEPROM_NHLPA = &device_creator<md_eeprom_nhlpa_device>; const device_type MD_EEPROM_BLARA = &device_creator<md_eeprom_blara_device>; -md_std_eeprom_device::md_std_eeprom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +md_std_eeprom_device::md_std_eeprom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_md_cart_interface( mconfig, *this ), m_i2cmem(*this, "i2cmem"), m_i2c_mem(0), m_i2c_clk(0) { } -md_std_eeprom_device::md_std_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_std_eeprom_device::md_std_eeprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MD_STD_EEPROM, "MD Standard cart + EEPROM", tag, owner, clock, "md_std_eeprom", __FILE__), device_md_cart_interface( mconfig, *this ), m_i2cmem(*this, "i2cmem"), m_i2c_mem(0), m_i2c_clk(0) { } -md_eeprom_nbajam_device::md_eeprom_nbajam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_eeprom_nbajam_device::md_eeprom_nbajam_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_eeprom_device(mconfig, MD_EEPROM_NBAJAM, "MD NBA Jam", tag, owner, clock, "md_eeprom_nbajam", __FILE__) { } -md_eeprom_nbajamte_device::md_eeprom_nbajamte_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_eeprom_nbajamte_device::md_eeprom_nbajamte_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_eeprom_device(mconfig, MD_EEPROM_NBAJAMTE, "MD NBA Jam TE (and a few more)", tag, owner, clock, "md_eeprom_nbajamte", __FILE__) { } -md_eeprom_cslam_device::md_eeprom_cslam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_eeprom_cslam_device::md_eeprom_cslam_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_eeprom_device(mconfig, MD_EEPROM_CSLAM, "MD College Slam", tag, owner, clock, "md_eeprom_cslam", __FILE__) { } -md_eeprom_nflqb_device::md_eeprom_nflqb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_eeprom_nflqb_device::md_eeprom_nflqb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_eeprom_device(mconfig, MD_EEPROM_NFLQB, "MD NFL Quarterback 96", tag, owner, clock, "md_eeprom_nflqb", __FILE__) { } -md_eeprom_nhlpa_device::md_eeprom_nhlpa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_eeprom_nhlpa_device::md_eeprom_nhlpa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_eeprom_device(mconfig, MD_EEPROM_NHLPA, "MD NHLPA 93", tag, owner, clock, "md_eeprom_nhlpa", __FILE__) { } -md_eeprom_blara_device::md_eeprom_blara_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_eeprom_blara_device::md_eeprom_blara_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_eeprom_device(mconfig, MD_EEPROM_BLARA, "MD Brian Lara", tag, owner, clock, "md_eeprom_blara", __FILE__) { } diff --git a/src/devices/bus/megadrive/eeprom.h b/src/devices/bus/megadrive/eeprom.h index 78ed7689547..e53e33302d7 100644 --- a/src/devices/bus/megadrive/eeprom.h +++ b/src/devices/bus/megadrive/eeprom.h @@ -18,8 +18,8 @@ class md_std_eeprom_device : public device_t, { public: // construction/destruction - md_std_eeprom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - md_std_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_std_eeprom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + md_std_eeprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -40,7 +40,7 @@ class md_eeprom_nbajam_device : public md_std_eeprom_device { public: // construction/destruction - md_eeprom_nbajam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_eeprom_nbajam_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -56,7 +56,7 @@ class md_eeprom_nbajamte_device : public md_std_eeprom_device { public: // construction/destruction - md_eeprom_nbajamte_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_eeprom_nbajamte_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -72,7 +72,7 @@ class md_eeprom_cslam_device : public md_std_eeprom_device { public: // construction/destruction - md_eeprom_cslam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_eeprom_cslam_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -88,7 +88,7 @@ class md_eeprom_nflqb_device : public md_std_eeprom_device { public: // construction/destruction - md_eeprom_nflqb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_eeprom_nflqb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -104,7 +104,7 @@ class md_eeprom_nhlpa_device : public md_std_eeprom_device { public: // construction/destruction - md_eeprom_nhlpa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_eeprom_nhlpa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -120,7 +120,7 @@ class md_eeprom_blara_device : public md_std_eeprom_device { public: // construction/destruction - md_eeprom_blara_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_eeprom_blara_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/megadrive/ggenie.cpp b/src/devices/bus/megadrive/ggenie.cpp index 65097208567..2d20ed719cf 100644 --- a/src/devices/bus/megadrive/ggenie.cpp +++ b/src/devices/bus/megadrive/ggenie.cpp @@ -32,7 +32,7 @@ const device_type MD_ROM_GAMEGENIE = &device_creator<md_rom_ggenie_device>; -md_rom_ggenie_device::md_rom_ggenie_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_ggenie_device::md_rom_ggenie_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MD_ROM_GAMEGENIE, "MD Game Genie", tag, owner, clock, "md_ggenie", __FILE__), device_md_cart_interface( mconfig, *this ), m_exp(*this, "subslot"), m_gg_bypass(0), m_reg_enable(0) diff --git a/src/devices/bus/megadrive/ggenie.h b/src/devices/bus/megadrive/ggenie.h index 75b943abb4e..13a9951eeae 100644 --- a/src/devices/bus/megadrive/ggenie.h +++ b/src/devices/bus/megadrive/ggenie.h @@ -13,7 +13,7 @@ class md_rom_ggenie_device : public device_t, { public: // construction/destruction - md_rom_ggenie_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_ggenie_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/megadrive/jcart.cpp b/src/devices/bus/megadrive/jcart.cpp index 85fb7c373b4..07631117e53 100644 --- a/src/devices/bus/megadrive/jcart.cpp +++ b/src/devices/bus/megadrive/jcart.cpp @@ -40,7 +40,7 @@ const device_type MD_SEPROM_CODEMAST = &device_creator<md_seprom_codemast_device const device_type MD_SEPROM_MM96 = &device_creator<md_seprom_mm96_device>; // Sampras, Super Skidmarks? -md_jcart_device::md_jcart_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +md_jcart_device::md_jcart_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_md_cart_interface( mconfig, *this ), m_jcart3(*this, "JCART3"), @@ -48,7 +48,7 @@ md_jcart_device::md_jcart_device(const machine_config &mconfig, device_type type { } -md_jcart_device::md_jcart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_jcart_device::md_jcart_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MD_JCART, "MD J-Cart games", tag, owner, clock, "md_jcart", __FILE__), device_md_cart_interface( mconfig, *this ), m_jcart3(*this, "JCART3"), @@ -57,20 +57,20 @@ md_jcart_device::md_jcart_device(const machine_config &mconfig, const char *tag, } // Micro Machines 2, Micro Machines Military -md_seprom_codemast_device::md_seprom_codemast_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +md_seprom_codemast_device::md_seprom_codemast_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : md_jcart_device(mconfig, type, name, tag, owner, clock, shortname, source), m_i2cmem(*this, "i2cmem"), m_i2c_mem(0), m_i2c_clk(0) { } -md_seprom_codemast_device::md_seprom_codemast_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_seprom_codemast_device::md_seprom_codemast_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_jcart_device(mconfig, MD_SEPROM_CODEMAST, "MD J-Cart games + SEPROM", tag, owner, clock, "md_seprom_codemast", __FILE__), m_i2cmem(*this, "i2cmem"), m_i2c_mem(0), m_i2c_clk(0) { } // Micro Machines 96 -md_seprom_mm96_device::md_seprom_mm96_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_seprom_mm96_device::md_seprom_mm96_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_seprom_codemast_device(mconfig, MD_SEPROM_MM96, "MD Micro Machine 96", tag, owner, clock, "md_seprom_mm96", __FILE__) { } diff --git a/src/devices/bus/megadrive/jcart.h b/src/devices/bus/megadrive/jcart.h index 7af02447ede..ca246306082 100644 --- a/src/devices/bus/megadrive/jcart.h +++ b/src/devices/bus/megadrive/jcart.h @@ -18,8 +18,8 @@ class md_jcart_device : public device_t, { public: // construction/destruction - md_jcart_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - md_jcart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_jcart_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + md_jcart_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -43,8 +43,8 @@ class md_seprom_codemast_device : public md_jcart_device { public: // construction/destruction - md_seprom_codemast_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - md_seprom_codemast_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_seprom_codemast_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + md_seprom_codemast_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -68,7 +68,7 @@ class md_seprom_mm96_device : public md_seprom_codemast_device { public: // construction/destruction - md_seprom_mm96_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_seprom_mm96_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/megadrive/md_slot.cpp b/src/devices/bus/megadrive/md_slot.cpp index a2674838914..d9f1a736b3b 100644 --- a/src/devices/bus/megadrive/md_slot.cpp +++ b/src/devices/bus/megadrive/md_slot.cpp @@ -83,7 +83,7 @@ device_md_cart_interface::~device_md_cart_interface() // rom_alloc - alloc the space for the cart //------------------------------------------------- -void device_md_cart_interface::rom_alloc(size_t size, const char *tag) +void device_md_cart_interface::rom_alloc(size_t size, std::string tag) { if (m_rom == nullptr) { @@ -160,7 +160,7 @@ UINT32 device_md_cart_interface::get_padded_size(UINT32 size) //------------------------------------------------- // base_md_cart_slot_device - constructor //------------------------------------------------- -base_md_cart_slot_device::base_md_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +base_md_cart_slot_device::base_md_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), @@ -169,17 +169,17 @@ base_md_cart_slot_device::base_md_cart_slot_device(const machine_config &mconfig { } -md_cart_slot_device::md_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +md_cart_slot_device::md_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : base_md_cart_slot_device(mconfig, MD_CART_SLOT, "MD Cartridge Slot", tag, owner, clock, "md_cart_slot", __FILE__) { } -pico_cart_slot_device::pico_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +pico_cart_slot_device::pico_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : base_md_cart_slot_device(mconfig, PICO_CART_SLOT, "Pico Cartridge Slot", tag, owner, clock, "pico_cart_slot", __FILE__) { } -copera_cart_slot_device::copera_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +copera_cart_slot_device::copera_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : base_md_cart_slot_device(mconfig, COPERA_CART_SLOT, "Copera Cartridge Slot", tag, owner, clock, "copera_cart_slot", __FILE__) { } diff --git a/src/devices/bus/megadrive/md_slot.h b/src/devices/bus/megadrive/md_slot.h index 086d02bc79f..08a05965d06 100644 --- a/src/devices/bus/megadrive/md_slot.h +++ b/src/devices/bus/megadrive/md_slot.h @@ -102,7 +102,7 @@ public: /* this probably should do more, like make Genesis V2 'die' if the SEGA string is not written promptly */ virtual DECLARE_WRITE16_MEMBER(write_tmss_bank) { m_device.logerror("Write to TMSS bank: offset %x data %x\n", 0xa14000 + (offset << 1), data); }; - virtual void rom_alloc(size_t size, const char *tag); + virtual void rom_alloc(size_t size, std::string tag); virtual void nvram_alloc(size_t size); virtual UINT16* get_rom_base() { return m_rom; }; virtual UINT16* get_nvram_base() { return &m_nvram[0]; }; @@ -140,7 +140,7 @@ class base_md_cart_slot_device : public device_t, { public: // construction/destruction - base_md_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + base_md_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); virtual ~base_md_cart_slot_device(); // device-level overrides @@ -201,7 +201,7 @@ class md_cart_slot_device : public base_md_cart_slot_device { public: // construction/destruction - md_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual const char *image_interface() const override { return "megadriv_cart"; } virtual const char *file_extensions() const override { return "smd,bin,md,gen"; } }; @@ -212,7 +212,7 @@ class pico_cart_slot_device : public base_md_cart_slot_device { public: // construction/destruction - pico_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + pico_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual const char *image_interface() const override { return "pico_cart"; } virtual const char *file_extensions() const override { return "bin,md"; } }; @@ -223,7 +223,7 @@ class copera_cart_slot_device : public base_md_cart_slot_device { public: // construction/destruction - copera_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + copera_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual const char *image_interface() const override { return "copera_cart"; } virtual const char *file_extensions() const override { return "bin,md"; } }; diff --git a/src/devices/bus/megadrive/rom.cpp b/src/devices/bus/megadrive/rom.cpp index 2ce6d353e35..0e4367201eb 100644 --- a/src/devices/bus/megadrive/rom.cpp +++ b/src/devices/bus/megadrive/rom.cpp @@ -63,174 +63,174 @@ const device_type MD_ROM_BEGGARP = &device_creator<md_rom_beggarp_device>; const device_type MD_ROM_WUKONG = &device_creator<md_rom_wukong_device>; -md_std_rom_device::md_std_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +md_std_rom_device::md_std_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_md_cart_interface( mconfig, *this ) { } -md_std_rom_device::md_std_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_std_rom_device::md_std_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MD_STD_ROM, "MD Standard cart", tag, owner, clock, "md_std_rom", __FILE__), device_md_cart_interface( mconfig, *this ) { } -md_rom_sram_device::md_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_sram_device::md_rom_sram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_SRAM, "MD Standard cart + SRAM", tag, owner, clock, "md_rom_sram", __FILE__) { } -md_rom_fram_device::md_rom_fram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_fram_device::md_rom_fram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_FRAM, "MD Standard cart + FRAM", tag, owner, clock, "md_rom_fram", __FILE__) { } -md_rom_ssf2_device::md_rom_ssf2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_ssf2_device::md_rom_ssf2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_SSF2, "MD Super SF2", tag, owner, clock, "md_rom_ssf2", __FILE__), m_lastoff(0), m_lastdata(0) { } -md_rom_cm2in1_device::md_rom_cm2in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_cm2in1_device::md_rom_cm2in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_CM2IN1, "MD Codemasters 2in1", tag, owner, clock, "md_rom_cm2in1", __FILE__), m_base(0) { } -md_rom_mcpirate_device::md_rom_mcpirate_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_mcpirate_device::md_rom_mcpirate_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_MCPIR, "MD Pirate Multicarts (Various)", tag, owner, clock, "md_rom_mcpirate", __FILE__), m_bank(0) { } -md_rom_bugslife_device::md_rom_bugslife_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_bugslife_device::md_rom_bugslife_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_BUGSLIFE, "MD A Bug's Life", tag, owner, clock, "md_rom_bugslife", __FILE__) { } -md_rom_smouse_device::md_rom_smouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_smouse_device::md_rom_smouse_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_SMOUSE, "MD Huan Le Tao Qi Shu / Smart Mouse", tag, owner, clock, "md_rom_smouse", __FILE__) { } -md_rom_smb_device::md_rom_smb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_smb_device::md_rom_smb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_SMB, "MD Super Mario Bros.", tag, owner, clock, "md_rom_smb", __FILE__) { } -md_rom_smb2_device::md_rom_smb2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_smb2_device::md_rom_smb2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_SMB2, "MD Super Mario Bros. 2", tag, owner, clock, "md_rom_smb2", __FILE__) { } -md_rom_smw64_device::md_rom_smw64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_smw64_device::md_rom_smw64_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_SMW64, "MD Super Mario World 64", tag, owner, clock, "md_rom_smw64", __FILE__), m_latch0(0), m_latch1(0) { } -md_rom_sbubl_device::md_rom_sbubl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_sbubl_device::md_rom_sbubl_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_SBUBL, "MD Super Bubble Bobble", tag, owner, clock, "md_rom_sbubl", __FILE__) { } -md_rom_rx3_device::md_rom_rx3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_rx3_device::md_rom_rx3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_RX3, "MD Rockman X3", tag, owner, clock, "md_rom_rx3", __FILE__) { } -md_rom_mjlov_device::md_rom_mjlov_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_mjlov_device::md_rom_mjlov_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_MJLOV, "MD Ma Jiang Qing Ren / Mahjong Lover", tag, owner, clock, "md_rom_mjlov", __FILE__) { } -md_rom_kof98_device::md_rom_kof98_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_kof98_device::md_rom_kof98_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_KOF98, "MD KOF 98", tag, owner, clock, "md_rom_kof98", __FILE__) { } -md_rom_kof99_device::md_rom_kof99_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_kof99_device::md_rom_kof99_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_KOF99, "MD KOF 99 (and others)", tag, owner, clock, "md_rom_kof99", __FILE__) { } -md_rom_soulb_device::md_rom_soulb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_soulb_device::md_rom_soulb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_SOULB, "MD Soul Blade", tag, owner, clock, "md_rom_soulb", __FILE__) { } -md_rom_chinf3_device::md_rom_chinf3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_chinf3_device::md_rom_chinf3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_CHINF3, "MD Chinese Fighter 3", tag, owner, clock, "md_rom_chinf3", __FILE__), m_bank(0) { } -md_rom_16mj2_device::md_rom_16mj2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_16mj2_device::md_rom_16mj2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_16MJ2, "MD 16 Mahjong Tiles II", tag, owner, clock, "md_rom_16mj2", __FILE__) { } -md_rom_elfwor_device::md_rom_elfwor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_elfwor_device::md_rom_elfwor_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_ELFWOR, "MD Linghuan Daoshi Super Magician / Elf Wor", tag, owner, clock, "md_rom_elfwor", __FILE__) { } -md_rom_yasech_device::md_rom_yasech_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_yasech_device::md_rom_yasech_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_YASECH, "MD Ya Se Chuan Shuo", tag, owner, clock, "md_rom_yasech", __FILE__) { } -md_rom_lion2_device::md_rom_lion2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_lion2_device::md_rom_lion2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_LION2, "MD Lion King 2", tag, owner, clock, "md_rom_lion2", __FILE__), m_prot1_data(0), m_prot2_data(0) { } -md_rom_lion3_device::md_rom_lion3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_lion3_device::md_rom_lion3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_LION3, "MD Lion King 3", tag, owner, clock, "md_rom_lion3", __FILE__), m_bank(0) { } -md_rom_pokea_device::md_rom_pokea_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_pokea_device::md_rom_pokea_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_POKEA, "MD Pokemon (Alt Protection)", tag, owner, clock, "md_rom_pokea", __FILE__) { } -md_rom_pokestad_device::md_rom_pokestad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_pokestad_device::md_rom_pokestad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_POKESTAD, "MD Pokemon Stadium", tag, owner, clock, "md_rom_pokestad", __FILE__), m_bank(0) { } -md_rom_realtec_device::md_rom_realtec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_realtec_device::md_rom_realtec_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_REALTEC, "MD Realtec", tag, owner, clock, "md_rom_realtec", __FILE__), m_bank_addr(0), m_bank_size(0), m_old_bank_addr(0) { } -md_rom_redcl_device::md_rom_redcl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_redcl_device::md_rom_redcl_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_REDCL, "MD Redcliff", tag, owner, clock, "md_rom_redcl", __FILE__) { } -md_rom_squir_device::md_rom_squir_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_squir_device::md_rom_squir_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_SQUIR, "MD Squirrel King", tag, owner, clock, "md_rom_squir", __FILE__), m_latch(0) { } -md_rom_tekkensp_device::md_rom_tekkensp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_tekkensp_device::md_rom_tekkensp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_TEKKENSP, "MD Tekken Special", tag, owner, clock, "md_rom_tekkensp", __FILE__), m_reg(0) { } -md_rom_topf_device::md_rom_topf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_topf_device::md_rom_topf_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_TOPF, "MD Top Fighter", tag, owner, clock, "md_rom_topf", __FILE__), m_latch(0) { } -md_rom_radica_device::md_rom_radica_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_radica_device::md_rom_radica_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_RADICA, "MD Radica TV games", tag, owner, clock, "md_rom_radica", __FILE__), m_bank(0) { } -md_rom_beggarp_device::md_rom_beggarp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_beggarp_device::md_rom_beggarp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_BEGGARP, "MD Beggar Prince", tag, owner, clock, "md_rom_beggarp", __FILE__), m_mode(0), m_lock(0) { } -md_rom_wukong_device::md_rom_wukong_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_wukong_device::md_rom_wukong_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_WUKONG, "MD Legend of Wukong", tag, owner, clock, "md_rom_wukong", __FILE__), m_mode(0) { } diff --git a/src/devices/bus/megadrive/rom.h b/src/devices/bus/megadrive/rom.h index 796b29dc9fb..f763977ecea 100644 --- a/src/devices/bus/megadrive/rom.h +++ b/src/devices/bus/megadrive/rom.h @@ -16,8 +16,8 @@ class md_std_rom_device : public device_t, { public: // construction/destruction - md_std_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - md_std_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_std_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + md_std_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override {}; @@ -33,7 +33,7 @@ class md_rom_sram_device : public md_std_rom_device { public: // construction/destruction - md_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_sram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ16_MEMBER(read) override; @@ -47,7 +47,7 @@ class md_rom_fram_device : public md_std_rom_device { public: // construction/destruction - md_rom_fram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_fram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ16_MEMBER(read) override; @@ -62,7 +62,7 @@ class md_rom_ssf2_device : public md_std_rom_device { public: // construction/destruction - md_rom_ssf2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_ssf2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -83,7 +83,7 @@ class md_rom_cm2in1_device : public md_std_rom_device { public: // construction/destruction - md_rom_cm2in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_cm2in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -103,7 +103,7 @@ class md_rom_mcpirate_device : public md_std_rom_device { public: // construction/destruction - md_rom_mcpirate_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_mcpirate_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -124,7 +124,7 @@ class md_rom_bugslife_device : public md_std_rom_device { public: // construction/destruction - md_rom_bugslife_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_bugslife_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ16_MEMBER(read_a13) override; @@ -136,7 +136,7 @@ class md_rom_chinf3_device : public md_std_rom_device { public: // construction/destruction - md_rom_chinf3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_chinf3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -156,7 +156,7 @@ class md_rom_16mj2_device : public md_std_rom_device { public: // construction/destruction - md_rom_16mj2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_16mj2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ16_MEMBER(read) override; @@ -168,7 +168,7 @@ class md_rom_elfwor_device : public md_std_rom_device { public: // construction/destruction - md_rom_elfwor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_elfwor_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ16_MEMBER(read) override; @@ -180,7 +180,7 @@ class md_rom_yasech_device : public md_std_rom_device { public: // construction/destruction - md_rom_yasech_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_yasech_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ16_MEMBER(read) override; @@ -192,7 +192,7 @@ class md_rom_kof98_device : public md_std_rom_device { public: // construction/destruction - md_rom_kof98_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_kof98_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ16_MEMBER(read) override; @@ -204,7 +204,7 @@ class md_rom_kof99_device : public md_std_rom_device { public: // construction/destruction - md_rom_kof99_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_kof99_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ16_MEMBER(read_a13) override; @@ -216,7 +216,7 @@ class md_rom_lion2_device : public md_std_rom_device { public: // construction/destruction - md_rom_lion2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_lion2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -236,7 +236,7 @@ class md_rom_lion3_device : public md_std_rom_device { public: // construction/destruction - md_rom_lion3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_lion3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -257,7 +257,7 @@ class md_rom_mjlov_device : public md_std_rom_device { public: // construction/destruction - md_rom_mjlov_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_mjlov_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ16_MEMBER(read) override; @@ -269,7 +269,7 @@ class md_rom_pokea_device : public md_std_rom_device { public: // construction/destruction - md_rom_pokea_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_pokea_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ16_MEMBER(read_a13) override; @@ -281,7 +281,7 @@ class md_rom_pokestad_device : public md_std_rom_device { public: // construction/destruction - md_rom_pokestad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_pokestad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -301,7 +301,7 @@ class md_rom_realtec_device : public md_std_rom_device { public: // construction/destruction - md_rom_realtec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_realtec_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -321,7 +321,7 @@ class md_rom_redcl_device : public md_std_rom_device { public: // construction/destruction - md_rom_redcl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_redcl_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ16_MEMBER(read) override; @@ -333,7 +333,7 @@ class md_rom_rx3_device : public md_std_rom_device { public: // construction/destruction - md_rom_rx3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_rx3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ16_MEMBER(read_a13) override; @@ -345,7 +345,7 @@ class md_rom_sbubl_device : public md_std_rom_device { public: // construction/destruction - md_rom_sbubl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_sbubl_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ16_MEMBER(read) override; @@ -357,7 +357,7 @@ class md_rom_smb_device : public md_std_rom_device { public: // construction/destruction - md_rom_smb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_smb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ16_MEMBER(read_a13) override; @@ -369,7 +369,7 @@ class md_rom_smb2_device : public md_std_rom_device { public: // construction/destruction - md_rom_smb2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_smb2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ16_MEMBER(read_a13) override; @@ -381,7 +381,7 @@ class md_rom_smw64_device : public md_std_rom_device { public: // construction/destruction - md_rom_smw64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_smw64_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -403,7 +403,7 @@ class md_rom_smouse_device : public md_std_rom_device { public: // construction/destruction - md_rom_smouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_smouse_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ16_MEMBER(read) override; @@ -416,7 +416,7 @@ class md_rom_soulb_device : public md_std_rom_device { public: // construction/destruction - md_rom_soulb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_soulb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ16_MEMBER(read) override; @@ -428,7 +428,7 @@ class md_rom_squir_device : public md_std_rom_device { public: // construction/destruction - md_rom_squir_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_squir_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -448,7 +448,7 @@ class md_rom_tekkensp_device : public md_std_rom_device { public: // construction/destruction - md_rom_tekkensp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_tekkensp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -468,7 +468,7 @@ class md_rom_topf_device : public md_std_rom_device { public: // construction/destruction - md_rom_topf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_topf_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -489,7 +489,7 @@ class md_rom_radica_device : public md_std_rom_device { public: // construction/destruction - md_rom_radica_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_radica_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -509,7 +509,7 @@ class md_rom_beggarp_device : public md_std_rom_device { public: // construction/destruction - md_rom_beggarp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_beggarp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -530,7 +530,7 @@ class md_rom_wukong_device : public md_std_rom_device { public: // construction/destruction - md_rom_wukong_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_wukong_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/megadrive/sk.cpp b/src/devices/bus/megadrive/sk.cpp index 4cee6dd90f4..0d05b71564c 100644 --- a/src/devices/bus/megadrive/sk.cpp +++ b/src/devices/bus/megadrive/sk.cpp @@ -27,14 +27,14 @@ const device_type MD_ROM_SK = &device_creator<md_rom_sk_device>; -md_rom_sk_device::md_rom_sk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +md_rom_sk_device::md_rom_sk_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_md_cart_interface( mconfig, *this ), m_exp(*this, "subslot") { } -md_rom_sk_device::md_rom_sk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_sk_device::md_rom_sk_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MD_ROM_SK, "MD Sonic & Knuckles", tag, owner, clock, "md_rom_sk", __FILE__), device_md_cart_interface( mconfig, *this ), m_exp(*this, "subslot") diff --git a/src/devices/bus/megadrive/sk.h b/src/devices/bus/megadrive/sk.h index 606d928daae..5d853d2af70 100644 --- a/src/devices/bus/megadrive/sk.h +++ b/src/devices/bus/megadrive/sk.h @@ -13,8 +13,8 @@ class md_rom_sk_device : public device_t, { public: // construction/destruction - md_rom_sk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - md_rom_sk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_sk_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + md_rom_sk_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/megadrive/stm95.cpp b/src/devices/bus/megadrive/stm95.cpp index 2c7ddf89ad4..b5c6b28a553 100644 --- a/src/devices/bus/megadrive/stm95.cpp +++ b/src/devices/bus/megadrive/stm95.cpp @@ -175,13 +175,13 @@ void stm95_eeprom_device::set_sck_line(int state) const device_type MD_EEPROM_STM95 = &device_creator<md_eeprom_stm95_device>; -md_eeprom_stm95_device::md_eeprom_stm95_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +md_eeprom_stm95_device::md_eeprom_stm95_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_md_cart_interface( mconfig, *this ), m_rdcnt(0) { } -md_eeprom_stm95_device::md_eeprom_stm95_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_eeprom_stm95_device::md_eeprom_stm95_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MD_EEPROM_STM95, "MD Cart + EEPROM STM95", tag, owner, clock, "md_eeprom_stm95", __FILE__), device_md_cart_interface( mconfig, *this ), m_rdcnt(0) { diff --git a/src/devices/bus/megadrive/stm95.h b/src/devices/bus/megadrive/stm95.h index 09e61670c14..46e1b708580 100644 --- a/src/devices/bus/megadrive/stm95.h +++ b/src/devices/bus/megadrive/stm95.h @@ -60,8 +60,8 @@ class md_eeprom_stm95_device : public device_t, { public: // construction/destruction - md_eeprom_stm95_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - md_eeprom_stm95_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_eeprom_stm95_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + md_eeprom_stm95_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/megadrive/svp.cpp b/src/devices/bus/megadrive/svp.cpp index 9aa905b7a66..1c37bc6ab92 100644 --- a/src/devices/bus/megadrive/svp.cpp +++ b/src/devices/bus/megadrive/svp.cpp @@ -36,7 +36,7 @@ const device_type MD_ROM_SVP = &device_creator<md_rom_svp_device>; -md_rom_svp_device::md_rom_svp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +md_rom_svp_device::md_rom_svp_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_md_cart_interface( mconfig, *this ), m_svp(*this, "svp"), @@ -44,7 +44,7 @@ md_rom_svp_device::md_rom_svp_device(const machine_config &mconfig, device_type { } -md_rom_svp_device::md_rom_svp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +md_rom_svp_device::md_rom_svp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MD_ROM_SVP, "MD Virtua Racing", tag, owner, clock, "md_rom_svp", __FILE__), device_md_cart_interface( mconfig, *this ), m_svp(*this, "svp"), diff --git a/src/devices/bus/megadrive/svp.h b/src/devices/bus/megadrive/svp.h index dce7115cf05..49ebeffb6e2 100644 --- a/src/devices/bus/megadrive/svp.h +++ b/src/devices/bus/megadrive/svp.h @@ -17,8 +17,8 @@ class md_rom_svp_device : public device_t, { public: // construction/destruction - md_rom_svp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - md_rom_svp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + md_rom_svp_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + md_rom_svp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); //protected: // device-level overrides diff --git a/src/devices/bus/midi/midi.cpp b/src/devices/bus/midi/midi.cpp index cc8a9166f4f..8c8505c8300 100644 --- a/src/devices/bus/midi/midi.cpp +++ b/src/devices/bus/midi/midi.cpp @@ -4,7 +4,7 @@ const device_type MIDI_PORT = &device_creator<midi_port_device>; -midi_port_device::midi_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +midi_port_device::midi_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MIDI_PORT, "Midi Port", tag, owner, clock, "midi_port", __FILE__), device_slot_interface(mconfig, *this), m_rxd(0), diff --git a/src/devices/bus/midi/midi.h b/src/devices/bus/midi/midi.h index fcd16932637..410050f74b1 100644 --- a/src/devices/bus/midi/midi.h +++ b/src/devices/bus/midi/midi.h @@ -20,7 +20,7 @@ class midi_port_device : public device_t, friend class device_midi_port_interface; public: - midi_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + midi_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~midi_port_device(); // static configuration helpers diff --git a/src/devices/bus/midi/midiinport.cpp b/src/devices/bus/midi/midiinport.cpp index 13632219c03..706d3c82918 100644 --- a/src/devices/bus/midi/midiinport.cpp +++ b/src/devices/bus/midi/midiinport.cpp @@ -12,7 +12,7 @@ const device_type MIDIIN_PORT = &device_creator<midiin_port_device>; -midiin_port_device::midiin_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +midiin_port_device::midiin_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MIDIIN_PORT, "MIDI In port", tag, owner, clock, "midiin_port", __FILE__), device_midi_port_interface(mconfig, *this), m_midiin(*this, "midiinimg") diff --git a/src/devices/bus/midi/midiinport.h b/src/devices/bus/midi/midiinport.h index 1f938855d70..7355e48b008 100644 --- a/src/devices/bus/midi/midiinport.h +++ b/src/devices/bus/midi/midiinport.h @@ -18,7 +18,7 @@ class midiin_port_device : public device_t, public device_midi_port_interface { public: - midiin_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + midiin_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_WRITE_LINE_MEMBER( read ) { output_rxd(state); } diff --git a/src/devices/bus/midi/midioutport.cpp b/src/devices/bus/midi/midioutport.cpp index 6ba39d6ee57..549dfbc3c7a 100644 --- a/src/devices/bus/midi/midioutport.cpp +++ b/src/devices/bus/midi/midioutport.cpp @@ -12,7 +12,7 @@ const device_type MIDIOUT_PORT = &device_creator<midiout_port_device>; -midiout_port_device::midiout_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +midiout_port_device::midiout_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MIDIOUT_PORT, "MIDI Out port", tag, owner, clock, "midiout_port", __FILE__), device_midi_port_interface(mconfig, *this), m_midiout(*this, "midioutimg") diff --git a/src/devices/bus/midi/midioutport.h b/src/devices/bus/midi/midioutport.h index 4cfabf9eeea..3b517fd9560 100644 --- a/src/devices/bus/midi/midioutport.h +++ b/src/devices/bus/midi/midioutport.h @@ -18,7 +18,7 @@ class midiout_port_device : public device_t, public device_midi_port_interface { public: - midiout_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + midiout_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) override { if (started()) m_midiout->tx(state); } diff --git a/src/devices/bus/msx_cart/arc.cpp b/src/devices/bus/msx_cart/arc.cpp index a64f321af14..3eeffa96190 100644 --- a/src/devices/bus/msx_cart/arc.cpp +++ b/src/devices/bus/msx_cart/arc.cpp @@ -7,7 +7,7 @@ const device_type MSX_CART_ARC = &device_creator<msx_cart_arc>; -msx_cart_arc::msx_cart_arc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_arc::msx_cart_arc(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_CART_ARC, "MSX Cartridge - Arc", tag, owner, clock, "msx_cart_arc", __FILE__) , msx_cart_interface(mconfig, *this) , m_7f(0) diff --git a/src/devices/bus/msx_cart/arc.h b/src/devices/bus/msx_cart/arc.h index 29f24bc7e66..351bb78dba3 100644 --- a/src/devices/bus/msx_cart/arc.h +++ b/src/devices/bus/msx_cart/arc.h @@ -13,7 +13,7 @@ class msx_cart_arc : public device_t , public msx_cart_interface { public: - msx_cart_arc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_arc(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/msx_cart/ascii.cpp b/src/devices/bus/msx_cart/ascii.cpp index 04ef820e7d9..4b2320e6b0b 100644 --- a/src/devices/bus/msx_cart/ascii.cpp +++ b/src/devices/bus/msx_cart/ascii.cpp @@ -11,7 +11,7 @@ const device_type MSX_CART_ASCII16_SRAM = &device_creator<msx_cart_ascii16_sram> const device_type MSX_CART_MSXWRITE = &device_creator<msx_cart_msxwrite>; -msx_cart_ascii8::msx_cart_ascii8(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_ascii8::msx_cart_ascii8(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_CART_ASCII8, "MSX Cartridge - ASCII8", tag, owner, clock, "msx_cart_ascii8", __FILE__) , msx_cart_interface(mconfig, *this) , m_bank_mask(0) @@ -95,7 +95,7 @@ WRITE8_MEMBER(msx_cart_ascii8::write_cart) -msx_cart_ascii16::msx_cart_ascii16(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_ascii16::msx_cart_ascii16(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_CART_ASCII16, "MSX Cartridge - ASCII16", tag, owner, clock, "msx_cart_ascii16", __FILE__) , msx_cart_interface(mconfig, *this) , m_bank_mask(0) @@ -185,7 +185,7 @@ WRITE8_MEMBER(msx_cart_ascii16::write_cart) -msx_cart_ascii8_sram::msx_cart_ascii8_sram(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_ascii8_sram::msx_cart_ascii8_sram(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_CART_ASCII8_SRAM, "MSX Cartridge - ASCII8 w/SRAM", tag, owner, clock, "msx_cart_ascii8_sram", __FILE__) , msx_cart_interface(mconfig, *this) , m_bank_mask(0) @@ -310,7 +310,7 @@ WRITE8_MEMBER(msx_cart_ascii8_sram::write_cart) -msx_cart_ascii16_sram::msx_cart_ascii16_sram(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_ascii16_sram::msx_cart_ascii16_sram(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_CART_ASCII16_SRAM, "MSX Cartridge - ASCII16 w/SRAM", tag, owner, clock, "msx_cart_ascii16_sram", __FILE__) , msx_cart_interface(mconfig, *this) , m_bank_mask(0) @@ -445,7 +445,7 @@ WRITE8_MEMBER(msx_cart_ascii16_sram::write_cart) -msx_cart_msxwrite::msx_cart_msxwrite(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_msxwrite::msx_cart_msxwrite(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_CART_MSXWRITE, "MSX Cartridge - MSXWRITE", tag, owner, clock, "msx_cart_msxwrite", __FILE__) , msx_cart_interface(mconfig, *this) , m_bank_mask(0) diff --git a/src/devices/bus/msx_cart/ascii.h b/src/devices/bus/msx_cart/ascii.h index d66cff8ff25..9e5dfbb416d 100644 --- a/src/devices/bus/msx_cart/ascii.h +++ b/src/devices/bus/msx_cart/ascii.h @@ -17,7 +17,7 @@ class msx_cart_ascii8 : public device_t , public msx_cart_interface { public: - msx_cart_ascii8(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_ascii8(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -41,7 +41,7 @@ class msx_cart_ascii16 : public device_t , public msx_cart_interface { public: - msx_cart_ascii16(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_ascii16(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -65,7 +65,7 @@ class msx_cart_ascii8_sram : public device_t , public msx_cart_interface { public: - msx_cart_ascii8_sram(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_ascii8_sram(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -92,7 +92,7 @@ class msx_cart_ascii16_sram : public device_t , public msx_cart_interface { public: - msx_cart_ascii16_sram(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_ascii16_sram(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -119,7 +119,7 @@ class msx_cart_msxwrite : public device_t , public msx_cart_interface { public: - msx_cart_msxwrite(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_msxwrite(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/msx_cart/bm_012.cpp b/src/devices/bus/msx_cart/bm_012.cpp index 89430da93f2..d977869df78 100644 --- a/src/devices/bus/msx_cart/bm_012.cpp +++ b/src/devices/bus/msx_cart/bm_012.cpp @@ -22,7 +22,7 @@ TODO: const device_type MSX_CART_BM_012 = &device_creator<msx_cart_bm_012>; -msx_cart_bm_012::msx_cart_bm_012(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_bm_012::msx_cart_bm_012(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_CART_BM_012, "MSX Cartridge - BM-012", tag, owner, clock, "msx_cart_bm_012", __FILE__) , msx_cart_interface(mconfig, *this) , m_tmpz84c015af(*this, "tmpz84c015af") diff --git a/src/devices/bus/msx_cart/bm_012.h b/src/devices/bus/msx_cart/bm_012.h index 20c6c1970be..9dabd27e9eb 100644 --- a/src/devices/bus/msx_cart/bm_012.h +++ b/src/devices/bus/msx_cart/bm_012.h @@ -15,7 +15,7 @@ class msx_cart_bm_012 : public device_t , public msx_cart_interface { public: - msx_cart_bm_012(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_bm_012(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/msx_cart/crossblaim.cpp b/src/devices/bus/msx_cart/crossblaim.cpp index f36f7b4b8cc..f5229061169 100644 --- a/src/devices/bus/msx_cart/crossblaim.cpp +++ b/src/devices/bus/msx_cart/crossblaim.cpp @@ -6,7 +6,7 @@ const device_type MSX_CART_CROSSBLAIM = &device_creator<msx_cart_crossblaim>; -msx_cart_crossblaim::msx_cart_crossblaim(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_crossblaim::msx_cart_crossblaim(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_CART_CROSSBLAIM, "MSX Cartridge - Cross Blaim", tag, owner, clock, "msx_cart_crossblaim", __FILE__) , msx_cart_interface(mconfig, *this) , m_selected_bank(1) diff --git a/src/devices/bus/msx_cart/crossblaim.h b/src/devices/bus/msx_cart/crossblaim.h index 85af99795fb..26d42e8fc07 100644 --- a/src/devices/bus/msx_cart/crossblaim.h +++ b/src/devices/bus/msx_cart/crossblaim.h @@ -13,7 +13,7 @@ class msx_cart_crossblaim : public device_t , public msx_cart_interface { public: - msx_cart_crossblaim(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_crossblaim(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/msx_cart/disk.cpp b/src/devices/bus/msx_cart/disk.cpp index 11789e0a79f..f2582e0ab86 100644 --- a/src/devices/bus/msx_cart/disk.cpp +++ b/src/devices/bus/msx_cart/disk.cpp @@ -122,7 +122,7 @@ static SLOT_INTERFACE_START( msx_floppies ) SLOT_INTERFACE_END -msx_cart_disk::msx_cart_disk(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname) +msx_cart_disk::msx_cart_disk(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname) : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__) , msx_cart_interface(mconfig, *this) , m_floppy0(*this, "fdc:0") @@ -132,53 +132,53 @@ msx_cart_disk::msx_cart_disk(const machine_config &mconfig, device_type type, co } -msx_cart_disk_wd::msx_cart_disk_wd(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname) +msx_cart_disk_wd::msx_cart_disk_wd(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname) : msx_cart_disk(mconfig, type, name, tag, owner, clock, shortname) , m_fdc(*this, "fdc") { } -msx_cart_disk_type1::msx_cart_disk_type1(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname) +msx_cart_disk_type1::msx_cart_disk_type1(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname) : msx_cart_disk_wd(mconfig, type, name, tag, owner, clock, shortname), m_side_control(0) , m_control(0) { } -msx_cart_disk_type2::msx_cart_disk_type2(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname) +msx_cart_disk_type2::msx_cart_disk_type2(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname) : msx_cart_disk_wd(mconfig, type, name, tag, owner, clock, shortname) , m_control(0) { } -msx_cart_vy0010::msx_cart_vy0010(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_vy0010::msx_cart_vy0010(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : msx_cart_disk_type1(mconfig, MSX_CART_VY0010, "MSX Cartridge - VY0010", tag, owner, clock, "msx_cart_vy0010") { } -msx_cart_fsfd1::msx_cart_fsfd1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_fsfd1::msx_cart_fsfd1(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : msx_cart_disk_type1(mconfig, MSX_CART_FSFD1, "MSX Cartridge - FS-FD1", tag, owner, clock, "msx_cart_fsfd1") { } -msx_cart_fscf351::msx_cart_fscf351(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_fscf351::msx_cart_fscf351(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : msx_cart_disk_type2(mconfig, MSX_CART_FSCF351, "MSX Cartridge - FS-CF351", tag, owner, clock, "msx_cart_fscf351") { } -msx_cart_disk_tc8566::msx_cart_disk_tc8566(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname) +msx_cart_disk_tc8566::msx_cart_disk_tc8566(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname) : msx_cart_disk(mconfig, type, name, tag, owner, clock, shortname) , m_fdc(*this, "fdc") { } -msx_cart_fsfd1a::msx_cart_fsfd1a(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_fsfd1a::msx_cart_fsfd1a(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : msx_cart_disk_tc8566(mconfig, MSX_CART_FSFD1A, "MSX Cartridge - FS-FD1A", tag, owner, clock, "msx_cart_fsfd1a") { } diff --git a/src/devices/bus/msx_cart/disk.h b/src/devices/bus/msx_cart/disk.h index f941e7e5668..75235aba64e 100644 --- a/src/devices/bus/msx_cart/disk.h +++ b/src/devices/bus/msx_cart/disk.h @@ -20,7 +20,7 @@ class msx_cart_disk : public device_t , public msx_cart_interface { public: - msx_cart_disk(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname); + msx_cart_disk(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname); virtual void initialize_cartridge() override; @@ -36,7 +36,7 @@ protected: class msx_cart_disk_wd : public msx_cart_disk { public: - msx_cart_disk_wd(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname); + msx_cart_disk_wd(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname); protected: required_device<wd_fdc_analog_t> m_fdc; @@ -46,7 +46,7 @@ protected: class msx_cart_disk_type1 : public msx_cart_disk_wd { public: - msx_cart_disk_type1(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname); + msx_cart_disk_type1(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname); // device-level overrides virtual void device_start() override; @@ -69,7 +69,7 @@ protected: class msx_cart_disk_type2 : public msx_cart_disk_wd { public: - msx_cart_disk_type2(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname); + msx_cart_disk_type2(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname); // device-level overrides virtual void device_start() override; @@ -90,7 +90,7 @@ protected: class msx_cart_vy0010 : public msx_cart_disk_type1 { public: - msx_cart_vy0010(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_vy0010(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; }; @@ -99,7 +99,7 @@ public: class msx_cart_fsfd1 : public msx_cart_disk_type1 { public: - msx_cart_fsfd1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_fsfd1(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; }; @@ -108,7 +108,7 @@ public: class msx_cart_fscf351 : public msx_cart_disk_type2 { public: - msx_cart_fscf351(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_fscf351(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; }; @@ -117,7 +117,7 @@ public: class msx_cart_disk_tc8566 : public msx_cart_disk { public: - msx_cart_disk_tc8566(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname); + msx_cart_disk_tc8566(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname); protected: required_device<tc8566af_device> m_fdc; @@ -127,7 +127,7 @@ protected: class msx_cart_fsfd1a : public msx_cart_disk_tc8566 { public: - msx_cart_fsfd1a(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_fsfd1a(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/msx_cart/dooly.cpp b/src/devices/bus/msx_cart/dooly.cpp index 95f2748b04a..c991b918d2f 100644 --- a/src/devices/bus/msx_cart/dooly.cpp +++ b/src/devices/bus/msx_cart/dooly.cpp @@ -7,7 +7,7 @@ const device_type MSX_CART_DOOLY = &device_creator<msx_cart_dooly>; -msx_cart_dooly::msx_cart_dooly(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_dooly::msx_cart_dooly(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_CART_DOOLY, "MSX Cartridge - Dooly", tag, owner, clock, "msx_cart_dooly", __FILE__) , msx_cart_interface(mconfig, *this) , m_prot(0) diff --git a/src/devices/bus/msx_cart/dooly.h b/src/devices/bus/msx_cart/dooly.h index dca29881c5f..9ad7884d7ef 100644 --- a/src/devices/bus/msx_cart/dooly.h +++ b/src/devices/bus/msx_cart/dooly.h @@ -13,7 +13,7 @@ class msx_cart_dooly : public device_t , public msx_cart_interface { public: - msx_cart_dooly(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_dooly(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/msx_cart/fmpac.cpp b/src/devices/bus/msx_cart/fmpac.cpp index 44b934d17f5..837b9e2f247 100644 --- a/src/devices/bus/msx_cart/fmpac.cpp +++ b/src/devices/bus/msx_cart/fmpac.cpp @@ -13,7 +13,7 @@ with: PAC2 BACKUP DATA. We only store the raw sram contents. const device_type MSX_CART_FMPAC = &device_creator<msx_cart_fmpac>; -msx_cart_fmpac::msx_cart_fmpac(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_fmpac::msx_cart_fmpac(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_CART_FMPAC, "MSX Cartridge - FM-PAC", tag, owner, clock, "msx_cart_fmpac", __FILE__) , msx_cart_interface(mconfig, *this) , m_ym2413(*this, "ym2413") diff --git a/src/devices/bus/msx_cart/fmpac.h b/src/devices/bus/msx_cart/fmpac.h index 259cb0afe16..a8eff255fb3 100644 --- a/src/devices/bus/msx_cart/fmpac.h +++ b/src/devices/bus/msx_cart/fmpac.h @@ -14,7 +14,7 @@ class msx_cart_fmpac : public device_t , public msx_cart_interface { public: - msx_cart_fmpac(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_fmpac(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/msx_cart/fs_sr022.cpp b/src/devices/bus/msx_cart/fs_sr022.cpp index df3819fc6b3..93ea31544de 100644 --- a/src/devices/bus/msx_cart/fs_sr022.cpp +++ b/src/devices/bus/msx_cart/fs_sr022.cpp @@ -7,7 +7,7 @@ const device_type MSX_CART_FS_SR022 = &device_creator<msx_cart_fs_sr022>; -msx_cart_fs_sr022::msx_cart_fs_sr022(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_fs_sr022::msx_cart_fs_sr022(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_CART_FS_SR022, "MSX Cartridge - FS-SR022", tag, owner, clock, "msx_cart_fs_sr022", __FILE__) , msx_cart_interface(mconfig, *this) , m_bunsetsu_rom(nullptr) diff --git a/src/devices/bus/msx_cart/fs_sr022.h b/src/devices/bus/msx_cart/fs_sr022.h index 4555520f5b3..2511fe544db 100644 --- a/src/devices/bus/msx_cart/fs_sr022.h +++ b/src/devices/bus/msx_cart/fs_sr022.h @@ -13,7 +13,7 @@ class msx_cart_fs_sr022 : public device_t , public msx_cart_interface { public: - msx_cart_fs_sr022(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_fs_sr022(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/msx_cart/halnote.cpp b/src/devices/bus/msx_cart/halnote.cpp index d37354dd0a5..f87b13b1e4e 100644 --- a/src/devices/bus/msx_cart/halnote.cpp +++ b/src/devices/bus/msx_cart/halnote.cpp @@ -7,7 +7,7 @@ const device_type MSX_CART_HALNOTE = &device_creator<msx_cart_halnote>; -msx_cart_halnote::msx_cart_halnote(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_halnote::msx_cart_halnote(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_CART_HALNOTE, "MSX Cartridge - Halnote", tag, owner, clock, "msx_cart_halnote", __FILE__) , msx_cart_interface(mconfig, *this) { diff --git a/src/devices/bus/msx_cart/halnote.h b/src/devices/bus/msx_cart/halnote.h index 5d59ce7cd35..10643eaf4a0 100644 --- a/src/devices/bus/msx_cart/halnote.h +++ b/src/devices/bus/msx_cart/halnote.h @@ -13,7 +13,7 @@ class msx_cart_halnote : public device_t , public msx_cart_interface { public: - msx_cart_halnote(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_halnote(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/msx_cart/hfox.cpp b/src/devices/bus/msx_cart/hfox.cpp index a0f2f7c4556..a106eaf9531 100644 --- a/src/devices/bus/msx_cart/hfox.cpp +++ b/src/devices/bus/msx_cart/hfox.cpp @@ -7,7 +7,7 @@ const device_type MSX_CART_HFOX = &device_creator<msx_cart_hfox>; -msx_cart_hfox::msx_cart_hfox(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_hfox::msx_cart_hfox(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_CART_HFOX, "MSX Cartridge - Harry Fox", tag, owner, clock, "msx_cart_hfox", __FILE__) , msx_cart_interface(mconfig, *this) { diff --git a/src/devices/bus/msx_cart/hfox.h b/src/devices/bus/msx_cart/hfox.h index c51bd77cd2f..09c62296a2c 100644 --- a/src/devices/bus/msx_cart/hfox.h +++ b/src/devices/bus/msx_cart/hfox.h @@ -13,7 +13,7 @@ class msx_cart_hfox : public device_t , public msx_cart_interface { public: - msx_cart_hfox(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_hfox(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/msx_cart/holy_quran.cpp b/src/devices/bus/msx_cart/holy_quran.cpp index 7671e8624de..ac3678c055c 100644 --- a/src/devices/bus/msx_cart/holy_quran.cpp +++ b/src/devices/bus/msx_cart/holy_quran.cpp @@ -7,7 +7,7 @@ const device_type MSX_CART_HOLY_QURAN = &device_creator<msx_cart_holy_quran>; -msx_cart_holy_quran::msx_cart_holy_quran(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_holy_quran::msx_cart_holy_quran(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_CART_HOLY_QURAN, "MSX Cartridge - Holy Quran", tag, owner, clock, "msx_cart_holy_quran", __FILE__) , msx_cart_interface(mconfig, *this) , m_decrypt(false) diff --git a/src/devices/bus/msx_cart/holy_quran.h b/src/devices/bus/msx_cart/holy_quran.h index 00ae6bc92f4..9a09d6ea3e8 100644 --- a/src/devices/bus/msx_cart/holy_quran.h +++ b/src/devices/bus/msx_cart/holy_quran.h @@ -13,7 +13,7 @@ class msx_cart_holy_quran : public device_t , public msx_cart_interface { public: - msx_cart_holy_quran(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_holy_quran(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/msx_cart/konami.cpp b/src/devices/bus/msx_cart/konami.cpp index d9d129888fd..fec0da58707 100644 --- a/src/devices/bus/msx_cart/konami.cpp +++ b/src/devices/bus/msx_cart/konami.cpp @@ -12,7 +12,7 @@ const device_type MSX_CART_SOUND_SDSNATCHER = &device_creator<msx_cart_konami_so const device_type MSX_CART_KEYBOARD_MASTER = &device_creator<msx_cart_keyboard_master>; -msx_cart_konami::msx_cart_konami(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_konami::msx_cart_konami(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_CART_KONAMI, "MSX Cartridge - KONAMI", tag, owner, clock, "msx_cart_konami", __FILE__) , msx_cart_interface(mconfig, *this) , m_bank_mask(0) @@ -119,7 +119,7 @@ WRITE8_MEMBER(msx_cart_konami::write_cart) -msx_cart_konami_scc::msx_cart_konami_scc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_konami_scc::msx_cart_konami_scc(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_CART_KONAMI_SCC, "MSX Cartridge - KONAMI+SCC", tag, owner, clock, "msx_cart_konami_scc", __FILE__) , msx_cart_interface(mconfig, *this) , m_k051649(*this, "k051649") @@ -295,7 +295,7 @@ WRITE8_MEMBER(msx_cart_konami_scc::write_cart) -msx_cart_gamemaster2::msx_cart_gamemaster2(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_gamemaster2::msx_cart_gamemaster2(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_CART_GAMEMASTER2, "MSX Cartridge - GAMEMASTER2", tag, owner, clock, "msx_cart_gamemaster2", __FILE__) , msx_cart_interface(mconfig, *this) { @@ -465,7 +465,7 @@ WRITE8_MEMBER(msx_cart_gamemaster2::write_cart) -msx_cart_synthesizer::msx_cart_synthesizer(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_synthesizer::msx_cart_synthesizer(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_CART_SYNTHESIZER, "MSX Cartridge - Synthesizer", tag, owner, clock, "msx_cart_synthesizer", __FILE__) , msx_cart_interface(mconfig, *this) , m_bank_base(nullptr) @@ -525,7 +525,7 @@ WRITE8_MEMBER(msx_cart_synthesizer::write_cart) -msx_cart_konami_sound::msx_cart_konami_sound(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +msx_cart_konami_sound::msx_cart_konami_sound(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) , msx_cart_interface(mconfig, *this) , m_k052539(*this, "k052539") @@ -821,7 +821,7 @@ WRITE8_MEMBER(msx_cart_konami_sound::write_cart) } -msx_cart_konami_sound_snatcher::msx_cart_konami_sound_snatcher(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_konami_sound_snatcher::msx_cart_konami_sound_snatcher(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : msx_cart_konami_sound(mconfig, MSX_CART_SOUND_SNATCHER, "MSX Cartridge - Sound Snatcher", tag, owner, clock, "msx_cart_sound_snatcher", __FILE__) { } @@ -845,7 +845,7 @@ void msx_cart_konami_sound_snatcher::initialize_cartridge() } -msx_cart_konami_sound_sdsnatcher::msx_cart_konami_sound_sdsnatcher(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_konami_sound_sdsnatcher::msx_cart_konami_sound_sdsnatcher(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : msx_cart_konami_sound(mconfig, MSX_CART_SOUND_SDSNATCHER, "MSX Cartridge - Sound SD Snatcher", tag, owner, clock, "msx_cart_sound_sdsnatcher", __FILE__) { } @@ -871,7 +871,7 @@ void msx_cart_konami_sound_sdsnatcher::initialize_cartridge() -msx_cart_keyboard_master::msx_cart_keyboard_master(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_keyboard_master::msx_cart_keyboard_master(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_CART_KEYBOARD_MASTER, "MSX Cartridge - Keyboard Master", tag, owner, clock, "msx_cart_keyboard_master", __FILE__) , msx_cart_interface(mconfig, *this) , m_vlm5030(*this, "vlm5030") diff --git a/src/devices/bus/msx_cart/konami.h b/src/devices/bus/msx_cart/konami.h index e26533bce29..da446c12922 100644 --- a/src/devices/bus/msx_cart/konami.h +++ b/src/devices/bus/msx_cart/konami.h @@ -22,7 +22,7 @@ class msx_cart_konami : public device_t , public msx_cart_interface { public: - msx_cart_konami(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_konami(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -46,7 +46,7 @@ class msx_cart_konami_scc : public device_t , public msx_cart_interface { public: - msx_cart_konami_scc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_konami_scc(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -74,7 +74,7 @@ class msx_cart_gamemaster2 : public device_t , public msx_cart_interface { public: - msx_cart_gamemaster2(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_gamemaster2(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -99,7 +99,7 @@ class msx_cart_synthesizer : public device_t , public msx_cart_interface { public: - msx_cart_synthesizer(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_synthesizer(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -120,7 +120,7 @@ class msx_cart_konami_sound : public device_t , public msx_cart_interface { public: - msx_cart_konami_sound(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + msx_cart_konami_sound(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides virtual void device_start() override; @@ -155,7 +155,7 @@ private: class msx_cart_konami_sound_snatcher : public msx_cart_konami_sound { public: - msx_cart_konami_sound_snatcher(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_konami_sound_snatcher(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void initialize_cartridge() override; }; @@ -164,7 +164,7 @@ public: class msx_cart_konami_sound_sdsnatcher : public msx_cart_konami_sound { public: - msx_cart_konami_sound_sdsnatcher(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_konami_sound_sdsnatcher(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void initialize_cartridge() override; }; @@ -175,7 +175,7 @@ class msx_cart_keyboard_master : public device_t , public msx_cart_interface { public: - msx_cart_keyboard_master(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_keyboard_master(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/msx_cart/korean.cpp b/src/devices/bus/msx_cart/korean.cpp index f1dedeb9874..0dd49ad8f43 100644 --- a/src/devices/bus/msx_cart/korean.cpp +++ b/src/devices/bus/msx_cart/korean.cpp @@ -8,7 +8,7 @@ const device_type MSX_CART_KOREAN_90IN1 = &device_creator<msx_cart_korean_90in1> const device_type MSX_CART_KOREAN_126IN1 = &device_creator<msx_cart_korean_126in1>; -msx_cart_korean_80in1::msx_cart_korean_80in1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_korean_80in1::msx_cart_korean_80in1(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_CART_KOREAN_80IN1, "MSX Cartridge - Korean 80-in-1", tag, owner, clock, "msx_cart_korean_80in1", __FILE__) , msx_cart_interface(mconfig, *this) , m_bank_mask(0) @@ -101,7 +101,7 @@ WRITE8_MEMBER(msx_cart_korean_80in1::write_cart) -msx_cart_korean_90in1::msx_cart_korean_90in1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_korean_90in1::msx_cart_korean_90in1(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_CART_KOREAN_90IN1, "MSX Cartridge - Korean 90-in-1", tag, owner, clock, "msx_cart_korean_90in1", __FILE__) , msx_cart_interface(mconfig, *this) , m_bank_mask(0) @@ -208,7 +208,7 @@ WRITE8_MEMBER(msx_cart_korean_90in1::banking) -msx_cart_korean_126in1::msx_cart_korean_126in1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_korean_126in1::msx_cart_korean_126in1(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_CART_KOREAN_126IN1, "MSX Cartridge - Korean 126-in-1", tag, owner, clock, "msx_cart_korean_126in1", __FILE__) , msx_cart_interface(mconfig, *this) , m_bank_mask(0) diff --git a/src/devices/bus/msx_cart/korean.h b/src/devices/bus/msx_cart/korean.h index 7c332f486c3..6bff18ba6c1 100644 --- a/src/devices/bus/msx_cart/korean.h +++ b/src/devices/bus/msx_cart/korean.h @@ -15,7 +15,7 @@ class msx_cart_korean_80in1 : public device_t , public msx_cart_interface { public: - msx_cart_korean_80in1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_korean_80in1(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -41,7 +41,7 @@ class msx_cart_korean_90in1 : public device_t , public msx_cart_interface { public: - msx_cart_korean_90in1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_korean_90in1(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -66,7 +66,7 @@ class msx_cart_korean_126in1 : public device_t , public msx_cart_interface { public: - msx_cart_korean_126in1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_korean_126in1(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/msx_cart/majutsushi.cpp b/src/devices/bus/msx_cart/majutsushi.cpp index 23091c1fb4b..8e5c60ba4fe 100644 --- a/src/devices/bus/msx_cart/majutsushi.cpp +++ b/src/devices/bus/msx_cart/majutsushi.cpp @@ -6,7 +6,7 @@ const device_type MSX_CART_MAJUTSUSHI = &device_creator<msx_cart_majutsushi>; -msx_cart_majutsushi::msx_cart_majutsushi(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_majutsushi::msx_cart_majutsushi(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_CART_MAJUTSUSHI, "MSX Cartridge - Majutsushi", tag, owner, clock, "msx_cart_majutsushi", __FILE__) , msx_cart_interface(mconfig, *this) , m_dac(*this, "dac") diff --git a/src/devices/bus/msx_cart/majutsushi.h b/src/devices/bus/msx_cart/majutsushi.h index 2cff08446a2..6d2226ea52d 100644 --- a/src/devices/bus/msx_cart/majutsushi.h +++ b/src/devices/bus/msx_cart/majutsushi.h @@ -14,7 +14,7 @@ class msx_cart_majutsushi : public device_t , public msx_cart_interface { public: - msx_cart_majutsushi(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_majutsushi(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/msx_cart/moonsound.cpp b/src/devices/bus/msx_cart/moonsound.cpp index cdae9385815..cf4ca51786e 100644 --- a/src/devices/bus/msx_cart/moonsound.cpp +++ b/src/devices/bus/msx_cart/moonsound.cpp @@ -19,7 +19,7 @@ TODO: const device_type MSX_CART_MOONSOUND = &device_creator<msx_cart_moonsound>; -msx_cart_moonsound::msx_cart_moonsound(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_moonsound::msx_cart_moonsound(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_CART_MOONSOUND, "MSX Cartridge - MoonSound", tag, owner, clock, "msx_moonsound", __FILE__) , msx_cart_interface(mconfig, *this) , m_ymf278b(*this, "ymf278b") diff --git a/src/devices/bus/msx_cart/moonsound.h b/src/devices/bus/msx_cart/moonsound.h index d826d446ec1..4c64c360cea 100644 --- a/src/devices/bus/msx_cart/moonsound.h +++ b/src/devices/bus/msx_cart/moonsound.h @@ -14,7 +14,7 @@ class msx_cart_moonsound : public device_t , public msx_cart_interface { public: - msx_cart_moonsound(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_moonsound(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/msx_cart/msx_audio.cpp b/src/devices/bus/msx_cart/msx_audio.cpp index 01ad0cd1f45..a77f1b8d672 100644 --- a/src/devices/bus/msx_cart/msx_audio.cpp +++ b/src/devices/bus/msx_cart/msx_audio.cpp @@ -70,7 +70,7 @@ const device_type MSX_CART_MSX_AUDIO_NMS1205 = &device_creator<msx_cart_msx_audi const device_type MSX_CART_MSX_AUDIO_FSCA1 = &device_creator<msx_cart_msx_audio_fsca1>; -msx_cart_msx_audio_hxmu900::msx_cart_msx_audio_hxmu900(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_msx_audio_hxmu900::msx_cart_msx_audio_hxmu900(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_CART_MSX_AUDIO_HXMU900, "MSX Cartridge - MSX-AUDIO HX-MU900", tag, owner, clock, "msx_audio_hxmu900", __FILE__) , msx_cart_interface(mconfig, *this) , m_y8950(*this, "y8950") @@ -127,7 +127,7 @@ READ8_MEMBER(msx_cart_msx_audio_hxmu900::read_cart) -msx_cart_msx_audio_nms1205::msx_cart_msx_audio_nms1205(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_msx_audio_nms1205::msx_cart_msx_audio_nms1205(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_CART_MSX_AUDIO_NMS1205, "MSX Cartridge - MSX-AUDIO NMS-1205", tag, owner, clock, "msx_audio_nms1205", __FILE__) , msx_cart_interface(mconfig, *this) , m_y8950(*this, "y8950") @@ -235,7 +235,7 @@ READ8_MEMBER(msx_cart_msx_audio_nms1205::read_cart) -msx_cart_msx_audio_fsca1::msx_cart_msx_audio_fsca1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_msx_audio_fsca1::msx_cart_msx_audio_fsca1(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_CART_MSX_AUDIO_FSCA1, "MSX Cartridge - MSX-AUDIO FS-CA1", tag, owner, clock, "msx_audio_fsca1", __FILE__) , msx_cart_interface(mconfig, *this) , m_y8950(*this, "y8950") diff --git a/src/devices/bus/msx_cart/msx_audio.h b/src/devices/bus/msx_cart/msx_audio.h index 9787d1b163b..ea6c8d0b1bb 100644 --- a/src/devices/bus/msx_cart/msx_audio.h +++ b/src/devices/bus/msx_cart/msx_audio.h @@ -18,7 +18,7 @@ class msx_cart_msx_audio_hxmu900 : public device_t , public msx_cart_interface { public: - msx_cart_msx_audio_hxmu900(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_msx_audio_hxmu900(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -37,7 +37,7 @@ class msx_cart_msx_audio_nms1205 : public device_t , public msx_cart_interface { public: - msx_cart_msx_audio_nms1205(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_msx_audio_nms1205(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -63,7 +63,7 @@ class msx_cart_msx_audio_fsca1 : public device_t , public msx_cart_interface { public: - msx_cart_msx_audio_fsca1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_msx_audio_fsca1(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/msx_cart/msx_audio_kb.cpp b/src/devices/bus/msx_cart/msx_audio_kb.cpp index d9304613ca7..ffb6b26d9c1 100644 --- a/src/devices/bus/msx_cart/msx_audio_kb.cpp +++ b/src/devices/bus/msx_cart/msx_audio_kb.cpp @@ -7,7 +7,7 @@ const device_type MSX_AUDIO_KBDC_PORT = &device_creator<msx_audio_kbdc_port_device>; -msx_audio_kbdc_port_device::msx_audio_kbdc_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_audio_kbdc_port_device::msx_audio_kbdc_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_AUDIO_KBDC_PORT, "MSX Audio keyboard connector port", tag, owner, clock, "msx_audio_kbdc_port", __FILE__), device_slot_interface(mconfig, *this), m_keyboard(nullptr) @@ -48,7 +48,7 @@ class msx_hxmu901 : public device_t , public msx_audio_kb_port_interface { public: - msx_hxmu901(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) + msx_hxmu901(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_AUDIO_KB_HXMU901, "Toshiba HXMU901", tag, owner, clock, "hxmu901", __FILE__) , msx_audio_kb_port_interface(mconfig, *this) , m_row(0) @@ -178,7 +178,7 @@ class msx_nms1160 : public device_t , public msx_audio_kb_port_interface { public: - msx_nms1160(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) + msx_nms1160(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_AUDIO_KB_NMS1160, "Philips NMS-1160", tag, owner, clock, "nms1160", __FILE__) , msx_audio_kb_port_interface(mconfig, *this) , m_row(0) diff --git a/src/devices/bus/msx_cart/msx_audio_kb.h b/src/devices/bus/msx_cart/msx_audio_kb.h index 6bdc1fe86fe..6b6b533cf0b 100644 --- a/src/devices/bus/msx_cart/msx_audio_kb.h +++ b/src/devices/bus/msx_cart/msx_audio_kb.h @@ -30,7 +30,7 @@ class msx_audio_kbdc_port_device : public device_t, { public: // construction/destruction - msx_audio_kbdc_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_audio_kbdc_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/msx_cart/msxdos2.cpp b/src/devices/bus/msx_cart/msxdos2.cpp index 96f0b99f119..319893eff28 100644 --- a/src/devices/bus/msx_cart/msxdos2.cpp +++ b/src/devices/bus/msx_cart/msxdos2.cpp @@ -6,7 +6,7 @@ const device_type MSX_CART_MSXDOS2 = &device_creator<msx_cart_msxdos2>; -msx_cart_msxdos2::msx_cart_msxdos2(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_msxdos2::msx_cart_msxdos2(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_CART_MSXDOS2, "MSX Cartridge - MSXDOS2", tag, owner, clock, "msx_cart_msxdos2", __FILE__) , msx_cart_interface(mconfig, *this) , m_selected_bank(0) diff --git a/src/devices/bus/msx_cart/msxdos2.h b/src/devices/bus/msx_cart/msxdos2.h index a4171b41292..79b0da7d195 100644 --- a/src/devices/bus/msx_cart/msxdos2.h +++ b/src/devices/bus/msx_cart/msxdos2.h @@ -13,7 +13,7 @@ class msx_cart_msxdos2 : public device_t , public msx_cart_interface { public: - msx_cart_msxdos2(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_msxdos2(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/msx_cart/nomapper.cpp b/src/devices/bus/msx_cart/nomapper.cpp index 922649d5c1f..958e2597271 100644 --- a/src/devices/bus/msx_cart/nomapper.cpp +++ b/src/devices/bus/msx_cart/nomapper.cpp @@ -7,7 +7,7 @@ const device_type MSX_CART_NOMAPPER = &device_creator<msx_cart_nomapper>; -msx_cart_nomapper::msx_cart_nomapper(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_nomapper::msx_cart_nomapper(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_CART_NOMAPPER, "MSX Cartridge - ROM", tag, owner, clock, "msx_cart_nomapper", __FILE__) , msx_cart_interface(mconfig, *this) , m_start_address(0) diff --git a/src/devices/bus/msx_cart/nomapper.h b/src/devices/bus/msx_cart/nomapper.h index f81c7bcdd50..8635c10c1fd 100644 --- a/src/devices/bus/msx_cart/nomapper.h +++ b/src/devices/bus/msx_cart/nomapper.h @@ -13,7 +13,7 @@ class msx_cart_nomapper : public device_t , public msx_cart_interface { public: - msx_cart_nomapper(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_nomapper(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/msx_cart/rtype.cpp b/src/devices/bus/msx_cart/rtype.cpp index ffe7d56cfba..cd7d29d0dfe 100644 --- a/src/devices/bus/msx_cart/rtype.cpp +++ b/src/devices/bus/msx_cart/rtype.cpp @@ -6,7 +6,7 @@ const device_type MSX_CART_RTYPE = &device_creator<msx_cart_rtype>; -msx_cart_rtype::msx_cart_rtype(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_rtype::msx_cart_rtype(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_CART_RTYPE, "MSX Cartridge - R-Type", tag, owner, clock, "msx_cart_rtype", __FILE__) , msx_cart_interface(mconfig, *this) , m_selected_bank(0) diff --git a/src/devices/bus/msx_cart/rtype.h b/src/devices/bus/msx_cart/rtype.h index 811ccc5ad27..9a1fbf85f3d 100644 --- a/src/devices/bus/msx_cart/rtype.h +++ b/src/devices/bus/msx_cart/rtype.h @@ -13,7 +13,7 @@ class msx_cart_rtype : public device_t , public msx_cart_interface { public: - msx_cart_rtype(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_rtype(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/msx_cart/super_swangi.cpp b/src/devices/bus/msx_cart/super_swangi.cpp index 65e4992afe3..d362979dcd1 100644 --- a/src/devices/bus/msx_cart/super_swangi.cpp +++ b/src/devices/bus/msx_cart/super_swangi.cpp @@ -7,7 +7,7 @@ const device_type MSX_CART_SUPER_SWANGI = &device_creator<msx_cart_super_swangi>; -msx_cart_super_swangi::msx_cart_super_swangi(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_super_swangi::msx_cart_super_swangi(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_CART_SUPER_SWANGI, "MSX Cartridge - Super Swangi", tag, owner, clock, "msx_cart_super_swangi", __FILE__) , msx_cart_interface(mconfig, *this) , m_selected_bank(0) diff --git a/src/devices/bus/msx_cart/super_swangi.h b/src/devices/bus/msx_cart/super_swangi.h index 19241869877..9a5e9f038ec 100644 --- a/src/devices/bus/msx_cart/super_swangi.h +++ b/src/devices/bus/msx_cart/super_swangi.h @@ -13,7 +13,7 @@ class msx_cart_super_swangi : public device_t , public msx_cart_interface { public: - msx_cart_super_swangi(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_super_swangi(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/msx_cart/superloderunner.cpp b/src/devices/bus/msx_cart/superloderunner.cpp index f71a109a83b..9602e4b2eac 100644 --- a/src/devices/bus/msx_cart/superloderunner.cpp +++ b/src/devices/bus/msx_cart/superloderunner.cpp @@ -6,7 +6,7 @@ const device_type MSX_CART_SUPERLODERUNNER = &device_creator<msx_cart_superloderunner>; -msx_cart_superloderunner::msx_cart_superloderunner(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_superloderunner::msx_cart_superloderunner(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_CART_SUPERLODERUNNER, "MSX Cartridge - Super Lode Runner", tag, owner, clock, "msx_cart_superloderunner", __FILE__) , msx_cart_interface(mconfig, *this) , m_selected_bank(0) diff --git a/src/devices/bus/msx_cart/superloderunner.h b/src/devices/bus/msx_cart/superloderunner.h index 22b1e47e368..0923171522e 100644 --- a/src/devices/bus/msx_cart/superloderunner.h +++ b/src/devices/bus/msx_cart/superloderunner.h @@ -13,7 +13,7 @@ class msx_cart_superloderunner : public device_t , public msx_cart_interface { public: - msx_cart_superloderunner(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_superloderunner(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/msx_cart/yamaha.cpp b/src/devices/bus/msx_cart/yamaha.cpp index 7abf066c3af..b1ac9210cf1 100644 --- a/src/devices/bus/msx_cart/yamaha.cpp +++ b/src/devices/bus/msx_cart/yamaha.cpp @@ -18,7 +18,7 @@ const device_type MSX_CART_SFG01 = &device_creator<msx_cart_sfg01>; const device_type MSX_CART_SFG05 = &device_creator<msx_cart_sfg05>; -msx_cart_sfg::msx_cart_sfg(const machine_config &mconfig, const device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname) +msx_cart_sfg::msx_cart_sfg(const machine_config &mconfig, const device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname) : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__) , msx_cart_interface(mconfig, *this) , m_region_sfg(*this, "sfg") @@ -32,13 +32,13 @@ msx_cart_sfg::msx_cart_sfg(const machine_config &mconfig, const device_type type } -msx_cart_sfg01::msx_cart_sfg01(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_sfg01::msx_cart_sfg01(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : msx_cart_sfg(mconfig, MSX_CART_SFG01, "MSX Cartridge - SFG01", tag, owner, clock, "msx_cart_sfg01") { } -msx_cart_sfg05::msx_cart_sfg05(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_cart_sfg05::msx_cart_sfg05(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : msx_cart_sfg(mconfig, MSX_CART_SFG05, "MSX Cartridge - SFG05", tag, owner, clock, "msx_cart_sfg05") { } diff --git a/src/devices/bus/msx_cart/yamaha.h b/src/devices/bus/msx_cart/yamaha.h index 30f7fea8e55..af815efa6ae 100644 --- a/src/devices/bus/msx_cart/yamaha.h +++ b/src/devices/bus/msx_cart/yamaha.h @@ -17,7 +17,7 @@ class msx_cart_sfg : public device_t , public msx_cart_interface { public: - msx_cart_sfg(const machine_config &mconfig, const device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname); + msx_cart_sfg(const machine_config &mconfig, const device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname); // device-level overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -47,7 +47,7 @@ private: class msx_cart_sfg01 : public msx_cart_sfg { public: - msx_cart_sfg01(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_sfg01(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual const rom_entry *device_rom_region() const override; }; @@ -56,7 +56,7 @@ public: class msx_cart_sfg05 : public msx_cart_sfg { public: - msx_cart_sfg05(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_cart_sfg05(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual const rom_entry *device_rom_region() const override; }; diff --git a/src/devices/bus/msx_slot/bunsetsu.cpp b/src/devices/bus/msx_slot/bunsetsu.cpp index 1289a84704b..f23083538b4 100644 --- a/src/devices/bus/msx_slot/bunsetsu.cpp +++ b/src/devices/bus/msx_slot/bunsetsu.cpp @@ -11,10 +11,9 @@ const device_type MSX_SLOT_BUNSETSU = &device_creator<msx_slot_bunsetsu_device>; -msx_slot_bunsetsu_device::msx_slot_bunsetsu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_slot_bunsetsu_device::msx_slot_bunsetsu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : msx_slot_rom_device(mconfig, MSX_SLOT_BUNSETSU, "MSX Internal BUNSETSU", tag, owner, clock, "msx_slot_bunsetsu", __FILE__) - , m_bunsetsu_region(nullptr) - , m_bunsetsu_region_tag(nullptr) + , m_bunsetsu_region(nullptr) , m_bunsetsu_address(0) { } @@ -24,7 +23,7 @@ void msx_slot_bunsetsu_device::device_start() { msx_slot_rom_device::device_start(); - if (m_bunsetsu_region_tag == nullptr) + if (m_bunsetsu_region_tag.empty()) { fatalerror("msx_slot_bunsetsu_device: no bunsetsu region tag specified\n"); } @@ -33,7 +32,7 @@ void msx_slot_bunsetsu_device::device_start() if (m_bunsetsu_region == nullptr) { - fatalerror("msx_slot_bunsetsu_device: Unable to find region with tag '%s'\n", m_bunsetsu_region_tag); + fatalerror("msx_slot_bunsetsu_device: Unable to find region with tag '%s'\n", m_bunsetsu_region_tag.c_str()); } if (m_bunsetsu_region->bytes() != 0x20000) diff --git a/src/devices/bus/msx_slot/bunsetsu.h b/src/devices/bus/msx_slot/bunsetsu.h index 701e6bb8640..ec8c85c4396 100644 --- a/src/devices/bus/msx_slot/bunsetsu.h +++ b/src/devices/bus/msx_slot/bunsetsu.h @@ -17,10 +17,10 @@ extern const device_type MSX_SLOT_BUNSETSU; class msx_slot_bunsetsu_device : public msx_slot_rom_device { public: - msx_slot_bunsetsu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_slot_bunsetsu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // static configuration helpers - static void set_bunsetsu_region_tag(device_t &device, const char *tag) { dynamic_cast<msx_slot_bunsetsu_device &>(device).m_bunsetsu_region_tag = tag; } + static void set_bunsetsu_region_tag(device_t &device, std::string tag) { dynamic_cast<msx_slot_bunsetsu_device &>(device).m_bunsetsu_region_tag = tag; } virtual void device_start() override; virtual void device_reset() override; @@ -30,7 +30,7 @@ public: private: memory_region *m_bunsetsu_region; - const char *m_bunsetsu_region_tag; + std::string m_bunsetsu_region_tag; UINT32 m_bunsetsu_address; }; diff --git a/src/devices/bus/msx_slot/cartridge.cpp b/src/devices/bus/msx_slot/cartridge.cpp index c24df3bf1fb..910ca3c2abb 100644 --- a/src/devices/bus/msx_slot/cartridge.cpp +++ b/src/devices/bus/msx_slot/cartridge.cpp @@ -33,7 +33,7 @@ const device_type MSX_SLOT_CARTRIDGE = &device_creator<msx_slot_cartridge_device const device_type MSX_SLOT_YAMAHA_EXPANSION = &device_creator<msx_slot_yamaha_expansion_device>; -msx_slot_cartridge_device::msx_slot_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_slot_cartridge_device::msx_slot_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_SLOT_CARTRIDGE, "MSX Cartridge slot", tag, owner, clock, "msx_slot_cartridge", __FILE__) , device_image_interface(mconfig, *this) , device_slot_interface(mconfig, *this) @@ -44,7 +44,7 @@ msx_slot_cartridge_device::msx_slot_cartridge_device(const machine_config &mconf } -msx_slot_cartridge_device::msx_slot_cartridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +msx_slot_cartridge_device::msx_slot_cartridge_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) , device_image_interface(mconfig, *this) , device_slot_interface(mconfig, *this) @@ -364,7 +364,7 @@ WRITE8_MEMBER(msx_slot_cartridge_device::write) -msx_slot_yamaha_expansion_device::msx_slot_yamaha_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_slot_yamaha_expansion_device::msx_slot_yamaha_expansion_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : msx_slot_cartridge_device(mconfig, MSX_SLOT_YAMAHA_EXPANSION, "MSX Yamaha Expansion slot", tag, owner, clock, "msx_slot_yamaha_expansion", __FILE__) { } diff --git a/src/devices/bus/msx_slot/cartridge.h b/src/devices/bus/msx_slot/cartridge.h index ce8303ff3d4..2a2ae297701 100644 --- a/src/devices/bus/msx_slot/cartridge.h +++ b/src/devices/bus/msx_slot/cartridge.h @@ -30,8 +30,8 @@ class msx_slot_cartridge_device : public device_t { public: // construction/destruction - msx_slot_cartridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - msx_slot_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_slot_cartridge_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + msx_slot_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // static configuration helpers template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<msx_slot_cartridge_device &>(device).m_irq_handler.set_callback(object); } @@ -75,7 +75,7 @@ class msx_slot_yamaha_expansion_device : public msx_slot_cartridge_device { public: // construction/destruction - msx_slot_yamaha_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_slot_yamaha_expansion_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void device_start() override; virtual void device_config_complete() override { update_names(MSX_SLOT_YAMAHA_EXPANSION, "cartridge60pin", "cart60p"); } diff --git a/src/devices/bus/msx_slot/disk.cpp b/src/devices/bus/msx_slot/disk.cpp index ea4313f6ac5..88bd2747edf 100644 --- a/src/devices/bus/msx_slot/disk.cpp +++ b/src/devices/bus/msx_slot/disk.cpp @@ -43,18 +43,13 @@ const device_type MSX_SLOT_DISK5 = &device_creator<msx_slot_disk5_device>; const device_type MSX_SLOT_DISK6 = &device_creator<msx_slot_disk6_device>; -msx_slot_disk_device::msx_slot_disk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +msx_slot_disk_device::msx_slot_disk_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : msx_slot_rom_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_floppy0(nullptr) , m_floppy1(nullptr) , m_floppy2(nullptr) , m_floppy3(nullptr) , m_floppy(nullptr) - , m_fdc_tag(nullptr) - , m_floppy0_tag(nullptr) - , m_floppy1_tag(nullptr) - , m_floppy2_tag(nullptr) - , m_floppy3_tag(nullptr) { } @@ -63,15 +58,15 @@ void msx_slot_disk_device::device_start() { msx_slot_rom_device::device_start(); - if (m_fdc_tag == nullptr) + if (m_fdc_tag.empty()) { fatalerror("msx_slot_disk_device: no FDC tag specified\n"); } - m_floppy0 = m_floppy0_tag ? owner()->subdevice<floppy_connector>(m_floppy0_tag) : nullptr; - m_floppy1 = m_floppy1_tag ? owner()->subdevice<floppy_connector>(m_floppy1_tag) : nullptr; - m_floppy2 = m_floppy2_tag ? owner()->subdevice<floppy_connector>(m_floppy2_tag) : nullptr; - m_floppy3 = m_floppy3_tag ? owner()->subdevice<floppy_connector>(m_floppy3_tag) : nullptr; + m_floppy0 = !m_floppy0_tag.empty() ? owner()->subdevice<floppy_connector>(m_floppy0_tag) : nullptr; + m_floppy1 = !m_floppy1_tag.empty() ? owner()->subdevice<floppy_connector>(m_floppy1_tag) : nullptr; + m_floppy2 = !m_floppy2_tag.empty() ? owner()->subdevice<floppy_connector>(m_floppy2_tag) : nullptr; + m_floppy3 = !m_floppy3_tag.empty() ? owner()->subdevice<floppy_connector>(m_floppy3_tag) : nullptr; if (m_floppy0 == nullptr && m_floppy1 == nullptr) { @@ -80,7 +75,7 @@ void msx_slot_disk_device::device_start() } -msx_slot_wd_disk_device::msx_slot_wd_disk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +msx_slot_wd_disk_device::msx_slot_wd_disk_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : msx_slot_disk_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_fdc(nullptr) { @@ -95,12 +90,12 @@ void msx_slot_wd_disk_device::device_start() if (m_fdc == nullptr) { - fatalerror("msx_slot_wd_disk_device: Unable to find FDC with tag '%s'\n", m_fdc_tag); + fatalerror("msx_slot_wd_disk_device: Unable to find FDC with tag '%s'\n", m_fdc_tag.c_str()); } } -msx_slot_tc8566_disk_device::msx_slot_tc8566_disk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +msx_slot_tc8566_disk_device::msx_slot_tc8566_disk_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : msx_slot_disk_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_fdc(nullptr) { @@ -115,13 +110,13 @@ void msx_slot_tc8566_disk_device::device_start() if (m_fdc == nullptr) { - fatalerror("msx_slot_tc8566_disk_device: Unable to find FDC with tag '%s'\n", m_fdc_tag); + fatalerror("msx_slot_tc8566_disk_device: Unable to find FDC with tag '%s'\n", m_fdc_tag.c_str()); } } -msx_slot_disk1_device::msx_slot_disk1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_slot_disk1_device::msx_slot_disk1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : msx_slot_wd_disk_device(mconfig, MSX_SLOT_DISK1, "MSX Internal floppy type 1", tag, owner, clock, "msx_slot_disk1", __FILE__) , m_side_control(0) , m_control(0) @@ -284,7 +279,7 @@ WRITE8_MEMBER(msx_slot_disk1_device::write) } -msx_slot_disk2_device::msx_slot_disk2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_slot_disk2_device::msx_slot_disk2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : msx_slot_wd_disk_device(mconfig, MSX_SLOT_DISK2, "MSX Internal floppy type 2", tag, owner, clock, "msx_slot_disk2", __FILE__) , m_control(0) { @@ -423,7 +418,7 @@ WRITE8_MEMBER(msx_slot_disk2_device::write) -msx_slot_disk3_device::msx_slot_disk3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_slot_disk3_device::msx_slot_disk3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : msx_slot_tc8566_disk_device(mconfig, MSX_SLOT_DISK3, "MSX Internal floppy type 3", tag, owner, clock, "msx_slot_disk3", __FILE__) { } @@ -469,7 +464,7 @@ READ8_MEMBER(msx_slot_disk3_device::read) -msx_slot_disk4_device::msx_slot_disk4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_slot_disk4_device::msx_slot_disk4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : msx_slot_tc8566_disk_device(mconfig, MSX_SLOT_DISK4, "MSX Internal floppy type 4", tag, owner, clock, "msx_slot_disk4", __FILE__) { } @@ -521,7 +516,7 @@ READ8_MEMBER(msx_slot_disk4_device::read) -msx_slot_disk5_device::msx_slot_disk5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_slot_disk5_device::msx_slot_disk5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : msx_slot_wd_disk_device(mconfig, MSX_SLOT_DISK5, "MSX Internal floppy type 5", tag, owner, clock, "msx_slot_disk5", __FILE__) , m_control(0) { @@ -644,7 +639,7 @@ WRITE8_MEMBER(msx_slot_disk5_device::io_write) -msx_slot_disk6_device::msx_slot_disk6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_slot_disk6_device::msx_slot_disk6_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : msx_slot_wd_disk_device(mconfig, MSX_SLOT_DISK6, "MSX Internal floppy type 6", tag, owner, clock, "msx_slot_disk6", __FILE__) , m_side_motor(0) , m_drive_select0(0) diff --git a/src/devices/bus/msx_slot/disk.h b/src/devices/bus/msx_slot/disk.h index fb0bdad5cdf..701cf423a7e 100644 --- a/src/devices/bus/msx_slot/disk.h +++ b/src/devices/bus/msx_slot/disk.h @@ -73,16 +73,16 @@ extern const device_type MSX_SLOT_DISK6; class msx_slot_disk_device : public msx_slot_rom_device { public: - msx_slot_disk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + msx_slot_disk_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); virtual void device_start() override; // static configuration helpers - static void set_fdc_tag(device_t &device, const char *tag) { dynamic_cast<msx_slot_disk_device &>(device).m_fdc_tag = tag; } - static void set_floppy0_tag(device_t &device, const char *tag) { dynamic_cast<msx_slot_disk_device &>(device).m_floppy0_tag = tag; } - static void set_floppy1_tag(device_t &device, const char *tag) { dynamic_cast<msx_slot_disk_device &>(device).m_floppy1_tag = tag; } - static void set_floppy2_tag(device_t &device, const char *tag) { dynamic_cast<msx_slot_disk_device &>(device).m_floppy2_tag = tag; } - static void set_floppy3_tag(device_t &device, const char *tag) { dynamic_cast<msx_slot_disk_device &>(device).m_floppy3_tag = tag; } + static void set_fdc_tag(device_t &device, std::string tag) { dynamic_cast<msx_slot_disk_device &>(device).m_fdc_tag = tag; } + static void set_floppy0_tag(device_t &device, std::string tag) { dynamic_cast<msx_slot_disk_device &>(device).m_floppy0_tag = tag; } + static void set_floppy1_tag(device_t &device, std::string tag) { dynamic_cast<msx_slot_disk_device &>(device).m_floppy1_tag = tag; } + static void set_floppy2_tag(device_t &device, std::string tag) { dynamic_cast<msx_slot_disk_device &>(device).m_floppy2_tag = tag; } + static void set_floppy3_tag(device_t &device, std::string tag) { dynamic_cast<msx_slot_disk_device &>(device).m_floppy3_tag = tag; } protected: floppy_connector *m_floppy0; @@ -91,18 +91,18 @@ protected: floppy_connector *m_floppy3; floppy_image_device *m_floppy; - const char *m_fdc_tag; - const char *m_floppy0_tag; - const char *m_floppy1_tag; - const char *m_floppy2_tag; - const char *m_floppy3_tag; + std::string m_fdc_tag; + std::string m_floppy0_tag; + std::string m_floppy1_tag; + std::string m_floppy2_tag; + std::string m_floppy3_tag; }; class msx_slot_wd_disk_device : public msx_slot_disk_device { public: - msx_slot_wd_disk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + msx_slot_wd_disk_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); virtual void device_start() override; @@ -114,7 +114,7 @@ protected: class msx_slot_tc8566_disk_device : public msx_slot_disk_device { public: - msx_slot_tc8566_disk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + msx_slot_tc8566_disk_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); virtual void device_start() override; @@ -126,7 +126,7 @@ protected: class msx_slot_disk1_device : public msx_slot_wd_disk_device { public: - msx_slot_disk1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_slot_disk1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void device_start() override; virtual void device_reset() override; @@ -148,7 +148,7 @@ private: class msx_slot_disk2_device : public msx_slot_wd_disk_device { public: - msx_slot_disk2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_slot_disk2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void device_start() override; virtual void device_reset() override; @@ -168,7 +168,7 @@ private: class msx_slot_disk3_device : public msx_slot_tc8566_disk_device { public: - msx_slot_disk3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_slot_disk3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual DECLARE_READ8_MEMBER(read) override; virtual DECLARE_WRITE8_MEMBER(write) override; @@ -178,7 +178,7 @@ public: class msx_slot_disk4_device : public msx_slot_tc8566_disk_device { public: - msx_slot_disk4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_slot_disk4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual DECLARE_READ8_MEMBER(read) override; virtual DECLARE_WRITE8_MEMBER(write) override; @@ -188,7 +188,7 @@ public: class msx_slot_disk5_device : public msx_slot_wd_disk_device { public: - msx_slot_disk5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_slot_disk5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void device_start() override; virtual void device_reset() override; @@ -208,7 +208,7 @@ private: class msx_slot_disk6_device : public msx_slot_wd_disk_device { public: - msx_slot_disk6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_slot_disk6_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void device_start() override; virtual void device_reset() override; diff --git a/src/devices/bus/msx_slot/fs4600.cpp b/src/devices/bus/msx_slot/fs4600.cpp index e6d6d8b9b9f..0cae82694a4 100644 --- a/src/devices/bus/msx_slot/fs4600.cpp +++ b/src/devices/bus/msx_slot/fs4600.cpp @@ -11,7 +11,7 @@ const device_type MSX_SLOT_FS4600 = &device_creator<msx_slot_fs4600_device>; -msx_slot_fs4600_device::msx_slot_fs4600_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_slot_fs4600_device::msx_slot_fs4600_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_SLOT_FS4600, "MSX Internal FS4600 Firmware", tag, owner, clock, "msx_slot_fs4600", __FILE__) , msx_internal_slot_interface() , m_nvram(*this, "nvram") @@ -59,7 +59,7 @@ void msx_slot_fs4600_device::device_start() // Sanity checks if (m_rom_region == nullptr ) { - fatalerror("Rom slot '%s': Unable to find memory region '%s'\n", tag(), m_region); + fatalerror("Rom slot '%s': Unable to find memory region '%s'\n", tag().c_str(), m_region); } if (m_rom_region->bytes() < m_region_offset + 0x100000) { diff --git a/src/devices/bus/msx_slot/fs4600.h b/src/devices/bus/msx_slot/fs4600.h index 57ae25aa47e..18fc51a0eae 100644 --- a/src/devices/bus/msx_slot/fs4600.h +++ b/src/devices/bus/msx_slot/fs4600.h @@ -18,7 +18,7 @@ class msx_slot_fs4600_device : public device_t, public msx_internal_slot_interface { public: - msx_slot_fs4600_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_slot_fs4600_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // static configuration helpers static void set_rom_start(device_t &device, const char *region, UINT32 offset); diff --git a/src/devices/bus/msx_slot/music.cpp b/src/devices/bus/msx_slot/music.cpp index baa6bdf0175..da4bd27ac8a 100644 --- a/src/devices/bus/msx_slot/music.cpp +++ b/src/devices/bus/msx_slot/music.cpp @@ -7,10 +7,9 @@ const device_type MSX_SLOT_MUSIC = &device_creator<msx_slot_music_device>; -msx_slot_music_device::msx_slot_music_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_slot_music_device::msx_slot_music_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : msx_slot_rom_device(mconfig, MSX_SLOT_MUSIC, "MSX Internal MSX-MUSIC", tag, owner, clock, "msx_slot_music", __FILE__) , m_ym2413(nullptr) - , m_ym2413_tag(nullptr) { } @@ -19,7 +18,7 @@ void msx_slot_music_device::device_start() { msx_slot_rom_device::device_start(); - if (m_ym2413_tag == nullptr) + if (m_ym2413_tag.empty()) { fatalerror("msx_slot_music_device: no YM2413 tag specified\n"); } @@ -28,7 +27,7 @@ void msx_slot_music_device::device_start() if (m_ym2413 == nullptr) { - fatalerror("msx_slot_ym2413_device: Unable to find YM2413 with tag '%s'\n", m_ym2413_tag); + fatalerror("msx_slot_ym2413_device: Unable to find YM2413 with tag '%s'\n", m_ym2413_tag.c_str()); } // Install IO read/write handlers diff --git a/src/devices/bus/msx_slot/music.h b/src/devices/bus/msx_slot/music.h index eb2501b6746..1a7e5fc17f6 100644 --- a/src/devices/bus/msx_slot/music.h +++ b/src/devices/bus/msx_slot/music.h @@ -19,10 +19,10 @@ extern const device_type MSX_SLOT_MUSIC; class msx_slot_music_device : public msx_slot_rom_device { public: - msx_slot_music_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_slot_music_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // static configuration helpers - static void set_ym2413_tag(device_t &device, const char *tag) { dynamic_cast<msx_slot_music_device &>(device).m_ym2413_tag = tag; } + static void set_ym2413_tag(device_t &device, std::string tag) { dynamic_cast<msx_slot_music_device &>(device).m_ym2413_tag = tag; } virtual void device_start() override; @@ -32,7 +32,7 @@ public: private: ym2413_device *m_ym2413; - const char *m_ym2413_tag; + std::string m_ym2413_tag; }; diff --git a/src/devices/bus/msx_slot/panasonic08.cpp b/src/devices/bus/msx_slot/panasonic08.cpp index ec9fdcf20ea..3606c32f52b 100644 --- a/src/devices/bus/msx_slot/panasonic08.cpp +++ b/src/devices/bus/msx_slot/panasonic08.cpp @@ -16,7 +16,7 @@ Todo: const device_type MSX_SLOT_PANASONIC08 = &device_creator<msx_slot_panasonic08_device>; -msx_slot_panasonic08_device::msx_slot_panasonic08_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_slot_panasonic08_device::msx_slot_panasonic08_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_SLOT_PANASONIC08, "MSX Internal Panasonic08", tag, owner, clock, "msx_slot_panasonic08", __FILE__) , msx_internal_slot_interface() , m_nvram(*this, "nvram") @@ -62,7 +62,7 @@ void msx_slot_panasonic08_device::device_start() // Sanity checks if (m_rom_region == nullptr ) { - fatalerror("Rom slot '%s': Unable to find memory region '%s'\n", tag(), m_region); + fatalerror("Rom slot '%s': Unable to find memory region '%s'\n", tag().c_str(), m_region); } if (m_rom_region->bytes() < m_region_offset + 0x200000) { diff --git a/src/devices/bus/msx_slot/panasonic08.h b/src/devices/bus/msx_slot/panasonic08.h index d42ebd308f5..6e1c5cb085c 100644 --- a/src/devices/bus/msx_slot/panasonic08.h +++ b/src/devices/bus/msx_slot/panasonic08.h @@ -18,7 +18,7 @@ class msx_slot_panasonic08_device : public device_t, public msx_internal_slot_interface { public: - msx_slot_panasonic08_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_slot_panasonic08_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // static configuration helpers static void set_rom_start(device_t &device, const char *region, UINT32 offset); diff --git a/src/devices/bus/msx_slot/ram.cpp b/src/devices/bus/msx_slot/ram.cpp index cb07422358a..82308f1099e 100644 --- a/src/devices/bus/msx_slot/ram.cpp +++ b/src/devices/bus/msx_slot/ram.cpp @@ -6,7 +6,7 @@ const device_type MSX_SLOT_RAM = &device_creator<msx_slot_ram_device>; -msx_slot_ram_device::msx_slot_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_slot_ram_device::msx_slot_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_SLOT_RAM, "MSX Internal RAM", tag, owner, clock, "msx_slot_ram", __FILE__) , msx_internal_slot_interface() { diff --git a/src/devices/bus/msx_slot/ram.h b/src/devices/bus/msx_slot/ram.h index da9ed2e61b0..20a9003338e 100644 --- a/src/devices/bus/msx_slot/ram.h +++ b/src/devices/bus/msx_slot/ram.h @@ -16,7 +16,7 @@ class msx_slot_ram_device : public device_t, public msx_internal_slot_interface { public: - msx_slot_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_slot_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); static void force_start_address(device_t &device, UINT16 start) { downcast<msx_slot_ram_device &>(device).m_start_address = start; } diff --git a/src/devices/bus/msx_slot/ram_mm.cpp b/src/devices/bus/msx_slot/ram_mm.cpp index 4d70fff80bc..2571dfc4624 100644 --- a/src/devices/bus/msx_slot/ram_mm.cpp +++ b/src/devices/bus/msx_slot/ram_mm.cpp @@ -5,7 +5,7 @@ const device_type MSX_SLOT_RAM_MM = &device_creator<msx_slot_ram_mm_device>; -msx_slot_ram_mm_device::msx_slot_ram_mm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_slot_ram_mm_device::msx_slot_ram_mm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_SLOT_RAM_MM, "MSX Internal Memory Mapped RAM", tag, owner, clock, "msx_slot_ram_mm", __FILE__) , msx_internal_slot_interface() , m_total_size(0) diff --git a/src/devices/bus/msx_slot/ram_mm.h b/src/devices/bus/msx_slot/ram_mm.h index b58532c2d57..607e0dc18ec 100644 --- a/src/devices/bus/msx_slot/ram_mm.h +++ b/src/devices/bus/msx_slot/ram_mm.h @@ -16,7 +16,7 @@ class msx_slot_ram_mm_device : public device_t , public msx_internal_slot_interface { public: - msx_slot_ram_mm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_slot_ram_mm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); static void set_total_size(device_t &device, UINT32 total_size) { dynamic_cast<msx_slot_ram_mm_device &>(device).m_total_size = total_size; } static void set_ramio_set_bits(device_t &device, UINT8 ramio_set_bits) { dynamic_cast<msx_slot_ram_mm_device &>(device).m_ramio_set_bits = ramio_set_bits; } diff --git a/src/devices/bus/msx_slot/rom.cpp b/src/devices/bus/msx_slot/rom.cpp index 2d4593bed2b..394f893ea12 100644 --- a/src/devices/bus/msx_slot/rom.cpp +++ b/src/devices/bus/msx_slot/rom.cpp @@ -7,7 +7,7 @@ const device_type MSX_SLOT_ROM = &device_creator<msx_slot_rom_device>; -msx_slot_rom_device::msx_slot_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_slot_rom_device::msx_slot_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_SLOT_ROM, "MSX Internal ROM", tag, owner, clock, "msx_slot_rom", __FILE__) , msx_internal_slot_interface() , m_region(nullptr) @@ -17,7 +17,7 @@ msx_slot_rom_device::msx_slot_rom_device(const machine_config &mconfig, const ch } -msx_slot_rom_device::msx_slot_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +msx_slot_rom_device::msx_slot_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) , msx_internal_slot_interface() , m_region(nullptr) @@ -45,11 +45,11 @@ void msx_slot_rom_device::device_start() // Sanity checks if (m_rom_region == nullptr ) { - fatalerror("Rom slot '%s': Unable to find memory region '%s'\n", tag(), m_region); + fatalerror("Rom slot '%s': Unable to find memory region '%s'\n", tag().c_str(), m_region); } if (m_rom_region->bytes() < m_region_offset + m_size) { - fatalerror("Memory region '%s' is too small for rom slot '%s'\n", m_region, tag()); + fatalerror("Memory region '%s' is too small for rom slot '%s'\n", m_region, tag().c_str()); } m_rom = m_rom_region->base() + m_region_offset; diff --git a/src/devices/bus/msx_slot/rom.h b/src/devices/bus/msx_slot/rom.h index e46fea28186..2cb63b8c31e 100644 --- a/src/devices/bus/msx_slot/rom.h +++ b/src/devices/bus/msx_slot/rom.h @@ -13,8 +13,8 @@ class msx_slot_rom_device : public device_t, public msx_internal_slot_interface { public: - msx_slot_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - msx_slot_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_slot_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + msx_slot_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // static configuration helpers static void set_rom_start(device_t &device, const char *region, UINT32 offset); diff --git a/src/devices/bus/msx_slot/sony08.cpp b/src/devices/bus/msx_slot/sony08.cpp index 2f48869c291..4ec0e45366c 100644 --- a/src/devices/bus/msx_slot/sony08.cpp +++ b/src/devices/bus/msx_slot/sony08.cpp @@ -13,7 +13,7 @@ const device_type MSX_SLOT_SONY08 = &device_creator<msx_slot_sony08_device>; -msx_slot_sony08_device::msx_slot_sony08_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +msx_slot_sony08_device::msx_slot_sony08_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_SLOT_SONY08, "MSX Internal SONY08", tag, owner, clock, "msx_slot_sony08", __FILE__) , msx_internal_slot_interface() , m_nvram(*this, "nvram") @@ -59,7 +59,7 @@ void msx_slot_sony08_device::device_start() // Sanity checks if (m_rom_region == nullptr ) { - fatalerror("Rom slot '%s': Unable to find memory region '%s'\n", tag(), m_region); + fatalerror("Rom slot '%s': Unable to find memory region '%s'\n", tag().c_str(), m_region); } if (m_rom_region->bytes() < m_region_offset + 0x100000) { diff --git a/src/devices/bus/msx_slot/sony08.h b/src/devices/bus/msx_slot/sony08.h index ebef6145c4f..8bcb4fc4dd3 100644 --- a/src/devices/bus/msx_slot/sony08.h +++ b/src/devices/bus/msx_slot/sony08.h @@ -18,7 +18,7 @@ class msx_slot_sony08_device : public device_t, public msx_internal_slot_interface { public: - msx_slot_sony08_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msx_slot_sony08_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // static configuration helpers static void set_rom_start(device_t &device, const char *region, UINT32 offset); diff --git a/src/devices/bus/nasbus/avc.cpp b/src/devices/bus/nasbus/avc.cpp index 8960a19573f..ef861b68d6e 100644 --- a/src/devices/bus/nasbus/avc.cpp +++ b/src/devices/bus/nasbus/avc.cpp @@ -47,7 +47,7 @@ machine_config_constructor nascom_avc_device::device_mconfig_additions() const // nascom_avc_device - constructor //------------------------------------------------- -nascom_avc_device::nascom_avc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nascom_avc_device::nascom_avc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NASCOM_AVC, "Nascom Advanced Video Card", tag, owner, clock, "nascom_avc", __FILE__), device_nasbus_card_interface(mconfig, *this), m_crtc(*this, "mc6845"), diff --git a/src/devices/bus/nasbus/avc.h b/src/devices/bus/nasbus/avc.h index 08b43b82d8d..1eac94e7ea3 100644 --- a/src/devices/bus/nasbus/avc.h +++ b/src/devices/bus/nasbus/avc.h @@ -26,7 +26,7 @@ class nascom_avc_device : public device_t, public device_nasbus_card_interface { public: // construction/destruction - nascom_avc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nascom_avc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); MC6845_UPDATE_ROW(crtc_update_row); DECLARE_WRITE8_MEMBER(control_w); diff --git a/src/devices/bus/nasbus/floppy.cpp b/src/devices/bus/nasbus/floppy.cpp index 8c87bf55b35..f181ac4a310 100644 --- a/src/devices/bus/nasbus/floppy.cpp +++ b/src/devices/bus/nasbus/floppy.cpp @@ -63,7 +63,7 @@ machine_config_constructor nascom_fdc_device::device_mconfig_additions() const // wordpro_device - constructor //------------------------------------------------- -nascom_fdc_device::nascom_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nascom_fdc_device::nascom_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NASCOM_FDC, "Nascom Floppy Disc Controller", tag, owner, clock, "nascom_fdc", __FILE__), device_nasbus_card_interface(mconfig, *this), m_fdc(*this, "fd1793"), diff --git a/src/devices/bus/nasbus/floppy.h b/src/devices/bus/nasbus/floppy.h index ea27b266667..c81c0fe7dea 100644 --- a/src/devices/bus/nasbus/floppy.h +++ b/src/devices/bus/nasbus/floppy.h @@ -26,7 +26,7 @@ class nascom_fdc_device : public device_t, public device_nasbus_card_interface { public: // construction/destruction - nascom_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nascom_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER(select_r); DECLARE_WRITE8_MEMBER(select_w); diff --git a/src/devices/bus/nasbus/nasbus.cpp b/src/devices/bus/nasbus/nasbus.cpp index bd0f2d4dab4..00bf06b9f2e 100644 --- a/src/devices/bus/nasbus/nasbus.cpp +++ b/src/devices/bus/nasbus/nasbus.cpp @@ -21,22 +21,20 @@ const device_type NASBUS_SLOT = &device_creator<nasbus_slot_device>; // nasbus_slot_device - constructor //------------------------------------------------- -nasbus_slot_device::nasbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nasbus_slot_device::nasbus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NASBUS_SLOT, "NASBUS Slot", tag, owner, clock, "nasbus_slot", __FILE__), - device_slot_interface(mconfig, *this), - m_nasbus_tag(nullptr) + device_slot_interface(mconfig, *this) { } nasbus_slot_device::nasbus_slot_device(const machine_config &mconfig, device_type type, const char *name, - const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : + std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_interface(mconfig, *this), - m_nasbus_tag(nullptr) + device_slot_interface(mconfig, *this) { } -void nasbus_slot_device::set_nasbus_slot(device_t &device, device_t *owner, const char *nasbus_tag) +void nasbus_slot_device::set_nasbus_slot(device_t &device, device_t *owner, std::string nasbus_tag) { nasbus_slot_device &nasbus_card = dynamic_cast<nasbus_slot_device &>(device); nasbus_card.m_owner = owner; @@ -69,7 +67,7 @@ const device_type NASBUS = &device_creator<nasbus_device>; // nasbus_device - constructor //------------------------------------------------- -nasbus_device::nasbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nasbus_device::nasbus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NASBUS_SLOT, "NASBUS Backplane", tag, owner, clock, "nasbus", __FILE__), m_program(nullptr), m_io(nullptr), diff --git a/src/devices/bus/nasbus/nasbus.h b/src/devices/bus/nasbus/nasbus.h index 34e35de4886..0f4b8690f4b 100644 --- a/src/devices/bus/nasbus/nasbus.h +++ b/src/devices/bus/nasbus/nasbus.h @@ -131,19 +131,19 @@ class nasbus_slot_device : public device_t, public device_slot_interface { public: // construction/destruction - nasbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nasbus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); nasbus_slot_device(const machine_config &mconfig, device_type type, const char *name, - const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides virtual void device_start() override; // inline configuration - static void set_nasbus_slot(device_t &device, device_t *owner, const char *nasbus_tag); + static void set_nasbus_slot(device_t &device, device_t *owner, std::string nasbus_tag); protected: // configuration - const char *m_nasbus_tag; + std::string m_nasbus_tag; }; // device type definition @@ -155,7 +155,7 @@ class nasbus_device : public device_t { public: // construction/destruction - nasbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nasbus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~nasbus_device(); template<class _Object> static devcb_base &set_ram_disable_handler(device_t &device, _Object object) diff --git a/src/devices/bus/neogeo/banked_cart.cpp b/src/devices/bus/neogeo/banked_cart.cpp index 1ad3b0c34e1..e01724bf752 100644 --- a/src/devices/bus/neogeo/banked_cart.cpp +++ b/src/devices/bus/neogeo/banked_cart.cpp @@ -8,7 +8,7 @@ extern const device_type NEOGEO_BANKED_CART = &device_creator<neogeo_banked_cart_device>; -neogeo_banked_cart_device::neogeo_banked_cart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +neogeo_banked_cart_device::neogeo_banked_cart_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NEOGEO_BANKED_CART, "NeoGeo Banked Cartridge", tag, owner, clock, "neogeo_banked_cart", __FILE__), m_bank_cartridge(nullptr), m_main_cpu_bank_address(0), diff --git a/src/devices/bus/neogeo/banked_cart.h b/src/devices/bus/neogeo/banked_cart.h index 5f9c4d9503d..e57c239419d 100644 --- a/src/devices/bus/neogeo/banked_cart.h +++ b/src/devices/bus/neogeo/banked_cart.h @@ -17,7 +17,7 @@ class neogeo_banked_cart_device : public device_t { public: // construction/destruction - neogeo_banked_cart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_banked_cart_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); memory_bank* m_bank_cartridge; UINT32 m_main_cpu_bank_address; diff --git a/src/devices/bus/neogeo/bootleg_cart.cpp b/src/devices/bus/neogeo/bootleg_cart.cpp index 45a4563f88d..821bb040442 100644 --- a/src/devices/bus/neogeo/bootleg_cart.cpp +++ b/src/devices/bus/neogeo/bootleg_cart.cpp @@ -18,7 +18,7 @@ const device_type NEOGEO_BOOTLEG_CART = &device_creator<neogeo_bootleg_cart>; -neogeo_bootleg_cart::neogeo_bootleg_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source) +neogeo_bootleg_cart::neogeo_bootleg_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_neogeo_cart_interface(mconfig, *this), m_banked_cart(*this, "banked_cart"), @@ -27,7 +27,7 @@ neogeo_bootleg_cart::neogeo_bootleg_cart(const machine_config &mconfig, device_t { } -neogeo_bootleg_cart::neogeo_bootleg_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock) +neogeo_bootleg_cart::neogeo_bootleg_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock) : device_t(mconfig, NEOGEO_BOOTLEG_CART, "NEOGEO Bootleg Cart", tag, owner, clock, "neogeo_rom", __FILE__), device_neogeo_cart_interface(mconfig, *this), m_banked_cart(*this, "banked_cart"), @@ -79,7 +79,7 @@ machine_config_constructor neogeo_bootleg_cart::device_mconfig_additions() const const device_type NEOGEO_BOOTLEG_GAROUBL_CART = &device_creator<neogeo_bootleg_garoubl_cart>; -neogeo_bootleg_garoubl_cart::neogeo_bootleg_garoubl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_GAROUBL_CART, "NEOGEO BOOT garoubl Cart", tag, owner, clock, "boot_garoubl_cart", __FILE__) {} +neogeo_bootleg_garoubl_cart::neogeo_bootleg_garoubl_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_GAROUBL_CART, "NEOGEO BOOT garoubl Cart", tag, owner, clock, "boot_garoubl_cart", __FILE__) {} void neogeo_bootleg_garoubl_cart::activate_cart(ACTIVATE_CART_PARAMS) { @@ -99,7 +99,7 @@ void neogeo_bootleg_garoubl_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_BOOTLEG_CTHD2003_CART = &device_creator<neogeo_bootleg_cthd2003_cart>; -neogeo_bootleg_cthd2003_cart::neogeo_bootleg_cthd2003_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_CTHD2003_CART, "NEOGEO BOOT cthd2003 Cart", tag, owner, clock, "boot_cthd2003_cart", __FILE__) {} +neogeo_bootleg_cthd2003_cart::neogeo_bootleg_cthd2003_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_CTHD2003_CART, "NEOGEO BOOT cthd2003 Cart", tag, owner, clock, "boot_cthd2003_cart", __FILE__) {} void neogeo_bootleg_cthd2003_cart::activate_cart(ACTIVATE_CART_PARAMS) { @@ -116,7 +116,7 @@ void neogeo_bootleg_cthd2003_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_BOOTLEG_CT2K3SP_CART = &device_creator<neogeo_bootleg_ct2k3sp_cart>; -neogeo_bootleg_ct2k3sp_cart::neogeo_bootleg_ct2k3sp_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_CT2K3SP_CART, "NEOGEO BOOT ct2k3sp Cart", tag, owner, clock, "boot_ct2k3sp_cart", __FILE__) {} +neogeo_bootleg_ct2k3sp_cart::neogeo_bootleg_ct2k3sp_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_CT2K3SP_CART, "NEOGEO BOOT ct2k3sp Cart", tag, owner, clock, "boot_ct2k3sp_cart", __FILE__) {} void neogeo_bootleg_ct2k3sp_cart::activate_cart(ACTIVATE_CART_PARAMS) { @@ -133,7 +133,7 @@ void neogeo_bootleg_ct2k3sp_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_BOOTLEG_CT2K3SA_CART = &device_creator<neogeo_bootleg_ct2k3sa_cart>; -neogeo_bootleg_ct2k3sa_cart::neogeo_bootleg_ct2k3sa_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_CT2K3SA_CART, "NEOGEO BOOT ct2k3sa Cart", tag, owner, clock, "boot_ct2k3sa_cart", __FILE__) {} +neogeo_bootleg_ct2k3sa_cart::neogeo_bootleg_ct2k3sa_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_CT2K3SA_CART, "NEOGEO BOOT ct2k3sa Cart", tag, owner, clock, "boot_ct2k3sa_cart", __FILE__) {} void neogeo_bootleg_ct2k3sa_cart::activate_cart(ACTIVATE_CART_PARAMS) { @@ -152,7 +152,7 @@ void neogeo_bootleg_ct2k3sa_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_BOOTLEG_KF10THEP_CART = &device_creator<neogeo_bootleg_kf10thep_cart>; -neogeo_bootleg_kf10thep_cart::neogeo_bootleg_kf10thep_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_KF10THEP_CART, "NEOGEO BOOT kf10thep Cart", tag, owner, clock, "boot_kf10thep_cart", __FILE__) {} +neogeo_bootleg_kf10thep_cart::neogeo_bootleg_kf10thep_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_KF10THEP_CART, "NEOGEO BOOT kf10thep Cart", tag, owner, clock, "boot_kf10thep_cart", __FILE__) {} void neogeo_bootleg_kf10thep_cart::activate_cart(ACTIVATE_CART_PARAMS) { @@ -173,7 +173,7 @@ void neogeo_bootleg_kf10thep_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_BOOTLEG_KF2K5UNI_CART = &device_creator<neogeo_bootleg_kf2k5uni_cart>; -neogeo_bootleg_kf2k5uni_cart::neogeo_bootleg_kf2k5uni_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_KF2K5UNI_CART, "NEOGEO BOOT kf2k5uni Cart", tag, owner, clock, "boot_kf2k5uni_cart", __FILE__) {} +neogeo_bootleg_kf2k5uni_cart::neogeo_bootleg_kf2k5uni_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_KF2K5UNI_CART, "NEOGEO BOOT kf2k5uni Cart", tag, owner, clock, "boot_kf2k5uni_cart", __FILE__) {} void neogeo_bootleg_kf2k5uni_cart::activate_cart(ACTIVATE_CART_PARAMS) { @@ -193,7 +193,7 @@ void neogeo_bootleg_kf2k5uni_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_BOOTLEG_KF2K4SE_CART = &device_creator<neogeo_bootleg_kf2k4se_cart>; -neogeo_bootleg_kf2k4se_cart::neogeo_bootleg_kf2k4se_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_KF2K4SE_CART, "NEOGEO BOOT kf2k4se Cart", tag, owner, clock, "boot_kf2k4se_cart", __FILE__) {} +neogeo_bootleg_kf2k4se_cart::neogeo_bootleg_kf2k4se_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_KF2K4SE_CART, "NEOGEO BOOT kf2k4se Cart", tag, owner, clock, "boot_kf2k4se_cart", __FILE__) {} void neogeo_bootleg_kf2k4se_cart::activate_cart(ACTIVATE_CART_PARAMS) { @@ -214,7 +214,7 @@ void neogeo_bootleg_kf2k4se_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_BOOTLEG_SVCPLUS_CART = &device_creator<neogeo_bootleg_svcplus_cart>; -neogeo_bootleg_svcplus_cart::neogeo_bootleg_svcplus_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_SVCPLUS_CART, "NEOGEO BOOT svcplus Cart", tag, owner, clock, "boot_svcplus_cart", __FILE__) {} +neogeo_bootleg_svcplus_cart::neogeo_bootleg_svcplus_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_SVCPLUS_CART, "NEOGEO BOOT svcplus Cart", tag, owner, clock, "boot_svcplus_cart", __FILE__) {} void neogeo_bootleg_svcplus_cart::activate_cart(ACTIVATE_CART_PARAMS) { @@ -237,7 +237,7 @@ void neogeo_bootleg_svcplus_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_BOOTLEG_SVCPLUSA_CART = &device_creator<neogeo_bootleg_svcplusa_cart>; -neogeo_bootleg_svcplusa_cart::neogeo_bootleg_svcplusa_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_SVCPLUSA_CART, "NEOGEO BOOT svcplusa Cart", tag, owner, clock, "boot_svcplusa_cart", __FILE__) {} +neogeo_bootleg_svcplusa_cart::neogeo_bootleg_svcplusa_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_SVCPLUSA_CART, "NEOGEO BOOT svcplusa Cart", tag, owner, clock, "boot_svcplusa_cart", __FILE__) {} void neogeo_bootleg_svcplusa_cart::activate_cart(ACTIVATE_CART_PARAMS) { @@ -258,7 +258,7 @@ void neogeo_bootleg_svcplusa_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_BOOTLEG_SAMSHO5B_CART = &device_creator<neogeo_bootleg_samsho5b_cart>; -neogeo_bootleg_samsho5b_cart::neogeo_bootleg_samsho5b_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_SAMSHO5B_CART, "NEOGEO BOOT samsho5b Cart", tag, owner, clock, "boot_samsho5b_cart", __FILE__) {} +neogeo_bootleg_samsho5b_cart::neogeo_bootleg_samsho5b_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_SAMSHO5B_CART, "NEOGEO BOOT samsho5b Cart", tag, owner, clock, "boot_samsho5b_cart", __FILE__) {} void neogeo_bootleg_samsho5b_cart::activate_cart(ACTIVATE_CART_PARAMS) { @@ -281,7 +281,7 @@ void neogeo_bootleg_samsho5b_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_BOOTLEG_KOF97ORO_CART = &device_creator<neogeo_bootleg_kof97oro_cart>; -neogeo_bootleg_kof97oro_cart::neogeo_bootleg_kof97oro_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_KOF97ORO_CART, "NEOGEO BOOT kof97oro Cart", tag, owner, clock, "boot_kof97oro_cart", __FILE__) {} +neogeo_bootleg_kof97oro_cart::neogeo_bootleg_kof97oro_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_KOF97ORO_CART, "NEOGEO BOOT kof97oro Cart", tag, owner, clock, "boot_kof97oro_cart", __FILE__) {} void neogeo_bootleg_kof97oro_cart::activate_cart(ACTIVATE_CART_PARAMS) { @@ -303,7 +303,7 @@ void neogeo_bootleg_kof97oro_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_BOOTLEG_LANS2004_CART = &device_creator<neogeo_bootleg_lans2004_cart>; -neogeo_bootleg_lans2004_cart::neogeo_bootleg_lans2004_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_LANS2004_CART, "NEOGEO BOOT lans2004 Cart", tag, owner, clock, "boot_lans2004_cart", __FILE__) {} +neogeo_bootleg_lans2004_cart::neogeo_bootleg_lans2004_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_LANS2004_CART, "NEOGEO BOOT lans2004 Cart", tag, owner, clock, "boot_lans2004_cart", __FILE__) {} void neogeo_bootleg_lans2004_cart::activate_cart(ACTIVATE_CART_PARAMS) { @@ -326,7 +326,7 @@ void neogeo_bootleg_lans2004_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_BOOTLEG_KOF10TH_CART = &device_creator<neogeo_bootleg_kof10th_cart>; -neogeo_bootleg_kof10th_cart::neogeo_bootleg_kof10th_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_KOF10TH_CART, "NEOGEO BOOT kof10th Cart", tag, owner, clock, "boot_kof10th_cart", __FILE__) {} +neogeo_bootleg_kof10th_cart::neogeo_bootleg_kof10th_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_KOF10TH_CART, "NEOGEO BOOT kof10th Cart", tag, owner, clock, "boot_kof10th_cart", __FILE__) {} void neogeo_bootleg_kof10th_cart::activate_cart(ACTIVATE_CART_PARAMS) { @@ -348,7 +348,7 @@ void neogeo_bootleg_kof10th_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_BOOTLEG_KOG_CART = &device_creator<neogeo_bootleg_kog_cart>; -neogeo_bootleg_kog_cart::neogeo_bootleg_kog_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_KOG_CART, "NEOGEO BOOT kog Cart", tag, owner, clock, "boot_kog_cart", __FILE__), +neogeo_bootleg_kog_cart::neogeo_bootleg_kog_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_KOG_CART, "NEOGEO BOOT kog Cart", tag, owner, clock, "boot_kog_cart", __FILE__), m_kog_prot(*this, "kog_prot") {} diff --git a/src/devices/bus/neogeo/bootleg_cart.h b/src/devices/bus/neogeo/bootleg_cart.h index 77082b7035d..1d3fc516f0a 100644 --- a/src/devices/bus/neogeo/bootleg_cart.h +++ b/src/devices/bus/neogeo/bootleg_cart.h @@ -16,8 +16,8 @@ class neogeo_bootleg_cart : public device_t, { public: // construction/destruction - neogeo_bootleg_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source); - neogeo_bootleg_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock); + neogeo_bootleg_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source); + neogeo_bootleg_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock); // device-level overrides virtual void device_start() override; @@ -48,7 +48,7 @@ extern const device_type NEOGEO_BOOTLEG_CART; class neogeo_bootleg_garoubl_cart : public neogeo_bootleg_cart { public: - neogeo_bootleg_garoubl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_bootleg_garoubl_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void activate_cart(ACTIVATE_CART_PARAMS) override; virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 0; } @@ -63,7 +63,7 @@ extern const device_type NEOGEO_BOOTLEG_GAROUBL_CART; class neogeo_bootleg_cthd2003_cart : public neogeo_bootleg_cart { public: - neogeo_bootleg_cthd2003_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_bootleg_cthd2003_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void activate_cart(ACTIVATE_CART_PARAMS) override; virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 0; } @@ -73,7 +73,7 @@ extern const device_type NEOGEO_BOOTLEG_CTHD2003_CART; class neogeo_bootleg_ct2k3sp_cart : public neogeo_bootleg_cart { public: - neogeo_bootleg_ct2k3sp_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_bootleg_ct2k3sp_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void activate_cart(ACTIVATE_CART_PARAMS) override; virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 0; } @@ -83,7 +83,7 @@ extern const device_type NEOGEO_BOOTLEG_CT2K3SP_CART; class neogeo_bootleg_ct2k3sa_cart : public neogeo_bootleg_cart { public: - neogeo_bootleg_ct2k3sa_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_bootleg_ct2k3sa_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void activate_cart(ACTIVATE_CART_PARAMS) override; virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 0; } @@ -98,7 +98,7 @@ extern const device_type NEOGEO_BOOTLEG_CT2K3SA_CART; class neogeo_bootleg_kf10thep_cart : public neogeo_bootleg_cart { public: - neogeo_bootleg_kf10thep_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_bootleg_kf10thep_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void activate_cart(ACTIVATE_CART_PARAMS) override; virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 0; } @@ -113,7 +113,7 @@ extern const device_type NEOGEO_BOOTLEG_KF10THEP_CART; class neogeo_bootleg_kf2k5uni_cart : public neogeo_bootleg_cart { public: - neogeo_bootleg_kf2k5uni_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_bootleg_kf2k5uni_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void activate_cart(ACTIVATE_CART_PARAMS) override; virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 0; } @@ -127,7 +127,7 @@ extern const device_type NEOGEO_BOOTLEG_KF2K5UNI_CART; class neogeo_bootleg_kf2k4se_cart : public neogeo_bootleg_cart { public: - neogeo_bootleg_kf2k4se_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_bootleg_kf2k4se_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void activate_cart(ACTIVATE_CART_PARAMS) override; virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 0; } @@ -142,7 +142,7 @@ extern const device_type NEOGEO_BOOTLEG_KF2K4SE_CART; class neogeo_bootleg_svcplus_cart : public neogeo_bootleg_cart { public: - neogeo_bootleg_svcplus_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_bootleg_svcplus_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void activate_cart(ACTIVATE_CART_PARAMS) override; virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 0; } @@ -156,7 +156,7 @@ extern const device_type NEOGEO_BOOTLEG_SVCPLUS_CART; class neogeo_bootleg_svcplusa_cart : public neogeo_bootleg_cart { public: - neogeo_bootleg_svcplusa_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_bootleg_svcplusa_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void activate_cart(ACTIVATE_CART_PARAMS) override; virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 0; } @@ -170,7 +170,7 @@ extern const device_type NEOGEO_BOOTLEG_SVCPLUSA_CART; class neogeo_bootleg_samsho5b_cart : public neogeo_bootleg_cart { public: - neogeo_bootleg_samsho5b_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_bootleg_samsho5b_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void activate_cart(ACTIVATE_CART_PARAMS) override; virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 0; } @@ -185,7 +185,7 @@ extern const device_type NEOGEO_BOOTLEG_SAMSHO5B_CART; class neogeo_bootleg_kof97oro_cart : public neogeo_bootleg_cart { public: - neogeo_bootleg_kof97oro_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_bootleg_kof97oro_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void activate_cart(ACTIVATE_CART_PARAMS) override; virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 0; } @@ -200,7 +200,7 @@ extern const device_type NEOGEO_BOOTLEG_KOF97ORO_CART; class neogeo_bootleg_lans2004_cart : public neogeo_bootleg_cart { public: - neogeo_bootleg_lans2004_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_bootleg_lans2004_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void activate_cart(ACTIVATE_CART_PARAMS) override; virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 0; } @@ -214,7 +214,7 @@ extern const device_type NEOGEO_BOOTLEG_LANS2004_CART; class neogeo_bootleg_kof10th_cart : public neogeo_bootleg_cart { public: - neogeo_bootleg_kof10th_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_bootleg_kof10th_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void activate_cart(ACTIVATE_CART_PARAMS) override; virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 0; } @@ -230,7 +230,7 @@ extern const device_type NEOGEO_BOOTLEG_KOF10TH_CART; class neogeo_bootleg_kog_cart : public neogeo_bootleg_cart { public: - neogeo_bootleg_kog_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_bootleg_kog_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void activate_cart(ACTIVATE_CART_PARAMS) override; virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 0; } diff --git a/src/devices/bus/neogeo/bootleg_hybrid_cart.cpp b/src/devices/bus/neogeo/bootleg_hybrid_cart.cpp index 5d677c8cc74..47c07aa5256 100644 --- a/src/devices/bus/neogeo/bootleg_hybrid_cart.cpp +++ b/src/devices/bus/neogeo/bootleg_hybrid_cart.cpp @@ -20,7 +20,7 @@ const device_type NEOGEO_BOOTLEG_HYBRID_HYBRID_CART = &device_creator<neogeo_bootleg_hybrid_hybrid_cart>; -neogeo_bootleg_hybrid_hybrid_cart::neogeo_bootleg_hybrid_hybrid_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source) +neogeo_bootleg_hybrid_hybrid_cart::neogeo_bootleg_hybrid_hybrid_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_neogeo_cart_interface(mconfig, *this), m_banked_cart(*this, "banked_cart"), @@ -32,7 +32,7 @@ neogeo_bootleg_hybrid_hybrid_cart::neogeo_bootleg_hybrid_hybrid_cart(const machi { } -neogeo_bootleg_hybrid_hybrid_cart::neogeo_bootleg_hybrid_hybrid_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock) +neogeo_bootleg_hybrid_hybrid_cart::neogeo_bootleg_hybrid_hybrid_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock) : device_t(mconfig, NEOGEO_BOOTLEG_HYBRID_HYBRID_CART, "NEOGEO SMA Cart", tag, owner, clock, "neogeo_rom", __FILE__), device_neogeo_cart_interface(mconfig, *this), m_banked_cart(*this, "banked_cart"), @@ -93,7 +93,7 @@ machine_config_constructor neogeo_bootleg_hybrid_hybrid_cart::device_mconfig_add const device_type NEOGEO_BOOTLEG_HYBRID_MSLUG3B6_CART = &device_creator<neogeo_bootleg_hybrid_mslug3b6_cart>; -neogeo_bootleg_hybrid_mslug3b6_cart::neogeo_bootleg_hybrid_mslug3b6_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_MSLUG3B6_CART, "NEOGEO BOOT mslug3b6 Cart", tag, owner, clock, "boot_mslug3b6_cart", __FILE__) {} +neogeo_bootleg_hybrid_mslug3b6_cart::neogeo_bootleg_hybrid_mslug3b6_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_MSLUG3B6_CART, "NEOGEO BOOT mslug3b6 Cart", tag, owner, clock, "boot_mslug3b6_cart", __FILE__) {} void neogeo_bootleg_hybrid_mslug3b6_cart::activate_cart(ACTIVATE_CART_PARAMS) { @@ -113,7 +113,7 @@ void neogeo_bootleg_hybrid_mslug3b6_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_BOOTLEG_HYBRID_KOF2002B_CART = &device_creator<neogeo_bootleg_hybrid_kof2002b_cart>; -neogeo_bootleg_hybrid_kof2002b_cart::neogeo_bootleg_hybrid_kof2002b_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_KOF2002B_CART, "NEOGEO BOOT kof2002b Cart", tag, owner, clock, "boot_kof2002b_cart", __FILE__) {} +neogeo_bootleg_hybrid_kof2002b_cart::neogeo_bootleg_hybrid_kof2002b_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_KOF2002B_CART, "NEOGEO BOOT kof2002b Cart", tag, owner, clock, "boot_kof2002b_cart", __FILE__) {} void neogeo_bootleg_hybrid_kof2002b_cart::activate_cart(ACTIVATE_CART_PARAMS) { @@ -134,7 +134,7 @@ void neogeo_bootleg_hybrid_kof2002b_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_BOOTLEG_HYBRID_KF2K2MP_CART = &device_creator<neogeo_bootleg_hybrid_kf2k2mp_cart>; -neogeo_bootleg_hybrid_kf2k2mp_cart::neogeo_bootleg_hybrid_kf2k2mp_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_KF2K2MP_CART, "NEOGEO BOOT kf2k2mp Cart", tag, owner, clock, "boot_kf2k2mp_cart", __FILE__) {} +neogeo_bootleg_hybrid_kf2k2mp_cart::neogeo_bootleg_hybrid_kf2k2mp_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_KF2K2MP_CART, "NEOGEO BOOT kf2k2mp Cart", tag, owner, clock, "boot_kf2k2mp_cart", __FILE__) {} void neogeo_bootleg_hybrid_kf2k2mp_cart::activate_cart(ACTIVATE_CART_PARAMS) { @@ -155,7 +155,7 @@ void neogeo_bootleg_hybrid_kf2k2mp_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_BOOTLEG_HYBRID_KF2K2MP2_CART = &device_creator<neogeo_bootleg_hybrid_kf2k2mp2_cart>; -neogeo_bootleg_hybrid_kf2k2mp2_cart::neogeo_bootleg_hybrid_kf2k2mp2_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_KF2K2MP2_CART, "NEOGEO BOOT kf2k2mp2 Cart", tag, owner, clock, "boot_kf2k2mp2_cart", __FILE__) {} +neogeo_bootleg_hybrid_kf2k2mp2_cart::neogeo_bootleg_hybrid_kf2k2mp2_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_KF2K2MP2_CART, "NEOGEO BOOT kf2k2mp2 Cart", tag, owner, clock, "boot_kf2k2mp2_cart", __FILE__) {} void neogeo_bootleg_hybrid_kf2k2mp2_cart::activate_cart(ACTIVATE_CART_PARAMS) { @@ -178,7 +178,7 @@ void neogeo_bootleg_hybrid_kf2k2mp2_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_BOOTLEG_HYBRID_MATRIMBL_CART = &device_creator<neogeo_bootleg_hybrid_matrimbl_cart>; -neogeo_bootleg_hybrid_matrimbl_cart::neogeo_bootleg_hybrid_matrimbl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_MATRIMBL_CART, "NEOGEO BOOT matrimbl Cart", tag, owner, clock, "boot_matrimbl_cart", __FILE__) {} +neogeo_bootleg_hybrid_matrimbl_cart::neogeo_bootleg_hybrid_matrimbl_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_MATRIMBL_CART, "NEOGEO BOOT matrimbl Cart", tag, owner, clock, "boot_matrimbl_cart", __FILE__) {} void neogeo_bootleg_hybrid_matrimbl_cart::activate_cart(ACTIVATE_CART_PARAMS) { @@ -199,7 +199,7 @@ void neogeo_bootleg_hybrid_matrimbl_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_BOOTLEG_HYBRID_MS5PLUS_CART = &device_creator<neogeo_bootleg_hybrid_ms5plus_cart>; -neogeo_bootleg_hybrid_ms5plus_cart::neogeo_bootleg_hybrid_ms5plus_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_MS5PLUS_CART, "NEOGEO BOOT ms5plus Cart", tag, owner, clock, "boot_ms5plus_cart", __FILE__) {} +neogeo_bootleg_hybrid_ms5plus_cart::neogeo_bootleg_hybrid_ms5plus_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_MS5PLUS_CART, "NEOGEO BOOT ms5plus Cart", tag, owner, clock, "boot_ms5plus_cart", __FILE__) {} void neogeo_bootleg_hybrid_ms5plus_cart::activate_cart(ACTIVATE_CART_PARAMS) { @@ -221,7 +221,7 @@ void neogeo_bootleg_hybrid_ms5plus_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_BOOTLEG_HYBRID_SVCBOOT_CART = &device_creator<neogeo_bootleg_hybrid_svcboot_cart>; -neogeo_bootleg_hybrid_svcboot_cart::neogeo_bootleg_hybrid_svcboot_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_SVCBOOT_CART, "NEOGEO BOOT svcboot Cart", tag, owner, clock, "boot_svcboot_cart", __FILE__) {} +neogeo_bootleg_hybrid_svcboot_cart::neogeo_bootleg_hybrid_svcboot_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_SVCBOOT_CART, "NEOGEO BOOT svcboot Cart", tag, owner, clock, "boot_svcboot_cart", __FILE__) {} void neogeo_bootleg_hybrid_svcboot_cart::activate_cart(ACTIVATE_CART_PARAMS) { @@ -239,7 +239,7 @@ void neogeo_bootleg_hybrid_svcboot_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_BOOTLEG_HYBRID_SVCSPLUS_CART = &device_creator<neogeo_bootleg_hybrid_svcsplus_cart>; -neogeo_bootleg_hybrid_svcsplus_cart::neogeo_bootleg_hybrid_svcsplus_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_SVCSPLUS_CART, "NEOGEO BOOT svcsplus Cart", tag, owner, clock, "boot_svcsplus_cart", __FILE__) {} +neogeo_bootleg_hybrid_svcsplus_cart::neogeo_bootleg_hybrid_svcsplus_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_SVCSPLUS_CART, "NEOGEO BOOT svcsplus Cart", tag, owner, clock, "boot_svcsplus_cart", __FILE__) {} void neogeo_bootleg_hybrid_svcsplus_cart::activate_cart(ACTIVATE_CART_PARAMS) { @@ -263,7 +263,7 @@ void neogeo_bootleg_hybrid_svcsplus_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_BOOTLEG_HYBRID_KF2K3BL_CART = &device_creator<neogeo_bootleg_hybrid_kf2k3bl_cart>; -neogeo_bootleg_hybrid_kf2k3bl_cart::neogeo_bootleg_hybrid_kf2k3bl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_KF2K3BL_CART, "NEOGEO BOOT kf2k3bl Cart", tag, owner, clock, "boot_kf2k3bl_cart", __FILE__) {} +neogeo_bootleg_hybrid_kf2k3bl_cart::neogeo_bootleg_hybrid_kf2k3bl_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_KF2K3BL_CART, "NEOGEO BOOT kf2k3bl Cart", tag, owner, clock, "boot_kf2k3bl_cart", __FILE__) {} void neogeo_bootleg_hybrid_kf2k3bl_cart::activate_cart(ACTIVATE_CART_PARAMS) { @@ -282,7 +282,7 @@ void neogeo_bootleg_hybrid_kf2k3bl_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_BOOTLEG_HYBRID_KF2K3PL_CART = &device_creator<neogeo_bootleg_hybrid_kf2k3pl_cart>; -neogeo_bootleg_hybrid_kf2k3pl_cart::neogeo_bootleg_hybrid_kf2k3pl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_KF2K3PL_CART, "NEOGEO BOOT kf2k3pl Cart", tag, owner, clock, "boot_kf2k3pl_cart", __FILE__) {} +neogeo_bootleg_hybrid_kf2k3pl_cart::neogeo_bootleg_hybrid_kf2k3pl_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_KF2K3PL_CART, "NEOGEO BOOT kf2k3pl Cart", tag, owner, clock, "boot_kf2k3pl_cart", __FILE__) {} void neogeo_bootleg_hybrid_kf2k3pl_cart::activate_cart(ACTIVATE_CART_PARAMS) { @@ -301,7 +301,7 @@ void neogeo_bootleg_hybrid_kf2k3pl_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_BOOTLEG_HYBRID_KF2K3UPL_CART = &device_creator<neogeo_bootleg_hybrid_kf2k3upl_cart>; -neogeo_bootleg_hybrid_kf2k3upl_cart::neogeo_bootleg_hybrid_kf2k3upl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_KF2K3UPL_CART, "NEOGEO BOOT kf2k3upl Cart", tag, owner, clock, "boot_kf2k3upl_cart", __FILE__) {} +neogeo_bootleg_hybrid_kf2k3upl_cart::neogeo_bootleg_hybrid_kf2k3upl_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_KF2K3UPL_CART, "NEOGEO BOOT kf2k3upl Cart", tag, owner, clock, "boot_kf2k3upl_cart", __FILE__) {} void neogeo_bootleg_hybrid_kf2k3upl_cart::activate_cart(ACTIVATE_CART_PARAMS) { diff --git a/src/devices/bus/neogeo/bootleg_hybrid_cart.h b/src/devices/bus/neogeo/bootleg_hybrid_cart.h index 09416da8545..317e5bb9483 100644 --- a/src/devices/bus/neogeo/bootleg_hybrid_cart.h +++ b/src/devices/bus/neogeo/bootleg_hybrid_cart.h @@ -18,8 +18,8 @@ class neogeo_bootleg_hybrid_hybrid_cart : public device_t, { public: // construction/destruction - neogeo_bootleg_hybrid_hybrid_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source); - neogeo_bootleg_hybrid_hybrid_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock); + neogeo_bootleg_hybrid_hybrid_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source); + neogeo_bootleg_hybrid_hybrid_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock); // device-level overrides virtual void device_start() override; @@ -55,7 +55,7 @@ extern const device_type NEOGEO_BOOTLEG_HYBRID_HYBRID_CART; class neogeo_bootleg_hybrid_mslug3b6_cart : public neogeo_bootleg_hybrid_hybrid_cart { public: - neogeo_bootleg_hybrid_mslug3b6_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_bootleg_hybrid_mslug3b6_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void activate_cart(ACTIVATE_CART_PARAMS) override; virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 0; } @@ -70,7 +70,7 @@ extern const device_type NEOGEO_BOOTLEG_HYBRID_MSLUG3B6_CART; class neogeo_bootleg_hybrid_kof2002b_cart : public neogeo_bootleg_hybrid_hybrid_cart { public: - neogeo_bootleg_hybrid_kof2002b_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_bootleg_hybrid_kof2002b_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void activate_cart(ACTIVATE_CART_PARAMS) override; virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 0; } @@ -80,7 +80,7 @@ extern const device_type NEOGEO_BOOTLEG_HYBRID_KOF2002B_CART; class neogeo_bootleg_hybrid_kf2k2mp_cart : public neogeo_bootleg_hybrid_hybrid_cart { public: - neogeo_bootleg_hybrid_kf2k2mp_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_bootleg_hybrid_kf2k2mp_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void activate_cart(ACTIVATE_CART_PARAMS) override; virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 0; } @@ -90,7 +90,7 @@ extern const device_type NEOGEO_BOOTLEG_HYBRID_KF2K2MP_CART; class neogeo_bootleg_hybrid_kf2k2mp2_cart : public neogeo_bootleg_hybrid_hybrid_cart { public: - neogeo_bootleg_hybrid_kf2k2mp2_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_bootleg_hybrid_kf2k2mp2_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void activate_cart(ACTIVATE_CART_PARAMS) override; virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 0; } @@ -105,7 +105,7 @@ extern const device_type NEOGEO_BOOTLEG_HYBRID_KF2K2MP2_CART; class neogeo_bootleg_hybrid_matrimbl_cart : public neogeo_bootleg_hybrid_hybrid_cart { public: - neogeo_bootleg_hybrid_matrimbl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_bootleg_hybrid_matrimbl_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void activate_cart(ACTIVATE_CART_PARAMS) override; virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 2; } @@ -119,7 +119,7 @@ extern const device_type NEOGEO_BOOTLEG_HYBRID_MATRIMBL_CART; class neogeo_bootleg_hybrid_ms5plus_cart : public neogeo_bootleg_hybrid_hybrid_cart { public: - neogeo_bootleg_hybrid_ms5plus_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_bootleg_hybrid_ms5plus_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void activate_cart(ACTIVATE_CART_PARAMS) override; virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 1; } @@ -133,7 +133,7 @@ extern const device_type NEOGEO_BOOTLEG_HYBRID_MS5PLUS_CART; class neogeo_bootleg_hybrid_svcboot_cart : public neogeo_bootleg_hybrid_hybrid_cart { public: - neogeo_bootleg_hybrid_svcboot_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_bootleg_hybrid_svcboot_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void activate_cart(ACTIVATE_CART_PARAMS) override; virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 0; } @@ -143,7 +143,7 @@ extern const device_type NEOGEO_BOOTLEG_HYBRID_SVCBOOT_CART; class neogeo_bootleg_hybrid_svcsplus_cart : public neogeo_bootleg_hybrid_hybrid_cart { public: - neogeo_bootleg_hybrid_svcsplus_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_bootleg_hybrid_svcsplus_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void activate_cart(ACTIVATE_CART_PARAMS) override; virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 0; } @@ -159,7 +159,7 @@ extern const device_type NEOGEO_BOOTLEG_HYBRID_SVCSPLUS_CART; class neogeo_bootleg_hybrid_kf2k3bl_cart : public neogeo_bootleg_hybrid_hybrid_cart { public: - neogeo_bootleg_hybrid_kf2k3bl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_bootleg_hybrid_kf2k3bl_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void activate_cart(ACTIVATE_CART_PARAMS) override; virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 0; } @@ -169,7 +169,7 @@ extern const device_type NEOGEO_BOOTLEG_HYBRID_KF2K3BL_CART; class neogeo_bootleg_hybrid_kf2k3pl_cart : public neogeo_bootleg_hybrid_hybrid_cart { public: - neogeo_bootleg_hybrid_kf2k3pl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_bootleg_hybrid_kf2k3pl_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void activate_cart(ACTIVATE_CART_PARAMS) override; virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 0; } @@ -180,7 +180,7 @@ extern const device_type NEOGEO_BOOTLEG_HYBRID_KF2K3PL_CART; class neogeo_bootleg_hybrid_kf2k3upl_cart : public neogeo_bootleg_hybrid_hybrid_cart { public: - neogeo_bootleg_hybrid_kf2k3upl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_bootleg_hybrid_kf2k3upl_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void activate_cart(ACTIVATE_CART_PARAMS) override; virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 0; } diff --git a/src/devices/bus/neogeo/bootleg_prot.cpp b/src/devices/bus/neogeo/bootleg_prot.cpp index 8c023f00091..ce773639b79 100644 --- a/src/devices/bus/neogeo/bootleg_prot.cpp +++ b/src/devices/bus/neogeo/bootleg_prot.cpp @@ -9,7 +9,7 @@ extern const device_type NGBOOTLEG_PROT = &device_creator<ngbootleg_prot_device>; -ngbootleg_prot_device::ngbootleg_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ngbootleg_prot_device::ngbootleg_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NGBOOTLEG_PROT, "NeoGeo Protection (Bootleg)", tag, owner, clock, "ngbootleg_prot", __FILE__), kof2k3_overlay(0), m_mainrom(nullptr), diff --git a/src/devices/bus/neogeo/bootleg_prot.h b/src/devices/bus/neogeo/bootleg_prot.h index 8aa1c9bdd7e..8a8059f379b 100644 --- a/src/devices/bus/neogeo/bootleg_prot.h +++ b/src/devices/bus/neogeo/bootleg_prot.h @@ -18,7 +18,7 @@ class ngbootleg_prot_device : public device_t { public: // construction/destruction - ngbootleg_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ngbootleg_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void neogeo_bootleg_cx_decrypt(UINT8*sprrom, UINT32 sprrom_size); void neogeo_bootleg_sx_decrypt(UINT8* fixed, UINT32 fixed_size, int value); diff --git a/src/devices/bus/neogeo/cmc_cart.cpp b/src/devices/bus/neogeo/cmc_cart.cpp index c528366b717..dec68562854 100644 --- a/src/devices/bus/neogeo/cmc_cart.cpp +++ b/src/devices/bus/neogeo/cmc_cart.cpp @@ -18,7 +18,7 @@ const device_type NEOGEO_CMC_CART = &device_creator<neogeo_cmc_cart>; -neogeo_cmc_cart::neogeo_cmc_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source) +neogeo_cmc_cart::neogeo_cmc_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_neogeo_cart_interface(mconfig, *this), m_banked_cart(*this, "banked_cart"), @@ -27,7 +27,7 @@ neogeo_cmc_cart::neogeo_cmc_cart(const machine_config &mconfig, device_type type { } -neogeo_cmc_cart::neogeo_cmc_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock) +neogeo_cmc_cart::neogeo_cmc_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock) : device_t(mconfig, NEOGEO_CMC_CART, "NEOGEO SMA Cart", tag, owner, clock, "neogeo_rom", __FILE__), device_neogeo_cart_interface(mconfig, *this), m_banked_cart(*this, "banked_cart"), @@ -78,7 +78,7 @@ machine_config_constructor neogeo_cmc_cart::device_mconfig_additions() const const device_type NEOGEO_CMC_ZUPAPA_CART = &device_creator<neogeo_cmc_zupapa_cart>; -neogeo_cmc_zupapa_cart::neogeo_cmc_zupapa_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_ZUPAPA_CART, "NEOGEO CMC zupapa Cart", tag, owner, clock, "cmc_zupapa_cart", __FILE__) {} +neogeo_cmc_zupapa_cart::neogeo_cmc_zupapa_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_ZUPAPA_CART, "NEOGEO CMC zupapa Cart", tag, owner, clock, "cmc_zupapa_cart", __FILE__) {} void neogeo_cmc_zupapa_cart::decrypt_all(DECRYPT_ALL_PARAMS) { @@ -92,7 +92,7 @@ void neogeo_cmc_zupapa_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_CMC_MSLUG3H_CART = &device_creator<neogeo_cmc_mslug3h_cart>; -neogeo_cmc_mslug3h_cart::neogeo_cmc_mslug3h_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_MSLUG3H_CART, "NEOGEO CMC mslug3h Cart", tag, owner, clock, "cmc_mslug3h_cart", __FILE__) {} +neogeo_cmc_mslug3h_cart::neogeo_cmc_mslug3h_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_MSLUG3H_CART, "NEOGEO CMC mslug3h Cart", tag, owner, clock, "cmc_mslug3h_cart", __FILE__) {} void neogeo_cmc_mslug3h_cart::decrypt_all(DECRYPT_ALL_PARAMS) { @@ -106,7 +106,7 @@ void neogeo_cmc_mslug3h_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_CMC_GANRYU_CART = &device_creator<neogeo_cmc_ganryu_cart>; -neogeo_cmc_ganryu_cart::neogeo_cmc_ganryu_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_GANRYU_CART, "NEOGEO CMC ganryu Cart", tag, owner, clock, "cmc_ganryu_cart", __FILE__) {} +neogeo_cmc_ganryu_cart::neogeo_cmc_ganryu_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_GANRYU_CART, "NEOGEO CMC ganryu Cart", tag, owner, clock, "cmc_ganryu_cart", __FILE__) {} void neogeo_cmc_ganryu_cart::decrypt_all(DECRYPT_ALL_PARAMS) { @@ -120,7 +120,7 @@ void neogeo_cmc_ganryu_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_CMC_S1945P_CART = &device_creator<neogeo_cmc_s1945p_cart>; -neogeo_cmc_s1945p_cart::neogeo_cmc_s1945p_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_S1945P_CART, "NEOGEO CMC s1945p Cart", tag, owner, clock, "cmc_s1945p_cart", __FILE__) {} +neogeo_cmc_s1945p_cart::neogeo_cmc_s1945p_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_S1945P_CART, "NEOGEO CMC s1945p Cart", tag, owner, clock, "cmc_s1945p_cart", __FILE__) {} void neogeo_cmc_s1945p_cart::decrypt_all(DECRYPT_ALL_PARAMS) { @@ -133,7 +133,7 @@ void neogeo_cmc_s1945p_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_CMC_PREISLE2_CART = &device_creator<neogeo_cmc_preisle2_cart>; -neogeo_cmc_preisle2_cart::neogeo_cmc_preisle2_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_PREISLE2_CART, "NEOGEO CMC preisle2 Cart", tag, owner, clock, "cmc_preisle2_cart", __FILE__) {} +neogeo_cmc_preisle2_cart::neogeo_cmc_preisle2_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_PREISLE2_CART, "NEOGEO CMC preisle2 Cart", tag, owner, clock, "cmc_preisle2_cart", __FILE__) {} void neogeo_cmc_preisle2_cart::decrypt_all(DECRYPT_ALL_PARAMS) { @@ -146,7 +146,7 @@ void neogeo_cmc_preisle2_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_CMC_BANGBEAD_CART = &device_creator<neogeo_cmc_bangbead_cart>; -neogeo_cmc_bangbead_cart::neogeo_cmc_bangbead_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_BANGBEAD_CART, "NEOGEO CMC bangbead Cart", tag, owner, clock, "cmc_bangbead_cart", __FILE__) {} +neogeo_cmc_bangbead_cart::neogeo_cmc_bangbead_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_BANGBEAD_CART, "NEOGEO CMC bangbead Cart", tag, owner, clock, "cmc_bangbead_cart", __FILE__) {} void neogeo_cmc_bangbead_cart::decrypt_all(DECRYPT_ALL_PARAMS) { @@ -159,7 +159,7 @@ void neogeo_cmc_bangbead_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_CMC_NITD_CART = &device_creator<neogeo_cmc_nitd_cart>; -neogeo_cmc_nitd_cart::neogeo_cmc_nitd_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_NITD_CART, "NEOGEO CMC nitd Cart", tag, owner, clock, "cmc_nitd_cart", __FILE__) {} +neogeo_cmc_nitd_cart::neogeo_cmc_nitd_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_NITD_CART, "NEOGEO CMC nitd Cart", tag, owner, clock, "cmc_nitd_cart", __FILE__) {} void neogeo_cmc_nitd_cart::decrypt_all(DECRYPT_ALL_PARAMS) { @@ -173,7 +173,7 @@ void neogeo_cmc_nitd_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_CMC_SENGOKU3_CART = &device_creator<neogeo_cmc_sengoku3_cart>; -neogeo_cmc_sengoku3_cart::neogeo_cmc_sengoku3_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_SENGOKU3_CART, "NEOGEO CMC sengoku3 Cart", tag, owner, clock, "cmc_sengoku3_cart", __FILE__) {} +neogeo_cmc_sengoku3_cart::neogeo_cmc_sengoku3_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_SENGOKU3_CART, "NEOGEO CMC sengoku3 Cart", tag, owner, clock, "cmc_sengoku3_cart", __FILE__) {} void neogeo_cmc_sengoku3_cart::decrypt_all(DECRYPT_ALL_PARAMS) { @@ -186,7 +186,7 @@ void neogeo_cmc_sengoku3_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_CMC_KOF99K_CART = &device_creator<neogeo_cmc_kof99k_cart>; -neogeo_cmc_kof99k_cart::neogeo_cmc_kof99k_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_KOF99K_CART, "NEOGEO CMC kof99k Cart", tag, owner, clock, "cmc_kof99k_cart", __FILE__) {} +neogeo_cmc_kof99k_cart::neogeo_cmc_kof99k_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_KOF99K_CART, "NEOGEO CMC kof99k Cart", tag, owner, clock, "cmc_kof99k_cart", __FILE__) {} void neogeo_cmc_kof99k_cart::decrypt_all(DECRYPT_ALL_PARAMS) { @@ -200,7 +200,7 @@ void neogeo_cmc_kof99k_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_CMC_KOF2001_CART = &device_creator<neogeo_cmc_kof2001_cart>; -neogeo_cmc_kof2001_cart::neogeo_cmc_kof2001_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_KOF2001_CART, "NEOGEO CMC kof2001 Cart", tag, owner, clock, "cmc_kof2001_cart", __FILE__) {} +neogeo_cmc_kof2001_cart::neogeo_cmc_kof2001_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_KOF2001_CART, "NEOGEO CMC kof2001 Cart", tag, owner, clock, "cmc_kof2001_cart", __FILE__) {} void neogeo_cmc_kof2001_cart::decrypt_all(DECRYPT_ALL_PARAMS) { @@ -214,7 +214,7 @@ void neogeo_cmc_kof2001_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_CMC_KOF2000N_CART = &device_creator<neogeo_cmc_kof2000n_cart>; -neogeo_cmc_kof2000n_cart::neogeo_cmc_kof2000n_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_KOF2000N_CART, "NEOGEO CMC kof2000n Cart", tag, owner, clock, "cmc_kof2000n_cart", __FILE__) {} +neogeo_cmc_kof2000n_cart::neogeo_cmc_kof2000n_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_KOF2000N_CART, "NEOGEO CMC kof2000n Cart", tag, owner, clock, "cmc_kof2000n_cart", __FILE__) {} void neogeo_cmc_kof2000n_cart::decrypt_all(DECRYPT_ALL_PARAMS) { diff --git a/src/devices/bus/neogeo/cmc_cart.h b/src/devices/bus/neogeo/cmc_cart.h index 6dcb544813a..e8f64927f7c 100644 --- a/src/devices/bus/neogeo/cmc_cart.h +++ b/src/devices/bus/neogeo/cmc_cart.h @@ -15,8 +15,8 @@ class neogeo_cmc_cart : public device_t, { public: // construction/destruction - neogeo_cmc_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source); - neogeo_cmc_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock); + neogeo_cmc_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source); + neogeo_cmc_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock); // device-level overrides virtual void device_start() override; @@ -47,7 +47,7 @@ extern const device_type NEOGEO_CMC_CART; class neogeo_cmc_zupapa_cart : public neogeo_cmc_cart { public: - neogeo_cmc_zupapa_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_cmc_zupapa_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 1; } }; @@ -60,7 +60,7 @@ extern const device_type NEOGEO_CMC_ZUPAPA_CART; class neogeo_cmc_mslug3h_cart : public neogeo_cmc_cart { public: - neogeo_cmc_mslug3h_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_cmc_mslug3h_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 1; } }; @@ -74,7 +74,7 @@ extern const device_type NEOGEO_CMC_MSLUG3H_CART; class neogeo_cmc_ganryu_cart : public neogeo_cmc_cart { public: - neogeo_cmc_ganryu_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_cmc_ganryu_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 1; } }; @@ -87,7 +87,7 @@ extern const device_type NEOGEO_CMC_GANRYU_CART; class neogeo_cmc_s1945p_cart : public neogeo_cmc_cart { public: - neogeo_cmc_s1945p_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_cmc_s1945p_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 1; } }; @@ -101,7 +101,7 @@ extern const device_type NEOGEO_CMC_S1945P_CART; class neogeo_cmc_preisle2_cart : public neogeo_cmc_cart { public: - neogeo_cmc_preisle2_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_cmc_preisle2_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 1; } }; @@ -114,7 +114,7 @@ extern const device_type NEOGEO_CMC_PREISLE2_CART; class neogeo_cmc_bangbead_cart : public neogeo_cmc_cart { public: - neogeo_cmc_bangbead_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_cmc_bangbead_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 1; } }; @@ -128,7 +128,7 @@ extern const device_type NEOGEO_CMC_BANGBEAD_CART; class neogeo_cmc_nitd_cart : public neogeo_cmc_cart { public: - neogeo_cmc_nitd_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_cmc_nitd_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 1; } }; @@ -141,7 +141,7 @@ extern const device_type NEOGEO_CMC_NITD_CART; class neogeo_cmc_sengoku3_cart : public neogeo_cmc_cart { public: - neogeo_cmc_sengoku3_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_cmc_sengoku3_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 1; } }; @@ -154,7 +154,7 @@ extern const device_type NEOGEO_CMC_SENGOKU3_CART; class neogeo_cmc_kof99k_cart : public neogeo_cmc_cart { public: - neogeo_cmc_kof99k_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_cmc_kof99k_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 1; } }; @@ -167,7 +167,7 @@ extern const device_type NEOGEO_CMC_KOF99K_CART; class neogeo_cmc_kof2001_cart : public neogeo_cmc_cart { public: - neogeo_cmc_kof2001_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_cmc_kof2001_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 1; } }; @@ -180,7 +180,7 @@ extern const device_type NEOGEO_CMC_KOF2001_CART; class neogeo_cmc_kof2000n_cart : public neogeo_cmc_cart { public: - neogeo_cmc_kof2000n_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_cmc_kof2000n_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 2; } }; diff --git a/src/devices/bus/neogeo/cmc_prot.cpp b/src/devices/bus/neogeo/cmc_prot.cpp index c4dc573af8a..8b404cfeccb 100644 --- a/src/devices/bus/neogeo/cmc_prot.cpp +++ b/src/devices/bus/neogeo/cmc_prot.cpp @@ -9,7 +9,7 @@ extern const device_type CMC_PROT = &device_creator<cmc_prot_device>; -cmc_prot_device::cmc_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +cmc_prot_device::cmc_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CMC_PROT, "NeoGeo Protection (CMC)", tag, owner, clock, "cmc_prot", __FILE__), type0_t03(nullptr), type0_t12(nullptr), diff --git a/src/devices/bus/neogeo/cmc_prot.h b/src/devices/bus/neogeo/cmc_prot.h index cbf53a865dd..1094f29a693 100644 --- a/src/devices/bus/neogeo/cmc_prot.h +++ b/src/devices/bus/neogeo/cmc_prot.h @@ -44,7 +44,7 @@ class cmc_prot_device : public device_t { public: // construction/destruction - cmc_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cmc_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void decrypt(UINT8 *r0, UINT8 *r1, UINT8 c0, UINT8 c1, diff --git a/src/devices/bus/neogeo/fatfury2_cart.cpp b/src/devices/bus/neogeo/fatfury2_cart.cpp index 047ca79a2eb..3b8db9ac52e 100644 --- a/src/devices/bus/neogeo/fatfury2_cart.cpp +++ b/src/devices/bus/neogeo/fatfury2_cart.cpp @@ -18,7 +18,7 @@ const device_type NEOGEO_FATFURY2_CART = &device_creator<neogeo_fatfury2_cart>; -neogeo_fatfury2_cart::neogeo_fatfury2_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source) +neogeo_fatfury2_cart::neogeo_fatfury2_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_neogeo_cart_interface( mconfig, *this ), m_banked_cart(*this, "banked_cart"), @@ -26,7 +26,7 @@ neogeo_fatfury2_cart::neogeo_fatfury2_cart(const machine_config &mconfig, device { } -neogeo_fatfury2_cart::neogeo_fatfury2_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock) +neogeo_fatfury2_cart::neogeo_fatfury2_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock) : device_t(mconfig, NEOGEO_FATFURY2_CART, "NEOGEO Fatal Fury 2 Cart", tag, owner, clock, "neogeo_rom", __FILE__), device_neogeo_cart_interface( mconfig, *this ), m_banked_cart(*this, "banked_cart"), diff --git a/src/devices/bus/neogeo/fatfury2_cart.h b/src/devices/bus/neogeo/fatfury2_cart.h index 4d4f91a72a1..743d5e5d74a 100644 --- a/src/devices/bus/neogeo/fatfury2_cart.h +++ b/src/devices/bus/neogeo/fatfury2_cart.h @@ -14,8 +14,8 @@ class neogeo_fatfury2_cart : public device_t, { public: // construction/destruction - neogeo_fatfury2_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source); - neogeo_fatfury2_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock); + neogeo_fatfury2_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source); + neogeo_fatfury2_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/neogeo/fatfury2_prot.cpp b/src/devices/bus/neogeo/fatfury2_prot.cpp index b2560ad4f62..2681d7da5c9 100644 --- a/src/devices/bus/neogeo/fatfury2_prot.cpp +++ b/src/devices/bus/neogeo/fatfury2_prot.cpp @@ -9,7 +9,7 @@ extern const device_type FATFURY2_PROT = &device_creator<fatfury2_prot_device>; -fatfury2_prot_device::fatfury2_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +fatfury2_prot_device::fatfury2_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, FATFURY2_PROT, "NeoGeo Protection (Fatal Fury 2)", tag, owner, clock, "fatfury2_prot", __FILE__), m_bankdev(nullptr), m_fatfury2_prot_data(0) diff --git a/src/devices/bus/neogeo/fatfury2_prot.h b/src/devices/bus/neogeo/fatfury2_prot.h index 17a31586ed4..7f21b848df4 100644 --- a/src/devices/bus/neogeo/fatfury2_prot.h +++ b/src/devices/bus/neogeo/fatfury2_prot.h @@ -18,7 +18,7 @@ class fatfury2_prot_device : public device_t { public: // construction/destruction - fatfury2_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + fatfury2_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ16_MEMBER( fatfury2_protection_16_r ); DECLARE_WRITE16_MEMBER( fatfury2_protection_16_w ); diff --git a/src/devices/bus/neogeo/kof2002_cart.cpp b/src/devices/bus/neogeo/kof2002_cart.cpp index 9726bd34b4b..0a90f4d2317 100644 --- a/src/devices/bus/neogeo/kof2002_cart.cpp +++ b/src/devices/bus/neogeo/kof2002_cart.cpp @@ -18,7 +18,7 @@ const device_type NEOGEO_KOF2002_CART = &device_creator<neogeo_kof2002_cart>; -neogeo_kof2002_cart::neogeo_kof2002_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source) +neogeo_kof2002_cart::neogeo_kof2002_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_neogeo_cart_interface(mconfig, *this), m_banked_cart(*this, "banked_cart"), @@ -28,7 +28,7 @@ neogeo_kof2002_cart::neogeo_kof2002_cart(const machine_config &mconfig, device_t { } -neogeo_kof2002_cart::neogeo_kof2002_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock) +neogeo_kof2002_cart::neogeo_kof2002_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock) : device_t(mconfig, NEOGEO_KOF2002_CART, "NEOGEO KOF2002 Cart", tag, owner, clock, "neogeo_rom", __FILE__), device_neogeo_cart_interface(mconfig, *this), m_banked_cart(*this, "banked_cart"), @@ -83,7 +83,7 @@ machine_config_constructor neogeo_kof2002_cart::device_mconfig_additions() const const device_type NEOGEO_KOF2002_KOF2002_CART = &device_creator<neogeo_kof2002_kof2002_cart>; -neogeo_kof2002_kof2002_cart::neogeo_kof2002_kof2002_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_kof2002_cart(mconfig, NEOGEO_KOF2002_KOF2002_CART, "NEOGEO Kof2002-type kof2002 Cart", tag, owner, clock, "k2k_k2k_cart", __FILE__) {} +neogeo_kof2002_kof2002_cart::neogeo_kof2002_kof2002_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_kof2002_cart(mconfig, NEOGEO_KOF2002_KOF2002_CART, "NEOGEO Kof2002-type kof2002 Cart", tag, owner, clock, "k2k_k2k_cart", __FILE__) {} void neogeo_kof2002_kof2002_cart::decrypt_all(DECRYPT_ALL_PARAMS) { @@ -96,7 +96,7 @@ void neogeo_kof2002_kof2002_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_KOF2002_KF2K2PLS_CART = &device_creator<neogeo_kof2002_kf2k2pls_cart>; -neogeo_kof2002_kf2k2pls_cart::neogeo_kof2002_kf2k2pls_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_kof2002_cart(mconfig, NEOGEO_KOF2002_KF2K2PLS_CART, "NEOGEO Kof2002-type kof2002plus Cart", tag, owner, clock, "k2k_k2kpls_cart", __FILE__) {} +neogeo_kof2002_kf2k2pls_cart::neogeo_kof2002_kf2k2pls_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_kof2002_cart(mconfig, NEOGEO_KOF2002_KF2K2PLS_CART, "NEOGEO Kof2002-type kof2002plus Cart", tag, owner, clock, "k2k_k2kpls_cart", __FILE__) {} void neogeo_kof2002_kf2k2pls_cart::decrypt_all(DECRYPT_ALL_PARAMS) { @@ -113,7 +113,7 @@ void neogeo_kof2002_kf2k2pls_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_KOF2002_MATRIM_CART = &device_creator<neogeo_kof2002_matrim_cart>; -neogeo_kof2002_matrim_cart::neogeo_kof2002_matrim_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_kof2002_cart(mconfig, NEOGEO_KOF2002_MATRIM_CART, "NEOGEO Kof2002-type matrim Cart", tag, owner, clock, "k2k_matrim_cart", __FILE__) {} +neogeo_kof2002_matrim_cart::neogeo_kof2002_matrim_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_kof2002_cart(mconfig, NEOGEO_KOF2002_MATRIM_CART, "NEOGEO Kof2002-type matrim Cart", tag, owner, clock, "k2k_matrim_cart", __FILE__) {} void neogeo_kof2002_matrim_cart::decrypt_all(DECRYPT_ALL_PARAMS) { @@ -130,7 +130,7 @@ void neogeo_kof2002_matrim_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_KOF2002_SAMSHO5_CART = &device_creator<neogeo_kof2002_samsho5_cart>; -neogeo_kof2002_samsho5_cart::neogeo_kof2002_samsho5_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_kof2002_cart(mconfig, NEOGEO_KOF2002_SAMSHO5_CART, "NEOGEO Kof2002-type Samsho5 Cart", tag, owner, clock, "k2k_ss5_cart", __FILE__) {} +neogeo_kof2002_samsho5_cart::neogeo_kof2002_samsho5_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_kof2002_cart(mconfig, NEOGEO_KOF2002_SAMSHO5_CART, "NEOGEO Kof2002-type Samsho5 Cart", tag, owner, clock, "k2k_ss5_cart", __FILE__) {} void neogeo_kof2002_samsho5_cart::decrypt_all(DECRYPT_ALL_PARAMS) { @@ -146,7 +146,7 @@ void neogeo_kof2002_samsho5_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_KOF2002_SAMSHO5SP_CART = &device_creator<neogeo_kof2002_samsho5sp_cart>; -neogeo_kof2002_samsho5sp_cart::neogeo_kof2002_samsho5sp_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_kof2002_cart(mconfig, NEOGEO_KOF2002_SAMSHO5SP_CART, "NEOGEO Kof2002-type Samsho5sp Cart", tag, owner, clock, "k2k_ss5s_cart", __FILE__) {} +neogeo_kof2002_samsho5sp_cart::neogeo_kof2002_samsho5sp_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_kof2002_cart(mconfig, NEOGEO_KOF2002_SAMSHO5SP_CART, "NEOGEO Kof2002-type Samsho5sp Cart", tag, owner, clock, "k2k_ss5s_cart", __FILE__) {} void neogeo_kof2002_samsho5sp_cart::decrypt_all(DECRYPT_ALL_PARAMS) { diff --git a/src/devices/bus/neogeo/kof2002_cart.h b/src/devices/bus/neogeo/kof2002_cart.h index f8c87314588..79ae36d9472 100644 --- a/src/devices/bus/neogeo/kof2002_cart.h +++ b/src/devices/bus/neogeo/kof2002_cart.h @@ -16,8 +16,8 @@ class neogeo_kof2002_cart : public device_t, { public: // construction/destruction - neogeo_kof2002_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source); - neogeo_kof2002_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock); + neogeo_kof2002_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source); + neogeo_kof2002_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock); // device-level overrides virtual void device_start() override; @@ -51,7 +51,7 @@ extern const device_type NEOGEO_KOF2002_CART; class neogeo_kof2002_kof2002_cart : public neogeo_kof2002_cart { public: - neogeo_kof2002_kof2002_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_kof2002_kof2002_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 0; } }; @@ -60,7 +60,7 @@ extern const device_type NEOGEO_KOF2002_KOF2002_CART; class neogeo_kof2002_kf2k2pls_cart : public neogeo_kof2002_cart { public: - neogeo_kof2002_kf2k2pls_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_kof2002_kf2k2pls_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 0; } }; @@ -75,7 +75,7 @@ extern const device_type NEOGEO_KOF2002_KF2K2PLS_CART; class neogeo_kof2002_matrim_cart : public neogeo_kof2002_cart { public: - neogeo_kof2002_matrim_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_kof2002_matrim_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 2; } }; @@ -88,7 +88,7 @@ extern const device_type NEOGEO_KOF2002_MATRIM_CART; class neogeo_kof2002_samsho5_cart : public neogeo_kof2002_cart { public: - neogeo_kof2002_samsho5_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_kof2002_samsho5_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 1; } }; @@ -101,7 +101,7 @@ extern const device_type NEOGEO_KOF2002_SAMSHO5_CART; class neogeo_kof2002_samsho5sp_cart : public neogeo_kof2002_cart { public: - neogeo_kof2002_samsho5sp_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_kof2002_samsho5sp_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 1; } }; diff --git a/src/devices/bus/neogeo/kof2002_prot.cpp b/src/devices/bus/neogeo/kof2002_prot.cpp index f234602a0c2..27fd8751783 100644 --- a/src/devices/bus/neogeo/kof2002_prot.cpp +++ b/src/devices/bus/neogeo/kof2002_prot.cpp @@ -9,7 +9,7 @@ extern const device_type KOF2002_PROT = &device_creator<kof2002_prot_device>; -kof2002_prot_device::kof2002_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +kof2002_prot_device::kof2002_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, KOF2002_PROT, "NeoGeo Protection (KOF2002)", tag, owner, clock, "kof2002_prot", __FILE__) { } diff --git a/src/devices/bus/neogeo/kof2002_prot.h b/src/devices/bus/neogeo/kof2002_prot.h index 8ed4873b1be..d553ed6de7a 100644 --- a/src/devices/bus/neogeo/kof2002_prot.h +++ b/src/devices/bus/neogeo/kof2002_prot.h @@ -17,7 +17,7 @@ class kof2002_prot_device : public device_t { public: // construction/destruction - kof2002_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + kof2002_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void kof2002_decrypt_68k(UINT8* cpurom, UINT32 cpurom_size); void matrim_decrypt_68k(UINT8* cpurom, UINT32 cpurom_size); diff --git a/src/devices/bus/neogeo/kof98_cart.cpp b/src/devices/bus/neogeo/kof98_cart.cpp index 6314522e4ff..5f049cad334 100644 --- a/src/devices/bus/neogeo/kof98_cart.cpp +++ b/src/devices/bus/neogeo/kof98_cart.cpp @@ -18,7 +18,7 @@ const device_type NEOGEO_KOF98_CART = &device_creator<neogeo_kof98_cart>; -neogeo_kof98_cart::neogeo_kof98_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source) +neogeo_kof98_cart::neogeo_kof98_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_neogeo_cart_interface( mconfig, *this ), m_banked_cart(*this, "banked_cart"), @@ -26,7 +26,7 @@ neogeo_kof98_cart::neogeo_kof98_cart(const machine_config &mconfig, device_type { } -neogeo_kof98_cart::neogeo_kof98_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock) +neogeo_kof98_cart::neogeo_kof98_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock) : device_t(mconfig, NEOGEO_KOF98_CART, "NEOGEO KOF98 Cart", tag, owner, clock, "neogeo_rom", __FILE__), device_neogeo_cart_interface( mconfig, *this ), m_banked_cart(*this, "banked_cart"), diff --git a/src/devices/bus/neogeo/kof98_cart.h b/src/devices/bus/neogeo/kof98_cart.h index 6bf3a715cde..ae9f469f961 100644 --- a/src/devices/bus/neogeo/kof98_cart.h +++ b/src/devices/bus/neogeo/kof98_cart.h @@ -14,8 +14,8 @@ class neogeo_kof98_cart : public device_t, { public: // construction/destruction - neogeo_kof98_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source); - neogeo_kof98_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock); + neogeo_kof98_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source); + neogeo_kof98_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/neogeo/kof98_prot.cpp b/src/devices/bus/neogeo/kof98_prot.cpp index 6fdfa5001f3..022b032c134 100644 --- a/src/devices/bus/neogeo/kof98_prot.cpp +++ b/src/devices/bus/neogeo/kof98_prot.cpp @@ -10,7 +10,7 @@ extern const device_type KOF98_PROT = &device_creator<kof98_prot_device>; -kof98_prot_device::kof98_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +kof98_prot_device::kof98_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, KOF98_PROT, "NeoGeo Protection (KOF98)", tag, owner, clock, "kof98_prot", __FILE__), kof98_prot_state(0) { diff --git a/src/devices/bus/neogeo/kof98_prot.h b/src/devices/bus/neogeo/kof98_prot.h index f824a8a1206..1254809dd89 100644 --- a/src/devices/bus/neogeo/kof98_prot.h +++ b/src/devices/bus/neogeo/kof98_prot.h @@ -17,7 +17,7 @@ class kof98_prot_device : public device_t { public: // construction/destruction - kof98_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + kof98_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void kof98_decrypt_68k(UINT8* cpurom, UINT32 cpurom_size); void install_kof98_protection(cpu_device* maincpu); diff --git a/src/devices/bus/neogeo/kog_prot.cpp b/src/devices/bus/neogeo/kog_prot.cpp index d3caaff3e15..b628d30ae64 100644 --- a/src/devices/bus/neogeo/kog_prot.cpp +++ b/src/devices/bus/neogeo/kog_prot.cpp @@ -8,7 +8,7 @@ extern const device_type KOG_PROT = &device_creator<kog_prot_device>; -kog_prot_device::kog_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +kog_prot_device::kog_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, KOG_PROT, "NeoGeo Protection (King of Gladiator)", tag, owner, clock, "kog_prot", __FILE__), m_jumper(*this, "JUMPER") { diff --git a/src/devices/bus/neogeo/kog_prot.h b/src/devices/bus/neogeo/kog_prot.h index 5e19053c3d4..40d1857852d 100644 --- a/src/devices/bus/neogeo/kog_prot.h +++ b/src/devices/bus/neogeo/kog_prot.h @@ -17,7 +17,7 @@ class kog_prot_device : public device_t { public: // construction/destruction - kog_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + kog_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void kog_install_protection(cpu_device* maincpu); void kog_px_decrypt(UINT8* cpurom, UINT32 cpurom_size); diff --git a/src/devices/bus/neogeo/mslugx_cart.cpp b/src/devices/bus/neogeo/mslugx_cart.cpp index d6bd6388864..ee1d5a2f060 100644 --- a/src/devices/bus/neogeo/mslugx_cart.cpp +++ b/src/devices/bus/neogeo/mslugx_cart.cpp @@ -18,7 +18,7 @@ const device_type NEOGEO_MSLUGX_CART = &device_creator<neogeo_mslugx_cart>; -neogeo_mslugx_cart::neogeo_mslugx_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source) +neogeo_mslugx_cart::neogeo_mslugx_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_neogeo_cart_interface( mconfig, *this ), m_banked_cart(*this, "banked_cart"), @@ -26,7 +26,7 @@ neogeo_mslugx_cart::neogeo_mslugx_cart(const machine_config &mconfig, device_typ { } -neogeo_mslugx_cart::neogeo_mslugx_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock) +neogeo_mslugx_cart::neogeo_mslugx_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock) : device_t(mconfig, NEOGEO_MSLUGX_CART, "NEOGEO Metal Slug X Cart", tag, owner, clock, "neogeo_rom", __FILE__), device_neogeo_cart_interface( mconfig, *this ), m_banked_cart(*this, "banked_cart"), diff --git a/src/devices/bus/neogeo/mslugx_cart.h b/src/devices/bus/neogeo/mslugx_cart.h index 2e58655f3e2..3892d0d3337 100644 --- a/src/devices/bus/neogeo/mslugx_cart.h +++ b/src/devices/bus/neogeo/mslugx_cart.h @@ -14,8 +14,8 @@ class neogeo_mslugx_cart : public device_t, { public: // construction/destruction - neogeo_mslugx_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source); - neogeo_mslugx_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock); + neogeo_mslugx_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source); + neogeo_mslugx_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/neogeo/mslugx_prot.cpp b/src/devices/bus/neogeo/mslugx_prot.cpp index 783ef2db839..53f23356482 100644 --- a/src/devices/bus/neogeo/mslugx_prot.cpp +++ b/src/devices/bus/neogeo/mslugx_prot.cpp @@ -8,7 +8,7 @@ extern const device_type MSLUGX_PROT = &device_creator<mslugx_prot_device>; -mslugx_prot_device::mslugx_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +mslugx_prot_device::mslugx_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSLUGX_PROT, "NeoGeo Protection (Metal Slug X)", tag, owner, clock, "mslugx_prot", __FILE__), m_mslugx_counter(0), m_mslugx_command(0) diff --git a/src/devices/bus/neogeo/mslugx_prot.h b/src/devices/bus/neogeo/mslugx_prot.h index fb1f2261957..80b1fe5444b 100644 --- a/src/devices/bus/neogeo/mslugx_prot.h +++ b/src/devices/bus/neogeo/mslugx_prot.h @@ -17,7 +17,7 @@ class mslugx_prot_device : public device_t { public: // construction/destruction - mslugx_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + mslugx_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_WRITE16_MEMBER( mslugx_protection_16_w ); diff --git a/src/devices/bus/neogeo/neogeo_slot.cpp b/src/devices/bus/neogeo/neogeo_slot.cpp index fac43eda050..f96307f497a 100644 --- a/src/devices/bus/neogeo/neogeo_slot.cpp +++ b/src/devices/bus/neogeo/neogeo_slot.cpp @@ -23,7 +23,7 @@ const device_type NEOGEO_CART_SLOT = &device_creator<neogeo_cart_slot_device>; //------------------------------------------------- // neogeo_cart_slot_device - constructor //------------------------------------------------- -neogeo_cart_slot_device::neogeo_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock) : +neogeo_cart_slot_device::neogeo_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock) : device_t(mconfig, NEOGEO_CART_SLOT, "NeoGeo Cartridge Slot", tag, owner, clock, "neogeo_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), diff --git a/src/devices/bus/neogeo/neogeo_slot.h b/src/devices/bus/neogeo/neogeo_slot.h index 1b037103165..f42d841550a 100644 --- a/src/devices/bus/neogeo/neogeo_slot.h +++ b/src/devices/bus/neogeo/neogeo_slot.h @@ -18,7 +18,7 @@ class neogeo_cart_slot_device : public device_t, { public: // construction/destruction - neogeo_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock); + neogeo_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock); virtual ~neogeo_cart_slot_device(); // device-level overrides diff --git a/src/devices/bus/neogeo/pcm2_cart.cpp b/src/devices/bus/neogeo/pcm2_cart.cpp index 04eede0ebe9..2ec389c5bf6 100644 --- a/src/devices/bus/neogeo/pcm2_cart.cpp +++ b/src/devices/bus/neogeo/pcm2_cart.cpp @@ -18,7 +18,7 @@ const device_type NEOGEO_PCM2_CART = &device_creator<neogeo_pcm2_cart>; -neogeo_pcm2_cart::neogeo_pcm2_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source) +neogeo_pcm2_cart::neogeo_pcm2_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_neogeo_cart_interface(mconfig, *this), m_banked_cart(*this, "banked_cart"), @@ -27,7 +27,7 @@ neogeo_pcm2_cart::neogeo_pcm2_cart(const machine_config &mconfig, device_type ty { } -neogeo_pcm2_cart::neogeo_pcm2_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock) +neogeo_pcm2_cart::neogeo_pcm2_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock) : device_t(mconfig, NEOGEO_PCM2_CART, "NEOGEO PCM2 Cart", tag, owner, clock, "neogeo_rom", __FILE__), device_neogeo_cart_interface(mconfig, *this), m_banked_cart(*this, "banked_cart"), @@ -80,7 +80,7 @@ machine_config_constructor neogeo_pcm2_cart::device_mconfig_additions() const const device_type NEOGEO_PCM2_MSLUG4_CART = &device_creator<neogeo_pcm2_mslug4_cart>; -neogeo_pcm2_mslug4_cart::neogeo_pcm2_mslug4_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_pcm2_cart(mconfig, NEOGEO_PCM2_MSLUG4_CART, "NEOGEO PCM2 mslug4 Cart", tag, owner, clock, "p2_mslug4_cart", __FILE__) {} +neogeo_pcm2_mslug4_cart::neogeo_pcm2_mslug4_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_pcm2_cart(mconfig, NEOGEO_PCM2_MSLUG4_CART, "NEOGEO PCM2 mslug4 Cart", tag, owner, clock, "p2_mslug4_cart", __FILE__) {} void neogeo_pcm2_mslug4_cart::decrypt_all(DECRYPT_ALL_PARAMS) { @@ -93,7 +93,7 @@ void neogeo_pcm2_mslug4_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_PCM2_MS4PLUS_CART = &device_creator<neogeo_pcm2_ms4plus_cart>; -neogeo_pcm2_ms4plus_cart::neogeo_pcm2_ms4plus_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_pcm2_cart(mconfig, NEOGEO_PCM2_MS4PLUS_CART, "NEOGEO PCM2 ms4plus Cart", tag, owner, clock, "p2_ms4plus_cart", __FILE__) {} +neogeo_pcm2_ms4plus_cart::neogeo_pcm2_ms4plus_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_pcm2_cart(mconfig, NEOGEO_PCM2_MS4PLUS_CART, "NEOGEO PCM2 ms4plus Cart", tag, owner, clock, "p2_ms4plus_cart", __FILE__) {} void neogeo_pcm2_ms4plus_cart::decrypt_all(DECRYPT_ALL_PARAMS) { @@ -109,7 +109,7 @@ void neogeo_pcm2_ms4plus_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_PCM2_ROTD_CART = &device_creator<neogeo_pcm2_rotd_cart>; -neogeo_pcm2_rotd_cart::neogeo_pcm2_rotd_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_pcm2_cart(mconfig, NEOGEO_PCM2_ROTD_CART, "NEOGEO PCM2 rotd Cart", tag, owner, clock, "p2_rotd_cart", __FILE__) {} +neogeo_pcm2_rotd_cart::neogeo_pcm2_rotd_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_pcm2_cart(mconfig, NEOGEO_PCM2_ROTD_CART, "NEOGEO PCM2 rotd Cart", tag, owner, clock, "p2_rotd_cart", __FILE__) {} void neogeo_pcm2_rotd_cart::decrypt_all(DECRYPT_ALL_PARAMS) { @@ -125,7 +125,7 @@ void neogeo_pcm2_rotd_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_PCM2_PNYAA_CART = &device_creator<neogeo_pcm2_pnyaa_cart>; -neogeo_pcm2_pnyaa_cart::neogeo_pcm2_pnyaa_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_pcm2_cart(mconfig, NEOGEO_PCM2_PNYAA_CART, "NEOGEO PCM2 pnyaa Cart", tag, owner, clock, "p2_pnyaa_cart", __FILE__) {} +neogeo_pcm2_pnyaa_cart::neogeo_pcm2_pnyaa_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_pcm2_cart(mconfig, NEOGEO_PCM2_PNYAA_CART, "NEOGEO PCM2 pnyaa Cart", tag, owner, clock, "p2_pnyaa_cart", __FILE__) {} void neogeo_pcm2_pnyaa_cart::decrypt_all(DECRYPT_ALL_PARAMS) { diff --git a/src/devices/bus/neogeo/pcm2_cart.h b/src/devices/bus/neogeo/pcm2_cart.h index 74f8e24d929..c176337312b 100644 --- a/src/devices/bus/neogeo/pcm2_cart.h +++ b/src/devices/bus/neogeo/pcm2_cart.h @@ -15,8 +15,8 @@ class neogeo_pcm2_cart : public device_t, { public: // construction/destruction - neogeo_pcm2_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source); - neogeo_pcm2_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock); + neogeo_pcm2_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source); + neogeo_pcm2_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock); // device-level overrides virtual void device_start() override; @@ -48,7 +48,7 @@ extern const device_type NEOGEO_PCM2_CART; class neogeo_pcm2_mslug4_cart : public neogeo_pcm2_cart { public: - neogeo_pcm2_mslug4_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_pcm2_mslug4_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 1; } }; @@ -57,7 +57,7 @@ extern const device_type NEOGEO_PCM2_MSLUG4_CART; class neogeo_pcm2_ms4plus_cart : public neogeo_pcm2_cart { public: - neogeo_pcm2_ms4plus_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_pcm2_ms4plus_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 0; } }; @@ -72,7 +72,7 @@ extern const device_type NEOGEO_PCM2_MS4PLUS_CART; class neogeo_pcm2_rotd_cart : public neogeo_pcm2_cart { public: - neogeo_pcm2_rotd_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_pcm2_rotd_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 1; } }; @@ -86,7 +86,7 @@ extern const device_type NEOGEO_PCM2_ROTD_CART; class neogeo_pcm2_pnyaa_cart : public neogeo_pcm2_cart { public: - neogeo_pcm2_pnyaa_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_pcm2_pnyaa_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 1; } }; diff --git a/src/devices/bus/neogeo/pcm2_prot.cpp b/src/devices/bus/neogeo/pcm2_prot.cpp index 64159ff4185..abb50d33823 100644 --- a/src/devices/bus/neogeo/pcm2_prot.cpp +++ b/src/devices/bus/neogeo/pcm2_prot.cpp @@ -10,7 +10,7 @@ extern const device_type PCM2_PROT = &device_creator<pcm2_prot_device>; -pcm2_prot_device::pcm2_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +pcm2_prot_device::pcm2_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PCM2_PROT, "NeoGeo Protection (NEOPCM2)", tag, owner, clock, "pcm2_prot", __FILE__) { } diff --git a/src/devices/bus/neogeo/pcm2_prot.h b/src/devices/bus/neogeo/pcm2_prot.h index 72f59dac1b3..68df5591db2 100644 --- a/src/devices/bus/neogeo/pcm2_prot.h +++ b/src/devices/bus/neogeo/pcm2_prot.h @@ -17,7 +17,7 @@ class pcm2_prot_device : public device_t { public: // construction/destruction - pcm2_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + pcm2_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void neo_pcm2_snk_1999(UINT8* ymrom, UINT32 ymsize, int value); void neo_pcm2_swap(UINT8* ymrom, UINT32 ymsize, int value); diff --git a/src/devices/bus/neogeo/pvc_cart.cpp b/src/devices/bus/neogeo/pvc_cart.cpp index ee587724b7f..7e8d1a7da20 100644 --- a/src/devices/bus/neogeo/pvc_cart.cpp +++ b/src/devices/bus/neogeo/pvc_cart.cpp @@ -18,7 +18,7 @@ const device_type NEOGEO_PVC_CART = &device_creator<neogeo_pvc_cart>; -neogeo_pvc_cart::neogeo_pvc_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source) +neogeo_pvc_cart::neogeo_pvc_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_neogeo_cart_interface(mconfig, *this), m_banked_cart(*this, "banked_cart"), @@ -28,7 +28,7 @@ neogeo_pvc_cart::neogeo_pvc_cart(const machine_config &mconfig, device_type type { } -neogeo_pvc_cart::neogeo_pvc_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock) +neogeo_pvc_cart::neogeo_pvc_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock) : device_t(mconfig, NEOGEO_PVC_CART, "NEOGEO PCM2 Cart", tag, owner, clock, "neogeo_rom", __FILE__), device_neogeo_cart_interface(mconfig, *this), m_banked_cart(*this, "banked_cart"), @@ -83,7 +83,7 @@ machine_config_constructor neogeo_pvc_cart::device_mconfig_additions() const const device_type NEOGEO_PVC_MSLUG5_CART = &device_creator<neogeo_pvc_mslug5_cart>; -neogeo_pvc_mslug5_cart::neogeo_pvc_mslug5_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_pvc_cart(mconfig, NEOGEO_PVC_MSLUG5_CART, "NEOGEO PCM2 mslug5 Cart", tag, owner, clock, "p2_mslug5_cart", __FILE__) {} +neogeo_pvc_mslug5_cart::neogeo_pvc_mslug5_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_pvc_cart(mconfig, NEOGEO_PVC_MSLUG5_CART, "NEOGEO PCM2 mslug5 Cart", tag, owner, clock, "p2_mslug5_cart", __FILE__) {} void neogeo_pvc_mslug5_cart::decrypt_all(DECRYPT_ALL_PARAMS) { @@ -99,7 +99,7 @@ void neogeo_pvc_mslug5_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_PVC_SVC_CART = &device_creator<neogeo_pvc_svc_cart>; -neogeo_pvc_svc_cart::neogeo_pvc_svc_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_pvc_cart(mconfig, NEOGEO_PVC_SVC_CART, "NEOGEO PCM2 svc Cart", tag, owner, clock, "p2_svc_cart", __FILE__) {} +neogeo_pvc_svc_cart::neogeo_pvc_svc_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_pvc_cart(mconfig, NEOGEO_PVC_SVC_CART, "NEOGEO PCM2 svc Cart", tag, owner, clock, "p2_svc_cart", __FILE__) {} void neogeo_pvc_svc_cart::decrypt_all(DECRYPT_ALL_PARAMS) { @@ -116,7 +116,7 @@ void neogeo_pvc_svc_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_PVC_KOF2003_CART = &device_creator<neogeo_pvc_kof2003_cart>; -neogeo_pvc_kof2003_cart::neogeo_pvc_kof2003_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_pvc_cart(mconfig, NEOGEO_PVC_KOF2003_CART, "NEOGEO PCM2 kof2003 Cart", tag, owner, clock, "p2_kof2003_cart", __FILE__) {} +neogeo_pvc_kof2003_cart::neogeo_pvc_kof2003_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_pvc_cart(mconfig, NEOGEO_PVC_KOF2003_CART, "NEOGEO PCM2 kof2003 Cart", tag, owner, clock, "p2_kof2003_cart", __FILE__) {} void neogeo_pvc_kof2003_cart::decrypt_all(DECRYPT_ALL_PARAMS) { @@ -128,7 +128,7 @@ void neogeo_pvc_kof2003_cart::decrypt_all(DECRYPT_ALL_PARAMS) const device_type NEOGEO_PVC_KOF2003H_CART = &device_creator<neogeo_pvc_kof2003h_cart>; -neogeo_pvc_kof2003h_cart::neogeo_pvc_kof2003h_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_pvc_cart(mconfig, NEOGEO_PVC_KOF2003H_CART, "NEOGEO PCM2 kof2003h Cart", tag, owner, clock, "p2_kof2003h_cart", __FILE__) {} +neogeo_pvc_kof2003h_cart::neogeo_pvc_kof2003h_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_pvc_cart(mconfig, NEOGEO_PVC_KOF2003H_CART, "NEOGEO PCM2 kof2003h Cart", tag, owner, clock, "p2_kof2003h_cart", __FILE__) {} void neogeo_pvc_kof2003h_cart::decrypt_all(DECRYPT_ALL_PARAMS) { diff --git a/src/devices/bus/neogeo/pvc_cart.h b/src/devices/bus/neogeo/pvc_cart.h index 7d5e3aa22d5..19a67dcd6fc 100644 --- a/src/devices/bus/neogeo/pvc_cart.h +++ b/src/devices/bus/neogeo/pvc_cart.h @@ -16,8 +16,8 @@ class neogeo_pvc_cart : public device_t, { public: // construction/destruction - neogeo_pvc_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source); - neogeo_pvc_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock); + neogeo_pvc_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source); + neogeo_pvc_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock); // device-level overrides virtual void device_start() override; @@ -56,7 +56,7 @@ extern const device_type NEOGEO_PVC_CART; class neogeo_pvc_mslug5_cart : public neogeo_pvc_cart { public: - neogeo_pvc_mslug5_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_pvc_mslug5_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 1; } }; @@ -69,7 +69,7 @@ extern const device_type NEOGEO_PVC_MSLUG5_CART; class neogeo_pvc_svc_cart : public neogeo_pvc_cart { public: - neogeo_pvc_svc_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_pvc_svc_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 2; } }; @@ -83,7 +83,7 @@ extern const device_type NEOGEO_PVC_SVC_CART; class neogeo_pvc_kof2003_cart : public neogeo_pvc_cart { public: - neogeo_pvc_kof2003_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_pvc_kof2003_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 2; } }; @@ -97,7 +97,7 @@ extern const device_type NEOGEO_PVC_KOF2003_CART; class neogeo_pvc_kof2003h_cart : public neogeo_pvc_cart { public: - neogeo_pvc_kof2003h_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_pvc_kof2003h_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 2; } }; diff --git a/src/devices/bus/neogeo/pvc_prot.cpp b/src/devices/bus/neogeo/pvc_prot.cpp index bef53153a5f..872eac75037 100644 --- a/src/devices/bus/neogeo/pvc_prot.cpp +++ b/src/devices/bus/neogeo/pvc_prot.cpp @@ -10,7 +10,7 @@ extern const device_type PVC_PROT = &device_creator<pvc_prot_device>; -pvc_prot_device::pvc_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +pvc_prot_device::pvc_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PVC_PROT, "NeoGeo Protection (PVC)", tag, owner, clock, "pvc_prot", __FILE__), m_bankdev(nullptr) { diff --git a/src/devices/bus/neogeo/pvc_prot.h b/src/devices/bus/neogeo/pvc_prot.h index db853285a28..ef9b82f5aaf 100644 --- a/src/devices/bus/neogeo/pvc_prot.h +++ b/src/devices/bus/neogeo/pvc_prot.h @@ -18,7 +18,7 @@ class pvc_prot_device : public device_t { public: // construction/destruction - pvc_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + pvc_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void pvc_write_unpack_color(); void pvc_write_pack_color(); diff --git a/src/devices/bus/neogeo/rom.cpp b/src/devices/bus/neogeo/rom.cpp index 085e68edec2..92b01920a03 100644 --- a/src/devices/bus/neogeo/rom.cpp +++ b/src/devices/bus/neogeo/rom.cpp @@ -18,14 +18,14 @@ const device_type NEOGEO_ROM = &device_creator<neogeo_rom_device>; -neogeo_rom_device::neogeo_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source) +neogeo_rom_device::neogeo_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_neogeo_cart_interface( mconfig, *this ), m_banked_cart(*this, "banked_cart") { } -neogeo_rom_device::neogeo_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock) +neogeo_rom_device::neogeo_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock) : device_t(mconfig, NEOGEO_ROM, "NEOGEO ROM Carts", tag, owner, clock, "neogeo_rom", __FILE__), device_neogeo_cart_interface( mconfig, *this ), m_banked_cart(*this, "banked_cart") diff --git a/src/devices/bus/neogeo/rom.h b/src/devices/bus/neogeo/rom.h index 7a1135a3e7c..4da90a1a2a3 100644 --- a/src/devices/bus/neogeo/rom.h +++ b/src/devices/bus/neogeo/rom.h @@ -13,8 +13,8 @@ class neogeo_rom_device : public device_t, { public: // construction/destruction - neogeo_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source); - neogeo_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock); + neogeo_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source); + neogeo_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/neogeo/sbp_prot.cpp b/src/devices/bus/neogeo/sbp_prot.cpp index b913eba75d9..4ee3130e916 100644 --- a/src/devices/bus/neogeo/sbp_prot.cpp +++ b/src/devices/bus/neogeo/sbp_prot.cpp @@ -10,7 +10,7 @@ extern const device_type SBP_PROT = &device_creator<sbp_prot_device>; -sbp_prot_device::sbp_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sbp_prot_device::sbp_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SBP_PROT, "NeoGeo Protection (Super Bubble Pop)", tag, owner, clock, "sbp_prot", __FILE__), m_mainrom(nullptr) { diff --git a/src/devices/bus/neogeo/sbp_prot.h b/src/devices/bus/neogeo/sbp_prot.h index 702bb9c42e0..9ab4d3aa4e7 100644 --- a/src/devices/bus/neogeo/sbp_prot.h +++ b/src/devices/bus/neogeo/sbp_prot.h @@ -17,7 +17,7 @@ class sbp_prot_device : public device_t { public: // construction/destruction - sbp_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sbp_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); UINT8* m_mainrom; diff --git a/src/devices/bus/neogeo/sma_cart.cpp b/src/devices/bus/neogeo/sma_cart.cpp index 61e07b962f3..727918659f3 100644 --- a/src/devices/bus/neogeo/sma_cart.cpp +++ b/src/devices/bus/neogeo/sma_cart.cpp @@ -18,7 +18,7 @@ const device_type NEOGEO_SMA_CART = &device_creator<neogeo_sma_cart>; -neogeo_sma_cart::neogeo_sma_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source) +neogeo_sma_cart::neogeo_sma_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_neogeo_cart_interface(mconfig, *this), m_banked_cart(*this, "banked_cart"), @@ -28,7 +28,7 @@ neogeo_sma_cart::neogeo_sma_cart(const machine_config &mconfig, device_type type { } -neogeo_sma_cart::neogeo_sma_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock) +neogeo_sma_cart::neogeo_sma_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock) : device_t(mconfig, NEOGEO_SMA_CART, "NEOGEO SMA Cart", tag, owner, clock, "neogeo_rom", __FILE__), device_neogeo_cart_interface(mconfig, *this), m_banked_cart(*this, "banked_cart"), @@ -81,7 +81,7 @@ machine_config_constructor neogeo_sma_cart::device_mconfig_additions() const const device_type NEOGEO_SMA_KOF99_CART = &device_creator<neogeo_sma_kof99_cart>; -neogeo_sma_kof99_cart::neogeo_sma_kof99_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_sma_cart(mconfig, NEOGEO_SMA_KOF99_CART, "NEOGEO SMA Kof99 Cart", tag, owner, clock, "sma_kof99_cart", __FILE__) {} +neogeo_sma_kof99_cart::neogeo_sma_kof99_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_sma_cart(mconfig, NEOGEO_SMA_KOF99_CART, "NEOGEO SMA Kof99 Cart", tag, owner, clock, "sma_kof99_cart", __FILE__) {} void neogeo_sma_kof99_cart::decrypt_all(DECRYPT_ALL_PARAMS) { @@ -104,7 +104,7 @@ void neogeo_sma_kof99_cart::activate_cart(ACTIVATE_CART_PARAMS) const device_type NEOGEO_SMA_GAROU_CART = &device_creator<neogeo_sma_garou_cart>; -neogeo_sma_garou_cart::neogeo_sma_garou_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_sma_cart(mconfig, NEOGEO_SMA_GAROU_CART, "NEOGEO SMA Garou Cart", tag, owner, clock, "sma_garou_cart", __FILE__) {} +neogeo_sma_garou_cart::neogeo_sma_garou_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_sma_cart(mconfig, NEOGEO_SMA_GAROU_CART, "NEOGEO SMA Garou Cart", tag, owner, clock, "sma_garou_cart", __FILE__) {} void neogeo_sma_garou_cart::decrypt_all(DECRYPT_ALL_PARAMS) { @@ -120,7 +120,7 @@ void neogeo_sma_garou_cart::activate_cart(ACTIVATE_CART_PARAMS) const device_type NEOGEO_SMA_GAROUH_CART = &device_creator<neogeo_sma_garouh_cart>; -neogeo_sma_garouh_cart::neogeo_sma_garouh_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_sma_cart(mconfig, NEOGEO_SMA_GAROU_CART, "NEOGEO SMA Garou (alt) Cart", tag, owner, clock, "sma_garouh_cart", __FILE__) {} +neogeo_sma_garouh_cart::neogeo_sma_garouh_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_sma_cart(mconfig, NEOGEO_SMA_GAROU_CART, "NEOGEO SMA Garou (alt) Cart", tag, owner, clock, "sma_garouh_cart", __FILE__) {} void neogeo_sma_garouh_cart::decrypt_all(DECRYPT_ALL_PARAMS) { @@ -141,7 +141,7 @@ void neogeo_sma_garouh_cart::activate_cart(ACTIVATE_CART_PARAMS) const device_type NEOGEO_SMA_MSLUG3_CART = &device_creator<neogeo_sma_mslug3_cart>; -neogeo_sma_mslug3_cart::neogeo_sma_mslug3_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_sma_cart(mconfig, NEOGEO_SMA_MSLUG3_CART, "NEOGEO SMA Mslug3 Cart", tag, owner, clock, "sma_mslug3_cart", __FILE__) {} +neogeo_sma_mslug3_cart::neogeo_sma_mslug3_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_sma_cart(mconfig, NEOGEO_SMA_MSLUG3_CART, "NEOGEO SMA Mslug3 Cart", tag, owner, clock, "sma_mslug3_cart", __FILE__) {} void neogeo_sma_mslug3_cart::decrypt_all(DECRYPT_ALL_PARAMS) { @@ -161,7 +161,7 @@ void neogeo_sma_mslug3_cart::activate_cart(ACTIVATE_CART_PARAMS) const device_type NEOGEO_SMA_KOF2000_CART = &device_creator<neogeo_sma_kof2000_cart>; -neogeo_sma_kof2000_cart::neogeo_sma_kof2000_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_sma_cart(mconfig, NEOGEO_SMA_KOF2000_CART, "NEOGEO SMA KOF2000 Cart", tag, owner, clock, "sma_kof2000_cart", __FILE__) {} +neogeo_sma_kof2000_cart::neogeo_sma_kof2000_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_sma_cart(mconfig, NEOGEO_SMA_KOF2000_CART, "NEOGEO SMA KOF2000 Cart", tag, owner, clock, "sma_kof2000_cart", __FILE__) {} void neogeo_sma_kof2000_cart::decrypt_all(DECRYPT_ALL_PARAMS) { diff --git a/src/devices/bus/neogeo/sma_cart.h b/src/devices/bus/neogeo/sma_cart.h index 04df0b1217a..b3e7445ced6 100644 --- a/src/devices/bus/neogeo/sma_cart.h +++ b/src/devices/bus/neogeo/sma_cart.h @@ -15,8 +15,8 @@ class neogeo_sma_cart : public device_t, { public: // construction/destruction - neogeo_sma_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source); - neogeo_sma_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock); + neogeo_sma_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source); + neogeo_sma_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock); // device-level overrides virtual void device_start() override; @@ -48,7 +48,7 @@ extern const device_type NEOGEO_SMA_CART; class neogeo_sma_kof99_cart : public neogeo_sma_cart { public: - neogeo_sma_kof99_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_sma_kof99_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void activate_cart(ACTIVATE_CART_PARAMS) override; virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 1; } @@ -62,7 +62,7 @@ extern const device_type NEOGEO_SMA_KOF99_CART; class neogeo_sma_garou_cart : public neogeo_sma_cart { public: - neogeo_sma_garou_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_sma_garou_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void activate_cart(ACTIVATE_CART_PARAMS) override; virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 1; } @@ -72,7 +72,7 @@ extern const device_type NEOGEO_SMA_GAROU_CART; class neogeo_sma_garouh_cart : public neogeo_sma_cart { public: - neogeo_sma_garouh_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_sma_garouh_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void activate_cart(ACTIVATE_CART_PARAMS) override; virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 1; } @@ -86,7 +86,7 @@ extern const device_type NEOGEO_SMA_GAROUH_CART; class neogeo_sma_mslug3_cart : public neogeo_sma_cart { public: - neogeo_sma_mslug3_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_sma_mslug3_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void activate_cart(ACTIVATE_CART_PARAMS) override; virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 1; } @@ -101,7 +101,7 @@ extern const device_type NEOGEO_SMA_MSLUG3_CART; class neogeo_sma_kof2000_cart : public neogeo_sma_cart { public: - neogeo_sma_kof2000_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + neogeo_sma_kof2000_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void activate_cart(ACTIVATE_CART_PARAMS) override; virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; virtual int get_fixed_bank_type(void) override { return 2; } diff --git a/src/devices/bus/neogeo/sma_prot.cpp b/src/devices/bus/neogeo/sma_prot.cpp index 1c91212c416..d87b61239c4 100644 --- a/src/devices/bus/neogeo/sma_prot.cpp +++ b/src/devices/bus/neogeo/sma_prot.cpp @@ -8,7 +8,7 @@ extern const device_type SMA_PROT = &device_creator<sma_prot_device>; -sma_prot_device::sma_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sma_prot_device::sma_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SMA_PROT, "NeoGeo SMA Cartridge", tag, owner, clock, "sma_prot", __FILE__), m_bankdev(nullptr), m_sma_rng(0) diff --git a/src/devices/bus/neogeo/sma_prot.h b/src/devices/bus/neogeo/sma_prot.h index 37f7e82fbc1..b0349429809 100644 --- a/src/devices/bus/neogeo/sma_prot.h +++ b/src/devices/bus/neogeo/sma_prot.h @@ -19,7 +19,7 @@ class sma_prot_device : public device_t { public: // construction/destruction - sma_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sma_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_WRITE16_MEMBER( kof99_bankswitch_w ); diff --git a/src/devices/bus/nes/2a03pur.cpp b/src/devices/bus/nes/2a03pur.cpp index d7c807b63f2..1b3b8ea91dc 100644 --- a/src/devices/bus/nes/2a03pur.cpp +++ b/src/devices/bus/nes/2a03pur.cpp @@ -34,7 +34,7 @@ const device_type NES_2A03PURITANS = &device_creator<nes_2a03pur_device>; -nes_2a03pur_device::nes_2a03pur_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_2a03pur_device::nes_2a03pur_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_2A03PURITANS, "NES Cart 2A03 Puritans Album PCB", tag, owner, clock, "nes_2a03pur", __FILE__) { } diff --git a/src/devices/bus/nes/2a03pur.h b/src/devices/bus/nes/2a03pur.h index 6bcafadb7d5..d1de85a4ace 100644 --- a/src/devices/bus/nes/2a03pur.h +++ b/src/devices/bus/nes/2a03pur.h @@ -12,7 +12,7 @@ class nes_2a03pur_device : public nes_nrom_device { public: // construction/destruction - nes_2a03pur_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_2a03pur_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/act53.cpp b/src/devices/bus/nes/act53.cpp index 225be65d449..88ba720057d 100644 --- a/src/devices/bus/nes/act53.cpp +++ b/src/devices/bus/nes/act53.cpp @@ -32,7 +32,7 @@ const device_type NES_ACTION53 = &device_creator<nes_action53_device>; -nes_action53_device::nes_action53_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_action53_device::nes_action53_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_ACTION53, "NES Cart Action 53 PCB", tag, owner, clock, "nes_action53", __FILE__), m_sel(0) { diff --git a/src/devices/bus/nes/act53.h b/src/devices/bus/nes/act53.h index e3b395ce1cd..5d51b8fbd01 100644 --- a/src/devices/bus/nes/act53.h +++ b/src/devices/bus/nes/act53.h @@ -12,7 +12,7 @@ class nes_action53_device : public nes_nrom_device { public: // construction/destruction - nes_action53_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_action53_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/aladdin.cpp b/src/devices/bus/nes/aladdin.cpp index bad863b9255..1bffd08447f 100644 --- a/src/devices/bus/nes/aladdin.cpp +++ b/src/devices/bus/nes/aladdin.cpp @@ -66,7 +66,7 @@ READ8_MEMBER(aladdin_cart_interface::read) const device_type NES_ALADDIN_SLOT = &device_creator<nes_aladdin_slot_device>; -nes_aladdin_slot_device::nes_aladdin_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nes_aladdin_slot_device::nes_aladdin_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_ALADDIN_SLOT, "NES Aladdin Deck Enhancer Cartridge Slot", tag, owner, clock, "nes_ade_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), m_cart(nullptr) @@ -183,19 +183,19 @@ ROM_END const device_type NES_ALGN_ROM = &device_creator<nes_algn_rom_device>; const device_type NES_ALGQ_ROM = &device_creator<nes_algq_rom_device>; -nes_algn_rom_device::nes_algn_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_algn_rom_device::nes_algn_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), aladdin_cart_interface( mconfig, *this ) { } -nes_algn_rom_device::nes_algn_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_algn_rom_device::nes_algn_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_ALGN_ROM, "NES Aladdin Deck Enhancer ALGN ROM", tag, owner, clock, "nes_algn_rom", __FILE__), aladdin_cart_interface( mconfig, *this ) { } -nes_algq_rom_device::nes_algq_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_algq_rom_device::nes_algq_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_algn_rom_device(mconfig, NES_ALGQ_ROM, "NES Aladdin Deck Enhancer ALGQ ROM", tag, owner, clock, "nes_algq_rom", __FILE__), m_bank_base(0) { } @@ -270,7 +270,7 @@ void nes_algq_rom_device::write_prg(UINT32 offset, UINT8 data) const device_type NES_ALADDIN = &device_creator<nes_aladdin_device>; -nes_aladdin_device::nes_aladdin_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_aladdin_device::nes_aladdin_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_ALADDIN, "NES Cart Camerica Aladdin PCB", tag, owner, clock, "nes_aladdin", __FILE__), m_subslot(*this, "ade_slot") { diff --git a/src/devices/bus/nes/aladdin.h b/src/devices/bus/nes/aladdin.h index 20786c3cab3..f739ca789f8 100644 --- a/src/devices/bus/nes/aladdin.h +++ b/src/devices/bus/nes/aladdin.h @@ -43,7 +43,7 @@ class nes_aladdin_slot_device : public device_t, { public: // construction/destruction - nes_aladdin_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_aladdin_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~nes_aladdin_slot_device(); // device-level overrides @@ -95,8 +95,8 @@ class nes_algn_rom_device : public device_t, { public: // construction/destruction - nes_algn_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - nes_algn_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_algn_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_algn_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -116,7 +116,7 @@ class nes_algq_rom_device : public nes_algn_rom_device { public: // construction/destruction - nes_algq_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_algq_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual void write_prg(UINT32 offset, UINT8 data) override; @@ -146,7 +146,7 @@ class nes_aladdin_device : public nes_nrom_device { public: // construction/destruction - nes_aladdin_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_aladdin_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/ave.cpp b/src/devices/bus/nes/ave.cpp index c1103f228ac..dadabec187e 100644 --- a/src/devices/bus/nes/ave.cpp +++ b/src/devices/bus/nes/ave.cpp @@ -38,17 +38,17 @@ const device_type NES_NINA006 = &device_creator<nes_nina006_device>; const device_type NES_MAXI15 = &device_creator<nes_maxi15_device>; -nes_nina001_device::nes_nina001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_nina001_device::nes_nina001_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_NINA001, "NES Cart AVE Nina-001 PCB", tag, owner, clock, "nes_nina001", __FILE__) { } -nes_nina006_device::nes_nina006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_nina006_device::nes_nina006_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_NINA006, "NES Cart AVE Nina-006 PCB", tag, owner, clock, "nes_nina006", __FILE__) { } -nes_maxi15_device::nes_maxi15_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_maxi15_device::nes_maxi15_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_MAXI15, "NES Cart AVE Maxi 15 PCB", tag, owner, clock, "nes_maxi15", __FILE__), m_reg(0), m_bank(0) { } diff --git a/src/devices/bus/nes/ave.h b/src/devices/bus/nes/ave.h index 936d93ce392..e21e806466d 100644 --- a/src/devices/bus/nes/ave.h +++ b/src/devices/bus/nes/ave.h @@ -12,7 +12,7 @@ class nes_nina001_device : public nes_nrom_device { public: // construction/destruction - nes_nina001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_nina001_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -28,7 +28,7 @@ class nes_nina006_device : public nes_nrom_device { public: // construction/destruction - nes_nina006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_nina006_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -44,7 +44,7 @@ class nes_maxi15_device : public nes_nrom_device { public: // construction/destruction - nes_maxi15_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_maxi15_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/bandai.cpp b/src/devices/bus/nes/bandai.cpp index 8a223a5d645..49bad5e3912 100644 --- a/src/devices/bus/nes/bandai.cpp +++ b/src/devices/bus/nes/bandai.cpp @@ -58,49 +58,49 @@ const device_type NES_LZ93D50_24C02 = &device_creator<nes_lz93d50_24c02_device>; const device_type NES_FJUMP2 = &device_creator<nes_fjump2_device>; -nes_oekakids_device::nes_oekakids_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_oekakids_device::nes_oekakids_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_OEKAKIDS, "NES Cart Bandai Oeka Kids PCB", tag, owner, clock, "nes_oeka", __FILE__), m_reg(0), m_latch(0) { } -nes_fcg_device::nes_fcg_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_fcg_device::nes_fcg_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) { } -nes_fcg_device::nes_fcg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_fcg_device::nes_fcg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_FCG, "NES Cart Bandai FCG PCB", tag, owner, clock, "nes_fcg", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) { } -nes_lz93d50_device::nes_lz93d50_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_lz93d50_device::nes_lz93d50_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : nes_fcg_device(mconfig, type, name, tag, owner, clock, shortname, source) { } -nes_lz93d50_device::nes_lz93d50_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_lz93d50_device::nes_lz93d50_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_fcg_device(mconfig, NES_LZ93D50, "NES Cart Bandai LZ93D50 PCB", tag, owner, clock, "nes_lz93d50", __FILE__) { } -nes_lz93d50_24c01_device::nes_lz93d50_24c01_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_lz93d50_24c01_device::nes_lz93d50_24c01_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : nes_lz93d50_device(mconfig, type, name, tag, owner, clock, shortname, source), m_i2cmem(*this, "i2cmem"), m_i2c_dir(0) { } -nes_lz93d50_24c01_device::nes_lz93d50_24c01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_lz93d50_24c01_device::nes_lz93d50_24c01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_lz93d50_device(mconfig, NES_LZ93D50_24C01, "NES Cart Bandai LZ93D50 + 24C01 PCB", tag, owner, clock, "nes_lz93d50_ep1", __FILE__), m_i2cmem(*this, "i2cmem"), m_i2c_dir(0) { } -nes_lz93d50_24c02_device::nes_lz93d50_24c02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_lz93d50_24c02_device::nes_lz93d50_24c02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_lz93d50_24c01_device(mconfig, NES_LZ93D50_24C02, "NES Cart Bandai LZ93D50 + 24C02 PCB", tag, owner, clock, "nes_lz93d50_ep2", __FILE__) { } -nes_fjump2_device::nes_fjump2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_fjump2_device::nes_fjump2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_lz93d50_device(mconfig, NES_FJUMP2, "NES Cart Bandai Famicom Jump II PCB", tag, owner, clock, "nes_fjump2", __FILE__) { } diff --git a/src/devices/bus/nes/bandai.h b/src/devices/bus/nes/bandai.h index 13ee41f4823..32d79444407 100644 --- a/src/devices/bus/nes/bandai.h +++ b/src/devices/bus/nes/bandai.h @@ -13,7 +13,7 @@ class nes_oekakids_device : public nes_nrom_device { public: // construction/destruction - nes_oekakids_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_oekakids_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -38,8 +38,8 @@ class nes_fcg_device : public nes_nrom_device { public: // construction/destruction - nes_fcg_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - nes_fcg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_fcg_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_fcg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -64,8 +64,8 @@ class nes_lz93d50_device : public nes_fcg_device { public: // construction/destruction - nes_lz93d50_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - nes_lz93d50_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_lz93d50_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_lz93d50_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_h) override { fcg_write(space, offset, data, mem_mask); } @@ -78,8 +78,8 @@ class nes_lz93d50_24c01_device : public nes_lz93d50_device { public: // construction/destruction - nes_lz93d50_24c01_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - nes_lz93d50_24c01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_lz93d50_24c01_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_lz93d50_24c01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -101,7 +101,7 @@ class nes_lz93d50_24c02_device : public nes_lz93d50_24c01_device { public: // construction/destruction - nes_lz93d50_24c02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_lz93d50_24c02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -114,7 +114,7 @@ class nes_fjump2_device : public nes_lz93d50_device { public: // construction/destruction - nes_fjump2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_fjump2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/benshieng.cpp b/src/devices/bus/nes/benshieng.cpp index cda8d66d94d..0f9aeacea17 100644 --- a/src/devices/bus/nes/benshieng.cpp +++ b/src/devices/bus/nes/benshieng.cpp @@ -31,7 +31,7 @@ const device_type NES_BENSHIENG = &device_creator<nes_benshieng_device>; -nes_benshieng_device::nes_benshieng_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_benshieng_device::nes_benshieng_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BENSHIENG, "NES Cart Benshieng PCB", tag, owner, clock, "nes_benshieng", __FILE__), m_dipsetting(0) { diff --git a/src/devices/bus/nes/benshieng.h b/src/devices/bus/nes/benshieng.h index c87b016c6a3..f68f94e6181 100644 --- a/src/devices/bus/nes/benshieng.h +++ b/src/devices/bus/nes/benshieng.h @@ -12,7 +12,7 @@ class nes_benshieng_device : public nes_nrom_device { public: // construction/destruction - nes_benshieng_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_benshieng_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/bootleg.cpp b/src/devices/bus/nes/bootleg.cpp index 5ae9729db14..aca7868fc02 100644 --- a/src/devices/bus/nes/bootleg.cpp +++ b/src/devices/bus/nes/bootleg.cpp @@ -60,102 +60,102 @@ const device_type NES_MMALEE = &device_creator<nes_mmalee_device>; const device_type NES_SHUIGUAN = &device_creator<nes_shuiguan_device>; -nes_ax5705_device::nes_ax5705_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_ax5705_device::nes_ax5705_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_AX5705, "NES Cart AX5705 PCB", tag, owner, clock, "nes_ax5705", __FILE__) { } -nes_sc127_device::nes_sc127_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_sc127_device::nes_sc127_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_SC127, "NES Cart SC-127 PCB", tag, owner, clock, "nes_sc127", __FILE__), m_irq_count(0), m_irq_enable(0) { } -nes_mbaby_device::nes_mbaby_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_mbaby_device::nes_mbaby_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_MARIOBABY, "NES Cart Mario Baby Bootleg PCB", tag, owner, clock, "nes_mbaby", __FILE__), m_latch(0), m_irq_enable(0), irq_timer(nullptr) { } -nes_asn_device::nes_asn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_asn_device::nes_asn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_ASN, "NES Cart Ai Senshi Nicol Bootleg PCB", tag, owner, clock, "nes_asn", __FILE__), m_latch(0) { } -nes_smb3p_device::nes_smb3p_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_smb3p_device::nes_smb3p_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_SMB3PIRATE, "NES Cart Super Mario Bros. 3 Pirate PCB", tag, owner, clock, "nes_smb3p", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) { } -nes_btl_dn_device::nes_btl_dn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_btl_dn_device::nes_btl_dn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BTL_DNINJA, "NES Cart DragonNinja Pirate PCB", tag, owner, clock, "nes_btl_dn", __FILE__), m_irq_count(0) { } -nes_whirl2706_device::nes_whirl2706_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_whirl2706_device::nes_whirl2706_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_WHIRLWIND_2706, "NES Cart Whirlwind 2706 PCB", tag, owner, clock, "nes_whirl2706", __FILE__), m_latch(0) { } -nes_smb2j_device::nes_smb2j_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_smb2j_device::nes_smb2j_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_SMB2J, "NES Cart Super Mario Bros. 2 Jpn PCB", tag, owner, clock, "nes_smb2j", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) { } -nes_smb2ja_device::nes_smb2ja_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_smb2ja_device::nes_smb2ja_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_SMB2JA, "NES Cart Super Mario Bros. 2 Jpn (Alt) PCB", tag, owner, clock, "nes_smb2ja", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) { } -nes_smb2jb_device::nes_smb2jb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_smb2jb_device::nes_smb2jb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_SMB2JB, "NES Cart Super Mario Bros. 2 Jpn (Alt 2) PCB", tag, owner, clock, "nes_smb2jb", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) { } -nes_09034a_device::nes_09034a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_09034a_device::nes_09034a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_09034A, "NES Cart 09-034A PCB", tag, owner, clock, "nes_09034a", __FILE__), m_reg(0) { } -nes_tobidase_device::nes_tobidase_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_tobidase_device::nes_tobidase_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_TOBIDASE, "NES Cart Tobidase Daisakusen Pirate PCB", tag, owner, clock, "nes_tobidase", __FILE__), m_latch(0) { } -nes_lh32_device::nes_lh32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_lh32_device::nes_lh32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_LH32, "NES Cart LH-32 Pirate PCB", tag, owner, clock, "nes_lh32", __FILE__), m_latch(0) { } -nes_lh10_device::nes_lh10_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_lh10_device::nes_lh10_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_LH10, "NES Cart LH-10 Pirate PCB", tag, owner, clock, "nes_lh10", __FILE__), m_latch(0) { } -nes_lh53_device::nes_lh53_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_lh53_device::nes_lh53_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_LH53, "NES Cart LH-53 Pirate PCB", tag, owner, clock, "nes_lh53", __FILE__), m_irq_count(0), m_irq_enable(0), m_reg(0), irq_timer(nullptr) { } -nes_2708_device::nes_2708_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_2708_device::nes_2708_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_2708, "NES Cart BTL-2708 Pirate PCB", tag, owner, clock, "nes_2708", __FILE__) { } -nes_ac08_device::nes_ac08_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_ac08_device::nes_ac08_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_AC08, "NES Cart AC08 Pirate PCB", tag, owner, clock, "nes_ac08", __FILE__), m_latch(0) { } -nes_unl_bb_device::nes_unl_bb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_unl_bb_device::nes_unl_bb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_UNL_BB, "NES Cart FDS+CHR Pirate PCB", tag, owner, clock, "nes_unl_bb", __FILE__) { } -nes_mmalee_device::nes_mmalee_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_mmalee_device::nes_mmalee_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_MMALEE, "NES Cart Super Mario Bros. Malee 2 Pirate PCB", tag, owner, clock, "nes_mmalee", __FILE__) { } -nes_shuiguan_device::nes_shuiguan_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_shuiguan_device::nes_shuiguan_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_SHUIGUAN, "NES Cart Shui Guan Pipe Pirate PCB", tag, owner, clock, "nes_shuiguan", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) { } diff --git a/src/devices/bus/nes/bootleg.h b/src/devices/bus/nes/bootleg.h index 013a6a22b70..9239647deb2 100644 --- a/src/devices/bus/nes/bootleg.h +++ b/src/devices/bus/nes/bootleg.h @@ -12,7 +12,7 @@ class nes_ax5705_device : public nes_nrom_device { public: // construction/destruction - nes_ax5705_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_ax5705_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -33,7 +33,7 @@ class nes_sc127_device : public nes_nrom_device { public: // construction/destruction - nes_sc127_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_sc127_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -54,7 +54,7 @@ class nes_mbaby_device : public nes_nrom_device { public: // construction/destruction - nes_mbaby_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_mbaby_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -80,7 +80,7 @@ class nes_asn_device : public nes_nrom_device { public: // construction/destruction - nes_asn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_asn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -100,7 +100,7 @@ class nes_smb3p_device : public nes_nrom_device { public: // construction/destruction - nes_smb3p_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_smb3p_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -124,7 +124,7 @@ class nes_btl_dn_device : public nes_nrom_device { public: // construction/destruction - nes_btl_dn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_btl_dn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -144,7 +144,7 @@ class nes_whirl2706_device : public nes_nrom_device { public: // construction/destruction - nes_whirl2706_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_whirl2706_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -164,7 +164,7 @@ class nes_smb2j_device : public nes_nrom_device { public: // construction/destruction - nes_smb2j_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_smb2j_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -192,7 +192,7 @@ class nes_smb2ja_device : public nes_nrom_device { public: // construction/destruction - nes_smb2ja_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_smb2ja_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -217,7 +217,7 @@ class nes_smb2jb_device : public nes_nrom_device { public: // construction/destruction - nes_smb2jb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_smb2jb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -243,7 +243,7 @@ class nes_09034a_device : public nes_nrom_device { public: // construction/destruction - nes_09034a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_09034a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -263,7 +263,7 @@ class nes_tobidase_device : public nes_nrom_device { public: // construction/destruction - nes_tobidase_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_tobidase_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -283,7 +283,7 @@ class nes_lh32_device : public nes_nrom_device { public: // construction/destruction - nes_lh32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_lh32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -305,7 +305,7 @@ class nes_lh10_device : public nes_nrom_device { public: // construction/destruction - nes_lh10_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_lh10_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -328,7 +328,7 @@ class nes_lh53_device : public nes_nrom_device { public: // construction/destruction - nes_lh53_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_lh53_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -357,7 +357,7 @@ class nes_2708_device : public nes_nrom_device { public: // construction/destruction - nes_2708_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_2708_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -378,7 +378,7 @@ class nes_ac08_device : public nes_nrom_device { public: // nes_ac08_device/destruction - nes_ac08_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_ac08_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -398,7 +398,7 @@ class nes_unl_bb_device : public nes_nrom_device { public: // construction/destruction - nes_unl_bb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_unl_bb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -417,7 +417,7 @@ class nes_mmalee_device : public nes_nrom_device { public: // construction/destruction - nes_mmalee_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_mmalee_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -433,7 +433,7 @@ class nes_shuiguan_device : public nes_nrom_device { public: // construction/destruction - nes_shuiguan_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_shuiguan_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/camerica.cpp b/src/devices/bus/nes/camerica.cpp index d1418c763f6..cdc55548dc9 100644 --- a/src/devices/bus/nes/camerica.cpp +++ b/src/devices/bus/nes/camerica.cpp @@ -46,17 +46,17 @@ const device_type NES_BF9096 = &device_creator<nes_bf9096_device>; const device_type NES_GOLDEN5 = &device_creator<nes_golden5_device>; -nes_bf9093_device::nes_bf9093_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bf9093_device::nes_bf9093_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BF9093, "NES Cart Camerica BF9093 PCB", tag, owner, clock, "nes_bf9093", __FILE__) { } -nes_bf9096_device::nes_bf9096_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bf9096_device::nes_bf9096_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BF9096, "NES Cart Camerica BF9096 PCB", tag, owner, clock, "nes_bf9096", __FILE__), m_bank_base(0), m_latch(0) { } -nes_golden5_device::nes_golden5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_golden5_device::nes_golden5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_GOLDEN5, "NES Cart Camerica Golden 5 PCB", tag, owner, clock, "nes_golden5", __FILE__), m_bank_base(0), m_latch(0) { } diff --git a/src/devices/bus/nes/camerica.h b/src/devices/bus/nes/camerica.h index f9adeacdca0..bf845dbd7be 100644 --- a/src/devices/bus/nes/camerica.h +++ b/src/devices/bus/nes/camerica.h @@ -12,7 +12,7 @@ class nes_bf9093_device : public nes_nrom_device { public: // construction/destruction - nes_bf9093_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bf9093_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -28,7 +28,7 @@ class nes_bf9096_device : public nes_nrom_device { public: // construction/destruction - nes_bf9096_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bf9096_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -48,7 +48,7 @@ class nes_golden5_device : public nes_nrom_device { public: // construction/destruction - nes_golden5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_golden5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/cne.cpp b/src/devices/bus/nes/cne.cpp index 76dc0a999f2..b4b838ccd7c 100644 --- a/src/devices/bus/nes/cne.cpp +++ b/src/devices/bus/nes/cne.cpp @@ -37,17 +37,17 @@ const device_type NES_CNE_FSB = &device_creator<nes_cne_fsb_device>; const device_type NES_CNE_SHLZ = &device_creator<nes_cne_shlz_device>; -nes_cne_decathl_device::nes_cne_decathl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_cne_decathl_device::nes_cne_decathl_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_CNE_DECATHL, "NES Cart C&E Decathlon PCB", tag, owner, clock, "nes_cne_deca", __FILE__) { } -nes_cne_fsb_device::nes_cne_fsb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_cne_fsb_device::nes_cne_fsb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_CNE_FSB, "NES Cart C&E Feng Shen Bang PCB", tag, owner, clock, "nes_cne_fsb", __FILE__) { } -nes_cne_shlz_device::nes_cne_shlz_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_cne_shlz_device::nes_cne_shlz_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_CNE_SHLZ, "NES Cart C&E Sheng Huo Lie Zhuan PCB", tag, owner, clock, "nes_cne_shlz", __FILE__) { } diff --git a/src/devices/bus/nes/cne.h b/src/devices/bus/nes/cne.h index f64445aeb01..bd42776cec3 100644 --- a/src/devices/bus/nes/cne.h +++ b/src/devices/bus/nes/cne.h @@ -12,7 +12,7 @@ class nes_cne_decathl_device : public nes_nrom_device { public: // construction/destruction - nes_cne_decathl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_cne_decathl_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -28,7 +28,7 @@ class nes_cne_fsb_device : public nes_nrom_device { public: // construction/destruction - nes_cne_fsb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_cne_fsb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -45,7 +45,7 @@ class nes_cne_shlz_device : public nes_nrom_device { public: // construction/destruction - nes_cne_shlz_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_cne_shlz_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/cony.cpp b/src/devices/bus/nes/cony.cpp index 2f4b29bfab3..3499eed1bf3 100644 --- a/src/devices/bus/nes/cony.cpp +++ b/src/devices/bus/nes/cony.cpp @@ -39,7 +39,7 @@ const device_type NES_CONY = &device_creator<nes_cony_device>; const device_type NES_YOKO = &device_creator<nes_yoko_device>; -nes_cony_device::nes_cony_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_cony_device::nes_cony_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_irq_count(0), m_irq_enable(0), @@ -50,12 +50,12 @@ nes_cony_device::nes_cony_device(const machine_config &mconfig, device_type type { } -nes_cony_device::nes_cony_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_cony_device::nes_cony_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_CONY, "NES Cart Cony PCB", tag, owner, clock, "nes_cony", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr), m_latch1(0), m_latch2(0), m_extra1(0) { } -nes_yoko_device::nes_yoko_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_yoko_device::nes_yoko_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_cony_device(mconfig, NES_YOKO, "NES Cart Yoko PCB", tag, owner, clock, "nes_yoko", __FILE__), m_extra2(0) { } diff --git a/src/devices/bus/nes/cony.h b/src/devices/bus/nes/cony.h index 625470da1e1..ec5200b7c86 100644 --- a/src/devices/bus/nes/cony.h +++ b/src/devices/bus/nes/cony.h @@ -12,8 +12,8 @@ class nes_cony_device : public nes_nrom_device { public: // construction/destruction - nes_cony_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - nes_cony_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_cony_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_cony_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -47,7 +47,7 @@ class nes_yoko_device : public nes_cony_device { public: // construction/destruction - nes_yoko_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_yoko_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/datach.cpp b/src/devices/bus/nes/datach.cpp index cdb41e16830..59bd8381d88 100644 --- a/src/devices/bus/nes/datach.cpp +++ b/src/devices/bus/nes/datach.cpp @@ -67,7 +67,7 @@ READ8_MEMBER(datach_cart_interface::read) const device_type NES_DATACH_SLOT = &device_creator<nes_datach_slot_device>; -nes_datach_slot_device::nes_datach_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nes_datach_slot_device::nes_datach_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_DATACH_SLOT, "NES Datach Cartridge Slot", tag, owner, clock, "nes_datach_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), m_cart(nullptr) @@ -168,19 +168,19 @@ ROM_END const device_type NES_DATACH_ROM = &device_creator<nes_datach_rom_device>; const device_type NES_DATACH_24C01 = &device_creator<nes_datach_24c01_device>; -nes_datach_rom_device::nes_datach_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_datach_rom_device::nes_datach_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), datach_cart_interface( mconfig, *this ) { } -nes_datach_rom_device::nes_datach_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_datach_rom_device::nes_datach_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_DATACH_ROM, "NES Datach ROM", tag, owner, clock, "nes_datach_rom", __FILE__), datach_cart_interface( mconfig, *this ) { } -nes_datach_24c01_device::nes_datach_24c01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_datach_24c01_device::nes_datach_24c01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_datach_rom_device(mconfig, NES_DATACH_24C01, "NES Datach + 24C01 PCB", tag, owner, clock, "nes_datach_ep1", __FILE__) { } @@ -227,7 +227,7 @@ machine_config_constructor nes_datach_24c01_device::device_mconfig_additions() c const device_type NES_DATACH = &device_creator<nes_datach_device>; -nes_datach_device::nes_datach_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_datach_device::nes_datach_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_lz93d50_device(mconfig, NES_DATACH, "NES Cart Bandai Datach PCB", tag, owner, clock, "nes_datach", __FILE__), m_datach_latch(0), m_i2cmem(*this, "i2cmem"), m_reader(*this, "datach"), diff --git a/src/devices/bus/nes/datach.h b/src/devices/bus/nes/datach.h index bda9edfe50e..662e4ff9c70 100644 --- a/src/devices/bus/nes/datach.h +++ b/src/devices/bus/nes/datach.h @@ -45,7 +45,7 @@ class nes_datach_slot_device : public device_t, { public: // construction/destruction - nes_datach_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_datach_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~nes_datach_slot_device(); // device-level overrides @@ -97,8 +97,8 @@ class nes_datach_rom_device : public device_t, { public: // construction/destruction - nes_datach_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - nes_datach_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_datach_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_datach_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -116,7 +116,7 @@ class nes_datach_24c01_device : public nes_datach_rom_device { public: // construction/destruction - nes_datach_24c01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_datach_24c01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -139,7 +139,7 @@ class nes_datach_device : public nes_lz93d50_device { public: // construction/destruction - nes_datach_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_datach_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/discrete.cpp b/src/devices/bus/nes/discrete.cpp index e0109a84d94..fe4cc4a32e3 100644 --- a/src/devices/bus/nes/discrete.cpp +++ b/src/devices/bus/nes/discrete.cpp @@ -41,22 +41,22 @@ const device_type NES_74X377 = &device_creator<nes_74x377_device>; const device_type NES_74X161X138 = &device_creator<nes_74x161x138_device>; -nes_74x161x161x32_device::nes_74x161x161x32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_74x161x161x32_device::nes_74x161x161x32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_74X161X161X32, "NES Cart Discrete Logic (74*161/161/32) PCB", tag, owner, clock, "nes_74x161", __FILE__) { } -nes_74x139x74_device::nes_74x139x74_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_74x139x74_device::nes_74x139x74_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_74X139X74, "NES Cart Discrete Logic (74*139/74) PCB", tag, owner, clock, "nes_74x139", __FILE__) { } -nes_74x377_device::nes_74x377_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_74x377_device::nes_74x377_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_74X377, "NES Cart Discrete Logic (74*377) PCB", tag, owner, clock, "nes_74x377", __FILE__) { } -nes_74x161x138_device::nes_74x161x138_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_74x161x138_device::nes_74x161x138_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_74X161X138, "NES Cart Discrete Logic (74*161/138) PCB", tag, owner, clock, "nes_bitcorp_dis", __FILE__) { } diff --git a/src/devices/bus/nes/discrete.h b/src/devices/bus/nes/discrete.h index 94abf418a95..5c73c628d73 100644 --- a/src/devices/bus/nes/discrete.h +++ b/src/devices/bus/nes/discrete.h @@ -12,7 +12,7 @@ class nes_74x161x161x32_device : public nes_nrom_device { public: // construction/destruction - nes_74x161x161x32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_74x161x161x32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -28,7 +28,7 @@ class nes_74x139x74_device : public nes_nrom_device { public: // construction/destruction - nes_74x139x74_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_74x139x74_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -44,7 +44,7 @@ class nes_74x377_device : public nes_nrom_device { public: // construction/destruction - nes_74x377_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_74x377_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -60,7 +60,7 @@ class nes_74x161x138_device : public nes_nrom_device { public: // construction/destruction - nes_74x161x138_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_74x161x138_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/disksys.cpp b/src/devices/bus/nes/disksys.cpp index 38b24438408..43a06d9432a 100644 --- a/src/devices/bus/nes/disksys.cpp +++ b/src/devices/bus/nes/disksys.cpp @@ -103,7 +103,7 @@ void nes_disksys_device::unload_proc(device_image_interface &image) const device_type NES_DISKSYS = &device_creator<nes_disksys_device>; -nes_disksys_device::nes_disksys_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_disksys_device::nes_disksys_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_DISKSYS, "FC RAM Expansion + Disk System PCB", tag, owner, clock, "fc_disksys", __FILE__), m_2c33_rom(nullptr), m_fds_data(nullptr), m_disk(*this, FLOPPY_0), irq_timer(nullptr), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), m_irq_transfer(0), m_fds_motor_on(0), m_fds_door_closed(0), m_fds_current_side(0), m_fds_head_position(0), m_fds_status0(0), m_read_mode(0), m_drive_ready(0), diff --git a/src/devices/bus/nes/disksys.h b/src/devices/bus/nes/disksys.h index 7dbefa37ee4..b04eea3e88f 100644 --- a/src/devices/bus/nes/disksys.h +++ b/src/devices/bus/nes/disksys.h @@ -13,7 +13,7 @@ class nes_disksys_device : public nes_nrom_device { public: // construction/destruction - nes_disksys_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_disksys_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/event.cpp b/src/devices/bus/nes/event.cpp index e8cc13e44bc..39bb5d05154 100644 --- a/src/devices/bus/nes/event.cpp +++ b/src/devices/bus/nes/event.cpp @@ -35,7 +35,7 @@ const device_type NES_EVENT = &device_creator<nes_event_device>; -nes_event_device::nes_event_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_event_device::nes_event_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_sxrom_device(mconfig, NES_EVENT, "NES Cart Event PCB", tag, owner, clock, "nes_event", __FILE__), m_dsw(*this, "DIPSW"), m_nwc_init(0), diff --git a/src/devices/bus/nes/event.h b/src/devices/bus/nes/event.h index 7da34bc58c2..90b4c2b6ff6 100644 --- a/src/devices/bus/nes/event.h +++ b/src/devices/bus/nes/event.h @@ -12,7 +12,7 @@ class nes_event_device : public nes_sxrom_device { public: // construction/destruction - nes_event_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_event_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/ggenie.cpp b/src/devices/bus/nes/ggenie.cpp index 148b9b568ac..8d241f5414c 100644 --- a/src/devices/bus/nes/ggenie.cpp +++ b/src/devices/bus/nes/ggenie.cpp @@ -34,7 +34,7 @@ const device_type NES_GGENIE = &device_creator<nes_ggenie_device>; -nes_ggenie_device::nes_ggenie_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_ggenie_device::nes_ggenie_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_GGENIE, "NES Cart Game Genie PCB", tag, owner, clock, "nes_ggenie", __FILE__), m_ggslot(*this, "gg_slot"), m_gg_bypass(0) diff --git a/src/devices/bus/nes/ggenie.h b/src/devices/bus/nes/ggenie.h index f0b55ee3753..40fb9bf9005 100644 --- a/src/devices/bus/nes/ggenie.h +++ b/src/devices/bus/nes/ggenie.h @@ -12,7 +12,7 @@ class nes_ggenie_device : public nes_nrom_device { public: // construction/destruction - nes_ggenie_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_ggenie_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/henggedianzi.cpp b/src/devices/bus/nes/henggedianzi.cpp index 8a212e17bf3..51d13c86dcb 100644 --- a/src/devices/bus/nes/henggedianzi.cpp +++ b/src/devices/bus/nes/henggedianzi.cpp @@ -43,17 +43,17 @@ const device_type NES_HENGG_XHZS = &device_creator<nes_hengg_xhzs_device>; const device_type NES_HENGG_SHJY3 = &device_creator<nes_hengg_shjy3_device>; -nes_hengg_srich_device::nes_hengg_srich_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_hengg_srich_device::nes_hengg_srich_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_HENGG_SRICH, "NES Cart Henggedianzi Super Rich PCB", tag, owner, clock, "nes_hengg_srich", __FILE__) { } -nes_hengg_xhzs_device::nes_hengg_xhzs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_hengg_xhzs_device::nes_hengg_xhzs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_HENGG_XHZS, "NES Cart Henggedianzi Xing He Zhan Shi PCB", tag, owner, clock, "nes_hengg_xhzs", __FILE__) { } -nes_hengg_shjy3_device::nes_hengg_shjy3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_hengg_shjy3_device::nes_hengg_shjy3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_HENGG_SHJY3, "NES Cart Henggedianzi Shen Hua Jian Yun III PCB", tag, owner, clock, "nes_hengg_shjy3", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), m_chr_mode(0) { } diff --git a/src/devices/bus/nes/henggedianzi.h b/src/devices/bus/nes/henggedianzi.h index 9f1344bfab9..1eeae6b1ffa 100644 --- a/src/devices/bus/nes/henggedianzi.h +++ b/src/devices/bus/nes/henggedianzi.h @@ -12,7 +12,7 @@ class nes_hengg_srich_device : public nes_nrom_device { public: // construction/destruction - nes_hengg_srich_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_hengg_srich_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -28,7 +28,7 @@ class nes_hengg_xhzs_device : public nes_nrom_device { public: // construction/destruction - nes_hengg_xhzs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_hengg_xhzs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -45,7 +45,7 @@ class nes_hengg_shjy3_device : public nes_nrom_device { public: // construction/destruction - nes_hengg_shjy3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_hengg_shjy3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/hes.cpp b/src/devices/bus/nes/hes.cpp index ddfda0590d8..10ba7493927 100644 --- a/src/devices/bus/nes/hes.cpp +++ b/src/devices/bus/nes/hes.cpp @@ -33,7 +33,7 @@ const device_type NES_HES = &device_creator<nes_hes_device>; -nes_hes_device::nes_hes_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_hes_device::nes_hes_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_HES, "NES Cart HES PCB", tag, owner, clock, "nes_hes", __FILE__) { } diff --git a/src/devices/bus/nes/hes.h b/src/devices/bus/nes/hes.h index d6e59f90bae..c3e99bba903 100644 --- a/src/devices/bus/nes/hes.h +++ b/src/devices/bus/nes/hes.h @@ -12,7 +12,7 @@ class nes_hes_device : public nes_nrom_device { public: // construction/destruction - nes_hes_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_hes_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/hosenkan.cpp b/src/devices/bus/nes/hosenkan.cpp index 0525534cbb9..5d96df4f2c5 100644 --- a/src/devices/bus/nes/hosenkan.cpp +++ b/src/devices/bus/nes/hosenkan.cpp @@ -32,7 +32,7 @@ const device_type NES_HOSENKAN = &device_creator<nes_hosenkan_device>; -nes_hosenkan_device::nes_hosenkan_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_hosenkan_device::nes_hosenkan_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_HOSENKAN, "NES Cart HOSENKAN PCB", tag, owner, clock, "nes_hosenkan", __FILE__), m_irq_count(0), m_irq_count_latch(0), diff --git a/src/devices/bus/nes/hosenkan.h b/src/devices/bus/nes/hosenkan.h index ca3840bcbb9..ae15efc98f2 100644 --- a/src/devices/bus/nes/hosenkan.h +++ b/src/devices/bus/nes/hosenkan.h @@ -12,7 +12,7 @@ class nes_hosenkan_device : public nes_nrom_device { public: // construction/destruction - nes_hosenkan_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_hosenkan_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/irem.cpp b/src/devices/bus/nes/irem.cpp index 5a8a1052849..e1bfe8a0bf9 100644 --- a/src/devices/bus/nes/irem.cpp +++ b/src/devices/bus/nes/irem.cpp @@ -42,27 +42,27 @@ const device_type NES_G101 = &device_creator<nes_g101_device>; const device_type NES_H3001 = &device_creator<nes_h3001_device>; -nes_lrog017_device::nes_lrog017_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_lrog017_device::nes_lrog017_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_LROG017, "NES Cart Irem Discrete 74*161/161/21/138 PCB", tag, owner, clock, "nes_lrog017", __FILE__) { } -nes_holydivr_device::nes_holydivr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_holydivr_device::nes_holydivr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_HOLYDIVR, "NES Cart Irem Holy Diver PCB", tag, owner, clock, "nes_holydivr", __FILE__) { } -nes_tam_s1_device::nes_tam_s1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_tam_s1_device::nes_tam_s1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_TAM_S1, "NES Cart Irem TAM-S1 PCB", tag, owner, clock, "nes_tam_s1", __FILE__) { } -nes_g101_device::nes_g101_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_g101_device::nes_g101_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_G101, "NES Cart Irem G-101 PCB", tag, owner, clock, "nes_g101", __FILE__), m_latch(0) { } -nes_h3001_device::nes_h3001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_h3001_device::nes_h3001_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_H3001, "NES Cart Irem H-3001 PCB", tag, owner, clock, "nes_h3001", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), irq_timer(nullptr) { } diff --git a/src/devices/bus/nes/irem.h b/src/devices/bus/nes/irem.h index 0e1e55803f7..8659faf3470 100644 --- a/src/devices/bus/nes/irem.h +++ b/src/devices/bus/nes/irem.h @@ -12,7 +12,7 @@ class nes_lrog017_device : public nes_nrom_device { public: // construction/destruction - nes_lrog017_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_lrog017_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -28,7 +28,7 @@ class nes_holydivr_device : public nes_nrom_device { public: // construction/destruction - nes_holydivr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_holydivr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -44,7 +44,7 @@ class nes_tam_s1_device : public nes_nrom_device { public: // construction/destruction - nes_tam_s1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_tam_s1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -60,7 +60,7 @@ class nes_g101_device : public nes_nrom_device { public: // construction/destruction - nes_g101_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_g101_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -79,7 +79,7 @@ class nes_h3001_device : public nes_nrom_device { public: // construction/destruction - nes_h3001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_h3001_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/jaleco.cpp b/src/devices/bus/nes/jaleco.cpp index 13be40eac4c..c0aca2d3054 100644 --- a/src/devices/bus/nes/jaleco.cpp +++ b/src/devices/bus/nes/jaleco.cpp @@ -51,88 +51,88 @@ const device_type NES_JF29 = &device_creator<nes_jf29_device>; const device_type NES_JF33 = &device_creator<nes_jf33_device>; -nes_jf11_device::nes_jf11_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_jf11_device::nes_jf11_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_JF11, "NES Cart Jaleco JF-11 PCB", tag, owner, clock, "nes_jf11", __FILE__) { } -nes_jf13_device::nes_jf13_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_jf13_device::nes_jf13_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_JF13, "NES Cart Jaleco JF-13 PCB", tag, owner, clock, "nes_jf13", __FILE__), m_samples(*this, "samples") { } -nes_jf16_device::nes_jf16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_jf16_device::nes_jf16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_JF16, "NES Cart Jaleco JF-16 PCB", tag, owner, clock, "nes_jf16", __FILE__) { } -nes_jf17_device::nes_jf17_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_jf17_device::nes_jf17_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_latch(0) { } -nes_jf17_device::nes_jf17_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_jf17_device::nes_jf17_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_JF17, "NES Cart Jaleco JF-17 PCB", tag, owner, clock, "nes_jf17", __FILE__), m_latch(0) { } -nes_jf17_adpcm_device::nes_jf17_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_jf17_adpcm_device::nes_jf17_adpcm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_jf17_device(mconfig, NES_JF17_ADPCM, "NES Cart Jaleco JF-17 + ADPCM (Moero!! Pro Tennis) PCB", tag, owner, clock, "nes_jf17_pcm", __FILE__), m_samples(*this, "samples") { } -nes_jf19_device::nes_jf19_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_jf19_device::nes_jf19_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source) { } -nes_jf19_device::nes_jf19_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_jf19_device::nes_jf19_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_JF19, "NES Cart Jaleco JF-19 (Moero!! Pro Soccer) PCB", tag, owner, clock, "nes_jf19", __FILE__) { } -nes_jf19_adpcm_device::nes_jf19_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_jf19_adpcm_device::nes_jf19_adpcm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_jf19_device(mconfig, NES_JF19_ADPCM, "NES Cart Jaleco JF-19 + ADPCM (Moero!! Pro Yakyuu 88) PCB", tag, owner, clock, "nes_jf19_pcm", __FILE__), m_samples(*this, "samples") { } -nes_ss88006_device::nes_ss88006_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_ss88006_device::nes_ss88006_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_irq_count(0), m_irq_count_latch(0), m_irq_mode(0), m_irq_enable(0), irq_timer(nullptr), m_latch(0) { } -nes_ss88006_device::nes_ss88006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_ss88006_device::nes_ss88006_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_SS88006, "NES Cart Jaleco SS88006 PCB", tag, owner, clock, "nes_ss88006", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_mode(0), m_irq_enable(0), irq_timer(nullptr), m_latch(0) { } -nes_ss88006_adpcm_device::nes_ss88006_adpcm_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_ss88006_adpcm_device::nes_ss88006_adpcm_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : nes_ss88006_device(mconfig, type, name, tag, owner, clock, shortname, source) { } -nes_jf23_device::nes_jf23_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_jf23_device::nes_jf23_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_ss88006_adpcm_device(mconfig, NES_JF23, "NES Cart Jaleco Shin Moero Pro Yakyuu PCB", tag, owner, clock, "nes_jf23", __FILE__), m_samples(*this, "samples") { } -nes_jf24_device::nes_jf24_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_jf24_device::nes_jf24_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_ss88006_adpcm_device(mconfig, NES_JF24, "NES Cart Jaleco Terao no Dosukoi Oozumou PCB", tag, owner, clock, "nes_jf24", __FILE__), m_samples(*this, "samples") { } -nes_jf29_device::nes_jf29_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_jf29_device::nes_jf29_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_ss88006_adpcm_device(mconfig, NES_JF29, "NES Cart Jaleco Moe Pro! '90 PCB", tag, owner, clock, "nes_jf29", __FILE__), m_samples(*this, "samples") { } -nes_jf33_device::nes_jf33_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_jf33_device::nes_jf33_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_ss88006_adpcm_device(mconfig, NES_JF33, "NES Cart Jaleco Moe Pro! Saikyou-hen PCB", tag, owner, clock, "nes_jf33", __FILE__), m_samples(*this, "samples") { diff --git a/src/devices/bus/nes/jaleco.h b/src/devices/bus/nes/jaleco.h index 7d8536b71ff..b5562c69b32 100644 --- a/src/devices/bus/nes/jaleco.h +++ b/src/devices/bus/nes/jaleco.h @@ -13,7 +13,7 @@ class nes_jf11_device : public nes_nrom_device { public: // construction/destruction - nes_jf11_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_jf11_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -29,7 +29,7 @@ class nes_jf13_device : public nes_nrom_device { public: // construction/destruction - nes_jf13_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_jf13_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -49,7 +49,7 @@ class nes_jf16_device : public nes_nrom_device { public: // construction/destruction - nes_jf16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_jf16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -65,8 +65,8 @@ class nes_jf17_device : public nes_nrom_device { public: // construction/destruction - nes_jf17_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - nes_jf17_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_jf17_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_jf17_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -85,7 +85,7 @@ class nes_jf17_adpcm_device : public nes_jf17_device { public: // construction/destruction - nes_jf17_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_jf17_adpcm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; virtual DECLARE_WRITE8_MEMBER(write_h) override; @@ -101,8 +101,8 @@ class nes_jf19_device : public nes_nrom_device { public: // construction/destruction - nes_jf19_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - nes_jf19_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_jf19_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_jf19_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -118,7 +118,7 @@ class nes_jf19_adpcm_device : public nes_jf19_device { public: // construction/destruction - nes_jf19_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_jf19_adpcm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; virtual DECLARE_WRITE8_MEMBER(write_h) override; @@ -134,8 +134,8 @@ class nes_ss88006_device : public nes_nrom_device { public: // construction/destruction - nes_ss88006_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - nes_ss88006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_ss88006_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_ss88006_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -166,7 +166,7 @@ class nes_ss88006_adpcm_device : public nes_ss88006_device { public: // construction/destruction - nes_ss88006_adpcm_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_ss88006_adpcm_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides void ss88006_adpcm_write(address_space &space, offs_t offset, UINT8 data, samples_device *dev); @@ -179,7 +179,7 @@ class nes_jf23_device : public nes_ss88006_adpcm_device { public: // construction/destruction - nes_jf23_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_jf23_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; @@ -195,7 +195,7 @@ class nes_jf24_device : public nes_ss88006_adpcm_device { public: // construction/destruction - nes_jf24_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_jf24_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; @@ -211,7 +211,7 @@ class nes_jf29_device : public nes_ss88006_adpcm_device { public: // construction/destruction - nes_jf29_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_jf29_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; @@ -227,7 +227,7 @@ class nes_jf33_device : public nes_ss88006_adpcm_device { public: // construction/destruction - nes_jf33_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_jf33_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/nes/jy.cpp b/src/devices/bus/nes/jy.cpp index 08763d250e9..970fa0e1bb7 100644 --- a/src/devices/bus/nes/jy.cpp +++ b/src/devices/bus/nes/jy.cpp @@ -42,30 +42,30 @@ const device_type NES_JY_TYPEB = &device_creator<nes_jy_typeb_device>; const device_type NES_JY_TYPEC = &device_creator<nes_jy_typec_device>; -nes_jy_typea_device::nes_jy_typea_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_jy_typea_device::nes_jy_typea_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_latch(0), m_extra_chr_bank(0), m_extra_chr_mask(0), m_bank_6000(0), m_irq_mode(0), m_irq_count(0), m_irq_prescale(0), m_irq_prescale_mask(0), m_irq_flip(0), m_irq_enable(0), m_irq_up(0), m_irq_down(0), irq_timer(nullptr) { } -nes_jy_typea_device::nes_jy_typea_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_jy_typea_device::nes_jy_typea_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_JY_TYPEA, "NES Cart JY Company Type A PCB", tag, owner, clock, "nes_jya", __FILE__), m_latch(0), m_extra_chr_bank(0), m_extra_chr_mask(0), m_bank_6000(0), m_irq_mode(0), m_irq_count(0), m_irq_prescale(0), m_irq_prescale_mask(0), m_irq_flip(0), m_irq_enable(0), m_irq_up(0), m_irq_down(0), irq_timer(nullptr) { } -nes_jy_typeb_device::nes_jy_typeb_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_jy_typeb_device::nes_jy_typeb_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : nes_jy_typea_device(mconfig, type, name, tag, owner, clock, shortname, source) { } -nes_jy_typeb_device::nes_jy_typeb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_jy_typeb_device::nes_jy_typeb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_jy_typea_device(mconfig, NES_JY_TYPEB, "NES Cart JY Company Type B PCB", tag, owner, clock, "nes_jyb", __FILE__) { } -nes_jy_typec_device::nes_jy_typec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_jy_typec_device::nes_jy_typec_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_jy_typeb_device(mconfig, NES_JY_TYPEC, "NES Cart JY Company Type C PCB", tag, owner, clock, "nes_jyc", __FILE__) { } diff --git a/src/devices/bus/nes/jy.h b/src/devices/bus/nes/jy.h index 1eca466d681..e2a57b10b25 100644 --- a/src/devices/bus/nes/jy.h +++ b/src/devices/bus/nes/jy.h @@ -12,8 +12,8 @@ class nes_jy_typea_device : public nes_nrom_device { public: // construction/destruction - nes_jy_typea_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - nes_jy_typea_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_jy_typea_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_jy_typea_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -69,8 +69,8 @@ class nes_jy_typeb_device : public nes_jy_typea_device { public: // construction/destruction - nes_jy_typeb_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - nes_jy_typeb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_jy_typeb_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_jy_typeb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: void update_mirror_typeb(); @@ -83,7 +83,7 @@ class nes_jy_typec_device : public nes_jy_typeb_device { public: // construction/destruction - nes_jy_typec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_jy_typec_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual DECLARE_READ8_MEMBER(chr_r) override; diff --git a/src/devices/bus/nes/kaiser.cpp b/src/devices/bus/nes/kaiser.cpp index 911099d71b4..c4ae6b11496 100644 --- a/src/devices/bus/nes/kaiser.cpp +++ b/src/devices/bus/nes/kaiser.cpp @@ -57,47 +57,47 @@ const device_type NES_KS7013B = &device_creator<nes_ks7013b_device>; const device_type NES_KS7031 = &device_creator<nes_ks7031_device>; -nes_ks7058_device::nes_ks7058_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_ks7058_device::nes_ks7058_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_KS7058, "NES Cart Kaiser KS-7058 PCB", tag, owner, clock, "nes_ks7058", __FILE__) { } -nes_ks7022_device::nes_ks7022_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_ks7022_device::nes_ks7022_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_KS7022, "NES Cart Kaiser KS-7022 PCB", tag, owner, clock, "nes_ks7022", __FILE__), m_latch(0) { } -nes_ks7032_device::nes_ks7032_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_ks7032_device::nes_ks7032_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_latch(0), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) { } -nes_ks7032_device::nes_ks7032_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_ks7032_device::nes_ks7032_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_KS7032, "NES Cart Kaiser KS-7032 PCB", tag, owner, clock, "nes_ks7032", __FILE__), m_latch(0), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) { } -nes_ks202_device::nes_ks202_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_ks202_device::nes_ks202_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_ks7032_device(mconfig, NES_KS202, "NES Cart Kaiser KS-202 PCB", tag, owner, clock, "nes_ks202", __FILE__) { } -nes_ks7017_device::nes_ks7017_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_ks7017_device::nes_ks7017_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_KS7017, "NES Cart Kaiser KS-7017 PCB", tag, owner, clock, "nes_ks7017", __FILE__), m_latch(0), m_irq_count(0), m_irq_status(0), m_irq_enable(0), irq_timer(nullptr) { } -nes_ks7012_device::nes_ks7012_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_ks7012_device::nes_ks7012_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_KS7012, "NES Cart Kaiser KS-7012 PCB", tag, owner, clock, "nes_ks7012", __FILE__) { } -nes_ks7013b_device::nes_ks7013b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_ks7013b_device::nes_ks7013b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_KS7013B, "NES Cart Kaiser KS-7013B PCB", tag, owner, clock, "nes_ks7013b", __FILE__) { } -nes_ks7031_device::nes_ks7031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_ks7031_device::nes_ks7031_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_KS7031, "NES Cart Kaiser KS-7031 PCB", tag, owner, clock, "nes_ks7031", __FILE__) { } diff --git a/src/devices/bus/nes/kaiser.h b/src/devices/bus/nes/kaiser.h index c38731216a9..24ead7da934 100644 --- a/src/devices/bus/nes/kaiser.h +++ b/src/devices/bus/nes/kaiser.h @@ -12,7 +12,7 @@ class nes_ks7058_device : public nes_nrom_device { public: // construction/destruction - nes_ks7058_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_ks7058_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -28,7 +28,7 @@ class nes_ks7022_device : public nes_nrom_device { public: // construction/destruction - nes_ks7022_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_ks7022_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -48,8 +48,8 @@ class nes_ks7032_device : public nes_nrom_device { public: // construction/destruction - nes_ks7032_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - nes_ks7032_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_ks7032_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_ks7032_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -80,7 +80,7 @@ class nes_ks202_device : public nes_ks7032_device { public: // construction/destruction - nes_ks202_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_ks202_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual DECLARE_READ8_MEMBER(read_m) override; @@ -94,7 +94,7 @@ class nes_ks7017_device : public nes_nrom_device { public: // construction/destruction - nes_ks7017_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_ks7017_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -123,7 +123,7 @@ class nes_ks7012_device : public nes_nrom_device { public: // construction/destruction - nes_ks7012_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_ks7012_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -138,7 +138,7 @@ class nes_ks7013b_device : public nes_nrom_device { public: // construction/destruction - nes_ks7013b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_ks7013b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -155,7 +155,7 @@ class nes_ks7031_device : public nes_nrom_device { public: // construction/destruction - nes_ks7031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_ks7031_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/karastudio.cpp b/src/devices/bus/nes/karastudio.cpp index d9d0e26a2cf..6ff18f4b34e 100644 --- a/src/devices/bus/nes/karastudio.cpp +++ b/src/devices/bus/nes/karastudio.cpp @@ -71,7 +71,7 @@ READ8_MEMBER(kstudio_cart_interface::read) const device_type NES_KSEXPANSION_SLOT = &device_creator<nes_kstudio_slot_device>; -nes_kstudio_slot_device::nes_kstudio_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nes_kstudio_slot_device::nes_kstudio_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_KSEXPANSION_SLOT, "NES Karaoke Studio Expansion Slot", tag, owner, clock, "nes_ks_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), m_cart(nullptr) @@ -150,7 +150,7 @@ ROM_END const device_type NES_KSEXPANSION_ROM = &device_creator<nes_kstudio_rom_device>; -nes_kstudio_rom_device::nes_kstudio_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_kstudio_rom_device::nes_kstudio_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_KSEXPANSION_ROM, "NES Karaoke Studio Expansion ROM", tag, owner, clock, "nes_ks_rom", __FILE__), kstudio_cart_interface( mconfig, *this ) { @@ -187,7 +187,7 @@ UINT8 *nes_kstudio_rom_device::get_cart_base() const device_type NES_KARAOKESTUDIO = &device_creator<nes_karaokestudio_device>; -nes_karaokestudio_device::nes_karaokestudio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_karaokestudio_device::nes_karaokestudio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_KARAOKESTUDIO, "NES Cart Bandai Karaoke Studio PCB", tag, owner, clock, "nes_karaoke", __FILE__), m_exp_active(0), m_subslot(*this, "exp_slot"), m_mic_ipt(*this, "MIC") diff --git a/src/devices/bus/nes/karastudio.h b/src/devices/bus/nes/karastudio.h index 3a2f0c6d919..ca89d9f4dad 100644 --- a/src/devices/bus/nes/karastudio.h +++ b/src/devices/bus/nes/karastudio.h @@ -42,7 +42,7 @@ class nes_kstudio_slot_device : public device_t, { public: // construction/destruction - nes_kstudio_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_kstudio_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~nes_kstudio_slot_device(); // device-level overrides @@ -94,7 +94,7 @@ class nes_kstudio_rom_device : public device_t, { public: // construction/destruction - nes_kstudio_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_kstudio_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -122,7 +122,7 @@ class nes_karaokestudio_device : public nes_nrom_device { public: // construction/destruction - nes_karaokestudio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_karaokestudio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/konami.cpp b/src/devices/bus/nes/konami.cpp index ded2e4b0980..e0935bb89fd 100644 --- a/src/devices/bus/nes/konami.cpp +++ b/src/devices/bus/nes/konami.cpp @@ -51,38 +51,38 @@ const device_type NES_VRC6 = &device_creator<nes_konami_vrc6_device>; const device_type NES_VRC7 = &device_creator<nes_konami_vrc7_device>; -nes_konami_vrc1_device::nes_konami_vrc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_konami_vrc1_device::nes_konami_vrc1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_VRC1, "NES Cart Konami VRC-1 PCB", tag, owner, clock, "nes_vrc1", __FILE__) { } -nes_konami_vrc2_device::nes_konami_vrc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_konami_vrc2_device::nes_konami_vrc2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_VRC2, "NES Cart Konami VRC-2 PCB", tag, owner, clock, "nes_vrc2", __FILE__), m_latch(0) { } -nes_konami_vrc3_device::nes_konami_vrc3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_konami_vrc3_device::nes_konami_vrc3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_VRC3, "NES Cart Konami VRC-3 PCB", tag, owner, clock, "nes_vrc3", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), m_irq_enable_latch(0), m_irq_mode(0), irq_timer(nullptr) { } -nes_konami_vrc4_device::nes_konami_vrc4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_konami_vrc4_device::nes_konami_vrc4_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_latch(0), m_mmc_prg_bank(0), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), m_irq_enable_latch(0), m_irq_mode(0), m_irq_prescale(0), irq_timer(nullptr) { } -nes_konami_vrc4_device::nes_konami_vrc4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_konami_vrc4_device::nes_konami_vrc4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_VRC4, "NES Cart Konami VRC-4 PCB", tag, owner, clock, "nes_vrc4", __FILE__), m_latch(0), m_mmc_prg_bank(0), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), m_irq_enable_latch(0), m_irq_mode(0), m_irq_prescale(0), irq_timer(nullptr) { } -nes_konami_vrc6_device::nes_konami_vrc6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_konami_vrc6_device::nes_konami_vrc6_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_konami_vrc4_device(mconfig, NES_VRC6, "NES Cart Konami VRC-6 PCB", tag, owner, clock, "nes_vrc6", __FILE__), m_vrc6snd(*this, "vrc6snd") { } -nes_konami_vrc7_device::nes_konami_vrc7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_konami_vrc7_device::nes_konami_vrc7_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_konami_vrc4_device(mconfig, NES_VRC7, "NES Cart Konami VRC-7 PCB", tag, owner, clock, "nes_vrc7", __FILE__), m_ym2413(*this, "ym") { diff --git a/src/devices/bus/nes/konami.h b/src/devices/bus/nes/konami.h index ace9c080fef..c36fdb1b973 100644 --- a/src/devices/bus/nes/konami.h +++ b/src/devices/bus/nes/konami.h @@ -14,7 +14,7 @@ class nes_konami_vrc1_device : public nes_nrom_device { public: // construction/destruction - nes_konami_vrc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_konami_vrc1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -33,7 +33,7 @@ class nes_konami_vrc2_device : public nes_nrom_device { public: // construction/destruction - nes_konami_vrc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_konami_vrc2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -55,7 +55,7 @@ class nes_konami_vrc3_device : public nes_nrom_device { public: // construction/destruction - nes_konami_vrc3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_konami_vrc3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -80,8 +80,8 @@ class nes_konami_vrc4_device : public nes_nrom_device { public: // construction/destruction - nes_konami_vrc4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - nes_konami_vrc4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_konami_vrc4_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_konami_vrc4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -112,7 +112,7 @@ class nes_konami_vrc6_device : public nes_konami_vrc4_device { public: // construction/destruction - nes_konami_vrc6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_konami_vrc6_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -129,7 +129,7 @@ class nes_konami_vrc7_device : public nes_konami_vrc4_device { public: // construction/destruction - nes_konami_vrc7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_konami_vrc7_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/legacy.cpp b/src/devices/bus/nes/legacy.cpp index cdcc69df682..1a665cfda17 100644 --- a/src/devices/bus/nes/legacy.cpp +++ b/src/devices/bus/nes/legacy.cpp @@ -39,22 +39,22 @@ const device_type NES_FFE4 = &device_creator<nes_ffe4_device>; const device_type NES_FFE8 = &device_creator<nes_ffe8_device>; -nes_ffe3_device::nes_ffe3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_ffe3_device::nes_ffe3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_FFE3, "NES Cart FFE-3 PCB", tag, owner, clock, "nes_ff3", __FILE__) { } -nes_ffe4_device::nes_ffe4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_ffe4_device::nes_ffe4_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr), m_latch(0), m_exram_enabled(0), m_exram_bank(0) { } -nes_ffe4_device::nes_ffe4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_ffe4_device::nes_ffe4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_FFE4, "NES Cart FFE-4 PCB", tag, owner, clock, "nes_ff4", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr), m_latch(0), m_exram_enabled(0), m_exram_bank(0) { } -nes_ffe8_device::nes_ffe8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_ffe8_device::nes_ffe8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_ffe4_device(mconfig, NES_FFE8, "NES Cart FFE-8 PCB", tag, owner, clock, "nes_ff8", __FILE__) { } diff --git a/src/devices/bus/nes/legacy.h b/src/devices/bus/nes/legacy.h index 4efc4bc96f5..becc035d09a 100644 --- a/src/devices/bus/nes/legacy.h +++ b/src/devices/bus/nes/legacy.h @@ -12,7 +12,7 @@ class nes_ffe3_device : public nes_nrom_device { public: // construction/destruction - nes_ffe3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_ffe3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -28,8 +28,8 @@ class nes_ffe4_device : public nes_nrom_device { public: // construction/destruction - nes_ffe4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - nes_ffe4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_ffe4_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_ffe4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -61,7 +61,7 @@ class nes_ffe8_device : public nes_ffe4_device { public: // construction/destruction - nes_ffe8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_ffe8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_l) override; diff --git a/src/devices/bus/nes/mmc1.cpp b/src/devices/bus/nes/mmc1.cpp index b1bd17d3917..bdf5279c475 100644 --- a/src/devices/bus/nes/mmc1.cpp +++ b/src/devices/bus/nes/mmc1.cpp @@ -39,27 +39,27 @@ const device_type NES_SOROM_A = &device_creator<nes_sorom_a_device>; -nes_sxrom_device::nes_sxrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_sxrom_device::nes_sxrom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_reg_write_enable(0), m_latch(0), m_count(0) { } -nes_sxrom_device::nes_sxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_sxrom_device::nes_sxrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_SXROM, "NES Cart SxROM (MMC-1) PCB", tag, owner, clock, "nes_sxrom", __FILE__), m_reg_write_enable(0), m_latch(0), m_count(0) { } -nes_sorom_device::nes_sorom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_sorom_device::nes_sorom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_sxrom_device(mconfig, NES_SOROM, "NES Cart SOROM (MMC-1) PCB", tag, owner, clock, "nes_sorom", __FILE__) { } -nes_sxrom_a_device::nes_sxrom_a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_sxrom_a_device::nes_sxrom_a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_sxrom_device(mconfig, NES_SXROM_A, "NES Cart SxROM (MMC-1A) PCB", tag, owner, clock, "nes_sxrom_a", __FILE__) { } -nes_sorom_a_device::nes_sorom_a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_sorom_a_device::nes_sorom_a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_sxrom_device(mconfig, NES_SOROM_A, "NES Cart SOROM (MMC-1A) PCB", tag, owner, clock, "nes_sorom_a", __FILE__) { } diff --git a/src/devices/bus/nes/mmc1.h b/src/devices/bus/nes/mmc1.h index 7b71b732a87..ca284bd5f2b 100644 --- a/src/devices/bus/nes/mmc1.h +++ b/src/devices/bus/nes/mmc1.h @@ -12,8 +12,8 @@ class nes_sxrom_device : public nes_nrom_device { public: // construction/destruction - nes_sxrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - nes_sxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_sxrom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_sxrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -39,7 +39,7 @@ class nes_sorom_device : public nes_sxrom_device { public: // construction/destruction - nes_sorom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_sorom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual DECLARE_READ8_MEMBER(read_m) override; virtual DECLARE_WRITE8_MEMBER(write_m) override; @@ -51,7 +51,7 @@ class nes_sxrom_a_device : public nes_sxrom_device { public: // construction/destruction - nes_sxrom_a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_sxrom_a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual DECLARE_READ8_MEMBER(read_m) override; virtual DECLARE_WRITE8_MEMBER(write_m) override; @@ -61,7 +61,7 @@ class nes_sorom_a_device : public nes_sxrom_device { public: // construction/destruction - nes_sorom_a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_sorom_a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual DECLARE_READ8_MEMBER(read_m) override; virtual DECLARE_WRITE8_MEMBER(write_m) override; diff --git a/src/devices/bus/nes/mmc2.cpp b/src/devices/bus/nes/mmc2.cpp index 9351761f31c..442a111b3ec 100644 --- a/src/devices/bus/nes/mmc2.cpp +++ b/src/devices/bus/nes/mmc2.cpp @@ -32,19 +32,19 @@ const device_type NES_PXROM = &device_creator<nes_pxrom_device>; const device_type NES_FXROM = &device_creator<nes_fxrom_device>; -nes_pxrom_device::nes_pxrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_pxrom_device::nes_pxrom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_latch1(0), m_latch2(0) { } -nes_pxrom_device::nes_pxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_pxrom_device::nes_pxrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_PXROM, "NES Cart PxROM (MMC-2) PCB", tag, owner, clock, "nes_pxrom", __FILE__), m_latch1(0), m_latch2(0) { } -nes_fxrom_device::nes_fxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_fxrom_device::nes_fxrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_pxrom_device(mconfig, NES_FXROM, "NES Cart FxROM (MMC-4) PCB", tag, owner, clock, "nes_fxrom", __FILE__) { } diff --git a/src/devices/bus/nes/mmc2.h b/src/devices/bus/nes/mmc2.h index d127aafec2f..2c0868e2105 100644 --- a/src/devices/bus/nes/mmc2.h +++ b/src/devices/bus/nes/mmc2.h @@ -12,8 +12,8 @@ class nes_pxrom_device : public nes_nrom_device { public: // construction/destruction - nes_pxrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - nes_pxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_pxrom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_pxrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -35,7 +35,7 @@ class nes_fxrom_device : public nes_pxrom_device { public: // construction/destruction - nes_fxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_fxrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_h) override; diff --git a/src/devices/bus/nes/mmc3.cpp b/src/devices/bus/nes/mmc3.cpp index a9bc5631b0d..e45f0234204 100644 --- a/src/devices/bus/nes/mmc3.cpp +++ b/src/devices/bus/nes/mmc3.cpp @@ -53,39 +53,39 @@ const device_type NES_QJ_PCB = &device_creator<nes_qj_device>; const device_type NES_ZZ_PCB = &device_creator<nes_zz_device>; -nes_txrom_device::nes_txrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_txrom_device::nes_txrom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_prg_base(0), m_prg_mask(0), m_chr_base(0), m_chr_mask(0), m_latch(0), m_wram_protect(0), m_alt_irq(0), m_irq_count(0), m_irq_count_latch(0), m_irq_clear(0), m_irq_enable(0) { } -nes_txrom_device::nes_txrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_txrom_device::nes_txrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_TXROM, "NES Cart TxROM (MMC-3) PCB", tag, owner, clock, "nes_txrom", __FILE__), m_prg_base(0), m_prg_mask(0), m_chr_base(0), m_chr_mask(0), m_latch(0), m_wram_protect(0), m_alt_irq(0), m_irq_count(0), m_irq_count_latch(0), m_irq_clear(0), m_irq_enable(0) { } -nes_hkrom_device::nes_hkrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_hkrom_device::nes_hkrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_HKROM, "NES Cart HKROM (MMC-6) PCB", tag, owner, clock, "nes_hkrom", __FILE__), m_wram_enable(0), m_mmc6_reg(0) { } -nes_txsrom_device::nes_txsrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_txsrom_device::nes_txsrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_TXSROM, "NES Cart TxSROM PCB", tag, owner, clock, "nes_txsrom", __FILE__) { } -nes_tqrom_device::nes_tqrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_tqrom_device::nes_tqrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_TQROM, "NES Cart TQROM PCB", tag, owner, clock, "nes_tqrom", __FILE__) { } -nes_qj_device::nes_qj_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_qj_device::nes_qj_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_QJ_PCB, "NES Cart NES-QJ PCB", tag, owner, clock, "nes_qj", __FILE__) { } -nes_zz_device::nes_zz_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_zz_device::nes_zz_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_ZZ_PCB, "NES Cart PAL-ZZ PCB", tag, owner, clock, "nes_zz", __FILE__) { } diff --git a/src/devices/bus/nes/mmc3.h b/src/devices/bus/nes/mmc3.h index 6436b247cea..9f3936d2f31 100644 --- a/src/devices/bus/nes/mmc3.h +++ b/src/devices/bus/nes/mmc3.h @@ -12,8 +12,8 @@ class nes_txrom_device : public nes_nrom_device { public: // construction/destruction - nes_txrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - nes_txrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_txrom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_txrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override { mmc3_start(); } @@ -56,7 +56,7 @@ class nes_hkrom_device : public nes_txrom_device { public: // construction/destruction - nes_hkrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_hkrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -81,7 +81,7 @@ class nes_txsrom_device : public nes_txrom_device { public: // construction/destruction - nes_txsrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_txsrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_h) override; @@ -98,7 +98,7 @@ class nes_tqrom_device : public nes_txrom_device { public: // construction/destruction - nes_tqrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_tqrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: virtual void set_chr( UINT8 chr, int chr_base, int chr_mask ) override; @@ -111,7 +111,7 @@ class nes_qj_device : public nes_txrom_device { public: // construction/destruction - nes_qj_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_qj_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_m) override; @@ -125,7 +125,7 @@ class nes_zz_device : public nes_txrom_device { public: // construction/destruction - nes_zz_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_zz_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_m) override; diff --git a/src/devices/bus/nes/mmc3_clones.cpp b/src/devices/bus/nes/mmc3_clones.cpp index 7c320c56060..f9960d369ba 100644 --- a/src/devices/bus/nes/mmc3_clones.cpp +++ b/src/devices/bus/nes/mmc3_clones.cpp @@ -65,177 +65,177 @@ const device_type NES_BMC_830118C = &device_creator<nes_bmc_830118c_device>; const device_type NES_PJOY84 = &device_creator<nes_pjoy84_device>; -nes_nitra_device::nes_nitra_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_nitra_device::nes_nitra_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_NITRA, "NES Cart Nitra PCB", tag, owner, clock, "nes_nitra", __FILE__) { } -nes_ks7057_device::nes_ks7057_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_ks7057_device::nes_ks7057_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_KS7057, "NES Cart KS-7057 PCB", tag, owner, clock, "nes_ks7057", __FILE__) { } -nes_sbros11_device::nes_sbros11_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_sbros11_device::nes_sbros11_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_SBROS11, "NES Cart SMB 11 PCB", tag, owner, clock, "nes_smb11", __FILE__) { } -nes_malisb_device::nes_malisb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_malisb_device::nes_malisb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_MALISB, "NES Cart Mali Spash Bomb PCB", tag, owner, clock, "nes_malisb", __FILE__) { } -nes_family4646_device::nes_family4646_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_family4646_device::nes_family4646_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_FAMILY4646, "NES Cart BMC-FAMILY-4646 PCB", tag, owner, clock, "nes_family4646", __FILE__) { } -nes_pikay2k_device::nes_pikay2k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_pikay2k_device::nes_pikay2k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_PIKAY2K, "NES Cart PIKACHU Y2K PCB", tag, owner, clock, "nes_pikay2k", __FILE__) { } -nes_8237_device::nes_8237_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_8237_device::nes_8237_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_8237, "NES Cart UNL-8237 PCB", tag, owner, clock, "nes_8237", __FILE__), m_cd_enable(0) { } -nes_sglionk_device::nes_sglionk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_sglionk_device::nes_sglionk_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_SG_LIONK, "NES Cart SuperGame Lion King PCB", tag, owner, clock, "nes_sglionk", __FILE__), m_reg(0), m_reg_enabled(0) { } -nes_sgboog_device::nes_sgboog_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_sgboog_device::nes_sgboog_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_SG_BOOG, "NES Cart SuperGame BoogerMan PCB", tag, owner, clock, "nes_sgbooger", __FILE__), m_mode(0) { } -nes_kasing_device::nes_kasing_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_kasing_device::nes_kasing_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_KASING, "NES Cart Kasing PCB", tag, owner, clock, "nes_kasing", __FILE__), m_reg(0) { } -nes_kay_device::nes_kay_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_kay_device::nes_kay_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_KAY, "NES Cart KAY PCB", tag, owner, clock, "nes_kay", __FILE__), m_low_reg(0) { } -nes_h2288_device::nes_h2288_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_h2288_device::nes_h2288_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_H2288, "NES Cart H-2288 PCB", tag, owner, clock, "nes_h2288", __FILE__) { } -nes_6035052_device::nes_6035052_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_6035052_device::nes_6035052_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_6035052, "NES Cart UNL-603-5052 PCB", tag, owner, clock, "nes_6035052", __FILE__), m_prot(0) { } -nes_txc_tw_device::nes_txc_tw_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_txc_tw_device::nes_txc_tw_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_TXC_TW, "NES Cart TXC Thunder Warrior PCB", tag, owner, clock, "nes_txc_tw", __FILE__) { } -nes_kof97_device::nes_kof97_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_kof97_device::nes_kof97_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_KOF97, "NES Cart KOF 97 PCB", tag, owner, clock, "nes_kof97", __FILE__) { } -nes_kof96_device::nes_kof96_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_kof96_device::nes_kof96_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_KOF96, "NES Cart KOF 96 PCB", tag, owner, clock, "nes_kof96", __FILE__) { } -nes_sf3_device::nes_sf3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_sf3_device::nes_sf3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_SF3, "NES Cart Super Fighter III PCB", tag, owner, clock, "nes_sf3", __FILE__) { } -nes_gouder_device::nes_gouder_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_gouder_device::nes_gouder_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_GOUDER, "NES Cart Gouder PCB", tag, owner, clock, "nes_gouder", __FILE__) { } -nes_sa9602b_device::nes_sa9602b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_sa9602b_device::nes_sa9602b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_SA9602B, "NES Cart SA-9602B PCB", tag, owner, clock, "nes_sa9602b", __FILE__), m_reg(0), m_prg_chip(0) { } -nes_sachen_shero_device::nes_sachen_shero_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_sachen_shero_device::nes_sachen_shero_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_SACHEN_SHERO, "NES Cart Street Hero PCB", tag, owner, clock, "nes_shero", __FILE__), m_reg(0) { } -//nes_a9746_device::nes_a9746_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +//nes_a9746_device::nes_a9746_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) // : nes_txrom_device(mconfig, NES_A9746, "NES Cart A-9746 PCB", tag, owner, clock, "nes_bmc_a9746", __FILE__) //{ //} -nes_fk23c_device::nes_fk23c_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_fk23c_device::nes_fk23c_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : nes_txrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_mmc_cmd1(0) { } -nes_fk23c_device::nes_fk23c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_fk23c_device::nes_fk23c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_FK23C, "NES Cart FK23C PCB", tag, owner, clock, "nes_fk23c", __FILE__), m_mmc_cmd1(0) { } -nes_fk23ca_device::nes_fk23ca_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_fk23ca_device::nes_fk23ca_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_fk23c_device(mconfig, NES_FK23CA, "NES Cart FK23CA PCB", tag, owner, clock, "nes_fk23ca", __FILE__) { } -nes_s24in1sc03_device::nes_s24in1sc03_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_s24in1sc03_device::nes_s24in1sc03_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_S24IN1SC03, "NES Cart Super 24 in 1 SC-03 PCB", tag, owner, clock, "nes_s24in1c03", __FILE__) { } -nes_bmc_15in1_device::nes_bmc_15in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_15in1_device::nes_bmc_15in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_BMC_15IN1, "NES Cart BMC 15 in 1 PCB", tag, owner, clock, "nes_bmc_15in1", __FILE__) { } -nes_bmc_sbig7_device::nes_bmc_sbig7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_sbig7_device::nes_bmc_sbig7_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_BMC_SBIG7, "NES Cart BMC Super BIG 7 in 1 PCB", tag, owner, clock, "nes_bmc_sbit7", __FILE__) { } -nes_bmc_hik8_device::nes_bmc_hik8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_hik8_device::nes_bmc_hik8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_BMC_HIK8, "NES Cart BMC Super HIK 8 in 1 PCB", tag, owner, clock, "nes_bmc_hik8", __FILE__), m_count(0) { } -nes_bmc_hik4_device::nes_bmc_hik4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_hik4_device::nes_bmc_hik4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_BMC_HIK4, "NES Cart BMC Super HIK 4 in 1 PCB", tag, owner, clock, "nes_bmc_hik4", __FILE__) { } -nes_bmc_mario7in1_device::nes_bmc_mario7in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_mario7in1_device::nes_bmc_mario7in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_BMC_MARIO7IN1, "NES Cart BMC Mario 7 in 1 PCB", tag, owner, clock, "nes_bmc_mario7in1", __FILE__), m_reg_written(0) { } -nes_bmc_gold7in1_device::nes_bmc_gold7in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_gold7in1_device::nes_bmc_gold7in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_BMC_GOLD7IN1, "NES Cart BMC Golden 7 in 1 PCB", tag, owner, clock, "nes_bmc_gold7in1", __FILE__), m_reg_written(0) { } -nes_bmc_gc6in1_device::nes_bmc_gc6in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_gc6in1_device::nes_bmc_gc6in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_BMC_GC6IN1, "NES Cart BMC Golden Card 6 in 1 PCB", tag, owner, clock, "nes_bmc_gc6in1", __FILE__) { } -nes_bmc_411120c_device::nes_bmc_411120c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_411120c_device::nes_bmc_411120c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_BMC_411120C, "NES Cart BMC 411120C PCB", tag, owner, clock, "nes_bmc_411120c", __FILE__), m_reg(0) { } -nes_bmc_830118c_device::nes_bmc_830118c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_830118c_device::nes_bmc_830118c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_BMC_830118C, "NES Cart BMC 830118C PCB", tag, owner, clock, "nes_bmc_830118c", __FILE__), m_reg(0) { } -nes_pjoy84_device::nes_pjoy84_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_pjoy84_device::nes_pjoy84_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_PJOY84, "NES Cart Powerjoy 84 PCB", tag, owner, clock, "nes_pjoy84", __FILE__) { } diff --git a/src/devices/bus/nes/mmc3_clones.h b/src/devices/bus/nes/mmc3_clones.h index f803ff87323..f1715c02dc7 100644 --- a/src/devices/bus/nes/mmc3_clones.h +++ b/src/devices/bus/nes/mmc3_clones.h @@ -12,7 +12,7 @@ class nes_nitra_device : public nes_txrom_device { public: // construction/destruction - nes_nitra_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_nitra_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_h) override; @@ -25,7 +25,7 @@ class nes_ks7057_device : public nes_txrom_device { public: // construction/destruction - nes_ks7057_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_ks7057_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_h) override; @@ -38,7 +38,7 @@ class nes_sbros11_device : public nes_txrom_device { public: // construction/destruction - nes_sbros11_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_sbros11_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_h) override; @@ -51,7 +51,7 @@ class nes_malisb_device : public nes_txrom_device { public: // construction/destruction - nes_malisb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_malisb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_h) override; @@ -66,7 +66,7 @@ class nes_family4646_device : public nes_txrom_device { public: // construction/destruction - nes_family4646_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_family4646_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_m) override; @@ -81,7 +81,7 @@ class nes_pikay2k_device : public nes_txrom_device { public: // construction/destruction - nes_pikay2k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_pikay2k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -102,7 +102,7 @@ class nes_8237_device : public nes_txrom_device { public: // construction/destruction - nes_8237_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_8237_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -125,7 +125,7 @@ class nes_sglionk_device : public nes_txrom_device { public: // construction/destruction - nes_sglionk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_sglionk_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -146,7 +146,7 @@ class nes_sgboog_device : public nes_txrom_device { public: // construction/destruction - nes_sgboog_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_sgboog_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -171,7 +171,7 @@ class nes_kasing_device : public nes_txrom_device { public: // construction/destruction - nes_kasing_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_kasing_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -191,7 +191,7 @@ class nes_kay_device : public nes_txrom_device { public: // construction/destruction - nes_kay_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_kay_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -216,7 +216,7 @@ class nes_h2288_device : public nes_txrom_device { public: // construction/destruction - nes_h2288_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_h2288_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -238,7 +238,7 @@ class nes_6035052_device : public nes_txrom_device { public: // construction/destruction - nes_6035052_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_6035052_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -262,7 +262,7 @@ class nes_txc_tw_device : public nes_txrom_device { public: // construction/destruction - nes_txc_tw_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_txc_tw_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_l) override; @@ -277,7 +277,7 @@ class nes_kof97_device : public nes_txrom_device { public: // construction/destruction - nes_kof97_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_kof97_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_h) override; @@ -290,7 +290,7 @@ class nes_kof96_device : public nes_txrom_device { public: // construction/destruction - nes_kof96_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_kof96_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -313,7 +313,7 @@ class nes_sf3_device : public nes_txrom_device { public: // construction/destruction - nes_sf3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_sf3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_h) override; @@ -329,7 +329,7 @@ class nes_gouder_device : public nes_txrom_device { public: // construction/destruction - nes_gouder_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_gouder_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -350,7 +350,7 @@ class nes_sa9602b_device : public nes_txrom_device { public: // construction/destruction - nes_sa9602b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_sa9602b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -371,7 +371,7 @@ class nes_sachen_shero_device : public nes_txrom_device { public: // construction/destruction - nes_sachen_shero_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_sachen_shero_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -392,7 +392,7 @@ class nes_a9746_device : public nes_txrom_device { public: // construction/destruction - nes_a9746_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_a9746_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -413,8 +413,8 @@ class nes_fk23c_device : public nes_txrom_device { public: // construction/destruction - nes_fk23c_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - nes_fk23c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_fk23c_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_fk23c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -439,7 +439,7 @@ class nes_fk23ca_device : public nes_fk23c_device { public: // construction/destruction - nes_fk23ca_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_fk23ca_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void pcb_reset() override; }; @@ -451,7 +451,7 @@ class nes_s24in1sc03_device : public nes_txrom_device { public: // construction/destruction - nes_s24in1sc03_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_s24in1sc03_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -472,7 +472,7 @@ class nes_bmc_15in1_device : public nes_txrom_device { public: // construction/destruction - nes_bmc_15in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_15in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_m) override; @@ -487,7 +487,7 @@ class nes_bmc_sbig7_device : public nes_txrom_device { public: // construction/destruction - nes_bmc_sbig7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_sbig7_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_h) override; @@ -502,7 +502,7 @@ class nes_bmc_hik8_device : public nes_txrom_device { public: // construction/destruction - nes_bmc_hik8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_hik8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -522,7 +522,7 @@ class nes_bmc_hik4_device : public nes_txrom_device { public: // construction/destruction - nes_bmc_hik4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_hik4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_m) override; @@ -537,7 +537,7 @@ class nes_bmc_mario7in1_device : public nes_txrom_device { public: // construction/destruction - nes_bmc_mario7in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_mario7in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -556,7 +556,7 @@ class nes_bmc_gold7in1_device : public nes_txrom_device { public: // construction/destruction - nes_bmc_gold7in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_gold7in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -575,7 +575,7 @@ class nes_bmc_gc6in1_device : public nes_txrom_device { public: // construction/destruction - nes_bmc_gc6in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_gc6in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -597,7 +597,7 @@ class nes_bmc_411120c_device : public nes_txrom_device { public: // construction/destruction - nes_bmc_411120c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_411120c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -618,7 +618,7 @@ class nes_bmc_830118c_device : public nes_txrom_device { public: // construction/destruction - nes_bmc_830118c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_830118c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -639,7 +639,7 @@ class nes_pjoy84_device : public nes_txrom_device { public: // construction/destruction - nes_pjoy84_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_pjoy84_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/mmc5.cpp b/src/devices/bus/nes/mmc5.cpp index 7c114ca0e77..a5a8201d7ee 100644 --- a/src/devices/bus/nes/mmc5.cpp +++ b/src/devices/bus/nes/mmc5.cpp @@ -44,7 +44,7 @@ static const int m_mmc5_attrib[4] = {0x00, 0x55, 0xaa, 0xff}; const device_type NES_EXROM = &device_creator<nes_exrom_device>; -nes_exrom_device::nes_exrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_exrom_device::nes_exrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_EXROM, "NES Cart ExROM (MMC-5) PCB", tag, owner, clock, "nes_exrom", __FILE__), m_irq_count(0), m_irq_status(0), m_irq_enable(0), m_mult1(0), m_mult2(0), m_mmc5_scanline(0), m_vrom_page_a(0), m_vrom_page_b(0), m_floodtile(0), m_floodattr(0), m_prg_mode(0), m_chr_mode(0), m_wram_protect_1(0), m_wram_protect_2(0), m_exram_control(0), m_wram_base(0), m_last_chr(0), m_ex1_chr(0), diff --git a/src/devices/bus/nes/mmc5.h b/src/devices/bus/nes/mmc5.h index 44569d3d561..17d7c80286a 100644 --- a/src/devices/bus/nes/mmc5.h +++ b/src/devices/bus/nes/mmc5.h @@ -12,7 +12,7 @@ class nes_exrom_device : public nes_nrom_device { public: // construction/destruction - nes_exrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_exrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/multigame.cpp b/src/devices/bus/nes/multigame.cpp index bd905a11de5..48d0b252382 100644 --- a/src/devices/bus/nes/multigame.cpp +++ b/src/devices/bus/nes/multigame.cpp @@ -77,237 +77,237 @@ const device_type NES_BMC_4IN1RESET = &device_creator<nes_bmc_4in1reset_device>; const device_type NES_BMC_42IN1RESET = &device_creator<nes_bmc_42in1reset_device>; -nes_action52_device::nes_action52_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_action52_device::nes_action52_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_ACTION52, "NES Cart Action 52 PCB", tag, owner, clock, "nes_action52", __FILE__) { } -nes_caltron_device::nes_caltron_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_caltron_device::nes_caltron_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_CALTRON6IN1, "NES Cart Caltron 6 in 1 PCB", tag, owner, clock, "nes_caltron", __FILE__), m_latch(0) { } -nes_rumblestat_device::nes_rumblestat_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_rumblestat_device::nes_rumblestat_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_RUMBLESTATION, "NES Cart Rumblestation PCB", tag, owner, clock, "nes_rumblestat", __FILE__), m_prg(0), m_chr(0) { } -nes_svision16_device::nes_svision16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_svision16_device::nes_svision16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_SVISION16, "NES Cart Supervision 16 in 1 PCB", tag, owner, clock, "nes_svision16", __FILE__), m_latch1(0), m_latch2(0) { } -nes_n625092_device::nes_n625092_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_n625092_device::nes_n625092_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_N625092, "NES Cart N625092 PCB", tag, owner, clock, "nes_n625092", __FILE__), m_latch1(0), m_latch2(0) { } -nes_a65as_device::nes_a65as_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_a65as_device::nes_a65as_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_A65AS, "NES Cart A65AS PCB", tag, owner, clock, "nes_a65as", __FILE__) { } -nes_t262_device::nes_t262_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_t262_device::nes_t262_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_T262, "NES Cart T-262 PCB", tag, owner, clock, "nes_t262", __FILE__), m_latch1(0), m_latch2(0) { } -nes_novel1_device::nes_novel1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_novel1_device::nes_novel1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_NOVEL1, "NES Cart Novel Diamond Type 1 PCB", tag, owner, clock, "nes_novel1", __FILE__) { } -nes_novel2_device::nes_novel2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_novel2_device::nes_novel2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_NOVEL2, "NES Cart Novel Diamond Type 2 PCB", tag, owner, clock, "nes_novel2", __FILE__) { } -nes_studyngame_device::nes_studyngame_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_studyngame_device::nes_studyngame_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_STUDYNGAME, "NES Cart Study n Game PCB", tag, owner, clock, "nes_studyngame", __FILE__) { } -nes_sgun20in1_device::nes_sgun20in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_sgun20in1_device::nes_sgun20in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_SUPERGUN20IN1, "NES Cart Supergun 20 in 1 PCB", tag, owner, clock, "nes_sgun20in1", __FILE__) { } -nes_vt5201_device::nes_vt5201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_vt5201_device::nes_vt5201_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_VT5201, "NES Cart VT5201 PCB", tag, owner, clock, "nes_vt5201", __FILE__), m_latch(0), m_dipsetting(0) { } -nes_810544c_device::nes_810544c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_810544c_device::nes_810544c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_810544C, "NES Cart 810544-C-A1 PCB", tag, owner, clock, "nes_810544c", __FILE__) { } -nes_ntd03_device::nes_ntd03_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_ntd03_device::nes_ntd03_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_NTD03, "NES Cart NTD-03 PCB", tag, owner, clock, "nes_ntd03", __FILE__) { } -nes_bmc_gb63_device::nes_bmc_gb63_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_gb63_device::nes_bmc_gb63_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BMC_GB63, "NES Cart BMC Ghostbusters 63 in 1 PCB", tag, owner, clock, "nes_bmc_gb63", __FILE__), m_latch(0), m_dipsetting(0), m_vram_disable(0) { } -nes_bmc_gka_device::nes_bmc_gka_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_gka_device::nes_bmc_gka_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BMC_GKA, "NES Cart BMC GK-A PCB", tag, owner, clock, "nes_bmc_gka", __FILE__), m_latch1(0), m_latch2(0) { } -nes_bmc_gkb_device::nes_bmc_gkb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_gkb_device::nes_bmc_gkb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BMC_GKB, "NES Cart BMC GK-B PCB", tag, owner, clock, "nes_bmc_gkb", __FILE__) { } -nes_bmc_ws_device::nes_bmc_ws_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_ws_device::nes_bmc_ws_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BMC_WS, "NES Cart BMC WS PCB", tag, owner, clock, "nes_bmc_ws", __FILE__), m_latch(0) { } -nes_bmc_11160_device::nes_bmc_11160_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_11160_device::nes_bmc_11160_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BMC_11160, "NES Cart BMC-11160 PCB", tag, owner, clock, "nes_bmc_11160", __FILE__) { } -nes_bmc_g146_device::nes_bmc_g146_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_g146_device::nes_bmc_g146_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BMC_G146, "NES Cart BMC-G-146 PCB", tag, owner, clock, "nes_bmc_g146", __FILE__) { } -nes_bmc_8157_device::nes_bmc_8157_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_8157_device::nes_bmc_8157_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BMC_8157, "NES Cart BMC-8157 PCB", tag, owner, clock, "nes_bmc_8157", __FILE__) { } -nes_bmc_hik300_device::nes_bmc_hik300_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_hik300_device::nes_bmc_hik300_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BMC_HIK300, "NES Cart BMC HIK 300 in 1 PCB", tag, owner, clock, "nes_bmc_hik300", __FILE__) { } -nes_bmc_s700_device::nes_bmc_s700_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_s700_device::nes_bmc_s700_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BMC_S700, "NES Cart BMC Super 700 in 1 PCB", tag, owner, clock, "nes_bmc_s700", __FILE__) { } -nes_bmc_ball11_device::nes_bmc_ball11_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_ball11_device::nes_bmc_ball11_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BMC_BALL11, "NES Cart BMC Ball 11 in 1 PCB", tag, owner, clock, "nes_bmc_ball11", __FILE__) { } -nes_bmc_22games_device::nes_bmc_22games_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_22games_device::nes_bmc_22games_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BMC_22GAMES, "NES Cart BMC 22 Games PCB", tag, owner, clock, "nes_bmc_22games", __FILE__) { } -nes_bmc_64y2k_device::nes_bmc_64y2k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_64y2k_device::nes_bmc_64y2k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BMC_64Y2K, "NES Cart BMC 64 in 1 Y2K PCB", tag, owner, clock, "nes_bmc_64y2k", __FILE__) { } -nes_bmc_12in1_device::nes_bmc_12in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_12in1_device::nes_bmc_12in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BMC_12IN1, "NES Cart BMC 12 in 1 PCB", tag, owner, clock, "nes_bmc_12in1", __FILE__) { } -nes_bmc_20in1_device::nes_bmc_20in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_20in1_device::nes_bmc_20in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BMC_20IN1, "NES Cart BMC 20 in 1 PCB", tag, owner, clock, "nes_bmc_20in1", __FILE__) { } -nes_bmc_21in1_device::nes_bmc_21in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_21in1_device::nes_bmc_21in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BMC_21IN1, "NES Cart BMC 21 in 1 PCB", tag, owner, clock, "nes_bmc_21in1", __FILE__) { } -nes_bmc_31in1_device::nes_bmc_31in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_31in1_device::nes_bmc_31in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BMC_31IN1, "NES Cart BMC 31 in 1 PCB", tag, owner, clock, "nes_bmc_31in1", __FILE__) { } -nes_bmc_35in1_device::nes_bmc_35in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_35in1_device::nes_bmc_35in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BMC_35IN1, "NES Cart BMC 35 in 1 PCB", tag, owner, clock, "nes_bmc_35in1", __FILE__) { } -nes_bmc_36in1_device::nes_bmc_36in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_36in1_device::nes_bmc_36in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BMC_36IN1, "NES Cart BMC 36 in 1 PCB", tag, owner, clock, "nes_bmc_36in1", __FILE__) { } -nes_bmc_64in1_device::nes_bmc_64in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_64in1_device::nes_bmc_64in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BMC_64IN1, "NES Cart BMC 64 in 1 PCB", tag, owner, clock, "nes_bmc_64in1", __FILE__) { } -nes_bmc_70in1_device::nes_bmc_70in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_70in1_device::nes_bmc_70in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BMC_70IN1, "NES Cart BMC 70 in 1 PCB", tag, owner, clock, "nes_bmc_70in1", __FILE__), m_mode(0) { } -nes_bmc_72in1_device::nes_bmc_72in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_72in1_device::nes_bmc_72in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BMC_72IN1, "NES Cart BMC 72 in 1 PCB", tag, owner, clock, "nes_bmc_72in1", __FILE__) { } -nes_bmc_76in1_device::nes_bmc_76in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_76in1_device::nes_bmc_76in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BMC_76IN1, "NES Cart BMC 76 in 1 PCB", tag, owner, clock, "nes_bmc_76in1", __FILE__), m_latch1(0), m_latch2(0) { } -nes_bmc_110in1_device::nes_bmc_110in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_110in1_device::nes_bmc_110in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BMC_110IN1, "NES Cart BMC 110 in 1 PCB", tag, owner, clock, "nes_bmc_110in1", __FILE__) { } -nes_bmc_150in1_device::nes_bmc_150in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_150in1_device::nes_bmc_150in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BMC_150IN1, "NES Cart BMC 150 in 1 PCB", tag, owner, clock, "nes_bmc_150in1", __FILE__) { } -nes_bmc_190in1_device::nes_bmc_190in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_190in1_device::nes_bmc_190in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BMC_190IN1, "NES Cart BMC 190 in 1 PCB", tag, owner, clock, "nes_bmc_190in1", __FILE__) { } -nes_bmc_800in1_device::nes_bmc_800in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_800in1_device::nes_bmc_800in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BMC_800IN1, "NES Cart BMC 800 in 1 PCB", tag, owner, clock, "nes_bmc_800in1", __FILE__), m_mode(0) { } -nes_bmc_1200in1_device::nes_bmc_1200in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_1200in1_device::nes_bmc_1200in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BMC_1200IN1, "NES Cart BMC 1200 in 1 PCB", tag, owner, clock, "nes_bmc_1200in1", __FILE__), m_vram_protect(0) { } -nes_bmc_gold150_device::nes_bmc_gold150_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_gold150_device::nes_bmc_gold150_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BMC_GOLD150, "NES Cart BMC Golden 150 in 1 PCB", tag, owner, clock, "nes_bmc_gold150", __FILE__), m_latch(0) { } -nes_bmc_gold260_device::nes_bmc_gold260_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_gold260_device::nes_bmc_gold260_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BMC_GOLD260, "NES Cart BMC Golden 260 in 1 PCB", tag, owner, clock, "nes_bmc_gold260", __FILE__) { } -nes_bmc_ch001_device::nes_bmc_ch001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_ch001_device::nes_bmc_ch001_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BMC_CH001, "NES Cart BMC CH-001 PCB", tag, owner, clock, "nes_bmc_ch001", __FILE__), m_latch(0) { } -nes_bmc_super22_device::nes_bmc_super22_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_super22_device::nes_bmc_super22_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BMC_SUPER22, "NES Cart BMC Super 22 Games PCB", tag, owner, clock, "nes_bmc_super22", __FILE__) { } -nes_bmc_4in1reset_device::nes_bmc_4in1reset_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_4in1reset_device::nes_bmc_4in1reset_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BMC_4IN1RESET, "NES Cart BMC 4 in 1 (Reset Based) PCB", tag, owner, clock, "nes_bmc_4in1reset", __FILE__), m_latch(0) { } -nes_bmc_42in1reset_device::nes_bmc_42in1reset_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bmc_42in1reset_device::nes_bmc_42in1reset_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BMC_42IN1RESET, "NES Cart BMC 42 in 1 (Reset Based) PCB", tag, owner, clock, "nes_bmc_42in1reset", __FILE__), m_latch(0) { } diff --git a/src/devices/bus/nes/multigame.h b/src/devices/bus/nes/multigame.h index e9ecced4a7a..06a068213ab 100644 --- a/src/devices/bus/nes/multigame.h +++ b/src/devices/bus/nes/multigame.h @@ -12,7 +12,7 @@ class nes_action52_device : public nes_nrom_device { public: // construction/destruction - nes_action52_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_action52_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -28,7 +28,7 @@ class nes_caltron_device : public nes_nrom_device { public: // construction/destruction - nes_caltron_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_caltron_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -48,7 +48,7 @@ class nes_rumblestat_device : public nes_nrom_device { public: // construction/destruction - nes_rumblestat_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_rumblestat_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -68,7 +68,7 @@ class nes_svision16_device : public nes_nrom_device { public: // construction/destruction - nes_svision16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_svision16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -90,7 +90,7 @@ class nes_n625092_device : public nes_nrom_device { public: // construction/destruction - nes_n625092_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_n625092_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -110,7 +110,7 @@ class nes_a65as_device : public nes_nrom_device { public: // construction/destruction - nes_a65as_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_a65as_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -126,7 +126,7 @@ class nes_t262_device : public nes_nrom_device { public: // construction/destruction - nes_t262_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_t262_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -145,7 +145,7 @@ class nes_novel1_device : public nes_nrom_device { public: // construction/destruction - nes_novel1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_novel1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -161,7 +161,7 @@ class nes_novel2_device : public nes_nrom_device { public: // construction/destruction - nes_novel2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_novel2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -177,7 +177,7 @@ class nes_studyngame_device : public nes_nrom_device { public: // construction/destruction - nes_studyngame_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_studyngame_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -193,7 +193,7 @@ class nes_sgun20in1_device : public nes_nrom_device { public: // construction/destruction - nes_sgun20in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_sgun20in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -209,7 +209,7 @@ class nes_vt5201_device : public nes_nrom_device { public: // construction/destruction - nes_vt5201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_vt5201_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -229,7 +229,7 @@ class nes_810544c_device : public nes_nrom_device { public: // construction/destruction - nes_810544c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_810544c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -245,7 +245,7 @@ class nes_ntd03_device : public nes_nrom_device { public: // construction/destruction - nes_ntd03_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_ntd03_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -261,7 +261,7 @@ class nes_bmc_gb63_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_gb63_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_gb63_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -284,7 +284,7 @@ class nes_bmc_gka_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_gka_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_gka_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -303,7 +303,7 @@ class nes_bmc_gkb_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_gkb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_gkb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -319,7 +319,7 @@ class nes_bmc_ws_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_ws_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_ws_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -338,7 +338,7 @@ class nes_bmc_11160_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_11160_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_11160_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -354,7 +354,7 @@ class nes_bmc_g146_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_g146_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_g146_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -370,7 +370,7 @@ class nes_bmc_8157_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_8157_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_8157_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -387,7 +387,7 @@ class nes_bmc_hik300_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_hik300_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_hik300_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -403,7 +403,7 @@ class nes_bmc_s700_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_s700_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_s700_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -419,7 +419,7 @@ class nes_bmc_ball11_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_ball11_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_ball11_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -440,7 +440,7 @@ class nes_bmc_22games_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_22games_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_22games_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -456,7 +456,7 @@ class nes_bmc_64y2k_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_64y2k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_64y2k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -477,7 +477,7 @@ class nes_bmc_12in1_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_12in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_12in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -497,7 +497,7 @@ class nes_bmc_20in1_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_20in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_20in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -513,7 +513,7 @@ class nes_bmc_21in1_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_21in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_21in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -529,7 +529,7 @@ class nes_bmc_31in1_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_31in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_31in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -545,7 +545,7 @@ class nes_bmc_35in1_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_35in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_35in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -561,7 +561,7 @@ class nes_bmc_36in1_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_36in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_36in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -577,7 +577,7 @@ class nes_bmc_64in1_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_64in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_64in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -593,7 +593,7 @@ class nes_bmc_70in1_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_70in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_70in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -614,7 +614,7 @@ class nes_bmc_72in1_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_72in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_72in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -630,7 +630,7 @@ class nes_bmc_76in1_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_76in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_76in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -649,7 +649,7 @@ class nes_bmc_110in1_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_110in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_110in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -665,7 +665,7 @@ class nes_bmc_150in1_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_150in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_150in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -681,7 +681,7 @@ class nes_bmc_190in1_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_190in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_190in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -697,7 +697,7 @@ class nes_bmc_800in1_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_800in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_800in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -718,7 +718,7 @@ class nes_bmc_1200in1_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_1200in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_1200in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -738,7 +738,7 @@ class nes_bmc_gold150_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_gold150_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_gold150_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -758,7 +758,7 @@ class nes_bmc_gold260_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_gold260_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_gold260_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -774,7 +774,7 @@ class nes_bmc_ch001_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_ch001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_ch001_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -794,7 +794,7 @@ class nes_bmc_super22_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_super22_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_super22_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -810,7 +810,7 @@ class nes_bmc_4in1reset_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_4in1reset_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_4in1reset_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -826,7 +826,7 @@ class nes_bmc_42in1reset_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_42in1reset_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bmc_42in1reset_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/namcot.cpp b/src/devices/bus/nes/namcot.cpp index 5d166114e49..9cf418e966a 100644 --- a/src/devices/bus/nes/namcot.cpp +++ b/src/devices/bus/nes/namcot.cpp @@ -49,42 +49,42 @@ const device_type NES_NAMCOT340 = &device_creator<nes_namcot340_device>; const device_type NES_NAMCOT163 = &device_creator<nes_namcot163_device>; -nes_namcot3433_device::nes_namcot3433_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_namcot3433_device::nes_namcot3433_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_latch(0) { } -nes_namcot3433_device::nes_namcot3433_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_namcot3433_device::nes_namcot3433_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_NAMCOT3433, "NES Cart Namcot 3433 & 3443 / DxROM PCB", tag, owner, clock, "nes_namcot3433", __FILE__), m_latch(0) { } -nes_namcot3446_device::nes_namcot3446_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_namcot3446_device::nes_namcot3446_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_NAMCOT3446, "NES Cart Namcot 3446 PCB", tag, owner, clock, "nes_namcot3446", __FILE__), m_latch(0) { } -nes_namcot3425_device::nes_namcot3425_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_namcot3425_device::nes_namcot3425_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_NAMCOT3425, "NES Cart Namcot 3425 PCB", tag, owner, clock, "nes_namcot3425", __FILE__), m_latch(0) { } -nes_namcot340_device::nes_namcot340_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_namcot340_device::nes_namcot340_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) { } -nes_namcot340_device::nes_namcot340_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_namcot340_device::nes_namcot340_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_NAMCOT175, "NES Cart Namcot 340 PCB", tag, owner, clock, "nes_namcot340", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) { } -nes_namcot175_device::nes_namcot175_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_namcot175_device::nes_namcot175_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_namcot340_device(mconfig, NES_NAMCOT340, "NES Cart Namcot 175 PCB", tag, owner, clock, "nes_namcot175", __FILE__), m_wram_protect(0) { } -nes_namcot163_device::nes_namcot163_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_namcot163_device::nes_namcot163_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_namcot340_device(mconfig, NES_NAMCOT163, "NES Cart Namcot 163 PCB", tag, owner, clock, "nes_namcot163", __FILE__), m_wram_protect(0), m_latch(0), m_chr_bank(0) { } diff --git a/src/devices/bus/nes/namcot.h b/src/devices/bus/nes/namcot.h index 6499218a752..e8798829cb5 100644 --- a/src/devices/bus/nes/namcot.h +++ b/src/devices/bus/nes/namcot.h @@ -12,8 +12,8 @@ class nes_namcot3433_device : public nes_nrom_device { public: // construction/destruction - nes_namcot3433_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - nes_namcot3433_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_namcot3433_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_namcot3433_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -33,7 +33,7 @@ class nes_namcot3446_device : public nes_nrom_device { public: // construction/destruction - nes_namcot3446_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_namcot3446_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -52,7 +52,7 @@ class nes_namcot3425_device : public nes_nrom_device { public: // construction/destruction - nes_namcot3425_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_namcot3425_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -72,8 +72,8 @@ class nes_namcot340_device : public nes_nrom_device { public: // construction/destruction - nes_namcot340_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - nes_namcot340_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_namcot340_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_namcot340_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -106,7 +106,7 @@ class nes_namcot175_device : public nes_namcot340_device { public: // construction/destruction - nes_namcot175_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_namcot175_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -127,7 +127,7 @@ class nes_namcot163_device : public nes_namcot340_device { public: // construction/destruction - nes_namcot163_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_namcot163_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/nanjing.cpp b/src/devices/bus/nes/nanjing.cpp index 9c4ea8bf3b1..a457f2b4c28 100644 --- a/src/devices/bus/nes/nanjing.cpp +++ b/src/devices/bus/nes/nanjing.cpp @@ -33,7 +33,7 @@ const device_type NES_NANJING = &device_creator<nes_nanjing_device>; -nes_nanjing_device::nes_nanjing_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_nanjing_device::nes_nanjing_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_NANJING, "NES Cart Nanjing PCB", tag, owner, clock, "nes_nanjing", __FILE__), m_count(0), m_latch1(0), diff --git a/src/devices/bus/nes/nanjing.h b/src/devices/bus/nes/nanjing.h index 3fe4d670527..10261929efb 100644 --- a/src/devices/bus/nes/nanjing.h +++ b/src/devices/bus/nes/nanjing.h @@ -12,7 +12,7 @@ class nes_nanjing_device : public nes_nrom_device { public: // construction/destruction - nes_nanjing_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_nanjing_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/nes_pcb.inc b/src/devices/bus/nes/nes_pcb.inc index b7af5aeefd4..32fabbcbbf3 100644 --- a/src/devices/bus/nes/nes_pcb.inc +++ b/src/devices/bus/nes/nes_pcb.inc @@ -381,7 +381,7 @@ const char * nes_cart_slot_device::nes_get_slot( int pcb_id ) struct nes_cart_lines { - const char *tag; + std::string tag; int line; }; @@ -414,9 +414,9 @@ static int nes_cart_get_line( const char *feature ) if (feature == nullptr) return 128; - while (nes_line->tag) + while (!nes_line->tag.empty()) { - if (strcmp(nes_line->tag, feature) == 0) + if (strcmp(nes_line->tag.c_str(), feature) == 0) break; nes_line++; diff --git a/src/devices/bus/nes/nes_slot.cpp b/src/devices/bus/nes/nes_slot.cpp index 05adca0f9ae..b40aeaa80e5 100644 --- a/src/devices/bus/nes/nes_slot.cpp +++ b/src/devices/bus/nes/nes_slot.cpp @@ -146,7 +146,7 @@ device_nes_cart_interface::~device_nes_cart_interface() // pointer allocators //------------------------------------------------- -void device_nes_cart_interface::prg_alloc(size_t size, const char *tag) +void device_nes_cart_interface::prg_alloc(size_t size, std::string tag) { if (m_prg == nullptr) { @@ -213,7 +213,7 @@ void device_nes_cart_interface::prg_alloc(size_t size, const char *tag) } } -void device_nes_cart_interface::vrom_alloc(size_t size, const char *tag) +void device_nes_cart_interface::vrom_alloc(size_t size, std::string tag) { if (m_vrom == nullptr) { @@ -742,7 +742,7 @@ void device_nes_cart_interface::nes_banks_restore() //------------------------------------------------- // nes_cart_slot_device - constructor //------------------------------------------------- -nes_cart_slot_device::nes_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nes_cart_slot_device::nes_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_CART_SLOT, "NES Cartridge Slot", tag, owner, clock, "nes_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), diff --git a/src/devices/bus/nes/nes_slot.h b/src/devices/bus/nes/nes_slot.h index ad2a1b1c28a..a12839e6be2 100644 --- a/src/devices/bus/nes/nes_slot.h +++ b/src/devices/bus/nes/nes_slot.h @@ -178,8 +178,8 @@ public: // hack until disk system is made modern! virtual void disk_flip_side() { } - void prg_alloc(size_t size, const char *tag); - void vrom_alloc(size_t size, const char *tag); + void prg_alloc(size_t size, std::string tag); + void vrom_alloc(size_t size, std::string tag); void prgram_alloc(size_t size); void vram_alloc(size_t size); void battery_alloc(size_t size); @@ -335,7 +335,7 @@ class nes_cart_slot_device : public device_t, { public: // construction/destruction - nes_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~nes_cart_slot_device(); // device-level overrides diff --git a/src/devices/bus/nes/ntdec.cpp b/src/devices/bus/nes/ntdec.cpp index 77b983137a3..6005e847471 100644 --- a/src/devices/bus/nes/ntdec.cpp +++ b/src/devices/bus/nes/ntdec.cpp @@ -38,13 +38,13 @@ const device_type NES_NTDEC_ASDER = &device_creator<nes_ntdec_asder_device>; const device_type NES_NTDEC_FH = &device_creator<nes_ntdec_fh_device>; -nes_ntdec_asder_device::nes_ntdec_asder_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_ntdec_asder_device::nes_ntdec_asder_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_NTDEC_ASDER, "NES Cart NTDEC Asder PCB", tag, owner, clock, "nes_ntdec_asder", __FILE__), m_latch(0) { } -nes_ntdec_fh_device::nes_ntdec_fh_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_ntdec_fh_device::nes_ntdec_fh_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_NTDEC_FH, "NES Cart NTDEC Fighting Hero PCB", tag, owner, clock, "nes_ntdec_fh", __FILE__) { } diff --git a/src/devices/bus/nes/ntdec.h b/src/devices/bus/nes/ntdec.h index bc6906179ce..6ca17c442de 100644 --- a/src/devices/bus/nes/ntdec.h +++ b/src/devices/bus/nes/ntdec.h @@ -12,7 +12,7 @@ class nes_ntdec_asder_device : public nes_nrom_device { public: // construction/destruction - nes_ntdec_asder_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_ntdec_asder_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -31,7 +31,7 @@ class nes_ntdec_fh_device : public nes_nrom_device { public: // construction/destruction - nes_ntdec_fh_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_ntdec_fh_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/nxrom.cpp b/src/devices/bus/nes/nxrom.cpp index c7fb9a90f3b..dad30116db6 100644 --- a/src/devices/bus/nes/nxrom.cpp +++ b/src/devices/bus/nes/nxrom.cpp @@ -59,74 +59,74 @@ const device_type NES_UN1ROM = &device_creator<nes_un1rom_device>; const device_type NES_NOCHR = &device_creator<nes_nochr_device>; -nes_nrom_device::nes_nrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_nrom_device::nes_nrom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_nes_cart_interface( mconfig, *this ) { } -nes_nrom_device::nes_nrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_nrom_device::nes_nrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_NROM, "NES Cart NROM PCB", tag, owner, clock, "nes_nrom", __FILE__), device_nes_cart_interface( mconfig, *this ) { } -nes_nrom368_device::nes_nrom368_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_nrom368_device::nes_nrom368_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_NROM368, "NES Cart NROM-368 PCB", tag, owner, clock, "nes_nrom368", __FILE__) { } -nes_fcbasic_device::nes_fcbasic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_fcbasic_device::nes_fcbasic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_FCBASIC, "NES Cart Famicom BASIC PCB", tag, owner, clock, "nes_fcbasic", __FILE__) { } -nes_axrom_device::nes_axrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_axrom_device::nes_axrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_AXROM, "NES Cart AxROM PCB", tag, owner, clock, "nes_axrom", __FILE__) { } -nes_bxrom_device::nes_bxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bxrom_device::nes_bxrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_BXROM, "NES Cart BxROM PCB", tag, owner, clock, "nes_bxrom", __FILE__) { } -nes_cnrom_device::nes_cnrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_cnrom_device::nes_cnrom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_chr_open_bus(0) { } -nes_cnrom_device::nes_cnrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_cnrom_device::nes_cnrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_CNROM, "NES Cart CNROM PCB", tag, owner, clock, "nes_cnrom", __FILE__), m_chr_open_bus(0) { } -nes_cprom_device::nes_cprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_cprom_device::nes_cprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_CPROM, "NES Cart CPROM PCB", tag, owner, clock, "nes_cprom", __FILE__) { } -nes_gxrom_device::nes_gxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_gxrom_device::nes_gxrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_GXROM, "NES Cart GxROM PCB", tag, owner, clock, "nes_gxrom", __FILE__) { } -nes_uxrom_device::nes_uxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_uxrom_device::nes_uxrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_UXROM, "NES Cart UxROM PCB", tag, owner, clock, "nes_uxrom", __FILE__) { } -nes_uxrom_cc_device::nes_uxrom_cc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_uxrom_cc_device::nes_uxrom_cc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_UXROM_CC, "NES Cart UNROM M5 PCB (Crazy Climber)", tag, owner, clock, "nes_uxrom_cc", __FILE__) { } -nes_un1rom_device::nes_un1rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_un1rom_device::nes_un1rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_UN1ROM, "NES Cart UN1ROM PCB", tag, owner, clock, "nes_un1rom", __FILE__) { } -nes_nochr_device::nes_nochr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_nochr_device::nes_nochr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_NOCHR, "NES Cart NoCash NOCHR PCB", tag, owner, clock, "nes_nochr", __FILE__) { } diff --git a/src/devices/bus/nes/nxrom.h b/src/devices/bus/nes/nxrom.h index e813e4f1ad3..9b1ddaea421 100644 --- a/src/devices/bus/nes/nxrom.h +++ b/src/devices/bus/nes/nxrom.h @@ -14,8 +14,8 @@ class nes_nrom_device : public device_t, { public: // construction/destruction - nes_nrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - nes_nrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_nrom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_nrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void device_start() override { common_start(); } @@ -31,7 +31,7 @@ class nes_nrom368_device : public nes_nrom_device { public: // construction/destruction - nes_nrom368_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_nrom368_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual DECLARE_READ8_MEMBER(read_l) override; virtual DECLARE_READ8_MEMBER(read_m) override; @@ -45,7 +45,7 @@ class nes_fcbasic_device : public nes_nrom_device { public: // construction/destruction - nes_fcbasic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_fcbasic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // emulate the additional WRAM }; @@ -57,7 +57,7 @@ class nes_axrom_device : public nes_nrom_device { public: // construction/destruction - nes_axrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_axrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -73,7 +73,7 @@ class nes_bxrom_device : public nes_nrom_device { public: // construction/destruction - nes_bxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bxrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -89,8 +89,8 @@ class nes_cnrom_device : public nes_nrom_device { public: // construction/destruction - nes_cnrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - nes_cnrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_cnrom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_cnrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -110,7 +110,7 @@ class nes_cprom_device : public nes_nrom_device { public: // construction/destruction - nes_cprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_cprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -126,7 +126,7 @@ class nes_gxrom_device : public nes_nrom_device { public: // construction/destruction - nes_gxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_gxrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -142,7 +142,7 @@ class nes_uxrom_device : public nes_nrom_device { public: // construction/destruction - nes_uxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_uxrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -158,7 +158,7 @@ class nes_uxrom_cc_device : public nes_nrom_device { public: // construction/destruction - nes_uxrom_cc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_uxrom_cc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -174,7 +174,7 @@ class nes_un1rom_device : public nes_nrom_device { public: // construction/destruction - nes_un1rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_un1rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -190,7 +190,7 @@ class nes_nochr_device : public nes_nrom_device { public: // construction/destruction - nes_nochr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_nochr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual DECLARE_READ8_MEMBER(chr_r) override; diff --git a/src/devices/bus/nes/pirate.cpp b/src/devices/bus/nes/pirate.cpp index 9d31e1b7a1f..253b9d6d39b 100644 --- a/src/devices/bus/nes/pirate.cpp +++ b/src/devices/bus/nes/pirate.cpp @@ -53,87 +53,87 @@ const device_type NES_TF1201 = &device_creator<nes_tf1201_device>; const device_type NES_CITYFIGHT = &device_creator<nes_cityfight_device>; -nes_agci_device::nes_agci_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_agci_device::nes_agci_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_AGCI_50282, "NES Cart AGCI 50282 PCB", tag, owner, clock, "nes_agci50282", __FILE__) { } -nes_dreamtech_device::nes_dreamtech_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_dreamtech_device::nes_dreamtech_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_DREAMTECH01, "NES Cart Dreamtech01 PCB", tag, owner, clock, "nes_dreamtech", __FILE__) { } -nes_fukutake_device::nes_fukutake_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_fukutake_device::nes_fukutake_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_FUKUTAKE, "NES Cart Fukutake Study Box PCB", tag, owner, clock, "nes_fukutake", __FILE__), m_latch(0) { } -nes_futuremedia_device::nes_futuremedia_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_futuremedia_device::nes_futuremedia_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_FUTUREMEDIA, "NES Cart FutureMedia PCB", tag, owner, clock, "nes_futuremedia", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_clear(0), m_irq_enable(0) { } -nes_magseries_device::nes_magseries_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_magseries_device::nes_magseries_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_MAGSERIES, "NES Cart Magical Series PCB", tag, owner, clock, "nes_magseries", __FILE__) { } -nes_daou306_device::nes_daou306_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_daou306_device::nes_daou306_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_DAOU306, "NES Cart Daou 306 PCB", tag, owner, clock, "nes_daou306", __FILE__) { } -nes_subor0_device::nes_subor0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_subor0_device::nes_subor0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_SUBOR0, "NES Cart Subor Type 0 PCB", tag, owner, clock, "nes_subor0", __FILE__) { } -nes_subor1_device::nes_subor1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_subor1_device::nes_subor1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_SUBOR1, "NES Cart Subor Type 1 PCB", tag, owner, clock, "nes_subor1", __FILE__) { } -nes_cc21_device::nes_cc21_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_cc21_device::nes_cc21_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_CC21, "NES Cart CC-21 PCB", tag, owner, clock, "nes_cc21", __FILE__) { } -nes_xiaozy_device::nes_xiaozy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_xiaozy_device::nes_xiaozy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_XIAOZY, "NES Cart Xiao Zhuan Yuan PCB", tag, owner, clock, "nes_xiaozy", __FILE__) { } -nes_edu2k_device::nes_edu2k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_edu2k_device::nes_edu2k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_EDU2K, "NES Cart Educational Computer 2000 PCB", tag, owner, clock, "nes_edu2k", __FILE__), m_latch(0) { } -nes_t230_device::nes_t230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_t230_device::nes_t230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_T230, "NES Cart T-230 PCB", tag, owner, clock, "nes_t230", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_mode(0), m_irq_enable(0), m_irq_enable_latch(0) { } -nes_mk2_device::nes_mk2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_mk2_device::nes_mk2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_MK2, "NES Cart Mortal Kombat 2 PCB", tag, owner, clock, "nes_mk2", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_clear(0), m_irq_enable(0) { } -nes_whero_device::nes_whero_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_whero_device::nes_whero_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_WHERO, "NES Cart World Heroes PCB", tag, owner, clock, "nes_whero", __FILE__), m_reg(0), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), m_irq_enable_latch(0) { } -nes_43272_device::nes_43272_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_43272_device::nes_43272_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_43272, "NES Cart UNL-43272 PCB", tag, owner, clock, "nes_43272", __FILE__), m_latch(0) { } -nes_tf1201_device::nes_tf1201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_tf1201_device::nes_tf1201_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_TF1201, "NES Cart UNL-TF1201 PCB", tag, owner, clock, "nes_tf1201", __FILE__), m_prg(0), m_swap(0), m_irq_count(0), m_irq_enable(0), m_irq_enable_latch(0) { } -nes_cityfight_device::nes_cityfight_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_cityfight_device::nes_cityfight_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_TF1201, "NES Cart City Fighter PCB", tag, owner, clock, "nes_cityfight", __FILE__), m_prg_reg(0), m_prg_mode(0), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) { } diff --git a/src/devices/bus/nes/pirate.h b/src/devices/bus/nes/pirate.h index c9425d5e263..75830a399d8 100644 --- a/src/devices/bus/nes/pirate.h +++ b/src/devices/bus/nes/pirate.h @@ -12,7 +12,7 @@ class nes_agci_device : public nes_nrom_device { public: // construction/destruction - nes_agci_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_agci_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -28,7 +28,7 @@ class nes_dreamtech_device : public nes_nrom_device { public: // construction/destruction - nes_dreamtech_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_dreamtech_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -44,7 +44,7 @@ class nes_fukutake_device : public nes_nrom_device { public: // construction/destruction - nes_fukutake_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_fukutake_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -67,7 +67,7 @@ class nes_futuremedia_device : public nes_nrom_device { public: // construction/destruction - nes_futuremedia_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_futuremedia_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -89,7 +89,7 @@ class nes_magseries_device : public nes_nrom_device { public: // construction/destruction - nes_magseries_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_magseries_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -105,7 +105,7 @@ class nes_daou306_device : public nes_nrom_device { public: // construction/destruction - nes_daou306_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_daou306_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -124,7 +124,7 @@ class nes_subor0_device : public nes_nrom_device { public: // construction/destruction - nes_subor0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_subor0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -143,7 +143,7 @@ class nes_subor1_device : public nes_nrom_device { public: // construction/destruction - nes_subor1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_subor1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -162,7 +162,7 @@ class nes_cc21_device : public nes_nrom_device { public: // construction/destruction - nes_cc21_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_cc21_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -178,7 +178,7 @@ class nes_xiaozy_device : public nes_nrom_device { public: // construction/destruction - nes_xiaozy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_xiaozy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -194,7 +194,7 @@ class nes_edu2k_device : public nes_nrom_device { public: // construction/destruction - nes_edu2k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_edu2k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -215,7 +215,7 @@ class nes_t230_device : public nes_nrom_device { public: // construction/destruction - nes_t230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_t230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -239,7 +239,7 @@ class nes_mk2_device : public nes_nrom_device { public: // construction/destruction - nes_mk2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_mk2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -261,7 +261,7 @@ class nes_whero_device : public nes_nrom_device { public: // construction/destruction - nes_whero_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_whero_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -286,7 +286,7 @@ class nes_43272_device : public nes_nrom_device { public: // construction/destruction - nes_43272_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_43272_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -306,7 +306,7 @@ class nes_tf1201_device : public nes_nrom_device { public: // construction/destruction - nes_tf1201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_tf1201_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -331,7 +331,7 @@ class nes_cityfight_device : public nes_nrom_device { public: // construction/destruction - nes_cityfight_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_cityfight_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -361,7 +361,7 @@ class nes_fujiya_device : public nes_nrom_device { public: // construction/destruction - nes_fujiya_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_fujiya_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/pt554.cpp b/src/devices/bus/nes/pt554.cpp index c9fec996e8e..0f339f6b7ef 100644 --- a/src/devices/bus/nes/pt554.cpp +++ b/src/devices/bus/nes/pt554.cpp @@ -34,7 +34,7 @@ const device_type NES_BANDAI_PT554 = &device_creator<nes_bandai_pt554_device>; -nes_bandai_pt554_device::nes_bandai_pt554_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_bandai_pt554_device::nes_bandai_pt554_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_cnrom_device(mconfig, NES_BANDAI_PT554, "NES Cart Bandai PT-554 PCB", tag, owner, clock, "nes_bandai_pt554", __FILE__), m_samples(*this, "samples") { diff --git a/src/devices/bus/nes/pt554.h b/src/devices/bus/nes/pt554.h index b42cc048d5e..ade218a0ce8 100644 --- a/src/devices/bus/nes/pt554.h +++ b/src/devices/bus/nes/pt554.h @@ -12,7 +12,7 @@ class nes_bandai_pt554_device : public nes_cnrom_device { public: // construction/destruction - nes_bandai_pt554_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bandai_pt554_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/nes/racermate.cpp b/src/devices/bus/nes/racermate.cpp index 9f549dc1f2d..c62edaedd9d 100644 --- a/src/devices/bus/nes/racermate.cpp +++ b/src/devices/bus/nes/racermate.cpp @@ -35,7 +35,7 @@ const device_type NES_RACERMATE = &device_creator<nes_racermate_device>; -nes_racermate_device::nes_racermate_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_racermate_device::nes_racermate_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_RACERMATE, "NES Cart Racermate PCB", tag, owner, clock, "nes_racermate", __FILE__), m_latch(0) { diff --git a/src/devices/bus/nes/racermate.h b/src/devices/bus/nes/racermate.h index 3ba50b399ae..c0331615eca 100644 --- a/src/devices/bus/nes/racermate.h +++ b/src/devices/bus/nes/racermate.h @@ -12,7 +12,7 @@ class nes_racermate_device : public nes_nrom_device { public: // construction/destruction - nes_racermate_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_racermate_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/rcm.cpp b/src/devices/bus/nes/rcm.cpp index a599dcbd432..c1398a7f853 100644 --- a/src/devices/bus/nes/rcm.cpp +++ b/src/devices/bus/nes/rcm.cpp @@ -46,27 +46,27 @@ const device_type NES_TF9IN1 = &device_creator<nes_tf9_device>; const device_type NES_3DBLOCK = &device_creator<nes_3dblock_device>; -nes_gs2015_device::nes_gs2015_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_gs2015_device::nes_gs2015_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_GS2015, "NES Cart RCM GS-2015 PCB", tag, owner, clock, "nes_gs2015", __FILE__) { } -nes_gs2004_device::nes_gs2004_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_gs2004_device::nes_gs2004_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_GS2004, "NES Cart RCM GS-2004 PCB", tag, owner, clock, "nes_gs2004", __FILE__) { } -nes_gs2013_device::nes_gs2013_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_gs2013_device::nes_gs2013_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_GS2013, "NES Cart RCM GS-2013 PCB", tag, owner, clock, "nes_gs2013", __FILE__) { } -nes_tf9_device::nes_tf9_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_tf9_device::nes_tf9_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_TF9IN1, "NES Cart RCM Tetris Family 9 in 1 PCB", tag, owner, clock, "nes_tetrisfam", __FILE__) { } -nes_3dblock_device::nes_3dblock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_3dblock_device::nes_3dblock_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_3DBLOCK, "NES Cart RCM 3D Block PCB", tag, owner, clock, "nes_3dblock", __FILE__), m_irq_count(0) { } diff --git a/src/devices/bus/nes/rcm.h b/src/devices/bus/nes/rcm.h index 0b78c1e41bf..3da3108a664 100644 --- a/src/devices/bus/nes/rcm.h +++ b/src/devices/bus/nes/rcm.h @@ -12,7 +12,7 @@ class nes_gs2015_device : public nes_nrom_device { public: // construction/destruction - nes_gs2015_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_gs2015_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -30,7 +30,7 @@ class nes_gs2004_device : public nes_nrom_device { public: // construction/destruction - nes_gs2004_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_gs2004_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -46,7 +46,7 @@ class nes_gs2013_device : public nes_nrom_device { public: // construction/destruction - nes_gs2013_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_gs2013_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -62,7 +62,7 @@ class nes_tf9_device : public nes_nrom_device { public: // construction/destruction - nes_tf9_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_tf9_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -78,7 +78,7 @@ class nes_3dblock_device : public nes_nrom_device { public: // construction/destruction - nes_3dblock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_3dblock_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/rexsoft.cpp b/src/devices/bus/nes/rexsoft.cpp index ed2b7246726..d765edd9559 100644 --- a/src/devices/bus/nes/rexsoft.cpp +++ b/src/devices/bus/nes/rexsoft.cpp @@ -39,13 +39,13 @@ const device_type NES_REX_DBZ5 = &device_creator<nes_rex_dbz5_device>; const device_type NES_REX_SL1632 = &device_creator<nes_rex_sl1632_device>; -nes_rex_dbz5_device::nes_rex_dbz5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_rex_dbz5_device::nes_rex_dbz5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_REX_DBZ5, "NES Cart Rex Soft DragonBall Z V PCB", tag, owner, clock, "nes_rex_dbz5", __FILE__), m_extra(0) { } -nes_rex_sl1632_device::nes_rex_sl1632_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_rex_sl1632_device::nes_rex_sl1632_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_REX_SL1632, "NES Cart Rex Soft SL-1632 PCB", tag, owner, clock, "nes_rex_sl1632", __FILE__), m_mode(0), m_mirror(0) { } diff --git a/src/devices/bus/nes/rexsoft.h b/src/devices/bus/nes/rexsoft.h index 0b9799ee168..120368112f3 100644 --- a/src/devices/bus/nes/rexsoft.h +++ b/src/devices/bus/nes/rexsoft.h @@ -12,7 +12,7 @@ class nes_rex_dbz5_device : public nes_txrom_device { public: // construction/destruction - nes_rex_dbz5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_rex_dbz5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -34,7 +34,7 @@ class nes_rex_sl1632_device : public nes_txrom_device { public: // construction/destruction - nes_rex_sl1632_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_rex_sl1632_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/sachen.cpp b/src/devices/bus/nes/sachen.cpp index a5128b1bf6a..746dfdcc695 100644 --- a/src/devices/bus/nes/sachen.cpp +++ b/src/devices/bus/nes/sachen.cpp @@ -60,82 +60,82 @@ const device_type NES_SACHEN_8259C = &device_creator<nes_sachen_8259c_device>; const device_type NES_SACHEN_8259D = &device_creator<nes_sachen_8259d_device>; -nes_sachen_sa009_device::nes_sachen_sa009_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_sachen_sa009_device::nes_sachen_sa009_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_SACHEN_SA009, "NES Cart Sachen SA009 PCB", tag, owner, clock, "nes_sa009", __FILE__) { } -nes_sachen_sa0036_device::nes_sachen_sa0036_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_sachen_sa0036_device::nes_sachen_sa0036_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_SACHEN_SA0036, "NES Cart Sachen sa0036 PCB", tag, owner, clock, "nes_sa0036", __FILE__) { } -nes_sachen_sa0037_device::nes_sachen_sa0037_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_sachen_sa0037_device::nes_sachen_sa0037_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_SACHEN_SA0037, "NES Cart Sachen sa0037 PCB", tag, owner, clock, "nes_sa0037", __FILE__) { } -nes_sachen_sa72007_device::nes_sachen_sa72007_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_sachen_sa72007_device::nes_sachen_sa72007_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_SACHEN_SA72007, "NES Cart Sachen SA72007 PCB", tag, owner, clock, "nes_sa72007", __FILE__) { } -nes_sachen_sa72008_device::nes_sachen_sa72008_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_sachen_sa72008_device::nes_sachen_sa72008_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_SACHEN_SA72008, "NES Cart Sachen SA72008 PCB", tag, owner, clock, "nes_sa72008", __FILE__) { } -nes_sachen_tca01_device::nes_sachen_tca01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_sachen_tca01_device::nes_sachen_tca01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_SACHEN_TCA01, "NES Cart Sachen TCA-01 PCB", tag, owner, clock, "nes_tca01", __FILE__) { } -nes_sachen_tcu01_device::nes_sachen_tcu01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_sachen_tcu01_device::nes_sachen_tcu01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_SACHEN_TCU01, "NES Cart Sachen TCU-01 PCB", tag, owner, clock, "nes_tcu01", __FILE__) { } -nes_sachen_tcu02_device::nes_sachen_tcu02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_sachen_tcu02_device::nes_sachen_tcu02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_SACHEN_TCU02, "NES Cart Sachen TCU-02 PCB", tag, owner, clock, "nes_tcu02", __FILE__), m_latch(0) { } -nes_sachen_74x374_device::nes_sachen_74x374_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_sachen_74x374_device::nes_sachen_74x374_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_latch(0), m_mmc_vrom_bank(0) { } -nes_sachen_74x374_device::nes_sachen_74x374_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_sachen_74x374_device::nes_sachen_74x374_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_SACHEN_74X374, "NES Cart Sachen 74*374 PCB", tag, owner, clock, "nes_s74x34", __FILE__), m_latch(0), m_mmc_vrom_bank(0) { } -nes_sachen_74x374_alt_device::nes_sachen_74x374_alt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_sachen_74x374_alt_device::nes_sachen_74x374_alt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_sachen_74x374_device(mconfig, NES_SACHEN_74X374_ALT, "NES Cart Sachen 74*374 Alt PCB", tag, owner, clock, "nes_s74x34a", __FILE__) { } -nes_sachen_8259a_device::nes_sachen_8259a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_sachen_8259a_device::nes_sachen_8259a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : nes_sachen_74x374_device(mconfig, type, name, tag, owner, clock, shortname, source) { } -nes_sachen_8259a_device::nes_sachen_8259a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_sachen_8259a_device::nes_sachen_8259a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_sachen_74x374_device(mconfig, NES_SACHEN_8259A, "NES Cart Sachen 8259A PCB", tag, owner, clock, "nes_s8259a", __FILE__) { } -nes_sachen_8259b_device::nes_sachen_8259b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_sachen_8259b_device::nes_sachen_8259b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_sachen_8259a_device(mconfig, NES_SACHEN_8259B, "NES Cart Sachen 8259B PCB", tag, owner, clock, "nes_s8259b", __FILE__) { } -nes_sachen_8259c_device::nes_sachen_8259c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_sachen_8259c_device::nes_sachen_8259c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_sachen_8259a_device(mconfig, NES_SACHEN_8259C, "NES Cart Sachen 8259C PCB", tag, owner, clock, "nes_s8259c", __FILE__) { } -nes_sachen_8259d_device::nes_sachen_8259d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_sachen_8259d_device::nes_sachen_8259d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_sachen_8259a_device(mconfig, NES_SACHEN_8259D, "NES Cart Sachen 8259D PCB", tag, owner, clock, "nes_s8259d", __FILE__) { } diff --git a/src/devices/bus/nes/sachen.h b/src/devices/bus/nes/sachen.h index 066a5e86a57..05b72385a9f 100644 --- a/src/devices/bus/nes/sachen.h +++ b/src/devices/bus/nes/sachen.h @@ -12,7 +12,7 @@ class nes_sachen_sa009_device : public nes_nrom_device { public: // construction/destruction - nes_sachen_sa009_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_sachen_sa009_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -28,7 +28,7 @@ class nes_sachen_sa0036_device : public nes_nrom_device { public: // construction/destruction - nes_sachen_sa0036_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_sachen_sa0036_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -44,7 +44,7 @@ class nes_sachen_sa0037_device : public nes_nrom_device { public: // construction/destruction - nes_sachen_sa0037_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_sachen_sa0037_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -60,7 +60,7 @@ class nes_sachen_sa72007_device : public nes_nrom_device { public: // construction/destruction - nes_sachen_sa72007_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_sachen_sa72007_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -76,7 +76,7 @@ class nes_sachen_sa72008_device : public nes_nrom_device { public: // construction/destruction - nes_sachen_sa72008_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_sachen_sa72008_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -92,7 +92,7 @@ class nes_sachen_tca01_device : public nes_nrom_device { public: // construction/destruction - nes_sachen_tca01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_sachen_tca01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -108,7 +108,7 @@ class nes_sachen_tcu01_device : public nes_nrom_device { public: // construction/destruction - nes_sachen_tcu01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_sachen_tcu01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -126,7 +126,7 @@ class nes_sachen_tcu02_device : public nes_nrom_device { public: // construction/destruction - nes_sachen_tcu02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_sachen_tcu02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -146,8 +146,8 @@ class nes_sachen_74x374_device : public nes_nrom_device { public: // construction/destruction - nes_sachen_74x374_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - nes_sachen_74x374_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_sachen_74x374_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_sachen_74x374_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -168,7 +168,7 @@ class nes_sachen_74x374_alt_device : public nes_sachen_74x374_device { public: // construction/destruction - nes_sachen_74x374_alt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_sachen_74x374_alt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual DECLARE_READ8_MEMBER(read_l) override { return 0xff; } // no read_l here @@ -182,8 +182,8 @@ class nes_sachen_8259a_device : public nes_sachen_74x374_device { public: // construction/destruction - nes_sachen_8259a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - nes_sachen_8259a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_sachen_8259a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_sachen_8259a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -204,7 +204,7 @@ class nes_sachen_8259b_device : public nes_sachen_8259a_device { public: // construction/destruction - nes_sachen_8259b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_sachen_8259b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: virtual void chr_update() override; @@ -217,7 +217,7 @@ class nes_sachen_8259c_device : public nes_sachen_8259a_device { public: // construction/destruction - nes_sachen_8259c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_sachen_8259c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: virtual void chr_update() override; @@ -230,7 +230,7 @@ class nes_sachen_8259d_device : public nes_sachen_8259a_device { public: // construction/destruction - nes_sachen_8259d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_sachen_8259d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void pcb_reset() override; diff --git a/src/devices/bus/nes/somari.cpp b/src/devices/bus/nes/somari.cpp index 39af6273eee..acdbf59e920 100644 --- a/src/devices/bus/nes/somari.cpp +++ b/src/devices/bus/nes/somari.cpp @@ -39,7 +39,7 @@ const device_type NES_SOMARI = &device_creator<nes_somari_device>; -nes_somari_device::nes_somari_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_somari_device::nes_somari_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_SOMARI, "NES Cart Team Somari PCB", tag, owner, clock, "nes_somari", __FILE__), m_board_mode(0), m_mmc3_mirror_reg(0), diff --git a/src/devices/bus/nes/somari.h b/src/devices/bus/nes/somari.h index 340bdc1d439..69b52cf8455 100644 --- a/src/devices/bus/nes/somari.h +++ b/src/devices/bus/nes/somari.h @@ -12,7 +12,7 @@ class nes_somari_device : public nes_txrom_device { public: // construction/destruction - nes_somari_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_somari_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/sunsoft.cpp b/src/devices/bus/nes/sunsoft.cpp index 8cc1929b308..c28554c5c67 100644 --- a/src/devices/bus/nes/sunsoft.cpp +++ b/src/devices/bus/nes/sunsoft.cpp @@ -48,42 +48,42 @@ const device_type NES_SUNSOFT_FME7 = &device_creator<nes_sunsoft_fme7_device>; const device_type NES_SUNSOFT_5 = &device_creator<nes_sunsoft_5_device>; -nes_sunsoft_1_device::nes_sunsoft_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_sunsoft_1_device::nes_sunsoft_1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_SUNSOFT_1, "NES Cart Sunsoft 1 PCB", tag, owner, clock, "nes_sun1", __FILE__) { } -nes_sunsoft_2_device::nes_sunsoft_2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_sunsoft_2_device::nes_sunsoft_2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_SUNSOFT_2, "NES Cart Sunsoft 2 PCB", tag, owner, clock, "nes_sun2", __FILE__) { } -nes_sunsoft_3_device::nes_sunsoft_3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_sunsoft_3_device::nes_sunsoft_3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_SUNSOFT_3, "NES Cart Sunsoft 3 PCB", tag, owner, clock, "nes_sun3", __FILE__), m_irq_count(0), m_irq_enable(0), m_irq_toggle(0), irq_timer(nullptr) { } -nes_sunsoft_4_device::nes_sunsoft_4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_sunsoft_4_device::nes_sunsoft_4_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_reg(0), m_latch1(0), m_latch2(0), m_wram_enable(0) { } -nes_sunsoft_4_device::nes_sunsoft_4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_sunsoft_4_device::nes_sunsoft_4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_SUNSOFT_4, "NES Cart Sunsoft 4 PCB", tag, owner, clock, "nes_sun4", __FILE__), m_reg(0), m_latch1(0), m_latch2(0), m_wram_enable(0) { } -nes_sunsoft_fme7_device::nes_sunsoft_fme7_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_sunsoft_fme7_device::nes_sunsoft_fme7_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr), m_latch(0), m_wram_bank(0) { } -nes_sunsoft_fme7_device::nes_sunsoft_fme7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_sunsoft_fme7_device::nes_sunsoft_fme7_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_SUNSOFT_4, "NES Cart Sunsoft FME7 PCB", tag, owner, clock, "nes_fme7", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr), m_latch(0), m_wram_bank(0) { } -nes_sunsoft_5_device::nes_sunsoft_5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_sunsoft_5_device::nes_sunsoft_5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_sunsoft_fme7_device(mconfig, NES_SUNSOFT_5, "NES Cart Sunsoft 5A/5B PCB", tag, owner, clock, "nes_sun5", __FILE__), m_ym2149(*this, "ay") { diff --git a/src/devices/bus/nes/sunsoft.h b/src/devices/bus/nes/sunsoft.h index 8e55a80ce39..70ce2f7be12 100644 --- a/src/devices/bus/nes/sunsoft.h +++ b/src/devices/bus/nes/sunsoft.h @@ -13,7 +13,7 @@ class nes_sunsoft_1_device : public nes_nrom_device { public: // construction/destruction - nes_sunsoft_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_sunsoft_1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -29,7 +29,7 @@ class nes_sunsoft_2_device : public nes_nrom_device { public: // construction/destruction - nes_sunsoft_2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_sunsoft_2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -45,7 +45,7 @@ class nes_sunsoft_3_device : public nes_nrom_device { public: // construction/destruction - nes_sunsoft_3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_sunsoft_3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -69,8 +69,8 @@ class nes_sunsoft_4_device : public nes_nrom_device { public: // construction/destruction - nes_sunsoft_4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - nes_sunsoft_4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_sunsoft_4_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_sunsoft_4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -92,8 +92,8 @@ class nes_sunsoft_fme7_device : public nes_nrom_device { public: // construction/destruction - nes_sunsoft_fme7_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - nes_sunsoft_fme7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_sunsoft_fme7_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_sunsoft_fme7_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -123,7 +123,7 @@ class nes_sunsoft_5_device : public nes_sunsoft_fme7_device { public: // construction/destruction - nes_sunsoft_5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_sunsoft_5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/nes/sunsoft_dcs.cpp b/src/devices/bus/nes/sunsoft_dcs.cpp index 25d1a1db623..2e96637af77 100644 --- a/src/devices/bus/nes/sunsoft_dcs.cpp +++ b/src/devices/bus/nes/sunsoft_dcs.cpp @@ -50,7 +50,7 @@ ntb_cart_interface::~ntb_cart_interface() const device_type NES_NTB_SLOT = &device_creator<nes_ntb_slot_device>; -nes_ntb_slot_device::nes_ntb_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nes_ntb_slot_device::nes_ntb_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_NTB_SLOT, "NES NTB Cartridge Slot", tag, owner, clock, "nes_ntb_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), m_cart(nullptr) @@ -128,7 +128,7 @@ ROM_END const device_type NES_NTB_ROM = &device_creator<nes_ntb_rom_device>; -nes_ntb_rom_device::nes_ntb_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_ntb_rom_device::nes_ntb_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_NTB_ROM, "NES NTB ROM", tag, owner, clock, "nes_ntbrom", __FILE__), ntb_cart_interface( mconfig, *this ) { @@ -162,7 +162,7 @@ UINT8 *nes_ntb_rom_device::get_cart_base() const device_type NES_SUNSOFT_DCS = &device_creator<nes_sunsoft_dcs_device>; -nes_sunsoft_dcs_device::nes_sunsoft_dcs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_sunsoft_dcs_device::nes_sunsoft_dcs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_sunsoft_4_device(mconfig, NES_SUNSOFT_DCS, "NES Cart Sunsoft DCS PCB", tag, owner, clock, "nes_dcs", __FILE__), m_timer_on(0), m_exrom_enable(0), m_subslot(*this, "ntb_slot"), ntb_enable_timer(nullptr) { diff --git a/src/devices/bus/nes/sunsoft_dcs.h b/src/devices/bus/nes/sunsoft_dcs.h index 83393719cf7..c646a79f1a8 100644 --- a/src/devices/bus/nes/sunsoft_dcs.h +++ b/src/devices/bus/nes/sunsoft_dcs.h @@ -39,7 +39,7 @@ class nes_ntb_slot_device : public device_t, { public: // construction/destruction - nes_ntb_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_ntb_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~nes_ntb_slot_device(); // device-level overrides @@ -90,7 +90,7 @@ class nes_ntb_rom_device : public device_t, { public: // construction/destruction - nes_ntb_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_ntb_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -120,7 +120,7 @@ class nes_sunsoft_dcs_device : public nes_sunsoft_4_device { public: // construction/destruction - nes_sunsoft_dcs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_sunsoft_dcs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/taito.cpp b/src/devices/bus/nes/taito.cpp index 6d3a4e68941..81d2106acd9 100644 --- a/src/devices/bus/nes/taito.cpp +++ b/src/devices/bus/nes/taito.cpp @@ -47,27 +47,27 @@ const device_type NES_X1_005 = &device_creator<nes_x1_005_device>; const device_type NES_X1_017 = &device_creator<nes_x1_017_device>; -nes_tc0190fmc_device::nes_tc0190fmc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_tc0190fmc_device::nes_tc0190fmc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source) { } -nes_tc0190fmc_device::nes_tc0190fmc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_tc0190fmc_device::nes_tc0190fmc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_TC0190FMC, "NES Cart Taito TC0190FMC PCB", tag, owner, clock, "nes_tc0190fmc", __FILE__) { } -nes_tc0190fmc_pal16r4_device::nes_tc0190fmc_pal16r4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_tc0190fmc_pal16r4_device::nes_tc0190fmc_pal16r4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_tc0190fmc_device(mconfig, NES_TC0190FMC_PAL16R4, "NES Cart Taito TC0190FMC + PAL16R4 PCB", tag, owner, clock, "nes_tc0190pal", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0) { } -nes_x1_005_device::nes_x1_005_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_x1_005_device::nes_x1_005_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_X1_005, "NES Cart Taito X1-005 PCB", tag, owner, clock, "nes_x1_005", __FILE__), m_latch(0) { } -nes_x1_017_device::nes_x1_017_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_x1_017_device::nes_x1_017_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_X1_017, "NES Cart Taito X1-017 PCB", tag, owner, clock, "nes_x1_017", __FILE__), m_latch(0) { } diff --git a/src/devices/bus/nes/taito.h b/src/devices/bus/nes/taito.h index 38fa05d960c..7876570f660 100644 --- a/src/devices/bus/nes/taito.h +++ b/src/devices/bus/nes/taito.h @@ -12,8 +12,8 @@ class nes_tc0190fmc_device : public nes_nrom_device { public: // construction/destruction - nes_tc0190fmc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - nes_tc0190fmc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_tc0190fmc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_tc0190fmc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -30,7 +30,7 @@ class nes_tc0190fmc_pal16r4_device : public nes_tc0190fmc_device { public: // construction/destruction - nes_tc0190fmc_pal16r4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_tc0190fmc_pal16r4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -51,7 +51,7 @@ class nes_x1_005_device : public nes_nrom_device { public: // construction/destruction - nes_x1_005_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_x1_005_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -73,7 +73,7 @@ class nes_x1_017_device : public nes_nrom_device { public: // construction/destruction - nes_x1_017_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_x1_017_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/tengen.cpp b/src/devices/bus/nes/tengen.cpp index 828519a0e71..809c8266b53 100644 --- a/src/devices/bus/nes/tengen.cpp +++ b/src/devices/bus/nes/tengen.cpp @@ -43,22 +43,22 @@ const device_type NES_TENGEN_800032 = &device_creator<nes_tengen032_device>; const device_type NES_TENGEN_800037 = &device_creator<nes_tengen037_device>; -nes_tengen008_device::nes_tengen008_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_tengen008_device::nes_tengen008_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_TENGEN_800008, "NES Cart Tengen 800008 PCB", tag, owner, clock, "nes_tengen008", __FILE__) { } -nes_tengen032_device::nes_tengen032_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_tengen032_device::nes_tengen032_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_irq_count(0), m_irq_count_latch(0), m_irq_mode(0), m_irq_reset(0), m_irq_enable(0), m_latch(0), irq_timer(nullptr) { } -nes_tengen032_device::nes_tengen032_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_tengen032_device::nes_tengen032_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_TENGEN_800032, "NES Cart Tengen 800032 PCB", tag, owner, clock, "nes_tengen032", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_mode(0), m_irq_reset(0), m_irq_enable(0), m_latch(0), irq_timer(nullptr) { } -nes_tengen037_device::nes_tengen037_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_tengen037_device::nes_tengen037_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_tengen032_device(mconfig, NES_TENGEN_800037, "NES Cart Tengen 800037 PCB", tag, owner, clock, "nes_tengen037", __FILE__) { } diff --git a/src/devices/bus/nes/tengen.h b/src/devices/bus/nes/tengen.h index d812443b613..1cd88894603 100644 --- a/src/devices/bus/nes/tengen.h +++ b/src/devices/bus/nes/tengen.h @@ -12,7 +12,7 @@ class nes_tengen008_device : public nes_nrom_device { public: // construction/destruction - nes_tengen008_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_tengen008_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -28,8 +28,8 @@ class nes_tengen032_device : public nes_nrom_device { public: // construction/destruction - nes_tengen032_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - nes_tengen032_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_tengen032_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_tengen032_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -66,7 +66,7 @@ class nes_tengen037_device : public nes_tengen032_device { public: // construction/destruction - nes_tengen037_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_tengen037_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_h) override; diff --git a/src/devices/bus/nes/txc.cpp b/src/devices/bus/nes/txc.cpp index ae36ece75ee..73512f43c3a 100644 --- a/src/devices/bus/nes/txc.cpp +++ b/src/devices/bus/nes/txc.cpp @@ -44,32 +44,32 @@ const device_type NES_TXC_STRIKEW = &device_creator<nes_txc_strikew_device>; const device_type NES_TXC_COMMANDOS = &device_creator<nes_txc_commandos_device>; -nes_txc_22211_device::nes_txc_22211_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_txc_22211_device::nes_txc_22211_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source) { } -nes_txc_22211_device::nes_txc_22211_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_txc_22211_device::nes_txc_22211_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_TXC_22211, "NES Cart TXC 22211 PCB", tag, owner, clock, "nes_txc_22211", __FILE__) { } -nes_txc_dumarc_device::nes_txc_dumarc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_txc_dumarc_device::nes_txc_dumarc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txc_22211_device(mconfig, NES_TXC_DUMARACING, "NES Cart TXC Du Ma Racing PCB", tag, owner, clock, "nes_dumarc", __FILE__) { } -nes_txc_mjblock_device::nes_txc_mjblock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_txc_mjblock_device::nes_txc_mjblock_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txc_22211_device(mconfig, NES_TXC_MJBLOCK, "NES Cart TXC Mahjong Block PCB", tag, owner, clock, "nes_mjblock", __FILE__) { } -nes_txc_strikew_device::nes_txc_strikew_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_txc_strikew_device::nes_txc_strikew_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_TXC_STRIKEW, "NES Cart Strike Wolf PCB", tag, owner, clock, "nes_txc_strikew", __FILE__) { } -nes_txc_commandos_device::nes_txc_commandos_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_txc_commandos_device::nes_txc_commandos_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_TXC_COMMANDOS, "NES Cart Commandos (and others) PCB", tag, owner, clock, "nes_txc_comm", __FILE__) { } diff --git a/src/devices/bus/nes/txc.h b/src/devices/bus/nes/txc.h index cd190c51f37..3dc45316c26 100644 --- a/src/devices/bus/nes/txc.h +++ b/src/devices/bus/nes/txc.h @@ -12,8 +12,8 @@ class nes_txc_22211_device : public nes_nrom_device { public: // construction/destruction - nes_txc_22211_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - nes_txc_22211_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_txc_22211_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_txc_22211_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -34,7 +34,7 @@ class nes_txc_dumarc_device : public nes_txc_22211_device { public: // construction/destruction - nes_txc_dumarc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_txc_dumarc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_h) override; @@ -47,7 +47,7 @@ class nes_txc_mjblock_device : public nes_txc_22211_device { public: // construction/destruction - nes_txc_mjblock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_txc_mjblock_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual DECLARE_READ8_MEMBER(read_l) override; @@ -60,7 +60,7 @@ class nes_txc_strikew_device : public nes_nrom_device { public: // construction/destruction - nes_txc_strikew_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_txc_strikew_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -76,7 +76,7 @@ class nes_txc_commandos_device : public nes_nrom_device { public: // construction/destruction - nes_txc_commandos_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_txc_commandos_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/waixing.cpp b/src/devices/bus/nes/waixing.cpp index f4dbd58d718..f573843024c 100644 --- a/src/devices/bus/nes/waixing.cpp +++ b/src/devices/bus/nes/waixing.cpp @@ -56,117 +56,117 @@ const device_type NES_WAIXING_WXZS2 = &device_creator<nes_waixing_wxzs2_device>; const device_type NES_WAIXING_FS304 = &device_creator<nes_waixing_fs304_device>; -nes_waixing_a_device::nes_waixing_a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_waixing_a_device::nes_waixing_a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : nes_txrom_device(mconfig, type, name, tag, owner, clock, shortname, source) { } -nes_waixing_a_device::nes_waixing_a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_waixing_a_device::nes_waixing_a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_WAIXING_A, "NES Cart Waixing Type A PCB", tag, owner, clock, "nes_waixing_a", __FILE__) { } -nes_waixing_a1_device::nes_waixing_a1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_waixing_a1_device::nes_waixing_a1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_waixing_a_device(mconfig, NES_WAIXING_A1, "NES Cart Waixing Type A (Alt) PCB", tag, owner, clock, "nes_waixing_a1", __FILE__) { } -nes_waixing_b_device::nes_waixing_b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_waixing_b_device::nes_waixing_b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_waixing_a_device(mconfig, NES_WAIXING_B, "NES Cart Waixing Type B PCB", tag, owner, clock, "nes_waixing_b", __FILE__) { } -nes_waixing_c_device::nes_waixing_c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_waixing_c_device::nes_waixing_c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_waixing_a_device(mconfig, NES_WAIXING_C, "NES Cart Waixing Type C PCB", tag, owner, clock, "nes_waixing_c", __FILE__) { } -nes_waixing_d_device::nes_waixing_d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_waixing_d_device::nes_waixing_d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_waixing_a_device(mconfig, NES_WAIXING_D, "NES Cart Waixing Type D PCB", tag, owner, clock, "nes_waixing_d", __FILE__) { } -nes_waixing_e_device::nes_waixing_e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_waixing_e_device::nes_waixing_e_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_waixing_a_device(mconfig, NES_WAIXING_E, "NES Cart Waixing Type E PCB", tag, owner, clock, "nes_waixing_e", __FILE__) { } -nes_waixing_f_device::nes_waixing_f_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_waixing_f_device::nes_waixing_f_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_waixing_a_device(mconfig, NES_WAIXING_F, "NES Cart Waixing Type F PCB", tag, owner, clock, "nes_waixing_f", __FILE__) { } -nes_waixing_g_device::nes_waixing_g_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_waixing_g_device::nes_waixing_g_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_waixing_a_device(mconfig, NES_WAIXING_G, "NES Cart Waixing Type G PCB", tag, owner, clock, "nes_waixing_g", __FILE__) { } -nes_waixing_h_device::nes_waixing_h_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_waixing_h_device::nes_waixing_h_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : nes_txrom_device(mconfig, type, name, tag, owner, clock, shortname, source) { } -nes_waixing_h_device::nes_waixing_h_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_waixing_h_device::nes_waixing_h_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_WAIXING_H, "NES Cart Waixing Type H PCB", tag, owner, clock, "nes_waixing_h", __FILE__) { } -nes_waixing_h1_device::nes_waixing_h1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_waixing_h1_device::nes_waixing_h1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_waixing_h_device(mconfig, NES_WAIXING_H1, "NES Cart Waixing Type H (Alt) PCB", tag, owner, clock, "nes_waixing_h1", __FILE__) { } -nes_waixing_i_device::nes_waixing_i_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_waixing_i_device::nes_waixing_i_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_waixing_a_device(mconfig, NES_WAIXING_I, "NES Cart Waixing Type I PCB", tag, owner, clock, "nes_waixing_i", __FILE__) { } -nes_waixing_j_device::nes_waixing_j_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_waixing_j_device::nes_waixing_j_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_waixing_a_device(mconfig, NES_WAIXING_J, "NES Cart Waixing Type J PCB", tag, owner, clock, "nes_waixing_j", __FILE__) { } -nes_waixing_sh2_device::nes_waixing_sh2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_waixing_sh2_device::nes_waixing_sh2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_WAIXING_SH2, "NES Cart Waixing SH2 PCB", tag, owner, clock, "nes_waixing_sh2", __FILE__) { } -nes_waixing_sec_device::nes_waixing_sec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_waixing_sec_device::nes_waixing_sec_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_txrom_device(mconfig, NES_WAIXING_SEC, "NES Cart Waixing Security Chip PCB", tag, owner, clock, "nes_waixing_sec", __FILE__), m_reg(0) { } -nes_waixing_sgz_device::nes_waixing_sgz_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_waixing_sgz_device::nes_waixing_sgz_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_WAIXING_SGZ, "NES Cart Waixing San Guo Zhi PCB", tag, owner, clock, "nes_waixing_sgz", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), m_irq_enable_latch(0) { } -nes_waixing_sgzlz_device::nes_waixing_sgzlz_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_waixing_sgzlz_device::nes_waixing_sgzlz_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_WAIXING_SGZLZ, "NES Cart Waixing San Guo Zhong Lie Zhuan PCB", tag, owner, clock, "nes_waixing_sgzlz", __FILE__), m_latch(0) { } -nes_waixing_ffv_device::nes_waixing_ffv_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_waixing_ffv_device::nes_waixing_ffv_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_WAIXING_FFV, "NES Cart Waixing Final Fantasy V PCB", tag, owner, clock, "nes_waixing_ffv", __FILE__) { } -nes_waixing_wxzs_device::nes_waixing_wxzs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_waixing_wxzs_device::nes_waixing_wxzs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_WAIXING_WXZS, "NES Cart Waixing Wai Xing Zhan Shi PCB", tag, owner, clock, "nes_waixing_wxzs", __FILE__) { } -nes_waixing_dq8_device::nes_waixing_dq8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_waixing_dq8_device::nes_waixing_dq8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_WAIXING_DQ8, "NES Cart Waixing Dragon Quest VIII PCB", tag, owner, clock, "nes_waixing_dq8", __FILE__) { } -nes_waixing_wxzs2_device::nes_waixing_wxzs2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_waixing_wxzs2_device::nes_waixing_wxzs2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_WAIXING_WXZS2, "NES Cart Waixing Wai Xing Zhan Shi 2 PCB", tag, owner, clock, "nes_waixing_wxzs2", __FILE__) { } -nes_waixing_fs304_device::nes_waixing_fs304_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nes_waixing_fs304_device::nes_waixing_fs304_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_WAIXING_FS304, "NES Cart Waixing FS-304 PCB", tag, owner, clock, "nes_waixing_fs304", __FILE__) { } diff --git a/src/devices/bus/nes/waixing.h b/src/devices/bus/nes/waixing.h index 132b3673cee..90506ae85fb 100644 --- a/src/devices/bus/nes/waixing.h +++ b/src/devices/bus/nes/waixing.h @@ -12,8 +12,8 @@ class nes_waixing_a_device : public nes_txrom_device { public: // construction/destruction - nes_waixing_a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - nes_waixing_a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_waixing_a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_waixing_a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -37,7 +37,7 @@ class nes_waixing_a1_device : public nes_waixing_a_device { public: // construction/destruction - nes_waixing_a1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_waixing_a1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void chr_cb(int start, int bank, int source) override; }; @@ -49,7 +49,7 @@ class nes_waixing_b_device : public nes_waixing_a_device { public: // construction/destruction - nes_waixing_b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_waixing_b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void chr_cb(int start, int bank, int source) override; @@ -62,7 +62,7 @@ class nes_waixing_c_device : public nes_waixing_a_device { public: // construction/destruction - nes_waixing_c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_waixing_c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void chr_cb(int start, int bank, int source) override; @@ -75,7 +75,7 @@ class nes_waixing_d_device : public nes_waixing_a_device { public: // construction/destruction - nes_waixing_d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_waixing_d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void chr_cb(int start, int bank, int source) override; @@ -88,7 +88,7 @@ class nes_waixing_e_device : public nes_waixing_a_device { public: // construction/destruction - nes_waixing_e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_waixing_e_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void chr_cb(int start, int bank, int source) override; @@ -101,7 +101,7 @@ class nes_waixing_f_device : public nes_waixing_a_device { public: // construction/destruction - nes_waixing_f_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_waixing_f_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_h) override; @@ -120,7 +120,7 @@ class nes_waixing_g_device : public nes_waixing_a_device { public: // construction/destruction - nes_waixing_g_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_waixing_g_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_h) override; @@ -139,8 +139,8 @@ class nes_waixing_h_device : public nes_txrom_device { public: // construction/destruction - nes_waixing_h_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - nes_waixing_h_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_waixing_h_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_waixing_h_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_h) override; @@ -156,7 +156,7 @@ class nes_waixing_h1_device : public nes_waixing_h_device { public: // construction/destruction - nes_waixing_h1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_waixing_h1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_h) override; @@ -171,7 +171,7 @@ class nes_waixing_i_device : public nes_waixing_a_device { public: // construction/destruction - nes_waixing_i_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_waixing_i_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // still to emulate this variant }; @@ -183,7 +183,7 @@ class nes_waixing_j_device : public nes_waixing_a_device { public: // construction/destruction - nes_waixing_j_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_waixing_j_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -203,7 +203,7 @@ class nes_waixing_sh2_device : public nes_txrom_device { public: // construction/destruction - nes_waixing_sh2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_waixing_sh2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -223,7 +223,7 @@ class nes_waixing_sec_device : public nes_txrom_device { public: // construction/destruction - nes_waixing_sec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_waixing_sec_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -244,7 +244,7 @@ class nes_waixing_sgz_device : public nes_nrom_device { public: // construction/destruction - nes_waixing_sgz_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_waixing_sgz_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -267,7 +267,7 @@ class nes_waixing_sgzlz_device : public nes_nrom_device { public: // construction/destruction - nes_waixing_sgzlz_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_waixing_sgzlz_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -286,7 +286,7 @@ class nes_waixing_ffv_device : public nes_nrom_device { public: // construction/destruction - nes_waixing_ffv_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_waixing_ffv_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -305,7 +305,7 @@ class nes_waixing_wxzs_device : public nes_nrom_device { public: // construction/destruction - nes_waixing_wxzs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_waixing_wxzs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -321,7 +321,7 @@ class nes_waixing_dq8_device : public nes_nrom_device { public: // construction/destruction - nes_waixing_dq8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_waixing_dq8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -337,7 +337,7 @@ class nes_waixing_wxzs2_device : public nes_nrom_device { public: // construction/destruction - nes_waixing_wxzs2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_waixing_wxzs2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -353,7 +353,7 @@ class nes_waixing_fs304_device : public nes_nrom_device { public: // construction/destruction - nes_waixing_fs304_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_waixing_fs304_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes_ctrl/4score.cpp b/src/devices/bus/nes_ctrl/4score.cpp index e5adb5feb97..2d3180a0caf 100644 --- a/src/devices/bus/nes_ctrl/4score.cpp +++ b/src/devices/bus/nes_ctrl/4score.cpp @@ -110,20 +110,20 @@ ioport_constructor nes_4score_p2p4_device::device_input_ports() const // nes_4score_device - constructor //------------------------------------------------- -nes_4score_device::nes_4score_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_4score_device::nes_4score_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_nes_control_port_interface(mconfig, *this), m_latch(0) { } -nes_4score_p1p3_device::nes_4score_p1p3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nes_4score_p1p3_device::nes_4score_p1p3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_4score_device(mconfig, NES_4SCORE_P1P3, "Nintendo Four Score Adapter P1/P3", tag, owner, clock, "nes_4score_p1p3", __FILE__), m_joypad1(*this, "PAD1"), m_joypad3(*this, "PAD3") { } -nes_4score_p2p4_device::nes_4score_p2p4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nes_4score_p2p4_device::nes_4score_p2p4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_4score_device(mconfig, NES_4SCORE_P2P4, "Nintendo Four Score Adapter P2/P4", tag, owner, clock, "nes_4score_p2p4", __FILE__), m_joypad2(*this, "PAD2"), m_joypad4(*this, "PAD4") diff --git a/src/devices/bus/nes_ctrl/4score.h b/src/devices/bus/nes_ctrl/4score.h index c05cb403b39..e54e0320280 100644 --- a/src/devices/bus/nes_ctrl/4score.h +++ b/src/devices/bus/nes_ctrl/4score.h @@ -26,7 +26,7 @@ class nes_4score_device : public device_t, { public: // construction/destruction - nes_4score_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_4score_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); protected: // device-level overrides @@ -45,7 +45,7 @@ class nes_4score_p1p3_device : public nes_4score_device { public: // construction/destruction - nes_4score_p1p3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_4score_p1p3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ioport_constructor device_input_ports() const override; @@ -63,7 +63,7 @@ class nes_4score_p2p4_device : public nes_4score_device { public: // construction/destruction - nes_4score_p2p4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_4score_p2p4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/nes_ctrl/arkpaddle.cpp b/src/devices/bus/nes_ctrl/arkpaddle.cpp index 15755d283ca..dc1523f7f1f 100644 --- a/src/devices/bus/nes_ctrl/arkpaddle.cpp +++ b/src/devices/bus/nes_ctrl/arkpaddle.cpp @@ -44,7 +44,7 @@ ioport_constructor nes_vaus_device::device_input_ports() const // nes_vaus_device - constructor //------------------------------------------------- -nes_vaus_device::nes_vaus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nes_vaus_device::nes_vaus_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_nes_control_port_interface(mconfig, *this), m_paddle(*this, "PADDLE"), @@ -52,7 +52,7 @@ nes_vaus_device::nes_vaus_device(const machine_config &mconfig, device_type type { } -nes_vaus_device::nes_vaus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nes_vaus_device::nes_vaus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_ARKPADDLE, "NES Arkanoid Vaus Controller", tag, owner, clock, "nes_vaus", __FILE__), device_nes_control_port_interface(mconfig, *this), m_paddle(*this, "PADDLE"), @@ -60,7 +60,7 @@ nes_vaus_device::nes_vaus_device(const machine_config &mconfig, const char *tag, { } -nes_vausfc_device::nes_vausfc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nes_vausfc_device::nes_vausfc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_vaus_device(mconfig, NES_ARKPADDLE_FC, "FC Arkanoid Vaus Controller", tag, owner, clock, "nes_vausfc", __FILE__) { } diff --git a/src/devices/bus/nes_ctrl/arkpaddle.h b/src/devices/bus/nes_ctrl/arkpaddle.h index d693bb7c0b7..b6932f8fb4a 100644 --- a/src/devices/bus/nes_ctrl/arkpaddle.h +++ b/src/devices/bus/nes_ctrl/arkpaddle.h @@ -27,8 +27,8 @@ class nes_vaus_device : public device_t, { public: // construction/destruction - nes_vaus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - nes_vaus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_vaus_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_vaus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; @@ -54,7 +54,7 @@ class nes_vausfc_device : public nes_vaus_device { public: // construction/destruction - nes_vausfc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_vausfc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: virtual UINT8 read_bit34() override { return 0; } diff --git a/src/devices/bus/nes_ctrl/bcbattle.cpp b/src/devices/bus/nes_ctrl/bcbattle.cpp index 336a14e92c8..b14864efc61 100644 --- a/src/devices/bus/nes_ctrl/bcbattle.cpp +++ b/src/devices/bus/nes_ctrl/bcbattle.cpp @@ -81,7 +81,7 @@ void nes_bcbattle_device::device_timer(emu_timer &timer, device_timer_id id, int // nes_bcbattle_device - constructor //------------------------------------------------- -nes_bcbattle_device::nes_bcbattle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nes_bcbattle_device::nes_bcbattle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_BARCODE_BATTLER, "Epoch Barcode Battler (FC)", tag, owner, clock, "nes_bcbattle", __FILE__), device_nes_control_port_interface(mconfig, *this), m_reader(*this, "battler"), m_pending_code(0), m_new_code(0), m_transmitting(0), m_cur_bit(0), m_cur_byte(0), battler_timer(nullptr) diff --git a/src/devices/bus/nes_ctrl/bcbattle.h b/src/devices/bus/nes_ctrl/bcbattle.h index cbc7125c041..eb9e954db91 100644 --- a/src/devices/bus/nes_ctrl/bcbattle.h +++ b/src/devices/bus/nes_ctrl/bcbattle.h @@ -27,7 +27,7 @@ class nes_bcbattle_device : public device_t, { public: // construction/destruction - nes_bcbattle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_bcbattle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/nes_ctrl/ctrl.cpp b/src/devices/bus/nes_ctrl/ctrl.cpp index a1ef7dc9c1a..6e57faaabd2 100644 --- a/src/devices/bus/nes_ctrl/ctrl.cpp +++ b/src/devices/bus/nes_ctrl/ctrl.cpp @@ -100,7 +100,7 @@ device_nes_control_port_interface::~device_nes_control_port_interface() // nes_control_port_device - constructor //------------------------------------------------- -nes_control_port_device::nes_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nes_control_port_device::nes_control_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_CONTROL_PORT, "Nintendo NES/FC control port", tag, owner, clock, "nes_control_port", __FILE__), device_slot_interface(mconfig, *this), m_device(nullptr) { diff --git a/src/devices/bus/nes_ctrl/ctrl.h b/src/devices/bus/nes_ctrl/ctrl.h index e899258547c..1d03ee4c40d 100644 --- a/src/devices/bus/nes_ctrl/ctrl.h +++ b/src/devices/bus/nes_ctrl/ctrl.h @@ -53,7 +53,7 @@ class nes_control_port_device : public device_t, { public: // construction/destruction - nes_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_control_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~nes_control_port_device(); static void set_brightpixel_callback(device_t &device, nesctrl_brightpixel_delegate callback) { downcast<nes_control_port_device &>(device).m_brightpixel_cb = callback; } diff --git a/src/devices/bus/nes_ctrl/fckeybrd.cpp b/src/devices/bus/nes_ctrl/fckeybrd.cpp index 2381933041c..1aec70ccfec 100644 --- a/src/devices/bus/nes_ctrl/fckeybrd.cpp +++ b/src/devices/bus/nes_ctrl/fckeybrd.cpp @@ -144,7 +144,7 @@ machine_config_constructor nes_fckeybrd_device::device_mconfig_additions() const // nes_fckeybrd_device - constructor //------------------------------------------------- -nes_fckeybrd_device::nes_fckeybrd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nes_fckeybrd_device::nes_fckeybrd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_FCKEYBOARD, "Nintendo Family Computer Keyboard Component", tag, owner, clock, "nes_fckeybrd", __FILE__), device_nes_control_port_interface(mconfig, *this), m_cassette(*this, "tape"), diff --git a/src/devices/bus/nes_ctrl/fckeybrd.h b/src/devices/bus/nes_ctrl/fckeybrd.h index f4cdc02ba39..32669b531df 100644 --- a/src/devices/bus/nes_ctrl/fckeybrd.h +++ b/src/devices/bus/nes_ctrl/fckeybrd.h @@ -27,7 +27,7 @@ class nes_fckeybrd_device : public device_t, { public: // construction/destruction - nes_fckeybrd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_fckeybrd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ioport_constructor device_input_ports() const override; virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/nes_ctrl/ftrainer.cpp b/src/devices/bus/nes_ctrl/ftrainer.cpp index 506418d4446..027bab1d7af 100644 --- a/src/devices/bus/nes_ctrl/ftrainer.cpp +++ b/src/devices/bus/nes_ctrl/ftrainer.cpp @@ -83,7 +83,7 @@ ioport_constructor nes_ftrainer_device::device_input_ports() const // nes_ftrainer_device - constructor //------------------------------------------------- -nes_ftrainer_device::nes_ftrainer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nes_ftrainer_device::nes_ftrainer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_FTRAINER, "Bandai Family Trainer", tag, owner, clock, "nes_famtrain", __FILE__), device_nes_control_port_interface(mconfig, *this), m_trainer(*this, "FT_COL"), m_row_scan(0) diff --git a/src/devices/bus/nes_ctrl/ftrainer.h b/src/devices/bus/nes_ctrl/ftrainer.h index f426f4e6a2c..054ca8d3b39 100644 --- a/src/devices/bus/nes_ctrl/ftrainer.h +++ b/src/devices/bus/nes_ctrl/ftrainer.h @@ -26,7 +26,7 @@ class nes_ftrainer_device : public device_t, { public: // construction/destruction - nes_ftrainer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_ftrainer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/nes_ctrl/hori.cpp b/src/devices/bus/nes_ctrl/hori.cpp index cecf1f05dbc..4cde0104cc6 100644 --- a/src/devices/bus/nes_ctrl/hori.cpp +++ b/src/devices/bus/nes_ctrl/hori.cpp @@ -89,7 +89,7 @@ machine_config_constructor nes_hori4p_device::device_mconfig_additions() const // nes_horitwin_device - constructor //------------------------------------------------- -nes_horitwin_device::nes_horitwin_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nes_horitwin_device::nes_horitwin_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_HORITWIN, "Hori Twin Adapter", tag, owner, clock, "nes_horitwin", __FILE__), device_nes_control_port_interface(mconfig, *this), m_port1(*this, "port1"), @@ -97,7 +97,7 @@ nes_horitwin_device::nes_horitwin_device(const machine_config &mconfig, const ch { } -nes_hori4p_device::nes_hori4p_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nes_hori4p_device::nes_hori4p_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_HORI4P, "Hori 4P Adapter", tag, owner, clock, "nes_hori4p", __FILE__), device_nes_control_port_interface(mconfig, *this), m_port1(*this, "port1"), diff --git a/src/devices/bus/nes_ctrl/hori.h b/src/devices/bus/nes_ctrl/hori.h index 613a8bdac7c..7d7ce26659e 100644 --- a/src/devices/bus/nes_ctrl/hori.h +++ b/src/devices/bus/nes_ctrl/hori.h @@ -26,7 +26,7 @@ class nes_horitwin_device : public device_t, { public: // construction/destruction - nes_horitwin_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_horitwin_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; @@ -49,7 +49,7 @@ class nes_hori4p_device : public device_t, { public: // construction/destruction - nes_hori4p_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_hori4p_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ioport_constructor device_input_ports() const override; virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/nes_ctrl/joypad.cpp b/src/devices/bus/nes_ctrl/joypad.cpp index 7a78d08f2c7..f03c0b7616d 100644 --- a/src/devices/bus/nes_ctrl/joypad.cpp +++ b/src/devices/bus/nes_ctrl/joypad.cpp @@ -173,36 +173,36 @@ machine_config_constructor nes_arcstick_device::device_mconfig_additions() const // nes_joypad_device - constructor //------------------------------------------------- -nes_joypad_device::nes_joypad_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +nes_joypad_device::nes_joypad_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_nes_control_port_interface(mconfig, *this), m_joypad(*this, "JOYPAD"), m_latch(0) { } -nes_joypad_device::nes_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nes_joypad_device::nes_joypad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_JOYPAD, "Nintendo NES / FC Control Pad", tag, owner, clock, "nes_joypad", __FILE__), device_nes_control_port_interface(mconfig, *this), m_joypad(*this, "JOYPAD"), m_latch(0) { } -nes_fcpad2_device::nes_fcpad2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nes_fcpad2_device::nes_fcpad2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_joypad_device(mconfig, NES_FCPAD_P2, "Nintendo Family Computer P2 Pad", tag, owner, clock, "nes_fcpad2", __FILE__) { } -nes_ccpadl_device::nes_ccpadl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nes_ccpadl_device::nes_ccpadl_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_joypad_device(mconfig, NES_CCPAD_LEFT, "FC Crazy Climber Left Pad", tag, owner, clock, "nes_ccpadl", __FILE__) { } -nes_ccpadr_device::nes_ccpadr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nes_ccpadr_device::nes_ccpadr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_joypad_device(mconfig, NES_CCPAD_RIGHT, "FC Crazy Climber Right Pad", tag, owner, clock, "nes_ccpadr", __FILE__) { } -nes_arcstick_device::nes_arcstick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nes_arcstick_device::nes_arcstick_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nes_joypad_device(mconfig, NES_ARCSTICK, "Nintendo Family Computer Arcade Stick", tag, owner, clock, "nes_arcstick", __FILE__), m_daisychain(*this, "subexp"), m_cfg(*this, "CONFIG") diff --git a/src/devices/bus/nes_ctrl/joypad.h b/src/devices/bus/nes_ctrl/joypad.h index 8430db4dff9..acdd01552e4 100644 --- a/src/devices/bus/nes_ctrl/joypad.h +++ b/src/devices/bus/nes_ctrl/joypad.h @@ -26,8 +26,8 @@ class nes_joypad_device : public device_t, { public: // construction/destruction - nes_joypad_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - nes_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_joypad_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_joypad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ioport_constructor device_input_ports() const override; @@ -49,7 +49,7 @@ class nes_fcpad2_device : public nes_joypad_device { public: // construction/destruction - nes_fcpad2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_fcpad2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ioport_constructor device_input_ports() const override; @@ -64,7 +64,7 @@ class nes_ccpadl_device : public nes_joypad_device { public: // construction/destruction - nes_ccpadl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_ccpadl_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ioport_constructor device_input_ports() const override; }; @@ -75,7 +75,7 @@ class nes_ccpadr_device : public nes_joypad_device { public: // construction/destruction - nes_ccpadr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_ccpadr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ioport_constructor device_input_ports() const override; }; @@ -86,7 +86,7 @@ class nes_arcstick_device : public nes_joypad_device { public: // construction/destruction - nes_arcstick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_arcstick_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ioport_constructor device_input_ports() const override; virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/nes_ctrl/konamihs.cpp b/src/devices/bus/nes_ctrl/konamihs.cpp index 46d5fb1f2fa..4adab90266d 100644 --- a/src/devices/bus/nes_ctrl/konamihs.cpp +++ b/src/devices/bus/nes_ctrl/konamihs.cpp @@ -42,7 +42,7 @@ ioport_constructor nes_konamihs_device::device_input_ports() const // nes_konamihs_device - constructor //------------------------------------------------- -nes_konamihs_device::nes_konamihs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nes_konamihs_device::nes_konamihs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_KONAMIHS, "Konami Hyper Shot Controller", tag, owner, clock, "nes_konamihs", __FILE__), device_nes_control_port_interface(mconfig, *this), m_ipt_p1(*this, "P1"), diff --git a/src/devices/bus/nes_ctrl/konamihs.h b/src/devices/bus/nes_ctrl/konamihs.h index da3aca612be..0a7e1590de8 100644 --- a/src/devices/bus/nes_ctrl/konamihs.h +++ b/src/devices/bus/nes_ctrl/konamihs.h @@ -26,7 +26,7 @@ class nes_konamihs_device : public device_t, { public: // construction/destruction - nes_konamihs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_konamihs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/nes_ctrl/miracle.cpp b/src/devices/bus/nes_ctrl/miracle.cpp index 6fdbc6f273a..33b59fb679b 100644 --- a/src/devices/bus/nes_ctrl/miracle.cpp +++ b/src/devices/bus/nes_ctrl/miracle.cpp @@ -58,7 +58,7 @@ void nes_miracle_device::device_timer(emu_timer &timer, device_timer_id id, int // nes_miracle_device - constructor //------------------------------------------------- -nes_miracle_device::nes_miracle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nes_miracle_device::nes_miracle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_MIRACLE, "Miracle Piano Controller", tag, owner, clock, "nes_miracle", __FILE__), device_serial_interface(mconfig, *this), device_nes_control_port_interface(mconfig, *this), diff --git a/src/devices/bus/nes_ctrl/miracle.h b/src/devices/bus/nes_ctrl/miracle.h index 6d0730423aa..f43d80a1f58 100644 --- a/src/devices/bus/nes_ctrl/miracle.h +++ b/src/devices/bus/nes_ctrl/miracle.h @@ -31,7 +31,7 @@ public: static const int RECV_RING_SIZE = 64; // construction/destruction - nes_miracle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_miracle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/nes_ctrl/mjpanel.cpp b/src/devices/bus/nes_ctrl/mjpanel.cpp index 8a4710c2c88..756b3dba46c 100644 --- a/src/devices/bus/nes_ctrl/mjpanel.cpp +++ b/src/devices/bus/nes_ctrl/mjpanel.cpp @@ -69,7 +69,7 @@ ioport_constructor nes_mjpanel_device::device_input_ports() const // nes_mjpanel_device - constructor //------------------------------------------------- -nes_mjpanel_device::nes_mjpanel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nes_mjpanel_device::nes_mjpanel_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_MJPANEL, "Famicom Mahjong Panel", tag, owner, clock, "nes_mjpanel", __FILE__), device_nes_control_port_interface(mconfig, *this), m_panel(*this, "MJPANEL"), m_latch(0) diff --git a/src/devices/bus/nes_ctrl/mjpanel.h b/src/devices/bus/nes_ctrl/mjpanel.h index ad470cb91e7..c56e6dc8745 100644 --- a/src/devices/bus/nes_ctrl/mjpanel.h +++ b/src/devices/bus/nes_ctrl/mjpanel.h @@ -26,7 +26,7 @@ class nes_mjpanel_device : public device_t, { public: // construction/destruction - nes_mjpanel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_mjpanel_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/nes_ctrl/pachinko.cpp b/src/devices/bus/nes_ctrl/pachinko.cpp index c4fdeb4b5d9..31750f145b8 100644 --- a/src/devices/bus/nes_ctrl/pachinko.cpp +++ b/src/devices/bus/nes_ctrl/pachinko.cpp @@ -47,7 +47,7 @@ ioport_constructor nes_pachinko_device::device_input_ports() const // nes_pachinko_device - constructor //------------------------------------------------- -nes_pachinko_device::nes_pachinko_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nes_pachinko_device::nes_pachinko_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_PACHINKO, "Famicom Pachinko Controller", tag, owner, clock, "nes_pachinko", __FILE__), device_nes_control_port_interface(mconfig, *this), m_joypad(*this, "JOYPAD"), diff --git a/src/devices/bus/nes_ctrl/pachinko.h b/src/devices/bus/nes_ctrl/pachinko.h index 04fad189160..18f2670c76f 100644 --- a/src/devices/bus/nes_ctrl/pachinko.h +++ b/src/devices/bus/nes_ctrl/pachinko.h @@ -26,7 +26,7 @@ class nes_pachinko_device : public device_t, { public: // construction/destruction - nes_pachinko_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_pachinko_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/nes_ctrl/partytap.cpp b/src/devices/bus/nes_ctrl/partytap.cpp index 2a1acd8adc9..496adc0181c 100644 --- a/src/devices/bus/nes_ctrl/partytap.cpp +++ b/src/devices/bus/nes_ctrl/partytap.cpp @@ -43,7 +43,7 @@ ioport_constructor nes_partytap_device::device_input_ports() const // nes_partytap_device - constructor //------------------------------------------------- -nes_partytap_device::nes_partytap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nes_partytap_device::nes_partytap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_PARTYTAP, "Yonezawa Party Tap Controller", tag, owner, clock, "nes_partytap", __FILE__), device_nes_control_port_interface(mconfig, *this), m_inputs(*this, "INPUTS"), m_mode(0), m_latch(0) diff --git a/src/devices/bus/nes_ctrl/partytap.h b/src/devices/bus/nes_ctrl/partytap.h index f66b7af7eec..d11949f66aa 100644 --- a/src/devices/bus/nes_ctrl/partytap.h +++ b/src/devices/bus/nes_ctrl/partytap.h @@ -26,7 +26,7 @@ class nes_partytap_device : public device_t, { public: // construction/destruction - nes_partytap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_partytap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/nes_ctrl/powerpad.cpp b/src/devices/bus/nes_ctrl/powerpad.cpp index 569695d97ca..458c4501030 100644 --- a/src/devices/bus/nes_ctrl/powerpad.cpp +++ b/src/devices/bus/nes_ctrl/powerpad.cpp @@ -77,7 +77,7 @@ ioport_constructor nes_powerpad_device::device_input_ports() const // nes_powerpad_device - constructor //------------------------------------------------- -nes_powerpad_device::nes_powerpad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nes_powerpad_device::nes_powerpad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_POWERPAD, "Bandai Power Pad", tag, owner, clock, "nes_powerpad", __FILE__), device_nes_control_port_interface(mconfig, *this), m_ipt1(*this, "POWERPAD1"), diff --git a/src/devices/bus/nes_ctrl/powerpad.h b/src/devices/bus/nes_ctrl/powerpad.h index a69486e7e23..fc6da2821b8 100644 --- a/src/devices/bus/nes_ctrl/powerpad.h +++ b/src/devices/bus/nes_ctrl/powerpad.h @@ -26,7 +26,7 @@ class nes_powerpad_device : public device_t, { public: // construction/destruction - nes_powerpad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_powerpad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/nes_ctrl/suborkey.cpp b/src/devices/bus/nes_ctrl/suborkey.cpp index 13f8bb72481..d29f4a3d19b 100644 --- a/src/devices/bus/nes_ctrl/suborkey.cpp +++ b/src/devices/bus/nes_ctrl/suborkey.cpp @@ -160,7 +160,7 @@ ioport_constructor nes_suborkey_device::device_input_ports() const // nes_suborkey_device - constructor //------------------------------------------------- -nes_suborkey_device::nes_suborkey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nes_suborkey_device::nes_suborkey_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_SUBORKEYBOARD, "Subor FC Keyboard", tag, owner, clock, "nes_suborkey", __FILE__), device_nes_control_port_interface(mconfig, *this), m_kbd(*this, "SUBOR"), m_fck_scan(0), m_fck_mode(0) diff --git a/src/devices/bus/nes_ctrl/suborkey.h b/src/devices/bus/nes_ctrl/suborkey.h index b50b0e3bb94..041056a9bc6 100644 --- a/src/devices/bus/nes_ctrl/suborkey.h +++ b/src/devices/bus/nes_ctrl/suborkey.h @@ -26,7 +26,7 @@ class nes_suborkey_device : public device_t, { public: // construction/destruction - nes_suborkey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_suborkey_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/nes_ctrl/zapper.cpp b/src/devices/bus/nes_ctrl/zapper.cpp index 422b9664f5e..94f353deb04 100644 --- a/src/devices/bus/nes_ctrl/zapper.cpp +++ b/src/devices/bus/nes_ctrl/zapper.cpp @@ -44,7 +44,7 @@ ioport_constructor nes_zapper_device::device_input_ports() const // nes_zapper_device - constructor //------------------------------------------------- -nes_zapper_device::nes_zapper_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nes_zapper_device::nes_zapper_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_ZAPPER, "Nintendo Zapper Lightgun", tag, owner, clock, "nes_zapper", __FILE__), device_nes_control_port_interface(mconfig, *this), m_lightx(*this, "ZAPPER_X"), diff --git a/src/devices/bus/nes_ctrl/zapper.h b/src/devices/bus/nes_ctrl/zapper.h index 8aedda7fc7a..200c206d71b 100644 --- a/src/devices/bus/nes_ctrl/zapper.h +++ b/src/devices/bus/nes_ctrl/zapper.h @@ -26,7 +26,7 @@ class nes_zapper_device : public device_t, { public: // construction/destruction - nes_zapper_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nes_zapper_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/nubus/nubus.cpp b/src/devices/bus/nubus/nubus.cpp index 175139f19c2..680e20d501a 100644 --- a/src/devices/bus/nubus/nubus.cpp +++ b/src/devices/bus/nubus/nubus.cpp @@ -26,21 +26,19 @@ const device_type NUBUS_SLOT = &device_creator<nubus_slot_device>; //------------------------------------------------- // nubus_slot_device - constructor //------------------------------------------------- -nubus_slot_device::nubus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nubus_slot_device::nubus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NUBUS_SLOT, "NUBUS_SLOT", tag, owner, clock, "nubus_slot", __FILE__), - device_slot_interface(mconfig, *this), - m_nubus_tag(nullptr), - m_nubus_slottag(nullptr) + device_slot_interface(mconfig, *this) { } -nubus_slot_device::nubus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +nubus_slot_device::nubus_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_interface(mconfig, *this), m_nubus_tag(nullptr), m_nubus_slottag(nullptr) + device_slot_interface(mconfig, *this) { } -void nubus_slot_device::static_set_nubus_slot(device_t &device, const char *tag, const char *slottag) +void nubus_slot_device::static_set_nubus_slot(device_t &device, std::string tag, std::string slottag) { nubus_slot_device &nubus_card = dynamic_cast<nubus_slot_device &>(device); nubus_card.m_nubus_tag = tag; @@ -64,7 +62,7 @@ void nubus_slot_device::device_start() const device_type NUBUS = &device_creator<nubus_device>; -void nubus_device::static_set_cputag(device_t &device, const char *tag) +void nubus_device::static_set_cputag(device_t &device, std::string tag) { nubus_device &nubus = downcast<nubus_device &>(device); nubus.m_cputag = tag; @@ -78,25 +76,25 @@ void nubus_device::static_set_cputag(device_t &device, const char *tag) // nubus_device - constructor //------------------------------------------------- -nubus_device::nubus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nubus_device::nubus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NUBUS, "NUBUS", tag, owner, clock, "nubus", __FILE__), m_maincpu(nullptr), m_out_irq9_cb(*this), m_out_irqa_cb(*this), m_out_irqb_cb(*this), m_out_irqc_cb(*this), m_out_irqd_cb(*this), - m_out_irqe_cb(*this), m_cputag(nullptr) + m_out_irqe_cb(*this) { } -nubus_device::nubus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +nubus_device::nubus_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr), m_out_irq9_cb(*this), m_out_irqa_cb(*this), m_out_irqb_cb(*this), m_out_irqc_cb(*this), m_out_irqd_cb(*this), - m_out_irqe_cb(*this), m_cputag(nullptr) + m_out_irqe_cb(*this) { } //------------------------------------------------- @@ -213,7 +211,7 @@ void nubus_device::install_writeonly_device(offs_t start, offs_t end, write32_de } } -void nubus_device::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data) +void nubus_device::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, std::string tag, UINT8 *data) { // printf("install_bank: %s @ %x->%x mask %x mirror %x\n", tag, start, end, mask, mirror); m_maincpu = machine().device<cpu_device>(m_cputag); @@ -259,7 +257,7 @@ WRITE_LINE_MEMBER( nubus_device::irqe_w ) { m_out_irqe_cb(state); } device_nubus_card_interface::device_nubus_card_interface(const machine_config &mconfig, device_t &device) : device_slot_card_interface(mconfig, device), m_nubus(nullptr), - m_nubus_tag(nullptr), m_nubus_slottag(nullptr), m_slot(0), m_next(nullptr) + m_slot(0), m_next(nullptr) { } @@ -272,7 +270,7 @@ device_nubus_card_interface::~device_nubus_card_interface() { } -void device_nubus_card_interface::static_set_nubus_tag(device_t &device, const char *tag, const char *slottag) +void device_nubus_card_interface::static_set_nubus_tag(device_t &device, std::string tag, std::string slottag) { device_nubus_card_interface &nubus_card = dynamic_cast<device_nubus_card_interface &>(device); nubus_card.m_nubus_tag = tag; @@ -281,18 +279,18 @@ void device_nubus_card_interface::static_set_nubus_tag(device_t &device, const c void device_nubus_card_interface::set_nubus_device() { - if (!strncmp(m_nubus_slottag, "pds030", 6)) + if (!strncmp(m_nubus_slottag.c_str(), "pds030", 6)) { m_slot = 0x9; // '030 PDS slots phantom slot as NuBus slots $9, $A, and $B } - else if (!strncmp(m_nubus_slottag, "lcpds", 6)) + else if (!strncmp(m_nubus_slottag.c_str(), "lcpds", 6)) { m_slot = 0xe; // LC PDS slots phantom slot as NuBus slot $E } else { // extract the slot number from the last digit of the slot tag - int tlen = strlen(m_nubus_slottag); + int tlen = m_nubus_slottag.length(); if (m_nubus_slottag[tlen-1] == '9') { @@ -313,14 +311,10 @@ void device_nubus_card_interface::set_nubus_device() m_nubus->add_nubus_card(this); } -void device_nubus_card_interface::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data) +void device_nubus_card_interface::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, std::string tag, UINT8 *data) { - char bank[256]; - - // append an underscore and the slot name to the bank so it's guaranteed unique - strcpy(bank, tag); - strcat(bank, "_"); - strcat(bank, m_nubus_slottag); + // append an underscore and the slot name to the bank so it's guaranteed unique + std::string bank = tag + "_" + m_nubus_slottag; m_nubus->install_bank(start, end, mask, mirror, bank, data); } @@ -461,9 +455,7 @@ void device_nubus_card_interface::install_declaration_rom(device_t *dev, const c // now install the ROM UINT32 addr = get_slotspace() + 0x01000000; - char bankname[128]; - strcpy(bankname, "rom_"); - strcat(bankname, m_nubus_slottag); + std::string bankname = "rom_" + m_nubus_slottag; addr -= romlen; // printf("Installing ROM at %x, length %x\n", addr, romlen); if (mirror_all_mb) // mirror the declaration ROM across all 16 megs of the slot space diff --git a/src/devices/bus/nubus/nubus.h b/src/devices/bus/nubus/nubus.h index 4bb736f1eb7..7d670e01729 100644 --- a/src/devices/bus/nubus/nubus.h +++ b/src/devices/bus/nubus/nubus.h @@ -64,17 +64,18 @@ class nubus_slot_device : public device_t, { public: // construction/destruction - nubus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - nubus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nubus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + nubus_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides virtual void device_start() override; // inline configuration - static void static_set_nubus_slot(device_t &device, const char *tag, const char *slottag); + static void static_set_nubus_slot(device_t &device, std::string tag, std::string slottag); protected: // configuration - const char *m_nubus_tag, *m_nubus_slottag; + std::string m_nubus_tag; + std::string m_nubus_slottag; }; // device type definition @@ -87,12 +88,12 @@ class nubus_device : public device_t { public: // construction/destruction - nubus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - nubus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nubus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + nubus_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); ~nubus_device() { m_device_list.detach_all(); } // inline configuration - static void static_set_cputag(device_t &device, const char *tag); + static void static_set_cputag(device_t &device, std::string tag); template<class _Object> static devcb_base &set_out_irq9_callback(device_t &device, _Object object) { return downcast<nubus_device &>(device).m_out_irq9_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_irqa_callback(device_t &device, _Object object) { return downcast<nubus_device &>(device).m_out_irqa_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_irqb_callback(device_t &device, _Object object) { return downcast<nubus_device &>(device).m_out_irqb_cb.set_callback(object); } @@ -106,7 +107,7 @@ public: void install_device(offs_t start, offs_t end, read32_delegate rhandler, write32_delegate whandler, UINT32 mask=0xffffffff); void install_readonly_device(offs_t start, offs_t end, read32_delegate rhandler, UINT32 mask=0xffffffff); void install_writeonly_device(offs_t start, offs_t end, write32_delegate whandler, UINT32 mask=0xffffffff); - void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data); + void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, std::string tag, UINT8 *data); void set_irq_line(int slot, int state); DECLARE_WRITE_LINE_MEMBER( irq9_w ); @@ -132,7 +133,7 @@ protected: devcb_write_line m_out_irqe_cb; simple_list<device_nubus_card_interface> m_device_list; - const char *m_cputag; + std::string m_cputag; }; @@ -156,7 +157,7 @@ public: // helper functions for card devices void install_declaration_rom(device_t *dev, const char *romregion, bool mirror_all_mb = false, bool reverse_rom = false); - void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data); + void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, std::string tag, UINT8 *data); UINT32 get_slotspace() { return 0xf0000000 | (m_slot<<24); } UINT32 get_super_slotspace() { return m_slot<<28; } @@ -165,10 +166,11 @@ public: void lower_slot_irq() { m_nubus->set_irq_line(m_slot, CLEAR_LINE); } // inline configuration - static void static_set_nubus_tag(device_t &device, const char *tag, const char *slottag); + static void static_set_nubus_tag(device_t &device, std::string tag, std::string slottag); public: nubus_device *m_nubus; - const char *m_nubus_tag, *m_nubus_slottag; + std::string m_nubus_tag; + std::string m_nubus_slottag; int m_slot; device_nubus_card_interface *m_next; dynamic_buffer m_declaration_rom; diff --git a/src/devices/bus/nubus/nubus_48gc.cpp b/src/devices/bus/nubus/nubus_48gc.cpp index 2021def0a5d..2ce8aea0b10 100644 --- a/src/devices/bus/nubus/nubus_48gc.cpp +++ b/src/devices/bus/nubus/nubus_48gc.cpp @@ -76,7 +76,7 @@ const rom_entry *nubus_824gc_device::device_rom_region() const // jmfb_device - constructor //------------------------------------------------- -jmfb_device::jmfb_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +jmfb_device::jmfb_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), device_nubus_card_interface(mconfig, *this), m_screen(nullptr), m_timer(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_stride(0), m_base(0), m_count(0), m_clutoffs(0), m_xres(0), m_yres(0), m_is824(false) @@ -85,13 +85,13 @@ jmfb_device::jmfb_device(const machine_config &mconfig, device_type type, const m_screen_tag = m_assembled_tag.c_str(); } -nubus_48gc_device::nubus_48gc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nubus_48gc_device::nubus_48gc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : jmfb_device(mconfig, NUBUS_48GC, "Apple 4*8 video card", tag, owner, clock, "nb_48gc", __FILE__) { m_is824 = false; } -nubus_824gc_device::nubus_824gc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nubus_824gc_device::nubus_824gc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : jmfb_device(mconfig, NUBUS_824GC, "Apple 8*24 video card", tag, owner, clock, "nb_824gc", __FILE__) { m_is824 = true; diff --git a/src/devices/bus/nubus/nubus_48gc.h b/src/devices/bus/nubus/nubus_48gc.h index b32b057cfda..ff09fb5d82b 100644 --- a/src/devices/bus/nubus/nubus_48gc.h +++ b/src/devices/bus/nubus/nubus_48gc.h @@ -21,7 +21,7 @@ class jmfb_device : { public: // construction/destruction - jmfb_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + jmfb_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -53,13 +53,13 @@ public: class nubus_48gc_device : public jmfb_device { public: - nubus_48gc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nubus_48gc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; class nubus_824gc_device : public jmfb_device { public: - nubus_824gc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nubus_824gc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual const rom_entry *device_rom_region() const override; }; diff --git a/src/devices/bus/nubus/nubus_asntmc3b.cpp b/src/devices/bus/nubus/nubus_asntmc3b.cpp index 1d911055e11..93be1bfec52 100644 --- a/src/devices/bus/nubus/nubus_asntmc3b.cpp +++ b/src/devices/bus/nubus/nubus_asntmc3b.cpp @@ -76,19 +76,19 @@ const rom_entry *nubus_appleenet_device::device_rom_region() const // nubus_mac8390_device - constructor //------------------------------------------------- -nubus_mac8390_device::nubus_mac8390_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +nubus_mac8390_device::nubus_mac8390_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, NUBUS_ASNTMC3NB, name, tag, owner, clock, shortname, source), device_nubus_card_interface(mconfig, *this), m_dp83902(*this, MAC8390_839X) { } -nubus_asntmc3nb_device::nubus_asntmc3nb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nubus_asntmc3nb_device::nubus_asntmc3nb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nubus_mac8390_device(mconfig, NUBUS_ASNTMC3NB, "Asante MC3NB Ethernet card", tag, owner, clock, "nb_amc3b", __FILE__) { } -nubus_appleenet_device::nubus_appleenet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nubus_appleenet_device::nubus_appleenet_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : nubus_mac8390_device(mconfig, NUBUS_APPLEENET, "Apple NuBus Ethernet card", tag, owner, clock, "nb_aenet", __FILE__) { } diff --git a/src/devices/bus/nubus/nubus_asntmc3b.h b/src/devices/bus/nubus/nubus_asntmc3b.h index 7933cc11623..c6ef6a87e93 100644 --- a/src/devices/bus/nubus/nubus_asntmc3b.h +++ b/src/devices/bus/nubus/nubus_asntmc3b.h @@ -21,7 +21,7 @@ class nubus_mac8390_device : { public: // construction/destruction - nubus_mac8390_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nubus_mac8390_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -51,13 +51,13 @@ private: class nubus_asntmc3nb_device : public nubus_mac8390_device { public: - nubus_asntmc3nb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nubus_asntmc3nb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; class nubus_appleenet_device : public nubus_mac8390_device { public: - nubus_appleenet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nubus_appleenet_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual const rom_entry *device_rom_region() const override; }; diff --git a/src/devices/bus/nubus/nubus_cb264.cpp b/src/devices/bus/nubus/nubus_cb264.cpp index 29889da8a46..51011eb532b 100644 --- a/src/devices/bus/nubus/nubus_cb264.cpp +++ b/src/devices/bus/nubus/nubus_cb264.cpp @@ -69,13 +69,13 @@ const rom_entry *nubus_cb264_device::device_rom_region() const // nubus_cb264_device - constructor //------------------------------------------------- -nubus_cb264_device::nubus_cb264_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nubus_cb264_device::nubus_cb264_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NUBUS_CB264, "RasterOps ColorBoard 264 video card", tag, owner, clock, "nb_cb264", __FILE__), device_nubus_card_interface(mconfig, *this), m_cb264_mode(0), m_cb264_vbl_disable(0), m_cb264_toggle(0), m_count(0), m_clutoffs(0) { } -nubus_cb264_device::nubus_cb264_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +nubus_cb264_device::nubus_cb264_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_nubus_card_interface(mconfig, *this), m_cb264_mode(0), m_cb264_vbl_disable(0), m_cb264_toggle(0), m_count(0), m_clutoffs(0) { diff --git a/src/devices/bus/nubus/nubus_cb264.h b/src/devices/bus/nubus/nubus_cb264.h index fe0a934d7c8..a07e3a104a6 100644 --- a/src/devices/bus/nubus/nubus_cb264.h +++ b/src/devices/bus/nubus/nubus_cb264.h @@ -20,8 +20,8 @@ class nubus_cb264_device : { public: // construction/destruction - nubus_cb264_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - nubus_cb264_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nubus_cb264_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + nubus_cb264_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/nubus/nubus_image.cpp b/src/devices/bus/nubus/nubus_image.cpp index 412925fc351..351872eae14 100644 --- a/src/devices/bus/nubus/nubus_image.cpp +++ b/src/devices/bus/nubus/nubus_image.cpp @@ -34,7 +34,7 @@ class messimg_disk_image_device : public device_t, { public: // construction/destruction - messimg_disk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + messimg_disk_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // image-level overrides virtual iodevice_t image_type() const override { return IO_QUICKLOAD; } @@ -68,7 +68,7 @@ extern const device_type MESSIMG_DISK; const device_type MESSIMG_DISK = &device_creator<messimg_disk_image_device>; -messimg_disk_image_device::messimg_disk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +messimg_disk_image_device::messimg_disk_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MESSIMG_DISK, "Mac image", tag, owner, clock, "messimg_disk_image", __FILE__), device_image_interface(mconfig, *this), m_size(0), m_data(nullptr), m_ejected(false) { @@ -173,13 +173,13 @@ const rom_entry *nubus_image_device::device_rom_region() const // nubus_image_device - constructor //------------------------------------------------- -nubus_image_device::nubus_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nubus_image_device::nubus_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NUBUS_IMAGE, "Disk Image Pseudo-Card", tag, owner, clock, "nb_image", __FILE__), device_nubus_card_interface(mconfig, *this), m_image(nullptr) { } -nubus_image_device::nubus_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +nubus_image_device::nubus_image_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_nubus_card_interface(mconfig, *this), m_image(nullptr) { diff --git a/src/devices/bus/nubus/nubus_image.h b/src/devices/bus/nubus/nubus_image.h index d850b3f7735..5cd1d26126f 100644 --- a/src/devices/bus/nubus/nubus_image.h +++ b/src/devices/bus/nubus/nubus_image.h @@ -32,8 +32,8 @@ class nubus_image_device : { public: // construction/destruction - nubus_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - nubus_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nubus_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + nubus_image_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/nubus/nubus_m2hires.cpp b/src/devices/bus/nubus/nubus_m2hires.cpp index 3cf9e5abead..05a1acee433 100644 --- a/src/devices/bus/nubus/nubus_m2hires.cpp +++ b/src/devices/bus/nubus/nubus_m2hires.cpp @@ -65,7 +65,7 @@ const rom_entry *nubus_m2hires_device::device_rom_region() const // nubus_m2hires_device - constructor //------------------------------------------------- -nubus_m2hires_device::nubus_m2hires_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nubus_m2hires_device::nubus_m2hires_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NUBUS_M2HIRES, "Macintosh II Hi-Resolution video card", tag, owner, clock, "nb_m2hr", __FILE__), device_video_interface(mconfig, *this), device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) @@ -74,7 +74,7 @@ nubus_m2hires_device::nubus_m2hires_device(const machine_config &mconfig, const m_screen_tag = m_assembled_tag.c_str(); } -nubus_m2hires_device::nubus_m2hires_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +nubus_m2hires_device::nubus_m2hires_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) diff --git a/src/devices/bus/nubus/nubus_m2hires.h b/src/devices/bus/nubus/nubus_m2hires.h index e11e6e1a3ff..b35aca6ed1e 100644 --- a/src/devices/bus/nubus/nubus_m2hires.h +++ b/src/devices/bus/nubus/nubus_m2hires.h @@ -21,8 +21,8 @@ class nubus_m2hires_device : { public: // construction/destruction - nubus_m2hires_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - nubus_m2hires_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nubus_m2hires_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + nubus_m2hires_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/nubus/nubus_m2video.cpp b/src/devices/bus/nubus/nubus_m2video.cpp index ec4b7fb6d4c..2dfb12ccf83 100644 --- a/src/devices/bus/nubus/nubus_m2video.cpp +++ b/src/devices/bus/nubus/nubus_m2video.cpp @@ -66,7 +66,7 @@ const rom_entry *nubus_m2video_device::device_rom_region() const // nubus_m2video_device - constructor //------------------------------------------------- -nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NUBUS_M2VIDEO, "Macintosh II Video Card", tag, owner, clock, "nb_m2vc", __FILE__), device_video_interface(mconfig, *this), device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) @@ -75,7 +75,7 @@ nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, const m_screen_tag = m_assembled_tag.c_str(); } -nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) diff --git a/src/devices/bus/nubus/nubus_m2video.h b/src/devices/bus/nubus/nubus_m2video.h index 9dd7bc4a80b..26c0c398218 100644 --- a/src/devices/bus/nubus/nubus_m2video.h +++ b/src/devices/bus/nubus/nubus_m2video.h @@ -21,8 +21,8 @@ class nubus_m2video_device : { public: // construction/destruction - nubus_m2video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - nubus_m2video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nubus_m2video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + nubus_m2video_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/nubus/nubus_radiustpd.cpp b/src/devices/bus/nubus/nubus_radiustpd.cpp index 84188fd215e..83d5a726f8d 100644 --- a/src/devices/bus/nubus/nubus_radiustpd.cpp +++ b/src/devices/bus/nubus/nubus_radiustpd.cpp @@ -65,7 +65,7 @@ const rom_entry *nubus_radiustpd_device::device_rom_region() const // nubus_radiustpd_device - constructor //------------------------------------------------- -nubus_radiustpd_device::nubus_radiustpd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nubus_radiustpd_device::nubus_radiustpd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NUBUS_RADIUSTPD, "Radius Two Page Display video card", tag, owner, clock, "nb_rtpd", __FILE__), device_video_interface(mconfig, *this), device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) @@ -74,7 +74,7 @@ nubus_radiustpd_device::nubus_radiustpd_device(const machine_config &mconfig, co m_screen_tag = m_assembled_tag.c_str(); } -nubus_radiustpd_device::nubus_radiustpd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +nubus_radiustpd_device::nubus_radiustpd_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) diff --git a/src/devices/bus/nubus/nubus_radiustpd.h b/src/devices/bus/nubus/nubus_radiustpd.h index c8968ca30eb..ad227185eae 100644 --- a/src/devices/bus/nubus/nubus_radiustpd.h +++ b/src/devices/bus/nubus/nubus_radiustpd.h @@ -21,8 +21,8 @@ class nubus_radiustpd_device : { public: // construction/destruction - nubus_radiustpd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - nubus_radiustpd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nubus_radiustpd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + nubus_radiustpd_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/nubus/nubus_spec8.cpp b/src/devices/bus/nubus/nubus_spec8.cpp index 8b2651bcff8..abcdadfc49d 100644 --- a/src/devices/bus/nubus/nubus_spec8.cpp +++ b/src/devices/bus/nubus/nubus_spec8.cpp @@ -67,7 +67,7 @@ const rom_entry *nubus_spec8s3_device::device_rom_region() const // nubus_spec8s3_device - constructor //------------------------------------------------- -nubus_spec8s3_device::nubus_spec8s3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nubus_spec8s3_device::nubus_spec8s3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NUBUS_SPEC8S3, "SuperMac Spectrum/8 Series III video card", tag, owner, clock, "nb_sp8s3", __FILE__), device_video_interface(mconfig, *this), device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_count(0), m_clutoffs(0), m_timer(nullptr), m_vbl_pending(false), m_parameter(0) @@ -76,7 +76,7 @@ nubus_spec8s3_device::nubus_spec8s3_device(const machine_config &mconfig, const m_screen_tag = m_assembled_tag.c_str(); } -nubus_spec8s3_device::nubus_spec8s3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +nubus_spec8s3_device::nubus_spec8s3_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_count(0), m_clutoffs(0), m_timer(nullptr), m_vbl_pending(false), m_parameter(0) diff --git a/src/devices/bus/nubus/nubus_spec8.h b/src/devices/bus/nubus/nubus_spec8.h index 57c721afde5..971eef50266 100644 --- a/src/devices/bus/nubus/nubus_spec8.h +++ b/src/devices/bus/nubus/nubus_spec8.h @@ -21,8 +21,8 @@ class nubus_spec8s3_device : { public: // construction/destruction - nubus_spec8s3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - nubus_spec8s3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nubus_spec8s3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + nubus_spec8s3_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/nubus/nubus_specpdq.cpp b/src/devices/bus/nubus/nubus_specpdq.cpp index d67ac04ef31..c8c82c59c6d 100644 --- a/src/devices/bus/nubus/nubus_specpdq.cpp +++ b/src/devices/bus/nubus/nubus_specpdq.cpp @@ -82,7 +82,7 @@ const rom_entry *nubus_specpdq_device::device_rom_region() const // nubus_specpdq_device - constructor //------------------------------------------------- -nubus_specpdq_device::nubus_specpdq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nubus_specpdq_device::nubus_specpdq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NUBUS_SPECPDQ, "SuperMac Spectrum PDQ video card", tag, owner, clock, "nb_spdq", __FILE__), device_video_interface(mconfig, *this), device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_count(0), m_clutoffs(0), m_timer(nullptr), m_width(0), m_height(0), m_patofsx(0), m_patofsy(0), m_vram_addr(0), m_vram_src(0), @@ -92,7 +92,7 @@ nubus_specpdq_device::nubus_specpdq_device(const machine_config &mconfig, const m_screen_tag = m_assembled_tag.c_str(); } -nubus_specpdq_device::nubus_specpdq_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +nubus_specpdq_device::nubus_specpdq_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_count(0), m_clutoffs(0), m_timer(nullptr), m_width(0), m_height(0), m_patofsx(0), m_patofsy(0), m_vram_addr(0), m_vram_src(0), diff --git a/src/devices/bus/nubus/nubus_specpdq.h b/src/devices/bus/nubus/nubus_specpdq.h index ef260f7512a..ae1bccdfe6b 100644 --- a/src/devices/bus/nubus/nubus_specpdq.h +++ b/src/devices/bus/nubus/nubus_specpdq.h @@ -21,8 +21,8 @@ class nubus_specpdq_device : { public: // construction/destruction - nubus_specpdq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - nubus_specpdq_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nubus_specpdq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + nubus_specpdq_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/nubus/nubus_vikbw.cpp b/src/devices/bus/nubus/nubus_vikbw.cpp index 532e9b66145..4315a093eff 100644 --- a/src/devices/bus/nubus/nubus_vikbw.cpp +++ b/src/devices/bus/nubus/nubus_vikbw.cpp @@ -65,13 +65,13 @@ const rom_entry *nubus_vikbw_device::device_rom_region() const // nubus_vikbw_device - constructor //------------------------------------------------- -nubus_vikbw_device::nubus_vikbw_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nubus_vikbw_device::nubus_vikbw_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NUBUS_VIKBW, "Moniterm Viking video card", tag, owner, clock, "nb_vikbw", __FILE__), device_nubus_card_interface(mconfig, *this), m_vbl_disable(0) { } -nubus_vikbw_device::nubus_vikbw_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +nubus_vikbw_device::nubus_vikbw_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_nubus_card_interface(mconfig, *this), m_vbl_disable(0) { diff --git a/src/devices/bus/nubus/nubus_vikbw.h b/src/devices/bus/nubus/nubus_vikbw.h index e7a7b090eb1..c98ff035f46 100644 --- a/src/devices/bus/nubus/nubus_vikbw.h +++ b/src/devices/bus/nubus/nubus_vikbw.h @@ -20,8 +20,8 @@ class nubus_vikbw_device : { public: // construction/destruction - nubus_vikbw_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - nubus_vikbw_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nubus_vikbw_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + nubus_vikbw_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/nubus/nubus_wsportrait.cpp b/src/devices/bus/nubus/nubus_wsportrait.cpp index 3fe0e4c3ec0..d26cb978430 100644 --- a/src/devices/bus/nubus/nubus_wsportrait.cpp +++ b/src/devices/bus/nubus/nubus_wsportrait.cpp @@ -68,7 +68,7 @@ const rom_entry *nubus_wsportrait_device::device_rom_region() const // nubus_wsportrait_device - constructor //------------------------------------------------- -nubus_wsportrait_device::nubus_wsportrait_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nubus_wsportrait_device::nubus_wsportrait_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NUBUS_WSPORTRAIT, "Macintosh II Portrait Video Card", tag, owner, clock, "nb_wspt", __FILE__), device_video_interface(mconfig, *this), device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) @@ -77,7 +77,7 @@ nubus_wsportrait_device::nubus_wsportrait_device(const machine_config &mconfig, m_screen_tag = m_assembled_tag.c_str(); } -nubus_wsportrait_device::nubus_wsportrait_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +nubus_wsportrait_device::nubus_wsportrait_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) diff --git a/src/devices/bus/nubus/nubus_wsportrait.h b/src/devices/bus/nubus/nubus_wsportrait.h index 9afdf36d8c7..cef28ae68b7 100644 --- a/src/devices/bus/nubus/nubus_wsportrait.h +++ b/src/devices/bus/nubus/nubus_wsportrait.h @@ -21,8 +21,8 @@ class nubus_wsportrait_device : { public: // construction/destruction - nubus_wsportrait_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - nubus_wsportrait_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nubus_wsportrait_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + nubus_wsportrait_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/nubus/pds30_30hr.cpp b/src/devices/bus/nubus/pds30_30hr.cpp index eb5550cb64e..0305f830b7f 100644 --- a/src/devices/bus/nubus/pds30_30hr.cpp +++ b/src/devices/bus/nubus/pds30_30hr.cpp @@ -68,7 +68,7 @@ const rom_entry *nubus_xceed30hr_device::device_rom_region() const // nubus_xceed30hr_device - constructor //------------------------------------------------- -nubus_xceed30hr_device::nubus_xceed30hr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nubus_xceed30hr_device::nubus_xceed30hr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PDS030_XCEED30HR, "Micron/XCEED Technology Color 30HR", tag, owner, clock, "pd3_30hr", __FILE__), device_video_interface(mconfig, *this), device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) @@ -77,7 +77,7 @@ nubus_xceed30hr_device::nubus_xceed30hr_device(const machine_config &mconfig, co m_screen_tag = m_assembled_tag.c_str(); } -nubus_xceed30hr_device::nubus_xceed30hr_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +nubus_xceed30hr_device::nubus_xceed30hr_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) diff --git a/src/devices/bus/nubus/pds30_30hr.h b/src/devices/bus/nubus/pds30_30hr.h index 7cb832d4af3..5d52239f231 100644 --- a/src/devices/bus/nubus/pds30_30hr.h +++ b/src/devices/bus/nubus/pds30_30hr.h @@ -21,8 +21,8 @@ class nubus_xceed30hr_device : { public: // construction/destruction - nubus_xceed30hr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - nubus_xceed30hr_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nubus_xceed30hr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + nubus_xceed30hr_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/nubus/pds30_cb264.cpp b/src/devices/bus/nubus/pds30_cb264.cpp index b5c10671aea..c100739741b 100644 --- a/src/devices/bus/nubus/pds30_cb264.cpp +++ b/src/devices/bus/nubus/pds30_cb264.cpp @@ -61,7 +61,7 @@ const rom_entry *nubus_cb264se30_device::device_rom_region() const // nubus_cb264se30_device - constructor //------------------------------------------------- -nubus_cb264se30_device::nubus_cb264se30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nubus_cb264se30_device::nubus_cb264se30_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PDS030_CB264SE30, "RasterOps Colorboard 264/SE30", tag, owner, clock, "pd3_c264", __FILE__), device_video_interface(mconfig, *this), device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) @@ -70,7 +70,7 @@ nubus_cb264se30_device::nubus_cb264se30_device(const machine_config &mconfig, co m_screen_tag = m_assembled_tag.c_str(); } -nubus_cb264se30_device::nubus_cb264se30_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +nubus_cb264se30_device::nubus_cb264se30_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) diff --git a/src/devices/bus/nubus/pds30_cb264.h b/src/devices/bus/nubus/pds30_cb264.h index 4932468e573..17893bfd39a 100644 --- a/src/devices/bus/nubus/pds30_cb264.h +++ b/src/devices/bus/nubus/pds30_cb264.h @@ -21,8 +21,8 @@ class nubus_cb264se30_device : { public: // construction/destruction - nubus_cb264se30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - nubus_cb264se30_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nubus_cb264se30_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + nubus_cb264se30_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/nubus/pds30_mc30.cpp b/src/devices/bus/nubus/pds30_mc30.cpp index 4c0e6999541..985886b8b09 100644 --- a/src/devices/bus/nubus/pds30_mc30.cpp +++ b/src/devices/bus/nubus/pds30_mc30.cpp @@ -64,7 +64,7 @@ const rom_entry *nubus_xceedmc30_device::device_rom_region() const // nubus_xceedmc30_device - constructor //------------------------------------------------- -nubus_xceedmc30_device::nubus_xceedmc30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nubus_xceedmc30_device::nubus_xceedmc30_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PDS030_XCEEDMC30, "Micron/XCEED Technology MacroColor 30", tag, owner, clock, "pd3_mclr", __FILE__), device_video_interface(mconfig, *this), device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) @@ -73,7 +73,7 @@ nubus_xceedmc30_device::nubus_xceedmc30_device(const machine_config &mconfig, co m_screen_tag = m_assembled_tag.c_str(); } -nubus_xceedmc30_device::nubus_xceedmc30_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +nubus_xceedmc30_device::nubus_xceedmc30_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) diff --git a/src/devices/bus/nubus/pds30_mc30.h b/src/devices/bus/nubus/pds30_mc30.h index b9bcc01a42a..5c1b05cd064 100644 --- a/src/devices/bus/nubus/pds30_mc30.h +++ b/src/devices/bus/nubus/pds30_mc30.h @@ -21,8 +21,8 @@ class nubus_xceedmc30_device : { public: // construction/destruction - nubus_xceedmc30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - nubus_xceedmc30_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nubus_xceedmc30_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + nubus_xceedmc30_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/nubus/pds30_procolor816.cpp b/src/devices/bus/nubus/pds30_procolor816.cpp index bb995682381..8b8df5a1af0 100644 --- a/src/devices/bus/nubus/pds30_procolor816.cpp +++ b/src/devices/bus/nubus/pds30_procolor816.cpp @@ -67,7 +67,7 @@ const rom_entry *nubus_procolor816_device::device_rom_region() const // nubus_procolor816_device - constructor //------------------------------------------------- -nubus_procolor816_device::nubus_procolor816_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nubus_procolor816_device::nubus_procolor816_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PDS030_PROCOLOR816, "Lapis ProColor Server 8*16", tag, owner, clock, "pd3_pc16", __FILE__), device_video_interface(mconfig, *this), device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) @@ -76,7 +76,7 @@ nubus_procolor816_device::nubus_procolor816_device(const machine_config &mconfig m_screen_tag = m_assembled_tag.c_str(); } -nubus_procolor816_device::nubus_procolor816_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +nubus_procolor816_device::nubus_procolor816_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) diff --git a/src/devices/bus/nubus/pds30_procolor816.h b/src/devices/bus/nubus/pds30_procolor816.h index 5dfabef5be4..90fec177365 100644 --- a/src/devices/bus/nubus/pds30_procolor816.h +++ b/src/devices/bus/nubus/pds30_procolor816.h @@ -21,8 +21,8 @@ class nubus_procolor816_device : { public: // construction/destruction - nubus_procolor816_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - nubus_procolor816_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nubus_procolor816_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + nubus_procolor816_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/nubus/pds30_sigmalview.cpp b/src/devices/bus/nubus/pds30_sigmalview.cpp index 88eab2ffdcb..9c180cc9c88 100644 --- a/src/devices/bus/nubus/pds30_sigmalview.cpp +++ b/src/devices/bus/nubus/pds30_sigmalview.cpp @@ -61,7 +61,7 @@ const rom_entry *nubus_lview_device::device_rom_region() const // nubus_lview_device - constructor //------------------------------------------------- -nubus_lview_device::nubus_lview_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nubus_lview_device::nubus_lview_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PDS030_LVIEW, "Sigma Designs L-View", tag, owner, clock, "pd3_lviw", __FILE__), device_video_interface(mconfig, *this), device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_vbl_disable(0), m_toggle(0), m_timer(nullptr), m_protstate(0) @@ -70,7 +70,7 @@ nubus_lview_device::nubus_lview_device(const machine_config &mconfig, const char m_screen_tag = m_assembled_tag.c_str(); } -nubus_lview_device::nubus_lview_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +nubus_lview_device::nubus_lview_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_vbl_disable(0), m_toggle(0), m_timer(nullptr), m_protstate(0) diff --git a/src/devices/bus/nubus/pds30_sigmalview.h b/src/devices/bus/nubus/pds30_sigmalview.h index 3fe9d94f952..6f4193c40eb 100644 --- a/src/devices/bus/nubus/pds30_sigmalview.h +++ b/src/devices/bus/nubus/pds30_sigmalview.h @@ -21,8 +21,8 @@ class nubus_lview_device : { public: // construction/destruction - nubus_lview_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - nubus_lview_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nubus_lview_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + nubus_lview_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/odyssey2/chess.cpp b/src/devices/bus/odyssey2/chess.cpp index 8885733923c..6b12bd05160 100644 --- a/src/devices/bus/odyssey2/chess.cpp +++ b/src/devices/bus/odyssey2/chess.cpp @@ -22,7 +22,7 @@ const device_type O2_ROM_CHESS = &device_creator<o2_chess_device>; -o2_chess_device::o2_chess_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +o2_chess_device::o2_chess_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : o2_rom_device(mconfig, O2_ROM_CHESS, "Odyssey 2 BASIC Carts", tag, owner, clock, "o2_chess", __FILE__), m_cpu(*this, "subcpu") { diff --git a/src/devices/bus/odyssey2/chess.h b/src/devices/bus/odyssey2/chess.h index 4cfefa10347..f02c58df866 100644 --- a/src/devices/bus/odyssey2/chess.h +++ b/src/devices/bus/odyssey2/chess.h @@ -17,7 +17,7 @@ class o2_chess_device : public o2_rom_device public: // construction/destruction - o2_chess_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + o2_chess_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); private: required_device<nsc800_device> m_cpu; diff --git a/src/devices/bus/odyssey2/rom.cpp b/src/devices/bus/odyssey2/rom.cpp index dd2a3739bea..cf4e31583cb 100644 --- a/src/devices/bus/odyssey2/rom.cpp +++ b/src/devices/bus/odyssey2/rom.cpp @@ -22,26 +22,26 @@ const device_type O2_ROM_12K = &device_creator<o2_rom12_device>; const device_type O2_ROM_16K = &device_creator<o2_rom16_device>; -o2_rom_device::o2_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +o2_rom_device::o2_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_o2_cart_interface(mconfig, *this), m_bank_base(0) { } -o2_rom_device::o2_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +o2_rom_device::o2_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, O2_ROM_STD, "Odyssey 2 Standard Carts", tag, owner, clock, "o2_rom", __FILE__), device_o2_cart_interface( mconfig, *this ), m_bank_base(0) { } -o2_rom12_device::o2_rom12_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +o2_rom12_device::o2_rom12_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : o2_rom_device(mconfig, O2_ROM_12K, "Odyssey 2 12K Carts", tag, owner, clock, "o2_rom12", __FILE__) { } -o2_rom16_device::o2_rom16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +o2_rom16_device::o2_rom16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : o2_rom_device(mconfig, O2_ROM_16K, "Odyssey 2 16K Carts", tag, owner, clock, "o2_rom16", __FILE__) { } diff --git a/src/devices/bus/odyssey2/rom.h b/src/devices/bus/odyssey2/rom.h index 7f82a0c0e1a..8ff695e07cb 100644 --- a/src/devices/bus/odyssey2/rom.h +++ b/src/devices/bus/odyssey2/rom.h @@ -13,8 +13,8 @@ class o2_rom_device : public device_t, { public: // construction/destruction - o2_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - o2_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + o2_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + o2_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -36,7 +36,7 @@ class o2_rom12_device : public o2_rom_device { public: // construction/destruction - o2_rom12_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + o2_rom12_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_rom04) override; @@ -49,7 +49,7 @@ class o2_rom16_device : public o2_rom_device { public: // construction/destruction - o2_rom16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + o2_rom16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_rom04) override; diff --git a/src/devices/bus/odyssey2/slot.cpp b/src/devices/bus/odyssey2/slot.cpp index 0a6e35028b9..903af4f96d2 100644 --- a/src/devices/bus/odyssey2/slot.cpp +++ b/src/devices/bus/odyssey2/slot.cpp @@ -45,7 +45,7 @@ device_o2_cart_interface::~device_o2_cart_interface() // rom_alloc - alloc the space for the cart //------------------------------------------------- -void device_o2_cart_interface::rom_alloc(UINT32 size, const char *tag) +void device_o2_cart_interface::rom_alloc(UINT32 size, std::string tag) { if (m_rom == nullptr) { @@ -72,7 +72,7 @@ void device_o2_cart_interface::ram_alloc(UINT32 size) //------------------------------------------------- // o2_cart_slot_device - constructor //------------------------------------------------- -o2_cart_slot_device::o2_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +o2_cart_slot_device::o2_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, O2_CART_SLOT, "Odyssey 2 Cartridge Slot", tag, owner, clock, "o2_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), diff --git a/src/devices/bus/odyssey2/slot.h b/src/devices/bus/odyssey2/slot.h index 6634ed57c61..620b45bc5aa 100644 --- a/src/devices/bus/odyssey2/slot.h +++ b/src/devices/bus/odyssey2/slot.h @@ -36,7 +36,7 @@ public: virtual DECLARE_WRITE8_MEMBER(io_write) {} virtual DECLARE_READ8_MEMBER(t0_read) { return 0; } - void rom_alloc(UINT32 size, const char *tag); + void rom_alloc(UINT32 size, std::string tag); void ram_alloc(UINT32 size); UINT8* get_rom_base() { return m_rom; } UINT8* get_ram_base() { return &m_ram[0]; } @@ -59,7 +59,7 @@ class o2_cart_slot_device : public device_t, { public: // construction/destruction - o2_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + o2_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~o2_cart_slot_device(); // device-level overrides diff --git a/src/devices/bus/odyssey2/voice.cpp b/src/devices/bus/odyssey2/voice.cpp index 338b8053f64..0de03544e2f 100644 --- a/src/devices/bus/odyssey2/voice.cpp +++ b/src/devices/bus/odyssey2/voice.cpp @@ -23,7 +23,7 @@ const device_type O2_ROM_VOICE = &device_creator<o2_voice_device>; -o2_voice_device::o2_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +o2_voice_device::o2_voice_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : o2_rom_device(mconfig, O2_ROM_VOICE, "Odyssey 2 The Voice Passthrough Cart", tag, owner, clock, "o2_voice", __FILE__), m_speech(*this, "sp0256_speech"), m_subslot(*this, "subslot"), diff --git a/src/devices/bus/odyssey2/voice.h b/src/devices/bus/odyssey2/voice.h index 6616753238d..63fcc1de973 100644 --- a/src/devices/bus/odyssey2/voice.h +++ b/src/devices/bus/odyssey2/voice.h @@ -14,7 +14,7 @@ class o2_voice_device : public o2_rom_device { public: // construction/destruction - o2_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + o2_voice_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/oricext/jasmin.cpp b/src/devices/bus/oricext/jasmin.cpp index 49034d22d16..114a8ad3682 100644 --- a/src/devices/bus/oricext/jasmin.cpp +++ b/src/devices/bus/oricext/jasmin.cpp @@ -42,7 +42,7 @@ DEVICE_ADDRESS_MAP_START(map, 8, jasmin_device) AM_RANGE(0x3fc, 0x3ff) AM_WRITE(select_w) ADDRESS_MAP_END -jasmin_device::jasmin_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +jasmin_device::jasmin_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : oricext_device(mconfig, JASMIN, "Jasmin floppy drive interface", tag, owner, clock, "jasmin", __FILE__), fdc(*this, "fdc"), side_sel(false), fdc_reset(false), ram_access(false), rom_access(false), jasmin_rom(nullptr), cur_floppy(nullptr) { diff --git a/src/devices/bus/oricext/jasmin.h b/src/devices/bus/oricext/jasmin.h index 5d27895ccfa..bbd1fb35b00 100644 --- a/src/devices/bus/oricext/jasmin.h +++ b/src/devices/bus/oricext/jasmin.h @@ -12,7 +12,7 @@ extern const device_type JASMIN; class jasmin_device : public oricext_device { public: - jasmin_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + jasmin_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~jasmin_device(); DECLARE_FLOPPY_FORMATS(floppy_formats); diff --git a/src/devices/bus/oricext/microdisc.cpp b/src/devices/bus/oricext/microdisc.cpp index abb2ea138fd..40a1112a968 100644 --- a/src/devices/bus/oricext/microdisc.cpp +++ b/src/devices/bus/oricext/microdisc.cpp @@ -37,7 +37,7 @@ DEVICE_ADDRESS_MAP_START(map, 8, microdisc_device) AM_RANGE(0x318, 0x318) AM_READ(port_318_r) ADDRESS_MAP_END -microdisc_device::microdisc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +microdisc_device::microdisc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : oricext_device(mconfig, MICRODISC, "Microdisc floppy drive interface", tag, owner, clock, "microdisc", __FILE__), fdc(*this, "fdc"), microdisc_rom(nullptr), port_314(0), intrq_state(false), drq_state(false), hld_state(false) { diff --git a/src/devices/bus/oricext/microdisc.h b/src/devices/bus/oricext/microdisc.h index 9ffc2f23f14..151d4e1665f 100644 --- a/src/devices/bus/oricext/microdisc.h +++ b/src/devices/bus/oricext/microdisc.h @@ -12,7 +12,7 @@ extern const device_type MICRODISC; class microdisc_device : public oricext_device { public: - microdisc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + microdisc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~microdisc_device(); DECLARE_FLOPPY_FORMATS(floppy_formats); diff --git a/src/devices/bus/oricext/oricext.cpp b/src/devices/bus/oricext/oricext.cpp index 2c1894b385c..24acefd9f9c 100644 --- a/src/devices/bus/oricext/oricext.cpp +++ b/src/devices/bus/oricext/oricext.cpp @@ -6,11 +6,10 @@ const device_type ORICEXT_CONNECTOR = &device_creator<oricext_connector>; -oricext_connector::oricext_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +oricext_connector::oricext_connector(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ORICEXT_CONNECTOR, "ORIC extension connector", tag, owner, clock, "oricext_connector", __FILE__), device_slot_interface(mconfig, *this), - irq_handler(*this), - cputag(nullptr) + irq_handler(*this) { } @@ -18,7 +17,7 @@ oricext_connector::~oricext_connector() { } -void oricext_connector::set_cputag(const char *tag) +void oricext_connector::set_cputag(std::string tag) { cputag = tag; } @@ -40,10 +39,9 @@ void oricext_connector::device_config_complete() dev->set_cputag(cputag); } -oricext_device::oricext_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +oricext_device::oricext_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_card_interface(mconfig, *this), - cputag(nullptr), + device_slot_card_interface(mconfig, *this), cpu(nullptr), connector(nullptr), bank_c000_r(nullptr), @@ -57,7 +55,7 @@ oricext_device::oricext_device(const machine_config &mconfig, device_type type, { } -void oricext_device::set_cputag(const char *tag) +void oricext_device::set_cputag(std::string tag) { cputag = tag; } diff --git a/src/devices/bus/oricext/oricext.h b/src/devices/bus/oricext/oricext.h index 738850a40b5..eb8dd010d0f 100644 --- a/src/devices/bus/oricext/oricext.h +++ b/src/devices/bus/oricext/oricext.h @@ -25,16 +25,16 @@ class oricext_connector: public device_t, public device_slot_interface { public: - oricext_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + oricext_connector(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~oricext_connector(); - void set_cputag(const char *tag); + void set_cputag(std::string tag); template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<oricext_connector &>(device).irq_handler.set_callback(object); } void irq_w(int state); protected: devcb_write_line irq_handler; - const char *cputag; + std::string cputag; virtual void device_start() override; virtual void device_config_complete() override; }; @@ -43,13 +43,13 @@ class oricext_device : public device_t, public device_slot_card_interface { public: - oricext_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + oricext_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - void set_cputag(const char *tag); + void set_cputag(std::string tag); DECLARE_WRITE_LINE_MEMBER(irq_w); protected: - const char *cputag; + std::string cputag; m6502_device *cpu; oricext_connector *connector; memory_bank *bank_c000_r, *bank_e000_r, *bank_f800_r, *bank_c000_w, *bank_e000_w, *bank_f800_w; diff --git a/src/devices/bus/pc_joy/pc_joy.cpp b/src/devices/bus/pc_joy/pc_joy.cpp index 14c2b99e8a1..491a8dbb3b2 100644 --- a/src/devices/bus/pc_joy/pc_joy.cpp +++ b/src/devices/bus/pc_joy/pc_joy.cpp @@ -13,7 +13,7 @@ const device_type PC_JOY = &device_creator<pc_joy_device>; -pc_joy_device::pc_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +pc_joy_device::pc_joy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PC_JOY, "PC joystick port", tag, owner, clock, "pc_joy", __FILE__), device_slot_interface(mconfig, *this), m_dev(nullptr) @@ -77,7 +77,7 @@ ioport_constructor pc_basic_joy_device::device_input_ports() const const device_type PC_BASIC_JOY = &device_creator<pc_basic_joy_device>; -pc_basic_joy_device::pc_basic_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +pc_basic_joy_device::pc_basic_joy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PC_BASIC_JOY, "PC basic joystick", tag, owner, clock, "basic_joy", __FILE__), device_pc_joy_interface(mconfig, *this), m_btn(*this, "btn"), diff --git a/src/devices/bus/pc_joy/pc_joy.h b/src/devices/bus/pc_joy/pc_joy.h index c5e1d890c8e..6da702beb4b 100644 --- a/src/devices/bus/pc_joy/pc_joy.h +++ b/src/devices/bus/pc_joy/pc_joy.h @@ -37,7 +37,7 @@ class pc_joy_device : public device_t, public device_slot_interface { public: - pc_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + pc_joy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER(joy_port_r); DECLARE_WRITE8_MEMBER(joy_port_w); @@ -55,7 +55,7 @@ class pc_basic_joy_device : public device_t, public device_pc_joy_interface { public: - pc_basic_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + pc_basic_joy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ioport_constructor device_input_ports() const override; virtual UINT8 x1(int delta) override { return (m_x1->read() > delta); } diff --git a/src/devices/bus/pc_joy/pc_joy_sw.cpp b/src/devices/bus/pc_joy/pc_joy_sw.cpp index 4d826e9f62a..7c4ef4ede65 100644 --- a/src/devices/bus/pc_joy/pc_joy_sw.cpp +++ b/src/devices/bus/pc_joy/pc_joy_sw.cpp @@ -6,7 +6,7 @@ const device_type PC_MSSW_PAD = &device_creator<pc_mssw_pad_device>; -pc_mssw_pad_device::pc_mssw_pad_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) : +pc_mssw_pad_device::pc_mssw_pad_device(const machine_config& mconfig, std::string tag, device_t* owner, UINT32 clock) : device_t(mconfig, PC_MSSW_PAD, "Microsoft Sidewinder Pad", tag, owner, clock, "mssw_pad", __FILE__), device_pc_joy_interface(mconfig, *this), m_btn1(*this, "btn1"), diff --git a/src/devices/bus/pc_joy/pc_joy_sw.h b/src/devices/bus/pc_joy/pc_joy_sw.h index 29500ed35ea..8260d462179 100644 --- a/src/devices/bus/pc_joy/pc_joy_sw.h +++ b/src/devices/bus/pc_joy/pc_joy_sw.h @@ -9,7 +9,7 @@ class pc_mssw_pad_device : public device_t, public device_pc_joy_interface { public: - pc_mssw_pad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + pc_mssw_pad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ioport_constructor device_input_ports() const override; virtual UINT8 btn() override { return m_state; } diff --git a/src/devices/bus/pc_kbd/ec1841.cpp b/src/devices/bus/pc_kbd/ec1841.cpp index 54c4d6b3a97..f1af25ba8b3 100644 --- a/src/devices/bus/pc_kbd/ec1841.cpp +++ b/src/devices/bus/pc_kbd/ec1841.cpp @@ -280,7 +280,7 @@ ioport_constructor ec_1841_keyboard_device::device_input_ports() const // ec_1841_keyboard_device - constructor //------------------------------------------------- -ec_1841_keyboard_device::ec_1841_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ec_1841_keyboard_device::ec_1841_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PC_KBD_EC_1841, "EC-1841 Keyboard", tag, owner, clock, "kb_ec1841", __FILE__), device_pc_kbd_interface(mconfig, *this), m_maincpu(*this, I8048_TAG), @@ -339,7 +339,7 @@ void ec_1841_keyboard_device::device_reset() WRITE_LINE_MEMBER( ec_1841_keyboard_device::clock_write ) { - DBG_LOG(1,0,( "%s: clock write %d\n", tag(), state)); + DBG_LOG(1,0,( "%s: clock write %d\n", tag().c_str(), state)); } @@ -349,7 +349,7 @@ WRITE_LINE_MEMBER( ec_1841_keyboard_device::clock_write ) WRITE_LINE_MEMBER( ec_1841_keyboard_device::data_write ) { - DBG_LOG(1,0,( "%s: data write %d\n", tag(), state)); + DBG_LOG(1,0,( "%s: data write %d\n", tag().c_str(), state)); } @@ -359,7 +359,7 @@ WRITE_LINE_MEMBER( ec_1841_keyboard_device::data_write ) WRITE8_MEMBER( ec_1841_keyboard_device::bus_w ) { - DBG_LOG(2,0,( "%s: bus_w %02x\n", tag(), data)); + DBG_LOG(2,0,( "%s: bus_w %02x\n", tag().c_str(), data)); m_bus = data; } @@ -391,7 +391,7 @@ READ8_MEMBER( ec_1841_keyboard_device::p1_r ) data |= clock_signal(); data |= data_signal() << 1; - DBG_LOG(1,0,( "%s: p1_r %02x\n", tag(), data)); + DBG_LOG(1,0,( "%s: p1_r %02x\n", tag().c_str(), data)); return data; } @@ -415,7 +415,7 @@ WRITE8_MEMBER( ec_1841_keyboard_device::p1_w ) 6 LED XXX 7 LED XXX */ - DBG_LOG(1,0,( "%s: p1_w %02x\n", tag(), data)); + DBG_LOG(1,0,( "%s: p1_w %02x\n", tag().c_str(), data)); m_p1 = data; } @@ -439,7 +439,7 @@ WRITE8_MEMBER( ec_1841_keyboard_device::p2_w ) 6 XXX CLOCK out 2? 7 XXX */ - DBG_LOG(1,0,( "%s: p2_w %02x\n", tag(), data)); + DBG_LOG(1,0,( "%s: p2_w %02x\n", tag().c_str(), data)); m_pc_kbdc->data_write_from_kb(BIT(data, 2)); m_pc_kbdc->clock_write_from_kb(BIT(data, 1)); @@ -480,7 +480,7 @@ READ8_MEMBER( ec_1841_keyboard_device::t1_r ) m_q = BIT(sense, (m_bus >> 4) & 7); } - DBG_LOG(1,0,( "%s: bus %02X t1_r %d\n", tag(), m_bus, m_q)); + DBG_LOG(1,0,( "%s: bus %02X t1_r %d\n", tag().c_str(), m_bus, m_q)); return m_q; } diff --git a/src/devices/bus/pc_kbd/ec1841.h b/src/devices/bus/pc_kbd/ec1841.h index b91564cbe62..b364d9af470 100644 --- a/src/devices/bus/pc_kbd/ec1841.h +++ b/src/devices/bus/pc_kbd/ec1841.h @@ -28,7 +28,7 @@ class ec_1841_keyboard_device : public device_t, { public: // construction/destruction - ec_1841_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ec_1841_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/pc_kbd/iskr1030.cpp b/src/devices/bus/pc_kbd/iskr1030.cpp index b90fd1cef14..2afa47cb723 100644 --- a/src/devices/bus/pc_kbd/iskr1030.cpp +++ b/src/devices/bus/pc_kbd/iskr1030.cpp @@ -259,7 +259,7 @@ ioport_constructor iskr_1030_keyboard_device::device_input_ports() const // iskr_1030_keyboard_device - constructor //------------------------------------------------- -iskr_1030_keyboard_device::iskr_1030_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +iskr_1030_keyboard_device::iskr_1030_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PC_KBD_ISKR_1030, "Iskra-1030 Keyboard", tag, owner, clock, "kb_iskr1030", __FILE__), device_pc_kbd_interface(mconfig, *this), m_maincpu(*this, I8048_TAG), @@ -327,7 +327,7 @@ void iskr_1030_keyboard_device::device_reset() WRITE_LINE_MEMBER( iskr_1030_keyboard_device::clock_write ) { - DBG_LOG(1,0,( "%s: clock write %d\n", tag(), state)); + DBG_LOG(1,0,( "%s: clock write %d\n", tag().c_str(), state)); m_maincpu->set_input_line(MCS48_INPUT_IRQ, state ? CLEAR_LINE : ASSERT_LINE); } @@ -338,7 +338,7 @@ WRITE_LINE_MEMBER( iskr_1030_keyboard_device::clock_write ) WRITE_LINE_MEMBER( iskr_1030_keyboard_device::data_write ) { - DBG_LOG(1,0,( "%s: data write %d\n", tag(), state)); + DBG_LOG(1,0,( "%s: data write %d\n", tag().c_str(), state)); } @@ -352,12 +352,12 @@ READ8_MEMBER( iskr_1030_keyboard_device::t1_r ) UINT8 bias = m_p1 & 15; if (!BIT(m_p1, 7)) { - DBG_LOG(2,0,( "%s: t1_r (l) %d\n", tag(), data)); + DBG_LOG(2,0,( "%s: t1_r (l) %d\n", tag().c_str(), data)); return data; } if (bias) { - DBG_LOG(2,0,( "%s: t1_r (b) %d\n", tag(), bias)); + DBG_LOG(2,0,( "%s: t1_r (b) %d\n", tag().c_str(), bias)); return 1; } @@ -391,7 +391,7 @@ READ8_MEMBER( iskr_1030_keyboard_device::t1_r ) } data = BIT(data, m_bus&3); - DBG_LOG(2,0,( "%s: t1_r (k r%d c%d) %d\n", tag(), m_bus&3, m_bus>>2, data)); + DBG_LOG(2,0,( "%s: t1_r (k r%d c%d) %d\n", tag().c_str(), m_bus&3, m_bus>>2, data)); return data; } @@ -402,7 +402,7 @@ READ8_MEMBER( iskr_1030_keyboard_device::t1_r ) WRITE8_MEMBER( iskr_1030_keyboard_device::ram_w ) { - DBG_LOG(2,0,( "%s: ram_w[%02x] <- %02x\n", tag(), offset, data)); + DBG_LOG(2,0,( "%s: ram_w[%02x] <- %02x\n", tag().c_str(), offset, data)); m_bus = offset; m_ram[offset] = data; @@ -415,7 +415,7 @@ WRITE8_MEMBER( iskr_1030_keyboard_device::ram_w ) READ8_MEMBER( iskr_1030_keyboard_device::ram_r ) { - DBG_LOG(2,0,( "%s: ram_r[%02x] = %02x\n", tag(), offset, m_ram[offset])); + DBG_LOG(2,0,( "%s: ram_r[%02x] = %02x\n", tag().c_str(), offset, m_ram[offset])); return m_ram[offset]; } @@ -442,7 +442,7 @@ READ8_MEMBER( iskr_1030_keyboard_device::p1_r ) UINT8 data = 0; - DBG_LOG(1,0,( "%s: p1_r %02x\n", tag(), data)); + DBG_LOG(1,0,( "%s: p1_r %02x\n", tag().c_str(), data)); return data; } @@ -466,7 +466,7 @@ WRITE8_MEMBER( iskr_1030_keyboard_device::p2_w ) 6 LED NLK 7 LED CLK */ - DBG_LOG(1,0,( "%s: p2_w %02x\n", tag(), data)); + DBG_LOG(1,0,( "%s: p2_w %02x\n", tag().c_str(), data)); m_p2 = data; } @@ -493,7 +493,7 @@ WRITE8_MEMBER( iskr_1030_keyboard_device::p1_w ) m_p1 = data; - DBG_LOG(1,0,( "%s: p1_w %02x (c %d d %d bias %d)\n", tag(), data, BIT(data, 4), BIT(data, 5), data&15)); + DBG_LOG(1,0,( "%s: p1_w %02x (c %d d %d bias %d)\n", tag().c_str(), data, BIT(data, 4), BIT(data, 5), data&15)); m_pc_kbdc->data_write_from_kb(BIT(data, 5)); m_pc_kbdc->clock_write_from_kb(BIT(data, 4)); diff --git a/src/devices/bus/pc_kbd/iskr1030.h b/src/devices/bus/pc_kbd/iskr1030.h index 8ea16a802eb..7ff9d549626 100644 --- a/src/devices/bus/pc_kbd/iskr1030.h +++ b/src/devices/bus/pc_kbd/iskr1030.h @@ -29,7 +29,7 @@ class iskr_1030_keyboard_device : public device_t, { public: // construction/destruction - iskr_1030_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + iskr_1030_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/pc_kbd/keytro.cpp b/src/devices/bus/pc_kbd/keytro.cpp index 8dd5a4e3d5c..2ae91f50cf3 100644 --- a/src/devices/bus/pc_kbd/keytro.cpp +++ b/src/devices/bus/pc_kbd/keytro.cpp @@ -377,7 +377,7 @@ ROM_START( keytronic_pc3270 ) ROM_END -pc_kbd_keytronic_pc3270_device::pc_kbd_keytronic_pc3270_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +pc_kbd_keytronic_pc3270_device::pc_kbd_keytronic_pc3270_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PC_KBD_KEYTRONIC_PC3270, "Keytronic PC3270", tag, owner, clock, "keytronic_pc3270", __FILE__), device_pc_kbd_interface(mconfig, *this), m_cpu(*this, "kb_keytr"), m_p1(0), m_p1_data(0), m_p2(0), m_p3(0), m_last_write_addr(0) diff --git a/src/devices/bus/pc_kbd/keytro.h b/src/devices/bus/pc_kbd/keytro.h index 5fdcbf72f87..722e511919f 100644 --- a/src/devices/bus/pc_kbd/keytro.h +++ b/src/devices/bus/pc_kbd/keytro.h @@ -22,7 +22,7 @@ class pc_kbd_keytronic_pc3270_device : public device_t, { public: // construction/destruction - pc_kbd_keytronic_pc3270_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + pc_kbd_keytronic_pc3270_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); required_device<cpu_device> m_cpu; @@ -60,7 +60,7 @@ class pc_kbd_keytronic_pc3270_at_device : public pc_kbd_keytronic_pc3270_device { public: // construction/destruction - pc_kbd_keytronic_pc3270_at_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) + pc_kbd_keytronic_pc3270_at_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : pc_kbd_keytronic_pc3270_device(mconfig, tag, owner, clock) { } diff --git a/src/devices/bus/pc_kbd/msnat.cpp b/src/devices/bus/pc_kbd/msnat.cpp index 2d300841d26..375ccc41591 100644 --- a/src/devices/bus/pc_kbd/msnat.cpp +++ b/src/devices/bus/pc_kbd/msnat.cpp @@ -228,7 +228,7 @@ ROM_START( microsoft_natural ) ROM_END -pc_kbd_microsoft_natural_device::pc_kbd_microsoft_natural_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +pc_kbd_microsoft_natural_device::pc_kbd_microsoft_natural_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PC_KBD_MICROSOFT_NATURAL, "Microsoft Natural Keyboard", tag, owner, clock, "ms_natural", __FILE__) , device_pc_kbd_interface(mconfig, *this) , m_cpu(*this, "ms_natrl_cpu") @@ -318,7 +318,7 @@ READ8_MEMBER( pc_kbd_microsoft_natural_device::p0_read ) UINT8 data = 0xFF; if (LOG) - logerror("%s: P0 read. P1 = %02x, P2 = %02x\n", tag(), m_p1, m_p2 ); + logerror("%s: P0 read. P1 = %02x, P2 = %02x\n", tag().c_str(), m_p1, m_p2 ); if ( ! ( m_p2 & 0x01 ) ) { diff --git a/src/devices/bus/pc_kbd/msnat.h b/src/devices/bus/pc_kbd/msnat.h index 600138f9479..0bb566dbb1f 100644 --- a/src/devices/bus/pc_kbd/msnat.h +++ b/src/devices/bus/pc_kbd/msnat.h @@ -20,7 +20,7 @@ class pc_kbd_microsoft_natural_device : public device_t, { public: // construction/destruction - pc_kbd_microsoft_natural_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + pc_kbd_microsoft_natural_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); required_device<cpu_device> m_cpu; diff --git a/src/devices/bus/pc_kbd/pc83.cpp b/src/devices/bus/pc_kbd/pc83.cpp index e79c4126c47..45d74cfef73 100644 --- a/src/devices/bus/pc_kbd/pc83.cpp +++ b/src/devices/bus/pc_kbd/pc83.cpp @@ -248,7 +248,7 @@ ioport_constructor ibm_pc_83_keyboard_device::device_input_ports() const // ibm_pc_83_keyboard_device - constructor //------------------------------------------------- -ibm_pc_83_keyboard_device::ibm_pc_83_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ibm_pc_83_keyboard_device::ibm_pc_83_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PC_KBD_IBM_PC_83, "IBM PC Keyboard", tag, owner, clock, "kb_pc83", __FILE__), device_pc_kbd_interface(mconfig, *this), m_maincpu(*this, I8048_TAG), diff --git a/src/devices/bus/pc_kbd/pc83.h b/src/devices/bus/pc_kbd/pc83.h index b445c5b1f45..43566b65344 100644 --- a/src/devices/bus/pc_kbd/pc83.h +++ b/src/devices/bus/pc_kbd/pc83.h @@ -29,7 +29,7 @@ class ibm_pc_83_keyboard_device : public device_t, { public: // construction/destruction - ibm_pc_83_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ibm_pc_83_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/pc_kbd/pc_kbdc.cpp b/src/devices/bus/pc_kbd/pc_kbdc.cpp index 9f920c6d5dd..a5243fe2350 100644 --- a/src/devices/bus/pc_kbd/pc_kbdc.cpp +++ b/src/devices/bus/pc_kbd/pc_kbdc.cpp @@ -31,7 +31,7 @@ const device_type PC_KBDC_SLOT = &device_creator<pc_kbdc_slot_device>; //------------------------------------------------- // pc_kbdc_slot_device - constructor //------------------------------------------------- -pc_kbdc_slot_device::pc_kbdc_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +pc_kbdc_slot_device::pc_kbdc_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PC_KBDC_SLOT, "PC_KBDC_SLOT", tag, owner, clock, "pc_kbdc_slot", __FILE__), device_slot_interface(mconfig, *this), m_kbdc_device(nullptr) @@ -70,7 +70,7 @@ const device_type PC_KBDC = &device_creator<pc_kbdc_device>; //------------------------------------------------- // pc_kbdc_device - constructor //------------------------------------------------- -pc_kbdc_device::pc_kbdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +pc_kbdc_device::pc_kbdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PC_KBDC, "PC_KBDC", tag, owner, clock, "pc_kbdc", __FILE__), m_out_clock_cb(*this), m_out_data_cb(*this), @@ -196,7 +196,7 @@ WRITE_LINE_MEMBER( pc_kbdc_device::data_write_from_kb ) device_pc_kbd_interface::device_pc_kbd_interface(const machine_config &mconfig, device_t &device) : device_slot_card_interface(mconfig, device), m_pc_kbdc(nullptr), - m_pc_kbdc_tag(nullptr), m_next(nullptr) + m_next(nullptr) { } diff --git a/src/devices/bus/pc_kbd/pc_kbdc.h b/src/devices/bus/pc_kbd/pc_kbdc.h index 3f1788ac021..a23606ba45a 100644 --- a/src/devices/bus/pc_kbd/pc_kbdc.h +++ b/src/devices/bus/pc_kbd/pc_kbdc.h @@ -42,7 +42,7 @@ class pc_kbdc_slot_device : public device_t, { public: // construction/destruction - pc_kbdc_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + pc_kbdc_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -65,7 +65,7 @@ class pc_kbdc_device : public device_t { public: // construction/destruction - pc_kbdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + pc_kbdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template<class _Object> static devcb_base &set_out_clock_callback(device_t &device, _Object object) { return downcast<pc_kbdc_device &>(device).m_out_clock_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_data_callback(device_t &device, _Object object) { return downcast<pc_kbdc_device &>(device).m_out_data_cb.set_callback(object); } @@ -134,7 +134,7 @@ public: static void static_set_pc_kbdc(device_t &device, device_t *kbdc_device); pc_kbdc_device *m_pc_kbdc; - const char *m_pc_kbdc_tag; + std::string m_pc_kbdc_tag; device_pc_kbd_interface *m_next; }; diff --git a/src/devices/bus/pc_kbd/pcat84.cpp b/src/devices/bus/pc_kbd/pcat84.cpp index eeaf9494fd3..6e5aa21d586 100644 --- a/src/devices/bus/pc_kbd/pcat84.cpp +++ b/src/devices/bus/pc_kbd/pcat84.cpp @@ -353,7 +353,7 @@ ioport_constructor ibm_3270pc_122_keyboard_device::device_input_ports() const // ibm_pc_at_84_keyboard_device - constructor //------------------------------------------------- -ibm_pc_at_84_keyboard_device::ibm_pc_at_84_keyboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +ibm_pc_at_84_keyboard_device::ibm_pc_at_84_keyboard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_pc_kbd_interface(mconfig, *this), m_maincpu(*this, I8048_TAG), @@ -382,7 +382,7 @@ ibm_pc_at_84_keyboard_device::ibm_pc_at_84_keyboard_device(const machine_config { } -ibm_pc_at_84_keyboard_device::ibm_pc_at_84_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ibm_pc_at_84_keyboard_device::ibm_pc_at_84_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PC_KBD_IBM_PC_AT_84, "IBM PC/AT Keyboard", tag, owner, clock, "kb_pcat84", __FILE__), device_pc_kbd_interface(mconfig, *this), m_maincpu(*this, I8048_TAG), @@ -411,7 +411,7 @@ ibm_pc_at_84_keyboard_device::ibm_pc_at_84_keyboard_device(const machine_config { } -ibm_3270pc_122_keyboard_device::ibm_3270pc_122_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ibm_3270pc_122_keyboard_device::ibm_3270pc_122_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ibm_pc_at_84_keyboard_device(mconfig, PC_KBD_IBM_3270PC_122, "IBM 3270PC Keyboard", tag, owner, clock, "kb_3270pc", __FILE__) { } diff --git a/src/devices/bus/pc_kbd/pcat84.h b/src/devices/bus/pc_kbd/pcat84.h index e099dd31760..6b2103197bf 100644 --- a/src/devices/bus/pc_kbd/pcat84.h +++ b/src/devices/bus/pc_kbd/pcat84.h @@ -29,8 +29,8 @@ class ibm_pc_at_84_keyboard_device : public device_t, { public: // construction/destruction - ibm_pc_at_84_keyboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - ibm_pc_at_84_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ibm_pc_at_84_keyboard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + ibm_pc_at_84_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -97,7 +97,7 @@ class ibm_3270pc_122_keyboard_device : public ibm_pc_at_84_keyboard_device { public: // construction/destruction - ibm_3270pc_122_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ibm_3270pc_122_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/pc_kbd/pcxt83.cpp b/src/devices/bus/pc_kbd/pcxt83.cpp index dfbc5616b73..5f189ad05d3 100644 --- a/src/devices/bus/pc_kbd/pcxt83.cpp +++ b/src/devices/bus/pc_kbd/pcxt83.cpp @@ -247,7 +247,7 @@ ioport_constructor ibm_pc_xt_83_keyboard_device::device_input_ports() const // ibm_pc_xt_83_keyboard_device - constructor //------------------------------------------------- -ibm_pc_xt_83_keyboard_device::ibm_pc_xt_83_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ibm_pc_xt_83_keyboard_device::ibm_pc_xt_83_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PC_KBD_IBM_PC_XT_83, "IBM PC/XT Keyboard", tag, owner, clock, "kb_pcxt83", __FILE__), device_pc_kbd_interface(mconfig, *this), m_maincpu(*this, I8048_TAG), diff --git a/src/devices/bus/pc_kbd/pcxt83.h b/src/devices/bus/pc_kbd/pcxt83.h index af53d6244b4..8c28c60d4ff 100644 --- a/src/devices/bus/pc_kbd/pcxt83.h +++ b/src/devices/bus/pc_kbd/pcxt83.h @@ -29,7 +29,7 @@ class ibm_pc_xt_83_keyboard_device : public device_t, { public: // construction/destruction - ibm_pc_xt_83_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ibm_pc_xt_83_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/pce/pce_rom.cpp b/src/devices/bus/pce/pce_rom.cpp index 5323f8a675b..902e05057b9 100644 --- a/src/devices/bus/pce/pce_rom.cpp +++ b/src/devices/bus/pce/pce_rom.cpp @@ -23,29 +23,29 @@ const device_type PCE_ROM_POPULOUS = &device_creator<pce_populous_device>; const device_type PCE_ROM_SF2 = &device_creator<pce_sf2_device>; -pce_rom_device::pce_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +pce_rom_device::pce_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_pce_cart_interface( mconfig, *this ) { } -pce_rom_device::pce_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +pce_rom_device::pce_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PCE_ROM_STD, "PCE & TG16 Carts", tag, owner, clock, "pce_rom", __FILE__), device_pce_cart_interface( mconfig, *this ) { } -pce_cdsys3_device::pce_cdsys3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +pce_cdsys3_device::pce_cdsys3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : pce_rom_device(mconfig, PCE_ROM_CDSYS3, "PCE & TG16 CD-System Cart v3.00", tag, owner, clock, "pce_cdsys3", __FILE__) { } -pce_populous_device::pce_populous_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +pce_populous_device::pce_populous_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : pce_rom_device(mconfig, PCE_ROM_POPULOUS, "PCE Populous Cart", tag, owner, clock, "pce_populous", __FILE__) { } -pce_sf2_device::pce_sf2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +pce_sf2_device::pce_sf2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : pce_rom_device(mconfig, PCE_ROM_SF2, "PCE Street Fighters 2 Cart", tag, owner, clock, "pce_sf2", __FILE__), m_bank_base(0) { } diff --git a/src/devices/bus/pce/pce_rom.h b/src/devices/bus/pce/pce_rom.h index 14d6dc29577..1f3fec2ae7c 100644 --- a/src/devices/bus/pce/pce_rom.h +++ b/src/devices/bus/pce/pce_rom.h @@ -13,8 +13,8 @@ class pce_rom_device : public device_t, { public: // construction/destruction - pce_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - pce_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + pce_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + pce_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override {} @@ -30,7 +30,7 @@ class pce_cdsys3_device : public pce_rom_device { public: // construction/destruction - pce_cdsys3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + pce_cdsys3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_cart) override; @@ -44,7 +44,7 @@ class pce_populous_device : public pce_rom_device { public: // construction/destruction - pce_populous_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + pce_populous_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_cart) override; @@ -58,7 +58,7 @@ class pce_sf2_device : public pce_rom_device { public: // construction/destruction - pce_sf2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + pce_sf2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/pce/pce_slot.cpp b/src/devices/bus/pce/pce_slot.cpp index 4fffa5172fc..1b3e13dad67 100644 --- a/src/devices/bus/pce/pce_slot.cpp +++ b/src/devices/bus/pce/pce_slot.cpp @@ -49,7 +49,7 @@ device_pce_cart_interface::~device_pce_cart_interface() // rom_alloc - alloc the space for the cart //------------------------------------------------- -void device_pce_cart_interface::rom_alloc(UINT32 size, const char *tag) +void device_pce_cart_interface::rom_alloc(UINT32 size, std::string tag) { if (m_rom == nullptr) { @@ -135,7 +135,7 @@ void device_pce_cart_interface::rom_map_setup(UINT32 size) //------------------------------------------------- // pce_cart_slot_device - constructor //------------------------------------------------- -pce_cart_slot_device::pce_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +pce_cart_slot_device::pce_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PCE_CART_SLOT, "PCE & TG16 Cartridge Slot", tag, owner, clock, "pce_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), diff --git a/src/devices/bus/pce/pce_slot.h b/src/devices/bus/pce/pce_slot.h index e680ef7b950..86aa14aede3 100644 --- a/src/devices/bus/pce/pce_slot.h +++ b/src/devices/bus/pce/pce_slot.h @@ -32,7 +32,7 @@ public: virtual DECLARE_READ8_MEMBER(read_cart) { return 0xff; } virtual DECLARE_WRITE8_MEMBER(write_cart) {}; - void rom_alloc(UINT32 size, const char *tag); + void rom_alloc(UINT32 size, std::string tag); void ram_alloc(UINT32 size); UINT8* get_rom_base() { return m_rom; } UINT8* get_ram_base() { return &m_ram[0]; } @@ -58,7 +58,7 @@ class pce_cart_slot_device : public device_t, { public: // construction/destruction - pce_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + pce_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~pce_cart_slot_device(); // device-level overrides diff --git a/src/devices/bus/pet/64k.cpp b/src/devices/bus/pet/64k.cpp index dfdc278a77d..a291d35dd85 100644 --- a/src/devices/bus/pet/64k.cpp +++ b/src/devices/bus/pet/64k.cpp @@ -75,7 +75,7 @@ inline void pet_64k_expansion_device::write_ram(offs_t offset, UINT8 data) // pet_64k_expansion_device - constructor //------------------------------------------------- -pet_64k_expansion_device::pet_64k_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +pet_64k_expansion_device::pet_64k_expansion_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PET_64K, "PET 64KB RAM", tag, owner, clock, "pet_64k", __FILE__), device_pet_expansion_card_interface(mconfig, *this), m_ram(*this, "ram"), diff --git a/src/devices/bus/pet/64k.h b/src/devices/bus/pet/64k.h index ed698f539d1..74ddd60ecc2 100644 --- a/src/devices/bus/pet/64k.h +++ b/src/devices/bus/pet/64k.h @@ -27,7 +27,7 @@ class pet_64k_expansion_device : public device_t, { public: // construction/destruction - pet_64k_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + pet_64k_expansion_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/pet/c2n.cpp b/src/devices/bus/pet/c2n.cpp index 585e651f3d7..b51ff3100fc 100644 --- a/src/devices/bus/pet/c2n.cpp +++ b/src/devices/bus/pet/c2n.cpp @@ -51,7 +51,7 @@ machine_config_constructor c2n_device::device_mconfig_additions() const // c2n_device - constructor //------------------------------------------------- -c2n_device::c2n_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +c2n_device::c2n_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_pet_datassette_port_interface(mconfig, *this), m_cassette(*this, "cassette"), @@ -60,7 +60,7 @@ c2n_device::c2n_device(const machine_config &mconfig, device_type type, const ch { } -c2n_device::c2n_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +c2n_device::c2n_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C2N, "C2N Datassette", tag, owner, clock, "c2n", __FILE__), device_pet_datassette_port_interface(mconfig, *this), m_cassette(*this, "cassette"), @@ -73,7 +73,7 @@ c2n_device::c2n_device(const machine_config &mconfig, const char *tag, device_t // c1530_device - constructor //------------------------------------------------- -c1530_device::c1530_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +c1530_device::c1530_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : c2n_device(mconfig, C1530, "C1530 Datassette", tag, owner, clock, "c1530", __FILE__) { } @@ -81,7 +81,7 @@ c1530_device::c1530_device(const machine_config &mconfig, const char *tag, devic // c1531_device - constructor //------------------------------------------------- -c1531_device::c1531_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +c1531_device::c1531_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : c2n_device(mconfig, C1531, "C1531 Datassette", tag, owner, clock, "c1531", __FILE__) { } diff --git a/src/devices/bus/pet/c2n.h b/src/devices/bus/pet/c2n.h index 5aeac83ce0b..afaf19a60eb 100644 --- a/src/devices/bus/pet/c2n.h +++ b/src/devices/bus/pet/c2n.h @@ -29,8 +29,8 @@ class c2n_device : public device_t, { public: // construction/destruction - c2n_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - c2n_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c2n_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + c2n_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -62,7 +62,7 @@ class c1530_device : public c2n_device { public: // construction/destruction - c1530_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c1530_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; @@ -72,7 +72,7 @@ class c1531_device : public c2n_device { public: // construction/destruction - c1531_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c1531_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/bus/pet/cass.cpp b/src/devices/bus/pet/cass.cpp index cb715a18434..8977805f7a1 100644 --- a/src/devices/bus/pet/cass.cpp +++ b/src/devices/bus/pet/cass.cpp @@ -51,7 +51,7 @@ device_pet_datassette_port_interface::~device_pet_datassette_port_interface() // pet_datassette_port_device - constructor //------------------------------------------------- -pet_datassette_port_device::pet_datassette_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +pet_datassette_port_device::pet_datassette_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PET_DATASSETTE_PORT, "Datassette Port", tag, owner, clock, "pet_datassette_port", __FILE__), device_slot_interface(mconfig, *this), m_read_handler(*this), m_cart(nullptr) diff --git a/src/devices/bus/pet/cass.h b/src/devices/bus/pet/cass.h index a3dbda7797d..9cb97347e88 100644 --- a/src/devices/bus/pet/cass.h +++ b/src/devices/bus/pet/cass.h @@ -57,7 +57,7 @@ class pet_datassette_port_device : public device_t, { public: // construction/destruction - pet_datassette_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + pet_datassette_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~pet_datassette_port_device(); // static configuration helpers diff --git a/src/devices/bus/pet/cb2snd.cpp b/src/devices/bus/pet/cb2snd.cpp index d89ef26268c..f1d317af458 100644 --- a/src/devices/bus/pet/cb2snd.cpp +++ b/src/devices/bus/pet/cb2snd.cpp @@ -42,7 +42,7 @@ machine_config_constructor pet_userport_cb2_sound_device::device_mconfig_additio // pet_userport_cb2_sound_device - constructor //------------------------------------------------- -pet_userport_cb2_sound_device::pet_userport_cb2_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +pet_userport_cb2_sound_device::pet_userport_cb2_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PET_USERPORT_CB2_SOUND_DEVICE, "PET Userport 'CB2 Sound' Device", tag, owner, clock, "petucb2", __FILE__), device_pet_user_port_interface(mconfig, *this), m_dac(*this, DAC_TAG) diff --git a/src/devices/bus/pet/cb2snd.h b/src/devices/bus/pet/cb2snd.h index 8f62c8973bf..c653e9ad3ba 100644 --- a/src/devices/bus/pet/cb2snd.h +++ b/src/devices/bus/pet/cb2snd.h @@ -24,7 +24,7 @@ class pet_userport_cb2_sound_device : public device_t, { public: // construction/destruction - pet_userport_cb2_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + pet_userport_cb2_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/pet/diag.cpp b/src/devices/bus/pet/diag.cpp index 7cd73c6fff0..fa2343c5825 100644 --- a/src/devices/bus/pet/diag.cpp +++ b/src/devices/bus/pet/diag.cpp @@ -26,7 +26,7 @@ const device_type PET_USERPORT_DIAGNOSTIC_CONNECTOR = &device_creator<pet_userpo // pet_userport_diagnostic_connector_t - constructor //------------------------------------------------- -pet_userport_diagnostic_connector_t::pet_userport_diagnostic_connector_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +pet_userport_diagnostic_connector_t::pet_userport_diagnostic_connector_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PET_USERPORT_DIAGNOSTIC_CONNECTOR, "PET Userport Diagnostic Connector", tag, owner, clock, "pet_user_diag", __FILE__), device_pet_user_port_interface(mconfig, *this) { diff --git a/src/devices/bus/pet/diag.h b/src/devices/bus/pet/diag.h index 58ce46f82ba..305ac903862 100644 --- a/src/devices/bus/pet/diag.h +++ b/src/devices/bus/pet/diag.h @@ -27,7 +27,7 @@ class pet_userport_diagnostic_connector_t : public device_t, { public: // construction/destruction - pet_userport_diagnostic_connector_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + pet_userport_diagnostic_connector_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device_pet_user_port_interface overrides virtual DECLARE_WRITE_LINE_MEMBER( input_2 ) override { output_b(state); } diff --git a/src/devices/bus/pet/diag264_lb_tape.cpp b/src/devices/bus/pet/diag264_lb_tape.cpp index 0c3bfb87d74..a3a3269bde3 100644 --- a/src/devices/bus/pet/diag264_lb_tape.cpp +++ b/src/devices/bus/pet/diag264_lb_tape.cpp @@ -26,7 +26,7 @@ const device_type DIAG264_CASSETTE_LOOPBACK = &device_creator<diag264_cassette_l // diag264_cassette_loopback_device - constructor //------------------------------------------------- -diag264_cassette_loopback_device::diag264_cassette_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +diag264_cassette_loopback_device::diag264_cassette_loopback_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, DIAG264_CASSETTE_LOOPBACK, "Diag264 Cassette Loopback", tag, owner, clock, "diag264_loopback_cassette", __FILE__), device_pet_datassette_port_interface(mconfig, *this), m_read(1), diff --git a/src/devices/bus/pet/diag264_lb_tape.h b/src/devices/bus/pet/diag264_lb_tape.h index c4bc2ad4e02..954a379190d 100644 --- a/src/devices/bus/pet/diag264_lb_tape.h +++ b/src/devices/bus/pet/diag264_lb_tape.h @@ -27,7 +27,7 @@ class diag264_cassette_loopback_device : public device_t, { public: // construction/destruction - diag264_cassette_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + diag264_cassette_loopback_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/pet/exp.cpp b/src/devices/bus/pet/exp.cpp index 8a830a8af3a..bc2f7428213 100644 --- a/src/devices/bus/pet/exp.cpp +++ b/src/devices/bus/pet/exp.cpp @@ -34,7 +34,7 @@ const device_type PET_EXPANSION_SLOT = &device_creator<pet_expansion_slot_device // pet_expansion_slot_device - constructor //------------------------------------------------- -pet_expansion_slot_device::pet_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +pet_expansion_slot_device::pet_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PET_EXPANSION_SLOT, "PET memory expansion port", tag, owner, clock, "pet_expansion_slot", __FILE__), device_slot_interface(mconfig, *this), m_card(nullptr), m_read_dma(*this), diff --git a/src/devices/bus/pet/exp.h b/src/devices/bus/pet/exp.h index d2f189cf0cd..720337a4ffb 100644 --- a/src/devices/bus/pet/exp.h +++ b/src/devices/bus/pet/exp.h @@ -52,7 +52,7 @@ class pet_expansion_slot_device : public device_t, { public: // construction/destruction - pet_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + pet_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~pet_expansion_slot_device(); template<class _read, class _write> void set_callbacks(_read rd, _write wr) { diff --git a/src/devices/bus/pet/hsg.cpp b/src/devices/bus/pet/hsg.cpp index 2a90008c307..00c786db8e1 100644 --- a/src/devices/bus/pet/hsg.cpp +++ b/src/devices/bus/pet/hsg.cpp @@ -149,7 +149,7 @@ machine_config_constructor cbm8000_hsg_b_t::device_mconfig_additions() const // cbm8000_hsg_t - constructor //------------------------------------------------- -cbm8000_hsg_t::cbm8000_hsg_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +cbm8000_hsg_t::cbm8000_hsg_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_pet_expansion_card_interface(mconfig, *this), m_gdc(*this, EF9365_TAG), @@ -158,12 +158,12 @@ cbm8000_hsg_t::cbm8000_hsg_t(const machine_config &mconfig, device_type type, co { } -cbm8000_hsg_a_t::cbm8000_hsg_a_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +cbm8000_hsg_a_t::cbm8000_hsg_a_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : cbm8000_hsg_t(mconfig, CBM8000_HSG_A, "CBM 8000 High Speed Graphics (A)", tag, owner, clock, "cbm8000_hsg_a", __FILE__) { } -cbm8000_hsg_b_t::cbm8000_hsg_b_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +cbm8000_hsg_b_t::cbm8000_hsg_b_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : cbm8000_hsg_t(mconfig, CBM8000_HSG_B, "CBM 8000 High Speed Graphics (B)", tag, owner, clock, "cbm8000_hsg_b", __FILE__) { } diff --git a/src/devices/bus/pet/hsg.h b/src/devices/bus/pet/hsg.h index abe9067c498..7fc60fda6e9 100644 --- a/src/devices/bus/pet/hsg.h +++ b/src/devices/bus/pet/hsg.h @@ -28,7 +28,7 @@ class cbm8000_hsg_t : public device_t, { public: // construction/destruction - cbm8000_hsg_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + cbm8000_hsg_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -58,7 +58,7 @@ class cbm8000_hsg_a_t : public cbm8000_hsg_t { public: // construction/destruction - cbm8000_hsg_a_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cbm8000_hsg_a_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -71,7 +71,7 @@ class cbm8000_hsg_b_t : public cbm8000_hsg_t { public: // construction/destruction - cbm8000_hsg_b_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cbm8000_hsg_b_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/pet/petuja.cpp b/src/devices/bus/pet/petuja.cpp index 4bc335e7dab..ed3d9b9ba42 100644 --- a/src/devices/bus/pet/petuja.cpp +++ b/src/devices/bus/pet/petuja.cpp @@ -59,7 +59,7 @@ ioport_constructor pet_userport_joystick_adapter_device::device_input_ports() co // pet_userport_joystick_adapter_device - constructor //------------------------------------------------- -pet_userport_joystick_adapter_device::pet_userport_joystick_adapter_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +pet_userport_joystick_adapter_device::pet_userport_joystick_adapter_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PET_USERPORT_JOYSTICK_ADAPTER, "PET Userport Joystick Adapter", tag, owner, clock, "petuja", __FILE__), device_pet_user_port_interface(mconfig, *this), m_up1(1), diff --git a/src/devices/bus/pet/petuja.h b/src/devices/bus/pet/petuja.h index 720594e9561..bc5a3b375dd 100644 --- a/src/devices/bus/pet/petuja.h +++ b/src/devices/bus/pet/petuja.h @@ -28,7 +28,7 @@ class pet_userport_joystick_adapter_device : public device_t, { public: // construction/destruction - pet_userport_joystick_adapter_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + pet_userport_joystick_adapter_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/pet/superpet.cpp b/src/devices/bus/pet/superpet.cpp index 592e50b8327..f52b351a18c 100644 --- a/src/devices/bus/pet/superpet.cpp +++ b/src/devices/bus/pet/superpet.cpp @@ -174,7 +174,7 @@ inline bool superpet_device::is_ram_writable() // superpet_device - constructor //------------------------------------------------- -superpet_device::superpet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +superpet_device::superpet_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SUPERPET, "SuperPET", tag, owner, clock, "pet_superpet", __FILE__), device_pet_expansion_card_interface(mconfig, *this), m_maincpu(*this, M6809_TAG), diff --git a/src/devices/bus/pet/superpet.h b/src/devices/bus/pet/superpet.h index d26fbf059dd..19b19e49c06 100644 --- a/src/devices/bus/pet/superpet.h +++ b/src/devices/bus/pet/superpet.h @@ -28,7 +28,7 @@ class superpet_device : public device_t, { public: // construction/destruction - superpet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + superpet_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/pet/user.cpp b/src/devices/bus/pet/user.cpp index f56132c5dd3..949dffa0b41 100644 --- a/src/devices/bus/pet/user.cpp +++ b/src/devices/bus/pet/user.cpp @@ -12,7 +12,7 @@ const device_type PET_USER_PORT = &device_creator<pet_user_port_device>; -pet_user_port_device::pet_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +pet_user_port_device::pet_user_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PET_USER_PORT, "PET user port", tag, owner, clock, "pet_user_port", __FILE__), device_slot_interface(mconfig, *this), m_2_handler(*this), diff --git a/src/devices/bus/pet/user.h b/src/devices/bus/pet/user.h index 6b402691b17..1654445322c 100644 --- a/src/devices/bus/pet/user.h +++ b/src/devices/bus/pet/user.h @@ -101,7 +101,7 @@ class pet_user_port_device : public device_t, friend class device_pet_user_port_interface; public: - pet_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + pet_user_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template<class _Object> static devcb_base &set_2_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_2_handler.set_callback(object); } template<class _Object> static devcb_base &set_3_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_3_handler.set_callback(object); } diff --git a/src/devices/bus/plus4/c1551.cpp b/src/devices/bus/plus4/c1551.cpp index 4e24bb153e9..06638b2e968 100644 --- a/src/devices/bus/plus4/c1551.cpp +++ b/src/devices/bus/plus4/c1551.cpp @@ -413,7 +413,7 @@ ioport_constructor c1551_t::device_input_ports() const // c1551_t - constructor //------------------------------------------------- -c1551_t::c1551_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +c1551_t::c1551_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C1551, "C1551", tag, owner, clock, "c1551", __FILE__), device_plus4_expansion_card_interface(mconfig, *this), m_maincpu(*this, M6510T_TAG), diff --git a/src/devices/bus/plus4/c1551.h b/src/devices/bus/plus4/c1551.h index af10e75daed..1a4c5f4777f 100644 --- a/src/devices/bus/plus4/c1551.h +++ b/src/devices/bus/plus4/c1551.h @@ -31,7 +31,7 @@ class c1551_t : public device_t, { public: // construction/destruction - c1551_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c1551_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/plus4/diag264_lb_user.cpp b/src/devices/bus/plus4/diag264_lb_user.cpp index 10d93e462e6..1c3da20992f 100644 --- a/src/devices/bus/plus4/diag264_lb_user.cpp +++ b/src/devices/bus/plus4/diag264_lb_user.cpp @@ -26,7 +26,7 @@ const device_type DIAG264_USER_PORT_LOOPBACK = &device_creator<diag264_user_port // diag264_user_port_loopback_device - constructor //------------------------------------------------- -diag264_user_port_loopback_device::diag264_user_port_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +diag264_user_port_loopback_device::diag264_user_port_loopback_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, DIAG264_USER_PORT_LOOPBACK, "Diag264 User Port Loopback", tag, owner, clock, "diag264_user_port_loopback", __FILE__), device_pet_user_port_interface(mconfig, *this) { diff --git a/src/devices/bus/plus4/diag264_lb_user.h b/src/devices/bus/plus4/diag264_lb_user.h index 6c4ecae22ad..82de7b03886 100644 --- a/src/devices/bus/plus4/diag264_lb_user.h +++ b/src/devices/bus/plus4/diag264_lb_user.h @@ -27,7 +27,7 @@ class diag264_user_port_loopback_device : public device_t, { public: // construction/destruction - diag264_user_port_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + diag264_user_port_loopback_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/plus4/exp.cpp b/src/devices/bus/plus4/exp.cpp index 47f404cacf4..ccb596b5592 100644 --- a/src/devices/bus/plus4/exp.cpp +++ b/src/devices/bus/plus4/exp.cpp @@ -67,7 +67,7 @@ device_plus4_expansion_card_interface::~device_plus4_expansion_card_interface() // plus4_expansion_slot_device - constructor //------------------------------------------------- -plus4_expansion_slot_device::plus4_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +plus4_expansion_slot_device::plus4_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PLUS4_EXPANSION_SLOT, "Expansion Port", tag, owner, clock, "plus4_expansion_slot", __FILE__), device_slot_interface(mconfig, *this), device_image_interface(mconfig, *this), diff --git a/src/devices/bus/plus4/exp.h b/src/devices/bus/plus4/exp.h index 3595b013f98..1d7c55c2c1d 100644 --- a/src/devices/bus/plus4/exp.h +++ b/src/devices/bus/plus4/exp.h @@ -95,7 +95,7 @@ class plus4_expansion_slot_device : public device_t, { public: // construction/destruction - plus4_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + plus4_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<plus4_expansion_slot_device &>(device).m_write_irq.set_callback(object); } template<class _Object> static devcb_base &set_cd_rd_callback(device_t &device, _Object object) { return downcast<plus4_expansion_slot_device &>(device).m_read_dma_cd.set_callback(object); } diff --git a/src/devices/bus/plus4/sid.cpp b/src/devices/bus/plus4/sid.cpp index 5e4ffb172b1..262a740e05d 100644 --- a/src/devices/bus/plus4/sid.cpp +++ b/src/devices/bus/plus4/sid.cpp @@ -92,7 +92,7 @@ machine_config_constructor plus4_sid_cartridge_device::device_mconfig_additions( // plus4_sid_cartridge_device - constructor //------------------------------------------------- -plus4_sid_cartridge_device::plus4_sid_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +plus4_sid_cartridge_device::plus4_sid_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PLUS4_SID, "Plus/4 SID cartridge", tag, owner, clock, "plus4_sid", __FILE__), device_plus4_expansion_card_interface(mconfig, *this), m_sid(*this, MOS8580_TAG), diff --git a/src/devices/bus/plus4/sid.h b/src/devices/bus/plus4/sid.h index 0351381f478..a0ecb79a083 100644 --- a/src/devices/bus/plus4/sid.h +++ b/src/devices/bus/plus4/sid.h @@ -30,7 +30,7 @@ class plus4_sid_cartridge_device : public device_t, { public: // construction/destruction - plus4_sid_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + plus4_sid_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/plus4/std.cpp b/src/devices/bus/plus4/std.cpp index 8627f99cc30..d6c740daf49 100644 --- a/src/devices/bus/plus4/std.cpp +++ b/src/devices/bus/plus4/std.cpp @@ -26,7 +26,7 @@ const device_type PLUS4_STD = &device_creator<plus4_standard_cartridge_device>; // plus4_standard_cartridge_device - constructor //------------------------------------------------- -plus4_standard_cartridge_device::plus4_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +plus4_standard_cartridge_device::plus4_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PLUS4_STD, "Plus/4 standard cartridge", tag, owner, clock, "plus4_standard", __FILE__), device_plus4_expansion_card_interface(mconfig, *this) { diff --git a/src/devices/bus/plus4/std.h b/src/devices/bus/plus4/std.h index 29fe1d16b13..3dc6dda2ed3 100644 --- a/src/devices/bus/plus4/std.h +++ b/src/devices/bus/plus4/std.h @@ -27,7 +27,7 @@ class plus4_standard_cartridge_device : public device_t, { public: // construction/destruction - plus4_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + plus4_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/psx/analogue.cpp b/src/devices/bus/psx/analogue.cpp index 69d980e5843..02954688390 100644 --- a/src/devices/bus/psx/analogue.cpp +++ b/src/devices/bus/psx/analogue.cpp @@ -5,7 +5,7 @@ const device_type PSX_ANALOG_JOYSTICK = &device_creator<psx_analog_joystick_device>; const device_type PSX_DUALSHOCK = &device_creator<psx_dualshock_device>; -psx_analog_controller_device::psx_analog_controller_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +psx_analog_controller_device::psx_analog_controller_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_psx_controller_interface(mconfig, *this), m_type(), @@ -23,13 +23,13 @@ psx_analog_controller_device::psx_analog_controller_device(const machine_config { } -psx_dualshock_device::psx_dualshock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +psx_dualshock_device::psx_dualshock_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : psx_analog_controller_device(mconfig, PSX_DUALSHOCK, "Playstation Dualshock Pad", tag, owner, clock, "psx_dualshock_pad", __FILE__) { m_type = DUALSHOCK; } -psx_analog_joystick_device::psx_analog_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +psx_analog_joystick_device::psx_analog_joystick_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : psx_analog_controller_device(mconfig, PSX_ANALOG_JOYSTICK, "Playstation Analog Joystick", tag, owner, clock, "psx_analog_joystick", __FILE__) { m_type = JOYSTICK; diff --git a/src/devices/bus/psx/analogue.h b/src/devices/bus/psx/analogue.h index 9fab90f3625..972f720e02c 100644 --- a/src/devices/bus/psx/analogue.h +++ b/src/devices/bus/psx/analogue.h @@ -12,7 +12,7 @@ class psx_analog_controller_device : public device_t, public device_psx_controller_interface { public: - psx_analog_controller_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + psx_analog_controller_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); virtual ioport_constructor device_input_ports() const override; DECLARE_INPUT_CHANGED_MEMBER(change_mode); @@ -45,13 +45,13 @@ private: class psx_dualshock_device : public psx_analog_controller_device { public: - psx_dualshock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + psx_dualshock_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; class psx_analog_joystick_device : public psx_analog_controller_device { public: - psx_analog_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + psx_analog_joystick_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; #endif /* PSXANALOG_H_ */ diff --git a/src/devices/bus/psx/ctlrport.cpp b/src/devices/bus/psx/ctlrport.cpp index 5f84e482b4d..fcf431622b2 100644 --- a/src/devices/bus/psx/ctlrport.cpp +++ b/src/devices/bus/psx/ctlrport.cpp @@ -8,7 +8,7 @@ const device_type PSX_CONTROLLER_PORT = &device_creator<psx_controller_port_device>; -psx_controller_port_device::psx_controller_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +psx_controller_port_device::psx_controller_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PSX_CONTROLLER_PORT, "Playstation Controller Port", tag, owner, clock, "psx_controller_port", __FILE__), device_slot_interface(mconfig, *this), m_tx(false), @@ -41,7 +41,7 @@ void psx_controller_port_device::disable_card(bool state) const device_type PSXCONTROLLERPORTS = &device_creator<psxcontrollerports_device>; -psxcontrollerports_device::psxcontrollerports_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +psxcontrollerports_device::psxcontrollerports_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PSXCONTROLLERPORTS, "PSXCONTROLLERPORTS", tag, owner, clock, "psxcontrollerports", __FILE__), m_port0(nullptr), m_port1(nullptr), m_dsr_handler(*this), m_rxd_handler(*this) @@ -173,7 +173,7 @@ void device_psx_controller_interface::sel_w(bool state) { const device_type PSX_STANDARD_CONTROLLER = &device_creator<psx_standard_controller_device>; -psx_standard_controller_device::psx_standard_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +psx_standard_controller_device::psx_standard_controller_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PSX_STANDARD_CONTROLLER, "Playstation Standard Controller", tag, owner, clock, "psx_standard_controller", __FILE__), device_psx_controller_interface(mconfig, *this), m_pad0(*this,"PSXPAD0"), diff --git a/src/devices/bus/psx/ctlrport.h b/src/devices/bus/psx/ctlrport.h index 09f1b947eab..a529168be74 100644 --- a/src/devices/bus/psx/ctlrport.h +++ b/src/devices/bus/psx/ctlrport.h @@ -66,7 +66,7 @@ class psx_standard_controller_device : public device_t, public device_psx_controller_interface { public: - psx_standard_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + psx_standard_controller_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ioport_constructor device_input_ports() const override; @@ -88,7 +88,7 @@ private: class psxcontrollerports_device : public device_t { public: - psxcontrollerports_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + psxcontrollerports_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void ack(); template<class _Object> static devcb_base &set_dsr_handler(device_t &device, _Object object) { return downcast<psxcontrollerports_device &>(device).m_dsr_handler.set_callback(object); } @@ -113,7 +113,7 @@ class psx_controller_port_device : public device_t, public device_slot_interface { public: - psx_controller_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + psx_controller_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; typedef delegate<void ()> void_cb; diff --git a/src/devices/bus/psx/memcard.cpp b/src/devices/bus/psx/memcard.cpp index 5b8ff16933b..f9943eb7c8f 100644 --- a/src/devices/bus/psx/memcard.cpp +++ b/src/devices/bus/psx/memcard.cpp @@ -41,7 +41,7 @@ enum transfer_states state_end }; -psxcard_device::psxcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +psxcard_device::psxcard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PSXCARD, "Sony PSX Memory Card", tag, owner, clock, "psxcard", __FILE__), device_image_interface(mconfig, *this), pkt_ptr(0), diff --git a/src/devices/bus/psx/memcard.h b/src/devices/bus/psx/memcard.h index 762545d60db..503744a443d 100644 --- a/src/devices/bus/psx/memcard.h +++ b/src/devices/bus/psx/memcard.h @@ -16,7 +16,7 @@ class psxcard_device : public device_t, public device_image_interface { public: - psxcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + psxcard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual iodevice_t image_type() const override { return IO_MEMCARD; } diff --git a/src/devices/bus/psx/multitap.cpp b/src/devices/bus/psx/multitap.cpp index 51cfd5948ab..f31c002988c 100644 --- a/src/devices/bus/psx/multitap.cpp +++ b/src/devices/bus/psx/multitap.cpp @@ -6,7 +6,7 @@ const device_type PSX_MULTITAP = &device_creator<psx_multitap_device>; -psx_multitap_device::psx_multitap_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) : +psx_multitap_device::psx_multitap_device(const machine_config& mconfig, std::string tag, device_t* owner, UINT32 clock) : device_t(mconfig, PSX_MULTITAP, "Playstation Multitap", tag, owner, clock, "psx_multitap", __FILE__), device_psx_controller_interface(mconfig, *this), m_activeport(0), diff --git a/src/devices/bus/psx/multitap.h b/src/devices/bus/psx/multitap.h index 160b0de6b5d..282e5bee0f9 100644 --- a/src/devices/bus/psx/multitap.h +++ b/src/devices/bus/psx/multitap.h @@ -11,7 +11,7 @@ class psx_multitap_device : public device_t, public device_psx_controller_interface { public: - psx_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + psx_multitap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; protected: diff --git a/src/devices/bus/ql/cst_q_plus4.cpp b/src/devices/bus/ql/cst_q_plus4.cpp index 5b6d94f2a9d..5a623241fd8 100644 --- a/src/devices/bus/ql/cst_q_plus4.cpp +++ b/src/devices/bus/ql/cst_q_plus4.cpp @@ -86,7 +86,7 @@ machine_config_constructor cst_q_plus4_t::device_mconfig_additions() const // cst_q_plus4_t - constructor //------------------------------------------------- -cst_q_plus4_t::cst_q_plus4_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +cst_q_plus4_t::cst_q_plus4_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CST_Q_PLUS4, "CST Q+4", tag, owner, clock, "ql_qplus4", __FILE__), device_ql_expansion_card_interface(mconfig, *this), m_exp1(*this, "exp1"), diff --git a/src/devices/bus/ql/cst_q_plus4.h b/src/devices/bus/ql/cst_q_plus4.h index eba0f3ac712..a1a8e087dd2 100644 --- a/src/devices/bus/ql/cst_q_plus4.h +++ b/src/devices/bus/ql/cst_q_plus4.h @@ -27,7 +27,7 @@ class cst_q_plus4_t : public device_t, { public: // construction/destruction - cst_q_plus4_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cst_q_plus4_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/ql/cst_qdisc.cpp b/src/devices/bus/ql/cst_qdisc.cpp index f9fdcf26e04..22a8de08f1c 100644 --- a/src/devices/bus/ql/cst_qdisc.cpp +++ b/src/devices/bus/ql/cst_qdisc.cpp @@ -50,7 +50,7 @@ const rom_entry *cst_ql_disc_interface_t::device_rom_region() const // cst_ql_disc_interface_t - constructor //------------------------------------------------- -cst_ql_disc_interface_t::cst_ql_disc_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +cst_ql_disc_interface_t::cst_ql_disc_interface_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CST_QL_DISC_INTERFACE, "CST QL Disc Interface", tag, owner, clock, "ql_qdisc", __FILE__), device_ql_expansion_card_interface(mconfig, *this) { diff --git a/src/devices/bus/ql/cst_qdisc.h b/src/devices/bus/ql/cst_qdisc.h index d2ddae10b2e..5e38215297b 100644 --- a/src/devices/bus/ql/cst_qdisc.h +++ b/src/devices/bus/ql/cst_qdisc.h @@ -26,7 +26,7 @@ class cst_ql_disc_interface_t : public device_t, { public: // construction/destruction - cst_ql_disc_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cst_ql_disc_interface_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/ql/cumana_fdi.cpp b/src/devices/bus/ql/cumana_fdi.cpp index 91259f0db43..9a1178b8cdf 100644 --- a/src/devices/bus/ql/cumana_fdi.cpp +++ b/src/devices/bus/ql/cumana_fdi.cpp @@ -50,7 +50,7 @@ const rom_entry *cumana_floppy_disk_interface_t::device_rom_region() const // cumana_floppy_disk_interface_t - constructor //------------------------------------------------- -cumana_floppy_disk_interface_t::cumana_floppy_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +cumana_floppy_disk_interface_t::cumana_floppy_disk_interface_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, CUMANA_FLOPPY_DISK_INTERFACE, "Cumana Floppy Disk Interface", tag, owner, clock, "ql_cumanafdi", __FILE__), device_ql_expansion_card_interface(mconfig, *this) { diff --git a/src/devices/bus/ql/cumana_fdi.h b/src/devices/bus/ql/cumana_fdi.h index 9ac1b9ba01e..ade1e651b1b 100644 --- a/src/devices/bus/ql/cumana_fdi.h +++ b/src/devices/bus/ql/cumana_fdi.h @@ -26,7 +26,7 @@ class cumana_floppy_disk_interface_t : public device_t, { public: // construction/destruction - cumana_floppy_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + cumana_floppy_disk_interface_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/ql/exp.cpp b/src/devices/bus/ql/exp.cpp index 92a5580334d..54202b11618 100644 --- a/src/devices/bus/ql/exp.cpp +++ b/src/devices/bus/ql/exp.cpp @@ -43,7 +43,7 @@ device_ql_expansion_card_interface::device_ql_expansion_card_interface(const mac // ql_expansion_slot_t - constructor //------------------------------------------------- -ql_expansion_slot_t::ql_expansion_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +ql_expansion_slot_t::ql_expansion_slot_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, QL_EXPANSION_SLOT, "QL expansion port", tag, owner, clock, "ql_expansion_slot", __FILE__), device_slot_interface(mconfig, *this), m_write_ipl0l(*this), diff --git a/src/devices/bus/ql/exp.h b/src/devices/bus/ql/exp.h index e4b259b475c..24f6110ec0f 100644 --- a/src/devices/bus/ql/exp.h +++ b/src/devices/bus/ql/exp.h @@ -108,7 +108,7 @@ class ql_expansion_slot_t : public device_t, { public: // construction/destruction - ql_expansion_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ql_expansion_slot_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template<class _Object> static devcb_base &set_ipl0l_wr_callback(device_t &device, _Object object) { return downcast<ql_expansion_slot_t &>(device).m_write_ipl0l.set_callback(object); } template<class _Object> static devcb_base &set_ipl1l_wr_callback(device_t &device, _Object object) { return downcast<ql_expansion_slot_t &>(device).m_write_ipl1l.set_callback(object); } diff --git a/src/devices/bus/ql/kempston_di.cpp b/src/devices/bus/ql/kempston_di.cpp index c69c129e2e9..d4af1a6dcc9 100644 --- a/src/devices/bus/ql/kempston_di.cpp +++ b/src/devices/bus/ql/kempston_di.cpp @@ -48,7 +48,7 @@ const rom_entry *kempston_disk_interface_t::device_rom_region() const // kempston_disk_interface_t - constructor //------------------------------------------------- -kempston_disk_interface_t::kempston_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +kempston_disk_interface_t::kempston_disk_interface_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, KEMPSTON_DISK_INTERFACE, "Kempston Disk Interface", tag, owner, clock, "ql_kdi", __FILE__), device_ql_expansion_card_interface(mconfig, *this) { diff --git a/src/devices/bus/ql/kempston_di.h b/src/devices/bus/ql/kempston_di.h index 041bdc65544..6867ba02e7a 100644 --- a/src/devices/bus/ql/kempston_di.h +++ b/src/devices/bus/ql/kempston_di.h @@ -26,7 +26,7 @@ class kempston_disk_interface_t : public device_t, { public: // construction/destruction - kempston_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + kempston_disk_interface_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/ql/miracle_gold_card.cpp b/src/devices/bus/ql/miracle_gold_card.cpp index 3e25f43e0a6..132709e875a 100644 --- a/src/devices/bus/ql/miracle_gold_card.cpp +++ b/src/devices/bus/ql/miracle_gold_card.cpp @@ -50,7 +50,7 @@ const rom_entry *miracle_gold_card_t::device_rom_region() const // miracle_gold_card_t - constructor //------------------------------------------------- -miracle_gold_card_t::miracle_gold_card_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +miracle_gold_card_t::miracle_gold_card_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MIRACLE_GOLD_CARD, "Miracle Gold Card", tag, owner, clock, "ql_gold", __FILE__), device_ql_expansion_card_interface(mconfig, *this) { diff --git a/src/devices/bus/ql/miracle_gold_card.h b/src/devices/bus/ql/miracle_gold_card.h index 176f7556fdf..c7007df51fa 100644 --- a/src/devices/bus/ql/miracle_gold_card.h +++ b/src/devices/bus/ql/miracle_gold_card.h @@ -26,7 +26,7 @@ class miracle_gold_card_t : public device_t, { public: // construction/destruction - miracle_gold_card_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + miracle_gold_card_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/ql/miracle_hd.cpp b/src/devices/bus/ql/miracle_hd.cpp index b181fc48918..8766dfdf1c3 100644 --- a/src/devices/bus/ql/miracle_hd.cpp +++ b/src/devices/bus/ql/miracle_hd.cpp @@ -48,7 +48,7 @@ const rom_entry *miracle_hard_disk_t::device_rom_region() const // miracle_hard_disk_t - constructor //------------------------------------------------- -miracle_hard_disk_t::miracle_hard_disk_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +miracle_hard_disk_t::miracle_hard_disk_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MIRACLE_HARD_DISK, "Miracle Hard Disk", tag, owner, clock, "ql_mhd", __FILE__), device_ql_rom_cartridge_card_interface(mconfig, *this) { diff --git a/src/devices/bus/ql/miracle_hd.h b/src/devices/bus/ql/miracle_hd.h index c4aeaa6d74b..233411724d7 100644 --- a/src/devices/bus/ql/miracle_hd.h +++ b/src/devices/bus/ql/miracle_hd.h @@ -26,7 +26,7 @@ class miracle_hard_disk_t : public device_t, { public: // construction/destruction - miracle_hard_disk_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + miracle_hard_disk_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/ql/mp_fdi.cpp b/src/devices/bus/ql/mp_fdi.cpp index d23542ab8f4..546cd1006b1 100644 --- a/src/devices/bus/ql/mp_fdi.cpp +++ b/src/devices/bus/ql/mp_fdi.cpp @@ -48,7 +48,7 @@ const rom_entry *micro_peripherals_floppy_disk_interface_t::device_rom_region() // micro_peripherals_floppy_disk_interface_t - constructor //------------------------------------------------- -micro_peripherals_floppy_disk_interface_t::micro_peripherals_floppy_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +micro_peripherals_floppy_disk_interface_t::micro_peripherals_floppy_disk_interface_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MICRO_PERIPHERALS_FLOPPY_DISK_INTERFACE, "Micro Peripherals Floppy Disk Interface", tag, owner, clock, "ql_mpfdi", __FILE__), device_ql_expansion_card_interface(mconfig, *this) { diff --git a/src/devices/bus/ql/mp_fdi.h b/src/devices/bus/ql/mp_fdi.h index 57681f30d28..a01934cca89 100644 --- a/src/devices/bus/ql/mp_fdi.h +++ b/src/devices/bus/ql/mp_fdi.h @@ -26,7 +26,7 @@ class micro_peripherals_floppy_disk_interface_t : public device_t, { public: // construction/destruction - micro_peripherals_floppy_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + micro_peripherals_floppy_disk_interface_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/ql/opd_basic_master.cpp b/src/devices/bus/ql/opd_basic_master.cpp index fa20bf4f5eb..3ff6bcca9a2 100644 --- a/src/devices/bus/ql/opd_basic_master.cpp +++ b/src/devices/bus/ql/opd_basic_master.cpp @@ -46,7 +46,7 @@ const rom_entry *opd_basic_master_t::device_rom_region() const // opd_basic_master_t - constructor //------------------------------------------------- -opd_basic_master_t::opd_basic_master_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +opd_basic_master_t::opd_basic_master_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, OPD_BASIC_MASTER, "OPD Basic Master", tag, owner, clock, "ql_opdbm", __FILE__), device_ql_expansion_card_interface(mconfig, *this) { diff --git a/src/devices/bus/ql/opd_basic_master.h b/src/devices/bus/ql/opd_basic_master.h index 16608210cf2..902cb30d93b 100644 --- a/src/devices/bus/ql/opd_basic_master.h +++ b/src/devices/bus/ql/opd_basic_master.h @@ -26,7 +26,7 @@ class opd_basic_master_t : public device_t, { public: // construction/destruction - opd_basic_master_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + opd_basic_master_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/ql/pcml_qdisk.cpp b/src/devices/bus/ql/pcml_qdisk.cpp index b5d534f68d7..5a3d247ba98 100644 --- a/src/devices/bus/ql/pcml_qdisk.cpp +++ b/src/devices/bus/ql/pcml_qdisk.cpp @@ -48,7 +48,7 @@ const rom_entry *pcml_q_disk_interface_t::device_rom_region() const // pcml_q_disk_interface_t - constructor //------------------------------------------------- -pcml_q_disk_interface_t::pcml_q_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +pcml_q_disk_interface_t::pcml_q_disk_interface_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PCML_Q_DISK_INTERFACE, "PCML Q+ Disk Interface", tag, owner, clock, "ql_pcmlqdi", __FILE__), device_ql_expansion_card_interface(mconfig, *this) { diff --git a/src/devices/bus/ql/pcml_qdisk.h b/src/devices/bus/ql/pcml_qdisk.h index 29a011b7455..6bda106d887 100644 --- a/src/devices/bus/ql/pcml_qdisk.h +++ b/src/devices/bus/ql/pcml_qdisk.h @@ -26,7 +26,7 @@ class pcml_q_disk_interface_t : public device_t, { public: // construction/destruction - pcml_q_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + pcml_q_disk_interface_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/ql/qubide.cpp b/src/devices/bus/ql/qubide.cpp index 9241321bcac..5b18c8409e9 100644 --- a/src/devices/bus/ql/qubide.cpp +++ b/src/devices/bus/ql/qubide.cpp @@ -168,7 +168,7 @@ ioport_constructor qubide_t::device_input_ports() const // qubide_t - constructor //------------------------------------------------- -qubide_t::qubide_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +qubide_t::qubide_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, QUBIDE, "QubIDE", tag, owner, clock, "ql_qubide", __FILE__), device_ql_expansion_card_interface(mconfig, *this), m_ata(*this, "ata"), diff --git a/src/devices/bus/ql/qubide.h b/src/devices/bus/ql/qubide.h index f8a363b55a2..78f2d471d7d 100644 --- a/src/devices/bus/ql/qubide.h +++ b/src/devices/bus/ql/qubide.h @@ -27,7 +27,7 @@ class qubide_t : public device_t, { public: // construction/destruction - qubide_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + qubide_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/ql/rom.cpp b/src/devices/bus/ql/rom.cpp index bd17b2cb1b8..b37378aa31c 100644 --- a/src/devices/bus/ql/rom.cpp +++ b/src/devices/bus/ql/rom.cpp @@ -53,7 +53,7 @@ device_ql_rom_cartridge_card_interface::~device_ql_rom_cartridge_card_interface( // ql_rom_cartridge_slot_t - constructor //------------------------------------------------- -ql_rom_cartridge_slot_t::ql_rom_cartridge_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +ql_rom_cartridge_slot_t::ql_rom_cartridge_slot_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, QL_ROM_CARTRIDGE_SLOT, "QL ROM cartridge slot", tag, owner, clock, "ql_rom_cartridge_slot", __FILE__), device_slot_interface(mconfig, *this), device_image_interface(mconfig, *this), m_card(nullptr) diff --git a/src/devices/bus/ql/rom.h b/src/devices/bus/ql/rom.h index 282c47cac3d..9bd0b629d57 100644 --- a/src/devices/bus/ql/rom.h +++ b/src/devices/bus/ql/rom.h @@ -82,7 +82,7 @@ class ql_rom_cartridge_slot_t : public device_t, { public: // construction/destruction - ql_rom_cartridge_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ql_rom_cartridge_slot_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // computer interface UINT8 read(address_space &space, offs_t offset, UINT8 data) { if (m_card) data = m_card->read(space, offset, data); return data; } diff --git a/src/devices/bus/ql/sandy_superdisk.cpp b/src/devices/bus/ql/sandy_superdisk.cpp index c4bdb1bfdf4..49a5862f3f3 100644 --- a/src/devices/bus/ql/sandy_superdisk.cpp +++ b/src/devices/bus/ql/sandy_superdisk.cpp @@ -111,7 +111,7 @@ machine_config_constructor sandy_super_disk_t::device_mconfig_additions() const // sandy_super_disk_t - constructor //------------------------------------------------- -sandy_super_disk_t::sandy_super_disk_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sandy_super_disk_t::sandy_super_disk_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SANDY_SUPER_DISK, "Sandy Super Disk", tag, owner, clock, "ql_sdisk", __FILE__), device_ql_expansion_card_interface(mconfig, *this), m_fdc(*this, WD1772_TAG), diff --git a/src/devices/bus/ql/sandy_superdisk.h b/src/devices/bus/ql/sandy_superdisk.h index 408c3430695..f45c93e111a 100644 --- a/src/devices/bus/ql/sandy_superdisk.h +++ b/src/devices/bus/ql/sandy_superdisk.h @@ -29,7 +29,7 @@ class sandy_super_disk_t : public device_t, { public: // construction/destruction - sandy_super_disk_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sandy_super_disk_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/ql/sandy_superqboard.cpp b/src/devices/bus/ql/sandy_superqboard.cpp index 0508b835982..1479ee7b97b 100644 --- a/src/devices/bus/ql/sandy_superqboard.cpp +++ b/src/devices/bus/ql/sandy_superqboard.cpp @@ -212,7 +212,7 @@ ioport_constructor sandy_superqmouse_512k_t::device_input_ports() const // sandy_superqboard_t - constructor //------------------------------------------------- -sandy_superqboard_t::sandy_superqboard_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sandy_superqboard_t::sandy_superqboard_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SANDY_SUPERQBOARD, "Sandy SuperQBoard 256K", tag, owner, clock, "ql_sqboard256", __FILE__), device_ql_expansion_card_interface(mconfig, *this), m_fdc(*this, WD1772_TAG), @@ -230,7 +230,7 @@ sandy_superqboard_t::sandy_superqboard_t(const machine_config &mconfig, const ch { } -sandy_superqboard_t::sandy_superqboard_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int ram_size) : +sandy_superqboard_t::sandy_superqboard_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int ram_size) : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__), device_ql_expansion_card_interface(mconfig, *this), m_fdc(*this, WD1772_TAG), @@ -248,13 +248,13 @@ sandy_superqboard_t::sandy_superqboard_t(const machine_config &mconfig, device_t { } -sandy_superqboard_512k_t::sandy_superqboard_512k_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sandy_superqboard_512k_t::sandy_superqboard_512k_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sandy_superqboard_t(mconfig, SANDY_SUPERQBOARD_512K, "Sandy SuperQBoard 512K", tag, owner, clock, "ql_sqboard512", __FILE__, 512*1024) { } -sandy_superqmouse_t::sandy_superqmouse_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sandy_superqmouse_t::sandy_superqmouse_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sandy_superqboard_t(mconfig, SANDY_SUPERQMOUSE, "Sandy SuperQMouse", tag, owner, clock, "ql_sqmouse", __FILE__, 256*1024) { } -sandy_superqmouse_512k_t::sandy_superqmouse_512k_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sandy_superqmouse_512k_t::sandy_superqmouse_512k_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sandy_superqboard_t(mconfig, SANDY_SUPERQMOUSE_512K, "Sandy SuperQMouse 512K", tag, owner, clock, "ql_sqmouse512", __FILE__, 512*1024) { } diff --git a/src/devices/bus/ql/sandy_superqboard.h b/src/devices/bus/ql/sandy_superqboard.h index 286e224f962..2bacc094060 100644 --- a/src/devices/bus/ql/sandy_superqboard.h +++ b/src/devices/bus/ql/sandy_superqboard.h @@ -29,8 +29,8 @@ class sandy_superqboard_t : public device_t, { public: // construction/destruction - sandy_superqboard_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - sandy_superqboard_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int ram_size); + sandy_superqboard_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sandy_superqboard_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int ram_size); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -90,7 +90,7 @@ class sandy_superqboard_512k_t : public sandy_superqboard_t { public: // construction/destruction - sandy_superqboard_512k_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sandy_superqboard_512k_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; @@ -100,7 +100,7 @@ class sandy_superqmouse_t : public sandy_superqboard_t { public: // construction/destruction - sandy_superqmouse_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sandy_superqmouse_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; @@ -113,7 +113,7 @@ class sandy_superqmouse_512k_t : public sandy_superqboard_t { public: // construction/destruction - sandy_superqmouse_512k_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sandy_superqmouse_512k_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/ql/std.cpp b/src/devices/bus/ql/std.cpp index 11132954104..ad7d0f43d75 100644 --- a/src/devices/bus/ql/std.cpp +++ b/src/devices/bus/ql/std.cpp @@ -26,7 +26,7 @@ const device_type QL_STANDARD_ROM_CARTRIDGE = &device_creator<ql_standard_rom_ca // ql_standard_rom_cartridge_t - constructor //------------------------------------------------- -ql_standard_rom_cartridge_t::ql_standard_rom_cartridge_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +ql_standard_rom_cartridge_t::ql_standard_rom_cartridge_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, QL_STANDARD_ROM_CARTRIDGE, "QL standard ROM cartridge", tag, owner, clock, "ql_standard", __FILE__), device_ql_rom_cartridge_card_interface(mconfig, *this) { diff --git a/src/devices/bus/ql/std.h b/src/devices/bus/ql/std.h index cbf7731c59a..68d46a266c2 100644 --- a/src/devices/bus/ql/std.h +++ b/src/devices/bus/ql/std.h @@ -26,7 +26,7 @@ class ql_standard_rom_cartridge_t : public device_t, { public: // construction/destruction - ql_standard_rom_cartridge_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ql_standard_rom_cartridge_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/ql/trumpcard.cpp b/src/devices/bus/ql/trumpcard.cpp index cd2a829c3b8..5daafdea35a 100644 --- a/src/devices/bus/ql/trumpcard.cpp +++ b/src/devices/bus/ql/trumpcard.cpp @@ -111,7 +111,7 @@ machine_config_constructor ql_trump_card_t::device_mconfig_additions() const // ql_trump_card_t - constructor //------------------------------------------------- -ql_trump_card_t::ql_trump_card_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +ql_trump_card_t::ql_trump_card_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, QL_TRUMP_CARD, "QL Trump Card", tag, owner, clock, "ql_trump", __FILE__), device_ql_expansion_card_interface(mconfig, *this), m_fdc(*this, WD1772_TAG), @@ -123,7 +123,7 @@ ql_trump_card_t::ql_trump_card_t(const machine_config &mconfig, const char *tag, { } -ql_trump_card_t::ql_trump_card_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int ram_size) : +ql_trump_card_t::ql_trump_card_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int ram_size) : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__), device_ql_expansion_card_interface(mconfig, *this), m_fdc(*this, WD1772_TAG), @@ -135,13 +135,13 @@ ql_trump_card_t::ql_trump_card_t(const machine_config &mconfig, device_type type { } -ql_trump_card_256k_t::ql_trump_card_256k_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ql_trump_card_256k_t::ql_trump_card_256k_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ql_trump_card_t(mconfig, QL_TRUMP_CARD_256K, "QL Trump Card 256K", tag, owner, clock, "ql_trump256", __FILE__, 256*1024) { } -ql_trump_card_512k_t::ql_trump_card_512k_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ql_trump_card_512k_t::ql_trump_card_512k_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ql_trump_card_t(mconfig, QL_TRUMP_CARD_512K, "QL Trump Card 512K", tag, owner, clock, "ql_trump512", __FILE__, 512*1024) { } -ql_trump_card_768k_t::ql_trump_card_768k_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ql_trump_card_768k_t::ql_trump_card_768k_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ql_trump_card_t(mconfig, QL_TRUMP_CARD_768K, "QL Trump Card 768K", tag, owner, clock, "ql_trump768", __FILE__, 768*1024) { } diff --git a/src/devices/bus/ql/trumpcard.h b/src/devices/bus/ql/trumpcard.h index d8675a8459c..cd31a838f38 100644 --- a/src/devices/bus/ql/trumpcard.h +++ b/src/devices/bus/ql/trumpcard.h @@ -28,8 +28,8 @@ class ql_trump_card_t : public device_t, { public: // construction/destruction - ql_trump_card_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - ql_trump_card_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int ram_size); + ql_trump_card_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ql_trump_card_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int ram_size); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -64,7 +64,7 @@ class ql_trump_card_256k_t : public ql_trump_card_t { public: // construction/destruction - ql_trump_card_256k_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ql_trump_card_256k_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; @@ -74,7 +74,7 @@ class ql_trump_card_512k_t : public ql_trump_card_t { public: // construction/destruction - ql_trump_card_512k_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ql_trump_card_512k_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; @@ -84,7 +84,7 @@ class ql_trump_card_768k_t : public ql_trump_card_t { public: // construction/destruction - ql_trump_card_768k_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ql_trump_card_768k_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/bus/rs232/keyboard.cpp b/src/devices/bus/rs232/keyboard.cpp index af8cb01420b..d472bab1f14 100644 --- a/src/devices/bus/rs232/keyboard.cpp +++ b/src/devices/bus/rs232/keyboard.cpp @@ -2,7 +2,7 @@ // copyright-holders:smf #include "keyboard.h" -serial_keyboard_device::serial_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +serial_keyboard_device::serial_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : generic_keyboard_device(mconfig, SERIAL_KEYBOARD, "Serial Keyboard", tag, owner, clock, "serial_keyboard", __FILE__), device_serial_interface(mconfig, *this), device_rs232_port_interface(mconfig, *this), @@ -16,7 +16,7 @@ serial_keyboard_device::serial_keyboard_device(const machine_config &mconfig, co { } -serial_keyboard_device::serial_keyboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +serial_keyboard_device::serial_keyboard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : generic_keyboard_device(mconfig, type, name, tag, owner, clock, shortname, source), device_serial_interface(mconfig, *this), device_rs232_port_interface(mconfig, *this), diff --git a/src/devices/bus/rs232/keyboard.h b/src/devices/bus/rs232/keyboard.h index 37e2097b8fb..4a6033594fc 100644 --- a/src/devices/bus/rs232/keyboard.h +++ b/src/devices/bus/rs232/keyboard.h @@ -14,8 +14,8 @@ class serial_keyboard_device : public device_rs232_port_interface { public: - serial_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - serial_keyboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + serial_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + serial_keyboard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) override { device_serial_interface::rx_w(state); } diff --git a/src/devices/bus/rs232/loopback.cpp b/src/devices/bus/rs232/loopback.cpp index 20c75e4099d..ed3ca7eb0e4 100644 --- a/src/devices/bus/rs232/loopback.cpp +++ b/src/devices/bus/rs232/loopback.cpp @@ -5,7 +5,7 @@ const device_type RS232_LOOPBACK = &device_creator<rs232_loopback_device>; -rs232_loopback_device::rs232_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +rs232_loopback_device::rs232_loopback_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, RS232_LOOPBACK, "RS232 Loopback", tag, owner, clock, "rs232_loopback", __FILE__), device_rs232_port_interface(mconfig, *this) { diff --git a/src/devices/bus/rs232/loopback.h b/src/devices/bus/rs232/loopback.h index 5d262c93264..c1e8f2e0112 100644 --- a/src/devices/bus/rs232/loopback.h +++ b/src/devices/bus/rs232/loopback.h @@ -10,7 +10,7 @@ class rs232_loopback_device : public device_t, public device_rs232_port_interface { public: - rs232_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + rs232_loopback_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual WRITE_LINE_MEMBER( input_txd ) override; virtual WRITE_LINE_MEMBER( input_rts ) override; diff --git a/src/devices/bus/rs232/null_modem.cpp b/src/devices/bus/rs232/null_modem.cpp index 4c5d7417a8b..ef7ae3819a5 100644 --- a/src/devices/bus/rs232/null_modem.cpp +++ b/src/devices/bus/rs232/null_modem.cpp @@ -2,7 +2,7 @@ // copyright-holders:smf,Carl #include "null_modem.h" -null_modem_device::null_modem_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +null_modem_device::null_modem_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, NULL_MODEM, "Null Modem", tag, owner, clock, "null_modem", __FILE__), device_serial_interface(mconfig, *this), device_rs232_port_interface(mconfig, *this), diff --git a/src/devices/bus/rs232/null_modem.h b/src/devices/bus/rs232/null_modem.h index aed62fb3aad..072ccf75053 100644 --- a/src/devices/bus/rs232/null_modem.h +++ b/src/devices/bus/rs232/null_modem.h @@ -11,7 +11,7 @@ class null_modem_device : public device_t, public device_rs232_port_interface { public: - null_modem_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + null_modem_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; virtual WRITE_LINE_MEMBER( input_txd ) override { device_serial_interface::rx_w(state); } diff --git a/src/devices/bus/rs232/printer.cpp b/src/devices/bus/rs232/printer.cpp index e8734ad6de6..85cfff0369c 100644 --- a/src/devices/bus/rs232/printer.cpp +++ b/src/devices/bus/rs232/printer.cpp @@ -2,7 +2,7 @@ // copyright-holders:smf #include "printer.h" -serial_printer_device::serial_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +serial_printer_device::serial_printer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SERIAL_PRINTER, "Serial Printer", tag, owner, clock, "serial_printer", __FILE__), device_serial_interface(mconfig, *this), device_rs232_port_interface(mconfig, *this), diff --git a/src/devices/bus/rs232/printer.h b/src/devices/bus/rs232/printer.h index 4ce526fac4b..0ff013f428d 100644 --- a/src/devices/bus/rs232/printer.h +++ b/src/devices/bus/rs232/printer.h @@ -13,7 +13,7 @@ class serial_printer_device : public device_t, public device_rs232_port_interface { public: - serial_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + serial_printer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) override { device_serial_interface::rx_w(state); } diff --git a/src/devices/bus/rs232/pty.cpp b/src/devices/bus/rs232/pty.cpp index 3a525236128..7005f26ab14 100644 --- a/src/devices/bus/rs232/pty.cpp +++ b/src/devices/bus/rs232/pty.cpp @@ -6,7 +6,7 @@ static const int TIMER_POLL = 1; -pseudo_terminal_device::pseudo_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +pseudo_terminal_device::pseudo_terminal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PSEUDO_TERMINAL, "Pseudo terminal", tag, owner, clock, "pseudo_terminal", __FILE__), device_serial_interface(mconfig, *this), device_rs232_port_interface(mconfig, *this), diff --git a/src/devices/bus/rs232/pty.h b/src/devices/bus/rs232/pty.h index 19f0a30ef9f..9af7c585c7c 100644 --- a/src/devices/bus/rs232/pty.h +++ b/src/devices/bus/rs232/pty.h @@ -12,7 +12,7 @@ class pseudo_terminal_device : public device_t, public device_pty_interface { public: - pseudo_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + pseudo_terminal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) override { device_serial_interface::rx_w(state); diff --git a/src/devices/bus/rs232/rs232.cpp b/src/devices/bus/rs232/rs232.cpp index 31d6310e2ad..d33b1731336 100644 --- a/src/devices/bus/rs232/rs232.cpp +++ b/src/devices/bus/rs232/rs232.cpp @@ -4,7 +4,7 @@ const device_type RS232_PORT = &device_creator<rs232_port_device>; -rs232_port_device::rs232_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +rs232_port_device::rs232_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, RS232_PORT, "RS232 Port", tag, owner, clock, "rs232", __FILE__), device_slot_interface(mconfig, *this), m_rxd(0), @@ -21,7 +21,7 @@ rs232_port_device::rs232_port_device(const machine_config &mconfig, const char * { } -rs232_port_device::rs232_port_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +rs232_port_device::rs232_port_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_slot_interface(mconfig, *this), m_rxd(0), diff --git a/src/devices/bus/rs232/rs232.h b/src/devices/bus/rs232/rs232.h index 75e1e963eca..f970620feca 100644 --- a/src/devices/bus/rs232/rs232.h +++ b/src/devices/bus/rs232/rs232.h @@ -117,8 +117,8 @@ class rs232_port_device : public device_t, friend class device_rs232_port_interface; public: - rs232_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - rs232_port_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + rs232_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + rs232_port_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); virtual ~rs232_port_device(); // static configuration helpers diff --git a/src/devices/bus/rs232/ser_mouse.cpp b/src/devices/bus/rs232/ser_mouse.cpp index ecf9414f1c9..09f9d1dc631 100644 --- a/src/devices/bus/rs232/ser_mouse.cpp +++ b/src/devices/bus/rs232/ser_mouse.cpp @@ -11,7 +11,7 @@ #include "ser_mouse.h" -serial_mouse_device::serial_mouse_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +serial_mouse_device::serial_mouse_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_rs232_port_interface(mconfig, *this), device_serial_interface(mconfig, *this), @@ -30,14 +30,14 @@ serial_mouse_device::serial_mouse_device(const machine_config &mconfig, device_t const device_type MSFT_SERIAL_MOUSE = &device_creator<microsoft_mouse_device>; -microsoft_mouse_device::microsoft_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +microsoft_mouse_device::microsoft_mouse_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : serial_mouse_device(mconfig, MSFT_SERIAL_MOUSE, "Microsoft Serial Mouse", tag, owner, clock, "microsoft_mouse", __FILE__) { } const device_type MSYSTEM_SERIAL_MOUSE = &device_creator<mouse_systems_mouse_device>; -mouse_systems_mouse_device::mouse_systems_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +mouse_systems_mouse_device::mouse_systems_mouse_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : serial_mouse_device(mconfig, MSYSTEM_SERIAL_MOUSE, "Mouse Systems Serial Mouse", tag, owner, clock, "mouse_systems_mouse", __FILE__) { } diff --git a/src/devices/bus/rs232/ser_mouse.h b/src/devices/bus/rs232/ser_mouse.h index 6a8986aa081..8ebab89a5cf 100644 --- a/src/devices/bus/rs232/ser_mouse.h +++ b/src/devices/bus/rs232/ser_mouse.h @@ -17,7 +17,7 @@ class serial_mouse_device : public device_serial_interface { public: - serial_mouse_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + serial_mouse_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); virtual ioport_constructor device_input_ports() const override; @@ -55,7 +55,7 @@ private: class microsoft_mouse_device : public serial_mouse_device { public: - microsoft_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + microsoft_mouse_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: virtual WRITE_LINE_MEMBER(input_rts) override; @@ -69,7 +69,7 @@ extern const device_type MSFT_SERIAL_MOUSE; class mouse_systems_mouse_device : public serial_mouse_device { public: - mouse_systems_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + mouse_systems_mouse_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: virtual void set_frame() override { set_data_frame(1, 8, PARITY_NONE, STOP_BITS_2); } diff --git a/src/devices/bus/rs232/terminal.cpp b/src/devices/bus/rs232/terminal.cpp index c242184b387..248715813de 100644 --- a/src/devices/bus/rs232/terminal.cpp +++ b/src/devices/bus/rs232/terminal.cpp @@ -2,7 +2,7 @@ // copyright-holders:smf #include "terminal.h" -serial_terminal_device::serial_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +serial_terminal_device::serial_terminal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : generic_terminal_device(mconfig, SERIAL_TERMINAL, "Serial Terminal", tag, owner, clock, "serial_terminal", __FILE__), device_serial_interface(mconfig, *this), device_rs232_port_interface(mconfig, *this), diff --git a/src/devices/bus/rs232/terminal.h b/src/devices/bus/rs232/terminal.h index 0cde8f71f32..1d2112b45c8 100644 --- a/src/devices/bus/rs232/terminal.h +++ b/src/devices/bus/rs232/terminal.h @@ -12,7 +12,7 @@ class serial_terminal_device : public generic_terminal_device, public device_rs232_port_interface { public: - serial_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + serial_terminal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) override { device_serial_interface::rx_w(state); } diff --git a/src/devices/bus/rs232/xvd701.cpp b/src/devices/bus/rs232/xvd701.cpp index 9b032606ea8..c575dd59270 100644 --- a/src/devices/bus/rs232/xvd701.cpp +++ b/src/devices/bus/rs232/xvd701.cpp @@ -2,7 +2,7 @@ // copyright-holders:smf #include "xvd701.h" -jvc_xvd701_device::jvc_xvd701_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +jvc_xvd701_device::jvc_xvd701_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, JVC_XVD701, "JVC XV-D701", tag, owner, clock, "xvd701", __FILE__), device_serial_interface(mconfig, *this), device_rs232_port_interface(mconfig, *this), diff --git a/src/devices/bus/rs232/xvd701.h b/src/devices/bus/rs232/xvd701.h index 29f6dd0a5a9..faf6fe226a4 100644 --- a/src/devices/bus/rs232/xvd701.h +++ b/src/devices/bus/rs232/xvd701.h @@ -10,7 +10,7 @@ class jvc_xvd701_device : public device_t, public device_rs232_port_interface { public: - jvc_xvd701_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + jvc_xvd701_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; virtual WRITE_LINE_MEMBER( input_txd ) override { device_serial_interface::rx_w(state); } diff --git a/src/devices/bus/s100/dj2db.cpp b/src/devices/bus/s100/dj2db.cpp index ca144a8f82a..7706f7a5df6 100644 --- a/src/devices/bus/s100/dj2db.cpp +++ b/src/devices/bus/s100/dj2db.cpp @@ -250,7 +250,7 @@ ioport_constructor s100_dj2db_device::device_input_ports() const // s100_dj2db_device - constructor //------------------------------------------------- -s100_dj2db_device::s100_dj2db_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +s100_dj2db_device::s100_dj2db_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, S100_DJ2DB, "DJ2DB", tag, owner, clock, "dj2db", __FILE__), device_s100_card_interface(mconfig, *this), m_fdc(*this, MB8866_TAG), diff --git a/src/devices/bus/s100/dj2db.h b/src/devices/bus/s100/dj2db.h index a8504cee1cf..a5e1fc1bb6a 100644 --- a/src/devices/bus/s100/dj2db.h +++ b/src/devices/bus/s100/dj2db.h @@ -29,7 +29,7 @@ class s100_dj2db_device : public device_t, { public: // construction/destruction - s100_dj2db_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + s100_dj2db_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/s100/djdma.cpp b/src/devices/bus/s100/djdma.cpp index c0d93aed2f5..ccf2b8b1097 100644 --- a/src/devices/bus/s100/djdma.cpp +++ b/src/devices/bus/s100/djdma.cpp @@ -102,7 +102,7 @@ machine_config_constructor s100_djdma_device::device_mconfig_additions() const // s100_djdma_device - constructor //------------------------------------------------- -s100_djdma_device::s100_djdma_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +s100_djdma_device::s100_djdma_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, S100_DJDMA, "DJDMA", tag, owner, clock, "djdma", __FILE__), device_s100_card_interface(mconfig, *this) { diff --git a/src/devices/bus/s100/djdma.h b/src/devices/bus/s100/djdma.h index e1ac5d2d95d..88e0f8c6f87 100644 --- a/src/devices/bus/s100/djdma.h +++ b/src/devices/bus/s100/djdma.h @@ -28,7 +28,7 @@ class s100_djdma_device : public device_t, { public: // construction/destruction - s100_djdma_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + s100_djdma_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/s100/mm65k16s.cpp b/src/devices/bus/s100/mm65k16s.cpp index 22240dd789a..78325cd7290 100644 --- a/src/devices/bus/s100/mm65k16s.cpp +++ b/src/devices/bus/s100/mm65k16s.cpp @@ -201,7 +201,7 @@ ioport_constructor s100_mm65k16s_device::device_input_ports() const // s100_mm65k16s_device - constructor //------------------------------------------------- -s100_mm65k16s_device::s100_mm65k16s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +s100_mm65k16s_device::s100_mm65k16s_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, S100_MM65K16S, "MM65K16S", tag, owner, clock, "mm65k16s", __FILE__), device_s100_card_interface(mconfig, *this), m_ram(*this, "ram") diff --git a/src/devices/bus/s100/mm65k16s.h b/src/devices/bus/s100/mm65k16s.h index 7a9c50ad1aa..4e4d99ede07 100644 --- a/src/devices/bus/s100/mm65k16s.h +++ b/src/devices/bus/s100/mm65k16s.h @@ -27,7 +27,7 @@ class s100_mm65k16s_device : public device_t, { public: // construction/destruction - s100_mm65k16s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + s100_mm65k16s_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/s100/nsmdsa.cpp b/src/devices/bus/s100/nsmdsa.cpp index 91fb4f46135..84d9e434ecf 100644 --- a/src/devices/bus/s100/nsmdsa.cpp +++ b/src/devices/bus/s100/nsmdsa.cpp @@ -81,7 +81,7 @@ machine_config_constructor s100_mds_a_device::device_mconfig_additions() const // s100_mds_a_device - constructor //------------------------------------------------- -s100_mds_a_device::s100_mds_a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +s100_mds_a_device::s100_mds_a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, S100_MDS_A, "MDS-A", tag, owner, clock, "nsmdsa", __FILE__), device_s100_card_interface(mconfig, *this), m_floppy0(*this, "floppy0"), diff --git a/src/devices/bus/s100/nsmdsa.h b/src/devices/bus/s100/nsmdsa.h index bdf170fb869..df2c2eb4223 100644 --- a/src/devices/bus/s100/nsmdsa.h +++ b/src/devices/bus/s100/nsmdsa.h @@ -28,7 +28,7 @@ class s100_mds_a_device : public device_t, { public: // construction/destruction - s100_mds_a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + s100_mds_a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/s100/nsmdsad.cpp b/src/devices/bus/s100/nsmdsad.cpp index d1a06407c6d..942eb668b32 100644 --- a/src/devices/bus/s100/nsmdsad.cpp +++ b/src/devices/bus/s100/nsmdsad.cpp @@ -82,7 +82,7 @@ machine_config_constructor s100_mds_ad_device::device_mconfig_additions() const // s100_mds_ad_device - constructor //------------------------------------------------- -s100_mds_ad_device::s100_mds_ad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +s100_mds_ad_device::s100_mds_ad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, S100_MDS_AD, "MDS-A-D", tag, owner, clock, "nsmdsad", __FILE__), device_s100_card_interface(mconfig, *this), m_floppy0(*this, "floppy0"), diff --git a/src/devices/bus/s100/nsmdsad.h b/src/devices/bus/s100/nsmdsad.h index 0f524af48bd..375f7dfcdec 100644 --- a/src/devices/bus/s100/nsmdsad.h +++ b/src/devices/bus/s100/nsmdsad.h @@ -28,7 +28,7 @@ class s100_mds_ad_device : public device_t, { public: // construction/destruction - s100_mds_ad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + s100_mds_ad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/s100/s100.cpp b/src/devices/bus/s100/s100.cpp index da63653b737..daedd5298fa 100644 --- a/src/devices/bus/s100/s100.cpp +++ b/src/devices/bus/s100/s100.cpp @@ -37,7 +37,7 @@ device_s100_card_interface::device_s100_card_interface(const machine_config &mco //------------------------------------------------- // s100_slot_t - constructor //------------------------------------------------- -s100_slot_t::s100_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +s100_slot_t::s100_slot_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, S100_SLOT, "S100 slot", tag, owner, clock, "s100_slot", __FILE__), device_slot_interface(mconfig, *this), m_bus(nullptr) { @@ -60,7 +60,7 @@ void s100_slot_t::device_start() // s100_bus_t - constructor //------------------------------------------------- -s100_bus_t::s100_bus_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +s100_bus_t::s100_bus_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, S100_BUS, "S100", tag, owner, clock, "s100", __FILE__), m_write_irq(*this), m_write_nmi(*this), diff --git a/src/devices/bus/s100/s100.h b/src/devices/bus/s100/s100.h index 97d067f62e8..06ea060919e 100644 --- a/src/devices/bus/s100/s100.h +++ b/src/devices/bus/s100/s100.h @@ -208,7 +208,7 @@ class s100_bus_t : public device_t { public: // construction/destruction - s100_bus_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + s100_bus_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); ~s100_bus_t() { m_device_list.detach_all(); } template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_irq.set_callback(object); } @@ -290,7 +290,7 @@ class s100_slot_t : public device_t, { public: // construction/destruction - s100_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + s100_slot_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/s100/wunderbus.cpp b/src/devices/bus/s100/wunderbus.cpp index efa739c0742..7d39c18d8fb 100644 --- a/src/devices/bus/s100/wunderbus.cpp +++ b/src/devices/bus/s100/wunderbus.cpp @@ -236,7 +236,7 @@ ioport_constructor s100_wunderbus_device::device_input_ports() const // s100_wunderbus_device - constructor //------------------------------------------------- -s100_wunderbus_device::s100_wunderbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +s100_wunderbus_device::s100_wunderbus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, S100_WUNDERBUS, "Wunderbus I/O", tag, owner, clock, "s100_wunderbus", __FILE__), device_s100_card_interface(mconfig, *this), m_pic(*this, I8259A_TAG), diff --git a/src/devices/bus/s100/wunderbus.h b/src/devices/bus/s100/wunderbus.h index 53aae135b06..8d09cfb99fb 100644 --- a/src/devices/bus/s100/wunderbus.h +++ b/src/devices/bus/s100/wunderbus.h @@ -29,7 +29,7 @@ class s100_wunderbus_device : public device_t, { public: // construction/destruction - s100_wunderbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + s100_wunderbus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/saturn/bram.cpp b/src/devices/bus/saturn/bram.cpp index 28d0aba2945..a8da0d2e12f 100644 --- a/src/devices/bus/saturn/bram.cpp +++ b/src/devices/bus/saturn/bram.cpp @@ -21,32 +21,32 @@ const device_type SATURN_BRAM_16MB = &device_creator<saturn_bram16mb_device>; const device_type SATURN_BRAM_32MB = &device_creator<saturn_bram32mb_device>; -saturn_bram_device::saturn_bram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +saturn_bram_device::saturn_bram_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sat_cart_interface( mconfig, *this ), device_nvram_interface(mconfig, *this) { } -saturn_bram4mb_device::saturn_bram4mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +saturn_bram4mb_device::saturn_bram4mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : saturn_bram_device(mconfig, SATURN_BRAM_4MB, "Saturn Battery RAM 4Mbit Cart", tag, owner, clock, "sat_bram_4mb", __FILE__) { m_cart_type = 0x21; } -saturn_bram8mb_device::saturn_bram8mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +saturn_bram8mb_device::saturn_bram8mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : saturn_bram_device(mconfig, SATURN_BRAM_8MB, "Saturn Battery RAM 8Mbit Cart", tag, owner, clock, "sat_bram_8mb", __FILE__) { m_cart_type = 0x22; } -saturn_bram16mb_device::saturn_bram16mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +saturn_bram16mb_device::saturn_bram16mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : saturn_bram_device(mconfig, SATURN_BRAM_16MB, "Saturn Battery RAM 16Mbit Cart", tag, owner, clock, "sat_bram_16mb", __FILE__) { m_cart_type = 0x23; } -saturn_bram32mb_device::saturn_bram32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +saturn_bram32mb_device::saturn_bram32mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : saturn_bram_device(mconfig, SATURN_BRAM_32MB, "Saturn Battery RAM 32Mbit Cart", tag, owner, clock, "sat_bram_32mb", __FILE__) { m_cart_type = 0x24; diff --git a/src/devices/bus/saturn/bram.h b/src/devices/bus/saturn/bram.h index e6237ff76ce..c43734eb455 100644 --- a/src/devices/bus/saturn/bram.h +++ b/src/devices/bus/saturn/bram.h @@ -14,7 +14,7 @@ class saturn_bram_device : public device_t, { public: // construction/destruction - saturn_bram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + saturn_bram_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides virtual void device_start() override; @@ -34,28 +34,28 @@ class saturn_bram4mb_device : public saturn_bram_device { public: // construction/destruction - saturn_bram4mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + saturn_bram4mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; class saturn_bram8mb_device : public saturn_bram_device { public: // construction/destruction - saturn_bram8mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + saturn_bram8mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; class saturn_bram16mb_device : public saturn_bram_device { public: // construction/destruction - saturn_bram16mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + saturn_bram16mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; class saturn_bram32mb_device : public saturn_bram_device { public: // construction/destruction - saturn_bram32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + saturn_bram32mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/bus/saturn/dram.cpp b/src/devices/bus/saturn/dram.cpp index d1078fcc722..0ac5008de27 100644 --- a/src/devices/bus/saturn/dram.cpp +++ b/src/devices/bus/saturn/dram.cpp @@ -19,19 +19,19 @@ const device_type SATURN_DRAM_8MB = &device_creator<saturn_dram8mb_device>; const device_type SATURN_DRAM_32MB = &device_creator<saturn_dram32mb_device>; -saturn_dram_device::saturn_dram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +saturn_dram_device::saturn_dram_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sat_cart_interface( mconfig, *this ) { } -saturn_dram8mb_device::saturn_dram8mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +saturn_dram8mb_device::saturn_dram8mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : saturn_dram_device(mconfig, SATURN_DRAM_8MB, "Saturn Data RAM 8Mbit Cart", tag, owner, clock, "sat_dram_8mb", __FILE__) { m_cart_type = 0x5a; } -saturn_dram32mb_device::saturn_dram32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +saturn_dram32mb_device::saturn_dram32mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : saturn_dram_device(mconfig, SATURN_DRAM_32MB, "Saturn Data RAM 32Mbit Cart", tag, owner, clock, "sat_dram_32mb", __FILE__) { m_cart_type = 0x5c; diff --git a/src/devices/bus/saturn/dram.h b/src/devices/bus/saturn/dram.h index 29ddbfcbcdc..571eaf47759 100644 --- a/src/devices/bus/saturn/dram.h +++ b/src/devices/bus/saturn/dram.h @@ -13,7 +13,7 @@ class saturn_dram_device : public device_t, { public: // construction/destruction - saturn_dram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + saturn_dram_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides virtual void device_start() override; @@ -30,14 +30,14 @@ class saturn_dram8mb_device : public saturn_dram_device { public: // construction/destruction - saturn_dram8mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + saturn_dram8mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; class saturn_dram32mb_device : public saturn_dram_device { public: // construction/destruction - saturn_dram32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + saturn_dram32mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/bus/saturn/rom.cpp b/src/devices/bus/saturn/rom.cpp index 7b8068735a1..3c34ec1aa9b 100644 --- a/src/devices/bus/saturn/rom.cpp +++ b/src/devices/bus/saturn/rom.cpp @@ -18,13 +18,13 @@ const device_type SATURN_ROM = &device_creator<saturn_rom_device>; -saturn_rom_device::saturn_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +saturn_rom_device::saturn_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sat_cart_interface( mconfig, *this ) { } -saturn_rom_device::saturn_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +saturn_rom_device::saturn_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SATURN_ROM, "Saturn ROM Carts", tag, owner, clock, "sat_rom", __FILE__), device_sat_cart_interface( mconfig, *this ) { diff --git a/src/devices/bus/saturn/rom.h b/src/devices/bus/saturn/rom.h index ffd80e272ee..a81293930d9 100644 --- a/src/devices/bus/saturn/rom.h +++ b/src/devices/bus/saturn/rom.h @@ -13,8 +13,8 @@ class saturn_rom_device : public device_t, { public: // construction/destruction - saturn_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - saturn_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + saturn_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + saturn_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/saturn/sat_slot.cpp b/src/devices/bus/saturn/sat_slot.cpp index dba415c8a47..3b860444277 100644 --- a/src/devices/bus/saturn/sat_slot.cpp +++ b/src/devices/bus/saturn/sat_slot.cpp @@ -56,7 +56,7 @@ device_sat_cart_interface::~device_sat_cart_interface() // rom_alloc - alloc the space for the cart //------------------------------------------------- -void device_sat_cart_interface::rom_alloc(UINT32 size, const char *tag) +void device_sat_cart_interface::rom_alloc(UINT32 size, std::string tag) { if (m_rom == nullptr) { @@ -101,7 +101,7 @@ void device_sat_cart_interface::dram1_alloc(UINT32 size) //------------------------------------------------- // sat_cart_slot_device - constructor //------------------------------------------------- -sat_cart_slot_device::sat_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sat_cart_slot_device::sat_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SATURN_CART_SLOT, "Saturn Cartridge Slot", tag, owner, clock, "sat_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), m_cart(nullptr) diff --git a/src/devices/bus/saturn/sat_slot.h b/src/devices/bus/saturn/sat_slot.h index e8a711c3a0b..6bfe37ebda1 100644 --- a/src/devices/bus/saturn/sat_slot.h +++ b/src/devices/bus/saturn/sat_slot.h @@ -31,7 +31,7 @@ public: virtual int get_cart_type() { return m_cart_type; }; - void rom_alloc(UINT32 size, const char *tag); + void rom_alloc(UINT32 size, std::string tag); void bram_alloc(UINT32 size); void dram0_alloc(UINT32 size); void dram1_alloc(UINT32 size); @@ -64,7 +64,7 @@ class sat_cart_slot_device : public device_t, { public: // construction/destruction - sat_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sat_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~sat_cart_slot_device(); // device-level overrides diff --git a/src/devices/bus/scsi/acb4070.cpp b/src/devices/bus/scsi/acb4070.cpp index 1503272b55c..34c96e9d2ef 100644 --- a/src/devices/bus/scsi/acb4070.cpp +++ b/src/devices/bus/scsi/acb4070.cpp @@ -10,7 +10,7 @@ // device type definition const device_type ACB4070 = &device_creator<acb4070_device>; -acb4070_device::acb4070_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +acb4070_device::acb4070_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : scsihd_device(mconfig, ACB4070, "ACB4070", tag, owner, clock, "acb4070", __FILE__) { } diff --git a/src/devices/bus/scsi/acb4070.h b/src/devices/bus/scsi/acb4070.h index ea9b1583c28..85d1fd4b296 100644 --- a/src/devices/bus/scsi/acb4070.h +++ b/src/devices/bus/scsi/acb4070.h @@ -11,7 +11,7 @@ class acb4070_device : public scsihd_device { public: // construction/destruction - acb4070_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + acb4070_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void ExecCommand() override; virtual void WriteData( UINT8 *data, int dataLength ) override; diff --git a/src/devices/bus/scsi/cdu76s.cpp b/src/devices/bus/scsi/cdu76s.cpp index bb6a70390ed..3eaf2b4c82a 100644 --- a/src/devices/bus/scsi/cdu76s.cpp +++ b/src/devices/bus/scsi/cdu76s.cpp @@ -41,7 +41,7 @@ void sony_cdu76s_device::ReadData( UINT8 *data, int dataLength ) // device type definition const device_type CDU76S = &device_creator<sony_cdu76s_device>; -sony_cdu76s_device::sony_cdu76s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sony_cdu76s_device::sony_cdu76s_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : scsicd_device(mconfig, CDU76S, "Sony CDU-76S", tag, owner, clock, "cdu76s", __FILE__) { } diff --git a/src/devices/bus/scsi/cdu76s.h b/src/devices/bus/scsi/cdu76s.h index d10a23c1246..5818c7da68a 100644 --- a/src/devices/bus/scsi/cdu76s.h +++ b/src/devices/bus/scsi/cdu76s.h @@ -19,7 +19,7 @@ class sony_cdu76s_device : public scsicd_device { public: - sony_cdu76s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sony_cdu76s_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void ExecCommand() override; virtual void ReadData( UINT8 *data, int dataLength ) override; diff --git a/src/devices/bus/scsi/d9060hd.cpp b/src/devices/bus/scsi/d9060hd.cpp index 3d212582a39..de1dbe14bb0 100644 --- a/src/devices/bus/scsi/d9060hd.cpp +++ b/src/devices/bus/scsi/d9060hd.cpp @@ -10,7 +10,7 @@ // device type definition const device_type D9060HD = &device_creator<d9060hd_device>; -d9060hd_device::d9060hd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +d9060hd_device::d9060hd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : scsihd_device(mconfig, D9060HD, "D9060HD", tag, owner, clock, "d9060hd", __FILE__) { } diff --git a/src/devices/bus/scsi/d9060hd.h b/src/devices/bus/scsi/d9060hd.h index 2daed5e40af..c3460e9279e 100644 --- a/src/devices/bus/scsi/d9060hd.h +++ b/src/devices/bus/scsi/d9060hd.h @@ -11,7 +11,7 @@ class d9060hd_device : public scsihd_device { public: // construction/destruction - d9060hd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + d9060hd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void ExecCommand() override; }; diff --git a/src/devices/bus/scsi/omti5100.cpp b/src/devices/bus/scsi/omti5100.cpp index 9dd436f4acb..82601f71e05 100644 --- a/src/devices/bus/scsi/omti5100.cpp +++ b/src/devices/bus/scsi/omti5100.cpp @@ -23,7 +23,7 @@ const rom_entry *omti5100_device::device_rom_region() const } #endif -omti5100_device::omti5100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +omti5100_device::omti5100_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : scsihd_device(mconfig, OMTI5100, "OMTI 5100", tag, owner, clock, "omti5100", __FILE__), m_image0(*this, "image0"), m_image1(*this, "image1") diff --git a/src/devices/bus/scsi/omti5100.h b/src/devices/bus/scsi/omti5100.h index 63ac7b8a4dc..a1854c837b9 100644 --- a/src/devices/bus/scsi/omti5100.h +++ b/src/devices/bus/scsi/omti5100.h @@ -11,7 +11,7 @@ class omti5100_device : public scsihd_device { public: - omti5100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + omti5100_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; //virtual const rom_entry *device_rom_region() const; diff --git a/src/devices/bus/scsi/pc9801_sasi.cpp b/src/devices/bus/scsi/pc9801_sasi.cpp index 619f9f074da..688c2f48495 100644 --- a/src/devices/bus/scsi/pc9801_sasi.cpp +++ b/src/devices/bus/scsi/pc9801_sasi.cpp @@ -6,7 +6,7 @@ const device_type PC9801_SASI = &device_creator<pc9801_sasi_device>; -pc9801_sasi_device::pc9801_sasi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +pc9801_sasi_device::pc9801_sasi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : scsihd_device(mconfig, PC9801_SASI, "PC-9801 SASI Controller", tag, owner, clock, "pc9801_sasi", __FILE__) { } diff --git a/src/devices/bus/scsi/pc9801_sasi.h b/src/devices/bus/scsi/pc9801_sasi.h index b3e5816573d..f82e29b5c7e 100644 --- a/src/devices/bus/scsi/pc9801_sasi.h +++ b/src/devices/bus/scsi/pc9801_sasi.h @@ -9,7 +9,7 @@ class pc9801_sasi_device : public scsihd_device { public: // construction/destruction - pc9801_sasi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + pc9801_sasi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void ExecCommand() override; }; diff --git a/src/devices/bus/scsi/s1410.cpp b/src/devices/bus/scsi/s1410.cpp index 59b964ce4f2..f9400d662fc 100644 --- a/src/devices/bus/scsi/s1410.cpp +++ b/src/devices/bus/scsi/s1410.cpp @@ -192,7 +192,7 @@ machine_config_constructor s1410_device::device_mconfig_additions() const // s1410_device - constructor //------------------------------------------------- -s1410_device::s1410_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +s1410_device::s1410_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : scsihd_device(mconfig, S1410, "Xebec S1410", tag, owner, clock, "s1410", __FILE__) { } diff --git a/src/devices/bus/scsi/s1410.h b/src/devices/bus/scsi/s1410.h index 519c013b066..222f6c5b836 100644 --- a/src/devices/bus/scsi/s1410.h +++ b/src/devices/bus/scsi/s1410.h @@ -17,7 +17,7 @@ class s1410_device : public scsihd_device { public: // construction/destruction - s1410_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + s1410_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/scsi/sa1403d.cpp b/src/devices/bus/scsi/sa1403d.cpp index 1abe47e0805..f320f1dd1e1 100644 --- a/src/devices/bus/scsi/sa1403d.cpp +++ b/src/devices/bus/scsi/sa1403d.cpp @@ -122,7 +122,7 @@ ioport_constructor sa1403d_device::device_input_ports() const // sa1403d_device - constructor //------------------------------------------------- -sa1403d_device::sa1403d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sa1403d_device::sa1403d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : scsihd_device(mconfig, SA1403D, "Shugart SA1403D", tag, owner, clock, "sa1403d", __FILE__) { } diff --git a/src/devices/bus/scsi/sa1403d.h b/src/devices/bus/scsi/sa1403d.h index 308be3b5b48..5c1ba288d61 100644 --- a/src/devices/bus/scsi/sa1403d.h +++ b/src/devices/bus/scsi/sa1403d.h @@ -18,7 +18,7 @@ class sa1403d_device : public scsihd_device { public: // construction/destruction - sa1403d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sa1403d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/scsi/scsi.cpp b/src/devices/bus/scsi/scsi.cpp index 118e2d58114..505ab78e228 100644 --- a/src/devices/bus/scsi/scsi.cpp +++ b/src/devices/bus/scsi/scsi.cpp @@ -3,7 +3,7 @@ #include "scsi.h" -SCSI_PORT_DEVICE::SCSI_PORT_DEVICE(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +SCSI_PORT_DEVICE::SCSI_PORT_DEVICE(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SCSI_PORT, "SCSI Port", tag, owner, clock, "scsi", __FILE__), m_bsy_handler(*this), m_sel_handler(*this), @@ -666,7 +666,7 @@ WRITE_LINE_MEMBER( SCSI_PORT_DEVICE::write_data7 ) const device_type SCSI_PORT = &device_creator<SCSI_PORT_DEVICE>; -SCSI_PORT_SLOT_device::SCSI_PORT_SLOT_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +SCSI_PORT_SLOT_device::SCSI_PORT_SLOT_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SCSI_PORT_SLOT, "SCSI Connector", tag, owner, clock, "scsi_slot", __FILE__), device_slot_interface(mconfig, *this), m_dev(nullptr), diff --git a/src/devices/bus/scsi/scsi.h b/src/devices/bus/scsi/scsi.h index 19fec347f53..6995e14d741 100644 --- a/src/devices/bus/scsi/scsi.h +++ b/src/devices/bus/scsi/scsi.h @@ -99,7 +99,7 @@ class SCSI_PORT_DEVICE : public device_t public: // construction/destruction - SCSI_PORT_DEVICE(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + SCSI_PORT_DEVICE(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template<class _Object> static devcb_base &set_bsy_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_bsy_handler.set_callback(object); } template<class _Object> static devcb_base &set_sel_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_sel_handler.set_callback(object); } @@ -229,7 +229,7 @@ class SCSI_PORT_SLOT_device : public device_t, friend class scsi_port_interface; public: - SCSI_PORT_SLOT_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + SCSI_PORT_SLOT_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); scsi_port_interface *dev() { return m_dev; } SCSI_PORT_DEVICE *port() { return m_port; } diff --git a/src/devices/bus/scsi/scsicd.cpp b/src/devices/bus/scsi/scsicd.cpp index 9ee7d92668f..89402bf2c5a 100644 --- a/src/devices/bus/scsi/scsicd.cpp +++ b/src/devices/bus/scsi/scsicd.cpp @@ -11,12 +11,12 @@ // device type definition const device_type SCSICD = &device_creator<scsicd_device>; -scsicd_device::scsicd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +scsicd_device::scsicd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : scsihle_device(mconfig, SCSICD, "SCSI CD", tag, owner, clock, "scsicd", __FILE__) { } -scsicd_device::scsicd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +scsicd_device::scsicd_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : scsihle_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/bus/scsi/scsicd.h b/src/devices/bus/scsi/scsicd.h index 3acfffe2ad6..34c457df7d1 100644 --- a/src/devices/bus/scsi/scsicd.h +++ b/src/devices/bus/scsi/scsicd.h @@ -17,8 +17,8 @@ class scsicd_device : public scsihle_device, { public: // construction/destruction - scsicd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - scsicd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + scsicd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + scsicd_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); virtual machine_config_constructor device_mconfig_additions() const override; protected: diff --git a/src/devices/bus/scsi/scsihd.cpp b/src/devices/bus/scsi/scsihd.cpp index 8774310d0b3..42e6c2d821f 100644 --- a/src/devices/bus/scsi/scsihd.cpp +++ b/src/devices/bus/scsi/scsihd.cpp @@ -11,12 +11,12 @@ // device type definition const device_type SCSIHD = &device_creator<scsihd_device>; -scsihd_device::scsihd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +scsihd_device::scsihd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : scsihle_device(mconfig, SCSIHD, "SCSI HD", tag, owner, clock, "scsihd", __FILE__) { } -scsihd_device::scsihd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +scsihd_device::scsihd_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : scsihle_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/bus/scsi/scsihd.h b/src/devices/bus/scsi/scsihd.h index 41b535a15b1..645706090b5 100644 --- a/src/devices/bus/scsi/scsihd.h +++ b/src/devices/bus/scsi/scsihd.h @@ -17,8 +17,8 @@ class scsihd_device : public scsihle_device, { public: // construction/destruction - scsihd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - scsihd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + scsihd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + scsihd_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); virtual machine_config_constructor device_mconfig_additions() const override; protected: diff --git a/src/devices/bus/scsi/scsihle.cpp b/src/devices/bus/scsi/scsihle.cpp index e14d875881f..44e4e087f29 100644 --- a/src/devices/bus/scsi/scsihle.cpp +++ b/src/devices/bus/scsi/scsihle.cpp @@ -10,7 +10,7 @@ Base class for HLE'd SCSI devices. #include "scsihle.h" -scsihle_device::scsihle_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +scsihle_device::scsihle_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), scsi_port_interface(mconfig, *this), m_scsi_id(*this, "SCSI_ID"), @@ -133,7 +133,7 @@ static const char *const phasenames[] = void scsihle_device::data_out(UINT8 data) { -// printf( "%s data out %02x\n", tag(), data ); +// printf( "%s data out %02x\n", tag().c_str(), data ); output_data0(BIT(data, 0)); output_data1(BIT(data, 1)); output_data2(BIT(data, 2)); diff --git a/src/devices/bus/scsi/scsihle.h b/src/devices/bus/scsi/scsihle.h index 4963210726c..1308b606b01 100644 --- a/src/devices/bus/scsi/scsihle.h +++ b/src/devices/bus/scsi/scsihle.h @@ -22,7 +22,7 @@ class scsihle_device : public device_t, { public: // construction/destruction - scsihle_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + scsihle_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); virtual int GetDeviceID(); // hack for legacy_scsi_host_adapter::get_device diff --git a/src/devices/bus/scv/rom.cpp b/src/devices/bus/scv/rom.cpp index 27487e8cc73..1fc13842e72 100644 --- a/src/devices/bus/scv/rom.cpp +++ b/src/devices/bus/scv/rom.cpp @@ -26,44 +26,44 @@ const device_type SCV_ROM128K = &device_creator<scv_rom128_device>; const device_type SCV_ROM128K_RAM4K = &device_creator<scv_rom128ram4_device>; -scv_rom8_device::scv_rom8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +scv_rom8_device::scv_rom8_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_scv_cart_interface( mconfig, *this ) { } -scv_rom8_device::scv_rom8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +scv_rom8_device::scv_rom8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SCV_ROM8K, "SCV 8K Carts", tag, owner, clock, "scv_rom8", __FILE__), device_scv_cart_interface( mconfig, *this ) { } -scv_rom16_device::scv_rom16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +scv_rom16_device::scv_rom16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : scv_rom8_device(mconfig, SCV_ROM16K, "SCV 16K Carts", tag, owner, clock, "scv_rom16", __FILE__) { } -scv_rom32_device::scv_rom32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +scv_rom32_device::scv_rom32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : scv_rom8_device(mconfig, SCV_ROM32K, "SCV 32K Carts", tag, owner, clock, "scv_rom32", __FILE__) { } -scv_rom32ram8_device::scv_rom32ram8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +scv_rom32ram8_device::scv_rom32ram8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : scv_rom8_device(mconfig, SCV_ROM32K_RAM8K, "SCV 32K + RAM 8K Carts", tag, owner, clock, "scv_rom32_ram8", __FILE__), m_ram_enabled(0) { } -scv_rom64_device::scv_rom64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +scv_rom64_device::scv_rom64_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : scv_rom8_device(mconfig, SCV_ROM16K, "SCV 64K Carts", tag, owner, clock, "scv_rom64", __FILE__), m_bank_base(0) { } -scv_rom128_device::scv_rom128_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +scv_rom128_device::scv_rom128_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : scv_rom8_device(mconfig, SCV_ROM32K, "SCV 128K Carts", tag, owner, clock, "scv_rom128", __FILE__), m_bank_base(0) { } -scv_rom128ram4_device::scv_rom128ram4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +scv_rom128ram4_device::scv_rom128ram4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : scv_rom8_device(mconfig, SCV_ROM128K_RAM4K, "SCV 128K + RAM 4K Carts", tag, owner, clock, "scv_rom128_ram4", __FILE__), m_bank_base(0), m_ram_enabled(0) { } diff --git a/src/devices/bus/scv/rom.h b/src/devices/bus/scv/rom.h index 381a82fb7cf..7c2043c613a 100644 --- a/src/devices/bus/scv/rom.h +++ b/src/devices/bus/scv/rom.h @@ -13,8 +13,8 @@ class scv_rom8_device : public device_t, { public: // construction/destruction - scv_rom8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - scv_rom8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + scv_rom8_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + scv_rom8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override {} @@ -30,7 +30,7 @@ class scv_rom16_device : public scv_rom8_device { public: // construction/destruction - scv_rom16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + scv_rom16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_cart) override; @@ -43,7 +43,7 @@ class scv_rom32_device : public scv_rom8_device { public: // construction/destruction - scv_rom32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + scv_rom32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_cart) override; @@ -56,7 +56,7 @@ class scv_rom32ram8_device : public scv_rom8_device { public: // construction/destruction - scv_rom32ram8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + scv_rom32ram8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -78,7 +78,7 @@ class scv_rom64_device : public scv_rom8_device { public: // construction/destruction - scv_rom64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + scv_rom64_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -99,7 +99,7 @@ class scv_rom128_device : public scv_rom8_device { public: // construction/destruction - scv_rom128_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + scv_rom128_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -120,7 +120,7 @@ class scv_rom128ram4_device : public scv_rom8_device { public: // construction/destruction - scv_rom128ram4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + scv_rom128ram4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/scv/slot.cpp b/src/devices/bus/scv/slot.cpp index 15495afe918..d0e286664ea 100644 --- a/src/devices/bus/scv/slot.cpp +++ b/src/devices/bus/scv/slot.cpp @@ -45,7 +45,7 @@ device_scv_cart_interface::~device_scv_cart_interface() // rom_alloc - alloc the space for the cart //------------------------------------------------- -void device_scv_cart_interface::rom_alloc(UINT32 size, const char *tag) +void device_scv_cart_interface::rom_alloc(UINT32 size, std::string tag) { if (m_rom == nullptr) { @@ -72,7 +72,7 @@ void device_scv_cart_interface::ram_alloc(UINT32 size) //------------------------------------------------- // scv_cart_slot_device - constructor //------------------------------------------------- -scv_cart_slot_device::scv_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +scv_cart_slot_device::scv_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SCV_CART_SLOT, "SCV Cartridge Slot", tag, owner, clock, "scv_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), diff --git a/src/devices/bus/scv/slot.h b/src/devices/bus/scv/slot.h index 3fa5a02578a..1cc7b1fda38 100644 --- a/src/devices/bus/scv/slot.h +++ b/src/devices/bus/scv/slot.h @@ -35,7 +35,7 @@ public: virtual DECLARE_WRITE8_MEMBER(write_cart) {} virtual DECLARE_WRITE8_MEMBER(write_bank) {} - void rom_alloc(UINT32 size, const char *tag); + void rom_alloc(UINT32 size, std::string tag); void ram_alloc(UINT32 size); UINT8* get_rom_base() { return m_rom; } UINT8* get_ram_base() { return &m_ram[0]; } @@ -60,7 +60,7 @@ class scv_cart_slot_device : public device_t, { public: // construction/destruction - scv_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + scv_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~scv_cart_slot_device(); // device-level overrides diff --git a/src/devices/bus/sega8/ccatch.cpp b/src/devices/bus/sega8/ccatch.cpp index 5ec9295fdba..c716ab39329 100644 --- a/src/devices/bus/sega8/ccatch.cpp +++ b/src/devices/bus/sega8/ccatch.cpp @@ -23,7 +23,7 @@ const device_type SEGA8_ROM_CARDCATCH = &device_creator<sega8_cardcatch_device>; -sega8_cardcatch_device::sega8_cardcatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sega8_cardcatch_device::sega8_cardcatch_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sega8_rom_device(mconfig, SEGA8_ROM_CARDCATCH, "SG-1000 Card Catcher Cart", tag, owner, clock, "sega8_ccatch", __FILE__), m_card(*this, "cardslot") { diff --git a/src/devices/bus/sega8/ccatch.h b/src/devices/bus/sega8/ccatch.h index 959376173c5..a8224c717a7 100644 --- a/src/devices/bus/sega8/ccatch.h +++ b/src/devices/bus/sega8/ccatch.h @@ -12,7 +12,7 @@ class sega8_cardcatch_device : public sega8_rom_device { public: // construction/destruction - sega8_cardcatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sega8_cardcatch_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_cart) override; diff --git a/src/devices/bus/sega8/mgear.cpp b/src/devices/bus/sega8/mgear.cpp index d6b8c91c6cf..5b36e6c6c49 100644 --- a/src/devices/bus/sega8/mgear.cpp +++ b/src/devices/bus/sega8/mgear.cpp @@ -17,7 +17,7 @@ const device_type SEGA8_ROM_MGEAR = &device_creator<sega8_mgear_device>; -sega8_mgear_device::sega8_mgear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sega8_mgear_device::sega8_mgear_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sega8_rom_device(mconfig, SEGA8_ROM_MGEAR, "Master Gear Adapter", tag, owner, clock, "sega8_mgear", __FILE__), m_subslot(*this, "subslot") { diff --git a/src/devices/bus/sega8/mgear.h b/src/devices/bus/sega8/mgear.h index 960545c7350..f7b9e6fd2ea 100644 --- a/src/devices/bus/sega8/mgear.h +++ b/src/devices/bus/sega8/mgear.h @@ -13,7 +13,7 @@ class sega8_mgear_device : public sega8_rom_device { public: // construction/destruction - sega8_mgear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sega8_mgear_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/sega8/rom.cpp b/src/devices/bus/sega8/rom.cpp index b9c35af15f9..b74923ab41c 100644 --- a/src/devices/bus/sega8/rom.cpp +++ b/src/devices/bus/sega8/rom.cpp @@ -43,13 +43,13 @@ const device_type SEGA8_ROM_KOREAN_NB = &device_creator<sega8_korean_nb_device>; -sega8_rom_device::sega8_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +sega8_rom_device::sega8_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sega8_cart_interface( mconfig, *this ), m_ram_base(0), m_ram_enabled(0) { } -sega8_rom_device::sega8_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sega8_rom_device::sega8_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SEGA8_ROM_STD, "Mark III, SMS & GG Carts", tag, owner, clock, "sega8_rom", __FILE__), device_sega8_cart_interface( mconfig, *this ), m_ram_base(0), m_ram_enabled(0) { @@ -58,31 +58,31 @@ sega8_rom_device::sega8_rom_device(const machine_config &mconfig, const char *ta -sega8_othello_device::sega8_othello_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sega8_othello_device::sega8_othello_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sega8_rom_device(mconfig, SEGA8_ROM_OTHELLO, "SG-1000 Othello Cart", tag, owner, clock, "sega8_othello", __FILE__) { } -sega8_castle_device::sega8_castle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sega8_castle_device::sega8_castle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sega8_rom_device(mconfig, SEGA8_ROM_CASTLE, "SG-1000 The Castle Cart", tag, owner, clock, "sega8_castle", __FILE__) { } -sega8_basic_l3_device::sega8_basic_l3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sega8_basic_l3_device::sega8_basic_l3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sega8_rom_device(mconfig, SEGA8_ROM_BASIC_L3, "SC-3000 BASIC Level III Cart", tag, owner, clock, "sega8_basicl3", __FILE__) { } -sega8_music_editor_device::sega8_music_editor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sega8_music_editor_device::sega8_music_editor_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sega8_rom_device(mconfig, SEGA8_ROM_MUSIC_EDITOR, "SC-3000 Music Editor Cart", tag, owner, clock, "sega8_music", __FILE__) { } -sega8_terebi_device::sega8_terebi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sega8_terebi_device::sega8_terebi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sega8_rom_device(mconfig, SEGA8_ROM_TEREBI, "SG-1000 Terebi Oekaki Cart", tag, owner, clock, "sega8_terebi", __FILE__), m_tvdraw_x(*this, "TVDRAW_X"), m_tvdraw_y(*this, "TVDRAW_Y"), @@ -91,13 +91,13 @@ sega8_terebi_device::sega8_terebi_device(const machine_config &mconfig, const ch } -sega8_dahjee_typea_device::sega8_dahjee_typea_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sega8_dahjee_typea_device::sega8_dahjee_typea_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sega8_rom_device(mconfig, SEGA8_ROM_DAHJEE_TYPEA, "SG-1000 Dahjee RAM expansion + Cart (Type A)", tag, owner, clock, "sega8_dahjeea", __FILE__) { } -sega8_dahjee_typeb_device::sega8_dahjee_typeb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sega8_dahjee_typeb_device::sega8_dahjee_typeb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sega8_rom_device(mconfig, SEGA8_ROM_DAHJEE_TYPEB, "SG-1000 Dahjee RAM expansion + Cart (Type B)", tag, owner, clock, "sega8_dahjeeb", __FILE__) { } @@ -105,7 +105,7 @@ sega8_dahjee_typeb_device::sega8_dahjee_typeb_device(const machine_config &mconf -sega8_eeprom_device::sega8_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sega8_eeprom_device::sega8_eeprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SEGA8_ROM_EEPROM, "GG Carts + EEPROM", tag, owner, clock, "sega8_eeprom", __FILE__), device_sega8_cart_interface( mconfig, *this ), m_eeprom(*this, "eeprom"), m_93c46_enabled(0), m_93c46_lines(0) @@ -113,58 +113,58 @@ sega8_eeprom_device::sega8_eeprom_device(const machine_config &mconfig, const ch } -sega8_codemasters_device::sega8_codemasters_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sega8_codemasters_device::sega8_codemasters_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SEGA8_ROM_CODEMASTERS, "Mark III, SMS & GG Codemasters Carts", tag, owner, clock, "sega8_codemasters", __FILE__), device_sega8_cart_interface( mconfig, *this ), m_ram_base(0), m_ram_enabled(0) { } -sega8_4pak_device::sega8_4pak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sega8_4pak_device::sega8_4pak_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sega8_rom_device(mconfig, SEGA8_ROM_4PAK, "SMS 4-Pak Cart", tag, owner, clock, "sega8_4pak", __FILE__) { } -sega8_zemina_device::sega8_zemina_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +sega8_zemina_device::sega8_zemina_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sega8_cart_interface( mconfig, *this ), m_ram_base(0), m_ram_enabled(0) { } -sega8_zemina_device::sega8_zemina_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sega8_zemina_device::sega8_zemina_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SEGA8_ROM_ZEMINA, "SMS Zemina Carts", tag, owner, clock, "sega8_zemina", __FILE__), device_sega8_cart_interface( mconfig, *this ), m_ram_base(0), m_ram_enabled(0) { } -sega8_nemesis_device::sega8_nemesis_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sega8_nemesis_device::sega8_nemesis_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sega8_zemina_device(mconfig, SEGA8_ROM_NEMESIS, "SMS Nemesis Cart", tag, owner, clock, "sega8_nemesis", __FILE__) { } -sega8_janggun_device::sega8_janggun_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sega8_janggun_device::sega8_janggun_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SEGA8_ROM_JANGGUN, "SMS Janggun Cart", tag, owner, clock, "sega8_janggun", __FILE__), device_sega8_cart_interface( mconfig, *this ) { } -sega8_hicom_device::sega8_hicom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sega8_hicom_device::sega8_hicom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sega8_rom_device(mconfig, SEGA8_ROM_HICOM, "SMS Hi-Com Carts", tag, owner, clock, "sega8_hicom", __FILE__), m_rom_bank_base(0) { } -sega8_korean_device::sega8_korean_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sega8_korean_device::sega8_korean_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sega8_rom_device(mconfig, SEGA8_ROM_KOREAN, "SMS Korean Carts", tag, owner, clock, "sega8_korean", __FILE__) { } -sega8_korean_nb_device::sega8_korean_nb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sega8_korean_nb_device::sega8_korean_nb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sega8_rom_device(mconfig, SEGA8_ROM_KOREAN_NB, "SMS Korean No-Bank Mapper Carts", tag, owner, clock, "sega8_korean_nb", __FILE__) { } diff --git a/src/devices/bus/sega8/rom.h b/src/devices/bus/sega8/rom.h index 462ea7d8e28..9e30940526d 100644 --- a/src/devices/bus/sega8/rom.h +++ b/src/devices/bus/sega8/rom.h @@ -13,8 +13,8 @@ class sega8_rom_device : public device_t, { public: // construction/destruction - sega8_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - sega8_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sega8_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + sega8_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -42,7 +42,7 @@ class sega8_othello_device : public sega8_rom_device { public: // construction/destruction - sega8_othello_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sega8_othello_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_cart) override; @@ -57,7 +57,7 @@ class sega8_castle_device : public sega8_rom_device { public: // construction/destruction - sega8_castle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sega8_castle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_cart) override; @@ -72,7 +72,7 @@ class sega8_basic_l3_device : public sega8_rom_device { public: // construction/destruction - sega8_basic_l3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sega8_basic_l3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_cart) override; @@ -91,7 +91,7 @@ class sega8_music_editor_device : public sega8_rom_device { public: // construction/destruction - sega8_music_editor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sega8_music_editor_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_cart) override; @@ -110,7 +110,7 @@ class sega8_terebi_device : public sega8_rom_device { public: // construction/destruction - sega8_terebi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sega8_terebi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -137,7 +137,7 @@ class sega8_dahjee_typea_device : public sega8_rom_device { public: // construction/destruction - sega8_dahjee_typea_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sega8_dahjee_typea_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_cart) override; @@ -156,7 +156,7 @@ class sega8_dahjee_typeb_device : public sega8_rom_device { public: // construction/destruction - sega8_dahjee_typeb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sega8_dahjee_typeb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_cart) override; @@ -178,7 +178,7 @@ class sega8_eeprom_device : public device_t, { public: // construction/destruction - sega8_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sega8_eeprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -208,7 +208,7 @@ class sega8_codemasters_device : public device_t, { public: // construction/destruction - sega8_codemasters_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sega8_codemasters_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -234,7 +234,7 @@ class sega8_4pak_device : public sega8_rom_device { public: // construction/destruction - sega8_4pak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sega8_4pak_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -256,8 +256,8 @@ class sega8_zemina_device : public device_t, { public: // construction/destruction - sega8_zemina_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - sega8_zemina_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sega8_zemina_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + sega8_zemina_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -283,7 +283,7 @@ class sega8_nemesis_device : public sega8_zemina_device { public: // construction/destruction - sega8_nemesis_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sega8_nemesis_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void late_bank_setup() override; }; @@ -296,7 +296,7 @@ class sega8_janggun_device : public device_t, { public: // construction/destruction - sega8_janggun_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sega8_janggun_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override { save_item(NAME(m_rom_bank_base)); } @@ -319,7 +319,7 @@ class sega8_hicom_device : public sega8_rom_device { public: // construction/destruction - sega8_hicom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sega8_hicom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override { save_item(NAME(m_rom_bank_base)); } @@ -342,7 +342,7 @@ class sega8_korean_device : public sega8_rom_device { public: // construction/destruction - sega8_korean_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sega8_korean_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void late_bank_setup() override; @@ -358,7 +358,7 @@ class sega8_korean_nb_device : public sega8_rom_device { public: // construction/destruction - sega8_korean_nb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sega8_korean_nb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_WRITE8_MEMBER(write_mapper) override {} diff --git a/src/devices/bus/sega8/sega8_slot.cpp b/src/devices/bus/sega8/sega8_slot.cpp index df3c59adc05..b87c42305fc 100644 --- a/src/devices/bus/sega8/sega8_slot.cpp +++ b/src/devices/bus/sega8/sega8_slot.cpp @@ -74,7 +74,7 @@ device_sega8_cart_interface::~device_sega8_cart_interface() // rom_alloc - alloc the space for the cart //------------------------------------------------- -void device_sega8_cart_interface::rom_alloc(UINT32 size, const char *tag) +void device_sega8_cart_interface::rom_alloc(UINT32 size, std::string tag) { if (m_rom == nullptr) { @@ -107,7 +107,7 @@ void device_sega8_cart_interface::ram_alloc(UINT32 size) // sega8_cart_slot_device - constructor //------------------------------------------------- -sega8_cart_slot_device::sega8_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, bool is_card, const char *shortname, const char *source) : +sega8_cart_slot_device::sega8_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, bool is_card, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), @@ -119,7 +119,7 @@ sega8_cart_slot_device::sega8_cart_slot_device(const machine_config &mconfig, de m_is_card = is_card; } -sega8_cart_slot_device::sega8_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sega8_cart_slot_device::sega8_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SEGA8_CART_SLOT, "Sega Master System / Game Gear / SG1000 Cartridge Slot", tag, owner, clock, "sega8_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), @@ -131,7 +131,7 @@ sega8_cart_slot_device::sega8_cart_slot_device(const machine_config &mconfig, co { } -sega8_card_slot_device::sega8_card_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sega8_card_slot_device::sega8_card_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sega8_cart_slot_device(mconfig, SEGA8_CARD_SLOT, "Sega Master System / Game Gear / SG1000 Card Slot", tag, owner, clock, TRUE, "sega8_card_slot", __FILE__) { } diff --git a/src/devices/bus/sega8/sega8_slot.h b/src/devices/bus/sega8/sega8_slot.h index 439bc3be7a2..b71c53a738c 100644 --- a/src/devices/bus/sega8/sega8_slot.h +++ b/src/devices/bus/sega8/sega8_slot.h @@ -52,7 +52,7 @@ public: virtual DECLARE_READ8_MEMBER(read_ram) { return 0xff; } virtual DECLARE_WRITE8_MEMBER(write_ram) {} - void rom_alloc(UINT32 size, const char *tag); + void rom_alloc(UINT32 size, std::string tag); void ram_alloc(UINT32 size); virtual void late_bank_setup() {} @@ -99,8 +99,8 @@ class sega8_cart_slot_device : public device_t, { public: // construction/destruction - sega8_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, bool is_card, const char *shortname, const char *source); - sega8_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sega8_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, bool is_card, const char *shortname, const char *source); + sega8_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~sega8_cart_slot_device(); // device-level overrides @@ -161,7 +161,7 @@ class sega8_card_slot_device : public sega8_cart_slot_device { public: // construction/destruction - sega8_card_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sega8_card_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void device_config_complete() override { update_names(SEGA8_CARD_SLOT, "card", "card"); } }; diff --git a/src/devices/bus/sms_ctrl/graphic.cpp b/src/devices/bus/sms_ctrl/graphic.cpp index 31d211e30a8..ba4cc85df3e 100644 --- a/src/devices/bus/sms_ctrl/graphic.cpp +++ b/src/devices/bus/sms_ctrl/graphic.cpp @@ -75,7 +75,7 @@ ioport_constructor sms_graphic_device::device_input_ports() const // sms_graphic_device - constructor //------------------------------------------------- -sms_graphic_device::sms_graphic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sms_graphic_device::sms_graphic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SMS_GRAPHIC, "Sega SMS Graphic Board", tag, owner, clock, "sms_graphic", __FILE__) , device_sms_control_port_interface(mconfig, *this) , m_buttons(*this, "BUTTONS") diff --git a/src/devices/bus/sms_ctrl/graphic.h b/src/devices/bus/sms_ctrl/graphic.h index 82d624c07b5..b636b432747 100644 --- a/src/devices/bus/sms_ctrl/graphic.h +++ b/src/devices/bus/sms_ctrl/graphic.h @@ -28,7 +28,7 @@ class sms_graphic_device : public device_t, { public: // construction/destruction - sms_graphic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sms_graphic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/sms_ctrl/joypad.cpp b/src/devices/bus/sms_ctrl/joypad.cpp index b2537453c6a..2aaa6f9d178 100644 --- a/src/devices/bus/sms_ctrl/joypad.cpp +++ b/src/devices/bus/sms_ctrl/joypad.cpp @@ -49,7 +49,7 @@ ioport_constructor sms_joypad_device::device_input_ports() const // sms_joypad_device - constructor //------------------------------------------------- -sms_joypad_device::sms_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sms_joypad_device::sms_joypad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SMS_JOYPAD, "Sega SMS Control Pad", tag, owner, clock, "sms_joypad", __FILE__), device_sms_control_port_interface(mconfig, *this), m_joypad(*this, "JOYPAD") diff --git a/src/devices/bus/sms_ctrl/joypad.h b/src/devices/bus/sms_ctrl/joypad.h index a67dd5f78b0..a9b093f28c8 100644 --- a/src/devices/bus/sms_ctrl/joypad.h +++ b/src/devices/bus/sms_ctrl/joypad.h @@ -28,7 +28,7 @@ class sms_joypad_device : public device_t, { public: // construction/destruction - sms_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sms_joypad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/sms_ctrl/lphaser.cpp b/src/devices/bus/sms_ctrl/lphaser.cpp index 54e03d5627e..5e2f28236bd 100644 --- a/src/devices/bus/sms_ctrl/lphaser.cpp +++ b/src/devices/bus/sms_ctrl/lphaser.cpp @@ -68,7 +68,7 @@ ioport_constructor sms_light_phaser_device::device_input_ports() const // sms_light_phaser_device - constructor //------------------------------------------------- -sms_light_phaser_device::sms_light_phaser_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sms_light_phaser_device::sms_light_phaser_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SMS_LIGHT_PHASER, "Sega SMS Light Phaser", tag, owner, clock, "sms_light_phaser", __FILE__), device_video_interface(mconfig, *this), device_sms_control_port_interface(mconfig, *this), diff --git a/src/devices/bus/sms_ctrl/lphaser.h b/src/devices/bus/sms_ctrl/lphaser.h index 7d2f9ca1ed6..0779cae8299 100644 --- a/src/devices/bus/sms_ctrl/lphaser.h +++ b/src/devices/bus/sms_ctrl/lphaser.h @@ -29,7 +29,7 @@ class sms_light_phaser_device : public device_t, { public: // construction/destruction - sms_light_phaser_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sms_light_phaser_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/sms_ctrl/multitap.cpp b/src/devices/bus/sms_ctrl/multitap.cpp index fd098b82c18..098b3a57dc1 100644 --- a/src/devices/bus/sms_ctrl/multitap.cpp +++ b/src/devices/bus/sms_ctrl/multitap.cpp @@ -27,7 +27,7 @@ const device_type SMS_MULTITAP = &device_creator<sms_multitap_device>; // sms_multitap_device - constructor //------------------------------------------------- -sms_multitap_device::sms_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sms_multitap_device::sms_multitap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SMS_MULTITAP, "Sega SMS Multitap", tag, owner, clock, "sms_multitap", __FILE__), device_sms_control_port_interface(mconfig, *this), m_subctrl1_port(*this, "ctrl1"), diff --git a/src/devices/bus/sms_ctrl/multitap.h b/src/devices/bus/sms_ctrl/multitap.h index bf3e79e5616..66ecb4ddd6d 100644 --- a/src/devices/bus/sms_ctrl/multitap.h +++ b/src/devices/bus/sms_ctrl/multitap.h @@ -28,7 +28,7 @@ class sms_multitap_device : public device_t, { public: // construction/destruction - sms_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sms_multitap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ32_MEMBER(pixel_r); diff --git a/src/devices/bus/sms_ctrl/paddle.cpp b/src/devices/bus/sms_ctrl/paddle.cpp index e2418f38345..379638db451 100644 --- a/src/devices/bus/sms_ctrl/paddle.cpp +++ b/src/devices/bus/sms_ctrl/paddle.cpp @@ -71,7 +71,7 @@ ioport_constructor sms_paddle_device::device_input_ports() const // sms_paddle_device - constructor //------------------------------------------------- -sms_paddle_device::sms_paddle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sms_paddle_device::sms_paddle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SMS_PADDLE, "Sega SMS Paddle", tag, owner, clock, "sms_paddle", __FILE__), device_sms_control_port_interface(mconfig, *this), m_paddle_pins(*this, "CTRL_PORT"), diff --git a/src/devices/bus/sms_ctrl/paddle.h b/src/devices/bus/sms_ctrl/paddle.h index 8e092d63afe..53eed47774a 100644 --- a/src/devices/bus/sms_ctrl/paddle.h +++ b/src/devices/bus/sms_ctrl/paddle.h @@ -28,7 +28,7 @@ class sms_paddle_device : public device_t, { public: // construction/destruction - sms_paddle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sms_paddle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/sms_ctrl/rfu.cpp b/src/devices/bus/sms_ctrl/rfu.cpp index 2b43b31a6b8..27bc3b6e8c1 100644 --- a/src/devices/bus/sms_ctrl/rfu.cpp +++ b/src/devices/bus/sms_ctrl/rfu.cpp @@ -49,7 +49,7 @@ ioport_constructor sms_rapid_fire_device::device_input_ports() const // sms_rapid_fire_device - constructor //------------------------------------------------- -sms_rapid_fire_device::sms_rapid_fire_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sms_rapid_fire_device::sms_rapid_fire_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SMS_RAPID_FIRE, "Sega SMS Rapid Fire", tag, owner, clock, "sms_rapid_fire", __FILE__), device_sms_control_port_interface(mconfig, *this), m_rfire_sw(*this, "rfu_sw"), diff --git a/src/devices/bus/sms_ctrl/rfu.h b/src/devices/bus/sms_ctrl/rfu.h index adc9a3443ba..f9cca7d0784 100644 --- a/src/devices/bus/sms_ctrl/rfu.h +++ b/src/devices/bus/sms_ctrl/rfu.h @@ -28,7 +28,7 @@ class sms_rapid_fire_device : public device_t, { public: // construction/destruction - sms_rapid_fire_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sms_rapid_fire_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/sms_ctrl/smsctrl.cpp b/src/devices/bus/sms_ctrl/smsctrl.cpp index 170a716a70f..417d76e8362 100644 --- a/src/devices/bus/sms_ctrl/smsctrl.cpp +++ b/src/devices/bus/sms_ctrl/smsctrl.cpp @@ -60,7 +60,7 @@ device_sms_control_port_interface::~device_sms_control_port_interface() // sms_control_port_device - constructor //------------------------------------------------- -sms_control_port_device::sms_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sms_control_port_device::sms_control_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SMS_CONTROL_PORT, "Sega SMS control port", tag, owner, clock, "sms_control_port", __FILE__), device_slot_interface(mconfig, *this), m_device(nullptr), m_th_pin_handler(*this), diff --git a/src/devices/bus/sms_ctrl/smsctrl.h b/src/devices/bus/sms_ctrl/smsctrl.h index 4cce2437149..3672a7b179c 100644 --- a/src/devices/bus/sms_ctrl/smsctrl.h +++ b/src/devices/bus/sms_ctrl/smsctrl.h @@ -51,7 +51,7 @@ class sms_control_port_device : public device_t, { public: // construction/destruction - sms_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sms_control_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~sms_control_port_device(); // static configuration helpers diff --git a/src/devices/bus/sms_ctrl/sports.cpp b/src/devices/bus/sms_ctrl/sports.cpp index e7ea829372c..9155af7edd2 100644 --- a/src/devices/bus/sms_ctrl/sports.cpp +++ b/src/devices/bus/sms_ctrl/sports.cpp @@ -143,7 +143,7 @@ ioport_constructor sms_sports_pad_device::device_input_ports() const // sms_sports_pad_device - constructor //------------------------------------------------- -sms_sports_pad_device::sms_sports_pad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sms_sports_pad_device::sms_sports_pad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SMS_SPORTS_PAD, "Sega SMS Sports Pad US", tag, owner, clock, "sms_sports_pad", __FILE__), device_sms_control_port_interface(mconfig, *this), m_sports_in(*this, "SPORTS_IN"), diff --git a/src/devices/bus/sms_ctrl/sports.h b/src/devices/bus/sms_ctrl/sports.h index fe98c9e5e70..baafc8bc0de 100644 --- a/src/devices/bus/sms_ctrl/sports.h +++ b/src/devices/bus/sms_ctrl/sports.h @@ -28,7 +28,7 @@ class sms_sports_pad_device : public device_t, { public: // construction/destruction - sms_sports_pad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sms_sports_pad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/sms_ctrl/sportsjp.cpp b/src/devices/bus/sms_ctrl/sportsjp.cpp index d431f0a6816..c32be5f8843 100644 --- a/src/devices/bus/sms_ctrl/sportsjp.cpp +++ b/src/devices/bus/sms_ctrl/sportsjp.cpp @@ -85,7 +85,7 @@ ioport_constructor sms_sports_pad_jp_device::device_input_ports() const // sms_sports_pad_jp_device - constructor //------------------------------------------------- -sms_sports_pad_jp_device::sms_sports_pad_jp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sms_sports_pad_jp_device::sms_sports_pad_jp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SMS_SPORTS_PAD_JP, "Sega SMS Sports Pad JP", tag, owner, clock, "sms_sports_pad_jp", __FILE__), device_sms_control_port_interface(mconfig, *this), m_sports_jp_in(*this, "SPORTS_JP_IN"), diff --git a/src/devices/bus/sms_ctrl/sportsjp.h b/src/devices/bus/sms_ctrl/sportsjp.h index c20f15bd845..cc15f199533 100644 --- a/src/devices/bus/sms_ctrl/sportsjp.h +++ b/src/devices/bus/sms_ctrl/sportsjp.h @@ -33,7 +33,7 @@ class sms_sports_pad_jp_device : public device_t, { public: // construction/destruction - sms_sports_pad_jp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sms_sports_pad_jp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/sms_exp/gender.cpp b/src/devices/bus/sms_exp/gender.cpp index 7ca7ff48a47..4c0042c2441 100644 --- a/src/devices/bus/sms_exp/gender.cpp +++ b/src/devices/bus/sms_exp/gender.cpp @@ -26,7 +26,7 @@ const device_type SMS_GENDER_ADAPTER = &device_creator<sms_gender_adapter_device // sms_gender_adapter_device - constructor //------------------------------------------------- -sms_gender_adapter_device::sms_gender_adapter_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sms_gender_adapter_device::sms_gender_adapter_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SMS_GENDER_ADAPTER, "Gender Adapter", tag, owner, clock, "sms_gender_adapter", __FILE__), device_sms_expansion_slot_interface(mconfig, *this), m_subslot(*this, "subslot") diff --git a/src/devices/bus/sms_exp/gender.h b/src/devices/bus/sms_exp/gender.h index 79c654c6022..0a8624bd8c4 100644 --- a/src/devices/bus/sms_exp/gender.h +++ b/src/devices/bus/sms_exp/gender.h @@ -29,7 +29,7 @@ class sms_gender_adapter_device : public device_t, { public: // construction/destruction - sms_gender_adapter_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sms_gender_adapter_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device_sms_expansion_slot_interface overrides virtual DECLARE_READ8_MEMBER(read) override; diff --git a/src/devices/bus/sms_exp/smsexp.cpp b/src/devices/bus/sms_exp/smsexp.cpp index 73961674687..6ed7905b442 100644 --- a/src/devices/bus/sms_exp/smsexp.cpp +++ b/src/devices/bus/sms_exp/smsexp.cpp @@ -50,7 +50,7 @@ device_sms_expansion_slot_interface::~device_sms_expansion_slot_interface() // sms_expansion_slot_device - constructor //------------------------------------------------- -sms_expansion_slot_device::sms_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sms_expansion_slot_device::sms_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SMS_EXPANSION_SLOT, "Sega SMS expansion slot", tag, owner, clock, "sms_expansion_slot", __FILE__), device_slot_interface(mconfig, *this), m_device(nullptr) { diff --git a/src/devices/bus/sms_exp/smsexp.h b/src/devices/bus/sms_exp/smsexp.h index 2d575b6da40..47b0347730f 100644 --- a/src/devices/bus/sms_exp/smsexp.h +++ b/src/devices/bus/sms_exp/smsexp.h @@ -41,7 +41,7 @@ class sms_expansion_slot_device : public device_t, { public: // construction/destruction - sms_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sms_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~sms_expansion_slot_device(); // reading and writing diff --git a/src/devices/bus/snes/bsx.cpp b/src/devices/bus/snes/bsx.cpp index a534018f78d..871c274c508 100644 --- a/src/devices/bus/snes/bsx.cpp +++ b/src/devices/bus/snes/bsx.cpp @@ -24,7 +24,7 @@ const device_type SNS_HIROM_BSX = &device_creator<sns_rom_bsxhi_device>; const device_type SNS_BSMEMPAK = &device_creator<sns_rom_bsmempak_device>; -sns_rom_bsx_device::sns_rom_bsx_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +sns_rom_bsx_device::sns_rom_bsx_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : sns_rom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_base_unit(nullptr), access_00_1f(0), @@ -37,7 +37,7 @@ sns_rom_bsx_device::sns_rom_bsx_device(const machine_config &mconfig, device_typ { } -sns_rom_bsx_device::sns_rom_bsx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom_bsx_device::sns_rom_bsx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sns_rom_device(mconfig, SNS_ROM_BSX, "SNES BS-X Cart", tag, owner, clock, "sns_rom_bsx", __FILE__), m_base_unit(nullptr), access_00_1f(0), @@ -50,19 +50,19 @@ sns_rom_bsx_device::sns_rom_bsx_device(const machine_config &mconfig, const char { } -sns_rom_bsxlo_device::sns_rom_bsxlo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom_bsxlo_device::sns_rom_bsxlo_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sns_rom_device(mconfig, SNS_LOROM_BSX, "SNES Cart (LoROM) + BS-X slot", tag, owner, clock, "sns_rom_bsxlo", __FILE__), m_slot(*this, "bs_slot") { } -sns_rom_bsxhi_device::sns_rom_bsxhi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom_bsxhi_device::sns_rom_bsxhi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sns_rom21_device(mconfig, SNS_HIROM_BSX, "SNES Cart (HiROM) + BS-X slot", tag, owner, clock, "sns_rom_bsxhi", __FILE__), m_slot(*this, "bs_slot") { } -sns_rom_bsmempak_device::sns_rom_bsmempak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom_bsmempak_device::sns_rom_bsmempak_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sns_rom_device(mconfig, SNS_BSMEMPAK, "SNES BS-X Memory packs", tag, owner, clock, "sns_bsmempak", __FILE__), m_command(0), m_write_old(0), m_write_new(0), m_flash_enable(0), m_read_enable(0), m_write_enable(0) { } diff --git a/src/devices/bus/snes/bsx.h b/src/devices/bus/snes/bsx.h index 43ee42f7b4a..5959d4a0fdf 100644 --- a/src/devices/bus/snes/bsx.h +++ b/src/devices/bus/snes/bsx.h @@ -34,8 +34,8 @@ class sns_rom_bsx_device : public sns_rom_device { public: // construction/destruction - sns_rom_bsx_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - sns_rom_bsx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom_bsx_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + sns_rom_bsx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -76,7 +76,7 @@ class sns_rom_bsxlo_device : public sns_rom_device { public: // construction/destruction - sns_rom_bsxlo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom_bsxlo_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -96,7 +96,7 @@ class sns_rom_bsxhi_device : public sns_rom21_device { public: // construction/destruction - sns_rom_bsxhi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom_bsxhi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -117,7 +117,7 @@ class sns_rom_bsmempak_device : public sns_rom_device { public: // construction/destruction - sns_rom_bsmempak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom_bsmempak_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/snes/event.cpp b/src/devices/bus/snes/event.cpp index ef39d9fbce6..f83665f9cdb 100644 --- a/src/devices/bus/snes/event.cpp +++ b/src/devices/bus/snes/event.cpp @@ -20,7 +20,7 @@ const device_type SNS_PFEST94 = &device_creator<sns_pfest94_device>; -sns_pfest94_device::sns_pfest94_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_pfest94_device::sns_pfest94_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SNS_PFEST94, "SNES Powerfest '94", tag, owner, clock, "sns_pfest94", __FILE__), device_sns_cart_interface(mconfig, *this), m_upd7725(*this, "dsp"), diff --git a/src/devices/bus/snes/event.h b/src/devices/bus/snes/event.h index a09adf15949..63144f56c59 100644 --- a/src/devices/bus/snes/event.h +++ b/src/devices/bus/snes/event.h @@ -14,7 +14,7 @@ class sns_pfest94_device : public device_t, { public: // construction/destruction - sns_pfest94_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_pfest94_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/snes/rom.cpp b/src/devices/bus/snes/rom.cpp index 3763f11ed91..fc7dfb2c6b1 100644 --- a/src/devices/bus/snes/rom.cpp +++ b/src/devices/bus/snes/rom.cpp @@ -29,19 +29,19 @@ const device_type SNS_LOROM_MCPIR2 = &device_creator<sns_rom_mcpirate2_device>; const device_type SNS_LOROM_20COL = &device_creator<sns_rom_20col_device>; -sns_rom_device::sns_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +sns_rom_device::sns_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sns_cart_interface( mconfig, *this ) { } -sns_rom_device::sns_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom_device::sns_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SNS_LOROM, "SNES Cart (LoROM)", tag, owner, clock, "sns_rom", __FILE__), device_sns_cart_interface( mconfig, *this ) { } -sns_rom_obc1_device::sns_rom_obc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom_obc1_device::sns_rom_obc1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sns_rom_device(mconfig, SNS_LOROM_OBC1, "SNES Cart (LoROM) + OBC-1", tag, owner, clock, "sns_rom_obc1", __FILE__), m_address(0), m_offset(0), m_shift(0) { } @@ -49,43 +49,43 @@ sns_rom_obc1_device::sns_rom_obc1_device(const machine_config &mconfig, const ch // Pirate LoROM 'mappers' -sns_rom_pokemon_device::sns_rom_pokemon_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom_pokemon_device::sns_rom_pokemon_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sns_rom_device(mconfig, SNS_LOROM_POKEMON, "SNES Pirate Carts with Protection", tag, owner, clock, "sns_rom_pokemon", __FILE__), m_latch(0) { } -sns_rom_tekken2_device::sns_rom_tekken2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom_tekken2_device::sns_rom_tekken2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sns_rom_device(mconfig, SNS_LOROM_TEKKEN2, "SNES Tekken 2", tag, owner, clock, "sns_rom_tekken2", __FILE__), m_prot(0) { } -sns_rom_soulblad_device::sns_rom_soulblad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom_soulblad_device::sns_rom_soulblad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sns_rom_device(mconfig, SNS_LOROM_SOULBLAD, "SNES Soul Blade", tag, owner, clock, "sns_rom_soulblad", __FILE__) { } -sns_rom_banana_device::sns_rom_banana_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom_banana_device::sns_rom_banana_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sns_rom_device(mconfig, SNS_LOROM_BANANA, "SNES Banana de Pijamas", tag, owner, clock, "sns_rom_banana", __FILE__) { } -sns_rom_bugs_device::sns_rom_bugs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom_bugs_device::sns_rom_bugs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sns_rom_device(mconfig, SNS_LOROM_BUGSLIFE, "SNES A Bug's Life", tag, owner, clock, "sns_rom_bugslife", __FILE__) { } // Multigame LoROM 'mappers' -sns_rom_mcpirate1_device::sns_rom_mcpirate1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom_mcpirate1_device::sns_rom_mcpirate1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sns_rom_device(mconfig, SNS_LOROM_MCPIR1, "SNES Pirate Multigame Carts Type 1", tag, owner, clock, "sns_rom_mcpirate1", __FILE__), m_base_bank(0) { } -sns_rom_mcpirate2_device::sns_rom_mcpirate2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom_mcpirate2_device::sns_rom_mcpirate2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sns_rom_device(mconfig, SNS_LOROM_MCPIR2, "SNES Pirate Multigame Carts Type 2", tag, owner, clock, "sns_rom_mcpirate2", __FILE__), m_base_bank(0) { } -sns_rom_20col_device::sns_rom_20col_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom_20col_device::sns_rom_20col_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sns_rom_device(mconfig, SNS_LOROM_20COL, "SNES Super 20 Collection", tag, owner, clock, "sns_rom_20col", __FILE__), m_base_bank(0) { } diff --git a/src/devices/bus/snes/rom.h b/src/devices/bus/snes/rom.h index a197383d1cb..d7703da61e6 100644 --- a/src/devices/bus/snes/rom.h +++ b/src/devices/bus/snes/rom.h @@ -13,8 +13,8 @@ class sns_rom_device : public device_t, { public: // construction/destruction - sns_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - sns_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + sns_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -30,7 +30,7 @@ class sns_rom_obc1_device : public sns_rom_device { public: // construction/destruction - sns_rom_obc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom_obc1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -54,7 +54,7 @@ class sns_rom_pokemon_device : public sns_rom_device { public: // construction/destruction - sns_rom_pokemon_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom_pokemon_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -72,7 +72,7 @@ class sns_rom_tekken2_device : public sns_rom_device { public: // construction/destruction - sns_rom_tekken2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom_tekken2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -95,7 +95,7 @@ class sns_rom_soulblad_device : public sns_rom_device { public: // construction/destruction - sns_rom_soulblad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom_soulblad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(chip_read) override; // protection device @@ -107,7 +107,7 @@ class sns_rom_mcpirate1_device : public sns_rom_device { public: // construction/destruction - sns_rom_mcpirate1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom_mcpirate1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -126,7 +126,7 @@ class sns_rom_mcpirate2_device : public sns_rom_device { public: // construction/destruction - sns_rom_mcpirate2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom_mcpirate2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -145,7 +145,7 @@ class sns_rom_20col_device : public sns_rom_device { public: // construction/destruction - sns_rom_20col_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom_20col_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -163,7 +163,7 @@ class sns_rom_banana_device : public sns_rom_device { public: // construction/destruction - sns_rom_banana_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom_banana_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides // virtual void device_start(); @@ -181,7 +181,7 @@ class sns_rom_bugs_device : public sns_rom_device { public: // construction/destruction - sns_rom_bugs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom_bugs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/snes/rom21.cpp b/src/devices/bus/snes/rom21.cpp index 477b75bdc1e..ad60a669f17 100644 --- a/src/devices/bus/snes/rom21.cpp +++ b/src/devices/bus/snes/rom21.cpp @@ -19,19 +19,19 @@ const device_type SNS_HIROM = &device_creator<sns_rom21_device>; const device_type SNS_HIROM_SRTC = &device_creator<sns_rom21_srtc_device>; -sns_rom21_device::sns_rom21_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +sns_rom21_device::sns_rom21_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sns_cart_interface( mconfig, *this ) { } -sns_rom21_device::sns_rom21_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom21_device::sns_rom21_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SNS_HIROM, "SNES Cart (HiROM)", tag, owner, clock, "sns_rom21", __FILE__), device_sns_cart_interface( mconfig, *this ) { } -sns_rom21_srtc_device::sns_rom21_srtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom21_srtc_device::sns_rom21_srtc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sns_rom21_device(mconfig, SNS_HIROM_SRTC, "SNES Cart (HiROM) + S-RTC", tag, owner, clock, "sns_rom21_srtc", __FILE__), m_mode(0), m_index(0) { } diff --git a/src/devices/bus/snes/rom21.h b/src/devices/bus/snes/rom21.h index 2196e90ca56..51c52ecc56f 100644 --- a/src/devices/bus/snes/rom21.h +++ b/src/devices/bus/snes/rom21.h @@ -13,8 +13,8 @@ class sns_rom21_device : public device_t, { public: // construction/destruction - sns_rom21_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - sns_rom21_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom21_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + sns_rom21_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -31,7 +31,7 @@ class sns_rom21_srtc_device : public sns_rom21_device { public: // construction/destruction - sns_rom21_srtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom21_srtc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/snes/sa1.cpp b/src/devices/bus/snes/sa1.cpp index b22af792a97..88fac4a3045 100644 --- a/src/devices/bus/snes/sa1.cpp +++ b/src/devices/bus/snes/sa1.cpp @@ -85,7 +85,7 @@ const device_type SNS_LOROM_SA1 = &device_creator<sns_sa1_device>; -sns_sa1_device::sns_sa1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_sa1_device::sns_sa1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SNS_LOROM_SA1, "SNES Cart + SA-1", tag, owner, clock, "sns_rom_sa1", __FILE__), device_sns_cart_interface( mconfig, *this ), m_sa1(*this, "sa1cpu"), m_sa1_ctrl(0), m_scpu_sie(0), m_sa1_reset(0), m_sa1_nmi(0), m_sa1_irq(0), m_scpu_ctrl(0), m_sa1_sie(0), m_irq_vector(0), m_nmi_vector(0), m_hcount(0), m_vcount(0), m_bank_c_hi(0), m_bank_c_rom(0), m_bank_d_hi(0), m_bank_d_rom(0), m_bank_e_hi(0), m_bank_e_rom(0), m_bank_f_hi(0), m_bank_f_rom(0), m_bwram_snes(0), m_bwram_sa1(0), m_bwram_sa1_source(0), m_bwram_sa1_format(0), m_bwram_write_snes(0), m_bwram_write_sa1(0), m_bwpa_sa1(0), m_iram_write_snes(0), m_iram_write_sa1(0), m_dma_ctrl(0), m_dma_ccparam(0), m_src_addr(0), m_dst_addr(0), m_dma_cnt(0), m_math_ctlr(0), m_math_overflow(0), m_math_a(0), m_math_b(0), m_math_res(0), m_vda(0), m_vbit(0), m_vlen(0), m_drm(0), m_scpu_flags(0), m_sa1_flags(0), m_hcr(0), m_vcr(0) diff --git a/src/devices/bus/snes/sa1.h b/src/devices/bus/snes/sa1.h index 5d0767340c5..d40c2f2d4ce 100644 --- a/src/devices/bus/snes/sa1.h +++ b/src/devices/bus/snes/sa1.h @@ -14,7 +14,7 @@ class sns_sa1_device : public device_t, { public: // construction/destruction - sns_sa1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_sa1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/snes/sdd1.cpp b/src/devices/bus/snes/sdd1.cpp index 9570b5110ad..e269d663c8b 100644 --- a/src/devices/bus/snes/sdd1.cpp +++ b/src/devices/bus/snes/sdd1.cpp @@ -411,13 +411,13 @@ void SDD1_emu::SDD1emu_decompress(UINT8 *ROM, UINT32 *mmc, UINT32 in_buf, UINT16 const device_type SNS_LOROM_SDD1 = &device_creator<sns_rom_sdd1_device>; -sns_rom_sdd1_device::sns_rom_sdd1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +sns_rom_sdd1_device::sns_rom_sdd1_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sns_cart_interface( mconfig, *this ), m_sdd1_enable(0), m_xfer_enable(0), m_sdd1emu(nullptr) { } -sns_rom_sdd1_device::sns_rom_sdd1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom_sdd1_device::sns_rom_sdd1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SNS_LOROM_SDD1, "SNES Cart + S-DD1", tag, owner, clock, "sns_rom_sdd1", __FILE__), device_sns_cart_interface( mconfig, *this ), m_sdd1_enable(0), m_xfer_enable(0), m_sdd1emu(nullptr) { diff --git a/src/devices/bus/snes/sdd1.h b/src/devices/bus/snes/sdd1.h index e9dcc9e71e1..21dde5d66dd 100644 --- a/src/devices/bus/snes/sdd1.h +++ b/src/devices/bus/snes/sdd1.h @@ -155,8 +155,8 @@ class sns_rom_sdd1_device : public device_t, { public: // construction/destruction - sns_rom_sdd1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - sns_rom_sdd1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom_sdd1_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + sns_rom_sdd1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/snes/sfx.cpp b/src/devices/bus/snes/sfx.cpp index 9fce31d00db..d1312645178 100644 --- a/src/devices/bus/snes/sfx.cpp +++ b/src/devices/bus/snes/sfx.cpp @@ -18,7 +18,7 @@ const device_type SNS_LOROM_SUPERFX = &device_creator<sns_rom_superfx_device>; -sns_rom_superfx_device::sns_rom_superfx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom_superfx_device::sns_rom_superfx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sns_rom_device(mconfig, SNS_LOROM_SUPERFX, "SNES Cart (LoROM) + SuperFX", tag, owner, clock, "sns_rom_superfx", __FILE__), m_superfx(*this, "superfx") { diff --git a/src/devices/bus/snes/sfx.h b/src/devices/bus/snes/sfx.h index 785a68bb827..7471ffcae5e 100644 --- a/src/devices/bus/snes/sfx.h +++ b/src/devices/bus/snes/sfx.h @@ -14,7 +14,7 @@ class sns_rom_superfx_device : public sns_rom_device { public: // construction/destruction - sns_rom_superfx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom_superfx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/snes/sgb.cpp b/src/devices/bus/snes/sgb.cpp index 0c6abd79490..2daf69969a0 100644 --- a/src/devices/bus/snes/sgb.cpp +++ b/src/devices/bus/snes/sgb.cpp @@ -22,7 +22,7 @@ const device_type SNS_LOROM_SUPERGB = &device_creator<sns_rom_sgb_device>; -sns_rom_sgb_device::sns_rom_sgb_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) : +sns_rom_sgb_device::sns_rom_sgb_device(const machine_config& mconfig, std::string tag, device_t* owner, UINT32 clock) : sns_rom_device(mconfig, SNS_LOROM_SUPERGB, "SNES Super Game Boy Cart", tag, owner, clock, "sns_rom_sgb", __FILE__), m_gb_cpu(*this, "sgb_cpu"), m_gb_snd(*this, "sgb_snd"), diff --git a/src/devices/bus/snes/sgb.h b/src/devices/bus/snes/sgb.h index 31ee68b8305..93057b8631c 100644 --- a/src/devices/bus/snes/sgb.h +++ b/src/devices/bus/snes/sgb.h @@ -20,7 +20,7 @@ class sns_rom_sgb_device : public sns_rom_device { public: // construction/destruction - sns_rom_sgb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom_sgb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/snes/snes_slot.cpp b/src/devices/bus/snes/snes_slot.cpp index 65c2fffdb4d..56b646c8236 100644 --- a/src/devices/bus/snes/snes_slot.cpp +++ b/src/devices/bus/snes/snes_slot.cpp @@ -88,7 +88,7 @@ device_sns_cart_interface::~device_sns_cart_interface() // rom_alloc - alloc the space for the cart //------------------------------------------------- -void device_sns_cart_interface::rom_alloc(UINT32 size, const char *tag) +void device_sns_cart_interface::rom_alloc(UINT32 size, std::string tag) { if (m_rom == nullptr) { @@ -172,7 +172,7 @@ void device_sns_cart_interface::rom_map_setup(UINT32 size) //------------------------------------------------- // base_sns_cart_slot_device - constructor //------------------------------------------------- -base_sns_cart_slot_device::base_sns_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +base_sns_cart_slot_device::base_sns_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), @@ -181,17 +181,17 @@ base_sns_cart_slot_device::base_sns_cart_slot_device(const machine_config &mconf { } -sns_cart_slot_device::sns_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sns_cart_slot_device::sns_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : base_sns_cart_slot_device(mconfig, SNS_CART_SLOT, "SNES Cartridge Slot", tag, owner, clock, "sns_cart_slot", __FILE__) { } -sns_sufami_cart_slot_device::sns_sufami_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sns_sufami_cart_slot_device::sns_sufami_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : base_sns_cart_slot_device(mconfig, SNS_SUFAMI_CART_SLOT, "SNES Sufami Turbo Cartridge Slot", tag, owner, clock, "sns_sufami_cart_slot", __FILE__) { } -sns_bsx_cart_slot_device::sns_bsx_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sns_bsx_cart_slot_device::sns_bsx_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : base_sns_cart_slot_device(mconfig, SNS_BSX_CART_SLOT, "SNES BS-X Cartridge Slot", tag, owner, clock, "sns_bsx_cart_slot", __FILE__) { } diff --git a/src/devices/bus/snes/snes_slot.h b/src/devices/bus/snes/snes_slot.h index 02b00a1cb87..0d5bc4fd16f 100644 --- a/src/devices/bus/snes/snes_slot.h +++ b/src/devices/bus/snes/snes_slot.h @@ -113,7 +113,7 @@ public: virtual DECLARE_WRITE8_MEMBER(chip_write) {} virtual void speedup_addon_bios_access() {}; - void rom_alloc(UINT32 size, const char *tag); + void rom_alloc(UINT32 size, std::string tag); void nvram_alloc(UINT32 size); void rtc_ram_alloc(UINT32 size); void addon_bios_alloc(UINT32 size); @@ -149,7 +149,7 @@ class base_sns_cart_slot_device : public device_t, { public: // construction/destruction - base_sns_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + base_sns_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); virtual ~base_sns_cart_slot_device(); // device-level overrides @@ -215,7 +215,7 @@ class sns_cart_slot_device : public base_sns_cart_slot_device { public: // construction/destruction - sns_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual const char *image_interface() const override { return "snes_cart"; } virtual const char *file_extensions() const override { return "sfc"; } }; @@ -226,7 +226,7 @@ class sns_sufami_cart_slot_device : public base_sns_cart_slot_device { public: // construction/destruction - sns_sufami_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_sufami_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual const char *image_interface() const override { return "st_cart"; } virtual const char *file_extensions() const override { return "st"; } virtual bool must_be_loaded() const override { return 0; } @@ -238,7 +238,7 @@ class sns_bsx_cart_slot_device : public base_sns_cart_slot_device { public: // construction/destruction - sns_bsx_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_bsx_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual const char *image_interface() const override { return "bspack"; } virtual const char *file_extensions() const override { return "bs"; } virtual bool must_be_loaded() const override { return 0; } diff --git a/src/devices/bus/snes/spc7110.cpp b/src/devices/bus/snes/spc7110.cpp index b9b0ee77cd3..504546e3a46 100644 --- a/src/devices/bus/snes/spc7110.cpp +++ b/src/devices/bus/snes/spc7110.cpp @@ -24,7 +24,7 @@ const device_type SNS_HIROM_SPC7110 = &device_creator<sns_rom_spc7110_device>; const device_type SNS_HIROM_SPC7110_RTC = &device_creator<sns_rom_spc7110rtc_device>; -sns_rom_spc7110_device::sns_rom_spc7110_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +sns_rom_spc7110_device::sns_rom_spc7110_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : sns_rom21_device(mconfig, type, name, tag, owner, clock, shortname, source), m_r4801(0), m_r4802(0), m_r4803(0), m_r4804(0), m_r4805(0), m_r4806(0), m_r4807(0), m_r4808(0), m_r4809(0), m_r480a(0), m_r480b(0), m_r480c(0), m_decomp(nullptr), m_r4811(0), m_r4812(0), m_r4813(0), m_r4814(0), m_r4815(0), m_r4816(0), m_r4817(0), m_r4818(0), m_r481x(0), m_r4814_latch(0), m_r4815_latch(0), m_r4820(0), m_r4821(0), m_r4822(0), m_r4823(0), m_r4824(0), m_r4825(0), m_r4826(0), m_r4827(0), m_r4828(0), m_r4829(0), m_r482a(0), @@ -33,7 +33,7 @@ sns_rom_spc7110_device::sns_rom_spc7110_device(const machine_config &mconfig, de { } -sns_rom_spc7110_device::sns_rom_spc7110_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom_spc7110_device::sns_rom_spc7110_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sns_rom21_device(mconfig, SNS_HIROM_SPC7110, "SNES Cart + SPC-7110", tag, owner, clock, "sns_rom_spc7110", __FILE__), m_r4801(0), m_r4802(0), m_r4803(0), m_r4804(0), m_r4805(0), m_r4806(0), m_r4807(0), m_r4808(0), m_r4809(0), m_r480a(0), m_r480b(0), m_r480c(0), m_decomp(nullptr), m_r4811(0), m_r4812(0), m_r4813(0), m_r4814(0), m_r4815(0), m_r4816(0), m_r4817(0), m_r4818(0), m_r481x(0), m_r4814_latch(0), m_r4815_latch(0), m_r4820(0), m_r4821(0), m_r4822(0), m_r4823(0), m_r4824(0), m_r4825(0), m_r4826(0), m_r4827(0), m_r4828(0), m_r4829(0), m_r482a(0), @@ -42,7 +42,7 @@ sns_rom_spc7110_device::sns_rom_spc7110_device(const machine_config &mconfig, co { } -sns_rom_spc7110rtc_device::sns_rom_spc7110rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom_spc7110rtc_device::sns_rom_spc7110rtc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sns_rom_spc7110_device(mconfig, SNS_HIROM_SPC7110_RTC, "SNES Cart + SPC-7110 + RTC", tag, owner, clock, "sns_rom_spc7110rtc", __FILE__) { } diff --git a/src/devices/bus/snes/spc7110.h b/src/devices/bus/snes/spc7110.h index 33d7170d02c..f952669798e 100644 --- a/src/devices/bus/snes/spc7110.h +++ b/src/devices/bus/snes/spc7110.h @@ -89,8 +89,8 @@ class sns_rom_spc7110_device : public sns_rom21_device { public: // construction/destruction - sns_rom_spc7110_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - sns_rom_spc7110_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom_spc7110_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + sns_rom_spc7110_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -204,7 +204,7 @@ class sns_rom_spc7110rtc_device : public sns_rom_spc7110_device { public: // construction/destruction - sns_rom_spc7110rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom_spc7110rtc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/snes/sufami.cpp b/src/devices/bus/snes/sufami.cpp index b6ac1b376d2..cbb6661235a 100644 --- a/src/devices/bus/snes/sufami.cpp +++ b/src/devices/bus/snes/sufami.cpp @@ -24,14 +24,14 @@ const device_type SNS_LOROM_SUFAMI = &device_creator<sns_rom_sufami_device>; const device_type SNS_STROM = &device_creator<sns_rom_strom_device>; -sns_rom_sufami_device::sns_rom_sufami_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom_sufami_device::sns_rom_sufami_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sns_rom_device(mconfig, SNS_LOROM_SUFAMI, "SNES Sufami Turbo Cart", tag, owner, clock, "sns_rom_sufami", __FILE__), m_slot1(*this, "st_slot1"), m_slot2(*this, "st_slot2") { } -sns_rom_strom_device::sns_rom_strom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom_strom_device::sns_rom_strom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sns_rom_device(mconfig, SNS_STROM, "SNES Sufami Turbo Minicart", tag, owner, clock, "sns_strom", __FILE__) { } diff --git a/src/devices/bus/snes/sufami.h b/src/devices/bus/snes/sufami.h index 7881a6f6d58..4fd03042a9b 100644 --- a/src/devices/bus/snes/sufami.h +++ b/src/devices/bus/snes/sufami.h @@ -13,7 +13,7 @@ class sns_rom_sufami_device : public sns_rom_device { public: // construction/destruction - sns_rom_sufami_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom_sufami_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -36,7 +36,7 @@ class sns_rom_strom_device : public sns_rom_device { public: // construction/destruction - sns_rom_strom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom_strom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/snes/upd.cpp b/src/devices/bus/snes/upd.cpp index 056f462e2fa..4896a23f934 100644 --- a/src/devices/bus/snes/upd.cpp +++ b/src/devices/bus/snes/upd.cpp @@ -32,42 +32,42 @@ const device_type SNS_LOROM_SETA10 = &device_creator<sns_rom_seta10dsp_device>; const device_type SNS_LOROM_SETA11 = &device_creator<sns_rom_seta11dsp_device>; -sns_rom20_necdsp_device::sns_rom20_necdsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +sns_rom20_necdsp_device::sns_rom20_necdsp_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : sns_rom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_upd7725(*this, "dsp") { } -sns_rom20_necdsp_device::sns_rom20_necdsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom20_necdsp_device::sns_rom20_necdsp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sns_rom_device(mconfig, SNS_LOROM_NECDSP, "SNES Cart (LoROM) + NEC DSP", tag, owner, clock, "sns_rom_necdsp", __FILE__), m_upd7725(*this, "dsp") { } -sns_rom21_necdsp_device::sns_rom21_necdsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +sns_rom21_necdsp_device::sns_rom21_necdsp_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : sns_rom21_device(mconfig, type, name, tag, owner, clock, shortname, source), m_upd7725(*this, "dsp") { } -sns_rom21_necdsp_device::sns_rom21_necdsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom21_necdsp_device::sns_rom21_necdsp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sns_rom21_device(mconfig, SNS_HIROM_NECDSP, "SNES Cart (HiROM) + NEC DSP", tag, owner, clock, "sns_rom21_necdsp", __FILE__), m_upd7725(*this, "dsp") { } -sns_rom_setadsp_device::sns_rom_setadsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +sns_rom_setadsp_device::sns_rom_setadsp_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : sns_rom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_upd96050(*this, "dsp") { } -sns_rom_seta10dsp_device::sns_rom_seta10dsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom_seta10dsp_device::sns_rom_seta10dsp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sns_rom_setadsp_device(mconfig, SNS_LOROM_SETA10, "SNES Cart (LoROM) + Seta ST010 DSP", tag, owner, clock, "sns_rom_seta10", __FILE__) { } -sns_rom_seta11dsp_device::sns_rom_seta11dsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom_seta11dsp_device::sns_rom_seta11dsp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sns_rom_setadsp_device(mconfig, SNS_LOROM_SETA11, "SNES Cart (LoROM) + Seta ST011 DSP", tag, owner, clock, "sns_rom_seta11", __FILE__) { } @@ -408,42 +408,42 @@ const device_type SNS_LOROM_SETA10_LEG = &device_creator<sns_rom_seta10dsp_legac const device_type SNS_LOROM_SETA11_LEG = &device_creator<sns_rom_seta11dsp_legacy_device>; -sns_rom20_necdsp1_legacy_device::sns_rom20_necdsp1_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom20_necdsp1_legacy_device::sns_rom20_necdsp1_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sns_rom20_necdsp_device(mconfig, SNS_LOROM_NECDSP1_LEG, "SNES Cart (LoROM) + NEC DSP1 Legacy", tag, owner, clock, "dsp1leg", __FILE__) { } -sns_rom20_necdsp1b_legacy_device::sns_rom20_necdsp1b_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom20_necdsp1b_legacy_device::sns_rom20_necdsp1b_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sns_rom20_necdsp_device(mconfig, SNS_LOROM_NECDSP1B_LEG, "SNES Cart (LoROM) + NEC DSP1B Legacy", tag, owner, clock, "dsp1bleg", __FILE__) { } -sns_rom20_necdsp2_legacy_device::sns_rom20_necdsp2_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom20_necdsp2_legacy_device::sns_rom20_necdsp2_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sns_rom20_necdsp_device(mconfig, SNS_LOROM_NECDSP2_LEG, "SNES Cart (LoROM) + NEC DSP2 Legacy", tag, owner, clock, "dsp2leg", __FILE__) { } -sns_rom20_necdsp3_legacy_device::sns_rom20_necdsp3_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom20_necdsp3_legacy_device::sns_rom20_necdsp3_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sns_rom20_necdsp_device(mconfig, SNS_LOROM_NECDSP3_LEG, "SNES Cart (LoROM) + NEC DSP3 Legacy", tag, owner, clock, "dsp3leg", __FILE__) { } -sns_rom20_necdsp4_legacy_device::sns_rom20_necdsp4_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom20_necdsp4_legacy_device::sns_rom20_necdsp4_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sns_rom20_necdsp_device(mconfig, SNS_LOROM_NECDSP4_LEG, "SNES Cart (LoROM) + NEC DSP4 Legacy", tag, owner, clock, "dsp4leg", __FILE__) { } -sns_rom21_necdsp1_legacy_device::sns_rom21_necdsp1_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom21_necdsp1_legacy_device::sns_rom21_necdsp1_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sns_rom21_necdsp_device(mconfig, SNS_HIROM_NECDSP1_LEG, "SNES Cart (HiROM) + NEC DSP1 Legacy", tag, owner, clock, "dsp1leg_hi", __FILE__) { } -sns_rom_seta10dsp_legacy_device::sns_rom_seta10dsp_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom_seta10dsp_legacy_device::sns_rom_seta10dsp_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sns_rom_setadsp_device(mconfig, SNS_LOROM_SETA10_LEG, "SNES Cart (LoROM) + Seta ST010 DSP Legacy", tag, owner, clock, "seta10leg", __FILE__) { } -sns_rom_seta11dsp_legacy_device::sns_rom_seta11dsp_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sns_rom_seta11dsp_legacy_device::sns_rom_seta11dsp_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : sns_rom_setadsp_device(mconfig, SNS_LOROM_SETA11_LEG, "SNES Cart (LoROM) + Seta ST011 DSP Legacy", tag, owner, clock, "seta11leg", __FILE__) { } diff --git a/src/devices/bus/snes/upd.h b/src/devices/bus/snes/upd.h index 815b5b2a42c..6633290b828 100644 --- a/src/devices/bus/snes/upd.h +++ b/src/devices/bus/snes/upd.h @@ -14,8 +14,8 @@ class sns_rom20_necdsp_device : public sns_rom_device { public: // construction/destruction - sns_rom20_necdsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - sns_rom20_necdsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom20_necdsp_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + sns_rom20_necdsp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -41,8 +41,8 @@ class sns_rom21_necdsp_device : public sns_rom21_device { public: // construction/destruction - sns_rom21_necdsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - sns_rom21_necdsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom21_necdsp_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + sns_rom21_necdsp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -68,7 +68,7 @@ class sns_rom_setadsp_device : public sns_rom_device { public: // construction/destruction - sns_rom_setadsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + sns_rom_setadsp_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides virtual void device_start() override; @@ -93,7 +93,7 @@ class sns_rom_seta10dsp_device : public sns_rom_setadsp_device { public: // construction/destruction - sns_rom_seta10dsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom_seta10dsp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -105,7 +105,7 @@ class sns_rom_seta11dsp_device : public sns_rom_setadsp_device { public: // construction/destruction - sns_rom_seta11dsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom_seta11dsp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -127,7 +127,7 @@ class sns_rom20_necdsp1_legacy_device : public sns_rom20_necdsp_device { public: // construction/destruction - sns_rom20_necdsp1_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom20_necdsp1_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -138,7 +138,7 @@ class sns_rom20_necdsp1b_legacy_device : public sns_rom20_necdsp_device { public: // construction/destruction - sns_rom20_necdsp1b_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom20_necdsp1b_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -149,7 +149,7 @@ class sns_rom20_necdsp2_legacy_device : public sns_rom20_necdsp_device { public: // construction/destruction - sns_rom20_necdsp2_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom20_necdsp2_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -160,7 +160,7 @@ class sns_rom20_necdsp3_legacy_device : public sns_rom20_necdsp_device { public: // construction/destruction - sns_rom20_necdsp3_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom20_necdsp3_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -171,7 +171,7 @@ class sns_rom20_necdsp4_legacy_device : public sns_rom20_necdsp_device { public: // construction/destruction - sns_rom20_necdsp4_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom20_necdsp4_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -182,7 +182,7 @@ class sns_rom21_necdsp1_legacy_device : public sns_rom21_necdsp_device { public: // construction/destruction - sns_rom21_necdsp1_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom21_necdsp1_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -193,7 +193,7 @@ class sns_rom_seta10dsp_legacy_device : public sns_rom_setadsp_device { public: // construction/destruction - sns_rom_seta10dsp_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom_seta10dsp_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -204,7 +204,7 @@ class sns_rom_seta11dsp_legacy_device : public sns_rom_setadsp_device { public: // construction/destruction - sns_rom_seta11dsp_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sns_rom_seta11dsp_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/snes_ctrl/bcbattle.cpp b/src/devices/bus/snes_ctrl/bcbattle.cpp index dddda96de46..46ad128bb76 100644 --- a/src/devices/bus/snes_ctrl/bcbattle.cpp +++ b/src/devices/bus/snes_ctrl/bcbattle.cpp @@ -81,7 +81,7 @@ void snes_bcbattle_device::device_timer(emu_timer &timer, device_timer_id id, in // snes_bcbattle_device - constructor //------------------------------------------------- -snes_bcbattle_device::snes_bcbattle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +snes_bcbattle_device::snes_bcbattle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SNES_BARCODE_BATTLER, "Epoch Barcode Battler (SFC)", tag, owner, clock, "snes_bcbattle", __FILE__), device_snes_control_port_interface(mconfig, *this), m_reader(*this, "battler"), m_pending_code(0), m_new_code(0), m_transmitting(0), m_cur_bit(0), m_cur_byte(0), battler_timer(nullptr), m_strobe(0), m_idx(0) diff --git a/src/devices/bus/snes_ctrl/bcbattle.h b/src/devices/bus/snes_ctrl/bcbattle.h index d336c31b6a7..f7c444dba64 100644 --- a/src/devices/bus/snes_ctrl/bcbattle.h +++ b/src/devices/bus/snes_ctrl/bcbattle.h @@ -27,7 +27,7 @@ class snes_bcbattle_device : public device_t, { public: // construction/destruction - snes_bcbattle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + snes_bcbattle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/snes_ctrl/ctrl.cpp b/src/devices/bus/snes_ctrl/ctrl.cpp index af8ed67db02..cd4c33a01aa 100644 --- a/src/devices/bus/snes_ctrl/ctrl.cpp +++ b/src/devices/bus/snes_ctrl/ctrl.cpp @@ -57,7 +57,7 @@ device_snes_control_port_interface::~device_snes_control_port_interface() // snes_control_port_device - constructor //------------------------------------------------- -snes_control_port_device::snes_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +snes_control_port_device::snes_control_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SNES_CONTROL_PORT, "Nintendo SNES / SFC control port", tag, owner, clock, "snes_control_port", __FILE__), device_slot_interface(mconfig, *this), m_device(nullptr) { diff --git a/src/devices/bus/snes_ctrl/ctrl.h b/src/devices/bus/snes_ctrl/ctrl.h index 94a6a7b8ce8..8b7e2e048b6 100644 --- a/src/devices/bus/snes_ctrl/ctrl.h +++ b/src/devices/bus/snes_ctrl/ctrl.h @@ -52,7 +52,7 @@ class snes_control_port_device : public device_t, { public: // construction/destruction - snes_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + snes_control_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~snes_control_port_device(); static void set_onscreen_callback(device_t &device, snesctrl_onscreen_delegate callback) { downcast<snes_control_port_device &>(device).m_onscreen_cb = callback; } diff --git a/src/devices/bus/snes_ctrl/joypad.cpp b/src/devices/bus/snes_ctrl/joypad.cpp index 0edea6be148..66cd908aa35 100644 --- a/src/devices/bus/snes_ctrl/joypad.cpp +++ b/src/devices/bus/snes_ctrl/joypad.cpp @@ -52,7 +52,7 @@ ioport_constructor snes_joypad_device::device_input_ports() const // snes_joypad_device - constructor //------------------------------------------------- -snes_joypad_device::snes_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +snes_joypad_device::snes_joypad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SNES_JOYPAD, "Nintendo SNES / SFC Control Pad", tag, owner, clock, "snes_joypad", __FILE__), device_snes_control_port_interface(mconfig, *this), m_joypad(*this, "JOYPAD"), m_strobe(0), m_latch(0) diff --git a/src/devices/bus/snes_ctrl/joypad.h b/src/devices/bus/snes_ctrl/joypad.h index 8daa922f20a..61788ddb98e 100644 --- a/src/devices/bus/snes_ctrl/joypad.h +++ b/src/devices/bus/snes_ctrl/joypad.h @@ -26,7 +26,7 @@ class snes_joypad_device : public device_t, { public: // construction/destruction - snes_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + snes_joypad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/snes_ctrl/miracle.cpp b/src/devices/bus/snes_ctrl/miracle.cpp index 7ec640047de..d8580fa3c01 100644 --- a/src/devices/bus/snes_ctrl/miracle.cpp +++ b/src/devices/bus/snes_ctrl/miracle.cpp @@ -59,7 +59,7 @@ void snes_miracle_device::device_timer(emu_timer &timer, device_timer_id id, int // snes_miracle_device - constructor //------------------------------------------------- -snes_miracle_device::snes_miracle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +snes_miracle_device::snes_miracle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SNES_MIRACLE, "Miracle Piano SNES Cable", tag, owner, clock, "snes_miracle", __FILE__), device_serial_interface(mconfig, *this), device_snes_control_port_interface(mconfig, *this), diff --git a/src/devices/bus/snes_ctrl/miracle.h b/src/devices/bus/snes_ctrl/miracle.h index a89b41accaf..e74cb8c93a2 100644 --- a/src/devices/bus/snes_ctrl/miracle.h +++ b/src/devices/bus/snes_ctrl/miracle.h @@ -31,7 +31,7 @@ public: static const int RECV_RING_SIZE = 64; // construction/destruction - snes_miracle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + snes_miracle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/snes_ctrl/mouse.cpp b/src/devices/bus/snes_ctrl/mouse.cpp index fc851dc33f6..875b6eb1ae0 100644 --- a/src/devices/bus/snes_ctrl/mouse.cpp +++ b/src/devices/bus/snes_ctrl/mouse.cpp @@ -58,7 +58,7 @@ ioport_constructor snes_mouse_device::device_input_ports() const // snes_mouse_device - constructor //------------------------------------------------- -snes_mouse_device::snes_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +snes_mouse_device::snes_mouse_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SNES_MOUSE, "Nintendo SNES / SFC Mouse Controller", tag, owner, clock, "snes_mouse", __FILE__), device_snes_control_port_interface(mconfig, *this), m_buttons(*this, "BUTTONS"), diff --git a/src/devices/bus/snes_ctrl/mouse.h b/src/devices/bus/snes_ctrl/mouse.h index 53602b96be3..89a6433792c 100644 --- a/src/devices/bus/snes_ctrl/mouse.h +++ b/src/devices/bus/snes_ctrl/mouse.h @@ -26,7 +26,7 @@ class snes_mouse_device : public device_t, { public: // construction/destruction - snes_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + snes_mouse_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/snes_ctrl/multitap.cpp b/src/devices/bus/snes_ctrl/multitap.cpp index 2eba8914bcb..dc4db913915 100644 --- a/src/devices/bus/snes_ctrl/multitap.cpp +++ b/src/devices/bus/snes_ctrl/multitap.cpp @@ -67,7 +67,7 @@ machine_config_constructor snes_multitap_device::device_mconfig_additions() cons // snes_multitap_device - constructor //------------------------------------------------- -snes_multitap_device::snes_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +snes_multitap_device::snes_multitap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SNES_MULTITAP, "Nintendo SNES / SFC Multitap Adapter", tag, owner, clock, "snes_multitap", __FILE__), device_snes_control_port_interface(mconfig, *this), m_port1(*this, "port1"), diff --git a/src/devices/bus/snes_ctrl/multitap.h b/src/devices/bus/snes_ctrl/multitap.h index e978a9d13ca..d0ff5948a48 100644 --- a/src/devices/bus/snes_ctrl/multitap.h +++ b/src/devices/bus/snes_ctrl/multitap.h @@ -26,7 +26,7 @@ class snes_multitap_device : public device_t, { public: // construction/destruction - snes_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + snes_multitap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/snes_ctrl/pachinko.cpp b/src/devices/bus/snes_ctrl/pachinko.cpp index ecdc1b21fe5..ce57dfeb415 100644 --- a/src/devices/bus/snes_ctrl/pachinko.cpp +++ b/src/devices/bus/snes_ctrl/pachinko.cpp @@ -44,7 +44,7 @@ ioport_constructor snes_pachinko_device::device_input_ports() const // snes_pachinko_device - constructor //------------------------------------------------- -snes_pachinko_device::snes_pachinko_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +snes_pachinko_device::snes_pachinko_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SNES_PACHINKO, "Sunsoft Pachinko Controller", tag, owner, clock, "snes_pachinko", __FILE__), device_snes_control_port_interface(mconfig, *this), m_dial(*this, "DIAL"), diff --git a/src/devices/bus/snes_ctrl/pachinko.h b/src/devices/bus/snes_ctrl/pachinko.h index 149d5775157..d7952f21dcf 100644 --- a/src/devices/bus/snes_ctrl/pachinko.h +++ b/src/devices/bus/snes_ctrl/pachinko.h @@ -26,7 +26,7 @@ class snes_pachinko_device : public device_t, { public: // construction/destruction - snes_pachinko_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + snes_pachinko_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/snes_ctrl/sscope.cpp b/src/devices/bus/snes_ctrl/sscope.cpp index 3f26fe562c4..fd3ad11349a 100644 --- a/src/devices/bus/snes_ctrl/sscope.cpp +++ b/src/devices/bus/snes_ctrl/sscope.cpp @@ -53,7 +53,7 @@ ioport_constructor snes_sscope_device::device_input_ports() const // snes_sscope_device - constructor //------------------------------------------------- -snes_sscope_device::snes_sscope_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +snes_sscope_device::snes_sscope_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SNES_SUPERSCOPE, "Nintendo SNES / SFC SuperScope", tag, owner, clock, "snes_sscope", __FILE__), device_snes_control_port_interface(mconfig, *this), m_buttons(*this, "BUTTONS"), diff --git a/src/devices/bus/snes_ctrl/sscope.h b/src/devices/bus/snes_ctrl/sscope.h index 064ee0c941d..cbfd76ca6f4 100644 --- a/src/devices/bus/snes_ctrl/sscope.h +++ b/src/devices/bus/snes_ctrl/sscope.h @@ -26,7 +26,7 @@ class snes_sscope_device : public device_t, { public: // construction/destruction - snes_sscope_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + snes_sscope_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/snes_ctrl/twintap.cpp b/src/devices/bus/snes_ctrl/twintap.cpp index 29db7df0029..fcb86751a2f 100644 --- a/src/devices/bus/snes_ctrl/twintap.cpp +++ b/src/devices/bus/snes_ctrl/twintap.cpp @@ -49,7 +49,7 @@ ioport_constructor snes_twintap_device::device_input_ports() const // snes_twintap_device - constructor //------------------------------------------------- -snes_twintap_device::snes_twintap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +snes_twintap_device::snes_twintap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SNES_TWINTAP, "Yonezawa Twin Tap Controller", tag, owner, clock, "snes_twintap", __FILE__), device_snes_control_port_interface(mconfig, *this), m_inputs(*this, "INPUTS"), m_strobe(0), m_latch(0) diff --git a/src/devices/bus/snes_ctrl/twintap.h b/src/devices/bus/snes_ctrl/twintap.h index 5adf0bf1cc1..81172365417 100644 --- a/src/devices/bus/snes_ctrl/twintap.h +++ b/src/devices/bus/snes_ctrl/twintap.h @@ -26,7 +26,7 @@ class snes_twintap_device : public device_t, { public: // construction/destruction - snes_twintap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + snes_twintap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/spc1000/exp.cpp b/src/devices/bus/spc1000/exp.cpp index 83d919215a1..7d640d9d752 100644 --- a/src/devices/bus/spc1000/exp.cpp +++ b/src/devices/bus/spc1000/exp.cpp @@ -35,7 +35,7 @@ device_spc1000_card_interface::~device_spc1000_card_interface() //------------------------------------------------- // spc1000_exp_device - constructor //------------------------------------------------- -spc1000_exp_device::spc1000_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +spc1000_exp_device::spc1000_exp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SPC1000_EXP_SLOT, "Samsung SPC-1000 expansion", tag, owner, clock, "spc1000_exp", __FILE__), device_slot_interface(mconfig, *this), m_card(nullptr) { diff --git a/src/devices/bus/spc1000/exp.h b/src/devices/bus/spc1000/exp.h index e48e9efe3c8..5319653f584 100644 --- a/src/devices/bus/spc1000/exp.h +++ b/src/devices/bus/spc1000/exp.h @@ -25,7 +25,7 @@ class spc1000_exp_device : public device_t, { public: // construction/destruction - spc1000_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + spc1000_exp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~spc1000_exp_device(); // device-level overrides diff --git a/src/devices/bus/spc1000/fdd.cpp b/src/devices/bus/spc1000/fdd.cpp index 504a13ec0be..0f5b718b2f6 100644 --- a/src/devices/bus/spc1000/fdd.cpp +++ b/src/devices/bus/spc1000/fdd.cpp @@ -134,7 +134,7 @@ const device_type SPC1000_FDD_EXP = &device_creator<spc1000_fdd_exp_device>; // spc1000_fdd_exp_device - constructor //------------------------------------------------- -spc1000_fdd_exp_device::spc1000_fdd_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +spc1000_fdd_exp_device::spc1000_fdd_exp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SPC1000_FDD_EXP, "SPC1000 FDD expansion", tag, owner, clock, "spc1000_fdd_exp", __FILE__), device_spc1000_card_interface(mconfig, *this), m_cpu(*this, "fdccpu"), diff --git a/src/devices/bus/spc1000/fdd.h b/src/devices/bus/spc1000/fdd.h index ea8366770b0..1e6fb8c7551 100644 --- a/src/devices/bus/spc1000/fdd.h +++ b/src/devices/bus/spc1000/fdd.h @@ -19,7 +19,7 @@ class spc1000_fdd_exp_device : public device_t, { public: // construction/destruction - spc1000_fdd_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + spc1000_fdd_exp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/spc1000/vdp.cpp b/src/devices/bus/spc1000/vdp.cpp index 7824e9fccb4..6017a0555c9 100644 --- a/src/devices/bus/spc1000/vdp.cpp +++ b/src/devices/bus/spc1000/vdp.cpp @@ -52,7 +52,7 @@ const device_type SPC1000_VDP_EXP = &device_creator<spc1000_vdp_exp_device>; // spc1000_vdp_exp_device - constructor //------------------------------------------------- -spc1000_vdp_exp_device::spc1000_vdp_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +spc1000_vdp_exp_device::spc1000_vdp_exp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SPC1000_VDP_EXP, "SPC1000 VDP expansion", tag, owner, clock, "spc1000_vdp_exp", __FILE__), device_spc1000_card_interface(mconfig, *this), m_vdp(*this, "tms") diff --git a/src/devices/bus/spc1000/vdp.h b/src/devices/bus/spc1000/vdp.h index 20a0e23acd7..b5db17d121d 100644 --- a/src/devices/bus/spc1000/vdp.h +++ b/src/devices/bus/spc1000/vdp.h @@ -18,7 +18,7 @@ class spc1000_vdp_exp_device : public device_t, { public: // construction/destruction - spc1000_vdp_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + spc1000_vdp_exp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/ti99_peb/bwg.cpp b/src/devices/bus/ti99_peb/bwg.cpp index 4085dcfe230..7246128786b 100644 --- a/src/devices/bus/ti99_peb/bwg.cpp +++ b/src/devices/bus/ti99_peb/bwg.cpp @@ -84,7 +84,7 @@ Modern implementation */ -snug_bwg_device::snug_bwg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +snug_bwg_device::snug_bwg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI99_BWG, "SNUG BwG Floppy Controller", tag, owner, clock, "ti99_bwg", __FILE__), m_DRQ(), m_IRQ(), m_dip1(0), m_dip2(0), m_dip34(0), m_ram_page(0), m_rom_page(0), m_WAITena(false), m_inDsrArea(false), m_WDsel(false), m_WDsel0(false), m_RTCsel(false), m_lastK(false), m_dataregLB(false), m_rtc_enabled(false), m_MOTOR_ON(), m_lastval(0), m_address(0), m_DSEL(0), m_SIDSEL(), m_motor_on_timer(nullptr), m_dsrrom(nullptr), m_buffer_ram(nullptr), m_current_floppy(nullptr), m_wd1773(*this, FDC_TAG), m_clock(*this, CLOCK_TAG), m_debug_dataout(false) diff --git a/src/devices/bus/ti99_peb/bwg.h b/src/devices/bus/ti99_peb/bwg.h index 6a301b5cb59..7111273e348 100644 --- a/src/devices/bus/ti99_peb/bwg.h +++ b/src/devices/bus/ti99_peb/bwg.h @@ -23,7 +23,7 @@ extern const device_type TI99_BWG; class snug_bwg_device : public ti_expansion_card_device { public: - snug_bwg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + snug_bwg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8Z_MEMBER(readz) override; DECLARE_WRITE8_MEMBER(write) override; DECLARE_SETADDRESS_DBIN_MEMBER(setaddress_dbin) override; diff --git a/src/devices/bus/ti99_peb/evpc.cpp b/src/devices/bus/ti99_peb/evpc.cpp index 6945df0dcc6..d23b91e3819 100644 --- a/src/devices/bus/ti99_peb/evpc.cpp +++ b/src/devices/bus/ti99_peb/evpc.cpp @@ -24,7 +24,7 @@ #define NOVRAM_SIZE 256 -snug_enhanced_video_device::snug_enhanced_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +snug_enhanced_video_device::snug_enhanced_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI99_EVPC, "SNUG Enhanced Video Processor Card", tag, owner, clock, "ti99_evpc", __FILE__), device_nvram_interface(mconfig, *this), m_dsrrom(nullptr), diff --git a/src/devices/bus/ti99_peb/evpc.h b/src/devices/bus/ti99_peb/evpc.h index 2b67fd272fc..0e2a866323c 100644 --- a/src/devices/bus/ti99_peb/evpc.h +++ b/src/devices/bus/ti99_peb/evpc.h @@ -32,7 +32,7 @@ struct evpc_palette class snug_enhanced_video_device : public ti_expansion_card_device, public device_nvram_interface { public: - snug_enhanced_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + snug_enhanced_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8Z_MEMBER(readz) override; DECLARE_WRITE8_MEMBER(write) override; diff --git a/src/devices/bus/ti99_peb/hfdc.cpp b/src/devices/bus/ti99_peb/hfdc.cpp index c3e4779c1ef..698bf2b4f5b 100644 --- a/src/devices/bus/ti99_peb/hfdc.cpp +++ b/src/devices/bus/ti99_peb/hfdc.cpp @@ -87,7 +87,7 @@ /* Constructor for the HFDC card. */ -myarc_hfdc_device::myarc_hfdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +myarc_hfdc_device::myarc_hfdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI99_HFDC, "Myarc Hard and Floppy Disk Controller", tag, owner, clock, "ti99_hfdc", __FILE__), m_motor_on_timer(nullptr), m_hdc9234(*this, FDC_TAG), m_clock(*this, CLOCK_TAG), m_current_floppy(nullptr), m_current_harddisk(nullptr), m_see_switches(false), m_irq(), m_dip(), m_motor_running(false), @@ -202,21 +202,21 @@ READ8Z_MEMBER(myarc_hfdc_device::readz) { if (m_tapesel) { - logerror("%s: Tape support not available on this HFDC version (access to address %04x)\n", tag(), m_address & 0xffff); + logerror("%s: Tape support not available on this HFDC version (access to address %04x)\n", tag().c_str(), m_address & 0xffff); return; } if (m_HDCsel) { *value = m_hdc9234->read(space, (m_address>>2)&1, 0xff); - if (TRACE_COMP) logerror("%s: %04x[HDC] -> %02x\n", tag(), m_address & 0xffff, *value); + if (TRACE_COMP) logerror("%s: %04x[HDC] -> %02x\n", tag().c_str(), m_address & 0xffff, *value); return; } if (m_RTCsel) { *value = m_clock->read(space, (m_address & 0x001e) >> 1); - if (TRACE_COMP) logerror("%s: %04x[CLK] -> %02x\n", tag(), m_address & 0xffff, *value); + if (TRACE_COMP) logerror("%s: %04x[CLK] -> %02x\n", tag().c_str(), m_address & 0xffff, *value); return; } @@ -235,7 +235,7 @@ READ8Z_MEMBER(myarc_hfdc_device::readz) if ((m_address & 1)==0) // only show even addresses with words { int valword = (((*value) << 8) | m_buffer_ram[(m_ram_page[bank]<<10) | ((m_address+1) & 0x03ff)])&0xffff; - logerror("%s: %04x[%02x] -> %04x\n", tag(), m_address & 0xffff, m_ram_page[bank], valword); + logerror("%s: %04x[%02x] -> %04x\n", tag().c_str(), m_address & 0xffff, m_ram_page[bank], valword); } } return; @@ -249,7 +249,7 @@ READ8Z_MEMBER(myarc_hfdc_device::readz) if ((m_address & 1)==0) // only show even addresses with words { int valword = (((*value) << 8) | m_dsrrom[(m_rom_page << 12) | ((m_address + 1) & 0x0fff)])&0xffff; - logerror("%s: %04x[%02x] -> %04x\n", tag(), m_address & 0xffff, m_rom_page, valword); + logerror("%s: %04x[%02x] -> %04x\n", tag().c_str(), m_address & 0xffff, m_rom_page, valword); } } return; @@ -281,20 +281,20 @@ WRITE8_MEMBER( myarc_hfdc_device::write ) { if (m_tapesel) { - logerror("%s: Tape support not available on this HFDC version (write access to address %04x: %02x)\n", tag(), m_address & 0xffff, data); + logerror("%s: Tape support not available on this HFDC version (write access to address %04x: %02x)\n", tag().c_str(), m_address & 0xffff, data); return; } if (m_HDCsel) { - if (TRACE_COMP) logerror("%s: %04x[HDC] <- %02x\n", tag(), m_address & 0xffff, data); + if (TRACE_COMP) logerror("%s: %04x[HDC] <- %02x\n", tag().c_str(), m_address & 0xffff, data); m_hdc9234->write(space, (m_address>>2)&1, data, 0xff); return; } if (m_RTCsel) { - if (TRACE_COMP) logerror("%s: %04x[CLK] <- %02x\n", tag(), m_address & 0xffff, data); + if (TRACE_COMP) logerror("%s: %04x[CLK] <- %02x\n", tag().c_str(), m_address & 0xffff, data); m_clock->write(space, (m_address & 0x001e) >> 1, data); return; } @@ -306,7 +306,7 @@ WRITE8_MEMBER( myarc_hfdc_device::write ) // 0101 10xx xxxx xxxx bank 2 // 0101 11xx xxxx xxxx bank 3 int bank = (m_address & 0x0c00) >> 10; - if (TRACE_RAM) logerror("%s: %04x[%02x] <- %02x\n", tag(), m_address & 0xffff, m_ram_page[bank], data); + if (TRACE_RAM) logerror("%s: %04x[%02x] <- %02x\n", tag().c_str(), m_address & 0xffff, m_ram_page[bank], data); // When a DMA is in progress, do not change anything if (m_dip == CLEAR_LINE) m_buffer_ram[(m_ram_page[bank]<<10) | (m_address & 0x03ff)] = data; @@ -315,7 +315,7 @@ WRITE8_MEMBER( myarc_hfdc_device::write ) // The rest is ROM if (m_ROMsel) { - if (TRACE_ROM) logerror("%s: Ignoring write ROM %04x[%02x]: %02x\n", tag(), m_address & 0xffff, m_rom_page, data); + if (TRACE_ROM) logerror("%s: Ignoring write ROM %04x[%02x]: %02x\n", tag().c_str(), m_address & 0xffff, m_rom_page, data); } } } @@ -388,7 +388,7 @@ READ8Z_MEMBER(myarc_hfdc_device::crureadz) *value = 0; } - if (TRACE_CRU) logerror("%s: CRU %04x -> %02x\n", tag(), offset & 0xffff, *value); + if (TRACE_CRU) logerror("%s: CRU %04x -> %02x\n", tag().c_str(), offset & 0xffff, *value); } } @@ -420,7 +420,7 @@ WRITE8_MEMBER(myarc_hfdc_device::cruwrite) { if ((offset & 0xff00)==m_cru_base) { - if (TRACE_CRU) logerror("%s: CRU %04x <- %d\n", tag(), offset & 0xffff, data); + if (TRACE_CRU) logerror("%s: CRU %04x <- %d\n", tag().c_str(), offset & 0xffff, data); int bit = (offset >> 1) & 0x1f; @@ -435,9 +435,9 @@ WRITE8_MEMBER(myarc_hfdc_device::cruwrite) if (TRACE_CRU) { - if (bit==0x0d) logerror("%s: RAM page @5400 = %d\n", tag(), m_ram_page[1]); - if (bit==0x12) logerror("%s: RAM page @5800 = %d\n", tag(), m_ram_page[2]); - if (bit==0x17) logerror("%s: RAM page @5C00 = %d\n", tag(), m_ram_page[3]); + if (bit==0x0d) logerror("%s: RAM page @5400 = %d\n", tag().c_str(), m_ram_page[1]); + if (bit==0x12) logerror("%s: RAM page @5800 = %d\n", tag().c_str(), m_ram_page[2]); + if (bit==0x17) logerror("%s: RAM page @5C00 = %d\n", tag().c_str(), m_ram_page[3]); } return; } @@ -448,12 +448,12 @@ WRITE8_MEMBER(myarc_hfdc_device::cruwrite) { bool turnOn = (data!=0); // Avoid too many meaningless log outputs - if (TRACE_CRU) if (m_selected != turnOn) logerror("%s: card %s\n", tag(), turnOn? "selected" : "unselected"); + if (TRACE_CRU) if (m_selected != turnOn) logerror("%s: card %s\n", tag().c_str(), turnOn? "selected" : "unselected"); m_selected = turnOn; break; } case 1: - if (TRACE_CRU) if (data==0) logerror("%s: trigger HDC reset\n", tag()); + if (TRACE_CRU) if (data==0) logerror("%s: trigger HDC reset\n", tag().c_str()); m_hdc9234->reset((data == 0)? ASSERT_LINE : CLEAR_LINE); break; @@ -477,17 +477,17 @@ WRITE8_MEMBER(myarc_hfdc_device::cruwrite) case 3: m_hdc9234->set_clock_divider(1, data); m_rom_page = (data != 0)? (m_rom_page | 2) : (m_rom_page & 0xfd); - if (TRACE_CRU) logerror("%s: ROM page = %d\n", tag(), m_rom_page); + if (TRACE_CRU) logerror("%s: ROM page = %d\n", tag().c_str(), m_rom_page); break; case 4: m_see_switches = (data != 0); m_rom_page = (data != 0)? (m_rom_page | 1) : (m_rom_page & 0xfe); - if (TRACE_CRU) logerror("%s: ROM page = %d, see_switches = %d\n", tag(), m_rom_page, m_see_switches); + if (TRACE_CRU) logerror("%s: ROM page = %d, see_switches = %d\n", tag().c_str(), m_rom_page, m_see_switches); break; default: - logerror("%s: Attempt to set undefined CRU bit %d\n", tag(), bit); + logerror("%s: Attempt to set undefined CRU bit %d\n", tag().c_str(), bit); } } } @@ -505,7 +505,7 @@ void myarc_hfdc_device::device_timer(emu_timer &timer, device_timer_id id, int p */ void myarc_hfdc_device::floppy_index_callback(floppy_image_device *floppy, int state) { - if (TRACE_LINES) if (state==1) logerror("%s: Floppy index pulse\n", tag()); + if (TRACE_LINES) if (state==1) logerror("%s: Floppy index pulse\n", tag().c_str()); // m_status_latch = (state==ASSERT_LINE)? (m_status_latch | HDC_DS_INDEX) : (m_status_latch & ~HDC_DS_INDEX); set_bits(m_status_latch, HDC_DS_INDEX, (state==ASSERT_LINE)); signal_drive_status(); @@ -516,7 +516,7 @@ void myarc_hfdc_device::floppy_index_callback(floppy_image_device *floppy, int s */ void myarc_hfdc_device::harddisk_index_callback(mfm_harddisk_device *harddisk, int state) { - if (TRACE_LINES) if (state==1) logerror("%s: HD index pulse\n", tag()); + if (TRACE_LINES) if (state==1) logerror("%s: HD index pulse\n", tag().c_str()); set_bits(m_status_latch, HDC_DS_INDEX, (state==ASSERT_LINE)); signal_drive_status(); } @@ -526,7 +526,7 @@ void myarc_hfdc_device::harddisk_index_callback(mfm_harddisk_device *harddisk, i */ void myarc_hfdc_device::harddisk_ready_callback(mfm_harddisk_device *harddisk, int state) { - if (TRACE_LINES) logerror("%s: HD READY = %d\n", tag(), state); + if (TRACE_LINES) logerror("%s: HD READY = %d\n", tag().c_str(), state); set_bits(m_status_latch, HDC_DS_READY, (state==ASSERT_LINE)); signal_drive_status(); } @@ -536,7 +536,7 @@ void myarc_hfdc_device::harddisk_ready_callback(mfm_harddisk_device *harddisk, i */ void myarc_hfdc_device::harddisk_skcom_callback(mfm_harddisk_device *harddisk, int state) { - if (TRACE_LINES) logerror("%s: HD seek complete = %d\n", tag(), state); + if (TRACE_LINES) logerror("%s: HD seek complete = %d\n", tag().c_str(), state); set_bits(m_status_latch, HDC_DS_SKCOM, (state==ASSERT_LINE)); signal_drive_status(); } @@ -627,14 +627,14 @@ WRITE8_MEMBER( myarc_hfdc_device::auxbus_out ) switch (offset) { case HDC_INPUT_STATUS: - logerror("%s: Invalid operation: S0=S1=0, but tried to write (expected: read drive status)\n", tag()); + logerror("%s: Invalid operation: S0=S1=0, but tried to write (expected: read drive status)\n", tag().c_str()); break; case HDC_OUTPUT_DMA_ADDR: // Value is dma address byte. Shift previous contents to the left. // The value is latched inside the Gate Array. m_dma_address = ((m_dma_address << 8) + (data&0xff))&0xffffff; - if (TRACE_DMA) logerror("%s: Setting DMA address; current value = %06x\n", tag(), m_dma_address); + if (TRACE_DMA) logerror("%s: Setting DMA address; current value = %06x\n", tag().c_str(), m_dma_address); break; case HDC_OUTPUT_1: @@ -713,7 +713,7 @@ void myarc_hfdc_device::connect_floppy_unit(int index) // Clear all latched flags from other drives m_status_latch = 0; disconnect_floppy_drives(); - if (TRACE_LINES) logerror("%s: Select floppy drive DSK%d\n", tag(), index+1); + if (TRACE_LINES) logerror("%s: Select floppy drive DSK%d\n", tag().c_str(), index+1); // Connect new drive m_current_floppy = m_floppy_unit[index]; @@ -721,11 +721,11 @@ void myarc_hfdc_device::connect_floppy_unit(int index) // We don't use the READY line of floppy drives. // READY is asserted when DSKx = 1 // The controller fetches the state with the auxbus access - if (TRACE_LINES) logerror("%s: Connect index callback DSK%d\n", tag(), index+1); + if (TRACE_LINES) logerror("%s: Connect index callback DSK%d\n", tag().c_str(), index+1); if (m_current_floppy != nullptr) m_current_floppy->setup_index_pulse_cb(floppy_image_device::index_pulse_cb(FUNC(myarc_hfdc_device::floppy_index_callback), this)); else - logerror("%s: Connection to DSK%d failed because no drive is connected\n", tag(), index+1); + logerror("%s: Connection to DSK%d failed because no drive is connected\n", tag().c_str(), index+1); m_hdc9234->connect_floppy_drive(m_floppy_unit[index]); } @@ -740,12 +740,12 @@ void myarc_hfdc_device::connect_harddisk_unit(int index) // Clear all latched flags form other drives m_status_latch = 0; disconnect_hard_drives(); - if (TRACE_LINES) logerror("%s: Select hard disk WDS%d\n", tag(), index+1); + if (TRACE_LINES) logerror("%s: Select hard disk WDS%d\n", tag().c_str(), index+1); // Connect new drive m_current_harddisk = m_harddisk_unit[index]; - if (TRACE_LINES) logerror("%s: Connect index callback WDS%d\n", tag(), index+1); + if (TRACE_LINES) logerror("%s: Connect index callback WDS%d\n", tag().c_str(), index+1); if (m_current_harddisk != nullptr) { m_current_harddisk->setup_index_pulse_cb(mfm_harddisk_device::index_pulse_cb(FUNC(myarc_hfdc_device::harddisk_index_callback), this)); @@ -753,7 +753,7 @@ void myarc_hfdc_device::connect_harddisk_unit(int index) m_current_harddisk->setup_seek_complete_cb(mfm_harddisk_device::seek_complete_cb(FUNC(myarc_hfdc_device::harddisk_skcom_callback), this)); } else - logerror("%s: Connection to WDS%d failed because no drive is connected\n", tag(), index+1); + logerror("%s: Connection to WDS%d failed because no drive is connected\n", tag().c_str(), index+1); m_hdc9234->connect_hard_drive(m_current_harddisk); } @@ -763,7 +763,7 @@ void myarc_hfdc_device::connect_harddisk_unit(int index) void myarc_hfdc_device::disconnect_floppy_drives() { - if (TRACE_LINES) logerror("%s: Unselect floppy drives\n", tag()); + if (TRACE_LINES) logerror("%s: Unselect floppy drives\n", tag().c_str()); // Disconnect current floppy if (m_current_floppy != nullptr) { @@ -774,7 +774,7 @@ void myarc_hfdc_device::disconnect_floppy_drives() void myarc_hfdc_device::disconnect_hard_drives() { - if (TRACE_LINES) logerror("%s: Unselect hard drives\n", tag()); + if (TRACE_LINES) logerror("%s: Unselect hard drives\n", tag().c_str()); if (m_current_harddisk != nullptr) { m_current_harddisk->setup_index_pulse_cb(mfm_harddisk_device::index_pulse_cb()); @@ -791,13 +791,13 @@ void myarc_hfdc_device::set_floppy_motors_running(bool run) if (run) { if (TRACE_MOTOR) - if (m_MOTOR_ON==CLEAR_LINE) logerror("%s: Motor START\n", tag()); + if (m_MOTOR_ON==CLEAR_LINE) logerror("%s: Motor START\n", tag().c_str()); m_MOTOR_ON = ASSERT_LINE; } else { if (TRACE_MOTOR) - if (m_MOTOR_ON==ASSERT_LINE) logerror("%s: Motor STOP\n", tag()); + if (m_MOTOR_ON==ASSERT_LINE) logerror("%s: Motor STOP\n", tag().c_str()); m_MOTOR_ON = CLEAR_LINE; } @@ -812,7 +812,7 @@ void myarc_hfdc_device::set_floppy_motors_running(bool run) WRITE_LINE_MEMBER( myarc_hfdc_device::intrq_w ) { m_irq = (line_state)state; - if (TRACE_INT) logerror("%s: INT pin from controller = %d, propagating to INTA*\n", tag(), state); + if (TRACE_INT) logerror("%s: INT pin from controller = %d, propagating to INTA*\n", tag().c_str(), state); // Set INTA* // Signal from SMC is active high, INTA* is active low; board inverts signal @@ -826,7 +826,7 @@ WRITE_LINE_MEMBER( myarc_hfdc_device::intrq_w ) */ WRITE_LINE_MEMBER( myarc_hfdc_device::dmarq_w ) { - if (TRACE_DMA) logerror("%s: DMARQ pin from controller = %d\n", tag(), state); + if (TRACE_DMA) logerror("%s: DMARQ pin from controller = %d\n", tag().c_str(), state); if (state == ASSERT_LINE) { m_hdc9234->dmaack(ASSERT_LINE); @@ -846,8 +846,8 @@ WRITE_LINE_MEMBER( myarc_hfdc_device::dip_w ) */ READ8_MEMBER( myarc_hfdc_device::read_buffer ) { - if (TRACE_DMA) logerror("%s: Read access to onboard SRAM at %04x\n", tag(), m_dma_address); - if (m_dma_address > 0x8000) logerror("%s: Read access beyond RAM size: %06x\n", tag(), m_dma_address); + if (TRACE_DMA) logerror("%s: Read access to onboard SRAM at %04x\n", tag().c_str(), m_dma_address); + if (m_dma_address > 0x8000) logerror("%s: Read access beyond RAM size: %06x\n", tag().c_str(), m_dma_address); UINT8 value = m_buffer_ram[m_dma_address & 0x7fff]; m_dma_address = (m_dma_address+1) & 0x7fff; return value; @@ -858,15 +858,15 @@ READ8_MEMBER( myarc_hfdc_device::read_buffer ) */ WRITE8_MEMBER( myarc_hfdc_device::write_buffer ) { - if (TRACE_DMA) logerror("%s: Write access to onboard SRAM at %04x: %02x\n", tag(), m_dma_address, data); - if (m_dma_address > 0x8000) logerror("%s: Write access beyond RAM size: %06x\n", tag(), m_dma_address); + if (TRACE_DMA) logerror("%s: Write access to onboard SRAM at %04x: %02x\n", tag().c_str(), m_dma_address, data); + if (m_dma_address > 0x8000) logerror("%s: Write access beyond RAM size: %06x\n", tag().c_str(), m_dma_address); m_buffer_ram[m_dma_address & 0x7fff] = data; m_dma_address = (m_dma_address+1) & 0x7fff; } void myarc_hfdc_device::device_start() { - if (TRACE_EMU) logerror("%s: start\n", tag()); + if (TRACE_EMU) logerror("%s: start\n", tag().c_str()); m_dsrrom = memregion(DSRROM)->base(); m_buffer_ram = memregion(BUFFER)->base(); m_motor_on_timer = timer_alloc(MOTOR_TIMER); @@ -877,7 +877,7 @@ void myarc_hfdc_device::device_start() void myarc_hfdc_device::device_reset() { - if (TRACE_EMU) logerror("%s: reset\n", tag()); + if (TRACE_EMU) logerror("%s: reset\n", tag().c_str()); // The GenMOD mod; our implementation automagically adapts all cards if (m_genmod) @@ -914,17 +914,17 @@ void myarc_hfdc_device::device_reset() for (int i=0; i < 4; i++) { if (m_floppy_unit[i] != nullptr) - logerror("%s: FD connector %d with %s\n", tag(), i+1, m_floppy_unit[i]->name()); + logerror("%s: FD connector %d with %s\n", tag().c_str(), i+1, m_floppy_unit[i]->name()); else - logerror("%s: FD connector %d has no floppy attached\n", tag(), i+1); + logerror("%s: FD connector %d has no floppy attached\n", tag().c_str(), i+1); } for (int i=0; i < 3; i++) { if (m_harddisk_unit[i] != nullptr) - logerror("%s: HD connector %d with %s\n", tag(), i+1, m_harddisk_unit[i]->name()); + logerror("%s: HD connector %d with %s\n", tag().c_str(), i+1, m_harddisk_unit[i]->name()); else - logerror("%s: HD connector %d has no drive attached\n", tag(), i+1); + logerror("%s: HD connector %d has no drive attached\n", tag().c_str(), i+1); } // Disconnect all units diff --git a/src/devices/bus/ti99_peb/hfdc.h b/src/devices/bus/ti99_peb/hfdc.h index ec51e3122d6..0bbdcea1f65 100644 --- a/src/devices/bus/ti99_peb/hfdc.h +++ b/src/devices/bus/ti99_peb/hfdc.h @@ -30,7 +30,7 @@ extern const device_type TI99_HFDC; class myarc_hfdc_device : public ti_expansion_card_device { public: - myarc_hfdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + myarc_hfdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8Z_MEMBER(readz) override; DECLARE_WRITE8_MEMBER(write) override; diff --git a/src/devices/bus/ti99_peb/horizon.cpp b/src/devices/bus/ti99_peb/horizon.cpp index cdae19a2bbb..0eb006506f7 100644 --- a/src/devices/bus/ti99_peb/horizon.cpp +++ b/src/devices/bus/ti99_peb/horizon.cpp @@ -65,7 +65,7 @@ #define VERBOSE 1 #define LOG logerror -horizon_ramdisk_device::horizon_ramdisk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +horizon_ramdisk_device::horizon_ramdisk_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI99_HORIZON, "Horizon 4000 Ramdisk", tag, owner, clock,"ti99_horizon",__FILE__), device_nvram_interface(mconfig, *this), m_ram(nullptr), m_nvram(nullptr), m_ros(nullptr), m_select6_value(0), m_select_all(0), m_page(0), m_cru_horizon(0), m_cru_phoenix(0), m_timode(false), m_32k_installed(false), m_split_mode(false), m_rambo_mode(false), m_killswitch(false), m_use_rambo(false) { diff --git a/src/devices/bus/ti99_peb/horizon.h b/src/devices/bus/ti99_peb/horizon.h index f2568bb864f..3a97ecef8f2 100644 --- a/src/devices/bus/ti99_peb/horizon.h +++ b/src/devices/bus/ti99_peb/horizon.h @@ -22,7 +22,7 @@ extern const device_type TI99_HORIZON; class horizon_ramdisk_device : public ti_expansion_card_device, public device_nvram_interface { public: - horizon_ramdisk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + horizon_ramdisk_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8Z_MEMBER(readz) override; DECLARE_WRITE8_MEMBER(write) override; diff --git a/src/devices/bus/ti99_peb/hsgpl.cpp b/src/devices/bus/ti99_peb/hsgpl.cpp index 42ec9360ad3..e3c95b4578b 100644 --- a/src/devices/bus/ti99_peb/hsgpl.cpp +++ b/src/devices/bus/ti99_peb/hsgpl.cpp @@ -139,7 +139,7 @@ #define GROM_A_EEPROM "u1_grom" #define ROM6_EEPROM "u6_rom6" -snug_high_speed_gpl_device::snug_high_speed_gpl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +snug_high_speed_gpl_device::snug_high_speed_gpl_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI99_HSGPL, "SNUG High-speed GPL card", tag, owner, clock, "ti99_hsgpl", __FILE__), m_dsr_eeprom(nullptr), m_rom6_eeprom(nullptr), m_grom_a_eeprom(nullptr), m_grom_b_eeprom(nullptr), m_ram6_memory(nullptr), m_gram_memory(nullptr), m_dsr_enabled(false), m_gram_enabled(false), m_bank_inhibit(false), m_dsr_page(0), m_card_enabled(false), m_write_enabled(false), m_supercart_enabled(false), m_led_on(false), @@ -165,7 +165,7 @@ WRITE8_MEMBER(snug_high_speed_gpl_device::cruwrite) { if (data != 0) { - if (TRACE_CRU) logerror("%s: Supercart cru setting %04x\n", tag(), offset); + if (TRACE_CRU) logerror("%s: Supercart cru setting %04x\n", tag().c_str(), offset); m_current_bank = (offset-0x0802)>>2; } return; @@ -179,15 +179,15 @@ WRITE8_MEMBER(snug_high_speed_gpl_device::cruwrite) { case 0: m_dsr_enabled = (data != 0); - if (TRACE_CRU) logerror("%s: Set dsr_enabled=%x\n", tag(), data); + if (TRACE_CRU) logerror("%s: Set dsr_enabled=%x\n", tag().c_str(), data); break; case 1: m_gram_enabled = (data != 0); - if (TRACE_CRU) logerror("%s: Set gram_enabled=%x\n", tag(), data); + if (TRACE_CRU) logerror("%s: Set gram_enabled=%x\n", tag().c_str(), data); break; case 2: m_bank_inhibit = (data != 0); - if (TRACE_CRU) logerror("%s: Set bank_inhibit=%x\n", tag(), data); + if (TRACE_CRU) logerror("%s: Set bank_inhibit=%x\n", tag().c_str(), data); break; case 3: case 4: @@ -199,34 +199,34 @@ WRITE8_MEMBER(snug_high_speed_gpl_device::cruwrite) m_dsr_page |= (1 << (bit-3)); else m_dsr_page &= ~(1 << (bit-3)); - if (TRACE_CRU) logerror("%s: Set dsr_page=%d\n", tag(), m_dsr_page); + if (TRACE_CRU) logerror("%s: Set dsr_page=%d\n", tag().c_str(), m_dsr_page); break; case 9: m_card_enabled = data; - if (TRACE_CRU) logerror("%s: Set card_enabled=%x\n", tag(), data); + if (TRACE_CRU) logerror("%s: Set card_enabled=%x\n", tag().c_str(), data); break; case 10: m_write_enabled = data; - if (TRACE_CRU) logerror("%s: Set write_enabled=%x\n", tag(), data); + if (TRACE_CRU) logerror("%s: Set write_enabled=%x\n", tag().c_str(), data); break; case 11: m_supercart_enabled = data; // CHECK: Do we have to reset the bank? - if (TRACE_CRU) logerror("%s: Set supercart_enabled=%x\n", tag(), data); + if (TRACE_CRU) logerror("%s: Set supercart_enabled=%x\n", tag().c_str(), data); break; case 12: m_led_on = data; - if (TRACE_CRU) logerror("%s: Set led_on=%x\n", tag(), data); + if (TRACE_CRU) logerror("%s: Set led_on=%x\n", tag().c_str(), data); break; case 13: break; case 14: m_mbx_enabled = data; - if (TRACE_CRU) logerror("%s: Set mbx_enabled=%x\n", tag(), data); + if (TRACE_CRU) logerror("%s: Set mbx_enabled=%x\n", tag().c_str(), data); break; case 15: m_ram_enabled = data; - if (TRACE_CRU) logerror("%s: Set ram_enabled=%x\n", tag(), data); + if (TRACE_CRU) logerror("%s: Set ram_enabled=%x\n", tag().c_str(), data); break; } } @@ -279,7 +279,7 @@ void snug_high_speed_gpl_device::dsrspace_readz(address_space& space, offs_t off if (m_dsr_enabled) { *value = m_dsr_eeprom->read(space, (offset & 0x1fff) | (m_dsr_page<<13), mem_mask); - if (TRACE_READ) logerror("%s: read dsr %04x[%02x] -> %02x\n", tag(), offset, m_dsr_page, *value); + if (TRACE_READ) logerror("%s: read dsr %04x[%02x] -> %02x\n", tag().c_str(), offset, m_dsr_page, *value); } } @@ -290,14 +290,14 @@ void snug_high_speed_gpl_device::cartspace_readz(address_space& space, offs_t of { if (!m_card_enabled || m_flash_mode) { - if (TRACE_IGNORE) logerror("%s: cartridge space read ignored (enable=%d, flash_mode=%d)\n", tag(), m_card_enabled, m_flash_mode); + if (TRACE_IGNORE) logerror("%s: cartridge space read ignored (enable=%d, flash_mode=%d)\n", tag().c_str(), m_card_enabled, m_flash_mode); return; } if (m_module_bank < 16) { *value = m_rom6_eeprom->read(space, (offset & 0x1fff) | (m_current_bank<<13) | (m_current_grom_port<<15), mem_mask); - if (TRACE_READ) logerror("%s: cartridge space read %04x -> %02x\n", tag(), offset, *value); + if (TRACE_READ) logerror("%s: cartridge space read %04x -> %02x\n", tag().c_str(), offset, *value); } else { @@ -307,7 +307,7 @@ void snug_high_speed_gpl_device::cartspace_readz(address_space& space, offs_t of } else { - logerror("%s: unknown 0x6000 port\n", tag()); + logerror("%s: unknown 0x6000 port\n", tag().c_str()); } } } @@ -356,7 +356,7 @@ void snug_high_speed_gpl_device::grom_readz(address_space& space, offs_t offset, { *value = m_gram_memory[m_grom_address | (port<<16)]; m_module_bank = port + 16; - if (TRACE_PORT) if (bNew) logerror("%s: GRAM read access at %04x (GRMENA=1) - switch to bank %d\n", tag(), offset & 0xffff, m_module_bank); + if (TRACE_PORT) if (bNew) logerror("%s: GRAM read access at %04x (GRMENA=1) - switch to bank %d\n", tag().c_str(), offset & 0xffff, m_module_bank); } else { @@ -366,7 +366,7 @@ void snug_high_speed_gpl_device::grom_readz(address_space& space, offs_t offset, { *value = m_grom_a_eeprom->read(space, m_grom_address | (port<<16), mem_mask); m_module_bank = port; - if (TRACE_PORT) if (bNew) logerror("%s: GROM read access at %04x - switch to bank %d\n", tag(), offset & 0xffff, m_module_bank); + if (TRACE_PORT) if (bNew) logerror("%s: GROM read access at %04x - switch to bank %d\n", tag().c_str(), offset & 0xffff, m_module_bank); } } else @@ -375,7 +375,7 @@ void snug_high_speed_gpl_device::grom_readz(address_space& space, offs_t offset, { *value = m_grom_b_eeprom->read(space, m_grom_address | ((port-8)<<16), mem_mask); m_module_bank = port; - if (TRACE_PORT) if (bNew) logerror("%s: GROM read access at %04x - switch to bank %d\n", tag(), offset & 0xffff, m_module_bank); + if (TRACE_PORT) if (bNew) logerror("%s: GROM read access at %04x - switch to bank %d\n", tag().c_str(), offset & 0xffff, m_module_bank); } else { @@ -385,7 +385,7 @@ void snug_high_speed_gpl_device::grom_readz(address_space& space, offs_t offset, // DSR banks 0-63 (8 KiB per bank, 8 banks per port) *value = m_dsr_eeprom->read(space, m_grom_address | ((port-16)<<16), mem_mask); // Don't change the module port - if (TRACE_DSR) if (bNew) logerror("%s: read access to DSR bank %d-%d (%04x)\n", tag(), (port-16)<<3, ((port-16)<<3)+7, offset); + if (TRACE_DSR) if (bNew) logerror("%s: read access to DSR bank %d-%d (%04x)\n", tag().c_str(), (port-16)<<3, ((port-16)<<3)+7, offset); } else { @@ -395,7 +395,7 @@ void snug_high_speed_gpl_device::grom_readz(address_space& space, offs_t offset, // Each ROM6 is available as 4 (sub)banks (switchable via 6000, 6002, 6004, 6006) // Accordingly, each port has two complete sets *value = m_rom6_eeprom->read(space, m_grom_address | ((port-24)<<16), mem_mask); - if (TRACE_PORT) if (bNew) logerror("%s: ROM6 read access for module bank %d-%d (%04x)\n", tag(), (port-24)<<1, ((port-24)<<1)+1, offset & 0xffff); + if (TRACE_PORT) if (bNew) logerror("%s: ROM6 read access for module bank %d-%d (%04x)\n", tag().c_str(), (port-24)<<1, ((port-24)<<1)+1, offset & 0xffff); } else { @@ -404,7 +404,7 @@ void snug_high_speed_gpl_device::grom_readz(address_space& space, offs_t offset, { *value = m_gram_memory[m_grom_address | ((port-32)<<16)]; m_module_bank = port - 16; - if (TRACE_PORT) if (bNew) logerror("%s: GRAM read access at %04x - switch to bank %d\n", tag(), offset & 0xffff, m_module_bank); + if (TRACE_PORT) if (bNew) logerror("%s: GRAM read access at %04x - switch to bank %d\n", tag().c_str(), offset & 0xffff, m_module_bank); } else { @@ -412,11 +412,11 @@ void snug_high_speed_gpl_device::grom_readz(address_space& space, offs_t offset, { // *value = m_ram6_memory[m_grom_address]; *value = m_ram6_memory[m_grom_address | ((port-48)<<16)]; - if (TRACE_PORT) if (bNew) logerror("%s: RAM read access at %04x\n", tag(), offset & 0xffff); + if (TRACE_PORT) if (bNew) logerror("%s: RAM read access at %04x\n", tag().c_str(), offset & 0xffff); } else { - logerror("%s: Attempt to read from undefined port 0x%0x; ignored.\n", tag(), port); + logerror("%s: Attempt to read from undefined port 0x%0x; ignored.\n", tag().c_str(), port); } } } @@ -439,19 +439,19 @@ void snug_high_speed_gpl_device::cartspace_write(address_space& space, offs_t of { if (!m_card_enabled || m_flash_mode) { - if (TRACE_IGNORE) logerror("%s: write ignored: card_enabled=%d, flash_mode=%d\n", tag(), m_card_enabled, m_flash_mode); + if (TRACE_IGNORE) logerror("%s: write ignored: card_enabled=%d, flash_mode=%d\n", tag().c_str(), m_card_enabled, m_flash_mode); return; } - if (TRACE_WRITE) logerror("%s: cartridge space write %04x <- %02x\n", tag(), offset, data); + if (TRACE_WRITE) logerror("%s: cartridge space write %04x <- %02x\n", tag().c_str(), offset, data); if (!m_bank_inhibit && (m_module_bank < 16)) { if ((offset & 1) == 0) { - if ((offset & 0x9ff0)!=0) logerror("%s: unplausible ROM6 write: %04x <- %02x\n", tag(), offset, data); + if ((offset & 0x9ff0)!=0) logerror("%s: unplausible ROM6 write: %04x <- %02x\n", tag().c_str(), offset, data); m_current_bank = (offset>>1) & 3; - if (TRACE_BANKING) logerror("%s: select bank %d\n", tag(), m_current_bank); + if (TRACE_BANKING) logerror("%s: select bank %d\n", tag().c_str(), m_current_bank); } return; /* right??? */ } @@ -459,7 +459,7 @@ void snug_high_speed_gpl_device::cartspace_write(address_space& space, offs_t of if ((m_mbx_enabled) && (offset==0x6ffe)) { /* MBX: mapper at 0x6ffe */ m_current_bank = data & 0x03; - if (TRACE_BANKING) logerror("%s: select bank MBX %d\n", tag(), m_current_bank); + if (TRACE_BANKING) logerror("%s: select bank MBX %d\n", tag().c_str(), m_current_bank); return; } @@ -477,7 +477,7 @@ void snug_high_speed_gpl_device::cartspace_write(address_space& space, offs_t of // and !ram_enabled if (m_module_bank < 16) { - logerror("%s: invalid write %04x <- %02x\n", tag(), offset, data); + logerror("%s: invalid write %04x <- %02x\n", tag().c_str(), offset, data); // feeprom is normally written to using GPL ports, and I don't know // whether writing through >6000 page is enabled /* @@ -493,7 +493,7 @@ void snug_high_speed_gpl_device::cartspace_write(address_space& space, offs_t of } else { - logerror("%s: unknown 0x6000 port\n", tag()); + logerror("%s: unknown 0x6000 port\n", tag().c_str()); } } } @@ -543,7 +543,7 @@ void snug_high_speed_gpl_device::grom_write(address_space& space, offs_t offset, { m_gram_memory[m_grom_address | (port<<16)] = data; m_module_bank = port + 16; - if (TRACE_PORT) if (bNew) logerror("%s: GRAM write access at %04x (GRMENA=1) - switch to bank %d\n", tag(), offset & 0xffff, port); + if (TRACE_PORT) if (bNew) logerror("%s: GRAM write access at %04x (GRMENA=1) - switch to bank %d\n", tag().c_str(), offset & 0xffff, port); } else { @@ -551,7 +551,7 @@ void snug_high_speed_gpl_device::grom_write(address_space& space, offs_t offset, { m_grom_a_eeprom->write(space, m_grom_address | (port<<16), data, mem_mask); m_module_bank = port; - if (TRACE_PORT) if (bNew) logerror("%s: GROM write access at %04x - switch to bank %d\n", tag(), offset & 0xffff, port); + if (TRACE_PORT) if (bNew) logerror("%s: GROM write access at %04x - switch to bank %d\n", tag().c_str(), offset & 0xffff, port); } else { @@ -559,21 +559,21 @@ void snug_high_speed_gpl_device::grom_write(address_space& space, offs_t offset, { m_grom_b_eeprom->write(space, m_grom_address | ((port-8)<<16), data, mem_mask); m_module_bank = port; - if (TRACE_PORT) if (bNew) logerror("%s: GROM write access at %04x - switch to bank %d\n", tag(), offset & 0xffff, port); + if (TRACE_PORT) if (bNew) logerror("%s: GROM write access at %04x - switch to bank %d\n", tag().c_str(), offset & 0xffff, port); } else { if (port < 24) { m_dsr_eeprom->write(space, m_grom_address | ((port-16)<<16), data, mem_mask); - if (TRACE_DSR) if (bNew) logerror("%s: write access to DSR bank %d-%d (%04x)\n", tag(), (port-16)<<3, ((port-16)<<3)+7, offset); + if (TRACE_DSR) if (bNew) logerror("%s: write access to DSR bank %d-%d (%04x)\n", tag().c_str(), (port-16)<<3, ((port-16)<<3)+7, offset); } else { if (port < 32) { m_rom6_eeprom->write(space, m_grom_address | ((port-24)<<16), data, mem_mask); - if (TRACE_PORT) if (bNew) logerror("%s: ROM6 write access for module bank %d-%d (%04x)\n", tag(), (port-24)<<1, ((port-24)<<1)+1,offset & 0xffff); + if (TRACE_PORT) if (bNew) logerror("%s: ROM6 write access for module bank %d-%d (%04x)\n", tag().c_str(), (port-24)<<1, ((port-24)<<1)+1,offset & 0xffff); } else { @@ -581,7 +581,7 @@ void snug_high_speed_gpl_device::grom_write(address_space& space, offs_t offset, { m_gram_memory[m_grom_address | ((port-32)<<16)] = data; m_module_bank = port - 16; - if (TRACE_PORT) if (bNew) logerror("%s: GRAM write access at %04x - switch to bank %d\n", tag(), offset & 0xffff, m_module_bank); + if (TRACE_PORT) if (bNew) logerror("%s: GRAM write access at %04x - switch to bank %d\n", tag().c_str(), offset & 0xffff, m_module_bank); } else { @@ -589,11 +589,11 @@ void snug_high_speed_gpl_device::grom_write(address_space& space, offs_t offset, { // m_ram6_memory[m_grom_address] = data; m_ram6_memory[m_grom_address | ((port-48)<<16)] = data; - if (TRACE_PORT) if (bNew) logerror("%s: RAM write access at %04x\n", tag(), offset & 0xffff); + if (TRACE_PORT) if (bNew) logerror("%s: RAM write access at %04x\n", tag().c_str(), offset & 0xffff); } else { - logerror("%s: Attempt to write to undefined port; ignored.\n", tag()); + logerror("%s: Attempt to write to undefined port; ignored.\n", tag().c_str()); } } } @@ -619,7 +619,7 @@ void snug_high_speed_gpl_device::device_start() void snug_high_speed_gpl_device::device_reset() { - logerror("%s: reset\n", tag()); + logerror("%s: reset\n", tag().c_str()); m_dsr_enabled = false; m_gram_enabled = false; m_bank_inhibit = false; diff --git a/src/devices/bus/ti99_peb/hsgpl.h b/src/devices/bus/ti99_peb/hsgpl.h index dfb755c67b4..1ccb9ae1d35 100644 --- a/src/devices/bus/ti99_peb/hsgpl.h +++ b/src/devices/bus/ti99_peb/hsgpl.h @@ -25,7 +25,7 @@ extern const device_type TI99_HSGPL; class snug_high_speed_gpl_device : public ti_expansion_card_device { public: - snug_high_speed_gpl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + snug_high_speed_gpl_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8Z_MEMBER(readz) override; DECLARE_WRITE8_MEMBER(write) override; diff --git a/src/devices/bus/ti99_peb/memex.cpp b/src/devices/bus/ti99_peb/memex.cpp index 66dd2f7b291..0aa1eca3688 100644 --- a/src/devices/bus/ti99_peb/memex.cpp +++ b/src/devices/bus/ti99_peb/memex.cpp @@ -32,7 +32,7 @@ enum MDIP8 = 0x80 }; -geneve_memex_device::geneve_memex_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +geneve_memex_device::geneve_memex_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI99_MEMEX, "Geneve memory expansion card", tag, owner, clock, "ti99_memex", __FILE__), m_ram(nullptr), m_genmod(0) diff --git a/src/devices/bus/ti99_peb/memex.h b/src/devices/bus/ti99_peb/memex.h index e82e2c21ab7..0dd0c07a0a5 100644 --- a/src/devices/bus/ti99_peb/memex.h +++ b/src/devices/bus/ti99_peb/memex.h @@ -21,7 +21,7 @@ extern const device_type TI99_MEMEX; class geneve_memex_device : public ti_expansion_card_device { public: - geneve_memex_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + geneve_memex_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8Z_MEMBER(readz) override; DECLARE_WRITE8_MEMBER(write) override; diff --git a/src/devices/bus/ti99_peb/myarcmem.cpp b/src/devices/bus/ti99_peb/myarcmem.cpp index 08e8f893a95..fec35bc21fe 100644 --- a/src/devices/bus/ti99_peb/myarcmem.cpp +++ b/src/devices/bus/ti99_peb/myarcmem.cpp @@ -44,7 +44,7 @@ enum SIZE_512 }; -myarc_memory_expansion_device::myarc_memory_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +myarc_memory_expansion_device::myarc_memory_expansion_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI99_MYARCMEM, "Myarc Memory expansion card MEXP-1", tag, owner, clock, "ti99_myarcmem", __FILE__), m_ram(nullptr), m_dsrrom(nullptr), m_bank(0), m_size(0) { diff --git a/src/devices/bus/ti99_peb/myarcmem.h b/src/devices/bus/ti99_peb/myarcmem.h index 6af530d65dd..0f3f615c395 100644 --- a/src/devices/bus/ti99_peb/myarcmem.h +++ b/src/devices/bus/ti99_peb/myarcmem.h @@ -21,7 +21,7 @@ extern const device_type TI99_MYARCMEM; class myarc_memory_expansion_device : public ti_expansion_card_device { public: - myarc_memory_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + myarc_memory_expansion_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8Z_MEMBER(readz) override; DECLARE_WRITE8_MEMBER(write) override; diff --git a/src/devices/bus/ti99_peb/pcode.cpp b/src/devices/bus/ti99_peb/pcode.cpp index 57ee6462874..5cbe7c08b63 100644 --- a/src/devices/bus/ti99_peb/pcode.cpp +++ b/src/devices/bus/ti99_peb/pcode.cpp @@ -95,7 +95,7 @@ #define LOG logerror #define VERBOSE 1 -ti_pcode_card_device::ti_pcode_card_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ti_pcode_card_device::ti_pcode_card_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI99_P_CODE, "TI-99 P-Code Card", tag, owner, clock, "ti99_pcode", __FILE__), m_rom(nullptr), m_bank_select(0), m_switch(false) { } diff --git a/src/devices/bus/ti99_peb/pcode.h b/src/devices/bus/ti99_peb/pcode.h index c2a81a1395c..79db2b394de 100644 --- a/src/devices/bus/ti99_peb/pcode.h +++ b/src/devices/bus/ti99_peb/pcode.h @@ -24,7 +24,7 @@ extern const device_type TI99_P_CODE; class ti_pcode_card_device : public ti_expansion_card_device { public: - ti_pcode_card_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ti_pcode_card_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8Z_MEMBER(readz) override; DECLARE_WRITE8_MEMBER(write) override; DECLARE_READ8Z_MEMBER(crureadz) override; diff --git a/src/devices/bus/ti99_peb/peribox.cpp b/src/devices/bus/ti99_peb/peribox.cpp index f91622742d1..6da994728bf 100644 --- a/src/devices/bus/ti99_peb/peribox.cpp +++ b/src/devices/bus/ti99_peb/peribox.cpp @@ -216,7 +216,7 @@ CRUCLK* 51||52 DBIN #define PEBSLOT7 "slot7" #define PEBSLOT8 "slot8" -peribox_device::peribox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +peribox_device::peribox_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : bus8z_device(mconfig, PERIBOX, "Peripheral expansion box", tag, owner, clock, "peribox", __FILE__), m_console_inta(*this), m_console_intb(*this), @@ -231,7 +231,7 @@ peribox_device::peribox_device(const machine_config &mconfig, const char *tag, d /* Constructor called from subclasses. */ -peribox_device::peribox_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +peribox_device::peribox_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source), m_console_inta(*this), m_console_intb(*this), @@ -327,7 +327,7 @@ void peribox_device::set_genmod(bool set) */ void peribox_device::inta_join(int slot, int state) { - if (TRACE_INT) logerror("%s: propagating INTA from slot %d to console: %d\n", tag(), slot, state); + if (TRACE_INT) logerror("%s: propagating INTA from slot %d to console: %d\n", tag().c_str(), slot, state); if (state==ASSERT_LINE) m_inta_flag |= (1 << slot); else @@ -338,7 +338,7 @@ void peribox_device::inta_join(int slot, int state) void peribox_device::intb_join(int slot, int state) { - if (TRACE_INT) logerror("%s: propagating INTB from slot %d to console: %d\n", tag(), slot, state); + if (TRACE_INT) logerror("%s: propagating INTB from slot %d to console: %d\n", tag().c_str(), slot, state); if (state==ASSERT_LINE) m_intb_flag |= (1 << slot); else @@ -352,7 +352,7 @@ void peribox_device::intb_join(int slot, int state) */ void peribox_device::ready_join(int slot, int state) { - if (TRACE_READY) logerror("%s: Incoming READY=%d from slot %d\n", tag(), state, slot); + if (TRACE_READY) logerror("%s: Incoming READY=%d from slot %d\n", tag().c_str(), state, slot); // We store the inverse state if (state==CLEAR_LINE) m_ready_flag |= (1 << slot); @@ -369,7 +369,7 @@ void peribox_device::set_slot_loaded(int slot, peribox_slot_device* slotdev) void peribox_device::device_start(void) { - if (TRACE_EMU) logerror("%s: started\n", tag()); + if (TRACE_EMU) logerror("%s: started\n", tag().c_str()); // Resolve the callback lines to the console m_console_inta.resolve(); @@ -378,10 +378,10 @@ void peribox_device::device_start(void) if (TRACE_EMU) { - logerror("%s: AMA/B/C address prefix set to %05x\n", tag(), m_address_prefix); + logerror("%s: AMA/B/C address prefix set to %05x\n", tag().c_str(), m_address_prefix); for (int i=2; i < 9; i++) { - logerror("%s: Slot %d = %s\n", tag(), i, (m_slot[i] != nullptr)? m_slot[i]->m_card->tag() : "EMPTY"); + logerror("%s: Slot %d = %s\n", tag().c_str(), i, (m_slot[i] != nullptr)? m_slot[i]->m_card->tag().c_str() : "EMPTY"); } } } @@ -443,7 +443,7 @@ machine_config_constructor peribox_device::device_mconfig_additions() const A variant of the box used for the Geneve. *****************************************************************************/ -peribox_gen_device::peribox_gen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +peribox_gen_device::peribox_gen_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : peribox_device(mconfig, PERIBOX_GEN, "Peripheral expansion box Geneve", tag, owner, clock, "peribox_gen", __FILE__) { // The Geneve sits in slot 1; there is no prefix here - it can control @@ -497,7 +497,7 @@ machine_config_constructor peribox_gen_device::device_mconfig_additions() const A variant of the box used for the TI-99/8 *****************************************************************************/ -peribox_998_device::peribox_998_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +peribox_998_device::peribox_998_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : peribox_device(mconfig, PERIBOX_998, "Peripheral expansion box 99/8", tag, owner, clock, "peribox_998", __FILE__) { m_address_prefix = 0x70000; @@ -536,7 +536,7 @@ machine_config_constructor peribox_998_device::device_mconfig_additions() const A variant of the box used for the SGCPU (aka TI-99/4P). *****************************************************************************/ -peribox_sg_device::peribox_sg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +peribox_sg_device::peribox_sg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : peribox_device(mconfig, PERIBOX_SG, "Peripheral expansion box SGCPU", tag, owner, clock, "peribox_sg", __FILE__) { m_address_prefix = 0x70000; @@ -577,7 +577,7 @@ machine_config_constructor peribox_sg_device::device_mconfig_additions() const obviously required. *****************************************************************************/ -peribox_ev_device::peribox_ev_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +peribox_ev_device::peribox_ev_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : peribox_device(mconfig, PERIBOX_EV, "Peripheral expansion box EVPC", tag, owner, clock, "peribox_ev", __FILE__) { m_address_prefix = 0x70000; @@ -604,7 +604,7 @@ machine_config_constructor peribox_ev_device::device_mconfig_additions() const int peribox_slot_device::get_index_from_tagname() { - const char *mytag = tag(); + const char *mytag = tag().c_str(); int maxlen = strlen(mytag); int i; for (i=maxlen-1; i >=0; i--) @@ -613,7 +613,7 @@ int peribox_slot_device::get_index_from_tagname() return atoi(mytag+i+1); } -peribox_slot_device::peribox_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +peribox_slot_device::peribox_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : bus8z_device(mconfig, PERIBOX_SLOT, "TI P-Box slot", tag, owner, clock, "peribox_slot", __FILE__), device_slot_interface(mconfig, *this), m_card(nullptr), m_slotnumber(0) { } diff --git a/src/devices/bus/ti99_peb/peribox.h b/src/devices/bus/ti99_peb/peribox.h index 429d8ba8610..72b168cd449 100644 --- a/src/devices/bus/ti99_peb/peribox.h +++ b/src/devices/bus/ti99_peb/peribox.h @@ -36,8 +36,8 @@ class peribox_device : public bus8z_device { friend class peribox_slot_device; public: - peribox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - peribox_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + peribox_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + peribox_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); template<class _Object> static devcb_base &static_set_inta_callback(device_t &device, _Object object) { return downcast<peribox_device &>(device).m_console_inta.set_callback(object); } template<class _Object> static devcb_base &static_set_intb_callback(device_t &device, _Object object) { return downcast<peribox_device &>(device).m_console_intb.set_callback(object); } @@ -98,7 +98,7 @@ protected: class peribox_ev_device : public peribox_device { public: - peribox_ev_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + peribox_ev_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: virtual machine_config_constructor device_mconfig_additions() const override; @@ -110,7 +110,7 @@ protected: class peribox_sg_device : public peribox_device { public: - peribox_sg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + peribox_sg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: virtual machine_config_constructor device_mconfig_additions() const override; @@ -122,7 +122,7 @@ protected: class peribox_gen_device : public peribox_device { public: - peribox_gen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + peribox_gen_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: virtual machine_config_constructor device_mconfig_additions() const override; @@ -134,7 +134,7 @@ protected: class peribox_998_device : public peribox_device { public: - peribox_998_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + peribox_998_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: virtual machine_config_constructor device_mconfig_additions() const override; @@ -148,7 +148,7 @@ class peribox_slot_device : public bus8z_device, public device_slot_interface { friend class peribox_device; public: - peribox_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + peribox_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // Called from the box (direction to card) DECLARE_READ8Z_MEMBER(readz) override; @@ -191,7 +191,7 @@ class ti_expansion_card_device : public bus8z_device, public device_slot_card_in friend class peribox_slot_device; public: - ti_expansion_card_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) + ti_expansion_card_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source), device_slot_card_interface(mconfig, *this), m_selected(false), m_cru_base(0), m_select_mask(0), m_select_value(0) { diff --git a/src/devices/bus/ti99_peb/samsmem.cpp b/src/devices/bus/ti99_peb/samsmem.cpp index 0ff3e27d928..8f603f8d0ec 100644 --- a/src/devices/bus/ti99_peb/samsmem.cpp +++ b/src/devices/bus/ti99_peb/samsmem.cpp @@ -25,7 +25,7 @@ #define VERBOSE 1 #define LOG logerror -sams_memory_expansion_device::sams_memory_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sams_memory_expansion_device::sams_memory_expansion_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI99_SAMSMEM, "SuperAMS memory expansion card", tag, owner, clock, "ti99_sams", __FILE__), m_ram(nullptr), m_map_mode(false), m_access_mapper(false) { } diff --git a/src/devices/bus/ti99_peb/samsmem.h b/src/devices/bus/ti99_peb/samsmem.h index d5e1cb9b062..c14966aab48 100644 --- a/src/devices/bus/ti99_peb/samsmem.h +++ b/src/devices/bus/ti99_peb/samsmem.h @@ -23,7 +23,7 @@ extern const device_type TI99_SAMSMEM; class sams_memory_expansion_device : public ti_expansion_card_device { public: - sams_memory_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sams_memory_expansion_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8Z_MEMBER(readz) override; DECLARE_WRITE8_MEMBER(write) override; diff --git a/src/devices/bus/ti99_peb/spchsyn.cpp b/src/devices/bus/ti99_peb/spchsyn.cpp index 1fb447f6d17..8e018bae354 100644 --- a/src/devices/bus/ti99_peb/spchsyn.cpp +++ b/src/devices/bus/ti99_peb/spchsyn.cpp @@ -32,7 +32,7 @@ /****************************************************************************/ -ti_speech_synthesizer_device::ti_speech_synthesizer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ti_speech_synthesizer_device::ti_speech_synthesizer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI99_SPEECH, "TI-99 Speech synthesizer (on adapter card)", tag, owner, clock, "ti99_speech", __FILE__), m_vsp(nullptr), m_read_mode(false) { } diff --git a/src/devices/bus/ti99_peb/spchsyn.h b/src/devices/bus/ti99_peb/spchsyn.h index 44e7aca54c4..1ca399f82c9 100644 --- a/src/devices/bus/ti99_peb/spchsyn.h +++ b/src/devices/bus/ti99_peb/spchsyn.h @@ -22,7 +22,7 @@ extern const device_type TI99_SPEECH; class ti_speech_synthesizer_device : public ti_expansion_card_device { public: - ti_speech_synthesizer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ti_speech_synthesizer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8Z_MEMBER(readz) override; DECLARE_WRITE8_MEMBER(write) override; DECLARE_SETADDRESS_DBIN_MEMBER(setaddress_dbin) override; diff --git a/src/devices/bus/ti99_peb/ti_32kmem.cpp b/src/devices/bus/ti99_peb/ti_32kmem.cpp index 9e4a2b82349..81339ed3731 100644 --- a/src/devices/bus/ti99_peb/ti_32kmem.cpp +++ b/src/devices/bus/ti99_peb/ti_32kmem.cpp @@ -31,7 +31,7 @@ #define RAMREGION "ram" -ti_32k_expcard_device::ti_32k_expcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ti_32k_expcard_device::ti_32k_expcard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI_32KMEM, "TI-99 32KiB memory expansion card", tag, owner, clock, "ti99_32k", __FILE__), m_ram_ptr(nullptr) { } diff --git a/src/devices/bus/ti99_peb/ti_32kmem.h b/src/devices/bus/ti99_peb/ti_32kmem.h index fe3bf860753..646890bda89 100644 --- a/src/devices/bus/ti99_peb/ti_32kmem.h +++ b/src/devices/bus/ti99_peb/ti_32kmem.h @@ -19,7 +19,7 @@ extern const device_type TI_32KMEM; class ti_32k_expcard_device : public ti_expansion_card_device { public: - ti_32k_expcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ti_32k_expcard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8Z_MEMBER(readz) override; DECLARE_WRITE8_MEMBER(write) override; diff --git a/src/devices/bus/ti99_peb/ti_fdc.cpp b/src/devices/bus/ti99_peb/ti_fdc.cpp index 82585c424ce..7745e6c9edf 100644 --- a/src/devices/bus/ti99_peb/ti_fdc.cpp +++ b/src/devices/bus/ti99_peb/ti_fdc.cpp @@ -47,7 +47,7 @@ #define TI_FDC_TAG "ti_dssd_controller" -ti_fdc_device::ti_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ti_fdc_device::ti_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI99_FDC, "TI-99 Standard DSSD Floppy Controller", tag, owner, clock, "ti99_fdc", __FILE__), m_address(0), m_DRQ(), m_IRQ(), m_lastval(0), m_DVENA(), m_inDsrArea(false), m_WAITena(false), m_WDsel(false), m_DSEL(0), m_SIDSEL(), m_motor_on_timer(nullptr), m_fd1771(*this, FDC_TAG), m_dsrrom(nullptr), m_current_floppy(nullptr), m_debug_dataout(false) diff --git a/src/devices/bus/ti99_peb/ti_fdc.h b/src/devices/bus/ti99_peb/ti_fdc.h index ed1082d3b0a..7870158d16a 100644 --- a/src/devices/bus/ti99_peb/ti_fdc.h +++ b/src/devices/bus/ti99_peb/ti_fdc.h @@ -22,7 +22,7 @@ extern const device_type TI99_FDC; class ti_fdc_device : public ti_expansion_card_device { public: - ti_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ti_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8Z_MEMBER(readz) override; DECLARE_WRITE8_MEMBER(write) override; DECLARE_SETADDRESS_DBIN_MEMBER(setaddress_dbin) override; diff --git a/src/devices/bus/ti99_peb/ti_rs232.cpp b/src/devices/bus/ti99_peb/ti_rs232.cpp index e93bb86d015..bd99239a909 100644 --- a/src/devices/bus/ti99_peb/ti_rs232.cpp +++ b/src/devices/bus/ti99_peb/ti_rs232.cpp @@ -116,7 +116,7 @@ #define ESC 0x1b -ti_rs232_pio_device::ti_rs232_pio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ti_rs232_pio_device::ti_rs232_pio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI99_RS232, "TI-99 RS232/PIO interface", tag, owner, clock, "ti99_rs232", __FILE__), m_piodev(nullptr), m_dsrrom(nullptr), m_pio_direction_in(false), m_pio_handshakeout(false), m_pio_handshakein(false), m_pio_spareout(false), m_pio_sparein(false), m_flag0(false), m_led(false), m_pio_out_buffer(0), m_pio_in_buffer(0), m_pio_readable(false), m_pio_writable(false), m_pio_write(false), m_ila(0) { } @@ -125,13 +125,13 @@ ti_rs232_pio_device::ti_rs232_pio_device(const machine_config &mconfig, const ch /**************************************************************************/ /* Ports */ -ti_rs232_attached_device::ti_rs232_attached_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ti_rs232_attached_device::ti_rs232_attached_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, TI99_RS232_DEV, "Serial attached device", tag, owner, clock, "ti_rs232_attached", __FILE__), device_image_interface(mconfig, *this) { } -ti_pio_attached_device::ti_pio_attached_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ti_pio_attached_device::ti_pio_attached_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, TI99_PIO_DEV, "Parallel attached device", tag, owner, clock, "ti_pio_attached", __FILE__), device_image_interface(mconfig, *this) { @@ -162,7 +162,7 @@ void ti_pio_attached_device::device_config_complete() */ int ti_rs232_attached_device::get_index_from_tagname() { - const char *mytag = tag(); + const char *mytag = tag().c_str(); int maxlen = strlen(mytag); int i; for (i=maxlen-1; i >=0; i--) diff --git a/src/devices/bus/ti99_peb/ti_rs232.h b/src/devices/bus/ti99_peb/ti_rs232.h index 24c190aac2d..0ecdfa1397d 100644 --- a/src/devices/bus/ti99_peb/ti_rs232.h +++ b/src/devices/bus/ti99_peb/ti_rs232.h @@ -30,7 +30,7 @@ class ti_rs232_pio_device : public ti_expansion_card_device friend class ti_rs232_attached_device; public: - ti_rs232_pio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ti_rs232_pio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8Z_MEMBER(readz) override; DECLARE_WRITE8_MEMBER(write) override; @@ -117,7 +117,7 @@ private: class ti_rs232_attached_device : public device_t, public device_image_interface { public: - ti_rs232_attached_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ti_rs232_attached_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); iodevice_t image_type() const override { return IO_SERIAL; } bool is_readable() const override { return true; } @@ -145,7 +145,7 @@ private: class ti_pio_attached_device : public device_t, public device_image_interface { public: - ti_pio_attached_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ti_pio_attached_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); iodevice_t image_type() const override { return IO_PARALLEL; } bool is_readable() const override { return true; } diff --git a/src/devices/bus/ti99_peb/tn_ide.cpp b/src/devices/bus/ti99_peb/tn_ide.cpp index 3b9e9b1f6ce..13c25c07f3e 100644 --- a/src/devices/bus/ti99_peb/tn_ide.cpp +++ b/src/devices/bus/ti99_peb/tn_ide.cpp @@ -49,7 +49,7 @@ enum cru_reg_reset = 0x80 }; -nouspikel_ide_interface_device::nouspikel_ide_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nouspikel_ide_interface_device::nouspikel_ide_interface_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI99_IDE, "Nouspikel IDE interface card", tag, owner, clock, "ti99_ide", __FILE__), m_ata_irq(false), m_cru_register(0), m_rtc(nullptr), m_ata(*this, "ata"), m_clk_irq(false), m_sram_enable(false), m_sram_enable_dip(false), m_cur_page(0), m_tms9995_mode(false), diff --git a/src/devices/bus/ti99_peb/tn_ide.h b/src/devices/bus/ti99_peb/tn_ide.h index 52694555b3b..5afc0355fab 100644 --- a/src/devices/bus/ti99_peb/tn_ide.h +++ b/src/devices/bus/ti99_peb/tn_ide.h @@ -23,7 +23,7 @@ extern const device_type TI99_IDE; class nouspikel_ide_interface_device : public ti_expansion_card_device { public: - nouspikel_ide_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nouspikel_ide_interface_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8Z_MEMBER(readz) override; DECLARE_WRITE8_MEMBER(write) override; diff --git a/src/devices/bus/ti99_peb/tn_usbsm.cpp b/src/devices/bus/ti99_peb/tn_usbsm.cpp index 63662ce692a..9448592dc6e 100644 --- a/src/devices/bus/ti99_peb/tn_usbsm.cpp +++ b/src/devices/bus/ti99_peb/tn_usbsm.cpp @@ -51,7 +51,7 @@ enum FEEPROM_WRITE_ENABLE = 0x10 }; -nouspikel_usb_smartmedia_device::nouspikel_usb_smartmedia_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +nouspikel_usb_smartmedia_device::nouspikel_usb_smartmedia_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI99_USBSM, "Nouspikel USB/Smartmedia card", tag, owner, clock, "ti99_usbsm", __FILE__), m_feeprom_page(0), m_sram_page(0), m_cru_register(0), m_tms9995_mode(false), m_enable_io(false), m_enable_int(false), m_enable_sm(false), m_write_flash(false), m_input_latch(0), m_output_latch(0), diff --git a/src/devices/bus/ti99_peb/tn_usbsm.h b/src/devices/bus/ti99_peb/tn_usbsm.h index 08d7f281fe8..d07aa8a5562 100644 --- a/src/devices/bus/ti99_peb/tn_usbsm.h +++ b/src/devices/bus/ti99_peb/tn_usbsm.h @@ -24,7 +24,7 @@ extern const device_type TI99_USBSM; class nouspikel_usb_smartmedia_device : public ti_expansion_card_device { public: - nouspikel_usb_smartmedia_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nouspikel_usb_smartmedia_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8Z_MEMBER(readz) override; DECLARE_WRITE8_MEMBER(write) override; diff --git a/src/devices/bus/ti99x/990_dk.cpp b/src/devices/bus/ti99x/990_dk.cpp index 16fd5920d7c..b74e041d724 100644 --- a/src/devices/bus/ti99x/990_dk.cpp +++ b/src/devices/bus/ti99x/990_dk.cpp @@ -42,7 +42,7 @@ enum const device_type FD800 = &device_creator<fd800_legacy_device>; -fd800_legacy_device::fd800_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +fd800_legacy_device::fd800_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, FD800, "TI FD800 Diablo floppy disk controller", tag, owner, clock, "fd800", __FILE__), m_recv_buf(0), m_stat_reg(0), m_xmit_buf(0), m_cmd_reg(0), m_interrupt_f_f(0), m_int_line(*this), m_buf_pos(0), m_buf_mode(), m_unit(0), m_sector(0) diff --git a/src/devices/bus/ti99x/990_dk.h b/src/devices/bus/ti99x/990_dk.h index ffb7f79784a..f1b0296430d 100644 --- a/src/devices/bus/ti99x/990_dk.h +++ b/src/devices/bus/ti99x/990_dk.h @@ -14,7 +14,7 @@ extern const device_type FD800; class fd800_legacy_device : public device_t { public: - fd800_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + fd800_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER( cru_r ); DECLARE_WRITE8_MEMBER( cru_w ); diff --git a/src/devices/bus/ti99x/990_hd.cpp b/src/devices/bus/ti99x/990_hd.cpp index b884f8be444..7d1df50c7c9 100644 --- a/src/devices/bus/ti99x/990_hd.cpp +++ b/src/devices/bus/ti99x/990_hd.cpp @@ -137,19 +137,19 @@ int ti990_hdc_device::get_id_from_device( device_t *device ) { int id = -1; - if ( ! strcmp( ":harddisk1", device->tag() ) ) + if (":harddisk1" == device->tag()) { id = 0; } - else if ( ! strcmp( ":harddisk2", device->tag() ) ) + else if (":harddisk2"==device->tag()) { id = 1; } - else if ( ! strcmp( ":harddisk3", device->tag() ) ) + else if (":harddisk3"==device->tag()) { id = 2; } - else if ( ! strcmp( ":harddisk4", device->tag() ) ) + else if (":harddisk4"==device->tag()) { id = 3; } @@ -976,7 +976,7 @@ MACHINE_CONFIG_END const device_type TI990_HDC = &device_creator<ti990_hdc_device>; -ti990_hdc_device::ti990_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ti990_hdc_device::ti990_hdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, TI990_HDC, "Generic TI-990 Hard Disk Controller", tag, owner, clock, "hdc_990", __FILE__), m_interrupt_callback(*this) { diff --git a/src/devices/bus/ti99x/990_hd.h b/src/devices/bus/ti99x/990_hd.h index f6468a807f9..0c2017d7b20 100644 --- a/src/devices/bus/ti99x/990_hd.h +++ b/src/devices/bus/ti99x/990_hd.h @@ -15,7 +15,7 @@ overriden if more than one controller is used */ class ti990_hdc_device : public device_t { public: - ti990_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ti990_hdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template<class _Object> static devcb_base &static_set_int_callback(device_t &device, _Object object) { return downcast<ti990_hdc_device &>(device).m_interrupt_callback.set_callback(object); } diff --git a/src/devices/bus/ti99x/990_tap.cpp b/src/devices/bus/ti99x/990_tap.cpp index 3f6e48ddc52..8bd5c0f75d5 100644 --- a/src/devices/bus/ti99x/990_tap.cpp +++ b/src/devices/bus/ti99x/990_tap.cpp @@ -892,7 +892,7 @@ class ti990_tape_image_device : public device_t, { public: // construction/destruction - ti990_tape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ti990_tape_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // image-level overrides virtual iodevice_t image_type() const override { return IO_MAGTAPE; } @@ -918,7 +918,7 @@ private: const device_type TI990_TAPE = &device_creator<ti990_tape_image_device>; -ti990_tape_image_device::ti990_tape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ti990_tape_image_device::ti990_tape_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, TI990_TAPE, "TI-990 Magnetic Tape", tag, owner, clock, "ti990_tape_image", __FILE__), device_image_interface(mconfig, *this) { @@ -938,10 +938,10 @@ void ti990_tape_image_device::device_start() int ti990_tape_image_device::tape_get_id() { int drive =0; - if (strcmp(tag(), ":tape0") == 0) drive = 0; - if (strcmp(tag(), ":tape1") == 0) drive = 1; - if (strcmp(tag(), ":tape2") == 0) drive = 2; - if (strcmp(tag(), ":tape3") == 0) drive = 3; + if (tag()==":tape0") drive = 0; + if (tag()==":tape1") drive = 1; + if (tag()==":tape2") drive = 2; + if (tag()==":tape3") drive = 3; return drive; } @@ -978,7 +978,7 @@ MACHINE_CONFIG_END 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) +tap_990_device::tap_990_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, TI990_TAPE_CTRL, "Generic TI-990 Tape Controller", tag, owner, clock, "tap_990", __FILE__), m_int_line(*this) { diff --git a/src/devices/bus/ti99x/990_tap.h b/src/devices/bus/ti99x/990_tap.h index 6622e2af587..94892a947d8 100644 --- a/src/devices/bus/ti99x/990_tap.h +++ b/src/devices/bus/ti99x/990_tap.h @@ -18,7 +18,7 @@ struct tape_unit_t class tap_990_device : public device_t { public: - tap_990_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + tap_990_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template<class _Object> static devcb_base &static_set_int_callback(device_t &device, _Object object) { return downcast<tap_990_device &>(device).m_int_line.set_callback(object); diff --git a/src/devices/bus/ti99x/998board.cpp b/src/devices/bus/ti99x/998board.cpp index 6df84271cc4..db93d16f309 100644 --- a/src/devices/bus/ti99x/998board.cpp +++ b/src/devices/bus/ti99x/998board.cpp @@ -203,7 +203,7 @@ #define TRACE_SPEECH 0 #define TRACE_DETAIL 0 -mainboard8_device::mainboard8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +mainboard8_device::mainboard8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : bus8z_device(mconfig, MAINBOARD8, "TI-99/8 Main board", tag, owner, clock, "ti998_mainboard", __FILE__), m_ready(*this), m_dsr_selected(false), m_hexbus_selected(false), m_CRUS(false), m_PTGE(false), m_waitcount(0), m_sram(nullptr), m_dram(nullptr), m_rom0(nullptr), m_rom1(nullptr), m_pcode(nullptr), m_oso(*this, OSO_TAG) @@ -218,7 +218,7 @@ mainboard8_device::mainboard8_device(const machine_config &mconfig, const char * READ8Z_MEMBER(mainboard8_device::crureadz) { - if (TRACE_CRU) logerror("%s: read CRU %04x ignored\n", tag(), offset); + if (TRACE_CRU) logerror("%s: read CRU %04x ignored\n", tag().c_str(), offset); // Nothing here. } @@ -236,10 +236,10 @@ WRITE8_MEMBER(mainboard8_device::cruwrite) case 0: // Turn on/off the internal DSR m_dsr_selected = (data!=0); - if (TRACE_CRU) logerror("%s: DSR select = %d\n", tag(), data); + if (TRACE_CRU) logerror("%s: DSR select = %d\n", tag().c_str(), data); break; case 1: - if (TRACE_CRU) logerror("%s: System reset by CRU request\n", tag()); + if (TRACE_CRU) logerror("%s: System reset by CRU request\n", tag().c_str()); machine().schedule_soft_reset(); break; } @@ -254,10 +254,10 @@ WRITE8_MEMBER(mainboard8_device::cruwrite) case 0: // Turn on/off the Hexbus DSR m_hexbus_selected = (data!=0); - if (TRACE_CRU) logerror("%s: Hexbus select = %d\n", tag(), data); + if (TRACE_CRU) logerror("%s: Hexbus select = %d\n", tag().c_str(), data); break; default: - if (TRACE_CRU) logerror("%s: Set CRU>%04x (Hexbus) to %d\n", tag(), offset,data); + if (TRACE_CRU) logerror("%s: Set CRU>%04x (Hexbus) to %d\n", tag().c_str(), offset,data); break; } return; @@ -265,14 +265,14 @@ WRITE8_MEMBER(mainboard8_device::cruwrite) if ((offset & 0xff00)>=0x0100) { - if (TRACE_CRU) logerror("%s: Set CRU>%04x (unknown) to %d\n", tag(), offset,data); + if (TRACE_CRU) logerror("%s: Set CRU>%04x (unknown) to %d\n", tag().c_str(), offset,data); return; } } void mainboard8_device::CRUS_set(bool state) { - if (TRACE_CRU) logerror("%s: set CRUS=%d\n", tag(), state); + if (TRACE_CRU) logerror("%s: set CRUS=%d\n", tag().c_str(), state); m_CRUS = state; } @@ -281,7 +281,7 @@ void mainboard8_device::CRUS_set(bool state) */ void mainboard8_device::PTGE_set(bool state) { - if (TRACE_CRU) logerror("%s: set PTGEN=%d\n", tag(), state? 1:0); + if (TRACE_CRU) logerror("%s: set PTGEN=%d\n", tag().c_str(), state? 1:0); m_PTGE = state; } @@ -296,7 +296,7 @@ READ8_MEMBER( mainboard8_device::readm ) { UINT8 value = 0; bool found; - if (TRACE_MEM) logerror("%s: read from %04x\n", tag(), offset); + if (TRACE_MEM) logerror("%s: read from %04x\n", tag().c_str(), offset); found = access_logical_r(space, offset, &value, mem_mask); m_waitcount = 2; @@ -365,7 +365,7 @@ READ8Z_MEMBER( mainboard8_device::readz ) { // Starts at 0x4000 in the image *value = m_rom1[0x4000 | (offset & 0x1fff)]; - if (TRACE_MEM) logerror("%s: (intDSR) %04x -> %02x\n", tag(), offset, *value); + if (TRACE_MEM) logerror("%s: (intDSR) %04x -> %02x\n", tag().c_str(), offset, *value); } else { @@ -379,7 +379,7 @@ READ8Z_MEMBER( mainboard8_device::readz ) { // Starts at 0x6000 in the image *value = m_rom1[0x6000 | (offset & 0x1fff)]; - if (TRACE_MEM) logerror("%s: (HexDSR) %04x -> %02x\n", tag(), offset, *value); + if (TRACE_MEM) logerror("%s: (HexDSR) %04x -> %02x\n", tag().c_str(), offset, *value); } } } @@ -388,7 +388,7 @@ READ8Z_MEMBER( mainboard8_device::readz ) { if (((offset & 0xfff0)==0xf870 && m_CRUS==false)||(((offset & 0xfff0)==0x8810 && m_CRUS==true))) { - if (TRACE_MEM) logerror("%s: read access to mapper ignored: %04x\n", tag(), offset); + if (TRACE_MEM) logerror("%s: read access to mapper ignored: %04x\n", tag().c_str(), offset); } } } @@ -410,18 +410,18 @@ WRITE8_MEMBER( mainboard8_device::write ) } else { - logerror("%s: Write access to Hexbus DSR address %06x ignored\n", tag(), offset); + logerror("%s: Write access to Hexbus DSR address %06x ignored\n", tag().c_str(), offset); } } else { if (m_dsr_selected) { - logerror("%s: Write access to internal DSR address %06x ignored\n", tag(), offset); + logerror("%s: Write access to internal DSR address %06x ignored\n", tag().c_str(), offset); } else { - logerror("%s: Write access to unmapped DSR space at address %06x ignored\n", tag(), offset); + logerror("%s: Write access to unmapped DSR space at address %06x ignored\n", tag().c_str(), offset); } } } @@ -449,7 +449,7 @@ void mainboard8_device::mapwrite(int offset, UINT8 data) int bankindx = (data & 0x0e)>>1; if (data & 1) { - if (TRACE_MAP) logerror("%s: load mapper from SRAM, bank %d\n", tag(), bankindx); + if (TRACE_MAP) logerror("%s: load mapper from SRAM, bank %d\n", tag().c_str(), bankindx); // Load from SRAM // In reality the CPU is put on HOLD during this transfer for (int i=0; i < 16; i++) @@ -457,12 +457,12 @@ void mainboard8_device::mapwrite(int offset, UINT8 data) int ptr = (bankindx << 6); m_pas_offset[i] = (m_sram[(i<<2) + ptr] << 24) | (m_sram[(i<<2)+ ptr+1] << 16) | (m_sram[(i<<2) + ptr+2] << 8) | (m_sram[(i<<2) + ptr+3]); - if (TRACE_MAP) logerror("%s: load %d=%08x\n", tag(), i, m_pas_offset[i]); + if (TRACE_MAP) logerror("%s: load %d=%08x\n", tag().c_str(), i, m_pas_offset[i]); } } else { - if (TRACE_MAP) logerror("%s: store mapper to SRAM, bank %d\n", tag(), bankindx); + if (TRACE_MAP) logerror("%s: store mapper to SRAM, bank %d\n", tag().c_str(), bankindx); // Store in SRAM for (int i=0; i < 16; i++) { @@ -471,7 +471,7 @@ void mainboard8_device::mapwrite(int offset, UINT8 data) m_sram[(i<<2) + ptr +1] = (m_pas_offset[i] >> 16)& 0xff; m_sram[(i<<2) + ptr +2] = (m_pas_offset[i] >> 8)& 0xff; m_sram[(i<<2) + ptr +3] = (m_pas_offset[i])& 0xff; - if (TRACE_MAP) logerror("%s: save %d=%08x\n", tag(), i, m_pas_offset[i]); + if (TRACE_MAP) logerror("%s: save %d=%08x\n", tag().c_str(), i, m_pas_offset[i]); } } } @@ -487,10 +487,10 @@ bool mainboard8_device::access_logical_r(address_space& space, offs_t offset, UI logically_addressed_device *ldev = m_logcomp.first(); bus8z_device *bdev; - if (TRACE_MEM) logerror("%s: offset=%04x; CRUS=%d, PTGEN=%d\n", tag(), offset, m_CRUS? 1:0, m_PTGE? 0:1); + if (TRACE_MEM) logerror("%s: offset=%04x; CRUS=%d, PTGEN=%d\n", tag().c_str(), offset, m_CRUS? 1:0, m_PTGE? 0:1); while (ldev != nullptr) { - if (TRACE_MEM) logerror("%s: checking node=%s\n", tag(), ldev->m_config->name); + if (TRACE_MEM) logerror("%s: checking node=%s\n", tag().c_str(), ldev->m_config->name); // Check the mode if (((ldev->m_config->mode == NATIVE) && (m_CRUS==false)) || ((ldev->m_config->mode == TI99EM) && (m_CRUS==true)) @@ -502,21 +502,21 @@ bool mainboard8_device::access_logical_r(address_space& space, offs_t offset, UI { case MAP8_SRAM: *value = m_sram[offset & ~ldev->m_config->address_mask]; - if (TRACE_MEM) logerror("%s: (SRAM) %04x -> %02x\n", tag(), offset, *value); + if (TRACE_MEM) logerror("%s: (SRAM) %04x -> %02x\n", tag().c_str(), offset, *value); break; case MAP8_ROM0: // Starts at 0000 *value = m_rom0[offset & ~ldev->m_config->address_mask]; - if (TRACE_MEM) logerror("%s: (ROM0) %04x -> %02x\n", tag(), offset, *value); + if (TRACE_MEM) logerror("%s: (ROM0) %04x -> %02x\n", tag().c_str(), offset, *value); break; case MAP8_DEV: // device bdev = static_cast<bus8z_device*>(ldev->m_device); bdev->readz(space, offset, value, mem_mask); - if (TRACE_MEM) logerror("%s: (dev %s) %04x -> %02x\n", tag(), ldev->m_config->name, offset, *value); + if (TRACE_MEM) logerror("%s: (dev %s) %04x -> %02x\n", tag().c_str(), ldev->m_config->name, offset, *value); break; default: - if (TRACE_MEM) logerror("%s: Invalid kind for read access: %d\n", tag(), ldev->m_kind); + if (TRACE_MEM) logerror("%s: Invalid kind for read access: %d\n", tag().c_str(), ldev->m_kind); } found = true; if (ldev->m_config->stop==STOP) break; @@ -546,19 +546,19 @@ bool mainboard8_device::access_logical_w(address_space& space, offs_t offset, UI { case MAP8_SRAM: m_sram[offset & ~ldev->m_config->address_mask] = data; - if (TRACE_MEM) logerror("%s: (SRAM) %04x <- %02x\n", tag(), offset, data); + if (TRACE_MEM) logerror("%s: (SRAM) %04x <- %02x\n", tag().c_str(), offset, data); break; case MAP8_ROM0: - if (TRACE_MEM) logerror("%s: (ROM0) %04x <- %02x (ignored)\n", tag(), offset, data); + if (TRACE_MEM) logerror("%s: (ROM0) %04x <- %02x (ignored)\n", tag().c_str(), offset, data); break; case MAP8_DEV: // device bdev = static_cast<bus8z_device*>(ldev->m_device); bdev->write(space, offset, data, mem_mask); - if (TRACE_MEM) logerror("%s: (dev %s) %04x <- %02x\n", tag(), ldev->m_config->name, offset, data); + if (TRACE_MEM) logerror("%s: (dev %s) %04x <- %02x\n", tag().c_str(), ldev->m_config->name, offset, data); break; default: - if (TRACE_MEM) logerror("%s: Invalid kind for write access: %d\n", tag(), ldev->m_kind); + if (TRACE_MEM) logerror("%s: Invalid kind for write access: %d\n", tag().c_str(), ldev->m_kind); } found = true; if (ldev->m_config->stop==STOP) break; @@ -583,34 +583,34 @@ void mainboard8_device::access_physical_r( address_space& space, offs_t pas_addr { case MAP8_DRAM: *value = m_dram[pas_address & ~pdev->m_config->address_mask]; - if (TRACE_MEM) logerror("%s: (DRAM) %06x -> %02x\n", tag(), pas_address, *value); + if (TRACE_MEM) logerror("%s: (DRAM) %06x -> %02x\n", tag().c_str(), pas_address, *value); break; case MAP8_ROM1A0: // Starts at 0000 in the image, 8K *value = m_rom1[pas_address & 0x1fff]; - if (TRACE_MEM) logerror("%s: (ROM) %06x -> %02x\n", tag(), pas_address, *value); + if (TRACE_MEM) logerror("%s: (ROM) %06x -> %02x\n", tag().c_str(), pas_address, *value); break; case MAP8_ROM1C0: // Starts at 2000 in the image, 8K *value = m_rom1[0x2000 | (pas_address & 0x1fff)]; - if (TRACE_MEM) logerror("%s: (ROM) %06x -> %02x\n", tag(), pas_address, *value); + if (TRACE_MEM) logerror("%s: (ROM) %06x -> %02x\n", tag().c_str(), pas_address, *value); break; case MAP8_PCODE: *value = m_pcode[pas_address & 0x3fff]; - if (TRACE_MEM) logerror("%s: (PCODE) %06x -> %02x\n", tag(), pas_address, *value); + if (TRACE_MEM) logerror("%s: (PCODE) %06x -> %02x\n", tag().c_str(), pas_address, *value); break; case MAP8_INTS: // Interrupt sense - logerror("%s: ILSENSE not implemented.\n", tag()); + logerror("%s: ILSENSE not implemented.\n", tag().c_str()); break; case MAP8_DEV: // devices bdev = static_cast<bus8z_device*>(pdev->m_device); bdev->readz(space, pas_address, value, mem_mask); - if (TRACE_MEM) logerror("%s: (dev %s) %06x -> %02x\n", tag(), pdev->m_config->name, pas_address, *value); + if (TRACE_MEM) logerror("%s: (dev %s) %06x -> %02x\n", tag().c_str(), pdev->m_config->name, pas_address, *value); break; default: - logerror("%s: Invalid kind for physical read access: %d\n", tag(), pdev->m_kind); + logerror("%s: Invalid kind for physical read access: %d\n", tag().c_str(), pdev->m_kind); } if (pdev->m_config->stop==STOP) break; } @@ -631,27 +631,27 @@ void mainboard8_device::access_physical_w( address_space& space, offs_t pas_addr { case MAP8_DRAM: m_dram[pas_address & ~pdev->m_config->address_mask] = data; - if (TRACE_MEM) logerror("%s: (DRAM) %06x <- %02x\n", tag(), pas_address, data); + if (TRACE_MEM) logerror("%s: (DRAM) %06x <- %02x\n", tag().c_str(), pas_address, data); break; case MAP8_ROM1A0: case MAP8_ROM1C0: - if (TRACE_MEM) logerror("%s: (ROM1) %06x <- %02x (ignored)\n", tag(), pas_address, data); + if (TRACE_MEM) logerror("%s: (ROM1) %06x <- %02x (ignored)\n", tag().c_str(), pas_address, data); break; case MAP8_PCODE: - if (TRACE_MEM) logerror("%s: (PCODE) %06x <- %02x (ignored)\n", tag(), pas_address, data); + if (TRACE_MEM) logerror("%s: (PCODE) %06x <- %02x (ignored)\n", tag().c_str(), pas_address, data); break; case MAP8_INTS: // Interrupt sense - logerror("%s: write to ilsense ignored\n", tag()); + logerror("%s: write to ilsense ignored\n", tag().c_str()); break; case MAP8_DEV: // devices bdev = static_cast<bus8z_device*>(pdev->m_device); - if (TRACE_MEM) logerror("%s: (dev %s) %06x <- %02x\n", tag(), pdev->m_config->name, pas_address, data); + if (TRACE_MEM) logerror("%s: (dev %s) %06x <- %02x\n", tag().c_str(), pdev->m_config->name, pas_address, data); bdev->write(space, pas_address, data, mem_mask); break; default: - logerror("%s: Invalid kind for physical write access: %d\n", tag(), pdev->m_kind); + logerror("%s: Invalid kind for physical write access: %d\n", tag().c_str(), pdev->m_kind); } if (pdev->m_config->stop==STOP) break; } @@ -684,7 +684,7 @@ void mainboard8_device::clock_in(int clock) */ void mainboard8_device::device_start() { - logerror("%s: Starting mapper\n", tag()); + logerror("%s: Starting mapper\n", tag().c_str()); // String values of the pseudo constants, used in the configuration. const char *const pseudodev[7] = { SRAMNAME, ROM0NAME, ROM1A0NAME, ROM1C0NAME, DRAMNAME, PCODENAME, INTSNAME }; @@ -737,24 +737,24 @@ void mainboard8_device::device_start() { auto ad = new logically_addressed_device(kind, (device_t*)dev, entry[i]); m_logcomp.append(*ad); - if (TRACE_CONFIG) logerror("%s: Device %s mounted into logical address space.\n", tag(), entry[i].name); + if (TRACE_CONFIG) logerror("%s: Device %s mounted into logical address space.\n", tag().c_str(), entry[i].name); } else { auto ad = new physically_addressed_device(kind, (device_t*)dev, entry[i]); m_physcomp.append(*ad); - if (TRACE_CONFIG) logerror("%s: Device %s mounted into physical address space.\n", tag(), entry[i].name); + if (TRACE_CONFIG) logerror("%s: Device %s mounted into physical address space.\n", tag().c_str(), entry[i].name); } } else { - if (TRACE_CONFIG) logerror("%s: Device %s not found.\n", tag(), entry[i].name); + if (TRACE_CONFIG) logerror("%s: Device %s not found.\n", tag().c_str(), entry[i].name); } } } } - if (TRACE_CONFIG) logerror("%s: Mapper logical device count = %d\n", tag(), m_logcomp.count()); - if (TRACE_CONFIG) logerror("%s: Mapper physical device count = %d\n", tag(), m_physcomp.count()); + if (TRACE_CONFIG) logerror("%s: Mapper logical device count = %d\n", tag().c_str(), m_logcomp.count()); + if (TRACE_CONFIG) logerror("%s: Mapper physical device count = %d\n", tag().c_str(), m_physcomp.count()); m_dsr_selected = false; m_CRUS = true; @@ -858,7 +858,7 @@ enum SHSK = 0x01 }; -ti998_oso_device::ti998_oso_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ti998_oso_device::ti998_oso_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, OSO, "OSO Hexbus interface", tag, owner, clock, "ti998_oso", __FILE__), m_data(0), m_status(0), m_control(0), m_xmit(0) { } @@ -871,23 +871,23 @@ READ8_MEMBER( ti998_oso_device::read ) { case 0: // read 5FF8: read data register - if (TRACE_OSO) logerror("%s: Read data register = %02x\n", tag(), value); + if (TRACE_OSO) logerror("%s: Read data register = %02x\n", tag().c_str(), value); value = m_data; break; case 1: // read 5FFA: read status register value = m_status; - if (TRACE_OSO) logerror("%s: Read status %02x\n", tag(), value); + if (TRACE_OSO) logerror("%s: Read status %02x\n", tag().c_str(), value); break; case 2: // read 5FFC: read control register value = m_control; - if (TRACE_OSO) logerror("%s: Read control register = %02x\n", tag(), value); + if (TRACE_OSO) logerror("%s: Read control register = %02x\n", tag().c_str(), value); break; case 3: // read 5FFE: read transmit register value = m_xmit; - if (TRACE_OSO) logerror("%s: Read transmit register = %02x\n", tag(), value); + if (TRACE_OSO) logerror("%s: Read transmit register = %02x\n", tag().c_str(), value); break; } return value; @@ -900,7 +900,7 @@ WRITE8_MEMBER( ti998_oso_device::write ) { case 0: // write 5FF8: write transmit register - if (TRACE_OSO) logerror("%s: Write transmit register %02x\n", tag(), data); + if (TRACE_OSO) logerror("%s: Write transmit register %02x\n", tag().c_str(), data); m_xmit = data; // We set the status register directly in order to prevent lock-ups // until we have a complete Hexbus implementation @@ -908,12 +908,12 @@ WRITE8_MEMBER( ti998_oso_device::write ) break; case 1: // write 5FFA: write control register - if (TRACE_OSO) logerror("%s: Write control register %02x\n", tag(), data); + if (TRACE_OSO) logerror("%s: Write control register %02x\n", tag().c_str(), data); m_control = data; break; default: // write 5FFC, 5FFE: undefined - if (TRACE_OSO) logerror("%s: Invalid write on %04x: %02x\n", tag(), (offset<<1) | 0x5ff0, data); + if (TRACE_OSO) logerror("%s: Invalid write on %04x: %02x\n", tag().c_str(), (offset<<1) | 0x5ff0, data); break; } } @@ -947,7 +947,7 @@ const device_type OSO = &device_creator<ti998_oso_device>; #define SPEECHSYN_TAG "speechsyn" #define REAL_TIMING 0 -ti998_spsyn_device::ti998_spsyn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ti998_spsyn_device::ti998_spsyn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : bus8z_device(mconfig, SPEECH8, "TI-99/8 Onboard Speech synthesizer", tag, owner, clock, "ti998_speech", __FILE__), m_vsp(nullptr), m_ready(*this) { @@ -963,7 +963,7 @@ READ8Z_MEMBER( ti998_spsyn_device::readz ) m_vsp->wsq_w(TRUE); m_vsp->rsq_w(FALSE); *value = m_vsp->read(offset) & 0xff; - if (TRACE_SPEECH) logerror("%s: read value = %02x\n", tag(), *value); + if (TRACE_SPEECH) logerror("%s: read value = %02x\n", tag().c_str(), *value); } /* @@ -973,7 +973,7 @@ WRITE8_MEMBER( ti998_spsyn_device::write ) { m_vsp->rsq_w(m_vsp, TRUE); m_vsp->wsq_w(m_vsp, FALSE); - if (TRACE_SPEECH) logerror("%s: write value = %02x\n", tag(), data); + if (TRACE_SPEECH) logerror("%s: write value = %02x\n", tag().c_str(), data); m_vsp->write(offset, data); } @@ -984,7 +984,7 @@ READ8Z_MEMBER( ti998_spsyn_device::readz ) { machine().device("maincpu")->execute().adjust_icount(-(18+3)); /* this is just a minimum, it can be more */ *value = m_vsp->status_r(space, offset, 0xff) & 0xff; - if (TRACE_SPEECH) logerror("%s: read value = %02x\n", tag(), *value); + if (TRACE_SPEECH) logerror("%s: read value = %02x\n", tag().c_str(), *value); } /* @@ -1002,12 +1002,12 @@ WRITE8_MEMBER( ti998_spsyn_device::write ) { attotime time_to_ready = attotime::from_double(m_vsp->time_to_ready()); int cycles_to_ready = machine().device<cpu_device>("maincpu")->attotime_to_cycles(time_to_ready); - if (TRACE_SPEECH && TRACE_DETAIL) logerror("%s: time to ready: %f -> %d\n", tag(), time_to_ready.as_double(), (int) cycles_to_ready); + if (TRACE_SPEECH && TRACE_DETAIL) logerror("%s: time to ready: %f -> %d\n", tag().c_str(), time_to_ready.as_double(), (int) cycles_to_ready); machine().device("maincpu")->execute().adjust_icount(-cycles_to_ready); machine().scheduler().timer_set(attotime::zero, FUNC_NULL); } - if (TRACE_SPEECH) logerror("%s: write value = %02x\n", tag(), data); + if (TRACE_SPEECH) logerror("%s: write value = %02x\n", tag().c_str(), data); m_vsp->data_w(space, offset, data); } #endif @@ -1018,7 +1018,7 @@ WRITE_LINE_MEMBER( ti998_spsyn_device::speech8_ready ) { // The TMS5200 implementation uses TRUE/FALSE, not ASSERT/CLEAR semantics m_ready((state==0)? ASSERT_LINE : CLEAR_LINE); - if (TRACE_SPEECH) logerror("%s: READY = %d\n", tag(), (state==0)); + if (TRACE_SPEECH) logerror("%s: READY = %d\n", tag().c_str(), (state==0)); #if REAL_TIMING // Need to do that here (see explanations in spchsyn.c) @@ -1040,7 +1040,7 @@ void ti998_spsyn_device::device_start() void ti998_spsyn_device::device_reset() { - if (TRACE_SPEECH) logerror("%s: reset\n", tag()); + if (TRACE_SPEECH) logerror("%s: reset\n", tag().c_str()); } // Unlike the TI-99/4A, the 99/8 uses the CD2501ECD diff --git a/src/devices/bus/ti99x/998board.h b/src/devices/bus/ti99x/998board.h index 9231d9be647..b5586afcbf3 100644 --- a/src/devices/bus/ti99x/998board.h +++ b/src/devices/bus/ti99x/998board.h @@ -124,7 +124,7 @@ private: class ti998_oso_device : public device_t { public: - ti998_oso_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ti998_oso_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); void device_start() override; @@ -145,7 +145,7 @@ private: class ti998_spsyn_device : public bus8z_device { public: - ti998_spsyn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ti998_spsyn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template<class _Object> static devcb_base &set_ready_wr_callback(device_t &device, _Object object) { return downcast<ti998_spsyn_device &>(device).m_ready.set_callback(object); } @@ -186,7 +186,7 @@ private: class mainboard8_device : public bus8z_device { public: - mainboard8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + mainboard8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template<class _Object> static devcb_base &set_ready_wr_callback(device_t &device, _Object object) { return downcast<mainboard8_device &>(device).m_ready.set_callback(object); } diff --git a/src/devices/bus/ti99x/datamux.cpp b/src/devices/bus/ti99x/datamux.cpp index 1b8ec8de02f..25987a49f29 100644 --- a/src/devices/bus/ti99x/datamux.cpp +++ b/src/devices/bus/ti99x/datamux.cpp @@ -74,7 +74,7 @@ /* Constructor */ -ti99_datamux_device::ti99_datamux_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ti99_datamux_device::ti99_datamux_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, DATAMUX, "Databus multiplexer", tag, owner, clock, "ti99_datamux", __FILE__), m_spacep(nullptr), m_ready(*this), m_muxready(), m_sysready(), m_addr_buf(0), m_read_mode(false), m_latch(0), m_waitcount(0), m_ram16b(nullptr), m_use32k(false), m_base32k(0), m_cpu(nullptr) { } diff --git a/src/devices/bus/ti99x/datamux.h b/src/devices/bus/ti99x/datamux.h index 604dfb2e62f..6adec37d121 100644 --- a/src/devices/bus/ti99x/datamux.h +++ b/src/devices/bus/ti99x/datamux.h @@ -68,7 +68,7 @@ private: class ti99_datamux_device : public device_t { public: - ti99_datamux_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ti99_datamux_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ16_MEMBER( read ); DECLARE_WRITE16_MEMBER( write ); DECLARE_SETOFFSET_MEMBER( setoffset ); diff --git a/src/devices/bus/ti99x/genboard.cpp b/src/devices/bus/ti99x/genboard.cpp index 9d6aeef7e76..f653944c3df 100644 --- a/src/devices/bus/ti99x/genboard.cpp +++ b/src/devices/bus/ti99x/genboard.cpp @@ -205,7 +205,7 @@ #define TRACE_SETTING 1 #define TRACE_PFM 0 -geneve_mapper_device::geneve_mapper_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +geneve_mapper_device::geneve_mapper_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, GENEVE_MAPPER, "Geneve Gate Array", tag, owner, clock, "geneve_mapper", __FILE__), m_gromwaddr_LSB(false), m_gromraddr_LSB(false), m_grom_address(0), m_video_waitstates(false), m_extra_waitstates(false), m_ready_asserted(false), m_read_mode(false), m_debug_no_ws(false), m_geneve_mode(false), m_direct_mode(false), m_cartridge_size(0), m_cartridge_secondpage(false), m_cartridge6_writable(false), m_cartridge7_writable(false), m_turbo(false), m_genmod(false), m_timode(false), m_pfm_mode(0), m_pfm_bank(0), m_pfm_output_enable(false), m_sram_mask(0), m_sram_val(0), m_ready(*this), m_waitcount(0), m_ext_waitcount(0), m_clock(nullptr), m_cpu(nullptr), m_pfm512(nullptr), m_pfm512a(nullptr), m_keyboard(nullptr), m_video(nullptr), m_peribox(nullptr), m_sound(nullptr), m_sram(nullptr), m_dram(nullptr) { @@ -221,12 +221,12 @@ INPUT_CHANGED_MEMBER( geneve_mapper_device::settings_changed ) { case 1: // Turbo switch. May be changed at any time. - if (TRACE_SETTING) logerror("%s: Setting turbo flag to %d\n", tag(), value); + if (TRACE_SETTING) logerror("%s: Setting turbo flag to %d\n", tag().c_str(), value); m_turbo = (value!=0); break; case 2: // TIMode switch. Causes reset when changed. - if (TRACE_SETTING) logerror("%s: Setting timode flag to %d\n", tag(), value); + if (TRACE_SETTING) logerror("%s: Setting timode flag to %d\n", tag().c_str(), value); m_timode = (value!=0); machine().schedule_hard_reset(); break; @@ -235,7 +235,7 @@ INPUT_CHANGED_MEMBER( geneve_mapper_device::settings_changed ) set_boot_rom(value); break; default: - logerror("%s: Unknown setting %d ignored\n", tag(), number); + logerror("%s: Unknown setting %d ignored\n", tag().c_str(), number); } } @@ -326,7 +326,7 @@ void geneve_mapper_device::set_wait(int min) m_waitcount = min + 1; if (m_waitcount > 1) { - if (TRACE_LINES) logerror("%s: Pulling down READY line for %d cycles\n", tag(), min); + if (TRACE_LINES) logerror("%s: Pulling down READY line for %d cycles\n", tag().c_str(), min); m_ready(CLEAR_LINE); m_ready_asserted = false; } @@ -343,62 +343,62 @@ void geneve_mapper_device::set_boot_rom(int selection) switch (selection) { case GENEVE_098: - logerror("%s: Using 0.98 boot eprom\n", tag()); + logerror("%s: Using 0.98 boot eprom\n", tag().c_str()); m_eprom = machine().root_device().memregion("maincpu")->base() + 0x4000; m_pfm_mode = 0; break; case GENEVE_100: - logerror("%s: Using 1.00 boot eprom\n", tag()); + logerror("%s: Using 1.00 boot eprom\n", tag().c_str()); m_eprom = machine().root_device().memregion("maincpu")->base(); m_pfm_mode = 0; break; case GENEVE_PFM512: - logerror("%s: Using PFM512 (AT29C040)\n", tag()); + logerror("%s: Using PFM512 (AT29C040)\n", tag().c_str()); m_pfm_mode = 1; break; case GENEVE_PFM512A: - logerror("%s: Using PFM512A (AT29C040A)\n", tag()); + logerror("%s: Using PFM512A (AT29C040A)\n", tag().c_str()); m_pfm_mode = 2; break; default: - logerror("%s: Unknown boot ROM selection\n", tag()); + logerror("%s: Unknown boot ROM selection\n", tag().c_str()); } } void geneve_mapper_device::set_geneve_mode(bool geneve) { - if (TRACE_SETTING) logerror("%s: Setting Geneve mode = %d\n", tag(), geneve); + if (TRACE_SETTING) logerror("%s: Setting Geneve mode = %d\n", tag().c_str(), geneve); m_geneve_mode = geneve; } void geneve_mapper_device::set_direct_mode(bool direct) { - if (TRACE_SETTING) logerror("%s: Setting direct mode = %d\n", tag(), direct); + if (TRACE_SETTING) logerror("%s: Setting direct mode = %d\n", tag().c_str(), direct); m_direct_mode = direct; } void geneve_mapper_device::set_cartridge_size(int size) { - if (TRACE_SETTING) logerror("%s: Setting cartridge size to %d\n", tag(), size); + if (TRACE_SETTING) logerror("%s: Setting cartridge size to %d\n", tag().c_str(), size); m_cartridge_size = size; } void geneve_mapper_device::set_cartridge_writable(int base, bool write) { - if (TRACE_SETTING) logerror("%s: Cartridge %04x space writable = %d\n", tag(), base, write); + if (TRACE_SETTING) logerror("%s: Cartridge %04x space writable = %d\n", tag().c_str(), base, write); if (base==0x6000) m_cartridge6_writable = write; else m_cartridge7_writable = write; } void geneve_mapper_device::set_video_waitstates(bool wait) { - if (TRACE_SETTING) logerror("%s: Setting video waitstates = %d\n", tag(), wait); + if (TRACE_SETTING) logerror("%s: Setting video waitstates = %d\n", tag().c_str(), wait); m_video_waitstates = wait; } void geneve_mapper_device::set_extra_waitstates(bool wait) { - if (TRACE_SETTING) logerror("%s: Setting extra waitstates = %d\n", tag(), wait); + if (TRACE_SETTING) logerror("%s: Setting extra waitstates = %d\n", tag().c_str(), wait); m_extra_waitstates = wait; } @@ -467,7 +467,7 @@ READ8_MEMBER( geneve_mapper_device::readm ) { case MLGVIDEO: m_video->readz(space, dec->offset, &value, 0xff); - if (TRACE_READ) logerror("%s: Read video %04x -> %02x\n", tag(), dec->offset, value); + if (TRACE_READ) logerror("%s: Read video %04x -> %02x\n", tag().c_str(), dec->offset, value); // Video wait states are created *after* the access // Accordingly, they have no effect when execution is in onchip RAM if (m_video_waitstates) set_ext_wait(15); @@ -476,13 +476,13 @@ READ8_MEMBER( geneve_mapper_device::readm ) case MLGMAPPER: // mapper value = m_map[dec->offset]; - if (TRACE_READ) logerror("%s: read mapper %04x -> %02x\n", tag(), dec->offset, value); + if (TRACE_READ) logerror("%s: read mapper %04x -> %02x\n", tag().c_str(), dec->offset, value); break; case MLGKEY: // key if (!space.debugger_access()) value = m_keyboard->get_recent_key(); - if (TRACE_READ) logerror("%s: Read keyboard -> %02x\n", tag(), value); + if (TRACE_READ) logerror("%s: Read keyboard -> %02x\n", tag().c_str(), value); break; case MLGCLOCK: @@ -490,19 +490,19 @@ READ8_MEMBER( geneve_mapper_device::readm ) // tests on the real machine showed that // upper nibble is 0xf (probably because of the location at 0xf130?) value = m_clock->read(space, dec->offset) | 0xf0; - if (TRACE_READ) logerror("%s: Read clock %04x -> %02x\n", tag(), dec->offset, value); + if (TRACE_READ) logerror("%s: Read clock %04x -> %02x\n", tag().c_str(), dec->offset, value); break; case MLTMAPPER: // mapper value = m_map[dec->offset]; - if (TRACE_READ) logerror("%s: Read mapper %04x -> %02x\n", tag(), dec->offset, value); + if (TRACE_READ) logerror("%s: Read mapper %04x -> %02x\n", tag().c_str(), dec->offset, value); break; case MLTKEY: // key if (!space.debugger_access()) value = m_keyboard->get_recent_key(); - if (TRACE_READ) logerror("%s: Read keyboard -> %02x\n", tag(), value); + if (TRACE_READ) logerror("%s: Read keyboard -> %02x\n", tag().c_str(), value); break; case MLTCLOCK: @@ -516,7 +516,7 @@ READ8_MEMBER( geneve_mapper_device::readm ) // value floating around. value = m_clock->read(space, dec->offset); value |= (dec->offset==0x000f)? 0x20 : 0x10; - if (TRACE_READ) logerror("%s: Read clock %04x -> %02x\n", tag(), dec->offset, value); + if (TRACE_READ) logerror("%s: Read clock %04x -> %02x\n", tag().c_str(), dec->offset, value); break; case MLTVIDEO: @@ -524,7 +524,7 @@ READ8_MEMBER( geneve_mapper_device::readm ) // ++++ ++-- ---- ---+ // 1000 1000 0000 00x0 m_video->readz(space, dec->offset, &value, 0xff); - if (TRACE_READ) logerror("%s: Read video %04x -> %02x\n", tag(), dec->offset, value); + if (TRACE_READ) logerror("%s: Read video %04x -> %02x\n", tag().c_str(), dec->offset, value); // See above if (m_video_waitstates) set_ext_wait(15); break; @@ -535,7 +535,7 @@ READ8_MEMBER( geneve_mapper_device::readm ) // 1001 0000 0000 0000 // We need to add the address prefix bits m_peribox->readz(space, dec->offset, &value, 0xff); - if (TRACE_READ) logerror("%s: Read speech -> %02x\n", tag(), value); + if (TRACE_READ) logerror("%s: Read speech -> %02x\n", tag().c_str(), value); break; case MLTGROM: @@ -543,7 +543,7 @@ READ8_MEMBER( geneve_mapper_device::readm ) // ++++ ++-- ---- ---+ // 1001 1000 0000 00x0 if (!space.debugger_access()) value = read_grom(space, dec->offset, 0xff); - if (TRACE_READ) logerror("%s: Read GROM %04x -> %02x\n", tag(), dec->offset, value); + if (TRACE_READ) logerror("%s: Read GROM %04x -> %02x\n", tag().c_str(), dec->offset, value); break; case MLGSOUND: @@ -556,12 +556,12 @@ READ8_MEMBER( geneve_mapper_device::readm ) // DRAM. value = m_dram[dec->physaddr]; // LOG("dram read physaddr = %06x logaddr = %04x value = %02x\n", dec->physaddr, dec->offset, value); - if (TRACE_READ) logerror("%s: Read DRAM %04x (%06x) -> %02x\n", tag(), dec->offset, dec->physaddr, value); + if (TRACE_READ) logerror("%s: Read DRAM %04x (%06x) -> %02x\n", tag().c_str(), dec->offset, dec->physaddr, value); break; case MPGEXP: // On-board memory expansion for standard Geneve (never used) - if (TRACE_READ) logerror("%s: Read unmapped area %06x\n", tag(), dec->physaddr); + if (TRACE_READ) logerror("%s: Read unmapped area %06x\n", tag().c_str(), dec->physaddr); value = 0; break; @@ -571,7 +571,7 @@ READ8_MEMBER( geneve_mapper_device::readm ) if (m_pfm_mode == 0) { value = m_eprom[dec->physaddr & 0x003fff]; - if (TRACE_READ) logerror("%s: Read EPROM %04x (%06x) -> %02x\n", tag(), dec->offset, dec->physaddr, value); + if (TRACE_READ) logerror("%s: Read EPROM %04x (%06x) -> %02x\n", tag().c_str(), dec->offset, dec->physaddr, value); } else value = read_from_pfm(space, dec->physaddr, 0xff); @@ -585,7 +585,7 @@ READ8_MEMBER( geneve_mapper_device::readm ) else value = 0; // Return in any case // LOG("sram read physaddr = %06x logaddr = %04x value = %02x\n", dec->physaddr, dec->offset, value); - if (TRACE_READ) logerror("%s: Read SRAM %04x (%06x) -> %02x\n", tag(), dec->offset, dec->physaddr, value); + if (TRACE_READ) logerror("%s: Read SRAM %04x (%06x) -> %02x\n", tag().c_str(), dec->offset, dec->physaddr, value); break; case MPGBOX: @@ -594,7 +594,7 @@ READ8_MEMBER( geneve_mapper_device::readm ) // 0x000000-0x1fffff for the GenMod.(AME,AMD,AMC,AMB,AMA,A0 ...,A15) m_peribox->readz(space, dec->physaddr, &value, 0xff); - if (TRACE_READ) logerror("%s: Read P-Box %04x (%06x) -> %02x\n", tag(), dec->offset, dec->physaddr, value); + if (TRACE_READ) logerror("%s: Read P-Box %04x (%06x) -> %02x\n", tag().c_str(), dec->offset, dec->physaddr, value); break; case MPGMDRAM: @@ -608,7 +608,7 @@ READ8_MEMBER( geneve_mapper_device::readm ) if (m_pfm_mode == 0) { value = m_eprom[dec->physaddr & 0x003fff]; - if (TRACE_READ) logerror("%s: Read EPROM %04x (%06x) -> %02x\n", tag(), dec->offset, dec->physaddr, value); + if (TRACE_READ) logerror("%s: Read EPROM %04x (%06x) -> %02x\n", tag().c_str(), dec->offset, dec->physaddr, value); } else value = read_from_pfm(space, dec->physaddr, 0xff); break; @@ -647,7 +647,7 @@ WRITE8_MEMBER( geneve_mapper_device::writem ) // ++++ ++++ ++++ ---+ // 1111 0001 0000 .cc0 m_video->write(space, dec->offset, data, 0xff); - if (TRACE_WRITE) logerror("%s: Write video %04x <- %02x\n", tag(), offset, data); + if (TRACE_WRITE) logerror("%s: Write video %04x <- %02x\n", tag().c_str(), offset, data); // See above if (m_video_waitstates) set_ext_wait(15); break; @@ -655,33 +655,33 @@ WRITE8_MEMBER( geneve_mapper_device::writem ) case MLGMAPPER: // mapper m_map[dec->offset] = data; - if (TRACE_WRITE) logerror("%s: Write mapper %04x <- %02x\n", tag(), offset, data); + if (TRACE_WRITE) logerror("%s: Write mapper %04x <- %02x\n", tag().c_str(), offset, data); break; case MLGCLOCK: // clock // ++++ ++++ ++++ ---- m_clock->write(space, dec->offset, data); - if (TRACE_WRITE) logerror("%s: Write clock %04x <- %02x\n", tag(), offset, data); + if (TRACE_WRITE) logerror("%s: Write clock %04x <- %02x\n", tag().c_str(), offset, data); break; case MLGSOUND: // sound // ++++ ++++ ++++ ---+ m_sound->write(space, 0, data, 0xff); - if (TRACE_WRITE) logerror("%s: Write sound <- %02x\n", tag(), data); + if (TRACE_WRITE) logerror("%s: Write sound <- %02x\n", tag().c_str(), data); break; case MLTMAPPER: // mapper m_map[dec->offset] = data; - if (TRACE_WRITE) logerror("%s: Write mapper %04x <- %02x\n", tag(), offset, data); + if (TRACE_WRITE) logerror("%s: Write mapper %04x <- %02x\n", tag().c_str(), offset, data); break; case MLTCLOCK: // clock m_clock->write(space, dec->offset, data); - if (TRACE_WRITE) logerror("%s: Write clock %04x <- %02x\n", tag(), offset, data); + if (TRACE_WRITE) logerror("%s: Write clock %04x <- %02x\n", tag().c_str(), offset, data); break; case MLTVIDEO: @@ -690,7 +690,7 @@ WRITE8_MEMBER( geneve_mapper_device::writem ) // 1000 1100 0000 00c0 // Initialize waitstate timer m_video->write(space, dec->offset, data, 0xff); - if (TRACE_WRITE) logerror("%s: Write video %04x <- %02x\n", tag(), offset, data); + if (TRACE_WRITE) logerror("%s: Write video %04x <- %02x\n", tag().c_str(), offset, data); // See above if (m_video_waitstates) set_ext_wait(15); break; @@ -701,7 +701,7 @@ WRITE8_MEMBER( geneve_mapper_device::writem ) // 1001 0100 0000 0000 // We need to add the address prefix bits m_peribox->write(space, dec->offset, data, 0xff); - if (TRACE_WRITE) logerror("%s: Write speech <- %02x\n", tag(), data); + if (TRACE_WRITE) logerror("%s: Write speech <- %02x\n", tag().c_str(), data); break; case MLTGROM: @@ -709,7 +709,7 @@ WRITE8_MEMBER( geneve_mapper_device::writem ) // ++++ ++-- ---- ---+ // 1001 1100 0000 00c0 write_grom(space, dec->offset, data, 0xff); - if (TRACE_WRITE) logerror("%s: Write GROM %04x <- %02x\n", tag(), offset, data); + if (TRACE_WRITE) logerror("%s: Write GROM %04x <- %02x\n", tag().c_str(), offset, data); break; case MLTSOUND: @@ -717,7 +717,7 @@ WRITE8_MEMBER( geneve_mapper_device::writem ) // ++++ ++-- ---- ---+ // 1000 0100 0000 0000 m_sound->write(space, 0, data, 0xff); - if (TRACE_WRITE) logerror("%s: Write sound <- %02x\n", tag(), data); + if (TRACE_WRITE) logerror("%s: Write sound <- %02x\n", tag().c_str(), data); break; case MLTKEY: @@ -727,12 +727,12 @@ WRITE8_MEMBER( geneve_mapper_device::writem ) case MPGDRAM: // DRAM write. One wait state. (only for normal Geneve) m_dram[dec->physaddr] = data; - if (TRACE_WRITE) logerror("%s: Write DRAM %04x (%06x) <- %02x\n", tag(), offset, dec->physaddr, data); + if (TRACE_WRITE) logerror("%s: Write DRAM %04x (%06x) <- %02x\n", tag().c_str(), offset, dec->physaddr, data); break; case MPGEXP: // On-board memory expansion for standard Geneve (never used) - if (TRACE_WRITE) logerror("%s: Write unmapped area %06x\n", tag(), dec->physaddr); + if (TRACE_WRITE) logerror("%s: Write unmapped area %06x\n", tag().c_str(), dec->physaddr); break; case MPGEPROM: @@ -741,7 +741,7 @@ WRITE8_MEMBER( geneve_mapper_device::writem ) // Ignore EPROM write (unless PFM) if (m_pfm_mode != 0) write_to_pfm(space, dec->physaddr, data, 0xff); else - logerror("%s: Write EPROM %04x (%06x) <- %02x, ignored\n", tag(), offset, dec->physaddr, data); + logerror("%s: Write EPROM %04x (%06x) <- %02x, ignored\n", tag().c_str(), offset, dec->physaddr, data); break; case MPGSRAM: @@ -749,12 +749,12 @@ WRITE8_MEMBER( geneve_mapper_device::writem ) { m_sram[dec->physaddr & ~m_sram_mask] = data; } - if (TRACE_WRITE) logerror("%s: Write SRAM %04x (%06x) <- %02x\n", tag(), offset, dec->physaddr, data); + if (TRACE_WRITE) logerror("%s: Write SRAM %04x (%06x) <- %02x\n", tag().c_str(), offset, dec->physaddr, data); break; case MPGBOX: dec->physaddr = (dec->physaddr & 0x0007ffff); // 19 bit address - if (TRACE_WRITE) logerror("%s: Write P-Box %04x (%06x) <- %02x\n", tag(), offset, dec->physaddr, data); + if (TRACE_WRITE) logerror("%s: Write P-Box %04x (%06x) <- %02x\n", tag().c_str(), offset, dec->physaddr, data); m_peribox->write(space, dec->physaddr, data, 0xff); break; @@ -769,7 +769,7 @@ WRITE8_MEMBER( geneve_mapper_device::writem ) // Ignore EPROM write if (m_pfm_mode != 0) write_to_pfm(space, dec->physaddr, data, 0xff); else - logerror("%s: Write EPROM %04x (%06x) <- %02x, ignored\n", tag(), offset, dec->physaddr, data); + logerror("%s: Write EPROM %04x (%06x) <- %02x, ignored\n", tag().c_str(), offset, dec->physaddr, data); break; case MPGMBOX: @@ -1092,7 +1092,7 @@ void geneve_mapper_device::decode(address_space& space, offs_t offset, bool read if (m_cartridge_size==0x4000) { m_cartridge_secondpage = ((dec->offset & 0x0002)!=0); - if (TRACE_WRITE) logerror("%s: Set cartridge page %02x\n", tag(), m_cartridge_secondpage); + if (TRACE_WRITE) logerror("%s: Set cartridge page %02x\n", tag().c_str(), m_cartridge_secondpage); set_wait(1); return; } @@ -1102,7 +1102,7 @@ void geneve_mapper_device::decode(address_space& space, offs_t offset, bool read if ((((dec->offset & 0x1000)==0x0000) && !m_cartridge6_writable) || (((dec->offset & 0x1000)==0x1000) && !m_cartridge7_writable)) { - logerror("%s: Writing to protected cartridge space %04x ignored\n", tag(), dec->offset); + logerror("%s: Writing to protected cartridge space %04x ignored\n", tag().c_str(), dec->offset); return; } else @@ -1200,11 +1200,11 @@ READ8_MEMBER( geneve_mapper_device::read_from_pfm ) value = m_pfm512a->read(space, address, mem_mask); break; default: - logerror("%s: Illegal mode for reading PFM: %d\n", tag(), m_pfm_mode); + logerror("%s: Illegal mode for reading PFM: %d\n", tag().c_str(), m_pfm_mode); return 0; } - if (TRACE_PFM) logerror("%s: Reading from PFM at address %05x -> %02x\n", tag(), address, value); + if (TRACE_PFM) logerror("%s: Reading from PFM at address %05x -> %02x\n", tag().c_str(), address, value); return value; } @@ -1213,7 +1213,7 @@ WRITE8_MEMBER( geneve_mapper_device::write_to_pfm ) // Nota bene: The PFM must be write protected on startup, or the RESET // of the 9995 will attempt to write the return vector into the flash EEPROM int address = (offset & 0x01ffff) | (m_pfm_bank<<17); - if (TRACE_PFM) logerror("%s: Writing to PFM at address %05x <- %02x\n", tag(), address, data); + if (TRACE_PFM) logerror("%s: Writing to PFM at address %05x <- %02x\n", tag().c_str(), address, data); switch (m_pfm_mode) { @@ -1224,7 +1224,7 @@ WRITE8_MEMBER( geneve_mapper_device::write_to_pfm ) m_pfm512a->write(space, address, data, mem_mask); break; default: - logerror("%s: Illegal mode for writing to PFM: %d\n", tag(), m_pfm_mode); + logerror("%s: Illegal mode for writing to PFM: %d\n", tag().c_str(), m_pfm_mode); } } @@ -1236,7 +1236,7 @@ WRITE8_MEMBER( geneve_mapper_device::write_to_pfm ) */ SETOFFSET_MEMBER( geneve_mapper_device::setoffset ) { - if (TRACE_DETAIL) logerror("%s: setoffset = %04x\n", tag(), offset); + if (TRACE_DETAIL) logerror("%s: setoffset = %04x\n", tag().c_str(), offset); m_debug_no_ws = false; decode(space, offset, m_read_mode, &m_decoded); } @@ -1265,13 +1265,13 @@ WRITE_LINE_MEMBER( geneve_mapper_device::clock_in ) m_waitcount--; if (m_waitcount == 0) { - if (TRACE_CLOCK) logerror("%s: clock, READY asserted\n", tag()); + if (TRACE_CLOCK) logerror("%s: clock, READY asserted\n", tag().c_str()); m_ready(ASSERT_LINE); m_ready_asserted = true; } else { - if (TRACE_CLOCK) logerror("%s: clock\n", tag()); + if (TRACE_CLOCK) logerror("%s: clock\n", tag().c_str()); } } else @@ -1281,13 +1281,13 @@ WRITE_LINE_MEMBER( geneve_mapper_device::clock_in ) m_ext_waitcount--; if (m_ext_waitcount == 0) { - if (TRACE_CLOCK) logerror("%s: clock, READY asserted after video\n", tag()); + if (TRACE_CLOCK) logerror("%s: clock, READY asserted after video\n", tag().c_str()); m_ready(ASSERT_LINE); m_ready_asserted = true; } else { - if (TRACE_CLOCK) logerror("%s: vclock, ew=%d\n", tag(), m_ext_waitcount); + if (TRACE_CLOCK) logerror("%s: vclock, ew=%d\n", tag().c_str(), m_ext_waitcount); } } } @@ -1299,7 +1299,7 @@ WRITE_LINE_MEMBER( geneve_mapper_device::clock_in ) // Do we have video wait states? In that case, clear the line again if ((m_waitcount == 0) && (m_ext_waitcount > 0) && m_ready_asserted) { - if (TRACE_CLOCK) logerror("%s: clock, READY cleared for video\n", tag()); + if (TRACE_CLOCK) logerror("%s: clock, READY cleared for video\n", tag().c_str()); m_ready(CLEAR_LINE); m_ready_asserted = false; } @@ -1312,7 +1312,7 @@ WRITE_LINE_MEMBER( geneve_mapper_device::clock_in ) WRITE_LINE_MEMBER( geneve_mapper_device::dbin_in ) { m_read_mode = (state==ASSERT_LINE); - if (TRACE_DETAIL) logerror("%s: dbin = %02x\n", tag(), m_read_mode? 1:0); + if (TRACE_DETAIL) logerror("%s: dbin = %02x\n", tag().c_str(), m_read_mode? 1:0); } /* @@ -1322,21 +1322,21 @@ WRITE_LINE_MEMBER( geneve_mapper_device::pfm_select_lsb ) { if (state==ASSERT_LINE) m_pfm_bank |= 1; else m_pfm_bank &= 0xfe; - if (TRACE_PFM) logerror("%s: Setting bank (l) = %d\n", tag(), m_pfm_bank); + if (TRACE_PFM) logerror("%s: Setting bank (l) = %d\n", tag().c_str(), m_pfm_bank); } WRITE_LINE_MEMBER( geneve_mapper_device::pfm_select_msb ) { if (state==ASSERT_LINE) m_pfm_bank |= 2; else m_pfm_bank &= 0xfd; - if (TRACE_PFM) logerror("%s: Setting bank (u) = %d\n", tag(), m_pfm_bank); + if (TRACE_PFM) logerror("%s: Setting bank (u) = %d\n", tag().c_str(), m_pfm_bank); } WRITE_LINE_MEMBER( geneve_mapper_device::pfm_output_enable ) { // Negative logic m_pfm_output_enable = (state==CLEAR_LINE); - if (TRACE_PFM) logerror("%s: PFM output %s\n", tag(), m_pfm_output_enable? "enable" : "disable"); + if (TRACE_PFM) logerror("%s: PFM output %s\n", tag().c_str(), m_pfm_output_enable? "enable" : "disable"); } //==================================================================== @@ -1396,7 +1396,7 @@ void geneve_mapper_device::device_reset() // Check for GenMod. We assume that GenMod can be combined with PFM. if (machine().root_device().ioport("MODE")->read()!=0) { - logerror("%s: Using GenMod modification\n", tag()); + logerror("%s: Using GenMod modification\n", tag().c_str()); m_eprom = machine().root_device().memregion("maincpu")->base() + 0x8000; if (m_eprom[0] != 0xf0) { @@ -1466,7 +1466,7 @@ static const UINT8 MF1_CODE[0xe] = 0x53 /* delete */ }; -geneve_keyboard_device::geneve_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +geneve_keyboard_device::geneve_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, GENEVE_KEYBOARD, "Geneve XT-style keyboard", tag, owner, clock, "geneve_keyboard", __FILE__), m_interrupt(*this), m_key_reset(false), m_key_queue_length(0), m_key_queue_head(0), m_key_in_buffer(false), m_key_numlock_state(false), m_key_ctrl_state(0), m_key_alt_state(0), m_key_real_shift_state(0), m_key_fake_shift_state(false), m_key_fake_unshift_state(false), m_key_autorepeat_key(0), m_key_autorepeat_timer(0), m_keep_keybuf(false), @@ -1479,7 +1479,7 @@ void geneve_keyboard_device::post_in_key_queue(int keycode) m_key_queue[(m_key_queue_head + m_key_queue_length) % KEYQUEUESIZE] = keycode; m_key_queue_length++; - if (TRACE_KEYBOARD) logerror("%s: Posting keycode %02x\n", tag(), keycode); + if (TRACE_KEYBOARD) logerror("%s: Posting keycode %02x\n", tag().c_str(), keycode); } void geneve_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) @@ -1494,7 +1494,7 @@ void geneve_keyboard_device::poll() int i, j; int keycode; int pressed; - if (TRACE_KEYBOARD) logerror("%s: Poll keyboard\n", tag()); + if (TRACE_KEYBOARD) logerror("%s: Poll keyboard\n", tag().c_str()); if (m_key_reset) return; /* Poll keyboard */ @@ -1700,7 +1700,7 @@ void geneve_keyboard_device::signal_when_key_available() // buffer clear is disabled, and key queue is not empty. */ if ((!m_key_reset) && (m_keyboard_clock) && (m_keep_keybuf) && (m_key_queue_length != 0)) { - if (TRACE_KEYBOARD) logerror("%s: Signalling key available\n", tag()); + if (TRACE_KEYBOARD) logerror("%s: Signalling key available\n", tag().c_str()); m_interrupt(ASSERT_LINE); m_key_in_buffer = true; } @@ -1710,7 +1710,7 @@ WRITE_LINE_MEMBER( geneve_keyboard_device::clock_control ) { bool rising_edge = (!m_keyboard_clock && (state==ASSERT_LINE)); m_keyboard_clock = (state==ASSERT_LINE); - if (TRACE_KEYBOARD) logerror("%s: Keyboard clock_control state=%d\n", tag(), m_keyboard_clock); + if (TRACE_KEYBOARD) logerror("%s: Keyboard clock_control state=%d\n", tag().c_str(), m_keyboard_clock); if (rising_edge) signal_when_key_available(); } @@ -1919,7 +1919,7 @@ const device_type GENEVE_KEYBOARD = &device_creator<geneve_keyboard_device>; Mouse support ****************************************************************************/ -geneve_mouse_device::geneve_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +geneve_mouse_device::geneve_mouse_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, GENEVE_MOUSE, "Geneve mouse", tag, owner, clock, "geneve_mouse", __FILE__), m_v9938(nullptr), m_last_mx(0), m_last_my(0) { } diff --git a/src/devices/bus/ti99x/genboard.h b/src/devices/bus/ti99x/genboard.h index 2248c64f9fe..66c02ec94ad 100644 --- a/src/devices/bus/ti99x/genboard.h +++ b/src/devices/bus/ti99x/genboard.h @@ -29,7 +29,7 @@ extern const device_type GENEVE_MAPPER; class geneve_mouse_device : public device_t { public: - geneve_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + geneve_mouse_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void poll(); line_state left_button(); // left button is not connected to the V9938 but to a TMS9901 pin @@ -57,7 +57,7 @@ private: class geneve_keyboard_device : public device_t { public: - geneve_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + geneve_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_WRITE_LINE_MEMBER( reset_line ); DECLARE_WRITE_LINE_MEMBER( send_scancodes ); DECLARE_WRITE_LINE_MEMBER( clock_control ); @@ -109,7 +109,7 @@ private: class geneve_mapper_device : public device_t { public: - geneve_mapper_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + geneve_mapper_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void set_geneve_mode(bool geneve); void set_direct_mode(bool direct); void set_cartridge_size(int size); diff --git a/src/devices/bus/ti99x/grom.cpp b/src/devices/bus/ti99x/grom.cpp index 1ecb0168d80..d58a137c63f 100644 --- a/src/devices/bus/ti99x/grom.cpp +++ b/src/devices/bus/ti99x/grom.cpp @@ -92,7 +92,7 @@ /* Constructor. */ -ti99_grom_device::ti99_grom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ti99_grom_device::ti99_grom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : bus8z_device(mconfig, GROM, "TI-99 GROM device", tag, owner, clock, "ti99_grom", __FILE__), m_writable(false), m_ident(0), m_size(0), m_gromready(*this), m_clockrate(0), m_address(0), m_buffer(0), m_raddr_LSB(false), m_waddr_LSB(false), m_memptr(nullptr), m_timer(nullptr) { diff --git a/src/devices/bus/ti99x/grom.h b/src/devices/bus/ti99x/grom.h index a3129b6997f..8019076fa0a 100644 --- a/src/devices/bus/ti99x/grom.h +++ b/src/devices/bus/ti99x/grom.h @@ -39,7 +39,7 @@ extern const device_type GROM; class ti99_grom_device : public bus8z_device, ti99grom_config { public: - ti99_grom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ti99_grom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template<class _Object> static devcb_base &set_ready_wr_callback(device_t &device, _Object object) { return downcast<ti99_grom_device &>(device).m_gromready.set_callback(object); } diff --git a/src/devices/bus/ti99x/gromport.cpp b/src/devices/bus/ti99x/gromport.cpp index 9e1533cb9a8..c98a8d2e58a 100644 --- a/src/devices/bus/ti99x/gromport.cpp +++ b/src/devices/bus/ti99x/gromport.cpp @@ -180,7 +180,7 @@ static void image_battery_save_by_name(emu_options &options, const char *filenam } -gromport_device::gromport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +gromport_device::gromport_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : bus8z_device(mconfig, GROMPORT, "Cartridge port", tag, owner, clock, "gromport", __FILE__), device_slot_interface(mconfig, *this), m_connector(nullptr), @@ -294,7 +294,7 @@ const device_type GROMPORT_SINGLE = &device_creator<single_conn_device>; const device_type GROMPORT_MULTI = &device_creator<multi_conn_device>; const device_type GROMPORT_GK = &device_creator<gkracker_device>; -ti99_cartridge_connector_device::ti99_cartridge_connector_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +ti99_cartridge_connector_device::ti99_cartridge_connector_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source), m_gromport(nullptr) { @@ -320,7 +320,7 @@ UINT16 ti99_cartridge_connector_device::grom_mask() return m_gromport->get_grom_mask(); } -single_conn_device::single_conn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +single_conn_device::single_conn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ti99_cartridge_connector_device(mconfig, GROMPORT_SINGLE, "Standard cartridge connector", tag, owner, clock, "single", __FILE__), m_cartridge(nullptr) { @@ -413,7 +413,7 @@ machine_config_constructor single_conn_device::device_mconfig_additions() const #define AUTO -1 -multi_conn_device::multi_conn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +multi_conn_device::multi_conn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ti99_cartridge_connector_device(mconfig, GROMPORT_MULTI, "Multi-cartridge extender", tag, owner, clock, "multi", __FILE__), m_active_slot(0), m_fixed_slot(0), @@ -462,7 +462,7 @@ multi_conn_device::multi_conn_device(const machine_config &mconfig, const char * void multi_conn_device::set_slot(int slotnumber) { if (TRACE_CHANGE) - if (m_active_slot != slotnumber) logerror("%s: Setting cartslot to %d\n", tag(), slotnumber); + if (m_active_slot != slotnumber) logerror("%s: Setting cartslot to %d\n", tag().c_str(), slotnumber); if (m_fixed_slot==AUTO) m_active_slot = slotnumber; @@ -486,14 +486,14 @@ int multi_conn_device::get_active_slot(bool changebase, offs_t offset) void multi_conn_device::insert(int index, ti99_cartridge_device* cart) { - if (TRACE_CHANGE) logerror("%s: Insert slot %d\n", tag(), index); + if (TRACE_CHANGE) logerror("%s: Insert slot %d\n", tag().c_str(), index); m_cartridge[index] = cart; m_gromport->cartridge_inserted(); } void multi_conn_device::remove(int index) { - if (TRACE_CHANGE) logerror("%s: Remove slot %d\n", tag(), index); + if (TRACE_CHANGE) logerror("%s: Remove slot %d\n", tag().c_str(), index); m_cartridge[index] = nullptr; } @@ -548,7 +548,7 @@ WRITE8_MEMBER(multi_conn_device::write) { if (slot < NUMBER_OF_CARTRIDGE_SLOTS && m_cartridge[slot] != nullptr) { - // logerror("%s: try it on slot %d\n", tag(), slot); + // logerror("%s: try it on slot %d\n", tag().c_str(), slot); m_cartridge[slot]->write(space, offset, data, mem_mask); } } @@ -739,7 +739,7 @@ enum #define GKSWITCH4_TAG "GKSWITCH4" #define GKSWITCH5_TAG "GKSWITCH5" -gkracker_device::gkracker_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +gkracker_device::gkracker_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ti99_cartridge_connector_device(mconfig, GROMPORT_GK, "GRAMKracker", tag, owner, clock, "ti99_gkracker", __FILE__), device_nvram_interface(mconfig, *this), m_ram_page(0), @@ -852,7 +852,7 @@ READ8Z_MEMBER(gkracker_device::readz) } } } - if (TRACE_READ) logerror("%s: Read %04x -> %02x\n", tag(), offset, *value); + if (TRACE_READ) logerror("%s: Read %04x -> %02x\n", tag().c_str(), offset, *value); } WRITE8_MEMBER(gkracker_device::write) @@ -874,7 +874,7 @@ WRITE8_MEMBER(gkracker_device::write) // Accept low address byte (second write) m_grom_address = (m_grom_address & 0xff00) | data; m_waddr_LSB = false; - if (TRACE_GROM) logerror("%s: Set grom address %04x\n", tag(), m_grom_address); + if (TRACE_GROM) logerror("%s: Set grom address %04x\n", tag().c_str(), m_grom_address); } else { @@ -886,7 +886,7 @@ WRITE8_MEMBER(gkracker_device::write) else { // Write data byte to GRAM area. - if (TRACE_GROM) logerror("%s: gwrite %04x(%04x) <- %02x\n", tag(), offset, m_grom_address, data); + if (TRACE_GROM) logerror("%s: gwrite %04x(%04x) <- %02x\n", tag().c_str(), offset, m_grom_address, data); // According to manual: // Writing to GRAM 0: switch 2 set to GRAM 0 + Write protect switch (4) in 1 or 2 position @@ -925,7 +925,7 @@ WRITE8_MEMBER(gkracker_device::write) { // Write to the RAM space of the GRAM Kracker // (only if no cartridge is present) - if (TRACE_GROM) logerror("%s: write %04x <- %02x\n", tag(), offset, data); + if (TRACE_GROM) logerror("%s: write %04x <- %02x\n", tag().c_str(), offset, data); if (m_cartridge == nullptr) { if (m_gk_switch[1] == GK_OFF) return; // just don't do anything @@ -962,13 +962,13 @@ WRITE8_MEMBER( gkracker_device::cruwrite ) INPUT_CHANGED_MEMBER( gkracker_device::gk_changed ) { - if (TRACE_GKRACKER) logerror("%s: Input changed %d - %d\n", tag(), (int)((UINT64)param & 0x07), newval); + if (TRACE_GKRACKER) logerror("%s: Input changed %d - %d\n", tag().c_str(), (int)((UINT64)param & 0x07), newval); m_gk_switch[(UINT64)param & 0x07] = newval; } void gkracker_device::insert(int index, ti99_cartridge_device* cart) { - if (TRACE_CHANGE) logerror("%s: Insert cartridge\n", tag()); + if (TRACE_CHANGE) logerror("%s: Insert cartridge\n", tag().c_str()); m_cartridge = cart; // Switch 1 has a third location for resetting. We do the reset by default // here. It can be turned off in the configuration. @@ -977,7 +977,7 @@ void gkracker_device::insert(int index, ti99_cartridge_device* cart) void gkracker_device::remove(int index) { - if (TRACE_CHANGE) logerror("%s: Remove cartridge\n", tag()); + if (TRACE_CHANGE) logerror("%s: Remove cartridge\n", tag().c_str()); m_cartridge = nullptr; } @@ -1000,7 +1000,7 @@ void gkracker_device::gk_install_menu(const char* menutext, int len, int ptr, in */ void gkracker_device::nvram_default() { - if (TRACE_GKRACKER) logerror("%s: Creating default NVRAM\n", tag()); + if (TRACE_GKRACKER) logerror("%s: Creating default NVRAM\n", tag().c_str()); memset(m_ram_ptr, 0, 81920); m_ram_ptr[0x6000] = 0xaa; @@ -1024,7 +1024,7 @@ void gkracker_device::nvram_default() void gkracker_device::nvram_read(emu_file &file) { int readsize = file.read(m_ram_ptr, 81920); - if (TRACE_GKRACKER) logerror("%s: Reading NVRAM\n", tag()); + if (TRACE_GKRACKER) logerror("%s: Reading NVRAM\n", tag().c_str()); // If we increased the size, fill the remaining parts with 0 if (readsize < 81920) { @@ -1034,7 +1034,7 @@ void gkracker_device::nvram_read(emu_file &file) void gkracker_device::nvram_write(emu_file &file) { - if (TRACE_GKRACKER) logerror("%s: Writing NVRAM\n", tag()); + if (TRACE_GKRACKER) logerror("%s: Writing NVRAM\n", tag().c_str()); file.write(m_ram_ptr, 81920); } @@ -1164,7 +1164,7 @@ static const pcb_type sw_pcbdefs[] = { 0, nullptr} }; -ti99_cartridge_device::ti99_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ti99_cartridge_device::ti99_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : bus8z_device(mconfig, TI99CART, "TI-99 cartridge", tag, owner, clock, "cartridge", __FILE__), device_image_interface(mconfig, *this), m_softlist(false), @@ -1196,7 +1196,7 @@ void ti99_cartridge_device::prepare_cartridge() for (int i=0; i < 5; i++) m_pcb->m_grom[i] = nullptr; m_pcb->m_grom_size = m_softlist? get_software_region_length("grom_socket") : m_rpk->get_resource_length("grom_socket"); - if (TRACE_CONFIG) logerror("%s: grom_socket.size=0x%04x\n", tag(), m_pcb->m_grom_size); + if (TRACE_CONFIG) logerror("%s: grom_socket.size=0x%04x\n", tag().c_str(), m_pcb->m_grom_size); if (m_pcb->m_grom_size > 0) { @@ -1217,7 +1217,7 @@ void ti99_cartridge_device::prepare_cartridge() m_pcb->m_rom_size = m_softlist? get_software_region_length("rom_socket") : m_rpk->get_resource_length("rom_socket"); if (m_pcb->m_rom_size > 0) { - if (TRACE_CONFIG) logerror("%s: rom_socket.size=0x%04x\n", tag(), m_pcb->m_rom_size); + if (TRACE_CONFIG) logerror("%s: rom_socket.size=0x%04x\n", tag().c_str(), m_pcb->m_rom_size); regr = memregion(CARTROM_TAG); rom_ptr = m_softlist? get_software_region("rom_socket") : m_rpk->get_contents_of_socket("rom_socket"); memcpy(regr->base(), rom_ptr, m_pcb->m_rom_size); @@ -1254,7 +1254,7 @@ void ti99_cartridge_device::prepare_cartridge() */ int ti99_cartridge_device::get_index_from_tagname() { - const char *mytag = tag(); + const char *mytag = tag().c_str(); int maxlen = strlen(mytag); int i; @@ -1284,11 +1284,11 @@ bool ti99_cartridge_device::call_load() { // File name is in m_basename // return true = error - if (TRACE_CHANGE) logerror("%s: Loading %s in slot %s\n", tag(), m_basename.c_str(), tag()); + if (TRACE_CHANGE) logerror("%s: Loading %s in slot %s\n", tag().c_str(), m_basename.c_str(), tag().c_str()); if (m_softlist) { - if (TRACE_CONFIG) logerror("%s: Using softlists\n", tag()); + if (TRACE_CONFIG) logerror("%s: Using softlists\n", tag().c_str()); int i = 0; const char* pcb = get_feature("pcb"); do @@ -1300,7 +1300,7 @@ bool ti99_cartridge_device::call_load() } i++; } while (sw_pcbdefs[i].id != 0); - if (TRACE_CONFIG) logerror("%s: Cartridge type is %s (%d)\n", tag(), pcb, m_pcbtype); + if (TRACE_CONFIG) logerror("%s: Cartridge type is %s (%d)\n", tag().c_str(), pcb, m_pcbtype); } else { @@ -1312,7 +1312,7 @@ bool ti99_cartridge_device::call_load() } catch (rpk_exception& err) { - logerror("%s: Failed to load cartridge '%s': %s\n", tag(), basename(), err.to_string()); + logerror("%s: Failed to load cartridge '%s': %s\n", tag().c_str(), basename(), err.to_string()); m_rpk = nullptr; m_err = IMAGE_ERROR_INVALIDIMAGE; return true; @@ -1322,43 +1322,43 @@ bool ti99_cartridge_device::call_load() switch (m_pcbtype) { case PCB_STANDARD: - if (TRACE_CONFIG) logerror("%s: Standard PCB\n", tag()); + if (TRACE_CONFIG) logerror("%s: Standard PCB\n", tag().c_str()); m_pcb = new ti99_standard_cartridge(); break; case PCB_PAGED: - if (TRACE_CONFIG) logerror("%s: Paged PCB\n", tag()); + if (TRACE_CONFIG) logerror("%s: Paged PCB\n", tag().c_str()); m_pcb = new ti99_paged_cartridge(); break; case PCB_MINIMEM: - if (TRACE_CONFIG) logerror("%s: Minimem PCB\n", tag()); + if (TRACE_CONFIG) logerror("%s: Minimem PCB\n", tag().c_str()); m_pcb = new ti99_minimem_cartridge(); break; case PCB_SUPER: - if (TRACE_CONFIG) logerror("%s: Superspace PCB\n", tag()); + if (TRACE_CONFIG) logerror("%s: Superspace PCB\n", tag().c_str()); m_pcb = new ti99_super_cartridge(); break; case PCB_MBX: - if (TRACE_CONFIG) logerror("%s: MBX PCB\n", tag()); + if (TRACE_CONFIG) logerror("%s: MBX PCB\n", tag().c_str()); m_pcb = new ti99_mbx_cartridge(); break; case PCB_PAGED379I: - if (TRACE_CONFIG) logerror("%s: Paged379i PCB\n", tag()); + if (TRACE_CONFIG) logerror("%s: Paged379i PCB\n", tag().c_str()); m_pcb = new ti99_paged379i_cartridge(); break; case PCB_PAGED378: - if (TRACE_CONFIG) logerror("%s: Paged378 PCB\n", tag()); + if (TRACE_CONFIG) logerror("%s: Paged378 PCB\n", tag().c_str()); m_pcb = new ti99_paged378_cartridge(); break; case PCB_PAGED377: - if (TRACE_CONFIG) logerror("%s: Paged377 PCB\n", tag()); + if (TRACE_CONFIG) logerror("%s: Paged377 PCB\n", tag().c_str()); m_pcb = new ti99_paged377_cartridge(); break; case PCB_PAGEDCRU: - if (TRACE_CONFIG) logerror("%s: PagedCRU PCB\n", tag()); + if (TRACE_CONFIG) logerror("%s: PagedCRU PCB\n", tag().c_str()); m_pcb = new ti99_pagedcru_cartridge(); break; case PCB_GROMEMU: - if (TRACE_CONFIG) logerror("%s: Grom Emulation PCB\n", tag()); + if (TRACE_CONFIG) logerror("%s: Grom Emulation PCB\n", tag().c_str()); m_pcb = new ti99_gromemu_cartridge(); break; } @@ -1373,7 +1373,7 @@ bool ti99_cartridge_device::call_load() void ti99_cartridge_device::call_unload() { - if (TRACE_CHANGE) logerror("%s: Unload\n", tag()); + if (TRACE_CHANGE) logerror("%s: Unload\n", tag().c_str()); if (m_rpk != nullptr) { m_rpk->close(); // will write NVRAM contents @@ -1392,7 +1392,7 @@ void ti99_cartridge_device::set_slot(int i) bool ti99_cartridge_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) { - if (TRACE_CONFIG) logerror("%s: swlist = %s, swname = %s\n", tag(), swlist.list_name(), swname); + if (TRACE_CONFIG) logerror("%s: swlist = %s, swname = %s\n", tag().c_str(), swlist.list_name(), swname); machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry); m_softlist = true; m_rpk = nullptr; @@ -1499,7 +1499,7 @@ const device_type TI99CART = &device_creator<ti99_cartridge_device>; Unlike in the previous implementation we do not model it as a full device. ***************************************************************************/ -ti99_cartridge_pcb::ti99_cartridge_pcb(): m_cart(nullptr), m_grom_size(0), m_rom_size(0), m_ram_size(0), m_rom_ptr(nullptr), m_ram_ptr(nullptr), m_rom_page(0), m_grom_ptr(nullptr), m_grom_address(0), m_ram_page(0), m_tag(nullptr) +ti99_cartridge_pcb::ti99_cartridge_pcb(): m_cart(nullptr), m_grom_size(0), m_rom_size(0), m_ram_size(0), m_rom_ptr(nullptr), m_ram_ptr(nullptr), m_rom_page(0), m_grom_ptr(nullptr), m_grom_address(0), m_ram_page(0) { } @@ -1551,19 +1551,19 @@ READ8Z_MEMBER(ti99_cartridge_pcb::readz) // For TI-99/8 we should plan for 16K cartridges. However, none was ever produced. // Well, forget about that. *value = m_rom_ptr[offset & 0x1fff]; - // logerror("%s: read cartridge rom space %04x = %02x\n", tag(), offset, *value); + // logerror("%s: read cartridge rom space %04x = %02x\n", tag().c_str(), offset, *value); } } } WRITE8_MEMBER(ti99_cartridge_pcb::write) { - // logerror("%s: write standard\n", tag()); + // logerror("%s: write standard\n", tag().c_str()); if ((offset & grom_mask())==grom_base()) gromwrite(space, offset, data, mem_mask); else { - if (TRACE_ILLWRITE) space.device().logerror("%s: Cannot write to ROM space at %04x\n", tag(), offset); + if (TRACE_ILLWRITE) space.device().logerror("%s: Cannot write to ROM space at %04x\n", tag().c_str(), offset); } } @@ -1601,7 +1601,7 @@ READ8Z_MEMBER(ti99_paged_cartridge::readz) WRITE8_MEMBER(ti99_paged_cartridge::write) { - // logerror("%s: write standard\n", tag()); + // logerror("%s: write standard\n", tag().c_str()); if ((offset & grom_mask())==grom_base()) gromwrite(space, offset, data, mem_mask); @@ -1642,7 +1642,7 @@ READ8Z_MEMBER(ti99_minimem_cartridge::readz) /* Write function for the minimem cartridge. */ WRITE8_MEMBER(ti99_minimem_cartridge::write) { - // logerror("%s: write standard\n", tag()); + // logerror("%s: write standard\n", tag().c_str()); if ((offset & grom_mask())==grom_base()) gromwrite(space, offset, data, mem_mask); @@ -1650,7 +1650,7 @@ WRITE8_MEMBER(ti99_minimem_cartridge::write) { if ((offset & 0x1000)==0x0000) { - if (TRACE_ILLWRITE) space.device().logerror("%s: Write access to cartridge ROM at address %04x ignored", tag(), offset); + if (TRACE_ILLWRITE) space.device().logerror("%s: Write access to cartridge ROM at address %04x ignored", tag().c_str(), offset); } else { @@ -1732,7 +1732,7 @@ READ8Z_MEMBER(ti99_super_cartridge::crureadz) if ((offset & 0xfff0) == 0x0800) { - if (TRACE_CRU) space.device().logerror("%s: CRU accessed at %04x\n", tag(), offset); + if (TRACE_CRU) space.device().logerror("%s: CRU accessed at %04x\n", tag().c_str(), offset); UINT8 val = 0x02 << (m_ram_page << 1); *value = (val >> ((offset - 0x0800)>>1)) & 0xff; } @@ -1742,7 +1742,7 @@ WRITE8_MEMBER(ti99_super_cartridge::cruwrite) { if ((offset & 0xfff0) == 0x0800) { - if (TRACE_CRU) space.device().logerror("%s: CRU accessed at %04x\n", tag(), offset); + if (TRACE_CRU) space.device().logerror("%s: CRU accessed at %04x\n", tag().c_str(), offset); if (data != 0) m_ram_page = (offset-0x0802)>>2; } @@ -2055,7 +2055,7 @@ READ8Z_MEMBER(ti99_gromemu_cartridge::readz) WRITE8_MEMBER(ti99_gromemu_cartridge::write) { - // logerror("%s: write standard\n", tag()); + // logerror("%s: write standard\n", tag().c_str()); if ((offset & grom_mask())==grom_base()) gromemuwrite(space, offset, data, mem_mask); @@ -2100,7 +2100,7 @@ WRITE8_MEMBER(ti99_gromemu_cartridge::gromemuwrite) // Accept low address byte (second write) m_grom_address = (m_grom_address & 0xff00) | data; m_waddr_LSB = false; - if (TRACE_GROM) space.device().logerror("%s: Set grom address %04x\n", tag(), m_grom_address); + if (TRACE_GROM) space.device().logerror("%s: Set grom address %04x\n", tag().c_str(), m_grom_address); } else { @@ -2110,7 +2110,7 @@ WRITE8_MEMBER(ti99_gromemu_cartridge::gromemuwrite) } } else { - if (TRACE_ILLWRITE) space.device().logerror("%s: Ignoring write to GROM area at address %04x\n", tag(), m_grom_address); + if (TRACE_ILLWRITE) space.device().logerror("%s: Ignoring write to GROM area at address %04x\n", tag().c_str(), m_grom_address); } } diff --git a/src/devices/bus/ti99x/gromport.h b/src/devices/bus/ti99x/gromport.h index 7655173b10d..406b80f5db3 100644 --- a/src/devices/bus/ti99x/gromport.h +++ b/src/devices/bus/ti99x/gromport.h @@ -22,7 +22,7 @@ class ti99_cartridge_connector_device; class gromport_device : public bus8z_device, public device_slot_interface { public: - gromport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gromport_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8Z_MEMBER(readz) override; DECLARE_WRITE8_MEMBER(write) override; DECLARE_READ8Z_MEMBER(crureadz); @@ -72,7 +72,7 @@ class ti99_cartridge_pcb; class ti99_cartridge_device : public bus8z_device, public device_image_interface { public: - ti99_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ti99_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8Z_MEMBER(readz) override; DECLARE_WRITE8_MEMBER(write) override; @@ -144,7 +144,7 @@ public: UINT16 grom_mask(); protected: - ti99_cartridge_connector_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + ti99_cartridge_connector_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); virtual void device_config_complete() override; gromport_device* m_gromport; @@ -156,7 +156,7 @@ protected: class single_conn_device : public ti99_cartridge_connector_device { public: - single_conn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + single_conn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8Z_MEMBER(readz) override; DECLARE_WRITE8_MEMBER(write) override; @@ -184,7 +184,7 @@ private: class multi_conn_device : public ti99_cartridge_connector_device { public: - multi_conn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + multi_conn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8Z_MEMBER(readz) override; DECLARE_WRITE8_MEMBER(write) override; @@ -216,7 +216,7 @@ private: class gkracker_device : public ti99_cartridge_connector_device, public device_nvram_interface { public: - gkracker_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gkracker_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8Z_MEMBER(readz) override; DECLARE_WRITE8_MEMBER(write) override; @@ -281,8 +281,8 @@ protected: void set_cartridge(ti99_cartridge_device *cart); UINT16 grom_base(); UINT16 grom_mask(); - const char* tag() { return m_tag; } - void set_tag(const char* tag) { m_tag = tag; } + std::string tag() { return m_tag; } + void set_tag(std::string tag) { m_tag = tag; } ti99_cartridge_device* m_cart; ti99_grom_device* m_grom[5]; @@ -296,7 +296,7 @@ protected: UINT8* m_grom_ptr; // for gromemu int m_grom_address; // for gromemu int m_ram_page; // for super - const char* m_tag; + std::string m_tag; }; /******************** Standard cartridge ******************************/ diff --git a/src/devices/bus/ti99x/handset.cpp b/src/devices/bus/ti99x/handset.cpp index 2a073636910..cdc526ccb67 100644 --- a/src/devices/bus/ti99x/handset.cpp +++ b/src/devices/bus/ti99x/handset.cpp @@ -50,7 +50,7 @@ static const char *const joynames[2][4] = static const char *const keynames[] = { "KP0", "KP1", "KP2", "KP3", "KP4" }; -ti99_handset_device::ti99_handset_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ti99_handset_device::ti99_handset_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : joyport_attached_device(mconfig, HANDSET, "TI-99/4 IR handset", tag, owner, clock, "handset", __FILE__), m_ack(0), m_clock_high(false), m_buf(0), m_buflen(0), m_delay_timer(nullptr) { } @@ -489,7 +489,7 @@ INPUT_PORTS_START( joysticks ) PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1/*, "(2FIRE)", CODE_NONE, OSD_JOY2_FIRE, 0*/) PORT_PLAYER(2) INPUT_PORTS_END -ti99_twin_joystick::ti99_twin_joystick(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ti99_twin_joystick::ti99_twin_joystick(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : joyport_attached_device(mconfig, HANDSET, "TI-99/4(A) Twin Joystick", tag, owner, clock, "twinjoy", __FILE__), m_joystick(0) { } diff --git a/src/devices/bus/ti99x/handset.h b/src/devices/bus/ti99x/handset.h index 3f9de1b6221..b5ceb353ed2 100644 --- a/src/devices/bus/ti99x/handset.h +++ b/src/devices/bus/ti99x/handset.h @@ -27,7 +27,7 @@ extern const device_type HANDSET; class ti99_handset_device : public joyport_attached_device { public: - ti99_handset_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ti99_handset_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); UINT8 read_dev() override; void write_dev(UINT8 data) override; @@ -72,7 +72,7 @@ extern const device_type TI99_JOYSTICK; class ti99_twin_joystick : public joyport_attached_device { public: - ti99_twin_joystick(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ti99_twin_joystick(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void device_start(void) override; UINT8 read_dev() override; diff --git a/src/devices/bus/ti99x/joyport.cpp b/src/devices/bus/ti99x/joyport.cpp index 9aab362f812..73f83e360e9 100644 --- a/src/devices/bus/ti99x/joyport.cpp +++ b/src/devices/bus/ti99x/joyport.cpp @@ -39,7 +39,7 @@ #include "handset.h" #include "mecmouse.h" -joyport_device::joyport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +joyport_device::joyport_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, JOYPORT, "Joystick port", tag, owner, clock, "ti99_joyport", __FILE__), device_slot_interface(mconfig, *this), m_interrupt(*this), m_connected(nullptr) diff --git a/src/devices/bus/ti99x/joyport.h b/src/devices/bus/ti99x/joyport.h index 82129db726e..019ff14c677 100644 --- a/src/devices/bus/ti99x/joyport.h +++ b/src/devices/bus/ti99x/joyport.h @@ -32,7 +32,7 @@ class joyport_device; class joyport_attached_device : public device_t { public: - joyport_attached_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) + joyport_attached_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_joyport(nullptr) { } @@ -51,7 +51,7 @@ protected: class joyport_device : public device_t, public device_slot_interface { public: - joyport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + joyport_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); UINT8 read_port(); void write_port(int data); void set_interrupt(int state); diff --git a/src/devices/bus/ti99x/mecmouse.cpp b/src/devices/bus/ti99x/mecmouse.cpp index 573fce594ff..3e54ae802bb 100644 --- a/src/devices/bus/ti99x/mecmouse.cpp +++ b/src/devices/bus/ti99x/mecmouse.cpp @@ -52,7 +52,7 @@ #define POLL_TIMER 1 -mecmouse_device::mecmouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +mecmouse_device::mecmouse_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : joyport_attached_device(mconfig, MECMOUSE, "Mechatronics Mouse", tag, owner, clock, "mecmouse", __FILE__), m_last_select(0), m_read_y_axis(false), m_x(0), m_y(0), m_x_buf(0), m_y_buf(0), m_last_mx(0), m_last_my(0), m_poll_timer(nullptr) { } diff --git a/src/devices/bus/ti99x/mecmouse.h b/src/devices/bus/ti99x/mecmouse.h index 37390a7461c..abd52dff0fa 100644 --- a/src/devices/bus/ti99x/mecmouse.h +++ b/src/devices/bus/ti99x/mecmouse.h @@ -22,7 +22,7 @@ extern const device_type MECMOUSE; class mecmouse_device : public joyport_attached_device { public: - mecmouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + mecmouse_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); UINT8 read_dev() override; void write_dev(UINT8 data) override; diff --git a/src/devices/bus/ti99x/ti99defs.h b/src/devices/bus/ti99x/ti99defs.h index 130c0cfbc40..2f8f31379a9 100644 --- a/src/devices/bus/ti99x/ti99defs.h +++ b/src/devices/bus/ti99x/ti99defs.h @@ -80,7 +80,7 @@ class bus8z_device : public device_t { public: - bus8z_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) + bus8z_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) { } virtual DECLARE_READ8Z_MEMBER(readz) =0; virtual DECLARE_WRITE8_MEMBER(write) =0; @@ -90,7 +90,7 @@ public: class bus16z_device : device_t { public: - bus16z_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) + bus16z_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) { } virtual DECLARE_READ16Z_MEMBER(read16z) =0; virtual DECLARE_WRITE16_MEMBER(write16) =0; diff --git a/src/devices/bus/ti99x/videowrp.cpp b/src/devices/bus/ti99x/videowrp.cpp index 6f09da722e7..b4b8a9f0fcf 100644 --- a/src/devices/bus/ti99x/videowrp.cpp +++ b/src/devices/bus/ti99x/videowrp.cpp @@ -27,28 +27,28 @@ /* Constructors */ -ti_video_device::ti_video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +ti_video_device::ti_video_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source), m_tms9928a(nullptr) { } -ti_std_video_device::ti_std_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ti_std_video_device::ti_std_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ti_video_device(mconfig, TI99VIDEO, "TI99 STD Video subsystem", tag, owner, clock, "ti99_video", __FILE__) { } -ti_exp_video_device::ti_exp_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ti_exp_video_device::ti_exp_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ti_video_device(mconfig, V9938VIDEO, "TI99 EXP Video subsystem", tag, owner, clock, "v9938_video", __FILE__), m_v9938(nullptr) { } -ti_sound_sn94624_device::ti_sound_sn94624_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ti_sound_sn94624_device::ti_sound_sn94624_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ti_sound_system_device(mconfig, TISOUND_94624, "Onboard sound (SN94624)", tag, owner, clock, "ti_sound_sn94624", __FILE__) { } -ti_sound_sn76496_device::ti_sound_sn76496_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ti_sound_sn76496_device::ti_sound_sn76496_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ti_sound_system_device(mconfig, TISOUND_76496, "Onboard sound (SN76496)", tag, owner, clock, "ti_sound_sn76496", __FILE__) { } diff --git a/src/devices/bus/ti99x/videowrp.h b/src/devices/bus/ti99x/videowrp.h index de08dfb3dce..d71d3f90c92 100644 --- a/src/devices/bus/ti99x/videowrp.h +++ b/src/devices/bus/ti99x/videowrp.h @@ -28,7 +28,7 @@ protected: tms9928a_device *m_tms9928a; /* Constructor */ - ti_video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + ti_video_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); virtual void device_start(void) override; virtual void device_reset(void) override; virtual DECLARE_READ8Z_MEMBER(readz) override { }; @@ -41,7 +41,7 @@ protected: class ti_std_video_device : public ti_video_device { public: - ti_std_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ti_std_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8Z_MEMBER(readz) override; DECLARE_WRITE8_MEMBER(write) override; @@ -54,7 +54,7 @@ public: class ti_exp_video_device : public ti_video_device { public: - ti_exp_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ti_exp_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void video_update_mouse(int delta_x, int delta_y, int buttons); DECLARE_READ8Z_MEMBER(readz) override; DECLARE_WRITE8_MEMBER(write) override; @@ -84,7 +84,7 @@ extern const device_type TISOUND_76496; class ti_sound_system_device : public bus8z_device { public: - ti_sound_system_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) + ti_sound_system_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source), m_sound_chip(nullptr), m_console_ready(*this) { }; @@ -110,7 +110,7 @@ private: class ti_sound_sn94624_device : public ti_sound_system_device { public: - ti_sound_sn94624_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ti_sound_sn94624_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: virtual machine_config_constructor device_mconfig_additions() const override; @@ -122,7 +122,7 @@ protected: class ti_sound_sn76496_device : public ti_sound_system_device { public: - ti_sound_sn76496_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ti_sound_sn76496_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/tiki100/8088.cpp b/src/devices/bus/tiki100/8088.cpp index d8c9fe201b5..27cd2f6b929 100644 --- a/src/devices/bus/tiki100/8088.cpp +++ b/src/devices/bus/tiki100/8088.cpp @@ -91,7 +91,7 @@ machine_config_constructor tiki100_8088_t::device_mconfig_additions() const // tiki100_8088_t - constructor //------------------------------------------------- -tiki100_8088_t::tiki100_8088_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +tiki100_8088_t::tiki100_8088_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, TIKI100_8088, "TIKI-100 8/16", tag, owner, clock, "tiki100_8088", __FILE__), device_tiki100bus_card_interface(mconfig, *this), m_maincpu(*this, I8088_TAG), diff --git a/src/devices/bus/tiki100/8088.h b/src/devices/bus/tiki100/8088.h index 7ce0fe64776..acadbb004ec 100644 --- a/src/devices/bus/tiki100/8088.h +++ b/src/devices/bus/tiki100/8088.h @@ -28,7 +28,7 @@ class tiki100_8088_t : public device_t, { public: // construction/destruction - tiki100_8088_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + tiki100_8088_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/tiki100/exp.cpp b/src/devices/bus/tiki100/exp.cpp index 9ec594375b2..b17eb8e9402 100644 --- a/src/devices/bus/tiki100/exp.cpp +++ b/src/devices/bus/tiki100/exp.cpp @@ -26,7 +26,7 @@ const device_type TIKI100_BUS_SLOT = &device_creator<tiki100_bus_slot_t>; // tiki100_bus_slot_t - constructor //------------------------------------------------- -tiki100_bus_slot_t::tiki100_bus_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +tiki100_bus_slot_t::tiki100_bus_slot_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, TIKI100_BUS_SLOT, "TIKI-100 expansion bus slot", tag, owner, clock, "tiki100bus_slot", __FILE__), device_slot_interface(mconfig, *this), device_z80daisy_interface(mconfig, *this), @@ -56,7 +56,7 @@ void tiki100_bus_slot_t::device_start() // tiki100_bus_t - constructor //------------------------------------------------- -tiki100_bus_t::tiki100_bus_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +tiki100_bus_t::tiki100_bus_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, TIKI100_BUS, "TIKI-100 expansion bus", tag, owner, clock, "tiki100bus", __FILE__), m_irq_cb(*this), m_nmi_cb(*this), diff --git a/src/devices/bus/tiki100/exp.h b/src/devices/bus/tiki100/exp.h index 511d449beea..373b31ecaf1 100644 --- a/src/devices/bus/tiki100/exp.h +++ b/src/devices/bus/tiki100/exp.h @@ -110,7 +110,7 @@ class tiki100_bus_slot_t : public device_t, { public: // construction/destruction - tiki100_bus_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + tiki100_bus_slot_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -138,7 +138,7 @@ class tiki100_bus_t : public device_t { public: // construction/destruction - tiki100_bus_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + tiki100_bus_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); ~tiki100_bus_t() { m_device_list.detach_all(); } template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<tiki100_bus_t &>(device).m_irq_cb.set_callback(object); } diff --git a/src/devices/bus/tiki100/hdc.cpp b/src/devices/bus/tiki100/hdc.cpp index 504222f0f48..cee10080dcd 100644 --- a/src/devices/bus/tiki100/hdc.cpp +++ b/src/devices/bus/tiki100/hdc.cpp @@ -63,7 +63,7 @@ machine_config_constructor tiki100_hdc_t::device_mconfig_additions() const // tiki100_hdc_t - constructor //------------------------------------------------- -tiki100_hdc_t::tiki100_hdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +tiki100_hdc_t::tiki100_hdc_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, TIKI100_HDC, "TIKI-100 Winchester controller", tag, owner, clock, "tiki100_hdc", __FILE__), device_tiki100bus_card_interface(mconfig, *this), m_hdc(*this, WD1010_TAG) diff --git a/src/devices/bus/tiki100/hdc.h b/src/devices/bus/tiki100/hdc.h index 0d533bf7f96..1504c72c079 100644 --- a/src/devices/bus/tiki100/hdc.h +++ b/src/devices/bus/tiki100/hdc.h @@ -29,7 +29,7 @@ class tiki100_hdc_t : public device_t, { public: // construction/destruction - tiki100_hdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + tiki100_hdc_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/tvc/hbf.cpp b/src/devices/bus/tvc/hbf.cpp index 8fd354a18c4..ff4473f5f85 100644 --- a/src/devices/bus/tvc/hbf.cpp +++ b/src/devices/bus/tvc/hbf.cpp @@ -58,7 +58,7 @@ const device_type TVC_HBF = &device_creator<tvc_hbf_device>; // tvc_hbf_device - constructor //------------------------------------------------- -tvc_hbf_device::tvc_hbf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +tvc_hbf_device::tvc_hbf_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, TVC_HBF, "HBF floppy interface", tag, owner, clock, "tvc_hbf", __FILE__), device_tvcexp_interface( mconfig, *this ), m_fdc(*this, "fdc"), m_rom(nullptr), m_ram(nullptr), m_rom_bank(0) @@ -123,7 +123,7 @@ WRITE8_MEMBER(tvc_hbf_device::write) if (offset>=0x1000) m_ram[offset & 0x0fff] = data; else - logerror("'%s': unmapped write to %04x %02x\n", tag(), offset, data); + logerror("'%s': unmapped write to %04x %02x\n", tag().c_str(), offset, data); } diff --git a/src/devices/bus/tvc/hbf.h b/src/devices/bus/tvc/hbf.h index da677aa617e..5c99296023f 100644 --- a/src/devices/bus/tvc/hbf.h +++ b/src/devices/bus/tvc/hbf.h @@ -23,7 +23,7 @@ class tvc_hbf_device : { public: // construction/destruction - tvc_hbf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + tvc_hbf_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/tvc/tvc.cpp b/src/devices/bus/tvc/tvc.cpp index 2ee28a2f3c0..0e839bd3a32 100644 --- a/src/devices/bus/tvc/tvc.cpp +++ b/src/devices/bus/tvc/tvc.cpp @@ -52,7 +52,7 @@ device_tvcexp_interface::~device_tvcexp_interface() //------------------------------------------------- // tvcexp_slot_device - constructor //------------------------------------------------- -tvcexp_slot_device::tvcexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +tvcexp_slot_device::tvcexp_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, TVCEXP_SLOT, "TVC64 Expansion Slot", tag, owner, clock, "tvcexp_slot", __FILE__), device_slot_interface(mconfig, *this), m_out_irq_cb(*this), diff --git a/src/devices/bus/tvc/tvc.h b/src/devices/bus/tvc/tvc.h index 9fa9e89fd2b..93975272379 100644 --- a/src/devices/bus/tvc/tvc.h +++ b/src/devices/bus/tvc/tvc.h @@ -87,7 +87,7 @@ class tvcexp_slot_device : public device_t, { public: // construction/destruction - tvcexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + tvcexp_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~tvcexp_slot_device(); template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<tvcexp_slot_device &>(device).m_out_irq_cb.set_callback(object); } diff --git a/src/devices/bus/vboy/rom.cpp b/src/devices/bus/vboy/rom.cpp index 587be158610..19a9791a257 100644 --- a/src/devices/bus/vboy/rom.cpp +++ b/src/devices/bus/vboy/rom.cpp @@ -21,19 +21,19 @@ const device_type VBOY_ROM_STD = &device_creator<vboy_rom_device>; const device_type VBOY_ROM_EEPROM = &device_creator<vboy_eeprom_device>; -vboy_rom_device::vboy_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +vboy_rom_device::vboy_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_vboy_cart_interface( mconfig, *this ) { } -vboy_rom_device::vboy_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +vboy_rom_device::vboy_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VBOY_ROM_STD, "Nintendo Virtual Boy Carts", tag, owner, clock, "vboy_rom", __FILE__), device_vboy_cart_interface( mconfig, *this ) { } -vboy_eeprom_device::vboy_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +vboy_eeprom_device::vboy_eeprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : vboy_rom_device(mconfig, VBOY_ROM_EEPROM, "Nintendo Virtual Boy Carts + EEPROM", tag, owner, clock, "vboy_eeprom", __FILE__) { } diff --git a/src/devices/bus/vboy/rom.h b/src/devices/bus/vboy/rom.h index 9ced7b51296..5da06ed726d 100644 --- a/src/devices/bus/vboy/rom.h +++ b/src/devices/bus/vboy/rom.h @@ -13,8 +13,8 @@ class vboy_rom_device : public device_t, { public: // construction/destruction - vboy_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - vboy_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vboy_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + vboy_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override {} @@ -29,7 +29,7 @@ class vboy_eeprom_device : public vboy_rom_device { public: // construction/destruction - vboy_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vboy_eeprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ32_MEMBER(read_eeprom) override; diff --git a/src/devices/bus/vboy/slot.cpp b/src/devices/bus/vboy/slot.cpp index 4b8fc1bf4d2..a12ad79fb7b 100644 --- a/src/devices/bus/vboy/slot.cpp +++ b/src/devices/bus/vboy/slot.cpp @@ -46,7 +46,7 @@ device_vboy_cart_interface::~device_vboy_cart_interface() // rom_alloc - alloc the space for the cart //------------------------------------------------- -void device_vboy_cart_interface::rom_alloc(UINT32 size, const char *tag) +void device_vboy_cart_interface::rom_alloc(UINT32 size, std::string tag) { if (m_rom == nullptr) { @@ -74,7 +74,7 @@ void device_vboy_cart_interface::eeprom_alloc(UINT32 size) //------------------------------------------------- // vboy_cart_slot_device - constructor //------------------------------------------------- -vboy_cart_slot_device::vboy_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +vboy_cart_slot_device::vboy_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VBOY_CART_SLOT, "Nintendo Virtual Boy Cartridge Slot", tag, owner, clock, "vboy_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), diff --git a/src/devices/bus/vboy/slot.h b/src/devices/bus/vboy/slot.h index ca9e784ad8c..5b2f93b9bfc 100644 --- a/src/devices/bus/vboy/slot.h +++ b/src/devices/bus/vboy/slot.h @@ -30,7 +30,7 @@ public: virtual DECLARE_READ32_MEMBER(read_eeprom) { return 0xffffffff; } virtual DECLARE_WRITE32_MEMBER(write_eeprom) {} - void rom_alloc(UINT32 size, const char *tag); + void rom_alloc(UINT32 size, std::string tag); void eeprom_alloc(UINT32 size); UINT32* get_rom_base() { return m_rom; } UINT32* get_eeprom_base() { return &m_eeprom[0]; } @@ -56,7 +56,7 @@ class vboy_cart_slot_device : public device_t, { public: // construction/destruction - vboy_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vboy_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~vboy_cart_slot_device(); // device-level overrides diff --git a/src/devices/bus/vc4000/rom.cpp b/src/devices/bus/vc4000/rom.cpp index 5c8ebf5c7bb..fc74f0c0d05 100644 --- a/src/devices/bus/vc4000/rom.cpp +++ b/src/devices/bus/vc4000/rom.cpp @@ -198,29 +198,29 @@ const device_type VC4000_ROM_RAM1K = &device_creator<vc4000_ram1k_device>; const device_type VC4000_ROM_CHESS2 = &device_creator<vc4000_chess2_device>; -vc4000_rom_device::vc4000_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +vc4000_rom_device::vc4000_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_vc4000_cart_interface( mconfig, *this ) { } -vc4000_rom_device::vc4000_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +vc4000_rom_device::vc4000_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VC4000_ROM_STD, "VC 4000 Standard Carts", tag, owner, clock, "vc4000_rom", __FILE__), device_vc4000_cart_interface( mconfig, *this ) { } -vc4000_rom4k_device::vc4000_rom4k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +vc4000_rom4k_device::vc4000_rom4k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : vc4000_rom_device(mconfig, VC4000_ROM_ROM4K, "VC 4000 Carts w/4K ROM", tag, owner, clock, "vc4000_rom4k", __FILE__) { } -vc4000_ram1k_device::vc4000_ram1k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +vc4000_ram1k_device::vc4000_ram1k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : vc4000_rom_device(mconfig, VC4000_ROM_RAM1K, "VC 4000 Carts w/1K RAM", tag, owner, clock, "vc4000_ram1k", __FILE__) { } -vc4000_chess2_device::vc4000_chess2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +vc4000_chess2_device::vc4000_chess2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : vc4000_rom_device(mconfig, VC4000_ROM_CHESS2, "VC 4000 Chess II Cart", tag, owner, clock, "vc4000_chess2", __FILE__) { } diff --git a/src/devices/bus/vc4000/rom.h b/src/devices/bus/vc4000/rom.h index af7bb070271..3c9d4b80e7d 100644 --- a/src/devices/bus/vc4000/rom.h +++ b/src/devices/bus/vc4000/rom.h @@ -13,8 +13,8 @@ class vc4000_rom_device : public device_t, { public: // construction/destruction - vc4000_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - vc4000_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vc4000_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + vc4000_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override {} @@ -30,7 +30,7 @@ class vc4000_rom4k_device : public vc4000_rom_device { public: // construction/destruction - vc4000_rom4k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vc4000_rom4k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); }; // ======================> vc4000_ram1k_device @@ -39,7 +39,7 @@ class vc4000_ram1k_device : public vc4000_rom_device { public: // construction/destruction - vc4000_ram1k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vc4000_ram1k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_ram) override; @@ -52,7 +52,7 @@ class vc4000_chess2_device : public vc4000_rom_device { public: // construction/destruction - vc4000_chess2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vc4000_chess2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(extra_rom) override; diff --git a/src/devices/bus/vc4000/slot.cpp b/src/devices/bus/vc4000/slot.cpp index 0b67a264c34..5f44086b0e5 100644 --- a/src/devices/bus/vc4000/slot.cpp +++ b/src/devices/bus/vc4000/slot.cpp @@ -46,7 +46,7 @@ device_vc4000_cart_interface::~device_vc4000_cart_interface() // rom_alloc - alloc the space for the cart //------------------------------------------------- -void device_vc4000_cart_interface::rom_alloc(UINT32 size, const char *tag) +void device_vc4000_cart_interface::rom_alloc(UINT32 size, std::string tag) { if (m_rom == nullptr) { @@ -73,7 +73,7 @@ void device_vc4000_cart_interface::ram_alloc(UINT32 size) //------------------------------------------------- // vc4000_cart_slot_device - constructor //------------------------------------------------- -vc4000_cart_slot_device::vc4000_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +vc4000_cart_slot_device::vc4000_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VC4000_CART_SLOT, "Interton VC 4000 Cartridge Slot", tag, owner, clock, "vc4000_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), @@ -115,7 +115,7 @@ void vc4000_cart_slot_device::device_config_complete() // trq h-21 slot //------------------------------------------------- -h21_cart_slot_device::h21_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +h21_cart_slot_device::h21_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : vc4000_cart_slot_device(mconfig, tag, owner, clock) { } diff --git a/src/devices/bus/vc4000/slot.h b/src/devices/bus/vc4000/slot.h index 6b40c6cbcbe..6559e27dc88 100644 --- a/src/devices/bus/vc4000/slot.h +++ b/src/devices/bus/vc4000/slot.h @@ -33,7 +33,7 @@ public: virtual DECLARE_READ8_MEMBER(read_ram) { return 0xff; } virtual DECLARE_WRITE8_MEMBER(write_ram) {} - void rom_alloc(UINT32 size, const char *tag); + void rom_alloc(UINT32 size, std::string tag); void ram_alloc(UINT32 size); UINT8* get_rom_base() { return m_rom; } UINT8* get_ram_base() { return &m_ram[0]; } @@ -58,7 +58,7 @@ class vc4000_cart_slot_device : public device_t, { public: // construction/destruction - vc4000_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vc4000_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~vc4000_cart_slot_device(); // device-level overrides @@ -103,7 +103,7 @@ class h21_cart_slot_device : public vc4000_cart_slot_device { public: // construction/destruction - h21_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + h21_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~h21_cart_slot_device(); virtual const char *image_interface() const override { return "h21_cart"; } diff --git a/src/devices/bus/vcs/compumat.cpp b/src/devices/bus/vcs/compumat.cpp index 4fc7d9cba5b..124ed28dc7f 100644 --- a/src/devices/bus/vcs/compumat.cpp +++ b/src/devices/bus/vcs/compumat.cpp @@ -16,7 +16,7 @@ const device_type A26_ROM_COMPUMATE = &device_creator<a26_rom_cm_device>; -a26_rom_cm_device::a26_rom_cm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a26_rom_cm_device::a26_rom_cm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a26_rom_f6_device(mconfig, A26_ROM_COMPUMATE, "Atari 2600 ROM Cart Compumate", tag, owner, clock, "a2600_cm", __FILE__) { } diff --git a/src/devices/bus/vcs/compumat.h b/src/devices/bus/vcs/compumat.h index 986cab23320..e60a7e84c31 100644 --- a/src/devices/bus/vcs/compumat.h +++ b/src/devices/bus/vcs/compumat.h @@ -15,7 +15,7 @@ class a26_rom_cm_device : public a26_rom_f6_device { public: // construction/destruction - a26_rom_cm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a26_rom_cm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/vcs/dpc.cpp b/src/devices/bus/vcs/dpc.cpp index fac776fabb1..ab11a1766d1 100644 --- a/src/devices/bus/vcs/dpc.cpp +++ b/src/devices/bus/vcs/dpc.cpp @@ -17,7 +17,7 @@ const device_type ATARI_DPC = &device_creator<dpc_device>; -dpc_device::dpc_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) : +dpc_device::dpc_device(const machine_config& mconfig, std::string tag, device_t* owner, UINT32 clock) : device_t(mconfig, ATARI_DPC, "Atari DCP", tag, owner, clock, "atari_dcp", __FILE__), m_movamt(0), m_latch_62(0), @@ -240,7 +240,7 @@ WRITE8_MEMBER(dpc_device::write) const device_type A26_ROM_DPC = &device_creator<a26_rom_dpc_device>; -a26_rom_dpc_device::a26_rom_dpc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a26_rom_dpc_device::a26_rom_dpc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a26_rom_f8_device(mconfig, A26_ROM_DPC, "Atari 2600 ROM Cart Pitfall II", tag, owner, clock, "a2600_dcp", __FILE__), m_dpc(*this, "dpc") { diff --git a/src/devices/bus/vcs/dpc.h b/src/devices/bus/vcs/dpc.h index f9af63202a3..67b6c5444c5 100644 --- a/src/devices/bus/vcs/dpc.h +++ b/src/devices/bus/vcs/dpc.h @@ -27,7 +27,7 @@ class dpc_device : public device_t { public: // construction/destruction - dpc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + dpc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); df_t m_df[8]; UINT8 m_movamt; @@ -68,7 +68,7 @@ class a26_rom_dpc_device : public a26_rom_f8_device { public: // construction/destruction - a26_rom_dpc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a26_rom_dpc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/vcs/harmony_melody.cpp b/src/devices/bus/vcs/harmony_melody.cpp index af5b09e0d8a..4226a0c43a9 100644 --- a/src/devices/bus/vcs/harmony_melody.cpp +++ b/src/devices/bus/vcs/harmony_melody.cpp @@ -66,7 +66,7 @@ map: const device_type A26_ROM_HARMONY = &device_creator<a26_rom_harmony_device>; -a26_rom_harmony_device::a26_rom_harmony_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a26_rom_harmony_device::a26_rom_harmony_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a26_rom_f8_device(mconfig, A26_ROM_HARMONY, "Atari 2600 ROM Cart HARMONY/MELODY", tag, owner, clock, "a2600_harmony", __FILE__), m_cpu(*this, "arm") { diff --git a/src/devices/bus/vcs/harmony_melody.h b/src/devices/bus/vcs/harmony_melody.h index 344d929af29..d7e3501e120 100644 --- a/src/devices/bus/vcs/harmony_melody.h +++ b/src/devices/bus/vcs/harmony_melody.h @@ -13,7 +13,7 @@ class a26_rom_harmony_device : public a26_rom_f8_device { public: // construction/destruction - a26_rom_harmony_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a26_rom_harmony_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/vcs/rom.cpp b/src/devices/bus/vcs/rom.cpp index 2c4dcd0d3a0..f72aab1725b 100755 --- a/src/devices/bus/vcs/rom.cpp +++ b/src/devices/bus/vcs/rom.cpp @@ -44,143 +44,143 @@ const device_type A26_ROM_32IN1 = &device_creator<a26_rom_32in1_device>; const device_type A26_ROM_X07 = &device_creator<a26_rom_x07_device>; -a26_rom_2k_device::a26_rom_2k_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +a26_rom_2k_device::a26_rom_2k_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_vcs_cart_interface( mconfig, *this ) { } -a26_rom_2k_device::a26_rom_2k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a26_rom_2k_device::a26_rom_2k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A26_ROM_2K, "Atari VCS 2600 2K ROM Carts", tag, owner, clock, "vcs_2k", __FILE__), device_vcs_cart_interface( mconfig, *this ) { } -a26_rom_4k_device::a26_rom_4k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a26_rom_4k_device::a26_rom_4k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a26_rom_2k_device(mconfig, A26_ROM_4K, "Atari VCS 2600 4K ROM Carts", tag, owner, clock, "vcs_4k", __FILE__) { } -a26_rom_f6_device::a26_rom_f6_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +a26_rom_f6_device::a26_rom_f6_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : a26_rom_2k_device(mconfig, type, name, tag, owner, clock, shortname, source), m_base_bank(-1) // set to -1 to help the Xin1 multicart... { } -a26_rom_f6_device::a26_rom_f6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a26_rom_f6_device::a26_rom_f6_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a26_rom_2k_device(mconfig, A26_ROM_F6, "Atari VCS 2600 ROM Carts w/F6 bankswitch", tag, owner, clock, "vcs_f6", __FILE__), m_base_bank(-1) // set to -1 to help the Xin1 multicart... { } -a26_rom_f4_device::a26_rom_f4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a26_rom_f4_device::a26_rom_f4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a26_rom_f6_device(mconfig, A26_ROM_F4, "Atari VCS 2600 ROM Carts w/F4 bankswitch", tag, owner, clock, "vcs_f4", __FILE__) { } -a26_rom_f8_device::a26_rom_f8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +a26_rom_f8_device::a26_rom_f8_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : a26_rom_f6_device(mconfig, type, name, tag, owner, clock, shortname, source) { } -a26_rom_f8_device::a26_rom_f8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a26_rom_f8_device::a26_rom_f8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a26_rom_f6_device(mconfig, A26_ROM_F8, "Atari VCS 2600 ROM Carts w/F8 bankswitch", tag, owner, clock, "vcs_f8", __FILE__) { } -a26_rom_f8_sw_device::a26_rom_f8_sw_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a26_rom_f8_sw_device::a26_rom_f8_sw_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a26_rom_f8_device(mconfig, A26_ROM_F8_SW, "Atari VCS 2600 ROM Cart Snow White", tag, owner, clock, "vcs_f8_sw", __FILE__) { } -a26_rom_fa_device::a26_rom_fa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a26_rom_fa_device::a26_rom_fa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a26_rom_f6_device(mconfig, A26_ROM_FA, "Atari VCS 2600 ROM Carts w/FA bankswitch", tag, owner, clock, "vcs_fa", __FILE__) { } -a26_rom_fe_device::a26_rom_fe_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a26_rom_fe_device::a26_rom_fe_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a26_rom_2k_device(mconfig, A26_ROM_FE, "Atari VCS 2600 ROM Carts w/FE bankswitch", tag, owner, clock, "vcs_fe", __FILE__), m_base_bank(0), m_trigger_on_next_access(0) { } -a26_rom_3e_device::a26_rom_3e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a26_rom_3e_device::a26_rom_3e_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a26_rom_f6_device(mconfig, A26_ROM_3E, "Atari VCS 2600 ROM Carts w/3E bankswitch", tag, owner, clock, "vcs_3e", __FILE__), m_num_bank(0), m_ram_bank(0), m_ram_enable(0) { } -a26_rom_3f_device::a26_rom_3f_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a26_rom_3f_device::a26_rom_3f_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a26_rom_f6_device(mconfig, A26_ROM_3F, "Atari VCS 2600 ROM Carts w/3F bankswitch", tag, owner, clock, "vcs_3f", __FILE__), m_num_bank(0) { } -a26_rom_e0_device::a26_rom_e0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a26_rom_e0_device::a26_rom_e0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a26_rom_f6_device(mconfig, A26_ROM_E0, "Atari VCS 2600 ROM Carts w/E0 bankswitch", tag, owner, clock, "vcs_e0", __FILE__) { } -a26_rom_e7_device::a26_rom_e7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a26_rom_e7_device::a26_rom_e7_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a26_rom_f6_device(mconfig, A26_ROM_E7, "Atari VCS 2600 ROM Carts w/E7 bankswitch", tag, owner, clock, "vcs_e7", __FILE__), m_ram_bank(0) { } -a26_rom_ua_device::a26_rom_ua_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a26_rom_ua_device::a26_rom_ua_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a26_rom_f6_device(mconfig, A26_ROM_UA, "Atari VCS 2600 ROM Carts w/UA bankswitch", tag, owner, clock, "vcs_ua", __FILE__) { } -a26_rom_cv_device::a26_rom_cv_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a26_rom_cv_device::a26_rom_cv_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a26_rom_2k_device(mconfig, A26_ROM_CV, "Atari VCS 2600 ROM Carts w/Commavid bankswitch", tag, owner, clock, "vcs_cv", __FILE__) { } -a26_rom_dc_device::a26_rom_dc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a26_rom_dc_device::a26_rom_dc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a26_rom_f6_device(mconfig, A26_ROM_DC, "Atari VCS 2600 ROM Carts w/Dynacom bankswitch", tag, owner, clock, "vcs_dc", __FILE__) { } -a26_rom_fv_device::a26_rom_fv_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a26_rom_fv_device::a26_rom_fv_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a26_rom_f6_device(mconfig, A26_ROM_FV, "Atari VCS 2600 ROM Carts w/FV bankswitch", tag, owner, clock, "vcs_fv", __FILE__), m_locked(0) { } -a26_rom_jvp_device::a26_rom_jvp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a26_rom_jvp_device::a26_rom_jvp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a26_rom_f6_device(mconfig, A26_ROM_JVP, "Atari VCS 2600 ROM Carts w/JVP bankswitch", tag, owner, clock, "vcs_jvp", __FILE__) { } -a26_rom_4in1_device::a26_rom_4in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a26_rom_4in1_device::a26_rom_4in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a26_rom_f6_device(mconfig, A26_ROM_4IN1, "Atari VCS 2600 ROM Cart 4 in 1", tag, owner, clock, "vcs_4in1", __FILE__) { } -a26_rom_8in1_device::a26_rom_8in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a26_rom_8in1_device::a26_rom_8in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a26_rom_f8_device(mconfig, A26_ROM_8IN1, "Atari VCS 2600 ROM Cart 8 in 1", tag, owner, clock, "vcs_8in1", __FILE__), m_reset_bank(0) { } -a26_rom_32in1_device::a26_rom_32in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a26_rom_32in1_device::a26_rom_32in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a26_rom_f6_device(mconfig, A26_ROM_32IN1, "Atari VCS 2600 ROM Cart 32 in 1", tag, owner, clock, "vcs_32in1", __FILE__) { } -a26_rom_x07_device::a26_rom_x07_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a26_rom_x07_device::a26_rom_x07_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a26_rom_f6_device(mconfig, A26_ROM_X07, "Atari VCS 2600 ROM Carts w/X07 bankswitch", tag, owner, clock, "vcs_x07", __FILE__) { } diff --git a/src/devices/bus/vcs/rom.h b/src/devices/bus/vcs/rom.h index a6c37465c07..e5174b12525 100755 --- a/src/devices/bus/vcs/rom.h +++ b/src/devices/bus/vcs/rom.h @@ -13,8 +13,8 @@ class a26_rom_2k_device : public device_t, { public: // construction/destruction - a26_rom_2k_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - a26_rom_2k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a26_rom_2k_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a26_rom_2k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -31,7 +31,7 @@ class a26_rom_4k_device : public a26_rom_2k_device { public: // construction/destruction - a26_rom_4k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a26_rom_4k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing @@ -46,8 +46,8 @@ class a26_rom_f6_device : public a26_rom_2k_device { public: // construction/destruction - a26_rom_f6_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - a26_rom_f6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a26_rom_f6_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a26_rom_f6_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -69,7 +69,7 @@ class a26_rom_f4_device : public a26_rom_f6_device { public: // construction/destruction - a26_rom_f4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a26_rom_f4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_reset() override; @@ -86,8 +86,8 @@ class a26_rom_f8_device : public a26_rom_f6_device { public: // construction/destruction - a26_rom_f8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - a26_rom_f8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a26_rom_f8_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a26_rom_f8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_rom) override; @@ -101,7 +101,7 @@ class a26_rom_f8_sw_device : public a26_rom_f8_device { public: // construction/destruction - a26_rom_f8_sw_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a26_rom_f8_sw_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_reset() override; @@ -114,7 +114,7 @@ class a26_rom_fa_device : public a26_rom_f6_device { public: // construction/destruction - a26_rom_fa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a26_rom_fa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_rom) override; @@ -128,7 +128,7 @@ class a26_rom_fe_device : public a26_rom_2k_device { public: // construction/destruction - a26_rom_fe_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a26_rom_fe_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -152,7 +152,7 @@ class a26_rom_3e_device : public a26_rom_f6_device { public: // construction/destruction - a26_rom_3e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a26_rom_3e_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -176,7 +176,7 @@ class a26_rom_3f_device : public a26_rom_f6_device { public: // construction/destruction - a26_rom_3f_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a26_rom_3f_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_reset() override; @@ -196,7 +196,7 @@ class a26_rom_e0_device : public a26_rom_f6_device { public: // construction/destruction - a26_rom_e0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a26_rom_e0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -217,7 +217,7 @@ class a26_rom_e7_device : public a26_rom_f6_device { public: // construction/destruction - a26_rom_e7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a26_rom_e7_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -238,7 +238,7 @@ class a26_rom_ua_device : public a26_rom_f6_device { public: // construction/destruction - a26_rom_ua_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a26_rom_ua_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_reset() override; @@ -256,7 +256,7 @@ class a26_rom_cv_device : public a26_rom_2k_device { public: // construction/destruction - a26_rom_cv_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a26_rom_cv_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_rom) override; @@ -270,7 +270,7 @@ class a26_rom_dc_device : public a26_rom_f6_device { public: // construction/destruction - a26_rom_dc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a26_rom_dc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_rom) override; @@ -284,7 +284,7 @@ class a26_rom_fv_device : public a26_rom_f6_device { public: // construction/destruction - a26_rom_fv_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a26_rom_fv_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -305,7 +305,7 @@ class a26_rom_jvp_device : public a26_rom_f6_device { public: // construction/destruction - a26_rom_jvp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a26_rom_jvp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_rom) override; @@ -319,7 +319,7 @@ class a26_rom_4in1_device : public a26_rom_f6_device { public: // construction/destruction - a26_rom_4in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a26_rom_4in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_reset() override; @@ -335,7 +335,7 @@ class a26_rom_8in1_device : public a26_rom_f8_device { public: // construction/destruction - a26_rom_8in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a26_rom_8in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -355,7 +355,7 @@ class a26_rom_32in1_device : public a26_rom_f6_device { public: // construction/destruction - a26_rom_32in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a26_rom_32in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_reset() override; @@ -371,7 +371,7 @@ class a26_rom_x07_device : public a26_rom_f6_device { public: // construction/destruction - a26_rom_x07_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a26_rom_x07_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_rom) override; diff --git a/src/devices/bus/vcs/scharger.cpp b/src/devices/bus/vcs/scharger.cpp index aeebde0f4c6..74a04f74083 100644 --- a/src/devices/bus/vcs/scharger.cpp +++ b/src/devices/bus/vcs/scharger.cpp @@ -40,7 +40,7 @@ const device_type A26_ROM_SUPERCHARGER = &device_creator<a26_rom_ss_device>; -a26_rom_ss_device::a26_rom_ss_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +a26_rom_ss_device::a26_rom_ss_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : a26_rom_f6_device(mconfig, A26_ROM_SUPERCHARGER, "Atari 2600 ROM Cart Supercharger", tag, owner, clock, "a2600_ss", __FILE__), m_cassette(*this, "cassette"), m_maincpu(nullptr), diff --git a/src/devices/bus/vcs/scharger.h b/src/devices/bus/vcs/scharger.h index 141a08e00e7..2aa36db6774 100644 --- a/src/devices/bus/vcs/scharger.h +++ b/src/devices/bus/vcs/scharger.h @@ -16,7 +16,7 @@ class a26_rom_ss_device : public a26_rom_f6_device { public: // construction/destruction - a26_rom_ss_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + a26_rom_ss_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/vcs/vcs_slot.cpp b/src/devices/bus/vcs/vcs_slot.cpp index b946c8051e7..cea3e2d10c0 100755 --- a/src/devices/bus/vcs/vcs_slot.cpp +++ b/src/devices/bus/vcs/vcs_slot.cpp @@ -49,7 +49,7 @@ device_vcs_cart_interface::~device_vcs_cart_interface() // rom_alloc - alloc the space for the cart //------------------------------------------------- -void device_vcs_cart_interface::rom_alloc(UINT32 size, const char *tag) +void device_vcs_cart_interface::rom_alloc(UINT32 size, std::string tag) { if (m_rom == nullptr) { @@ -77,7 +77,7 @@ void device_vcs_cart_interface::ram_alloc(UINT32 size) //------------------------------------------------- // vcs_cart_slot_device - constructor //------------------------------------------------- -vcs_cart_slot_device::vcs_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +vcs_cart_slot_device::vcs_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VCS_CART_SLOT, "Atari VCS 2600 Cartridge Slot", tag, owner, clock, "vcs_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), m_cart(nullptr), m_type(0) diff --git a/src/devices/bus/vcs/vcs_slot.h b/src/devices/bus/vcs/vcs_slot.h index 984cf5c9d12..f091980d340 100755 --- a/src/devices/bus/vcs/vcs_slot.h +++ b/src/devices/bus/vcs/vcs_slot.h @@ -63,7 +63,7 @@ public: virtual void setup_addon_ptr(UINT8 *ptr) {} - void rom_alloc(UINT32 size, const char *tag); + void rom_alloc(UINT32 size, std::string tag); void ram_alloc(UINT32 size); UINT8* get_rom_base() { return m_rom; } UINT8* get_ram_base() { return &m_ram[0]; } @@ -86,7 +86,7 @@ class vcs_cart_slot_device : public device_t, { public: // construction/destruction - vcs_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vcs_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~vcs_cart_slot_device(); // device-level overrides diff --git a/src/devices/bus/vcs_ctrl/ctrl.cpp b/src/devices/bus/vcs_ctrl/ctrl.cpp index a74c5ae1b84..93327c3c00d 100644 --- a/src/devices/bus/vcs_ctrl/ctrl.cpp +++ b/src/devices/bus/vcs_ctrl/ctrl.cpp @@ -42,7 +42,7 @@ device_vcs_control_port_interface::device_vcs_control_port_interface(const machi // vcs_control_port_device - constructor //------------------------------------------------- -vcs_control_port_device::vcs_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +vcs_control_port_device::vcs_control_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VCS_CONTROL_PORT, "Atari VCS control port", tag, owner, clock, "vcs_control_port", __FILE__), device_slot_interface(mconfig, *this), m_device(nullptr), m_write_trigger(*this) diff --git a/src/devices/bus/vcs_ctrl/ctrl.h b/src/devices/bus/vcs_ctrl/ctrl.h index 41f7c12e75a..69230ee655b 100644 --- a/src/devices/bus/vcs_ctrl/ctrl.h +++ b/src/devices/bus/vcs_ctrl/ctrl.h @@ -68,7 +68,7 @@ class vcs_control_port_device : public device_t, { public: // construction/destruction - vcs_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vcs_control_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~vcs_control_port_device() { } // static configuration helpers diff --git a/src/devices/bus/vcs_ctrl/joybooster.cpp b/src/devices/bus/vcs_ctrl/joybooster.cpp index e1fbfec7c90..b46ea971820 100644 --- a/src/devices/bus/vcs_ctrl/joybooster.cpp +++ b/src/devices/bus/vcs_ctrl/joybooster.cpp @@ -56,7 +56,7 @@ ioport_constructor vcs_joystick_booster_device::device_input_ports() const // vcs_joystick_booster_device - constructor //------------------------------------------------- -vcs_joystick_booster_device::vcs_joystick_booster_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +vcs_joystick_booster_device::vcs_joystick_booster_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VCS_JOYSTICK_BOOSTER, "Atari / CBM Digital joystick with Boostergrip", tag, owner, clock, "vcs_joystick_booster", __FILE__), device_vcs_control_port_interface(mconfig, *this), m_joy(*this, "JOY"), diff --git a/src/devices/bus/vcs_ctrl/joybooster.h b/src/devices/bus/vcs_ctrl/joybooster.h index d04be025ab9..0f3b08f5fd0 100644 --- a/src/devices/bus/vcs_ctrl/joybooster.h +++ b/src/devices/bus/vcs_ctrl/joybooster.h @@ -28,7 +28,7 @@ class vcs_joystick_booster_device : public device_t, { public: // construction/destruction - vcs_joystick_booster_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vcs_joystick_booster_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/vcs_ctrl/joystick.cpp b/src/devices/bus/vcs_ctrl/joystick.cpp index f1539eabeef..c3f4619b9f9 100644 --- a/src/devices/bus/vcs_ctrl/joystick.cpp +++ b/src/devices/bus/vcs_ctrl/joystick.cpp @@ -47,7 +47,7 @@ ioport_constructor vcs_joystick_device::device_input_ports() const // vcs_joystick_device - constructor //------------------------------------------------- -vcs_joystick_device::vcs_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +vcs_joystick_device::vcs_joystick_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VCS_JOYSTICK, "Atari / CBM Digital joystick", tag, owner, clock, "vcs_joystick", __FILE__), device_vcs_control_port_interface(mconfig, *this), m_joy(*this, "JOY") diff --git a/src/devices/bus/vcs_ctrl/joystick.h b/src/devices/bus/vcs_ctrl/joystick.h index d43f6912dff..53ec0e86de0 100644 --- a/src/devices/bus/vcs_ctrl/joystick.h +++ b/src/devices/bus/vcs_ctrl/joystick.h @@ -27,7 +27,7 @@ class vcs_joystick_device : public device_t, { public: // construction/destruction - vcs_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vcs_joystick_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/vcs_ctrl/keypad.cpp b/src/devices/bus/vcs_ctrl/keypad.cpp index b1a1f2079d6..1fa375b8871 100644 --- a/src/devices/bus/vcs_ctrl/keypad.cpp +++ b/src/devices/bus/vcs_ctrl/keypad.cpp @@ -53,7 +53,7 @@ ioport_constructor vcs_keypad_device::device_input_ports() const // vcs_keypad_device - constructor //------------------------------------------------- -vcs_keypad_device::vcs_keypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +vcs_keypad_device::vcs_keypad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VCS_KEYPAD, "Atari / CBM Keypad", tag, owner, clock, "vcs_keypad", __FILE__), device_vcs_control_port_interface(mconfig, *this), m_keypad(*this, "KEYPAD"), m_column(0) diff --git a/src/devices/bus/vcs_ctrl/keypad.h b/src/devices/bus/vcs_ctrl/keypad.h index ffa4c1fed63..84a2a037be1 100644 --- a/src/devices/bus/vcs_ctrl/keypad.h +++ b/src/devices/bus/vcs_ctrl/keypad.h @@ -27,7 +27,7 @@ class vcs_keypad_device : public device_t, { public: // construction/destruction - vcs_keypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vcs_keypad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/vcs_ctrl/lightpen.cpp b/src/devices/bus/vcs_ctrl/lightpen.cpp index 446e57cd6a0..4bc8a632cdb 100644 --- a/src/devices/bus/vcs_ctrl/lightpen.cpp +++ b/src/devices/bus/vcs_ctrl/lightpen.cpp @@ -56,7 +56,7 @@ ioport_constructor vcs_lightpen_device::device_input_ports() const // vcs_lightpen_device - constructor //------------------------------------------------- -vcs_lightpen_device::vcs_lightpen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +vcs_lightpen_device::vcs_lightpen_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VCS_LIGHTPEN, "Atari / CBM Light Pen", tag, owner, clock, "vcs_lightpen", __FILE__), device_vcs_control_port_interface(mconfig, *this), m_joy(*this, "JOY"), diff --git a/src/devices/bus/vcs_ctrl/lightpen.h b/src/devices/bus/vcs_ctrl/lightpen.h index 0aed6ac85a4..80baf41a9c8 100644 --- a/src/devices/bus/vcs_ctrl/lightpen.h +++ b/src/devices/bus/vcs_ctrl/lightpen.h @@ -27,7 +27,7 @@ class vcs_lightpen_device : public device_t, { public: // construction/destruction - vcs_lightpen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vcs_lightpen_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/vcs_ctrl/paddles.cpp b/src/devices/bus/vcs_ctrl/paddles.cpp index b8a4f4a6de5..b49fb6acee4 100644 --- a/src/devices/bus/vcs_ctrl/paddles.cpp +++ b/src/devices/bus/vcs_ctrl/paddles.cpp @@ -50,7 +50,7 @@ ioport_constructor vcs_paddles_device::device_input_ports() const // vcs_paddles_device - constructor //------------------------------------------------- -vcs_paddles_device::vcs_paddles_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +vcs_paddles_device::vcs_paddles_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VCS_PADDLES, "Atari / CBM Digital paddles", tag, owner, clock, "vcs_paddles", __FILE__), device_vcs_control_port_interface(mconfig, *this), m_joy(*this, "JOY"), diff --git a/src/devices/bus/vcs_ctrl/paddles.h b/src/devices/bus/vcs_ctrl/paddles.h index 65ffd394fef..1d17b3f02a0 100644 --- a/src/devices/bus/vcs_ctrl/paddles.h +++ b/src/devices/bus/vcs_ctrl/paddles.h @@ -27,7 +27,7 @@ class vcs_paddles_device : public device_t, { public: // construction/destruction - vcs_paddles_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vcs_paddles_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/vcs_ctrl/wheel.cpp b/src/devices/bus/vcs_ctrl/wheel.cpp index 9d1f3009596..318ba47c2b4 100644 --- a/src/devices/bus/vcs_ctrl/wheel.cpp +++ b/src/devices/bus/vcs_ctrl/wheel.cpp @@ -46,7 +46,7 @@ ioport_constructor vcs_wheel_device::device_input_ports() const // vcs_wheel_device - constructor //------------------------------------------------- -vcs_wheel_device::vcs_wheel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +vcs_wheel_device::vcs_wheel_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VCS_WHEEL, "Atari / CBM Driving Wheel", tag, owner, clock, "vcs_wheel", __FILE__), device_vcs_control_port_interface(mconfig, *this), m_joy(*this, "JOY"), diff --git a/src/devices/bus/vcs_ctrl/wheel.h b/src/devices/bus/vcs_ctrl/wheel.h index 9cb8818144e..970cb722b75 100644 --- a/src/devices/bus/vcs_ctrl/wheel.h +++ b/src/devices/bus/vcs_ctrl/wheel.h @@ -27,7 +27,7 @@ class vcs_wheel_device : public device_t, { public: // construction/destruction - vcs_wheel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vcs_wheel_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/vectrex/rom.cpp b/src/devices/bus/vectrex/rom.cpp index d8f2993a3be..47fbd9a3059 100644 --- a/src/devices/bus/vectrex/rom.cpp +++ b/src/devices/bus/vectrex/rom.cpp @@ -25,24 +25,24 @@ const device_type VECTREX_ROM_64K = &device_creator<vectrex_rom64k_device>; const device_type VECTREX_ROM_SRAM = &device_creator<vectrex_sram_device>; -vectrex_rom_device::vectrex_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +vectrex_rom_device::vectrex_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_vectrex_cart_interface(mconfig, *this) { } -vectrex_rom_device::vectrex_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +vectrex_rom_device::vectrex_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VECTREX_ROM_STD, "Vectrex Standard Carts", tag, owner, clock, "vectrex_rom", __FILE__), device_vectrex_cart_interface(mconfig, *this) { } -vectrex_rom64k_device::vectrex_rom64k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +vectrex_rom64k_device::vectrex_rom64k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : vectrex_rom_device(mconfig, VECTREX_ROM_64K, "Vectrex Carts w/ Bankswitch", tag, owner, clock, "vectrex_64k", __FILE__), m_bank(0) { } -vectrex_sram_device::vectrex_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +vectrex_sram_device::vectrex_sram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : vectrex_rom_device(mconfig, VECTREX_ROM_SRAM, "Vectrex Carts w/ SRAM", tag, owner, clock, "vectrex_sram", __FILE__) { } diff --git a/src/devices/bus/vectrex/rom.h b/src/devices/bus/vectrex/rom.h index 453cbfed89b..65bcf94d513 100644 --- a/src/devices/bus/vectrex/rom.h +++ b/src/devices/bus/vectrex/rom.h @@ -13,8 +13,8 @@ class vectrex_rom_device : public device_t, { public: // construction/destruction - vectrex_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - vectrex_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vectrex_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + vectrex_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override {} @@ -30,7 +30,7 @@ class vectrex_rom64k_device : public vectrex_rom_device { public: // construction/destruction - vectrex_rom64k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vectrex_rom64k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -50,7 +50,7 @@ class vectrex_sram_device : public vectrex_rom_device { public: // construction/destruction - vectrex_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vectrex_sram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing virtual DECLARE_WRITE8_MEMBER(write_ram) override; diff --git a/src/devices/bus/vectrex/slot.cpp b/src/devices/bus/vectrex/slot.cpp index 1a9bbed7d29..0669baf4356 100644 --- a/src/devices/bus/vectrex/slot.cpp +++ b/src/devices/bus/vectrex/slot.cpp @@ -45,7 +45,7 @@ device_vectrex_cart_interface::~device_vectrex_cart_interface() // rom_alloc - alloc the space for the cart //------------------------------------------------- -void device_vectrex_cart_interface::rom_alloc(UINT32 size, const char *tag) +void device_vectrex_cart_interface::rom_alloc(UINT32 size, std::string tag) { if (m_rom == nullptr) { @@ -62,7 +62,7 @@ void device_vectrex_cart_interface::rom_alloc(UINT32 size, const char *tag) //------------------------------------------------- // vectrex_cart_slot_device - constructor //------------------------------------------------- -vectrex_cart_slot_device::vectrex_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +vectrex_cart_slot_device::vectrex_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VECTREX_CART_SLOT, "GCE Vectrex Cartridge Slot", tag, owner, clock, "vectrex_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), diff --git a/src/devices/bus/vectrex/slot.h b/src/devices/bus/vectrex/slot.h index 5a1bf306213..a3e2479eb52 100644 --- a/src/devices/bus/vectrex/slot.h +++ b/src/devices/bus/vectrex/slot.h @@ -39,7 +39,7 @@ public: virtual DECLARE_WRITE8_MEMBER(write_ram) {} virtual DECLARE_WRITE8_MEMBER(write_bank) {} - void rom_alloc(UINT32 size, const char *tag); + void rom_alloc(UINT32 size, std::string tag); UINT8* get_rom_base() { return m_rom; } UINT32 get_rom_size() { return m_rom_size; } @@ -58,7 +58,7 @@ class vectrex_cart_slot_device : public device_t, { public: // construction/destruction - vectrex_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vectrex_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~vectrex_cart_slot_device(); // device-level overrides diff --git a/src/devices/bus/vic10/exp.cpp b/src/devices/bus/vic10/exp.cpp index 1aa6f2e6363..05a16c4f757 100644 --- a/src/devices/bus/vic10/exp.cpp +++ b/src/devices/bus/vic10/exp.cpp @@ -56,7 +56,7 @@ device_vic10_expansion_card_interface::~device_vic10_expansion_card_interface() // vic10_expansion_slot_device - constructor //------------------------------------------------- -vic10_expansion_slot_device::vic10_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +vic10_expansion_slot_device::vic10_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VIC10_EXPANSION_SLOT, "VIC-10 expansion port", tag, owner, clock, "vic10_expansion_slot", __FILE__), device_slot_interface(mconfig, *this), device_image_interface(mconfig, *this), diff --git a/src/devices/bus/vic10/exp.h b/src/devices/bus/vic10/exp.h index 9ca71e33653..9ad734b5ffe 100644 --- a/src/devices/bus/vic10/exp.h +++ b/src/devices/bus/vic10/exp.h @@ -93,7 +93,7 @@ class vic10_expansion_slot_device : public device_t, { public: // construction/destruction - vic10_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vic10_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<vic10_expansion_slot_device &>(device).m_write_irq.set_callback(object); } template<class _Object> static devcb_base &set_res_wr_callback(device_t &device, _Object object) { return downcast<vic10_expansion_slot_device &>(device).m_write_res.set_callback(object); } diff --git a/src/devices/bus/vic10/std.cpp b/src/devices/bus/vic10/std.cpp index a0cd1aa67cf..dbfb2d89281 100644 --- a/src/devices/bus/vic10/std.cpp +++ b/src/devices/bus/vic10/std.cpp @@ -26,7 +26,7 @@ const device_type VIC10_STD = &device_creator<vic10_standard_cartridge_device>; // vic10_standard_cartridge_device - constructor //------------------------------------------------- -vic10_standard_cartridge_device::vic10_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +vic10_standard_cartridge_device::vic10_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VIC10_STD, "VIC-10 Standard Cartridge", tag, owner, clock, "vic10_standard", __FILE__), device_vic10_expansion_card_interface(mconfig, *this) { diff --git a/src/devices/bus/vic10/std.h b/src/devices/bus/vic10/std.h index 5f7e206a166..633cddf9c1e 100644 --- a/src/devices/bus/vic10/std.h +++ b/src/devices/bus/vic10/std.h @@ -27,7 +27,7 @@ class vic10_standard_cartridge_device : public device_t, { public: // construction/destruction - vic10_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vic10_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/vic20/4cga.cpp b/src/devices/bus/vic20/4cga.cpp index 67901823065..d46e4348350 100644 --- a/src/devices/bus/vic20/4cga.cpp +++ b/src/devices/bus/vic20/4cga.cpp @@ -58,7 +58,7 @@ ioport_constructor c64_4cga_device::device_input_ports() const // c64_4cga_device - constructor //------------------------------------------------- -c64_4cga_device::c64_4cga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c64_4cga_device::c64_4cga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_4CGA, "C64 Protovision 4 Player Interface", tag, owner, clock, "c64_4cga", __FILE__), device_pet_user_port_interface(mconfig, *this), m_port(0), diff --git a/src/devices/bus/vic20/4cga.h b/src/devices/bus/vic20/4cga.h index e95e682ae1d..8b5a2b83c56 100644 --- a/src/devices/bus/vic20/4cga.h +++ b/src/devices/bus/vic20/4cga.h @@ -28,7 +28,7 @@ class c64_4cga_device : public device_t, { public: // construction/destruction - c64_4cga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c64_4cga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/vic20/exp.cpp b/src/devices/bus/vic20/exp.cpp index 37761ab7d14..f11ec3ecd82 100644 --- a/src/devices/bus/vic20/exp.cpp +++ b/src/devices/bus/vic20/exp.cpp @@ -56,7 +56,7 @@ device_vic20_expansion_card_interface::~device_vic20_expansion_card_interface() // vic20_expansion_slot_device - constructor //------------------------------------------------- -vic20_expansion_slot_device::vic20_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +vic20_expansion_slot_device::vic20_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VIC20_EXPANSION_SLOT, "VIC-20 expansion port", tag, owner, clock, "vic20_expansion_slot", __FILE__), device_slot_interface(mconfig, *this), device_image_interface(mconfig, *this), diff --git a/src/devices/bus/vic20/exp.h b/src/devices/bus/vic20/exp.h index 15d67b00e53..38fe4ef45a6 100644 --- a/src/devices/bus/vic20/exp.h +++ b/src/devices/bus/vic20/exp.h @@ -88,7 +88,7 @@ class vic20_expansion_slot_device : public device_t, { public: // construction/destruction - vic20_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vic20_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<vic20_expansion_slot_device &>(device).m_write_irq.set_callback(object); } template<class _Object> static devcb_base &set_nmi_wr_callback(device_t &device, _Object object) { return downcast<vic20_expansion_slot_device &>(device).m_write_nmi.set_callback(object); } diff --git a/src/devices/bus/vic20/fe3.cpp b/src/devices/bus/vic20/fe3.cpp index 9c24b0de19e..c8e67fa9f99 100644 --- a/src/devices/bus/vic20/fe3.cpp +++ b/src/devices/bus/vic20/fe3.cpp @@ -110,7 +110,7 @@ machine_config_constructor vic20_final_expansion_3_t::device_mconfig_additions() // vic20_final_expansion_3_t - constructor //------------------------------------------------- -vic20_final_expansion_3_t::vic20_final_expansion_3_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +vic20_final_expansion_3_t::vic20_final_expansion_3_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VIC20_FE3, "Final Expansion v3", tag, owner, clock, "vic20_fe3", __FILE__), device_vic20_expansion_card_interface(mconfig, *this), m_flash_rom(*this, AM29F040_TAG), diff --git a/src/devices/bus/vic20/fe3.h b/src/devices/bus/vic20/fe3.h index 93669f5ace3..0b478d9b95e 100644 --- a/src/devices/bus/vic20/fe3.h +++ b/src/devices/bus/vic20/fe3.h @@ -28,7 +28,7 @@ class vic20_final_expansion_3_t : public device_t, { public: // construction/destruction - vic20_final_expansion_3_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vic20_final_expansion_3_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/vic20/megacart.cpp b/src/devices/bus/vic20/megacart.cpp index e92e1dbbc55..874a3718840 100644 --- a/src/devices/bus/vic20/megacart.cpp +++ b/src/devices/bus/vic20/megacart.cpp @@ -46,7 +46,7 @@ machine_config_constructor vic20_megacart_device::device_mconfig_additions() con // vic20_megacart_device - constructor //------------------------------------------------- -vic20_megacart_device::vic20_megacart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +vic20_megacart_device::vic20_megacart_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VIC20_MEGACART, "Mega-Cart", tag, owner, clock, "megacart", __FILE__), device_vic20_expansion_card_interface(mconfig, *this), device_nvram_interface(mconfig, *this), diff --git a/src/devices/bus/vic20/megacart.h b/src/devices/bus/vic20/megacart.h index 678ddac1cff..44bcd98293c 100644 --- a/src/devices/bus/vic20/megacart.h +++ b/src/devices/bus/vic20/megacart.h @@ -28,7 +28,7 @@ class vic20_megacart_device : public device_t, { public: // construction/destruction - vic20_megacart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vic20_megacart_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/vic20/std.cpp b/src/devices/bus/vic20/std.cpp index fe02022f2be..5f0e9cbf710 100644 --- a/src/devices/bus/vic20/std.cpp +++ b/src/devices/bus/vic20/std.cpp @@ -26,7 +26,7 @@ const device_type VIC20_STD = &device_creator<vic20_standard_cartridge_device>; // vic20_standard_cartridge_device - constructor //------------------------------------------------- -vic20_standard_cartridge_device::vic20_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +vic20_standard_cartridge_device::vic20_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VIC20_STD, "VIC-20 Standard Cartridge", tag, owner, clock, "vic20_standard", __FILE__), device_vic20_expansion_card_interface(mconfig, *this) { diff --git a/src/devices/bus/vic20/std.h b/src/devices/bus/vic20/std.h index 0ea4cdec1ab..5258f1bb685 100644 --- a/src/devices/bus/vic20/std.h +++ b/src/devices/bus/vic20/std.h @@ -27,7 +27,7 @@ class vic20_standard_cartridge_device : public device_t, { public: // construction/destruction - vic20_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vic20_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/vic20/vic1010.cpp b/src/devices/bus/vic20/vic1010.cpp index 5aa981edb5a..0ad656efc2a 100644 --- a/src/devices/bus/vic20/vic1010.cpp +++ b/src/devices/bus/vic20/vic1010.cpp @@ -51,7 +51,7 @@ machine_config_constructor vic1010_device::device_mconfig_additions() const // vic1010_device - constructor //------------------------------------------------- -vic1010_device::vic1010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +vic1010_device::vic1010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VIC1010, "VIC1010", tag, owner, clock, "vic1010", __FILE__), device_vic20_expansion_card_interface(mconfig, *this), m_slot1(*this, "slot1"), diff --git a/src/devices/bus/vic20/vic1010.h b/src/devices/bus/vic20/vic1010.h index a481ba9cb08..78cf79a5e34 100644 --- a/src/devices/bus/vic20/vic1010.h +++ b/src/devices/bus/vic20/vic1010.h @@ -35,7 +35,7 @@ class vic1010_device : public device_t, { public: // construction/destruction - vic1010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vic1010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/vic20/vic1011.cpp b/src/devices/bus/vic20/vic1011.cpp index 0b0d30f97f5..7e4f655bfb8 100644 --- a/src/devices/bus/vic20/vic1011.cpp +++ b/src/devices/bus/vic20/vic1011.cpp @@ -58,7 +58,7 @@ machine_config_constructor vic1011_device::device_mconfig_additions() const // vic1011_device - constructor //------------------------------------------------- -vic1011_device::vic1011_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +vic1011_device::vic1011_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VIC1011, "VIC1011", tag, owner, clock, "vic1011", __FILE__), device_pet_user_port_interface(mconfig, *this), m_rs232(*this, RS232_TAG) diff --git a/src/devices/bus/vic20/vic1011.h b/src/devices/bus/vic20/vic1011.h index 0e5b104b0e3..07f5c74c750 100644 --- a/src/devices/bus/vic20/vic1011.h +++ b/src/devices/bus/vic20/vic1011.h @@ -27,7 +27,7 @@ class vic1011_device : public device_t, { public: // construction/destruction - vic1011_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vic1011_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/vic20/vic1110.cpp b/src/devices/bus/vic20/vic1110.cpp index c8d9acb1398..54a8e9975ee 100644 --- a/src/devices/bus/vic20/vic1110.cpp +++ b/src/devices/bus/vic20/vic1110.cpp @@ -65,7 +65,7 @@ ioport_constructor vic1110_device::device_input_ports() const // vic1110_device - constructor //------------------------------------------------- -vic1110_device::vic1110_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +vic1110_device::vic1110_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VIC1110, "VIC1110", tag, owner, clock, "vic1110", __FILE__), device_vic20_expansion_card_interface(mconfig, *this), m_ram(*this, "ram"), diff --git a/src/devices/bus/vic20/vic1110.h b/src/devices/bus/vic20/vic1110.h index 21a4660d282..746ca23df77 100644 --- a/src/devices/bus/vic20/vic1110.h +++ b/src/devices/bus/vic20/vic1110.h @@ -27,7 +27,7 @@ class vic1110_device : public device_t, { public: // construction/destruction - vic1110_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vic1110_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/vic20/vic1111.cpp b/src/devices/bus/vic20/vic1111.cpp index 770d5639d8f..bbb89ab86be 100644 --- a/src/devices/bus/vic20/vic1111.cpp +++ b/src/devices/bus/vic20/vic1111.cpp @@ -26,7 +26,7 @@ const device_type VIC1111 = &device_creator<vic1111_device>; // vic1111_device - constructor //------------------------------------------------- -vic1111_device::vic1111_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +vic1111_device::vic1111_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VIC1111, "VIC1111", tag, owner, clock, "vic1111", __FILE__), device_vic20_expansion_card_interface(mconfig, *this), m_ram(*this, "ram") diff --git a/src/devices/bus/vic20/vic1111.h b/src/devices/bus/vic20/vic1111.h index 83783da6878..739bc262c45 100644 --- a/src/devices/bus/vic20/vic1111.h +++ b/src/devices/bus/vic20/vic1111.h @@ -27,7 +27,7 @@ class vic1111_device : public device_t, { public: // construction/destruction - vic1111_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vic1111_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/vic20/vic1112.cpp b/src/devices/bus/vic20/vic1112.cpp index 9ccb180aa6a..1f0c75e50f6 100644 --- a/src/devices/bus/vic20/vic1112.cpp +++ b/src/devices/bus/vic20/vic1112.cpp @@ -134,7 +134,7 @@ machine_config_constructor vic1112_device::device_mconfig_additions() const // vic1112_device - constructor //------------------------------------------------- -vic1112_device::vic1112_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +vic1112_device::vic1112_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VIC1112, "VIC1112", tag, owner, clock, "vic1112", __FILE__), device_vic20_expansion_card_interface(mconfig, *this), m_via0(*this, M6522_0_TAG), diff --git a/src/devices/bus/vic20/vic1112.h b/src/devices/bus/vic20/vic1112.h index fce5971c533..1acfa4b9c51 100644 --- a/src/devices/bus/vic20/vic1112.h +++ b/src/devices/bus/vic20/vic1112.h @@ -32,7 +32,7 @@ class vic1112_device : public device_t, { public: // construction/destruction - vic1112_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vic1112_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/vic20/vic1210.cpp b/src/devices/bus/vic20/vic1210.cpp index 5acb518cd08..2430ccd5cde 100644 --- a/src/devices/bus/vic20/vic1210.cpp +++ b/src/devices/bus/vic20/vic1210.cpp @@ -27,7 +27,7 @@ const device_type VIC1210 = &device_creator<vic1210_device>; // vic1210_device - constructor //------------------------------------------------- -vic1210_device::vic1210_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +vic1210_device::vic1210_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VIC1210, "VIC1210", tag, owner, clock, "vic1210", __FILE__), device_vic20_expansion_card_interface(mconfig, *this), m_ram(*this, "ram") diff --git a/src/devices/bus/vic20/vic1210.h b/src/devices/bus/vic20/vic1210.h index 90de25cddae..9b2dccafc12 100644 --- a/src/devices/bus/vic20/vic1210.h +++ b/src/devices/bus/vic20/vic1210.h @@ -28,7 +28,7 @@ class vic1210_device : public device_t, { public: // construction/destruction - vic1210_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vic1210_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/vidbrain/exp.cpp b/src/devices/bus/vidbrain/exp.cpp index 2b4ac800ff3..93fd9bb77e4 100644 --- a/src/devices/bus/vidbrain/exp.cpp +++ b/src/devices/bus/vidbrain/exp.cpp @@ -86,7 +86,7 @@ UINT8* device_videobrain_expansion_card_interface::videobrain_ram_pointer(runnin // videobrain_expansion_slot_device - constructor //------------------------------------------------- -videobrain_expansion_slot_device::videobrain_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +videobrain_expansion_slot_device::videobrain_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VIDEOBRAIN_EXPANSION_SLOT, "VideoBrain expansion port", tag, owner, clock, "videobrain_expansion_slot", __FILE__), device_slot_interface(mconfig, *this), device_image_interface(mconfig, *this), diff --git a/src/devices/bus/vidbrain/exp.h b/src/devices/bus/vidbrain/exp.h index e431ff3f1a6..664a479c7d2 100644 --- a/src/devices/bus/vidbrain/exp.h +++ b/src/devices/bus/vidbrain/exp.h @@ -110,7 +110,7 @@ class videobrain_expansion_slot_device : public device_t, { public: // construction/destruction - videobrain_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + videobrain_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~videobrain_expansion_slot_device() { } template<class _Object> static devcb_base &set_extres_wr_callback(device_t &device, _Object object) { return downcast<videobrain_expansion_slot_device &>(device).m_write_extres.set_callback(object); } diff --git a/src/devices/bus/vidbrain/money_minder.cpp b/src/devices/bus/vidbrain/money_minder.cpp index f5fa70bd868..491fb5e0a11 100644 --- a/src/devices/bus/vidbrain/money_minder.cpp +++ b/src/devices/bus/vidbrain/money_minder.cpp @@ -26,7 +26,7 @@ const device_type VB_MONEY_MINDER = &device_creator<videobrain_money_minder_cart // videobrain_money_minder_cartridge_device - constructor //------------------------------------------------- -videobrain_money_minder_cartridge_device::videobrain_money_minder_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +videobrain_money_minder_cartridge_device::videobrain_money_minder_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VB_MONEY_MINDER, "VideoBrain Money Minder cartridge", tag, owner, clock, "vb_money_minder", __FILE__), device_videobrain_expansion_card_interface(mconfig, *this) { diff --git a/src/devices/bus/vidbrain/money_minder.h b/src/devices/bus/vidbrain/money_minder.h index b32723338f9..e1b883e93a8 100644 --- a/src/devices/bus/vidbrain/money_minder.h +++ b/src/devices/bus/vidbrain/money_minder.h @@ -27,7 +27,7 @@ class videobrain_money_minder_cartridge_device : public device_t, { public: // construction/destruction - videobrain_money_minder_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + videobrain_money_minder_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/vidbrain/std.cpp b/src/devices/bus/vidbrain/std.cpp index f56f5fd9d9f..b824ade83ad 100644 --- a/src/devices/bus/vidbrain/std.cpp +++ b/src/devices/bus/vidbrain/std.cpp @@ -26,7 +26,7 @@ const device_type VB_STD = &device_creator<videobrain_standard_cartridge_device> // videobrain_standard_cartridge_device - constructor //------------------------------------------------- -videobrain_standard_cartridge_device::videobrain_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +videobrain_standard_cartridge_device::videobrain_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VB_STD, "VideoBrain standard cartridge", tag, owner, clock, "vb_std", __FILE__), device_videobrain_expansion_card_interface(mconfig, *this) { diff --git a/src/devices/bus/vidbrain/std.h b/src/devices/bus/vidbrain/std.h index 8cde3c70db4..52f027d830a 100644 --- a/src/devices/bus/vidbrain/std.h +++ b/src/devices/bus/vidbrain/std.h @@ -27,7 +27,7 @@ class videobrain_standard_cartridge_device : public device_t, { public: // construction/destruction - videobrain_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + videobrain_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/vidbrain/timeshare.cpp b/src/devices/bus/vidbrain/timeshare.cpp index 196bf66db2e..6f3d8da12ea 100644 --- a/src/devices/bus/vidbrain/timeshare.cpp +++ b/src/devices/bus/vidbrain/timeshare.cpp @@ -26,7 +26,7 @@ const device_type VB_TIMESHARE = &device_creator<videobrain_timeshare_cartridge_ // videobrain_timeshare_cartridge_device - constructor //------------------------------------------------- -videobrain_timeshare_cartridge_device::videobrain_timeshare_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +videobrain_timeshare_cartridge_device::videobrain_timeshare_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VB_TIMESHARE, "VideoBrain Timeshare cartridge", tag, owner, clock, "vb_timeshare", __FILE__), device_videobrain_expansion_card_interface(mconfig, *this) { diff --git a/src/devices/bus/vidbrain/timeshare.h b/src/devices/bus/vidbrain/timeshare.h index ac59726dfb7..595d6af5ca2 100644 --- a/src/devices/bus/vidbrain/timeshare.h +++ b/src/devices/bus/vidbrain/timeshare.h @@ -27,7 +27,7 @@ class videobrain_timeshare_cartridge_device : public device_t, { public: // construction/destruction - videobrain_timeshare_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + videobrain_timeshare_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/vip/byteio.cpp b/src/devices/bus/vip/byteio.cpp index 871a60138f4..50b27735c0e 100644 --- a/src/devices/bus/vip/byteio.cpp +++ b/src/devices/bus/vip/byteio.cpp @@ -42,7 +42,7 @@ device_vip_byteio_port_interface::device_vip_byteio_port_interface(const machine // vip_byteio_port_device - constructor //------------------------------------------------- -vip_byteio_port_device::vip_byteio_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +vip_byteio_port_device::vip_byteio_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VIP_BYTEIO_PORT, "VIP byte I/O port", tag, owner, clock, "vip_byteio_port", __FILE__), device_slot_interface(mconfig, *this), m_write_inst(*this), m_cart(nullptr) diff --git a/src/devices/bus/vip/byteio.h b/src/devices/bus/vip/byteio.h index 8871e1f0d72..c4bb61a6838 100644 --- a/src/devices/bus/vip/byteio.h +++ b/src/devices/bus/vip/byteio.h @@ -72,7 +72,7 @@ class vip_byteio_port_device : public device_t, { public: // construction/destruction - vip_byteio_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vip_byteio_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template<class _inst> void set_inst_callback(_inst inst) { m_write_inst.set_callback(inst); } diff --git a/src/devices/bus/vip/exp.cpp b/src/devices/bus/vip/exp.cpp index 59db0c4844d..a5e9646251a 100644 --- a/src/devices/bus/vip/exp.cpp +++ b/src/devices/bus/vip/exp.cpp @@ -50,7 +50,7 @@ device_vip_expansion_card_interface::device_vip_expansion_card_interface(const m // vip_expansion_slot_device - constructor //------------------------------------------------- -vip_expansion_slot_device::vip_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +vip_expansion_slot_device::vip_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VIP_EXPANSION_SLOT, "VIP expansion port", tag, owner, clock, "vip_expansion_slot", __FILE__), device_slot_interface(mconfig, *this), m_write_int(*this), diff --git a/src/devices/bus/vip/exp.h b/src/devices/bus/vip/exp.h index 8aad60fafc8..0269231eee5 100644 --- a/src/devices/bus/vip/exp.h +++ b/src/devices/bus/vip/exp.h @@ -81,7 +81,7 @@ class vip_expansion_slot_device : public device_t, { public: // construction/destruction - vip_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vip_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template<class _Object> static devcb_base &set_int_wr_callback(device_t &device, _Object object) { return downcast<vip_expansion_slot_device &>(device).m_write_int.set_callback(object); } template<class _Object> static devcb_base &set_dma_out_wr_callback(device_t &device, _Object object) { return downcast<vip_expansion_slot_device &>(device).m_write_dma_out.set_callback(object); } diff --git a/src/devices/bus/vip/vp550.cpp b/src/devices/bus/vip/vp550.cpp index dbf25a6a190..eadcd90731b 100644 --- a/src/devices/bus/vip/vp550.cpp +++ b/src/devices/bus/vip/vp550.cpp @@ -78,7 +78,7 @@ machine_config_constructor vp550_device::device_mconfig_additions() const // vp550_device - constructor //------------------------------------------------- -vp550_device::vp550_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +vp550_device::vp550_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VP550, "VP550", tag, owner, clock, "vp550", __FILE__), device_vip_expansion_card_interface(mconfig, *this), m_pfg_a(*this, CDP1863_A_TAG), @@ -106,7 +106,7 @@ void vp550_device::device_start() void vp550_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) { - if (LOG) logerror("VP550 '%s' Interrupt\n", tag()); + if (LOG) logerror("VP550 '%s' Interrupt\n", tag().c_str()); m_slot->interrupt_w(ASSERT_LINE); } @@ -147,7 +147,7 @@ void vp550_device::vip_sc_w(int data) { if (BIT(data, 1)) { - if (LOG) logerror("VP550 '%s' Clear Interrupt\n", tag()); + if (LOG) logerror("VP550 '%s' Clear Interrupt\n", tag().c_str()); m_slot->interrupt_w(CLEAR_LINE); } @@ -205,7 +205,7 @@ WRITE8_MEMBER( vp550_device::octave_w ) case CHANNEL_B: m_pfg_b->set_clk2(clock2); break; } - if (LOG) logerror("VP550 '%s' Clock %c: %u Hz\n", tag(), 'A' + channel, clock2); + if (LOG) logerror("VP550 '%s' Clock %c: %u Hz\n", tag().c_str(), 'A' + channel, clock2); } @@ -215,7 +215,7 @@ WRITE8_MEMBER( vp550_device::octave_w ) WRITE8_MEMBER( vp550_device::vlmna_w ) { - if (LOG) logerror("VP550 '%s' A Volume: %u\n", tag(), data & 0x0f); + if (LOG) logerror("VP550 '%s' A Volume: %u\n", tag().c_str(), data & 0x0f); float gain = (data & 0x0f) * 0.0666; @@ -229,7 +229,7 @@ WRITE8_MEMBER( vp550_device::vlmna_w ) WRITE8_MEMBER( vp550_device::vlmnb_w ) { - if (LOG) logerror("VP550 '%s' B Volume: %u\n", tag(), data & 0x0f); + if (LOG) logerror("VP550 '%s' B Volume: %u\n", tag().c_str(), data & 0x0f); float gain = (data & 0x0f) * 0.0666; @@ -243,7 +243,7 @@ WRITE8_MEMBER( vp550_device::vlmnb_w ) WRITE8_MEMBER( vp550_device::sync_w ) { - if (LOG) logerror("VP550 '%s' Interrupt Enable: %u\n", tag(), BIT(data, 0)); + if (LOG) logerror("VP550 '%s' Interrupt Enable: %u\n", tag().c_str(), BIT(data, 0)); m_sync_timer->enable(BIT(data, 0)); } diff --git a/src/devices/bus/vip/vp550.h b/src/devices/bus/vip/vp550.h index 99ba25b64fd..8590f1a2cfe 100644 --- a/src/devices/bus/vip/vp550.h +++ b/src/devices/bus/vip/vp550.h @@ -28,7 +28,7 @@ class vp550_device : public device_t, { public: // construction/destruction - vp550_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vp550_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/vip/vp570.cpp b/src/devices/bus/vip/vp570.cpp index 42ec4119c21..5c07c4ec020 100644 --- a/src/devices/bus/vip/vp570.cpp +++ b/src/devices/bus/vip/vp570.cpp @@ -59,7 +59,7 @@ ioport_constructor vp570_device::device_input_ports() const // vp570_device - constructor //------------------------------------------------- -vp570_device::vp570_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +vp570_device::vp570_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VP570, "VP570", tag, owner, clock, "vp570", __FILE__), device_vip_expansion_card_interface(mconfig, *this), m_ram(*this, "ram"), diff --git a/src/devices/bus/vip/vp570.h b/src/devices/bus/vip/vp570.h index 745b96cff95..b670591386e 100644 --- a/src/devices/bus/vip/vp570.h +++ b/src/devices/bus/vip/vp570.h @@ -27,7 +27,7 @@ class vp570_device : public device_t, { public: // construction/destruction - vp570_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vp570_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/vip/vp575.cpp b/src/devices/bus/vip/vp575.cpp index 680a2a14369..53b9c94ffa6 100644 --- a/src/devices/bus/vip/vp575.cpp +++ b/src/devices/bus/vip/vp575.cpp @@ -92,7 +92,7 @@ machine_config_constructor vp575_device::device_mconfig_additions() const // vp575_device - constructor //------------------------------------------------- -vp575_device::vp575_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +vp575_device::vp575_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VP575, "VP575", tag, owner, clock, "vp575", __FILE__), device_vip_expansion_card_interface(mconfig, *this) { diff --git a/src/devices/bus/vip/vp575.h b/src/devices/bus/vip/vp575.h index a91bf188aef..bb5f5417e00 100644 --- a/src/devices/bus/vip/vp575.h +++ b/src/devices/bus/vip/vp575.h @@ -35,7 +35,7 @@ class vp575_device : public device_t, { public: // construction/destruction - vp575_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vp575_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/vip/vp585.cpp b/src/devices/bus/vip/vp585.cpp index 81d73634fe1..bb61d3b1b3b 100644 --- a/src/devices/bus/vip/vp585.cpp +++ b/src/devices/bus/vip/vp585.cpp @@ -79,7 +79,7 @@ ioport_constructor vp585_device::device_input_ports() const // vp585_device - constructor //------------------------------------------------- -vp585_device::vp585_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +vp585_device::vp585_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VP585, "VP585", tag, owner, clock, "vp585", __FILE__), device_vip_expansion_card_interface(mconfig, *this), m_j1(*this, "J1"), diff --git a/src/devices/bus/vip/vp585.h b/src/devices/bus/vip/vp585.h index 8ae23737b64..43bec3b743c 100644 --- a/src/devices/bus/vip/vp585.h +++ b/src/devices/bus/vip/vp585.h @@ -27,7 +27,7 @@ class vp585_device : public device_t, { public: // construction/destruction - vp585_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vp585_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/vip/vp590.cpp b/src/devices/bus/vip/vp590.cpp index b9027a9c943..6ffac4b2295 100644 --- a/src/devices/bus/vip/vp590.cpp +++ b/src/devices/bus/vip/vp590.cpp @@ -136,7 +136,7 @@ ioport_constructor vp590_device::device_input_ports() const // vp590_device - constructor //------------------------------------------------- -vp590_device::vp590_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +vp590_device::vp590_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VP590, "VP590", tag, owner, clock, "vp590", __FILE__), device_vip_expansion_card_interface(mconfig, *this), m_cgc(*this, CDP1862_TAG), diff --git a/src/devices/bus/vip/vp590.h b/src/devices/bus/vip/vp590.h index fe006db8e6d..d466524742c 100644 --- a/src/devices/bus/vip/vp590.h +++ b/src/devices/bus/vip/vp590.h @@ -29,7 +29,7 @@ class vp590_device : public device_t, { public: // construction/destruction - vp590_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vp590_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/vip/vp595.cpp b/src/devices/bus/vip/vp595.cpp index d2ed10de18d..706c40e8262 100644 --- a/src/devices/bus/vip/vp595.cpp +++ b/src/devices/bus/vip/vp595.cpp @@ -58,7 +58,7 @@ machine_config_constructor vp595_device::device_mconfig_additions() const // vp595_device - constructor //------------------------------------------------- -vp595_device::vp595_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +vp595_device::vp595_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VP595, "VP595", tag, owner, clock, "vp595", __FILE__), device_vip_expansion_card_interface(mconfig, *this), m_pfg(*this, CDP1863_TAG) diff --git a/src/devices/bus/vip/vp595.h b/src/devices/bus/vip/vp595.h index 43dcebd6d57..e1c1e0238f5 100644 --- a/src/devices/bus/vip/vp595.h +++ b/src/devices/bus/vip/vp595.h @@ -28,7 +28,7 @@ class vp595_device : public device_t, { public: // construction/destruction - vp595_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vp595_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/vip/vp620.cpp b/src/devices/bus/vip/vp620.cpp index 42a00b37444..946161ee1af 100644 --- a/src/devices/bus/vip/vp620.cpp +++ b/src/devices/bus/vip/vp620.cpp @@ -61,7 +61,7 @@ machine_config_constructor vp620_device::device_mconfig_additions() const // vp620_device - constructor //------------------------------------------------- -vp620_device::vp620_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +vp620_device::vp620_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VP620, "VP620", tag, owner, clock, "vp620", __FILE__), device_vip_byteio_port_interface(mconfig, *this), m_keydata(0), diff --git a/src/devices/bus/vip/vp620.h b/src/devices/bus/vip/vp620.h index 036cf482e68..4a93e01f9c4 100644 --- a/src/devices/bus/vip/vp620.h +++ b/src/devices/bus/vip/vp620.h @@ -28,7 +28,7 @@ class vp620_device : public device_t, { public: // construction/destruction - vp620_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vp620_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/vip/vp700.cpp b/src/devices/bus/vip/vp700.cpp index 7d9b32536a7..497d7b7c007 100644 --- a/src/devices/bus/vip/vp700.cpp +++ b/src/devices/bus/vip/vp700.cpp @@ -45,7 +45,7 @@ const rom_entry *vp700_device::device_rom_region() const // vp700_device - constructor //------------------------------------------------- -vp700_device::vp700_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +vp700_device::vp700_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, VP700, "VP700", tag, owner, clock, "vp700", __FILE__), device_vip_expansion_card_interface(mconfig, *this), m_rom(*this, "vp700") diff --git a/src/devices/bus/vip/vp700.h b/src/devices/bus/vip/vp700.h index 2631dc01c62..6dce3cce8b4 100644 --- a/src/devices/bus/vip/vp700.h +++ b/src/devices/bus/vip/vp700.h @@ -28,7 +28,7 @@ class vp700_device : public device_t, { public: // construction/destruction - vp700_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vp700_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/vtech/ioexp/ioexp.cpp b/src/devices/bus/vtech/ioexp/ioexp.cpp index 55671583558..cd86b4a5404 100644 --- a/src/devices/bus/vtech/ioexp/ioexp.cpp +++ b/src/devices/bus/vtech/ioexp/ioexp.cpp @@ -26,7 +26,7 @@ const device_type IOEXP_SLOT = &device_creator<ioexp_slot_device>; // ioexp_slot_device - constructor //------------------------------------------------- -ioexp_slot_device::ioexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +ioexp_slot_device::ioexp_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, IOEXP_SLOT, "Peripheral Expansion Slot", tag, owner, clock, "ioexp_slot", __FILE__), device_slot_interface(mconfig, *this), m_io(nullptr), diff --git a/src/devices/bus/vtech/ioexp/ioexp.h b/src/devices/bus/vtech/ioexp/ioexp.h index c8ec78042d6..0e25112d44b 100644 --- a/src/devices/bus/vtech/ioexp/ioexp.h +++ b/src/devices/bus/vtech/ioexp/ioexp.h @@ -51,7 +51,7 @@ class ioexp_slot_device : public device_t, public device_slot_interface { public: // construction/destruction - ioexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ioexp_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~ioexp_slot_device(); void set_io_space(address_space *io); diff --git a/src/devices/bus/vtech/ioexp/joystick.cpp b/src/devices/bus/vtech/ioexp/joystick.cpp index 38e9732d17a..ef3f54ad75a 100644 --- a/src/devices/bus/vtech/ioexp/joystick.cpp +++ b/src/devices/bus/vtech/ioexp/joystick.cpp @@ -64,7 +64,7 @@ ioport_constructor joystick_interface_device::device_input_ports() const // joystick_interface_device - constructor //------------------------------------------------- -joystick_interface_device::joystick_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +joystick_interface_device::joystick_interface_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, JOYSTICK_INTERFACE, "Laser/VZ Joystick Interface", tag, owner, clock, "joystick", __FILE__), device_ioexp_interface(mconfig, *this), m_joy0(*this, "joystick_0"), diff --git a/src/devices/bus/vtech/ioexp/joystick.h b/src/devices/bus/vtech/ioexp/joystick.h index 1575dde42f2..749d0139d0b 100644 --- a/src/devices/bus/vtech/ioexp/joystick.h +++ b/src/devices/bus/vtech/ioexp/joystick.h @@ -28,7 +28,7 @@ class joystick_interface_device : public device_t, public device_ioexp_interface { public: // construction/destruction - joystick_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + joystick_interface_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER( joystick_r ); diff --git a/src/devices/bus/vtech/ioexp/printer.cpp b/src/devices/bus/vtech/ioexp/printer.cpp index a122c9fa2c7..0cb07224de1 100644 --- a/src/devices/bus/vtech/ioexp/printer.cpp +++ b/src/devices/bus/vtech/ioexp/printer.cpp @@ -43,7 +43,7 @@ machine_config_constructor printer_interface_device::device_mconfig_additions() // printer_interface_device - constructor //------------------------------------------------- -printer_interface_device::printer_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +printer_interface_device::printer_interface_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, PRINTER_INTERFACE, "Laser/VZ Printer Interface", tag, owner, clock, "printer", __FILE__), device_ioexp_interface(mconfig, *this), m_centronics(*this, "centronics"), diff --git a/src/devices/bus/vtech/ioexp/printer.h b/src/devices/bus/vtech/ioexp/printer.h index 0f2b8746400..5eb3fdc407c 100644 --- a/src/devices/bus/vtech/ioexp/printer.h +++ b/src/devices/bus/vtech/ioexp/printer.h @@ -28,7 +28,7 @@ class printer_interface_device : public device_t, public device_ioexp_interface { public: // construction/destruction - printer_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + printer_interface_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_WRITE_LINE_MEMBER( busy_w ); DECLARE_READ8_MEMBER( busy_r ); diff --git a/src/devices/bus/vtech/memexp/floppy.cpp b/src/devices/bus/vtech/memexp/floppy.cpp index afe88fce06a..87df52bf591 100644 --- a/src/devices/bus/vtech/memexp/floppy.cpp +++ b/src/devices/bus/vtech/memexp/floppy.cpp @@ -67,7 +67,7 @@ machine_config_constructor floppy_controller_device::device_mconfig_additions() // floppy_controller_device - constructor //------------------------------------------------- -floppy_controller_device::floppy_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +floppy_controller_device::floppy_controller_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, FLOPPY_CONTROLLER, "Laser/VZ Floppy Disk Controller", tag, owner, clock, "laserfdc", __FILE__), device_memexp_interface(mconfig, *this), m_memexp(*this, "mem"), diff --git a/src/devices/bus/vtech/memexp/floppy.h b/src/devices/bus/vtech/memexp/floppy.h index 7b01c742d07..f60e8681891 100644 --- a/src/devices/bus/vtech/memexp/floppy.h +++ b/src/devices/bus/vtech/memexp/floppy.h @@ -29,7 +29,7 @@ class floppy_controller_device : public device_t, public device_memexp_interface { public: // construction/destruction - floppy_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + floppy_controller_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_ADDRESS_MAP(map, 8); diff --git a/src/devices/bus/vtech/memexp/memexp.cpp b/src/devices/bus/vtech/memexp/memexp.cpp index 5b547103645..45c21d37fdb 100644 --- a/src/devices/bus/vtech/memexp/memexp.cpp +++ b/src/devices/bus/vtech/memexp/memexp.cpp @@ -26,7 +26,7 @@ const device_type MEMEXP_SLOT = &device_creator<memexp_slot_device>; // memexp_slot_device - constructor //------------------------------------------------- -memexp_slot_device::memexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +memexp_slot_device::memexp_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, MEMEXP_SLOT, "Memory Expansion Slot", tag, owner, clock, "memexp_slot", __FILE__), device_slot_interface(mconfig, *this), m_program(nullptr), diff --git a/src/devices/bus/vtech/memexp/memexp.h b/src/devices/bus/vtech/memexp/memexp.h index 9085c2ce6cb..4586d88c953 100644 --- a/src/devices/bus/vtech/memexp/memexp.h +++ b/src/devices/bus/vtech/memexp/memexp.h @@ -67,7 +67,7 @@ class memexp_slot_device : public device_t, public device_slot_interface { public: // construction/destruction - memexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + memexp_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~memexp_slot_device(); void set_program_space(address_space *program); diff --git a/src/devices/bus/vtech/memexp/memory.cpp b/src/devices/bus/vtech/memexp/memory.cpp index 5b4b9d71701..47e2f001ee3 100644 --- a/src/devices/bus/vtech/memexp/memory.cpp +++ b/src/devices/bus/vtech/memexp/memory.cpp @@ -27,7 +27,7 @@ const device_type LASER_64K = &device_creator<laser_64k_device>; // laser110_16k_device - constructor //------------------------------------------------- -laser110_16k_device::laser110_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +laser110_16k_device::laser110_16k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, LASER110_16K, "Laser 110/200/VZ-200 16k Memory", tag, owner, clock, "laser110_16k", __FILE__), device_memexp_interface(mconfig, *this) { @@ -60,7 +60,7 @@ void laser110_16k_device::device_reset() // laser210_16k_device - constructor //------------------------------------------------- -laser210_16k_device::laser210_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +laser210_16k_device::laser210_16k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, LASER210_16K, "Laser 210/VZ-200 (DSE) 16k Memory", tag, owner, clock, "laser210_16k", __FILE__), device_memexp_interface(mconfig, *this) { @@ -93,7 +93,7 @@ void laser210_16k_device::device_reset() // laser310_16k_device - constructor //------------------------------------------------- -laser310_16k_device::laser310_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +laser310_16k_device::laser310_16k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, LASER310_16K, "Laser 310/VZ-300 16k Memory", tag, owner, clock, "laser310_16k", __FILE__), device_memexp_interface(mconfig, *this) { @@ -126,7 +126,7 @@ void laser310_16k_device::device_reset() // laser_64k_device - constructor //------------------------------------------------- -laser_64k_device::laser_64k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +laser_64k_device::laser_64k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, LASER_64K, "Laser/VZ 64k Memory", tag, owner, clock, "laser_64k", __FILE__), device_memexp_interface(mconfig, *this) { diff --git a/src/devices/bus/vtech/memexp/memory.h b/src/devices/bus/vtech/memexp/memory.h index 87518d20123..5955e75d0c1 100644 --- a/src/devices/bus/vtech/memexp/memory.h +++ b/src/devices/bus/vtech/memexp/memory.h @@ -25,7 +25,7 @@ class laser110_16k_device : public device_t, public device_memexp_interface { public: // construction/destruction - laser110_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + laser110_16k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: virtual void device_start() override; @@ -41,7 +41,7 @@ class laser210_16k_device : public device_t, public device_memexp_interface { public: // construction/destruction - laser210_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + laser210_16k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: virtual void device_start() override; @@ -57,7 +57,7 @@ class laser310_16k_device : public device_t, public device_memexp_interface { public: // construction/destruction - laser310_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + laser310_16k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: virtual void device_start() override; @@ -73,7 +73,7 @@ class laser_64k_device : public device_t, public device_memexp_interface { public: // construction/destruction - laser_64k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + laser_64k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_WRITE8_MEMBER( bankswitch_w ); diff --git a/src/devices/bus/vtech/memexp/rs232.cpp b/src/devices/bus/vtech/memexp/rs232.cpp index 42e281151b1..94e83a3288b 100644 --- a/src/devices/bus/vtech/memexp/rs232.cpp +++ b/src/devices/bus/vtech/memexp/rs232.cpp @@ -53,7 +53,7 @@ machine_config_constructor rs232_interface_device::device_mconfig_additions() co // wordpro_device - constructor //------------------------------------------------- -rs232_interface_device::rs232_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +rs232_interface_device::rs232_interface_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, RS232_INTERFACE, "DSE VZ-200/300 RS-232 Interface", tag, owner, clock, "vz_rs232", __FILE__), device_memexp_interface(mconfig, *this), m_rs232(*this, "rs232"), diff --git a/src/devices/bus/vtech/memexp/rs232.h b/src/devices/bus/vtech/memexp/rs232.h index 20508d86469..a37d2bb023f 100644 --- a/src/devices/bus/vtech/memexp/rs232.h +++ b/src/devices/bus/vtech/memexp/rs232.h @@ -26,7 +26,7 @@ class rs232_interface_device : public device_t, public device_memexp_interface { public: // construction/destruction - rs232_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + rs232_interface_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_WRITE_LINE_MEMBER( rs232_rx_w ); DECLARE_READ8_MEMBER( receive_data_r ); diff --git a/src/devices/bus/vtech/memexp/wordpro.cpp b/src/devices/bus/vtech/memexp/wordpro.cpp index 1a038bcf0ac..617758529e6 100644 --- a/src/devices/bus/vtech/memexp/wordpro.cpp +++ b/src/devices/bus/vtech/memexp/wordpro.cpp @@ -40,7 +40,7 @@ const rom_entry *wordpro_device::device_rom_region() const // wordpro_device - constructor //------------------------------------------------- -wordpro_device::wordpro_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +wordpro_device::wordpro_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, WORDPRO, "DSE VZ-300 WordPro", tag, owner, clock, "wordpro", __FILE__), device_memexp_interface(mconfig, *this) { diff --git a/src/devices/bus/vtech/memexp/wordpro.h b/src/devices/bus/vtech/memexp/wordpro.h index 79e78735cd4..0b8e64c5b25 100644 --- a/src/devices/bus/vtech/memexp/wordpro.h +++ b/src/devices/bus/vtech/memexp/wordpro.h @@ -25,7 +25,7 @@ class wordpro_device : public device_t, public device_memexp_interface { public: // construction/destruction - wordpro_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + wordpro_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/wangpc/emb.cpp b/src/devices/bus/wangpc/emb.cpp index 43e1176e04c..32d5d7e4b21 100644 --- a/src/devices/bus/wangpc/emb.cpp +++ b/src/devices/bus/wangpc/emb.cpp @@ -43,7 +43,7 @@ const device_type WANGPC_EMB = &device_creator<wangpc_emb_device>; // wangpc_emb_device - constructor //------------------------------------------------- -wangpc_emb_device::wangpc_emb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +wangpc_emb_device::wangpc_emb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, WANGPC_EMB, "Wang PC-PM031-B", tag, owner, clock, "wangpc_emb", __FILE__), device_wangpcbus_card_interface(mconfig, *this), m_ram(*this, "ram"), m_option(0), m_parity_error(0), m_parity_odd(0) diff --git a/src/devices/bus/wangpc/emb.h b/src/devices/bus/wangpc/emb.h index f40f7fe4e1c..ecb8b92beb4 100644 --- a/src/devices/bus/wangpc/emb.h +++ b/src/devices/bus/wangpc/emb.h @@ -27,7 +27,7 @@ class wangpc_emb_device : public device_t, { public: // construction/destruction - wangpc_emb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + wangpc_emb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/devices/bus/wangpc/lic.cpp b/src/devices/bus/wangpc/lic.cpp index cebc359a942..77b1d45875c 100644 --- a/src/devices/bus/wangpc/lic.cpp +++ b/src/devices/bus/wangpc/lic.cpp @@ -73,7 +73,7 @@ machine_config_constructor wangpc_lic_device::device_mconfig_additions() const // wangpc_lic_device - constructor //------------------------------------------------- -wangpc_lic_device::wangpc_lic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +wangpc_lic_device::wangpc_lic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, WANGPC_LIC, "Wang PC-PM070", tag, owner, clock, "wangpc_lic", __FILE__), device_wangpcbus_card_interface(mconfig, *this) { diff --git a/src/devices/bus/wangpc/lic.h b/src/devices/bus/wangpc/lic.h index 98f9f83fd3a..48a4730a9de 100644 --- a/src/devices/bus/wangpc/lic.h +++ b/src/devices/bus/wangpc/lic.h @@ -27,7 +27,7 @@ class wangpc_lic_device : public device_t, { public: // construction/destruction - wangpc_lic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + wangpc_lic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/wangpc/lvc.cpp b/src/devices/bus/wangpc/lvc.cpp index 7f7e0ebe25b..dd1a878fa03 100644 --- a/src/devices/bus/wangpc/lvc.cpp +++ b/src/devices/bus/wangpc/lvc.cpp @@ -166,7 +166,7 @@ inline void wangpc_lvc_device::set_irq(int state) // wangpc_lvc_device - constructor //------------------------------------------------- -wangpc_lvc_device::wangpc_lvc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +wangpc_lvc_device::wangpc_lvc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, WANGPC_LVC, "Wang PC Low Resolution Video Card", tag, owner, clock, "wangpc_lvc", __FILE__), device_wangpcbus_card_interface(mconfig, *this), m_crtc(*this, MC6845_TAG), diff --git a/src/devices/bus/wangpc/lvc.h b/src/devices/bus/wangpc/lvc.h index ada6f261fd3..a6e6f0110c3 100644 --- a/src/devices/bus/wangpc/lvc.h +++ b/src/devices/bus/wangpc/lvc.h @@ -28,7 +28,7 @@ class wangpc_lvc_device : public device_t, { public: // construction/destruction - wangpc_lvc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + wangpc_lvc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/wangpc/mcc.cpp b/src/devices/bus/wangpc/mcc.cpp index 37bd21dda25..5fb915c13f6 100644 --- a/src/devices/bus/wangpc/mcc.cpp +++ b/src/devices/bus/wangpc/mcc.cpp @@ -102,7 +102,7 @@ inline void wangpc_mcc_device::set_irq(int state) // wangpc_mcc_device - constructor //------------------------------------------------- -wangpc_mcc_device::wangpc_mcc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +wangpc_mcc_device::wangpc_mcc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, WANGPC_MCC, "Wang PC-PM043", tag, owner, clock, "wangpc_mcc", __FILE__), device_wangpcbus_card_interface(mconfig, *this), m_sio(*this, Z80SIO2_TAG), diff --git a/src/devices/bus/wangpc/mcc.h b/src/devices/bus/wangpc/mcc.h index 54b0b868e45..db0197dae07 100644 --- a/src/devices/bus/wangpc/mcc.h +++ b/src/devices/bus/wangpc/mcc.h @@ -28,7 +28,7 @@ class wangpc_mcc_device : public device_t, { public: // construction/destruction - wangpc_mcc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + wangpc_mcc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/wangpc/mvc.cpp b/src/devices/bus/wangpc/mvc.cpp index ac5b09a0466..eec60b34aca 100644 --- a/src/devices/bus/wangpc/mvc.cpp +++ b/src/devices/bus/wangpc/mvc.cpp @@ -186,7 +186,7 @@ inline void wangpc_mvc_device::set_irq(int state) // wangpc_mvc_device - constructor //------------------------------------------------- -wangpc_mvc_device::wangpc_mvc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +wangpc_mvc_device::wangpc_mvc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, WANGPC_MVC, "Wang PC Medium Resolution Video Card", tag, owner, clock, "wangpc_mvc", __FILE__), device_wangpcbus_card_interface(mconfig, *this), m_crtc(*this, MC6845_TAG), diff --git a/src/devices/bus/wangpc/mvc.h b/src/devices/bus/wangpc/mvc.h index eed98d499f0..6c98e597c06 100644 --- a/src/devices/bus/wangpc/mvc.h +++ b/src/devices/bus/wangpc/mvc.h @@ -28,7 +28,7 @@ class wangpc_mvc_device : public device_t, { public: // construction/destruction - wangpc_mvc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + wangpc_mvc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/wangpc/rtc.cpp b/src/devices/bus/wangpc/rtc.cpp index f8a436af0c8..dc818577423 100644 --- a/src/devices/bus/wangpc/rtc.cpp +++ b/src/devices/bus/wangpc/rtc.cpp @@ -185,7 +185,7 @@ ioport_constructor wangpc_rtc_device::device_input_ports() const // wangpc_rtc_device - constructor //------------------------------------------------- -wangpc_rtc_device::wangpc_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +wangpc_rtc_device::wangpc_rtc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, WANGPC_RTC, "Wang PC-PM040-B", tag, owner, clock, "wangpc_rtc", __FILE__), device_wangpcbus_card_interface(mconfig, *this), m_maincpu(*this, Z80_TAG), diff --git a/src/devices/bus/wangpc/rtc.h b/src/devices/bus/wangpc/rtc.h index f59de8c8139..9753ad4ef72 100644 --- a/src/devices/bus/wangpc/rtc.h +++ b/src/devices/bus/wangpc/rtc.h @@ -31,7 +31,7 @@ class wangpc_rtc_device : public device_t, { public: // construction/destruction - wangpc_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + wangpc_rtc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/wangpc/tig.cpp b/src/devices/bus/wangpc/tig.cpp index efadfc332dc..8682d6273a3 100644 --- a/src/devices/bus/wangpc/tig.cpp +++ b/src/devices/bus/wangpc/tig.cpp @@ -150,7 +150,7 @@ machine_config_constructor wangpc_tig_device::device_mconfig_additions() const // wangpc_tig_device - constructor //------------------------------------------------- -wangpc_tig_device::wangpc_tig_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +wangpc_tig_device::wangpc_tig_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, WANGPC_TIG, "Wang PC TIG Controller", tag, owner, clock, "wangpc_tig", __FILE__), device_wangpcbus_card_interface(mconfig, *this), m_hgdc0(*this, UPD7720_0_TAG), diff --git a/src/devices/bus/wangpc/tig.h b/src/devices/bus/wangpc/tig.h index 8f9f8f9a5eb..353076a7808 100644 --- a/src/devices/bus/wangpc/tig.h +++ b/src/devices/bus/wangpc/tig.h @@ -28,7 +28,7 @@ class wangpc_tig_device : public device_t, { public: // construction/destruction - wangpc_tig_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + wangpc_tig_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/wangpc/wangpc.cpp b/src/devices/bus/wangpc/wangpc.cpp index d3aebaf1fac..997d77c31a0 100644 --- a/src/devices/bus/wangpc/wangpc.cpp +++ b/src/devices/bus/wangpc/wangpc.cpp @@ -26,7 +26,7 @@ const device_type WANGPC_BUS_SLOT = &device_creator<wangpcbus_slot_device>; // wangpcbus_slot_device - constructor //------------------------------------------------- -wangpcbus_slot_device::wangpcbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +wangpcbus_slot_device::wangpcbus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, WANGPC_BUS_SLOT, "Wang PC bus slot", tag, owner, clock, "wangpcbus_slot", __FILE__), device_slot_interface(mconfig, *this), m_bus(nullptr), @@ -57,7 +57,7 @@ void wangpcbus_slot_device::device_start() // wangpcbus_device - constructor //------------------------------------------------- -wangpcbus_device::wangpcbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +wangpcbus_device::wangpcbus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, WANGPC_BUS, "Wang PC bus", tag, owner, clock, "wangpcbus", __FILE__), m_write_irq2(*this), m_write_irq3(*this), diff --git a/src/devices/bus/wangpc/wangpc.h b/src/devices/bus/wangpc/wangpc.h index e892cc3b880..d43a58f6743 100644 --- a/src/devices/bus/wangpc/wangpc.h +++ b/src/devices/bus/wangpc/wangpc.h @@ -83,7 +83,7 @@ class wangpcbus_slot_device : public device_t, { public: // construction/destruction - wangpcbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + wangpcbus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -111,7 +111,7 @@ class wangpcbus_device : public device_t { public: // construction/destruction - wangpcbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + wangpcbus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); ~wangpcbus_device() { m_device_list.detach_all(); } template<class _Object> static devcb_base &set_irq2_wr_callback(device_t &device, _Object object) { return downcast<wangpcbus_device &>(device).m_write_irq2.set_callback(object); } diff --git a/src/devices/bus/wangpc/wdc.cpp b/src/devices/bus/wangpc/wdc.cpp index 7b2dafdd5f9..319640cdeb6 100644 --- a/src/devices/bus/wangpc/wdc.cpp +++ b/src/devices/bus/wangpc/wdc.cpp @@ -141,7 +141,7 @@ inline void wangpc_wdc_device::set_irq(int state) // wangpc_wdc_device - constructor //------------------------------------------------- -wangpc_wdc_device::wangpc_wdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +wangpc_wdc_device::wangpc_wdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, WANGPC_WDC, "Wang PC-PM001", tag, owner, clock, "wangpc_wdc", __FILE__), device_wangpcbus_card_interface(mconfig, *this), m_maincpu(*this, Z80_TAG), diff --git a/src/devices/bus/wangpc/wdc.h b/src/devices/bus/wangpc/wdc.h index fd8edbcbfdf..8c871f85e20 100644 --- a/src/devices/bus/wangpc/wdc.h +++ b/src/devices/bus/wangpc/wdc.h @@ -30,7 +30,7 @@ class wangpc_wdc_device : public device_t, { public: // construction/destruction - wangpc_wdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + wangpc_wdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/wswan/rom.cpp b/src/devices/bus/wswan/rom.cpp index fbfab9272e4..b0c6ddf787e 100644 --- a/src/devices/bus/wswan/rom.cpp +++ b/src/devices/bus/wswan/rom.cpp @@ -26,7 +26,7 @@ const device_type WS_ROM_SRAM = &device_creator<ws_rom_sram_device>; const device_type WS_ROM_EEPROM = &device_creator<ws_rom_eeprom_device>; -ws_rom_device::ws_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +ws_rom_device::ws_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_ws_cart_interface(mconfig, *this), m_base20(0), @@ -45,7 +45,7 @@ ws_rom_device::ws_rom_device(const machine_config &mconfig, device_type type, co { } -ws_rom_device::ws_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ws_rom_device::ws_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, WS_ROM_STD, "Wonderswan Standard Carts", tag, owner, clock, "ws_rom", __FILE__), device_ws_cart_interface( mconfig, *this ), m_base20(0), m_base30(0), @@ -63,13 +63,13 @@ ws_rom_device::ws_rom_device(const machine_config &mconfig, const char *tag, dev { } -ws_rom_sram_device::ws_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ws_rom_sram_device::ws_rom_sram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ws_rom_device(mconfig, WS_ROM_SRAM, "Wonderswan Carts w/SRAM", tag, owner, clock, "ws_sram", __FILE__), m_nvram_base(0) { } -ws_rom_eeprom_device::ws_rom_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +ws_rom_eeprom_device::ws_rom_eeprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ws_rom_device(mconfig, WS_ROM_EEPROM, "Wonderswan Carts w/EEPROM", tag, owner, clock, "ws_eeprom", __FILE__), m_eeprom_mode(0), m_eeprom_address(0), m_eeprom_command(0), m_eeprom_start(0), m_eeprom_write_enabled(0) { diff --git a/src/devices/bus/wswan/rom.h b/src/devices/bus/wswan/rom.h index e3a15550e73..0d3bbc3a6e8 100644 --- a/src/devices/bus/wswan/rom.h +++ b/src/devices/bus/wswan/rom.h @@ -13,8 +13,8 @@ class ws_rom_device : public device_t, { public: // construction/destruction - ws_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - ws_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ws_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + ws_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -54,7 +54,7 @@ class ws_rom_sram_device : public ws_rom_device { public: // construction/destruction - ws_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ws_rom_sram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -76,7 +76,7 @@ class ws_rom_eeprom_device : public ws_rom_device { public: // construction/destruction - ws_rom_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ws_rom_eeprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/wswan/slot.cpp b/src/devices/bus/wswan/slot.cpp index b5b95851f00..662f27bd1e0 100644 --- a/src/devices/bus/wswan/slot.cpp +++ b/src/devices/bus/wswan/slot.cpp @@ -48,7 +48,7 @@ device_ws_cart_interface::~device_ws_cart_interface() // rom_alloc - alloc the space for the cart //------------------------------------------------- -void device_ws_cart_interface::rom_alloc(UINT32 size, const char *tag) +void device_ws_cart_interface::rom_alloc(UINT32 size, std::string tag) { if (m_rom == nullptr) { @@ -76,7 +76,7 @@ void device_ws_cart_interface::nvram_alloc(UINT32 size) //------------------------------------------------- // ws_cart_slot_device - constructor //------------------------------------------------- -ws_cart_slot_device::ws_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +ws_cart_slot_device::ws_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, WS_CART_SLOT, "Wonderswan Cartridge Slot", tag, owner, clock, "ws_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), diff --git a/src/devices/bus/wswan/slot.h b/src/devices/bus/wswan/slot.h index ae5ab7d81d6..e436e4d87f4 100644 --- a/src/devices/bus/wswan/slot.h +++ b/src/devices/bus/wswan/slot.h @@ -35,7 +35,7 @@ public: virtual DECLARE_READ8_MEMBER(read_io) { return 0xff; } virtual DECLARE_WRITE8_MEMBER(write_io) {} - void rom_alloc(UINT32 size, const char *tag); + void rom_alloc(UINT32 size, std::string tag); void nvram_alloc(UINT32 size); UINT8* get_rom_base() { return m_rom; } UINT8* get_nvram_base() { return &m_nvram[0]; } @@ -66,7 +66,7 @@ class ws_cart_slot_device : public device_t, { public: // construction/destruction - ws_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ws_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~ws_cart_slot_device(); // device-level overrides diff --git a/src/devices/bus/x68k/x68k_neptunex.cpp b/src/devices/bus/x68k/x68k_neptunex.cpp index 1b97427be3e..393a4f75709 100644 --- a/src/devices/bus/x68k/x68k_neptunex.cpp +++ b/src/devices/bus/x68k/x68k_neptunex.cpp @@ -28,7 +28,7 @@ machine_config_constructor x68k_neptune_device::device_mconfig_additions() const return MACHINE_CONFIG_NAME( x68k_neptunex ); } -x68k_neptune_device::x68k_neptune_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +x68k_neptune_device::x68k_neptune_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, X68K_NEPTUNEX, "Neptune-X", tag, owner, clock, "x68k_neptunex", __FILE__), device_x68k_expansion_card_interface(mconfig, *this), m_slot(nullptr), diff --git a/src/devices/bus/x68k/x68k_neptunex.h b/src/devices/bus/x68k/x68k_neptunex.h index 6700f1bea3b..cff4150dd83 100644 --- a/src/devices/bus/x68k/x68k_neptunex.h +++ b/src/devices/bus/x68k/x68k_neptunex.h @@ -24,7 +24,7 @@ class x68k_neptune_device : public device_t, { public: // construction/destruction - x68k_neptune_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + x68k_neptune_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/x68k/x68k_scsiext.cpp b/src/devices/bus/x68k/x68k_scsiext.cpp index fce3c4a89ca..fec17636469 100644 --- a/src/devices/bus/x68k/x68k_scsiext.cpp +++ b/src/devices/bus/x68k/x68k_scsiext.cpp @@ -56,7 +56,7 @@ machine_config_constructor x68k_scsiext_device::device_mconfig_additions() const return MACHINE_CONFIG_NAME( x68k_scsiext ); } -x68k_scsiext_device::x68k_scsiext_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +x68k_scsiext_device::x68k_scsiext_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, X68K_SCSIEXT, "Sharp CZ-6BS1 SCSI-1", tag, owner, clock, "x68k_cz6bs1", __FILE__), device_x68k_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_spc(*this, "mb89352") diff --git a/src/devices/bus/x68k/x68k_scsiext.h b/src/devices/bus/x68k/x68k_scsiext.h index 7cd45c2c6da..57e79f23a6b 100644 --- a/src/devices/bus/x68k/x68k_scsiext.h +++ b/src/devices/bus/x68k/x68k_scsiext.h @@ -18,7 +18,7 @@ class x68k_scsiext_device : public device_t, { public: // construction/destruction - x68k_scsiext_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + x68k_scsiext_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/x68k/x68kexp.cpp b/src/devices/bus/x68k/x68kexp.cpp index 39f1f74eec9..2cb1c3e5b57 100644 --- a/src/devices/bus/x68k/x68kexp.cpp +++ b/src/devices/bus/x68k/x68kexp.cpp @@ -34,7 +34,7 @@ device_x68k_expansion_card_interface::~device_x68k_expansion_card_interface() // LIVE DEVICE //************************************************************************** -x68k_expansion_slot_device::x68k_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +x68k_expansion_slot_device::x68k_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, X68K_EXPANSION_SLOT, "Sharp X680x0 expansion slot", tag, owner, clock, "x68k_expansion_slot", __FILE__), device_slot_interface(mconfig, *this), m_out_irq2_cb(*this), diff --git a/src/devices/bus/x68k/x68kexp.h b/src/devices/bus/x68k/x68kexp.h index b3a07242180..14aa34fdcf4 100644 --- a/src/devices/bus/x68k/x68kexp.h +++ b/src/devices/bus/x68k/x68kexp.h @@ -115,7 +115,7 @@ class x68k_expansion_slot_device : public device_t, { public: // construction/destruction - x68k_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + x68k_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~x68k_expansion_slot_device(); template<class _Object> static devcb_base &set_out_irq2_callback(device_t &device, _Object object) { return downcast<x68k_expansion_slot_device &>(device).m_out_irq2_cb.set_callback(object); } diff --git a/src/devices/bus/z88/flash.cpp b/src/devices/bus/z88/flash.cpp index 0793f126c18..2980b814745 100644 --- a/src/devices/bus/z88/flash.cpp +++ b/src/devices/bus/z88/flash.cpp @@ -41,7 +41,7 @@ MACHINE_CONFIG_END // z88_1024k_flash_device - constructor //------------------------------------------------- -z88_1024k_flash_device::z88_1024k_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +z88_1024k_flash_device::z88_1024k_flash_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, Z88_1024K_FLASH, "Z88 1024KB Flash", tag, owner, clock, "z88_1024k_flash", __FILE__), device_z88cart_interface( mconfig, *this ), m_flash(*this, FLASH_TAG) diff --git a/src/devices/bus/z88/flash.h b/src/devices/bus/z88/flash.h index 37fe76e2f99..93c0a5a132f 100644 --- a/src/devices/bus/z88/flash.h +++ b/src/devices/bus/z88/flash.h @@ -20,7 +20,7 @@ class z88_1024k_flash_device : public device_t, { public: // construction/destruction - z88_1024k_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + z88_1024k_flash_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/z88/ram.cpp b/src/devices/bus/z88/ram.cpp index b9c8cc6cea7..5a534e6564d 100644 --- a/src/devices/bus/z88/ram.cpp +++ b/src/devices/bus/z88/ram.cpp @@ -32,13 +32,13 @@ const device_type Z88_1024K_RAM = &device_creator<z88_1024k_ram_device>; // z88_32k_ram_device - constructor //------------------------------------------------- -z88_32k_ram_device::z88_32k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +z88_32k_ram_device::z88_32k_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, Z88_32K_RAM, "Z88 32KB RAM", tag, owner, clock, "z88_32k_ram", __FILE__), device_z88cart_interface( mconfig, *this ), m_ram(nullptr) { } -z88_32k_ram_device::z88_32k_ram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +z88_32k_ram_device::z88_32k_ram_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_z88cart_interface( mconfig, *this ), m_ram(nullptr) { @@ -48,7 +48,7 @@ z88_32k_ram_device::z88_32k_ram_device(const machine_config &mconfig, device_typ // z88_128k_ram_device - constructor //------------------------------------------------- -z88_128k_ram_device::z88_128k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +z88_128k_ram_device::z88_128k_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : z88_32k_ram_device(mconfig, Z88_128K_RAM, "Z88 128KB RAM", tag, owner, clock, "z88_128k_ram", __FILE__) { } @@ -57,7 +57,7 @@ z88_128k_ram_device::z88_128k_ram_device(const machine_config &mconfig, const ch // z88_512k_ram_device - constructor //------------------------------------------------- -z88_512k_ram_device::z88_512k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +z88_512k_ram_device::z88_512k_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : z88_32k_ram_device(mconfig, Z88_512K_RAM, "Z88 512KB RAM", tag, owner, clock, "z88_512k_ram", __FILE__) { } @@ -66,7 +66,7 @@ z88_512k_ram_device::z88_512k_ram_device(const machine_config &mconfig, const ch // z88_1024k_ram_device - constructor //------------------------------------------------- -z88_1024k_ram_device::z88_1024k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +z88_1024k_ram_device::z88_1024k_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : z88_32k_ram_device(mconfig, Z88_1024K_RAM, "Z88 1024KB RAM", tag, owner, clock, "z88_1024k_ram", __FILE__) { } @@ -78,7 +78,7 @@ z88_1024k_ram_device::z88_1024k_ram_device(const machine_config &mconfig, const void z88_32k_ram_device::device_start() { - m_ram = machine().memory().region_alloc(tag(), get_cart_size(), 1, ENDIANNESS_LITTLE)->base(); + m_ram = machine().memory().region_alloc(tag().c_str(), get_cart_size(), 1, ENDIANNESS_LITTLE)->base(); memset(m_ram, 0, get_cart_size()); } diff --git a/src/devices/bus/z88/ram.h b/src/devices/bus/z88/ram.h index d8515a6b9c0..b02630b67dc 100644 --- a/src/devices/bus/z88/ram.h +++ b/src/devices/bus/z88/ram.h @@ -19,8 +19,8 @@ class z88_32k_ram_device : public device_t, { public: // construction/destruction - z88_32k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - z88_32k_ram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + z88_32k_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + z88_32k_ram_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); protected: // device-level overrides @@ -43,7 +43,7 @@ class z88_128k_ram_device : public z88_32k_ram_device { public: // construction/destruction - z88_128k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + z88_128k_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // z88cart_interface overrides @@ -56,7 +56,7 @@ class z88_512k_ram_device : public z88_32k_ram_device { public: // construction/destruction - z88_512k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + z88_512k_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // z88cart_interface overrides @@ -69,7 +69,7 @@ class z88_1024k_ram_device : public z88_32k_ram_device { public: // construction/destruction - z88_1024k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + z88_1024k_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // z88cart_interface overrides diff --git a/src/devices/bus/z88/rom.cpp b/src/devices/bus/z88/rom.cpp index 08f14011c9d..aab89859be2 100644 --- a/src/devices/bus/z88/rom.cpp +++ b/src/devices/bus/z88/rom.cpp @@ -31,13 +31,13 @@ const device_type Z88_256K_ROM = &device_creator<z88_256k_rom_device>; // z88_32k_rom_device - constructor //------------------------------------------------- -z88_32k_rom_device::z88_32k_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +z88_32k_rom_device::z88_32k_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, Z88_32K_ROM, "Z88 32KB ROM", tag, owner, clock, "z88_32k_rom", __FILE__), device_z88cart_interface( mconfig, *this ), m_rom(nullptr) { } -z88_32k_rom_device::z88_32k_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +z88_32k_rom_device::z88_32k_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_z88cart_interface( mconfig, *this ), m_rom(nullptr) { @@ -47,7 +47,7 @@ z88_32k_rom_device::z88_32k_rom_device(const machine_config &mconfig, device_typ // z88_128k_rom_device - constructor //------------------------------------------------- -z88_128k_rom_device::z88_128k_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +z88_128k_rom_device::z88_128k_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : z88_32k_rom_device(mconfig, Z88_128K_ROM, "Z88 128KB ROM", tag, owner, clock, "z88_128k_rom", __FILE__) { } @@ -56,7 +56,7 @@ z88_128k_rom_device::z88_128k_rom_device(const machine_config &mconfig, const ch // z88_256k_rom_device - constructor //------------------------------------------------- -z88_256k_rom_device::z88_256k_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +z88_256k_rom_device::z88_256k_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : z88_32k_rom_device(mconfig, Z88_256K_ROM, "Z88 256KB ROM", tag, owner, clock, "z88_256k_rom", __FILE__) { } @@ -67,7 +67,7 @@ z88_256k_rom_device::z88_256k_rom_device(const machine_config &mconfig, const ch void z88_32k_rom_device::device_start() { - m_rom = machine().memory().region_alloc(tag(), get_cart_size(), 1, ENDIANNESS_LITTLE)->base(); + m_rom = machine().memory().region_alloc(tag().c_str(), get_cart_size(), 1, ENDIANNESS_LITTLE)->base(); } /*------------------------------------------------- diff --git a/src/devices/bus/z88/rom.h b/src/devices/bus/z88/rom.h index 8ebc4da3bc8..696ee31f41c 100644 --- a/src/devices/bus/z88/rom.h +++ b/src/devices/bus/z88/rom.h @@ -19,8 +19,8 @@ class z88_32k_rom_device : public device_t, { public: // construction/destruction - z88_32k_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - z88_32k_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + z88_32k_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + z88_32k_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); protected: // device-level overrides @@ -42,7 +42,7 @@ class z88_128k_rom_device : public z88_32k_rom_device { public: // construction/destruction - z88_128k_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + z88_128k_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // z88cart_interface overrides @@ -55,7 +55,7 @@ class z88_256k_rom_device : public z88_32k_rom_device { public: // construction/destruction - z88_256k_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + z88_256k_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: // z88cart_interface overrides diff --git a/src/devices/bus/z88/z88.cpp b/src/devices/bus/z88/z88.cpp index 7af6b781369..6c00235c4c7 100644 --- a/src/devices/bus/z88/z88.cpp +++ b/src/devices/bus/z88/z88.cpp @@ -56,7 +56,7 @@ device_z88cart_interface::~device_z88cart_interface() //------------------------------------------------- // z88cart_slot_device - constructor //------------------------------------------------- -z88cart_slot_device::z88cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +z88cart_slot_device::z88cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, Z88CART_SLOT, "Z88 Cartridge Slot", tag, owner, clock, "z88cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), diff --git a/src/devices/bus/z88/z88.h b/src/devices/bus/z88/z88.h index 0c39edd5e24..568240ca6b7 100644 --- a/src/devices/bus/z88/z88.h +++ b/src/devices/bus/z88/z88.h @@ -83,7 +83,7 @@ class z88cart_slot_device : public device_t, { public: // construction/destruction - z88cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + z88cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~z88cart_slot_device(); template<class _Object> static devcb_base &set_out_flp_callback(device_t &device, _Object object) { return downcast<z88cart_slot_device &>(device).m_out_flp_cb.set_callback(object); } |