diff --git a/src/devices/bus/a1bus/a1bus.cpp b/src/devices/bus/a1bus/a1bus.cpp index b0ea52156ca..1e52d00c347 100644 --- a/src/devices/bus/a1bus/a1bus.cpp +++ b/src/devices/bus/a1bus/a1bus.cpp @@ -30,7 +30,7 @@ a1bus_slot_device::a1bus_slot_device(const machine_config &mconfig, std::string { } -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) : +a1bus_slot_device::a1bus_slot_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_slot_interface(mconfig, *this) { @@ -81,7 +81,7 @@ a1bus_device::a1bus_device(const machine_config &mconfig, std::string tag, devic { } -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) : +a1bus_device::a1bus_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) diff --git a/src/devices/bus/a1bus/a1bus.h b/src/devices/bus/a1bus/a1bus.h index 70b9532167b..8499198c7b4 100644 --- a/src/devices/bus/a1bus/a1bus.h +++ b/src/devices/bus/a1bus/a1bus.h @@ -50,7 +50,7 @@ class a1bus_slot_device : public device_t, public: // construction/destruction 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); + a1bus_slot_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // device-level overrides virtual void device_start() override; @@ -74,7 +74,7 @@ class a1bus_device : public device_t public: // construction/destruction 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); + a1bus_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // inline configuration static void static_set_cputag(device_t &device, std::string tag); diff --git a/src/devices/bus/a1bus/a1cassette.cpp b/src/devices/bus/a1bus/a1cassette.cpp index 090aa58bfcd..609b8eacb0d 100644 --- a/src/devices/bus/a1bus/a1cassette.cpp +++ b/src/devices/bus/a1bus/a1cassette.cpp @@ -63,7 +63,7 @@ a1bus_cassette_device::a1bus_cassette_device(const machine_config &mconfig, std: { } -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) : +a1bus_cassette_device::a1bus_cassette_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 c63353979dd..b44e2d64842 100644 --- a/src/devices/bus/a1bus/a1cassette.h +++ b/src/devices/bus/a1bus/a1cassette.h @@ -25,7 +25,7 @@ class a1bus_cassette_device: public: // construction/destruction 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); + a1bus_cassette_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 e9a29649c97..592c5dedb4c 100644 --- a/src/devices/bus/a1bus/a1cffa.cpp +++ b/src/devices/bus/a1bus/a1cffa.cpp @@ -58,7 +58,7 @@ a1bus_cffa_device::a1bus_cffa_device(const machine_config &mconfig, std::string { } -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) : +a1bus_cffa_device::a1bus_cffa_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 738d1bcbcc2..41014e3d8ae 100644 --- a/src/devices/bus/a1bus/a1cffa.h +++ b/src/devices/bus/a1bus/a1cffa.h @@ -26,7 +26,7 @@ class a1bus_cffa_device: public: // construction/destruction 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); + a1bus_cffa_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 7c6b0cb40af..ae7a8432859 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_sn1(*this, SN1_TAG), diff --git a/src/devices/bus/a2bus/a2alfam2.h b/src/devices/bus/a2bus/a2alfam2.h index fad3d592470..0f76c7e1762 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_sn76489_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // optional information overrides 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 d62e29e8a6b..65734902ceb 100644 --- a/src/devices/bus/a2bus/a2applicard.cpp +++ b/src/devices/bus/a2bus/a2applicard.cpp @@ -75,7 +75,7 @@ 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) diff --git a/src/devices/bus/a2bus/a2applicard.h b/src/devices/bus/a2bus/a2applicard.h index 53e21d5751a..e48ecb011fe 100644 --- a/src/devices/bus/a2bus/a2applicard.h +++ b/src/devices/bus/a2bus/a2applicard.h @@ -24,7 +24,7 @@ class a2bus_applicard_device: { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); a2bus_applicard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides diff --git a/src/devices/bus/a2bus/a2arcadebd.cpp b/src/devices/bus/a2bus/a2arcadebd.cpp index 2ef20951e61..13191eb32e2 100644 --- a/src/devices/bus/a2bus/a2arcadebd.cpp +++ b/src/devices/bus/a2bus/a2arcadebd.cpp @@ -65,7 +65,7 @@ a2bus_arcboard_device::a2bus_arcboard_device(const machine_config &mconfig, std: { } -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) : +a2bus_arcboard_device::a2bus_arcboard_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 e16f7faff0a..55f667d432b 100644 --- a/src/devices/bus/a2bus/a2arcadebd.h +++ b/src/devices/bus/a2bus/a2arcadebd.h @@ -27,7 +27,7 @@ class a2bus_arcboard_device: public: // construction/destruction 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); + a2bus_arcboard_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 1ef42988001..08fab829c68 100644 --- a/src/devices/bus/a2bus/a2bus.cpp +++ b/src/devices/bus/a2bus/a2bus.cpp @@ -94,7 +94,7 @@ a2bus_slot_device::a2bus_slot_device(const machine_config &mconfig, std::string { } -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) : +a2bus_slot_device::a2bus_slot_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_slot_interface(mconfig, *this) { @@ -146,7 +146,7 @@ a2bus_device::a2bus_device(const machine_config &mconfig, std::string tag, devic { } -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) : +a2bus_device::a2bus_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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), diff --git a/src/devices/bus/a2bus/a2bus.h b/src/devices/bus/a2bus/a2bus.h index 7bfa03213c8..50564d9ed8e 100644 --- a/src/devices/bus/a2bus/a2bus.h +++ b/src/devices/bus/a2bus/a2bus.h @@ -64,7 +64,7 @@ class a2bus_slot_device : public device_t, public: // construction/destruction 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); + a2bus_slot_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // device-level overrides virtual void device_start() override; @@ -90,7 +90,7 @@ class a2bus_device : public device_t public: // construction/destruction 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); + a2bus_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // inline configuration static void static_set_cputag(device_t &device, std::string tag); diff --git a/src/devices/bus/a2bus/a2cffa.cpp b/src/devices/bus/a2bus/a2cffa.cpp index d259e49cbdc..d074ac19b89 100644 --- a/src/devices/bus/a2bus/a2cffa.cpp +++ b/src/devices/bus/a2bus/a2cffa.cpp @@ -83,7 +83,7 @@ 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) diff --git a/src/devices/bus/a2bus/a2cffa.h b/src/devices/bus/a2bus/a2cffa.h index 9444ee48a9b..265581fed9f 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_cffa2000_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a2bus/a2corvus.cpp b/src/devices/bus/a2bus/a2corvus.cpp index e17edcb4870..e8a084b6602 100644 --- a/src/devices/bus/a2bus/a2corvus.cpp +++ b/src/devices/bus/a2bus/a2corvus.cpp @@ -101,7 +101,7 @@ 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) diff --git a/src/devices/bus/a2bus/a2corvus.h b/src/devices/bus/a2bus/a2corvus.h index 461822fe3ab..b1aaa538bbb 100644 --- a/src/devices/bus/a2bus/a2corvus.h +++ b/src/devices/bus/a2bus/a2corvus.h @@ -26,7 +26,7 @@ class a2bus_corvus_device: { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); a2bus_corvus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides diff --git a/src/devices/bus/a2bus/a2diskii.cpp b/src/devices/bus/a2bus/a2diskii.cpp index ce7e603a765..1822f539be0 100644 --- a/src/devices/bus/a2bus/a2diskii.cpp +++ b/src/devices/bus/a2bus/a2diskii.cpp @@ -90,7 +90,7 @@ 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) diff --git a/src/devices/bus/a2bus/a2diskii.h b/src/devices/bus/a2bus/a2diskii.h index d803926581c..262a1b40d08 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_floppy_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // 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 71350591e0d..0f366026433 100644 --- a/src/devices/bus/a2bus/a2dx1.cpp +++ b/src/devices/bus/a2bus/a2dx1.cpp @@ -48,7 +48,7 @@ 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) diff --git a/src/devices/bus/a2bus/a2dx1.h b/src/devices/bus/a2bus/a2dx1.h index d7448a7a671..f0b21667b3d 100644 --- a/src/devices/bus/a2bus/a2dx1.h +++ b/src/devices/bus/a2bus/a2dx1.h @@ -25,7 +25,7 @@ class a2bus_dx1_device: { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); a2bus_dx1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides diff --git a/src/devices/bus/a2bus/a2eauxslot.cpp b/src/devices/bus/a2bus/a2eauxslot.cpp index e8601235b46..57c2152ffd7 100644 --- a/src/devices/bus/a2bus/a2eauxslot.cpp +++ b/src/devices/bus/a2bus/a2eauxslot.cpp @@ -32,7 +32,7 @@ a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, st { } -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) : +a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_slot_interface(mconfig, *this) { @@ -83,7 +83,7 @@ a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, std::string { } -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) : +a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) diff --git a/src/devices/bus/a2bus/a2eauxslot.h b/src/devices/bus/a2bus/a2eauxslot.h index 04972cfa347..b6093dd7f75 100644 --- a/src/devices/bus/a2bus/a2eauxslot.h +++ b/src/devices/bus/a2bus/a2eauxslot.h @@ -48,7 +48,7 @@ class a2eauxslot_slot_device : public device_t, public: // construction/destruction 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); + a2eauxslot_slot_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // device-level overrides virtual void device_start() override; @@ -73,7 +73,7 @@ class a2eauxslot_device : public device_t public: // construction/destruction 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); + a2eauxslot_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // inline configuration static void static_set_cputag(device_t &device, std::string tag); diff --git a/src/devices/bus/a2bus/a2echoii.cpp b/src/devices/bus/a2bus/a2echoii.cpp index f388782337f..2f014f21562 100644 --- a/src/devices/bus/a2bus/a2echoii.cpp +++ b/src/devices/bus/a2bus/a2echoii.cpp @@ -48,7 +48,7 @@ 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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/a2echoii.h b/src/devices/bus/a2bus/a2echoii.h index 64f974d141f..7a76fc4fe05 100644 --- a/src/devices/bus/a2bus/a2echoii.h +++ b/src/devices/bus/a2bus/a2echoii.h @@ -25,7 +25,7 @@ class a2bus_echoii_device: { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); a2bus_echoii_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides diff --git a/src/devices/bus/a2bus/a2eext80col.cpp b/src/devices/bus/a2bus/a2eext80col.cpp index f718df1ea56..90b46a27879 100644 --- a/src/devices/bus/a2bus/a2eext80col.cpp +++ b/src/devices/bus/a2bus/a2eext80col.cpp @@ -33,7 +33,7 @@ a2eaux_ext80col_device::a2eaux_ext80col_device(const machine_config &mconfig, st { } -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) : +a2eaux_ext80col_device::a2eaux_ext80col_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 3152e357546..77ca9201cae 100644 --- a/src/devices/bus/a2bus/a2eext80col.h +++ b/src/devices/bus/a2bus/a2eext80col.h @@ -25,7 +25,7 @@ class a2eaux_ext80col_device: public: // construction/destruction 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); + a2eaux_ext80col_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); protected: virtual void device_start() override; diff --git a/src/devices/bus/a2bus/a2eramworks3.cpp b/src/devices/bus/a2bus/a2eramworks3.cpp index ea70075436f..e6b5b8a64e7 100644 --- a/src/devices/bus/a2bus/a2eramworks3.cpp +++ b/src/devices/bus/a2bus/a2eramworks3.cpp @@ -35,7 +35,7 @@ a2eaux_ramworks3_device::a2eaux_ramworks3_device(const machine_config &mconfig, { } -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) : +a2eaux_ramworks3_device::a2eaux_ramworks3_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 28d4a41c305..6aa6d34b48e 100644 --- a/src/devices/bus/a2bus/a2eramworks3.h +++ b/src/devices/bus/a2bus/a2eramworks3.h @@ -25,7 +25,7 @@ class a2eaux_ramworks3_device: public: // construction/destruction 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); + a2eaux_ramworks3_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); protected: virtual void device_start() override; diff --git a/src/devices/bus/a2bus/a2estd80col.cpp b/src/devices/bus/a2bus/a2estd80col.cpp index 102e6176ab9..200276c7316 100644 --- a/src/devices/bus/a2bus/a2estd80col.cpp +++ b/src/devices/bus/a2bus/a2estd80col.cpp @@ -33,7 +33,7 @@ a2eaux_std80col_device::a2eaux_std80col_device(const machine_config &mconfig, st { } -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) : +a2eaux_std80col_device::a2eaux_std80col_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 ccf73070d6a..ac1c9e73fda 100644 --- a/src/devices/bus/a2bus/a2estd80col.h +++ b/src/devices/bus/a2bus/a2estd80col.h @@ -25,7 +25,7 @@ class a2eaux_std80col_device: public: // construction/destruction 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); + a2eaux_std80col_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); protected: virtual void device_start() override; diff --git a/src/devices/bus/a2bus/a2hsscsi.cpp b/src/devices/bus/a2bus/a2hsscsi.cpp index f335ac5e181..28f57c08b12 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), 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 52c464e457d..c5458457d68 100644 --- a/src/devices/bus/a2bus/a2hsscsi.h +++ b/src/devices/bus/a2bus/a2hsscsi.h @@ -25,7 +25,7 @@ class a2bus_hsscsi_device: { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); a2bus_hsscsi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides diff --git a/src/devices/bus/a2bus/a2lang.cpp b/src/devices/bus/a2bus/a2lang.cpp index 0a25aafebda..93491b531f5 100644 --- a/src/devices/bus/a2bus/a2lang.cpp +++ b/src/devices/bus/a2bus/a2lang.cpp @@ -41,7 +41,7 @@ a2bus_lang_device::a2bus_lang_device(const machine_config &mconfig, std::string last_offset = -1; } -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) : +a2bus_lang_device::a2bus_lang_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 da600f06b23..ab3249daf2a 100644 --- a/src/devices/bus/a2bus/a2lang.h +++ b/src/devices/bus/a2bus/a2lang.h @@ -25,7 +25,7 @@ class a2bus_lang_device: public: // construction/destruction 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); + a2bus_lang_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); protected: virtual void device_start() override; diff --git a/src/devices/bus/a2bus/a2mcms.cpp b/src/devices/bus/a2bus/a2mcms.cpp index 17cf0e7bc2d..2c5fc8ed1b7 100644 --- a/src/devices/bus/a2bus/a2mcms.cpp +++ b/src/devices/bus/a2bus/a2mcms.cpp @@ -68,7 +68,7 @@ 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_mcms(*this, ENGINE_TAG) @@ -149,7 +149,7 @@ 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_card1(nullptr), m_engine(nullptr) { diff --git a/src/devices/bus/a2bus/a2mcms.h b/src/devices/bus/a2bus/a2mcms.h index afbf0d80ae5..518db436be1 100644 --- a/src/devices/bus/a2bus/a2mcms.h +++ b/src/devices/bus/a2bus/a2mcms.h @@ -65,7 +65,7 @@ class a2bus_mcms1_device: { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); a2bus_mcms1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides @@ -96,7 +96,7 @@ class a2bus_mcms2_device: { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); a2bus_mcms2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: diff --git a/src/devices/bus/a2bus/a2memexp.cpp b/src/devices/bus/a2bus/a2memexp.cpp index 2c58b61d256..bce0f508a54 100644 --- a/src/devices/bus/a2bus/a2memexp.cpp +++ b/src/devices/bus/a2bus/a2memexp.cpp @@ -73,7 +73,7 @@ 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) { diff --git a/src/devices/bus/a2bus/a2memexp.h b/src/devices/bus/a2bus/a2memexp.h index a99f94eb89c..6a7d34cca96 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_memexp_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a2bus/a2midi.cpp b/src/devices/bus/a2bus/a2midi.cpp index 41423ddfdd2..367c71b412d 100644 --- a/src/devices/bus/a2bus/a2midi.cpp +++ b/src/devices/bus/a2bus/a2midi.cpp @@ -68,7 +68,7 @@ a2bus_midi_device::a2bus_midi_device(const machine_config &mconfig, std::string { } -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) : +a2bus_midi_device::a2bus_midi_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 d8d37d2241a..a1db2e78ade 100644 --- a/src/devices/bus/a2bus/a2midi.h +++ b/src/devices/bus/a2bus/a2midi.h @@ -26,7 +26,7 @@ class a2bus_midi_device: public: // construction/destruction 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); + a2bus_midi_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 cc53ae3f6cd..8fe649321e5 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_via1(*this, VIA1_TAG), diff --git a/src/devices/bus/a2bus/a2mockingboard.h b/src/devices/bus/a2bus/a2mockingboard.h index e9771d771bf..39a814a6212 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_ayboard_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a2bus/a2pic.cpp b/src/devices/bus/a2bus/a2pic.cpp index 9613445725f..f19a706b896 100644 --- a/src/devices/bus/a2bus/a2pic.cpp +++ b/src/devices/bus/a2bus/a2pic.cpp @@ -109,7 +109,7 @@ a2bus_pic_device::a2bus_pic_device(const machine_config &mconfig, std::string ta { } -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) : +a2bus_pic_device::a2bus_pic_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 83481d66a8d..b32948b6495 100644 --- a/src/devices/bus/a2bus/a2pic.h +++ b/src/devices/bus/a2bus/a2pic.h @@ -25,7 +25,7 @@ class a2bus_pic_device: public: // construction/destruction 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); + a2bus_pic_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 e63cb32a0a0..4b6d78977ea 100644 --- a/src/devices/bus/a2bus/a2sam.cpp +++ b/src/devices/bus/a2bus/a2sam.cpp @@ -48,7 +48,7 @@ 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), 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 541303ad108..fcf81da7172 100644 --- a/src/devices/bus/a2bus/a2sam.h +++ b/src/devices/bus/a2bus/a2sam.h @@ -25,7 +25,7 @@ class a2bus_sam_device: { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); a2bus_sam_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides diff --git a/src/devices/bus/a2bus/a2scsi.cpp b/src/devices/bus/a2bus/a2scsi.cpp index d9e0c0cb48a..b77661d669f 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), 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 b82213d6053..aa62570a8f6 100644 --- a/src/devices/bus/a2bus/a2scsi.h +++ b/src/devices/bus/a2bus/a2scsi.h @@ -25,7 +25,7 @@ class a2bus_scsi_device: { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); a2bus_scsi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides diff --git a/src/devices/bus/a2bus/a2softcard.cpp b/src/devices/bus/a2bus/a2softcard.cpp index 757f268d9ab..d9655be819e 100644 --- a/src/devices/bus/a2bus/a2softcard.cpp +++ b/src/devices/bus/a2bus/a2softcard.cpp @@ -51,7 +51,7 @@ 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) diff --git a/src/devices/bus/a2bus/a2softcard.h b/src/devices/bus/a2bus/a2softcard.h index 9a2101d67a9..f8fd354cd6d 100644 --- a/src/devices/bus/a2bus/a2softcard.h +++ b/src/devices/bus/a2bus/a2softcard.h @@ -24,7 +24,7 @@ class a2bus_softcard_device: { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); a2bus_softcard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides diff --git a/src/devices/bus/a2bus/a2ssc.cpp b/src/devices/bus/a2bus/a2ssc.cpp index 2fa361f573d..f9ebc0e0887 100644 --- a/src/devices/bus/a2bus/a2ssc.cpp +++ b/src/devices/bus/a2bus/a2ssc.cpp @@ -137,7 +137,7 @@ a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, std::string ta { } -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) : +a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 e3297f41345..c4ac3ef2059 100644 --- a/src/devices/bus/a2bus/a2ssc.h +++ b/src/devices/bus/a2bus/a2ssc.h @@ -25,7 +25,7 @@ class a2bus_ssc_device: public: // construction/destruction 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); + a2bus_ssc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 125057060b4..9e48b5c2cdb 100644 --- a/src/devices/bus/a2bus/a2swyft.cpp +++ b/src/devices/bus/a2bus/a2swyft.cpp @@ -51,7 +51,7 @@ a2bus_swyft_device::a2bus_swyft_device(const machine_config &mconfig, std::strin { } -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) : +a2bus_swyft_device::a2bus_swyft_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 9714689744f..dbbd85337de 100644 --- a/src/devices/bus/a2bus/a2swyft.h +++ b/src/devices/bus/a2bus/a2swyft.h @@ -25,7 +25,7 @@ class a2bus_swyft_device: public: // construction/destruction 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); + a2bus_swyft_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 35bd88add2a..780d51dd3b4 100644 --- a/src/devices/bus/a2bus/a2themill.cpp +++ b/src/devices/bus/a2bus/a2themill.cpp @@ -67,7 +67,7 @@ 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) diff --git a/src/devices/bus/a2bus/a2themill.h b/src/devices/bus/a2bus/a2themill.h index 7fdade36f17..054725cc613 100644 --- a/src/devices/bus/a2bus/a2themill.h +++ b/src/devices/bus/a2bus/a2themill.h @@ -24,7 +24,7 @@ class a2bus_themill_device: { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); a2bus_themill_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides diff --git a/src/devices/bus/a2bus/a2thunderclock.cpp b/src/devices/bus/a2bus/a2thunderclock.cpp index 60518688e1e..260e1f66942 100644 --- a/src/devices/bus/a2bus/a2thunderclock.cpp +++ b/src/devices/bus/a2bus/a2thunderclock.cpp @@ -76,7 +76,7 @@ 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) diff --git a/src/devices/bus/a2bus/a2thunderclock.h b/src/devices/bus/a2bus/a2thunderclock.h index 898491fdb5a..b4793de7ee5 100644 --- a/src/devices/bus/a2bus/a2thunderclock.h +++ b/src/devices/bus/a2bus/a2thunderclock.h @@ -25,7 +25,7 @@ class a2bus_thunderclock_device: { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); a2bus_thunderclock_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides diff --git a/src/devices/bus/a2bus/a2ultraterm.cpp b/src/devices/bus/a2bus/a2ultraterm.cpp index 932424f6aa0..fd462d8ea10 100644 --- a/src/devices/bus/a2bus/a2ultraterm.cpp +++ b/src/devices/bus/a2bus/a2ultraterm.cpp @@ -138,7 +138,7 @@ 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) diff --git a/src/devices/bus/a2bus/a2ultraterm.h b/src/devices/bus/a2bus/a2ultraterm.h index 957cf2ae5d3..9c229344857 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_videx160_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a2bus/a2videoterm.cpp b/src/devices/bus/a2bus/a2videoterm.cpp index fe994dcb38b..8a54130bd59 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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), diff --git a/src/devices/bus/a2bus/a2videoterm.h b/src/devices/bus/a2bus/a2videoterm.h index 024cfa16ba7..768bbb0ec65 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_videx80_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a2bus/a2vulcan.cpp b/src/devices/bus/a2bus/a2vulcan.cpp index 343978daeca..41c3327e185 100644 --- a/src/devices/bus/a2bus/a2vulcan.cpp +++ b/src/devices/bus/a2bus/a2vulcan.cpp @@ -114,7 +114,7 @@ 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) diff --git a/src/devices/bus/a2bus/a2vulcan.h b/src/devices/bus/a2bus/a2vulcan.h index 6a961abaf24..29552b0c574 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_vulcanbase_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a2bus/a2zipdrive.cpp b/src/devices/bus/a2bus/a2zipdrive.cpp index d8b83825d68..0ab38e054d3 100644 --- a/src/devices/bus/a2bus/a2zipdrive.cpp +++ b/src/devices/bus/a2bus/a2zipdrive.cpp @@ -69,7 +69,7 @@ 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) diff --git a/src/devices/bus/a2bus/a2zipdrive.h b/src/devices/bus/a2bus/a2zipdrive.h index 71ac4baed7d..bec6fd13277 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_zipdrivebase_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a2bus/corvfdc01.cpp b/src/devices/bus/a2bus/corvfdc01.cpp index 0c31cb9d641..46415c607c0 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), 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 83a6add1402..afbf7909ccf 100644 --- a/src/devices/bus/a2bus/corvfdc01.h +++ b/src/devices/bus/a2bus/corvfdc01.h @@ -26,7 +26,7 @@ class a2bus_corvfdc01_device: { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); a2bus_corvfdc01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides diff --git a/src/devices/bus/a2bus/corvfdc02.cpp b/src/devices/bus/a2bus/corvfdc02.cpp index 6caf19439a7..7de6be9ba84 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), 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 f448134c71b..699113219ce 100644 --- a/src/devices/bus/a2bus/corvfdc02.h +++ b/src/devices/bus/a2bus/corvfdc02.h @@ -26,7 +26,7 @@ class a2bus_corvfdc02_device: { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); a2bus_corvfdc02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides diff --git a/src/devices/bus/a2bus/ezcgi.cpp b/src/devices/bus/a2bus/ezcgi.cpp index 373efb48e26..43be66a2057 100644 --- a/src/devices/bus/a2bus/ezcgi.cpp +++ b/src/devices/bus/a2bus/ezcgi.cpp @@ -103,7 +103,7 @@ a2bus_ezcgi_device::a2bus_ezcgi_device(const machine_config &mconfig, std::strin { } -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) : +a2bus_ezcgi_device::a2bus_ezcgi_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_tms(*this, TMS_TAG) @@ -117,7 +117,7 @@ a2bus_ezcgi_9938_device::a2bus_ezcgi_9938_device(const machine_config &mconfig, { } -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) : +a2bus_ezcgi_9938_device::a2bus_ezcgi_9938_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_tms(*this, TMS_TAG) @@ -131,7 +131,7 @@ a2bus_ezcgi_9958_device::a2bus_ezcgi_9958_device(const machine_config &mconfig, { } -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) : +a2bus_ezcgi_9958_device::a2bus_ezcgi_9958_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 bfcf64de5f3..3a8714b807d 100644 --- a/src/devices/bus/a2bus/ezcgi.h +++ b/src/devices/bus/a2bus/ezcgi.h @@ -29,7 +29,7 @@ class a2bus_ezcgi_device: public: // construction/destruction 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); + a2bus_ezcgi_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -54,7 +54,7 @@ class a2bus_ezcgi_9938_device: public: // construction/destruction 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); + a2bus_ezcgi_9938_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -79,7 +79,7 @@ class a2bus_ezcgi_9958_device: public: // construction/destruction 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); + a2bus_ezcgi_9958_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 45b8589f734..0a829833537 100644 --- a/src/devices/bus/a2bus/laser128.cpp +++ b/src/devices/bus/a2bus/laser128.cpp @@ -42,7 +42,7 @@ 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) diff --git a/src/devices/bus/a2bus/laser128.h b/src/devices/bus/a2bus/laser128.h index db73a34efd4..324b53539fd 100644 --- a/src/devices/bus/a2bus/laser128.h +++ b/src/devices/bus/a2bus/laser128.h @@ -24,7 +24,7 @@ class a2bus_laser128_device: { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); a2bus_laser128_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides diff --git a/src/devices/bus/a2bus/mouse.cpp b/src/devices/bus/a2bus/mouse.cpp index 012b850f025..ac32a2d9609 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), 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 bbb4f7da770..50978b9618f 100644 --- a/src/devices/bus/a2bus/mouse.h +++ b/src/devices/bus/a2bus/mouse.h @@ -26,7 +26,7 @@ class a2bus_mouse_device: { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); a2bus_mouse_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides diff --git a/src/devices/bus/a2bus/ramcard128k.cpp b/src/devices/bus/a2bus/ramcard128k.cpp index 80bbb452586..cd09d83a074 100644 --- a/src/devices/bus/a2bus/ramcard128k.cpp +++ b/src/devices/bus/a2bus/ramcard128k.cpp @@ -28,7 +28,7 @@ const device_type A2BUS_RAMCARD128K = &device_creator; // LIVE DEVICE //************************************************************************** -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) : +a2bus_ssramcard_device::a2bus_ssramcard_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) { diff --git a/src/devices/bus/a2bus/ramcard128k.h b/src/devices/bus/a2bus/ramcard128k.h index 4609e1cb47f..6f1cb5b6344 100644 --- a/src/devices/bus/a2bus/ramcard128k.h +++ b/src/devices/bus/a2bus/ramcard128k.h @@ -24,7 +24,7 @@ class a2bus_ssramcard_device: { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); a2bus_ssramcard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: diff --git a/src/devices/bus/a2bus/ramcard16k.cpp b/src/devices/bus/a2bus/ramcard16k.cpp index c5332917b29..4d17f53dded 100644 --- a/src/devices/bus/a2bus/ramcard16k.cpp +++ b/src/devices/bus/a2bus/ramcard16k.cpp @@ -28,7 +28,7 @@ const device_type A2BUS_RAMCARD16K = &device_creator; // LIVE DEVICE //************************************************************************** -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) : +a2bus_ramcard_device::a2bus_ramcard_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) { diff --git a/src/devices/bus/a2bus/ramcard16k.h b/src/devices/bus/a2bus/ramcard16k.h index 180b09f66a4..6ead078ddbd 100644 --- a/src/devices/bus/a2bus/ramcard16k.h +++ b/src/devices/bus/a2bus/ramcard16k.h @@ -24,7 +24,7 @@ class a2bus_ramcard_device: { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); a2bus_ramcard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: diff --git a/src/devices/bus/a2bus/timemasterho.cpp b/src/devices/bus/a2bus/timemasterho.cpp index ec0a8eb2cc5..b00ce07fdf9 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), 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 b8f62830051..36f75f0e64f 100644 --- a/src/devices/bus/a2bus/timemasterho.h +++ b/src/devices/bus/a2bus/timemasterho.h @@ -26,7 +26,7 @@ class a2bus_timemasterho_device: { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); a2bus_timemasterho_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides diff --git a/src/devices/bus/a7800/cpuwiz.cpp b/src/devices/bus/a7800/cpuwiz.cpp index 7a8236425fd..fb7057a6032 100644 --- a/src/devices/bus/a7800/cpuwiz.cpp +++ b/src/devices/bus/a7800/cpuwiz.cpp @@ -40,7 +40,7 @@ const device_type A78_ROM_MEGACART = &device_creator; const device_type A78_ROM_P450_VB = &device_creator; -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_versaboard_device::a78_versaboard_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : a78_rom_sg_device(mconfig, type, name, tag, owner, clock, shortname, source), m_ram_bank(0) { } diff --git a/src/devices/bus/a7800/cpuwiz.h b/src/devices/bus/a7800/cpuwiz.h index 6ad4d2780d7..c9b8787947d 100644 --- a/src/devices/bus/a7800/cpuwiz.h +++ b/src/devices/bus/a7800/cpuwiz.h @@ -13,7 +13,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a78_versaboard_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); a78_versaboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/a7800/rom.cpp b/src/devices/bus/a7800/rom.cpp index 264d844c8c2..9ece57c0ed2 100644 --- a/src/devices/bus/a7800/rom.cpp +++ b/src/devices/bus/a7800/rom.cpp @@ -42,7 +42,7 @@ const device_type A78_ROM_P450_SG_RAM = &device_creator; -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) +a78_rom_device::a78_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a78_cart_interface( mconfig, *this ) { @@ -54,7 +54,7 @@ a78_rom_device::a78_rom_device(const machine_config &mconfig, std::string tag, d { } -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_pokey_device::a78_rom_pokey_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : a78_rom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_pokey(*this, "pokey") { @@ -67,7 +67,7 @@ a78_rom_pokey_device::a78_rom_pokey_device(const machine_config &mconfig, std::s } -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_sg_device::a78_rom_sg_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : a78_rom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_bank(0) { } @@ -84,7 +84,7 @@ a78_rom_sg_pokey_device::a78_rom_sg_pokey_device(const machine_config &mconfig, } -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_ram_device::a78_rom_sg_ram_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : a78_rom_sg_device(mconfig, type, name, tag, owner, clock, shortname, source) { } @@ -95,7 +95,7 @@ a78_rom_sg_ram_device::a78_rom_sg_ram_device(const machine_config &mconfig, std: } -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_sg9_device::a78_rom_sg9_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : a78_rom_sg_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/bus/a7800/rom.h b/src/devices/bus/a7800/rom.h index 93a30672966..a05014627b3 100644 --- a/src/devices/bus/a7800/rom.h +++ b/src/devices/bus/a7800/rom.h @@ -14,7 +14,7 @@ class a78_rom_device : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); a78_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides @@ -32,7 +32,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a78_rom_pokey_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); a78_rom_pokey_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides @@ -53,7 +53,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a78_rom_sg_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); a78_rom_sg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides @@ -95,7 +95,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a78_rom_sg_ram_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); a78_rom_sg_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing @@ -110,7 +110,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a78_rom_sg9_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); a78_rom_sg9_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing diff --git a/src/devices/bus/a7800/xboard.cpp b/src/devices/bus/a7800/xboard.cpp index 33f1079a015..70d6bae5f6b 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; const device_type A78_XM = &device_creator; -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_xboard_device::a78_xboard_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) diff --git a/src/devices/bus/a7800/xboard.h b/src/devices/bus/a7800/xboard.h index c02c8a91d8c..5b0462a6e11 100644 --- a/src/devices/bus/a7800/xboard.h +++ b/src/devices/bus/a7800/xboard.h @@ -15,7 +15,7 @@ class a78_xboard_device : public a78_rom_device { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); a78_xboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/a800/a800_slot.cpp b/src/devices/bus/a800/a800_slot.cpp index 19f51ea9c7d..5fab9d68eff 100644 --- a/src/devices/bus/a800/a800_slot.cpp +++ b/src/devices/bus/a800/a800_slot.cpp @@ -101,7 +101,7 @@ 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) diff --git a/src/devices/bus/a800/a800_slot.h b/src/devices/bus/a800/a800_slot.h index d20816ad5d6..a74caa85773 100644 --- a/src/devices/bus/a800/a800_slot.h +++ b/src/devices/bus/a800/a800_slot.h @@ -85,7 +85,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a800_cart_slot_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); a800_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~a800_cart_slot_device(); diff --git a/src/devices/bus/a800/a8sio.cpp b/src/devices/bus/a800/a8sio.cpp index aa3b843a096..c8190f4f492 100644 --- a/src/devices/bus/a800/a8sio.cpp +++ b/src/devices/bus/a800/a8sio.cpp @@ -54,7 +54,7 @@ a8sio_slot_device::a8sio_slot_device(const machine_config &mconfig, std::string { } -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) : +a8sio_slot_device::a8sio_slot_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_slot_interface(mconfig, *this) { @@ -106,7 +106,7 @@ a8sio_device::a8sio_device(const machine_config &mconfig, std::string tag, devic { } -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) +a8sio_device::a8sio_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) , m_out_clock_in_cb(*this) , m_out_data_in_cb(*this) diff --git a/src/devices/bus/a800/a8sio.h b/src/devices/bus/a800/a8sio.h index 60a54d53cf0..2745ad52f51 100644 --- a/src/devices/bus/a800/a8sio.h +++ b/src/devices/bus/a800/a8sio.h @@ -55,7 +55,7 @@ class a8sio_slot_device : public device_t, public: // construction/destruction 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); + a8sio_slot_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // device-level overrides virtual void device_start() override; @@ -81,7 +81,7 @@ class a8sio_device : public device_t public: // construction/destruction 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); + a8sio_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // inline configuration template static devcb_base &set_clock_in_callback(device_t &device, _Object object) { return downcast(device).m_out_clock_in_cb.set_callback(object); } diff --git a/src/devices/bus/a800/cassette.cpp b/src/devices/bus/a800/cassette.cpp index 15e273c7096..b49e2563215 100644 --- a/src/devices/bus/a800/cassette.cpp +++ b/src/devices/bus/a800/cassette.cpp @@ -53,7 +53,7 @@ a8sio_cassette_device::a8sio_cassette_device(const machine_config &mconfig, std: { } -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) +a8sio_cassette_device::a8sio_cassette_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 94b63b0894f..15d8b8f9fb9 100644 --- a/src/devices/bus/a800/cassette.h +++ b/src/devices/bus/a800/cassette.h @@ -28,7 +28,7 @@ class a8sio_cassette_device public: // construction/destruction 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); + a8sio_cassette_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/a800/rom.cpp b/src/devices/bus/a800/rom.cpp index 4fdae4c4b7b..efa9dc7e318 100644 --- a/src/devices/bus/a800/rom.cpp +++ b/src/devices/bus/a800/rom.cpp @@ -30,7 +30,7 @@ const device_type A5200_ROM_2CHIPS = &device_creator; const device_type A5200_ROM_BBSB = &device_creator; -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) +a800_rom_device::a800_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a800_cart_interface( mconfig, *this ) { diff --git a/src/devices/bus/a800/rom.h b/src/devices/bus/a800/rom.h index 03ed54272ab..22693b86385 100644 --- a/src/devices/bus/a800/rom.h +++ b/src/devices/bus/a800/rom.h @@ -13,7 +13,7 @@ class a800_rom_device : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); a800_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/abcbus/abc890.cpp b/src/devices/bus/abcbus/abc890.cpp index 34fa28a8de4..63bc8084059 100644 --- a/src/devices/bus/abcbus/abc890.cpp +++ b/src/devices/bus/abcbus/abc890.cpp @@ -186,7 +186,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +abc890_t::abc890_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_abcbus_card_interface(mconfig, *this) { diff --git a/src/devices/bus/abcbus/abc890.h b/src/devices/bus/abcbus/abc890.h index aefebfe0249..c8b81b68060 100644 --- a/src/devices/bus/abcbus/abc890.h +++ b/src/devices/bus/abcbus/abc890.h @@ -27,7 +27,7 @@ class abc890_t : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); abc890_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides diff --git a/src/devices/bus/abcbus/lux21046.cpp b/src/devices/bus/abcbus/lux21046.cpp index b7245a93b6f..bc6f883f152 100644 --- a/src/devices/bus/abcbus/lux21046.cpp +++ b/src/devices/bus/abcbus/lux21046.cpp @@ -760,7 +760,7 @@ luxor_55_21046_device::luxor_55_21046_device(const machine_config &mconfig, std: { } -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) +luxor_55_21046_device::luxor_55_21046_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_abcbus_card_interface(mconfig, *this), m_maincpu(*this, Z80_TAG), diff --git a/src/devices/bus/abcbus/lux21046.h b/src/devices/bus/abcbus/lux21046.h index b1916bf5e62..d114dfd3126 100644 --- a/src/devices/bus/abcbus/lux21046.h +++ b/src/devices/bus/abcbus/lux21046.h @@ -53,7 +53,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + luxor_55_21046_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); luxor_55_21046_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides diff --git a/src/devices/bus/abckb/abc77.cpp b/src/devices/bus/abckb/abc77.cpp index ff11b75977b..b00e9813054 100644 --- a/src/devices/bus/abckb/abc77.cpp +++ b/src/devices/bus/abckb/abc77.cpp @@ -446,7 +446,7 @@ abc77_device::abc77_device(const machine_config &mconfig, std::string tag, devic { } -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) : +abc77_device::abc77_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), abc_keyboard_interface(mconfig, *this), m_maincpu(*this, I8035_TAG), diff --git a/src/devices/bus/abckb/abc77.h b/src/devices/bus/abckb/abc77.h index 6283989fe3c..12e9d757471 100644 --- a/src/devices/bus/abckb/abc77.h +++ b/src/devices/bus/abckb/abc77.h @@ -30,7 +30,7 @@ class abc77_device : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); abc77_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides diff --git a/src/devices/bus/amiga/zorro/a2052.cpp b/src/devices/bus/amiga/zorro/a2052.cpp index bd1849061c0..9eb53cf554d 100644 --- a/src/devices/bus/amiga/zorro/a2052.cpp +++ b/src/devices/bus/amiga/zorro/a2052.cpp @@ -74,7 +74,7 @@ void a2052_device::device_start() void a2052_device::autoconfig_base_address(offs_t address) { if (VERBOSE) - logerror("%s('%s'): autoconfig_base_address received: 0x%06x\n", shortname(), basetag(), address); + logerror("%s('%s'): autoconfig_base_address received: 0x%06x\n", shortname().c_str(), basetag().c_str(), address); if (VERBOSE) logerror("-> installing a2052\n"); @@ -92,7 +92,7 @@ void a2052_device::autoconfig_base_address(offs_t address) WRITE_LINE_MEMBER( a2052_device::cfgin_w ) { if (VERBOSE) - logerror("%s('%s'): configin_w (%d)\n", shortname(), basetag(), state); + logerror("%s('%s'): configin_w (%d)\n", shortname().c_str(), basetag().c_str(), state); if (state == 0) { diff --git a/src/devices/bus/amiga/zorro/a2232.cpp b/src/devices/bus/amiga/zorro/a2232.cpp index 50368699611..ecea1972081 100644 --- a/src/devices/bus/amiga/zorro/a2232.cpp +++ b/src/devices/bus/amiga/zorro/a2232.cpp @@ -222,7 +222,7 @@ void a2232_device::update_irqs() WRITE8_MEMBER( a2232_device::int2_w ) { if (VERBOSE) - logerror("%s('%s'): int2_w %04x\n", shortname(), basetag(), data); + logerror("%s('%s'): int2_w %04x\n", shortname().c_str(), basetag().c_str(), data); m_slot->int2_w(1); } @@ -230,7 +230,7 @@ WRITE8_MEMBER( a2232_device::int2_w ) WRITE8_MEMBER( a2232_device::irq_ack_w ) { if (VERBOSE) - logerror("%s('%s'): irq_ack_w %04x\n", shortname(), basetag(), data); + logerror("%s('%s'): irq_ack_w %04x\n", shortname().c_str(), basetag().c_str(), data); m_irqs[IRQ_AMIGA] = CLEAR_LINE; update_irqs(); @@ -244,7 +244,7 @@ WRITE8_MEMBER( a2232_device::irq_ack_w ) void a2232_device::autoconfig_base_address(offs_t address) { if (VERBOSE) - logerror("%s('%s'): autoconfig_base_address received: 0x%06x\n", shortname(), basetag(), address); + logerror("%s('%s'): autoconfig_base_address received: 0x%06x\n", shortname().c_str(), basetag().c_str(), address); if (VERBOSE) logerror("-> installing a2232\n"); @@ -279,7 +279,7 @@ void a2232_device::autoconfig_base_address(offs_t address) WRITE_LINE_MEMBER( a2232_device::cfgin_w ) { if (VERBOSE) - logerror("%s('%s'): configin_w (%d)\n", shortname(), basetag(), state); + logerror("%s('%s'): configin_w (%d)\n", shortname().c_str(), basetag().c_str(), state); if (state == 0) { @@ -324,7 +324,7 @@ READ16_MEMBER( a2232_device::shared_ram_r ) data |= 0xff00; if (VERBOSE_DATA) - logerror("%s('%s'): shared_ram_r(%04x) %04x [mask = %04x]\n", shortname(), basetag(), offset << 1, data, mem_mask); + logerror("%s('%s'): shared_ram_r(%04x) %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), offset << 1, data, mem_mask); return data; } @@ -332,7 +332,7 @@ READ16_MEMBER( a2232_device::shared_ram_r ) WRITE16_MEMBER( a2232_device::shared_ram_w ) { if (VERBOSE_DATA) - logerror("%s('%s'): shared_ram_w(%04x) %04x [mask = %04x]\n", shortname(), basetag(), offset << 1, data, mem_mask); + logerror("%s('%s'): shared_ram_w(%04x) %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), offset << 1, data, mem_mask); if (ACCESSING_BITS_0_7) m_shared_ram[(offset << 1) + 1] = data & 0xff; @@ -384,7 +384,7 @@ READ16_MEMBER( a2232_device::reset_high_r ) UINT16 data = 0xffff; if (VERBOSE) - logerror("%s('%s'): reset_high_r %04x [mask = %04x]\n", shortname(), basetag(), data, mem_mask); + logerror("%s('%s'): reset_high_r %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), data, mem_mask); m_iocpu->set_input_line(INPUT_LINE_RESET, CLEAR_LINE); @@ -394,7 +394,7 @@ READ16_MEMBER( a2232_device::reset_high_r ) WRITE16_MEMBER( a2232_device::reset_high_w ) { if (VERBOSE) - logerror("%s('%s'): reset_high_w %04x [mask = %04x]\n", shortname(), basetag(), data, mem_mask); + logerror("%s('%s'): reset_high_w %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), data, mem_mask); m_iocpu->set_input_line(INPUT_LINE_RESET, CLEAR_LINE); } diff --git a/src/devices/bus/amiga/zorro/buddha.cpp b/src/devices/bus/amiga/zorro/buddha.cpp index 45ca9968307..79bf5090438 100644 --- a/src/devices/bus/amiga/zorro/buddha.cpp +++ b/src/devices/bus/amiga/zorro/buddha.cpp @@ -103,7 +103,7 @@ void buddha_device::device_reset() void buddha_device::autoconfig_base_address(offs_t address) { if (VERBOSE) - logerror("%s('%s'): autoconfig_base_address received: 0x%06x\n", shortname(), basetag(), address); + logerror("%s('%s'): autoconfig_base_address received: 0x%06x\n", shortname().c_str(), basetag().c_str(), address); if (VERBOSE) logerror("-> installing buddha\n"); @@ -156,7 +156,7 @@ void buddha_device::autoconfig_base_address(offs_t address) WRITE_LINE_MEMBER( buddha_device::cfgin_w ) { if (VERBOSE) - logerror("%s('%s'): configin_w (%d)\n", shortname(), basetag(), state); + logerror("%s('%s'): configin_w (%d)\n", shortname().c_str(), basetag().c_str(), state); if (state == 0) { @@ -185,7 +185,7 @@ READ16_MEMBER( buddha_device::speed_r ) UINT16 data = 0xffff; if (VERBOSE) - logerror("%s('%s'): ide_0_interrupt_r %04x [mask = %04x]\n", shortname(), basetag(), data, mem_mask); + logerror("%s('%s'): ide_0_interrupt_r %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), data, mem_mask); return data; } @@ -193,13 +193,13 @@ READ16_MEMBER( buddha_device::speed_r ) WRITE16_MEMBER( buddha_device::speed_w ) { if (VERBOSE) - logerror("%s('%s'): speed_w %04x [mask = %04x]\n", shortname(), basetag(), data, mem_mask); + logerror("%s('%s'): speed_w %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), data, mem_mask); } WRITE_LINE_MEMBER( buddha_device::ide_0_interrupt_w) { if (VERBOSE) - logerror("%s('%s'): ide_0_interrupt_w (%d)\n", shortname(), basetag(), state); + logerror("%s('%s'): ide_0_interrupt_w (%d)\n", shortname().c_str(), basetag().c_str(), state); m_ide_0_interrupt = state; @@ -210,7 +210,7 @@ WRITE_LINE_MEMBER( buddha_device::ide_0_interrupt_w) WRITE_LINE_MEMBER( buddha_device::ide_1_interrupt_w) { if (VERBOSE) - logerror("%s('%s'): ide_1_interrupt_w (%d)\n", shortname(), basetag(), state); + logerror("%s('%s'): ide_1_interrupt_w (%d)\n", shortname().c_str(), basetag().c_str(), state); m_ide_1_interrupt = state; @@ -225,7 +225,7 @@ READ16_MEMBER( buddha_device::ide_0_interrupt_r ) data = m_ide_0_interrupt << 15; if (VERBOSE) - logerror("%s('%s'): ide_0_interrupt_r %04x [mask = %04x]\n", shortname(), basetag(), data, mem_mask); + logerror("%s('%s'): ide_0_interrupt_r %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), data, mem_mask); logerror("%s\n", device().machine().describe_context()); @@ -239,7 +239,7 @@ READ16_MEMBER( buddha_device::ide_1_interrupt_r ) data = m_ide_1_interrupt << 15; if (VERBOSE) - logerror("%s('%s'): ide_1_interrupt_r %04x [mask = %04x]\n", shortname(), basetag(), data, mem_mask); + logerror("%s('%s'): ide_1_interrupt_r %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), data, mem_mask); return data; } @@ -247,7 +247,7 @@ READ16_MEMBER( buddha_device::ide_1_interrupt_r ) WRITE16_MEMBER( buddha_device::ide_interrupt_enable_w ) { if (VERBOSE) - logerror("%s('%s'): ide_interrupt_enable_w %04x [mask = %04x]\n", shortname(), basetag(), data, mem_mask); + logerror("%s('%s'): ide_interrupt_enable_w %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), data, mem_mask); // writing any value here enables ide interrupts to the zorro slot m_ide_interrupts_enabled = true; @@ -261,7 +261,7 @@ READ16_MEMBER( buddha_device::ide_0_cs0_r ) data = m_ata_0->read_cs0(space, (offset >> 1) & 0x07, mem_mask); if (VERBOSE) - logerror("%s('%s'): ide_0_cs0_r(%04x) %04x [mask = %04x]\n", shortname(), basetag(), offset, data, mem_mask); + logerror("%s('%s'): ide_0_cs0_r(%04x) %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), offset, data, mem_mask); return (data << 8) | (data >> 8); } @@ -269,7 +269,7 @@ READ16_MEMBER( buddha_device::ide_0_cs0_r ) WRITE16_MEMBER( buddha_device::ide_0_cs0_w ) { if (VERBOSE) - logerror("%s('%s'): ide_0_cs0_w(%04x) %04x [mask = %04x]\n", shortname(), basetag(), offset, data, mem_mask); + logerror("%s('%s'): ide_0_cs0_w(%04x) %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), offset, data, mem_mask); mem_mask = (mem_mask << 8) | (mem_mask >> 8); data = (data << 8) | (data >> 8); @@ -285,7 +285,7 @@ READ16_MEMBER( buddha_device::ide_0_cs1_r ) data = m_ata_0->read_cs1(space, (offset >> 1) & 0x07, mem_mask); if (VERBOSE) - logerror("%s('%s'): ide_0_cs1_r(%04x) %04x [mask = %04x]\n", shortname(), basetag(), offset, data, mem_mask); + logerror("%s('%s'): ide_0_cs1_r(%04x) %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), offset, data, mem_mask); return (data << 8) | (data >> 8); } @@ -293,7 +293,7 @@ READ16_MEMBER( buddha_device::ide_0_cs1_r ) WRITE16_MEMBER( buddha_device::ide_0_cs1_w ) { if (VERBOSE) - logerror("%s('%s'): ide_0_cs1_w(%04x) %04x [mask = %04x]\n", shortname(), basetag(), offset, data, mem_mask); + logerror("%s('%s'): ide_0_cs1_w(%04x) %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), offset, data, mem_mask); mem_mask = (mem_mask << 8) | (mem_mask >> 8); data = (data << 8) | (data >> 8); @@ -309,7 +309,7 @@ READ16_MEMBER( buddha_device::ide_1_cs0_r ) data = m_ata_1->read_cs0(space, (offset >> 1) & 0x07, mem_mask); if (VERBOSE) - logerror("%s('%s'): ide_1_cs0_r(%04x) %04x [mask = %04x]\n", shortname(), basetag(), offset, data, mem_mask); + logerror("%s('%s'): ide_1_cs0_r(%04x) %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), offset, data, mem_mask); return (data << 8) | (data >> 8); } @@ -317,7 +317,7 @@ READ16_MEMBER( buddha_device::ide_1_cs0_r ) WRITE16_MEMBER( buddha_device::ide_1_cs0_w ) { if (VERBOSE) - logerror("%s('%s'): ide_1_cs0_w(%04x) %04x [mask = %04x]\n", shortname(), basetag(), offset, data, mem_mask); + logerror("%s('%s'): ide_1_cs0_w(%04x) %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), offset, data, mem_mask); mem_mask = (mem_mask << 8) | (mem_mask >> 8); data = (data << 8) | (data >> 8); @@ -333,7 +333,7 @@ READ16_MEMBER( buddha_device::ide_1_cs1_r ) data = m_ata_1->read_cs1(space, (offset >> 1) & 0x07, mem_mask); if (VERBOSE) - logerror("%s('%s'): ide_1_cs1_r(%04x) %04x [mask = %04x]\n", shortname(), basetag(), offset, data, mem_mask); + logerror("%s('%s'): ide_1_cs1_r(%04x) %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), offset, data, mem_mask); return (data << 8) | (data >> 8); } @@ -341,7 +341,7 @@ READ16_MEMBER( buddha_device::ide_1_cs1_r ) WRITE16_MEMBER( buddha_device::ide_1_cs1_w ) { if (VERBOSE) - logerror("%s('%s'): ide_1_cs1_w(%04x) %04x [mask = %04x]\n", shortname(), basetag(), offset, data, mem_mask); + logerror("%s('%s'): ide_1_cs1_w(%04x) %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), offset, data, mem_mask); mem_mask = (mem_mask << 8) | (mem_mask >> 8); data = (data << 8) | (data >> 8); diff --git a/src/devices/bus/amiga/zorro/zorro.cpp b/src/devices/bus/amiga/zorro/zorro.cpp index b5a8e2768c9..04c2ce88183 100644 --- a/src/devices/bus/amiga/zorro/zorro.cpp +++ b/src/devices/bus/amiga/zorro/zorro.cpp @@ -27,8 +27,8 @@ zorro_slot_device::zorro_slot_device(const machine_config &mconfig, std::string { } -zorro_slot_device::zorro_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) : +zorro_slot_device::zorro_slot_device(const machine_config &mconfig, device_type type, std::string name, + std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_slot_interface(mconfig, *this) { @@ -65,8 +65,8 @@ void zorro_slot_device::device_start() // exp_slot_device - constructor //------------------------------------------------- -zorro_device::zorro_device(const machine_config &mconfig, device_type type, const char *name, - std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +zorro_device::zorro_device(const machine_config &mconfig, device_type type, std::string name, + std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_space(nullptr), m_ovr_handler(*this), @@ -124,8 +124,8 @@ exp_slot_device::exp_slot_device(const machine_config &mconfig, std::string tag, { } -exp_slot_device::exp_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) : +exp_slot_device::exp_slot_device(const machine_config &mconfig, device_type type, std::string name, + std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : zorro_device(mconfig, type, name, tag, owner, clock, shortname, source), m_ipl_handler(*this), m_dev(nullptr) @@ -193,8 +193,8 @@ zorro2_device::zorro2_device(const machine_config &mconfig, std::string tag, dev { } -zorro2_device::zorro2_device(const machine_config &mconfig, device_type type, const char *name, - std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +zorro2_device::zorro2_device(const machine_config &mconfig, device_type type, std::string name, + std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 ad52934f200..3ddd99b47e9 100644 --- a/src/devices/bus/amiga/zorro/zorro.h +++ b/src/devices/bus/amiga/zorro/zorro.h @@ -229,8 +229,8 @@ class zorro_slot_device : public device_t, public device_slot_interface public: // construction/destruction 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, - std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + zorro_slot_device(const machine_config &mconfig, device_type type, std::string name, + std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // device-level overrides virtual void device_start() override; @@ -252,8 +252,8 @@ class zorro_device : public device_t { public: // construction/destruction - zorro_device(const machine_config &mconfig, device_type type, const char *name, - std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + zorro_device(const machine_config &mconfig, device_type type, std::string name, + std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // static configuration helpers static void set_cputag(device_t &device, std::string tag); @@ -299,8 +299,8 @@ class exp_slot_device : public zorro_device public: // construction/destruction 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, - std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + exp_slot_device(const machine_config &mconfig, device_type type, std::string name, + std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); template static devcb_base &set_ipl_handler(device_t &device, _Object object) { return downcast(device).m_ipl_handler.set_callback(object); } @@ -335,8 +335,8 @@ class zorro2_device : public zorro_device public: // construction/destruction 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, - std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + zorro2_device(const machine_config &mconfig, device_type type, std::string name, + std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); ~zorro2_device(); template 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 c4f89d584dd..ce752ccb8a3 100644 --- a/src/devices/bus/apf/rom.cpp +++ b/src/devices/bus/apf/rom.cpp @@ -22,7 +22,7 @@ const device_type APF_ROM_BASIC = &device_creator; const device_type APF_ROM_SPACEDST = &device_creator; -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) +apf_rom_device::apf_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_apf_cart_interface( mconfig, *this ) { diff --git a/src/devices/bus/apf/rom.h b/src/devices/bus/apf/rom.h index 54706a528a5..75f0f0a687e 100644 --- a/src/devices/bus/apf/rom.h +++ b/src/devices/bus/apf/rom.h @@ -13,7 +13,7 @@ class apf_rom_device : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); apf_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/apricot/expansion.cpp b/src/devices/bus/apricot/expansion.cpp index bca4c71705c..2e40fbba7bc 100644 --- a/src/devices/bus/apricot/expansion.cpp +++ b/src/devices/bus/apricot/expansion.cpp @@ -25,8 +25,8 @@ apricot_expansion_slot_device::apricot_expansion_slot_device(const machine_confi { } -apricot_expansion_slot_device::apricot_expansion_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) : +apricot_expansion_slot_device::apricot_expansion_slot_device(const machine_config &mconfig, device_type type, std::string name, + std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_slot_interface(mconfig, *this) { diff --git a/src/devices/bus/apricot/expansion.h b/src/devices/bus/apricot/expansion.h index 94a5f4f8fbd..fa711efa0d5 100644 --- a/src/devices/bus/apricot/expansion.h +++ b/src/devices/bus/apricot/expansion.h @@ -98,8 +98,8 @@ class apricot_expansion_slot_device : public device_t, public device_slot_interf public: // construction/destruction 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, - std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + apricot_expansion_slot_device(const machine_config &mconfig, device_type type, std::string name, + std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/arcadia/rom.cpp b/src/devices/bus/arcadia/rom.cpp index d1734061b56..d07d76aa033 100644 --- a/src/devices/bus/arcadia/rom.cpp +++ b/src/devices/bus/arcadia/rom.cpp @@ -22,7 +22,7 @@ const device_type ARCADIA_ROM_STD = &device_creator; const device_type ARCADIA_ROM_GOLF = &device_creator; -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) +arcadia_rom_device::arcadia_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_arcadia_cart_interface( mconfig, *this ) { diff --git a/src/devices/bus/arcadia/rom.h b/src/devices/bus/arcadia/rom.h index 57b51cb7baf..845a0738d42 100644 --- a/src/devices/bus/arcadia/rom.h +++ b/src/devices/bus/arcadia/rom.h @@ -13,7 +13,7 @@ class arcadia_rom_device : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); arcadia_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/astrocde/ram.cpp b/src/devices/bus/astrocde/ram.cpp index c63a13af887..565fe7d8dde 100644 --- a/src/devices/bus/astrocde/ram.cpp +++ b/src/devices/bus/astrocde/ram.cpp @@ -68,7 +68,7 @@ const device_type ASTROCADE_WHITERAM = &device_creator; -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) +astrocade_blueram_4k_device::astrocade_blueram_4k_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), 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 b279056b9cb..f9fb3972a03 100644 --- a/src/devices/bus/astrocde/ram.h +++ b/src/devices/bus/astrocde/ram.h @@ -13,7 +13,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + astrocade_blueram_4k_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); astrocade_blueram_4k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/astrocde/rom.cpp b/src/devices/bus/astrocde/rom.cpp index 31a9bc0934f..9cf0dbb4e30 100644 --- a/src/devices/bus/astrocde/rom.cpp +++ b/src/devices/bus/astrocde/rom.cpp @@ -22,7 +22,7 @@ const device_type ASTROCADE_ROM_256K = &device_creator; -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) +astrocade_rom_device::astrocade_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_astrocade_cart_interface(mconfig, *this) { diff --git a/src/devices/bus/astrocde/rom.h b/src/devices/bus/astrocde/rom.h index 531e10bbbb2..2b450d645e6 100644 --- a/src/devices/bus/astrocde/rom.h +++ b/src/devices/bus/astrocde/rom.h @@ -13,7 +13,7 @@ class astrocade_rom_device : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); astrocade_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/bml3/bml3bus.cpp b/src/devices/bus/bml3/bml3bus.cpp index d28e7f49ca8..7b0d8420efc 100644 --- a/src/devices/bus/bml3/bml3bus.cpp +++ b/src/devices/bus/bml3/bml3bus.cpp @@ -66,7 +66,7 @@ bml3bus_slot_device::bml3bus_slot_device(const machine_config &mconfig, std::str { } -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) : +bml3bus_slot_device::bml3bus_slot_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_slot_interface(mconfig, *this) { @@ -118,7 +118,7 @@ bml3bus_device::bml3bus_device(const machine_config &mconfig, std::string tag, d { } -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) : +bml3bus_device::bml3bus_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr), m_out_nmi_cb(*this), m_out_irq_cb(*this), diff --git a/src/devices/bus/bml3/bml3bus.h b/src/devices/bus/bml3/bml3bus.h index a7c9b82d63a..7cb24c834ac 100644 --- a/src/devices/bus/bml3/bml3bus.h +++ b/src/devices/bus/bml3/bml3bus.h @@ -57,7 +57,7 @@ class bml3bus_slot_device : public device_t, public: // construction/destruction 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); + bml3bus_slot_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // device-level overrides virtual void device_start() override; @@ -81,7 +81,7 @@ class bml3bus_device : public device_t public: // construction/destruction 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); + bml3bus_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // inline configuration static void static_set_cputag(device_t &device, std::string tag); diff --git a/src/devices/bus/c64/reu.cpp b/src/devices/bus/c64/reu.cpp index 61156396ccc..b83c27c6305 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, int jp1, size_t ram_size, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_c64_expansion_card_interface(mconfig, *this), m_dmac(*this, MOS8726R1_TAG), diff --git a/src/devices/bus/c64/reu.h b/src/devices/bus/c64/reu.h index 637830d84e9..1017c83f38a 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, int jp1, size_t ram_size, std::string shortname, std::string source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/cbm2/hrg.cpp b/src/devices/bus/cbm2/hrg.cpp index b2e2a087529..e6695f3c2a8 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_cbm2_expansion_card_interface(mconfig, *this), m_gdc(*this, EF9366_TAG), diff --git a/src/devices/bus/cbm2/hrg.h b/src/devices/bus/cbm2/hrg.h index 2562e4c8971..f2b4d482d23 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + cbm2_hrg_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/cbmiec/c1526.cpp b/src/devices/bus/cbmiec/c1526.cpp index 0ee77d48ce9..de04cc1e5ba 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/bus/cbmiec/c1526.h b/src/devices/bus/cbmiec/c1526.h index 98510b774bf..4ae53efc4ca 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + c1526_base_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); protected: // device-level overrides diff --git a/src/devices/bus/cbmiec/c1541.cpp b/src/devices/bus/cbmiec/c1541.cpp index 1c3e48f0929..4cb40cbdc8e 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_cbm_iec_interface(mconfig, *this), device_c64_floppy_parallel_interface(mconfig, *this), diff --git a/src/devices/bus/cbmiec/c1541.h b/src/devices/bus/cbmiec/c1541.h index 19fff953a76..a3b8bbf3617 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + c1541_base_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/cbmiec/c1571.cpp b/src/devices/bus/cbmiec/c1571.cpp index ff907c7a537..084be6438f0 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +c1571_t::c1571_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_cbm_iec_interface(mconfig, *this), device_c64_floppy_parallel_interface(mconfig, *this), diff --git a/src/devices/bus/cbmiec/c1571.h b/src/devices/bus/cbmiec/c1571.h index 0a09a24a5fb..ea267e5d54c 100644 --- a/src/devices/bus/cbmiec/c1571.h +++ b/src/devices/bus/cbmiec/c1571.h @@ -44,7 +44,7 @@ class c1571_t : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); c1571_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides diff --git a/src/devices/bus/cbmiec/c1581.cpp b/src/devices/bus/cbmiec/c1581.cpp index 892e3980ddf..144e55585c9 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +c1581_t::c1581_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_cbm_iec_interface(mconfig, *this), m_maincpu(*this, M6502_TAG), diff --git a/src/devices/bus/cbmiec/c1581.h b/src/devices/bus/cbmiec/c1581.h index f1a3ac04dae..ef49ee68ecb 100644 --- a/src/devices/bus/cbmiec/c1581.h +++ b/src/devices/bus/cbmiec/c1581.h @@ -39,7 +39,7 @@ class c1581_t : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); c1581_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides diff --git a/src/devices/bus/cbmiec/fd2000.cpp b/src/devices/bus/cbmiec/fd2000.cpp index e8fce1bf343..c33705bd84f 100644 --- a/src/devices/bus/cbmiec/fd2000.cpp +++ b/src/devices/bus/cbmiec/fd2000.cpp @@ -284,7 +284,7 @@ fd2000_device::fd2000_device(const machine_config &mconfig, std::string tag, dev { } -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) +fd2000_device::fd2000_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_cbm_iec_interface(mconfig, *this), m_maincpu(*this, R65C02P4_TAG), diff --git a/src/devices/bus/cbmiec/fd2000.h b/src/devices/bus/cbmiec/fd2000.h index 10a83d99de0..6311e82ee0b 100644 --- a/src/devices/bus/cbmiec/fd2000.h +++ b/src/devices/bus/cbmiec/fd2000.h @@ -40,7 +40,7 @@ class fd2000_device : public device_t, public: // construction/destruction 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); + fd2000_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source); enum { diff --git a/src/devices/bus/centronics/epson_lx800.cpp b/src/devices/bus/centronics/epson_lx800.cpp index 6a6e632bdc0..27e8dce0226 100644 --- a/src/devices/bus/centronics/epson_lx800.cpp +++ b/src/devices/bus/centronics/epson_lx800.cpp @@ -207,7 +207,7 @@ epson_lx800_t::epson_lx800_t(const machine_config &mconfig, std::string tag, dev { } -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) : +epson_lx800_t::epson_lx800_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 044d97a36c3..17260be59f5 100644 --- a/src/devices/bus/centronics/epson_lx800.h +++ b/src/devices/bus/centronics/epson_lx800.h @@ -31,7 +31,7 @@ class epson_lx800_t : public device_t, public: // construction/destruction 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); + epson_lx800_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 1cfdbc37818..63a9ef5f5cd 100644 --- a/src/devices/bus/centronics/epson_lx810l.cpp +++ b/src/devices/bus/centronics/epson_lx810l.cpp @@ -306,7 +306,7 @@ epson_lx810l_t::epson_lx810l_t(const machine_config &mconfig, std::string tag, d { } -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) : +epson_lx810l_t::epson_lx810l_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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_lx810l.h b/src/devices/bus/centronics/epson_lx810l.h index 491874e73d3..99f9f3325db 100644 --- a/src/devices/bus/centronics/epson_lx810l.h +++ b/src/devices/bus/centronics/epson_lx810l.h @@ -43,8 +43,8 @@ public: 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, std::string tag, device_t *owner, - UINT32 clock, const char *shortname, const char *source); + std::string name, std::string tag, device_t *owner, + UINT32 clock, std::string shortname, std::string source); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/centronics/nec_p72.cpp b/src/devices/bus/centronics/nec_p72.cpp index 2bb400c63fc..abe2bc99fc5 100644 --- a/src/devices/bus/centronics/nec_p72.cpp +++ b/src/devices/bus/centronics/nec_p72.cpp @@ -86,7 +86,7 @@ nec_p72_t::nec_p72_t(const machine_config &mconfig, std::string tag, device_t *o { } -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) : +nec_p72_t::nec_p72_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 0aac9f9f23d..b24167b449a 100644 --- a/src/devices/bus/centronics/nec_p72.h +++ b/src/devices/bus/centronics/nec_p72.h @@ -24,8 +24,8 @@ public: 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, std::string tag, device_t *owner, - UINT32 clock, const char *shortname, const char *source); + std::string name, std::string tag, device_t *owner, + UINT32 clock, std::string shortname, std::string source); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/chanf/rom.cpp b/src/devices/bus/chanf/rom.cpp index 05ba7bc14fa..c88a4229da4 100644 --- a/src/devices/bus/chanf/rom.cpp +++ b/src/devices/bus/chanf/rom.cpp @@ -31,7 +31,7 @@ const device_type CHANF_ROM_MULTI_OLD = &device_creator; const device_type CHANF_ROM_MULTI_FINAL = &device_creator; -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) +chanf_rom_device::chanf_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) { diff --git a/src/devices/bus/chanf/rom.h b/src/devices/bus/chanf/rom.h index 1114302d97e..f6437b64c1f 100644 --- a/src/devices/bus/chanf/rom.h +++ b/src/devices/bus/chanf/rom.h @@ -13,7 +13,7 @@ class chanf_rom_device : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); chanf_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/coco/coco_fdc.cpp b/src/devices/bus/coco/coco_fdc.cpp index 4efe5cb6f9a..b0181580e06 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 - constructor //------------------------------------------------- -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) +coco_fdc_device::coco_fdc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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), @@ -444,7 +444,7 @@ const device_type DRAGON_FDC = &device_creator; //------------------------------------------------- // dragon_fdc_device - constructor //------------------------------------------------- -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) +dragon_fdc_device::dragon_fdc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : coco_fdc_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/bus/coco/coco_fdc.h b/src/devices/bus/coco/coco_fdc.h index ddca5d388d2..f4a11cd6568 100644 --- a/src/devices/bus/coco/coco_fdc.h +++ b/src/devices/bus/coco/coco_fdc.h @@ -35,7 +35,7 @@ class coco_fdc_device : public: // construction/destruction 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); + coco_fdc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); DECLARE_FLOPPY_FORMATS(floppy_formats); @@ -141,7 +141,7 @@ class dragon_fdc_device : public: // construction/destruction 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); + dragon_fdc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // 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 711a2ffa2d6..69f3c557dc3 100644 --- a/src/devices/bus/coco/coco_pak.cpp +++ b/src/devices/bus/coco/coco_pak.cpp @@ -39,7 +39,7 @@ const device_type COCO_PAK = &device_creator; //------------------------------------------------- // coco_pak_device - constructor //------------------------------------------------- -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) +coco_pak_device::coco_pak_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_cococart_interface( mconfig, *this ), m_cart(nullptr), m_owner(nullptr) { diff --git a/src/devices/bus/coco/coco_pak.h b/src/devices/bus/coco/coco_pak.h index 019046e04fd..db055047194 100644 --- a/src/devices/bus/coco/coco_pak.h +++ b/src/devices/bus/coco/coco_pak.h @@ -21,7 +21,7 @@ class coco_pak_device : public: // construction/destruction 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); + coco_pak_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // 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 6b5d965d3f5..d4e5df7b899 100644 --- a/src/devices/bus/cpc/cpc_rs232.cpp +++ b/src/devices/bus/cpc/cpc_rs232.cpp @@ -89,7 +89,7 @@ cpc_rs232_device::cpc_rs232_device(const machine_config &mconfig, std::string ta { } -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) : +cpc_rs232_device::cpc_rs232_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_cpc_expansion_card_interface(mconfig, *this), m_pit(*this,"pit"), diff --git a/src/devices/bus/cpc/cpc_rs232.h b/src/devices/bus/cpc/cpc_rs232.h index e355d1242c4..ad6accd1377 100644 --- a/src/devices/bus/cpc/cpc_rs232.h +++ b/src/devices/bus/cpc/cpc_rs232.h @@ -21,7 +21,7 @@ class cpc_rs232_device : public device_t, public: // construction/destruction 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); + cpc_rs232_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/crvision/rom.cpp b/src/devices/bus/crvision/rom.cpp index 24eb7942a36..c6b8c27cff5 100644 --- a/src/devices/bus/crvision/rom.cpp +++ b/src/devices/bus/crvision/rom.cpp @@ -26,7 +26,7 @@ const device_type CRVISION_ROM_16K = &device_creator; const device_type CRVISION_ROM_18K = &device_creator; -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) +crvision_rom_device::crvision_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_crvision_cart_interface(mconfig, *this) { diff --git a/src/devices/bus/crvision/rom.h b/src/devices/bus/crvision/rom.h index 31ba846ab97..bf30a30d998 100644 --- a/src/devices/bus/crvision/rom.h +++ b/src/devices/bus/crvision/rom.h @@ -13,7 +13,7 @@ class crvision_rom_device : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); crvision_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/dmv/k230.cpp b/src/devices/bus/dmv/k230.cpp index 3beccbdf7ac..058aea49c1b 100644 --- a/src/devices/bus/dmv/k230.cpp +++ b/src/devices/bus/dmv/k230.cpp @@ -114,7 +114,7 @@ dmv_k230_device::dmv_k230_device(const machine_config &mconfig, std::string tag, { } -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) +dmv_k230_device::dmv_k230_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_dmvslot_interface( mconfig, *this ), m_maincpu(*this, "maincpu"), diff --git a/src/devices/bus/dmv/k230.h b/src/devices/bus/dmv/k230.h index 993e449f2aa..700cb442679 100644 --- a/src/devices/bus/dmv/k230.h +++ b/src/devices/bus/dmv/k230.h @@ -29,7 +29,7 @@ class dmv_k230_device : { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); dmv_k230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides diff --git a/src/devices/bus/dmv/k801.cpp b/src/devices/bus/dmv/k801.cpp index 98f1984ddf1..8be583aa596 100644 --- a/src/devices/bus/dmv/k801.cpp +++ b/src/devices/bus/dmv/k801.cpp @@ -119,7 +119,7 @@ dmv_k801_device::dmv_k801_device(const machine_config &mconfig, std::string tag, { } -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) +dmv_k801_device::dmv_k801_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_dmvslot_interface( mconfig, *this ), m_epci(*this, "epci"), @@ -137,7 +137,7 @@ dmv_k211_device::dmv_k211_device(const machine_config &mconfig, std::string tag, } -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_k211_device::dmv_k211_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : dmv_k801_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/bus/dmv/k801.h b/src/devices/bus/dmv/k801.h index 9c74b5f1a84..0091f578438 100644 --- a/src/devices/bus/dmv/k801.h +++ b/src/devices/bus/dmv/k801.h @@ -24,7 +24,7 @@ class dmv_k801_device : public: // construction/destruction 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); + dmv_k801_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // optional information overrides virtual ioport_constructor device_input_ports() const override; @@ -56,7 +56,7 @@ class dmv_k211_device : public: // construction/destruction 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); + dmv_k211_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/dmv/ram.cpp b/src/devices/bus/dmv/ram.cpp index 997bcd6d199..c46637a562e 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_ram_device - constructor //------------------------------------------------- -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) +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, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_dmvslot_interface( mconfig, *this ), m_ram(nullptr), m_size(size) diff --git a/src/devices/bus/dmv/ram.h b/src/devices/bus/dmv/ram.h index 848e2848de1..b6d25e5423a 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, std::string 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, std::string shortname, std::string source); protected: // device-level overrides diff --git a/src/devices/bus/econet/e01.cpp b/src/devices/bus/econet/e01.cpp index 71da0802380..4628fe2626e 100644 --- a/src/devices/bus/econet/e01.cpp +++ b/src/devices/bus/econet/e01.cpp @@ -402,7 +402,7 @@ e01_device::e01_device(const machine_config &mconfig, std::string tag, device_t } -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) +e01_device::e01_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 ef3d1fcb4bd..9a3a1c3db82 100644 --- a/src/devices/bus/econet/e01.h +++ b/src/devices/bus/econet/e01.h @@ -28,7 +28,7 @@ class e01_device : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); e01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); enum diff --git a/src/devices/bus/gameboy/gb_slot.cpp b/src/devices/bus/gameboy/gb_slot.cpp index 9130f4ddd29..7d3c2247c33 100644 --- a/src/devices/bus/gameboy/gb_slot.cpp +++ b/src/devices/bus/gameboy/gb_slot.cpp @@ -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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), diff --git a/src/devices/bus/gameboy/gb_slot.h b/src/devices/bus/gameboy/gb_slot.h index 3f6109e7d2d..b5a6a88871b 100644 --- a/src/devices/bus/gameboy/gb_slot.h +++ b/src/devices/bus/gameboy/gb_slot.h @@ -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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + base_gb_cart_slot_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual ~base_gb_cart_slot_device(); // device-level overrides diff --git a/src/devices/bus/gameboy/mbc.cpp b/src/devices/bus/gameboy/mbc.cpp index 3526d4658a2..bf57c60c15b 100644 --- a/src/devices/bus/gameboy/mbc.cpp +++ b/src/devices/bus/gameboy/mbc.cpp @@ -37,13 +37,13 @@ const device_type GB_ROM_ROCKMAN8 = &device_creator; const device_type GB_ROM_SM3SP = &device_creator; -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) +gb_rom_mbc_device::gb_rom_mbc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : gb_rom_mbc_device(mconfig, type, name, tag, owner, clock, shortname, source), m_mode(0), m_mask(0x1f), m_shift(0) @@ -67,7 +67,7 @@ gb_rom_mbc3_device::gb_rom_mbc3_device(const machine_config &mconfig, std::strin { } -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_mbc5_device::gb_rom_mbc5_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : gb_rom_mbc_device(mconfig, type, name, tag, owner, clock, shortname, source) { } @@ -102,7 +102,7 @@ gb_rom_sachen_mmc1_device::gb_rom_sachen_mmc1_device(const machine_config &mconf { } -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_sachen_mmc1_device::gb_rom_sachen_mmc1_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) { } diff --git a/src/devices/bus/gameboy/mbc.h b/src/devices/bus/gameboy/mbc.h index b1d52c865e9..06a6124172b 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + gb_rom_mbc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // device-level overrides virtual void device_start() override { shared_start(); }; @@ -42,7 +42,7 @@ public: }; // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); gb_rom_mbc1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides @@ -102,7 +102,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + gb_rom_mbc5_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); gb_rom_mbc5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides @@ -204,7 +204,7 @@ public: // construction/destruction 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); + gb_rom_sachen_mmc1_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/gameboy/rom.cpp b/src/devices/bus/gameboy/rom.cpp index 130d16b52dc..69371aee39a 100644 --- a/src/devices/bus/gameboy/rom.cpp +++ b/src/devices/bus/gameboy/rom.cpp @@ -29,7 +29,7 @@ const device_type GB_ROM_LASAMA = &device_creator; const device_type MEGADUCK_ROM = &device_creator; -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) +gb_rom_device::gb_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_gb_cart_interface( mconfig, *this ) { @@ -67,7 +67,7 @@ gb_rom_lasama_device::gb_rom_lasama_device(const machine_config &mconfig, std::s } -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) +megaduck_rom_device::megaduck_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_gb_cart_interface( mconfig, *this ) { diff --git a/src/devices/bus/gameboy/rom.h b/src/devices/bus/gameboy/rom.h index 9e0932ad2fb..08a22dd081f 100644 --- a/src/devices/bus/gameboy/rom.h +++ b/src/devices/bus/gameboy/rom.h @@ -13,7 +13,7 @@ class gb_rom_device : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); gb_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides @@ -121,7 +121,7 @@ class megaduck_rom_device :public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); megaduck_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/gba/rom.cpp b/src/devices/bus/gba/rom.cpp index 13e773bca18..e4d0eea9ffb 100644 --- a/src/devices/bus/gba/rom.cpp +++ b/src/devices/bus/gba/rom.cpp @@ -29,7 +29,7 @@ const device_type GBA_ROM_FLASH = &device_creator; const device_type GBA_ROM_FLASH1M = &device_creator; -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) +gba_rom_device::gba_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_gba_cart_interface( mconfig, *this ) { diff --git a/src/devices/bus/gba/rom.h b/src/devices/bus/gba/rom.h index d9f58bddac4..3c83a3fda2e 100644 --- a/src/devices/bus/gba/rom.h +++ b/src/devices/bus/gba/rom.h @@ -14,7 +14,7 @@ class gba_rom_device : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); gba_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/generic/ram.cpp b/src/devices/bus/generic/ram.cpp index 969d0a0bfa9..d54341c8c94 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_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) +generic_ram_plain_device::generic_ram_plain_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 size, std::string shortname, std::string 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 size, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_generic_cart_interface(mconfig, *this), m_size(size) diff --git a/src/devices/bus/generic/ram.h b/src/devices/bus/generic/ram.h index 673015f2020..3b6198eef6d 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 size, std::string shortname, std::string 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 size, std::string shortname, std::string source); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/generic/rom.cpp b/src/devices/bus/generic/rom.cpp index d1358c458af..f45dc89d7e4 100644 --- a/src/devices/bus/generic/rom.cpp +++ b/src/devices/bus/generic/rom.cpp @@ -31,13 +31,13 @@ const device_type GENERIC_ROM_LINEAR = &device_creator; -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) +generic_rom_device::generic_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : generic_rom_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/bus/generic/rom.h b/src/devices/bus/generic/rom.h index 7e889c19388..ba3acc6e823 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + generic_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // device-level overrides virtual void device_start() override {} @@ -26,7 +26,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + generic_rom_plain_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); generic_rom_plain_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing diff --git a/src/devices/bus/ieee488/c2040.cpp b/src/devices/bus/ieee488/c2040.cpp index dd5f99e5455..e0d3209f93e 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +c2040_t::c2040_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_ieee488_interface(mconfig, *this), m_maincpu(*this, M6502_TAG), diff --git a/src/devices/bus/ieee488/c2040.h b/src/devices/bus/ieee488/c2040.h index fd102976e8d..ac7f79a099f 100644 --- a/src/devices/bus/ieee488/c2040.h +++ b/src/devices/bus/ieee488/c2040.h @@ -32,7 +32,7 @@ class c2040_t : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); c2040_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides diff --git a/src/devices/bus/ieee488/c8050.cpp b/src/devices/bus/ieee488/c8050.cpp index 710cd8e03bb..7d164abaf56 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +c8050_t::c8050_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_ieee488_interface(mconfig, *this), m_maincpu(*this, M6502_TAG), diff --git a/src/devices/bus/ieee488/c8050.h b/src/devices/bus/ieee488/c8050.h index a9cb8b27546..e4860a61b8d 100644 --- a/src/devices/bus/ieee488/c8050.h +++ b/src/devices/bus/ieee488/c8050.h @@ -32,7 +32,7 @@ class c8050_t : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); c8050_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides diff --git a/src/devices/bus/ieee488/d9060.cpp b/src/devices/bus/ieee488/d9060.cpp index 136c96fb7c6..b263a070bf7 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_ieee488_interface(mconfig, *this), m_maincpu(*this, M6502_DOS_TAG), diff --git a/src/devices/bus/ieee488/d9060.h b/src/devices/bus/ieee488/d9060.h index 8cc737c620f..4cc52468b4a 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, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source); + d9060_base_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/intv/rom.cpp b/src/devices/bus/intv/rom.cpp index c037fe3bbac..641bcd80761 100644 --- a/src/devices/bus/intv/rom.cpp +++ b/src/devices/bus/intv/rom.cpp @@ -23,7 +23,7 @@ const device_type INTV_ROM_GFACT = &device_creator; const device_type INTV_ROM_WSMLB = &device_creator; -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) +intv_rom_device::intv_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_intv_cart_interface( mconfig, *this ) { diff --git a/src/devices/bus/intv/rom.h b/src/devices/bus/intv/rom.h index 887c67f0ea8..5630c76ab55 100644 --- a/src/devices/bus/intv/rom.h +++ b/src/devices/bus/intv/rom.h @@ -13,7 +13,7 @@ class intv_rom_device : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); intv_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing diff --git a/src/devices/bus/iq151/rom.cpp b/src/devices/bus/iq151/rom.cpp index d6e0d025144..ec6ca3103f0 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_rom_device - constructor //------------------------------------------------- -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) : +iq151_rom_device::iq151_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_iq151cart_interface(mconfig, *this), m_rom(nullptr) { diff --git a/src/devices/bus/iq151/rom.h b/src/devices/bus/iq151/rom.h index c9ef60c7a0a..b5dd74d1791 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + iq151_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/isa/aga.cpp b/src/devices/bus/isa/aga.cpp index ce3194ad28f..3073d555090 100644 --- a/src/devices/bus/isa/aga.cpp +++ b/src/devices/bus/isa/aga.cpp @@ -78,7 +78,7 @@ isa8_aga_device::isa8_aga_device(const machine_config &mconfig, std::string tag, { } -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) : +isa8_aga_device::isa8_aga_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_isa8_card_interface(mconfig, *this), m_palette(*this, "palette"), diff --git a/src/devices/bus/isa/aga.h b/src/devices/bus/isa/aga.h index e9a312f4569..8ed6588ea99 100644 --- a/src/devices/bus/isa/aga.h +++ b/src/devices/bus/isa/aga.h @@ -38,7 +38,7 @@ class isa8_aga_device : public: // construction/destruction 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); + isa8_aga_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // device-level overrides virtual void device_start() override; // optional information overrides diff --git a/src/devices/bus/isa/cga.cpp b/src/devices/bus/isa/cga.cpp index ef2ca006d86..53ddc855134 100644 --- a/src/devices/bus/isa/cga.cpp +++ b/src/devices/bus/isa/cga.cpp @@ -320,7 +320,7 @@ isa8_cga_device::isa8_cga_device(const machine_config &mconfig, std::string tag, m_superimpose = false; } -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) : +isa8_cga_device::isa8_cga_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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), @@ -478,7 +478,7 @@ isa8_cga_superimpose_device::isa8_cga_superimpose_device(const machine_config &m m_superimpose = true; } -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_superimpose_device::isa8_cga_superimpose_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : isa8_cga_device( mconfig, type, name, tag, owner, clock, shortname, source) { m_superimpose = true; diff --git a/src/devices/bus/isa/cga.h b/src/devices/bus/isa/cga.h index 7a3adcd15b3..8e2f9c32a62 100644 --- a/src/devices/bus/isa/cga.h +++ b/src/devices/bus/isa/cga.h @@ -27,7 +27,7 @@ class isa8_cga_device : public: // construction/destruction 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); + isa8_cga_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual MC6845_UPDATE_ROW( crtc_update_row ); MC6845_UPDATE_ROW( cga_text_inten_update_row ); @@ -98,7 +98,7 @@ class isa8_cga_superimpose_device : public: // construction/destruction 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); + isa8_cga_superimpose_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); }; // device type definition diff --git a/src/devices/bus/isa/com.cpp b/src/devices/bus/isa/com.cpp index 676fde0c221..eb615b4e9eb 100644 --- a/src/devices/bus/isa/com.cpp +++ b/src/devices/bus/isa/com.cpp @@ -101,7 +101,7 @@ isa8_com_device::isa8_com_device(const machine_config &mconfig, std::string tag, { } -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) : +isa8_com_device::isa8_com_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_isa8_card_interface(mconfig, *this) { diff --git a/src/devices/bus/isa/com.h b/src/devices/bus/isa/com.h index a514a586022..f7945492628 100644 --- a/src/devices/bus/isa/com.h +++ b/src/devices/bus/isa/com.h @@ -22,7 +22,7 @@ class isa8_com_device : public: // construction/destruction 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); + isa8_com_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/isa/ega.cpp b/src/devices/bus/isa/ega.cpp index 59e82fcbb8a..69b268db46d 100644 --- a/src/devices/bus/isa/ega.cpp +++ b/src/devices/bus/isa/ega.cpp @@ -578,7 +578,7 @@ isa8_ega_device::isa8_ega_device(const machine_config &mconfig, std::string tag, { } -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) : +isa8_ega_device::isa8_ega_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 6edb0dba81a..763d15e5e67 100644 --- a/src/devices/bus/isa/ega.h +++ b/src/devices/bus/isa/ega.h @@ -22,7 +22,7 @@ class isa8_ega_device : public: // construction/destruction 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); + isa8_ega_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 4bf1b974227..8178eaf868b 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_isa8_card_interface(mconfig, *this), fdc(*this, "fdc") diff --git a/src/devices/bus/isa/fdc.h b/src/devices/bus/isa/fdc.h index 3a2c85b7d01..41343657da2 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + isa8_fdc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); required_device fdc; diff --git a/src/devices/bus/isa/hdc.cpp b/src/devices/bus/isa/hdc.cpp index 6bf46ee72c0..1c380577ddd 100644 --- a/src/devices/bus/isa/hdc.cpp +++ b/src/devices/bus/isa/hdc.cpp @@ -169,7 +169,7 @@ xt_hdc_device::xt_hdc_device(const machine_config &mconfig, std::string tag, dev m_type = STANDARD; } -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) : +xt_hdc_device::xt_hdc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) @@ -925,7 +925,7 @@ isa8_hdc_device::isa8_hdc_device(const machine_config &mconfig, std::string tag, { } -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) : +isa8_hdc_device::isa8_hdc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_isa8_card_interface(mconfig, *this), m_hdc(*this,"hdc"), dip(0) diff --git a/src/devices/bus/isa/hdc.h b/src/devices/bus/isa/hdc.h index afd8c46e0b8..fb05f823009 100644 --- a/src/devices/bus/isa/hdc.h +++ b/src/devices/bus/isa/hdc.h @@ -32,7 +32,7 @@ class xt_hdc_device : public: // construction/destruction 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); + xt_hdc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } template static devcb_base &set_drq_handler(device_t &device, _Object object) { return downcast(device).m_drq_handler.set_callback(object); } @@ -143,7 +143,7 @@ class isa8_hdc_device : public: // construction/destruction 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); + isa8_hdc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); DECLARE_READ8_MEMBER(pc_hdc_r); DECLARE_WRITE8_MEMBER(pc_hdc_w); diff --git a/src/devices/bus/isa/isa.cpp b/src/devices/bus/isa/isa.cpp index 308d5c487a9..2265b36e1c2 100644 --- a/src/devices/bus/isa/isa.cpp +++ b/src/devices/bus/isa/isa.cpp @@ -31,7 +31,7 @@ isa8_slot_device::isa8_slot_device(const machine_config &mconfig, std::string ta { } -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) : +isa8_slot_device::isa8_slot_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_slot_interface(mconfig, *this), m_owner(nullptr) { @@ -162,7 +162,7 @@ isa8_device::isa8_device(const machine_config &mconfig, std::string tag, device_ m_allocspaces = false; } -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) : +isa8_device::isa8_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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), diff --git a/src/devices/bus/isa/isa.h b/src/devices/bus/isa/isa.h index 5c8ee7a3151..29dbe233aa7 100644 --- a/src/devices/bus/isa/isa.h +++ b/src/devices/bus/isa/isa.h @@ -163,7 +163,7 @@ class isa8_slot_device : public device_t, public: // construction/destruction 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); + isa8_slot_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // device-level overrides virtual void device_start() override; @@ -187,7 +187,7 @@ class isa8_device : public device_t, public: // construction/destruction 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); + isa8_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // inline configuration static void static_set_cputag(device_t &device, std::string tag); static void static_set_custom_spaces(device_t &device); diff --git a/src/devices/bus/isa/mach32.cpp b/src/devices/bus/isa/mach32.cpp index 51054d22fee..69489874b2e 100644 --- a/src/devices/bus/isa/mach32.cpp +++ b/src/devices/bus/isa/mach32.cpp @@ -29,7 +29,7 @@ mach32_8514a_device::mach32_8514a_device(const machine_config &mconfig, std::str { } -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) +mach32_8514a_device::mach32_8514a_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : mach8_device(mconfig, type, name, tag, owner, clock, shortname, source), m_chip_ID(0), m_membounds(0) @@ -44,7 +44,7 @@ mach32_device::mach32_device(const machine_config &mconfig, std::string tag, dev { } -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) +mach32_device::mach32_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : ati_vga_device(mconfig, type, name, tag, owner, clock, shortname, source), m_8514a(*this,"8514a") { @@ -100,7 +100,7 @@ mach64_8514a_device::mach64_8514a_device(const machine_config &mconfig, std::str { } -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) +mach64_8514a_device::mach64_8514a_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : mach32_8514a_device(mconfig, type, name, tag, owner, clock, shortname, source) { } @@ -113,7 +113,7 @@ mach64_device::mach64_device(const machine_config &mconfig, std::string tag, dev { } -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) +mach64_device::mach64_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 52758769a75..7273ec7a125 100644 --- a/src/devices/bus/isa/mach32.h +++ b/src/devices/bus/isa/mach32.h @@ -19,7 +19,7 @@ class mach32_8514a_device : public mach8_device public: // construction/destruction 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); + mach32_8514a_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 @@ -41,7 +41,7 @@ class mach32_device : public ati_vga_device public: // construction/destruction 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); + mach32_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); required_device m_8514a; // provides accelerated 2D drawing, derived from the Mach8 device @@ -138,7 +138,7 @@ class mach64_8514a_device : public mach32_8514a_device public: // construction/destruction 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); + mach64_8514a_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); protected: virtual void device_start() override; @@ -152,7 +152,7 @@ class mach64_device : public mach32_device public: // construction/destruction 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); + mach64_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); required_device m_8514a; // provides accelerated 2D drawing, derived from the Mach8 device diff --git a/src/devices/bus/isa/mda.cpp b/src/devices/bus/isa/mda.cpp index 3cebdb0db0b..37d495aa1ef 100644 --- a/src/devices/bus/isa/mda.cpp +++ b/src/devices/bus/isa/mda.cpp @@ -158,7 +158,7 @@ isa8_mda_device::isa8_mda_device(const machine_config &mconfig, std::string tag, { } -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) : +isa8_mda_device::isa8_mda_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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), diff --git a/src/devices/bus/isa/mda.h b/src/devices/bus/isa/mda.h index dc0edb10927..16b13da6831 100644 --- a/src/devices/bus/isa/mda.h +++ b/src/devices/bus/isa/mda.h @@ -23,7 +23,7 @@ public: // construction/destruction 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); + isa8_mda_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/isa/pgc.cpp b/src/devices/bus/isa/pgc.cpp index 2c7484f584d..e9ed56bd7db 100644 --- a/src/devices/bus/isa/pgc.cpp +++ b/src/devices/bus/isa/pgc.cpp @@ -212,7 +212,7 @@ isa8_pgc_device::isa8_pgc_device(const machine_config &mconfig, std::string tag, { } -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) : +isa8_pgc_device::isa8_pgc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 d86084ec61c..81537841f19 100644 --- a/src/devices/bus/isa/pgc.h +++ b/src/devices/bus/isa/pgc.h @@ -24,7 +24,7 @@ class isa8_pgc_device : public: // construction/destruction 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); + isa8_pgc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 2d3950e678c..f0befece7ea 100644 --- a/src/devices/bus/isa/s3virge.cpp +++ b/src/devices/bus/isa/s3virge.cpp @@ -25,7 +25,7 @@ s3virge_vga_device::s3virge_vga_device(const machine_config &mconfig, std::strin { } -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) +s3virge_vga_device::s3virge_vga_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : s3_vga_device(mconfig, type, name, tag, owner, clock, shortname, source) { } @@ -35,7 +35,7 @@ s3virgedx_vga_device::s3virgedx_vga_device(const machine_config &mconfig, std::s { } -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) +s3virgedx_vga_device::s3virgedx_vga_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : s3virge_vga_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/bus/isa/s3virge.h b/src/devices/bus/isa/s3virge.h index 4a7bad4b8c2..8d04b6720e5 100644 --- a/src/devices/bus/isa/s3virge.h +++ b/src/devices/bus/isa/s3virge.h @@ -20,7 +20,7 @@ class s3virge_vga_device : public s3_vga_device public: // construction/destruction 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); + s3virge_vga_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual READ8_MEMBER(port_03b0_r) override; virtual WRITE8_MEMBER(port_03b0_w) override; @@ -52,7 +52,7 @@ class s3virgedx_vga_device : public s3virge_vga_device public: // construction/destruction 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); + s3virgedx_vga_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); protected: // device-level overrides diff --git a/src/devices/bus/isa/sblaster.cpp b/src/devices/bus/isa/sblaster.cpp index f416f10e4a4..14374e3114e 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, std::string 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, std::string shortname, std::string 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, std::strin { } -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) : +sb8_device::sb8_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, std::string shortname, std::string 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, std::string 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, std::string shortname, std::string source) : sb_device(mconfig, type, tag, owner, clock, name, shortname, source), device_isa16_card_interface(mconfig, *this) { diff --git a/src/devices/bus/isa/sblaster.h b/src/devices/bus/isa/sblaster.h index 01c3921244b..b9c95b9b751 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, std::string 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, std::string shortname, std::string source); required_device m_dacl; required_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, std::string 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, std::string shortname, std::string source); DECLARE_READ8_MEMBER(ym3812_16_r); DECLARE_WRITE8_MEMBER(ym3812_16_w); @@ -212,7 +212,7 @@ class sb16_device : public sb_device, { public: // construction/destruction - 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); + sb16_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, std::string shortname, std::string source); DECLARE_READ8_MEMBER(mpu401_r); DECLARE_WRITE8_MEMBER(mpu401_w); DECLARE_READ8_MEMBER(mixer_r); diff --git a/src/devices/bus/kc/d004.cpp b/src/devices/bus/kc/d004.cpp index 661f7a56359..6bb9a8f7908 100644 --- a/src/devices/bus/kc/d004.cpp +++ b/src/devices/bus/kc/d004.cpp @@ -141,7 +141,7 @@ kc_d004_device::kc_d004_device(const machine_config &mconfig, std::string tag, d { } -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) +kc_d004_device::kc_d004_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_kcexp_interface( mconfig, *this ), m_cpu(*this, Z80_TAG), diff --git a/src/devices/bus/kc/d004.h b/src/devices/bus/kc/d004.h index 4ce9ad0d15f..8cb26b801bd 100644 --- a/src/devices/bus/kc/d004.h +++ b/src/devices/bus/kc/d004.h @@ -27,7 +27,7 @@ class kc_d004_device : public: // construction/destruction 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); + kc_d004_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // 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 c58179df7c9..9216196d75f 100644 --- a/src/devices/bus/kc/kc.cpp +++ b/src/devices/bus/kc/kc.cpp @@ -162,7 +162,7 @@ kcexp_slot_device::kcexp_slot_device(const machine_config &mconfig, std::string { } -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) : +kcexp_slot_device::kcexp_slot_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_slot_interface(mconfig, *this), m_out_irq_cb(*this), diff --git a/src/devices/bus/kc/kc.h b/src/devices/bus/kc/kc.h index 9b3d5bf489c..13a6cefcc6f 100644 --- a/src/devices/bus/kc/kc.h +++ b/src/devices/bus/kc/kc.h @@ -43,7 +43,7 @@ class kcexp_slot_device : public device_t, public: // construction/destruction 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); + kcexp_slot_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual ~kcexp_slot_device(); template static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast(device).m_out_irq_cb.set_callback(object); } diff --git a/src/devices/bus/kc/ram.cpp b/src/devices/bus/kc/ram.cpp index 50f50be3efe..8484c144719 100644 --- a/src/devices/bus/kc/ram.cpp +++ b/src/devices/bus/kc/ram.cpp @@ -48,7 +48,7 @@ kc_m011_device::kc_m011_device(const machine_config &mconfig, std::string tag, d { } -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) +kc_m011_device::kc_m011_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) { diff --git a/src/devices/bus/kc/ram.h b/src/devices/bus/kc/ram.h index 83fbd778f35..5e0af5ba4a2 100644 --- a/src/devices/bus/kc/ram.h +++ b/src/devices/bus/kc/ram.h @@ -21,7 +21,7 @@ class kc_m011_device : public: // construction/destruction 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); + kc_m011_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); protected: // device-level overrides diff --git a/src/devices/bus/kc/rom.cpp b/src/devices/bus/kc/rom.cpp index ec78ec3f198..ea872af6d43 100644 --- a/src/devices/bus/kc/rom.cpp +++ b/src/devices/bus/kc/rom.cpp @@ -48,7 +48,7 @@ kc_8k_device::kc_8k_device(const machine_config &mconfig, std::string tag, devic { } -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) +kc_8k_device::kc_8k_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) { diff --git a/src/devices/bus/kc/rom.h b/src/devices/bus/kc/rom.h index 48ae2763f96..f95760045d6 100644 --- a/src/devices/bus/kc/rom.h +++ b/src/devices/bus/kc/rom.h @@ -21,7 +21,7 @@ class kc_8k_device : public: // construction/destruction 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); + kc_8k_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // optional information overrides diff --git a/src/devices/bus/lpci/northbridge.cpp b/src/devices/bus/lpci/northbridge.cpp index c159ba8b313..e1842beaf4b 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +northbridge_device::northbridge_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 2f76be6d457..d7ce782a053 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + northbridge_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); protected: // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/lpci/southbridge.cpp b/src/devices/bus/lpci/southbridge.cpp index 47d6d5ef32e..71928f12d4c 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +southbridge_device::southbridge_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 8d798723dc3..aa34801657e 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + southbridge_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/macpds/macpds.cpp b/src/devices/bus/macpds/macpds.cpp index 95dcb55c249..d799e73f088 100644 --- a/src/devices/bus/macpds/macpds.cpp +++ b/src/devices/bus/macpds/macpds.cpp @@ -32,7 +32,7 @@ macpds_slot_device::macpds_slot_device(const machine_config &mconfig, std::strin { } -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) : +macpds_slot_device::macpds_slot_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_slot_interface(mconfig, *this) { @@ -81,7 +81,7 @@ macpds_device::macpds_device(const machine_config &mconfig, std::string tag, dev { } -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) : +macpds_device::macpds_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr) { } diff --git a/src/devices/bus/macpds/macpds.h b/src/devices/bus/macpds/macpds.h index 084958930e9..62877a4eab8 100644 --- a/src/devices/bus/macpds/macpds.h +++ b/src/devices/bus/macpds/macpds.h @@ -52,7 +52,7 @@ class macpds_slot_device : public device_t, public: // construction/destruction 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); + macpds_slot_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // device-level overrides virtual void device_start() override; @@ -77,7 +77,7 @@ class macpds_device : public device_t public: // construction/destruction 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); + macpds_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // inline configuration static void static_set_cputag(device_t &device, std::string tag); diff --git a/src/devices/bus/macpds/pds_tpdfpd.cpp b/src/devices/bus/macpds/pds_tpdfpd.cpp index 56747e6ec07..57b47bb31ce 100644 --- a/src/devices/bus/macpds/pds_tpdfpd.cpp +++ b/src/devices/bus/macpds/pds_tpdfpd.cpp @@ -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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 88f0d5bb12f..46d5e5a8456 100644 --- a/src/devices/bus/macpds/pds_tpdfpd.h +++ b/src/devices/bus/macpds/pds_tpdfpd.h @@ -22,7 +22,7 @@ class macpds_sedisplay_device : public: // construction/destruction 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); + macpds_sedisplay_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 3eb3833855f..12921edf0ad 100644 --- a/src/devices/bus/megadrive/eeprom.cpp +++ b/src/devices/bus/megadrive/eeprom.cpp @@ -60,7 +60,7 @@ const device_type MD_EEPROM_NHLPA = &device_creator; const device_type MD_EEPROM_BLARA = &device_creator; -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) +md_std_eeprom_device::md_std_eeprom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) diff --git a/src/devices/bus/megadrive/eeprom.h b/src/devices/bus/megadrive/eeprom.h index e53e33302d7..d9617df6f42 100644 --- a/src/devices/bus/megadrive/eeprom.h +++ b/src/devices/bus/megadrive/eeprom.h @@ -18,7 +18,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + md_std_eeprom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); md_std_eeprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/megadrive/jcart.cpp b/src/devices/bus/megadrive/jcart.cpp index 07631117e53..f2871de5557 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; // Sampras, Super Skidmarks? -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) +md_jcart_device::md_jcart_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_md_cart_interface( mconfig, *this ), m_jcart3(*this, "JCART3"), @@ -57,7 +57,7 @@ md_jcart_device::md_jcart_device(const machine_config &mconfig, std::string 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : md_jcart_device(mconfig, type, name, tag, owner, clock, shortname, source), m_i2cmem(*this, "i2cmem"), m_i2c_mem(0), m_i2c_clk(0) { diff --git a/src/devices/bus/megadrive/jcart.h b/src/devices/bus/megadrive/jcart.h index ca246306082..0338a19a164 100644 --- a/src/devices/bus/megadrive/jcart.h +++ b/src/devices/bus/megadrive/jcart.h @@ -18,7 +18,7 @@ class md_jcart_device : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); md_jcart_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides @@ -43,7 +43,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + md_seprom_codemast_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); md_seprom_codemast_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/megadrive/md_slot.cpp b/src/devices/bus/megadrive/md_slot.cpp index d9f1a736b3b..f259e53ce2f 100644 --- a/src/devices/bus/megadrive/md_slot.cpp +++ b/src/devices/bus/megadrive/md_slot.cpp @@ -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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), diff --git a/src/devices/bus/megadrive/md_slot.h b/src/devices/bus/megadrive/md_slot.h index 08a05965d06..abca8a186af 100644 --- a/src/devices/bus/megadrive/md_slot.h +++ b/src/devices/bus/megadrive/md_slot.h @@ -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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + base_md_cart_slot_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual ~base_md_cart_slot_device(); // device-level overrides diff --git a/src/devices/bus/megadrive/rom.cpp b/src/devices/bus/megadrive/rom.cpp index 0e4367201eb..7a23fe3c018 100644 --- a/src/devices/bus/megadrive/rom.cpp +++ b/src/devices/bus/megadrive/rom.cpp @@ -63,7 +63,7 @@ const device_type MD_ROM_BEGGARP = &device_creator; const device_type MD_ROM_WUKONG = &device_creator; -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) +md_std_rom_device::md_std_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_md_cart_interface( mconfig, *this ) { diff --git a/src/devices/bus/megadrive/rom.h b/src/devices/bus/megadrive/rom.h index f763977ecea..49a7967af87 100644 --- a/src/devices/bus/megadrive/rom.h +++ b/src/devices/bus/megadrive/rom.h @@ -16,7 +16,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + md_std_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); md_std_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/megadrive/sk.cpp b/src/devices/bus/megadrive/sk.cpp index 0d05b71564c..523b5eff3f5 100644 --- a/src/devices/bus/megadrive/sk.cpp +++ b/src/devices/bus/megadrive/sk.cpp @@ -27,7 +27,7 @@ const device_type MD_ROM_SK = &device_creator; -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) +md_rom_sk_device::md_rom_sk_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), 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 5d853d2af70..0510d0ae8d5 100644 --- a/src/devices/bus/megadrive/sk.h +++ b/src/devices/bus/megadrive/sk.h @@ -13,7 +13,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + md_rom_sk_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); md_rom_sk_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/megadrive/stm95.cpp b/src/devices/bus/megadrive/stm95.cpp index b5c6b28a553..63ec3dba9b7 100644 --- a/src/devices/bus/megadrive/stm95.cpp +++ b/src/devices/bus/megadrive/stm95.cpp @@ -175,7 +175,7 @@ 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(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::md_eeprom_stm95_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), 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 46e1b708580..f0909a1eeef 100644 --- a/src/devices/bus/megadrive/stm95.h +++ b/src/devices/bus/megadrive/stm95.h @@ -60,7 +60,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + md_eeprom_stm95_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); md_eeprom_stm95_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/megadrive/svp.cpp b/src/devices/bus/megadrive/svp.cpp index 1c37bc6ab92..62dc784bb26 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(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::md_rom_svp_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), 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 49ebeffb6e2..90f7bb809dd 100644 --- a/src/devices/bus/megadrive/svp.h +++ b/src/devices/bus/megadrive/svp.h @@ -17,7 +17,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + md_rom_svp_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); md_rom_svp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); //protected: diff --git a/src/devices/bus/msx_cart/disk.cpp b/src/devices/bus/msx_cart/disk.cpp index f2582e0ab86..70c0a667317 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname) +msx_cart_disk::msx_cart_disk(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname) : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__) , msx_cart_interface(mconfig, *this) , m_floppy0(*this, "fdc:0") @@ -132,21 +132,21 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname) +msx_cart_disk_wd::msx_cart_disk_wd(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname) +msx_cart_disk_type1::msx_cart_disk_type1(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname) +msx_cart_disk_type2::msx_cart_disk_type2(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname) : msx_cart_disk_wd(mconfig, type, name, tag, owner, clock, shortname) , m_control(0) { @@ -171,7 +171,7 @@ msx_cart_fscf351::msx_cart_fscf351(const machine_config &mconfig, std::string ta } -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_tc8566::msx_cart_disk_tc8566(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname) : msx_cart_disk(mconfig, type, name, tag, owner, clock, shortname) , m_fdc(*this, "fdc") { diff --git a/src/devices/bus/msx_cart/disk.h b/src/devices/bus/msx_cart/disk.h index 75235aba64e..daab8b006d8 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname); + msx_cart_disk(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname); + msx_cart_disk_wd(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname); protected: required_device 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname); + msx_cart_disk_type1(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname); + msx_cart_disk_type2(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname); // device-level overrides virtual void device_start() 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname); + msx_cart_disk_tc8566(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname); protected: required_device m_fdc; diff --git a/src/devices/bus/msx_cart/konami.cpp b/src/devices/bus/msx_cart/konami.cpp index fec0da58707..d941b3600cc 100644 --- a/src/devices/bus/msx_cart/konami.cpp +++ b/src/devices/bus/msx_cart/konami.cpp @@ -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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) , msx_cart_interface(mconfig, *this) , m_k052539(*this, "k052539") diff --git a/src/devices/bus/msx_cart/konami.h b/src/devices/bus/msx_cart/konami.h index da446c12922..0e5f1a0ed3c 100644 --- a/src/devices/bus/msx_cart/konami.h +++ b/src/devices/bus/msx_cart/konami.h @@ -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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + msx_cart_konami_sound(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/msx_slot/cartridge.cpp b/src/devices/bus/msx_slot/cartridge.cpp index 910ca3c2abb..8fb2bf15ead 100644 --- a/src/devices/bus/msx_slot/cartridge.cpp +++ b/src/devices/bus/msx_slot/cartridge.cpp @@ -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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) , device_image_interface(mconfig, *this) , device_slot_interface(mconfig, *this) diff --git a/src/devices/bus/msx_slot/cartridge.h b/src/devices/bus/msx_slot/cartridge.h index 2a2ae297701..cca1b35b405 100644 --- a/src/devices/bus/msx_slot/cartridge.h +++ b/src/devices/bus/msx_slot/cartridge.h @@ -30,7 +30,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + msx_slot_cartridge_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); msx_slot_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // static configuration helpers diff --git a/src/devices/bus/msx_slot/disk.cpp b/src/devices/bus/msx_slot/disk.cpp index 88bd2747edf..8d939a251fb 100644 --- a/src/devices/bus/msx_slot/disk.cpp +++ b/src/devices/bus/msx_slot/disk.cpp @@ -43,7 +43,7 @@ const device_type MSX_SLOT_DISK5 = &device_creator; const device_type MSX_SLOT_DISK6 = &device_creator; -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_disk_device::msx_slot_disk_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : msx_slot_rom_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_floppy0(nullptr) , m_floppy1(nullptr) @@ -75,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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : msx_slot_disk_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_fdc(nullptr) { @@ -95,7 +95,7 @@ void msx_slot_wd_disk_device::device_start() } -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_tc8566_disk_device::msx_slot_tc8566_disk_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : msx_slot_disk_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_fdc(nullptr) { diff --git a/src/devices/bus/msx_slot/disk.h b/src/devices/bus/msx_slot/disk.h index 701cf423a7e..bcfb56f3d71 100644 --- a/src/devices/bus/msx_slot/disk.h +++ b/src/devices/bus/msx_slot/disk.h @@ -73,7 +73,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + msx_slot_disk_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual void device_start() override; @@ -102,7 +102,7 @@ protected: 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + msx_slot_wd_disk_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + msx_slot_tc8566_disk_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual void device_start() override; diff --git a/src/devices/bus/msx_slot/rom.cpp b/src/devices/bus/msx_slot/rom.cpp index 394f893ea12..da7b196976a 100644 --- a/src/devices/bus/msx_slot/rom.cpp +++ b/src/devices/bus/msx_slot/rom.cpp @@ -17,7 +17,7 @@ msx_slot_rom_device::msx_slot_rom_device(const machine_config &mconfig, std::str } -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) +msx_slot_rom_device::msx_slot_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) , msx_internal_slot_interface() , m_region(nullptr) diff --git a/src/devices/bus/msx_slot/rom.h b/src/devices/bus/msx_slot/rom.h index 2cb63b8c31e..2f4efd61007 100644 --- a/src/devices/bus/msx_slot/rom.h +++ b/src/devices/bus/msx_slot/rom.h @@ -13,7 +13,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + msx_slot_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); msx_slot_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // static configuration helpers diff --git a/src/devices/bus/nasbus/nasbus.cpp b/src/devices/bus/nasbus/nasbus.cpp index 00bf06b9f2e..107cf2be74d 100644 --- a/src/devices/bus/nasbus/nasbus.cpp +++ b/src/devices/bus/nasbus/nasbus.cpp @@ -27,8 +27,8 @@ nasbus_slot_device::nasbus_slot_device(const machine_config &mconfig, std::strin { } -nasbus_slot_device::nasbus_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) : +nasbus_slot_device::nasbus_slot_device(const machine_config &mconfig, device_type type, std::string name, + std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_slot_interface(mconfig, *this) { diff --git a/src/devices/bus/nasbus/nasbus.h b/src/devices/bus/nasbus/nasbus.h index 0f4b8690f4b..093a3c9614e 100644 --- a/src/devices/bus/nasbus/nasbus.h +++ b/src/devices/bus/nasbus/nasbus.h @@ -132,8 +132,8 @@ class nasbus_slot_device : public device_t, public device_slot_interface public: // construction/destruction 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, - std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nasbus_slot_device(const machine_config &mconfig, device_type type, std::string name, + std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/neogeo/bootleg_cart.cpp b/src/devices/bus/neogeo/bootleg_cart.cpp index 821bb040442..0039e400fb9 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(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::neogeo_bootleg_cart(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT16 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_neogeo_cart_interface(mconfig, *this), m_banked_cart(*this, "banked_cart"), diff --git a/src/devices/bus/neogeo/bootleg_cart.h b/src/devices/bus/neogeo/bootleg_cart.h index 1d3fc516f0a..b3b0c465671 100644 --- a/src/devices/bus/neogeo/bootleg_cart.h +++ b/src/devices/bus/neogeo/bootleg_cart.h @@ -16,7 +16,7 @@ class neogeo_bootleg_cart : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT16 clock, std::string shortname, std::string source); neogeo_bootleg_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock); // device-level overrides diff --git a/src/devices/bus/neogeo/bootleg_hybrid_cart.cpp b/src/devices/bus/neogeo/bootleg_hybrid_cart.cpp index 47c07aa5256..0e5581ef653 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(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::neogeo_bootleg_hybrid_hybrid_cart(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT16 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_neogeo_cart_interface(mconfig, *this), m_banked_cart(*this, "banked_cart"), diff --git a/src/devices/bus/neogeo/bootleg_hybrid_cart.h b/src/devices/bus/neogeo/bootleg_hybrid_cart.h index 317e5bb9483..33cceebb73d 100644 --- a/src/devices/bus/neogeo/bootleg_hybrid_cart.h +++ b/src/devices/bus/neogeo/bootleg_hybrid_cart.h @@ -18,7 +18,7 @@ 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, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source); + neogeo_bootleg_hybrid_hybrid_cart(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT16 clock, std::string shortname, std::string source); neogeo_bootleg_hybrid_hybrid_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock); // device-level overrides diff --git a/src/devices/bus/neogeo/cmc_cart.cpp b/src/devices/bus/neogeo/cmc_cart.cpp index dec68562854..b3a3723020f 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(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::neogeo_cmc_cart(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT16 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_neogeo_cart_interface(mconfig, *this), m_banked_cart(*this, "banked_cart"), diff --git a/src/devices/bus/neogeo/cmc_cart.h b/src/devices/bus/neogeo/cmc_cart.h index e8f64927f7c..08af6581801 100644 --- a/src/devices/bus/neogeo/cmc_cart.h +++ b/src/devices/bus/neogeo/cmc_cart.h @@ -15,7 +15,7 @@ class neogeo_cmc_cart : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT16 clock, std::string shortname, std::string source); neogeo_cmc_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock); // device-level overrides diff --git a/src/devices/bus/neogeo/fatfury2_cart.cpp b/src/devices/bus/neogeo/fatfury2_cart.cpp index 3b8db9ac52e..7f3c3f612d0 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(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::neogeo_fatfury2_cart(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT16 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), 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 743d5e5d74a..ad651b57636 100644 --- a/src/devices/bus/neogeo/fatfury2_cart.h +++ b/src/devices/bus/neogeo/fatfury2_cart.h @@ -14,7 +14,7 @@ class neogeo_fatfury2_cart : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT16 clock, std::string shortname, std::string source); neogeo_fatfury2_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock); // device-level overrides diff --git a/src/devices/bus/neogeo/kof2002_cart.cpp b/src/devices/bus/neogeo/kof2002_cart.cpp index 0a90f4d2317..6321c4f6aec 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(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::neogeo_kof2002_cart(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT16 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_neogeo_cart_interface(mconfig, *this), m_banked_cart(*this, "banked_cart"), diff --git a/src/devices/bus/neogeo/kof2002_cart.h b/src/devices/bus/neogeo/kof2002_cart.h index 79ae36d9472..22be6ae2ba3 100644 --- a/src/devices/bus/neogeo/kof2002_cart.h +++ b/src/devices/bus/neogeo/kof2002_cart.h @@ -16,7 +16,7 @@ class neogeo_kof2002_cart : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT16 clock, std::string shortname, std::string source); neogeo_kof2002_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock); // device-level overrides diff --git a/src/devices/bus/neogeo/kof98_cart.cpp b/src/devices/bus/neogeo/kof98_cart.cpp index 5f049cad334..a303c96e781 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(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::neogeo_kof98_cart(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT16 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), 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 ae9f469f961..d7836e2e6c8 100644 --- a/src/devices/bus/neogeo/kof98_cart.h +++ b/src/devices/bus/neogeo/kof98_cart.h @@ -14,7 +14,7 @@ class neogeo_kof98_cart : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT16 clock, std::string shortname, std::string source); neogeo_kof98_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock); // device-level overrides diff --git a/src/devices/bus/neogeo/mslugx_cart.cpp b/src/devices/bus/neogeo/mslugx_cart.cpp index ee1d5a2f060..fe5c4afa1d8 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(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::neogeo_mslugx_cart(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT16 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), 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 3892d0d3337..efaf9f10ba6 100644 --- a/src/devices/bus/neogeo/mslugx_cart.h +++ b/src/devices/bus/neogeo/mslugx_cart.h @@ -14,7 +14,7 @@ class neogeo_mslugx_cart : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT16 clock, std::string shortname, std::string source); neogeo_mslugx_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock); // device-level overrides diff --git a/src/devices/bus/neogeo/pcm2_cart.cpp b/src/devices/bus/neogeo/pcm2_cart.cpp index 2ec389c5bf6..4a6f46d2ad7 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(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::neogeo_pcm2_cart(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT16 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_neogeo_cart_interface(mconfig, *this), m_banked_cart(*this, "banked_cart"), diff --git a/src/devices/bus/neogeo/pcm2_cart.h b/src/devices/bus/neogeo/pcm2_cart.h index c176337312b..8141b0a5edc 100644 --- a/src/devices/bus/neogeo/pcm2_cart.h +++ b/src/devices/bus/neogeo/pcm2_cart.h @@ -15,7 +15,7 @@ class neogeo_pcm2_cart : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT16 clock, std::string shortname, std::string source); neogeo_pcm2_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock); // device-level overrides diff --git a/src/devices/bus/neogeo/pvc_cart.cpp b/src/devices/bus/neogeo/pvc_cart.cpp index 7e8d1a7da20..247d0d5637f 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(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::neogeo_pvc_cart(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT16 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_neogeo_cart_interface(mconfig, *this), m_banked_cart(*this, "banked_cart"), diff --git a/src/devices/bus/neogeo/pvc_cart.h b/src/devices/bus/neogeo/pvc_cart.h index 19a67dcd6fc..ba38fe5caf5 100644 --- a/src/devices/bus/neogeo/pvc_cart.h +++ b/src/devices/bus/neogeo/pvc_cart.h @@ -16,7 +16,7 @@ class neogeo_pvc_cart : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT16 clock, std::string shortname, std::string source); neogeo_pvc_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock); // device-level overrides diff --git a/src/devices/bus/neogeo/rom.cpp b/src/devices/bus/neogeo/rom.cpp index 92b01920a03..47a3720e02d 100644 --- a/src/devices/bus/neogeo/rom.cpp +++ b/src/devices/bus/neogeo/rom.cpp @@ -18,7 +18,7 @@ const device_type NEOGEO_ROM = &device_creator; -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) +neogeo_rom_device::neogeo_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT16 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), 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 4da90a1a2a3..dc97d325c31 100644 --- a/src/devices/bus/neogeo/rom.h +++ b/src/devices/bus/neogeo/rom.h @@ -13,7 +13,7 @@ class neogeo_rom_device : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT16 clock, std::string shortname, std::string source); neogeo_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock); // device-level overrides diff --git a/src/devices/bus/neogeo/sma_cart.cpp b/src/devices/bus/neogeo/sma_cart.cpp index 727918659f3..d6c18a401d6 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(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::neogeo_sma_cart(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT16 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_neogeo_cart_interface(mconfig, *this), m_banked_cart(*this, "banked_cart"), diff --git a/src/devices/bus/neogeo/sma_cart.h b/src/devices/bus/neogeo/sma_cart.h index b3e7445ced6..2505dc194f2 100644 --- a/src/devices/bus/neogeo/sma_cart.h +++ b/src/devices/bus/neogeo/sma_cart.h @@ -15,7 +15,7 @@ class neogeo_sma_cart : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT16 clock, std::string shortname, std::string source); neogeo_sma_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock); // device-level overrides diff --git a/src/devices/bus/nes/aladdin.cpp b/src/devices/bus/nes/aladdin.cpp index 1bffd08447f..1eb07cfd400 100644 --- a/src/devices/bus/nes/aladdin.cpp +++ b/src/devices/bus/nes/aladdin.cpp @@ -183,7 +183,7 @@ ROM_END const device_type NES_ALGN_ROM = &device_creator; const device_type NES_ALGQ_ROM = &device_creator; -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) +nes_algn_rom_device::nes_algn_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), aladdin_cart_interface( mconfig, *this ) { diff --git a/src/devices/bus/nes/aladdin.h b/src/devices/bus/nes/aladdin.h index f739ca789f8..10cbf097873 100644 --- a/src/devices/bus/nes/aladdin.h +++ b/src/devices/bus/nes/aladdin.h @@ -95,7 +95,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_algn_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); nes_algn_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides diff --git a/src/devices/bus/nes/bandai.cpp b/src/devices/bus/nes/bandai.cpp index 49bad5e3912..1ae319e2ddb 100644 --- a/src/devices/bus/nes/bandai.cpp +++ b/src/devices/bus/nes/bandai.cpp @@ -63,7 +63,7 @@ nes_oekakids_device::nes_oekakids_device(const machine_config &mconfig, std::str { } -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_fcg_device::nes_fcg_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) { } @@ -73,7 +73,7 @@ nes_fcg_device::nes_fcg_device(const machine_config &mconfig, std::string tag, d { } -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_lz93d50_device::nes_lz93d50_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : nes_fcg_device(mconfig, type, name, tag, owner, clock, shortname, source) { } @@ -83,7 +83,7 @@ nes_lz93d50_device::nes_lz93d50_device(const machine_config &mconfig, std::strin { } -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_24c01_device::nes_lz93d50_24c01_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : nes_lz93d50_device(mconfig, type, name, tag, owner, clock, shortname, source), m_i2cmem(*this, "i2cmem"), m_i2c_dir(0) { diff --git a/src/devices/bus/nes/bandai.h b/src/devices/bus/nes/bandai.h index 32d79444407..a3999b9d087 100644 --- a/src/devices/bus/nes/bandai.h +++ b/src/devices/bus/nes/bandai.h @@ -38,7 +38,7 @@ class nes_fcg_device : public nes_nrom_device { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); nes_fcg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides @@ -64,7 +64,7 @@ class nes_lz93d50_device : public nes_fcg_device { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); nes_lz93d50_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides @@ -78,7 +78,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_lz93d50_24c01_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); nes_lz93d50_24c01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/nes/cony.cpp b/src/devices/bus/nes/cony.cpp index 3499eed1bf3..b791c54cbfe 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; const device_type NES_YOKO = &device_creator; -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_cony_device::nes_cony_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_irq_count(0), m_irq_enable(0), diff --git a/src/devices/bus/nes/cony.h b/src/devices/bus/nes/cony.h index ec5200b7c86..7edf263911a 100644 --- a/src/devices/bus/nes/cony.h +++ b/src/devices/bus/nes/cony.h @@ -12,7 +12,7 @@ class nes_cony_device : public nes_nrom_device { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); nes_cony_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/nes/datach.cpp b/src/devices/bus/nes/datach.cpp index 59bd8381d88..0fc213d8478 100644 --- a/src/devices/bus/nes/datach.cpp +++ b/src/devices/bus/nes/datach.cpp @@ -168,7 +168,7 @@ ROM_END const device_type NES_DATACH_ROM = &device_creator; const device_type NES_DATACH_24C01 = &device_creator; -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) +nes_datach_rom_device::nes_datach_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), datach_cart_interface( mconfig, *this ) { diff --git a/src/devices/bus/nes/datach.h b/src/devices/bus/nes/datach.h index 662e4ff9c70..e183cf2a9b1 100644 --- a/src/devices/bus/nes/datach.h +++ b/src/devices/bus/nes/datach.h @@ -97,7 +97,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_datach_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); nes_datach_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides diff --git a/src/devices/bus/nes/jaleco.cpp b/src/devices/bus/nes/jaleco.cpp index c0aca2d3054..bc223216086 100644 --- a/src/devices/bus/nes/jaleco.cpp +++ b/src/devices/bus/nes/jaleco.cpp @@ -67,7 +67,7 @@ nes_jf16_device::nes_jf16_device(const machine_config &mconfig, std::string tag, { } -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_jf17_device::nes_jf17_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_latch(0) { } @@ -83,7 +83,7 @@ nes_jf17_adpcm_device::nes_jf17_adpcm_device(const machine_config &mconfig, std: { } -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_jf19_device::nes_jf19_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source) { } @@ -99,7 +99,7 @@ nes_jf19_adpcm_device::nes_jf19_adpcm_device(const machine_config &mconfig, std: { } -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_ss88006_device::nes_ss88006_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) { } @@ -109,7 +109,7 @@ nes_ss88006_device::nes_ss88006_device(const machine_config &mconfig, std::strin { } -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_adpcm_device::nes_ss88006_adpcm_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : nes_ss88006_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/bus/nes/jaleco.h b/src/devices/bus/nes/jaleco.h index b5562c69b32..f7b35023dc3 100644 --- a/src/devices/bus/nes/jaleco.h +++ b/src/devices/bus/nes/jaleco.h @@ -65,7 +65,7 @@ class nes_jf17_device : public nes_nrom_device { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); nes_jf17_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides @@ -101,7 +101,7 @@ class nes_jf19_device : public nes_nrom_device { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); nes_jf19_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides @@ -134,7 +134,7 @@ class nes_ss88006_device : public nes_nrom_device { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); nes_ss88006_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides @@ -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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_ss88006_adpcm_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // device-level overrides void ss88006_adpcm_write(address_space &space, offs_t offset, UINT8 data, samples_device *dev); diff --git a/src/devices/bus/nes/jy.cpp b/src/devices/bus/nes/jy.cpp index 970fa0e1bb7..4808984eb73 100644 --- a/src/devices/bus/nes/jy.cpp +++ b/src/devices/bus/nes/jy.cpp @@ -42,7 +42,7 @@ const device_type NES_JY_TYPEB = &device_creator; const device_type NES_JY_TYPEC = &device_creator; -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_jy_typea_device::nes_jy_typea_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) { @@ -55,7 +55,7 @@ nes_jy_typea_device::nes_jy_typea_device(const machine_config &mconfig, std::str { } -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_typeb_device::nes_jy_typeb_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : nes_jy_typea_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/bus/nes/jy.h b/src/devices/bus/nes/jy.h index e2a57b10b25..7485c0e5ba0 100644 --- a/src/devices/bus/nes/jy.h +++ b/src/devices/bus/nes/jy.h @@ -12,7 +12,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_jy_typea_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); nes_jy_typea_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides @@ -69,7 +69,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_jy_typeb_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); nes_jy_typeb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: diff --git a/src/devices/bus/nes/kaiser.cpp b/src/devices/bus/nes/kaiser.cpp index c4ae6b11496..9b4701f3be0 100644 --- a/src/devices/bus/nes/kaiser.cpp +++ b/src/devices/bus/nes/kaiser.cpp @@ -67,7 +67,7 @@ nes_ks7022_device::nes_ks7022_device(const machine_config &mconfig, std::string { } -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_ks7032_device::nes_ks7032_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) { } diff --git a/src/devices/bus/nes/kaiser.h b/src/devices/bus/nes/kaiser.h index 24ead7da934..4f614e4920a 100644 --- a/src/devices/bus/nes/kaiser.h +++ b/src/devices/bus/nes/kaiser.h @@ -48,7 +48,7 @@ class nes_ks7032_device : public nes_nrom_device { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); nes_ks7032_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/nes/konami.cpp b/src/devices/bus/nes/konami.cpp index e0935bb89fd..174d479dc61 100644 --- a/src/devices/bus/nes/konami.cpp +++ b/src/devices/bus/nes/konami.cpp @@ -66,7 +66,7 @@ nes_konami_vrc3_device::nes_konami_vrc3_device(const machine_config &mconfig, st { } -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_konami_vrc4_device::nes_konami_vrc4_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) { } diff --git a/src/devices/bus/nes/konami.h b/src/devices/bus/nes/konami.h index c36fdb1b973..cb5660ff6dd 100644 --- a/src/devices/bus/nes/konami.h +++ b/src/devices/bus/nes/konami.h @@ -80,7 +80,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_konami_vrc4_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); nes_konami_vrc4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/nes/legacy.cpp b/src/devices/bus/nes/legacy.cpp index 1a665cfda17..8f85ac556b0 100644 --- a/src/devices/bus/nes/legacy.cpp +++ b/src/devices/bus/nes/legacy.cpp @@ -44,7 +44,7 @@ nes_ffe3_device::nes_ffe3_device(const machine_config &mconfig, std::string tag, { } -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_ffe4_device::nes_ffe4_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) { } diff --git a/src/devices/bus/nes/legacy.h b/src/devices/bus/nes/legacy.h index becc035d09a..503212e8d59 100644 --- a/src/devices/bus/nes/legacy.h +++ b/src/devices/bus/nes/legacy.h @@ -28,7 +28,7 @@ class nes_ffe4_device : public nes_nrom_device { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); nes_ffe4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/nes/mmc1.cpp b/src/devices/bus/nes/mmc1.cpp index bdf5279c475..9a9c0ef764b 100644 --- a/src/devices/bus/nes/mmc1.cpp +++ b/src/devices/bus/nes/mmc1.cpp @@ -39,7 +39,7 @@ const device_type NES_SOROM_A = &device_creator; -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_sxrom_device::nes_sxrom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_reg_write_enable(0), m_latch(0), m_count(0) { } diff --git a/src/devices/bus/nes/mmc1.h b/src/devices/bus/nes/mmc1.h index ca284bd5f2b..ef8b8a7a5fe 100644 --- a/src/devices/bus/nes/mmc1.h +++ b/src/devices/bus/nes/mmc1.h @@ -12,7 +12,7 @@ class nes_sxrom_device : public nes_nrom_device { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); nes_sxrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/nes/mmc2.cpp b/src/devices/bus/nes/mmc2.cpp index 442a111b3ec..c24ce67d870 100644 --- a/src/devices/bus/nes/mmc2.cpp +++ b/src/devices/bus/nes/mmc2.cpp @@ -32,7 +32,7 @@ const device_type NES_PXROM = &device_creator; const device_type NES_FXROM = &device_creator; -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_pxrom_device::nes_pxrom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_latch1(0), m_latch2(0) diff --git a/src/devices/bus/nes/mmc2.h b/src/devices/bus/nes/mmc2.h index 2c0868e2105..e4487194156 100644 --- a/src/devices/bus/nes/mmc2.h +++ b/src/devices/bus/nes/mmc2.h @@ -12,7 +12,7 @@ class nes_pxrom_device : public nes_nrom_device { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); nes_pxrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/nes/mmc3.cpp b/src/devices/bus/nes/mmc3.cpp index e45f0234204..50180cebbe0 100644 --- a/src/devices/bus/nes/mmc3.cpp +++ b/src/devices/bus/nes/mmc3.cpp @@ -53,7 +53,7 @@ const device_type NES_QJ_PCB = &device_creator; const device_type NES_ZZ_PCB = &device_creator; -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_txrom_device::nes_txrom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) { diff --git a/src/devices/bus/nes/mmc3.h b/src/devices/bus/nes/mmc3.h index 9f3936d2f31..a00552c2362 100644 --- a/src/devices/bus/nes/mmc3.h +++ b/src/devices/bus/nes/mmc3.h @@ -12,7 +12,7 @@ class nes_txrom_device : public nes_nrom_device { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); nes_txrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/nes/mmc3_clones.cpp b/src/devices/bus/nes/mmc3_clones.cpp index f9960d369ba..3d633672fa9 100644 --- a/src/devices/bus/nes/mmc3_clones.cpp +++ b/src/devices/bus/nes/mmc3_clones.cpp @@ -170,7 +170,7 @@ nes_sachen_shero_device::nes_sachen_shero_device(const machine_config &mconfig, //{ //} -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_fk23c_device::nes_fk23c_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : nes_txrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_mmc_cmd1(0) { } diff --git a/src/devices/bus/nes/mmc3_clones.h b/src/devices/bus/nes/mmc3_clones.h index f1715c02dc7..c41debaf263 100644 --- a/src/devices/bus/nes/mmc3_clones.h +++ b/src/devices/bus/nes/mmc3_clones.h @@ -413,7 +413,7 @@ class nes_fk23c_device : public nes_txrom_device { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); nes_fk23c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/nes/namcot.cpp b/src/devices/bus/nes/namcot.cpp index 9cf418e966a..cbc76a915c7 100644 --- a/src/devices/bus/nes/namcot.cpp +++ b/src/devices/bus/nes/namcot.cpp @@ -49,7 +49,7 @@ const device_type NES_NAMCOT340 = &device_creator; const device_type NES_NAMCOT163 = &device_creator; -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_namcot3433_device::nes_namcot3433_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_latch(0) { } @@ -69,7 +69,7 @@ nes_namcot3425_device::nes_namcot3425_device(const machine_config &mconfig, std: { } -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_namcot340_device::nes_namcot340_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) { } diff --git a/src/devices/bus/nes/namcot.h b/src/devices/bus/nes/namcot.h index e8798829cb5..1ca5d6ec6c8 100644 --- a/src/devices/bus/nes/namcot.h +++ b/src/devices/bus/nes/namcot.h @@ -12,7 +12,7 @@ class nes_namcot3433_device : public nes_nrom_device { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); nes_namcot3433_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides @@ -72,7 +72,7 @@ class nes_namcot340_device : public nes_nrom_device { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); nes_namcot340_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/nes/nxrom.cpp b/src/devices/bus/nes/nxrom.cpp index dad30116db6..117cb0ee758 100644 --- a/src/devices/bus/nes/nxrom.cpp +++ b/src/devices/bus/nes/nxrom.cpp @@ -59,7 +59,7 @@ const device_type NES_UN1ROM = &device_creator; const device_type NES_NOCHR = &device_creator; -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) +nes_nrom_device::nes_nrom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_nes_cart_interface( mconfig, *this ) { @@ -91,7 +91,7 @@ nes_bxrom_device::nes_bxrom_device(const machine_config &mconfig, std::string ta { } -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_cnrom_device::nes_cnrom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_chr_open_bus(0) { } diff --git a/src/devices/bus/nes/nxrom.h b/src/devices/bus/nes/nxrom.h index 9b1ddaea421..ddee3a77f10 100644 --- a/src/devices/bus/nes/nxrom.h +++ b/src/devices/bus/nes/nxrom.h @@ -14,7 +14,7 @@ class nes_nrom_device : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); nes_nrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void device_start() override { common_start(); } @@ -89,7 +89,7 @@ class nes_cnrom_device : public nes_nrom_device { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); nes_cnrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/nes/sachen.cpp b/src/devices/bus/nes/sachen.cpp index 746dfdcc695..2b7986fc9dd 100644 --- a/src/devices/bus/nes/sachen.cpp +++ b/src/devices/bus/nes/sachen.cpp @@ -100,7 +100,7 @@ nes_sachen_tcu02_device::nes_sachen_tcu02_device(const machine_config &mconfig, { } -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_sachen_74x374_device::nes_sachen_74x374_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_latch(0), m_mmc_vrom_bank(0) { } @@ -115,7 +115,7 @@ nes_sachen_74x374_alt_device::nes_sachen_74x374_alt_device(const machine_config { } -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_8259a_device::nes_sachen_8259a_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : nes_sachen_74x374_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/bus/nes/sachen.h b/src/devices/bus/nes/sachen.h index 05b72385a9f..baabbdaf27d 100644 --- a/src/devices/bus/nes/sachen.h +++ b/src/devices/bus/nes/sachen.h @@ -146,7 +146,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_sachen_74x374_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); nes_sachen_74x374_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides @@ -182,7 +182,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_sachen_8259a_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); nes_sachen_8259a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/nes/sunsoft.cpp b/src/devices/bus/nes/sunsoft.cpp index c28554c5c67..27eaa68738f 100644 --- a/src/devices/bus/nes/sunsoft.cpp +++ b/src/devices/bus/nes/sunsoft.cpp @@ -63,7 +63,7 @@ nes_sunsoft_3_device::nes_sunsoft_3_device(const machine_config &mconfig, std::s { } -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_sunsoft_4_device::nes_sunsoft_4_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) { } @@ -73,7 +73,7 @@ nes_sunsoft_4_device::nes_sunsoft_4_device(const machine_config &mconfig, std::s { } -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_sunsoft_fme7_device::nes_sunsoft_fme7_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) { } diff --git a/src/devices/bus/nes/sunsoft.h b/src/devices/bus/nes/sunsoft.h index 70ce2f7be12..9ac1d7c85ff 100644 --- a/src/devices/bus/nes/sunsoft.h +++ b/src/devices/bus/nes/sunsoft.h @@ -69,7 +69,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_sunsoft_4_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); nes_sunsoft_4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides @@ -92,7 +92,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_sunsoft_fme7_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); nes_sunsoft_fme7_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/nes/taito.cpp b/src/devices/bus/nes/taito.cpp index 81d2106acd9..a9e6911339b 100644 --- a/src/devices/bus/nes/taito.cpp +++ b/src/devices/bus/nes/taito.cpp @@ -47,7 +47,7 @@ const device_type NES_X1_005 = &device_creator; const device_type NES_X1_017 = &device_creator; -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_tc0190fmc_device::nes_tc0190fmc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/bus/nes/taito.h b/src/devices/bus/nes/taito.h index 7876570f660..e476444fa35 100644 --- a/src/devices/bus/nes/taito.h +++ b/src/devices/bus/nes/taito.h @@ -12,7 +12,7 @@ class nes_tc0190fmc_device : public nes_nrom_device { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); nes_tc0190fmc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/nes/tengen.cpp b/src/devices/bus/nes/tengen.cpp index 809c8266b53..d4d40ffdde9 100644 --- a/src/devices/bus/nes/tengen.cpp +++ b/src/devices/bus/nes/tengen.cpp @@ -48,7 +48,7 @@ nes_tengen008_device::nes_tengen008_device(const machine_config &mconfig, std::s { } -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_tengen032_device::nes_tengen032_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) { } diff --git a/src/devices/bus/nes/tengen.h b/src/devices/bus/nes/tengen.h index 1cd88894603..295be0dd042 100644 --- a/src/devices/bus/nes/tengen.h +++ b/src/devices/bus/nes/tengen.h @@ -28,7 +28,7 @@ class nes_tengen032_device : public nes_nrom_device { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); nes_tengen032_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/nes/txc.cpp b/src/devices/bus/nes/txc.cpp index 73512f43c3a..17a86afe612 100644 --- a/src/devices/bus/nes/txc.cpp +++ b/src/devices/bus/nes/txc.cpp @@ -44,7 +44,7 @@ const device_type NES_TXC_STRIKEW = &device_creator; const device_type NES_TXC_COMMANDOS = &device_creator; -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_txc_22211_device::nes_txc_22211_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/bus/nes/txc.h b/src/devices/bus/nes/txc.h index 3dc45316c26..006a5578b4a 100644 --- a/src/devices/bus/nes/txc.h +++ b/src/devices/bus/nes/txc.h @@ -12,7 +12,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_txc_22211_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); nes_txc_22211_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/nes/waixing.cpp b/src/devices/bus/nes/waixing.cpp index f573843024c..adf4e314b0c 100644 --- a/src/devices/bus/nes/waixing.cpp +++ b/src/devices/bus/nes/waixing.cpp @@ -56,7 +56,7 @@ const device_type NES_WAIXING_WXZS2 = &device_creator; const device_type NES_WAIXING_FS304 = &device_creator; -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_waixing_a_device::nes_waixing_a_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : nes_txrom_device(mconfig, type, name, tag, owner, clock, shortname, source) { } @@ -101,7 +101,7 @@ nes_waixing_g_device::nes_waixing_g_device(const machine_config &mconfig, std::s { } -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_waixing_h_device::nes_waixing_h_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : nes_txrom_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/bus/nes/waixing.h b/src/devices/bus/nes/waixing.h index 90506ae85fb..b4f429e8af8 100644 --- a/src/devices/bus/nes/waixing.h +++ b/src/devices/bus/nes/waixing.h @@ -12,7 +12,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_waixing_a_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); nes_waixing_a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides @@ -139,7 +139,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_waixing_h_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); nes_waixing_h_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/nes_ctrl/4score.cpp b/src/devices/bus/nes_ctrl/4score.cpp index 2d3180a0caf..8368a01948e 100644 --- a/src/devices/bus/nes_ctrl/4score.cpp +++ b/src/devices/bus/nes_ctrl/4score.cpp @@ -110,7 +110,7 @@ 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_nes_control_port_interface(mconfig, *this), m_latch(0) { diff --git a/src/devices/bus/nes_ctrl/4score.h b/src/devices/bus/nes_ctrl/4score.h index e54e0320280..84abdfc96f1 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nes_4score_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); protected: // device-level overrides diff --git a/src/devices/bus/nes_ctrl/arkpaddle.cpp b/src/devices/bus/nes_ctrl/arkpaddle.cpp index dc1523f7f1f..a47ac4762d2 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_nes_control_port_interface(mconfig, *this), m_paddle(*this, "PADDLE"), diff --git a/src/devices/bus/nes_ctrl/arkpaddle.h b/src/devices/bus/nes_ctrl/arkpaddle.h index b6932f8fb4a..5202367b05c 100644 --- a/src/devices/bus/nes_ctrl/arkpaddle.h +++ b/src/devices/bus/nes_ctrl/arkpaddle.h @@ -27,7 +27,7 @@ class nes_vaus_device : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); nes_vaus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides diff --git a/src/devices/bus/nes_ctrl/joypad.cpp b/src/devices/bus/nes_ctrl/joypad.cpp index f03c0b7616d..1732383d90b 100644 --- a/src/devices/bus/nes_ctrl/joypad.cpp +++ b/src/devices/bus/nes_ctrl/joypad.cpp @@ -173,7 +173,7 @@ 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) diff --git a/src/devices/bus/nes_ctrl/joypad.h b/src/devices/bus/nes_ctrl/joypad.h index acdd01552e4..e3cad231727 100644 --- a/src/devices/bus/nes_ctrl/joypad.h +++ b/src/devices/bus/nes_ctrl/joypad.h @@ -26,7 +26,7 @@ class nes_joypad_device : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); nes_joypad_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 680e20d501a..96d02c67767 100644 --- a/src/devices/bus/nubus/nubus.cpp +++ b/src/devices/bus/nubus/nubus.cpp @@ -32,7 +32,7 @@ nubus_slot_device::nubus_slot_device(const machine_config &mconfig, std::string { } -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) : +nubus_slot_device::nubus_slot_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_slot_interface(mconfig, *this) { @@ -87,7 +87,7 @@ nubus_device::nubus_device(const machine_config &mconfig, std::string tag, devic { } -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) : +nubus_device::nubus_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr), m_out_irq9_cb(*this), m_out_irqa_cb(*this), diff --git a/src/devices/bus/nubus/nubus.h b/src/devices/bus/nubus/nubus.h index 7d670e01729..94179d0d472 100644 --- a/src/devices/bus/nubus/nubus.h +++ b/src/devices/bus/nubus/nubus.h @@ -65,7 +65,7 @@ class nubus_slot_device : public device_t, public: // construction/destruction 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); + nubus_slot_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // device-level overrides virtual void device_start() override; @@ -89,7 +89,7 @@ class nubus_device : public device_t public: // construction/destruction 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(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); ~nubus_device() { m_device_list.detach_all(); } // inline configuration diff --git a/src/devices/bus/nubus/nubus_48gc.cpp b/src/devices/bus/nubus/nubus_48gc.cpp index 2ce8aea0b10..8dcb5a217ed 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +jmfb_device::jmfb_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) diff --git a/src/devices/bus/nubus/nubus_48gc.h b/src/devices/bus/nubus/nubus_48gc.h index ff09fb5d82b..bb8b58c4281 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + jmfb_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/nubus/nubus_asntmc3b.cpp b/src/devices/bus/nubus/nubus_asntmc3b.cpp index 93be1bfec52..a93e2eb92fb 100644 --- a/src/devices/bus/nubus/nubus_asntmc3b.cpp +++ b/src/devices/bus/nubus/nubus_asntmc3b.cpp @@ -76,7 +76,7 @@ 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, NUBUS_ASNTMC3NB, name, tag, owner, clock, shortname, source), device_nubus_card_interface(mconfig, *this), m_dp83902(*this, MAC8390_839X) diff --git a/src/devices/bus/nubus/nubus_asntmc3b.h b/src/devices/bus/nubus/nubus_asntmc3b.h index c6ef6a87e93..de5533e4190 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nubus_mac8390_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/nubus/nubus_cb264.cpp b/src/devices/bus/nubus/nubus_cb264.cpp index 51011eb532b..2416630a7e1 100644 --- a/src/devices/bus/nubus/nubus_cb264.cpp +++ b/src/devices/bus/nubus/nubus_cb264.cpp @@ -75,7 +75,7 @@ nubus_cb264_device::nubus_cb264_device(const machine_config &mconfig, std::strin { } -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) : +nubus_cb264_device::nubus_cb264_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 a07e3a104a6..bb027eaa58d 100644 --- a/src/devices/bus/nubus/nubus_cb264.h +++ b/src/devices/bus/nubus/nubus_cb264.h @@ -21,7 +21,7 @@ class nubus_cb264_device : public: // construction/destruction 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); + nubus_cb264_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 351872eae14..7a67ee7cb6b 100644 --- a/src/devices/bus/nubus/nubus_image.cpp +++ b/src/devices/bus/nubus/nubus_image.cpp @@ -179,7 +179,7 @@ nubus_image_device::nubus_image_device(const machine_config &mconfig, std::strin { } -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) : +nubus_image_device::nubus_image_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 5cd1d26126f..385be9a575e 100644 --- a/src/devices/bus/nubus/nubus_image.h +++ b/src/devices/bus/nubus/nubus_image.h @@ -33,7 +33,7 @@ class nubus_image_device : public: // construction/destruction 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); + nubus_image_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 05a1acee433..b99391f9266 100644 --- a/src/devices/bus/nubus/nubus_m2hires.cpp +++ b/src/devices/bus/nubus/nubus_m2hires.cpp @@ -74,7 +74,7 @@ nubus_m2hires_device::nubus_m2hires_device(const machine_config &mconfig, std::s m_screen_tag = m_assembled_tag.c_str(); } -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) : +nubus_m2hires_device::nubus_m2hires_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 b35aca6ed1e..23495b08e77 100644 --- a/src/devices/bus/nubus/nubus_m2hires.h +++ b/src/devices/bus/nubus/nubus_m2hires.h @@ -22,7 +22,7 @@ class nubus_m2hires_device : public: // construction/destruction 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); + nubus_m2hires_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 2dfb12ccf83..6d2692c83ae 100644 --- a/src/devices/bus/nubus/nubus_m2video.cpp +++ b/src/devices/bus/nubus/nubus_m2video.cpp @@ -75,7 +75,7 @@ nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, std::s m_screen_tag = m_assembled_tag.c_str(); } -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) : +nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 26c0c398218..6c86087ac13 100644 --- a/src/devices/bus/nubus/nubus_m2video.h +++ b/src/devices/bus/nubus/nubus_m2video.h @@ -22,7 +22,7 @@ class nubus_m2video_device : public: // construction/destruction 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); + nubus_m2video_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 83d5a726f8d..b468dc10ee8 100644 --- a/src/devices/bus/nubus/nubus_radiustpd.cpp +++ b/src/devices/bus/nubus/nubus_radiustpd.cpp @@ -74,7 +74,7 @@ nubus_radiustpd_device::nubus_radiustpd_device(const machine_config &mconfig, st m_screen_tag = m_assembled_tag.c_str(); } -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) : +nubus_radiustpd_device::nubus_radiustpd_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 ad227185eae..60010230584 100644 --- a/src/devices/bus/nubus/nubus_radiustpd.h +++ b/src/devices/bus/nubus/nubus_radiustpd.h @@ -22,7 +22,7 @@ class nubus_radiustpd_device : public: // construction/destruction 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); + nubus_radiustpd_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 abcdadfc49d..37f7077faeb 100644 --- a/src/devices/bus/nubus/nubus_spec8.cpp +++ b/src/devices/bus/nubus/nubus_spec8.cpp @@ -76,7 +76,7 @@ nubus_spec8s3_device::nubus_spec8s3_device(const machine_config &mconfig, std::s m_screen_tag = m_assembled_tag.c_str(); } -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) : +nubus_spec8s3_device::nubus_spec8s3_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 971eef50266..5dc7b797208 100644 --- a/src/devices/bus/nubus/nubus_spec8.h +++ b/src/devices/bus/nubus/nubus_spec8.h @@ -22,7 +22,7 @@ class nubus_spec8s3_device : public: // construction/destruction 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); + nubus_spec8s3_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 c8c82c59c6d..5bba7517334 100644 --- a/src/devices/bus/nubus/nubus_specpdq.cpp +++ b/src/devices/bus/nubus/nubus_specpdq.cpp @@ -92,7 +92,7 @@ nubus_specpdq_device::nubus_specpdq_device(const machine_config &mconfig, std::s m_screen_tag = m_assembled_tag.c_str(); } -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) : +nubus_specpdq_device::nubus_specpdq_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 ae1bccdfe6b..4ad726eb7ac 100644 --- a/src/devices/bus/nubus/nubus_specpdq.h +++ b/src/devices/bus/nubus/nubus_specpdq.h @@ -22,7 +22,7 @@ class nubus_specpdq_device : public: // construction/destruction 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); + nubus_specpdq_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 4315a093eff..bee2f97649e 100644 --- a/src/devices/bus/nubus/nubus_vikbw.cpp +++ b/src/devices/bus/nubus/nubus_vikbw.cpp @@ -71,7 +71,7 @@ nubus_vikbw_device::nubus_vikbw_device(const machine_config &mconfig, std::strin { } -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) : +nubus_vikbw_device::nubus_vikbw_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 c98ff035f46..3a8804ac763 100644 --- a/src/devices/bus/nubus/nubus_vikbw.h +++ b/src/devices/bus/nubus/nubus_vikbw.h @@ -21,7 +21,7 @@ class nubus_vikbw_device : public: // construction/destruction 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); + nubus_vikbw_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 d26cb978430..56f90afee9d 100644 --- a/src/devices/bus/nubus/nubus_wsportrait.cpp +++ b/src/devices/bus/nubus/nubus_wsportrait.cpp @@ -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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 cef28ae68b7..d51f6a6c6cb 100644 --- a/src/devices/bus/nubus/nubus_wsportrait.h +++ b/src/devices/bus/nubus/nubus_wsportrait.h @@ -22,7 +22,7 @@ class nubus_wsportrait_device : public: // construction/destruction 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); + nubus_wsportrait_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 0305f830b7f..26ba86fbb16 100644 --- a/src/devices/bus/nubus/pds30_30hr.cpp +++ b/src/devices/bus/nubus/pds30_30hr.cpp @@ -77,7 +77,7 @@ nubus_xceed30hr_device::nubus_xceed30hr_device(const machine_config &mconfig, st m_screen_tag = m_assembled_tag.c_str(); } -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) : +nubus_xceed30hr_device::nubus_xceed30hr_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 5d52239f231..6f1ab6748c0 100644 --- a/src/devices/bus/nubus/pds30_30hr.h +++ b/src/devices/bus/nubus/pds30_30hr.h @@ -22,7 +22,7 @@ class nubus_xceed30hr_device : public: // construction/destruction 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); + nubus_xceed30hr_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 c100739741b..ed5f4d20bcf 100644 --- a/src/devices/bus/nubus/pds30_cb264.cpp +++ b/src/devices/bus/nubus/pds30_cb264.cpp @@ -70,7 +70,7 @@ nubus_cb264se30_device::nubus_cb264se30_device(const machine_config &mconfig, st m_screen_tag = m_assembled_tag.c_str(); } -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) : +nubus_cb264se30_device::nubus_cb264se30_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 17893bfd39a..cd92239675c 100644 --- a/src/devices/bus/nubus/pds30_cb264.h +++ b/src/devices/bus/nubus/pds30_cb264.h @@ -22,7 +22,7 @@ class nubus_cb264se30_device : public: // construction/destruction 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); + nubus_cb264se30_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 985886b8b09..a55bf05f8e1 100644 --- a/src/devices/bus/nubus/pds30_mc30.cpp +++ b/src/devices/bus/nubus/pds30_mc30.cpp @@ -73,7 +73,7 @@ nubus_xceedmc30_device::nubus_xceedmc30_device(const machine_config &mconfig, st m_screen_tag = m_assembled_tag.c_str(); } -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) : +nubus_xceedmc30_device::nubus_xceedmc30_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 5c1b05cd064..6e9352d46d7 100644 --- a/src/devices/bus/nubus/pds30_mc30.h +++ b/src/devices/bus/nubus/pds30_mc30.h @@ -22,7 +22,7 @@ class nubus_xceedmc30_device : public: // construction/destruction 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); + nubus_xceedmc30_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 8b8df5a1af0..c5044febf09 100644 --- a/src/devices/bus/nubus/pds30_procolor816.cpp +++ b/src/devices/bus/nubus/pds30_procolor816.cpp @@ -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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 90fec177365..985a5ade958 100644 --- a/src/devices/bus/nubus/pds30_procolor816.h +++ b/src/devices/bus/nubus/pds30_procolor816.h @@ -22,7 +22,7 @@ class nubus_procolor816_device : public: // construction/destruction 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); + nubus_procolor816_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 9c180cc9c88..f24c0d50924 100644 --- a/src/devices/bus/nubus/pds30_sigmalview.cpp +++ b/src/devices/bus/nubus/pds30_sigmalview.cpp @@ -70,7 +70,7 @@ nubus_lview_device::nubus_lview_device(const machine_config &mconfig, std::strin m_screen_tag = m_assembled_tag.c_str(); } -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) : +nubus_lview_device::nubus_lview_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 6f4193c40eb..62a23cdb23b 100644 --- a/src/devices/bus/nubus/pds30_sigmalview.h +++ b/src/devices/bus/nubus/pds30_sigmalview.h @@ -22,7 +22,7 @@ class nubus_lview_device : public: // construction/destruction 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); + nubus_lview_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/odyssey2/rom.cpp b/src/devices/bus/odyssey2/rom.cpp index cf4e31583cb..9eecb698230 100644 --- a/src/devices/bus/odyssey2/rom.cpp +++ b/src/devices/bus/odyssey2/rom.cpp @@ -22,7 +22,7 @@ const device_type O2_ROM_12K = &device_creator; const device_type O2_ROM_16K = &device_creator; -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) +o2_rom_device::o2_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_o2_cart_interface(mconfig, *this), m_bank_base(0) diff --git a/src/devices/bus/odyssey2/rom.h b/src/devices/bus/odyssey2/rom.h index 8ff695e07cb..b24068d6e84 100644 --- a/src/devices/bus/odyssey2/rom.h +++ b/src/devices/bus/odyssey2/rom.h @@ -13,7 +13,7 @@ class o2_rom_device : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); o2_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/oricext/oricext.cpp b/src/devices/bus/oricext/oricext.cpp index 24acefd9f9c..4dd5f4566c6 100644 --- a/src/devices/bus/oricext/oricext.cpp +++ b/src/devices/bus/oricext/oricext.cpp @@ -39,7 +39,7 @@ void oricext_connector::device_config_complete() dev->set_cputag(cputag); } -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) : +oricext_device::oricext_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_slot_card_interface(mconfig, *this), cpu(nullptr), diff --git a/src/devices/bus/oricext/oricext.h b/src/devices/bus/oricext/oricext.h index eb8dd010d0f..7d239742add 100644 --- a/src/devices/bus/oricext/oricext.h +++ b/src/devices/bus/oricext/oricext.h @@ -43,7 +43,7 @@ class oricext_device : public device_t, public device_slot_card_interface { public: - 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); + oricext_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); void set_cputag(std::string tag); DECLARE_WRITE_LINE_MEMBER(irq_w); diff --git a/src/devices/bus/pc_kbd/pcat84.cpp b/src/devices/bus/pc_kbd/pcat84.cpp index 6e5aa21d586..878702a43ae 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_pc_kbd_interface(mconfig, *this), m_maincpu(*this, I8048_TAG), diff --git a/src/devices/bus/pc_kbd/pcat84.h b/src/devices/bus/pc_kbd/pcat84.h index 6b2103197bf..3d036f3ed0b 100644 --- a/src/devices/bus/pc_kbd/pcat84.h +++ b/src/devices/bus/pc_kbd/pcat84.h @@ -29,7 +29,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + ibm_pc_at_84_keyboard_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); ibm_pc_at_84_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides diff --git a/src/devices/bus/pce/pce_rom.cpp b/src/devices/bus/pce/pce_rom.cpp index 902e05057b9..d06f7240a6b 100644 --- a/src/devices/bus/pce/pce_rom.cpp +++ b/src/devices/bus/pce/pce_rom.cpp @@ -23,7 +23,7 @@ const device_type PCE_ROM_POPULOUS = &device_creator; const device_type PCE_ROM_SF2 = &device_creator; -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) +pce_rom_device::pce_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_pce_cart_interface( mconfig, *this ) { diff --git a/src/devices/bus/pce/pce_rom.h b/src/devices/bus/pce/pce_rom.h index 1f3fec2ae7c..51469cf75fb 100644 --- a/src/devices/bus/pce/pce_rom.h +++ b/src/devices/bus/pce/pce_rom.h @@ -13,7 +13,7 @@ class pce_rom_device : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); pce_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/pet/c2n.cpp b/src/devices/bus/pet/c2n.cpp index b51ff3100fc..c417378f75b 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +c2n_device::c2n_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_pet_datassette_port_interface(mconfig, *this), m_cassette(*this, "cassette"), diff --git a/src/devices/bus/pet/c2n.h b/src/devices/bus/pet/c2n.h index afaf19a60eb..bcc47376abe 100644 --- a/src/devices/bus/pet/c2n.h +++ b/src/devices/bus/pet/c2n.h @@ -29,7 +29,7 @@ class c2n_device : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); c2n_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides diff --git a/src/devices/bus/pet/hsg.cpp b/src/devices/bus/pet/hsg.cpp index 00c786db8e1..8e87f4c9aab 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_pet_expansion_card_interface(mconfig, *this), m_gdc(*this, EF9365_TAG), diff --git a/src/devices/bus/pet/hsg.h b/src/devices/bus/pet/hsg.h index 7fc60fda6e9..d166af4c42e 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + cbm8000_hsg_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/psx/analogue.cpp b/src/devices/bus/psx/analogue.cpp index 02954688390..6d51585b0a0 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; const device_type PSX_DUALSHOCK = &device_creator; -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) : +psx_analog_controller_device::psx_analog_controller_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_psx_controller_interface(mconfig, *this), m_type(), diff --git a/src/devices/bus/psx/analogue.h b/src/devices/bus/psx/analogue.h index 972f720e02c..bf6de30bfc1 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + psx_analog_controller_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual ioport_constructor device_input_ports() const override; DECLARE_INPUT_CHANGED_MEMBER(change_mode); diff --git a/src/devices/bus/ql/sandy_superqboard.cpp b/src/devices/bus/ql/sandy_superqboard.cpp index 1479ee7b97b..cf1e98de600 100644 --- a/src/devices/bus/ql/sandy_superqboard.cpp +++ b/src/devices/bus/ql/sandy_superqboard.cpp @@ -230,7 +230,7 @@ sandy_superqboard_t::sandy_superqboard_t(const machine_config &mconfig, std::str { } -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) : +sandy_superqboard_t::sandy_superqboard_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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), diff --git a/src/devices/bus/ql/sandy_superqboard.h b/src/devices/bus/ql/sandy_superqboard.h index 2bacc094060..e3534218fb2 100644 --- a/src/devices/bus/ql/sandy_superqboard.h +++ b/src/devices/bus/ql/sandy_superqboard.h @@ -30,7 +30,7 @@ class sandy_superqboard_t : public device_t, public: // construction/destruction 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); + sandy_superqboard_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, int ram_size); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/ql/trumpcard.cpp b/src/devices/bus/ql/trumpcard.cpp index 5daafdea35a..89140d2c1b5 100644 --- a/src/devices/bus/ql/trumpcard.cpp +++ b/src/devices/bus/ql/trumpcard.cpp @@ -123,7 +123,7 @@ ql_trump_card_t::ql_trump_card_t(const machine_config &mconfig, std::string tag, { } -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) : +ql_trump_card_t::ql_trump_card_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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), diff --git a/src/devices/bus/ql/trumpcard.h b/src/devices/bus/ql/trumpcard.h index cd31a838f38..6920b776be1 100644 --- a/src/devices/bus/ql/trumpcard.h +++ b/src/devices/bus/ql/trumpcard.h @@ -29,7 +29,7 @@ class ql_trump_card_t : public device_t, public: // construction/destruction 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); + ql_trump_card_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, int ram_size); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/rs232/keyboard.cpp b/src/devices/bus/rs232/keyboard.cpp index d472bab1f14..2c6779f5941 100644 --- a/src/devices/bus/rs232/keyboard.cpp +++ b/src/devices/bus/rs232/keyboard.cpp @@ -16,7 +16,7 @@ serial_keyboard_device::serial_keyboard_device(const machine_config &mconfig, st { } -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) +serial_keyboard_device::serial_keyboard_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 4a6033594fc..7c0629127c2 100644 --- a/src/devices/bus/rs232/keyboard.h +++ b/src/devices/bus/rs232/keyboard.h @@ -15,7 +15,7 @@ class serial_keyboard_device : { public: 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); + serial_keyboard_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); 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 d33b1731336..64fbf91ba9f 100644 --- a/src/devices/bus/rs232/rs232.cpp +++ b/src/devices/bus/rs232/rs232.cpp @@ -21,7 +21,7 @@ rs232_port_device::rs232_port_device(const machine_config &mconfig, std::string { } -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) +rs232_port_device::rs232_port_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 f970620feca..5b6648af3fb 100644 --- a/src/devices/bus/rs232/rs232.h +++ b/src/devices/bus/rs232/rs232.h @@ -118,7 +118,7 @@ class rs232_port_device : public device_t, public: 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); + rs232_port_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 09f9d1dc631..f1e00d967a3 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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_rs232_port_interface(mconfig, *this), device_serial_interface(mconfig, *this), diff --git a/src/devices/bus/rs232/ser_mouse.h b/src/devices/bus/rs232/ser_mouse.h index 8ebab89a5cf..8736c6d9f64 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + serial_mouse_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/saturn/bram.cpp b/src/devices/bus/saturn/bram.cpp index a8da0d2e12f..caea0d81e8b 100644 --- a/src/devices/bus/saturn/bram.cpp +++ b/src/devices/bus/saturn/bram.cpp @@ -21,7 +21,7 @@ const device_type SATURN_BRAM_16MB = &device_creator; const device_type SATURN_BRAM_32MB = &device_creator; -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) +saturn_bram_device::saturn_bram_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sat_cart_interface( mconfig, *this ), device_nvram_interface(mconfig, *this) diff --git a/src/devices/bus/saturn/bram.h b/src/devices/bus/saturn/bram.h index c43734eb455..9664bd00b64 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + saturn_bram_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/saturn/dram.cpp b/src/devices/bus/saturn/dram.cpp index 0ac5008de27..89722fe8911 100644 --- a/src/devices/bus/saturn/dram.cpp +++ b/src/devices/bus/saturn/dram.cpp @@ -19,7 +19,7 @@ const device_type SATURN_DRAM_8MB = &device_creator; const device_type SATURN_DRAM_32MB = &device_creator; -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) +saturn_dram_device::saturn_dram_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sat_cart_interface( mconfig, *this ) { diff --git a/src/devices/bus/saturn/dram.h b/src/devices/bus/saturn/dram.h index 571eaf47759..ef34e439095 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + saturn_dram_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/saturn/rom.cpp b/src/devices/bus/saturn/rom.cpp index 3c34ec1aa9b..24d24433352 100644 --- a/src/devices/bus/saturn/rom.cpp +++ b/src/devices/bus/saturn/rom.cpp @@ -18,7 +18,7 @@ const device_type SATURN_ROM = &device_creator; -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) +saturn_rom_device::saturn_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sat_cart_interface( mconfig, *this ) { diff --git a/src/devices/bus/saturn/rom.h b/src/devices/bus/saturn/rom.h index a81293930d9..e35d392d1a8 100644 --- a/src/devices/bus/saturn/rom.h +++ b/src/devices/bus/saturn/rom.h @@ -13,7 +13,7 @@ class saturn_rom_device : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); saturn_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/scsi/scsicd.cpp b/src/devices/bus/scsi/scsicd.cpp index 89402bf2c5a..6421c76ed78 100644 --- a/src/devices/bus/scsi/scsicd.cpp +++ b/src/devices/bus/scsi/scsicd.cpp @@ -16,7 +16,7 @@ scsicd_device::scsicd_device(const machine_config &mconfig, std::string tag, dev { } -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) : +scsicd_device::scsicd_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 34c457df7d1..9a1d1ab1bf2 100644 --- a/src/devices/bus/scsi/scsicd.h +++ b/src/devices/bus/scsi/scsicd.h @@ -18,7 +18,7 @@ class scsicd_device : public scsihle_device, public: // construction/destruction 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); + scsicd_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 42e6c2d821f..a9982278176 100644 --- a/src/devices/bus/scsi/scsihd.cpp +++ b/src/devices/bus/scsi/scsihd.cpp @@ -16,7 +16,7 @@ scsihd_device::scsihd_device(const machine_config &mconfig, std::string tag, dev { } -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) : +scsihd_device::scsihd_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 645706090b5..49af73fd659 100644 --- a/src/devices/bus/scsi/scsihd.h +++ b/src/devices/bus/scsi/scsihd.h @@ -18,7 +18,7 @@ class scsihd_device : public scsihle_device, public: // construction/destruction 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); + scsihd_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 44e4e087f29..ea6ec62e8f8 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +scsihle_device::scsihle_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), scsi_port_interface(mconfig, *this), m_scsi_id(*this, "SCSI_ID"), diff --git a/src/devices/bus/scsi/scsihle.h b/src/devices/bus/scsi/scsihle.h index 1308b606b01..c070b4d4c8b 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + scsihle_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 1fc13842e72..e111dcf7f8e 100644 --- a/src/devices/bus/scv/rom.cpp +++ b/src/devices/bus/scv/rom.cpp @@ -26,7 +26,7 @@ const device_type SCV_ROM128K = &device_creator; const device_type SCV_ROM128K_RAM4K = &device_creator; -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) +scv_rom8_device::scv_rom8_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_scv_cart_interface( mconfig, *this ) { diff --git a/src/devices/bus/scv/rom.h b/src/devices/bus/scv/rom.h index 7c2043c613a..6b40de66fc3 100644 --- a/src/devices/bus/scv/rom.h +++ b/src/devices/bus/scv/rom.h @@ -13,7 +13,7 @@ class scv_rom8_device : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); scv_rom8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/sega8/rom.cpp b/src/devices/bus/sega8/rom.cpp index b74923ab41c..2582c719d1c 100644 --- a/src/devices/bus/sega8/rom.cpp +++ b/src/devices/bus/sega8/rom.cpp @@ -43,7 +43,7 @@ const device_type SEGA8_ROM_KOREAN_NB = &device_creator; -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) +sega8_rom_device::sega8_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) { @@ -126,7 +126,7 @@ sega8_4pak_device::sega8_4pak_device(const machine_config &mconfig, std::string } -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) +sega8_zemina_device::sega8_zemina_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) { diff --git a/src/devices/bus/sega8/rom.h b/src/devices/bus/sega8/rom.h index 9e30940526d..de84e501a02 100644 --- a/src/devices/bus/sega8/rom.h +++ b/src/devices/bus/sega8/rom.h @@ -13,7 +13,7 @@ class sega8_rom_device : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); sega8_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides @@ -256,7 +256,7 @@ class sega8_zemina_device : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); sega8_zemina_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/sega8/sega8_slot.cpp b/src/devices/bus/sega8/sega8_slot.cpp index b87c42305fc..8377e183c9c 100644 --- a/src/devices/bus/sega8/sega8_slot.cpp +++ b/src/devices/bus/sega8/sega8_slot.cpp @@ -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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, bool is_card, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), diff --git a/src/devices/bus/sega8/sega8_slot.h b/src/devices/bus/sega8/sega8_slot.h index b71c53a738c..3b5dd91a18f 100644 --- a/src/devices/bus/sega8/sega8_slot.h +++ b/src/devices/bus/sega8/sega8_slot.h @@ -99,7 +99,7 @@ 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, 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, bool is_card, std::string shortname, std::string source); sega8_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual ~sega8_cart_slot_device(); diff --git a/src/devices/bus/snes/bsx.cpp b/src/devices/bus/snes/bsx.cpp index 871c274c508..90e8278ed8c 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; const device_type SNS_BSMEMPAK = &device_creator; -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_bsx_device::sns_rom_bsx_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : sns_rom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_base_unit(nullptr), access_00_1f(0), diff --git a/src/devices/bus/snes/bsx.h b/src/devices/bus/snes/bsx.h index 5959d4a0fdf..2fb63ccc83c 100644 --- a/src/devices/bus/snes/bsx.h +++ b/src/devices/bus/snes/bsx.h @@ -34,7 +34,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + sns_rom_bsx_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); sns_rom_bsx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/snes/rom.cpp b/src/devices/bus/snes/rom.cpp index fc7dfb2c6b1..e7c6a985c92 100644 --- a/src/devices/bus/snes/rom.cpp +++ b/src/devices/bus/snes/rom.cpp @@ -29,7 +29,7 @@ const device_type SNS_LOROM_MCPIR2 = &device_creator; const device_type SNS_LOROM_20COL = &device_creator; -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) +sns_rom_device::sns_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sns_cart_interface( mconfig, *this ) { diff --git a/src/devices/bus/snes/rom.h b/src/devices/bus/snes/rom.h index d7703da61e6..a4ec9ce9275 100644 --- a/src/devices/bus/snes/rom.h +++ b/src/devices/bus/snes/rom.h @@ -13,7 +13,7 @@ class sns_rom_device : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); sns_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/snes/rom21.cpp b/src/devices/bus/snes/rom21.cpp index ad60a669f17..e85ee5538bc 100644 --- a/src/devices/bus/snes/rom21.cpp +++ b/src/devices/bus/snes/rom21.cpp @@ -19,7 +19,7 @@ const device_type SNS_HIROM = &device_creator; const device_type SNS_HIROM_SRTC = &device_creator; -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) +sns_rom21_device::sns_rom21_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sns_cart_interface( mconfig, *this ) { diff --git a/src/devices/bus/snes/rom21.h b/src/devices/bus/snes/rom21.h index 51c52ecc56f..4fcc4980845 100644 --- a/src/devices/bus/snes/rom21.h +++ b/src/devices/bus/snes/rom21.h @@ -13,7 +13,7 @@ class sns_rom21_device : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); sns_rom21_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/snes/sdd1.cpp b/src/devices/bus/snes/sdd1.cpp index e269d663c8b..f807e9cba61 100644 --- a/src/devices/bus/snes/sdd1.cpp +++ b/src/devices/bus/snes/sdd1.cpp @@ -411,7 +411,7 @@ 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(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::sns_rom_sdd1_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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) { diff --git a/src/devices/bus/snes/sdd1.h b/src/devices/bus/snes/sdd1.h index 21dde5d66dd..dc096c9e570 100644 --- a/src/devices/bus/snes/sdd1.h +++ b/src/devices/bus/snes/sdd1.h @@ -155,7 +155,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + sns_rom_sdd1_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); sns_rom_sdd1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/snes/snes_slot.cpp b/src/devices/bus/snes/snes_slot.cpp index 56b646c8236..fc4a3f0cdc5 100644 --- a/src/devices/bus/snes/snes_slot.cpp +++ b/src/devices/bus/snes/snes_slot.cpp @@ -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, std::string 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), diff --git a/src/devices/bus/snes/snes_slot.h b/src/devices/bus/snes/snes_slot.h index 0d5bc4fd16f..51f8d10a9cb 100644 --- a/src/devices/bus/snes/snes_slot.h +++ b/src/devices/bus/snes/snes_slot.h @@ -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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + base_sns_cart_slot_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual ~base_sns_cart_slot_device(); // device-level overrides diff --git a/src/devices/bus/snes/spc7110.cpp b/src/devices/bus/snes/spc7110.cpp index 504546e3a46..671e11d0be0 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; const device_type SNS_HIROM_SPC7110_RTC = &device_creator; -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_rom_spc7110_device::sns_rom_spc7110_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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), diff --git a/src/devices/bus/snes/spc7110.h b/src/devices/bus/snes/spc7110.h index f952669798e..f50277079fb 100644 --- a/src/devices/bus/snes/spc7110.h +++ b/src/devices/bus/snes/spc7110.h @@ -89,7 +89,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + sns_rom_spc7110_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); sns_rom_spc7110_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/snes/upd.cpp b/src/devices/bus/snes/upd.cpp index 4896a23f934..0751b07c828 100644 --- a/src/devices/bus/snes/upd.cpp +++ b/src/devices/bus/snes/upd.cpp @@ -32,7 +32,7 @@ const device_type SNS_LOROM_SETA10 = &device_creator; const device_type SNS_LOROM_SETA11 = &device_creator; -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_rom20_necdsp_device::sns_rom20_necdsp_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : sns_rom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_upd7725(*this, "dsp") { @@ -44,7 +44,7 @@ sns_rom20_necdsp_device::sns_rom20_necdsp_device(const machine_config &mconfig, { } -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_necdsp_device::sns_rom21_necdsp_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : sns_rom21_device(mconfig, type, name, tag, owner, clock, shortname, source), m_upd7725(*this, "dsp") { @@ -56,7 +56,7 @@ sns_rom21_necdsp_device::sns_rom21_necdsp_device(const machine_config &mconfig, { } -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_setadsp_device::sns_rom_setadsp_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : sns_rom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_upd96050(*this, "dsp") { diff --git a/src/devices/bus/snes/upd.h b/src/devices/bus/snes/upd.h index 6633290b828..c997a8a8ca1 100644 --- a/src/devices/bus/snes/upd.h +++ b/src/devices/bus/snes/upd.h @@ -14,7 +14,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + sns_rom20_necdsp_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); sns_rom20_necdsp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides @@ -41,7 +41,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + sns_rom21_necdsp_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); sns_rom21_necdsp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides @@ -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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + sns_rom_setadsp_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/ti99_peb/bwg.cpp b/src/devices/bus/ti99_peb/bwg.cpp index 7246128786b..9aed9d58c95 100644 --- a/src/devices/bus/ti99_peb/bwg.cpp +++ b/src/devices/bus/ti99_peb/bwg.cpp @@ -604,7 +604,7 @@ void snug_bwg_device::device_reset() for (int i=0; i < 4; i++) { if (m_floppy[i] != nullptr) - logerror("bwg: Connector %d with %s\n", i, m_floppy[i]->name()); + logerror("bwg: Connector %d with %s\n", i, m_floppy[i]->name().c_str()); else logerror("bwg: Connector %d has no floppy attached\n", i); } diff --git a/src/devices/bus/ti99_peb/hfdc.cpp b/src/devices/bus/ti99_peb/hfdc.cpp index 698bf2b4f5b..b723c528632 100644 --- a/src/devices/bus/ti99_peb/hfdc.cpp +++ b/src/devices/bus/ti99_peb/hfdc.cpp @@ -914,7 +914,7 @@ 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().c_str(), 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().c_str()); else logerror("%s: FD connector %d has no floppy attached\n", tag().c_str(), i+1); } @@ -922,7 +922,7 @@ void myarc_hfdc_device::device_reset() for (int i=0; i < 3; i++) { if (m_harddisk_unit[i] != nullptr) - logerror("%s: HD connector %d with %s\n", tag().c_str(), 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().c_str()); else logerror("%s: HD connector %d has no drive attached\n", tag().c_str(), i+1); } diff --git a/src/devices/bus/ti99_peb/peribox.cpp b/src/devices/bus/ti99_peb/peribox.cpp index 6da994728bf..6075f4976d3 100644 --- a/src/devices/bus/ti99_peb/peribox.cpp +++ b/src/devices/bus/ti99_peb/peribox.cpp @@ -231,7 +231,7 @@ peribox_device::peribox_device(const machine_config &mconfig, std::string tag, d /* Constructor called from subclasses. */ -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) +peribox_device::peribox_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source), m_console_inta(*this), m_console_intb(*this), diff --git a/src/devices/bus/ti99_peb/peribox.h b/src/devices/bus/ti99_peb/peribox.h index 72b168cd449..0e3cd5f9a31 100644 --- a/src/devices/bus/ti99_peb/peribox.h +++ b/src/devices/bus/ti99_peb/peribox.h @@ -37,7 +37,7 @@ class peribox_device : public bus8z_device friend class peribox_slot_device; public: 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); + peribox_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); template static devcb_base &static_set_inta_callback(device_t &device, _Object object) { return downcast(device).m_console_inta.set_callback(object); } template static devcb_base &static_set_intb_callback(device_t &device, _Object object) { return downcast(device).m_console_intb.set_callback(object); } @@ -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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) + ti_expansion_card_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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/ti_fdc.cpp b/src/devices/bus/ti99_peb/ti_fdc.cpp index 7745e6c9edf..559f1748823 100644 --- a/src/devices/bus/ti99_peb/ti_fdc.cpp +++ b/src/devices/bus/ti99_peb/ti_fdc.cpp @@ -379,7 +379,7 @@ void ti_fdc_device::device_reset() for (int i=0; i < 3; i++) { if (m_floppy[i] != nullptr) - logerror("tifdc: Connector %d with %s\n", i, m_floppy[i]->name()); + logerror("tifdc: Connector %d with %s\n", i, m_floppy[i]->name().c_str()); else logerror("tifdc: No floppy attached to connector %d\n", i); } diff --git a/src/devices/bus/ti99x/gromport.cpp b/src/devices/bus/ti99x/gromport.cpp index c98a8d2e58a..ee74dffd461 100644 --- a/src/devices/bus/ti99x/gromport.cpp +++ b/src/devices/bus/ti99x/gromport.cpp @@ -294,7 +294,7 @@ const device_type GROMPORT_SINGLE = &device_creator; const device_type GROMPORT_MULTI = &device_creator; const device_type GROMPORT_GK = &device_creator; -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) +ti99_cartridge_connector_device::ti99_cartridge_connector_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source), m_gromport(nullptr) { diff --git a/src/devices/bus/ti99x/gromport.h b/src/devices/bus/ti99x/gromport.h index 406b80f5db3..fee22139bb7 100644 --- a/src/devices/bus/ti99x/gromport.h +++ b/src/devices/bus/ti99x/gromport.h @@ -144,7 +144,7 @@ public: UINT16 grom_mask(); protected: - 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); + ti99_cartridge_connector_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual void device_config_complete() override; gromport_device* m_gromport; diff --git a/src/devices/bus/ti99x/joyport.h b/src/devices/bus/ti99x/joyport.h index 019ff14c677..e76be54cf7a 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) + joyport_attached_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_joyport(nullptr) { } diff --git a/src/devices/bus/ti99x/ti99defs.h b/src/devices/bus/ti99x/ti99defs.h index 2f8f31379a9..d260ab5b885 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) + bus8z_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) + bus16z_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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 b4b8a9f0fcf..67b83aefb3a 100644 --- a/src/devices/bus/ti99x/videowrp.cpp +++ b/src/devices/bus/ti99x/videowrp.cpp @@ -27,7 +27,7 @@ /* Constructors */ -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) +ti_video_device::ti_video_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source), m_tms9928a(nullptr) { diff --git a/src/devices/bus/ti99x/videowrp.h b/src/devices/bus/ti99x/videowrp.h index d71d3f90c92..a3db633a394 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + ti_video_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual void device_start(void) override; virtual void device_reset(void) override; virtual DECLARE_READ8Z_MEMBER(readz) 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) + ti_sound_system_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source), m_sound_chip(nullptr), m_console_ready(*this) { }; diff --git a/src/devices/bus/vboy/rom.cpp b/src/devices/bus/vboy/rom.cpp index 19a9791a257..bcff7ce21fb 100644 --- a/src/devices/bus/vboy/rom.cpp +++ b/src/devices/bus/vboy/rom.cpp @@ -21,7 +21,7 @@ const device_type VBOY_ROM_STD = &device_creator; const device_type VBOY_ROM_EEPROM = &device_creator; -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) +vboy_rom_device::vboy_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_vboy_cart_interface( mconfig, *this ) { diff --git a/src/devices/bus/vboy/rom.h b/src/devices/bus/vboy/rom.h index 5da06ed726d..67aa8d62a54 100644 --- a/src/devices/bus/vboy/rom.h +++ b/src/devices/bus/vboy/rom.h @@ -13,7 +13,7 @@ class vboy_rom_device : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); vboy_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/vc4000/rom.cpp b/src/devices/bus/vc4000/rom.cpp index fc74f0c0d05..df9e57a997c 100644 --- a/src/devices/bus/vc4000/rom.cpp +++ b/src/devices/bus/vc4000/rom.cpp @@ -198,7 +198,7 @@ const device_type VC4000_ROM_RAM1K = &device_creator; const device_type VC4000_ROM_CHESS2 = &device_creator; -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) +vc4000_rom_device::vc4000_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_vc4000_cart_interface( mconfig, *this ) { diff --git a/src/devices/bus/vc4000/rom.h b/src/devices/bus/vc4000/rom.h index 3c9d4b80e7d..3b2b4da7641 100644 --- a/src/devices/bus/vc4000/rom.h +++ b/src/devices/bus/vc4000/rom.h @@ -13,7 +13,7 @@ class vc4000_rom_device : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); vc4000_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/vcs/rom.cpp b/src/devices/bus/vcs/rom.cpp index f72aab1725b..b72c7ced2b0 100755 --- a/src/devices/bus/vcs/rom.cpp +++ b/src/devices/bus/vcs/rom.cpp @@ -44,7 +44,7 @@ const device_type A26_ROM_32IN1 = &device_creator; const device_type A26_ROM_X07 = &device_creator; -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) +a26_rom_2k_device::a26_rom_2k_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_vcs_cart_interface( mconfig, *this ) { @@ -63,7 +63,7 @@ a26_rom_4k_device::a26_rom_4k_device(const machine_config &mconfig, std::string } -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_f6_device::a26_rom_f6_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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... { @@ -82,7 +82,7 @@ a26_rom_f4_device::a26_rom_f4_device(const machine_config &mconfig, std::string } -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_f8_device::a26_rom_f8_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : a26_rom_f6_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/bus/vcs/rom.h b/src/devices/bus/vcs/rom.h index e5174b12525..69113d825b9 100755 --- a/src/devices/bus/vcs/rom.h +++ b/src/devices/bus/vcs/rom.h @@ -13,7 +13,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a26_rom_2k_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); a26_rom_2k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides @@ -46,7 +46,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a26_rom_f6_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); a26_rom_f6_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides @@ -86,7 +86,7 @@ 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a26_rom_f8_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); a26_rom_f8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // reading and writing diff --git a/src/devices/bus/vectrex/rom.cpp b/src/devices/bus/vectrex/rom.cpp index 47fbd9a3059..1c109eefa9b 100644 --- a/src/devices/bus/vectrex/rom.cpp +++ b/src/devices/bus/vectrex/rom.cpp @@ -25,7 +25,7 @@ const device_type VECTREX_ROM_64K = &device_creator; const device_type VECTREX_ROM_SRAM = &device_creator; -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) +vectrex_rom_device::vectrex_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_vectrex_cart_interface(mconfig, *this) { diff --git a/src/devices/bus/vectrex/rom.h b/src/devices/bus/vectrex/rom.h index 65bcf94d513..0030339d72a 100644 --- a/src/devices/bus/vectrex/rom.h +++ b/src/devices/bus/vectrex/rom.h @@ -13,7 +13,7 @@ class vectrex_rom_device : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); vectrex_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/wswan/rom.cpp b/src/devices/bus/wswan/rom.cpp index b0c6ddf787e..8562ced80dd 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; const device_type WS_ROM_EEPROM = &device_creator; -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) : +ws_rom_device::ws_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_ws_cart_interface(mconfig, *this), m_base20(0), diff --git a/src/devices/bus/wswan/rom.h b/src/devices/bus/wswan/rom.h index 0d3bbc3a6e8..07e6df5edf2 100644 --- a/src/devices/bus/wswan/rom.h +++ b/src/devices/bus/wswan/rom.h @@ -13,7 +13,7 @@ class ws_rom_device : public device_t, { public: // construction/destruction - 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); ws_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // device-level overrides diff --git a/src/devices/bus/z88/ram.cpp b/src/devices/bus/z88/ram.cpp index 5a534e6564d..2f3fe2975b3 100644 --- a/src/devices/bus/z88/ram.cpp +++ b/src/devices/bus/z88/ram.cpp @@ -38,7 +38,7 @@ z88_32k_ram_device::z88_32k_ram_device(const machine_config &mconfig, std::strin { } -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) +z88_32k_ram_device::z88_32k_ram_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_z88cart_interface( mconfig, *this ), m_ram(nullptr) { diff --git a/src/devices/bus/z88/ram.h b/src/devices/bus/z88/ram.h index b02630b67dc..0ceb051278f 100644 --- a/src/devices/bus/z88/ram.h +++ b/src/devices/bus/z88/ram.h @@ -20,7 +20,7 @@ class z88_32k_ram_device : public device_t, public: // construction/destruction 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); + z88_32k_ram_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); protected: // device-level overrides diff --git a/src/devices/bus/z88/rom.cpp b/src/devices/bus/z88/rom.cpp index aab89859be2..21d5ff34aeb 100644 --- a/src/devices/bus/z88/rom.cpp +++ b/src/devices/bus/z88/rom.cpp @@ -37,7 +37,7 @@ z88_32k_rom_device::z88_32k_rom_device(const machine_config &mconfig, std::strin { } -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) +z88_32k_rom_device::z88_32k_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_z88cart_interface( mconfig, *this ), m_rom(nullptr) { diff --git a/src/devices/bus/z88/rom.h b/src/devices/bus/z88/rom.h index 696ee31f41c..835fa3a54a5 100644 --- a/src/devices/bus/z88/rom.h +++ b/src/devices/bus/z88/rom.h @@ -20,7 +20,7 @@ class z88_32k_rom_device : public device_t, public: // construction/destruction 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); + z88_32k_rom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); protected: // device-level overrides diff --git a/src/devices/cpu/adsp2100/adsp2100.cpp b/src/devices/cpu/adsp2100/adsp2100.cpp index c55257331f2..0c6b951c59e 100644 --- a/src/devices/cpu/adsp2100/adsp2100.cpp +++ b/src/devices/cpu/adsp2100/adsp2100.cpp @@ -119,7 +119,7 @@ const device_type ADSP2181 = &device_creator; // adsp21xx_device - constructor //------------------------------------------------- -adsp21xx_device::adsp21xx_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 chiptype, const char *shortname, const char *source) +adsp21xx_device::adsp21xx_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 chiptype, std::string shortname, std::string source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source), m_program_config("program", ENDIANNESS_LITTLE, 32, 14, -2), m_data_config("data", ENDIANNESS_LITTLE, 16, 14, -1), @@ -253,7 +253,7 @@ adsp2100_device::adsp2100_device(const machine_config &mconfig, std::string tag, adsp2101_device::adsp2101_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : adsp21xx_device(mconfig, ADSP2101, "ADSP-2101", tag, owner, clock, CHIP_TYPE_ADSP2101, "adsp2101", __FILE__) { } -adsp2101_device::adsp2101_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 chiptype, const char *shortname, const char *source) +adsp2101_device::adsp2101_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 chiptype, std::string shortname, std::string source) : adsp21xx_device(mconfig, type, name, tag, owner, clock, chiptype, shortname, source) { } adsp2104_device::adsp2104_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) diff --git a/src/devices/cpu/adsp2100/adsp2100.h b/src/devices/cpu/adsp2100/adsp2100.h index 6fc3a295e13..a360bcd59f6 100644 --- a/src/devices/cpu/adsp2100/adsp2100.h +++ b/src/devices/cpu/adsp2100/adsp2100.h @@ -212,7 +212,7 @@ protected: }; // construction/destruction - adsp21xx_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 chiptype, const char *shortname, const char *source); + adsp21xx_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 chiptype, std::string shortname, std::string source); virtual ~adsp21xx_device(); public: @@ -507,7 +507,7 @@ public: adsp2101_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); protected: - adsp2101_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 chiptype, const char *shortname, const char *source); + adsp2101_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 chiptype, std::string shortname, std::string source); // device_execute_interface overrides virtual UINT32 execute_input_lines() const override; diff --git a/src/devices/cpu/alph8201/alph8201.cpp b/src/devices/cpu/alph8201/alph8201.cpp index 81756a1c334..4e831a121df 100644 --- a/src/devices/cpu/alph8201/alph8201.cpp +++ b/src/devices/cpu/alph8201/alph8201.cpp @@ -194,7 +194,7 @@ alpha8201_cpu_device::alpha8201_cpu_device(const machine_config &mconfig, std::s } -alpha8201_cpu_device::alpha8201_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +alpha8201_cpu_device::alpha8201_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_LITTLE, 8, 10, 0) , m_io_config("io", ENDIANNESS_LITTLE, 8, 6, 0) diff --git a/src/devices/cpu/alph8201/alph8201.h b/src/devices/cpu/alph8201/alph8201.h index 8a234a9b12c..507d51d7d02 100644 --- a/src/devices/cpu/alph8201/alph8201.h +++ b/src/devices/cpu/alph8201/alph8201.h @@ -55,7 +55,7 @@ class alpha8201_cpu_device : public cpu_device public: // construction/destruction alpha8201_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - alpha8201_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + alpha8201_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); protected: // device-level overrides diff --git a/src/devices/cpu/amis2000/amis2000.h b/src/devices/cpu/amis2000/amis2000.h index 95eea213f41..4896b5716c3 100644 --- a/src/devices/cpu/amis2000/amis2000.h +++ b/src/devices/cpu/amis2000/amis2000.h @@ -44,7 +44,7 @@ class amis2000_base_device : public cpu_device { public: // construction/destruction - amis2000_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 bu_bits, UINT8 callstack_bits, UINT8 callstack_depth, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source) + amis2000_base_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT8 bu_bits, UINT8 callstack_bits, UINT8 callstack_depth, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, std::string shortname, std::string source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_BIG, 8, prgwidth, 0, program) , m_data_config("data", ENDIANNESS_BIG, 8, datawidth, 0, data) diff --git a/src/devices/cpu/arm/arm.cpp b/src/devices/cpu/arm/arm.cpp index 591253c5087..f2aa0747724 100644 --- a/src/devices/cpu/arm/arm.cpp +++ b/src/devices/cpu/arm/arm.cpp @@ -238,7 +238,7 @@ arm_cpu_device::arm_cpu_device(const machine_config &mconfig, std::string tag, d } -arm_cpu_device::arm_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, endianness_t endianness) +arm_cpu_device::arm_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, endianness_t endianness) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", endianness, 32, 26, 0) , m_endian(endianness) diff --git a/src/devices/cpu/arm/arm.h b/src/devices/cpu/arm/arm.h index 947dc8a8e5f..12d2dade745 100644 --- a/src/devices/cpu/arm/arm.h +++ b/src/devices/cpu/arm/arm.h @@ -41,7 +41,7 @@ class arm_cpu_device : public cpu_device public: // construction/destruction arm_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - arm_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, endianness_t endianness); + arm_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, endianness_t endianness); static void set_copro_type(device_t &device, int type) { downcast(device).m_copro_type = type; } diff --git a/src/devices/cpu/arm7/arm7.cpp b/src/devices/cpu/arm7/arm7.cpp index aacf55983f8..04181d95c3d 100644 --- a/src/devices/cpu/arm7/arm7.cpp +++ b/src/devices/cpu/arm7/arm7.cpp @@ -67,7 +67,7 @@ arm7_cpu_device::arm7_cpu_device(const machine_config &mconfig, std::string tag, } -arm7_cpu_device::arm7_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, UINT8 archRev, UINT8 archFlags, endianness_t endianness) +arm7_cpu_device::arm7_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, UINT8 archRev, UINT8 archFlags, endianness_t endianness) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", endianness, 32, 32, 0) , m_endian(endianness) diff --git a/src/devices/cpu/arm7/arm7.h b/src/devices/cpu/arm7/arm7.h index c1301741acb..7aa1a30134a 100644 --- a/src/devices/cpu/arm7/arm7.h +++ b/src/devices/cpu/arm7/arm7.h @@ -51,7 +51,7 @@ class arm7_cpu_device : public cpu_device public: // construction/destruction arm7_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - arm7_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, UINT8 archRev, UINT8 archFlags, endianness_t endianness = ENDIANNESS_LITTLE); + arm7_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, UINT8 archRev, UINT8 archFlags, endianness_t endianness = ENDIANNESS_LITTLE); protected: // device-level overrides diff --git a/src/devices/cpu/avr8/avr8.cpp b/src/devices/cpu/avr8/avr8.cpp index 590b058aa01..fc3c93d3b9e 100644 --- a/src/devices/cpu/avr8/avr8.cpp +++ b/src/devices/cpu/avr8/avr8.cpp @@ -632,7 +632,7 @@ atmega2560_device::atmega2560_device(const machine_config &mconfig, std::string // avr8_device - constructor //------------------------------------------------- -avr8_device::avr8_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock, const device_type type, UINT32 addr_mask, address_map_constructor internal_map, UINT8 cpu_type, const char *shortname, const char *source) +avr8_device::avr8_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock, const device_type type, UINT32 addr_mask, address_map_constructor internal_map, UINT8 cpu_type, std::string shortname, std::string source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source), m_shifted_pc(0), m_program_config("program", ENDIANNESS_LITTLE, 8, 22), diff --git a/src/devices/cpu/avr8/avr8.h b/src/devices/cpu/avr8/avr8.h index 089202fa1ac..3a4a73188ca 100644 --- a/src/devices/cpu/avr8/avr8.h +++ b/src/devices/cpu/avr8/avr8.h @@ -109,7 +109,7 @@ protected: CPU_TYPE_ATMEGA2560 }; - avr8_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock, const device_type type, UINT32 address_mask, address_map_constructor internal_map, UINT8 cpu_type, const char *shortname, const char *source); + avr8_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock, const device_type type, UINT32 address_mask, address_map_constructor internal_map, UINT8 cpu_type, std::string shortname, std::string source); // device-level overrides virtual void device_start() override; diff --git a/src/devices/cpu/cop400/cop400.cpp b/src/devices/cpu/cop400/cop400.cpp index f4d3453cb85..03b15ba1f43 100644 --- a/src/devices/cpu/cop400/cop400.cpp +++ b/src/devices/cpu/cop400/cop400.cpp @@ -166,7 +166,7 @@ ADDRESS_MAP_END #endif -cop400_cpu_device::cop400_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, UINT8 program_addr_bits, UINT8 data_addr_bits, UINT8 featuremask, UINT8 g_mask, UINT8 d_mask, UINT8 in_mask, bool has_counter, bool has_inil, address_map_constructor internal_map_program, address_map_constructor internal_map_data) +cop400_cpu_device::cop400_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, UINT8 program_addr_bits, UINT8 data_addr_bits, UINT8 featuremask, UINT8 g_mask, UINT8 d_mask, UINT8 in_mask, bool has_counter, bool has_inil, address_map_constructor internal_map_program, address_map_constructor internal_map_data) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_LITTLE, 8, program_addr_bits, 0, internal_map_program) , m_data_config("data", ENDIANNESS_LITTLE, 8, data_addr_bits, 0, internal_map_data) // data width is really 4 diff --git a/src/devices/cpu/cop400/cop400.h b/src/devices/cpu/cop400/cop400.h index a647bbea107..14c82bde476 100644 --- a/src/devices/cpu/cop400/cop400.h +++ b/src/devices/cpu/cop400/cop400.h @@ -128,7 +128,7 @@ class cop400_cpu_device : public cpu_device { public: // construction/destruction - cop400_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, UINT8 program_addr_bits, UINT8 data_addr_bits, UINT8 featuremask, UINT8 g_mask, UINT8 d_mask, UINT8 in_mask, bool has_counter, bool has_inil, address_map_constructor internal_map_program, address_map_constructor internal_map_data); + cop400_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, UINT8 program_addr_bits, UINT8 data_addr_bits, UINT8 featuremask, UINT8 g_mask, UINT8 d_mask, UINT8 in_mask, bool has_counter, bool has_inil, address_map_constructor internal_map_program, address_map_constructor internal_map_data); virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; diff --git a/src/devices/cpu/cosmac/cosmac.cpp b/src/devices/cpu/cosmac/cosmac.cpp index c4cd2ff04d9..b553a40de87 100644 --- a/src/devices/cpu/cosmac/cosmac.cpp +++ b/src/devices/cpu/cosmac/cosmac.cpp @@ -268,7 +268,7 @@ const device_type CDP1802 = &device_creator; // cosmac_device - constructor //------------------------------------------------- -cosmac_device::cosmac_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +cosmac_device::cosmac_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source), m_program_config("program", ENDIANNESS_LITTLE, 8, 16), m_io_config("io", ENDIANNESS_LITTLE, 8, 3), diff --git a/src/devices/cpu/cosmac/cosmac.h b/src/devices/cpu/cosmac/cosmac.h index 6695a62dd8e..09f3199a0fb 100644 --- a/src/devices/cpu/cosmac/cosmac.h +++ b/src/devices/cpu/cosmac/cosmac.h @@ -190,7 +190,7 @@ class cosmac_device : public cpu_device { public: // construction/destruction - cosmac_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + cosmac_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); template static devcb_base &set_wait_rd_callback(device_t &device, _Object object) { return downcast(device).m_read_wait.set_callback(object); } template static devcb_base &set_clear_rd_callback(device_t &device, _Object object) { return downcast(device).m_read_clear.set_callback(object); } diff --git a/src/devices/cpu/e0c6200/e0c6200.h b/src/devices/cpu/e0c6200/e0c6200.h index 62c2f8dced7..c8f9acfc0cc 100644 --- a/src/devices/cpu/e0c6200/e0c6200.h +++ b/src/devices/cpu/e0c6200/e0c6200.h @@ -16,7 +16,7 @@ class e0c6200_cpu_device : public cpu_device { public: // construction/destruction - e0c6200_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, address_map_constructor program, address_map_constructor data, const char *shortname, const char *source) + e0c6200_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, address_map_constructor program, address_map_constructor data, std::string shortname, std::string source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_BIG, 16, 13, -1, program) , m_data_config("data", ENDIANNESS_BIG, 8, 12, 0, data), m_program(nullptr), m_data(nullptr), m_op(0), m_prev_op(0), m_irq_vector(0), m_irq_id(0), m_possible_irq(false), m_halt(false), diff --git a/src/devices/cpu/e132xs/e132xs.cpp b/src/devices/cpu/e132xs/e132xs.cpp index 961a16f3809..9b50b28e2cf 100644 --- a/src/devices/cpu/e132xs/e132xs.cpp +++ b/src/devices/cpu/e132xs/e132xs.cpp @@ -293,7 +293,7 @@ ADDRESS_MAP_END //------------------------------------------------- hyperstone_device::hyperstone_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock, - const device_type type, UINT32 prg_data_width, UINT32 io_data_width, address_map_constructor internal_map, const char *shortname, const char *source) + const device_type type, UINT32 prg_data_width, UINT32 io_data_width, address_map_constructor internal_map, std::string shortname, std::string source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source), m_program_config("program", ENDIANNESS_BIG, prg_data_width, 32, 0, internal_map), m_io_config("io", ENDIANNESS_BIG, io_data_width, 15), diff --git a/src/devices/cpu/e132xs/e132xs.h b/src/devices/cpu/e132xs/e132xs.h index 75291e1b0f1..c4fd8067813 100644 --- a/src/devices/cpu/e132xs/e132xs.h +++ b/src/devices/cpu/e132xs/e132xs.h @@ -213,7 +213,7 @@ class hyperstone_device : public cpu_device public: // construction/destruction hyperstone_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock, - const device_type type, UINT32 prg_data_width, UINT32 io_data_width, address_map_constructor internal_map, const char *shortname, const char *source); + const device_type type, UINT32 prg_data_width, UINT32 io_data_width, address_map_constructor internal_map, std::string shortname, std::string source); // public interfaces diff --git a/src/devices/cpu/g65816/g65816.cpp b/src/devices/cpu/g65816/g65816.cpp index 5aad79b391c..584616d0ee9 100644 --- a/src/devices/cpu/g65816/g65816.cpp +++ b/src/devices/cpu/g65816/g65816.cpp @@ -105,7 +105,7 @@ g65816_device::g65816_device(const machine_config &mconfig, std::string tag, dev } -g65816_device::g65816_device(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 cpu_type, address_map_constructor internal) +g65816_device::g65816_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, int cpu_type, address_map_constructor internal) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_LITTLE, 8, 24, 0, internal) , m_cpu_type(cpu_type) diff --git a/src/devices/cpu/g65816/g65816.h b/src/devices/cpu/g65816/g65816.h index 33df92d71a8..625d327771a 100644 --- a/src/devices/cpu/g65816/g65816.h +++ b/src/devices/cpu/g65816/g65816.h @@ -60,7 +60,7 @@ class g65816_device : public cpu_device public: // construction/destruction g65816_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - g65816_device(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 cpu_type, address_map_constructor internal = nullptr); + g65816_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, int cpu_type, address_map_constructor internal = nullptr); void set_read_vector_callback(read8_delegate read_vector); diff --git a/src/devices/cpu/h8/h8.cpp b/src/devices/cpu/h8/h8.cpp index 302c466cbd3..e5d74bb1b3a 100644 --- a/src/devices/cpu/h8/h8.cpp +++ b/src/devices/cpu/h8/h8.cpp @@ -13,7 +13,7 @@ #include "debugger.h" #include "h8.h" -h8_device::h8_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, bool mode_a16, address_map_delegate map_delegate) : +h8_device::h8_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, bool mode_a16, address_map_delegate map_delegate) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source), program_config("program", ENDIANNESS_BIG, 16, mode_a16 ? 16 : 24, 0, map_delegate), io_config("io", ENDIANNESS_BIG, 16, 16, -1), program(nullptr), io(nullptr), direct(nullptr), PPC(0), NPC(0), PC(0), PIR(0), EXR(0), CCR(0), MAC(0), MACF(0), diff --git a/src/devices/cpu/h8/h8.h b/src/devices/cpu/h8/h8.h index 26087de3314..2b5ff0631ba 100644 --- a/src/devices/cpu/h8/h8.h +++ b/src/devices/cpu/h8/h8.h @@ -46,7 +46,7 @@ public: ADC_7 }; - h8_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, bool mode_a16, address_map_delegate map_delegate); + h8_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, bool mode_a16, address_map_delegate map_delegate); void internal_update(); diff --git a/src/devices/cpu/h8/h83006.cpp b/src/devices/cpu/h8/h83006.cpp index 2ccbdfe08fb..4a499f885fe 100644 --- a/src/devices/cpu/h8/h83006.cpp +++ b/src/devices/cpu/h8/h83006.cpp @@ -7,7 +7,7 @@ const device_type H83006 = &device_creator; const device_type H83007 = &device_creator; -h83006_device::h83006_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +h83006_device::h83006_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : h8h_device(mconfig, type, name, tag, owner, clock, shortname, source, address_map_delegate(FUNC(h83006_device::map), this)), intc(*this, "intc"), adc(*this, "adc"), diff --git a/src/devices/cpu/h8/h83006.h b/src/devices/cpu/h8/h83006.h index 576c3a45273..62ac904228b 100644 --- a/src/devices/cpu/h8/h83006.h +++ b/src/devices/cpu/h8/h83006.h @@ -24,7 +24,7 @@ class h83006_device : public h8h_device { public: - h83006_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + h83006_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); h83006_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER(syscr_r); diff --git a/src/devices/cpu/h8/h83048.cpp b/src/devices/cpu/h8/h83048.cpp index fd37a324fe6..52e6d8a3b98 100644 --- a/src/devices/cpu/h8/h83048.cpp +++ b/src/devices/cpu/h8/h83048.cpp @@ -8,7 +8,7 @@ const device_type H83045 = &device_creator; const device_type H83047 = &device_creator; const device_type H83048 = &device_creator; -h83048_device::h83048_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +h83048_device::h83048_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : h8h_device(mconfig, type, name, tag, owner, clock, shortname, source, address_map_delegate(FUNC(h83048_device::map), this)), intc(*this, "intc"), adc(*this, "adc"), diff --git a/src/devices/cpu/h8/h83048.h b/src/devices/cpu/h8/h83048.h index bf7e02848d1..c87f2f9003d 100644 --- a/src/devices/cpu/h8/h83048.h +++ b/src/devices/cpu/h8/h83048.h @@ -31,7 +31,7 @@ class h83048_device : public h8h_device { public: - h83048_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + h83048_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); h83048_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER(syscr_r); diff --git a/src/devices/cpu/h8/h83337.cpp b/src/devices/cpu/h8/h83337.cpp index 64b3608ebf7..3cbc27d5d1f 100644 --- a/src/devices/cpu/h8/h83337.cpp +++ b/src/devices/cpu/h8/h83337.cpp @@ -8,7 +8,7 @@ const device_type H83336 = &device_creator; const device_type H83337 = &device_creator; -h83337_device::h83337_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +h83337_device::h83337_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : h8_device(mconfig, type, name, tag, owner, clock, shortname, source, true, address_map_delegate(FUNC(h83337_device::map), this)), intc(*this, "intc"), adc(*this, "adc"), diff --git a/src/devices/cpu/h8/h83337.h b/src/devices/cpu/h8/h83337.h index 87cef30e2a0..f7bebec26ad 100644 --- a/src/devices/cpu/h8/h83337.h +++ b/src/devices/cpu/h8/h83337.h @@ -31,7 +31,7 @@ class h83337_device : public h8_device { public: - h83337_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + h83337_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); h83337_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER(wscr_r); diff --git a/src/devices/cpu/h8/h8_adc.cpp b/src/devices/cpu/h8/h8_adc.cpp index cb028de02f0..6e58c6f9875 100644 --- a/src/devices/cpu/h8/h8_adc.cpp +++ b/src/devices/cpu/h8/h8_adc.cpp @@ -10,7 +10,7 @@ const device_type H8_ADC_2320 = &device_creator; const device_type H8_ADC_2357 = &device_creator; const device_type H8_ADC_2655 = &device_creator; -h8_adc_device::h8_adc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +h8_adc_device::h8_adc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), cpu(*this, DEVICE_SELF_OWNER), intc(nullptr), io(nullptr), intc_vector(0), adcsr(0), adcr(0), register_mask(0), trigger(0), start_mode(0), start_channel(0), end_channel(0), start_count(0), mode(0), channel(0), count(0), analog_powered(false), adtrg(false), next_event(0) diff --git a/src/devices/cpu/h8/h8_adc.h b/src/devices/cpu/h8/h8_adc.h index c55b2dd2b16..e10efcd2f30 100644 --- a/src/devices/cpu/h8/h8_adc.h +++ b/src/devices/cpu/h8/h8_adc.h @@ -39,7 +39,7 @@ class h8_adc_device : public device_t { public: - h8_adc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + h8_adc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); void set_info(std::string intc_tag, int vect); diff --git a/src/devices/cpu/h8/h8_intc.cpp b/src/devices/cpu/h8/h8_intc.cpp index 1e8e53591a9..1f9f1c4bbe5 100644 --- a/src/devices/cpu/h8/h8_intc.cpp +++ b/src/devices/cpu/h8/h8_intc.cpp @@ -15,7 +15,7 @@ h8_intc_device::h8_intc_device(const machine_config &mconfig, std::string tag, d irq_vector_nmi = 3; } -h8_intc_device::h8_intc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +h8_intc_device::h8_intc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), irq_vector_base(0), irq_vector_nmi(0), cpu(*this, DEVICE_SELF_OWNER), nmi_input(false), irq_input(0), ier(0), isr(0), iscr(0), icr_filter(0), ipr_filter(0) { @@ -198,7 +198,7 @@ h8h_intc_device::h8h_intc_device(const machine_config &mconfig, std::string tag, irq_vector_nmi = 7; } -h8h_intc_device::h8h_intc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +h8h_intc_device::h8h_intc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : h8_intc_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/cpu/h8/h8_intc.h b/src/devices/cpu/h8/h8_intc.h index 0ba1fdb3da5..0e07591c8f5 100644 --- a/src/devices/cpu/h8/h8_intc.h +++ b/src/devices/cpu/h8/h8_intc.h @@ -27,7 +27,7 @@ class h8_intc_device : public device_t { public: h8_intc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - h8_intc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + h8_intc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); int interrupt_taken(int vector); void internal_interrupt(int vector); @@ -69,7 +69,7 @@ protected: class h8h_intc_device : public h8_intc_device { public: h8h_intc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - h8h_intc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + h8h_intc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); DECLARE_READ8_MEMBER(isr_r); DECLARE_WRITE8_MEMBER(isr_w); diff --git a/src/devices/cpu/h8/h8_timer16.cpp b/src/devices/cpu/h8/h8_timer16.cpp index 2e7645f59b1..35822637f55 100644 --- a/src/devices/cpu/h8/h8_timer16.cpp +++ b/src/devices/cpu/h8/h8_timer16.cpp @@ -18,7 +18,7 @@ h8_timer16_channel_device::h8_timer16_channel_device(const machine_config &mconf chain_tag.clear(); } -h8_timer16_channel_device::h8_timer16_channel_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +h8_timer16_channel_device::h8_timer16_channel_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), cpu(*this, "^^"), chained_timer(nullptr), intc(nullptr), tier_mask(0), tgr_count(0), tbr_count(0), tgr_clearing(0), tcr(0), tier(0), ier(0), isr(0), clock_type(0), clock_divider(0), tcnt(0), last_clock_update(0), event_time(0), phase(0), counter_cycle(0), counter_incrementing(false), channel_active(false) diff --git a/src/devices/cpu/h8/h8_timer16.h b/src/devices/cpu/h8/h8_timer16.h index 92382bb2c06..2a54426e64e 100644 --- a/src/devices/cpu/h8/h8_timer16.h +++ b/src/devices/cpu/h8/h8_timer16.h @@ -74,7 +74,7 @@ public: h8_timer16_channel_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - h8_timer16_channel_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + h8_timer16_channel_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); void set_info(int tgr_count, int tbr_count, std::string intc, int irq_base); diff --git a/src/devices/cpu/h8/h8_timer8.cpp b/src/devices/cpu/h8/h8_timer8.cpp index 762977d01ae..684cd3d3b2d 100644 --- a/src/devices/cpu/h8/h8_timer8.cpp +++ b/src/devices/cpu/h8/h8_timer8.cpp @@ -13,7 +13,7 @@ h8_timer8_channel_device::h8_timer8_channel_device(const machine_config &mconfig { } -h8_timer8_channel_device::h8_timer8_channel_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +h8_timer8_channel_device::h8_timer8_channel_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), cpu(*this, "^"), chained_timer(nullptr), intc(nullptr), irq_ca(0), irq_cb(0), irq_v(0), chain_type(0), tcr(0), tcsr(0), tcnt(0), extra_clock_bit(false), has_adte(false), has_ice(false), clock_type(0), clock_divider(0), clear_type(0), counter_cycle(0), last_clock_update(0), event_time(0) diff --git a/src/devices/cpu/h8/h8_timer8.h b/src/devices/cpu/h8/h8_timer8.h index c6be16fa6e8..a70712aec39 100644 --- a/src/devices/cpu/h8/h8_timer8.h +++ b/src/devices/cpu/h8/h8_timer8.h @@ -36,7 +36,7 @@ public: }; h8_timer8_channel_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - h8_timer8_channel_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + h8_timer8_channel_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); void set_info(std::string intc, int irq_ca, int irq_cb, int irq_v, int div1, int div2, int div3, int div4, int div5, int div6); diff --git a/src/devices/cpu/h8/h8h.cpp b/src/devices/cpu/h8/h8h.cpp index 7dc7a86b98e..7ad65386b2d 100644 --- a/src/devices/cpu/h8/h8h.cpp +++ b/src/devices/cpu/h8/h8h.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "h8h.h" -h8h_device::h8h_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, address_map_delegate map_delegate) : +h8h_device::h8h_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, address_map_delegate map_delegate) : h8_device(mconfig, type, name, tag, owner, clock, shortname, source, false, map_delegate) { supports_advanced = true; diff --git a/src/devices/cpu/h8/h8h.h b/src/devices/cpu/h8/h8h.h index 8c908cb1c95..c1dfd80f7bb 100644 --- a/src/devices/cpu/h8/h8h.h +++ b/src/devices/cpu/h8/h8h.h @@ -18,7 +18,7 @@ class h8h_device : public h8_device { public: - h8h_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, address_map_delegate map_delegate); + h8h_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, address_map_delegate map_delegate); protected: static const disasm_entry disasm_entries[]; diff --git a/src/devices/cpu/h8/h8s2000.cpp b/src/devices/cpu/h8/h8s2000.cpp index 1b86ca1de3b..45129537de4 100644 --- a/src/devices/cpu/h8/h8s2000.cpp +++ b/src/devices/cpu/h8/h8s2000.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "h8s2000.h" -h8s2000_device::h8s2000_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, address_map_delegate map_delegate) : +h8s2000_device::h8s2000_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, address_map_delegate map_delegate) : h8h_device(mconfig, type, name, tag, owner, clock, shortname, source, map_delegate) { has_exr = true; diff --git a/src/devices/cpu/h8/h8s2000.h b/src/devices/cpu/h8/h8s2000.h index 9abae61de89..4b1f1c14ec5 100644 --- a/src/devices/cpu/h8/h8s2000.h +++ b/src/devices/cpu/h8/h8s2000.h @@ -19,7 +19,7 @@ class h8s2000_device : public h8h_device { public: - h8s2000_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, address_map_delegate map_delegate); + h8s2000_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, address_map_delegate map_delegate); protected: static const disasm_entry disasm_entries[]; diff --git a/src/devices/cpu/h8/h8s2245.cpp b/src/devices/cpu/h8/h8s2245.cpp index 2050b249d1b..09dff096e6f 100644 --- a/src/devices/cpu/h8/h8s2245.cpp +++ b/src/devices/cpu/h8/h8s2245.cpp @@ -9,7 +9,7 @@ const device_type H8S2245 = &device_creator; const device_type H8S2246 = &device_creator; -h8s2245_device::h8s2245_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +h8s2245_device::h8s2245_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : h8s2000_device(mconfig, type, name, tag, owner, clock, shortname, source, address_map_delegate(FUNC(h8s2245_device::map), this)), intc(*this, "intc"), adc(*this, "adc"), diff --git a/src/devices/cpu/h8/h8s2245.h b/src/devices/cpu/h8/h8s2245.h index 6b7f25d4f1d..32d6810c975 100644 --- a/src/devices/cpu/h8/h8s2245.h +++ b/src/devices/cpu/h8/h8s2245.h @@ -31,7 +31,7 @@ class h8s2245_device : public h8s2000_device { public: - h8s2245_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + h8s2245_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); h8s2245_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER(syscr_r); diff --git a/src/devices/cpu/h8/h8s2320.cpp b/src/devices/cpu/h8/h8s2320.cpp index a08a9d1c4e3..15433e5d36c 100644 --- a/src/devices/cpu/h8/h8s2320.cpp +++ b/src/devices/cpu/h8/h8s2320.cpp @@ -14,7 +14,7 @@ const device_type H8S2328 = &device_creator; const device_type H8S2329 = &device_creator; -h8s2320_device::h8s2320_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +h8s2320_device::h8s2320_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : h8s2000_device(mconfig, type, name, tag, owner, clock, shortname, source, address_map_delegate(FUNC(h8s2320_device::map), this)), intc(*this, "intc"), adc(*this, "adc"), diff --git a/src/devices/cpu/h8/h8s2320.h b/src/devices/cpu/h8/h8s2320.h index 9e64ebbc111..41fd0a5074b 100644 --- a/src/devices/cpu/h8/h8s2320.h +++ b/src/devices/cpu/h8/h8s2320.h @@ -36,7 +36,7 @@ class h8s2320_device : public h8s2000_device { public: - h8s2320_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + h8s2320_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); h8s2320_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER(syscr_r); diff --git a/src/devices/cpu/h8/h8s2357.cpp b/src/devices/cpu/h8/h8s2357.cpp index 4585d9c8c42..7c1078d7d17 100644 --- a/src/devices/cpu/h8/h8s2357.cpp +++ b/src/devices/cpu/h8/h8s2357.cpp @@ -10,7 +10,7 @@ const device_type H8S2394 = &device_creator; const device_type H8S2392 = &device_creator; const device_type H8S2390 = &device_creator; -h8s2357_device::h8s2357_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +h8s2357_device::h8s2357_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : h8s2000_device(mconfig, type, name, tag, owner, clock, shortname, source, address_map_delegate(FUNC(h8s2357_device::map), this)), intc(*this, "intc"), adc(*this, "adc"), diff --git a/src/devices/cpu/h8/h8s2357.h b/src/devices/cpu/h8/h8s2357.h index 81bc13b6db2..55ebf81dea9 100644 --- a/src/devices/cpu/h8/h8s2357.h +++ b/src/devices/cpu/h8/h8s2357.h @@ -33,7 +33,7 @@ class h8s2357_device : public h8s2000_device { public: - h8s2357_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + h8s2357_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); h8s2357_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER(syscr_r); diff --git a/src/devices/cpu/h8/h8s2600.cpp b/src/devices/cpu/h8/h8s2600.cpp index f7c6a0ce12f..de5b15e2c22 100644 --- a/src/devices/cpu/h8/h8s2600.cpp +++ b/src/devices/cpu/h8/h8s2600.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "h8s2600.h" -h8s2600_device::h8s2600_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, address_map_delegate map_delegate) : +h8s2600_device::h8s2600_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, address_map_delegate map_delegate) : h8s2000_device(mconfig, type, name, tag, owner, clock, shortname, source, map_delegate) { } diff --git a/src/devices/cpu/h8/h8s2600.h b/src/devices/cpu/h8/h8s2600.h index ed3f4abd5ae..9c0741137ea 100644 --- a/src/devices/cpu/h8/h8s2600.h +++ b/src/devices/cpu/h8/h8s2600.h @@ -18,7 +18,7 @@ class h8s2600_device : public h8s2000_device { public: - h8s2600_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, address_map_delegate map_delegate); + h8s2600_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, address_map_delegate map_delegate); protected: static const disasm_entry disasm_entries[]; diff --git a/src/devices/cpu/h8/h8s2655.cpp b/src/devices/cpu/h8/h8s2655.cpp index 4ff5b406a86..5445053770e 100644 --- a/src/devices/cpu/h8/h8s2655.cpp +++ b/src/devices/cpu/h8/h8s2655.cpp @@ -6,7 +6,7 @@ const device_type H8S2655 = &device_creator; const device_type H8S2653 = &device_creator; -h8s2655_device::h8s2655_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +h8s2655_device::h8s2655_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : h8s2600_device(mconfig, type, name, tag, owner, clock, shortname, source, address_map_delegate(FUNC(h8s2655_device::map), this)), intc(*this, "intc"), adc(*this, "adc"), diff --git a/src/devices/cpu/h8/h8s2655.h b/src/devices/cpu/h8/h8s2655.h index 4ee16c1ecf6..49bcdc7b3a0 100644 --- a/src/devices/cpu/h8/h8s2655.h +++ b/src/devices/cpu/h8/h8s2655.h @@ -25,7 +25,7 @@ class h8s2655_device : public h8s2600_device { public: - h8s2655_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + h8s2655_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); h8s2655_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER(syscr_r); diff --git a/src/devices/cpu/hmcs40/hmcs40.cpp b/src/devices/cpu/hmcs40/hmcs40.cpp index f1a86de7775..4e3dc90f60c 100644 --- a/src/devices/cpu/hmcs40/hmcs40.cpp +++ b/src/devices/cpu/hmcs40/hmcs40.cpp @@ -78,7 +78,7 @@ ADDRESS_MAP_END // device definitions -hmcs43_cpu_device::hmcs43_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT16 polarity, const char *shortname) +hmcs43_cpu_device::hmcs43_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT16 polarity, const char *shortname) : hmcs40_cpu_device(mconfig, type, name, tag, owner, clock, HMCS40_FAMILY_HMCS43, polarity, 3 /* stack levels */, 10 /* pc width */, 11 /* prg width */, ADDRESS_MAP_NAME(program_1k), 7 /* data width */, ADDRESS_MAP_NAME(data_80x4), shortname, __FILE__) { } @@ -96,7 +96,7 @@ hd44758_device::hd44758_device(const machine_config &mconfig, std::string tag, d { } -hmcs44_cpu_device::hmcs44_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT16 polarity, const char *shortname) +hmcs44_cpu_device::hmcs44_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT16 polarity, const char *shortname) : hmcs40_cpu_device(mconfig, type, name, tag, owner, clock, HMCS40_FAMILY_HMCS44, polarity, 4, 11, 12, ADDRESS_MAP_NAME(program_2k), 8, ADDRESS_MAP_NAME(data_160x4), shortname, __FILE__) { } @@ -114,7 +114,7 @@ hd44808_device::hd44808_device(const machine_config &mconfig, std::string tag, d { } -hmcs45_cpu_device::hmcs45_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT16 polarity, const char *shortname) +hmcs45_cpu_device::hmcs45_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT16 polarity, const char *shortname) : hmcs40_cpu_device(mconfig, type, name, tag, owner, clock, HMCS40_FAMILY_HMCS45, polarity, 4, 11, 12, ADDRESS_MAP_NAME(program_2k), 8, ADDRESS_MAP_NAME(data_160x4), shortname, __FILE__) { } diff --git a/src/devices/cpu/hmcs40/hmcs40.h b/src/devices/cpu/hmcs40/hmcs40.h index 24ef5adba9e..337748d11a6 100644 --- a/src/devices/cpu/hmcs40/hmcs40.h +++ b/src/devices/cpu/hmcs40/hmcs40.h @@ -116,7 +116,7 @@ class hmcs40_cpu_device : public cpu_device { public: // construction/destruction - hmcs40_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, int family, UINT16 polarity, int stack_levels, int pcwidth, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source) + hmcs40_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, int family, UINT16 polarity, int stack_levels, int pcwidth, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, std::string shortname, std::string source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_LITTLE, 16, prgwidth, -1, program) , m_data_config("data", ENDIANNESS_LITTLE, 8, datawidth, 0, data) @@ -349,7 +349,7 @@ protected: class hmcs43_cpu_device : public hmcs40_cpu_device { public: - hmcs43_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT16 polarity, const char *shortname); + hmcs43_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT16 polarity, const char *shortname); protected: // overrides @@ -386,7 +386,7 @@ public: class hmcs44_cpu_device : public hmcs40_cpu_device { public: - hmcs44_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT16 polarity, const char *shortname); + hmcs44_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT16 polarity, const char *shortname); protected: // overrides @@ -422,7 +422,7 @@ public: class hmcs45_cpu_device : public hmcs40_cpu_device { public: - hmcs45_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT16 polarity, const char *shortname); + hmcs45_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT16 polarity, const char *shortname); protected: // overrides diff --git a/src/devices/cpu/hphybrid/hphybrid.cpp b/src/devices/cpu/hphybrid/hphybrid.cpp index 54c09e694bd..1b432bc1b96 100644 --- a/src/devices/cpu/hphybrid/hphybrid.cpp +++ b/src/devices/cpu/hphybrid/hphybrid.cpp @@ -109,7 +109,7 @@ WRITE_LINE_MEMBER(hp_hybrid_cpu_device::flag_w) } } -hp_hybrid_cpu_device::hp_hybrid_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname , UINT8 addrwidth) +hp_hybrid_cpu_device::hp_hybrid_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname , UINT8 addrwidth) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__), m_pa_changed_func(*this), m_program_config("program", ENDIANNESS_BIG, 16, addrwidth, -1), diff --git a/src/devices/cpu/hphybrid/hphybrid.h b/src/devices/cpu/hphybrid/hphybrid.h index f51b6c8dc52..43e7a7dc4cc 100644 --- a/src/devices/cpu/hphybrid/hphybrid.h +++ b/src/devices/cpu/hphybrid/hphybrid.h @@ -90,7 +90,7 @@ public: template static devcb_base &set_pa_changed_func(device_t &device, _Object object) { return downcast(device).m_pa_changed_func.set_callback(object); } protected: - hp_hybrid_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname , UINT8 addrwidth); + hp_hybrid_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname , UINT8 addrwidth); // device-level overrides virtual void device_start() override; diff --git a/src/devices/cpu/i386/i386.cpp b/src/devices/cpu/i386/i386.cpp index 63998f35a7d..9b3ce280859 100644 --- a/src/devices/cpu/i386/i386.cpp +++ b/src/devices/cpu/i386/i386.cpp @@ -50,7 +50,7 @@ i386_device::i386_device(const machine_config &mconfig, std::string tag, device_ } -i386_device::i386_device(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 program_data_width, int program_addr_width, int io_data_width) +i386_device::i386_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, int program_data_width, int program_addr_width, int io_data_width) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_LITTLE, program_data_width, program_addr_width, 0) , m_io_config("io", ENDIANNESS_LITTLE, io_data_width, 16, 0) @@ -75,7 +75,7 @@ pentium_device::pentium_device(const machine_config &mconfig, std::string tag, d { } -pentium_device::pentium_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +pentium_device::pentium_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : i386_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/cpu/i386/i386.h b/src/devices/cpu/i386/i386.h index e9a1df89f33..eba7f209c65 100644 --- a/src/devices/cpu/i386/i386.h +++ b/src/devices/cpu/i386/i386.h @@ -29,7 +29,7 @@ class i386_device : public cpu_device public: // construction/destruction i386_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - i386_device(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 program_data_width=32, int program_addr_width=32, int io_data_width=32); + i386_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, int program_data_width=32, int program_addr_width=32, int io_data_width=32); // static configuration helpers template static devcb_base &set_smiact(device_t &device, _Object object) { return downcast(device).m_smiact.set_callback(object); } @@ -1445,7 +1445,7 @@ class pentium_device : public i386_device public: // construction/destruction pentium_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - pentium_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + pentium_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); protected: virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/i8085/i8085.cpp b/src/devices/cpu/i8085/i8085.cpp index dc5d54ee82f..cc627688165 100644 --- a/src/devices/cpu/i8085/i8085.cpp +++ b/src/devices/cpu/i8085/i8085.cpp @@ -195,7 +195,7 @@ i8085a_cpu_device::i8085a_cpu_device(const machine_config &mconfig, std::string } -i8085a_cpu_device::i8085a_cpu_device(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 cputype) +i8085a_cpu_device::i8085a_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, int cputype) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_LITTLE, 8, 16, 0) , m_io_config("io", ENDIANNESS_LITTLE, 8, 8, 0) diff --git a/src/devices/cpu/i8085/i8085.h b/src/devices/cpu/i8085/i8085.h index 75f14968e33..b8a31c4e63b 100644 --- a/src/devices/cpu/i8085/i8085.h +++ b/src/devices/cpu/i8085/i8085.h @@ -58,7 +58,7 @@ class i8085a_cpu_device : public cpu_device public: // construction/destruction i8085a_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - i8085a_cpu_device(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 cputype); + i8085a_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, int cputype); // static configuration helpers template static devcb_base &set_out_status_func(device_t &device, _Object object) { return downcast(device).m_out_status_func.set_callback(object); } diff --git a/src/devices/cpu/i8089/i8089.cpp b/src/devices/cpu/i8089/i8089.cpp index c35be988595..852f4f4328f 100644 --- a/src/devices/cpu/i8089/i8089.cpp +++ b/src/devices/cpu/i8089/i8089.cpp @@ -269,13 +269,13 @@ void i8089_device::initialize() // output some debug info if (VERBOSE) { - logerror("%s('%s'): ---- initializing ----\n", shortname(), basetag()); - logerror("%s('%s'): %s system bus\n", shortname(), basetag(), sysbus_width() ? "16-bit" : "8-bit"); - logerror("%s('%s'): system configuration block location: %06x\n", shortname(), basetag(), m_scb); - logerror("%s('%s'): %s remote bus\n", shortname(), basetag(), remotebus_width() ? "16-bit" : "8-bit"); - logerror("%s('%s'): request/grant: %d\n", shortname(), basetag(), request_grant()); - logerror("%s('%s'): is %s\n", shortname(), basetag(), m_master ? "master" : "slave"); - logerror("%s('%s'): channel control block location: %06x\n", shortname(), basetag(), cb_address); + logerror("%s('%s'): ---- initializing ----\n", shortname().c_str(), basetag().c_str()); + logerror("%s('%s'): %s system bus\n", shortname().c_str(), basetag().c_str(), sysbus_width() ? "16-bit" : "8-bit"); + logerror("%s('%s'): system configuration block location: %06x\n", shortname().c_str(), basetag().c_str(), m_scb); + logerror("%s('%s'): %s remote bus\n", shortname().c_str(), basetag().c_str(), remotebus_width() ? "16-bit" : "8-bit"); + logerror("%s('%s'): request/grant: %d\n", shortname().c_str(), basetag().c_str(), request_grant()); + logerror("%s('%s'): is %s\n", shortname().c_str(), basetag().c_str(), m_master ? "master" : "slave"); + logerror("%s('%s'): channel control block location: %06x\n", shortname().c_str(), basetag().c_str(), cb_address); } } @@ -356,7 +356,7 @@ void i8089_device::execute_run() WRITE_LINE_MEMBER( i8089_device::ca_w ) { if (VERBOSE) - logerror("%s('%s'): ca_w: %u\n", shortname(), basetag(), state); + logerror("%s('%s'): ca_w: %u\n", shortname().c_str(), basetag().c_str(), state); if (m_ca == 1 && state == 0) { diff --git a/src/devices/cpu/i8089/i8089_channel.cpp b/src/devices/cpu/i8089/i8089_channel.cpp index 2114e293107..590e881f97e 100644 --- a/src/devices/cpu/i8089/i8089_channel.cpp +++ b/src/devices/cpu/i8089/i8089_channel.cpp @@ -200,7 +200,7 @@ INT16 i8089_channel::imm16() void i8089_channel::terminate_dma(int offset) { if (VERBOSE) - logerror("%s('%s'): terminating dma transfer\n", shortname(), tag().c_str()); + logerror("%s('%s'): terminating dma transfer\n", shortname().c_str(), tag().c_str()); set_reg(TP, m_r[TP].w + offset); m_r[PSW].w |= 1 << 2; @@ -230,9 +230,9 @@ int i8089_channel::execute_run() if (VERBOSE) { - logerror("%s('%s'): ---- starting dma transfer ----\n", shortname(), tag().c_str()); - logerror("%s('%s'): ga = %06x, gb = %06x, gc = %06x\n", shortname(), tag().c_str(), m_r[GA].w, m_r[GB].w, m_r[GC].w); - logerror("%s('%s'): bc = %04x, cc = %04x, mc = %04x\n", shortname(), tag().c_str(), m_r[BC].w, m_r[CC].w, m_r[MC].w); + logerror("%s('%s'): ---- starting dma transfer ----\n", shortname().c_str(), tag().c_str()); + logerror("%s('%s'): ga = %06x, gb = %06x, gc = %06x\n", shortname().c_str(), tag().c_str(), m_r[GA].w, m_r[GB].w, m_r[GC].w); + logerror("%s('%s'): bc = %04x, cc = %04x, mc = %04x\n", shortname().c_str(), tag().c_str(), m_r[BC].w, m_r[CC].w, m_r[MC].w); } } @@ -240,7 +240,7 @@ int i8089_channel::execute_run() { case DMA_IDLE: if (VERBOSE_DMA) - logerror("%s('%s'): entering state: DMA_IDLE (bc = %04x)\n", shortname(), tag().c_str(), m_r[BC].w); + logerror("%s('%s'): entering state: DMA_IDLE (bc = %04x)\n", shortname().c_str(), tag().c_str(), m_r[BC].w); // synchronize on source? if (CC_SYNC == 0x01) @@ -256,7 +256,7 @@ int i8089_channel::execute_run() case DMA_FETCH: if (VERBOSE_DMA) - logerror("%s('%s'): entering state: DMA_FETCH\n", shortname(), tag().c_str()); + logerror("%s('%s'): entering state: DMA_FETCH\n", shortname().c_str(), tag().c_str()); // source is 16-bit? if (BIT(m_r[PSW].w, 1)) @@ -309,7 +309,7 @@ int i8089_channel::execute_run() break; case DMA_TRANSLATE: - fatalerror("%s('%s'): dma translate requested\n", shortname(), tag().c_str()); + fatalerror("%s('%s'): dma translate requested\n", shortname().c_str(), tag().c_str()); case DMA_WAIT_FOR_DEST_DRQ: if (m_drq) @@ -318,7 +318,7 @@ int i8089_channel::execute_run() case DMA_STORE: if (VERBOSE_DMA) - logerror("%s('%s'): entering state: DMA_STORE", shortname(), tag().c_str()); + logerror("%s('%s'): entering state: DMA_STORE", shortname().c_str(), tag().c_str()); // destination is 16-bit? if (BIT(m_r[PSW].w, 0)) @@ -351,15 +351,15 @@ int i8089_channel::execute_run() break; case DMA_COMPARE: - fatalerror("%s('%s'): dma compare requested\n", shortname(), tag().c_str()); + fatalerror("%s('%s'): dma compare requested\n", shortname().c_str(), tag().c_str()); case DMA_TERMINATE: if (VERBOSE_DMA) - logerror("%s('%s'): entering state: DMA_TERMINATE\n", shortname(), tag().c_str()); + logerror("%s('%s'): entering state: DMA_TERMINATE\n", shortname().c_str(), tag().c_str()); // terminate on masked compare? if (CC_TMC & 0x03) - fatalerror("%s('%s'): terminate on masked compare not supported\n", shortname(), tag().c_str()); + fatalerror("%s('%s'): terminate on masked compare not supported\n", shortname().c_str(), tag().c_str()); // terminate on byte count? else if (CC_TBC && m_r[BC].w == 0) @@ -367,7 +367,7 @@ int i8089_channel::execute_run() // terminate on single transfer else if (CC_TS) - fatalerror("%s('%s'): terminate on single transfer not supported\n", shortname(), tag().c_str()); + fatalerror("%s('%s'): terminate on single transfer not supported\n", shortname().c_str(), tag().c_str()); // not terminated, continue transfer else @@ -386,7 +386,7 @@ int i8089_channel::execute_run() case DMA_STORE_BYTE_HIGH: if (VERBOSE_DMA) - logerror("%s('%s'): entering state: DMA_STORE_BYTE_HIGH[ %02x ]\n", shortname(), tag().c_str(), (m_dma_value >> 8) & 0xff); + logerror("%s('%s'): entering state: DMA_STORE_BYTE_HIGH[ %02x ]\n", shortname().c_str(), tag().c_str(), (m_dma_value >> 8) & 0xff); m_iop->write_byte(m_r[GA - CC_SOURCE].t, m_r[GB - CC_SOURCE].w, (m_dma_value >> 8) & 0xff); m_r[GB - CC_SOURCE].w++; @@ -708,7 +708,7 @@ void i8089_channel::attention() // no channel command case 0: if (VERBOSE) - logerror("%s('%s'): command received: update psw\n", shortname(), tag().c_str()); + logerror("%s('%s'): command received: update psw\n", shortname().c_str(), tag().c_str()); if(executing()) m_prio = chained() ? PRIO_PROG_CHAIN : PRIO_PROG; @@ -723,7 +723,7 @@ void i8089_channel::attention() // start channel, tb in local space case 1: if (VERBOSE) - logerror("%s('%s'): command received: start channel in local space\n", shortname(), tag().c_str()); + logerror("%s('%s'): command received: start channel in local space\n", shortname().c_str(), tag().c_str()); examine_ccw(ccw); @@ -737,9 +737,9 @@ void i8089_channel::attention() if (VERBOSE) { - logerror("%s('%s'): ---- starting channel ----\n", shortname(), tag().c_str()); - logerror("%s('%s'): parameter block address: %06x\n", shortname(), tag().c_str(), m_r[PP].w); - logerror("%s('%s'): task pointer: %04x\n", shortname(), tag().c_str(), m_r[TP].w); + logerror("%s('%s'): ---- starting channel ----\n", shortname().c_str(), tag().c_str()); + logerror("%s('%s'): parameter block address: %06x\n", shortname().c_str(), tag().c_str(), m_r[PP].w); + logerror("%s('%s'): task pointer: %04x\n", shortname().c_str(), tag().c_str(), m_r[TP].w); } break; @@ -747,7 +747,7 @@ void i8089_channel::attention() // reserved case 2: if (VERBOSE) - logerror("%s('%s'): command received: invalid command 010\n", shortname(), tag().c_str()); + logerror("%s('%s'): command received: invalid command 010\n", shortname().c_str(), tag().c_str()); m_prio = PRIO_IDLE; break; @@ -755,7 +755,7 @@ void i8089_channel::attention() // start channel, tb in system space case 3: if (VERBOSE) - logerror("%s('%s'): command received: start channel in system space\n", shortname(), tag().c_str()); + logerror("%s('%s'): command received: start channel in system space\n", shortname().c_str(), tag().c_str()); examine_ccw(ccw); @@ -768,16 +768,16 @@ void i8089_channel::attention() if (VERBOSE) { - logerror("%s('%s'): ---- starting channel ----\n", shortname(), tag().c_str()); - logerror("%s('%s'): parameter block address: %06x\n", shortname(), tag().c_str(), m_r[PP].w); - logerror("%s('%s'): task pointer: %06x\n", shortname(), tag().c_str(), m_r[TP].w); + logerror("%s('%s'): ---- starting channel ----\n", shortname().c_str(), tag().c_str()); + logerror("%s('%s'): parameter block address: %06x\n", shortname().c_str(), tag().c_str(), m_r[PP].w); + logerror("%s('%s'): task pointer: %06x\n", shortname().c_str(), tag().c_str(), m_r[TP].w); } break; case 4: if (VERBOSE) - logerror("%s('%s'): command received: invalid command 100\n", shortname(), tag().c_str()); + logerror("%s('%s'): command received: invalid command 100\n", shortname().c_str(), tag().c_str()); m_prio = PRIO_IDLE; break; @@ -785,7 +785,7 @@ void i8089_channel::attention() // continue channel processing case 5: if (VERBOSE) - logerror("%s('%s'): command received: continue channel processing\n", shortname(), tag().c_str()); + logerror("%s('%s'): command received: continue channel processing\n", shortname().c_str(), tag().c_str()); // restore task pointer and parameter block movp_pm(TP, PP, m_r[PP].w); @@ -797,8 +797,8 @@ void i8089_channel::attention() if (VERBOSE) { - logerror("%s('%s'): ---- continuing channel ----\n", shortname(), tag().c_str()); - logerror("%s('%s'): task pointer: %06x\n", shortname(), tag().c_str(), m_r[TP].w); + logerror("%s('%s'): ---- continuing channel ----\n", shortname().c_str(), tag().c_str()); + logerror("%s('%s'): task pointer: %06x\n", shortname().c_str(), tag().c_str(), m_r[TP].w); } break; @@ -806,7 +806,7 @@ void i8089_channel::attention() // halt channel, save tp case 6: if (VERBOSE) - logerror("%s('%s'): command received: halt channel and save tp\n", shortname(), tag().c_str()); + logerror("%s('%s'): command received: halt channel and save tp\n", shortname().c_str(), tag().c_str()); // save task pointer and psw to parameter block movp_mp(PP, TP, m_r[TP].w); @@ -818,7 +818,7 @@ void i8089_channel::attention() // halt channel, don't save tp case 7: if (VERBOSE) - logerror("%s('%s'): command received: halt channel\n", shortname(), tag().c_str()); + logerror("%s('%s'): command received: halt channel\n", shortname().c_str(), tag().c_str()); hlt(); @@ -834,7 +834,7 @@ void i8089_channel::ca() WRITE_LINE_MEMBER( i8089_channel::ext_w ) { if (VERBOSE) - logerror("%s('%s'): ext_w: %d\n", shortname(), tag().c_str(), state); + logerror("%s('%s'): ext_w: %d\n", shortname().c_str(), tag().c_str(), state); if(transferring() && state) terminate_dma((CC_TX - 1) * 4); } @@ -842,7 +842,7 @@ WRITE_LINE_MEMBER( i8089_channel::ext_w ) WRITE_LINE_MEMBER( i8089_channel::drq_w ) { if (VERBOSE) - logerror("%s('%s'): drq_w: %d\n", shortname(), tag().c_str(), state); + logerror("%s('%s'): drq_w: %d\n", shortname().c_str(), tag().c_str(), state); m_drq = state; } diff --git a/src/devices/cpu/i8089/i8089_ops.cpp b/src/devices/cpu/i8089/i8089_ops.cpp index c158b6a72eb..7bbb990d7dc 100644 --- a/src/devices/cpu/i8089/i8089_ops.cpp +++ b/src/devices/cpu/i8089/i8089_ops.cpp @@ -411,5 +411,5 @@ void i8089_channel::xfer() void i8089_channel::invalid(int opc) { - logerror("%s('%s'): invalid opcode: %02x\n", shortname(), tag().c_str(), opc); + logerror("%s('%s'): invalid opcode: %02x\n", shortname().c_str(), tag().c_str(), opc); } diff --git a/src/devices/cpu/i86/i186.cpp b/src/devices/cpu/i86/i186.cpp index ea1daedfe9f..2b1ada0a62a 100644 --- a/src/devices/cpu/i86/i186.cpp +++ b/src/devices/cpu/i86/i186.cpp @@ -142,7 +142,7 @@ i80186_cpu_device::i80186_cpu_device(const machine_config &mconfig, std::string static_set_irq_acknowledge_callback(*this, device_irq_acknowledge_delegate(FUNC(i80186_cpu_device::int_callback), this)); } -i80186_cpu_device::i80186_cpu_device(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 data_bus_size) +i80186_cpu_device::i80186_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, int data_bus_size) : i8086_common_cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_LITTLE, data_bus_size, 20, 0) , m_io_config("io", ENDIANNESS_LITTLE, data_bus_size, 16, 0) diff --git a/src/devices/cpu/i86/i186.h b/src/devices/cpu/i86/i186.h index b209df96067..03d3e7eb003 100644 --- a/src/devices/cpu/i86/i186.h +++ b/src/devices/cpu/i86/i186.h @@ -14,7 +14,7 @@ class i80186_cpu_device : public i8086_common_cpu_device public: // construction/destruction i80186_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - i80186_cpu_device(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 data_bus_size); + i80186_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, int data_bus_size); template static devcb_base &static_set_read_slave_ack_callback(device_t &device, _Object object) { return downcast(device).m_read_slave_ack_func.set_callback(object); } template static devcb_base &static_set_chip_select_callback(device_t &device, _Object object) { return downcast(device).m_out_chip_select_func.set_callback(object); } diff --git a/src/devices/cpu/i86/i86.cpp b/src/devices/cpu/i86/i86.cpp index ebded51bd53..0e4f0bb099b 100644 --- a/src/devices/cpu/i86/i86.cpp +++ b/src/devices/cpu/i86/i86.cpp @@ -106,7 +106,7 @@ i8086_cpu_device::i8086_cpu_device(const machine_config &mconfig, std::string ta m_fetch_xor = BYTE_XOR_LE(0); } -i8086_cpu_device::i8086_cpu_device(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 data_bus_size) +i8086_cpu_device::i8086_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, int data_bus_size) : i8086_common_cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_LITTLE, data_bus_size, 20, 0) , m_io_config("io", ENDIANNESS_LITTLE, data_bus_size, 16, 0) @@ -272,7 +272,7 @@ void i8086_cpu_device::device_start() state_add(STATE_GENPC, "curpc", m_pc).callimport().callexport().formatstr("%05X"); } -i8086_common_cpu_device::i8086_common_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +i8086_common_cpu_device::i8086_common_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_ip(0) , m_TF(0) diff --git a/src/devices/cpu/i86/i86.h b/src/devices/cpu/i86/i86.h index e338414a4eb..71c66a2caad 100644 --- a/src/devices/cpu/i86/i86.h +++ b/src/devices/cpu/i86/i86.h @@ -31,7 +31,7 @@ class i8086_common_cpu_device : public cpu_device { public: // construction/destruction - i8086_common_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + i8086_common_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); template static devcb_base &set_lock_handler(device_t &device, _Object object) { return downcast(device).m_lock_handler.set_callback(object); } @@ -342,7 +342,7 @@ class i8086_cpu_device : public i8086_common_cpu_device public: // construction/destruction i8086_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - i8086_cpu_device(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 data_bus_size); + i8086_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, int data_bus_size); // device_memory_interface overrides virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } diff --git a/src/devices/cpu/jaguar/jaguar.cpp b/src/devices/cpu/jaguar/jaguar.cpp index f9ef7232a23..336878f50dc 100644 --- a/src/devices/cpu/jaguar/jaguar.cpp +++ b/src/devices/cpu/jaguar/jaguar.cpp @@ -140,7 +140,7 @@ const device_type JAGUARGPU = &device_creator; const device_type JAGUARDSP = &device_creator; -jaguar_cpu_device::jaguar_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, bool isdsp) +jaguar_cpu_device::jaguar_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, bool isdsp) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_BIG, 32, 24, 0) , m_isdsp(isdsp) diff --git a/src/devices/cpu/jaguar/jaguar.h b/src/devices/cpu/jaguar/jaguar.h index f276d3467f0..af776fb2216 100644 --- a/src/devices/cpu/jaguar/jaguar.h +++ b/src/devices/cpu/jaguar/jaguar.h @@ -103,7 +103,7 @@ class jaguar_cpu_device : public cpu_device { public: // construction/destruction - jaguar_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, bool isdsp); + jaguar_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, bool isdsp); ~jaguar_cpu_device(); // static configuration helpers diff --git a/src/devices/cpu/m37710/m37710.cpp b/src/devices/cpu/m37710/m37710.cpp index 324de6ac217..74a38d55878 100644 --- a/src/devices/cpu/m37710/m37710.cpp +++ b/src/devices/cpu/m37710/m37710.cpp @@ -94,7 +94,7 @@ ADDRESS_MAP_END // many other combinations of RAM and ROM size exist -m37710_cpu_device::m37710_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, address_map_delegate map_delegate) +m37710_cpu_device::m37710_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, address_map_delegate map_delegate) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_LITTLE, 16, 24, 0, map_delegate) , m_io_config("io", ENDIANNESS_LITTLE, 8, 16, 0) @@ -108,7 +108,7 @@ m37702m2_device::m37702m2_device(const machine_config &mconfig, std::string tag, } -m37702m2_device::m37702m2_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +m37702m2_device::m37702m2_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : m37710_cpu_device(mconfig, type, name, tag, owner, clock, shortname, source, address_map_delegate(FUNC(m37702m2_device::map), this)) { } diff --git a/src/devices/cpu/m37710/m37710.h b/src/devices/cpu/m37710/m37710.h index 0bea6bfcf76..cca43e52b5f 100644 --- a/src/devices/cpu/m37710/m37710.h +++ b/src/devices/cpu/m37710/m37710.h @@ -94,7 +94,7 @@ class m37710_cpu_device : public cpu_device { public: // construction/destruction - m37710_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, address_map_delegate map_delegate); + m37710_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, address_map_delegate map_delegate); DECLARE_READ16_MEMBER( m37710_internal_word_r ); DECLARE_WRITE16_MEMBER( m37710_internal_word_w ); @@ -2024,7 +2024,7 @@ class m37702m2_device : public m37710_cpu_device public: // construction/destruction m37702m2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - m37702m2_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + m37702m2_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); protected: DECLARE_ADDRESS_MAP(map, 16); }; diff --git a/src/devices/cpu/m6502/m3745x.cpp b/src/devices/cpu/m6502/m3745x.cpp index 92c95b05a39..88d96421b5a 100644 --- a/src/devices/cpu/m6502/m3745x.cpp +++ b/src/devices/cpu/m6502/m3745x.cpp @@ -37,7 +37,7 @@ const device_type M37450 = &device_creator; //------------------------------------------------- // m3745x_device - constructor //------------------------------------------------- -m3745x_device::m3745x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, address_map_constructor internal_map, const char *shortname, const char *source) : +m3745x_device::m3745x_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, address_map_constructor internal_map, std::string shortname, std::string source) : m740_device(mconfig, type, name, tag, owner, clock, "m3745x", source), m_program_config("program", ENDIANNESS_LITTLE, 8, 16, 0, internal_map), read_p3(*this), @@ -503,7 +503,7 @@ m37450_device::m37450_device(const machine_config &mconfig, std::string tag, dev { } -m37450_device::m37450_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +m37450_device::m37450_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : m3745x_device(mconfig, type, name, tag, owner, clock, ADDRESS_MAP_NAME(m37450_map), shortname, source) { } diff --git a/src/devices/cpu/m6502/m3745x.h b/src/devices/cpu/m6502/m3745x.h index 9ffbf6a431a..67e72daeef0 100644 --- a/src/devices/cpu/m6502/m3745x.h +++ b/src/devices/cpu/m6502/m3745x.h @@ -61,7 +61,7 @@ public: }; // construction/destruction - m3745x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, address_map_constructor internal_map, const char *shortname, const char *source); + m3745x_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, address_map_constructor internal_map, std::string shortname, std::string source); const address_space_config m_program_config; @@ -145,7 +145,7 @@ class m37450_device : public m3745x_device { public: m37450_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - m37450_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + m37450_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); }; extern const device_type M37450; diff --git a/src/devices/cpu/m6502/m5074x.cpp b/src/devices/cpu/m6502/m5074x.cpp index 76038c49729..107ae176fc6 100644 --- a/src/devices/cpu/m6502/m5074x.cpp +++ b/src/devices/cpu/m6502/m5074x.cpp @@ -39,7 +39,7 @@ const device_type M50741 = &device_creator; //------------------------------------------------- // m5074x_device - constructor //------------------------------------------------- -m5074x_device::m5074x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, address_map_constructor internal_map, const char *shortname, const char *source) : +m5074x_device::m5074x_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, address_map_constructor internal_map, std::string shortname, std::string source) : m740_device(mconfig, type, name, tag, owner, clock, shortname, source), m_program_config("program", ENDIANNESS_LITTLE, 8, 13, 0, internal_map), read_p0(*this), @@ -494,7 +494,7 @@ m50740_device::m50740_device(const machine_config &mconfig, std::string tag, dev { } -m50740_device::m50740_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +m50740_device::m50740_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : m5074x_device(mconfig, type, name, tag, owner, clock, ADDRESS_MAP_NAME(m50740_map), shortname, source) { } @@ -512,7 +512,7 @@ m50741_device::m50741_device(const machine_config &mconfig, std::string tag, dev { } -m50741_device::m50741_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +m50741_device::m50741_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : m5074x_device(mconfig, type, name, tag, owner, clock, ADDRESS_MAP_NAME(m50741_map), shortname, source) { } diff --git a/src/devices/cpu/m6502/m5074x.h b/src/devices/cpu/m6502/m5074x.h index 42d41b0d6a8..356c368c048 100644 --- a/src/devices/cpu/m6502/m5074x.h +++ b/src/devices/cpu/m6502/m5074x.h @@ -72,7 +72,7 @@ class m5074x_device : public m740_device public: // construction/destruction - m5074x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, address_map_constructor internal_map, const char *shortname, const char *source); + m5074x_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, address_map_constructor internal_map, std::string shortname, std::string source); const address_space_config m_program_config; @@ -123,14 +123,14 @@ class m50740_device : public m5074x_device { public: m50740_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - m50740_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + m50740_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); }; class m50741_device : public m5074x_device { public: m50741_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - m50741_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + m50741_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); }; extern const device_type M50740; diff --git a/src/devices/cpu/m6502/m6502.cpp b/src/devices/cpu/m6502/m6502.cpp index 4727ece8ed5..895315331c7 100644 --- a/src/devices/cpu/m6502/m6502.cpp +++ b/src/devices/cpu/m6502/m6502.cpp @@ -24,7 +24,7 @@ m6502_device::m6502_device(const machine_config &mconfig, std::string tag, devic direct_disabled = false; } -m6502_device::m6502_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +m6502_device::m6502_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source), sync_w(*this), program_config("program", ENDIANNESS_LITTLE, 8, 16), diff --git a/src/devices/cpu/m6502/m6502.h b/src/devices/cpu/m6502/m6502.h index c847e0e69a9..d6f9caeb11c 100644 --- a/src/devices/cpu/m6502/m6502.h +++ b/src/devices/cpu/m6502/m6502.h @@ -27,7 +27,7 @@ public: }; m6502_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - m6502_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + m6502_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); DECLARE_WRITE_LINE_MEMBER( irq_line ); DECLARE_WRITE_LINE_MEMBER( nmi_line ); diff --git a/src/devices/cpu/m6502/m6510.cpp b/src/devices/cpu/m6502/m6510.cpp index 0555490e380..5b40e52832f 100644 --- a/src/devices/cpu/m6502/m6510.cpp +++ b/src/devices/cpu/m6502/m6510.cpp @@ -22,7 +22,7 @@ m6510_device::m6510_device(const machine_config &mconfig, std::string tag, devic floating = 0x00; } -m6510_device::m6510_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +m6510_device::m6510_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : m6502_device(mconfig, type, name, tag, owner, clock, shortname, source), read_port(*this), write_port(*this), dir(0), port(0), drive(0) diff --git a/src/devices/cpu/m6502/m6510.h b/src/devices/cpu/m6502/m6510.h index addd82dff55..6bee9e1c7c7 100644 --- a/src/devices/cpu/m6502/m6510.h +++ b/src/devices/cpu/m6502/m6510.h @@ -22,7 +22,7 @@ class m6510_device : public m6502_device { public: m6510_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - m6510_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + m6510_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); UINT8 get_port(); void set_pulls(UINT8 pullup, UINT8 pulldown); diff --git a/src/devices/cpu/m6502/m65c02.cpp b/src/devices/cpu/m6502/m65c02.cpp index 4066bc3b0c5..2ba34529716 100644 --- a/src/devices/cpu/m6502/m65c02.cpp +++ b/src/devices/cpu/m6502/m65c02.cpp @@ -19,7 +19,7 @@ m65c02_device::m65c02_device(const machine_config &mconfig, std::string tag, dev { } -m65c02_device::m65c02_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +m65c02_device::m65c02_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : m6502_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/cpu/m6502/m65c02.h b/src/devices/cpu/m6502/m65c02.h index 80961953b1d..8ca4b6166f6 100644 --- a/src/devices/cpu/m6502/m65c02.h +++ b/src/devices/cpu/m6502/m65c02.h @@ -17,7 +17,7 @@ class m65c02_device : public m6502_device { public: m65c02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - m65c02_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + m65c02_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); static const disasm_entry disasm_entries[0x100]; diff --git a/src/devices/cpu/m6502/m65ce02.cpp b/src/devices/cpu/m6502/m65ce02.cpp index 2ab01420028..8ff549fdfa1 100644 --- a/src/devices/cpu/m6502/m65ce02.cpp +++ b/src/devices/cpu/m6502/m65ce02.cpp @@ -18,7 +18,7 @@ m65ce02_device::m65ce02_device(const machine_config &mconfig, std::string tag, d { } -m65ce02_device::m65ce02_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +m65ce02_device::m65ce02_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : m65c02_device(mconfig, type, name, tag, owner, clock, shortname, source), TMP3(0), Z(0), B(0) { } diff --git a/src/devices/cpu/m6502/m65ce02.h b/src/devices/cpu/m6502/m65ce02.h index 4600ab7b41d..96ecc57012e 100644 --- a/src/devices/cpu/m6502/m65ce02.h +++ b/src/devices/cpu/m6502/m65ce02.h @@ -16,7 +16,7 @@ class m65ce02_device : public m65c02_device { public: m65ce02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - m65ce02_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + m65ce02_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); static const disasm_entry disasm_entries[0x100]; diff --git a/src/devices/cpu/m6502/m740.cpp b/src/devices/cpu/m6502/m740.cpp index fa932808b11..f35a3323ecd 100644 --- a/src/devices/cpu/m6502/m740.cpp +++ b/src/devices/cpu/m6502/m740.cpp @@ -18,7 +18,7 @@ m740_device::m740_device(const machine_config &mconfig, std::string tag, device_ { } -m740_device::m740_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +m740_device::m740_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : m6502_device(mconfig, type, name, tag, owner, clock, shortname, source), m_irq_multiplex(0), m_irq_vector(0) { } diff --git a/src/devices/cpu/m6502/m740.h b/src/devices/cpu/m6502/m740.h index a8549813225..2b8dcdd7c9c 100644 --- a/src/devices/cpu/m6502/m740.h +++ b/src/devices/cpu/m6502/m740.h @@ -37,7 +37,7 @@ public: }; m740_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - m740_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + m740_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual void device_start() override; virtual void device_reset() override; diff --git a/src/devices/cpu/m6502/r65c02.cpp b/src/devices/cpu/m6502/r65c02.cpp index a022bb65b1e..226e96d386a 100644 --- a/src/devices/cpu/m6502/r65c02.cpp +++ b/src/devices/cpu/m6502/r65c02.cpp @@ -18,7 +18,7 @@ r65c02_device::r65c02_device(const machine_config &mconfig, std::string tag, dev { } -r65c02_device::r65c02_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +r65c02_device::r65c02_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : m65c02_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/cpu/m6502/r65c02.h b/src/devices/cpu/m6502/r65c02.h index ae0c564a414..a1d63ef98ff 100644 --- a/src/devices/cpu/m6502/r65c02.h +++ b/src/devices/cpu/m6502/r65c02.h @@ -16,7 +16,7 @@ class r65c02_device : public m65c02_device { public: r65c02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - r65c02_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + r65c02_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); static const disasm_entry disasm_entries[0x100]; diff --git a/src/devices/cpu/m6800/m6800.cpp b/src/devices/cpu/m6800/m6800.cpp index 5ff3585761b..64e8c0a1dae 100644 --- a/src/devices/cpu/m6800/m6800.cpp +++ b/src/devices/cpu/m6800/m6800.cpp @@ -546,7 +546,7 @@ m6800_cpu_device::m6800_cpu_device(const machine_config &mconfig, std::string ta m_clock_divider = 1; } -m6800_cpu_device::m6800_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, bool has_io, int clock_divider, const op_func *insn, const UINT8 *cycles, address_map_constructor internal) +m6800_cpu_device::m6800_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, bool has_io, int clock_divider, const op_func *insn, const UINT8 *cycles, address_map_constructor internal) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_BIG, 8, 16, 0, internal) , m_decrypted_opcodes_config("program", ENDIANNESS_BIG, 8, 16, 0) @@ -565,7 +565,7 @@ m6801_cpu_device::m6801_cpu_device(const machine_config &mconfig, std::string ta { } -m6801_cpu_device::m6801_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, const op_func *insn, const UINT8 *cycles, address_map_constructor internal) +m6801_cpu_device::m6801_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, const op_func *insn, const UINT8 *cycles, address_map_constructor internal) : m6800_cpu_device(mconfig, type, name, tag, owner, clock, shortname, source, true, 4, insn, cycles, internal) { } @@ -575,7 +575,7 @@ m6802_cpu_device::m6802_cpu_device(const machine_config &mconfig, std::string ta { } -m6802_cpu_device::m6802_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, const op_func *insn, const UINT8 *cycles) +m6802_cpu_device::m6802_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, const op_func *insn, const UINT8 *cycles) : m6800_cpu_device(mconfig, type, name, tag, owner, clock, shortname, source, false, 4, insn, cycles) { } @@ -602,7 +602,7 @@ hd6301_cpu_device::hd6301_cpu_device(const machine_config &mconfig, std::string { } -hd6301_cpu_device::hd6301_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +hd6301_cpu_device::hd6301_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : m6801_cpu_device(mconfig, type, name, tag, owner, clock, shortname, source, hd63701_insn, cycles_63701) { } diff --git a/src/devices/cpu/m6800/m6800.h b/src/devices/cpu/m6800/m6800.h index d7b15d7822d..523869e5f4f 100644 --- a/src/devices/cpu/m6800/m6800.h +++ b/src/devices/cpu/m6800/m6800.h @@ -58,7 +58,7 @@ public: // construction/destruction m6800_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - m6800_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, bool has_io, int clock_divider, const m6800_cpu_device::op_func *insn, const UINT8 *cycles, address_map_constructor internal = nullptr); + m6800_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, bool has_io, int clock_divider, const m6800_cpu_device::op_func *insn, const UINT8 *cycles, address_map_constructor internal = nullptr); // static configuration helpers template static devcb_base &set_out_sc2_func(device_t &device, _Object object) { return downcast(device).m_out_sc2_func.set_callback(object); } @@ -433,7 +433,7 @@ class m6801_cpu_device : public m6800_cpu_device { public: m6801_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - m6801_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, const m6800_cpu_device::op_func *insn, const UINT8 *cycles, address_map_constructor internal = nullptr); + m6801_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, const m6800_cpu_device::op_func *insn, const UINT8 *cycles, address_map_constructor internal = nullptr); void m6801_clock_serial(); @@ -448,7 +448,7 @@ class m6802_cpu_device : public m6800_cpu_device { public: m6802_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - m6802_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, const m6800_cpu_device::op_func *insn, const UINT8 *cycles); + m6802_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, const m6800_cpu_device::op_func *insn, const UINT8 *cycles); protected: virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks + 4 - 1) / 4; } @@ -481,7 +481,7 @@ class hd6301_cpu_device : public m6801_cpu_device { public: hd6301_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - hd6301_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + hd6301_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); protected: virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; diff --git a/src/devices/cpu/m68000/m68000.h b/src/devices/cpu/m68000/m68000.h index 70dc66e3158..9b882564853 100644 --- a/src/devices/cpu/m68000/m68000.h +++ b/src/devices/cpu/m68000/m68000.h @@ -126,10 +126,10 @@ public: // construction/destruction m68000_base_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock, - const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, const char *shortname, const char *source); + const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, std::string shortname, std::string source); m68000_base_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock, - const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, address_map_constructor internal_map, const char *shortname, const char *source); + const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, address_map_constructor internal_map, std::string shortname, std::string source); m68000_base_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); @@ -409,10 +409,10 @@ class m68000_device : public m68000_base_device public: // construction/destruction m68000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - m68000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + m68000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); m68000_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock, - const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, address_map_constructor internal_map, const char *shortname, const char *source); + const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, address_map_constructor internal_map, std::string shortname, std::string source); @@ -729,7 +729,7 @@ public: fscpu32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); fscpu32_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock, - const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, address_map_constructor internal_map, const char *shortname, const char *source); + const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, address_map_constructor internal_map, std::string shortname, std::string source); virtual UINT32 disasm_min_opcode_bytes() const override { return 2; }; virtual UINT32 disasm_max_opcode_bytes() const override { return 20; }; diff --git a/src/devices/cpu/m68000/m68kcpu.cpp b/src/devices/cpu/m68000/m68kcpu.cpp index a28fadc0bfd..952d4bc5bdb 100644 --- a/src/devices/cpu/m68000/m68kcpu.cpp +++ b/src/devices/cpu/m68000/m68kcpu.cpp @@ -2308,7 +2308,7 @@ m68000_base_device::m68000_base_device(const machine_config &mconfig, std::strin m68000_base_device::m68000_base_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock, - const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, address_map_constructor internal_map, const char *shortname, const char *source) + const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, address_map_constructor internal_map, std::string shortname, std::string source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source), m_program_config("program", ENDIANNESS_BIG, prg_data_width, prg_address_bits, 0, internal_map), m_oprogram_config("decrypted_opcodes", ENDIANNESS_BIG, prg_data_width, prg_address_bits, 0, internal_map) @@ -2318,7 +2318,7 @@ m68000_base_device::m68000_base_device(const machine_config &mconfig, const char m68000_base_device::m68000_base_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock, - const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, const char *shortname, const char *source) + const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, std::string shortname, std::string source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source), m_program_config("program", ENDIANNESS_BIG, prg_data_width, prg_address_bits), m_oprogram_config("decrypted_opcodes", ENDIANNESS_BIG, prg_data_width, prg_address_bits) @@ -2538,7 +2538,7 @@ m68000_device::m68000_device(const machine_config &mconfig, std::string tag, dev { } -m68000_device::m68000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +m68000_device::m68000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : m68000_base_device(mconfig, "M68000", tag, owner, clock, M68000, 16,24, shortname, source) { } @@ -2549,7 +2549,7 @@ void m68000_device::device_start() } m68000_device::m68000_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock, - const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, address_map_constructor internal_map, const char *shortname, const char *source) + const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, address_map_constructor internal_map, std::string shortname, std::string source) : m68000_base_device(mconfig, name, tag, owner, clock, type, prg_data_width, prg_address_bits, internal_map, shortname, source) { } @@ -2753,7 +2753,7 @@ fscpu32_device::fscpu32_device(const machine_config &mconfig, std::string tag, d } fscpu32_device::fscpu32_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock, - const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, address_map_constructor internal_map, const char *shortname, const char *source) + const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, address_map_constructor internal_map, std::string shortname, std::string source) : m68000_base_device(mconfig, name, tag, owner, clock, type, prg_data_width, prg_address_bits, internal_map, shortname, source) { } diff --git a/src/devices/cpu/m6805/m6805.cpp b/src/devices/cpu/m6805/m6805.cpp index ee17d503f8b..e7e759b57b7 100644 --- a/src/devices/cpu/m6805/m6805.cpp +++ b/src/devices/cpu/m6805/m6805.cpp @@ -409,7 +409,7 @@ void m6805_base_device::interrupt() // m6809_base_device - constructor //------------------------------------------------- -m6805_base_device::m6805_base_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock, const device_type type, const char *name, UINT32 addr_width, const char *shortname, const char *source) +m6805_base_device::m6805_base_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock, const device_type type, const char *name, UINT32 addr_width, std::string shortname, std::string source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source), m_program_config("program", ENDIANNESS_BIG, 8, addr_width) { diff --git a/src/devices/cpu/m6805/m6805.h b/src/devices/cpu/m6805/m6805.h index e811d1b013c..659dce7ead7 100644 --- a/src/devices/cpu/m6805/m6805.h +++ b/src/devices/cpu/m6805/m6805.h @@ -26,7 +26,7 @@ class m6805_base_device : public cpu_device { public: // construction/destruction - m6805_base_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock, const device_type type, const char *name, UINT32 addr_width, const char *shortname, const char *source); + m6805_base_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock, const device_type type, const char *name, UINT32 addr_width, std::string shortname, std::string source); protected: // device-level overrides diff --git a/src/devices/cpu/m6809/m6809.cpp b/src/devices/cpu/m6809/m6809.cpp index 51917b588a2..27c367ba806 100644 --- a/src/devices/cpu/m6809/m6809.cpp +++ b/src/devices/cpu/m6809/m6809.cpp @@ -108,7 +108,7 @@ const device_type M6809E = &device_creator; // m6809_base_device - constructor //------------------------------------------------- -m6809_base_device::m6809_base_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock, const device_type type, int divider, const char *shortname, const char *source) +m6809_base_device::m6809_base_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock, const device_type type, int divider, std::string shortname, std::string source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source), m_lic_func(*this), m_program_config("program", ENDIANNESS_BIG, 8, 16), diff --git a/src/devices/cpu/m6809/m6809.h b/src/devices/cpu/m6809/m6809.h index f485c331897..030f1ffb97b 100644 --- a/src/devices/cpu/m6809/m6809.h +++ b/src/devices/cpu/m6809/m6809.h @@ -32,7 +32,7 @@ class m6809_base_device : public cpu_device { public: // construction/destruction - m6809_base_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock, const device_type type, int divider, const char *shortname, const char *source); + m6809_base_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock, const device_type type, int divider, std::string shortname, std::string source); DECLARE_WRITE_LINE_MEMBER( irq_line ); DECLARE_WRITE_LINE_MEMBER( firq_line ); diff --git a/src/devices/cpu/mb88xx/mb88xx.cpp b/src/devices/cpu/mb88xx/mb88xx.cpp index ea2a6a5d79d..fafd5333420 100644 --- a/src/devices/cpu/mb88xx/mb88xx.cpp +++ b/src/devices/cpu/mb88xx/mb88xx.cpp @@ -119,7 +119,7 @@ mb88_cpu_device::mb88_cpu_device(const machine_config &mconfig, std::string tag, } -mb88_cpu_device::mb88_cpu_device(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 program_width, int data_width) +mb88_cpu_device::mb88_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, int program_width, int data_width) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_BIG, 8, program_width, 0, ( (program_width == 9) ? ADDRESS_MAP_NAME(program_9bit) : (program_width == 10) ? ADDRESS_MAP_NAME(program_10bit) : ADDRESS_MAP_NAME(program_11bit) ) ) , m_data_config("data", ENDIANNESS_BIG, 8, data_width, 0, ( (data_width == 4) ? ADDRESS_MAP_NAME(data_4bit) : (data_width == 5) ? ADDRESS_MAP_NAME(data_5bit) : (data_width == 6) ? ADDRESS_MAP_NAME(data_6bit) : ADDRESS_MAP_NAME(data_7bit) ) ) diff --git a/src/devices/cpu/mb88xx/mb88xx.h b/src/devices/cpu/mb88xx/mb88xx.h index 0955093e652..525bc3dceb9 100644 --- a/src/devices/cpu/mb88xx/mb88xx.h +++ b/src/devices/cpu/mb88xx/mb88xx.h @@ -65,7 +65,7 @@ class mb88_cpu_device : public cpu_device public: // construction/destruction mb88_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - mb88_cpu_device(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 program_width, int data_width); + mb88_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, int program_width, int data_width); // static configuration helpers static void set_pla(device_t &device, UINT8 *pla) { downcast(device).m_PLA = pla; } diff --git a/src/devices/cpu/mcs48/mcs48.cpp b/src/devices/cpu/mcs48/mcs48.cpp index 751682e8a06..b1e2a4b0489 100644 --- a/src/devices/cpu/mcs48/mcs48.cpp +++ b/src/devices/cpu/mcs48/mcs48.cpp @@ -201,7 +201,7 @@ static ADDRESS_MAP_START(data_8bit, AS_DATA, 8, mcs48_cpu_device) ADDRESS_MAP_END -mcs48_cpu_device::mcs48_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int rom_size, int ram_size, UINT8 feature_mask) +mcs48_cpu_device::mcs48_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, int rom_size, int ram_size, UINT8 feature_mask) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__) , m_program_config("program", ENDIANNESS_LITTLE, 8, 12, 0 , ( ( rom_size == 1024 ) ? ADDRESS_MAP_NAME(program_10bit) : ( ( rom_size == 2048 ) ? ADDRESS_MAP_NAME(program_11bit) : ( ( rom_size == 4096 ) ? ADDRESS_MAP_NAME(program_12bit) : nullptr ) ) )) @@ -294,7 +294,7 @@ m58715_device::m58715_device(const machine_config &mconfig, std::string tag, dev { } -upi41_cpu_device::upi41_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int rom_size, int ram_size) +upi41_cpu_device::upi41_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, int rom_size, int ram_size) : mcs48_cpu_device(mconfig, type, name, tag, owner, clock, shortname, rom_size, ram_size, UPI41_FEATURE) { } diff --git a/src/devices/cpu/mcs48/mcs48.h b/src/devices/cpu/mcs48/mcs48.h index 785a53c1092..e6080a7c6ef 100644 --- a/src/devices/cpu/mcs48/mcs48.h +++ b/src/devices/cpu/mcs48/mcs48.h @@ -126,7 +126,7 @@ class mcs48_cpu_device : public cpu_device { public: // construction/destruction - mcs48_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int rom_size, int ram_size, UINT8 feature_mask = 0); + mcs48_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, int rom_size, int ram_size, UINT8 feature_mask = 0); protected: // device-level overrides @@ -592,7 +592,7 @@ class upi41_cpu_device : public mcs48_cpu_device { public: // construction/destruction - upi41_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int rom_size, int ram_size); + upi41_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, int rom_size, int ram_size); /* functions for talking to the input/output buffers on the UPI41-class chips */ DECLARE_READ8_MEMBER(upi41_master_r); diff --git a/src/devices/cpu/mcs51/mcs51.cpp b/src/devices/cpu/mcs51/mcs51.cpp index 8f31b856ab4..9e058688390 100644 --- a/src/devices/cpu/mcs51/mcs51.cpp +++ b/src/devices/cpu/mcs51/mcs51.cpp @@ -260,7 +260,7 @@ static ADDRESS_MAP_START(data_8bit, AS_DATA, 8, mcs51_cpu_device) ADDRESS_MAP_END -mcs51_cpu_device::mcs51_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, UINT8 features) +mcs51_cpu_device::mcs51_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, int program_width, int data_width, UINT8 features) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__) , m_program_config("program", ENDIANNESS_LITTLE, 8, 16, 0 , ( ( program_width == 12 ) ? ADDRESS_MAP_NAME(program_12bit) : ( ( program_width == 13 ) ? ADDRESS_MAP_NAME(program_13bit) : nullptr ) )) @@ -299,7 +299,7 @@ i8751_device::i8751_device(const machine_config &mconfig, std::string tag, devic { } -i8052_device::i8052_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, UINT8 features) +i8052_device::i8052_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, int program_width, int data_width, UINT8 features) : mcs51_cpu_device(mconfig, type, name, tag, owner, clock, shortname, program_width, data_width, features | FEATURE_I8052) { m_num_interrupts = 6; @@ -326,7 +326,7 @@ i80c31_device::i80c31_device(const machine_config &mconfig, std::string tag, dev { } -i80c51_device::i80c51_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, UINT8 features) +i80c51_device::i80c51_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, int program_width, int data_width, UINT8 features) : mcs51_cpu_device(mconfig, type, name, tag, owner, clock, shortname, program_width, data_width, features | FEATURE_CMOS) { } @@ -342,7 +342,7 @@ i87c51_device::i87c51_device(const machine_config &mconfig, std::string tag, dev } -i80c52_device::i80c52_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, UINT8 features) +i80c52_device::i80c52_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, int program_width, int data_width, UINT8 features) : i8052_device(mconfig, type, name, tag, owner, clock, shortname, program_width, data_width, features | FEATURE_I80C52 | FEATURE_CMOS) { } diff --git a/src/devices/cpu/mcs51/mcs51.h b/src/devices/cpu/mcs51/mcs51.h index 6c7a7c9924a..b7f48177f1a 100644 --- a/src/devices/cpu/mcs51/mcs51.h +++ b/src/devices/cpu/mcs51/mcs51.h @@ -77,7 +77,7 @@ class mcs51_cpu_device : public cpu_device { public: // construction/destruction - mcs51_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, UINT8 features = 0); + mcs51_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, int program_width, int data_width, UINT8 features = 0); void i8051_set_serial_tx_callback(write8_delegate tx_func); void i8051_set_serial_rx_callback(read8_delegate rx_func); @@ -385,7 +385,7 @@ class i8052_device : public mcs51_cpu_device public: // construction/destruction i8052_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - i8052_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, UINT8 features = 0); + i8052_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, int program_width, int data_width, UINT8 features = 0); protected: virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; @@ -425,7 +425,7 @@ class i80c51_device : public mcs51_cpu_device public: // construction/destruction i80c51_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - i80c51_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, UINT8 features = 0); + i80c51_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, int program_width, int data_width, UINT8 features = 0); protected: virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; @@ -444,7 +444,7 @@ class i80c52_device : public i8052_device public: // construction/destruction i80c52_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - i80c52_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, UINT8 features = 0); + i80c52_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, int program_width, int data_width, UINT8 features = 0); protected: virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; diff --git a/src/devices/cpu/mcs96/i8x9x.cpp b/src/devices/cpu/mcs96/i8x9x.cpp index 894ef99d654..c70ea355d31 100644 --- a/src/devices/cpu/mcs96/i8x9x.cpp +++ b/src/devices/cpu/mcs96/i8x9x.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "i8x9x.h" -i8x9x_device::i8x9x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +i8x9x_device::i8x9x_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : mcs96_device(mconfig, type, name, tag, owner, clock, 8, "i8x9x", __FILE__), io_config("io", ENDIANNESS_LITTLE, 16, 16, -1), io(nullptr), base_timer2(0), ad_done(0), hso_command(0), ad_command(0), hso_time(0), ad_result(0), ios0(0), ios1(0), ioc0(0), ioc1(0), sbuf(0), sp_stat(0), serial_send_buf(0), serial_send_timer(0) diff --git a/src/devices/cpu/mcs96/i8x9x.h b/src/devices/cpu/mcs96/i8x9x.h index 7b0d58f0cd8..73bd2824c74 100644 --- a/src/devices/cpu/mcs96/i8x9x.h +++ b/src/devices/cpu/mcs96/i8x9x.h @@ -21,7 +21,7 @@ public: P0, P1, P2 }; - i8x9x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + i8x9x_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); void serial_w(UINT8 val); diff --git a/src/devices/cpu/mcs96/i8xc196.cpp b/src/devices/cpu/mcs96/i8xc196.cpp index 151b1f4b871..7c0e7c021eb 100644 --- a/src/devices/cpu/mcs96/i8xc196.cpp +++ b/src/devices/cpu/mcs96/i8xc196.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "i8xc196.h" -i8xc196_device::i8xc196_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +i8xc196_device::i8xc196_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : mcs96_device(mconfig, type, name, tag, owner, clock, 16, shortname, source) { } diff --git a/src/devices/cpu/mcs96/i8xc196.h b/src/devices/cpu/mcs96/i8xc196.h index b6584fcd84f..49d2c57c258 100644 --- a/src/devices/cpu/mcs96/i8xc196.h +++ b/src/devices/cpu/mcs96/i8xc196.h @@ -15,7 +15,7 @@ class i8xc196_device : public mcs96_device { public: - i8xc196_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + i8xc196_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); static const disasm_entry disasm_entries[0x100]; diff --git a/src/devices/cpu/mcs96/mcs96.cpp b/src/devices/cpu/mcs96/mcs96.cpp index 1452971be5a..5107e18f161 100644 --- a/src/devices/cpu/mcs96/mcs96.cpp +++ b/src/devices/cpu/mcs96/mcs96.cpp @@ -12,7 +12,7 @@ #include "debugger.h" #include "mcs96.h" -mcs96_device::mcs96_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, int data_width, const char *shortname, const char *source) : +mcs96_device::mcs96_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, int data_width, std::string shortname, std::string source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source), program_config("program", ENDIANNESS_LITTLE, data_width, 16), program(nullptr), direct(nullptr), icount(0), bcount(0), inst_state(0), cycles_scaling(0), pending_irq(0), PC(0), PPC(0), PSW(0), OP1(0), OP2(0), OP3(0), OPI(0), TMP(0), irq_requested(false) diff --git a/src/devices/cpu/mcs96/mcs96.h b/src/devices/cpu/mcs96/mcs96.h index b662fb946e3..c96f5cde461 100644 --- a/src/devices/cpu/mcs96/mcs96.h +++ b/src/devices/cpu/mcs96/mcs96.h @@ -17,7 +17,7 @@ public: EXINT_LINE = 1 }; - mcs96_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, int data_width, const char *shortname, const char *source); + mcs96_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, int data_width, std::string shortname, std::string source); protected: enum { diff --git a/src/devices/cpu/melps4/melps4.h b/src/devices/cpu/melps4/melps4.h index d00f3651e21..fad4ccc685b 100644 --- a/src/devices/cpu/melps4/melps4.h +++ b/src/devices/cpu/melps4/melps4.h @@ -101,7 +101,7 @@ class melps4_cpu_device : public cpu_device { public: // construction/destruction - melps4_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, int d_pins, UINT8 sm_page, UINT8 int_page, const char *shortname, const char *source) + melps4_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, int d_pins, UINT8 sm_page, UINT8 int_page, std::string shortname, std::string source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_LITTLE, 16, prgwidth, -1, program) , m_data_config("data", ENDIANNESS_LITTLE, 8, datawidth, 0, data) diff --git a/src/devices/cpu/mips/mips3.cpp b/src/devices/cpu/mips/mips3.cpp index d25fd2ee019..934e694b32c 100644 --- a/src/devices/cpu/mips/mips3.cpp +++ b/src/devices/cpu/mips/mips3.cpp @@ -120,7 +120,7 @@ const device_type RM7000BE = &device_creator; const device_type RM7000LE = &device_creator; -mips3_device::mips3_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, mips3_flavor flavor, endianness_t endianness) +mips3_device::mips3_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, mips3_flavor flavor, endianness_t endianness) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__) , m_program_config("program", endianness, 32, 32, 0, 32, MIPS3_MIN_PAGE_SHIFT) , m_flavor(flavor) diff --git a/src/devices/cpu/mips/mips3.h b/src/devices/cpu/mips/mips3.h index ad61d8bce02..63d3fba5a63 100644 --- a/src/devices/cpu/mips/mips3.h +++ b/src/devices/cpu/mips/mips3.h @@ -269,7 +269,7 @@ protected: public: // construction/destruction - mips3_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, mips3_flavor flavor, endianness_t endiannes); + mips3_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, mips3_flavor flavor, endianness_t endiannes); static void set_icache_size(device_t &device, size_t icache_size) { downcast(device).c_icache_size = icache_size; } static void set_dcache_size(device_t &device, size_t dcache_size) { downcast(device).c_dcache_size = dcache_size; } diff --git a/src/devices/cpu/mips/r3000.cpp b/src/devices/cpu/mips/r3000.cpp index aa7901a4100..50cb6a851c8 100644 --- a/src/devices/cpu/mips/r3000.cpp +++ b/src/devices/cpu/mips/r3000.cpp @@ -124,7 +124,7 @@ const device_type R3081 = &device_creator; // r3000_device - constructor //------------------------------------------------- -r3000_device::r3000_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, chip_type chiptype, const char *shortname, const char *source) +r3000_device::r3000_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, chip_type chiptype, std::string shortname, std::string source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source), m_program_config_be("program", ENDIANNESS_BIG, 32, 29), m_program_config_le("program", ENDIANNESS_LITTLE, 32, 29), diff --git a/src/devices/cpu/mips/r3000.h b/src/devices/cpu/mips/r3000.h index 43606614112..cfef157cb1d 100644 --- a/src/devices/cpu/mips/r3000.h +++ b/src/devices/cpu/mips/r3000.h @@ -77,7 +77,7 @@ protected: }; // construction/destruction - r3000_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, chip_type chiptype, const char *shortname, const char *source); + r3000_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, chip_type chiptype, std::string shortname, std::string source); virtual ~r3000_device(); public: diff --git a/src/devices/cpu/mn10200/mn10200.h b/src/devices/cpu/mn10200/mn10200.h index 0d6f0c75f13..f90d7b760ed 100644 --- a/src/devices/cpu/mn10200/mn10200.h +++ b/src/devices/cpu/mn10200/mn10200.h @@ -46,7 +46,7 @@ class mn10200_device : public cpu_device { public: // construction/destruction - mn10200_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, address_map_constructor program, const char *shortname, const char *source) + mn10200_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, address_map_constructor program, std::string shortname, std::string source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_LITTLE, 16, 24, 0, program), m_program(nullptr) , m_read_port0(*this), m_read_port1(*this), m_read_port2(*this), m_read_port3(*this), m_read_port4(*this) diff --git a/src/devices/cpu/nec/nec.cpp b/src/devices/cpu/nec/nec.cpp index f285dc124c5..51cfac44618 100644 --- a/src/devices/cpu/nec/nec.cpp +++ b/src/devices/cpu/nec/nec.cpp @@ -122,7 +122,7 @@ const device_type V33A =&device_creator; -nec_common_device::nec_common_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, bool is_16bit, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type) +nec_common_device::nec_common_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, bool is_16bit, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_LITTLE, is_16bit ? 16 : 8, 20, 0) , m_io_config("io", ENDIANNESS_LITTLE, is_16bit ? 16 : 8, 16, 0) diff --git a/src/devices/cpu/nec/nec.h b/src/devices/cpu/nec/nec.h index ff0021fcc86..08e7ef3cc3b 100644 --- a/src/devices/cpu/nec/nec.h +++ b/src/devices/cpu/nec/nec.h @@ -23,7 +23,7 @@ class nec_common_device : public cpu_device { public: // construction/destruction - nec_common_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, bool is_16bit, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type); + nec_common_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, bool is_16bit, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type); protected: // device-level overrides diff --git a/src/devices/cpu/nec/v25.cpp b/src/devices/cpu/nec/v25.cpp index 1680219979a..4cc879a335f 100644 --- a/src/devices/cpu/nec/v25.cpp +++ b/src/devices/cpu/nec/v25.cpp @@ -49,7 +49,7 @@ const device_type V25 = &device_creator; const device_type V35 = &device_creator; -v25_common_device::v25_common_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, bool is_16bit, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type) +v25_common_device::v25_common_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, bool is_16bit, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__) , m_program_config("program", ENDIANNESS_LITTLE, is_16bit ? 16 : 8, 20, 0) , m_io_config("io", ENDIANNESS_LITTLE, is_16bit ? 16 : 8, 17, 0) diff --git a/src/devices/cpu/nec/v25.h b/src/devices/cpu/nec/v25.h index 4a7129e531a..ef259c685c0 100644 --- a/src/devices/cpu/nec/v25.h +++ b/src/devices/cpu/nec/v25.h @@ -32,7 +32,7 @@ class v25_common_device : public cpu_device { public: // construction/destruction - v25_common_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, bool is_16bit, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type); + v25_common_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, bool is_16bit, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type); // static configuration helpers static void set_decryption_table(device_t &device, const UINT8 *decryption_table) { downcast(device).m_v25v35_decryptiontable = decryption_table; } diff --git a/src/devices/cpu/nec/v53.cpp b/src/devices/cpu/nec/v53.cpp index 2eb90940d99..fd7668ada3f 100644 --- a/src/devices/cpu/nec/v53.cpp +++ b/src/devices/cpu/nec/v53.cpp @@ -526,7 +526,7 @@ machine_config_constructor v53_base_device::device_mconfig_additions() const } -v53_base_device::v53_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type) +v53_base_device::v53_base_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type) : nec_common_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__, true, fetch_xor, prefetch_size, prefetch_cycles, chip_type), m_io_space_config( "io", ENDIANNESS_LITTLE, 16, 16, 0, ADDRESS_MAP_NAME( v53_internal_port_map ) ), m_v53tcu(*this, "pit"), diff --git a/src/devices/cpu/nec/v53.h b/src/devices/cpu/nec/v53.h index 0a922b20c4b..3057b1dd867 100644 --- a/src/devices/cpu/nec/v53.h +++ b/src/devices/cpu/nec/v53.h @@ -107,7 +107,7 @@ class v53_base_device : public nec_common_device { public: - v53_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type); + v53_base_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type); DECLARE_WRITE8_MEMBER(BSEL_w); DECLARE_WRITE8_MEMBER(BADR_w); diff --git a/src/devices/cpu/pdp1/tx0.cpp b/src/devices/cpu/pdp1/tx0.cpp index 4e6c40636d5..a2513e4abec 100644 --- a/src/devices/cpu/pdp1/tx0.cpp +++ b/src/devices/cpu/pdp1/tx0.cpp @@ -44,7 +44,7 @@ const device_type TX0_8KW = &device_creator; const device_type TX0_64KW = &device_creator; -tx0_device::tx0_device(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 addr_bits, int address_mask, int ir_mask) +tx0_device::tx0_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, int addr_bits, int address_mask, int ir_mask) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_BIG, 32, addr_bits , -2), m_mbr(0), m_ac(0), m_mar(0), m_pc(0), m_ir(0), m_lr(0), m_xr(0), m_pf(0), m_tbr(0), m_tac(0), m_cm_sel(0), m_lr_sel(0), m_gbl_cm_sel(0), m_stop_cyc0(0), m_stop_cyc1(0), m_run(0), m_rim(0), m_cycle(0), m_ioh(0), m_ios(0), m_rim_step(0) diff --git a/src/devices/cpu/pdp1/tx0.h b/src/devices/cpu/pdp1/tx0.h index 21b737d9531..e8bcc3571c8 100644 --- a/src/devices/cpu/pdp1/tx0.h +++ b/src/devices/cpu/pdp1/tx0.h @@ -38,7 +38,7 @@ class tx0_device : public cpu_device { public: // construction/destruction - tx0_device(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 addr_bits, int address_mask, int ir_mask); + tx0_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, int addr_bits, int address_mask, int ir_mask); // static configuration helpers template static devcb_base &set_cpy_cb(device_t &device, _Object object) { return downcast(device).m_cpy_handler.set_callback(object); } diff --git a/src/devices/cpu/pic16c5x/pic16c5x.cpp b/src/devices/cpu/pic16c5x/pic16c5x.cpp index 42e9e6d998b..7edfb814307 100644 --- a/src/devices/cpu/pic16c5x/pic16c5x.cpp +++ b/src/devices/cpu/pic16c5x/pic16c5x.cpp @@ -106,7 +106,7 @@ static ADDRESS_MAP_START( pic16c5x_ram_7, AS_DATA, 8, pic16c5x_device ) ADDRESS_MAP_END -pic16c5x_device::pic16c5x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, int picmodel) +pic16c5x_device::pic16c5x_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, int program_width, int data_width, int picmodel) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__) , m_program_config("program", ENDIANNESS_LITTLE, 16, program_width, -1 , ( ( program_width == 9 ) ? ADDRESS_MAP_NAME(pic16c5x_rom_9) : ( ( program_width == 10 ) ? ADDRESS_MAP_NAME(pic16c5x_rom_10) : ADDRESS_MAP_NAME(pic16c5x_rom_11) ))) diff --git a/src/devices/cpu/pic16c5x/pic16c5x.h b/src/devices/cpu/pic16c5x/pic16c5x.h index c50779b9cc9..b5d6e37e0e7 100644 --- a/src/devices/cpu/pic16c5x/pic16c5x.h +++ b/src/devices/cpu/pic16c5x/pic16c5x.h @@ -64,7 +64,7 @@ class pic16c5x_device : public cpu_device { public: // construction/destruction - pic16c5x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, int picmodel); + pic16c5x_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, int program_width, int data_width, int picmodel); // static configuration helpers template static devcb_base &set_read_a_callback(device_t &device, _Object object) { return downcast(device).m_read_a.set_callback(object); } diff --git a/src/devices/cpu/pic16c62x/pic16c62x.cpp b/src/devices/cpu/pic16c62x/pic16c62x.cpp index 7d14c93a289..2670044c666 100644 --- a/src/devices/cpu/pic16c62x/pic16c62x.cpp +++ b/src/devices/cpu/pic16c62x/pic16c62x.cpp @@ -113,7 +113,7 @@ static ADDRESS_MAP_START( pic16c62xa_ram, AS_DATA, 8, pic16c62x_device ) ADDRESS_MAP_END -pic16c62x_device::pic16c62x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int picmodel) +pic16c62x_device::pic16c62x_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, int program_width, int picmodel) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__) , m_program_config("program", ENDIANNESS_LITTLE, 16, program_width, -1 , ( ( program_width == 9 ) ? ADDRESS_MAP_NAME(pic16c62x_rom_9) : ( ( program_width == 10 ) ? ADDRESS_MAP_NAME(pic16c62x_rom_10) : ADDRESS_MAP_NAME(pic16c62x_rom_11) ))) diff --git a/src/devices/cpu/pic16c62x/pic16c62x.h b/src/devices/cpu/pic16c62x/pic16c62x.h index b028f80255b..5551fd83038 100644 --- a/src/devices/cpu/pic16c62x/pic16c62x.h +++ b/src/devices/cpu/pic16c62x/pic16c62x.h @@ -55,7 +55,7 @@ class pic16c62x_device : public cpu_device { public: // construction/destruction - pic16c62x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int picmodel); + pic16c62x_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, int program_width, int picmodel); protected: // device-level overrides virtual void device_start() override; diff --git a/src/devices/cpu/powerpc/ppc.h b/src/devices/cpu/powerpc/ppc.h index 87c1bb2e8bc..9358f13d47b 100644 --- a/src/devices/cpu/powerpc/ppc.h +++ b/src/devices/cpu/powerpc/ppc.h @@ -211,7 +211,7 @@ protected: public: // construction/destruction - ppc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int address_bits, int data_bits, powerpc_flavor flavor, UINT32 cap, UINT32 tb_divisor, address_map_constructor internal_map); + ppc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, int address_bits, int data_bits, powerpc_flavor flavor, UINT32 cap, UINT32 tb_divisor, address_map_constructor internal_map); static void set_bus_frequency(device_t &device, UINT32 bus_frequency) { downcast(device).c_bus_frequency = bus_frequency; } @@ -750,7 +750,7 @@ public: class ppc4xx_device : public ppc_device { public: - ppc4xx_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, powerpc_flavor flavor, UINT32 cap, UINT32 tb_divisor); + ppc4xx_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, powerpc_flavor flavor, UINT32 cap, UINT32 tb_divisor); void ppc4xx_spu_set_tx_handler(write8_delegate callback); void ppc4xx_spu_receive_byte(UINT8 byteval); diff --git a/src/devices/cpu/powerpc/ppccom.cpp b/src/devices/cpu/powerpc/ppccom.cpp index 3517e3b880f..f673f5fba0c 100644 --- a/src/devices/cpu/powerpc/ppccom.cpp +++ b/src/devices/cpu/powerpc/ppccom.cpp @@ -207,7 +207,7 @@ const device_type PPC403GCX = &device_creator; const device_type PPC405GP = &device_creator; -ppc_device::ppc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int address_bits, int data_bits, powerpc_flavor flavor, UINT32 cap, UINT32 tb_divisor, address_map_constructor internal_map) +ppc_device::ppc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, int address_bits, int data_bits, powerpc_flavor flavor, UINT32 cap, UINT32 tb_divisor, address_map_constructor internal_map) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__) , m_program_config("program", ENDIANNESS_BIG, data_bits, address_bits, 0, internal_map) , c_bus_frequency(0) @@ -275,7 +275,7 @@ static ADDRESS_MAP_START( internal_ppc4xx, AS_PROGRAM, 32, ppc4xx_device ) AM_RANGE(0x40000000, 0x4000000f) AM_READWRITE8(ppc4xx_spu_r, ppc4xx_spu_w, 0xffffffff) ADDRESS_MAP_END -ppc4xx_device::ppc4xx_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, powerpc_flavor flavor, UINT32 cap, UINT32 tb_divisor) +ppc4xx_device::ppc4xx_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, powerpc_flavor flavor, UINT32 cap, UINT32 tb_divisor) : ppc_device(mconfig, type, name, tag, owner, clock, shortname, 31, 32, flavor, cap, tb_divisor, ADDRESS_MAP_NAME(internal_ppc4xx)) { } diff --git a/src/devices/cpu/psx/psx.cpp b/src/devices/cpu/psx/psx.cpp index f0dc65f180b..46879f2b790 100644 --- a/src/devices/cpu/psx/psx.cpp +++ b/src/devices/cpu/psx/psx.cpp @@ -1745,7 +1745,7 @@ ADDRESS_MAP_END // psxcpu_device - constructor //------------------------------------------------- -psxcpu_device::psxcpu_device( const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source ) : +psxcpu_device::psxcpu_device( const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source ) : cpu_device( mconfig, type, name, tag, owner, clock, shortname, source ), m_program_config( "program", ENDIANNESS_LITTLE, 32, 32, 0, ADDRESS_MAP_NAME( psxcpu_internal_map ) ), m_gpu_read_handler( *this ), diff --git a/src/devices/cpu/psx/psx.h b/src/devices/cpu/psx/psx.h index c80e8d0bcc6..42b7bdc9797 100644 --- a/src/devices/cpu/psx/psx.h +++ b/src/devices/cpu/psx/psx.h @@ -200,7 +200,7 @@ public: void set_disable_rom_berr(bool mode); protected: - psxcpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + psxcpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // device-level overrides virtual void device_start() override; diff --git a/src/devices/cpu/psx/sio.cpp b/src/devices/cpu/psx/sio.cpp index 63b05dca64d..0cd2ef6f825 100644 --- a/src/devices/cpu/psx/sio.cpp +++ b/src/devices/cpu/psx/sio.cpp @@ -37,7 +37,7 @@ psxsio1_device::psxsio1_device(const machine_config &mconfig, std::string tag, d { } -psxsio_device::psxsio_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +psxsio_device::psxsio_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_status(SIO_STATUS_TX_EMPTY | SIO_STATUS_TX_RDY), m_mode(0), m_control(0), m_baud(0), m_rxd(1), m_tx_data(0), m_rx_data(0), m_tx_shift(0), m_rx_shift(0), m_tx_bits(0), m_rx_bits(0), m_timer(nullptr), diff --git a/src/devices/cpu/psx/sio.h b/src/devices/cpu/psx/sio.h index 04c578a50c6..a9ecc66a9b9 100644 --- a/src/devices/cpu/psx/sio.h +++ b/src/devices/cpu/psx/sio.h @@ -52,7 +52,7 @@ extern const device_type PSX_SIO1; class psxsio_device : public device_t { public: - psxsio_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + psxsio_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // static configuration helpers template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/cpu/scmp/scmp.cpp b/src/devices/cpu/scmp/scmp.cpp index feffb86fcc4..8bba2695d64 100644 --- a/src/devices/cpu/scmp/scmp.cpp +++ b/src/devices/cpu/scmp/scmp.cpp @@ -34,7 +34,7 @@ scmp_device::scmp_device(const machine_config &mconfig, std::string tag, device_ } -scmp_device::scmp_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +scmp_device::scmp_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_LITTLE, 8, 16, 0), m_AC(0), m_ER(0), m_SR(0), m_program(nullptr), m_direct(nullptr), m_icount(0) , m_flag_out_func(*this) diff --git a/src/devices/cpu/scmp/scmp.h b/src/devices/cpu/scmp/scmp.h index 4efb1d531c6..6f6e9809844 100644 --- a/src/devices/cpu/scmp/scmp.h +++ b/src/devices/cpu/scmp/scmp.h @@ -31,7 +31,7 @@ class scmp_device : public cpu_device public: // construction/destruction scmp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - scmp_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + scmp_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // static configuration helpers template static devcb_base &set_flag_out_cb(device_t &device, _Object object) { return downcast(device).m_flag_out_func.set_callback(object); } diff --git a/src/devices/cpu/sh2/sh2.cpp b/src/devices/cpu/sh2/sh2.cpp index a9d76bd2b40..97b177a7b0d 100644 --- a/src/devices/cpu/sh2/sh2.cpp +++ b/src/devices/cpu/sh2/sh2.cpp @@ -202,7 +202,7 @@ void sh2_device::device_stop() } -sh2_device::sh2_device(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 cpu_type, address_map_constructor internal_map, int addrlines ) +sh2_device::sh2_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, int cpu_type, address_map_constructor internal_map, int addrlines ) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_BIG, 32, addrlines, 0, internal_map) , m_decrypted_program_config("decrypted_opcodes", ENDIANNESS_BIG, 32, addrlines, 0) diff --git a/src/devices/cpu/sh2/sh2.h b/src/devices/cpu/sh2/sh2.h index bbc1d07aa55..1abb89d3793 100644 --- a/src/devices/cpu/sh2/sh2.h +++ b/src/devices/cpu/sh2/sh2.h @@ -93,7 +93,7 @@ class sh2_device : public cpu_device public: // construction/destruction sh2_device(const machine_config &mconfig, std::string _tag, device_t *_owner, UINT32 _clock); - sh2_device(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 cpu_type,address_map_constructor internal_map, int addrlines); + sh2_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, int cpu_type,address_map_constructor internal_map, int addrlines); static void set_is_slave(device_t &device, int slave) { downcast(device).m_is_slave = slave; } static void set_dma_kludge_callback(device_t &device, sh2_dma_kludge_delegate callback) { downcast(device).m_dma_kludge_cb = callback; } diff --git a/src/devices/cpu/sh4/sh4.cpp b/src/devices/cpu/sh4/sh4.cpp index b88737a4e46..dff50e312a3 100644 --- a/src/devices/cpu/sh4/sh4.cpp +++ b/src/devices/cpu/sh4/sh4.cpp @@ -85,7 +85,7 @@ static ADDRESS_MAP_START( sh3_internal_map, AS_PROGRAM, 64, sh3_base_device ) ADDRESS_MAP_END -sh34_base_device::sh34_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, endianness_t endianness, address_map_constructor internal) +sh34_base_device::sh34_base_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, endianness_t endianness, address_map_constructor internal) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__) , m_program_config("program", endianness, 64, 32, 0, internal) , m_io_config("io", endianness, 64, 8) @@ -113,14 +113,14 @@ sh34_base_device::sh34_base_device(const machine_config &mconfig, device_type ty } -sh3_base_device::sh3_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, endianness_t endianness) +sh3_base_device::sh3_base_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, endianness_t endianness) : sh34_base_device(mconfig, type, name, tag, owner, clock, shortname, endianness, ADDRESS_MAP_NAME(sh3_internal_map)) { m_cpu_type = CPU_TYPE_SH3; } -sh4_base_device::sh4_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, endianness_t endianness) +sh4_base_device::sh4_base_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, endianness_t endianness) : sh34_base_device(mconfig, type, name, tag, owner, clock, shortname, endianness, ADDRESS_MAP_NAME(sh4_internal_map)) { m_cpu_type = CPU_TYPE_SH4; diff --git a/src/devices/cpu/sh4/sh4.h b/src/devices/cpu/sh4/sh4.h index b8d6d33a1d7..46e2b838423 100644 --- a/src/devices/cpu/sh4/sh4.h +++ b/src/devices/cpu/sh4/sh4.h @@ -174,7 +174,7 @@ class sh34_base_device : public cpu_device { public: // construction/destruction - sh34_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, endianness_t endianness, address_map_constructor internal); + sh34_base_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, endianness_t endianness, address_map_constructor internal); //#if SH4_USE_FASTRAM_OPTIMIZATION void add_fastram(offs_t start, offs_t end, UINT8 readonly, void *base); @@ -714,7 +714,7 @@ class sh3_base_device : public sh34_base_device { public: // construction/destruction - sh3_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, endianness_t endianness); + sh3_base_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, endianness_t endianness); DECLARE_WRITE32_MEMBER( sh3_internal_w ); DECLARE_READ32_MEMBER( sh3_internal_r ); @@ -731,7 +731,7 @@ class sh4_base_device : public sh34_base_device { public: // construction/destruction - sh4_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, endianness_t endianness); + sh4_base_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, endianness_t endianness); DECLARE_WRITE32_MEMBER( sh4_internal_w ); DECLARE_READ32_MEMBER( sh4_internal_r ); diff --git a/src/devices/cpu/sm510/sm510.h b/src/devices/cpu/sm510/sm510.h index 0ab1103a4cf..537bc7eac9b 100644 --- a/src/devices/cpu/sm510/sm510.h +++ b/src/devices/cpu/sm510/sm510.h @@ -68,7 +68,7 @@ class sm510_base_device : public cpu_device { public: // construction/destruction - sm510_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, int stack_levels, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source) + sm510_base_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, int stack_levels, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, std::string shortname, std::string source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_LITTLE, 8, prgwidth, 0, program) , m_data_config("data", ENDIANNESS_LITTLE, 8, datawidth, 0, data) @@ -283,7 +283,7 @@ class sm511_device : public sm510_base_device { public: sm511_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - sm511_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, int stack_levels, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source); + sm511_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, int stack_levels, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, std::string shortname, std::string source); protected: virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; diff --git a/src/devices/cpu/sm510/sm511core.cpp b/src/devices/cpu/sm510/sm511core.cpp index 6a9bb3e692f..a73507b9c42 100644 --- a/src/devices/cpu/sm510/sm511core.cpp +++ b/src/devices/cpu/sm510/sm511core.cpp @@ -47,7 +47,7 @@ sm511_device::sm511_device(const machine_config &mconfig, std::string tag, devic : sm510_base_device(mconfig, SM511, "SM511", tag, owner, clock, 2 /* stack levels */, 12 /* prg width */, ADDRESS_MAP_NAME(program_4k), 7 /* data width */, ADDRESS_MAP_NAME(data_96_32x4), "sm511", __FILE__) { } -sm511_device::sm511_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, int stack_levels, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source) +sm511_device::sm511_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, int stack_levels, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, std::string shortname, std::string source) : sm510_base_device(mconfig, type, name, tag, owner, clock, stack_levels, prgwidth, program, datawidth, data, shortname, source) { } diff --git a/src/devices/cpu/t11/t11.cpp b/src/devices/cpu/t11/t11.cpp index bf36b91f0fd..5bffdba6182 100644 --- a/src/devices/cpu/t11/t11.cpp +++ b/src/devices/cpu/t11/t11.cpp @@ -44,7 +44,7 @@ k1801vm2_device::k1801vm2_device(const machine_config &mconfig, std::string tag, { } -t11_device::t11_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +t11_device::t11_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_LITTLE, 16, 16, 0) , c_initial_mode(0) diff --git a/src/devices/cpu/t11/t11.h b/src/devices/cpu/t11/t11.h index 4ec83cce3f3..29aedc955e8 100644 --- a/src/devices/cpu/t11/t11.h +++ b/src/devices/cpu/t11/t11.h @@ -37,7 +37,7 @@ class t11_device : public cpu_device public: // construction/destruction t11_device(const machine_config &mconfig, std::string _tag, device_t *_owner, UINT32 _clock); - t11_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + t11_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // static configuration helpers static void set_initial_mode(device_t &device, const UINT16 mode) { downcast(device).c_initial_mode = mode; } diff --git a/src/devices/cpu/tlcs90/tlcs90.cpp b/src/devices/cpu/tlcs90/tlcs90.cpp index 16cdf435ce4..16c173d1c5e 100644 --- a/src/devices/cpu/tlcs90/tlcs90.cpp +++ b/src/devices/cpu/tlcs90/tlcs90.cpp @@ -53,7 +53,7 @@ static ADDRESS_MAP_START(tmp91641_mem, AS_PROGRAM, 8, tlcs90_device ) ADDRESS_MAP_END -tlcs90_device::tlcs90_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, address_map_constructor program_map) +tlcs90_device::tlcs90_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, address_map_constructor program_map) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_LITTLE, 8, 20, 0, program_map) , m_io_config("io", ENDIANNESS_LITTLE, 8, 16, 0) diff --git a/src/devices/cpu/tlcs90/tlcs90.h b/src/devices/cpu/tlcs90/tlcs90.h index e72ff60e107..5303d99a358 100644 --- a/src/devices/cpu/tlcs90/tlcs90.h +++ b/src/devices/cpu/tlcs90/tlcs90.h @@ -25,7 +25,7 @@ class tlcs90_device : public cpu_device { public: // construction/destruction - tlcs90_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, address_map_constructor program_map); + tlcs90_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, address_map_constructor program_map); DECLARE_READ8_MEMBER( t90_internal_registers_r ); DECLARE_WRITE8_MEMBER( t90_internal_registers_w ); diff --git a/src/devices/cpu/tlcs900/tlcs900.cpp b/src/devices/cpu/tlcs900/tlcs900.cpp index a95d9db764d..c9ad39a730a 100644 --- a/src/devices/cpu/tlcs900/tlcs900.cpp +++ b/src/devices/cpu/tlcs900/tlcs900.cpp @@ -42,7 +42,7 @@ static ADDRESS_MAP_START(tmp95c063_mem16, AS_PROGRAM, 16, tmp95c063_device ) ADDRESS_MAP_END -tlcs900h_device::tlcs900h_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname) +tlcs900h_device::tlcs900h_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__), m_am8_16(0) { diff --git a/src/devices/cpu/tlcs900/tlcs900.h b/src/devices/cpu/tlcs900/tlcs900.h index 6b4714dec77..4142fbe7c09 100644 --- a/src/devices/cpu/tlcs900/tlcs900.h +++ b/src/devices/cpu/tlcs900/tlcs900.h @@ -49,7 +49,7 @@ class tlcs900h_device : public cpu_device { public: // construction/destruction - tlcs900h_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname); + tlcs900h_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname); // static configuration helpers static void set_am8_16(device_t &device, int am8_16) { downcast(device).m_am8_16 = am8_16; } diff --git a/src/devices/cpu/tms0980/tms0980.cpp b/src/devices/cpu/tms0980/tms0980.cpp index a1d36d6af0f..53a48088e7a 100644 --- a/src/devices/cpu/tms0980/tms0980.cpp +++ b/src/devices/cpu/tms0980/tms0980.cpp @@ -234,7 +234,7 @@ tms1000_cpu_device::tms1000_cpu_device(const machine_config &mconfig, std::strin : tms1xxx_cpu_device(mconfig, TMS1000, "TMS1000", tag, owner, clock, 8 /* o pins */, 11 /* r pins */, 6 /* pc bits */, 8 /* byte width */, 2 /* x width */, 10 /* prg width */, ADDRESS_MAP_NAME(program_10bit_8), 6 /* data width */, ADDRESS_MAP_NAME(data_64x4), "tms1000", __FILE__) { } -tms1000_cpu_device::tms1000_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source) +tms1000_cpu_device::tms1000_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, std::string shortname, std::string source) : tms1xxx_cpu_device(mconfig, type, name, tag, owner, clock, o_pins, r_pins, pc_bits, byte_bits, x_bits, prgwidth, program, datawidth, data, shortname, source) { } @@ -255,7 +255,7 @@ tms1100_cpu_device::tms1100_cpu_device(const machine_config &mconfig, std::strin : tms1000_cpu_device(mconfig, TMS1100, "TMS1100", tag, owner, clock, 8, 11, 6, 8, 3, 11, ADDRESS_MAP_NAME(program_11bit_8), 7, ADDRESS_MAP_NAME(data_128x4), "tms1100", __FILE__) { } -tms1100_cpu_device::tms1100_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source) +tms1100_cpu_device::tms1100_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, std::string shortname, std::string source) : tms1000_cpu_device(mconfig, type, name, tag, owner, clock, o_pins, r_pins, pc_bits, byte_bits, x_bits, prgwidth, program, datawidth, data, shortname, source) { } @@ -276,7 +276,7 @@ tms1400_cpu_device::tms1400_cpu_device(const machine_config &mconfig, std::strin : tms1100_cpu_device(mconfig, TMS1400, "TMS1400", tag, owner, clock, 8, 11, 6, 8, 3, 12, ADDRESS_MAP_NAME(program_12bit_8), 7, ADDRESS_MAP_NAME(data_128x4), "tms1400", __FILE__) { } -tms1400_cpu_device::tms1400_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source) +tms1400_cpu_device::tms1400_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, std::string shortname, std::string source) : tms1100_cpu_device(mconfig, type, name, tag, owner, clock, o_pins, r_pins, pc_bits, byte_bits, x_bits, prgwidth, program, datawidth, data, shortname, source) { } @@ -289,7 +289,7 @@ tms1600_cpu_device::tms1600_cpu_device(const machine_config &mconfig, std::strin : tms1400_cpu_device(mconfig, TMS1600, "TMS1600", tag, owner, clock, 8, 16, 6, 8, 3, 12, ADDRESS_MAP_NAME(program_12bit_8), 7, ADDRESS_MAP_NAME(data_128x4), "tms1600", __FILE__) { } -tms1600_cpu_device::tms1600_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source) +tms1600_cpu_device::tms1600_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, std::string shortname, std::string source) : tms1400_cpu_device(mconfig, type, name, tag, owner, clock, o_pins, r_pins, pc_bits, byte_bits, x_bits, prgwidth, program, datawidth, data, shortname, source) { } @@ -302,7 +302,7 @@ tms0970_cpu_device::tms0970_cpu_device(const machine_config &mconfig, std::strin : tms1000_cpu_device(mconfig, TMS0970, "TMS0970", tag, owner, clock, 8, 11, 6, 8, 2, 10, ADDRESS_MAP_NAME(program_10bit_8), 6, ADDRESS_MAP_NAME(data_64x4), "tms0970", __FILE__) { } -tms0970_cpu_device::tms0970_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source) +tms0970_cpu_device::tms0970_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, std::string shortname, std::string source) : tms1000_cpu_device(mconfig, type, name, tag, owner, clock, o_pins, r_pins, pc_bits, byte_bits, x_bits, prgwidth, program, datawidth, data, shortname, source) { } @@ -319,7 +319,7 @@ tms0980_cpu_device::tms0980_cpu_device(const machine_config &mconfig, std::strin : tms0970_cpu_device(mconfig, TMS0980, "TMS0980", tag, owner, clock, 8, 9, 7, 9, 4, 12, ADDRESS_MAP_NAME(program_11bit_9), 8, ADDRESS_MAP_NAME(data_64x9_as4), "tms0980", __FILE__) { } -tms0980_cpu_device::tms0980_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source) +tms0980_cpu_device::tms0980_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, std::string shortname, std::string source) : tms0970_cpu_device(mconfig, type, name, tag, owner, clock, o_pins, r_pins, pc_bits, byte_bits, x_bits, prgwidth, program, datawidth, data, shortname, source) { } diff --git a/src/devices/cpu/tms0980/tms0980.h b/src/devices/cpu/tms0980/tms0980.h index 221beeeb982..3c2d267b4e7 100644 --- a/src/devices/cpu/tms0980/tms0980.h +++ b/src/devices/cpu/tms0980/tms0980.h @@ -92,7 +92,7 @@ class tms1xxx_cpu_device : public cpu_device { public: // construction/destruction - tms1xxx_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source) + tms1xxx_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, std::string shortname, std::string source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_BIG, byte_bits > 8 ? 16 : 8, prgwidth, 0, program) , m_data_config("data", ENDIANNESS_BIG, 8, datawidth, 0, data) @@ -251,7 +251,7 @@ class tms1000_cpu_device : public tms1xxx_cpu_device { public: tms1000_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - tms1000_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source); + tms1000_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, std::string shortname, std::string source); protected: // overrides @@ -286,7 +286,7 @@ class tms1100_cpu_device : public tms1000_cpu_device { public: tms1100_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - tms1100_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source); + tms1100_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, std::string shortname, std::string source); protected: // overrides @@ -321,7 +321,7 @@ class tms1400_cpu_device : public tms1100_cpu_device { public: tms1400_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - tms1400_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source); + tms1400_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, std::string shortname, std::string source); protected: // overrides @@ -347,7 +347,7 @@ class tms1600_cpu_device : public tms1400_cpu_device { public: tms1600_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - tms1600_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source); + tms1600_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, std::string shortname, std::string source); }; class tms1670_cpu_device : public tms1600_cpu_device @@ -361,7 +361,7 @@ class tms0970_cpu_device : public tms1000_cpu_device { public: tms0970_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - tms0970_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source); + tms0970_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, std::string shortname, std::string source); protected: // overrides @@ -399,7 +399,7 @@ class tms0980_cpu_device : public tms0970_cpu_device { public: tms0980_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - tms0980_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source); + tms0980_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, std::string shortname, std::string source); protected: // overrides diff --git a/src/devices/cpu/tms32010/tms32010.cpp b/src/devices/cpu/tms32010/tms32010.cpp index 285d1cf1ade..f83b45d4952 100644 --- a/src/devices/cpu/tms32010/tms32010.cpp +++ b/src/devices/cpu/tms32010/tms32010.cpp @@ -111,7 +111,7 @@ tms32010_device::tms32010_device(const machine_config &mconfig, std::string tag, } -tms32010_device::tms32010_device(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 addr_mask) +tms32010_device::tms32010_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, int addr_mask) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_BIG, 16, 12, -1) , m_data_config("data", ENDIANNESS_BIG, 16, 8, -1, ADDRESS_MAP_NAME(tms32015_ram)) diff --git a/src/devices/cpu/tms32010/tms32010.h b/src/devices/cpu/tms32010/tms32010.h index 96749cdbef0..16f5b564a9d 100644 --- a/src/devices/cpu/tms32010/tms32010.h +++ b/src/devices/cpu/tms32010/tms32010.h @@ -52,7 +52,7 @@ class tms32010_device : public cpu_device public: // construction/destruction tms32010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - tms32010_device(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 addr_mask); + tms32010_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, int addr_mask); protected: // device-level overrides diff --git a/src/devices/cpu/tms32025/tms32025.cpp b/src/devices/cpu/tms32025/tms32025.cpp index ef045083032..85f64f71e5a 100644 --- a/src/devices/cpu/tms32025/tms32025.cpp +++ b/src/devices/cpu/tms32025/tms32025.cpp @@ -217,7 +217,7 @@ tms32025_device::tms32025_device(const machine_config &mconfig, std::string tag, } -tms32025_device::tms32025_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +tms32025_device::tms32025_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_BIG, 16, 16, -1) , m_data_config("data", ENDIANNESS_BIG, 16, 16, -1) diff --git a/src/devices/cpu/tms32025/tms32025.h b/src/devices/cpu/tms32025/tms32025.h index 557e34466ad..f3019354ae8 100644 --- a/src/devices/cpu/tms32025/tms32025.h +++ b/src/devices/cpu/tms32025/tms32025.h @@ -74,7 +74,7 @@ class tms32025_device : public cpu_device public: // construction/destruction tms32025_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - tms32025_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + tms32025_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); protected: // device-level overrides diff --git a/src/devices/cpu/tms32031/tms32031.cpp b/src/devices/cpu/tms32031/tms32031.cpp index 6eefe54ff10..8ee60fe0ead 100644 --- a/src/devices/cpu/tms32031/tms32031.cpp +++ b/src/devices/cpu/tms32031/tms32031.cpp @@ -251,7 +251,7 @@ void tms3203x_device::tmsreg::from_double(double val) // tms3203x_device - constructor //------------------------------------------------- -tms3203x_device::tms3203x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 chiptype, address_map_constructor internal_map, const char *shortname, const char *source) +tms3203x_device::tms3203x_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 chiptype, address_map_constructor internal_map, std::string shortname, std::string source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source), m_program_config("program", ENDIANNESS_LITTLE, 32, 24, -2, internal_map), m_chip_type(chiptype), diff --git a/src/devices/cpu/tms32031/tms32031.h b/src/devices/cpu/tms32031/tms32031.h index d7bce71678a..9d5e984dccc 100644 --- a/src/devices/cpu/tms32031/tms32031.h +++ b/src/devices/cpu/tms32031/tms32031.h @@ -143,7 +143,7 @@ protected: }; // construction/destruction - tms3203x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 chiptype, address_map_constructor internal_map, const char *shortname, const char *source); + tms3203x_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 chiptype, address_map_constructor internal_map, std::string shortname, std::string source); virtual ~tms3203x_device(); public: diff --git a/src/devices/cpu/tms32051/tms32051.cpp b/src/devices/cpu/tms32051/tms32051.cpp index 7f5593c7dda..af4c99758c4 100644 --- a/src/devices/cpu/tms32051/tms32051.cpp +++ b/src/devices/cpu/tms32051/tms32051.cpp @@ -77,7 +77,7 @@ tms32051_device::tms32051_device(const machine_config &mconfig, std::string tag, { } -tms32051_device::tms32051_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char* shortname, const char* source) +tms32051_device::tms32051_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_LITTLE, 16, 16, -1) , m_data_config("data", ENDIANNESS_LITTLE, 16, 16, -1) diff --git a/src/devices/cpu/tms32051/tms32051.h b/src/devices/cpu/tms32051/tms32051.h index 7ab8fa152eb..0736e63bdbe 100644 --- a/src/devices/cpu/tms32051/tms32051.h +++ b/src/devices/cpu/tms32051/tms32051.h @@ -58,7 +58,7 @@ class tms32051_device : public cpu_device public: // construction/destruction tms32051_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - tms32051_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + tms32051_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); DECLARE_READ16_MEMBER( cpuregs_r ); DECLARE_WRITE16_MEMBER( cpuregs_w ); diff --git a/src/devices/cpu/tms34010/tms34010.cpp b/src/devices/cpu/tms34010/tms34010.cpp index 8be234dbbdd..d4421e29ff5 100644 --- a/src/devices/cpu/tms34010/tms34010.cpp +++ b/src/devices/cpu/tms34010/tms34010.cpp @@ -33,7 +33,7 @@ const device_type TMS34020 = &device_creator; GLOBAL VARIABLES ***************************************************************************/ -tms340x0_device::tms340x0_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname) +tms340x0_device::tms340x0_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__) , device_video_interface(mconfig, *this) , m_program_config("program", ENDIANNESS_LITTLE, 16, 32, 3), m_pc(0), m_ppc(0), m_st(0), m_pixel_write(nullptr), m_pixel_read(nullptr), m_raster_op(nullptr), m_pixel_op(nullptr), m_pixel_op_timing(0), m_convsp(0), m_convdp(0), m_convmp(0), m_gfxcycles(0), m_pixelshift(0), m_is_34020(0), m_reset_deferred(false) diff --git a/src/devices/cpu/tms34010/tms34010.h b/src/devices/cpu/tms34010/tms34010.h index 7434259a89a..71547640dc7 100644 --- a/src/devices/cpu/tms34010/tms34010.h +++ b/src/devices/cpu/tms34010/tms34010.h @@ -240,7 +240,7 @@ class tms340x0_device : public cpu_device, { public: // construction/destruction - tms340x0_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname); + tms340x0_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname); static void set_halt_on_reset(device_t &device, bool halt_on_reset) { downcast(device).m_halt_on_reset = halt_on_reset; } static void set_pixel_clock(device_t &device, UINT32 pixclock) { downcast(device).m_pixclock = pixclock; } diff --git a/src/devices/cpu/tms7000/tms7000.cpp b/src/devices/cpu/tms7000/tms7000.cpp index f9d8122fd1c..663814d8400 100644 --- a/src/devices/cpu/tms7000/tms7000.cpp +++ b/src/devices/cpu/tms7000/tms7000.cpp @@ -125,7 +125,7 @@ tms7000_device::tms7000_device(const machine_config &mconfig, std::string tag, d { } -tms7000_device::tms7000_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, address_map_constructor internal, UINT32 info_flags, const char *shortname, const char *source) +tms7000_device::tms7000_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, address_map_constructor internal, UINT32 info_flags, std::string shortname, std::string source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source), m_program_config("program", ENDIANNESS_BIG, 8, 16, 0, internal), m_io_config("io", ENDIANNESS_BIG, 8, 8, 0, ADDRESS_MAP_NAME(tms7000_io)), diff --git a/src/devices/cpu/tms7000/tms7000.h b/src/devices/cpu/tms7000/tms7000.h index 52cfe9c65d7..cf8722b3503 100644 --- a/src/devices/cpu/tms7000/tms7000.h +++ b/src/devices/cpu/tms7000/tms7000.h @@ -46,7 +46,7 @@ class tms7000_device : public cpu_device public: // construction/destruction tms7000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - tms7000_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, address_map_constructor internal, UINT32 info_flags, const char *shortname, const char *source); + tms7000_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, address_map_constructor internal, UINT32 info_flags, std::string shortname, std::string source); DECLARE_READ8_MEMBER(tms7000_unmapped_rf_r) { if (!space.debugger_access()) logerror("'%s' (%04X): unmapped_rf_r @ $%04x\n", tag().c_str(), m_pc, offset + 0x80); return 0; }; DECLARE_WRITE8_MEMBER(tms7000_unmapped_rf_w) { logerror("'%s' (%04X): unmapped_rf_w @ $%04x = $%02x\n", tag().c_str(), m_pc, offset + 0x80, data); }; diff --git a/src/devices/cpu/tms9900/tms9900.cpp b/src/devices/cpu/tms9900/tms9900.cpp index 4f85685fba0..f8d7bb2d795 100644 --- a/src/devices/cpu/tms9900/tms9900.cpp +++ b/src/devices/cpu/tms9900/tms9900.cpp @@ -168,7 +168,7 @@ enum twice their number. Accordingly, the TMS9900 has a CRU bitmask 0x0fff. ****************************************************************************/ -tms99xx_device::tms99xx_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, int databus_width, int prg_addr_bits, int cru_addr_bits, device_t *owner, UINT32 clock, const char *shortname, const char *source) +tms99xx_device::tms99xx_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, int databus_width, int prg_addr_bits, int cru_addr_bits, device_t *owner, UINT32 clock, std::string shortname, std::string source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source), m_program_config("program", ENDIANNESS_BIG, databus_width, prg_addr_bits), m_io_config("cru", ENDIANNESS_BIG, 8, cru_addr_bits), diff --git a/src/devices/cpu/tms9900/tms9900.h b/src/devices/cpu/tms9900/tms9900.h index 1676947c0d4..215f56754f0 100644 --- a/src/devices/cpu/tms9900/tms9900.h +++ b/src/devices/cpu/tms9900/tms9900.h @@ -44,7 +44,7 @@ class tms99xx_device : public cpu_device public: tms99xx_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, int databus_width, int prg_addr_bits, int cru_addr_bits, - device_t *owner, UINT32 clock, const char *shortname, const char *source); + device_t *owner, UINT32 clock, std::string shortname, std::string source); ~tms99xx_device(); diff --git a/src/devices/cpu/tms9900/tms9995.cpp b/src/devices/cpu/tms9900/tms9995.cpp index 4fd6c909bd3..a5761d20529 100644 --- a/src/devices/cpu/tms9900/tms9995.cpp +++ b/src/devices/cpu/tms9900/tms9995.cpp @@ -198,7 +198,7 @@ tms9995_device::tms9995_device(const machine_config &mconfig, std::string tag, d /* Called from subclass. */ -tms9995_device::tms9995_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +tms9995_device::tms9995_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : cpu_device(mconfig, TMS9995, name, tag, owner, clock, shortname, source), m_state_any(0), PC(0), diff --git a/src/devices/cpu/tms9900/tms9995.h b/src/devices/cpu/tms9900/tms9995.h index ab5560d133f..fd95e467aaa 100644 --- a/src/devices/cpu/tms9900/tms9995.h +++ b/src/devices/cpu/tms9900/tms9995.h @@ -49,7 +49,7 @@ class tms9995_device : public cpu_device { public: tms9995_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - tms9995_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + tms9995_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // READY input line. When asserted (high), the memory is ready for data exchange. // We chose to use a direct method instead of a delegate to keep performance diff --git a/src/devices/cpu/ucom4/ucom4.h b/src/devices/cpu/ucom4/ucom4.h index 518603a9aef..eaaebc665e0 100644 --- a/src/devices/cpu/ucom4/ucom4.h +++ b/src/devices/cpu/ucom4/ucom4.h @@ -100,7 +100,7 @@ class ucom4_cpu_device : public cpu_device { public: // construction/destruction - ucom4_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, int family, int stack_levels, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source) + ucom4_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, int family, int stack_levels, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, std::string shortname, std::string source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_BIG, 8, prgwidth, 0, program) , m_data_config("data", ENDIANNESS_BIG, 8, datawidth, 0, data) diff --git a/src/devices/cpu/upd7725/upd7725.cpp b/src/devices/cpu/upd7725/upd7725.cpp index 346897b1685..aa0442bdcd2 100644 --- a/src/devices/cpu/upd7725/upd7725.cpp +++ b/src/devices/cpu/upd7725/upd7725.cpp @@ -24,7 +24,7 @@ const device_type UPD7725 = &device_creator; const device_type UPD96050 = &device_creator; -necdsp_device::necdsp_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, UINT32 abits, UINT32 dbits, const char *name, const char *shortname, const char *source) +necdsp_device::necdsp_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, UINT32 abits, UINT32 dbits, const char *name, std::string shortname, std::string source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source), m_program_config("program", ENDIANNESS_BIG, 32, abits, -2), // data bus width, address bus width, -2 means DWORD-addressable m_data_config("data", ENDIANNESS_BIG, 16, dbits, -1), m_icount(0), // -1 for WORD-addressable diff --git a/src/devices/cpu/upd7725/upd7725.h b/src/devices/cpu/upd7725/upd7725.h index b731a46a756..5f16ff5081f 100644 --- a/src/devices/cpu/upd7725/upd7725.h +++ b/src/devices/cpu/upd7725/upd7725.h @@ -73,7 +73,7 @@ class necdsp_device : public cpu_device { protected: // construction/destruction - necdsp_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, UINT32 abits, UINT32 dbits, const char *name, const char *shortname, const char *source); + necdsp_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, UINT32 abits, UINT32 dbits, const char *name, std::string shortname, std::string source); public: diff --git a/src/devices/cpu/upd7810/upd7810.cpp b/src/devices/cpu/upd7810/upd7810.cpp index 7335e29974d..bad140a6392 100644 --- a/src/devices/cpu/upd7810/upd7810.cpp +++ b/src/devices/cpu/upd7810/upd7810.cpp @@ -409,7 +409,7 @@ upd7810_device::upd7810_device(const machine_config &mconfig, std::string tag, d m_op74 = s_op74; } -upd7810_device::upd7810_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +upd7810_device::upd7810_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_to_func(*this) , m_co0_func(*this) @@ -468,7 +468,7 @@ upd78c05_device::upd78c05_device(const machine_config &mconfig, std::string tag, m_opXX = s_opXX_78c05; } -upd78c05_device::upd78c05_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +upd78c05_device::upd78c05_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : upd7810_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/cpu/upd7810/upd7810.h b/src/devices/cpu/upd7810/upd7810.h index 3c555f80a36..146fdc4bd6c 100644 --- a/src/devices/cpu/upd7810/upd7810.h +++ b/src/devices/cpu/upd7810/upd7810.h @@ -95,7 +95,7 @@ class upd7810_device : public cpu_device public: // construction/destruction upd7810_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - upd7810_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + upd7810_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // static configuration helpers template static devcb_base &set_to_func(device_t &device, _Object object) { return downcast(device).m_to_func.set_callback(object); } @@ -1400,7 +1400,7 @@ class upd78c05_device : public upd7810_device public: // construction/destruction upd78c05_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - upd78c05_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + upd78c05_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); protected: virtual void device_start() override; diff --git a/src/devices/cpu/v60/v60.cpp b/src/devices/cpu/v60/v60.cpp index 8e091509beb..c4fbe131c7d 100644 --- a/src/devices/cpu/v60/v60.cpp +++ b/src/devices/cpu/v60/v60.cpp @@ -93,7 +93,7 @@ v60_device::v60_device(const machine_config &mconfig, std::string tag, device_t } -v60_device::v60_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +v60_device::v60_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_LITTLE, 32, 32, 0) , m_io_config("io", ENDIANNESS_LITTLE, 16, 24, 0) diff --git a/src/devices/cpu/v60/v60.h b/src/devices/cpu/v60/v60.h index ce146922f9b..ec123e02e46 100644 --- a/src/devices/cpu/v60/v60.h +++ b/src/devices/cpu/v60/v60.h @@ -85,7 +85,7 @@ class v60_device : public cpu_device public: // construction/destruction v60_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - v60_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + v60_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); void stall(); diff --git a/src/devices/cpu/z8/z8.cpp b/src/devices/cpu/z8/z8.cpp index 1c9928fbc95..ead663d3e72 100644 --- a/src/devices/cpu/z8/z8.cpp +++ b/src/devices/cpu/z8/z8.cpp @@ -170,7 +170,7 @@ static ADDRESS_MAP_START( program_4kb, AS_PROGRAM, 8, z8_device ) ADDRESS_MAP_END -z8_device::z8_device(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 size) +z8_device::z8_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, int size) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_LITTLE, 8, 16, 0, ( size == 4 ) ? ADDRESS_MAP_NAME(program_4kb) : ADDRESS_MAP_NAME(program_2kb)) , m_data_config("data", ENDIANNESS_LITTLE, 8, 16, 0) diff --git a/src/devices/cpu/z8/z8.h b/src/devices/cpu/z8/z8.h index 0620b956cd4..7180f82d0a3 100644 --- a/src/devices/cpu/z8/z8.h +++ b/src/devices/cpu/z8/z8.h @@ -27,7 +27,7 @@ class z8_device : public cpu_device { public: // construction/destruction - z8_device(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 size); + z8_device(const machine_config &mconfig, device_type type, std::string name, std::string _tag, device_t *_owner, UINT32 _clock, std::string shortname, std::string source, int size); protected: // device-level overrides diff --git a/src/devices/cpu/z80/z80.cpp b/src/devices/cpu/z80/z80.cpp index 77095d869b1..f547f8ee12b 100644 --- a/src/devices/cpu/z80/z80.cpp +++ b/src/devices/cpu/z80/z80.cpp @@ -3721,7 +3721,7 @@ z80_device::z80_device(const machine_config &mconfig, std::string tag, device_t { } -z80_device::z80_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +z80_device::z80_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source), m_program_config("program", ENDIANNESS_LITTLE, 8, 16, 0), m_decrypted_opcodes_config("decrypted_opcodes", ENDIANNESS_LITTLE, 8, 16, 0), diff --git a/src/devices/cpu/z80/z80.h b/src/devices/cpu/z80/z80.h index 1137955dd0d..2472d0464db 100644 --- a/src/devices/cpu/z80/z80.h +++ b/src/devices/cpu/z80/z80.h @@ -48,7 +48,7 @@ public: template static devcb_base &set_refresh_cb(device_t &device, _Object object) { return downcast(device).m_refresh_cb.set_callback(object); } protected: - z80_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + z80_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // device-level overrides virtual void device_start() override; diff --git a/src/devices/cpu/z8000/z8000.cpp b/src/devices/cpu/z8000/z8000.cpp index ee56855815d..2660a4895a3 100644 --- a/src/devices/cpu/z8000/z8000.cpp +++ b/src/devices/cpu/z8000/z8000.cpp @@ -43,7 +43,7 @@ z8002_device::z8002_device(const machine_config &mconfig, std::string tag, devic } -z8002_device::z8002_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +z8002_device::z8002_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_BIG, 16, 20, 0) , m_io_config("io", ENDIANNESS_BIG, 16, 16, 0) diff --git a/src/devices/cpu/z8000/z8000.h b/src/devices/cpu/z8000/z8000.h index 59ae874e349..41b7ee961fd 100644 --- a/src/devices/cpu/z8000/z8000.h +++ b/src/devices/cpu/z8000/z8000.h @@ -36,7 +36,7 @@ class z8002_device : public cpu_device public: // construction/destruction z8002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - z8002_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + z8002_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); ~z8002_device(); template static devcb_base &set_mo_callback(device_t &device, _Object object) { return downcast(device).m_mo_out.set_callback(object); } diff --git a/src/devices/imagedev/chd_cd.cpp b/src/devices/imagedev/chd_cd.cpp index 8be7c2aefaa..84b929c5c3f 100644 --- a/src/devices/imagedev/chd_cd.cpp +++ b/src/devices/imagedev/chd_cd.cpp @@ -35,7 +35,7 @@ cdrom_image_device::cdrom_image_device(const machine_config &mconfig, std::strin { } -cdrom_image_device::cdrom_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) +cdrom_image_device::cdrom_image_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_image_interface(mconfig, *this), m_cdrom_handle(nullptr), diff --git a/src/devices/imagedev/chd_cd.h b/src/devices/imagedev/chd_cd.h index f9d03528ba1..3982816bc4b 100644 --- a/src/devices/imagedev/chd_cd.h +++ b/src/devices/imagedev/chd_cd.h @@ -25,7 +25,7 @@ class cdrom_image_device : public device_t, public: // construction/destruction cdrom_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - cdrom_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); + cdrom_image_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual ~cdrom_image_device(); static void static_set_interface(device_t &device, const char *_interface) { downcast(device).m_interface = _interface; } diff --git a/src/devices/imagedev/flopdrv.cpp b/src/devices/imagedev/flopdrv.cpp index 09b99bfe315..a7f2f0df446 100644 --- a/src/devices/imagedev/flopdrv.cpp +++ b/src/devices/imagedev/flopdrv.cpp @@ -728,7 +728,7 @@ legacy_floppy_image_device::legacy_floppy_image_device(const machine_config &mco memset(&m_extension_list,0,sizeof(m_extension_list)); } -legacy_floppy_image_device::legacy_floppy_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) +legacy_floppy_image_device::legacy_floppy_image_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_image_interface(mconfig, *this), m_out_idx_func(*this), diff --git a/src/devices/imagedev/flopdrv.h b/src/devices/imagedev/flopdrv.h index 02b4f80aa8c..4d575255900 100644 --- a/src/devices/imagedev/flopdrv.h +++ b/src/devices/imagedev/flopdrv.h @@ -93,7 +93,7 @@ class legacy_floppy_image_device : public device_t, public: // construction/destruction legacy_floppy_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - legacy_floppy_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); + legacy_floppy_image_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); ~legacy_floppy_image_device(); template static devcb_base &set_out_idx_func(device_t &device, _Object object) { return downcast(device).m_out_idx_func.set_callback(object); } diff --git a/src/devices/imagedev/floppy.cpp b/src/devices/imagedev/floppy.cpp index 066866c843f..b6c1adef440 100644 --- a/src/devices/imagedev/floppy.cpp +++ b/src/devices/imagedev/floppy.cpp @@ -163,7 +163,7 @@ floppy_image_device *floppy_connector::get_device() // floppy_image_device - constructor //------------------------------------------------- -floppy_image_device::floppy_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) +floppy_image_device::floppy_image_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_image_interface(mconfig, *this), device_slot_card_interface(mconfig, *this), diff --git a/src/devices/imagedev/floppy.h b/src/devices/imagedev/floppy.h index 25a60219095..e3d381e196a 100644 --- a/src/devices/imagedev/floppy.h +++ b/src/devices/imagedev/floppy.h @@ -67,7 +67,7 @@ public: typedef delegate wpt_cb; // construction/destruction - floppy_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); + floppy_image_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual ~floppy_image_device(); virtual void handled_variants(UINT32 *variants, int &var_count) const = 0; diff --git a/src/devices/imagedev/harddriv.cpp b/src/devices/imagedev/harddriv.cpp index dafb63f55a6..5a4b9abe2e3 100644 --- a/src/devices/imagedev/harddriv.cpp +++ b/src/devices/imagedev/harddriv.cpp @@ -52,7 +52,7 @@ harddisk_image_device::harddisk_image_device(const machine_config &mconfig, std: //------------------------------------------------- // harddisk_image_device - constructor for subclasses //------------------------------------------------- -harddisk_image_device::harddisk_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) +harddisk_image_device::harddisk_image_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_image_interface(mconfig, *this), m_chd(nullptr), diff --git a/src/devices/imagedev/harddriv.h b/src/devices/imagedev/harddriv.h index b72f7e4ee10..eaab1127a79 100644 --- a/src/devices/imagedev/harddriv.h +++ b/src/devices/imagedev/harddriv.h @@ -53,7 +53,7 @@ public: chd_file *get_chd_file(); protected: - harddisk_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); + harddisk_image_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // device-level overrides virtual void device_config_complete() override; diff --git a/src/devices/imagedev/mfmhd.cpp b/src/devices/imagedev/mfmhd.cpp index 802194feba6..b8282683332 100644 --- a/src/devices/imagedev/mfmhd.cpp +++ b/src/devices/imagedev/mfmhd.cpp @@ -307,7 +307,7 @@ std::string mfm_harddisk_device::tts(const attotime &t) return buf; } -mfm_harddisk_device::mfm_harddisk_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +mfm_harddisk_device::mfm_harddisk_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : harddisk_image_device(mconfig, type, name, tag, owner, clock, shortname, source), device_slot_card_interface(mconfig, *this), m_index_timer(nullptr), diff --git a/src/devices/imagedev/mfmhd.h b/src/devices/imagedev/mfmhd.h index 4360658f6f3..86a60712cb2 100644 --- a/src/devices/imagedev/mfmhd.h +++ b/src/devices/imagedev/mfmhd.h @@ -51,7 +51,7 @@ class mfm_harddisk_device : public harddisk_image_device, public device_slot_card_interface { public: - mfm_harddisk_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + mfm_harddisk_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); ~mfm_harddisk_device(); typedef delegate index_pulse_cb; diff --git a/src/devices/imagedev/snapquik.cpp b/src/devices/imagedev/snapquik.cpp index 84160a92537..af5868a5947 100644 --- a/src/devices/imagedev/snapquik.cpp +++ b/src/devices/imagedev/snapquik.cpp @@ -29,7 +29,7 @@ snapshot_image_device::snapshot_image_device(const machine_config &mconfig, std: { } -snapshot_image_device::snapshot_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) : +snapshot_image_device::snapshot_image_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_image_interface(mconfig, *this), m_file_extensions(nullptr), diff --git a/src/devices/imagedev/snapquik.h b/src/devices/imagedev/snapquik.h index 04bb2de4800..48688f2586f 100644 --- a/src/devices/imagedev/snapquik.h +++ b/src/devices/imagedev/snapquik.h @@ -20,7 +20,7 @@ class snapshot_image_device : public device_t, public: // construction/destruction snapshot_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - snapshot_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); + snapshot_image_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual ~snapshot_image_device(); static void static_set_interface(device_t &device, const char *_interface) { downcast(device).m_interface = _interface; } diff --git a/src/devices/machine/68230pit.cpp b/src/devices/machine/68230pit.cpp index c30494f2a1d..e5deb7e6f12 100644 --- a/src/devices/machine/68230pit.cpp +++ b/src/devices/machine/68230pit.cpp @@ -26,7 +26,7 @@ const device_type PIT68230 = &device_creator; //------------------------------------------------- // pit68230_device - constructors //------------------------------------------------- -pit68230_device::pit68230_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) +pit68230_device::pit68230_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source) : device_t (mconfig, type, name, tag, owner, clock, shortname, source), device_execute_interface (mconfig, *this) , m_icount (0) diff --git a/src/devices/machine/68230pit.h b/src/devices/machine/68230pit.h index 8d4a9ea892f..fa1e900db74 100644 --- a/src/devices/machine/68230pit.h +++ b/src/devices/machine/68230pit.h @@ -86,7 +86,7 @@ class pit68230_device : public device_t, public device_execute_interface { public: // construction/destruction -pit68230_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); +pit68230_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source); pit68230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template static devcb_base &set_pa_wr_callback (device_t &device, _Object object) { diff --git a/src/devices/machine/6850acia.cpp b/src/devices/machine/6850acia.cpp index 7a70b05e300..d4531530313 100644 --- a/src/devices/machine/6850acia.cpp +++ b/src/devices/machine/6850acia.cpp @@ -88,7 +88,7 @@ acia6850_device::acia6850_device(const machine_config &mconfig, std::string tag, { } -acia6850_device::acia6850_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +acia6850_device::acia6850_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_txd_handler(*this), m_rts_handler(*this), diff --git a/src/devices/machine/6850acia.h b/src/devices/machine/6850acia.h index 6712a07d7a5..7d1c66ec182 100644 --- a/src/devices/machine/6850acia.h +++ b/src/devices/machine/6850acia.h @@ -47,7 +47,7 @@ public: DECLARE_WRITE_LINE_MEMBER( write_txc ); protected: - acia6850_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + acia6850_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // device-level overrides virtual void device_start() override; diff --git a/src/devices/machine/adc083x.cpp b/src/devices/machine/adc083x.cpp index 620bec89f4a..ffb8abdf67a 100644 --- a/src/devices/machine/adc083x.cpp +++ b/src/devices/machine/adc083x.cpp @@ -51,7 +51,7 @@ const device_type ADC0832 = &device_creator; const device_type ADC0834 = &device_creator; const device_type ADC0838 = &device_creator; -adc083x_device::adc083x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +adc083x_device::adc083x_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_cs(0), m_clk(0), diff --git a/src/devices/machine/adc083x.h b/src/devices/machine/adc083x.h index 78be305986f..8fcb2bd9234 100644 --- a/src/devices/machine/adc083x.h +++ b/src/devices/machine/adc083x.h @@ -46,7 +46,7 @@ typedef device_delegate adc083x_input_delegate; class adc083x_device : public device_t { public: - adc083x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + adc083x_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // static configuration helpers static void set_input_callback(device_t &device, adc083x_input_delegate input_callback) { downcast(device).m_input_callback = input_callback; } diff --git a/src/devices/machine/adc1213x.cpp b/src/devices/machine/adc1213x.cpp index a75aaa3f14c..90a2db4e380 100644 --- a/src/devices/machine/adc1213x.cpp +++ b/src/devices/machine/adc1213x.cpp @@ -56,7 +56,7 @@ adc12138_device::adc12138_device(const machine_config &mconfig, std::string tag, : device_t(mconfig, ADC12138, "ADC12138", tag, owner, clock, "adc12138", __FILE__) { } -adc12138_device::adc12138_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +adc12138_device::adc12138_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/machine/adc1213x.h b/src/devices/machine/adc1213x.h index bca6a5856b3..7d0df68adfa 100644 --- a/src/devices/machine/adc1213x.h +++ b/src/devices/machine/adc1213x.h @@ -28,7 +28,7 @@ class adc12138_device : public device_t { public: adc12138_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - adc12138_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + adc12138_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); ~adc12138_device() {} static void set_ipt_convert_callback(device_t &device, adc1213x_ipt_convert_delegate callback) { downcast(device).m_ipt_read_cb = callback; } diff --git a/src/devices/machine/am9517a.cpp b/src/devices/machine/am9517a.cpp index 3879d8906f9..f7373dfbec2 100644 --- a/src/devices/machine/am9517a.cpp +++ b/src/devices/machine/am9517a.cpp @@ -471,7 +471,7 @@ inline void am9517a_device::end_of_process() //------------------------------------------------- -am9517a_device::am9517a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname) +am9517a_device::am9517a_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname) : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__), device_execute_interface(mconfig, *this), m_icount(0), diff --git a/src/devices/machine/am9517a.h b/src/devices/machine/am9517a.h index dc48331e970..3e63ade2e4d 100644 --- a/src/devices/machine/am9517a.h +++ b/src/devices/machine/am9517a.h @@ -48,7 +48,7 @@ class am9517a_device : public device_t, { public: // construction/destruction - am9517a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname); + am9517a_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname); am9517a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template static devcb_base &set_out_hreq_callback(device_t &device, _Object object) { return downcast(device).m_out_hreq_cb.set_callback(object); } diff --git a/src/devices/machine/at29x.cpp b/src/devices/machine/at29x.cpp index 097ab676fc7..ede8dd8455b 100644 --- a/src/devices/machine/at29x.cpp +++ b/src/devices/machine/at29x.cpp @@ -54,7 +54,7 @@ enum Constructor for all variants */ -at29x_device::at29x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +at29x_device::at29x_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_nvram_interface(mconfig, *this), m_memory_size(0), // bytes diff --git a/src/devices/machine/at29x.h b/src/devices/machine/at29x.h index 02f68d5b0c7..12dc5c851f4 100644 --- a/src/devices/machine/at29x.h +++ b/src/devices/machine/at29x.h @@ -34,7 +34,7 @@ enum s_pgm_t class at29x_device : public device_t, public device_nvram_interface { public: - at29x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + at29x_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); diff --git a/src/devices/machine/at45dbxx.cpp b/src/devices/machine/at45dbxx.cpp index 3a7a6efb105..caef37e4f0c 100644 --- a/src/devices/machine/at45dbxx.cpp +++ b/src/devices/machine/at45dbxx.cpp @@ -53,7 +53,7 @@ at45db041_device::at45db041_device(const machine_config &mconfig, std::string ta } -at45db041_device::at45db041_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +at45db041_device::at45db041_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_nvram_interface(mconfig, *this), write_so(*this) diff --git a/src/devices/machine/at45dbxx.h b/src/devices/machine/at45dbxx.h index a7defed9e1f..a4ec4944f4d 100644 --- a/src/devices/machine/at45dbxx.h +++ b/src/devices/machine/at45dbxx.h @@ -42,7 +42,7 @@ class at45db041_device : public device_t, { public: at45db041_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - at45db041_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + at45db041_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); DECLARE_WRITE_LINE_MEMBER(cs_w); DECLARE_WRITE_LINE_MEMBER(sck_w); diff --git a/src/devices/machine/atahle.cpp b/src/devices/machine/atahle.cpp index 08bf542136a..add667cb8c0 100644 --- a/src/devices/machine/atahle.cpp +++ b/src/devices/machine/atahle.cpp @@ -39,7 +39,7 @@ enum #define DEVICE1_PDIAG_TIME (attotime::from_msec(2)) #define DIAGNOSTIC_TIME (attotime::from_msec(2)) -ata_hle_device::ata_hle_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source) +ata_hle_device::ata_hle_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock,std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), ata_device_interface(mconfig, *this), device_slot_card_interface(mconfig, *this), diff --git a/src/devices/machine/atahle.h b/src/devices/machine/atahle.h index 9d9e3b41179..2ccfb397b26 100644 --- a/src/devices/machine/atahle.h +++ b/src/devices/machine/atahle.h @@ -20,7 +20,7 @@ class ata_hle_device : public device_t, public device_slot_card_interface { public: - ata_hle_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source); + ata_hle_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock,std::string shortname, std::string source); virtual UINT16 read_dma() override; virtual DECLARE_READ16_MEMBER(read_cs0) override; diff --git a/src/devices/machine/ataintf.cpp b/src/devices/machine/ataintf.cpp index f8e4669b577..c0e7835c4b4 100644 --- a/src/devices/machine/ataintf.cpp +++ b/src/devices/machine/ataintf.cpp @@ -207,7 +207,7 @@ SLOT_INTERFACE_START(ata_devices) SLOT_INTERFACE("cdrom", ATAPI_CDROM) SLOT_INTERFACE_END -ata_interface_device::ata_interface_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +ata_interface_device::ata_interface_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_irq_handler(*this), m_dmarq_handler(*this), diff --git a/src/devices/machine/ataintf.h b/src/devices/machine/ataintf.h index d7006701188..1ad3ae901f5 100644 --- a/src/devices/machine/ataintf.h +++ b/src/devices/machine/ataintf.h @@ -78,7 +78,7 @@ class ata_interface_device : public device_t { public: ata_interface_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - ata_interface_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + ata_interface_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // static configuration helpers template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/machine/atapicdr.cpp b/src/devices/machine/atapicdr.cpp index 540aa493b66..9b611667fc9 100644 --- a/src/devices/machine/atapicdr.cpp +++ b/src/devices/machine/atapicdr.cpp @@ -10,7 +10,7 @@ atapi_cdrom_device::atapi_cdrom_device(const machine_config &mconfig, std::strin { } -atapi_cdrom_device::atapi_cdrom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +atapi_cdrom_device::atapi_cdrom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : atapi_hle_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/machine/atapicdr.h b/src/devices/machine/atapicdr.h index 99b2651c1a7..535ba351ece 100644 --- a/src/devices/machine/atapicdr.h +++ b/src/devices/machine/atapicdr.h @@ -21,7 +21,7 @@ class atapi_cdrom_device : public atapi_hle_device, { public: atapi_cdrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - atapi_cdrom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source); + atapi_cdrom_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock,std::string shortname, std::string source); UINT16 *identify_device_buffer() { return m_identify_buffer; } diff --git a/src/devices/machine/atapihle.cpp b/src/devices/machine/atapihle.cpp index 9ca6e7c73f7..993b1739018 100644 --- a/src/devices/machine/atapihle.cpp +++ b/src/devices/machine/atapihle.cpp @@ -2,7 +2,7 @@ // copyright-holders:smf #include "atapihle.h" -atapi_hle_device::atapi_hle_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source) +atapi_hle_device::atapi_hle_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock,std::string shortname, std::string source) : ata_hle_device(mconfig, type, name, tag, owner, clock, shortname, source), m_packet(0), m_data_size(0) diff --git a/src/devices/machine/atapihle.h b/src/devices/machine/atapihle.h index 97cd3f50398..0fe6e4a9ae4 100644 --- a/src/devices/machine/atapihle.h +++ b/src/devices/machine/atapihle.h @@ -20,7 +20,7 @@ class atapi_hle_device : public ata_hle_device, public virtual t10spc { public: - atapi_hle_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source); + atapi_hle_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock,std::string shortname, std::string source); enum atapi_features_flag_t { diff --git a/src/devices/machine/ay31015.cpp b/src/devices/machine/ay31015.cpp index 0effc877efd..b734765a037 100644 --- a/src/devices/machine/ay31015.cpp +++ b/src/devices/machine/ay31015.cpp @@ -97,7 +97,7 @@ Start bit (low), Bit 0, Bit 1... highest bit, Parity bit (if enabled), 1-2 stop const device_type AY31015 = &device_creator; const device_type AY51013 = &device_creator; -ay31015_device::ay31015_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +ay31015_device::ay31015_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_control_reg(0), m_status_reg(0), diff --git a/src/devices/machine/ay31015.h b/src/devices/machine/ay31015.h index a28595d723b..b6c1287b807 100644 --- a/src/devices/machine/ay31015.h +++ b/src/devices/machine/ay31015.h @@ -62,7 +62,7 @@ class ay31015_device : public device_t { public: ay31015_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - ay31015_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + ay31015_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); ~ay31015_device() {} static void set_tx_clock(device_t &device, double tx_clock) { downcast(device).m_tx_clock = tx_clock; } diff --git a/src/devices/machine/dmac.cpp b/src/devices/machine/dmac.cpp index ea1c16fa61c..8e743e8b65e 100644 --- a/src/devices/machine/dmac.cpp +++ b/src/devices/machine/dmac.cpp @@ -90,7 +90,7 @@ void dmac_device::device_reset() void dmac_device::autoconfig_base_address(offs_t address) { if (VERBOSE) - logerror("%s('%s'): autoconfig_base_address received: 0x%06x\n", shortname(), basetag(), address); + logerror("%s('%s'): autoconfig_base_address received: 0x%06x\n", shortname().c_str(), basetag().c_str(), address); if (!m_configured && m_ram_size > 0) { @@ -188,7 +188,7 @@ READ16_MEMBER( dmac_device::register_read ) check_interrupts(); if (VERBOSE) - logerror("%s('%s'): read istr %04x [mask = %04x]\n", shortname(), basetag(), data, mem_mask); + logerror("%s('%s'): read istr %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), data, mem_mask); break; @@ -196,7 +196,7 @@ READ16_MEMBER( dmac_device::register_read ) data = m_cntr; if (VERBOSE) - logerror("%s('%s'): read cntr %04x [mask = %04x]\n", shortname(), basetag(), data, mem_mask); + logerror("%s('%s'): read cntr %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), data, mem_mask); break; @@ -213,27 +213,27 @@ READ16_MEMBER( dmac_device::register_read ) data = m_scsi_read_handler(offset); if (VERBOSE) - logerror("%s('%s'): read scsi data @ %02x %04x [mask = %04x]\n", shortname(), basetag(), offset, data, mem_mask); + logerror("%s('%s'): read scsi data @ %02x %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), offset, data, mem_mask); break; case 0x70: if (VERBOSE) - logerror("%s('%s'): read dma start strobe %04x [mask = %04x]\n", shortname(), basetag(), data, mem_mask); + logerror("%s('%s'): read dma start strobe %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), data, mem_mask); start_dma(); break; case 0x71: if (VERBOSE) - logerror("%s('%s'): read dma stop strobe %04x [mask = %04x]\n", shortname(), basetag(), data, mem_mask); + logerror("%s('%s'): read dma stop strobe %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), data, mem_mask); stop_dma(); break; case 0x72: if (VERBOSE) - logerror("%s('%s'): read clear irq strobe %04x [mask = %04x]\n", shortname(), basetag(), data, mem_mask); + logerror("%s('%s'): read clear irq strobe %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), data, mem_mask); // clear all interrupts m_istr &= ~ISTR_INT_MASK; @@ -242,14 +242,14 @@ READ16_MEMBER( dmac_device::register_read ) case 0x74: if (VERBOSE) - logerror("%s('%s'): read flush fifo strobe %04x [mask = %04x]\n", shortname(), basetag(), data, mem_mask); + logerror("%s('%s'): read flush fifo strobe %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), data, mem_mask); m_istr |= ISTR_FE_FLG; break; default: if (VERBOSE) - logerror("%s('%s'): register_read %04x @ %02x [mask = %04x]\n", shortname(), basetag(), data, offset, mem_mask); + logerror("%s('%s'): register_read %04x @ %02x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), data, offset, mem_mask); } return data; @@ -261,7 +261,7 @@ WRITE16_MEMBER( dmac_device::register_write ) { case 0x21: if (VERBOSE) - logerror("%s('%s'): write cntr %04x [mask = %04x]\n", shortname(), basetag(), data, mem_mask); + logerror("%s('%s'): write cntr %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), data, mem_mask); m_cntr = data; check_interrupts(); @@ -269,7 +269,7 @@ WRITE16_MEMBER( dmac_device::register_write ) case 0x40: if (VERBOSE) - logerror("%s('%s'): write wtc hi %04x [mask = %04x]\n", shortname(), basetag(), data, mem_mask); + logerror("%s('%s'): write wtc hi %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), data, mem_mask); m_wtc &= 0x0000ffff; m_wtc |= ((UINT32) data) << 16; @@ -277,7 +277,7 @@ WRITE16_MEMBER( dmac_device::register_write ) case 0x41: if (VERBOSE) - logerror("%s('%s'): write wtc lo %04x [mask = %04x]\n", shortname(), basetag(), data, mem_mask); + logerror("%s('%s'): write wtc lo %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), data, mem_mask); m_wtc &= 0xffff0000; m_wtc |= data; @@ -285,7 +285,7 @@ WRITE16_MEMBER( dmac_device::register_write ) case 0x42: if (VERBOSE) - logerror("%s('%s'): write acr hi %04x [mask = %04x]\n", shortname(), basetag(), data, mem_mask); + logerror("%s('%s'): write acr hi %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), data, mem_mask); m_acr &= 0x0000ffff; m_acr |= ((UINT32) data) << 16; @@ -293,7 +293,7 @@ WRITE16_MEMBER( dmac_device::register_write ) case 0x43: if (VERBOSE) - logerror("%s('%s'): write acr lo %04x [mask = %04x]\n", shortname(), basetag(), data, mem_mask); + logerror("%s('%s'): write acr lo %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), data, mem_mask); m_acr &= 0xffff0000; m_acr |= data; @@ -301,7 +301,7 @@ WRITE16_MEMBER( dmac_device::register_write ) case 0x47: if (VERBOSE) - logerror("%s('%s'): write dawr %04x [mask = %04x]\n", shortname(), basetag(), data, mem_mask); + logerror("%s('%s'): write dawr %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), data, mem_mask); break; case 0x48: @@ -315,28 +315,28 @@ WRITE16_MEMBER( dmac_device::register_write ) case 0x5e: case 0x5f: if (VERBOSE) - logerror("%s('%s'): write scsi data @ %02x %04x [mask = %04x]\n", shortname(), basetag(), offset, data, mem_mask); + logerror("%s('%s'): write scsi data @ %02x %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), offset, data, mem_mask); m_scsi_write_handler(offset, data, 0xff); break; case 0x70: if (VERBOSE) - logerror("%s('%s'): write dma start strobe %04x [mask = %04x]\n", shortname(), basetag(), data, mem_mask); + logerror("%s('%s'): write dma start strobe %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), data, mem_mask); start_dma(); break; case 0x71: if (VERBOSE) - logerror("%s('%s'): write dma stop strobe %04x [mask = %04x]\n", shortname(), basetag(), data, mem_mask); + logerror("%s('%s'): write dma stop strobe %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), data, mem_mask); stop_dma(); break; case 0x72: if (VERBOSE) - logerror("%s('%s'): write clear irq strobe %04x [mask = %04x]\n", shortname(), basetag(), data, mem_mask); + logerror("%s('%s'): write clear irq strobe %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), data, mem_mask); // clear all interrupts m_istr &= ~ISTR_INT_MASK; @@ -345,14 +345,14 @@ WRITE16_MEMBER( dmac_device::register_write ) case 0x74: if (VERBOSE) - logerror("%s('%s'): write flush fifo strobe %04x [mask = %04x]\n", shortname(), basetag(), data, mem_mask); + logerror("%s('%s'): write flush fifo strobe %04x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), data, mem_mask); m_istr |= ISTR_FE_FLG; break; default: if (VERBOSE) - logerror("%s('%s'): write %04x @ %02x [mask = %04x]\n", shortname(), basetag(), data, offset, mem_mask); + logerror("%s('%s'): write %04x @ %02x [mask = %04x]\n", shortname().c_str(), basetag().c_str(), data, offset, mem_mask); } } @@ -360,7 +360,7 @@ WRITE16_MEMBER( dmac_device::register_write ) WRITE_LINE_MEMBER( dmac_device::configin_w ) { if (VERBOSE) - logerror("%s('%s'): configin_w (%d)\n", shortname(), basetag(), state); + logerror("%s('%s'): configin_w (%d)\n", shortname().c_str(), basetag().c_str(), state); if (state == 0 && !m_configured) { @@ -416,7 +416,7 @@ WRITE_LINE_MEMBER( dmac_device::configin_w ) WRITE_LINE_MEMBER( dmac_device::ramsz_w ) { if (VERBOSE) - logerror("%s('%s'): ramsz_w (%d)\n", shortname(), basetag(), state); + logerror("%s('%s'): ramsz_w (%d)\n", shortname().c_str(), basetag().c_str(), state); switch (state) { @@ -431,7 +431,7 @@ WRITE_LINE_MEMBER( dmac_device::ramsz_w ) WRITE_LINE_MEMBER( dmac_device::rst_w ) { if (VERBOSE) - logerror("%s('%s'): rst_w (%d)\n", shortname(), basetag(), state); + logerror("%s('%s'): rst_w (%d)\n", shortname().c_str(), basetag().c_str(), state); if (m_rst == 1 && state == 0) device_reset(); @@ -443,7 +443,7 @@ WRITE_LINE_MEMBER( dmac_device::rst_w ) WRITE_LINE_MEMBER( dmac_device::intx_w ) { if (VERBOSE) - logerror("%s('%s'): intx_w (%d)\n", shortname(), basetag(), state); + logerror("%s('%s'): intx_w (%d)\n", shortname().c_str(), basetag().c_str(), state); if (state) m_istr |= ISTR_INTS; @@ -457,7 +457,7 @@ WRITE_LINE_MEMBER( dmac_device::intx_w ) WRITE_LINE_MEMBER( dmac_device::xdreq_w ) { if (VERBOSE) - logerror("%s('%s'): xdreq_w (%d)\n", shortname(), basetag(), state); + logerror("%s('%s'): xdreq_w (%d)\n", shortname().c_str(), basetag().c_str(), state); if (m_dma_active) { diff --git a/src/devices/machine/dp8390.cpp b/src/devices/machine/dp8390.cpp index 87c9725ee9f..3184bb50bb0 100644 --- a/src/devices/machine/dp8390.cpp +++ b/src/devices/machine/dp8390.cpp @@ -19,7 +19,7 @@ rtl8019a_device::rtl8019a_device(const machine_config &mconfig, std::string tag, m_type = TYPE_RTL8019A; } -dp8390_device::dp8390_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, float bandwidth, const char *shortname, const char *source) +dp8390_device::dp8390_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, float bandwidth, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_network_interface(mconfig, *this, bandwidth), m_type(0), m_irq_cb(*this), diff --git a/src/devices/machine/dp8390.h b/src/devices/machine/dp8390.h index bb3f39bc314..1778c001242 100644 --- a/src/devices/machine/dp8390.h +++ b/src/devices/machine/dp8390.h @@ -38,7 +38,7 @@ class dp8390_device : public device_t, { public: // construction/destruction - dp8390_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, float bandwidth, const char *shortname, const char *source); + dp8390_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, float bandwidth, std::string shortname, std::string source); template static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast(device).m_irq_cb.set_callback(object); } template static devcb_base &set_breq_callback(device_t &device, _Object object) { return downcast(device).m_breq_cb.set_callback(object); } diff --git a/src/devices/machine/hdc92x4.cpp b/src/devices/machine/hdc92x4.cpp index c2659edcfd0..656924304a2 100644 --- a/src/devices/machine/hdc92x4.cpp +++ b/src/devices/machine/hdc92x4.cpp @@ -431,7 +431,7 @@ const hdc92x4_device::cmddef hdc92x4_device::s_command[] = /* Standard constructor for the base class and the two variants */ -hdc92x4_device::hdc92x4_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +hdc92x4_device::hdc92x4_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_out_intrq(*this), m_out_dmarq(*this), diff --git a/src/devices/machine/hdc92x4.h b/src/devices/machine/hdc92x4.h index e15fc72230e..35322aff2bc 100644 --- a/src/devices/machine/hdc92x4.h +++ b/src/devices/machine/hdc92x4.h @@ -79,7 +79,7 @@ enum class hdc92x4_device : public device_t { public: - hdc92x4_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + hdc92x4_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // Accesors from the CPU side DECLARE_READ8_MEMBER( read ); diff --git a/src/devices/machine/i8251.cpp b/src/devices/machine/i8251.cpp index f43c5fb2cab..fa929b9a1b0 100644 --- a/src/devices/machine/i8251.cpp +++ b/src/devices/machine/i8251.cpp @@ -37,7 +37,7 @@ const device_type V53_SCU = &device_creator; // i8251_device - constructor //------------------------------------------------- -i8251_device::i8251_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname) +i8251_device::i8251_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname) : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__), device_serial_interface(mconfig, *this), m_txd_handler(*this), diff --git a/src/devices/machine/i8251.h b/src/devices/machine/i8251.h index c1f650a9db6..6a37a0fca8e 100644 --- a/src/devices/machine/i8251.h +++ b/src/devices/machine/i8251.h @@ -42,7 +42,7 @@ class i8251_device : public device_t, { public: // construction/destruction - i8251_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname); + i8251_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname); i8251_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // static configuration helpers diff --git a/src/devices/machine/idectrl.cpp b/src/devices/machine/idectrl.cpp index 4539c62b0d9..e461148638e 100644 --- a/src/devices/machine/idectrl.cpp +++ b/src/devices/machine/idectrl.cpp @@ -31,7 +31,7 @@ ide_controller_device::ide_controller_device(const machine_config &mconfig, std: { } -ide_controller_device::ide_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) : +ide_controller_device::ide_controller_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : ata_interface_device(mconfig, type, name, tag, owner, clock, shortname, source) { } @@ -94,7 +94,7 @@ ide_controller_32_device::ide_controller_32_device(const machine_config &mconfig { } -ide_controller_32_device::ide_controller_32_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +ide_controller_32_device::ide_controller_32_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : ide_controller_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/machine/idectrl.h b/src/devices/machine/idectrl.h index e250f1e3071..89aa39e0ac5 100644 --- a/src/devices/machine/idectrl.h +++ b/src/devices/machine/idectrl.h @@ -31,7 +31,7 @@ class ide_controller_device : public ata_interface_device { public: ide_controller_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - ide_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); + ide_controller_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual DECLARE_READ16_MEMBER(read_cs0) override; virtual DECLARE_READ16_MEMBER(read_cs1) override; @@ -54,7 +54,7 @@ class ide_controller_32_device : public ide_controller_device { public: ide_controller_32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - ide_controller_32_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + ide_controller_32_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual DECLARE_READ32_MEMBER(read_cs0); virtual DECLARE_READ32_MEMBER(read_cs1); diff --git a/src/devices/machine/idehd.cpp b/src/devices/machine/idehd.cpp index 95e6f75dab0..68a6cdbbdc9 100644 --- a/src/devices/machine/idehd.cpp +++ b/src/devices/machine/idehd.cpp @@ -21,7 +21,7 @@ #define TIME_FULL_STROKE_SEEK (attotime::from_usec(13000)) #define TIME_AVERAGE_ROTATIONAL_LATENCY (attotime::from_usec(1300)) -ata_mass_storage_device::ata_mass_storage_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source) +ata_mass_storage_device::ata_mass_storage_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock,std::string shortname, std::string source) : ata_hle_device(mconfig, type, name, tag, owner, clock, shortname, source), m_can_identify_device(0), m_num_cylinders(0), @@ -754,7 +754,7 @@ ide_hdd_device::ide_hdd_device(const machine_config &mconfig, std::string tag, d { } -ide_hdd_device::ide_hdd_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +ide_hdd_device::ide_hdd_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : ata_mass_storage_device(mconfig, type, name, tag, owner, clock, shortname, source), m_image(*this, "image") { diff --git a/src/devices/machine/idehd.h b/src/devices/machine/idehd.h index b05895d50d4..fa488788d42 100644 --- a/src/devices/machine/idehd.h +++ b/src/devices/machine/idehd.h @@ -20,7 +20,7 @@ class ata_mass_storage_device : public ata_hle_device { public: - ata_mass_storage_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source); + ata_mass_storage_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock,std::string shortname, std::string source); UINT16 *identify_device_buffer() { return m_identify_buffer; } @@ -88,7 +88,7 @@ class ide_hdd_device : public ata_mass_storage_device public: // construction/destruction ide_hdd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - ide_hdd_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + ide_hdd_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); protected: // device-level overrides diff --git a/src/devices/machine/intelfsh.cpp b/src/devices/machine/intelfsh.cpp index dab6d007b86..5e6eb76ba0b 100644 --- a/src/devices/machine/intelfsh.cpp +++ b/src/devices/machine/intelfsh.cpp @@ -160,7 +160,7 @@ ADDRESS_MAP_END // intelfsh_device - constructor //------------------------------------------------- -intelfsh_device::intelfsh_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) +intelfsh_device::intelfsh_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_memory_interface(mconfig, *this), device_nvram_interface(mconfig, *this), @@ -390,10 +390,10 @@ intelfsh_device::intelfsh_device(const machine_config &mconfig, device_type type m_space_config = address_space_config("flash", ENDIANNESS_BIG, m_bits, addrbits, (m_bits == 8) ? 0 : -1, map); } -intelfsh8_device::intelfsh8_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) +intelfsh8_device::intelfsh8_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source) : intelfsh_device(mconfig, type, name, tag, owner, clock, variant, shortname, source) { } -intelfsh16_device::intelfsh16_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) +intelfsh16_device::intelfsh16_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source) : intelfsh_device(mconfig, type, name, tag, owner, clock, variant, shortname, source) { } diff --git a/src/devices/machine/intelfsh.h b/src/devices/machine/intelfsh.h index 6eba1d73023..915b4548786 100644 --- a/src/devices/machine/intelfsh.h +++ b/src/devices/machine/intelfsh.h @@ -143,7 +143,7 @@ public: protected: // construction/destruction - intelfsh_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); + intelfsh_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source); protected: // device-level overrides @@ -192,7 +192,7 @@ class intelfsh8_device : public intelfsh_device { protected: // construction/destruction - intelfsh8_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); + intelfsh8_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source); public: // public interface @@ -212,7 +212,7 @@ class intelfsh16_device : public intelfsh_device { protected: // construction/destruction - intelfsh16_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); + intelfsh16_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source); public: // public interface diff --git a/src/devices/machine/jvsdev.cpp b/src/devices/machine/jvsdev.cpp index e5884362f62..8060343f24b 100644 --- a/src/devices/machine/jvsdev.cpp +++ b/src/devices/machine/jvsdev.cpp @@ -9,7 +9,7 @@ void jvs_device::static_set_jvs_host_tag(device_t &device, const char *jvs_host_ jvsdev.jvs_host_tag = jvs_host_tag; } -jvs_device::jvs_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +jvs_device::jvs_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), jvs_outputs(0), jvs_address(0), jvs_reset_counter(0) { jvs_host_tag = nullptr; diff --git a/src/devices/machine/jvsdev.h b/src/devices/machine/jvsdev.h index 70ab6e65345..1810a52da74 100644 --- a/src/devices/machine/jvsdev.h +++ b/src/devices/machine/jvsdev.h @@ -13,7 +13,7 @@ class jvs_host; class jvs_device : public device_t { public: - jvs_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + jvs_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); static void static_set_jvs_host_tag(device_t &device, const char *jvs_host_tag); void chain(jvs_device *dev); diff --git a/src/devices/machine/jvshost.cpp b/src/devices/machine/jvshost.cpp index 6acb113bf5d..d62b278ec58 100644 --- a/src/devices/machine/jvshost.cpp +++ b/src/devices/machine/jvshost.cpp @@ -28,7 +28,7 @@ void jvs_host::device_reset() memset(recv_buffer, 0, sizeof(recv_buffer)); } -jvs_host::jvs_host(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +jvs_host::jvs_host(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), send_size(0), recv_size(0), recv_is_encoded(false) { first_device = nullptr; diff --git a/src/devices/machine/jvshost.h b/src/devices/machine/jvshost.h index 4f66e46dccc..13264bef07b 100644 --- a/src/devices/machine/jvshost.h +++ b/src/devices/machine/jvshost.h @@ -9,7 +9,7 @@ class jvs_device; class jvs_host : public device_t { public: - jvs_host(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + jvs_host(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); void add_device(jvs_device *dev); diff --git a/src/devices/machine/keyboard.cpp b/src/devices/machine/keyboard.cpp index a7ef77d4dd7..b9796df644b 100644 --- a/src/devices/machine/keyboard.cpp +++ b/src/devices/machine/keyboard.cpp @@ -31,7 +31,7 @@ WRITE8_MEMBER( xxx_state::kbd_put ) ***************************************************************************/ -generic_keyboard_device::generic_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::generic_keyboard_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_io_kbd0(*this, "TERM_LINE0"), m_io_kbd1(*this, "TERM_LINE1"), diff --git a/src/devices/machine/keyboard.h b/src/devices/machine/keyboard.h index b75f342b3ac..70c56174c21 100644 --- a/src/devices/machine/keyboard.h +++ b/src/devices/machine/keyboard.h @@ -21,7 +21,7 @@ INPUT_PORTS_EXTERN( generic_keyboard ); class generic_keyboard_device : public device_t { public: - generic_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(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); generic_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template static devcb_base &set_keyboard_callback(device_t &device, _Object object) { return downcast(device).m_keyboard_cb.set_callback(object); } diff --git a/src/devices/machine/laserdsc.cpp b/src/devices/machine/laserdsc.cpp index ffffc5c6cad..a05bb11263c 100644 --- a/src/devices/machine/laserdsc.cpp +++ b/src/devices/machine/laserdsc.cpp @@ -57,7 +57,7 @@ const UINT32 VIRTUAL_LEAD_OUT_TRACKS = LEAD_OUT_MIN_SIZE_IN_UM * 1000 / NOMINAL_ // laserdisc_device - constructor //------------------------------------------------- -laserdisc_device::laserdisc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +laserdisc_device::laserdisc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), device_video_interface(mconfig, *this), diff --git a/src/devices/machine/laserdsc.h b/src/devices/machine/laserdsc.h index ec615e512b3..89e1bdf1684 100644 --- a/src/devices/machine/laserdsc.h +++ b/src/devices/machine/laserdsc.h @@ -138,7 +138,7 @@ class laserdisc_device : public device_t, { protected: // construction/destruction - laserdisc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + laserdisc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual ~laserdisc_device(); public: diff --git a/src/devices/machine/ldpr8210.cpp b/src/devices/machine/ldpr8210.cpp index 4382adb58af..14a41e1499a 100644 --- a/src/devices/machine/ldpr8210.cpp +++ b/src/devices/machine/ldpr8210.cpp @@ -195,7 +195,7 @@ pioneer_pr8210_device::pioneer_pr8210_device(const machine_config &mconfig, std: { } -pioneer_pr8210_device::pioneer_pr8210_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +pioneer_pr8210_device::pioneer_pr8210_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : laserdisc_device(mconfig, type, name, tag, owner, clock, shortname, source), m_control(0), m_lastcommand(0), diff --git a/src/devices/machine/ldpr8210.h b/src/devices/machine/ldpr8210.h index c149620a87e..ed7210d8b1c 100644 --- a/src/devices/machine/ldpr8210.h +++ b/src/devices/machine/ldpr8210.h @@ -65,7 +65,7 @@ class pioneer_pr8210_device : public laserdisc_device public: // construction/destruction pioneer_pr8210_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - pioneer_pr8210_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + pioneer_pr8210_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // input and output void control_w(UINT8 data); diff --git a/src/devices/machine/legscsi.cpp b/src/devices/machine/legscsi.cpp index 0727a0ebb21..42236515978 100644 --- a/src/devices/machine/legscsi.cpp +++ b/src/devices/machine/legscsi.cpp @@ -2,7 +2,7 @@ // copyright-holders:smf #include "legscsi.h" -legacy_scsi_host_adapter::legacy_scsi_host_adapter(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +legacy_scsi_host_adapter::legacy_scsi_host_adapter(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_selected(0), m_scsi_port(*this) diff --git a/src/devices/machine/legscsi.h b/src/devices/machine/legscsi.h index 32235ee61aa..cd879856a34 100644 --- a/src/devices/machine/legscsi.h +++ b/src/devices/machine/legscsi.h @@ -13,7 +13,7 @@ class legacy_scsi_host_adapter : public device_t { public: - legacy_scsi_host_adapter(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + legacy_scsi_host_adapter(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); static void set_scsi_port(device_t &device, std::string tag) { downcast(device).m_scsi_port.set_tag(tag); } diff --git a/src/devices/machine/linflash.cpp b/src/devices/machine/linflash.cpp index 4c8a5df3b14..08e98c7b195 100644 --- a/src/devices/machine/linflash.cpp +++ b/src/devices/machine/linflash.cpp @@ -2,7 +2,7 @@ // copyright-holders:smf #include "linflash.h" -linear_flash_pccard_device::linear_flash_pccard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source) : +linear_flash_pccard_device::linear_flash_pccard_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock,std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_memory_interface(mconfig, *this), device_slot_card_interface(mconfig, *this), m_space(nullptr) diff --git a/src/devices/machine/linflash.h b/src/devices/machine/linflash.h index c588d9bca13..38cc12a33a5 100644 --- a/src/devices/machine/linflash.h +++ b/src/devices/machine/linflash.h @@ -19,7 +19,7 @@ public: virtual DECLARE_WRITE16_MEMBER(write_memory) override; protected: - linear_flash_pccard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source); + linear_flash_pccard_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock,std::string shortname, std::string source); // device-level overrides virtual void device_start() override; diff --git a/src/devices/machine/lpc.cpp b/src/devices/machine/lpc.cpp index 3a77b09abb7..cb1feffb431 100644 --- a/src/devices/machine/lpc.cpp +++ b/src/devices/machine/lpc.cpp @@ -2,7 +2,7 @@ // copyright-holders:Olivier Galibert #include "lpc.h" -lpc_device::lpc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +lpc_device::lpc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/machine/lpc.h b/src/devices/machine/lpc.h index 5b42c66976d..0cd5e6aff14 100644 --- a/src/devices/machine/lpc.h +++ b/src/devices/machine/lpc.h @@ -7,7 +7,7 @@ class lpc_device : public device_t { public: - lpc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + lpc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual void map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space, UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) = 0; diff --git a/src/devices/machine/mc146818.cpp b/src/devices/machine/mc146818.cpp index dccbf078ef4..a3e5de37372 100644 --- a/src/devices/machine/mc146818.cpp +++ b/src/devices/machine/mc146818.cpp @@ -45,7 +45,7 @@ mc146818_device::mc146818_device(const machine_config &mconfig, std::string tag, { } -mc146818_device::mc146818_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +mc146818_device::mc146818_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_nvram_interface(mconfig, *this), m_index(0), diff --git a/src/devices/machine/mc146818.h b/src/devices/machine/mc146818.h index c45b05ea42e..a652d1ff101 100644 --- a/src/devices/machine/mc146818.h +++ b/src/devices/machine/mc146818.h @@ -58,7 +58,7 @@ class mc146818_device : public device_t, public: // construction/destruction mc146818_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - mc146818_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + mc146818_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // callbacks template void set_irq_callback(_irq irq) { m_write_irq.set_callback(irq); } diff --git a/src/devices/machine/mos6526.cpp b/src/devices/machine/mos6526.cpp index 79962b1e5b0..de74ae1ad2f 100644 --- a/src/devices/machine/mos6526.cpp +++ b/src/devices/machine/mos6526.cpp @@ -586,7 +586,7 @@ inline void mos6526_device::synchronize() // mos6526_device - constructor //------------------------------------------------- -mos6526_device::mos6526_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) +mos6526_device::mos6526_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_execute_interface(mconfig, *this), m_icount(0), diff --git a/src/devices/machine/mos6526.h b/src/devices/machine/mos6526.h index b2dfb5b097e..6fb084e4bc5 100644 --- a/src/devices/machine/mos6526.h +++ b/src/devices/machine/mos6526.h @@ -108,7 +108,7 @@ class mos6526_device : public device_t, { public: // construction/destruction - mos6526_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); + mos6526_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source); mos6526_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); static void static_set_tod_clock(device_t &device, int clock) { downcast(device).m_tod_clock = clock; } diff --git a/src/devices/machine/mos6530n.cpp b/src/devices/machine/mos6530n.cpp index 96c714c5092..f5f07d7123e 100644 --- a/src/devices/machine/mos6530n.cpp +++ b/src/devices/machine/mos6530n.cpp @@ -113,7 +113,7 @@ WRITE8_MEMBER(mos6532_t::io_w) // mos6530_base_t - constructor //------------------------------------------------- -mos6530_base_t::mos6530_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) : +mos6530_base_t::mos6530_base_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_ram(*this), m_irq_cb(*this), @@ -460,7 +460,7 @@ void mos6530_base_t::edge_detect() if ((m_pa7 ^ state) && (m_pa7_dir ^ state) == 0) { - if (LOG) logerror("%s %s '%s' edge-detect IRQ\n", machine().time().as_string(), name(), tag().c_str()); + if (LOG) logerror("%s %s '%s' edge-detect IRQ\n", machine().time().as_string(), name().c_str(), tag().c_str()); m_irq_edge = true; update_irq(); @@ -476,7 +476,7 @@ void mos6530_base_t::edge_detect() void mos6530_base_t::pa_w(int bit, int state) { - if (LOG) logerror("%s %s %s '%s' Port A Data Bit %u State %u\n", machine().time().as_string(), machine().describe_context(), name(), tag().c_str(), bit, state); + if (LOG) logerror("%s %s %s '%s' Port A Data Bit %u State %u\n", machine().time().as_string(), machine().describe_context(), name().c_str(), tag().c_str(), bit, state); m_pa_in &= ~(1 << bit); m_pa_in |= (state << bit); @@ -491,7 +491,7 @@ void mos6530_base_t::pa_w(int bit, int state) void mos6530_base_t::pb_w(int bit, int state) { - if (LOG) logerror("%s %s %s '%s' Port B Data Bit %u State %u\n", machine().time().as_string(), machine().describe_context(), name(), tag().c_str(), bit, state); + if (LOG) logerror("%s %s %s '%s' Port B Data Bit %u State %u\n", machine().time().as_string(), machine().describe_context(), name().c_str(), tag().c_str(), bit, state); m_pb_in &= ~(1 << bit); m_pb_in |= (state << bit); @@ -527,7 +527,7 @@ READ8_MEMBER( mos6530_base_t::pa_data_r ) UINT8 ddr_in = m_pa_ddr ^ 0xff; UINT8 data = (out & ddr_out) | (in & ddr_in); - if (LOG) logerror("%s %s %s '%s' Port A Data In %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag().c_str(), data); + if (LOG) logerror("%s %s %s '%s' Port A Data In %02x\n", machine().time().as_string(), machine().describe_context(), name().c_str(), tag().c_str(), data); return data; } @@ -541,7 +541,7 @@ WRITE8_MEMBER( mos6530_base_t::pa_data_w ) { m_pa_out = data; - if (LOG) logerror("%s %s %s '%s' Port A Data Out %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag().c_str(), data); + if (LOG) logerror("%s %s %s '%s' Port A Data Out %02x\n", machine().time().as_string(), machine().describe_context(), name().c_str(), tag().c_str(), data); update_pa(); edge_detect(); @@ -556,7 +556,7 @@ WRITE8_MEMBER( mos6530_base_t::pa_ddr_w ) { m_pa_ddr = data; - if (LOG) logerror("%s %s %s '%s' Port A DDR %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag().c_str(), data); + if (LOG) logerror("%s %s %s '%s' Port A DDR %02x\n", machine().time().as_string(), machine().describe_context(), name().c_str(), tag().c_str(), data); update_pa(); edge_detect(); @@ -592,7 +592,7 @@ READ8_MEMBER( mos6530_base_t::pb_data_r ) UINT8 ddr_in = m_pb_ddr ^ 0xff; UINT8 data = (out & ddr_out) | (in & ddr_in); - if (LOG) logerror("%s %s %s '%s' Port B Data In %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag().c_str(), data); + if (LOG) logerror("%s %s %s '%s' Port B Data In %02x\n", machine().time().as_string(), machine().describe_context(), name().c_str(), tag().c_str(), data); return data; } @@ -606,7 +606,7 @@ WRITE8_MEMBER( mos6530_base_t::pb_data_w ) { m_pb_out = data; - if (LOG) logerror("%s %s %s '%s' Port B Data Out %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag().c_str(), data); + if (LOG) logerror("%s %s %s '%s' Port B Data Out %02x\n", machine().time().as_string(), machine().describe_context(), name().c_str(), tag().c_str(), data); update_pb(); } @@ -620,7 +620,7 @@ WRITE8_MEMBER( mos6530_base_t::pb_ddr_w ) { m_pb_ddr = data; - if (LOG) logerror("%s %s %s '%s' Port B DDR %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag().c_str(), data); + if (LOG) logerror("%s %s %s '%s' Port B DDR %02x\n", machine().time().as_string(), machine().describe_context(), name().c_str(), tag().c_str(), data); update_pb(); } @@ -660,7 +660,7 @@ UINT8 mos6530_base_t::timer_r(bool ie) data = cur_live.value; - if (LOG_TIMER) logerror("%s %s %s '%s' Timer read %02x IE %u\n", machine().time().as_string(), machine().describe_context(), name(), tag().c_str(), data, m_ie_timer ? 1 : 0); + if (LOG_TIMER) logerror("%s %s %s '%s' Timer read %02x IE %u\n", machine().time().as_string(), machine().describe_context(), name().c_str(), tag().c_str(), data, m_ie_timer ? 1 : 0); checkpoint(); live_run(); @@ -721,7 +721,7 @@ void mos6530_base_t::timer_w(offs_t offset, UINT8 data, bool ie) } update_irq(); - if (LOG_TIMER) logerror("%s %s %s '%s' Timer value %02x prescale %u IE %u\n", machine().time().as_string(), machine().describe_context(), name(), tag().c_str(), data, m_prescale, m_ie_timer ? 1 : 0); + if (LOG_TIMER) logerror("%s %s %s '%s' Timer value %02x prescale %u IE %u\n", machine().time().as_string(), machine().describe_context(), name().c_str(), tag().c_str(), data, m_prescale, m_ie_timer ? 1 : 0); checkpoint(); @@ -743,7 +743,7 @@ WRITE8_MEMBER( mos6530_base_t::edge_w ) m_pa7_dir = BIT(data, 0); m_ie_edge = BIT(data, 1) ? false : true; - if (LOG) logerror("%s %s %s '%s' %s edge-detect, %s interrupt\n", machine().time().as_string(), machine().describe_context(), name(), tag().c_str(), m_pa7_dir ? "positive" : "negative", m_ie_edge ? "enable" : "disable"); + if (LOG) logerror("%s %s %s '%s' %s edge-detect, %s interrupt\n", machine().time().as_string(), machine().describe_context(), name().c_str(), tag().c_str(), m_pa7_dir ? "positive" : "negative", m_ie_edge ? "enable" : "disable"); } @@ -834,7 +834,7 @@ void mos6530_base_t::live_run(const attotime &limit) live_delay(RUNNING_SYNCPOINT); return; } else { - if (LOG_TIMER) logerror("%s %s '%s' timer %02x\n", cur_live.tm.as_string(), name(), tag().c_str(), cur_live.value); + if (LOG_TIMER) logerror("%s %s '%s' timer %02x\n", cur_live.tm.as_string(), name().c_str(), tag().c_str(), cur_live.value); cur_live.tm += cur_live.period; } @@ -842,7 +842,7 @@ void mos6530_base_t::live_run(const attotime &limit) } case RUNNING_SYNCPOINT: { - if (LOG_TIMER) logerror("%s %s '%s' timer %02x interrupt\n", cur_live.tm.as_string(), name(), tag().c_str(), cur_live.value); + if (LOG_TIMER) logerror("%s %s '%s' timer %02x interrupt\n", cur_live.tm.as_string(), name().c_str(), tag().c_str(), cur_live.value); cur_live.tm_irq = cur_live.tm; m_irq_timer = true; @@ -862,7 +862,7 @@ void mos6530_base_t::live_run(const attotime &limit) cur_live.value--; - if (LOG_TIMER) logerror("%s %s '%s' timer %02x\n", cur_live.tm.as_string(), name(), tag().c_str(), cur_live.value); + if (LOG_TIMER) logerror("%s %s '%s' timer %02x\n", cur_live.tm.as_string(), name().c_str(), tag().c_str(), cur_live.value); if (!cur_live.value) { cur_live.state = IDLE; diff --git a/src/devices/machine/mos6530n.h b/src/devices/machine/mos6530n.h index ded6479d475..666b9950829 100644 --- a/src/devices/machine/mos6530n.h +++ b/src/devices/machine/mos6530n.h @@ -188,7 +188,7 @@ class mos6530_base_t : public device_t { public: // construction/destruction - mos6530_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); + mos6530_base_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); template static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast(device).m_irq_cb.set_callback(object); } template static devcb_base &set_pa_rd_callback(device_t &device, _Object object) { return downcast(device).m_in_pa_cb.set_callback(object); } diff --git a/src/devices/machine/netlist.cpp b/src/devices/machine/netlist.cpp index 2c714d0d0e6..012cef52af7 100644 --- a/src/devices/machine/netlist.cpp +++ b/src/devices/machine/netlist.cpp @@ -67,7 +67,7 @@ void netlist_mame_analog_input_t::device_start() m_param = dynamic_cast(p); if (m_param == nullptr) { - fatalerror("device %s wrong parameter type for %s\n", basetag(), m_param_name.cstr()); + fatalerror("device %s wrong parameter type for %s\n", basetag().c_str(), m_param_name.cstr()); } if (m_mult != 1.0 || m_offset != 0.0) { @@ -142,7 +142,7 @@ void netlist_mame_logic_input_t::device_start() m_param = dynamic_cast(p); if (m_param == nullptr) { - fatalerror("device %s wrong parameter type for %s\n", basetag(), m_param_name.cstr()); + fatalerror("device %s wrong parameter type for %s\n", basetag().c_str(), m_param_name.cstr()); } } @@ -272,8 +272,8 @@ netlist_mame_device_t::netlist_mame_device_t(const machine_config &mconfig, std: { } -netlist_mame_device_t::netlist_mame_device_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *file) - : device_t(mconfig, type, name, tag, owner, clock, shortname, file), +netlist_mame_device_t::netlist_mame_device_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) + : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_icount(0), m_old(netlist::netlist_time::zero), m_netlist(nullptr), diff --git a/src/devices/machine/netlist.h b/src/devices/machine/netlist.h index af3c0a1cdae..b5350dd4d52 100644 --- a/src/devices/machine/netlist.h +++ b/src/devices/machine/netlist.h @@ -113,7 +113,7 @@ public: // construction/destruction netlist_mame_device_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - netlist_mame_device_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *file); + netlist_mame_device_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual ~netlist_mame_device_t() { pstring::resetmem(); } static void static_set_constructor(device_t &device, void (*setup_func)(netlist::setup_t &)); diff --git a/src/devices/machine/nscsi_bus.cpp b/src/devices/machine/nscsi_bus.cpp index f753077f631..4096d00e799 100644 --- a/src/devices/machine/nscsi_bus.cpp +++ b/src/devices/machine/nscsi_bus.cpp @@ -151,7 +151,7 @@ nscsi_device *nscsi_connector::get_device() return dynamic_cast(get_card_device()); } -nscsi_device::nscsi_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +nscsi_device::nscsi_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_slot_card_interface(mconfig, *this) { @@ -175,7 +175,7 @@ void nscsi_device::device_start() save_item(NAME(scsi_id)); } -nscsi_full_device::nscsi_full_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +nscsi_full_device::nscsi_full_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : nscsi_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/machine/nscsi_bus.h b/src/devices/machine/nscsi_bus.h index 2e70dc02e2c..02d24076b60 100644 --- a/src/devices/machine/nscsi_bus.h +++ b/src/devices/machine/nscsi_bus.h @@ -86,7 +86,7 @@ public: S_PHASE_MASK = S_MSG|S_CTL|S_INP }; - nscsi_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nscsi_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); void connect_to_bus(nscsi_bus_device *bus, int refid, int default_scsi_id); virtual void scsi_ctrl_changed(); @@ -101,7 +101,7 @@ protected: class nscsi_full_device : public nscsi_device { public: - nscsi_full_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nscsi_full_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual void scsi_ctrl_changed() override; protected: diff --git a/src/devices/machine/nscsi_hd.cpp b/src/devices/machine/nscsi_hd.cpp index 92a77fc939f..0385f6310fb 100644 --- a/src/devices/machine/nscsi_hd.cpp +++ b/src/devices/machine/nscsi_hd.cpp @@ -10,7 +10,7 @@ nscsi_harddisk_device::nscsi_harddisk_device(const machine_config &mconfig, std: { } -nscsi_harddisk_device::nscsi_harddisk_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +nscsi_harddisk_device::nscsi_harddisk_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : nscsi_full_device(mconfig, type, name, tag, owner, clock, shortname, source), harddisk(nullptr), lba(0), cur_lba(0), blocks(0), bytes_per_sector(0) { } diff --git a/src/devices/machine/nscsi_hd.h b/src/devices/machine/nscsi_hd.h index ef83629c456..dae27f4186a 100644 --- a/src/devices/machine/nscsi_hd.h +++ b/src/devices/machine/nscsi_hd.h @@ -10,7 +10,7 @@ class nscsi_harddisk_device : public nscsi_full_device { public: nscsi_harddisk_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - nscsi_harddisk_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nscsi_harddisk_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/machine/pc_fdc.cpp b/src/devices/machine/pc_fdc.cpp index 03a35a4e290..e1eafd0ad66 100644 --- a/src/devices/machine/pc_fdc.cpp +++ b/src/devices/machine/pc_fdc.cpp @@ -45,7 +45,7 @@ DEVICE_ADDRESS_MAP_START(map, 8, pc_fdc_at_device) AM_RANGE(0x7, 0x7) AM_READWRITE(dir_r, ccr_w) ADDRESS_MAP_END -pc_fdc_family_device::pc_fdc_family_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +pc_fdc_family_device::pc_fdc_family_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : pc_fdc_interface(mconfig, type, name, tag, owner, clock, shortname, source), fdc(*this, "upd765"), intrq_cb(*this), drq_cb(*this) diff --git a/src/devices/machine/pc_fdc.h b/src/devices/machine/pc_fdc.h index b6dbb4f6c5c..1df6af34b03 100644 --- a/src/devices/machine/pc_fdc.h +++ b/src/devices/machine/pc_fdc.h @@ -26,7 +26,7 @@ class pc_fdc_family_device : public pc_fdc_interface { public: - pc_fdc_family_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + pc_fdc_family_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); template static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast(device).intrq_cb.set_callback(object); } template static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast(device).drq_cb.set_callback(object); } diff --git a/src/devices/machine/pci.cpp b/src/devices/machine/pci.cpp index 0e54518250b..f9849b5d42e 100644 --- a/src/devices/machine/pci.cpp +++ b/src/devices/machine/pci.cpp @@ -58,7 +58,7 @@ DEVICE_ADDRESS_MAP_START(config_map, 32, pci_bridge_device) AM_RANGE(0x3c, 0x3f) AM_READWRITE16(bridge_control_r, bridge_control_w, 0xffff0000) ADDRESS_MAP_END -pci_device::pci_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +pci_device::pci_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) { main_id = 0xffffffff; @@ -340,14 +340,14 @@ void pci_device::add_map(UINT64 size, int flags, address_map_delegate &map) bank_reg_infos[breg].hi = 0; } - logerror("Device %s (%s) has 0x%" I64FMT "x bytes of %s named %s\n", tag().c_str(), name(), size, flags & M_IO ? "io" : "memory", bank_infos[bid].map.name()); + logerror("Device %s (%s) has 0x%" I64FMT "x bytes of %s named %s\n", tag().c_str(), name().c_str(), size, flags & M_IO ? "io" : "memory", bank_infos[bid].map.name()); } void pci_device::add_rom(const UINT8 *rom, UINT32 size) { expansion_rom = rom; expansion_rom_size = size; - logerror("Device %s (%s) has 0x%x bytes of expansion rom\n", tag().c_str(), name(), size); + logerror("Device %s (%s) has 0x%x bytes of expansion rom\n", tag().c_str(), name().c_str(), size); } void pci_device::add_rom_from_region() @@ -373,7 +373,7 @@ void pci_device::set_map_flags(int id, int flags) remap_cb(); } -agp_device::agp_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +agp_device::agp_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : pci_device(mconfig, type, name, tag, owner, clock, shortname, source) { } @@ -397,7 +397,7 @@ pci_bridge_device::pci_bridge_device(const machine_config &mconfig, std::string { } -pci_bridge_device::pci_bridge_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +pci_bridge_device::pci_bridge_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : pci_device(mconfig, type, name, tag, owner, clock, shortname, source), device_memory_interface(mconfig, *this), configure_space_config("configuration_space", ENDIANNESS_LITTLE, 32, 20) @@ -780,7 +780,7 @@ WRITE16_MEMBER(pci_bridge_device::bridge_control_w) } -agp_bridge_device::agp_bridge_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +agp_bridge_device::agp_bridge_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : pci_bridge_device(mconfig, type, name, tag, owner, clock, shortname, source) { } @@ -803,7 +803,7 @@ DEVICE_ADDRESS_MAP_START(io_configuration_access_map, 32, pci_host_device) ADDRESS_MAP_END -pci_host_device::pci_host_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +pci_host_device::pci_host_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : pci_bridge_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/machine/pci.h b/src/devices/machine/pci.h index f0e663e85f9..8f20951fb20 100644 --- a/src/devices/machine/pci.h +++ b/src/devices/machine/pci.h @@ -30,7 +30,7 @@ public: mapper_cb remap_cb, remap_config_cb; - pci_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + pci_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); void set_ids(UINT32 main_id, UINT8 revision, UINT32 pclass, UINT32 subsystem_id); void set_multifunction_device(bool enable); @@ -137,7 +137,7 @@ protected: class agp_device : public pci_device { public: - agp_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + agp_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); protected: virtual void device_start() override; @@ -147,7 +147,7 @@ protected: class pci_bridge_device : public pci_device, public device_memory_interface { public: pci_bridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - pci_bridge_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + pci_bridge_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual void set_remap_cb(mapper_cb _remap_cb) override; virtual void map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space, @@ -226,7 +226,7 @@ private: class agp_bridge_device : public pci_bridge_device { public: - agp_bridge_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + agp_bridge_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); protected: virtual void device_start() override; @@ -237,7 +237,7 @@ class pci_host_device : public pci_bridge_device { public: DECLARE_ADDRESS_MAP(io_configuration_access_map, 32); - pci_host_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + pci_host_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); protected: address_space *memory_space, *io_space; diff --git a/src/devices/machine/pckeybrd.cpp b/src/devices/machine/pckeybrd.cpp index bff25f2d764..d57095b0783 100644 --- a/src/devices/machine/pckeybrd.cpp +++ b/src/devices/machine/pckeybrd.cpp @@ -292,7 +292,7 @@ pc_keyboard_device::pc_keyboard_device(const machine_config &mconfig, std::strin { } -pc_keyboard_device::pc_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) : +pc_keyboard_device::pc_keyboard_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_ioport_0(*this, ":pc_keyboard_0"), m_ioport_1(*this, ":pc_keyboard_1"), diff --git a/src/devices/machine/pckeybrd.h b/src/devices/machine/pckeybrd.h index c5e4ebe2a86..901b0bf746a 100644 --- a/src/devices/machine/pckeybrd.h +++ b/src/devices/machine/pckeybrd.h @@ -20,7 +20,7 @@ class pc_keyboard_device : public device_t { public: pc_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - pc_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); + pc_keyboard_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); DECLARE_READ8_MEMBER(read); DECLARE_WRITE_LINE_MEMBER(enable); diff --git a/src/devices/machine/pit8253.cpp b/src/devices/machine/pit8253.cpp index efad6443bdd..43a78c3a517 100644 --- a/src/devices/machine/pit8253.cpp +++ b/src/devices/machine/pit8253.cpp @@ -57,7 +57,7 @@ pit8253_device::pit8253_device(const machine_config &mconfig, std::string tag, d { } -pit8253_device::pit8253_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +pit8253_device::pit8253_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_clk0(0), m_clk1(0), diff --git a/src/devices/machine/pit8253.h b/src/devices/machine/pit8253.h index 3f6707e667f..1e23d018133 100644 --- a/src/devices/machine/pit8253.h +++ b/src/devices/machine/pit8253.h @@ -55,7 +55,7 @@ class pit8253_device : public device_t { public: pit8253_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - pit8253_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + pit8253_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); ~pit8253_device() {} // static configuration helpers diff --git a/src/devices/machine/roc10937.cpp b/src/devices/machine/roc10937.cpp index 327d2f9cf4c..3bfcf0fe5d0 100644 --- a/src/devices/machine/roc10937.cpp +++ b/src/devices/machine/roc10937.cpp @@ -127,7 +127,7 @@ static const int roc10937poslut[]= const device_type ROC10937 = &device_creator; -rocvfd_t::rocvfd_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) : +rocvfd_t::rocvfd_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) { m_port_val=0; diff --git a/src/devices/machine/roc10937.h b/src/devices/machine/roc10937.h index ae826fbc7cf..a2d2a58f736 100644 --- a/src/devices/machine/roc10937.h +++ b/src/devices/machine/roc10937.h @@ -49,7 +49,7 @@ class rocvfd_t : public device_t { public: - rocvfd_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); + rocvfd_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // inline configuration helpers static void static_set_value(device_t &device, int val); diff --git a/src/devices/machine/smc91c9x.cpp b/src/devices/machine/smc91c9x.cpp index 463f76403d4..019a613a770 100644 --- a/src/devices/machine/smc91c9x.cpp +++ b/src/devices/machine/smc91c9x.cpp @@ -105,7 +105,7 @@ static const char *const ethernet_regname[64] = DEVICE INTERFACE ***************************************************************************/ -smc91c9x_device::smc91c9x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +smc91c9x_device::smc91c9x_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_irq_handler(*this) { diff --git a/src/devices/machine/smc91c9x.h b/src/devices/machine/smc91c9x.h index 041e9819d72..ee37b0ad185 100644 --- a/src/devices/machine/smc91c9x.h +++ b/src/devices/machine/smc91c9x.h @@ -21,7 +21,7 @@ class smc91c9x_device : public device_t { public: - smc91c9x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + smc91c9x_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); ~smc91c9x_device() {} template static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/machine/terminal.cpp b/src/devices/machine/terminal.cpp index 1d47a65ce1f..56f995a027d 100644 --- a/src/devices/machine/terminal.cpp +++ b/src/devices/machine/terminal.cpp @@ -140,7 +140,7 @@ static const UINT8 terminal_font[256*16] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; -generic_terminal_device::generic_terminal_device(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_terminal_device::generic_terminal_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_palette(*this, "palette"), m_io_term_conf(*this, "TERM_CONF"), diff --git a/src/devices/machine/terminal.h b/src/devices/machine/terminal.h index aef9960ca7e..44ef9e0bb9e 100644 --- a/src/devices/machine/terminal.h +++ b/src/devices/machine/terminal.h @@ -26,7 +26,7 @@ INPUT_PORTS_EXTERN( generic_terminal ); class generic_terminal_device : public device_t { public: - generic_terminal_device(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_terminal_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); generic_terminal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template static devcb_base &set_keyboard_callback(device_t &device, _Object object) { return downcast(device).m_keyboard_cb.set_callback(object); } diff --git a/src/devices/machine/timekpr.cpp b/src/devices/machine/timekpr.cpp index bb137f1647e..867d5450a1e 100644 --- a/src/devices/machine/timekpr.cpp +++ b/src/devices/machine/timekpr.cpp @@ -119,7 +119,7 @@ static int counter_from_ram( UINT8 *data, int offset ) // timekeeper_device_config - constructor //------------------------------------------------- -timekeeper_device::timekeeper_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +timekeeper_device::timekeeper_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_nvram_interface(mconfig, *this) { diff --git a/src/devices/machine/timekpr.h b/src/devices/machine/timekpr.h index 8e057fe0519..9229053839a 100644 --- a/src/devices/machine/timekpr.h +++ b/src/devices/machine/timekpr.h @@ -55,7 +55,7 @@ class timekeeper_device : public device_t, { protected: // construction/destruction - timekeeper_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + timekeeper_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); public: DECLARE_WRITE8_MEMBER( write ); diff --git a/src/devices/machine/tms1024.cpp b/src/devices/machine/tms1024.cpp index b77747217ce..1e06ced2d22 100644 --- a/src/devices/machine/tms1024.cpp +++ b/src/devices/machine/tms1024.cpp @@ -30,7 +30,7 @@ tms1024_device::tms1024_device(const machine_config &mconfig, std::string tag, d { } -tms1024_device::tms1024_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +tms1024_device::tms1024_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_h(0), m_s(0), m_std(0), m_write_port1(*this), m_write_port2(*this), m_write_port3(*this), m_write_port4(*this), m_write_port5(*this), m_write_port6(*this), m_write_port7(*this) { diff --git a/src/devices/machine/tms1024.h b/src/devices/machine/tms1024.h index 27c90581cd1..3d13b677bb6 100644 --- a/src/devices/machine/tms1024.h +++ b/src/devices/machine/tms1024.h @@ -65,7 +65,7 @@ class tms1024_device : public device_t { public: tms1024_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - tms1024_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + tms1024_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // static configuration helpers template static devcb_base &set_write_port1_callback(device_t &device, _Object object) { return downcast(device).m_write_port1.set_callback(object); } diff --git a/src/devices/machine/tms6100.cpp b/src/devices/machine/tms6100.cpp index 951536e8941..418efcff4c0 100644 --- a/src/devices/machine/tms6100.cpp +++ b/src/devices/machine/tms6100.cpp @@ -27,7 +27,7 @@ const device_type TMS6100 = &device_creator; -tms6100_device::tms6100_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +tms6100_device::tms6100_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_rom(*this, DEVICE_SELF), m_reverse_bits(false), diff --git a/src/devices/machine/tms6100.h b/src/devices/machine/tms6100.h index a0130a51c10..abfe114ada4 100644 --- a/src/devices/machine/tms6100.h +++ b/src/devices/machine/tms6100.h @@ -95,7 +95,7 @@ class tms6100_device : public device_t { public: tms6100_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - tms6100_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + tms6100_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); static void enable_4bit_mode(device_t &device) { downcast(device).m_4bit_mode = true; } diff --git a/src/devices/machine/upd1990a.cpp b/src/devices/machine/upd1990a.cpp index a4245e29670..6a9721c291b 100644 --- a/src/devices/machine/upd1990a.cpp +++ b/src/devices/machine/upd1990a.cpp @@ -44,7 +44,7 @@ const device_type UPD4990A = &device_creator; // upd1990a_device - constructor //------------------------------------------------- -upd1990a_device::upd1990a_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) +upd1990a_device::upd1990a_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_rtc_interface(mconfig, *this), m_write_data(*this), diff --git a/src/devices/machine/upd1990a.h b/src/devices/machine/upd1990a.h index ee8ed3bd1b2..682ceed6402 100644 --- a/src/devices/machine/upd1990a.h +++ b/src/devices/machine/upd1990a.h @@ -52,7 +52,7 @@ class upd1990a_device : public device_t, { public: // construction/destruction - upd1990a_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); + upd1990a_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source); upd1990a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template void set_data_callback(_data data) { m_write_data.set_callback(data); } diff --git a/src/devices/machine/upd765.cpp b/src/devices/machine/upd765.cpp index 7b24b50dfe0..9b1deec7c81 100644 --- a/src/devices/machine/upd765.cpp +++ b/src/devices/machine/upd765.cpp @@ -108,7 +108,7 @@ ADDRESS_MAP_END int upd765_family_device::rates[4] = { 500000, 300000, 250000, 1000000 }; -upd765_family_device::upd765_family_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +upd765_family_device::upd765_family_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : pc_fdc_interface(mconfig, type, name, tag, owner, clock, shortname, source), intrq_cb(*this), drq_cb(*this), diff --git a/src/devices/machine/upd765.h b/src/devices/machine/upd765.h index fc7bac48cf2..cd871bf254c 100644 --- a/src/devices/machine/upd765.h +++ b/src/devices/machine/upd765.h @@ -75,7 +75,7 @@ public: typedef delegate byte_read_cb; typedef delegate byte_write_cb; - pc_fdc_interface(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) {} + pc_fdc_interface(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) {} /* Note that the address map must cover and handle the whole 0-7 * range. The upd765, while conforming to the rest of the @@ -95,7 +95,7 @@ class upd765_family_device : public pc_fdc_interface { public: enum { MODE_AT, MODE_PS2, MODE_M30 }; - upd765_family_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + upd765_family_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); template static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast(device).intrq_cb.set_callback(object); } template static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast(device).drq_cb.set_callback(object); } diff --git a/src/devices/machine/wd_fdc.cpp b/src/devices/machine/wd_fdc.cpp index 3db68daeb20..8504159dc1c 100644 --- a/src/devices/machine/wd_fdc.cpp +++ b/src/devices/machine/wd_fdc.cpp @@ -65,7 +65,7 @@ const device_type WD1773 = &device_creator; // Show state machine #define TRACE_STATE 0 -wd_fdc_t::wd_fdc_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) : +wd_fdc_t::wd_fdc_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), intrq_cb(*this), drq_cb(*this), @@ -2125,7 +2125,7 @@ int wd_fdc_t::settle_time() const return 60000; } -wd_fdc_analog_t::wd_fdc_analog_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) : +wd_fdc_analog_t::wd_fdc_analog_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : wd_fdc_t(mconfig, type, name, tag, owner, clock, shortname, source) { clock_ratio = 1; @@ -2177,7 +2177,7 @@ bool wd_fdc_analog_t::pll_write_next_bit(bool bit, attotime &tm, floppy_image_de return cur_pll.write_next_bit(bit, tm, floppy, limit); } -wd_fdc_digital_t::wd_fdc_digital_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) : +wd_fdc_digital_t::wd_fdc_digital_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : wd_fdc_t(mconfig, type, name, tag, owner, clock, shortname, source) { clock_ratio = 4; diff --git a/src/devices/machine/wd_fdc.h b/src/devices/machine/wd_fdc.h index d167017a737..b637c261a50 100644 --- a/src/devices/machine/wd_fdc.h +++ b/src/devices/machine/wd_fdc.h @@ -133,7 +133,7 @@ class wd_fdc_t : public device_t { public: - wd_fdc_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); + wd_fdc_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); template static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast(device).intrq_cb.set_callback(object); } template static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast(device).drq_cb.set_callback(object); } @@ -446,7 +446,7 @@ private: class wd_fdc_analog_t : public wd_fdc_t { public: - wd_fdc_analog_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); + wd_fdc_analog_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); protected: virtual void pll_reset(bool fm, bool enmf, const attotime &when) override; @@ -464,7 +464,7 @@ private: class wd_fdc_digital_t : public wd_fdc_t { public: - wd_fdc_digital_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); + wd_fdc_digital_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); protected: static const int wd_digital_step_times[4]; diff --git a/src/devices/machine/wozfdc.cpp b/src/devices/machine/wozfdc.cpp index 9e91c1a3004..e38fc702bd6 100644 --- a/src/devices/machine/wozfdc.cpp +++ b/src/devices/machine/wozfdc.cpp @@ -44,7 +44,7 @@ const rom_entry *wozfdc_device::device_rom_region() const // LIVE DEVICE //************************************************************************** -wozfdc_device::wozfdc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +wozfdc_device::wozfdc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/machine/wozfdc.h b/src/devices/machine/wozfdc.h index a9a82fce78d..d7d41ffc1db 100644 --- a/src/devices/machine/wozfdc.h +++ b/src/devices/machine/wozfdc.h @@ -30,7 +30,7 @@ class wozfdc_device: public: // construction/destruction - wozfdc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + wozfdc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/machine/x2212.cpp b/src/devices/machine/x2212.cpp index ecb54ee47cf..8b21f589d51 100644 --- a/src/devices/machine/x2212.cpp +++ b/src/devices/machine/x2212.cpp @@ -50,7 +50,7 @@ x2212_device::x2212_device(const machine_config &mconfig, std::string tag, devic { } -x2212_device::x2212_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +x2212_device::x2212_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_memory_interface(mconfig, *this), device_nvram_interface(mconfig, *this), diff --git a/src/devices/machine/x2212.h b/src/devices/machine/x2212.h index 3c20543f462..77feeffad58 100644 --- a/src/devices/machine/x2212.h +++ b/src/devices/machine/x2212.h @@ -49,7 +49,7 @@ class x2212_device : public device_t, public: // construction/destruction x2212_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - x2212_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + x2212_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // inline configuration helpers static void static_set_auto_save(device_t &device); diff --git a/src/devices/machine/z80dart.cpp b/src/devices/machine/z80dart.cpp index 69a3c2de16f..14ef6ead340 100644 --- a/src/devices/machine/z80dart.cpp +++ b/src/devices/machine/z80dart.cpp @@ -86,7 +86,7 @@ machine_config_constructor z80dart_device::device_mconfig_additions() const // z80dart_device - constructor //------------------------------------------------- -z80dart_device::z80dart_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) +z80dart_device::z80dart_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_z80daisy_interface(mconfig, *this), m_chanA(*this, CHANA_TAG), diff --git a/src/devices/machine/z80dart.h b/src/devices/machine/z80dart.h index 8032ff49a58..8b0e359cabf 100644 --- a/src/devices/machine/z80dart.h +++ b/src/devices/machine/z80dart.h @@ -467,7 +467,7 @@ class z80dart_device : public device_t, public: // construction/destruction - z80dart_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); + z80dart_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source); z80dart_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template static devcb_base &set_out_txda_callback(device_t &device, _Object object) { return downcast(device).m_out_txda_cb.set_callback(object); } diff --git a/src/devices/machine/z80scc.cpp b/src/devices/machine/z80scc.cpp index 812d4e07870..0d1befa3b9b 100644 --- a/src/devices/machine/z80scc.cpp +++ b/src/devices/machine/z80scc.cpp @@ -128,7 +128,7 @@ machine_config_constructor z80scc_device::device_mconfig_additions() const // z80scc_device - constructor //------------------------------------------------- -z80scc_device::z80scc_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) +z80scc_device::z80scc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_z80daisy_interface(mconfig, *this), m_chanA(*this, CHANA_TAG), diff --git a/src/devices/machine/z80scc.h b/src/devices/machine/z80scc.h index f5b6bebaf40..cbab3fef441 100644 --- a/src/devices/machine/z80scc.h +++ b/src/devices/machine/z80scc.h @@ -523,7 +523,7 @@ class z80scc_device : public device_t public: // construction/destruction - z80scc_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); + z80scc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source); z80scc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template static devcb_base &set_out_txda_callback(device_t &device, _Object object) { return downcast(device).m_out_txda_cb.set_callback(object); } diff --git a/src/devices/machine/z80sio.cpp b/src/devices/machine/z80sio.cpp index a83f235d4d6..5011a76d07b 100644 --- a/src/devices/machine/z80sio.cpp +++ b/src/devices/machine/z80sio.cpp @@ -103,7 +103,7 @@ machine_config_constructor z80sio_device::device_mconfig_additions() const // z80sio_device - constructor //------------------------------------------------- -z80sio_device::z80sio_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) +z80sio_device::z80sio_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_z80daisy_interface(mconfig, *this), m_chanA(*this, CHANA_TAG), diff --git a/src/devices/machine/z80sio.h b/src/devices/machine/z80sio.h index b22c12e8275..769df44e6bd 100644 --- a/src/devices/machine/z80sio.h +++ b/src/devices/machine/z80sio.h @@ -405,7 +405,7 @@ class z80sio_device : public device_t, public: // construction/destruction - z80sio_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); + z80sio_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source); z80sio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template static devcb_base &set_out_txda_callback(device_t &device, _Object object) { return downcast(device).m_out_txda_cb.set_callback(object); } diff --git a/src/devices/sound/2610intf.cpp b/src/devices/sound/2610intf.cpp index 004df9a8335..053830e0585 100644 --- a/src/devices/sound/2610intf.cpp +++ b/src/devices/sound/2610intf.cpp @@ -212,7 +212,7 @@ ym2610_device::ym2610_device(const machine_config &mconfig, std::string tag, dev { } -ym2610_device::ym2610_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +ym2610_device::ym2610_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : ay8910_device(mconfig, type, name, tag, owner, clock, PSG_TYPE_YM, 1, 0, shortname, source), m_irq_handler(*this) { diff --git a/src/devices/sound/2610intf.h b/src/devices/sound/2610intf.h index cb7b1acbbc0..bbb3392c95c 100644 --- a/src/devices/sound/2610intf.h +++ b/src/devices/sound/2610intf.h @@ -17,7 +17,7 @@ class ym2610_device : public ay8910_device { public: ym2610_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - ym2610_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + ym2610_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // static configuration helpers template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/sound/2612intf.cpp b/src/devices/sound/2612intf.cpp index 0771157b56d..be68f080422 100644 --- a/src/devices/sound/2612intf.cpp +++ b/src/devices/sound/2612intf.cpp @@ -157,7 +157,7 @@ ym2612_device::ym2612_device(const machine_config &mconfig, std::string tag, dev { } -ym2612_device::ym2612_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +ym2612_device::ym2612_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), m_irq_handler(*this) diff --git a/src/devices/sound/2612intf.h b/src/devices/sound/2612intf.h index cb18940637f..3dd596eea26 100644 --- a/src/devices/sound/2612intf.h +++ b/src/devices/sound/2612intf.h @@ -17,7 +17,7 @@ class ym2612_device : public device_t, { public: ym2612_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - ym2612_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + ym2612_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // static configuration helpers template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/sound/ay8910.cpp b/src/devices/sound/ay8910.cpp index 3b2a57bd318..d51defa982b 100644 --- a/src/devices/sound/ay8910.cpp +++ b/src/devices/sound/ay8910.cpp @@ -881,10 +881,10 @@ void ay8910_device::device_start() int master_clock = clock(); if (m_ioports < 1 && !(m_port_a_read_cb.isnull() && m_port_a_write_cb.isnull())) - fatalerror("Device '%s' is a %s and has no port A!", tag().c_str(), name()); + fatalerror("Device '%s' is a %s and has no port A!", tag().c_str(), name().c_str()); if (m_ioports < 2 && !(m_port_b_read_cb.isnull() && m_port_b_write_cb.isnull())) - fatalerror("Device '%s' is a %s and has no port B!", tag().c_str(), name()); + fatalerror("Device '%s' is a %s and has no port B!", tag().c_str(), name().c_str()); m_port_a_read_cb.resolve(); m_port_b_read_cb.resolve(); @@ -893,7 +893,7 @@ void ay8910_device::device_start() if ((m_flags & AY8910_SINGLE_OUTPUT) != 0) { - logerror("%s device '%s' using single output!\n", name(), tag().c_str()); + logerror("%s device '%s' using single output!\n", name().c_str(), tag().c_str()); m_streams = 1; } @@ -1165,8 +1165,8 @@ ay8910_device::ay8910_device(const machine_config &mconfig, std::string tag, dev m_res_load[0] = m_res_load[1] = m_res_load[2] = 1000; //Default values for resistor loads } -ay8910_device::ay8910_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, - psg_type_t psg_type, int streams, int ioports, const char *shortname, const char *source) +ay8910_device::ay8910_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, + psg_type_t psg_type, int streams, int ioports, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), m_type(psg_type), diff --git a/src/devices/sound/ay8910.h b/src/devices/sound/ay8910.h index 853f40853ea..a4a860461af 100644 --- a/src/devices/sound/ay8910.h +++ b/src/devices/sound/ay8910.h @@ -101,8 +101,8 @@ public: // construction/destruction ay8910_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - ay8910_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, - UINT32 clock, psg_type_t psg_type, int streams, int ioports, const char *shortname, const char *source); + ay8910_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, + UINT32 clock, psg_type_t psg_type, int streams, int ioports, std::string shortname, std::string source); // static configuration helpers static void set_flags(device_t &device, int flags) { downcast(device).m_flags = flags; } diff --git a/src/devices/sound/discrete.cpp b/src/devices/sound/discrete.cpp index 55326a0bd7e..c66e5cd9884 100644 --- a/src/devices/sound/discrete.cpp +++ b/src/devices/sound/discrete.cpp @@ -834,7 +834,7 @@ void discrete_device::static_set_intf(device_t &device, const discrete_block *in // discrete_device - constructor //------------------------------------------------- -discrete_device::discrete_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock) +discrete_device::discrete_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, type, name, tag, owner, clock, "discrete", __FILE__), m_intf(nullptr), m_sample_rate(0), diff --git a/src/devices/sound/discrete.h b/src/devices/sound/discrete.h index a82f3c1b6db..c6ff30cd6b2 100644 --- a/src/devices/sound/discrete.h +++ b/src/devices/sound/discrete.h @@ -4284,7 +4284,7 @@ class discrete_device : public device_t protected: // construction/destruction - discrete_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock); + discrete_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock); public: // inline configuration helpers diff --git a/src/devices/sound/es5506.cpp b/src/devices/sound/es5506.cpp index 2a43090188f..8375955c485 100644 --- a/src/devices/sound/es5506.cpp +++ b/src/devices/sound/es5506.cpp @@ -127,7 +127,7 @@ Ensoniq OTIS - ES5505 Ensoniq OTTO - #define CONTROL_STOPMASK (CONTROL_STOP1 | CONTROL_STOP0) -es550x_device::es550x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +es550x_device::es550x_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), m_stream(nullptr), diff --git a/src/devices/sound/es5506.h b/src/devices/sound/es5506.h index f9804a69647..798d66d596a 100644 --- a/src/devices/sound/es5506.h +++ b/src/devices/sound/es5506.h @@ -115,7 +115,7 @@ class es550x_device : public device_t, public device_sound_interface { public: - es550x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + es550x_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); ~es550x_device() {} static void set_region0(device_t &device, const char *region0) { downcast(device).m_region0 = region0; } diff --git a/src/devices/sound/gaelco.cpp b/src/devices/sound/gaelco.cpp index 9202e35a7e9..a696b0ac475 100644 --- a/src/devices/sound/gaelco.cpp +++ b/src/devices/sound/gaelco.cpp @@ -64,7 +64,7 @@ gaelco_gae1_device::gaelco_gae1_device(const machine_config &mconfig, std::strin { } -gaelco_gae1_device::gaelco_gae1_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +gaelco_gae1_device::gaelco_gae1_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), m_stream(nullptr), diff --git a/src/devices/sound/gaelco.h b/src/devices/sound/gaelco.h index 57695f1eb48..2c8ba538867 100644 --- a/src/devices/sound/gaelco.h +++ b/src/devices/sound/gaelco.h @@ -41,7 +41,7 @@ class gaelco_gae1_device : public device_t, { public: gaelco_gae1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - gaelco_gae1_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + gaelco_gae1_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); ~gaelco_gae1_device() { } static void set_snd_data_tag(device_t &device, std::string tag) { downcast(device).m_data_tag = tag; } diff --git a/src/devices/sound/hc55516.cpp b/src/devices/sound/hc55516.cpp index 256e9c427e8..06a43dc5d63 100644 --- a/src/devices/sound/hc55516.cpp +++ b/src/devices/sound/hc55516.cpp @@ -45,7 +45,7 @@ hc55516_device::hc55516_device(const machine_config &mconfig, std::string tag, d m_leak(0) { } -hc55516_device::hc55516_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +hc55516_device::hc55516_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), m_channel(nullptr), diff --git a/src/devices/sound/hc55516.h b/src/devices/sound/hc55516.h index f676afec8ee..2ceb38d1053 100644 --- a/src/devices/sound/hc55516.h +++ b/src/devices/sound/hc55516.h @@ -10,7 +10,7 @@ class hc55516_device : public device_t, { public: hc55516_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - hc55516_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + hc55516_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); ~hc55516_device() {} /* sets the digit (0 or 1) */ diff --git a/src/devices/sound/mos6560.cpp b/src/devices/sound/mos6560.cpp index 5e9e0cdff36..09ea8e16892 100644 --- a/src/devices/sound/mos6560.cpp +++ b/src/devices/sound/mos6560.cpp @@ -688,7 +688,7 @@ static ADDRESS_MAP_START( mos6560_colorram_map, AS_1, 8, mos6560_device ) AM_RANGE(0x000, 0x3ff) AM_RAM ADDRESS_MAP_END -mos6560_device::mos6560_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) +mos6560_device::mos6560_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_memory_interface(mconfig, *this), device_sound_interface(mconfig, *this), diff --git a/src/devices/sound/mos6560.h b/src/devices/sound/mos6560.h index 202f71385b4..b8d249cde85 100644 --- a/src/devices/sound/mos6560.h +++ b/src/devices/sound/mos6560.h @@ -135,7 +135,7 @@ class mos6560_device : public device_t, public device_video_interface { public: - mos6560_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); + mos6560_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source); mos6560_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template static devcb_base &set_potx_rd_callback(device_t &device, _Object object) { return downcast(device).m_read_potx.set_callback(object); } diff --git a/src/devices/sound/mos6581.cpp b/src/devices/sound/mos6581.cpp index 163f337afeb..bed5b5109ba 100644 --- a/src/devices/sound/mos6581.cpp +++ b/src/devices/sound/mos6581.cpp @@ -37,7 +37,7 @@ const device_type MOS8580 = &device_creator; // mos6581_device - constructor //------------------------------------------------- -mos6581_device::mos6581_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) +mos6581_device::mos6581_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), m_read_potx(*this), diff --git a/src/devices/sound/mos6581.h b/src/devices/sound/mos6581.h index 8a4a859b321..80ef13ff7b9 100644 --- a/src/devices/sound/mos6581.h +++ b/src/devices/sound/mos6581.h @@ -56,7 +56,7 @@ class mos6581_device : public device_t, public device_sound_interface { public: - mos6581_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); + mos6581_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source); mos6581_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); ~mos6581_device(); diff --git a/src/devices/sound/mos7360.h b/src/devices/sound/mos7360.h index aea354b8ce6..ac122569e39 100644 --- a/src/devices/sound/mos7360.h +++ b/src/devices/sound/mos7360.h @@ -94,7 +94,7 @@ class mos7360_device : public device_t, { public: // construction/destruction - //mos7360_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock); + //mos7360_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock); mos7360_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template void set_callbacks(const char *cpu_tag, _irq irq, _k k) { diff --git a/src/devices/sound/msm5205.cpp b/src/devices/sound/msm5205.cpp index fc88a05cceb..003f3e839da 100644 --- a/src/devices/sound/msm5205.cpp +++ b/src/devices/sound/msm5205.cpp @@ -67,7 +67,7 @@ msm5205_device::msm5205_device(const machine_config &mconfig, std::string tag, d { } -msm5205_device::msm5205_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +msm5205_device::msm5205_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), m_prescaler(0), diff --git a/src/devices/sound/msm5205.h b/src/devices/sound/msm5205.h index 0c8283ebbc1..34980aaea85 100644 --- a/src/devices/sound/msm5205.h +++ b/src/devices/sound/msm5205.h @@ -44,7 +44,7 @@ class msm5205_device : public device_t, { public: msm5205_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - msm5205_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + msm5205_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); ~msm5205_device() {} static void set_prescaler_selector(device_t &device, int select) { downcast(device).m_select = select; } diff --git a/src/devices/sound/namco.cpp b/src/devices/sound/namco.cpp index 69632ccf1fb..ea0b201c895 100644 --- a/src/devices/sound/namco.cpp +++ b/src/devices/sound/namco.cpp @@ -35,7 +35,7 @@ const device_type NAMCO = &device_creator; const device_type NAMCO_15XX = &device_creator; const device_type NAMCO_CUS30 = &device_creator; -namco_audio_device::namco_audio_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +namco_audio_device::namco_audio_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__), device_sound_interface(mconfig, *this), m_last_channel(nullptr), diff --git a/src/devices/sound/namco.h b/src/devices/sound/namco.h index 27cd8d85fef..88b3926b811 100644 --- a/src/devices/sound/namco.h +++ b/src/devices/sound/namco.h @@ -36,7 +36,7 @@ class namco_audio_device : public device_t, public device_sound_interface { public: - namco_audio_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + namco_audio_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); ~namco_audio_device() {} // static configuration diff --git a/src/devices/sound/samples.cpp b/src/devices/sound/samples.cpp index e7100d1f054..d00751d19a7 100644 --- a/src/devices/sound/samples.cpp +++ b/src/devices/sound/samples.cpp @@ -53,7 +53,7 @@ samples_device::samples_device(const machine_config &mconfig, std::string tag, d { } -samples_device::samples_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +samples_device::samples_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), m_channels(0), diff --git a/src/devices/sound/samples.h b/src/devices/sound/samples.h index 7d42a2f0f0c..33d4a80ced6 100644 --- a/src/devices/sound/samples.h +++ b/src/devices/sound/samples.h @@ -82,7 +82,7 @@ public: protected: // subclasses can do it this way - samples_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + samples_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // device-level overrides virtual void device_start() override; diff --git a/src/devices/sound/sn76496.cpp b/src/devices/sound/sn76496.cpp index 79546e16be8..53896d9221a 100644 --- a/src/devices/sound/sn76496.cpp +++ b/src/devices/sound/sn76496.cpp @@ -132,7 +132,7 @@ sn76496_base_device::sn76496_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, int feedbackmask, int noisetap1, int noisetap2, bool negate, bool stereo, int clockdivider, int sega, - device_t *owner, UINT32 clock, const char *shortname, const char *source) + device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), diff --git a/src/devices/sound/sn76496.h b/src/devices/sound/sn76496.h index f7f9bea7714..f1659469aae 100644 --- a/src/devices/sound/sn76496.h +++ b/src/devices/sound/sn76496.h @@ -25,7 +25,7 @@ class sn76496_base_device : public device_t, public device_sound_interface public: sn76496_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, int feedbackmask, int noisetap1, int noisetap2, bool negate, bool stereo, int clockdivider, int sega, - device_t *owner, UINT32 clock, const char *shortname, const char *source); + device_t *owner, UINT32 clock, std::string shortname, std::string source); // static configuration helpers template static devcb_base &set_ready_handler(device_t &device, _Object object) { return downcast(device).m_ready_handler.set_callback(object); } diff --git a/src/devices/sound/tms5110.cpp b/src/devices/sound/tms5110.cpp index 3d6c8520083..651cf134070 100644 --- a/src/devices/sound/tms5110.cpp +++ b/src/devices/sound/tms5110.cpp @@ -1541,7 +1541,7 @@ tms5110_device::tms5110_device(const machine_config &mconfig, std::string tag, d { } -tms5110_device::tms5110_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +tms5110_device::tms5110_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), m_m0_cb(*this), diff --git a/src/devices/sound/tms5110.h b/src/devices/sound/tms5110.h index cd08726663e..35b5fd4f809 100644 --- a/src/devices/sound/tms5110.h +++ b/src/devices/sound/tms5110.h @@ -47,7 +47,7 @@ class tms5110_device : public device_t, { public: tms5110_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - tms5110_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + tms5110_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); template static devcb_base &set_m0_callback(device_t &device, _Object object) { return downcast(device).m_m0_cb.set_callback(object); } template static devcb_base &set_m1_callback(device_t &device, _Object object) { return downcast(device).m_m1_cb.set_callback(object); } diff --git a/src/devices/sound/tms5220.cpp b/src/devices/sound/tms5220.cpp index f5b2fd9c202..fc35af0411c 100644 --- a/src/devices/sound/tms5220.cpp +++ b/src/devices/sound/tms5220.cpp @@ -1459,7 +1459,7 @@ void tms5220_device::device_start() m_speechrom = siblingdevice( m_speechrom_tag ); if( !m_speechrom ) { - throw new emu_fatalerror("Error: %s '%s' can't find speechrom '%s'\n", shortname(), tag().c_str(), m_speechrom_tag.c_str() ); + throw new emu_fatalerror("Error: %s '%s' can't find speechrom '%s'\n", shortname().c_str(), tag().c_str(), m_speechrom_tag.c_str() ); } } else @@ -1920,7 +1920,7 @@ tms5220_device::tms5220_device(const machine_config &mconfig, std::string tag, d { } -tms5220_device::tms5220_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +tms5220_device::tms5220_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), m_irq_handler(*this), diff --git a/src/devices/sound/tms5220.h b/src/devices/sound/tms5220.h index b5dbf271afd..db3fbe22c20 100644 --- a/src/devices/sound/tms5220.h +++ b/src/devices/sound/tms5220.h @@ -33,7 +33,7 @@ class tms5220_device : public device_t, { public: tms5220_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - tms5220_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + tms5220_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // static configuration helpers template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/sound/upd7759.cpp b/src/devices/sound/upd7759.cpp index bd4c60afd01..5891696fe62 100644 --- a/src/devices/sound/upd7759.cpp +++ b/src/devices/sound/upd7759.cpp @@ -144,7 +144,7 @@ #define FRAC_MASK (FRAC_ONE - 1) -upd775x_device::upd775x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +upd775x_device::upd775x_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), m_channel(nullptr), @@ -188,7 +188,7 @@ upd7759_device::upd7759_device(const machine_config &mconfig, std::string tag, d } -upd7759_device::upd7759_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +upd7759_device::upd7759_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : upd775x_device(mconfig, type, name, tag, owner, clock, shortname, source), m_timer(nullptr) { diff --git a/src/devices/sound/upd7759.h b/src/devices/sound/upd7759.h index a624c51fcdd..cf53812f0a7 100644 --- a/src/devices/sound/upd7759.h +++ b/src/devices/sound/upd7759.h @@ -37,7 +37,7 @@ class upd775x_device : public device_t, public device_sound_interface { public: - upd775x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + upd775x_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); ~upd775x_device() {} template static devcb_base &set_drq_callback(device_t &device, _Object object) { return downcast(device).m_drqcallback.set_callback(object); } @@ -110,7 +110,7 @@ class upd7759_device : public upd775x_device { public: upd7759_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - upd7759_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + upd7759_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); enum { diff --git a/src/devices/video/315_5124.cpp b/src/devices/video/315_5124.cpp index 90f3eae1fa1..e1cf7676201 100644 --- a/src/devices/video/315_5124.cpp +++ b/src/devices/video/315_5124.cpp @@ -176,7 +176,7 @@ sega315_5124_device::sega315_5124_device(const machine_config &mconfig, std::str } -sega315_5124_device::sega315_5124_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 cram_size, UINT8 palette_offset, bool supports_224_240, const char *shortname, const char *source) +sega315_5124_device::sega315_5124_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT8 cram_size, UINT8 palette_offset, bool supports_224_240, std::string shortname, std::string source) : device_t( mconfig, type, name, tag, owner, clock, shortname, source) , device_memory_interface(mconfig, *this) , device_video_interface(mconfig, *this) diff --git a/src/devices/video/315_5124.h b/src/devices/video/315_5124.h index 8d54f34a2e4..b5875c6e5ec 100644 --- a/src/devices/video/315_5124.h +++ b/src/devices/video/315_5124.h @@ -61,7 +61,7 @@ class sega315_5124_device : public device_t, public: // construction/destruction sega315_5124_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - sega315_5124_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 cram_size, UINT8 palette_offset, bool supports_224_240, const char *shortname, const char *source); + sega315_5124_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT8 cram_size, UINT8 palette_offset, bool supports_224_240, std::string shortname, std::string source); static void set_signal_type(device_t &device, bool is_pal) { downcast(device).m_is_pal = is_pal; } diff --git a/src/devices/video/clgd542x.cpp b/src/devices/video/clgd542x.cpp index 89a356148af..f3b0bfd3347 100644 --- a/src/devices/video/clgd542x.cpp +++ b/src/devices/video/clgd542x.cpp @@ -46,7 +46,7 @@ cirrus_gd5428_device::cirrus_gd5428_device(const machine_config &mconfig, std::s { } -cirrus_gd5428_device::cirrus_gd5428_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +cirrus_gd5428_device::cirrus_gd5428_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : svga_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/video/clgd542x.h b/src/devices/video/clgd542x.h index 03ebe0d206a..07267d22e3c 100644 --- a/src/devices/video/clgd542x.h +++ b/src/devices/video/clgd542x.h @@ -17,7 +17,7 @@ class cirrus_gd5428_device : public svga_device public: // construction/destruction cirrus_gd5428_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - cirrus_gd5428_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + cirrus_gd5428_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual READ8_MEMBER(port_03c0_r) override; virtual WRITE8_MEMBER(port_03c0_w) override; virtual READ8_MEMBER(port_03b0_r) override; diff --git a/src/devices/video/dl1416.cpp b/src/devices/video/dl1416.cpp index 722ced731fe..8edeacd3669 100644 --- a/src/devices/video/dl1416.cpp +++ b/src/devices/video/dl1416.cpp @@ -96,7 +96,7 @@ static const UINT16 dl1416t_segments[128] = { DEVICE INTERFACE *****************************************************************************/ -dl1416_device::dl1416_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +dl1416_device::dl1416_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_write_enable(FALSE), m_chip_enable(FALSE), diff --git a/src/devices/video/dl1416.h b/src/devices/video/dl1416.h index 00cb4e4f574..e4464f219f9 100644 --- a/src/devices/video/dl1416.h +++ b/src/devices/video/dl1416.h @@ -31,7 +31,7 @@ class dl1416_device : public device_t { public: - dl1416_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + dl1416_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); ~dl1416_device() {} template static devcb_base &set_update_handler(device_t &device, _Object object) { return downcast(device).m_update.set_callback(object); } diff --git a/src/devices/video/fixfreq.cpp b/src/devices/video/fixfreq.cpp index cfb46649a93..d95eb1d225a 100644 --- a/src/devices/video/fixfreq.cpp +++ b/src/devices/video/fixfreq.cpp @@ -33,7 +33,7 @@ // device type definition const device_type FIXFREQ = &device_creator; -fixedfreq_device::fixedfreq_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +fixedfreq_device::fixedfreq_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this, false), m_htotal(0), m_vtotal(0), m_vid(0), m_last_x(0), m_last_y(0), m_cur_bm(0), // default to NTSC "704x480@30i" diff --git a/src/devices/video/fixfreq.h b/src/devices/video/fixfreq.h index fb7b6ae3ec9..25582401100 100644 --- a/src/devices/video/fixfreq.h +++ b/src/devices/video/fixfreq.h @@ -72,7 +72,7 @@ class fixedfreq_device : public device_t, public: // construction/destruction fixedfreq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - fixedfreq_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + fixedfreq_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // inline configuration helpers static void set_minitor_clock(device_t &device, UINT32 clock) { downcast(device).m_monitor_clock = clock; } diff --git a/src/devices/video/hd44780.cpp b/src/devices/video/hd44780.cpp index 765270f1a5e..92629219499 100644 --- a/src/devices/video/hd44780.cpp +++ b/src/devices/video/hd44780.cpp @@ -52,7 +52,7 @@ hd44780_device::hd44780_device(const machine_config &mconfig, std::string tag, d set_charset_type(CHARSET_HD44780_A00); } -hd44780_device::hd44780_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +hd44780_device::hd44780_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_pixel_update_func(nullptr) { diff --git a/src/devices/video/hd44780.h b/src/devices/video/hd44780.h index 81191315e41..23cd681ae96 100644 --- a/src/devices/video/hd44780.h +++ b/src/devices/video/hd44780.h @@ -39,7 +39,7 @@ class hd44780_device : public device_t public: // construction/destruction hd44780_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - hd44780_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + hd44780_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // static configuration helpers static void static_set_lcd_size(device_t &device, int _lines, int _chars) { hd44780_device &dev=downcast(device); dev.m_lines = _lines; dev.m_chars = _chars; } diff --git a/src/devices/video/i8244.cpp b/src/devices/video/i8244.cpp index ab44e6f197a..060644e2983 100644 --- a/src/devices/video/i8244.cpp +++ b/src/devices/video/i8244.cpp @@ -114,7 +114,7 @@ i8244_device::i8244_device(const machine_config &mconfig, std::string tag, devic } -i8244_device::i8244_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, int lines, const char *shortname, const char *source) +i8244_device::i8244_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, int lines, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) , device_sound_interface(mconfig, *this) , device_video_interface(mconfig, *this) diff --git a/src/devices/video/i8244.h b/src/devices/video/i8244.h index cb3cbaff7ca..1c1ce4734fc 100644 --- a/src/devices/video/i8244.h +++ b/src/devices/video/i8244.h @@ -81,7 +81,7 @@ class i8244_device : public device_t public: // construction/destruction i8244_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - i8244_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, int lines, const char *shortname, const char *source); + i8244_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, int lines, std::string shortname, std::string source); // static configuration helpers static void set_screen_tag(device_t &device, const char *screen_tag) { downcast(device).m_screen_tag = screen_tag; } diff --git a/src/devices/video/i82730.cpp b/src/devices/video/i82730.cpp index 1450abc9112..7e9fbeacde3 100644 --- a/src/devices/video/i82730.cpp +++ b/src/devices/video/i82730.cpp @@ -232,13 +232,13 @@ void i82730_device::mode_set() // output some debug info if (VERBOSE) { - logerror("%s('%s'): ---- setting mode ----\n", shortname(), basetag()); - logerror("%s('%s'): dma burst length %02x, space %02x\n", shortname(), basetag(), m_dma_burst_length, m_dma_burst_space); - logerror("%s('%s'): margin %02x, lpr %02x\n", shortname(), basetag(), m_margin, m_lpr); + logerror("%s('%s'): ---- setting mode ----\n", shortname().c_str(), basetag().c_str()); + logerror("%s('%s'): dma burst length %02x, space %02x\n", shortname().c_str(), basetag().c_str(), m_dma_burst_length, m_dma_burst_space); + logerror("%s('%s'): margin %02x, lpr %02x\n", shortname().c_str(), basetag().c_str(), m_margin, m_lpr); logerror("%s('%s'): hsyncstp: %02x, line_length: %02x, hfldstrt: %02x, hbrdstart: %02x, hfldstop: %02x, hbrdstop: %02x\n", - shortname(), basetag(), hsyncstp, line_length, m_hfldstrt, hbrdstrt, hfldstp, hbrdstp); + shortname().c_str(), basetag().c_str(), hsyncstp, line_length, m_hfldstrt, hbrdstrt, hfldstp, hbrdstp); logerror("%s('%s'): frame_length %04x, vsyncstp: %04x, vfldstrt: %04x, vfldstp: %04x\n", - shortname(), basetag(), frame_length, m_vsyncstp, m_vfldstrt, m_vfldstp); + shortname().c_str(), basetag().c_str(), frame_length, m_vsyncstp, m_vfldstrt, m_vfldstp); } } @@ -248,7 +248,7 @@ void i82730_device::execute_command() UINT16 tmp; if (VERBOSE_COMMANDS && command < ARRAY_LENGTH(m_command_names)) - logerror("%s('%s'): executing command: %s [cbp = %08x]\n", shortname(), basetag(), m_command_names[command], m_cbp); + logerror("%s('%s'): executing command: %s [cbp = %08x]\n", shortname().c_str(), basetag().c_str(), m_command_names[command], m_cbp); tmp = read_word(m_cbp + 2); m_list_switch = BIT(tmp, 6); @@ -295,12 +295,12 @@ void i82730_device::execute_command() case 0x06: m_intmask = read_word(m_cbp + 22); if (VERBOSE_COMMANDS) - logerror("%s('%s'): intmask now %04x\n", shortname(), basetag(), m_intmask); + logerror("%s('%s'): intmask now %04x\n", shortname().c_str(), basetag().c_str(), m_intmask); break; // LPEN ENABLE case 0x07: - fatalerror("%s('%s'): Unimplemented command %s\n", shortname(), basetag(), m_command_names[command]); + fatalerror("%s('%s'): Unimplemented command %s\n", shortname().c_str(), basetag().c_str(), m_command_names[command]); break; // READ STATUS @@ -311,22 +311,22 @@ void i82730_device::execute_command() // LD CUR POS case 0x09: - fatalerror("%s('%s'): Unimplemented command %s\n", shortname(), basetag(), m_command_names[command]); + fatalerror("%s('%s'): Unimplemented command %s\n", shortname().c_str(), basetag().c_str(), m_command_names[command]); break; // SELF TEST case 0x0a: - fatalerror("%s('%s'): Unimplemented command %s\n", shortname(), basetag(), m_command_names[command]); + fatalerror("%s('%s'): Unimplemented command %s\n", shortname().c_str(), basetag().c_str(), m_command_names[command]); break; // TEST ROW BUFFER case 0x0b: - fatalerror("%s('%s'): Unimplemented command %s\n", shortname(), basetag(), m_command_names[command]); + fatalerror("%s('%s'): Unimplemented command %s\n", shortname().c_str(), basetag().c_str(), m_command_names[command]); break; default: if (VERBOSE_COMMANDS) - logerror("%s('%s'): executing command: (reserved) [cbp = %08x]\n", shortname(), basetag(), m_cbp); + logerror("%s('%s'): executing command: (reserved) [cbp = %08x]\n", shortname().c_str(), basetag().c_str(), m_cbp); m_status |= RCC; update_interrupts(); break; @@ -356,12 +356,12 @@ void i82730_device::load_row() m_sptr += 2; if (VERBOSE_DATASTREAM) - logerror("%s('%s'): SET FIELD ATTRIB to %04x\n", shortname(), basetag(), m_field_attribute_mask); + logerror("%s('%s'): SET FIELD ATTRIB to %04x\n", shortname().c_str(), basetag().c_str(), m_field_attribute_mask); break; default: - fatalerror("%s('%s'): Unimplemented datastream command %02x\n", shortname(), basetag(), data >> 8); + fatalerror("%s('%s'): Unimplemented datastream command %02x\n", shortname().c_str(), basetag().c_str(), data >> 8); } } else @@ -468,7 +468,7 @@ TIMER_CALLBACK_MEMBER( i82730_device::row_update ) WRITE_LINE_MEMBER( i82730_device::ca_w ) { if (VERBOSE) - logerror("%s('%s'): ca_w %d\n", shortname(), basetag(), state); + logerror("%s('%s'): ca_w %d\n", shortname().c_str(), basetag().c_str(), state); // falling edge if (m_ca == 1 && state == 0) @@ -493,10 +493,10 @@ WRITE_LINE_MEMBER( i82730_device::ca_w ) // output some debug info if (VERBOSE) { - logerror("%s('%s'): ---- initializing ----\n", shortname(), basetag()); - logerror("%s('%s'): %s system bus\n", shortname(), basetag(), sysbus_16bit() ? "16-bit" : "8-bit"); - logerror("%s('%s'): intermediate block pointer: %08x\n", shortname(), basetag(), m_ibp); - logerror("%s('%s'): addrbus: %s, clno: %d, clpos: %d, mode: %s, dtw16: %s, srdy: %s\n", shortname(), basetag(), + logerror("%s('%s'): ---- initializing ----\n", shortname().c_str(), basetag().c_str()); + logerror("%s('%s'): %s system bus\n", shortname().c_str(), basetag().c_str(), sysbus_16bit() ? "16-bit" : "8-bit"); + logerror("%s('%s'): intermediate block pointer: %08x\n", shortname().c_str(), basetag().c_str(), m_ibp); + logerror("%s('%s'): addrbus: %s, clno: %d, clpos: %d, mode: %s, dtw16: %s, srdy: %s\n", shortname().c_str(), basetag().c_str(), BIT(scb, 0) ? "32-bit" : "16-bit", (scb >> 1) & 0x03, (scb >> 3) & 0x03, BIT(scb, 5) ? "master" : "slave", BIT(scb, 6) ? "16-bit" : "8-bit", BIT(scb, 7) ? "synchronous" : "asynchronous"); } @@ -515,7 +515,7 @@ WRITE_LINE_MEMBER( i82730_device::ca_w ) WRITE_LINE_MEMBER( i82730_device::irst_w ) { if (VERBOSE) - logerror("%s('%s'): irst_w %d\n", shortname(), basetag(), state); + logerror("%s('%s'): irst_w %d\n", shortname().c_str(), basetag().c_str(), state); m_sint_handler(0); } diff --git a/src/devices/video/mc6845.cpp b/src/devices/video/mc6845.cpp index ac0f8de8046..8970b236616 100644 --- a/src/devices/video/mc6845.cpp +++ b/src/devices/video/mc6845.cpp @@ -89,7 +89,7 @@ const device_type MOS8568 = &device_creator; #define ATTR_ALTERNATE_CHARSET BIT(attr, 7) -mc6845_device::mc6845_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +mc6845_device::mc6845_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this, false), m_show_border_area(true), @@ -1454,7 +1454,7 @@ ams40489_device::ams40489_device(const machine_config &mconfig, std::string tag, } -mos8563_device::mos8563_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +mos8563_device::mos8563_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : mc6845_device(mconfig, type, name, tag, owner, clock, shortname, source), device_memory_interface(mconfig, *this), m_videoram_space_config("videoram", ENDIANNESS_LITTLE, 8, 16, 0, nullptr, *ADDRESS_MAP_NAME(mos8563_videoram_map)), diff --git a/src/devices/video/mc6845.h b/src/devices/video/mc6845.h index 8eb450a4957..6d27e079c32 100644 --- a/src/devices/video/mc6845.h +++ b/src/devices/video/mc6845.h @@ -100,7 +100,7 @@ class mc6845_device : public device_t, public: // construction/destruction mc6845_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - mc6845_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + mc6845_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); static void set_show_border_area(device_t &device, bool show) { downcast(device).m_show_border_area = show; } static void set_visarea_adjust(device_t &device, int min_x, int max_x, int min_y, int max_y) @@ -430,7 +430,7 @@ class mos8563_device : public mc6845_device, public device_memory_interface { public: - mos8563_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + mos8563_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); mos8563_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; diff --git a/src/devices/video/mc6847.cpp b/src/devices/video/mc6847.cpp index 5297a549ef1..816f1c3d4a9 100644 --- a/src/devices/video/mc6847.cpp +++ b/src/devices/video/mc6847.cpp @@ -129,8 +129,8 @@ const UINT32 mc6847_base_device::s_palette[mc6847_base_device::PALETTE_LENGTH] = // ctor //------------------------------------------------- -mc6847_friend_device::mc6847_friend_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, - const UINT8 *fontdata, bool is_mc6847t1, double tpfs, int field_sync_falling_edge_scanline, bool supports_partial_body_scanlines, const char *shortname, const char *source) +mc6847_friend_device::mc6847_friend_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, + const UINT8 *fontdata, bool is_mc6847t1, double tpfs, int field_sync_falling_edge_scanline, bool supports_partial_body_scanlines, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_write_hsync(*this), m_write_fsync(*this), @@ -546,7 +546,7 @@ const char *mc6847_friend_device::describe_context(void) // ctor //------------------------------------------------- -mc6847_base_device::mc6847_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const UINT8 *fontdata, double tpfs, const char *shortname, const char *source) : +mc6847_base_device::mc6847_base_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, const UINT8 *fontdata, double tpfs, std::string shortname, std::string source) : mc6847_friend_device(mconfig, type, name, tag, owner, clock, fontdata, (type == MC6847T1_NTSC) || (type == MC6847T1_PAL), tpfs, 25+191, true, shortname, source), m_input_cb(*this), m_black_and_white(false), diff --git a/src/devices/video/mc6847.h b/src/devices/video/mc6847.h index 46489296677..8ccd509bb55 100644 --- a/src/devices/video/mc6847.h +++ b/src/devices/video/mc6847.h @@ -90,8 +90,8 @@ public: static void set_get_char_rom(device_t &device, mc6847_get_char_rom_delegate callback) { downcast(device).m_charrom_cb = callback; } protected: - mc6847_friend_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, - const UINT8 *fontdata, bool is_mc6847t1, double tpfs, int field_sync_falling_edge_scanline, bool supports_partial_body_scanlines, const char *shortname, const char *source); + mc6847_friend_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, + const UINT8 *fontdata, bool is_mc6847t1, double tpfs, int field_sync_falling_edge_scanline, bool supports_partial_body_scanlines, std::string shortname, std::string source); // video mode constants static const UINT8 MODE_AG = 0x80; @@ -537,7 +537,7 @@ public: DECLARE_WRITE_LINE_MEMBER( inv_w ) { change_mode(MODE_INV, state); } protected: - mc6847_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const UINT8 *fontdata, double tpfs, const char *shortname, const char *source); + mc6847_base_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, const UINT8 *fontdata, double tpfs, std::string shortname, std::string source); // device-level overrides virtual void device_start() override; diff --git a/src/devices/video/mos6566.cpp b/src/devices/video/mos6566.cpp index bc98816dd20..e9a8dbd8fd2 100644 --- a/src/devices/video/mos6566.cpp +++ b/src/devices/video/mos6566.cpp @@ -595,7 +595,7 @@ mos6566_device::mos6566_device(const machine_config &mconfig, std::string tag, d { } -mos6566_device::mos6566_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) +mos6566_device::mos6566_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_memory_interface(mconfig, *this), device_video_interface(mconfig, *this), @@ -618,7 +618,7 @@ mos6566_device::mos6566_device(const machine_config &mconfig, device_type type, mos6567_device::mos6567_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :mos6566_device(mconfig, MOS6567, "MOS6567", tag, owner, clock, TYPE_6567, "mos6567", __FILE__) { } -mos6567_device::mos6567_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) +mos6567_device::mos6567_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source) :mos6566_device(mconfig, type, name, tag, owner, clock, variant, shortname, source) { } mos8562_device::mos8562_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) @@ -630,7 +630,7 @@ mos8564_device::mos8564_device(const machine_config &mconfig, std::string tag, d mos6569_device::mos6569_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :mos6566_device(mconfig, MOS6566, "MOS6569", tag, owner, clock, TYPE_6569, "mos6569", __FILE__) { } -mos6569_device::mos6569_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) +mos6569_device::mos6569_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source) :mos6566_device(mconfig, type, name, tag, owner, clock, variant, shortname, source) { } mos8565_device::mos8565_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) diff --git a/src/devices/video/mos6566.h b/src/devices/video/mos6566.h index c6d7f68eb95..273476ccae2 100644 --- a/src/devices/video/mos6566.h +++ b/src/devices/video/mos6566.h @@ -211,7 +211,7 @@ class mos6566_device : public device_t, { public: // construction/destruction - mos6566_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); + mos6566_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source); mos6566_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); static void static_set_cpu_tag(device_t &device, std::string tag) { downcast(device).m_cpu.set_tag(tag); } @@ -375,7 +375,7 @@ class mos6567_device : public mos6566_device public: // construction/destruction mos6567_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - mos6567_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); + mos6567_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source); }; @@ -410,7 +410,7 @@ class mos6569_device : public mos6566_device public: // construction/destruction mos6569_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - mos6569_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); + mos6569_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source); // device-level overrides virtual void execute_run() override; diff --git a/src/devices/video/msm6222b.cpp b/src/devices/video/msm6222b.cpp index eb73cae37a4..ad50e57ee2c 100644 --- a/src/devices/video/msm6222b.cpp +++ b/src/devices/video/msm6222b.cpp @@ -21,7 +21,7 @@ ROM_START( msm6222b_01 ) ROM_LOAD( "msm6222b-01.bin", 0x0000, 0x1000, CRC(8ffa8521) SHA1(e108b520e6d20459a7bbd5958bbfa1d551a690bd) ) ROM_END -msm6222b_device::msm6222b_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +msm6222b_device::msm6222b_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), cursor_direction(false), cursor_blinking(false), two_line(false), shift_on_write(false), double_height(false), cursor_on(false), display_on(false), adc(0), shift(0), cgrom(nullptr) { } diff --git a/src/devices/video/msm6222b.h b/src/devices/video/msm6222b.h index cc83e0727f0..f5c42a83caf 100644 --- a/src/devices/video/msm6222b.h +++ b/src/devices/video/msm6222b.h @@ -22,7 +22,7 @@ class msm6222b_device : public device_t { public: msm6222b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - msm6222b_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + msm6222b_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); void control_w(UINT8 data); UINT8 control_r(); diff --git a/src/devices/video/pc_vga.cpp b/src/devices/video/pc_vga.cpp index 3046612e10a..043164a1ff6 100644 --- a/src/devices/video/pc_vga.cpp +++ b/src/devices/video/pc_vga.cpp @@ -125,7 +125,7 @@ const device_type ATI_VGA = &device_creator; const device_type IBM8514A = &device_creator; const device_type MACH8 = &device_creator; -vga_device::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) +vga_device::vga_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_palette(*this, "^palette"), m_screen(*this,"^screen") @@ -139,7 +139,7 @@ vga_device::vga_device(const machine_config &mconfig, std::string tag, device_t { } -svga_device::svga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +svga_device::svga_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : vga_device(mconfig, type, name, tag, owner, clock, shortname, source) { } @@ -154,7 +154,7 @@ s3_vga_device::s3_vga_device(const machine_config &mconfig, std::string tag, dev { } -s3_vga_device::s3_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::s3_vga_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : ati_vga_device(mconfig, type, name, tag, owner, clock, shortname, source) { } @@ -169,7 +169,7 @@ ati_vga_device::ati_vga_device(const machine_config &mconfig, std::string tag, d { } -ati_vga_device::ati_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) +ati_vga_device::ati_vga_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : svga_device(mconfig, type, name, tag, owner, clock, shortname, source) { } @@ -179,12 +179,12 @@ ibm8514a_device::ibm8514a_device(const machine_config &mconfig, std::string tag, { } -ibm8514a_device::ibm8514a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +ibm8514a_device::ibm8514a_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) { } -mach8_device::mach8_device(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::mach8_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : ibm8514a_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/video/pc_vga.h b/src/devices/video/pc_vga.h index 750180ffea3..5b674a009df 100644 --- a/src/devices/video/pc_vga.h +++ b/src/devices/video/pc_vga.h @@ -40,7 +40,7 @@ class vga_device : public device_t public: // construction/destruction vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - 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); + vga_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual void zero(); virtual UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -243,7 +243,7 @@ class svga_device : public vga_device { public: // construction/destruction - svga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + svga_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual void zero() override; virtual UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override; @@ -272,7 +272,7 @@ protected: class ibm8514a_device : public device_t { public: - ibm8514a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + ibm8514a_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); ibm8514a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); void set_vga(std::string tag) { m_vga_tag.assign(tag); } @@ -411,7 +411,7 @@ extern const device_type IBM8514A; class mach8_device : public ibm8514a_device { public: - mach8_device(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(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); mach8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); READ16_MEMBER(mach8_ec0_r); @@ -516,7 +516,7 @@ class ati_vga_device : public svga_device public: // construction/destruction ati_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - ati_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); + ati_vga_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual READ8_MEMBER(mem_r) override; virtual WRITE8_MEMBER(mem_w) override; @@ -554,7 +554,7 @@ class s3_vga_device : public ati_vga_device public: // construction/destruction s3_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - s3_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(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual READ8_MEMBER(port_03b0_r) override; virtual WRITE8_MEMBER(port_03b0_w) override; diff --git a/src/devices/video/psx.cpp b/src/devices/video/psx.cpp index ae780ec8237..4d621ccc830 100644 --- a/src/devices/video/psx.cpp +++ b/src/devices/video/psx.cpp @@ -22,7 +22,7 @@ const device_type CXD8561BQ = &device_creator; const device_type CXD8561CQ = &device_creator; const device_type CXD8654Q = &device_creator; -psxgpu_device::psxgpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +psxgpu_device::psxgpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_vblank_handler(*this) #if DEBUG_VIEWER diff --git a/src/devices/video/psx.h b/src/devices/video/psx.h index a19138bb509..6b0dde4c6a6 100644 --- a/src/devices/video/psx.h +++ b/src/devices/video/psx.h @@ -189,7 +189,7 @@ class psxgpu_device : public device_t { public: // construction/destruction - psxgpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + psxgpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual machine_config_constructor device_mconfig_additions() const override; // static configuration helpers diff --git a/src/devices/video/saa5050.cpp b/src/devices/video/saa5050.cpp index 40d87bdb656..719a1dd23d2 100644 --- a/src/devices/video/saa5050.cpp +++ b/src/devices/video/saa5050.cpp @@ -173,7 +173,7 @@ const rom_entry *saa5057_device::device_rom_region() const // saa5050_device - constructor //------------------------------------------------- -saa5050_device::saa5050_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +saa5050_device::saa5050_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_char_rom(*this, "chargen"), m_read_d(*this), diff --git a/src/devices/video/saa5050.h b/src/devices/video/saa5050.h index bda63c98a8d..eeec8031fad 100644 --- a/src/devices/video/saa5050.h +++ b/src/devices/video/saa5050.h @@ -55,7 +55,7 @@ class saa5050_device : public device_t { public: // construction/destruction - saa5050_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + saa5050_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); saa5050_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); static void static_set_screen_size(device_t &device, int cols, int rows, int size) { downcast(device).m_cols = cols; downcast(device).m_rows = rows; downcast(device).m_size = size; } diff --git a/src/devices/video/sed1200.cpp b/src/devices/video/sed1200.cpp index 94706dccde6..15d99c019fd 100644 --- a/src/devices/video/sed1200.cpp +++ b/src/devices/video/sed1200.cpp @@ -31,7 +31,7 @@ ROM_START( sed1200x0b ) ROM_LOAD( "sed1200-b.bin", 0x000, 0x800, CRC(d0741f51) SHA1(c8c856f1357286a2c8c806af81724a828345357e)) ROM_END -sed1200_device::sed1200_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +sed1200_device::sed1200_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), cursor_direction(false), cursor_blinking(false), cursor_full(false), cursor_on(false), display_on(false), cursor_address(0), cgram_address(0), cgrom(nullptr) { } diff --git a/src/devices/video/sed1200.h b/src/devices/video/sed1200.h index fe647b6e9e6..440347d7209 100644 --- a/src/devices/video/sed1200.h +++ b/src/devices/video/sed1200.h @@ -29,7 +29,7 @@ class sed1200_device : public device_t { public: - sed1200_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + sed1200_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); void control_w(UINT8 data); UINT8 control_r(); diff --git a/src/devices/video/tms9927.cpp b/src/devices/video/tms9927.cpp index e75594d13e7..02e9edb98da 100644 --- a/src/devices/video/tms9927.cpp +++ b/src/devices/video/tms9927.cpp @@ -44,7 +44,7 @@ tms9927_device::tms9927_device(const machine_config &mconfig, std::string tag, d memset(m_reg, 0x00, sizeof(m_reg)); } -tms9927_device::tms9927_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +tms9927_device::tms9927_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), m_write_vsyn(*this), diff --git a/src/devices/video/tms9927.h b/src/devices/video/tms9927.h index 4ed6f2f236c..0478d91adb9 100644 --- a/src/devices/video/tms9927.h +++ b/src/devices/video/tms9927.h @@ -25,7 +25,7 @@ class tms9927_device : public device_t, { public: tms9927_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - tms9927_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + tms9927_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); ~tms9927_device() {} template static devcb_base &set_vsyn_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_vsyn.set_callback(object); } diff --git a/src/devices/video/tms9928a.cpp b/src/devices/video/tms9928a.cpp index a5c77b83dcf..b33b2231a77 100644 --- a/src/devices/video/tms9928a.cpp +++ b/src/devices/video/tms9928a.cpp @@ -54,7 +54,7 @@ static ADDRESS_MAP_START(memmap, AS_DATA, 8, tms9928a_device) AM_RANGE(0x0000, 0x3fff) AM_RAM ADDRESS_MAP_END -tms9928a_device::tms9928a_device( const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, bool is_50hz, bool is_reva, bool is_99, const char *shortname, const char *source) +tms9928a_device::tms9928a_device( const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, bool is_50hz, bool is_reva, bool is_99, std::string shortname, std::string source) : device_t( mconfig, type, name, tag, owner, clock, shortname, source), device_memory_interface(mconfig, *this), device_video_interface(mconfig, *this), diff --git a/src/devices/video/tms9928a.h b/src/devices/video/tms9928a.h index 82798ea7318..60b51b30c96 100644 --- a/src/devices/video/tms9928a.h +++ b/src/devices/video/tms9928a.h @@ -83,7 +83,7 @@ class tms9928a_device : public device_t, public: // construction/destruction tms9928a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - tms9928a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, bool is_50hz, bool is_reva, bool is_99, const char *shortname, const char *source); + tms9928a_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, bool is_50hz, bool is_reva, bool is_99, std::string shortname, std::string source); static void set_vram_size(device_t &device, int vram_size) { downcast(device).m_vram_size = vram_size; } template static devcb_base &set_out_int_line_callback(device_t &device, _Object object) { return downcast(device).m_out_int_line_cb.set_callback(object); } diff --git a/src/devices/video/v9938.cpp b/src/devices/video/v9938.cpp index 1ef39a39279..43a822b8678 100644 --- a/src/devices/video/v9938.cpp +++ b/src/devices/video/v9938.cpp @@ -88,7 +88,7 @@ const device_type V9938 = &device_creator; const device_type V9958 = &device_creator; -v99x8_device::v99x8_device(const machine_config &mconfig, device_type type, const char *name, const char *shortname, std::string tag, device_t *owner, UINT32 clock) +v99x8_device::v99x8_device(const machine_config &mconfig, device_type type, std::string name, const char *shortname, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__), device_memory_interface(mconfig, *this), device_video_interface(mconfig, *this), diff --git a/src/devices/video/v9938.h b/src/devices/video/v9938.h index 583df876df5..8db93e4b2bd 100644 --- a/src/devices/video/v9938.h +++ b/src/devices/video/v9938.h @@ -76,7 +76,7 @@ class v99x8_device : public device_t, { protected: // construction/destruction - v99x8_device(const machine_config &mconfig, device_type type, const char *name, const char *shortname, std::string tag, device_t *owner, UINT32 clock); + v99x8_device(const machine_config &mconfig, device_type type, std::string name, const char *shortname, std::string tag, device_t *owner, UINT32 clock); public: template void set_interrupt_callback(_irq irq) { diff --git a/src/devices/video/voodoo.cpp b/src/devices/video/voodoo.cpp index 060ab9736cc..0e1ea93255f 100644 --- a/src/devices/video/voodoo.cpp +++ b/src/devices/video/voodoo.cpp @@ -5831,7 +5831,7 @@ static void dump_rasterizer_stats(voodoo_state *v) } } -voodoo_device::voodoo_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +voodoo_device::voodoo_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_fbmem(0), m_tmumem0(0), @@ -5922,7 +5922,7 @@ voodoo_banshee_device::voodoo_banshee_device(const machine_config &mconfig, std: { } -voodoo_banshee_device::voodoo_banshee_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +voodoo_banshee_device::voodoo_banshee_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : voodoo_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/video/voodoo.h b/src/devices/video/voodoo.h index 9a61385046d..041cc960f34 100644 --- a/src/devices/video/voodoo.h +++ b/src/devices/video/voodoo.h @@ -71,7 +71,7 @@ void voodoo_set_init_enable(device_t *device, UINT32 newval); class voodoo_device : public device_t { public: - voodoo_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + voodoo_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); ~voodoo_device(); @@ -133,7 +133,7 @@ class voodoo_banshee_device : public voodoo_device { public: voodoo_banshee_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - voodoo_banshee_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + voodoo_banshee_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); DECLARE_READ32_MEMBER( banshee_r ); DECLARE_WRITE32_MEMBER( banshee_w ); diff --git a/src/emu/addrmap.cpp b/src/emu/addrmap.cpp index 0403008b110..ea3433d1a01 100644 --- a/src/emu/addrmap.cpp +++ b/src/emu/addrmap.cpp @@ -501,7 +501,7 @@ void address_map::uplift_submaps(running_machine &machine, device_t &device, dev std::string tag = owner.subtag(entry->m_read.m_tag); device_t *mapdevice = machine.device(tag.c_str()); if (mapdevice == nullptr) { - throw emu_fatalerror("Attempted to submap a non-existent device '%s' in space %d of device '%s'\n", tag.c_str(), m_spacenum, device.basetag()); + throw emu_fatalerror("Attempted to submap a non-existent device '%s' in space %d of device '%s'\n", tag.c_str(), m_spacenum, device.basetag().c_str()); } // Grab the submap address_map submap(*mapdevice, entry); diff --git a/src/emu/audit.cpp b/src/emu/audit.cpp index b1016967931..640ab2ca48f 100644 --- a/src/emu/audit.cpp +++ b/src/emu/audit.cpp @@ -46,7 +46,7 @@ media_auditor::summary media_auditor::audit_media(const char *validation) // temporary hack until romload is update: get the driver path and support it for // all searches -const char *driverpath = m_enumerator.config().root_device().searchpath(); +const char *driverpath = m_enumerator.config().root_device().searchpath().c_str(); int found = 0; int required = 0; @@ -58,14 +58,14 @@ const char *driverpath = m_enumerator.config().root_device().searchpath(); for (device_t *device = deviter.first(); device != nullptr; device = deviter.next()) { // determine the search path for this source and iterate through the regions - m_searchpath = device->searchpath(); + m_searchpath = device->searchpath().c_str(); // now iterate over regions and ROMs within for (const rom_entry *region = rom_first_region(*device); region != nullptr; region = rom_next_region(region)) { // temporary hack: add the driver path & region name std::string combinedpath = std::string(device->searchpath()).append(";").append(driverpath); -if (device->shortname()) +if (!device->shortname().empty()) combinedpath.append(";").append(device->shortname()); m_searchpath = combinedpath.c_str(); @@ -131,7 +131,7 @@ media_auditor::summary media_auditor::audit_device(device_t *device, const char // store validation for later m_validation = validation; - m_searchpath = device->shortname(); + m_searchpath = device->shortname().c_str(); int found = 0; int required = 0; @@ -173,7 +173,7 @@ media_auditor::summary media_auditor::audit_device(device_t *device, const char } // return a summary - return summarize(device->shortname()); + return summarize(device->shortname().c_str()); } @@ -386,7 +386,7 @@ media_auditor::summary media_auditor::summarize(const char *name, std::string *o if (shared_device == nullptr) strcatprintf(*output,"NOT FOUND\n"); else - strcatprintf(*output,"NOT FOUND (%s)\n", shared_device->shortname()); + strcatprintf(*output,"NOT FOUND (%s)\n", shared_device->shortname().c_str()); } best_new_status = NOTFOUND; break; diff --git a/src/emu/clifront.cpp b/src/emu/clifront.cpp index c5607c11d6a..1fdd9eecaf1 100644 --- a/src/emu/clifront.cpp +++ b/src/emu/clifront.cpp @@ -438,7 +438,7 @@ void cli_frontend::listcrc(const char *gamename) // if we have a CRC, display it UINT32 crc; if (hash_collection(ROM_GETHASHDATA(rom)).crc(crc)) - osd_printf_info("%08x %-16s \t %-8s \t %s\n", crc, ROM_GETNAME(rom), device->shortname(), device->name()); + osd_printf_info("%08x %-16s \t %-8s \t %s\n", crc, ROM_GETNAME(rom), device->shortname().c_str(), device->name().c_str()); } } } @@ -607,7 +607,7 @@ void cli_frontend::listdevices(const char *gamename) depth++; } } - printf(" %*s%-*s %s", depth * 2, "", 30 - depth * 2, tag.c_str(), device->name()); + printf(" %*s%-*s %s", depth * 2, "", 30 - depth * 2, tag.c_str(), device->name().c_str()); // add more information UINT32 clock = device->clock(); @@ -664,9 +664,9 @@ void cli_frontend::listslots(const char *gamename) device_t *dev = (*option->devtype())(drivlist.config(), "dummy", &drivlist.config().root_device(), 0); dev->config_complete(); if (first_option) { - printf("%-15s %s\n", option->name(),dev->name()); + printf("%-15s %s\n", option->name(),dev->name().c_str()); } else { - printf("%-23s %-15s %s\n", "",option->name(),dev->name()); + printf("%-23s %-15s %s\n", "",option->name(),dev->name().c_str()); } global_free(dev); @@ -815,8 +815,8 @@ void cli_frontend::verifyroms(const char *gamename) device_iterator iter(config.root_device()); for (device_t *dev = iter.first(); dev != nullptr; dev = iter.next()) { - if (dev->owner() != nullptr && (*(dev->shortname()) != 0) && dev->rom_region() != nullptr && (device_map.insert(dev->shortname()).second)) { - if (core_strwildcmp(gamename, dev->shortname()) == 0) + if (dev->owner() != nullptr && (!dev->shortname().empty()) && dev->rom_region() != nullptr && (device_map.insert(dev->shortname()).second)) { + if (core_strwildcmp(gamename, dev->shortname().c_str()) == 0) { matched++; @@ -831,11 +831,11 @@ void cli_frontend::verifyroms(const char *gamename) { // output the summary of the audit std::string summary_string; - auditor.summarize(dev->shortname(),&summary_string); + auditor.summarize(dev->shortname().c_str(),&summary_string); osd_printf_info("%s", summary_string.c_str()); // display information about what we discovered - osd_printf_info("romset %s ", dev->shortname()); + osd_printf_info("romset %s ", dev->shortname().c_str()); // switch off of the result switch (summary) @@ -879,7 +879,7 @@ void cli_frontend::verifyroms(const char *gamename) device->config_complete(); if (device_map.insert(dev->shortname()).second) { - if (core_strwildcmp(gamename, dev->shortname()) == 0) + if (core_strwildcmp(gamename, dev->shortname().c_str()) == 0) { matched++; if (dev->rom_region() != nullptr) @@ -896,11 +896,11 @@ void cli_frontend::verifyroms(const char *gamename) { // output the summary of the audit std::string summary_string; - auditor.summarize(dev->shortname(),&summary_string); + auditor.summarize(dev->shortname().c_str(),&summary_string); osd_printf_info("%s", summary_string.c_str()); // display information about what we discovered - osd_printf_info("romset %s ", dev->shortname()); + osd_printf_info("romset %s ", dev->shortname().c_str()); // switch off of the result switch (summary) @@ -934,11 +934,11 @@ void cli_frontend::verifyroms(const char *gamename) device_iterator subsubiter(*device); for (device_t *subdev = subsubiter.first(); subdev != nullptr; subdev = subsubiter.next()) { - if (subdev->owner() == device && subdev->rom_region() != nullptr && subdev->shortname() != nullptr && subdev->shortname()[0] != '\0') + if (subdev->owner() == device && subdev->rom_region() != nullptr && !subdev->shortname().empty()) { if (device_map.insert(subdev->shortname()).second) { - if (core_strwildcmp(gamename, subdev->shortname()) == 0) + if (core_strwildcmp(gamename, subdev->shortname().c_str()) == 0) { matched++; @@ -954,11 +954,11 @@ void cli_frontend::verifyroms(const char *gamename) { // output the summary of the audit std::string summary_string; - auditor.summarize(subdev->shortname(),&summary_string); + auditor.summarize(subdev->shortname().c_str(),&summary_string); osd_printf_info("%s", summary_string.c_str()); // display information about what we discovered - osd_printf_info("romset %s ", subdev->shortname()); + osd_printf_info("romset %s ", subdev->shortname().c_str()); // switch off of the result switch (summary) diff --git a/src/emu/debug/dvbpoints.cpp b/src/emu/debug/dvbpoints.cpp index b72c0081cf2..0aff9532d27 100644 --- a/src/emu/debug/dvbpoints.cpp +++ b/src/emu/debug/dvbpoints.cpp @@ -134,7 +134,7 @@ void debug_view_breakpoints::enumerate_sources() for (device_disasm_interface *dasm = iter.first(); dasm != nullptr; dasm = iter.next()) { std::string name; - strprintf(name, "%s '%s'", dasm->device().name(), dasm->device().tag().c_str()); + strprintf(name, "%s '%s'", dasm->device().name().c_str(), dasm->device().tag().c_str()); m_source_list.append(*global_alloc(debug_view_source(name.c_str(), &dasm->device()))); } diff --git a/src/emu/debug/dvdisasm.cpp b/src/emu/debug/dvdisasm.cpp index 6cf0a5d095d..ade61501c8a 100644 --- a/src/emu/debug/dvdisasm.cpp +++ b/src/emu/debug/dvdisasm.cpp @@ -99,7 +99,7 @@ void debug_view_disasm::enumerate_sources() std::string name; for (device_disasm_interface *dasm = iter.first(); dasm != nullptr; dasm = iter.next()) { - strprintf(name,"%s '%s'", dasm->device().name(), dasm->device().tag().c_str()); + strprintf(name,"%s '%s'", dasm->device().name().c_str(), dasm->device().tag().c_str()); m_source_list.append(*global_alloc(debug_view_disasm_source(name.c_str(), dasm->device()))); } diff --git a/src/emu/debug/dvmemory.cpp b/src/emu/debug/dvmemory.cpp index 8fab24d6ccb..04fab76b50d 100644 --- a/src/emu/debug/dvmemory.cpp +++ b/src/emu/debug/dvmemory.cpp @@ -142,7 +142,7 @@ void debug_view_memory::enumerate_sources() if (memintf->has_space(spacenum)) { address_space &space = memintf->space(spacenum); - strprintf(name,"%s '%s' %s space memory", memintf->device().name(), memintf->device().tag().c_str(), space.name()); + strprintf(name,"%s '%s' %s space memory", memintf->device().name().c_str(), memintf->device().tag().c_str(), space.name()); m_source_list.append(*global_alloc(debug_view_memory_source(name.c_str(), space))); } diff --git a/src/emu/debug/dvstate.cpp b/src/emu/debug/dvstate.cpp index a761a7d0cbb..ec77c7d3626 100644 --- a/src/emu/debug/dvstate.cpp +++ b/src/emu/debug/dvstate.cpp @@ -78,7 +78,7 @@ void debug_view_state::enumerate_sources() std::string name; for (device_state_interface *state = iter.first(); state != nullptr; state = iter.next()) { - strprintf(name,"%s '%s'", state->device().name(), state->device().tag().c_str()); + strprintf(name,"%s '%s'", state->device().name().c_str(), state->device().tag().c_str()); m_source_list.append(*global_alloc(debug_view_state_source(name.c_str(), state->device()))); } diff --git a/src/emu/debug/dvwpoints.cpp b/src/emu/debug/dvwpoints.cpp index 9a184ee0cc4..cc6742acf1c 100644 --- a/src/emu/debug/dvwpoints.cpp +++ b/src/emu/debug/dvwpoints.cpp @@ -155,7 +155,7 @@ void debug_view_watchpoints::enumerate_sources() for (device_disasm_interface *dasm = iter.first(); dasm != nullptr; dasm = iter.next()) { std::string name; - strprintf(name, "%s '%s'", dasm->device().name(), dasm->device().tag().c_str()); + strprintf(name, "%s '%s'", dasm->device().name().c_str(), dasm->device().tag().c_str()); m_source_list.append(*global_alloc(debug_view_source(name.c_str(), &dasm->device()))); } diff --git a/src/emu/devcpu.cpp b/src/emu/devcpu.cpp index 068bb8b1b8a..9cb2f5eef38 100644 --- a/src/emu/devcpu.cpp +++ b/src/emu/devcpu.cpp @@ -20,7 +20,7 @@ // cpu_device - constructor //------------------------------------------------- -cpu_device::cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +cpu_device::cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_execute_interface(mconfig, *this), device_memory_interface(mconfig, *this), diff --git a/src/emu/devcpu.h b/src/emu/devcpu.h index b4898615e53..6c0f379d50e 100644 --- a/src/emu/devcpu.h +++ b/src/emu/devcpu.h @@ -68,7 +68,7 @@ class cpu_device : public device_t, protected: // construction/destruction - cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual ~cpu_device(); }; diff --git a/src/emu/devfind.h b/src/emu/devfind.h index cd56404184a..2a6721eb66b 100644 --- a/src/emu/devfind.h +++ b/src/emu/devfind.h @@ -116,7 +116,7 @@ public: this->m_target = dynamic_cast<_DeviceClass *>(device); if (device != nullptr && this->m_target == nullptr) { - this->printf_warning("Device '%s' found but is of incorrect type (actual type is %s)\n", this->m_tag.c_str(), device->name()); + this->printf_warning("Device '%s' found but is of incorrect type (actual type is %s)\n", this->m_tag.c_str(), device->name().c_str()); } return this->report_missing(this->m_target != nullptr, "device", _Required); } diff --git a/src/emu/device.cpp b/src/emu/device.cpp index 217a47b8bbd..cae2e516a83 100644 --- a/src/emu/device.cpp +++ b/src/emu/device.cpp @@ -24,7 +24,7 @@ // from the provided config //------------------------------------------------- -device_t::device_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::device_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : m_type(type), m_name(name), m_shortname(shortname), diff --git a/src/emu/device.h b/src/emu/device.h index bf522077d25..2685e3ca1d6 100644 --- a/src/emu/device.h +++ b/src/emu/device.h @@ -105,19 +105,19 @@ class device_t : public delegate_late_bind protected: // construction/destruction - device_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(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); public: virtual ~device_t(); // getters running_machine &machine() const { /*assert(m_machine != NULL);*/ return *m_machine; } std::string tag() const { return m_tag; } - const char *basetag() const { return m_basetag.c_str(); } + std::string basetag() const { return m_basetag; } device_type type() const { return m_type; } - const char *name() const { return m_name.c_str(); } - const char *shortname() const { return m_shortname.c_str(); } - const char *searchpath() const { return m_searchpath.c_str(); } - const char *source() const { return m_source.c_str(); } + std::string name() const { return m_name; } + std::string shortname() const { return m_shortname; } + std::string searchpath() const { return m_searchpath; } + std::string source() const { return m_source; } device_t *owner() const { return m_owner; } device_t *next() const { return m_next; } UINT32 configured_clock() const { return m_configured_clock; } @@ -192,9 +192,9 @@ public: // state saving interfaces template - void ATTR_COLD save_item(_ItemType &value, const char *valname, int index = 0) { assert(m_save != nullptr); m_save->save_item(this, name(), tag(), index, value, valname); } + void ATTR_COLD save_item(_ItemType &value, std::string valname, int index = 0) { assert(m_save != nullptr); m_save->save_item(this, name(), tag(), index, value, valname); } template - void ATTR_COLD save_pointer(_ItemType *value, const char *valname, UINT32 count, int index = 0) { assert(m_save != nullptr); m_save->save_pointer(this, name(), tag(), index, value, valname, count); } + void ATTR_COLD save_pointer(_ItemType *value, std::string valname, UINT32 count, int index = 0) { assert(m_save != nullptr); m_save->save_pointer(this, name(), tag(), index, value, valname, count); } // debugging device_debug *debug() const { return m_debug.get(); } diff --git a/src/emu/diserial.cpp b/src/emu/diserial.cpp index 276fdcfb64c..705e27f7795 100644 --- a/src/emu/diserial.cpp +++ b/src/emu/diserial.cpp @@ -58,7 +58,7 @@ device_serial_interface::~device_serial_interface() void device_serial_interface::register_save_state(save_manager &save, device_t *device) { - const char *module = device->name(); + std::string module = device->name(); std::string tag = device->tag(); save.save_item(device, module, tag, 0, NAME(m_df_start_bit_count)); save.save_item(device, module, tag, 0, NAME(m_df_word_length)); diff --git a/src/emu/disound.cpp b/src/emu/disound.cpp index c99d1bb1b6d..b12211e569c 100644 --- a/src/emu/disound.cpp +++ b/src/emu/disound.cpp @@ -245,7 +245,7 @@ void device_sound_interface::interface_validity_check(validity_checker &valid) c // if it's not a speaker or a sound device, error const device_sound_interface *sound; if (target != nullptr && target->type() != SPEAKER && !target->interface(sound)) - osd_printf_error("Attempting to route sound to a non-sound device '%s' (%s)\n", route->m_target.c_str(), target->name()); + osd_printf_error("Attempting to route sound to a non-sound device '%s' (%s)\n", route->m_target.c_str(), target->name().c_str()); } } diff --git a/src/emu/emucore.cpp b/src/emu/emucore.cpp index d4466cd09fc..3bf6193d3b7 100644 --- a/src/emu/emucore.cpp +++ b/src/emu/emucore.cpp @@ -82,7 +82,7 @@ void report_bad_cast(const std::type_info &src_type, const std::type_info &dst_t void report_bad_device_cast(const device_t *dev, const std::type_info &src_type, const std::type_info &dst_type) { throw emu_fatalerror("Error: bad downcast<> or device<>. Tried to convert the device %s (%s) of type %s to a %s, which are incompatible.\n", - dev->tag().c_str(), dev->name(), src_type.name(), dst_type.name()); + dev->tag().c_str(), dev->name().c_str(), src_type.name(), dst_type.name()); } void fatalerror(const char *format, ...) diff --git a/src/emu/image.cpp b/src/emu/image.cpp index d49c395bbdf..b7c1efbc9e4 100644 --- a/src/emu/image.cpp +++ b/src/emu/image.cpp @@ -55,7 +55,7 @@ image_manager::image_manager(running_machine &machine) unload_all(); fatalerror_exitcode(machine, MAMERR_DEVICE, "Device %s load (%s) failed: %s", - image->device().name(), + image->device().name().c_str(), image_basename.c_str(), image_err.c_str()); } @@ -236,7 +236,7 @@ void image_manager::postdevice_init() unload_all(); fatalerror_exitcode(machine(), MAMERR_DEVICE, "Device %s load failed: %s", - image->device().name(), + image->device().name().c_str(), image_err.c_str()); } } diff --git a/src/emu/info.cpp b/src/emu/info.cpp index 28590bd2857..773c0d6126e 100644 --- a/src/emu/info.cpp +++ b/src/emu/info.cpp @@ -341,7 +341,7 @@ void info_xml_creator::output_one_device(device_t &device, const char *devtag) // start to output info fprintf(m_output, "\t<%s", emulator_info::get_xml_top()); - fprintf(m_output, " name=\"%s\"", xml_normalize_string(device.shortname())); + fprintf(m_output, " name=\"%s\"", xml_normalize_string(device.shortname().c_str())); std::string src(device.source()); strreplace(src,"../", ""); fprintf(m_output, " sourcefile=\"%s\"", xml_normalize_string(src.c_str())); @@ -349,7 +349,7 @@ void info_xml_creator::output_one_device(device_t &device, const char *devtag) fprintf(m_output, " runnable=\"no\""); output_sampleof(); fprintf(m_output, ">\n"); - fprintf(m_output, "\t\t%s\n", xml_normalize_string(device.name())); + fprintf(m_output, "\t\t%s\n", xml_normalize_string(device.name().c_str())); output_rom(device); @@ -394,7 +394,7 @@ void info_xml_creator::output_devices() device_iterator deviter(m_drivlist.config().root_device()); for (device_t *device = deviter.first(); device != nullptr; device = deviter.next()) { - if (device->owner() != nullptr && device->shortname()!= nullptr && device->shortname()[0]!='\0') + if (device->owner() != nullptr && !device->shortname().empty()) { if (shortnames.insert(device->shortname()).second) output_one_device(*device, device->tag().c_str()); @@ -424,7 +424,7 @@ void info_xml_creator::output_devices() device_iterator deviter2(*dev); for (device_t *device = deviter2.first(); device != nullptr; device = deviter2.next()) { - if (device->owner() == dev && device->shortname()!= nullptr && device->shortname()[0]!='\0') + if (device->owner() == dev && !device->shortname().empty()) { if (shortnames.insert(device->shortname()).second) output_one_device(*device, device->tag().c_str()); @@ -447,8 +447,8 @@ void info_xml_creator::output_device_roms() { device_iterator deviter(m_drivlist.config().root_device()); for (device_t *device = deviter.first(); device != nullptr; device = deviter.next()) - if (device->owner() != nullptr && device->shortname()!= nullptr && device->shortname()[0]!='\0') - fprintf(m_output, "\t\t\n", xml_normalize_string(device->shortname())); + if (device->owner() != nullptr && !device->shortname().empty()) + fprintf(m_output, "\t\t\n", xml_normalize_string(device->shortname().c_str())); } @@ -648,7 +648,7 @@ void info_xml_creator::output_chips(device_t &device, const char *root_tag) fprintf(m_output, "\t\tdevice().name())); + fprintf(m_output, " name=\"%s\"", xml_normalize_string(exec->device().name().c_str())); fprintf(m_output, " clock=\"%d\"", exec->device().clock()); fprintf(m_output, "/>\n"); } @@ -666,7 +666,7 @@ void info_xml_creator::output_chips(device_t &device, const char *root_tag) fprintf(m_output, "\t\tdevice().name())); + fprintf(m_output, " name=\"%s\"", xml_normalize_string(sound->device().name().c_str())); if (sound->device().clock() != 0) fprintf(m_output, " clock=\"%d\"", sound->device().clock()); fprintf(m_output, "/>\n"); @@ -1304,7 +1304,7 @@ void info_xml_creator::output_slots(device_t &device, const char *root_tag) fprintf(m_output, "\t\t\tname())); - fprintf(m_output, " devname=\"%s\"", xml_normalize_string(dev->shortname())); + fprintf(m_output, " devname=\"%s\"", xml_normalize_string(dev->shortname().c_str())); if (slot->default_option() != nullptr && strcmp(slot->default_option(),option->name())==0) fprintf(m_output, " default=\"yes\""); fprintf(m_output, "/>\n"); diff --git a/src/emu/machine.cpp b/src/emu/machine.cpp index 22254278ef7..72c6a98bc3e 100644 --- a/src/emu/machine.cpp +++ b/src/emu/machine.cpp @@ -1092,7 +1092,7 @@ void running_machine::start_all_devices() device->set_machine(*this); // now start the device - osd_printf_verbose("Starting %s '%s'\n", device->name(), device->tag().c_str()); + osd_printf_verbose("Starting %s '%s'\n", device->name().c_str(), device->tag().c_str()); device->start(); } diff --git a/src/emu/romload.cpp b/src/emu/romload.cpp index d52dbb6d97f..da47851b40b 100644 --- a/src/emu/romload.cpp +++ b/src/emu/romload.cpp @@ -1420,7 +1420,7 @@ void rom_load_manager::process_region_list() #endif /* now process the entries in the region */ - process_rom_entries(device->shortname(), region, region + 1, device, FALSE); + process_rom_entries(device->shortname().c_str(), region, region + 1, device, FALSE); } else if (ROMREGION_ISDISKDATA(region)) process_disk_entries(regiontag.c_str(), region, region + 1, nullptr); diff --git a/src/emu/save.cpp b/src/emu/save.cpp index 0a6cffd3983..cee8061f43a 100644 --- a/src/emu/save.cpp +++ b/src/emu/save.cpp @@ -146,16 +146,16 @@ void save_manager::register_postload(save_prepost_delegate func) // memory //------------------------------------------------- -void save_manager::save_memory(device_t *device, const char *module, std::string tag, UINT32 index, const char *name, void *val, UINT32 valsize, UINT32 valcount) +void save_manager::save_memory(device_t *device, std::string module, std::string tag, UINT32 index, std::string name, void *val, UINT32 valsize, UINT32 valcount) { assert(valsize == 1 || valsize == 2 || valsize == 4 || valsize == 8); // check for invalid timing if (!m_reg_allowed) { - machine().logerror("Attempt to register save state entry after state registration is closed!\nModule %s tag %s name %s\n", module, tag.c_str(), name); + machine().logerror("Attempt to register save state entry after state registration is closed!\nModule %s tag %s name %s\n", module.c_str(), tag.c_str(), name.c_str()); if (machine().system().flags & MACHINE_SUPPORTS_SAVE) - fatalerror("Attempt to register save state entry after state registration is closed!\nModule %s tag %s name %s\n", module, tag.c_str(), name); + fatalerror("Attempt to register save state entry after state registration is closed!\nModule %s tag %s name %s\n", module.c_str(), tag.c_str(), name.c_str()); m_illegal_regs++; return; } @@ -163,9 +163,9 @@ void save_manager::save_memory(device_t *device, const char *module, std::string // create the full name std::string totalname; if (!tag.empty()) - strprintf(totalname, "%s/%s/%X/%s", module, tag.c_str(), index, name); + strprintf(totalname, "%s/%s/%X/%s", module.c_str(), tag.c_str(), index, name.c_str()); else - strprintf(totalname, "%s/%X/%s", module, index, name); + strprintf(totalname, "%s/%X/%s", module.c_str(), index, name.c_str()); // look for duplicates and an entry to insert in front of state_entry *insert_after = nullptr; @@ -182,7 +182,7 @@ void save_manager::save_memory(device_t *device, const char *module, std::string } // insert us into the list - m_entry_list.insert_after(*global_alloc(state_entry(val, totalname.c_str(), device, module, tag, index, valsize, valcount)), insert_after); + m_entry_list.insert_after(*global_alloc(state_entry(val, totalname.c_str(), device, module.c_str(), tag, index, valsize, valcount)), insert_after); } @@ -418,7 +418,7 @@ save_manager::state_callback::state_callback(save_prepost_delegate callback) // state_entry - constructor //------------------------------------------------- -state_entry::state_entry(void *data, const char *name, device_t *device, const char *module, std::string tag, int index, UINT8 size, UINT32 count) +state_entry::state_entry(void *data, std::string name, device_t *device, std::string module, std::string tag, int index, UINT8 size, UINT32 count) : m_next(nullptr), m_data(data), m_name(name), diff --git a/src/emu/save.h b/src/emu/save.h index e461749102b..d3a02eda393 100644 --- a/src/emu/save.h +++ b/src/emu/save.h @@ -51,7 +51,7 @@ typedef delegate save_prepost_delegate; // use this as above, but also to declare that std::vector is safe as well #define ALLOW_SAVE_TYPE_AND_ARRAY(TYPE) \ ALLOW_SAVE_TYPE(TYPE); \ - template<> inline void save_manager::save_item(device_t *device, const char *module, std::string tag, int index, std::vector &value, const char *name) { save_memory(device, module, tag, index, name, &value[0], sizeof(TYPE), value.size()); } + template<> inline void save_manager::save_item(device_t *device, std::string module, std::string tag, int index, std::vector &value, std::string name) { save_memory(device, module, tag, index, name, &value[0], sizeof(TYPE), value.size()); } //************************************************************************** @@ -62,7 +62,7 @@ class state_entry { public: // construction/destruction - state_entry(void *data, const char *name, device_t *device, const char *module, std::string tag, int index, UINT8 size, UINT32 count); + state_entry(void *data, std::string name, device_t *device, std::string module, std::string tag, int index, UINT8 size, UINT32 count); // getters state_entry *next() const { return m_next; } @@ -111,11 +111,11 @@ public: void dispatch_postload(); // generic memory registration - void save_memory(device_t *device, const char *module, std::string tag, UINT32 index, const char *name, void *val, UINT32 valsize, UINT32 valcount = 1); + void save_memory(device_t *device, std::string module, std::string tag, UINT32 index, std::string name, void *val, UINT32 valsize, UINT32 valcount = 1); // templatized wrapper for general objects template - void save_item(device_t *device, const char *module, std::string tag, int index, _ItemType &value, const char *valname) + void save_item(device_t *device, std::string module, std::string tag, int index, _ItemType &value, std::string valname) { if (type_checker<_ItemType>::is_pointer) throw emu_fatalerror("Called save_item on a pointer with no count!"); if (!type_checker<_ItemType>::is_atom) throw emu_fatalerror("Called save_item on a non-fundamental type!"); @@ -124,7 +124,7 @@ public: // templatized wrapper for 1-dimensional arrays template - void save_item(device_t *device, const char *module, std::string tag, int index, _ItemType (&value)[N], const char *valname) + void save_item(device_t *device, std::string module, std::string tag, int index, _ItemType (&value)[N], std::string valname) { if (!type_checker<_ItemType>::is_atom) throw emu_fatalerror("Called save_item on a non-fundamental type!"); save_memory(device, module, tag, index, valname, &value[0], sizeof(value[0]), N); @@ -132,7 +132,7 @@ public: // templatized wrapper for 2-dimensional arrays template - void save_item(device_t *device, const char *module, std::string tag, int index, _ItemType (&value)[M][N], const char *valname) + void save_item(device_t *device, std::string module, std::string tag, int index, _ItemType (&value)[M][N], std::string valname) { if (!type_checker<_ItemType>::is_atom) throw emu_fatalerror("Called save_item on a non-fundamental type!"); save_memory(device, module, tag, index, valname, &value[0][0], sizeof(value[0][0]), M * N); @@ -140,7 +140,7 @@ public: // templatized wrapper for pointers template - void save_pointer(device_t *device, const char *module, std::string tag, int index, _ItemType *value, const char *valname, UINT32 count) + void save_pointer(device_t *device, std::string module, std::string tag, int index, _ItemType *value, std::string valname, UINT32 count) { if (!type_checker<_ItemType>::is_atom) throw emu_fatalerror("Called save_item on a non-fundamental type!"); save_memory(device, module, tag, index, valname, value, sizeof(*value), count); @@ -148,9 +148,9 @@ public: // global memory registration template - void save_item(_ItemType &value, const char *valname, int index = 0) { save_item(nullptr, "global", std::string(), index, value, valname); } + void save_item(_ItemType &value, std::string valname, int index = 0) { save_item(nullptr, "global", std::string(), index, value, valname); } template - void save_pointer(_ItemType *value, const char *valname, UINT32 count, int index = 0) { save_pointer(nullptr, "global", std::string(), index, value, valname, count); } + void save_pointer(_ItemType *value, std::string valname, UINT32 count, int index = 0) { save_pointer(nullptr, "global", std::string(), index, value, valname, count); } // file processing static save_error check_file(running_machine &machine, emu_file &file, const char *gamename, void (CLIB_DECL *errormsg)(const char *fmt, ...)); @@ -218,25 +218,25 @@ ALLOW_SAVE_TYPE_AND_ARRAY(rgb_t) //------------------------------------------------- template<> -inline void save_manager::save_item(device_t *device, const char *module, std::string tag, int index, bitmap_ind8 &value, const char *name) +inline void save_manager::save_item(device_t *device, std::string module, std::string tag, int index, bitmap_ind8 &value, std::string name) { save_memory(device, module, tag, index, name, &value.pix(0), value.bpp() / 8, value.rowpixels() * value.height()); } template<> -inline void save_manager::save_item(device_t *device, const char *module, std::string tag, int index, bitmap_ind16 &value, const char *name) +inline void save_manager::save_item(device_t *device, std::string module, std::string tag, int index, bitmap_ind16 &value, std::string name) { save_memory(device, module, tag, index, name, &value.pix(0), value.bpp() / 8, value.rowpixels() * value.height()); } template<> -inline void save_manager::save_item(device_t *device, const char *module, std::string tag, int index, bitmap_ind32 &value, const char *name) +inline void save_manager::save_item(device_t *device, std::string module, std::string tag, int index, bitmap_ind32 &value, std::string name) { save_memory(device, module, tag, index, name, &value.pix(0), value.bpp() / 8, value.rowpixels() * value.height()); } template<> -inline void save_manager::save_item(device_t *device, const char *module, std::string tag, int index, bitmap_rgb32 &value, const char *name) +inline void save_manager::save_item(device_t *device, std::string module, std::string tag, int index, bitmap_rgb32 &value, std::string name) { save_memory(device, module, tag, index, name, &value.pix(0), value.bpp() / 8, value.rowpixels() * value.height()); } @@ -247,11 +247,11 @@ inline void save_manager::save_item(device_t *device, const char *module, std::s //------------------------------------------------- template<> -inline void save_manager::save_item(device_t *device, const char *module, std::string tag, int index, attotime &value, const char *name) +inline void save_manager::save_item(device_t *device, std::string module, std::string tag, int index, attotime &value, std::string name) { - std::string tempstr = std::string(name).append(".attoseconds"); + std::string tempstr = name + ".attoseconds"; save_memory(device, module, tag, index, tempstr.c_str(), &value.m_attoseconds, sizeof(value.m_attoseconds)); - tempstr.assign(name).append(".seconds"); + tempstr = name + ".seconds"; save_memory(device, module, tag, index, tempstr.c_str(), &value.m_seconds, sizeof(value.m_seconds)); } diff --git a/src/emu/sound.cpp b/src/emu/sound.cpp index bf0aa97826e..7727b1a6e06 100644 --- a/src/emu/sound.cpp +++ b/src/emu/sound.cpp @@ -167,13 +167,13 @@ const char *sound_stream::input_name(int inputnum, std::string &str) const { // start with our device name and tag assert(inputnum >= 0 && inputnum < m_input.size()); - strprintf(str, "%s '%s': ", m_device.name(), m_device.tag().c_str()); + strprintf(str, "%s '%s': ", m_device.name().c_str(), m_device.tag().c_str()); // if we have a source, indicate where the sound comes from by device name and tag if (m_input[inputnum].m_source != nullptr && m_input[inputnum].m_source->m_stream != nullptr) { device_t &source = m_input[inputnum].m_source->m_stream->device(); - strcatprintf(str, "%s '%s'", source.name(), source.tag().c_str()); + strcatprintf(str, "%s '%s'", source.name().c_str(), source.tag().c_str()); // get the sound interface; if there is more than 1 output we need to figure out which one device_sound_interface *sound; diff --git a/src/emu/sprite.h b/src/emu/sprite.h index 81f5b8e4b1c..e0668848335 100644 --- a/src/emu/sprite.h +++ b/src/emu/sprite.h @@ -85,8 +85,8 @@ class sprite_device : public device_t protected: // construction/destruction - only for subclasses - sprite_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file, int dirty_granularity = 3) - : device_t(mconfig, type, name, tag, owner, 0, shortname, file), + sprite_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, std::string shortname, std::string source, int dirty_granularity = 3) + : device_t(mconfig, type, name, tag, owner, 0, shortname, source), m_xorigin(0), m_yorigin(0), m_spriteram(nullptr), diff --git a/src/emu/ui/devopt.cpp b/src/emu/ui/devopt.cpp index 18b73c6dce6..342bf853b4c 100644 --- a/src/emu/ui/devopt.cpp +++ b/src/emu/ui/devopt.cpp @@ -47,7 +47,7 @@ void ui_menu_device_config::populate() dev = const_cast(machine().config()).device_add(&machine().config().root_device(), m_option->name(), m_option->devtype(), 0); - strcatprintf(str,"Device: %s\n", dev->name()); + strcatprintf(str,"Device: %s\n", dev->name().c_str()); if (!m_mounted) str.append("\nIf you select this option, the following items will be enabled:\n"); else @@ -69,11 +69,11 @@ void ui_menu_device_config::populate() // count how many identical CPUs we have int count = 1; - const char *name = exec->device().name(); + std::string name = exec->device().name(); execute_interface_iterator execinneriter(*dev); for (device_execute_interface *scan = execinneriter.first(); scan != nullptr; scan = execinneriter.next()) { - if (exec->device().type() == scan->device().type() && strcmp(name, scan->device().name()) == 0 && exec->device().clock() == scan->device().clock()) + if (exec->device().type() == scan->device().type() && name==scan->device().name() && exec->device().clock() == scan->device().clock()) if (exectags.insert(scan->device().tag()).second) count++; } @@ -83,7 +83,7 @@ void ui_menu_device_config::populate() strcatprintf(str," %d" UTF8_MULTIPLY, count); else str.append(" "); - str.append(name); + str += name; // display clock in kHz or MHz if (clock >= 1000000) diff --git a/src/emu/ui/ui.cpp b/src/emu/ui/ui.cpp index 989905ba550..04fdb7ca436 100644 --- a/src/emu/ui/ui.cpp +++ b/src/emu/ui/ui.cpp @@ -1167,11 +1167,11 @@ std::string &ui_manager::game_info_astring(std::string &str) // count how many identical CPUs we have int count = 1; - const char *name = exec->device().name(); + std::string name = exec->device().name(); execute_interface_iterator execinneriter(machine().root_device()); for (device_execute_interface *scan = execinneriter.first(); scan != nullptr; scan = execinneriter.next()) { - if (exec->device().type() == scan->device().type() && strcmp(name, scan->device().name()) == 0 && exec->device().clock() == scan->device().clock()) + if (exec->device().type() == scan->device().type() && name==scan->device().name() && exec->device().clock() == scan->device().clock()) if (exectags.insert(scan->device().tag()).second) count++; } @@ -1179,7 +1179,7 @@ std::string &ui_manager::game_info_astring(std::string &str) // if more than one, prepend a #x in front of the CPU name if (count > 1) strcatprintf(str, "%d" UTF8_MULTIPLY, count); - str.append(name); + str += name; // display clock in kHz or MHz if (clock >= 1000000) diff --git a/src/emu/validity.cpp b/src/emu/validity.cpp index 23aba1dfd04..fa8c8c58ef1 100644 --- a/src/emu/validity.cpp +++ b/src/emu/validity.cpp @@ -979,18 +979,18 @@ void validity_checker::validate_devices() m_current_device = device; // validate the device tag - validate_tag(device->basetag()); + validate_tag(device->basetag().c_str()); // look for duplicates if (!device_map.insert(device->tag()).second) osd_printf_error("Multiple devices with the same tag '%s' defined\n", device->tag().c_str()); // all devices must have a shortname - if (strcmp(device->shortname(), "") == 0) + if (device->shortname().empty()) osd_printf_error("Device does not have short name defined\n"); // all devices must have a source file defined - if (strcmp(device->source(), "") == 0) + if (device->source().empty()) osd_printf_error("Device does not have source file location defined\n"); // check for device-specific validity check @@ -1017,9 +1017,9 @@ void validity_checker::validate_devices() if (!device->configured()) device->config_complete(); - if (strcmp(dev->shortname(), "") == 0) { + if (dev->shortname().empty()) { if (slot_device_map.insert(dev->name()).second) - osd_printf_error("Device '%s' is slot cart device but does not have short name defined\n",dev->name()); + osd_printf_error("Device '%s' is slot cart device but does not have short name defined\n",dev->name().c_str()); } const_cast(*m_current_config).device_remove(&m_current_config->root_device(), temptag.c_str()); diff --git a/src/emu/video/vector.cpp b/src/emu/video/vector.cpp index 6ea77d2edb1..b832a0d00c3 100644 --- a/src/emu/video/vector.cpp +++ b/src/emu/video/vector.cpp @@ -128,7 +128,7 @@ static render_texture *get_vector_texture(float dx, float dy, float intensity) // device type definition const device_type VECTOR = &device_creator; -vector_device::vector_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +vector_device::vector_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), m_vector_list(nullptr), diff --git a/src/emu/video/vector.h b/src/emu/video/vector.h index f1fb3539708..38436047bee 100644 --- a/src/emu/video/vector.h +++ b/src/emu/video/vector.h @@ -37,7 +37,7 @@ class vector_device : public device_t, public device_video_interface public: // construction/destruction vector_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - vector_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + vector_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void clear_list(); diff --git a/src/mame/audio/cage.cpp b/src/mame/audio/cage.cpp index 522701d210a..d561f6dada0 100644 --- a/src/mame/audio/cage.cpp +++ b/src/mame/audio/cage.cpp @@ -118,7 +118,7 @@ atari_cage_device::atari_cage_device(const machine_config &mconfig, std::string { } -atari_cage_device::atari_cage_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +atari_cage_device::atari_cage_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_irqhandler(*this) { diff --git a/src/mame/audio/cage.h b/src/mame/audio/cage.h index 97c70bd0d43..22ee5f6c2cf 100644 --- a/src/mame/audio/cage.h +++ b/src/mame/audio/cage.h @@ -25,7 +25,7 @@ class atari_cage_device : public device_t public: // construction/destruction atari_cage_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - atari_cage_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + atari_cage_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); static void static_set_speedup(device_t &device, offs_t speedup) { downcast(device).m_speedup = speedup; } template static devcb_base &set_irqhandler_callback(device_t &device, _Object object) { return downcast(device).m_irqhandler.set_callback(object); } diff --git a/src/mame/audio/dcs.cpp b/src/mame/audio/dcs.cpp index 6669ad245e5..a77c3c34d8f 100644 --- a/src/mame/audio/dcs.cpp +++ b/src/mame/audio/dcs.cpp @@ -785,7 +785,7 @@ void dcs_audio_device::dcs_register_state() // dcs_audio_device - constructor //------------------------------------------------- -dcs_audio_device::dcs_audio_device(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 rev) : +dcs_audio_device::dcs_audio_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, int rev) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_cpu(nullptr), m_program(nullptr), @@ -2442,7 +2442,7 @@ machine_config_constructor dcs_audio_wpc_device::device_mconfig_additions() cons // dcs2_audio_device - constructor //------------------------------------------------- -dcs2_audio_device::dcs2_audio_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +dcs2_audio_device::dcs2_audio_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : dcs_audio_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/mame/audio/dcs.h b/src/mame/audio/dcs.h index b436f2709bb..f118b71dc77 100644 --- a/src/mame/audio/dcs.h +++ b/src/mame/audio/dcs.h @@ -23,7 +23,7 @@ class dcs_audio_device : public device_t { public: // construction/destruction - dcs_audio_device(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 rev = 1); + dcs_audio_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source, int rev = 1); // for dcs2 (int dram_in_mb, offs_t polling_offset) static void static_set_dram_in_mb(device_t &device, int dram_in_mb) { downcast(device).m_dram_in_mb = dram_in_mb; } @@ -276,7 +276,7 @@ class dcs2_audio_device : public dcs_audio_device { public: // construction/destruction - dcs2_audio_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + dcs2_audio_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); protected: // device-level overrides diff --git a/src/mame/audio/exidy.cpp b/src/mame/audio/exidy.cpp index 8f68642efa5..cf9fb631df4 100644 --- a/src/mame/audio/exidy.cpp +++ b/src/mame/audio/exidy.cpp @@ -211,7 +211,7 @@ exidy_sound_device::exidy_sound_device(const machine_config &mconfig, std::strin { } -exidy_sound_device::exidy_sound_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +exidy_sound_device::exidy_sound_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), m_riot_irq_state(0), diff --git a/src/mame/audio/exidy.h b/src/mame/audio/exidy.h index 9f49ecaa567..5bf5c872355 100644 --- a/src/mame/audio/exidy.h +++ b/src/mame/audio/exidy.h @@ -38,7 +38,7 @@ class exidy_sound_device : public device_t, { public: exidy_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - exidy_sound_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + exidy_sound_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); ~exidy_sound_device() {} DECLARE_READ8_MEMBER( sh6840_r ); diff --git a/src/mame/audio/irem.cpp b/src/mame/audio/irem.cpp index 3e2a55cd006..a66c3cc0dc2 100644 --- a/src/mame/audio/irem.cpp +++ b/src/mame/audio/irem.cpp @@ -16,7 +16,7 @@ const device_type IREM_M62_AUDIO = &device_creator; const device_type IREM_M52_SOUNDC_AUDIO = &device_creator; const device_type IREM_M52_LARGE_AUDIO = &device_creator; -irem_audio_device::irem_audio_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +irem_audio_device::irem_audio_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_port1(0), m_port2(0) diff --git a/src/mame/audio/irem.h b/src/mame/audio/irem.h index 6b1b89f891a..4d2b65c5b44 100644 --- a/src/mame/audio/irem.h +++ b/src/mame/audio/irem.h @@ -7,7 +7,7 @@ class irem_audio_device : public device_t { public: - irem_audio_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + irem_audio_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); ~irem_audio_device() {} DECLARE_WRITE8_MEMBER( cmd_w ); diff --git a/src/mame/audio/leland.cpp b/src/mame/audio/leland.cpp index 34696b3d6ae..430be3406c2 100644 --- a/src/mame/audio/leland.cpp +++ b/src/mame/audio/leland.cpp @@ -347,7 +347,7 @@ leland_80186_sound_device::leland_80186_sound_device(const machine_config &mconf m_type = TYPE_LELAND; } -leland_80186_sound_device::leland_80186_sound_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +leland_80186_sound_device::leland_80186_sound_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_dac1(*this, "dac1"), m_dac2(*this, "dac2"), diff --git a/src/mame/audio/lynx.cpp b/src/mame/audio/lynx.cpp index ca8af4d5eda..151c6b5b1de 100644 --- a/src/mame/audio/lynx.cpp +++ b/src/mame/audio/lynx.cpp @@ -103,7 +103,7 @@ lynx_sound_device::lynx_sound_device(const machine_config &mconfig, std::string m_timer_delegate = lynx_sound_timer_delegate(); } -lynx_sound_device::lynx_sound_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +lynx_sound_device::lynx_sound_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this) { diff --git a/src/mame/audio/lynx.h b/src/mame/audio/lynx.h index e8c38daee57..60bd824e474 100644 --- a/src/mame/audio/lynx.h +++ b/src/mame/audio/lynx.h @@ -29,7 +29,7 @@ class lynx_sound_device : public device_t, public device_sound_interface { public: - lynx_sound_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + lynx_sound_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); lynx_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER(read); diff --git a/src/mame/audio/pleiads.cpp b/src/mame/audio/pleiads.cpp index 36eaafa1b00..e08abbe5811 100644 --- a/src/mame/audio/pleiads.cpp +++ b/src/mame/audio/pleiads.cpp @@ -26,7 +26,7 @@ pleiads_sound_device::pleiads_sound_device(const machine_config &mconfig, std::s { } -pleiads_sound_device::pleiads_sound_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +pleiads_sound_device::pleiads_sound_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), m_channel(nullptr), diff --git a/src/mame/audio/pleiads.h b/src/mame/audio/pleiads.h index b802018971b..ce130572e74 100644 --- a/src/mame/audio/pleiads.h +++ b/src/mame/audio/pleiads.h @@ -45,7 +45,7 @@ class pleiads_sound_device : public device_t, { public: pleiads_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - pleiads_sound_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + pleiads_sound_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); ~pleiads_sound_device() {} DECLARE_WRITE8_MEMBER( control_a_w ); diff --git a/src/mame/audio/segasnd.cpp b/src/mame/audio/segasnd.cpp index 2b65cea25ed..c14a53300bb 100644 --- a/src/mame/audio/segasnd.cpp +++ b/src/mame/audio/segasnd.cpp @@ -239,7 +239,7 @@ MACHINE_CONFIG_END const device_type SEGAUSB = &device_creator; -usb_sound_device::usb_sound_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +usb_sound_device::usb_sound_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), m_ourcpu(*this, "ourcpu"), diff --git a/src/mame/audio/segasnd.h b/src/mame/audio/segasnd.h index 6814d77e6fb..980d6fc509d 100644 --- a/src/mame/audio/segasnd.h +++ b/src/mame/audio/segasnd.h @@ -115,7 +115,7 @@ class usb_sound_device : public device_t, public device_sound_interface { public: - usb_sound_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + usb_sound_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); usb_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); ~usb_sound_device() {} required_device m_ourcpu; /* CPU index of the 8035 */ diff --git a/src/mame/audio/tx1.cpp b/src/mame/audio/tx1.cpp index 95c6dc0f694..2ba3d72bf4b 100644 --- a/src/mame/audio/tx1.cpp +++ b/src/mame/audio/tx1.cpp @@ -59,7 +59,7 @@ tx1_sound_device::tx1_sound_device(const machine_config &mconfig, std::string ta { } -tx1_sound_device::tx1_sound_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +tx1_sound_device::tx1_sound_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), m_stream(nullptr), diff --git a/src/mame/includes/apollo.h b/src/mame/includes/apollo.h index f300aff3d0d..725f015a8d5 100644 --- a/src/mame/includes/apollo.h +++ b/src/mame/includes/apollo.h @@ -399,7 +399,7 @@ class apollo_graphics_15i : public device_t { public: apollo_graphics_15i(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - apollo_graphics_15i(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock, device_type type, const char *name, const char *shortname, const char *source); + apollo_graphics_15i(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock, device_type type, const char *name, std::string shortname, std::string source); ~apollo_graphics_15i(); UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/leland.h b/src/mame/includes/leland.h index c0b2a5dbdfc..f231a1a0b18 100644 --- a/src/mame/includes/leland.h +++ b/src/mame/includes/leland.h @@ -211,7 +211,7 @@ class leland_80186_sound_device : public device_t { public: leland_80186_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - leland_80186_sound_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + leland_80186_sound_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_WRITE16_MEMBER(peripheral_ctrl); diff --git a/src/mame/includes/tx1.h b/src/mame/includes/tx1.h index e4b6c70c96c..14c03676410 100644 --- a/src/mame/includes/tx1.h +++ b/src/mame/includes/tx1.h @@ -256,7 +256,7 @@ class tx1_sound_device : public device_t, { public: tx1_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - tx1_sound_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + tx1_sound_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); ~tx1_sound_device() {} DECLARE_READ8_MEMBER( pit8253_r ); diff --git a/src/mame/machine/applefdc.cpp b/src/mame/machine/applefdc.cpp index 399a951ea25..c439e7284e0 100644 --- a/src/mame/machine/applefdc.cpp +++ b/src/mame/machine/applefdc.cpp @@ -105,7 +105,7 @@ enum // ctor //------------------------------------------------- -applefdc_base_device::applefdc_base_device(applefdc_base_device::applefdc_t fdc_type, const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +applefdc_base_device::applefdc_base_device(applefdc_base_device::applefdc_t fdc_type, const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) { m_type = fdc_type; diff --git a/src/mame/machine/applefdc.h b/src/mame/machine/applefdc.h index b027c904bc8..f0848d9b0c2 100644 --- a/src/mame/machine/applefdc.h +++ b/src/mame/machine/applefdc.h @@ -81,7 +81,7 @@ protected: }; // constructor - applefdc_base_device(applefdc_t fdc_type, const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + applefdc_base_device(applefdc_t fdc_type, const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // device-level overrides virtual void device_start() override; diff --git a/src/mame/machine/deco146.cpp b/src/mame/machine/deco146.cpp index d17f554c02e..202c8a09462 100644 --- a/src/mame/machine/deco146.cpp +++ b/src/mame/machine/deco146.cpp @@ -1319,7 +1319,7 @@ UINT16 deco_146_base_device::read_data(UINT16 address, UINT16 mem_mask, UINT8 &c -deco_146_base_device::deco_146_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +deco_146_base_device::deco_146_base_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) { m_port_a_r = deco146_port_read_cb(FUNC(deco_146_base_device::port_a_default), this); diff --git a/src/mame/machine/deco146.h b/src/mame/machine/deco146.h index c5a15becf46..17846e7a3cb 100644 --- a/src/mame/machine/deco146.h +++ b/src/mame/machine/deco146.h @@ -81,7 +81,7 @@ class deco_146_base_device : public device_t { public: //deco_146_base_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - deco_146_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + deco_146_base_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); void write_data(address_space &space, UINT16 address, UINT16 data, UINT16 mem_mask, UINT8 &csflags); UINT16 read_data(UINT16 address, UINT16 mem_mask, UINT8 &csflags); diff --git a/src/mame/machine/decopincpu.cpp b/src/mame/machine/decopincpu.cpp index ef15c5cc624..428a5b8cfdd 100644 --- a/src/mame/machine/decopincpu.cpp +++ b/src/mame/machine/decopincpu.cpp @@ -281,7 +281,7 @@ decocpu_type1_device::decocpu_type1_device(const machine_config &mconfig, std::s m_write_solenoid(*this) {} -decocpu_type1_device::decocpu_type1_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +decocpu_type1_device::decocpu_type1_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_cpu(*this,"maincpu"), m_pia21(*this, "pia21"), @@ -331,7 +331,7 @@ decocpu_type2_device::decocpu_type2_device(const machine_config &mconfig, std::s : decocpu_type1_device(mconfig, DECOCPU2, "Data East Pinball CPU Board Type 2", tag, owner, clock, "decocpu2", __FILE__) {} -decocpu_type2_device::decocpu_type2_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +decocpu_type2_device::decocpu_type2_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : decocpu_type1_device(mconfig, type, name, tag, owner, clock, shortname, source) {} @@ -349,7 +349,7 @@ decocpu_type3_device::decocpu_type3_device(const machine_config &mconfig, std::s : decocpu_type2_device(mconfig, DECOCPU3, "Data East Pinball CPU Board Type 3", tag, owner, clock, "decocpu3", __FILE__) {} -decocpu_type3_device::decocpu_type3_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +decocpu_type3_device::decocpu_type3_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : decocpu_type2_device(mconfig, type, name, tag, owner, clock, shortname, source) {} diff --git a/src/mame/machine/decopincpu.h b/src/mame/machine/decopincpu.h index 62990faa210..84da8bbe8da 100644 --- a/src/mame/machine/decopincpu.h +++ b/src/mame/machine/decopincpu.h @@ -65,7 +65,7 @@ class decocpu_type1_device : public device_t { public: decocpu_type1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - decocpu_type1_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + decocpu_type1_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); required_device m_cpu; required_device m_pia21; required_device m_pia24; @@ -135,7 +135,7 @@ class decocpu_type2_device : public decocpu_type1_device { public: decocpu_type2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - decocpu_type2_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + decocpu_type2_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); protected: // overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -146,7 +146,7 @@ class decocpu_type3_device : public decocpu_type2_device { public: decocpu_type3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - decocpu_type3_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + decocpu_type3_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); protected: // overrides diff --git a/src/mame/machine/esqpanel.cpp b/src/mame/machine/esqpanel.cpp index 87f86820f97..de8690c887a 100644 --- a/src/mame/machine/esqpanel.cpp +++ b/src/mame/machine/esqpanel.cpp @@ -26,7 +26,7 @@ const device_type ESQPANEL2x40_SQ1 = &device_creator; // esqpanel_device - constructor //------------------------------------------------- -esqpanel_device::esqpanel_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +esqpanel_device::esqpanel_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_serial_interface(mconfig, *this), m_write_tx(*this), diff --git a/src/mame/machine/esqpanel.h b/src/mame/machine/esqpanel.h index 40117250346..f8784e5a72a 100644 --- a/src/mame/machine/esqpanel.h +++ b/src/mame/machine/esqpanel.h @@ -55,7 +55,7 @@ class esqpanel_device : public device_t, public device_serial_interface { public: // construction/destruction - esqpanel_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + esqpanel_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); template static devcb_base &set_tx_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_tx.set_callback(object); } template static devcb_base &set_analog_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_analog.set_callback(object); } diff --git a/src/mame/machine/esqvfd.cpp b/src/mame/machine/esqvfd.cpp index d07b9d0394e..4d5c139a84a 100644 --- a/src/mame/machine/esqvfd.cpp +++ b/src/mame/machine/esqvfd.cpp @@ -114,7 +114,7 @@ static const UINT16 font[]= 0x0000, // 0000 0000 0000 0000 (DEL) }; -esqvfd_t::esqvfd_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) : +esqvfd_t::esqvfd_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/mame/machine/esqvfd.h b/src/mame/machine/esqvfd.h index 4d1bb68b70f..3388e719992 100644 --- a/src/mame/machine/esqvfd.h +++ b/src/mame/machine/esqvfd.h @@ -25,7 +25,7 @@ class esqvfd_t : public device_t { public: - esqvfd_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); + esqvfd_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); DECLARE_WRITE8_MEMBER( write ) { write_char(data); } diff --git a/src/mame/machine/fd1089.cpp b/src/mame/machine/fd1089.cpp index 4c4f2b399bd..6360b063c10 100644 --- a/src/mame/machine/fd1089.cpp +++ b/src/mame/machine/fd1089.cpp @@ -221,7 +221,7 @@ ADDRESS_MAP_END // fd1089_base_device - constructor //------------------------------------------------- -fd1089_base_device::fd1089_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +fd1089_base_device::fd1089_base_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : m68000_device(mconfig, tag, owner, clock, shortname, source), m_decrypted_opcodes(*this, ":fd1089_decrypted_opcodes") { diff --git a/src/mame/machine/fd1089.h b/src/mame/machine/fd1089.h index 7bb12936db6..3f8004f03df 100644 --- a/src/mame/machine/fd1089.h +++ b/src/mame/machine/fd1089.h @@ -39,7 +39,7 @@ class fd1089_base_device : public m68000_device { public: // construction/destruction - fd1089_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + fd1089_base_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // explicit decryption helpers void decrypt(offs_t baseaddr, UINT32 size, offs_t regionoffs, UINT16 *opcodesptr, UINT16 *dataptr) { decrypt(baseaddr, size, &m_plaintext[regionoffs/2], opcodesptr, dataptr); } diff --git a/src/mame/machine/ie15_kbd.cpp b/src/mame/machine/ie15_kbd.cpp index 478df314d42..dadb47ca88d 100644 --- a/src/mame/machine/ie15_kbd.cpp +++ b/src/mame/machine/ie15_kbd.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ -ie15_keyboard_device::ie15_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) +ie15_keyboard_device::ie15_keyboard_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) , m_io_kbd0(*this, "TERM_LINE0") , m_io_kbd1(*this, "TERM_LINE1") diff --git a/src/mame/machine/ie15_kbd.h b/src/mame/machine/ie15_kbd.h index 95d51775c85..9c3c487b072 100644 --- a/src/mame/machine/ie15_kbd.h +++ b/src/mame/machine/ie15_kbd.h @@ -42,7 +42,7 @@ class ie15_keyboard_device : public device_t { public: - ie15_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); + ie15_keyboard_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); ie15_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template static devcb_base &set_keyboard_callback(device_t &device, _Object object) { return downcast(device).m_keyboard_cb.set_callback(object); } diff --git a/src/mame/machine/k573cass.cpp b/src/mame/machine/k573cass.cpp index c27109c26ce..cd9b4d17377 100644 --- a/src/mame/machine/k573cass.cpp +++ b/src/mame/machine/k573cass.cpp @@ -70,7 +70,7 @@ konami573_cassette_x_device::konami573_cassette_x_device(const machine_config &m { } -konami573_cassette_x_device::konami573_cassette_x_device(const machine_config &mconfig, const device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +konami573_cassette_x_device::konami573_cassette_x_device(const machine_config &mconfig, const device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__), konami573_cassette_interface(mconfig, *this), m_x76f041(*this, "eeprom") @@ -194,7 +194,7 @@ konami573_cassette_y_device::konami573_cassette_y_device(const machine_config &m { } -konami573_cassette_y_device::konami573_cassette_y_device(const machine_config &mconfig, const device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +konami573_cassette_y_device::konami573_cassette_y_device(const machine_config &mconfig, const device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__), konami573_cassette_interface(mconfig, *this), m_x76f100(*this, "eeprom"), diff --git a/src/mame/machine/k573cass.h b/src/mame/machine/k573cass.h index 4c7153fe50c..f417933a864 100644 --- a/src/mame/machine/k573cass.h +++ b/src/mame/machine/k573cass.h @@ -92,7 +92,7 @@ class konami573_cassette_x_device: public device_t, { public: konami573_cassette_x_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - konami573_cassette_x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source); + konami573_cassette_x_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock,std::string shortname, std::string source); virtual DECLARE_READ_LINE_MEMBER(read_line_secflash_sda) override; virtual DECLARE_WRITE_LINE_MEMBER(write_line_d0) override; @@ -168,7 +168,7 @@ class konami573_cassette_y_device: public device_t, { public: konami573_cassette_y_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - konami573_cassette_y_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source); + konami573_cassette_y_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock,std::string shortname, std::string source); // static configuration helpers template static devcb_base &set_d0_handler(device_t &device, _Object object) { return downcast(device).m_d0_handler.set_callback(object); } diff --git a/src/mame/machine/mapledev.cpp b/src/mame/machine/mapledev.cpp index d9f95e9351b..3dead2c3e6d 100644 --- a/src/mame/machine/mapledev.cpp +++ b/src/mame/machine/mapledev.cpp @@ -12,7 +12,7 @@ void maple_device::static_set_host(device_t &device, const char *_host_tag, int } -maple_device::maple_device(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) +maple_device::maple_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) { host_tag = nullptr; host_port = 0; diff --git a/src/mame/machine/mapledev.h b/src/mame/machine/mapledev.h index f9e58ac64c4..6e98d64761b 100644 --- a/src/mame/machine/mapledev.h +++ b/src/mame/machine/mapledev.h @@ -10,7 +10,7 @@ class maple_device : public device_t { public: - maple_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + maple_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); static void static_set_host(device_t &device, const char *_host_tag, int _host_port); virtual void maple_w(const UINT32 *data, UINT32 in_size) = 0; diff --git a/src/mame/machine/mega32x.cpp b/src/mame/machine/mega32x.cpp index 5cb33c67037..722ff6b47d1 100644 --- a/src/mame/machine/mega32x.cpp +++ b/src/mame/machine/mega32x.cpp @@ -204,7 +204,7 @@ GFX check (these don't explicitly fails): const device_type SEGA_32X_NTSC = &device_creator; const device_type SEGA_32X_PAL = &device_creator; -sega_32x_device::sega_32x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +sega_32x_device::sega_32x_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_master_cpu(*this, "32x_master_sh2"), m_slave_cpu(*this, "32x_slave_sh2"), diff --git a/src/mame/machine/mega32x.h b/src/mame/machine/mega32x.h index ab33076bba0..94eb1ddcebc 100644 --- a/src/mame/machine/mega32x.h +++ b/src/mame/machine/mega32x.h @@ -31,7 +31,7 @@ class sega_32x_device : public device_t { public: - sega_32x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + sega_32x_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); required_device m_master_cpu; required_device m_slave_cpu; diff --git a/src/mame/machine/megacd.cpp b/src/mame/machine/megacd.cpp index 892120aa1e2..c096c71836a 100644 --- a/src/mame/machine/megacd.cpp +++ b/src/mame/machine/megacd.cpp @@ -289,7 +289,7 @@ machine_config_constructor sega_segacd_device::device_mconfig_additions() const } -sega_segacd_device::sega_segacd_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +sega_segacd_device::sega_segacd_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_gfx_interface(mconfig, *this, GFXDECODE_NAME( segacd )), m_scdcpu(*this, "segacd_68k"), diff --git a/src/mame/machine/megacd.h b/src/mame/machine/megacd.h index 851592224c5..4df91f723ae 100644 --- a/src/mame/machine/megacd.h +++ b/src/mame/machine/megacd.h @@ -42,7 +42,7 @@ class sega_segacd_device : public device_t, public device_gfx_interface { public: - sega_segacd_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + sega_segacd_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); required_device m_scdcpu; required_device m_rfsnd; diff --git a/src/mame/machine/midwayic.cpp b/src/mame/machine/midwayic.cpp index ae8c4bf7895..ccb4b8246a9 100644 --- a/src/mame/machine/midwayic.cpp +++ b/src/mame/machine/midwayic.cpp @@ -124,7 +124,7 @@ midway_serial_pic_device::midway_serial_pic_device(const machine_config &mconfig memset(m_data,0,sizeof(m_data)); } -midway_serial_pic_device::midway_serial_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) : +midway_serial_pic_device::midway_serial_pic_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_upper(0), m_buff(0), @@ -234,7 +234,7 @@ midway_serial_pic2_device::midway_serial_pic2_device(const machine_config &mconf } -midway_serial_pic2_device::midway_serial_pic2_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +midway_serial_pic2_device::midway_serial_pic2_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : midway_serial_pic_device(mconfig, type, name, tag, owner, clock, shortname, source), device_nvram_interface(mconfig, *this), m_latch(0), diff --git a/src/mame/machine/midwayic.h b/src/mame/machine/midwayic.h index 433e2bcbb4a..cc9a604ddad 100644 --- a/src/mame/machine/midwayic.h +++ b/src/mame/machine/midwayic.h @@ -19,7 +19,7 @@ class midway_serial_pic_device : public device_t public: // construction/destruction midway_serial_pic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - midway_serial_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); + midway_serial_pic_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); static void static_set_upper(device_t &device, int upper) { downcast(device).m_upper = upper; } @@ -62,7 +62,7 @@ class midway_serial_pic2_device : public midway_serial_pic_device, public: // construction/destruction midway_serial_pic2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - midway_serial_pic2_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + midway_serial_pic2_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); static void static_set_yearoffs(device_t &device, int yearoffs) { downcast(device).m_yearoffs = yearoffs; } diff --git a/src/mame/machine/msx_switched.cpp b/src/mame/machine/msx_switched.cpp index 9ec492934b7..914274e936a 100644 --- a/src/mame/machine/msx_switched.cpp +++ b/src/mame/machine/msx_switched.cpp @@ -4,7 +4,7 @@ #include "msx_switched.h" -msx_switched_device::msx_switched_device(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_switched_device::msx_switched_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/mame/machine/msx_switched.h b/src/mame/machine/msx_switched.h index 42a643bded6..91b3de849dc 100644 --- a/src/mame/machine/msx_switched.h +++ b/src/mame/machine/msx_switched.h @@ -7,7 +7,7 @@ class msx_switched_device : public device_t { public: - msx_switched_device(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_switched_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual UINT8 get_id() = 0; diff --git a/src/mame/machine/naomibd.cpp b/src/mame/machine/naomibd.cpp index f0b6c991bf2..2e67d9602ee 100644 --- a/src/mame/machine/naomibd.cpp +++ b/src/mame/machine/naomibd.cpp @@ -65,7 +65,7 @@ DEVICE_ADDRESS_MAP_START(submap, 16, naomi_board) AM_RANGE(0x00, 0xff) AM_READ(default_r) ADDRESS_MAP_END -naomi_board::naomi_board(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +naomi_board::naomi_board(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : naomi_g1_device(mconfig, type, name, tag, owner, clock, shortname, source) { eeprom_tag = nullptr; diff --git a/src/mame/machine/naomibd.h b/src/mame/machine/naomibd.h index 3061291ce65..09a2cf3430b 100644 --- a/src/mame/machine/naomibd.h +++ b/src/mame/machine/naomibd.h @@ -12,7 +12,7 @@ class naomi_board : public naomi_g1_device { public: - naomi_board(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + naomi_board(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); static void static_set_eeprom_tag(device_t &device, const char *_eeprom_tag, const char *_actel_tag); diff --git a/src/mame/machine/naomig1.cpp b/src/mame/machine/naomig1.cpp index 8221db382db..2ec4a0ea46c 100644 --- a/src/mame/machine/naomig1.cpp +++ b/src/mame/machine/naomig1.cpp @@ -25,7 +25,7 @@ DEVICE_ADDRESS_MAP_START(amap, 32, naomi_g1_device) AM_RANGE(0xf8, 0xfb) AM_READ(sb_gdlend_r) ADDRESS_MAP_END -naomi_g1_device::naomi_g1_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +naomi_g1_device::naomi_g1_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), irq_cb(*this) { diff --git a/src/mame/machine/naomig1.h b/src/mame/machine/naomig1.h index 717467ab50e..a425f00bba8 100644 --- a/src/mame/machine/naomig1.h +++ b/src/mame/machine/naomig1.h @@ -18,7 +18,7 @@ public: typedef delegate dma_cb; - naomi_g1_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + naomi_g1_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); template void set_irq_cb(_cb cb) { irq_cb.set_callback(cb); } void set_dma_cb(dma_cb _cb) { _dma_cb = _cb; } diff --git a/src/mame/machine/ns11prot.cpp b/src/mame/machine/ns11prot.cpp index 12a3b0d79a1..2957e256a5d 100644 --- a/src/mame/machine/ns11prot.cpp +++ b/src/mame/machine/ns11prot.cpp @@ -7,7 +7,7 @@ #include "ns11prot.h" -ns11_keycus_device::ns11_keycus_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +ns11_keycus_device::ns11_keycus_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/mame/machine/ns11prot.h b/src/mame/machine/ns11prot.h index 9b3fd0cc333..2d36facce05 100644 --- a/src/mame/machine/ns11prot.h +++ b/src/mame/machine/ns11prot.h @@ -10,7 +10,7 @@ class ns11_keycus_device : public device_t { protected: - ns11_keycus_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source); + ns11_keycus_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock,std::string shortname, std::string source); virtual void device_start() override; virtual void device_reset() override; diff --git a/src/mame/machine/smartmed.cpp b/src/mame/machine/smartmed.cpp index e73cf0b0203..071e45a0b50 100644 --- a/src/mame/machine/smartmed.cpp +++ b/src/mame/machine/smartmed.cpp @@ -88,7 +88,7 @@ nand_device::nand_device(const machine_config &mconfig, std::string tag, device_ memset(m_id, 0, sizeof(m_id)); } -nand_device::nand_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nand_device::nand_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_page_data_size(0), m_page_total_size(0), diff --git a/src/mame/machine/smartmed.h b/src/mame/machine/smartmed.h index 251dc563365..9e68a97d706 100644 --- a/src/mame/machine/smartmed.h +++ b/src/mame/machine/smartmed.h @@ -58,7 +58,7 @@ class nand_device : public device_t public: // construction/destruction nand_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - nand_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nand_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); template static devcb_base &set_rnb_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_rnb.set_callback(object); } diff --git a/src/mame/video/apollo.cpp b/src/mame/video/apollo.cpp index 60f78fadd4d..d6d17b41657 100644 --- a/src/mame/video/apollo.cpp +++ b/src/mame/video/apollo.cpp @@ -1726,7 +1726,7 @@ apollo_graphics_15i::apollo_graphics_15i(const machine_config &mconfig,std::stri { } -apollo_graphics_15i::apollo_graphics_15i(const machine_config &mconfig,std::string tag, device_t *owner, UINT32 clock, device_type type,const char *name, const char *shortname, const char *source) : +apollo_graphics_15i::apollo_graphics_15i(const machine_config &mconfig,std::string tag, device_t *owner, UINT32 clock, device_type type,const char *name, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_lut_fifo(nullptr), m_bt458(nullptr) diff --git a/src/mame/video/avgdvg.cpp b/src/mame/video/avgdvg.cpp index 8ba78e925a6..65082d3c044 100644 --- a/src/mame/video/avgdvg.cpp +++ b/src/mame/video/avgdvg.cpp @@ -1395,7 +1395,7 @@ void avgdvg_device::static_set_vector_tag(device_t &device, std::string tag) downcast(device).m_vector.set_tag(tag); } -avgdvg_device::avgdvg_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +avgdvg_device::avgdvg_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_vector(*this) { @@ -1461,7 +1461,7 @@ avg_device::avg_device(const machine_config &mconfig, std::string tag, device_t { } -avg_device::avg_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +avg_device::avg_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : avgdvg_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/mame/video/avgdvg.h b/src/mame/video/avgdvg.h index ddd657c775b..c9f0e88aced 100644 --- a/src/mame/video/avgdvg.h +++ b/src/mame/video/avgdvg.h @@ -25,7 +25,7 @@ class avgdvg_device : public device_t { public: // construction/destruction - avgdvg_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + avgdvg_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); static void static_set_vector_tag(device_t &device, std::string tag); @@ -155,7 +155,7 @@ class avg_device : public avgdvg_device public: // construction/destruction avg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - avg_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + avg_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); int avg_common_strobe1(); int avg_common_strobe2(); diff --git a/src/mame/video/gb_lcd.cpp b/src/mame/video/gb_lcd.cpp index a35573b387e..55b37063a52 100644 --- a/src/mame/video/gb_lcd.cpp +++ b/src/mame/video/gb_lcd.cpp @@ -180,7 +180,7 @@ const device_type GB_LCD_CGB = &device_creator; -gb_lcd_device::gb_lcd_device(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_lcd_device::gb_lcd_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), m_sgb_border_hack(0) diff --git a/src/mame/video/gb_lcd.h b/src/mame/video/gb_lcd.h index 15876138b44..0b899ba2117 100644 --- a/src/mame/video/gb_lcd.h +++ b/src/mame/video/gb_lcd.h @@ -33,7 +33,7 @@ class gb_lcd_device : public device_t, public device_video_interface { public: - gb_lcd_device(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_lcd_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); gb_lcd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); diff --git a/src/mame/video/gic.cpp b/src/mame/video/gic.cpp index b02bee5f756..10366a37d7d 100644 --- a/src/mame/video/gic.cpp +++ b/src/mame/video/gic.cpp @@ -93,7 +93,7 @@ gic_device::gic_device(const machine_config &mconfig, std::string tag, device_t } -gic_device::gic_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, int lines, const char *shortname, const char *source) +gic_device::gic_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, int lines, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) , device_sound_interface(mconfig, *this) , device_video_interface(mconfig, *this) diff --git a/src/mame/video/gic.h b/src/mame/video/gic.h index d51640a9d78..8f36f202b4a 100644 --- a/src/mame/video/gic.h +++ b/src/mame/video/gic.h @@ -55,7 +55,7 @@ class gic_device : public device_t public: // construction/destruction gic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - gic_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, int lines, const char *shortname, const char *source); + gic_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, int lines, std::string shortname, std::string source); // static configuration helpers static void set_screen_tag(device_t &device, const char *screen_tag) { downcast(device).m_screen_tag = screen_tag; } diff --git a/src/mame/video/gime.cpp b/src/mame/video/gime.cpp index 621a63beb60..9d64cf94dfa 100644 --- a/src/mame/video/gime.cpp +++ b/src/mame/video/gime.cpp @@ -108,7 +108,7 @@ // ctor //------------------------------------------------- -gime_base_device::gime_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const UINT8 *fontdata, const char *shortname, const char *source) +gime_base_device::gime_base_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, const UINT8 *fontdata, std::string shortname, std::string source) : mc6847_friend_device(mconfig, type, name, tag, owner, clock, fontdata, true, 263, 25+192+26+3, false, shortname, source), m_write_irq(*this), m_write_firq(*this), diff --git a/src/mame/video/gime.h b/src/mame/video/gime.h index 4db783fc1aa..e51350e79c5 100644 --- a/src/mame/video/gime.h +++ b/src/mame/video/gime.h @@ -91,7 +91,7 @@ public: void set_il2(bool value) { set_interrupt_value(INTERRUPT_EI2, value); } protected: - gime_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const UINT8 *fontdata, const char *shortname, const char *source); + gime_base_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, const UINT8 *fontdata, std::string shortname, std::string source); // device-level overrides virtual void device_start(void) override; diff --git a/src/mame/video/k053246_k053247_k055673.cpp b/src/mame/video/k053246_k053247_k055673.cpp index cea687071e7..75410ea58ad 100644 --- a/src/mame/video/k053246_k053247_k055673.cpp +++ b/src/mame/video/k053246_k053247_k055673.cpp @@ -1052,7 +1052,7 @@ k053247_device::k053247_device(const machine_config &mconfig, std::string tag, d clear_all(); } -k053247_device::k053247_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +k053247_device::k053247_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), m_gfxdecode(*this), diff --git a/src/mame/video/k053246_k053247_k055673.h b/src/mame/video/k053246_k053247_k055673.h index 0bec1c786af..8327003ecc6 100644 --- a/src/mame/video/k053246_k053247_k055673.h +++ b/src/mame/video/k053246_k053247_k055673.h @@ -62,7 +62,7 @@ class k053247_device : public device_t, { public: k053247_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - k053247_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + k053247_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); ~k053247_device() { } diff --git a/src/mame/video/k1ge.cpp b/src/mame/video/k1ge.cpp index 20c587d360f..729e5205abe 100644 --- a/src/mame/video/k1ge.cpp +++ b/src/mame/video/k1ge.cpp @@ -871,7 +871,7 @@ k1ge_device::k1ge_device(const machine_config &mconfig, std::string tag, device_ { } -k1ge_device::k1ge_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +k1ge_device::k1ge_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) , device_video_interface(mconfig, *this) , m_vblank_pin_w(*this) diff --git a/src/mame/video/k1ge.h b/src/mame/video/k1ge.h index 3cb4df83dc1..17c1300b174 100644 --- a/src/mame/video/k1ge.h +++ b/src/mame/video/k1ge.h @@ -28,7 +28,7 @@ class k1ge_device : public device_t, { public: k1ge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - k1ge_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + k1ge_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); diff --git a/src/mame/video/pc_t1t.cpp b/src/mame/video/pc_t1t.cpp index f6628d2e186..e389b3c7eb4 100644 --- a/src/mame/video/pc_t1t.cpp +++ b/src/mame/video/pc_t1t.cpp @@ -31,7 +31,7 @@ enum const device_type PCVIDEO_T1000 = &device_creator; const device_type PCVIDEO_PCJR = &device_creator; -pc_t1t_device::pc_t1t_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +pc_t1t_device::pc_t1t_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), m_mc6845(*this, T1000_MC6845_NAME), diff --git a/src/mame/video/pc_t1t.h b/src/mame/video/pc_t1t.h index bf9fbb3781b..b29bd474f7f 100644 --- a/src/mame/video/pc_t1t.h +++ b/src/mame/video/pc_t1t.h @@ -34,7 +34,7 @@ class pc_t1t_device : public device_t, { public: // construction/destruction - pc_t1t_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + pc_t1t_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); DECLARE_PALETTE_INIT( pcjr ); diff --git a/src/mame/video/pcd.cpp b/src/mame/video/pcd.cpp index 9b292ea1449..5e37a2f54a0 100644 --- a/src/mame/video/pcd.cpp +++ b/src/mame/video/pcd.cpp @@ -8,7 +8,7 @@ const device_type PCD_VIDEO = &device_creator; const device_type PCX_VIDEO = &device_creator; -pcdx_video_device::pcdx_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) : +pcdx_video_device::pcdx_video_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(*this, ":maincpu"), m_mcu(*this, "graphics"), diff --git a/src/mame/video/pcd.h b/src/mame/video/pcd.h index ecb22fa307e..20d86af5061 100644 --- a/src/mame/video/pcd.h +++ b/src/mame/video/pcd.h @@ -14,7 +14,7 @@ class pcdx_video_device : public device_t { public: - pcdx_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); + pcdx_video_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual DECLARE_ADDRESS_MAP(map, 16) = 0; DECLARE_READ8_MEMBER(detect_r); diff --git a/src/mame/video/ppu2c0x.cpp b/src/mame/video/ppu2c0x.cpp index b7bdc9575be..b1667ab74eb 100644 --- a/src/mame/video/ppu2c0x.cpp +++ b/src/mame/video/ppu2c0x.cpp @@ -120,7 +120,7 @@ void ppu2c0x_device::device_config_complete() m_vidaccess_callback_proc = ppu2c0x_vidaccess_delegate(); } -ppu2c0x_device::ppu2c0x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +ppu2c0x_device::ppu2c0x_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_memory_interface(mconfig, *this), device_video_interface(mconfig, *this), diff --git a/src/mame/video/ppu2c0x.h b/src/mame/video/ppu2c0x.h index 9a99fed53ff..2f59e80f490 100644 --- a/src/mame/video/ppu2c0x.h +++ b/src/mame/video/ppu2c0x.h @@ -137,7 +137,7 @@ class ppu2c0x_device : public device_t, { public: // construction/destruction - ppu2c0x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + ppu2c0x_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); diff --git a/src/mame/video/sega16sp.cpp b/src/mame/video/sega16sp.cpp index 389016c36d7..f89f8a65f4f 100644 --- a/src/mame/video/sega16sp.cpp +++ b/src/mame/video/sega16sp.cpp @@ -36,7 +36,7 @@ const device_type SEGA_YBOARD_SPRITES = &device_creator; const device_type RAINBOW_VIDEO = &device_creator; -vt100_video_device::vt100_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) +vt100_video_device::vt100_video_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), m_read_ram(*this), diff --git a/src/mame/video/vtvideo.h b/src/mame/video/vtvideo.h index cc995a4357a..ce3fbb09e76 100644 --- a/src/mame/video/vtvideo.h +++ b/src/mame/video/vtvideo.h @@ -18,7 +18,7 @@ class vt100_video_device : public device_t, public device_video_interface { public: - vt100_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); + vt100_video_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); vt100_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); ~vt100_video_device() {} diff --git a/src/osd/modules/debugger/win/consolewininfo.cpp b/src/osd/modules/debugger/win/consolewininfo.cpp index 8491d1768a8..f0855b56b96 100644 --- a/src/osd/modules/debugger/win/consolewininfo.cpp +++ b/src/osd/modules/debugger/win/consolewininfo.cpp @@ -44,7 +44,7 @@ consolewin_info::consolewin_info(debugger_windows_interface &debugger) : for ( ; img != NULL; img = iter.next()) { std::string temp; - strprintf(temp,"%s : %s", img->device().name(), img->exists() ? img->filename() : "[no image]"); + strprintf(temp,"%s : %s", img->device().name().c_str(), img->exists() ? img->filename() : "[no image]"); TCHAR *tc_buf = tstring_from_utf8(temp.c_str()); if (tc_buf != NULL) { @@ -108,7 +108,7 @@ void consolewin_info::set_cpu(device_t &device) char curtitle[256]; std::string title; - strprintf(title, "Debug: %s - %s '%s'", device.machine().system().name, device.name(), device.tag().c_str()); + strprintf(title, "Debug: %s - %s '%s'", device.machine().system().name, device.name().c_str(), device.tag().c_str()); win_get_window_text_utf8(window(), curtitle, ARRAY_LENGTH(curtitle)); if (title.compare(curtitle) != 0) win_set_window_text_utf8(window(), title.c_str()); @@ -201,7 +201,7 @@ void consolewin_info::update_menu() } std::string temp; - strprintf(temp,"%s :%s", img->device().name(), img->exists() ? img->filename() : "[empty slot]"); + strprintf(temp,"%s :%s", img->device().name().c_str(), img->exists() ? img->filename() : "[empty slot]"); TCHAR *tc_buf = tstring_from_utf8(temp.c_str()); if (tc_buf != NULL) {