diff options
author | 2016-01-16 20:05:32 +0100 | |
---|---|---|
committer | 2016-01-16 20:05:32 +0100 | |
commit | caba131d844ade3f2b30d6be24ea6cf46b2949d7 (patch) | |
tree | 03a87639748f22e37c6ef572354e8662517b7ec9 /src/devices/machine | |
parent | 2d96e6f4d304f1e8dbc15d305b9445769724219b (diff) |
rest of device parameters to std::string (nw)
Diffstat (limited to 'src/devices/machine')
101 files changed, 169 insertions, 169 deletions
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>; //------------------------------------------------- // 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<class _Object> 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<adc0832_device>; const device_type ADC0834 = &device_creator<adc0834_device>; const device_type ADC0838 = &device_creator<adc0838_device>; -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<double (UINT8 input)> 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<adc083x_device &>(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<adc12138_device &>(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<class _Object> static devcb_base &set_out_hreq_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(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<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ata_interface_device &>(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<ay31015_device>; const device_type AY51013 = &device_creator<ay51013_device>; -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<ay31015_device &>(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<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<dp8390_device &>(device).m_irq_cb.set_callback(object); } template<class _Object> static devcb_base &set_breq_callback(device_t &device, _Object object) { return downcast<dp8390_device &>(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<v53_scu_device>; // 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<class _Object> static devcb_base &set_keyboard_callback(device_t &device, _Object object) { return downcast<generic_keyboard_device &>(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<legacy_scsi_host_adapter &>(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<class _irq> 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<mos6526_device &>(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<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<mos6530_base_t &>(device).m_irq_cb.set_callback(object); } template<class _Object> static devcb_base &set_pa_rd_callback(device_t &device, _Object object) { return downcast<mos6530_base_t &>(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<netlist::param_double_t *>(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<netlist::param_int_t *>(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<nscsi_device *>(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<class _Object> static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast<pc_fdc_family_device &>(device).intrq_cb.set_callback(object); } template<class _Object> static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<pc_fdc_family_device &>(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<roc10937_t>; -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<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<smc91c9x_device &>(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<class _Object> static devcb_base &set_keyboard_callback(device_t &device, _Object object) { return downcast<generic_terminal_device &>(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<class _Object> static devcb_base &set_write_port1_callback(device_t &device, _Object object) { return downcast<tms1024_device &>(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::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<tms6100_device &>(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<upd4990a_device>; // 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<class _data> 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<UINT8 ()> byte_read_cb; typedef delegate<void (UINT8)> 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<class _Object> static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast<upd765_family_device &>(device).intrq_cb.set_callback(object); } template<class _Object> static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<upd765_family_device &>(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<wd1773_t>; // 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<class _Object> static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast<wd_fdc_t &>(device).intrq_cb.set_callback(object); } template<class _Object> static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<wd_fdc_t &>(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<class _Object> static devcb_base &set_out_txda_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(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<class _Object> static devcb_base &set_out_txda_callback(device_t &device, _Object object) { return downcast<z80scc_device &>(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<class _Object> static devcb_base &set_out_txda_callback(device_t &device, _Object object) { return downcast<z80sio_device &>(device).m_out_txda_cb.set_callback(object); } |