summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-01-20 21:34:55 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2016-01-20 21:34:55 +0100
commit8193c47c1925d937acc80f043ea9eadac39fd791 (patch)
treed387e1e6023f0fb5c3e72e7446fe4e0bf8d808ba /src
parent69b44cd860f08dc613474a41ecb16b03bc7a81da (diff)
Revert "some additional (nw)"
This reverts commit e8512cb57bfcfc69d5abab5f2e993f139f306536.
Diffstat (limited to 'src')
-rw-r--r--src/devices/bus/amiga/zorro/a590.cpp2
-rw-r--r--src/devices/bus/amiga/zorro/a590.h2
-rw-r--r--src/devices/bus/amiga/zorro/action_replay.cpp2
-rw-r--r--src/devices/bus/amiga/zorro/action_replay.h2
-rw-r--r--src/devices/bus/dmv/ram.cpp2
-rw-r--r--src/devices/bus/dmv/ram.h2
-rw-r--r--src/devices/bus/isa/mufdc.cpp2
-rw-r--r--src/devices/bus/isa/mufdc.h2
-rw-r--r--src/devices/bus/isa/sblaster.cpp6
-rw-r--r--src/devices/bus/isa/sblaster.h6
-rw-r--r--src/devices/bus/msx_cart/yamaha.cpp2
-rw-r--r--src/devices/bus/msx_cart/yamaha.h2
-rw-r--r--src/devices/cpu/avr8/avr8.cpp2
-rw-r--r--src/devices/cpu/avr8/avr8.h2
-rw-r--r--src/devices/cpu/e132xs/e132xs.cpp2
-rw-r--r--src/devices/cpu/e132xs/e132xs.h2
-rw-r--r--src/devices/cpu/hmcs40/hmcs40.cpp6
-rw-r--r--src/devices/cpu/hmcs40/hmcs40.h6
-rw-r--r--src/devices/cpu/m68000/m68000.h8
-rw-r--r--src/devices/cpu/m68000/m68kcpu.cpp8
-rw-r--r--src/devices/cpu/m6809/m6809.cpp2
-rw-r--r--src/devices/cpu/m6809/m6809.h2
-rw-r--r--src/devices/cpu/tms9900/tms9900.cpp2
-rw-r--r--src/devices/cpu/tms9900/tms9900.h2
-rw-r--r--src/devices/machine/eeprom.cpp4
-rw-r--r--src/devices/machine/eeprom.h2
-rw-r--r--src/devices/machine/eeprompar.cpp8
-rw-r--r--src/devices/machine/eeprompar.h4
-rw-r--r--src/devices/machine/eepromser.cpp16
-rw-r--r--src/devices/machine/eepromser.h8
-rw-r--r--src/devices/machine/ins8250.cpp2
-rw-r--r--src/devices/machine/ins8250.h2
-rw-r--r--src/devices/sound/sn76496.cpp2
-rw-r--r--src/devices/sound/sn76496.h2
-rw-r--r--src/devices/video/v9938.cpp2
-rw-r--r--src/devices/video/v9938.h2
-rw-r--r--src/mame/machine/atarigen.cpp4
-rw-r--r--src/mame/machine/atarigen.h2
-rw-r--r--src/mame/machine/namcoio.cpp2
-rw-r--r--src/mame/machine/namcoio.h2
-rw-r--r--src/mame/video/tia.cpp2
-rw-r--r--src/mame/video/tia.h2
42 files changed, 72 insertions, 72 deletions
diff --git a/src/devices/bus/amiga/zorro/a590.cpp b/src/devices/bus/amiga/zorro/a590.cpp
index 3b21b448c49..376e8cd2879 100644
--- a/src/devices/bus/amiga/zorro/a590.cpp
+++ b/src/devices/bus/amiga/zorro/a590.cpp
@@ -192,7 +192,7 @@ const rom_entry *dmac_hdc_device::device_rom_region() const
//-------------------------------------------------
dmac_hdc_device::dmac_hdc_device(const machine_config &mconfig, device_type type, std::string tag,
- device_t *owner, UINT32 clock, std::string name, std::string shortname) :
+ device_t *owner, UINT32 clock, const char *name, const char *shortname) :
device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
m_int6(false),
m_dmac(*this, "dmac"),
diff --git a/src/devices/bus/amiga/zorro/a590.h b/src/devices/bus/amiga/zorro/a590.h
index a54bec0e694..f787d51f260 100644
--- a/src/devices/bus/amiga/zorro/a590.h
+++ b/src/devices/bus/amiga/zorro/a590.h
@@ -30,7 +30,7 @@ class dmac_hdc_device : public device_t
public:
// construction/destruction
dmac_hdc_device(const machine_config &mconfig, device_type type, std::string tag,
- device_t *owner, UINT32 clock, std::string name, std::string shortname);
+ device_t *owner, UINT32 clock, const char *name, const char *shortname);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/amiga/zorro/action_replay.cpp b/src/devices/bus/amiga/zorro/action_replay.cpp
index 2e743f762b5..510ad153466 100644
--- a/src/devices/bus/amiga/zorro/action_replay.cpp
+++ b/src/devices/bus/amiga/zorro/action_replay.cpp
@@ -98,7 +98,7 @@ const rom_entry *action_replay_mk3_device::device_rom_region() const
//-------------------------------------------------
action_replay_device::action_replay_device(const machine_config &mconfig, device_type type, std::string tag,
- device_t *owner, UINT32 clock, std::string name, std::string shortname) :
+ device_t *owner, UINT32 clock, const char *name, const char *shortname) :
device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_exp_card_interface(mconfig, *this),
m_button(*this, "freeze")
diff --git a/src/devices/bus/amiga/zorro/action_replay.h b/src/devices/bus/amiga/zorro/action_replay.h
index ad2b7fc3bb7..f9f50173e3a 100644
--- a/src/devices/bus/amiga/zorro/action_replay.h
+++ b/src/devices/bus/amiga/zorro/action_replay.h
@@ -28,7 +28,7 @@ class action_replay_device : public device_t, public device_exp_card_interface
public:
// construction/destruction
action_replay_device(const machine_config &mconfig, device_type type, std::string tag,
- device_t *owner, UINT32 clock, std::string name, std::string shortname);
+ device_t *owner, UINT32 clock, const char *name, const char *shortname);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/dmv/ram.cpp b/src/devices/bus/dmv/ram.cpp
index 7b5183e7b39..c46637a562e 100644
--- a/src/devices/bus/dmv/ram.cpp
+++ b/src/devices/bus/dmv/ram.cpp
@@ -32,7 +32,7 @@ const device_type DMV_K208 = &device_creator<dmv_k208_device>;
// dmv_ram_device - constructor
//-------------------------------------------------
-dmv_ram_device::dmv_ram_device(const machine_config &mconfig, device_type type, UINT32 size, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source)
+dmv_ram_device::dmv_ram_device(const machine_config &mconfig, device_type type, UINT32 size, const char *name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_dmvslot_interface( mconfig, *this ), m_ram(nullptr),
m_size(size)
diff --git a/src/devices/bus/dmv/ram.h b/src/devices/bus/dmv/ram.h
index 10fe369bbef..b6d25e5423a 100644
--- a/src/devices/bus/dmv/ram.h
+++ b/src/devices/bus/dmv/ram.h
@@ -20,7 +20,7 @@ class dmv_ram_device :
{
public:
// construction/destruction
- dmv_ram_device(const machine_config &mconfig, device_type type, UINT32 size, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source);
+ dmv_ram_device(const machine_config &mconfig, device_type type, UINT32 size, const char *name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source);
protected:
// device-level overrides
diff --git a/src/devices/bus/isa/mufdc.cpp b/src/devices/bus/isa/mufdc.cpp
index d6fa8917269..585b1e25ed4 100644
--- a/src/devices/bus/isa/mufdc.cpp
+++ b/src/devices/bus/isa/mufdc.cpp
@@ -129,7 +129,7 @@ const rom_entry *fdcmag_device::device_rom_region() const
// mufdc_device - constructor
//-------------------------------------------------
-mufdc_device::mufdc_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, std::string name, std::string shortname) :
+mufdc_device::mufdc_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, const char *shortname) :
device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_isa8_card_interface( mconfig, *this ),
m_fdc(*this, "fdc"),
diff --git a/src/devices/bus/isa/mufdc.h b/src/devices/bus/isa/mufdc.h
index e9491ffec93..0897d85a964 100644
--- a/src/devices/bus/isa/mufdc.h
+++ b/src/devices/bus/isa/mufdc.h
@@ -36,7 +36,7 @@ class mufdc_device : public device_t,
{
public:
// construction/destruction
- mufdc_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, std::string name, std::string shortname);
+ mufdc_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, const char *shortname);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/sblaster.cpp b/src/devices/bus/isa/sblaster.cpp
index 1c0e622d80a..14374e3114e 100644
--- a/src/devices/bus/isa/sblaster.cpp
+++ b/src/devices/bus/isa/sblaster.cpp
@@ -1101,7 +1101,7 @@ machine_config_constructor isa16_sblaster16_device::device_mconfig_additions() c
// LIVE DEVICE
//**************************************************************************
-sb_device::sb_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, std::string name, std::string shortname, std::string source) :
+sb_device::sb_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, std::string shortname, std::string source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_serial_interface(mconfig, *this),
m_dacl(*this, "sbdacl"),
@@ -1111,14 +1111,14 @@ sb_device::sb_device(const machine_config &mconfig, device_type type, std::strin
{
}
-sb8_device::sb8_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, std::string name, std::string shortname, std::string source) :
+sb8_device::sb8_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, std::string shortname, std::string source) :
sb_device(mconfig, type, tag, owner, clock, name, shortname, source),
device_isa8_card_interface(mconfig, *this),
m_ym3812(*this, "ym3812")
{
}
-sb16_device::sb16_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, std::string name, std::string shortname, std::string source) :
+sb16_device::sb16_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, std::string shortname, std::string source) :
sb_device(mconfig, type, tag, owner, clock, name, shortname, source),
device_isa16_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/isa/sblaster.h b/src/devices/bus/isa/sblaster.h
index fbf713d1e30..b9c95b9b751 100644
--- a/src/devices/bus/isa/sblaster.h
+++ b/src/devices/bus/isa/sblaster.h
@@ -97,7 +97,7 @@ class sb_device :
{
public:
// construction/destruction
- sb_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, std::string name, std::string shortname, std::string source);
+ sb_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, std::string shortname, std::string source);
required_device<dac_device> m_dacl;
required_device<dac_device> m_dacr;
@@ -158,7 +158,7 @@ class sb8_device : public sb_device,
{
public:
// construction/destruction
- sb8_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, std::string name, std::string shortname, std::string source);
+ sb8_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, std::string shortname, std::string source);
DECLARE_READ8_MEMBER(ym3812_16_r);
DECLARE_WRITE8_MEMBER(ym3812_16_w);
@@ -212,7 +212,7 @@ class sb16_device : public sb_device,
{
public:
// construction/destruction
- sb16_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, std::string name, std::string shortname, std::string source);
+ sb16_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, std::string shortname, std::string source);
DECLARE_READ8_MEMBER(mpu401_r);
DECLARE_WRITE8_MEMBER(mpu401_w);
DECLARE_READ8_MEMBER(mixer_r);
diff --git a/src/devices/bus/msx_cart/yamaha.cpp b/src/devices/bus/msx_cart/yamaha.cpp
index 7b5f2306907..b1ac9210cf1 100644
--- a/src/devices/bus/msx_cart/yamaha.cpp
+++ b/src/devices/bus/msx_cart/yamaha.cpp
@@ -18,7 +18,7 @@ const device_type MSX_CART_SFG01 = &device_creator<msx_cart_sfg01>;
const device_type MSX_CART_SFG05 = &device_creator<msx_cart_sfg05>;
-msx_cart_sfg::msx_cart_sfg(const machine_config &mconfig, const device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname)
+msx_cart_sfg::msx_cart_sfg(const machine_config &mconfig, const device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname)
: device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__)
, msx_cart_interface(mconfig, *this)
, m_region_sfg(*this, "sfg")
diff --git a/src/devices/bus/msx_cart/yamaha.h b/src/devices/bus/msx_cart/yamaha.h
index f0a4a2eb819..af815efa6ae 100644
--- a/src/devices/bus/msx_cart/yamaha.h
+++ b/src/devices/bus/msx_cart/yamaha.h
@@ -17,7 +17,7 @@ class msx_cart_sfg : public device_t
, public msx_cart_interface
{
public:
- msx_cart_sfg(const machine_config &mconfig, const device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname);
+ msx_cart_sfg(const machine_config &mconfig, const device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/cpu/avr8/avr8.cpp b/src/devices/cpu/avr8/avr8.cpp
index 8ae3a6e96f3..fc3c93d3b9e 100644
--- a/src/devices/cpu/avr8/avr8.cpp
+++ b/src/devices/cpu/avr8/avr8.cpp
@@ -632,7 +632,7 @@ atmega2560_device::atmega2560_device(const machine_config &mconfig, std::string
// avr8_device - constructor
//-------------------------------------------------
-avr8_device::avr8_device(const machine_config &mconfig, std::string name, std::string tag, device_t *owner, UINT32 clock, const device_type type, UINT32 addr_mask, address_map_constructor internal_map, UINT8 cpu_type, std::string shortname, std::string source)
+avr8_device::avr8_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock, const device_type type, UINT32 addr_mask, address_map_constructor internal_map, UINT8 cpu_type, std::string shortname, std::string source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_shifted_pc(0),
m_program_config("program", ENDIANNESS_LITTLE, 8, 22),
diff --git a/src/devices/cpu/avr8/avr8.h b/src/devices/cpu/avr8/avr8.h
index 1b163d9aa14..3a4a73188ca 100644
--- a/src/devices/cpu/avr8/avr8.h
+++ b/src/devices/cpu/avr8/avr8.h
@@ -109,7 +109,7 @@ protected:
CPU_TYPE_ATMEGA2560
};
- avr8_device(const machine_config &mconfig, std::string name, std::string tag, device_t *owner, UINT32 clock, const device_type type, UINT32 address_mask, address_map_constructor internal_map, UINT8 cpu_type, std::string shortname, std::string source);
+ avr8_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock, const device_type type, UINT32 address_mask, address_map_constructor internal_map, UINT8 cpu_type, std::string shortname, std::string source);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/cpu/e132xs/e132xs.cpp b/src/devices/cpu/e132xs/e132xs.cpp
index a976abfc0f4..9b50b28e2cf 100644
--- a/src/devices/cpu/e132xs/e132xs.cpp
+++ b/src/devices/cpu/e132xs/e132xs.cpp
@@ -292,7 +292,7 @@ ADDRESS_MAP_END
// hyperstone_device - constructor
//-------------------------------------------------
-hyperstone_device::hyperstone_device(const machine_config &mconfig, std::string name, std::string tag, device_t *owner, UINT32 clock,
+hyperstone_device::hyperstone_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock,
const device_type type, UINT32 prg_data_width, UINT32 io_data_width, address_map_constructor internal_map, std::string shortname, std::string source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_program_config("program", ENDIANNESS_BIG, prg_data_width, 32, 0, internal_map),
diff --git a/src/devices/cpu/e132xs/e132xs.h b/src/devices/cpu/e132xs/e132xs.h
index 8d978f9acfc..c4fd8067813 100644
--- a/src/devices/cpu/e132xs/e132xs.h
+++ b/src/devices/cpu/e132xs/e132xs.h
@@ -212,7 +212,7 @@ class hyperstone_device : public cpu_device
{
public:
// construction/destruction
- hyperstone_device(const machine_config &mconfig, std::string name, std::string tag, device_t *owner, UINT32 clock,
+ hyperstone_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock,
const device_type type, UINT32 prg_data_width, UINT32 io_data_width, address_map_constructor internal_map, std::string shortname, std::string source);
// public interfaces
diff --git a/src/devices/cpu/hmcs40/hmcs40.cpp b/src/devices/cpu/hmcs40/hmcs40.cpp
index 249e7f2ce1f..4e3dc90f60c 100644
--- a/src/devices/cpu/hmcs40/hmcs40.cpp
+++ b/src/devices/cpu/hmcs40/hmcs40.cpp
@@ -78,7 +78,7 @@ ADDRESS_MAP_END
// device definitions
-hmcs43_cpu_device::hmcs43_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT16 polarity, std::string shortname)
+hmcs43_cpu_device::hmcs43_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT16 polarity, const char *shortname)
: hmcs40_cpu_device(mconfig, type, name, tag, owner, clock, HMCS40_FAMILY_HMCS43, polarity, 3 /* stack levels */, 10 /* pc width */, 11 /* prg width */, ADDRESS_MAP_NAME(program_1k), 7 /* data width */, ADDRESS_MAP_NAME(data_80x4), shortname, __FILE__)
{ }
@@ -96,7 +96,7 @@ hd44758_device::hd44758_device(const machine_config &mconfig, std::string tag, d
{ }
-hmcs44_cpu_device::hmcs44_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT16 polarity, std::string shortname)
+hmcs44_cpu_device::hmcs44_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT16 polarity, const char *shortname)
: hmcs40_cpu_device(mconfig, type, name, tag, owner, clock, HMCS40_FAMILY_HMCS44, polarity, 4, 11, 12, ADDRESS_MAP_NAME(program_2k), 8, ADDRESS_MAP_NAME(data_160x4), shortname, __FILE__)
{ }
@@ -114,7 +114,7 @@ hd44808_device::hd44808_device(const machine_config &mconfig, std::string tag, d
{ }
-hmcs45_cpu_device::hmcs45_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT16 polarity, std::string shortname)
+hmcs45_cpu_device::hmcs45_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT16 polarity, const char *shortname)
: hmcs40_cpu_device(mconfig, type, name, tag, owner, clock, HMCS40_FAMILY_HMCS45, polarity, 4, 11, 12, ADDRESS_MAP_NAME(program_2k), 8, ADDRESS_MAP_NAME(data_160x4), shortname, __FILE__)
{ }
diff --git a/src/devices/cpu/hmcs40/hmcs40.h b/src/devices/cpu/hmcs40/hmcs40.h
index 2df6fdcccc3..337748d11a6 100644
--- a/src/devices/cpu/hmcs40/hmcs40.h
+++ b/src/devices/cpu/hmcs40/hmcs40.h
@@ -349,7 +349,7 @@ protected:
class hmcs43_cpu_device : public hmcs40_cpu_device
{
public:
- hmcs43_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT16 polarity, std::string shortname);
+ hmcs43_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT16 polarity, const char *shortname);
protected:
// overrides
@@ -386,7 +386,7 @@ public:
class hmcs44_cpu_device : public hmcs40_cpu_device
{
public:
- hmcs44_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT16 polarity, std::string shortname);
+ hmcs44_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT16 polarity, const char *shortname);
protected:
// overrides
@@ -422,7 +422,7 @@ public:
class hmcs45_cpu_device : public hmcs40_cpu_device
{
public:
- hmcs45_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT16 polarity, std::string shortname);
+ hmcs45_cpu_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT16 polarity, const char *shortname);
protected:
// overrides
diff --git a/src/devices/cpu/m68000/m68000.h b/src/devices/cpu/m68000/m68000.h
index 51fc008a873..9b882564853 100644
--- a/src/devices/cpu/m68000/m68000.h
+++ b/src/devices/cpu/m68000/m68000.h
@@ -125,10 +125,10 @@ class m68000_base_device : public cpu_device
public:
// construction/destruction
- m68000_base_device(const machine_config &mconfig, std::string name, std::string tag, device_t *owner, UINT32 clock,
+ m68000_base_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock,
const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, std::string shortname, std::string source);
- m68000_base_device(const machine_config &mconfig, std::string name, std::string tag, device_t *owner, UINT32 clock,
+ m68000_base_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock,
const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, address_map_constructor internal_map, std::string shortname, std::string source);
m68000_base_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
@@ -411,7 +411,7 @@ public:
m68000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
m68000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source);
- m68000_device(const machine_config &mconfig, std::string name, std::string tag, device_t *owner, UINT32 clock,
+ m68000_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock,
const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, address_map_constructor internal_map, std::string shortname, std::string source);
@@ -728,7 +728,7 @@ public:
// construction/destruction
fscpu32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- fscpu32_device(const machine_config &mconfig, std::string name, std::string tag, device_t *owner, UINT32 clock,
+ fscpu32_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock,
const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, address_map_constructor internal_map, std::string shortname, std::string source);
virtual UINT32 disasm_min_opcode_bytes() const override { return 2; };
diff --git a/src/devices/cpu/m68000/m68kcpu.cpp b/src/devices/cpu/m68000/m68kcpu.cpp
index eba893e6361..952d4bc5bdb 100644
--- a/src/devices/cpu/m68000/m68kcpu.cpp
+++ b/src/devices/cpu/m68000/m68kcpu.cpp
@@ -2307,7 +2307,7 @@ m68000_base_device::m68000_base_device(const machine_config &mconfig, std::strin
-m68000_base_device::m68000_base_device(const machine_config &mconfig, std::string name, std::string tag, device_t *owner, UINT32 clock,
+m68000_base_device::m68000_base_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock,
const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, address_map_constructor internal_map, std::string shortname, std::string source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_program_config("program", ENDIANNESS_BIG, prg_data_width, prg_address_bits, 0, internal_map),
@@ -2317,7 +2317,7 @@ m68000_base_device::m68000_base_device(const machine_config &mconfig, std::strin
}
-m68000_base_device::m68000_base_device(const machine_config &mconfig, std::string name, std::string tag, device_t *owner, UINT32 clock,
+m68000_base_device::m68000_base_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock,
const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, std::string shortname, std::string source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_program_config("program", ENDIANNESS_BIG, prg_data_width, prg_address_bits),
@@ -2548,7 +2548,7 @@ void m68000_device::device_start()
init_cpu_m68000();
}
-m68000_device::m68000_device(const machine_config &mconfig, std::string name, std::string tag, device_t *owner, UINT32 clock,
+m68000_device::m68000_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock,
const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, address_map_constructor internal_map, std::string shortname, std::string source)
: m68000_base_device(mconfig, name, tag, owner, clock, type, prg_data_width, prg_address_bits, internal_map, shortname, source)
{
@@ -2752,7 +2752,7 @@ fscpu32_device::fscpu32_device(const machine_config &mconfig, std::string tag, d
{
}
-fscpu32_device::fscpu32_device(const machine_config &mconfig, std::string name, std::string tag, device_t *owner, UINT32 clock,
+fscpu32_device::fscpu32_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock,
const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, address_map_constructor internal_map, std::string shortname, std::string source)
: m68000_base_device(mconfig, name, tag, owner, clock, type, prg_data_width, prg_address_bits, internal_map, shortname, source)
{
diff --git a/src/devices/cpu/m6809/m6809.cpp b/src/devices/cpu/m6809/m6809.cpp
index 6050761954e..27c367ba806 100644
--- a/src/devices/cpu/m6809/m6809.cpp
+++ b/src/devices/cpu/m6809/m6809.cpp
@@ -108,7 +108,7 @@ const device_type M6809E = &device_creator<m6809e_device>;
// m6809_base_device - constructor
//-------------------------------------------------
-m6809_base_device::m6809_base_device(const machine_config &mconfig, std::string name, std::string tag, device_t *owner, UINT32 clock, const device_type type, int divider, std::string shortname, std::string source)
+m6809_base_device::m6809_base_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock, const device_type type, int divider, std::string shortname, std::string source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_lic_func(*this),
m_program_config("program", ENDIANNESS_BIG, 8, 16),
diff --git a/src/devices/cpu/m6809/m6809.h b/src/devices/cpu/m6809/m6809.h
index 3923f837ebc..030f1ffb97b 100644
--- a/src/devices/cpu/m6809/m6809.h
+++ b/src/devices/cpu/m6809/m6809.h
@@ -32,7 +32,7 @@ class m6809_base_device : public cpu_device
{
public:
// construction/destruction
- m6809_base_device(const machine_config &mconfig, std::string name, std::string tag, device_t *owner, UINT32 clock, const device_type type, int divider, std::string shortname, std::string source);
+ m6809_base_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock, const device_type type, int divider, std::string shortname, std::string source);
DECLARE_WRITE_LINE_MEMBER( irq_line );
DECLARE_WRITE_LINE_MEMBER( firq_line );
diff --git a/src/devices/cpu/tms9900/tms9900.cpp b/src/devices/cpu/tms9900/tms9900.cpp
index 1590580c90b..f8d7bb2d795 100644
--- a/src/devices/cpu/tms9900/tms9900.cpp
+++ b/src/devices/cpu/tms9900/tms9900.cpp
@@ -168,7 +168,7 @@ enum
twice their number. Accordingly, the TMS9900 has a CRU bitmask 0x0fff.
****************************************************************************/
-tms99xx_device::tms99xx_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, int databus_width, int prg_addr_bits, int cru_addr_bits, device_t *owner, UINT32 clock, std::string shortname, std::string source)
+tms99xx_device::tms99xx_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, int databus_width, int prg_addr_bits, int cru_addr_bits, device_t *owner, UINT32 clock, std::string shortname, std::string source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_program_config("program", ENDIANNESS_BIG, databus_width, prg_addr_bits),
m_io_config("cru", ENDIANNESS_BIG, 8, cru_addr_bits),
diff --git a/src/devices/cpu/tms9900/tms9900.h b/src/devices/cpu/tms9900/tms9900.h
index 50632fa5fd0..215f56754f0 100644
--- a/src/devices/cpu/tms9900/tms9900.h
+++ b/src/devices/cpu/tms9900/tms9900.h
@@ -42,7 +42,7 @@ static const char opname[][5] =
class tms99xx_device : public cpu_device
{
public:
- tms99xx_device(const machine_config &mconfig, device_type type, std::string name,
+ tms99xx_device(const machine_config &mconfig, device_type type, const char *name,
std::string tag, int databus_width, int prg_addr_bits, int cru_addr_bits,
device_t *owner, UINT32 clock, std::string shortname, std::string source);
diff --git a/src/devices/machine/eeprom.cpp b/src/devices/machine/eeprom.cpp
index 8c049264ebe..5909d6781a1 100644
--- a/src/devices/machine/eeprom.cpp
+++ b/src/devices/machine/eeprom.cpp
@@ -44,8 +44,8 @@ ADDRESS_MAP_END
// eeprom_base_device - constructor
//-------------------------------------------------
-eeprom_base_device::eeprom_base_device(const machine_config &mconfig, device_type devtype, std::string name, std::string tag, device_t *owner, std::string shortname, std::string source)
- : device_t(mconfig, devtype, name, tag, owner, 0, shortname, source),
+eeprom_base_device::eeprom_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file)
+ : device_t(mconfig, devtype, name, tag, owner, 0, shortname, file),
device_memory_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
m_cells(0),
diff --git a/src/devices/machine/eeprom.h b/src/devices/machine/eeprom.h
index 3fc3a3c4d75..605ff258a07 100644
--- a/src/devices/machine/eeprom.h
+++ b/src/devices/machine/eeprom.h
@@ -49,7 +49,7 @@ class eeprom_base_device : public device_t,
{
protected:
// construction/destruction
- eeprom_base_device(const machine_config &mconfig, device_type devtype, std::string name, std::string tag, device_t *owner, std::string shortname, std::string source);
+ eeprom_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file);
public:
// timing constants
diff --git a/src/devices/machine/eeprompar.cpp b/src/devices/machine/eeprompar.cpp
index a03447f7cdc..df360f69b09 100644
--- a/src/devices/machine/eeprompar.cpp
+++ b/src/devices/machine/eeprompar.cpp
@@ -51,8 +51,8 @@
// eeprom_parallel_base_device - constructor
//-------------------------------------------------
-eeprom_parallel_base_device::eeprom_parallel_base_device(const machine_config &mconfig, device_type devtype, std::string name, std::string tag, device_t *owner, std::string shortname, std::string source)
- : eeprom_base_device(mconfig, devtype, name, tag, owner, shortname, source)
+eeprom_parallel_base_device::eeprom_parallel_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file)
+ : eeprom_base_device(mconfig, devtype, name, tag, owner, shortname, file)
{
}
@@ -88,8 +88,8 @@ void eeprom_parallel_base_device::device_reset()
// eeprom_parallel_28xx_device - constructor
//-------------------------------------------------
-eeprom_parallel_28xx_device::eeprom_parallel_28xx_device(const machine_config &mconfig, device_type devtype, std::string name, std::string tag, device_t *owner, std::string shortname, std::string source)
- : eeprom_parallel_base_device(mconfig, devtype, name, tag, owner, shortname, source)
+eeprom_parallel_28xx_device::eeprom_parallel_28xx_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file)
+ : eeprom_parallel_base_device(mconfig, devtype, name, tag, owner, shortname, file)
{
}
diff --git a/src/devices/machine/eeprompar.h b/src/devices/machine/eeprompar.h
index 723f896a534..814a1e5d674 100644
--- a/src/devices/machine/eeprompar.h
+++ b/src/devices/machine/eeprompar.h
@@ -51,7 +51,7 @@ class eeprom_parallel_base_device : public eeprom_base_device
{
protected:
// construction/destruction
- eeprom_parallel_base_device(const machine_config &mconfig, device_type devtype, std::string name, std::string tag, device_t *owner, std::string shortname, std::string source);
+ eeprom_parallel_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file);
protected:
// device-level overrides
@@ -67,7 +67,7 @@ class eeprom_parallel_28xx_device : public eeprom_parallel_base_device
{
protected:
// construction/destruction
- eeprom_parallel_28xx_device(const machine_config &mconfig, device_type devtype, std::string name, std::string tag, device_t *owner, std::string shortname, std::string source);
+ eeprom_parallel_28xx_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file);
public:
// read/write data lines - for now we cheat and ignore the control lines, assuming
diff --git a/src/devices/machine/eepromser.cpp b/src/devices/machine/eepromser.cpp
index 57787afa778..9419993bc29 100644
--- a/src/devices/machine/eepromser.cpp
+++ b/src/devices/machine/eepromser.cpp
@@ -143,8 +143,8 @@ ALLOW_SAVE_TYPE(eeprom_serial_base_device::eeprom_state);
// eeprom_serial_base_device - constructor
//-------------------------------------------------
-eeprom_serial_base_device::eeprom_serial_base_device(const machine_config &mconfig, device_type devtype, std::string name, std::string tag, device_t *owner, std::string shortname, std::string source)
- : eeprom_base_device(mconfig, devtype, name, tag, owner, shortname, source),
+eeprom_serial_base_device::eeprom_serial_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file)
+ : eeprom_base_device(mconfig, devtype, name, tag, owner, shortname, file),
m_command_address_bits(0),
m_streaming_enabled(false),
m_state(STATE_IN_RESET),
@@ -625,8 +625,8 @@ void eeprom_serial_base_device::execute_write_command()
// eeprom_serial_93cxx_device - constructor
//-------------------------------------------------
-eeprom_serial_93cxx_device::eeprom_serial_93cxx_device(const machine_config &mconfig, device_type devtype, std::string name, std::string tag, device_t *owner, std::string shortname, std::string source)
- : eeprom_serial_base_device(mconfig, devtype, name, tag, owner, shortname, source)
+eeprom_serial_93cxx_device::eeprom_serial_93cxx_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file)
+ : eeprom_serial_base_device(mconfig, devtype, name, tag, owner, shortname, file)
{
}
@@ -692,8 +692,8 @@ WRITE_LINE_MEMBER(eeprom_serial_93cxx_device::di_write) { base_di_write(state);
// eeprom_serial_er5911_device - constructor
//-------------------------------------------------
-eeprom_serial_er5911_device::eeprom_serial_er5911_device(const machine_config &mconfig, device_type devtype, std::string name, std::string tag, device_t *owner, std::string shortname, std::string source)
- : eeprom_serial_base_device(mconfig, devtype, name, tag, owner, shortname, source)
+eeprom_serial_er5911_device::eeprom_serial_er5911_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file)
+ : eeprom_serial_base_device(mconfig, devtype, name, tag, owner, shortname, file)
{
}
@@ -760,8 +760,8 @@ WRITE_LINE_MEMBER(eeprom_serial_er5911_device::di_write) { base_di_write(state);
// eeprom_serial_x24c44_device - constructor
//-------------------------------------------------
-eeprom_serial_x24c44_device::eeprom_serial_x24c44_device(const machine_config &mconfig, device_type devtype, std::string name, std::string tag, device_t *owner, std::string shortname, std::string source)
- : eeprom_serial_base_device(mconfig, devtype, name, tag, owner, shortname, source)
+eeprom_serial_x24c44_device::eeprom_serial_x24c44_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file)
+ : eeprom_serial_base_device(mconfig, devtype, name, tag, owner, shortname, file)
{
}
diff --git a/src/devices/machine/eepromser.h b/src/devices/machine/eepromser.h
index ac40db42b7d..84c20239572 100644
--- a/src/devices/machine/eepromser.h
+++ b/src/devices/machine/eepromser.h
@@ -85,7 +85,7 @@ class eeprom_serial_base_device : public eeprom_base_device
{
protected:
// construction/destruction
- eeprom_serial_base_device(const machine_config &mconfig, device_type devtype, std::string name, std::string tag, device_t *owner, std::string shortname, std::string source);
+ eeprom_serial_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file);
public:
// inline configuration helpers
@@ -178,7 +178,7 @@ class eeprom_serial_93cxx_device : public eeprom_serial_base_device
{
protected:
// construction/destruction
- eeprom_serial_93cxx_device(const machine_config &mconfig, device_type devtype, std::string name, std::string tag, device_t *owner, std::string shortname, std::string source);
+ eeprom_serial_93cxx_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file);
public:
// read handlers
@@ -201,7 +201,7 @@ class eeprom_serial_er5911_device : public eeprom_serial_base_device
{
protected:
// construction/destruction
- eeprom_serial_er5911_device(const machine_config &mconfig, device_type devtype, std::string name, std::string tag, device_t *owner, std::string shortname, std::string source);
+ eeprom_serial_er5911_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file);
public:
// read handlers
@@ -227,7 +227,7 @@ class eeprom_serial_x24c44_device : public eeprom_serial_base_device
//async store not implemented
protected:
// construction/destruction
- eeprom_serial_x24c44_device(const machine_config &mconfig, device_type devtype, std::string name, std::string tag, device_t *owner, std::string shortname, std::string source);
+ eeprom_serial_x24c44_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file);
public:
// read handlers
diff --git a/src/devices/machine/ins8250.cpp b/src/devices/machine/ins8250.cpp
index 6285eafee1e..7d6aa2a84e5 100644
--- a/src/devices/machine/ins8250.cpp
+++ b/src/devices/machine/ins8250.cpp
@@ -91,7 +91,7 @@ const device_type NS16450 = &device_creator<ns16450_device>;
const device_type NS16550 = &device_creator<ns16550_device>;
const device_type PC16552D = &device_creator<pc16552_device>;
-ins8250_uart_device::ins8250_uart_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname)
+ins8250_uart_device::ins8250_uart_device(const machine_config &mconfig, device_type type, const char* name, std::string tag, device_t *owner, UINT32 clock, const char *shortname)
: device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_serial_interface(mconfig, *this),
m_out_tx_cb(*this),
diff --git a/src/devices/machine/ins8250.h b/src/devices/machine/ins8250.h
index b17c4c74e85..af5c08dba15 100644
--- a/src/devices/machine/ins8250.h
+++ b/src/devices/machine/ins8250.h
@@ -19,7 +19,7 @@ class ins8250_uart_device : public device_t,
public device_serial_interface
{
public:
- ins8250_uart_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname);
+ ins8250_uart_device(const machine_config &mconfig, device_type type, const char* name, std::string tag, device_t *owner, UINT32 clock, const char *shortname);
template<class _Object> static devcb_base &set_out_tx_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_tx_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_dtr_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_dtr_cb.set_callback(object); }
diff --git a/src/devices/sound/sn76496.cpp b/src/devices/sound/sn76496.cpp
index de7eb143c08..53896d9221a 100644
--- a/src/devices/sound/sn76496.cpp
+++ b/src/devices/sound/sn76496.cpp
@@ -130,7 +130,7 @@
#define MAX_OUTPUT 0x7fff
-sn76496_base_device::sn76496_base_device(const machine_config &mconfig, device_type type, std::string name,
+sn76496_base_device::sn76496_base_device(const machine_config &mconfig, device_type type, const char *name,
std::string tag, int feedbackmask, int noisetap1, int noisetap2, bool negate, bool stereo, int clockdivider, int sega,
device_t *owner, UINT32 clock, std::string shortname, std::string source)
diff --git a/src/devices/sound/sn76496.h b/src/devices/sound/sn76496.h
index adb3ca262e9..f1659469aae 100644
--- a/src/devices/sound/sn76496.h
+++ b/src/devices/sound/sn76496.h
@@ -23,7 +23,7 @@ extern const device_type SEGAPSG;
class sn76496_base_device : public device_t, public device_sound_interface
{
public:
- sn76496_base_device(const machine_config &mconfig, device_type type, std::string name, std::string tag,
+ sn76496_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag,
int feedbackmask, int noisetap1, int noisetap2, bool negate, bool stereo, int clockdivider, int sega,
device_t *owner, UINT32 clock, std::string shortname, std::string source);
diff --git a/src/devices/video/v9938.cpp b/src/devices/video/v9938.cpp
index 25fa912e0b0..43a822b8678 100644
--- a/src/devices/video/v9938.cpp
+++ b/src/devices/video/v9938.cpp
@@ -88,7 +88,7 @@ const device_type V9938 = &device_creator<v9938_device>;
const device_type V9958 = &device_creator<v9958_device>;
-v99x8_device::v99x8_device(const machine_config &mconfig, device_type type, std::string name, std::string shortname, std::string tag, device_t *owner, UINT32 clock)
+v99x8_device::v99x8_device(const machine_config &mconfig, device_type type, std::string name, const char *shortname, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_memory_interface(mconfig, *this),
device_video_interface(mconfig, *this),
diff --git a/src/devices/video/v9938.h b/src/devices/video/v9938.h
index 881e05c866b..8db93e4b2bd 100644
--- a/src/devices/video/v9938.h
+++ b/src/devices/video/v9938.h
@@ -76,7 +76,7 @@ class v99x8_device : public device_t,
{
protected:
// construction/destruction
- v99x8_device(const machine_config &mconfig, device_type type, std::string name, std::string shortname, std::string tag, device_t *owner, UINT32 clock);
+ v99x8_device(const machine_config &mconfig, device_type type, std::string name, const char *shortname, std::string tag, device_t *owner, UINT32 clock);
public:
template<class _irq> void set_interrupt_callback(_irq irq) {
diff --git a/src/mame/machine/atarigen.cpp b/src/mame/machine/atarigen.cpp
index ab4468bbef2..653f88b2f82 100644
--- a/src/mame/machine/atarigen.cpp
+++ b/src/mame/machine/atarigen.cpp
@@ -830,8 +830,8 @@ const device_type ATARI_EEPROM_2816 = &device_creator<atari_eeprom_2816_device>;
// atari_eeprom_device - constructor
//-------------------------------------------------
-atari_eeprom_device::atari_eeprom_device(const machine_config &mconfig, device_type devtype, std::string name, std::string tag, device_t *owner, std::string shortname, std::string source)
- : device_t(mconfig, devtype, name, tag, owner, 0, shortname, source),
+atari_eeprom_device::atari_eeprom_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file)
+ : device_t(mconfig, devtype, name, tag, owner, 0, shortname, file),
m_eeprom(*this, "eeprom"),
m_unlocked(false)
{
diff --git a/src/mame/machine/atarigen.h b/src/mame/machine/atarigen.h
index 7365485f89c..072d0a8f925 100644
--- a/src/mame/machine/atarigen.h
+++ b/src/mame/machine/atarigen.h
@@ -265,7 +265,7 @@ class atari_eeprom_device : public device_t
{
protected:
// construction/destruction
- atari_eeprom_device(const machine_config &mconfig, device_type devtype, std::string name, std::string tag, device_t *owner, std::string shortname, std::string source);
+ atari_eeprom_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file);
public:
// unlock controls
diff --git a/src/mame/machine/namcoio.cpp b/src/mame/machine/namcoio.cpp
index 5cee426e60b..cb625654004 100644
--- a/src/mame/machine/namcoio.cpp
+++ b/src/mame/machine/namcoio.cpp
@@ -122,7 +122,7 @@ const device_type NAMCO56XX = &device_creator<namco56xx_device>;
const device_type NAMCO58XX = &device_creator<namco58xx_device>;
const device_type NAMCO59XX = &device_creator<namco59xx_device>;
-namcoio_device::namcoio_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname)
+namcoio_device::namcoio_device(const machine_config &mconfig, device_type type, const char* name, std::string tag, device_t *owner, UINT32 clock, const char *shortname)
: device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
m_in_0_cb(*this),
m_in_1_cb(*this),
diff --git a/src/mame/machine/namcoio.h b/src/mame/machine/namcoio.h
index 8930db0a2d0..db18a9eb976 100644
--- a/src/mame/machine/namcoio.h
+++ b/src/mame/machine/namcoio.h
@@ -11,7 +11,7 @@
class namcoio_device : public device_t
{
public:
- namcoio_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname);
+ namcoio_device(const machine_config &mconfig, device_type type, const char* name, std::string tag, device_t *owner, UINT32 clock, const char *shortname);
template<class _Object> static devcb_base &set_in_0_callback(device_t &device, _Object object) { return downcast<namcoio_device &>(device).m_in_0_cb.set_callback(object); }
template<class _Object> static devcb_base &set_in_1_callback(device_t &device, _Object object) { return downcast<namcoio_device &>(device).m_in_1_cb.set_callback(object); }
diff --git a/src/mame/video/tia.cpp b/src/mame/video/tia.cpp
index 88e2270be95..31fb8923a6a 100644
--- a/src/mame/video/tia.cpp
+++ b/src/mame/video/tia.cpp
@@ -351,7 +351,7 @@ PALETTE_INIT_MEMBER(tia_pal_video_device, tia_pal)
extend_palette( palette );
}
-tia_video_device::tia_video_device(const machine_config &mconfig, device_type type, std::string name, std::string shortname, std::string tag, device_t *owner, UINT32 clock)
+tia_video_device::tia_video_device(const machine_config &mconfig, device_type type, std::string name, const char *shortname, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_video_interface(mconfig, *this),
m_read_input_port_cb(*this),
diff --git a/src/mame/video/tia.h b/src/mame/video/tia.h
index 12c9a10943e..22419753503 100644
--- a/src/mame/video/tia.h
+++ b/src/mame/video/tia.h
@@ -61,7 +61,7 @@ public:
protected:
// construction/destruction
- tia_video_device(const machine_config &mconfig, device_type type, std::string name, std::string shortname, std::string tag, device_t *owner, UINT32 clock);
+ tia_video_device(const machine_config &mconfig, device_type type, std::string name, const char *shortname, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;