summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/video
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-01-20 21:42:13 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2016-01-20 21:42:13 +0100
commit4e8e3066f847cc0fa11539f4d9ab8a63f70ca475 (patch)
tree25d48b50f2b89dd5b9e7dbbfeeb85c534ec6852a /src/devices/video
parent3a8ccb89b426509be06089a19c51ecf55567ed1b (diff)
reverting:
SHA-1: 1f90ceab075c4869298e963bf0a14a0aac2f1caa * tags are now strings (nw) fix start project for custom builds in Visual Studio (nw)
Diffstat (limited to 'src/devices/video')
-rw-r--r--src/devices/video/315_5124.cpp10
-rw-r--r--src/devices/video/315_5124.h8
-rw-r--r--src/devices/video/315_5313.cpp4
-rw-r--r--src/devices/video/315_5313.h4
-rw-r--r--src/devices/video/bufsprite.h10
-rw-r--r--src/devices/video/cdp1861.cpp2
-rw-r--r--src/devices/video/cdp1861.h2
-rw-r--r--src/devices/video/cdp1862.cpp2
-rw-r--r--src/devices/video/cdp1862.h2
-rw-r--r--src/devices/video/clgd542x.cpp6
-rw-r--r--src/devices/video/clgd542x.h6
-rw-r--r--src/devices/video/crt9007.cpp110
-rw-r--r--src/devices/video/crt9007.h2
-rw-r--r--src/devices/video/crt9021.cpp6
-rw-r--r--src/devices/video/crt9021.h2
-rw-r--r--src/devices/video/crt9212.cpp2
-rw-r--r--src/devices/video/crt9212.h2
-rw-r--r--src/devices/video/crtc_ega.cpp2
-rw-r--r--src/devices/video/crtc_ega.h2
-rw-r--r--src/devices/video/dl1416.cpp6
-rw-r--r--src/devices/video/dl1416.h6
-rw-r--r--src/devices/video/dm9368.cpp6
-rw-r--r--src/devices/video/dm9368.h2
-rw-r--r--src/devices/video/ef9340_1.cpp2
-rw-r--r--src/devices/video/ef9340_1.h2
-rw-r--r--src/devices/video/ef9345.cpp4
-rw-r--r--src/devices/video/ef9345.h4
-rw-r--r--src/devices/video/ef9365.cpp6
-rw-r--r--src/devices/video/ef9365.h4
-rw-r--r--src/devices/video/epic12.cpp2
-rw-r--r--src/devices/video/epic12.h2
-rw-r--r--src/devices/video/fixfreq.cpp4
-rw-r--r--src/devices/video/fixfreq.h4
-rw-r--r--src/devices/video/gf4500.cpp2
-rw-r--r--src/devices/video/gf4500.h2
-rw-r--r--src/devices/video/gf7600gs.cpp2
-rw-r--r--src/devices/video/gf7600gs.h2
-rw-r--r--src/devices/video/h63484.cpp66
-rw-r--r--src/devices/video/h63484.h2
-rw-r--r--src/devices/video/hd44102.cpp16
-rw-r--r--src/devices/video/hd44102.h2
-rw-r--r--src/devices/video/hd44352.cpp2
-rw-r--r--src/devices/video/hd44352.h2
-rw-r--r--src/devices/video/hd44780.cpp32
-rw-r--r--src/devices/video/hd44780.h6
-rw-r--r--src/devices/video/hd61830.cpp46
-rw-r--r--src/devices/video/hd61830.h2
-rw-r--r--src/devices/video/hd63484.cpp2
-rw-r--r--src/devices/video/hd63484.h2
-rw-r--r--src/devices/video/hd66421.cpp2
-rw-r--r--src/devices/video/hd66421.h2
-rw-r--r--src/devices/video/huc6202.cpp2
-rw-r--r--src/devices/video/huc6202.h2
-rw-r--r--src/devices/video/huc6260.cpp2
-rw-r--r--src/devices/video/huc6260.h2
-rw-r--r--src/devices/video/huc6261.cpp8
-rw-r--r--src/devices/video/huc6261.h10
-rw-r--r--src/devices/video/huc6270.cpp2
-rw-r--r--src/devices/video/huc6270.h2
-rw-r--r--src/devices/video/huc6272.cpp2
-rw-r--r--src/devices/video/huc6272.h2
-rw-r--r--src/devices/video/i8244.cpp6
-rw-r--r--src/devices/video/i8244.h6
-rw-r--r--src/devices/video/i82730.cpp6
-rw-r--r--src/devices/video/i82730.h6
-rw-r--r--src/devices/video/i8275.cpp42
-rw-r--r--src/devices/video/i8275.h2
-rw-r--r--src/devices/video/m50458.cpp2
-rw-r--r--src/devices/video/m50458.h2
-rw-r--r--src/devices/video/mb90082.cpp2
-rw-r--r--src/devices/video/mb90082.h2
-rw-r--r--src/devices/video/mb_vcu.cpp4
-rw-r--r--src/devices/video/mb_vcu.h6
-rw-r--r--src/devices/video/mc6845.cpp30
-rw-r--r--src/devices/video/mc6845.h30
-rw-r--r--src/devices/video/mc6847.cpp22
-rw-r--r--src/devices/video/mc6847.h20
-rw-r--r--src/devices/video/mos6566.cpp20
-rw-r--r--src/devices/video/mos6566.h22
-rw-r--r--src/devices/video/msm6222b.cpp6
-rw-r--r--src/devices/video/msm6222b.h6
-rw-r--r--src/devices/video/msm6255.cpp2
-rw-r--r--src/devices/video/msm6255.h2
-rw-r--r--src/devices/video/pc_vga.cpp26
-rw-r--r--src/devices/video/pc_vga.h28
-rw-r--r--src/devices/video/psx.cpp14
-rw-r--r--src/devices/video/psx.h14
-rw-r--r--src/devices/video/ramdac.cpp4
-rw-r--r--src/devices/video/ramdac.h4
-rw-r--r--src/devices/video/saa5050.cpp18
-rw-r--r--src/devices/video/saa5050.h18
-rw-r--r--src/devices/video/scn2674.cpp2
-rw-r--r--src/devices/video/scn2674.h2
-rw-r--r--src/devices/video/sed1200.cpp10
-rw-r--r--src/devices/video/sed1200.h10
-rw-r--r--src/devices/video/sed1330.cpp124
-rw-r--r--src/devices/video/sed1330.h2
-rw-r--r--src/devices/video/sed1520.cpp4
-rw-r--r--src/devices/video/sed1520.h2
-rw-r--r--src/devices/video/snes_ppu.cpp2
-rw-r--r--src/devices/video/snes_ppu.h2
-rw-r--r--src/devices/video/stvvdp1.cpp2
-rw-r--r--src/devices/video/t6a04.cpp2
-rw-r--r--src/devices/video/t6a04.h2
-rw-r--r--src/devices/video/tea1002.cpp2
-rw-r--r--src/devices/video/tea1002.h2
-rw-r--r--src/devices/video/tlc34076.cpp2
-rw-r--r--src/devices/video/tlc34076.h2
-rw-r--r--src/devices/video/tms34061.cpp2
-rw-r--r--src/devices/video/tms34061.h2
-rw-r--r--src/devices/video/tms3556.cpp2
-rw-r--r--src/devices/video/tms3556.h2
-rw-r--r--src/devices/video/tms9927.cpp14
-rw-r--r--src/devices/video/tms9927.h14
-rw-r--r--src/devices/video/tms9928a.cpp24
-rw-r--r--src/devices/video/tms9928a.h18
-rw-r--r--src/devices/video/upd3301.cpp66
-rw-r--r--src/devices/video/upd3301.h2
-rw-r--r--src/devices/video/upd7220.cpp94
-rw-r--r--src/devices/video/upd7220.h2
-rw-r--r--src/devices/video/upd7227.cpp2
-rw-r--r--src/devices/video/upd7227.h2
-rw-r--r--src/devices/video/v9938.cpp6
-rw-r--r--src/devices/video/v9938.h6
-rw-r--r--src/devices/video/vic4567.cpp2
-rw-r--r--src/devices/video/vic4567.h4
-rw-r--r--src/devices/video/voodoo.cpp18
-rw-r--r--src/devices/video/voodoo.h20
-rw-r--r--src/devices/video/voodoo_pci.cpp8
-rw-r--r--src/devices/video/voodoo_pci.h6
130 files changed, 665 insertions, 661 deletions
diff --git a/src/devices/video/315_5124.cpp b/src/devices/video/315_5124.cpp
index 90f3eae1fa1..399f48e9b26 100644
--- a/src/devices/video/315_5124.cpp
+++ b/src/devices/video/315_5124.cpp
@@ -160,7 +160,7 @@ static ADDRESS_MAP_START( sega315_5124, AS_0, 8, sega315_5124_device )
ADDRESS_MAP_END
-sega315_5124_device::sega315_5124_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+sega315_5124_device::sega315_5124_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t( mconfig, SEGA315_5124, "Sega 315-5124 VDP", tag, owner, clock, "sega315_5124", __FILE__)
, device_memory_interface(mconfig, *this)
, device_video_interface(mconfig, *this)
@@ -176,7 +176,7 @@ sega315_5124_device::sega315_5124_device(const machine_config &mconfig, std::str
}
-sega315_5124_device::sega315_5124_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 cram_size, UINT8 palette_offset, bool supports_224_240, const char *shortname, const char *source)
+sega315_5124_device::sega315_5124_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT8 cram_size, UINT8 palette_offset, bool supports_224_240, const char *shortname, const char *source)
: device_t( mconfig, type, name, tag, owner, clock, shortname, source)
, device_memory_interface(mconfig, *this)
, device_video_interface(mconfig, *this)
@@ -192,13 +192,13 @@ sega315_5124_device::sega315_5124_device(const machine_config &mconfig, device_t
}
-sega315_5246_device::sega315_5246_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+sega315_5246_device::sega315_5246_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: sega315_5124_device( mconfig, SEGA315_5246, "Sega 315-5246 VDP", tag, owner, clock, SEGA315_5124_CRAM_SIZE, 0, true, "sega315_5246", __FILE__)
{
}
-sega315_5378_device::sega315_5378_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+sega315_5378_device::sega315_5378_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: sega315_5124_device( mconfig, SEGA315_5378, "Sega 315-5378 VDP", tag, owner, clock, SEGA315_5378_CRAM_SIZE, 0x10, true, "sega315_5378", __FILE__)
{
}
@@ -690,7 +690,7 @@ WRITE8_MEMBER( sega315_5124_device::register_write )
case 2: /* VDP register write */
reg_num = data & 0x0f;
m_reg[reg_num] = m_addr & 0xff;
- //logerror("%s: %s: setting register %x to %02x\n", machine().describe_context(), tag().c_str(), reg_num, m_addr & 0xff);
+ //logerror("%s: %s: setting register %x to %02x\n", machine().describe_context(), tag(), reg_num, m_addr & 0xff);
switch (reg_num)
{
diff --git a/src/devices/video/315_5124.h b/src/devices/video/315_5124.h
index 8d54f34a2e4..9c2f2484209 100644
--- a/src/devices/video/315_5124.h
+++ b/src/devices/video/315_5124.h
@@ -60,8 +60,8 @@ class sega315_5124_device : public device_t,
{
public:
// construction/destruction
- sega315_5124_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- sega315_5124_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 cram_size, UINT8 palette_offset, bool supports_224_240, const char *shortname, const char *source);
+ sega315_5124_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega315_5124_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT8 cram_size, UINT8 palette_offset, bool supports_224_240, const char *shortname, const char *source);
static void set_signal_type(device_t &device, bool is_pal) { downcast<sega315_5124_device &>(device).m_is_pal = is_pal; }
@@ -185,7 +185,7 @@ protected:
class sega315_5246_device : public sega315_5124_device
{
public:
- sega315_5246_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ sega315_5246_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual UINT16 get_name_table_row(int row) override;
@@ -195,7 +195,7 @@ protected:
class sega315_5378_device : public sega315_5124_device
{
public:
- sega315_5378_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ sega315_5378_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_PALETTE_INIT( sega315_5378 );
diff --git a/src/devices/video/315_5313.cpp b/src/devices/video/315_5313.cpp
index d123db5a236..22b63f36d5b 100644
--- a/src/devices/video/315_5313.cpp
+++ b/src/devices/video/315_5313.cpp
@@ -14,7 +14,7 @@
const device_type SEGA315_5313 = &device_creator<sega315_5313_device>;
-sega315_5313_device::sega315_5313_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+sega315_5313_device::sega315_5313_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: sega315_5124_device(mconfig, SEGA315_5313, "Sega 315-5313 Megadrive VDP", tag, owner, clock, SEGA315_5124_CRAM_SIZE, 0, true, "sega315_5313", __FILE__), m_render_bitmap(nullptr),
m_render_line(nullptr), m_render_line_raw(nullptr), m_megadriv_scanline_timer(nullptr),
m_sndirqline_callback(*this),
@@ -35,7 +35,7 @@ sega315_5313_device::sega315_5313_device(const machine_config &mconfig, std::str
// palette device
//-------------------------------------------------
-void sega315_5313_device::static_set_palette_tag(device_t &device, std::string tag)
+void sega315_5313_device::static_set_palette_tag(device_t &device, const char *tag)
{
downcast<sega315_5313_device &>(device).m_palette.set_tag(tag);
}
diff --git a/src/devices/video/315_5313.h b/src/devices/video/315_5313.h
index 266e413f4c8..d7ca05ee2e6 100644
--- a/src/devices/video/315_5313.h
+++ b/src/devices/video/315_5313.h
@@ -192,14 +192,14 @@ typedef device_delegate<void (int scanline)> md_32x_scanline_helper_delegate;
class sega315_5313_device : public sega315_5124_device
{
public:
- sega315_5313_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ sega315_5313_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_sndirqline_callback(device_t &device, _Object object) { return downcast<sega315_5313_device &>(device).m_sndirqline_callback.set_callback(object); }
template<class _Object> static devcb_base &set_lv6irqline_callback(device_t &device, _Object object) { return downcast<sega315_5313_device &>(device).m_lv6irqline_callback.set_callback(object); }
template<class _Object> static devcb_base &set_lv4irqline_callback(device_t &device, _Object object) { return downcast<sega315_5313_device &>(device).m_lv4irqline_callback.set_callback(object); }
static void set_alt_timing(device_t &device, int use_alt_timing);
static void set_palwrite_base(device_t &device, int palwrite_base);
- static void static_set_palette_tag(device_t &device, std::string tag);
+ static void static_set_palette_tag(device_t &device, const char *tag);
static void set_md_32x_scanline(device_t &device, md_32x_scanline_delegate callback) { downcast<sega315_5313_device &>(device).m_32x_scanline_func = callback; }
static void set_md_32x_interrupt(device_t &device, md_32x_interrupt_delegate callback) { downcast<sega315_5313_device &>(device).m_32x_interrupt_func = callback; }
diff --git a/src/devices/video/bufsprite.h b/src/devices/video/bufsprite.h
index 1b110733c30..3a75f5a14f6 100644
--- a/src/devices/video/bufsprite.h
+++ b/src/devices/video/bufsprite.h
@@ -53,7 +53,7 @@ class buffered_spriteram_device : public device_t
{
public:
// construction
- buffered_spriteram_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock)
+ buffered_spriteram_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, type, "Buffered Sprite RAM", tag, owner, clock, "buffered_spriteram", __FILE__),
m_spriteram(*owner, tag) { }
@@ -102,7 +102,7 @@ class buffered_spriteram8_device : public buffered_spriteram_device<UINT8>
{
public:
// construction
- buffered_spriteram8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ buffered_spriteram8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: buffered_spriteram_device<UINT8>(mconfig, BUFFERED_SPRITERAM8, tag, owner, clock) { }
};
@@ -113,7 +113,7 @@ class buffered_spriteram16_device : public buffered_spriteram_device<UINT16>
{
public:
// construction
- buffered_spriteram16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ buffered_spriteram16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: buffered_spriteram_device<UINT16>(mconfig, BUFFERED_SPRITERAM16, tag, owner, clock) { }
};
@@ -124,7 +124,7 @@ class buffered_spriteram32_device : public buffered_spriteram_device<UINT32>
{
public:
// construction
- buffered_spriteram32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ buffered_spriteram32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: buffered_spriteram_device<UINT32>(mconfig, BUFFERED_SPRITERAM32, tag, owner, clock) { }
};
@@ -135,7 +135,7 @@ class buffered_spriteram64_device : public buffered_spriteram_device<UINT64>
{
public:
// construction
- buffered_spriteram64_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ buffered_spriteram64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: buffered_spriteram_device<UINT64>(mconfig, BUFFERED_SPRITERAM64, tag, owner, clock) { }
};
diff --git a/src/devices/video/cdp1861.cpp b/src/devices/video/cdp1861.cpp
index 8f020d7f3d1..a02309decca 100644
--- a/src/devices/video/cdp1861.cpp
+++ b/src/devices/video/cdp1861.cpp
@@ -38,7 +38,7 @@ const device_type CDP1861 = &device_creator<cdp1861_device>;
// cdp1861_device - constructor
//-------------------------------------------------
-cdp1861_device::cdp1861_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+cdp1861_device::cdp1861_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CDP1861, "CDP1861", tag, owner, clock, "cdp1861", __FILE__),
device_video_interface(mconfig, *this),
m_write_irq(*this),
diff --git a/src/devices/video/cdp1861.h b/src/devices/video/cdp1861.h
index 11aa46ceb70..08b76bd59cc 100644
--- a/src/devices/video/cdp1861.h
+++ b/src/devices/video/cdp1861.h
@@ -93,7 +93,7 @@ class cdp1861_device : public device_t,
{
public:
// construction/destruction
- cdp1861_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ cdp1861_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<cdp1861_device &>(device).m_write_irq.set_callback(object); }
template<class _Object> static devcb_base &set_dma_out_wr_callback(device_t &device, _Object object) { return downcast<cdp1861_device &>(device).m_write_dma_out.set_callback(object); }
diff --git a/src/devices/video/cdp1862.cpp b/src/devices/video/cdp1862.cpp
index aa3ddbe9d59..e75cb66c888 100644
--- a/src/devices/video/cdp1862.cpp
+++ b/src/devices/video/cdp1862.cpp
@@ -75,7 +75,7 @@ inline void cdp1862_device::initialize_palette()
// cdp1862_device - constructor
//-------------------------------------------------
-cdp1862_device::cdp1862_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+cdp1862_device::cdp1862_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CDP1862, "CDP1862", tag, owner, clock, "cdp1862", __FILE__),
device_video_interface(mconfig, *this),
m_read_rd(*this),
diff --git a/src/devices/video/cdp1862.h b/src/devices/video/cdp1862.h
index 9e1198453d5..36e04689500 100644
--- a/src/devices/video/cdp1862.h
+++ b/src/devices/video/cdp1862.h
@@ -70,7 +70,7 @@ class cdp1862_device : public device_t,
{
public:
// construction/destruction
- cdp1862_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ cdp1862_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_rd_rd_callback(device_t &device, _Object object) { return downcast<cdp1862_device &>(device).m_read_rd.set_callback(object); }
template<class _Object> static devcb_base &set_bd_rd_callback(device_t &device, _Object object) { return downcast<cdp1862_device &>(device).m_read_bd.set_callback(object); }
diff --git a/src/devices/video/clgd542x.cpp b/src/devices/video/clgd542x.cpp
index 89a356148af..f7950c879a9 100644
--- a/src/devices/video/clgd542x.cpp
+++ b/src/devices/video/clgd542x.cpp
@@ -41,17 +41,17 @@ const device_type CIRRUS_GD5428 = &device_creator<cirrus_gd5428_device>;
const device_type CIRRUS_GD5430 = &device_creator<cirrus_gd5430_device>;
-cirrus_gd5428_device::cirrus_gd5428_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+cirrus_gd5428_device::cirrus_gd5428_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: svga_device(mconfig, CIRRUS_GD5428, "Cirrus Logic GD5428", tag, owner, clock, "clgd5428", __FILE__)
{
}
-cirrus_gd5428_device::cirrus_gd5428_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+cirrus_gd5428_device::cirrus_gd5428_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: svga_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-cirrus_gd5430_device::cirrus_gd5430_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+cirrus_gd5430_device::cirrus_gd5430_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: cirrus_gd5428_device(mconfig, CIRRUS_GD5430, "Cirrus Logic GD5430", tag, owner, clock, "clgd5430", __FILE__)
{
}
diff --git a/src/devices/video/clgd542x.h b/src/devices/video/clgd542x.h
index 03ebe0d206a..ba9b442b360 100644
--- a/src/devices/video/clgd542x.h
+++ b/src/devices/video/clgd542x.h
@@ -16,8 +16,8 @@ class cirrus_gd5428_device : public svga_device
{
public:
// construction/destruction
- cirrus_gd5428_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- cirrus_gd5428_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ cirrus_gd5428_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cirrus_gd5428_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual READ8_MEMBER(port_03c0_r) override;
virtual WRITE8_MEMBER(port_03c0_w) override;
virtual READ8_MEMBER(port_03b0_r) override;
@@ -104,7 +104,7 @@ private:
class cirrus_gd5430_device : public cirrus_gd5428_device
{
public:
- cirrus_gd5430_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ cirrus_gd5430_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
};
diff --git a/src/devices/video/crt9007.cpp b/src/devices/video/crt9007.cpp
index 33aa1888535..84ec673ec8b 100644
--- a/src/devices/video/crt9007.cpp
+++ b/src/devices/video/crt9007.cpp
@@ -253,7 +253,7 @@ inline void crt9007_t::trigger_interrupt(int line)
if (!(status & STATUS_INTERRUPT_PENDING))
{
- if (LOG) logerror("CRT9007 '%s' INT 1\n", tag().c_str());
+ if (LOG) logerror("CRT9007 '%s' INT 1\n", tag());
m_write_int(ASSERT_LINE);
}
}
@@ -276,7 +276,7 @@ inline void crt9007_t::update_cblank_line()
{
m_cblank = cblank;
- if (LOG) logerror("CRT9007 '%s' y %03u x %04u : CBLANK %u\n", tag().c_str(), y, x, m_cblank);
+ if (LOG) logerror("CRT9007 '%s' y %03u x %04u : CBLANK %u\n", tag(), y, x, m_cblank);
m_write_cblank(m_cblank);
}
@@ -428,8 +428,8 @@ inline void crt9007_t::recompute_parameters()
//if (LOG)
//{
- // logerror("CRT9007 '%s' Screen: %u x %u @ %f Hz\n", tag().c_str(), horiz_pix_total, vert_pix_total, 1 / ATTOSECONDS_TO_DOUBLE(refresh));
- // logerror("CRT9007 '%s' Visible Area: (%u, %u) - (%u, %u)\n", tag().c_str(), visarea.min_x, visarea.min_y, visarea.max_x, visarea.max_y);
+ // logerror("CRT9007 '%s' Screen: %u x %u @ %f Hz\n", tag(), horiz_pix_total, vert_pix_total, 1 / ATTOSECONDS_TO_DOUBLE(refresh));
+ // logerror("CRT9007 '%s' Visible Area: (%u, %u) - (%u, %u)\n", tag(), visarea.min_x, visarea.min_y, visarea.max_x, visarea.max_y);
//}
//m_screen->configure(horiz_pix_total, vert_pix_total, visarea, refresh);
@@ -449,7 +449,7 @@ inline void crt9007_t::recompute_parameters()
// crt9007_t - constructor
//-------------------------------------------------
-crt9007_t::crt9007_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+crt9007_t::crt9007_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CRT9007, "SMC CRT9007", tag, owner, clock, "crt9007", __FILE__),
device_memory_interface(mconfig, *this),
device_video_interface(mconfig, *this),
@@ -571,7 +571,7 @@ void crt9007_t::device_timer(emu_timer &timer, device_timer_id id, int param, vo
case TIMER_HSYNC:
m_hs = param;
- if (LOG) logerror("CRT9007 '%s' y %03u x %04u : HS %u\n", tag().c_str(), y, x, m_hs);
+ if (LOG) logerror("CRT9007 '%s' y %03u x %04u : HS %u\n", tag(), y, x, m_hs);
m_write_hs(m_hs);
@@ -583,7 +583,7 @@ void crt9007_t::device_timer(emu_timer &timer, device_timer_id id, int param, vo
case TIMER_VSYNC:
m_vs = param;
- if (LOG) logerror("CRT9007 '%s' y %03u x %04u : VS %u\n", tag().c_str(), y, x, m_vs);
+ if (LOG) logerror("CRT9007 '%s' y %03u x %04u : VS %u\n", tag(), y, x, m_vs);
m_write_vs(param);
@@ -605,7 +605,7 @@ void crt9007_t::device_timer(emu_timer &timer, device_timer_id id, int param, vo
case TIMER_VLT:
m_vlt = param;
- if (LOG) logerror("CRT9007 '%s' y %03u x %04u : VLT %u\n", tag().c_str(), y, x, m_vlt);
+ if (LOG) logerror("CRT9007 '%s' y %03u x %04u : VLT %u\n", tag(), y, x, m_vlt);
m_write_vlt(param);
@@ -613,7 +613,7 @@ void crt9007_t::device_timer(emu_timer &timer, device_timer_id id, int param, vo
break;
case TIMER_CURS:
- if (LOG) logerror("CRT9007 '%s' y %03u x %04u : CURS %u\n", tag().c_str(), y, x, param);
+ if (LOG) logerror("CRT9007 '%s' y %03u x %04u : CURS %u\n", tag(), y, x, param);
m_write_curs(param);
@@ -623,7 +623,7 @@ void crt9007_t::device_timer(emu_timer &timer, device_timer_id id, int param, vo
case TIMER_DRB:
m_drb = param;
- if (LOG) logerror("CRT9007 '%s' y %03u x %04u : DRB %u\n", tag().c_str(), y, x, m_drb);
+ if (LOG) logerror("CRT9007 '%s' y %03u x %04u : DRB %u\n", tag(), y, x, m_drb);
m_write_drb(param);
@@ -635,7 +635,7 @@ void crt9007_t::device_timer(emu_timer &timer, device_timer_id id, int param, vo
m_dma_delay = DMA_BURST_DELAY;
m_dmar = 1;
- if (LOG) logerror("CRT9007 '%s' DMAR 1\n", tag().c_str());
+ if (LOG) logerror("CRT9007 '%s' DMAR 1\n", tag());
m_write_dmar(ASSERT_LINE);
}
@@ -673,12 +673,12 @@ READ8_MEMBER( crt9007_t::read )
switch (offset)
{
case 0x15:
- if (LOG) logerror("CRT9007 '%s' Start\n", tag().c_str());
+ if (LOG) logerror("CRT9007 '%s' Start\n", tag());
m_disp = 1;
break;
case 0x16:
- if (LOG) logerror("CRT9007 '%s' Reset\n", tag().c_str());
+ if (LOG) logerror("CRT9007 '%s' Reset\n", tag());
device_reset();
break;
@@ -695,7 +695,7 @@ READ8_MEMBER( crt9007_t::read )
// reset interrupt pending bit
m_status &= ~STATUS_INTERRUPT_PENDING;
- if (LOG) logerror("CRT9007 '%s' INT 0\n", tag().c_str());
+ if (LOG) logerror("CRT9007 '%s' INT 0\n", tag());
m_write_int(CLEAR_LINE);
break;
@@ -711,7 +711,7 @@ READ8_MEMBER( crt9007_t::read )
break;
default:
- logerror("CRT9007 '%s' Read from Invalid Register: %02x!\n", tag().c_str(), offset);
+ logerror("CRT9007 '%s' Read from Invalid Register: %02x!\n", tag(), offset);
}
return data;
@@ -730,75 +730,75 @@ WRITE8_MEMBER( crt9007_t::write )
{
case 0x00:
recompute_parameters();
- if (LOG) logerror("CRT9007 '%s' Characters per Horizontal Period: %u\n", tag().c_str(), CHARACTERS_PER_HORIZONTAL_PERIOD);
+ if (LOG) logerror("CRT9007 '%s' Characters per Horizontal Period: %u\n", tag(), CHARACTERS_PER_HORIZONTAL_PERIOD);
break;
case 0x01:
recompute_parameters();
- if (LOG) logerror("CRT9007 '%s' Characters per Data Row: %u\n", tag().c_str(), CHARACTERS_PER_DATA_ROW);
+ if (LOG) logerror("CRT9007 '%s' Characters per Data Row: %u\n", tag(), CHARACTERS_PER_DATA_ROW);
break;
case 0x02:
recompute_parameters();
- if (LOG) logerror("CRT9007 '%s' Horizontal Delay: %u\n", tag().c_str(), HORIZONTAL_DELAY);
+ if (LOG) logerror("CRT9007 '%s' Horizontal Delay: %u\n", tag(), HORIZONTAL_DELAY);
break;
case 0x03:
recompute_parameters();
- if (LOG) logerror("CRT9007 '%s' Horizontal Sync Width: %u\n", tag().c_str(), HORIZONTAL_SYNC_WIDTH);
+ if (LOG) logerror("CRT9007 '%s' Horizontal Sync Width: %u\n", tag(), HORIZONTAL_SYNC_WIDTH);
break;
case 0x04:
recompute_parameters();
- if (LOG) logerror("CRT9007 '%s' Vertical Sync Width: %u\n", tag().c_str(), VERTICAL_SYNC_WIDTH);
+ if (LOG) logerror("CRT9007 '%s' Vertical Sync Width: %u\n", tag(), VERTICAL_SYNC_WIDTH);
break;
case 0x05:
recompute_parameters();
- if (LOG) logerror("CRT9007 '%s' Vertical Delay: %u\n", tag().c_str(), VERTICAL_DELAY);
+ if (LOG) logerror("CRT9007 '%s' Vertical Delay: %u\n", tag(), VERTICAL_DELAY);
break;
case 0x06:
recompute_parameters();
if (LOG)
{
- logerror("CRT9007 '%s' Pin Configuration: %u\n", tag().c_str(), PIN_CONFIGURATION);
- logerror("CRT9007 '%s' Cursor Skew: %u\n", tag().c_str(), CURSOR_SKEW);
- logerror("CRT9007 '%s' Blank Skew: %u\n", tag().c_str(), BLANK_SKEW);
+ logerror("CRT9007 '%s' Pin Configuration: %u\n", tag(), PIN_CONFIGURATION);
+ logerror("CRT9007 '%s' Cursor Skew: %u\n", tag(), CURSOR_SKEW);
+ logerror("CRT9007 '%s' Blank Skew: %u\n", tag(), BLANK_SKEW);
}
break;
case 0x07:
recompute_parameters();
- if (LOG) logerror("CRT9007 '%s' Visible Data Rows per Frame: %u\n", tag().c_str(), VISIBLE_DATA_ROWS_PER_FRAME);
+ if (LOG) logerror("CRT9007 '%s' Visible Data Rows per Frame: %u\n", tag(), VISIBLE_DATA_ROWS_PER_FRAME);
break;
case 0x08:
recompute_parameters();
- if (LOG) logerror("CRT9007 '%s' Scan Lines per Data Row: %u\n", tag().c_str(), SCAN_LINES_PER_DATA_ROW);
+ if (LOG) logerror("CRT9007 '%s' Scan Lines per Data Row: %u\n", tag(), SCAN_LINES_PER_DATA_ROW);
break;
case 0x09:
recompute_parameters();
- if (LOG) logerror("CRT9007 '%s' Scan Lines per Frame: %u\n", tag().c_str(), SCAN_LINES_PER_FRAME);
+ if (LOG) logerror("CRT9007 '%s' Scan Lines per Frame: %u\n", tag(), SCAN_LINES_PER_FRAME);
break;
case 0x0a:
if (LOG)
{
- logerror("CRT9007 '%s' DMA Burst Count: %u\n", tag().c_str(), DMA_BURST_COUNT);
- logerror("CRT9007 '%s' DMA Burst Delay: %u\n", tag().c_str(), DMA_BURST_DELAY);
- logerror("CRT9007 '%s' DMA Disable: %u\n", tag().c_str(), DMA_DISABLE);
+ logerror("CRT9007 '%s' DMA Burst Count: %u\n", tag(), DMA_BURST_COUNT);
+ logerror("CRT9007 '%s' DMA Burst Delay: %u\n", tag(), DMA_BURST_DELAY);
+ logerror("CRT9007 '%s' DMA Disable: %u\n", tag(), DMA_DISABLE);
}
break;
case 0x0b:
if (LOG)
{
- logerror("CRT9007 '%s' %s Height Cursor\n", tag().c_str(), SINGLE_HEIGHT_CURSOR ? "Single" : "Double");
- logerror("CRT9007 '%s' Operation Mode: %u\n", tag().c_str(), OPERATION_MODE);
- logerror("CRT9007 '%s' Interlace Mode: %u\n", tag().c_str(), INTERLACE_MODE);
- logerror("CRT9007 '%s' %s Mechanism\n", tag().c_str(), PAGE_BLANK ? "Page Blank" : "Smooth Scroll");
+ logerror("CRT9007 '%s' %s Height Cursor\n", tag(), SINGLE_HEIGHT_CURSOR ? "Single" : "Double");
+ logerror("CRT9007 '%s' Operation Mode: %u\n", tag(), OPERATION_MODE);
+ logerror("CRT9007 '%s' Interlace Mode: %u\n", tag(), INTERLACE_MODE);
+ logerror("CRT9007 '%s' %s Mechanism\n", tag(), PAGE_BLANK ? "Page Blank" : "Smooth Scroll");
}
break;
@@ -808,8 +808,8 @@ WRITE8_MEMBER( crt9007_t::write )
case 0x0d:
if (LOG)
{
- logerror("CRT9007 '%s' Table Start Register: %04x\n", tag().c_str(), TABLE_START);
- logerror("CRT9007 '%s' Address Mode: %u\n", tag().c_str(), ADDRESS_MODE);
+ logerror("CRT9007 '%s' Table Start Register: %04x\n", tag(), TABLE_START);
+ logerror("CRT9007 '%s' Address Mode: %u\n", tag(), ADDRESS_MODE);
}
break;
@@ -819,21 +819,21 @@ WRITE8_MEMBER( crt9007_t::write )
case 0x0f:
if (LOG)
{
- logerror("CRT9007 '%s' Auxialiary Address Register 1: %04x\n", tag().c_str(), AUXILIARY_ADDRESS_1);
- logerror("CRT9007 '%s' Row Attributes: %u\n", tag().c_str(), ROW_ATTRIBUTES_1);
+ logerror("CRT9007 '%s' Auxialiary Address Register 1: %04x\n", tag(), AUXILIARY_ADDRESS_1);
+ logerror("CRT9007 '%s' Row Attributes: %u\n", tag(), ROW_ATTRIBUTES_1);
}
break;
case 0x10:
- if (LOG) logerror("CRT9007 '%s' Sequential Break Register 1: %u\n", tag().c_str(), SEQUENTIAL_BREAK_1);
+ if (LOG) logerror("CRT9007 '%s' Sequential Break Register 1: %u\n", tag(), SEQUENTIAL_BREAK_1);
break;
case 0x11:
- if (LOG) logerror("CRT9007 '%s' Data Row Start Register: %u\n", tag().c_str(), DATA_ROW_START);
+ if (LOG) logerror("CRT9007 '%s' Data Row Start Register: %u\n", tag(), DATA_ROW_START);
break;
case 0x12:
- if (LOG) logerror("CRT9007 '%s' Data Row End/Sequential Break Register 2: %u\n", tag().c_str(), SEQUENTIAL_BREAK_2);
+ if (LOG) logerror("CRT9007 '%s' Data Row End/Sequential Break Register 2: %u\n", tag(), SEQUENTIAL_BREAK_2);
break;
case 0x13:
@@ -842,48 +842,48 @@ WRITE8_MEMBER( crt9007_t::write )
case 0x14:
if (LOG)
{
- logerror("CRT9007 '%s' Auxiliary Address Register 2: %04x\n", tag().c_str(), AUXILIARY_ADDRESS_2);
- logerror("CRT9007 '%s' Row Attributes: %u\n", tag().c_str(), ROW_ATTRIBUTES_2);
+ logerror("CRT9007 '%s' Auxiliary Address Register 2: %04x\n", tag(), AUXILIARY_ADDRESS_2);
+ logerror("CRT9007 '%s' Row Attributes: %u\n", tag(), ROW_ATTRIBUTES_2);
}
break;
case 0x15:
- if (LOG) logerror("CRT9007 '%s' Start\n", tag().c_str());
+ if (LOG) logerror("CRT9007 '%s' Start\n", tag());
m_disp = 1;
break;
case 0x16:
- if (LOG) logerror("CRT9007 '%s' Reset\n", tag().c_str());
+ if (LOG) logerror("CRT9007 '%s' Reset\n", tag());
device_reset();
break;
case 0x17:
if (LOG)
{
- logerror("CRT9007 '%s' Smooth Scroll Offset: %u\n", tag().c_str(), SMOOTH_SCROLL_OFFSET);
- logerror("CRT9007 '%s' Smooth Scroll Offset Overflow: %u\n", tag().c_str(), SMOOTH_SCROLL_OFFSET_OVERFLOW);
+ logerror("CRT9007 '%s' Smooth Scroll Offset: %u\n", tag(), SMOOTH_SCROLL_OFFSET);
+ logerror("CRT9007 '%s' Smooth Scroll Offset Overflow: %u\n", tag(), SMOOTH_SCROLL_OFFSET_OVERFLOW);
}
break;
case 0x18:
- if (LOG) logerror("CRT9007 '%s' Vertical Cursor Register: %u\n", tag().c_str(), VERTICAL_CURSOR);
+ if (LOG) logerror("CRT9007 '%s' Vertical Cursor Register: %u\n", tag(), VERTICAL_CURSOR);
break;
case 0x19:
- if (LOG) logerror("CRT9007 '%s' Horizontal Cursor Register: %u\n", tag().c_str(), HORIZONTAL_CURSOR);
+ if (LOG) logerror("CRT9007 '%s' Horizontal Cursor Register: %u\n", tag(), HORIZONTAL_CURSOR);
break;
case 0x1a:
if (LOG)
{
- logerror("CRT9007 '%s' Frame Timer: %u\n", tag().c_str(), FRAME_TIMER);
- logerror("CRT9007 '%s' Light Pen Interrupt: %u\n", tag().c_str(), LIGHT_PEN_INTERRUPT);
- logerror("CRT9007 '%s' Vertical Retrace Interrupt: %u\n", tag().c_str(), VERTICAL_RETRACE_INTERRUPT);
+ logerror("CRT9007 '%s' Frame Timer: %u\n", tag(), FRAME_TIMER);
+ logerror("CRT9007 '%s' Light Pen Interrupt: %u\n", tag(), LIGHT_PEN_INTERRUPT);
+ logerror("CRT9007 '%s' Vertical Retrace Interrupt: %u\n", tag(), VERTICAL_RETRACE_INTERRUPT);
}
break;
default:
- logerror("CRT9007 '%s' Write to Invalid Register: %02x!\n", tag().c_str(), offset);
+ logerror("CRT9007 '%s' Write to Invalid Register: %02x!\n", tag(), offset);
}
}
@@ -894,7 +894,7 @@ WRITE8_MEMBER( crt9007_t::write )
WRITE_LINE_MEMBER( crt9007_t::ack_w )
{
- if (LOG) logerror("CRT9007 '%s' ACK: %u\n", tag().c_str(), state);
+ if (LOG) logerror("CRT9007 '%s' ACK: %u\n", tag(), state);
if (m_dmar && !m_ack && state)
{
@@ -912,7 +912,7 @@ WRITE_LINE_MEMBER( crt9007_t::ack_w )
WRITE_LINE_MEMBER( crt9007_t::lpstb_w )
{
- if (LOG) logerror("CRT9007 '%s' LPSTB: %u\n", tag().c_str(), state);
+ if (LOG) logerror("CRT9007 '%s' LPSTB: %u\n", tag(), state);
if (!m_lpstb && state)
{
diff --git a/src/devices/video/crt9007.h b/src/devices/video/crt9007.h
index 68e4efaa36b..8a812a73899 100644
--- a/src/devices/video/crt9007.h
+++ b/src/devices/video/crt9007.h
@@ -99,7 +99,7 @@ class crt9007_t : public device_t,
{
public:
// construction/destruction
- crt9007_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ crt9007_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
static void static_set_character_width(device_t &device, int value) { downcast<crt9007_t &>(device).m_hpixels_per_column = value; }
diff --git a/src/devices/video/crt9021.cpp b/src/devices/video/crt9021.cpp
index 026ea9e2f06..d72baff2b2b 100644
--- a/src/devices/video/crt9021.cpp
+++ b/src/devices/video/crt9021.cpp
@@ -60,7 +60,7 @@ const device_type CRT9021 = &device_creator<crt9021_t>;
// crt9021_t - constructor
//-------------------------------------------------
-crt9021_t::crt9021_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+crt9021_t::crt9021_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CRT9021, "SMC CRT9021", tag, owner, clock, "crt9021", __FILE__),
device_video_interface(mconfig, *this),
m_data(0),
@@ -131,7 +131,7 @@ void crt9021_t::device_start()
WRITE_LINE_MEMBER( crt9021_t::ld_sh_w )
{
- if (LOG) logerror("CRT9021 '%s' LD/SH: %u\n", tag().c_str(), state);
+ if (LOG) logerror("CRT9021 '%s' LD/SH: %u\n", tag(), state);
if (!m_ld_sh && state)
{
@@ -171,7 +171,7 @@ WRITE_LINE_MEMBER( crt9021_t::ld_sh_w )
WRITE_LINE_MEMBER( crt9021_t::vsync_w )
{
- if (LOG) logerror("CRT9021 '%s' VSYNC: %u\n", tag().c_str(), state);
+ if (LOG) logerror("CRT9021 '%s' VSYNC: %u\n", tag(), state);
}
diff --git a/src/devices/video/crt9021.h b/src/devices/video/crt9021.h
index 56bb5f06ad6..7d38f207d3e 100644
--- a/src/devices/video/crt9021.h
+++ b/src/devices/video/crt9021.h
@@ -57,7 +57,7 @@ class crt9021_t : public device_t,
{
public:
// construction/destruction
- crt9021_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ crt9021_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
static void static_set_display_callback(device_t &device, crt9021_draw_character_delegate callback) { downcast<crt9021_t &>(device).m_display_cb = callback; }
diff --git a/src/devices/video/crt9212.cpp b/src/devices/video/crt9212.cpp
index 4b75ce1a647..0535afa169b 100644
--- a/src/devices/video/crt9212.cpp
+++ b/src/devices/video/crt9212.cpp
@@ -34,7 +34,7 @@ const device_type CRT9212 = &device_creator<crt9212_t>;
// crt9212_t - constructor
//-------------------------------------------------
-crt9212_t::crt9212_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+crt9212_t::crt9212_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CRT9212, "SMC CRT9212", tag, owner, clock, "crt9212", __FILE__),
m_write_dout(*this),
m_write_rof(*this),
diff --git a/src/devices/video/crt9212.h b/src/devices/video/crt9212.h
index 1d90dc778b2..011cc8467a8 100644
--- a/src/devices/video/crt9212.h
+++ b/src/devices/video/crt9212.h
@@ -68,7 +68,7 @@ class crt9212_t : public device_t
{
public:
// construction/destruction
- crt9212_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ crt9212_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
static void static_set_wen2(device_t &device, int state) { downcast<crt9212_t &>(device).m_wen2 = state; }
diff --git a/src/devices/video/crtc_ega.cpp b/src/devices/video/crtc_ega.cpp
index 846c99653eb..0841adcc69a 100644
--- a/src/devices/video/crtc_ega.cpp
+++ b/src/devices/video/crtc_ega.cpp
@@ -18,7 +18,7 @@
const device_type CRTC_EGA = &device_creator<crtc_ega_device>;
-crtc_ega_device::crtc_ega_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+crtc_ega_device::crtc_ega_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CRTC_EGA, "crtc_EGA", tag, owner, clock, "crtc_ega", __FILE__),
device_video_interface(mconfig, *this, false),
m_res_out_de_cb(*this),
diff --git a/src/devices/video/crtc_ega.h b/src/devices/video/crtc_ega.h
index df15956b2f6..0030d865d76 100644
--- a/src/devices/video/crtc_ega.h
+++ b/src/devices/video/crtc_ega.h
@@ -59,7 +59,7 @@ class crtc_ega_device : public device_t,
public device_video_interface
{
public:
- crtc_ega_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ crtc_ega_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_res_out_de_callback(device_t &device, _Object object)
{ return downcast<crtc_ega_device &>(device).m_res_out_de_cb.set_callback(object); }
diff --git a/src/devices/video/dl1416.cpp b/src/devices/video/dl1416.cpp
index 722ced731fe..b017e9994e1 100644
--- a/src/devices/video/dl1416.cpp
+++ b/src/devices/video/dl1416.cpp
@@ -96,7 +96,7 @@ static const UINT16 dl1416t_segments[128] = {
DEVICE INTERFACE
*****************************************************************************/
-dl1416_device::dl1416_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+dl1416_device::dl1416_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_write_enable(FALSE),
m_chip_enable(FALSE),
@@ -165,7 +165,7 @@ void dl1416_device::device_reset()
const device_type DL1416B = &device_creator<dl1416b_device>;
-dl1416b_device::dl1416b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+dl1416b_device::dl1416b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: dl1416_device(mconfig, DL1416B, "DL1416B", tag, owner, clock, "dl1416b", __FILE__)
{
}
@@ -173,7 +173,7 @@ dl1416b_device::dl1416b_device(const machine_config &mconfig, std::string tag, d
const device_type DL1416T = &device_creator<dl1416t_device>;
-dl1416t_device::dl1416t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+dl1416t_device::dl1416t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: dl1416_device(mconfig, DL1416T, "DL1416T", tag, owner, clock, "dl1416t", __FILE__)
{
}
diff --git a/src/devices/video/dl1416.h b/src/devices/video/dl1416.h
index 00cb4e4f574..e3526bd95be 100644
--- a/src/devices/video/dl1416.h
+++ b/src/devices/video/dl1416.h
@@ -31,7 +31,7 @@
class dl1416_device : public device_t
{
public:
- dl1416_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ dl1416_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~dl1416_device() {}
template<class _Object> static devcb_base &set_update_handler(device_t &device, _Object object) { return downcast<dl1416_device &>(device).m_update.set_callback(object); }
@@ -61,7 +61,7 @@ private:
class dl1416b_device : public dl1416_device
{
public:
- dl1416b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ dl1416b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
extern const device_type DL1416B;
@@ -69,7 +69,7 @@ extern const device_type DL1416B;
class dl1416t_device : public dl1416_device
{
public:
- dl1416t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ dl1416t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
extern const device_type DL1416T;
diff --git a/src/devices/video/dm9368.cpp b/src/devices/video/dm9368.cpp
index b084a9861fa..16dee4e420f 100644
--- a/src/devices/video/dm9368.cpp
+++ b/src/devices/video/dm9368.cpp
@@ -40,7 +40,7 @@ const UINT8 dm9368_device::m_segment_data[16] =
// dm9368_device - constructor
//-------------------------------------------------
-dm9368_device::dm9368_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+dm9368_device::dm9368_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, DM9368, "DM9368 7-Segment Decoder", tag, owner, clock, "dm9368", __FILE__),
device_output_interface(mconfig, *this),
m_write_rbo(*this),
@@ -76,14 +76,14 @@ void dm9368_device::a_w(UINT8 data)
if (!m_rbi && !a)
{
- if (LOG) logerror("DM9368 '%s' Blanked Rippling Zero\n", tag().c_str());
+ if (LOG) logerror("DM9368 '%s' Blanked Rippling Zero\n", tag());
// blank rippling 0
m_rbo = 0;
}
else
{
- if (LOG) logerror("DM9368 '%s' Output Data: %u = %02x\n", tag().c_str(), a, m_segment_data[a]);
+ if (LOG) logerror("DM9368 '%s' Output Data: %u = %02x\n", tag(), a, m_segment_data[a]);
value = m_segment_data[a];
diff --git a/src/devices/video/dm9368.h b/src/devices/video/dm9368.h
index d19f231bd1f..23f34de94ad 100644
--- a/src/devices/video/dm9368.h
+++ b/src/devices/video/dm9368.h
@@ -46,7 +46,7 @@ class dm9368_device : public device_t,
{
public:
// construction/destruction
- dm9368_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ dm9368_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
void a_w(UINT8 data);
diff --git a/src/devices/video/ef9340_1.cpp b/src/devices/video/ef9340_1.cpp
index 8b5bf0f71c1..39654a32ba9 100644
--- a/src/devices/video/ef9340_1.cpp
+++ b/src/devices/video/ef9340_1.cpp
@@ -23,7 +23,7 @@ static const UINT8 bgr2rgb[8] =
};
-ef9340_1_device::ef9340_1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ef9340_1_device::ef9340_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, EF9340_1, "EF9340+EF9341", tag, owner, clock, "ef9340_1", __FILE__)
, device_video_interface(mconfig, *this), m_line_timer(nullptr)
//, m_start_vpos(START_Y)
diff --git a/src/devices/video/ef9340_1.h b/src/devices/video/ef9340_1.h
index 1d6bb673d1c..d92cbb5cf54 100644
--- a/src/devices/video/ef9340_1.h
+++ b/src/devices/video/ef9340_1.h
@@ -26,7 +26,7 @@ class ef9340_1_device : public device_t,
{
public:
// construction/destruction
- ef9340_1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ef9340_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
inline bitmap_ind16 *get_bitmap() { return &m_tmp_bitmap; }
diff --git a/src/devices/video/ef9345.cpp b/src/devices/video/ef9345.cpp
index 667eba7680c..a46e32a34b7 100644
--- a/src/devices/video/ef9345.cpp
+++ b/src/devices/video/ef9345.cpp
@@ -96,7 +96,7 @@ inline void ef9345_device::inc_y(UINT8 r)
// ef9345_device - constructor
//-------------------------------------------------
-ef9345_device::ef9345_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+ef9345_device::ef9345_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, EF9345, "EF9345", tag, owner, clock, "ef9345", __FILE__),
device_memory_interface(mconfig, *this),
device_video_interface(mconfig, *this),
@@ -110,7 +110,7 @@ ef9345_device::ef9345_device(const machine_config &mconfig, std::string tag, dev
// palette device
//-------------------------------------------------
-void ef9345_device::static_set_palette_tag(device_t &device, std::string tag)
+void ef9345_device::static_set_palette_tag(device_t &device, const char *tag)
{
downcast<ef9345_device &>(device).m_palette.set_tag(tag);
}
diff --git a/src/devices/video/ef9345.h b/src/devices/video/ef9345.h
index f59a2879d8d..9179e01ab03 100644
--- a/src/devices/video/ef9345.h
+++ b/src/devices/video/ef9345.h
@@ -30,10 +30,10 @@ class ef9345_device : public device_t,
{
public:
// construction/destruction
- ef9345_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ef9345_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// static configuration
- static void static_set_palette_tag(device_t &device, std::string tag);
+ static void static_set_palette_tag(device_t &device, const char *tag);
// device interface
DECLARE_READ8_MEMBER( data_r );
diff --git a/src/devices/video/ef9365.cpp b/src/devices/video/ef9365.cpp
index fec07e62eb8..f923cfd0813 100644
--- a/src/devices/video/ef9365.cpp
+++ b/src/devices/video/ef9365.cpp
@@ -155,7 +155,7 @@ const address_space_config *ef9365_device::memory_space_config(address_spacenum
// ef9365_device - constructor
//-------------------------------------------------
-ef9365_device::ef9365_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+ef9365_device::ef9365_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, EF9365, "EF9365", tag, owner, clock, "ef9365", __FILE__),
device_memory_interface(mconfig, *this),
device_video_interface(mconfig, *this),
@@ -171,7 +171,7 @@ ef9365_device::ef9365_device(const machine_config &mconfig, std::string tag, dev
// palette device
//-------------------------------------------------
-void ef9365_device::static_set_palette_tag(device_t &device, std::string tag)
+void ef9365_device::static_set_palette_tag(device_t &device, const char *tag)
{
downcast<ef9365_device &>(device).m_palette.set_tag(tag);
}
@@ -938,7 +938,7 @@ void ef9365_device::screen_scanning( int force_clear )
void ef9365_device::ef9365_exec(UINT8 cmd)
{
int tmp_delta_x,tmp_delta_y;
- int busy_cycles = 0;
+ int busy_cycles;
m_state = 0;
if( ( cmd>>4 ) == 0 )
diff --git a/src/devices/video/ef9365.h b/src/devices/video/ef9365.h
index 2ce2464e055..e29b3adca33 100644
--- a/src/devices/video/ef9365.h
+++ b/src/devices/video/ef9365.h
@@ -40,10 +40,10 @@ class ef9365_device : public device_t,
{
public:
// construction/destruction
- ef9365_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ef9365_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// static configuration
- static void static_set_palette_tag(device_t &device, std::string tag);
+ static void static_set_palette_tag(device_t &device, const char *tag);
static void static_set_nb_bitplanes(device_t &device, int nb_bitplanes );
static void static_set_display_mode(device_t &device, int display_mode );
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ef9365_device &>(device).m_irq_handler.set_callback(object); }
diff --git a/src/devices/video/epic12.cpp b/src/devices/video/epic12.cpp
index 6cfa0be16be..fa168e5ac36 100644
--- a/src/devices/video/epic12.cpp
+++ b/src/devices/video/epic12.cpp
@@ -9,7 +9,7 @@
const device_type EPIC12 = &device_creator<epic12_device>;
-epic12_device::epic12_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+epic12_device::epic12_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, EPIC12, "EP1C12 Blitter", tag, owner, clock, "epic12", __FILE__),
device_video_interface(mconfig, *this), m_ram16(nullptr), m_gfx_size(0), m_bitmaps(nullptr), m_use_ram(nullptr),
m_main_ramsize(0), m_main_rammask(0), m_maincpu(nullptr), m_ram16_copy(nullptr), m_work_queue(nullptr)
diff --git a/src/devices/video/epic12.h b/src/devices/video/epic12.h
index 0da6757c6c1..5e6301b44f8 100644
--- a/src/devices/video/epic12.h
+++ b/src/devices/video/epic12.h
@@ -47,7 +47,7 @@ class epic12_device : public device_t,
public device_video_interface
{
public:
- epic12_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ epic12_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
void set_rambase(UINT16* rambase) { m_ram16 = rambase; }
void set_delay_scale(int delay_scale) { m_delay_scale = delay_scale; }
diff --git a/src/devices/video/fixfreq.cpp b/src/devices/video/fixfreq.cpp
index cfb46649a93..d75232808e9 100644
--- a/src/devices/video/fixfreq.cpp
+++ b/src/devices/video/fixfreq.cpp
@@ -33,7 +33,7 @@
// device type definition
const device_type FIXFREQ = &device_creator<fixedfreq_device>;
-fixedfreq_device::fixedfreq_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+fixedfreq_device::fixedfreq_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this, false), m_htotal(0), m_vtotal(0), m_vid(0), m_last_x(0), m_last_y(0), m_cur_bm(0),
// default to NTSC "704x480@30i"
@@ -52,7 +52,7 @@ fixedfreq_device::fixedfreq_device(const machine_config &mconfig, device_type ty
{
}
-fixedfreq_device::fixedfreq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+fixedfreq_device::fixedfreq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, FIXFREQ, "Fixed Frequency Monochrome Monitor", tag, owner, clock, "fixfreq", __FILE__),
device_video_interface(mconfig, *this, false),
// default to NTSC "704x480@30i"
diff --git a/src/devices/video/fixfreq.h b/src/devices/video/fixfreq.h
index fb7b6ae3ec9..38fde1c5f3b 100644
--- a/src/devices/video/fixfreq.h
+++ b/src/devices/video/fixfreq.h
@@ -71,8 +71,8 @@ class fixedfreq_device : public device_t,
{
public:
// construction/destruction
- fixedfreq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- fixedfreq_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ fixedfreq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fixedfreq_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// inline configuration helpers
static void set_minitor_clock(device_t &device, UINT32 clock) { downcast<fixedfreq_device &>(device).m_monitor_clock = clock; }
diff --git a/src/devices/video/gf4500.cpp b/src/devices/video/gf4500.cpp
index fcbe22103a6..d4b7e86f056 100644
--- a/src/devices/video/gf4500.cpp
+++ b/src/devices/video/gf4500.cpp
@@ -35,7 +35,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, c
const device_type GF4500 = &device_creator<gf4500_device>;
-gf4500_device::gf4500_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+gf4500_device::gf4500_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, GF4500, "NVIDIA GoForce 4500", tag, owner, clock, "gf4500", __FILE__), m_data(nullptr), m_screen_x(0), m_screen_y(0), m_screen_x_max(0), m_screen_y_max(0), m_screen_x_min(0), m_screen_y_min(0)
{
}
diff --git a/src/devices/video/gf4500.h b/src/devices/video/gf4500.h
index 806c15a60d3..aa8bf8ebf63 100644
--- a/src/devices/video/gf4500.h
+++ b/src/devices/video/gf4500.h
@@ -15,7 +15,7 @@
class gf4500_device : public device_t
{
public:
- gf4500_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ gf4500_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~gf4500_device() {}
diff --git a/src/devices/video/gf7600gs.cpp b/src/devices/video/gf7600gs.cpp
index f6aaed137b4..85b6b2f06da 100644
--- a/src/devices/video/gf7600gs.cpp
+++ b/src/devices/video/gf7600gs.cpp
@@ -13,7 +13,7 @@ ADDRESS_MAP_END
DEVICE_ADDRESS_MAP_START(map3, 32, geforce_7600gs_device)
ADDRESS_MAP_END
-geforce_7600gs_device::geforce_7600gs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+geforce_7600gs_device::geforce_7600gs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, GEFORCE_7600GS, "NVidia GeForce 7600GS", tag, owner, clock, "geforce_7600gs", __FILE__)
{
}
diff --git a/src/devices/video/gf7600gs.h b/src/devices/video/gf7600gs.h
index 84cd37ffa59..ddd36edae40 100644
--- a/src/devices/video/gf7600gs.h
+++ b/src/devices/video/gf7600gs.h
@@ -10,7 +10,7 @@
class geforce_7600gs_device : public pci_device {
public:
- geforce_7600gs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ geforce_7600gs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
diff --git a/src/devices/video/h63484.cpp b/src/devices/video/h63484.cpp
index 4a6838f5d55..1e0d7cbb0d8 100644
--- a/src/devices/video/h63484.cpp
+++ b/src/devices/video/h63484.cpp
@@ -28,7 +28,7 @@ ADDRESS_MAP_END
// h63484_device - constructor
//-------------------------------------------------
-h63484_device::h63484_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+h63484_device::h63484_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, H63484, "HD63484 CRTC (rewrite)", tag, owner, clock, "h63484", __FILE__),
device_memory_interface(mconfig, *this),
device_video_interface(mconfig, *this),
@@ -387,7 +387,7 @@ inline void h63484_device::inc_ar(int value)
if(m_ar & 0x80)
{
if (m_ar + value > 0xff) // TODO: what happens if it overflows?
- logerror("HD63484 '%s': Address Register overflows 0x%02x\n", tag().c_str(), m_ar + value);
+ logerror("HD63484 '%s': Address Register overflows 0x%02x\n", tag(), m_ar + value);
m_ar = (m_ar + value) & 0xff;
}
@@ -767,7 +767,7 @@ bool h63484_device::set_dot(INT16 x, INT16 y, UINT16 color)
writeword(offset, res);
if (area)
- logerror("HD63484 '%s': unsupported area detection %x (%d %d)\n", tag().c_str(), area, x, y);
+ logerror("HD63484 '%s': unsupported area detection %x (%d %d)\n", tag(), area, x, y);
return false; // TODO: return area detection status
}
@@ -1425,8 +1425,8 @@ void h63484_device::process_fifo()
switch (translate_command(m_cr))
{
case COMMAND_INVALID:
- if (CMD_LOG) logerror("HD63484 '%s': <invalid %04x>\n", tag().c_str(), m_cr);
- printf("H63484 '%s' Invalid Command Byte %02x\n", tag().c_str(), m_cr);
+ if (CMD_LOG) logerror("HD63484 '%s': <invalid %04x>\n", tag(), m_cr);
+ printf("H63484 '%s' Invalid Command Byte %02x\n", tag(), m_cr);
m_sr |= H63484_SR_CER; // command error
command_end_seq();
break;
@@ -1434,7 +1434,7 @@ void h63484_device::process_fifo()
case COMMAND_ORG:
if (m_param_ptr == 2)
{
- if (CMD_LOG) logerror("HD63484 '%s': ORG 0x%04x, 0x%04x\n", tag().c_str(), m_pr[0], m_pr[1]);
+ if (CMD_LOG) logerror("HD63484 '%s': ORG 0x%04x, 0x%04x\n", tag(), m_pr[0], m_pr[1]);
m_org_dn = (m_pr[0] & 0xc000) >> 14;
m_org_dpa = ((m_pr[0] & 0xff) << 12) | ((m_pr[1] & 0xfff0) >> 4);
m_org_dpd = (m_pr[1] & 0xf);
@@ -1446,7 +1446,7 @@ void h63484_device::process_fifo()
case COMMAND_WPR: // 0x0800 & ~0x1f
if (m_param_ptr == 1)
{
- if (CMD_LOG) logerror("HD63484 '%s': WPR (%d) 0x%04x\n", tag().c_str(), m_cr & 0x1f, m_pr[0]);
+ if (CMD_LOG) logerror("HD63484 '%s': WPR (%d) 0x%04x\n", tag(), m_cr & 0x1f, m_pr[0]);
command_wpr_exec();
command_end_seq();
}
@@ -1455,7 +1455,7 @@ void h63484_device::process_fifo()
case COMMAND_RPR:
if (m_param_ptr == 0)
{
- if (CMD_LOG) logerror("HD63484 '%s': RPR (%d)\n", tag().c_str(), m_cr & 0x1f);
+ if (CMD_LOG) logerror("HD63484 '%s': RPR (%d)\n", tag(), m_cr & 0x1f);
UINT16 data = command_rpr_exec();
queue_r((data >> 8) & 0xff);
queue_r((data >> 0) & 0xff);
@@ -1474,7 +1474,7 @@ void h63484_device::process_fifo()
if(m_param_ptr == (1 + m_dn))
{
- if (CMD_LOG) logerror("HD63484 '%s': WPTN (%d) %d", tag().c_str(), m_cr & 0x0f, m_pr[0]);
+ if (CMD_LOG) logerror("HD63484 '%s': WPTN (%d) %d", tag(), m_cr & 0x0f, m_pr[0]);
int pra = m_cr & 0xf;
for(int i=0; i<m_dn; i++)
@@ -1491,7 +1491,7 @@ void h63484_device::process_fifo()
case COMMAND_RPTN:
if(m_param_ptr == 1)
{
- if (CMD_LOG) logerror("HD63484 '%s': RPTN (%d) %d\n", tag().c_str(), m_cr & 0x0f, m_pr[0]);
+ if (CMD_LOG) logerror("HD63484 '%s': RPTN (%d) %d\n", tag(), m_cr & 0x0f, m_pr[0]);
command_end_seq();
fatalerror("HD63484 COMMAND_RPTN!\n");
}
@@ -1500,7 +1500,7 @@ void h63484_device::process_fifo()
case COMMAND_DRD:
if (m_param_ptr == 2)
{
- if (CMD_LOG) logerror("HD63484 '%s': DRD %d, %d\n", tag().c_str(), m_pr[0], m_pr[1]);
+ if (CMD_LOG) logerror("HD63484 '%s': DRD %d, %d\n", tag(), m_pr[0], m_pr[1]);
command_end_seq();
fatalerror("HD63484 COMMAND_DRD!\n");
}
@@ -1509,7 +1509,7 @@ void h63484_device::process_fifo()
case COMMAND_DWT:
if (m_param_ptr == 2)
{
- if (CMD_LOG) logerror("HD63484 '%s': DWT %d, %d\n", tag().c_str(), m_pr[0], m_pr[1]);
+ if (CMD_LOG) logerror("HD63484 '%s': DWT %d, %d\n", tag(), m_pr[0], m_pr[1]);
command_end_seq();
fatalerror("HD63484 COMMAND_DWT!\n");
}
@@ -1518,7 +1518,7 @@ void h63484_device::process_fifo()
case COMMAND_DMOD:
if (m_param_ptr == 2)
{
- if (CMD_LOG) logerror("HD63484 '%s': DMOD (%d) %d, %d\n", tag().c_str(), m_cr & 0x03, m_pr[0], m_pr[1]);
+ if (CMD_LOG) logerror("HD63484 '%s': DMOD (%d) %d, %d\n", tag(), m_cr & 0x03, m_pr[0], m_pr[1]);
command_end_seq();
fatalerror("HD63484 COMMAND_DMOD!\n");
}
@@ -1527,7 +1527,7 @@ void h63484_device::process_fifo()
case COMMAND_RD:
if (m_param_ptr == 0)
{
- if (CMD_LOG) logerror("HD63484 '%s': RD\n", tag().c_str());
+ if (CMD_LOG) logerror("HD63484 '%s': RD\n", tag());
UINT16 data = readword(m_rwp[m_rwp_dn]);
queue_r((data >> 8) & 0xff);
queue_r((data >> 0) & 0xff);
@@ -1540,7 +1540,7 @@ void h63484_device::process_fifo()
case COMMAND_WT:
if (m_param_ptr == 1)
{
- if (CMD_LOG) logerror("HD63484 '%s': WT 0x%04x\n", tag().c_str(), m_pr[0]);
+ if (CMD_LOG) logerror("HD63484 '%s': WT 0x%04x\n", tag(), m_pr[0]);
writeword(m_rwp[m_rwp_dn], m_pr[0]);
m_rwp[m_rwp_dn]+=1;
m_rwp[m_rwp_dn]&=0xfffff;
@@ -1551,7 +1551,7 @@ void h63484_device::process_fifo()
case COMMAND_MOD:
if(m_param_ptr == 1)
{
- if (CMD_LOG) logerror("HD63484 '%s': MOD (%d) 0x%04x\n", tag().c_str(), m_cr & 0x03, m_pr[0]);
+ if (CMD_LOG) logerror("HD63484 '%s': MOD (%d) 0x%04x\n", tag(), m_cr & 0x03, m_pr[0]);
UINT16 d = m_pr[0];
UINT16 data = readword(m_rwp[m_rwp_dn]);
UINT16 res = 0;
@@ -1584,9 +1584,9 @@ void h63484_device::process_fifo()
if (CMD_LOG)
{
if (BIT(m_cr, 10))
- logerror("HD63484 '%s': SCLR (%d) 0x%04x, %d, %d\n", tag().c_str(), m_cr & 0x03, m_pr[0], (INT16)m_pr[1], (INT16)m_pr[2]);
+ logerror("HD63484 '%s': SCLR (%d) 0x%04x, %d, %d\n", tag(), m_cr & 0x03, m_pr[0], (INT16)m_pr[1], (INT16)m_pr[2]);
else
- logerror("HD63484 '%s': CLR 0x%04x, %d, %d\n", tag().c_str(), m_pr[0], (INT16)m_pr[1], (INT16)m_pr[2]);
+ logerror("HD63484 '%s': CLR 0x%04x, %d, %d\n", tag(), m_pr[0], (INT16)m_pr[1], (INT16)m_pr[2]);
}
command_clr_exec();
@@ -1601,9 +1601,9 @@ void h63484_device::process_fifo()
if (CMD_LOG)
{
if (BIT(m_cr, 12))
- logerror("HD63484 '%s': SCPY (%d, %d, %d) 0x%x, 0x%x, %d, %d\n", tag().c_str(), BIT(m_cr, 11), (m_cr >> 8) & 0x07, m_cr & 0x07, m_pr[0] & 0xff, (m_pr[1]&0xfff0) >> 4, (INT16)m_pr[2], (INT16)m_pr[3]);
+ logerror("HD63484 '%s': SCPY (%d, %d, %d) 0x%x, 0x%x, %d, %d\n", tag(), BIT(m_cr, 11), (m_cr >> 8) & 0x07, m_cr & 0x07, m_pr[0] & 0xff, (m_pr[1]&0xfff0) >> 4, (INT16)m_pr[2], (INT16)m_pr[3]);
else
- logerror("HD63484 '%s': CPY (%d, %d) 0x%x, 0x%x, %d, %d\n", tag().c_str(), BIT(m_cr, 11), (m_cr >> 8) & 0x07, m_pr[0] & 0xff, (m_pr[1]&0xfff0) >> 4, (INT16)m_pr[2], (INT16)m_pr[3]);
+ logerror("HD63484 '%s': CPY (%d, %d) 0x%x, 0x%x, %d, %d\n", tag(), BIT(m_cr, 11), (m_cr >> 8) & 0x07, m_pr[0] & 0xff, (m_pr[1]&0xfff0) >> 4, (INT16)m_pr[2], (INT16)m_pr[3]);
}
command_cpy_exec();
@@ -1615,7 +1615,7 @@ void h63484_device::process_fifo()
case COMMAND_RMOVE:
if (m_param_ptr == 2)
{
- if (CMD_LOG) logerror("HD63484 '%s': %cMOVE %d, %d\n", tag().c_str(), BIT(m_cr, 10) ? 'R' : 'A', (INT16)m_pr[0], (INT16)m_pr[1]);
+ if (CMD_LOG) logerror("HD63484 '%s': %cMOVE %d, %d\n", tag(), BIT(m_cr, 10) ? 'R' : 'A', (INT16)m_pr[0], (INT16)m_pr[1]);
if (BIT(m_cr, 10))
{
m_cpx += (INT16)m_pr[0];
@@ -1634,7 +1634,7 @@ void h63484_device::process_fifo()
case COMMAND_ARCT:
if (m_param_ptr == 2)
{
- if (CMD_LOG) logerror("HD63484 '%s': %cRTC (%d, %d, %d) %d, %d\n", tag().c_str(), BIT(m_cr, 10) ? 'R' : 'A', (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, (INT16)m_pr[0], (INT16)m_pr[1]);
+ if (CMD_LOG) logerror("HD63484 '%s': %cRTC (%d, %d, %d) %d, %d\n", tag(), BIT(m_cr, 10) ? 'R' : 'A', (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, (INT16)m_pr[0], (INT16)m_pr[1]);
command_rct_exec();
command_end_seq();
}
@@ -1644,7 +1644,7 @@ void h63484_device::process_fifo()
case COMMAND_ALINE:
if (m_param_ptr == 2)
{
- if (CMD_LOG) logerror("HD63484 '%s': %cLINE (%d, %d, %d) %d, %d\n", tag().c_str(), BIT(m_cr, 10) ? 'R' : 'A', (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, (INT16)m_pr[0], (INT16)m_pr[1]);
+ if (CMD_LOG) logerror("HD63484 '%s': %cLINE (%d, %d, %d) %d, %d\n", tag(), BIT(m_cr, 10) ? 'R' : 'A', (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, (INT16)m_pr[0], (INT16)m_pr[1]);
command_line_exec();
command_end_seq();
}
@@ -1661,7 +1661,7 @@ void h63484_device::process_fifo()
{
if (CMD_LOG)
{
- logerror("HD63484 '%s': %cPL%c (%d, %d, %d) %d", tag().c_str(), BIT(m_cr, 10) ? 'R' : 'A', m_cr & 0x2000 ? 'G' : 'L', (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, m_pr[0]);
+ logerror("HD63484 '%s': %cPL%c (%d, %d, %d) %d", tag(), BIT(m_cr, 10) ? 'R' : 'A', m_cr & 0x2000 ? 'G' : 'L', (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, m_pr[0]);
for (int i=0; i<m_dn; i++)
logerror(", %d, %d", (INT16)m_pr[1 + i * 2], (INT16)m_pr[1 + i * 2 + 1]);
logerror("\n");
@@ -1675,7 +1675,7 @@ void h63484_device::process_fifo()
case COMMAND_CRCL:
if(m_param_ptr == 1)
{
- if (CMD_LOG) logerror("HD63484 '%s': CRCL (%d, %d, %d, %d) %d\n", tag().c_str(), BIT(m_cr, 8), (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, m_pr[0]);
+ if (CMD_LOG) logerror("HD63484 '%s': CRCL (%d, %d, %d, %d) %d\n", tag(), BIT(m_cr, 8), (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, m_pr[0]);
UINT16 r = m_pr[0] & 0x1fff;
draw_ellipse(m_cpx, m_cpy, r, r, DEGREE_TO_RADIAN(0), DEGREE_TO_RADIAN(360), BIT(m_cr, 8));
command_end_seq();
@@ -1685,7 +1685,7 @@ void h63484_device::process_fifo()
case COMMAND_ELPS:
if(m_param_ptr == 3)
{
- if (CMD_LOG) logerror("HD63484 '%s': ELPS (%d, %d, %d, %d) %d, %d, %d\n", tag().c_str(), BIT(m_cr, 8), (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, m_pr[0], m_pr[1], m_pr[2]);
+ if (CMD_LOG) logerror("HD63484 '%s': ELPS (%d, %d, %d, %d) %d, %d, %d\n", tag(), BIT(m_cr, 8), (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, m_pr[0], m_pr[1], m_pr[2]);
double dx = (double)m_pr[3];
double dy = sqrt(pow(dx, 2) / ((double)m_pr[0] / m_pr[1]));
draw_ellipse(m_cpx, m_cpy, dx, dy, DEGREE_TO_RADIAN(0), DEGREE_TO_RADIAN(360), BIT(m_cr, 8));
@@ -1697,7 +1697,7 @@ void h63484_device::process_fifo()
case COMMAND_RARC:
if(m_param_ptr == 4)
{
- if (CMD_LOG) logerror("HD63484 '%s': %cARC (%d, %d, %d, %d) %d, %d, %d, %d\n", tag().c_str(), BIT(m_cr, 10) ? 'R' : 'A', BIT(m_cr, 8), (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, (INT16)m_pr[0], (INT16)m_pr[1], (INT16)m_pr[2], (INT16)m_pr[3]);
+ if (CMD_LOG) logerror("HD63484 '%s': %cARC (%d, %d, %d, %d) %d, %d, %d, %d\n", tag(), BIT(m_cr, 10) ? 'R' : 'A', BIT(m_cr, 8), (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, (INT16)m_pr[0], (INT16)m_pr[1], (INT16)m_pr[2], (INT16)m_pr[3]);
command_arc_exec();
command_end_seq();
}
@@ -1707,7 +1707,7 @@ void h63484_device::process_fifo()
case COMMAND_REARC:
if(m_param_ptr == 6)
{
- if (CMD_LOG) logerror("HD63484 '%s': %cEARC (%d, %d, %d, %d) %d, %d, %d, %d, %d, %d\n", tag().c_str(), BIT(m_cr, 10) ? 'R' : 'A', BIT(m_cr, 8), (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, m_pr[0], m_pr[1], m_pr[2], m_pr[3], m_pr[4], m_pr[5]);
+ if (CMD_LOG) logerror("HD63484 '%s': %cEARC (%d, %d, %d, %d) %d, %d, %d, %d, %d, %d\n", tag(), BIT(m_cr, 10) ? 'R' : 'A', BIT(m_cr, 8), (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, m_pr[0], m_pr[1], m_pr[2], m_pr[3], m_pr[4], m_pr[5]);
command_earc_exec();
command_end_seq();
}
@@ -1717,7 +1717,7 @@ void h63484_device::process_fifo()
case COMMAND_RFRCT:
if (m_param_ptr == 2)
{
- if (CMD_LOG) logerror("HD63484 '%s': %cFRCT (%d, %d, %d) %d, %d\n", tag().c_str(), BIT(m_cr, 10) ? 'R' : 'A', (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, (INT16)m_pr[0], (INT16)m_pr[1]);
+ if (CMD_LOG) logerror("HD63484 '%s': %cFRCT (%d, %d, %d) %d, %d\n", tag(), BIT(m_cr, 10) ? 'R' : 'A', (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, (INT16)m_pr[0], (INT16)m_pr[1]);
command_frct_exec();
command_end_seq();
@@ -1727,7 +1727,7 @@ void h63484_device::process_fifo()
case COMMAND_PAINT:
if (m_param_ptr == 0)
{
- if (CMD_LOG) logerror("HD63484 '%s': PAINT (%d, %d, %d, %d)\n", tag().c_str(), BIT(m_cr, 8), (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07);
+ if (CMD_LOG) logerror("HD63484 '%s': PAINT (%d, %d, %d, %d)\n", tag(), BIT(m_cr, 8), (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07);
paint(m_cpx, m_cpy);
command_end_seq();
}
@@ -1736,7 +1736,7 @@ void h63484_device::process_fifo()
case COMMAND_DOT:
if (m_param_ptr == 0)
{
- if (CMD_LOG) logerror("HD63484 '%s': DOT (%d, %d, %d)\n", tag().c_str(), (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07);
+ if (CMD_LOG) logerror("HD63484 '%s': DOT (%d, %d, %d)\n", tag(), (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07);
set_dot(m_cpx, m_cpy, 0, 0);
command_end_seq();
}
@@ -1745,7 +1745,7 @@ void h63484_device::process_fifo()
case COMMAND_PTN:
if (m_param_ptr == 1)
{
- if (CMD_LOG) logerror("HD63484 '%s': PTN (%d, %d, %d, %d, %d) 0x%04x\n", tag().c_str(), (m_cr >> 11) & 0x01, (m_cr >> 8) & 0x07, (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, m_pr[0]);
+ if (CMD_LOG) logerror("HD63484 '%s': PTN (%d, %d, %d, %d, %d) 0x%04x\n", tag(), (m_cr >> 11) & 0x01, (m_cr >> 8) & 0x07, (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, m_pr[0]);
command_ptn_exec();
command_end_seq();
}
@@ -1755,7 +1755,7 @@ void h63484_device::process_fifo()
case COMMAND_AGCPY:
if (m_param_ptr == 4)
{
- if (CMD_LOG) logerror("HD63484 '%s': %cGCPY (%d, %d, %d, %d, %d) %d, %d, %d, %d\n", tag().c_str(), BIT(m_cr, 12) ? 'R' : 'A', (m_cr >> 11) & 0x01, (m_cr >> 8) & 0x07, (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, (INT16)m_pr[0], (INT16)m_pr[1], (INT16)m_pr[2], (INT16)m_pr[3]);
+ if (CMD_LOG) logerror("HD63484 '%s': %cGCPY (%d, %d, %d, %d, %d) %d, %d, %d, %d\n", tag(), BIT(m_cr, 12) ? 'R' : 'A', (m_cr >> 11) & 0x01, (m_cr >> 8) & 0x07, (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, (INT16)m_pr[0], (INT16)m_pr[1], (INT16)m_pr[2], (INT16)m_pr[3]);
command_gcpy_exec();
command_end_seq();
diff --git a/src/devices/video/h63484.h b/src/devices/video/h63484.h
index d8319bcd3df..8cf169fe751 100644
--- a/src/devices/video/h63484.h
+++ b/src/devices/video/h63484.h
@@ -44,7 +44,7 @@ class h63484_device : public device_t,
{
public:
// construction/destruction
- h63484_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ h63484_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
static void static_set_display_callback(device_t &device, h63484_display_delegate callback) { downcast<h63484_device &>(device).m_display_cb = callback; }
diff --git a/src/devices/video/hd44102.cpp b/src/devices/video/hd44102.cpp
index b76ee9f8f04..e9a1a9d014d 100644
--- a/src/devices/video/hd44102.cpp
+++ b/src/devices/video/hd44102.cpp
@@ -67,7 +67,7 @@ inline void hd44102_device::count_up_or_down()
// hd44102_device - constructor
//-------------------------------------------------
-hd44102_device::hd44102_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+hd44102_device::hd44102_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, HD44102, "HD44102", tag, owner, clock, "hd44102", __FILE__),
device_video_interface(mconfig, *this),
m_cs2(0),
@@ -172,25 +172,25 @@ WRITE8_MEMBER( hd44102_device::control_w )
switch (data)
{
case CONTROL_DISPLAY_OFF:
- if (LOG) logerror("HD44102 '%s' Display Off\n", tag().c_str());
+ if (LOG) logerror("HD44102 '%s' Display Off\n", tag());
m_status |= STATUS_DISPLAY_OFF;
break;
case CONTROL_DISPLAY_ON:
- if (LOG) logerror("HD44102 '%s' Display On\n", tag().c_str());
+ if (LOG) logerror("HD44102 '%s' Display On\n", tag());
m_status &= ~STATUS_DISPLAY_OFF;
break;
case CONTROL_COUNT_DOWN_MODE:
- if (LOG) logerror("HD44102 '%s' Count Down Mode\n", tag().c_str());
+ if (LOG) logerror("HD44102 '%s' Count Down Mode\n", tag());
m_status &= ~STATUS_COUNT_UP;
break;
case CONTROL_COUNT_UP_MODE:
- if (LOG) logerror("HD44102 '%s' Count Up Mode\n", tag().c_str());
+ if (LOG) logerror("HD44102 '%s' Count Up Mode\n", tag());
m_status |= STATUS_COUNT_UP;
break;
@@ -202,17 +202,17 @@ WRITE8_MEMBER( hd44102_device::control_w )
if ((data & CONTROL_Y_ADDRESS_MASK) == CONTROL_DISPLAY_START_PAGE)
{
- if (LOG) logerror("HD44102 '%s' Display Start Page %u\n", tag().c_str(), x);
+ if (LOG) logerror("HD44102 '%s' Display Start Page %u\n", tag(), x);
m_page = x;
}
else if (y > 49)
{
- logerror("HD44102 '%s' Invalid Address X %u Y %u (%02x)!\n", tag().c_str(), data, x, y);
+ logerror("HD44102 '%s' Invalid Address X %u Y %u (%02x)!\n", tag(), data, x, y);
}
else
{
- if (LOG) logerror("HD44102 '%s' Address X %u Y %u (%02x)\n", tag().c_str(), data, x, y);
+ if (LOG) logerror("HD44102 '%s' Address X %u Y %u (%02x)\n", tag(), data, x, y);
m_x = x;
m_y = y;
diff --git a/src/devices/video/hd44102.h b/src/devices/video/hd44102.h
index 9e263c43975..fb3ef81fceb 100644
--- a/src/devices/video/hd44102.h
+++ b/src/devices/video/hd44102.h
@@ -37,7 +37,7 @@ class hd44102_device : public device_t,
{
public:
// construction/destruction
- hd44102_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ hd44102_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// inline configuration helpers
static void static_set_offsets(device_t &device, int sx, int sy);
diff --git a/src/devices/video/hd44352.cpp b/src/devices/video/hd44352.cpp
index 8e8a7aff87d..8b30b0afd9b 100644
--- a/src/devices/video/hd44352.cpp
+++ b/src/devices/video/hd44352.cpp
@@ -34,7 +34,7 @@ const device_type HD44352 = &device_creator<hd44352_device>;
// hd44352_device - constructor
//-------------------------------------------------
-hd44352_device::hd44352_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock):
+hd44352_device::hd44352_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock):
device_t(mconfig, HD44352, "hd44352", tag, owner, clock, "hd44352", __FILE__),
m_on_cb(*this)
{
diff --git a/src/devices/video/hd44352.h b/src/devices/video/hd44352.h
index 77f86be828a..dda32fa7111 100644
--- a/src/devices/video/hd44352.h
+++ b/src/devices/video/hd44352.h
@@ -27,7 +27,7 @@ class hd44352_device :
{
public:
// construction/destruction
- hd44352_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ hd44352_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_on_callback(device_t &device, _Object object) { return downcast<hd44352_device &>(device).m_on_cb.set_callback(object); }
diff --git a/src/devices/video/hd44780.cpp b/src/devices/video/hd44780.cpp
index 765270f1a5e..00c75e3cd2a 100644
--- a/src/devices/video/hd44780.cpp
+++ b/src/devices/video/hd44780.cpp
@@ -45,20 +45,20 @@ ROM_END
// hd44780_device - constructor
//-------------------------------------------------
-hd44780_device::hd44780_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+hd44780_device::hd44780_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, HD44780, "HD44780 A00", tag, owner, clock, "hd44780_a00", __FILE__),
m_pixel_update_func(nullptr)
{
set_charset_type(CHARSET_HD44780_A00);
}
-hd44780_device::hd44780_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+hd44780_device::hd44780_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_pixel_update_func(nullptr)
{
}
-ks0066_f05_device::ks0066_f05_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+ks0066_f05_device::ks0066_f05_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
hd44780_device(mconfig, KS0066_F05, "KS0066 F05", tag, owner, clock, "ks0066_f05", __FILE__)
{
set_charset_type(CHARSET_KS0066_F05);
@@ -264,7 +264,7 @@ inline void hd44780_device::pixel_update(bitmap_ind16 &bitmap, UINT8 line, UINT8
}
else
{
- fatalerror("%s: use a custom callback for this LCD configuration (%d x %d)\n", tag().c_str(), m_lines, m_chars);
+ fatalerror("%s: use a custom callback for this LCD configuration (%d x %d)\n", tag(), m_lines, m_chars);
}
}
}
@@ -393,7 +393,7 @@ WRITE8_MEMBER(hd44780_device::control_write)
correct_ac();
set_busy_flag(37);
- if (LOG) logerror("HD44780 '%s': set DDRAM address %x\n", tag().c_str(), m_ac);
+ if (LOG) logerror("HD44780 '%s': set DDRAM address %x\n", tag(), m_ac);
return;
}
else if (BIT(m_ir, 6))
@@ -403,7 +403,7 @@ WRITE8_MEMBER(hd44780_device::control_write)
m_ac = m_ir & 0x3f;
set_busy_flag(37);
- if (LOG) logerror("HD44780 '%s': set CGRAM address %x\n", tag().c_str(), m_ac);
+ if (LOG) logerror("HD44780 '%s': set CGRAM address %x\n", tag(), m_ac);
return;
}
else if (BIT(m_ir, 5))
@@ -411,7 +411,7 @@ WRITE8_MEMBER(hd44780_device::control_write)
// function set
if (!m_first_cmd && m_data_len == (BIT(m_ir, 4) ? 8 : 4) && (m_char_size != (BIT(m_ir, 2) ? 10 : 8) || m_num_line != (BIT(m_ir, 3) + 1)))
{
- logerror("HD44780 '%s': function set cannot be executed after other instructions unless the interface data length is changed\n", tag().c_str());
+ logerror("HD44780 '%s': function set cannot be executed after other instructions unless the interface data length is changed\n", tag());
return;
}
@@ -421,7 +421,7 @@ WRITE8_MEMBER(hd44780_device::control_write)
correct_ac();
set_busy_flag(37);
- if (LOG) logerror("HD44780 '%s': char size 5x%d, data len %d, lines %d\n", tag().c_str(), m_char_size, m_data_len, m_num_line);
+ if (LOG) logerror("HD44780 '%s': char size 5x%d, data len %d, lines %d\n", tag(), m_char_size, m_data_len, m_num_line);
return;
}
else if (BIT(m_ir, 4))
@@ -429,7 +429,7 @@ WRITE8_MEMBER(hd44780_device::control_write)
// cursor or display shift
int direction = (BIT(m_ir, 2)) ? +1 : -1;
- if (LOG) logerror("HD44780 '%s': %s shift %d\n", tag().c_str(), BIT(m_ir, 3) ? "display" : "cursor", direction);
+ if (LOG) logerror("HD44780 '%s': %s shift %d\n", tag(), BIT(m_ir, 3) ? "display" : "cursor", direction);
if (BIT(m_ir, 3))
shift_display(direction);
@@ -446,7 +446,7 @@ WRITE8_MEMBER(hd44780_device::control_write)
m_blink_on = BIT(m_ir, 0);
set_busy_flag(37);
- if (LOG) logerror("HD44780 '%s': display %d, cursor %d, blink %d\n", tag().c_str(), m_display_on, m_cursor_on, m_blink_on);
+ if (LOG) logerror("HD44780 '%s': display %d, cursor %d, blink %d\n", tag(), m_display_on, m_cursor_on, m_blink_on);
}
else if (BIT(m_ir, 2))
{
@@ -455,12 +455,12 @@ WRITE8_MEMBER(hd44780_device::control_write)
m_shift_on = BIT(m_ir, 0);
set_busy_flag(37);
- if (LOG) logerror("HD44780 '%s': entry mode set: direction %d, shift %d\n", tag().c_str(), m_direction, m_shift_on);
+ if (LOG) logerror("HD44780 '%s': entry mode set: direction %d, shift %d\n", tag(), m_direction, m_shift_on);
}
else if (BIT(m_ir, 1))
{
// return home
- if (LOG) logerror("HD44780 '%s': return home\n", tag().c_str());
+ if (LOG) logerror("HD44780 '%s': return home\n", tag());
m_ac = 0;
m_active_ram = DDRAM;
@@ -471,7 +471,7 @@ WRITE8_MEMBER(hd44780_device::control_write)
else if (BIT(m_ir, 0))
{
// clear display
- if (LOG) logerror("HD44780 '%s': clear display\n", tag().c_str());
+ if (LOG) logerror("HD44780 '%s': clear display\n", tag());
m_ac = 0;
m_active_ram = DDRAM;
@@ -506,7 +506,7 @@ WRITE8_MEMBER(hd44780_device::data_write)
{
if (m_busy_flag)
{
- logerror("HD44780 '%s': Ignoring data write %02x due of busy flag\n", tag().c_str(), data);
+ logerror("HD44780 '%s': Ignoring data write %02x due of busy flag\n", tag(), data);
return;
}
@@ -529,7 +529,7 @@ WRITE8_MEMBER(hd44780_device::data_write)
m_dr = data;
}
- if (LOG) logerror("HD44780 '%s': %sRAM write %x %x '%c'\n", tag().c_str(), m_active_ram == DDRAM ? "DD" : "CG", m_ac, m_dr, isprint(m_dr) ? m_dr : '.');
+ if (LOG) logerror("HD44780 '%s': %sRAM write %x %x '%c'\n", tag(), m_active_ram == DDRAM ? "DD" : "CG", m_ac, m_dr, isprint(m_dr) ? m_dr : '.');
if (m_active_ram == DDRAM)
m_ddram[m_ac] = m_dr;
@@ -546,7 +546,7 @@ READ8_MEMBER(hd44780_device::data_read)
{
UINT8 data = (m_active_ram == DDRAM) ? m_ddram[m_ac] : m_cgram[m_ac];
- if (LOG) logerror("HD44780 '%s': %sRAM read %x %c\n", tag().c_str(), m_active_ram == DDRAM ? "DD" : "CG", m_ac, data);
+ if (LOG) logerror("HD44780 '%s': %sRAM read %x %c\n", tag(), m_active_ram == DDRAM ? "DD" : "CG", m_ac, data);
if (m_data_len == 4)
{
diff --git a/src/devices/video/hd44780.h b/src/devices/video/hd44780.h
index 81191315e41..637056d9505 100644
--- a/src/devices/video/hd44780.h
+++ b/src/devices/video/hd44780.h
@@ -38,8 +38,8 @@ class hd44780_device : public device_t
{
public:
// construction/destruction
- hd44780_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- hd44780_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ hd44780_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hd44780_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// static configuration helpers
static void static_set_lcd_size(device_t &device, int _lines, int _chars) { hd44780_device &dev=downcast<hd44780_device &>(device); dev.m_lines = _lines; dev.m_chars = _chars; }
@@ -136,7 +136,7 @@ class ks0066_f05_device : public hd44780_device
{
public:
// construction/destruction
- ks0066_f05_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ks0066_f05_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
// device type definition
diff --git a/src/devices/video/hd61830.cpp b/src/devices/video/hd61830.cpp
index 541dbfbfebe..d60354ef8a8 100644
--- a/src/devices/video/hd61830.cpp
+++ b/src/devices/video/hd61830.cpp
@@ -95,7 +95,7 @@ inline void hd61830_device::writebyte(offs_t address, UINT8 data)
// hd61830_device - constructor
//-------------------------------------------------
-hd61830_device::hd61830_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+hd61830_device::hd61830_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, HD61830, "HD61830 LCDC", tag, owner, clock, "hd61830", __FILE__),
device_memory_interface(mconfig, *this),
device_video_interface(mconfig, *this),
@@ -196,7 +196,7 @@ void hd61830_device::set_busy_flag()
READ8_MEMBER( hd61830_device::status_r )
{
- if (LOG) logerror("HD61830 '%s' Status Read: %s\n", tag().c_str(), m_bf ? "busy" : "ready");
+ if (LOG) logerror("HD61830 '%s' Status Read: %s\n", tag(), m_bf ? "busy" : "ready");
return m_bf ? 0x80 : 0;
}
@@ -220,7 +220,7 @@ READ8_MEMBER( hd61830_device::data_r )
{
UINT8 data = m_dor;
- if (LOG) logerror("HD61830 '%s' Display Data Read %02x\n", tag().c_str(), m_dor);
+ if (LOG) logerror("HD61830 '%s' Display Data Read %02x\n", tag(), m_dor);
m_dor = readbyte(m_cac);
@@ -238,7 +238,7 @@ WRITE8_MEMBER( hd61830_device::data_w )
{
if (m_bf)
{
- logerror("HD61830 '%s' Ignoring data write %02x due to business\n", tag().c_str(), data);
+ logerror("HD61830 '%s' Ignoring data write %02x due to business\n", tag(), data);
return;
}
@@ -249,12 +249,12 @@ WRITE8_MEMBER( hd61830_device::data_w )
if (LOG)
{
- logerror("HD61830 '%s' %s CG\n", tag().c_str(), (data & MODE_EXTERNAL_CG) ? "External" : "Internal");
- logerror("HD61830 '%s' %s Display Mode\n", tag().c_str(), (data & MODE_GRAPHIC) ? "Graphic" : "Character");
- logerror("HD61830 '%s' %s Mode\n", tag().c_str(), (data & MODE_MASTER) ? "Master" : "Slave");
- logerror("HD61830 '%s' Cursor %s\n", tag().c_str(), (data & MODE_CURSOR) ? "On" : "Off");
- logerror("HD61830 '%s' Blink %s\n", tag().c_str(), (data & MODE_BLINK) ? "On" : "Off");
- logerror("HD61830 '%s' Display %s\n", tag().c_str(), (data & MODE_DISPLAY_ON) ? "On" : "Off");
+ logerror("HD61830 '%s' %s CG\n", tag(), (data & MODE_EXTERNAL_CG) ? "External" : "Internal");
+ logerror("HD61830 '%s' %s Display Mode\n", tag(), (data & MODE_GRAPHIC) ? "Graphic" : "Character");
+ logerror("HD61830 '%s' %s Mode\n", tag(), (data & MODE_MASTER) ? "Master" : "Slave");
+ logerror("HD61830 '%s' Cursor %s\n", tag(), (data & MODE_CURSOR) ? "On" : "Off");
+ logerror("HD61830 '%s' Blink %s\n", tag(), (data & MODE_BLINK) ? "On" : "Off");
+ logerror("HD61830 '%s' Display %s\n", tag(), (data & MODE_DISPLAY_ON) ? "On" : "Off");
}
break;
@@ -262,38 +262,38 @@ WRITE8_MEMBER( hd61830_device::data_w )
m_hp = (data & 0x07) + 1;
m_vp = (data >> 4) + 1;
- if (LOG) logerror("HD61830 '%s' Horizontal Character Pitch: %u\n", tag().c_str(), m_hp);
- if (LOG) logerror("HD61830 '%s' Vertical Character Pitch: %u\n", tag().c_str(), m_vp);
+ if (LOG) logerror("HD61830 '%s' Horizontal Character Pitch: %u\n", tag(), m_hp);
+ if (LOG) logerror("HD61830 '%s' Vertical Character Pitch: %u\n", tag(), m_vp);
break;
case INSTRUCTION_NUMBER_OF_CHARACTERS:
m_hn = (data & 0x7f) + 1;
- if (LOG) logerror("HD61830 '%s' Number of Characters: %u\n", tag().c_str(), m_hn);
+ if (LOG) logerror("HD61830 '%s' Number of Characters: %u\n", tag(), m_hn);
break;
case INSTRUCTION_NUMBER_OF_TIME_DIVISIONS:
m_nx = (data & 0x7f) + 1;
- if (LOG) logerror("HD61830 '%s' Number of Time Divisions: %u\n", tag().c_str(), m_nx);
+ if (LOG) logerror("HD61830 '%s' Number of Time Divisions: %u\n", tag(), m_nx);
break;
case INSTRUCTION_CURSOR_POSITION:
m_cp = (data & 0x7f) + 1;
- if (LOG) logerror("HD61830 '%s' Cursor Position: %u\n", tag().c_str(), m_cp);
+ if (LOG) logerror("HD61830 '%s' Cursor Position: %u\n", tag(), m_cp);
break;
case INSTRUCTION_DISPLAY_START_LOW:
m_dsa = (m_dsa & 0xff00) | data;
- if (LOG) logerror("HD61830 '%s' Display Start Address Low %04x\n", tag().c_str(), m_dsa);
+ if (LOG) logerror("HD61830 '%s' Display Start Address Low %04x\n", tag(), m_dsa);
break;
case INSTRUCTION_DISPLAY_START_HIGH:
m_dsa = (data << 8) | (m_dsa & 0xff);
- if (LOG) logerror("HD61830 '%s' Display Start Address High %04x\n", tag().c_str(), m_dsa);
+ if (LOG) logerror("HD61830 '%s' Display Start Address High %04x\n", tag(), m_dsa);
break;
case INSTRUCTION_CURSOR_ADDRESS_LOW:
@@ -306,19 +306,19 @@ WRITE8_MEMBER( hd61830_device::data_w )
m_cac = (m_cac & 0xff00) | data;
}
- if (LOG) logerror("HD61830 '%s' Cursor Address Low %02x: %04x\n", tag().c_str(), data, m_cac);
+ if (LOG) logerror("HD61830 '%s' Cursor Address Low %02x: %04x\n", tag(), data, m_cac);
break;
case INSTRUCTION_CURSOR_ADDRESS_HIGH:
m_cac = (data << 8) | (m_cac & 0xff);
- if (LOG) logerror("HD61830 '%s' Cursor Address High %02x: %04x\n", tag().c_str(), data, m_cac);
+ if (LOG) logerror("HD61830 '%s' Cursor Address High %02x: %04x\n", tag(), data, m_cac);
break;
case INSTRUCTION_DISPLAY_DATA_WRITE:
writebyte(m_cac, data);
- if (LOG) logerror("HD61830 '%s' Display Data Write %02x -> %04x row %u col %u\n", tag().c_str(), data, m_cac, m_cac / 40, m_cac % 40);
+ if (LOG) logerror("HD61830 '%s' Display Data Write %02x -> %04x row %u col %u\n", tag(), data, m_cac, m_cac / 40, m_cac % 40);
m_cac++;
break;
@@ -330,7 +330,7 @@ WRITE8_MEMBER( hd61830_device::data_w )
md &= ~(1 << bit);
- if (LOG) logerror("HD61830 '%s' Clear Bit %u at %04x\n", tag().c_str(), bit + 1, m_cac);
+ if (LOG) logerror("HD61830 '%s' Clear Bit %u at %04x\n", tag(), bit + 1, m_cac);
writebyte(m_cac, md);
@@ -345,7 +345,7 @@ WRITE8_MEMBER( hd61830_device::data_w )
md |= 1 << bit;
- if (LOG) logerror("HD61830 '%s' Set Bit %u at %04x\n", tag().c_str(), bit + 1, m_cac);
+ if (LOG) logerror("HD61830 '%s' Set Bit %u at %04x\n", tag(), bit + 1, m_cac);
writebyte(m_cac, md);
@@ -354,7 +354,7 @@ WRITE8_MEMBER( hd61830_device::data_w )
break;
default:
- logerror("HD61830 '%s' Illegal Instruction %02x!\n", tag().c_str(), m_ir);
+ logerror("HD61830 '%s' Illegal Instruction %02x!\n", tag(), m_ir);
return;
}
diff --git a/src/devices/video/hd61830.h b/src/devices/video/hd61830.h
index 999d17b9506..5e060fe9539 100644
--- a/src/devices/video/hd61830.h
+++ b/src/devices/video/hd61830.h
@@ -36,7 +36,7 @@ class hd61830_device : public device_t,
{
public:
// construction/destruction
- hd61830_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ hd61830_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_rd_rd_callback(device_t &device, _Object object) { return downcast<hd61830_device &>(device).m_read_rd.set_callback(object); }
diff --git a/src/devices/video/hd63484.cpp b/src/devices/video/hd63484.cpp
index 710907a722e..9dab25d3669 100644
--- a/src/devices/video/hd63484.cpp
+++ b/src/devices/video/hd63484.cpp
@@ -27,7 +27,7 @@
const device_type HD63484 = &device_creator<hd63484_device>;
-hd63484_device::hd63484_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+hd63484_device::hd63484_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, HD63484, "HD63484 CRTC", tag, owner, clock, "hd63484", __FILE__),
m_ram(nullptr),
m_fifo_counter(0),
diff --git a/src/devices/video/hd63484.h b/src/devices/video/hd63484.h
index 811d615ca05..aca908fe008 100644
--- a/src/devices/video/hd63484.h
+++ b/src/devices/video/hd63484.h
@@ -26,7 +26,7 @@
class hd63484_device : public device_t
{
public:
- hd63484_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ hd63484_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~hd63484_device() {}
DECLARE_READ16_MEMBER( status_r );
diff --git a/src/devices/video/hd66421.cpp b/src/devices/video/hd66421.cpp
index 59a5b12688e..513b028336f 100644
--- a/src/devices/video/hd66421.cpp
+++ b/src/devices/video/hd66421.cpp
@@ -116,7 +116,7 @@ inline void hd66421_device::writebyte(offs_t address, UINT8 data)
// hd66421_device - constructor
//-------------------------------------------------
-hd66421_device::hd66421_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+hd66421_device::hd66421_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, HD66421, "Hitachi HD66421 LCD Controller", tag, owner, clock, "hd66421", __FILE__),
device_memory_interface(mconfig, *this),
m_space_config("videoram", ENDIANNESS_LITTLE, 8, 17, 0, nullptr, *ADDRESS_MAP_NAME(hd66421)),
diff --git a/src/devices/video/hd66421.h b/src/devices/video/hd66421.h
index b1393586647..e02382f4fac 100644
--- a/src/devices/video/hd66421.h
+++ b/src/devices/video/hd66421.h
@@ -44,7 +44,7 @@ class hd66421_device : public device_t,
{
public:
// construction/destruction
- hd66421_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ hd66421_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER( reg_idx_r );
DECLARE_WRITE8_MEMBER( reg_idx_w );
diff --git a/src/devices/video/huc6202.cpp b/src/devices/video/huc6202.cpp
index b112fec6c09..2e2c4e60b6a 100644
--- a/src/devices/video/huc6202.cpp
+++ b/src/devices/video/huc6202.cpp
@@ -14,7 +14,7 @@
const device_type HUC6202 = &device_creator<huc6202_device>;
-huc6202_device::huc6202_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+huc6202_device::huc6202_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, HUC6202, "HuC6202 VPC", tag, owner, clock, "huc6202", __FILE__),
m_next_pixel_0_cb(*this),
m_time_til_next_event_0_cb(*this),
diff --git a/src/devices/video/huc6202.h b/src/devices/video/huc6202.h
index fafc3fdb571..c9920bd333e 100644
--- a/src/devices/video/huc6202.h
+++ b/src/devices/video/huc6202.h
@@ -53,7 +53,7 @@ class huc6202_device : public device_t
{
public:
// construction/destruction
- huc6202_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ huc6202_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_next_pixel_0_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_next_pixel_0_cb.set_callback(object); }
template<class _Object> static devcb_base &set_time_til_next_event_0_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_time_til_next_event_0_cb.set_callback(object); }
diff --git a/src/devices/video/huc6260.cpp b/src/devices/video/huc6260.cpp
index e9beca35ed4..ca9a9b0510d 100644
--- a/src/devices/video/huc6260.cpp
+++ b/src/devices/video/huc6260.cpp
@@ -45,7 +45,7 @@ PALETTE_INIT_MEMBER(huc6260_device, huc6260)
const device_type HUC6260 = &device_creator<huc6260_device>;
-huc6260_device::huc6260_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+huc6260_device::huc6260_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, HUC6260, "HuC6260 VCE", tag, owner, clock, "huc6260", __FILE__),
device_video_interface(mconfig, *this),
m_next_pixel_data_cb(*this),
diff --git a/src/devices/video/huc6260.h b/src/devices/video/huc6260.h
index dfaab084fed..85552fbd265 100644
--- a/src/devices/video/huc6260.h
+++ b/src/devices/video/huc6260.h
@@ -38,7 +38,7 @@ class huc6260_device : public device_t,
{
public:
// construction/destruction
- huc6260_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ huc6260_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_next_pixel_data_callback(device_t &device, _Object object) { return downcast<huc6260_device &>(device).m_next_pixel_data_cb.set_callback(object); }
template<class _Object> static devcb_base &set_time_til_next_event_callback(device_t &device, _Object object) { return downcast<huc6260_device &>(device).m_time_til_next_event_cb.set_callback(object); }
diff --git a/src/devices/video/huc6261.cpp b/src/devices/video/huc6261.cpp
index 35ea2a8fea1..69caa26008e 100644
--- a/src/devices/video/huc6261.cpp
+++ b/src/devices/video/huc6261.cpp
@@ -25,9 +25,9 @@
const device_type HUC6261 = &device_creator<huc6261_device>;
-huc6261_device::huc6261_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+huc6261_device::huc6261_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, HUC6261, "HuC6261", tag, owner, clock, "huc6261", __FILE__),
- device_video_interface(mconfig, *this), m_huc6270_a(nullptr), m_huc6270_b(nullptr), m_last_h(0), m_last_v(0), m_height(0), m_address(0), m_palette_latch(0), m_register(0), m_control(0), m_pixels_per_clock(0), m_pixel_data(0), m_pixel_clock(0), m_timer(nullptr), m_bmp(nullptr)
+ device_video_interface(mconfig, *this), m_huc6270_a_tag(nullptr), m_huc6270_b_tag(nullptr), m_huc6270_a(nullptr), m_huc6270_b(nullptr), m_last_h(0), m_last_v(0), m_height(0), m_address(0), m_palette_latch(0), m_register(0), m_control(0), m_pixels_per_clock(0), m_pixel_data(0), m_pixel_clock(0), m_timer(nullptr), m_bmp(nullptr)
{
// Set up UV lookup table
for ( int ur = 0; ur < 256; ur++ )
@@ -391,8 +391,8 @@ WRITE16_MEMBER( huc6261_device::write )
void huc6261_device::device_start()
{
/* Make sure we are supplied all our mandatory tags */
- assert( !m_huc6270_a_tag.empty() );
- assert( !m_huc6270_b_tag.empty() );
+ assert( m_huc6270_a_tag != nullptr );
+ assert( m_huc6270_b_tag != nullptr );
m_timer = timer_alloc();
m_huc6270_a = machine().device<huc6270_device>(m_huc6270_a_tag);
diff --git a/src/devices/video/huc6261.h b/src/devices/video/huc6261.h
index 9089c94e15e..ab04cd01c22 100644
--- a/src/devices/video/huc6261.h
+++ b/src/devices/video/huc6261.h
@@ -31,10 +31,10 @@ class huc6261_device : public device_t,
{
public:
// construction/destruction
- huc6261_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ huc6261_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- static void set_vdc1_tag(device_t &device, std::string tag) { downcast<huc6261_device &>(device).m_huc6270_a_tag = tag; }
- static void set_vdc2_tag(device_t &device, std::string tag) { downcast<huc6261_device &>(device).m_huc6270_b_tag = tag; }
+ static void set_vdc1_tag(device_t &device, const char *tag) { downcast<huc6261_device &>(device).m_huc6270_a_tag = tag; }
+ static void set_vdc2_tag(device_t &device, const char *tag) { downcast<huc6261_device &>(device).m_huc6270_b_tag = tag; }
void video_update(bitmap_rgb32 &bitmap, const rectangle &cliprect);
DECLARE_READ16_MEMBER( read );
@@ -49,8 +49,8 @@ protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
private:
- std::string m_huc6270_a_tag;
- std::string m_huc6270_b_tag;
+ const char *m_huc6270_a_tag;
+ const char *m_huc6270_b_tag;
huc6270_device *m_huc6270_a;
huc6270_device *m_huc6270_b;
diff --git a/src/devices/video/huc6270.cpp b/src/devices/video/huc6270.cpp
index 8ee3a9e5ae5..42527fbcf16 100644
--- a/src/devices/video/huc6270.cpp
+++ b/src/devices/video/huc6270.cpp
@@ -96,7 +96,7 @@ const device_type HUC6270 = &device_creator<huc6270_device>;
const UINT8 huc6270_device::vram_increments[4] = { 1, 32, 64, 128 };
-huc6270_device::huc6270_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+huc6270_device::huc6270_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, HUC6270, "HuC6270 VDC", tag, owner, clock, "huc6270", __FILE__),
m_vram_size(0),
m_irq_changed_cb(*this)
diff --git a/src/devices/video/huc6270.h b/src/devices/video/huc6270.h
index 145bfdf4e62..fdaca3b4f5c 100644
--- a/src/devices/video/huc6270.h
+++ b/src/devices/video/huc6270.h
@@ -21,7 +21,7 @@ class huc6270_device : public device_t
{
public:
// construction/destruction
- huc6270_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ huc6270_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
static void set_vram_size(device_t &device, UINT32 vram_size) { downcast<huc6270_device &>(device).m_vram_size = vram_size; }
template<class _Object> static devcb_base &set_irq_changed_callback(device_t &device, _Object object) { return downcast<huc6270_device &>(device).m_irq_changed_cb.set_callback(object); }
diff --git a/src/devices/video/huc6272.cpp b/src/devices/video/huc6272.cpp
index da336a21383..f76dd257d7f 100644
--- a/src/devices/video/huc6272.cpp
+++ b/src/devices/video/huc6272.cpp
@@ -65,7 +65,7 @@ inline void huc6272_device::write_dword(offs_t address, UINT32 data)
// huc6272_device - constructor
//-------------------------------------------------
-huc6272_device::huc6272_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+huc6272_device::huc6272_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, huc6272, "huc6272", tag, owner, clock, "huc6272", __FILE__),
device_memory_interface(mconfig, *this),
m_space_config("videoram", ENDIANNESS_LITTLE, 32, 32, 0, nullptr, *ADDRESS_MAP_NAME(huc6272_vram))
diff --git a/src/devices/video/huc6272.h b/src/devices/video/huc6272.h
index 73d6cbaf059..27bd14636e2 100644
--- a/src/devices/video/huc6272.h
+++ b/src/devices/video/huc6272.h
@@ -32,7 +32,7 @@ class huc6272_device : public device_t,
{
public:
// construction/destruction
- huc6272_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ huc6272_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// I/O operations
DECLARE_WRITE32_MEMBER( write );
diff --git a/src/devices/video/i8244.cpp b/src/devices/video/i8244.cpp
index ab44e6f197a..8adb5b5ed15 100644
--- a/src/devices/video/i8244.cpp
+++ b/src/devices/video/i8244.cpp
@@ -101,7 +101,7 @@ static const UINT8 bgr2rgb[8] =
// i8244_device - constructor
//-------------------------------------------------
-i8244_device::i8244_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+i8244_device::i8244_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, I8244, "I8244", tag, owner, clock, "i8244", __FILE__)
, device_sound_interface(mconfig, *this)
, device_video_interface(mconfig, *this)
@@ -114,7 +114,7 @@ i8244_device::i8244_device(const machine_config &mconfig, std::string tag, devic
}
-i8244_device::i8244_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, int lines, const char *shortname, const char *source)
+i8244_device::i8244_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, int lines, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
, device_sound_interface(mconfig, *this)
, device_video_interface(mconfig, *this)
@@ -127,7 +127,7 @@ i8244_device::i8244_device(const machine_config &mconfig, device_type type, cons
}
-i8245_device::i8245_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+i8245_device::i8245_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: i8244_device(mconfig, I8245, "I8245", tag, owner, clock, i8245_device::LINES, "i8245", __FILE__)
{
}
diff --git a/src/devices/video/i8244.h b/src/devices/video/i8244.h
index cb3cbaff7ca..b946f7bd2c0 100644
--- a/src/devices/video/i8244.h
+++ b/src/devices/video/i8244.h
@@ -80,8 +80,8 @@ class i8244_device : public device_t
{
public:
// construction/destruction
- i8244_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- i8244_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, int lines, const char *shortname, const char *source);
+ i8244_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8244_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, int lines, const char *shortname, const char *source);
// static configuration helpers
static void set_screen_tag(device_t &device, const char *screen_tag) { downcast<i8244_device &>(device).m_screen_tag = screen_tag; }
@@ -155,7 +155,7 @@ class i8245_device : public i8244_device
{
public:
// construction/destruction
- i8245_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ i8245_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
static const int LINES = 312;
};
diff --git a/src/devices/video/i82730.cpp b/src/devices/video/i82730.cpp
index 1450abc9112..d344c7006ef 100644
--- a/src/devices/video/i82730.cpp
+++ b/src/devices/video/i82730.cpp
@@ -51,11 +51,11 @@ const char *i82730_device::m_command_names[] =
// i82730_device - constructor
//-------------------------------------------------
-i82730_device::i82730_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+i82730_device::i82730_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, I82730, "I82730", tag, owner, clock, "i82730", __FILE__),
device_video_interface(mconfig, *this),
m_sint_handler(*this),
- m_program(nullptr),
+ m_cpu_tag(nullptr), m_program(nullptr),
m_row_timer(nullptr),
m_initialized(false), m_mode_set(false),
m_ca(0),
@@ -73,7 +73,7 @@ i82730_device::i82730_device(const machine_config &mconfig, std::string tag, dev
// set_cpu_tag - set cpu we are attached to
//-------------------------------------------------
-void i82730_device::set_cpu_tag(device_t &device, device_t *owner, std::string tag)
+void i82730_device::set_cpu_tag(device_t &device, device_t *owner, const char *tag)
{
i82730_device &dev = dynamic_cast<i82730_device &>(device);
dev.m_cpu_tag = tag;
diff --git a/src/devices/video/i82730.h b/src/devices/video/i82730.h
index 363a059c582..97d9bd70b0d 100644
--- a/src/devices/video/i82730.h
+++ b/src/devices/video/i82730.h
@@ -47,14 +47,14 @@ class i82730_device : public device_t, public device_video_interface
{
public:
// construction/destruction
- i82730_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ i82730_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// callbacks
template<class _Object> static devcb_base &set_sint_handler(device_t &device, _Object object)
{ return downcast<i82730_device &>(device).m_sint_handler.set_callback(object); }
// inline configuration
- static void set_cpu_tag(device_t &device, device_t *owner, std::string tag);
+ static void set_cpu_tag(device_t &device, device_t *owner, const char *tag);
static void set_update_row_callback(device_t &device, i82730_update_row_delegate callback) { downcast<i82730_device &>(device).m_update_row_cb = callback; }
UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
@@ -100,7 +100,7 @@ private:
devcb_write_line m_sint_handler;
i82730_update_row_delegate m_update_row_cb;
- std::string m_cpu_tag;
+ const char *m_cpu_tag;
address_space *m_program;
emu_timer *m_row_timer;
diff --git a/src/devices/video/i8275.cpp b/src/devices/video/i8275.cpp
index 00fd3432083..433f222cb92 100644
--- a/src/devices/video/i8275.cpp
+++ b/src/devices/video/i8275.cpp
@@ -91,7 +91,7 @@ const device_type I8275 = &device_creator<i8275_device>;
// i8275_device - constructor
//-------------------------------------------------
-i8275_device::i8275_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+i8275_device::i8275_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, I8275, "I8275 CRTC", tag, owner, clock, "i8275x", __FILE__),
device_video_interface(mconfig, *this),
m_write_irq(*this),
@@ -201,24 +201,24 @@ void i8275_device::device_timer(emu_timer &timer, device_timer_id id, int param,
switch (id)
{
case TIMER_HRTC_ON:
- //if (LOG) logerror("I8275 '%s' y %u x %u HRTC 1\n", tag().c_str(), y, x);
+ //if (LOG) logerror("I8275 '%s' y %u x %u HRTC 1\n", tag(), y, x);
m_write_hrtc(1);
break;
case TIMER_DRQ_ON:
- //if (LOG) logerror("I8275 '%s' y %u x %u DRQ 1\n", tag().c_str(), y, x);
+ //if (LOG) logerror("I8275 '%s' y %u x %u DRQ 1\n", tag(), y, x);
m_write_drq(1);
break;
case TIMER_SCANLINE:
if (!(m_status & ST_VE)) break;
- //if (LOG) logerror("I8275 '%s' y %u x %u HRTC 0\n", tag().c_str(), y, x);
+ //if (LOG) logerror("I8275 '%s' y %u x %u HRTC 0\n", tag(), y, x);
m_write_hrtc(0);
if (m_scanline == 0)
{
- //if (LOG) logerror("I8275 '%s' y %u x %u VRTC 0\n", tag().c_str(), y, x);
+ //if (LOG) logerror("I8275 '%s' y %u x %u VRTC 0\n", tag(), y, x);
m_write_vrtc(0);
}
@@ -231,7 +231,7 @@ void i8275_device::device_timer(emu_timer &timer, device_timer_id id, int param,
m_status |= ST_DU;
m_du = true;
- //if (LOG) logerror("I8275 '%s' y %u x %u DMA Underrun\n", tag().c_str(), y, x);
+ //if (LOG) logerror("I8275 '%s' y %u x %u DMA Underrun\n", tag(), y, x);
m_write_drq(0);
}
@@ -256,7 +256,7 @@ void i8275_device::device_timer(emu_timer &timer, device_timer_id id, int param,
{
if (m_status & ST_IE)
{
- //if (LOG) logerror("I8275 '%s' y %u x %u IRQ 1\n", tag().c_str(), y, x);
+ //if (LOG) logerror("I8275 '%s' y %u x %u IRQ 1\n", tag(), y, x);
m_status |= ST_IR;
m_write_irq(ASSERT_LINE);
}
@@ -264,7 +264,7 @@ void i8275_device::device_timer(emu_timer &timer, device_timer_id id, int param,
if (m_scanline == m_vrtc_scanline)
{
- //if (LOG) logerror("I8275 '%s' y %u x %u VRTC 1\n", tag().c_str(), y, x);
+ //if (LOG) logerror("I8275 '%s' y %u x %u VRTC 1\n", tag(), y, x);
m_write_vrtc(1);
// reset field attributes
@@ -456,7 +456,7 @@ READ8_MEMBER( i8275_device::read )
if (m_status & ST_IR)
{
- //if (LOG) logerror("I8275 '%s' IRQ 0\n", tag().c_str());
+ //if (LOG) logerror("I8275 '%s' IRQ 0\n", tag());
m_write_irq(CLEAR_LINE);
}
@@ -485,15 +485,15 @@ WRITE8_MEMBER( i8275_device::write )
{
if (offset & 0x01)
{
- if (LOG) logerror("I8275 '%s' Command %02x\n", tag().c_str(), data);
+ if (LOG) logerror("I8275 '%s' Command %02x\n", tag(), data);
switch (data >> 5)
{
case CMD_RESET:
- if (LOG) logerror("I8275 '%s' Reset\n", tag().c_str());
+ if (LOG) logerror("I8275 '%s' Reset\n", tag());
m_status &= ~ST_IE;
- if (LOG) logerror("I8275 '%s' IRQ 0\n", tag().c_str());
+ if (LOG) logerror("I8275 '%s' IRQ 0\n", tag());
m_write_irq(CLEAR_LINE);
m_write_drq(0);
@@ -504,47 +504,47 @@ WRITE8_MEMBER( i8275_device::write )
case CMD_START_DISPLAY:
{
m_param[REG_DMA] = data;
- if (LOG) logerror("I8275 '%s' Start Display %u %u\n", tag().c_str(), DMA_BURST_COUNT, DMA_BURST_SPACE);
+ if (LOG) logerror("I8275 '%s' Start Display %u %u\n", tag(), DMA_BURST_COUNT, DMA_BURST_SPACE);
m_status |= (ST_IE | ST_VE);
}
break;
case CMD_STOP_DISPLAY:
- if (LOG) logerror("I8275 '%s' Stop Display\n", tag().c_str());
+ if (LOG) logerror("I8275 '%s' Stop Display\n", tag());
m_status &= ~ST_VE;
break;
case CMD_READ_LIGHT_PEN:
- if (LOG) logerror("I8275 '%s' Read Light Pen\n", tag().c_str());
+ if (LOG) logerror("I8275 '%s' Read Light Pen\n", tag());
m_param_idx = REG_LPEN_COL;
m_param_end = REG_LPEN_ROW;
break;
case CMD_LOAD_CURSOR:
- if (LOG) logerror("I8275 '%s' Load Cursor\n", tag().c_str());
+ if (LOG) logerror("I8275 '%s' Load Cursor\n", tag());
m_param_idx = REG_CUR_COL;
m_param_end = REG_CUR_ROW;
break;
case CMD_ENABLE_INTERRUPT:
- if (LOG) logerror("I8275 '%s' Enable Interrupt\n", tag().c_str());
+ if (LOG) logerror("I8275 '%s' Enable Interrupt\n", tag());
m_status |= ST_IE;
break;
case CMD_DISABLE_INTERRUPT:
- if (LOG) logerror("I8275 '%s' Disable Interrupt\n", tag().c_str());
+ if (LOG) logerror("I8275 '%s' Disable Interrupt\n", tag());
m_status &= ~ST_IE;
break;
case CMD_PRESET_COUNTERS:
- if (LOG) logerror("I8275 '%s' Preset Counters\n", tag().c_str());
+ if (LOG) logerror("I8275 '%s' Preset Counters\n", tag());
m_scanline = 0;
break;
}
}
else
{
- if (LOG) logerror("I8275 '%s' Parameter %02x\n", tag().c_str(), data);
+ if (LOG) logerror("I8275 '%s' Parameter %02x\n", tag(), data);
m_param[m_param_idx] = data;
@@ -564,7 +564,7 @@ WRITE8_MEMBER( i8275_device::write )
WRITE8_MEMBER( i8275_device::dack_w )
{
- //if (LOG) logerror("I8275 '%s' y %u x %u DACK %04x:%02x %u\n", tag().c_str(), m_screen->vpos(), m_screen->hpos(), offset, data, m_buffer_idx);
+ //if (LOG) logerror("I8275 '%s' y %u x %u DACK %04x:%02x %u\n", tag(), m_screen->vpos(), m_screen->hpos(), offset, data, m_buffer_idx);
m_write_drq(0);
diff --git a/src/devices/video/i8275.h b/src/devices/video/i8275.h
index a8a9a01e74b..04a726f54ab 100644
--- a/src/devices/video/i8275.h
+++ b/src/devices/video/i8275.h
@@ -79,7 +79,7 @@ class i8275_device : public device_t,
{
public:
// construction/destruction
- i8275_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ i8275_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
static void static_set_character_width(device_t &device, int value) { downcast<i8275_device &>(device).m_hpixels_per_column = value; }
static void static_set_display_callback(device_t &device, i8275_draw_character_delegate callback) { downcast<i8275_device &>(device).m_display_cb = callback; }
diff --git a/src/devices/video/m50458.cpp b/src/devices/video/m50458.cpp
index db67b778dc9..38e5eeb6e9a 100644
--- a/src/devices/video/m50458.cpp
+++ b/src/devices/video/m50458.cpp
@@ -172,7 +172,7 @@ inline void m50458_device::write_word(offs_t address, UINT16 data)
// m50458_device - constructor
//-------------------------------------------------
-m50458_device::m50458_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+m50458_device::m50458_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, M50458, "M50458 OSD", tag, owner, clock, "m50458", __FILE__),
device_memory_interface(mconfig, *this),
device_video_interface(mconfig, *this),
diff --git a/src/devices/video/m50458.h b/src/devices/video/m50458.h
index e7078c659f2..9744ff6d361 100644
--- a/src/devices/video/m50458.h
+++ b/src/devices/video/m50458.h
@@ -40,7 +40,7 @@ class m50458_device : public device_t,
{
public:
// construction/destruction
- m50458_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ m50458_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// I/O operations
DECLARE_WRITE_LINE_MEMBER( write_bit );
diff --git a/src/devices/video/mb90082.cpp b/src/devices/video/mb90082.cpp
index e5207a7659a..b65590b6db8 100644
--- a/src/devices/video/mb90082.cpp
+++ b/src/devices/video/mb90082.cpp
@@ -85,7 +85,7 @@ inline void mb90082_device::write_word(offs_t address, UINT16 data)
// mb90082_device - constructor
//-------------------------------------------------
-mb90082_device::mb90082_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mb90082_device::mb90082_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MB90082, "MB90082 OSD", tag, owner, clock, "mb90082", __FILE__),
device_memory_interface(mconfig, *this),
m_space_config("videoram", ENDIANNESS_LITTLE, 16, 16, 0, nullptr, *ADDRESS_MAP_NAME(mb90082_vram))
diff --git a/src/devices/video/mb90082.h b/src/devices/video/mb90082.h
index 5c1ae0b7c83..61d6cc17a7a 100644
--- a/src/devices/video/mb90082.h
+++ b/src/devices/video/mb90082.h
@@ -38,7 +38,7 @@ class mb90082_device : public device_t,
{
public:
// construction/destruction
- mb90082_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mb90082_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// I/O operations
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/devices/video/mb_vcu.cpp b/src/devices/video/mb_vcu.cpp
index dded0e09735..eda7751a768 100644
--- a/src/devices/video/mb_vcu.cpp
+++ b/src/devices/video/mb_vcu.cpp
@@ -37,7 +37,7 @@ const device_type MB_VCU = &device_creator<mb_vcu_device>;
// palette device
//-------------------------------------------------
-void mb_vcu_device::static_set_palette_tag(device_t &device, std::string tag)
+void mb_vcu_device::static_set_palette_tag(device_t &device, const char *tag)
{
downcast<mb_vcu_device &>(device).m_palette.set_tag(tag);
}
@@ -150,7 +150,7 @@ inline void mb_vcu_device::write_io(offs_t address, UINT8 data)
// mb_vcu_device - constructor
//-------------------------------------------------
-mb_vcu_device::mb_vcu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mb_vcu_device::mb_vcu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MB_VCU, "Mazer Blazer custom VCU", tag, owner, clock, "mb_vcu", __FILE__),
device_memory_interface(mconfig, *this),
device_video_interface(mconfig, *this),
diff --git a/src/devices/video/mb_vcu.h b/src/devices/video/mb_vcu.h
index 5634d90a672..e5fe1b2e62e 100644
--- a/src/devices/video/mb_vcu.h
+++ b/src/devices/video/mb_vcu.h
@@ -18,11 +18,11 @@ class mb_vcu_device : public device_t,
{
public:
// construction/destruction
- mb_vcu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mb_vcu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// static configuration
- static void static_set_palette_tag(device_t &device, std::string tag);
- static void set_cpu_tag(device_t &device, std::string tag) { downcast<mb_vcu_device &>(device).m_cpu.set_tag(tag); }
+ static void static_set_palette_tag(device_t &device, const char *tag);
+ static void set_cpu_tag(device_t &device, const char *tag) { downcast<mb_vcu_device &>(device).m_cpu.set_tag(tag); }
// I/O operations
DECLARE_WRITE8_MEMBER( write_vregs );
diff --git a/src/devices/video/mc6845.cpp b/src/devices/video/mc6845.cpp
index ac0f8de8046..827854b0824 100644
--- a/src/devices/video/mc6845.cpp
+++ b/src/devices/video/mc6845.cpp
@@ -89,7 +89,7 @@ const device_type MOS8568 = &device_creator<mos8568_device>;
#define ATTR_ALTERNATE_CHARSET BIT(attr, 7)
-mc6845_device::mc6845_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+mc6845_device::mc6845_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this, false),
m_show_border_area(true),
@@ -106,7 +106,7 @@ mc6845_device::mc6845_device(const machine_config &mconfig, device_type type, co
{
}
-mc6845_device::mc6845_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mc6845_device::mc6845_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MC6845, "MC6845 CRTC", tag, owner, clock, "mc6845", __FILE__),
device_video_interface(mconfig, *this, false),
m_show_border_area(true),
@@ -1395,66 +1395,66 @@ static ADDRESS_MAP_START( mos8563_videoram_map, AS_0, 8, mos8563_device )
ADDRESS_MAP_END
-r6545_1_device::r6545_1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+r6545_1_device::r6545_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: mc6845_device(mconfig, R6545_1, "R6545-1 CRTC", tag, owner, clock, "r6545_1", __FILE__)
{
}
-h46505_device::h46505_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+h46505_device::h46505_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: mc6845_device(mconfig, H46505, "H46505 CRTC", tag, owner, clock, "h46505", __FILE__)
{
}
-mc6845_1_device::mc6845_1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mc6845_1_device::mc6845_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: mc6845_device(mconfig, MC6845_1, "MC6845-1 CRTC", tag, owner, clock, "mc6845_1", __FILE__)
{
}
-hd6845_device::hd6845_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+hd6845_device::hd6845_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: mc6845_device(mconfig, HD6845, "HD6845 CRTC", tag, owner, clock, "hd6845", __FILE__)
{
}
-c6545_1_device::c6545_1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+c6545_1_device::c6545_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: mc6845_device(mconfig, C6545_1, "C6545-1 CRTC", tag, owner, clock, "c6545_1", __FILE__)
{
}
-sy6545_1_device::sy6545_1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+sy6545_1_device::sy6545_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: mc6845_device(mconfig, SY6545_1, "SY6545-1 CRTC", tag, owner, clock, "sy6545_1", __FILE__)
{
}
-sy6845e_device::sy6845e_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+sy6845e_device::sy6845e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: mc6845_device(mconfig, SY6845E, "SY6845E CRTC", tag, owner, clock, "sy6845e", __FILE__)
{
}
-hd6345_device::hd6345_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+hd6345_device::hd6345_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: mc6845_device(mconfig, HD6345, "HD6345 CRTC", tag, owner, clock, "hd6345", __FILE__)
{
}
-ams40041_device::ams40041_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ams40041_device::ams40041_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: mc6845_device(mconfig, AMS40041, "AMS40041 CRTC", tag, owner, clock, "ams40041", __FILE__)
{
}
-ams40489_device::ams40489_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ams40489_device::ams40489_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: mc6845_device(mconfig, AMS40489, "AMS40489 ASIC (CRTC)", tag, owner, clock, "ams40489", __FILE__)
{
}
-mos8563_device::mos8563_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+mos8563_device::mos8563_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: mc6845_device(mconfig, type, name, tag, owner, clock, shortname, source),
device_memory_interface(mconfig, *this),
m_videoram_space_config("videoram", ENDIANNESS_LITTLE, 8, 16, 0, nullptr, *ADDRESS_MAP_NAME(mos8563_videoram_map)),
@@ -1464,7 +1464,7 @@ mos8563_device::mos8563_device(const machine_config &mconfig, device_type type,
}
-mos8563_device::mos8563_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mos8563_device::mos8563_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: mc6845_device(mconfig, MOS8563, "MOS8563", tag, owner, clock, "mos8563", __FILE__),
device_memory_interface(mconfig, *this),
m_videoram_space_config("videoram", ENDIANNESS_LITTLE, 8, 16, 0, nullptr, *ADDRESS_MAP_NAME(mos8563_videoram_map)),
@@ -1474,7 +1474,7 @@ mos8563_device::mos8563_device(const machine_config &mconfig, std::string tag, d
}
-mos8568_device::mos8568_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mos8568_device::mos8568_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: mos8563_device(mconfig, MOS8568, "MOS8568", tag, owner, clock, "mos8568", __FILE__)
{
}
diff --git a/src/devices/video/mc6845.h b/src/devices/video/mc6845.h
index 8eb450a4957..9bad2348640 100644
--- a/src/devices/video/mc6845.h
+++ b/src/devices/video/mc6845.h
@@ -99,8 +99,8 @@ class mc6845_device : public device_t,
public:
// construction/destruction
- mc6845_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- mc6845_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ mc6845_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mc6845_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
static void set_show_border_area(device_t &device, bool show) { downcast<mc6845_device &>(device).m_show_border_area = show; }
static void set_visarea_adjust(device_t &device, int min_x, int max_x, int min_y, int max_y)
@@ -329,7 +329,7 @@ protected:
class mc6845_1_device : public mc6845_device
{
public:
- mc6845_1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mc6845_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -339,7 +339,7 @@ protected:
class r6545_1_device : public mc6845_device
{
public:
- r6545_1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ r6545_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -349,7 +349,7 @@ protected:
class c6545_1_device : public mc6845_device
{
public:
- c6545_1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ c6545_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -359,7 +359,7 @@ protected:
class h46505_device : public mc6845_device
{
public:
- h46505_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ h46505_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -369,7 +369,7 @@ protected:
class hd6845_device : public mc6845_device
{
public:
- hd6845_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ hd6845_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -379,7 +379,7 @@ protected:
class sy6545_1_device : public mc6845_device
{
public:
- sy6545_1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ sy6545_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -389,7 +389,7 @@ protected:
class sy6845e_device : public mc6845_device
{
public:
- sy6845e_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ sy6845e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -399,7 +399,7 @@ protected:
class hd6345_device : public mc6845_device
{
public:
- hd6345_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ hd6345_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -409,7 +409,7 @@ protected:
class ams40041_device : public mc6845_device
{
public:
- ams40041_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ams40041_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -419,7 +419,7 @@ protected:
class ams40489_device : public mc6845_device
{
public:
- ams40489_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ams40489_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -430,8 +430,8 @@ class mos8563_device : public mc6845_device,
public device_memory_interface
{
public:
- mos8563_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- mos8563_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mos8563_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ mos8563_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override;
@@ -493,7 +493,7 @@ protected:
class mos8568_device : public mos8563_device
{
public:
- mos8568_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mos8568_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/video/mc6847.cpp b/src/devices/video/mc6847.cpp
index 5297a549ef1..ec072c6e206 100644
--- a/src/devices/video/mc6847.cpp
+++ b/src/devices/video/mc6847.cpp
@@ -129,7 +129,7 @@ const UINT32 mc6847_base_device::s_palette[mc6847_base_device::PALETTE_LENGTH] =
// ctor
//-------------------------------------------------
-mc6847_friend_device::mc6847_friend_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,
+mc6847_friend_device::mc6847_friend_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,
const UINT8 *fontdata, bool is_mc6847t1, double tpfs, int field_sync_falling_edge_scanline, bool supports_partial_body_scanlines, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_write_hsync(*this),
@@ -546,7 +546,7 @@ const char *mc6847_friend_device::describe_context(void)
// ctor
//-------------------------------------------------
-mc6847_base_device::mc6847_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const UINT8 *fontdata, double tpfs, const char *shortname, const char *source) :
+mc6847_base_device::mc6847_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const UINT8 *fontdata, double tpfs, const char *shortname, const char *source) :
mc6847_friend_device(mconfig, type, name, tag, owner, clock, fontdata, (type == MC6847T1_NTSC) || (type == MC6847T1_PAL), tpfs, 25+191, true, shortname, source),
m_input_cb(*this),
m_black_and_white(false),
@@ -1651,7 +1651,7 @@ mc6847_base_device::artifacter::artifacter()
void mc6847_base_device::artifacter::setup_config(device_t *device)
{
char port_name[32];
- snprintf(port_name, ARRAY_LENGTH(port_name), "%s:%s", device->tag().c_str(), ARTIFACTING_TAG);
+ snprintf(port_name, ARRAY_LENGTH(port_name), "%s:%s", device->tag(), ARTIFACTING_TAG);
m_config = device->ioport(port_name);
}
@@ -1769,7 +1769,7 @@ const device_type M5C6847P1 = &device_creator<m5c6847p1_device>;
// mc6847_ntsc_device
//-------------------------------------------------
-mc6847_ntsc_device::mc6847_ntsc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mc6847_ntsc_device::mc6847_ntsc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: mc6847_base_device(mconfig, MC6847_NTSC, "MC6847_NTSC", tag, owner, clock, ntsc_square_fontdata8x12, 262.0, "mc6847_ntsc", __FILE__)
{
}
@@ -1780,7 +1780,7 @@ mc6847_ntsc_device::mc6847_ntsc_device(const machine_config &mconfig, std::strin
// mc6847_pal_device
//-------------------------------------------------
-mc6847_pal_device::mc6847_pal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mc6847_pal_device::mc6847_pal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: mc6847_base_device(mconfig, MC6847_PAL, "MC6847_PAL", tag, owner, clock, pal_square_fontdata8x12, 313.0, "mc6847_pal", __FILE__)
{
}
@@ -1791,7 +1791,7 @@ mc6847_pal_device::mc6847_pal_device(const machine_config &mconfig, std::string
// mc6847y_ntsc_device
//-------------------------------------------------
-mc6847y_ntsc_device::mc6847y_ntsc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mc6847y_ntsc_device::mc6847y_ntsc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: mc6847_base_device(mconfig, MC6847Y_NTSC, "MC6847Y_NTSC", tag, owner, clock, ntsc_square_fontdata8x12, 262.5, "mc6847y", __FILE__)
{
}
@@ -1802,7 +1802,7 @@ mc6847y_ntsc_device::mc6847y_ntsc_device(const machine_config &mconfig, std::str
// mc6847y_pal_device
//-------------------------------------------------
-mc6847y_pal_device::mc6847y_pal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mc6847y_pal_device::mc6847y_pal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: mc6847_base_device(mconfig, MC6847Y_PAL, "MC6847Y_PAL", tag, owner, clock, pal_square_fontdata8x12, 313.0, "mc6847y_pal", __FILE__)
{
}
@@ -1813,7 +1813,7 @@ mc6847y_pal_device::mc6847y_pal_device(const machine_config &mconfig, std::strin
// mc6847t1_ntsc_device
//-------------------------------------------------
-mc6847t1_ntsc_device::mc6847t1_ntsc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mc6847t1_ntsc_device::mc6847t1_ntsc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: mc6847_base_device(mconfig, MC6847T1_NTSC, "MC6847T1_NTSC", tag, owner, clock, ntsc_round_fontdata8x12, 262.0, "mc6847t1_ntsc", __FILE__)
{
}
@@ -1824,7 +1824,7 @@ mc6847t1_ntsc_device::mc6847t1_ntsc_device(const machine_config &mconfig, std::s
// mc6847t1_pal_device
//-------------------------------------------------
-mc6847t1_pal_device::mc6847t1_pal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mc6847t1_pal_device::mc6847t1_pal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: mc6847_base_device(mconfig, MC6847T1_PAL, "MC6847T1_PAL", tag, owner, clock, pal_round_fontdata8x12, 313.0, "mc6847t1_pal", __FILE__)
{
}
@@ -1835,7 +1835,7 @@ mc6847t1_pal_device::mc6847t1_pal_device(const machine_config &mconfig, std::str
// s68047_device
//-------------------------------------------------
-s68047_device::s68047_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+s68047_device::s68047_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: mc6847_base_device(mconfig, S68047, "S68047", tag, owner, clock, s68047_fontdata8x12, 262.0, "s68047", __FILE__)
{
}
@@ -1884,7 +1884,7 @@ const UINT32 s68047_device::s_s68047_hack_palette[16] =
// m5c6847p1_device
//-------------------------------------------------
-m5c6847p1_device::m5c6847p1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+m5c6847p1_device::m5c6847p1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: mc6847_base_device(mconfig, M5C6847P1, "M5C6847P-1", tag, owner, clock, ntsc_square_fontdata8x12, 262.5, "m5c6847p1", __FILE__)
{
}
diff --git a/src/devices/video/mc6847.h b/src/devices/video/mc6847.h
index 46489296677..ac8279080e0 100644
--- a/src/devices/video/mc6847.h
+++ b/src/devices/video/mc6847.h
@@ -90,7 +90,7 @@ public:
static void set_get_char_rom(device_t &device, mc6847_get_char_rom_delegate callback) { downcast<mc6847_friend_device &>(device).m_charrom_cb = callback; }
protected:
- mc6847_friend_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,
+ mc6847_friend_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,
const UINT8 *fontdata, bool is_mc6847t1, double tpfs, int field_sync_falling_edge_scanline, bool supports_partial_body_scanlines, const char *shortname, const char *source);
// video mode constants
@@ -537,7 +537,7 @@ public:
DECLARE_WRITE_LINE_MEMBER( inv_w ) { change_mode(MODE_INV, state); }
protected:
- mc6847_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const UINT8 *fontdata, double tpfs, const char *shortname, const char *source);
+ mc6847_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const UINT8 *fontdata, double tpfs, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -640,43 +640,43 @@ private:
class mc6847_ntsc_device : public mc6847_base_device
{
public:
- mc6847_ntsc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mc6847_ntsc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class mc6847_pal_device : public mc6847_base_device
{
public:
- mc6847_pal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mc6847_pal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class mc6847y_ntsc_device : public mc6847_base_device
{
public:
- mc6847y_ntsc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mc6847y_ntsc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class mc6847y_pal_device : public mc6847_base_device
{
public:
- mc6847y_pal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mc6847y_pal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class mc6847t1_ntsc_device : public mc6847_base_device
{
public:
- mc6847t1_ntsc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mc6847t1_ntsc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class mc6847t1_pal_device : public mc6847_base_device
{
public:
- mc6847t1_pal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mc6847t1_pal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class s68047_device : public mc6847_base_device
{
public:
- s68047_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ s68047_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
void hack_black_becomes_blue(bool flag);
@@ -687,7 +687,7 @@ private:
class m5c6847p1_device : public mc6847_base_device
{
public:
- m5c6847p1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ m5c6847p1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/video/mos6566.cpp b/src/devices/video/mos6566.cpp
index bc98816dd20..f6b9ca75a62 100644
--- a/src/devices/video/mos6566.cpp
+++ b/src/devices/video/mos6566.cpp
@@ -578,7 +578,7 @@ inline void mos6566_device::draw_multi( UINT16 p, UINT8 c0, UINT8 c1, UINT8 c2,
// mos6566_device - constructor
//-------------------------------------------------
-mos6566_device::mos6566_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mos6566_device::mos6566_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MOS6566, "MOS6566", tag, owner, clock, "mos6566", __FILE__),
device_memory_interface(mconfig, *this),
device_video_interface(mconfig, *this),
@@ -595,7 +595,7 @@ mos6566_device::mos6566_device(const machine_config &mconfig, std::string tag, d
{
}
-mos6566_device::mos6566_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+mos6566_device::mos6566_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_memory_interface(mconfig, *this),
device_video_interface(mconfig, *this),
@@ -615,28 +615,28 @@ mos6566_device::mos6566_device(const machine_config &mconfig, device_type type,
{
}
-mos6567_device::mos6567_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mos6567_device::mos6567_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
:mos6566_device(mconfig, MOS6567, "MOS6567", tag, owner, clock, TYPE_6567, "mos6567", __FILE__) { }
-mos6567_device::mos6567_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+mos6567_device::mos6567_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
:mos6566_device(mconfig, type, name, tag, owner, clock, variant, shortname, source) { }
-mos8562_device::mos8562_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mos8562_device::mos8562_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
:mos6567_device(mconfig, MOS8562, "MOS8562", tag, owner, clock, TYPE_8562, "mos8562", __FILE__) { }
-mos8564_device::mos8564_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mos8564_device::mos8564_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
:mos6567_device(mconfig, MOS8564, "MOS8564", tag, owner, clock, TYPE_8564, "mos8564", __FILE__) { }
-mos6569_device::mos6569_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mos6569_device::mos6569_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
:mos6566_device(mconfig, MOS6566, "MOS6569", tag, owner, clock, TYPE_6569, "mos6569", __FILE__) { }
-mos6569_device::mos6569_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+mos6569_device::mos6569_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
:mos6566_device(mconfig, type, name, tag, owner, clock, variant, shortname, source) { }
-mos8565_device::mos8565_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mos8565_device::mos8565_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
:mos6569_device(mconfig, MOS8565, "MOS8565", tag, owner, clock, TYPE_8565, "mos8565", __FILE__) { }
-mos8566_device::mos8566_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mos8566_device::mos8566_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
:mos6569_device(mconfig, MOS8566, "MOS8566", tag, owner, clock, TYPE_8566, "mos8566", __FILE__) { }
diff --git a/src/devices/video/mos6566.h b/src/devices/video/mos6566.h
index c6d7f68eb95..c913b5ad98c 100644
--- a/src/devices/video/mos6566.h
+++ b/src/devices/video/mos6566.h
@@ -211,10 +211,10 @@ class mos6566_device : public device_t,
{
public:
// construction/destruction
- mos6566_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
- mos6566_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mos6566_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
+ mos6566_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- static void static_set_cpu_tag(device_t &device, std::string tag) { downcast<mos6566_device &>(device).m_cpu.set_tag(tag); }
+ static void static_set_cpu_tag(device_t &device, const char *tag) { downcast<mos6566_device &>(device).m_cpu.set_tag(tag); }
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<mos6566_device &>(device).m_write_irq.set_callback(object); }
template<class _Object> static devcb_base &set_ba_wr_callback(device_t &device, _Object object) { return downcast<mos6566_device &>(device).m_write_ba.set_callback(object); }
template<class _Object> static devcb_base &set_aec_wr_callback(device_t &device, _Object object) { return downcast<mos6566_device &>(device).m_write_aec.set_callback(object); }
@@ -374,8 +374,8 @@ class mos6567_device : public mos6566_device
{
public:
// construction/destruction
- mos6567_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- mos6567_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
+ mos6567_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mos6567_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
};
@@ -385,7 +385,7 @@ class mos8562_device : public mos6567_device
{
public:
// construction/destruction
- mos8562_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mos8562_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
@@ -395,7 +395,7 @@ class mos8564_device : public mos6567_device
{
public:
// construction/destruction
- mos8564_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mos8564_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device_execute_interface overrides
virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks / 8); }
@@ -409,8 +409,8 @@ class mos6569_device : public mos6566_device
{
public:
// construction/destruction
- mos6569_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- mos6569_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
+ mos6569_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mos6569_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
// device-level overrides
virtual void execute_run() override;
@@ -423,7 +423,7 @@ class mos8565_device : public mos6569_device
{
public:
// construction/destruction
- mos8565_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mos8565_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
@@ -433,7 +433,7 @@ class mos8566_device : public mos6569_device
{
public:
// construction/destruction
- mos8566_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mos8566_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device_execute_interface overrides
virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks / 8); }
diff --git a/src/devices/video/msm6222b.cpp b/src/devices/video/msm6222b.cpp
index eb73cae37a4..efa82d7c119 100644
--- a/src/devices/video/msm6222b.cpp
+++ b/src/devices/video/msm6222b.cpp
@@ -21,17 +21,17 @@ ROM_START( msm6222b_01 )
ROM_LOAD( "msm6222b-01.bin", 0x0000, 0x1000, CRC(8ffa8521) SHA1(e108b520e6d20459a7bbd5958bbfa1d551a690bd) )
ROM_END
-msm6222b_device::msm6222b_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+msm6222b_device::msm6222b_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source), cursor_direction(false), cursor_blinking(false), two_line(false), shift_on_write(false), double_height(false), cursor_on(false), display_on(false), adc(0), shift(0), cgrom(nullptr)
{
}
-msm6222b_device::msm6222b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+msm6222b_device::msm6222b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MSM6222B, "msm6222b-xx", tag, owner, clock, "msm6222b", __FILE__), cursor_direction(false), cursor_blinking(false), two_line(false), shift_on_write(false), double_height(false), cursor_on(false), display_on(false), adc(0), shift(0), cgrom(nullptr)
{
}
-msm6222b_01_device::msm6222b_01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+msm6222b_01_device::msm6222b_01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
msm6222b_device(mconfig, MSM6222B_01, "msm6222b-01", tag, owner, clock, "msm6222b", __FILE__)
{
}
diff --git a/src/devices/video/msm6222b.h b/src/devices/video/msm6222b.h
index cc83e0727f0..d86bcd63629 100644
--- a/src/devices/video/msm6222b.h
+++ b/src/devices/video/msm6222b.h
@@ -21,8 +21,8 @@
class msm6222b_device : public device_t {
public:
- msm6222b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- msm6222b_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ msm6222b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msm6222b_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
void control_w(UINT8 data);
UINT8 control_r();
@@ -50,7 +50,7 @@ private:
class msm6222b_01_device : public msm6222b_device {
public:
- msm6222b_01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ msm6222b_01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/video/msm6255.cpp b/src/devices/video/msm6255.cpp
index 2967693ba4c..6ae565cce9f 100644
--- a/src/devices/video/msm6255.cpp
+++ b/src/devices/video/msm6255.cpp
@@ -74,7 +74,7 @@ ADDRESS_MAP_END
// msm6255_device - constructor
//-------------------------------------------------
-msm6255_device::msm6255_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+msm6255_device::msm6255_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MSM6255, "MSM6255", tag, owner, clock, "msm6255", __FILE__),
device_memory_interface(mconfig, *this),
device_video_interface(mconfig, *this),
diff --git a/src/devices/video/msm6255.h b/src/devices/video/msm6255.h
index 9a56caccaf2..c686656988f 100644
--- a/src/devices/video/msm6255.h
+++ b/src/devices/video/msm6255.h
@@ -27,7 +27,7 @@ class msm6255_device : public device_t,
{
public:
// construction/destruction
- msm6255_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ msm6255_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual DECLARE_ADDRESS_MAP(map, 8);
diff --git a/src/devices/video/pc_vga.cpp b/src/devices/video/pc_vga.cpp
index 3046612e10a..7710e3402c3 100644
--- a/src/devices/video/pc_vga.cpp
+++ b/src/devices/video/pc_vga.cpp
@@ -125,71 +125,71 @@ const device_type ATI_VGA = &device_creator<ati_vga_device>;
const device_type IBM8514A = &device_creator<ibm8514a_device>;
const device_type MACH8 = &device_creator<mach8_device>;
-vga_device::vga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+vga_device::vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_palette(*this, "^palette"),
m_screen(*this,"^screen")
{
}
-vga_device::vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+vga_device::vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, VGA, "VGA", tag, owner, clock, "vga", __FILE__),
m_palette(*this, "^palette"),
m_screen(*this,"^screen")
{
}
-svga_device::svga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+svga_device::svga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: vga_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-tseng_vga_device::tseng_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+tseng_vga_device::tseng_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: svga_device(mconfig, TSENG_VGA, "TSENG LABS VGA", tag, owner, clock, "tseng_vga", __FILE__)
{
}
-s3_vga_device::s3_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+s3_vga_device::s3_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: ati_vga_device(mconfig, S3_VGA, "S3 Graphics VGA", tag, owner, clock, "s3_vga", __FILE__)
{
}
-s3_vga_device::s3_vga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+s3_vga_device::s3_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: ati_vga_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-gamtor_vga_device::gamtor_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+gamtor_vga_device::gamtor_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: svga_device(mconfig, GAMTOR_VGA, "GAMTOR VGA", tag, owner, clock, "gamtor_vga", __FILE__)
{
}
-ati_vga_device::ati_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ati_vga_device::ati_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: svga_device(mconfig, ATI_VGA, "ATI VGA", tag, owner, clock, "ati_vga", __FILE__)
{
}
-ati_vga_device::ati_vga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ati_vga_device::ati_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: svga_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-ibm8514a_device::ibm8514a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ibm8514a_device::ibm8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, IBM8514A, "IBM8514A Video", tag, owner, clock, "ibm8514a", __FILE__)
{
}
-ibm8514a_device::ibm8514a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ibm8514a_device::ibm8514a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-mach8_device::mach8_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+mach8_device::mach8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: ibm8514a_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-mach8_device::mach8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mach8_device::mach8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: ibm8514a_device(mconfig, MACH8, "MACH8", tag, owner, clock, "mach8", __FILE__)
{
}
diff --git a/src/devices/video/pc_vga.h b/src/devices/video/pc_vga.h
index 750180ffea3..9c729ba7a6e 100644
--- a/src/devices/video/pc_vga.h
+++ b/src/devices/video/pc_vga.h
@@ -39,8 +39,8 @@ class vga_device : public device_t
public:
// construction/destruction
- vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- vga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual void zero();
virtual UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
@@ -243,7 +243,7 @@ class svga_device : public vga_device
{
public:
// construction/destruction
- svga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ svga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual void zero() override;
virtual UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override;
@@ -272,10 +272,10 @@ protected:
class ibm8514a_device : public device_t
{
public:
- ibm8514a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- ibm8514a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ibm8514a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ ibm8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- void set_vga(std::string tag) { m_vga_tag.assign(tag); }
+ void set_vga(const char* tag) { m_vga_tag.assign(tag); }
void set_vga_owner() { m_vga = dynamic_cast<vga_device*>(owner()); }
void enabled();
@@ -411,8 +411,8 @@ extern const device_type IBM8514A;
class mach8_device : public ibm8514a_device
{
public:
- mach8_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- mach8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mach8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ mach8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
READ16_MEMBER(mach8_ec0_r);
WRITE16_MEMBER(mach8_ec0_w);
@@ -468,7 +468,7 @@ class tseng_vga_device : public svga_device
{
public:
// construction/destruction
- tseng_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tseng_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual READ8_MEMBER(port_03b0_r) override;
virtual WRITE8_MEMBER(port_03b0_w) override;
@@ -515,8 +515,8 @@ class ati_vga_device : public svga_device
{
public:
// construction/destruction
- ati_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- ati_vga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ ati_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ati_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual READ8_MEMBER(mem_r) override;
virtual WRITE8_MEMBER(mem_w) override;
@@ -553,8 +553,8 @@ class s3_vga_device : public ati_vga_device
{
public:
// construction/destruction
- s3_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- s3_vga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ s3_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ s3_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual READ8_MEMBER(port_03b0_r) override;
virtual WRITE8_MEMBER(port_03b0_w) override;
@@ -640,7 +640,7 @@ class gamtor_vga_device : public svga_device
{
public:
// construction/destruction
- gamtor_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ gamtor_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual READ8_MEMBER(port_03b0_r) override;
diff --git a/src/devices/video/psx.cpp b/src/devices/video/psx.cpp
index ae780ec8237..1caf2a92284 100644
--- a/src/devices/video/psx.cpp
+++ b/src/devices/video/psx.cpp
@@ -22,7 +22,7 @@ const device_type CXD8561BQ = &device_creator<cxd8561bq_device>;
const device_type CXD8561CQ = &device_creator<cxd8561cq_device>;
const device_type CXD8654Q = &device_creator<cxd8654q_device>;
-psxgpu_device::psxgpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+psxgpu_device::psxgpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_vblank_handler(*this)
#if DEBUG_VIEWER
@@ -51,32 +51,32 @@ void psxgpu_device::device_reset( void )
gpu_reset();
}
-cxd8514q_device::cxd8514q_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+cxd8514q_device::cxd8514q_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: psxgpu_device(mconfig, CXD8514Q, "CXD8514Q GPU", tag, owner, clock, "cxd8514q", __FILE__)
{
}
-cxd8538q_device::cxd8538q_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+cxd8538q_device::cxd8538q_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: psxgpu_device(mconfig, CXD8538Q, "CXD8538Q GPU", tag, owner, clock, "cxd8538q", __FILE__)
{
}
-cxd8561q_device::cxd8561q_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+cxd8561q_device::cxd8561q_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: psxgpu_device(mconfig, CXD8561Q, "CXD8561Q GPU", tag, owner, clock, "cxd8561q", __FILE__)
{
}
-cxd8561bq_device::cxd8561bq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+cxd8561bq_device::cxd8561bq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: psxgpu_device(mconfig, CXD8561BQ, "CXD8561BQ", tag, owner, clock, "cxd8561bq", __FILE__)
{
}
-cxd8561cq_device::cxd8561cq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+cxd8561cq_device::cxd8561cq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: psxgpu_device(mconfig, CXD8561CQ, "CXD8561CQ GPU", tag, owner, clock, "cxd8561cq", __FILE__)
{
}
-cxd8654q_device::cxd8654q_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+cxd8654q_device::cxd8654q_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: psxgpu_device(mconfig, CXD8654Q, "CXD8654Q GPU", tag, owner, clock, "cxd8654q", __FILE__)
{
}
diff --git a/src/devices/video/psx.h b/src/devices/video/psx.h
index a19138bb509..ae96761cb02 100644
--- a/src/devices/video/psx.h
+++ b/src/devices/video/psx.h
@@ -189,7 +189,7 @@ class psxgpu_device : public device_t
{
public:
// construction/destruction
- psxgpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ psxgpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual machine_config_constructor device_mconfig_additions() const override;
// static configuration helpers
@@ -320,42 +320,42 @@ class cxd8514q_device : public psxgpu_device
{
public:
// construction/destruction
- cxd8514q_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ cxd8514q_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class cxd8538q_device : public psxgpu_device
{
public:
// construction/destruction
- cxd8538q_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ cxd8538q_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class cxd8561q_device : public psxgpu_device
{
public:
// construction/destruction
- cxd8561q_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ cxd8561q_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class cxd8561bq_device : public psxgpu_device
{
public:
// construction/destruction
- cxd8561bq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ cxd8561bq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class cxd8561cq_device : public psxgpu_device
{
public:
// construction/destruction
- cxd8561cq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ cxd8561cq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class cxd8654q_device : public psxgpu_device
{
public:
// construction/destruction
- cxd8654q_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ cxd8654q_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
#endif
diff --git a/src/devices/video/ramdac.cpp b/src/devices/video/ramdac.cpp
index 881870763f4..b05cccfa10b 100644
--- a/src/devices/video/ramdac.cpp
+++ b/src/devices/video/ramdac.cpp
@@ -40,7 +40,7 @@ const device_type RAMDAC = &device_creator<ramdac_device>;
// ramdac_device - constructor
//-------------------------------------------------
-ramdac_device::ramdac_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ramdac_device::ramdac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, RAMDAC, "RAMDAC", tag, owner, clock, "ramdac", __FILE__),
device_memory_interface(mconfig, *this),
m_space_config("videoram", ENDIANNESS_LITTLE, 8, 10, 0, nullptr, *ADDRESS_MAP_NAME(ramdac_palram)),
@@ -54,7 +54,7 @@ ramdac_device::ramdac_device(const machine_config &mconfig, std::string tag, dev
// palette device
//-------------------------------------------------
-void ramdac_device::static_set_palette_tag(device_t &device, std::string tag)
+void ramdac_device::static_set_palette_tag(device_t &device, const char *tag)
{
downcast<ramdac_device &>(device).m_palette.set_tag(tag);
}
diff --git a/src/devices/video/ramdac.h b/src/devices/video/ramdac.h
index 749e6af2860..a006312c59f 100644
--- a/src/devices/video/ramdac.h
+++ b/src/devices/video/ramdac.h
@@ -38,10 +38,10 @@ class ramdac_device : public device_t,
{
public:
// construction/destruction
- ramdac_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ramdac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// static configuration
- static void static_set_palette_tag(device_t &device, std::string tag);
+ static void static_set_palette_tag(device_t &device, const char *tag);
static void set_split_read(device_t &device, int split) { downcast<ramdac_device &>(device).m_split_read_reg = split; }
// I/O operations
diff --git a/src/devices/video/saa5050.cpp b/src/devices/video/saa5050.cpp
index 40d87bdb656..071fbf52ec9 100644
--- a/src/devices/video/saa5050.cpp
+++ b/src/devices/video/saa5050.cpp
@@ -173,7 +173,7 @@ const rom_entry *saa5057_device::device_rom_region() const
// saa5050_device - constructor
//-------------------------------------------------
-saa5050_device::saa5050_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+saa5050_device::saa5050_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_char_rom(*this, "chargen"),
m_read_d(*this),
@@ -184,7 +184,7 @@ saa5050_device::saa5050_device(const machine_config &mconfig, device_type type,
{
}
-saa5050_device::saa5050_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+saa5050_device::saa5050_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SAA5050, "SAA5050 Video", tag, owner, clock, "saa5050", __FILE__),
m_char_rom(*this, "chargen"),
m_read_d(*this),
@@ -195,25 +195,25 @@ saa5050_device::saa5050_device(const machine_config &mconfig, std::string tag, d
{
}
-saa5051_device::saa5051_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+saa5051_device::saa5051_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: saa5050_device(mconfig, SAA5051, "SAA5051", tag, owner, clock, "saa5051", __FILE__) { }
-saa5052_device::saa5052_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+saa5052_device::saa5052_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: saa5050_device(mconfig, SAA5052, "SAA5052", tag, owner, clock, "saa5052", __FILE__) { }
-saa5053_device::saa5053_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+saa5053_device::saa5053_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: saa5050_device(mconfig, SAA5053, "SAA5053", tag, owner, clock, "saa5053", __FILE__) { }
-saa5054_device::saa5054_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+saa5054_device::saa5054_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: saa5050_device(mconfig, SAA5054, "SAA5054", tag, owner, clock, "saa5054", __FILE__) { }
-saa5055_device::saa5055_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+saa5055_device::saa5055_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: saa5050_device(mconfig, SAA5055, "SAA5055", tag, owner, clock, "saa5055", __FILE__) { }
-saa5056_device::saa5056_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+saa5056_device::saa5056_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: saa5050_device(mconfig, SAA5056, "SAA5056", tag, owner, clock, "saa5056", __FILE__) { }
-saa5057_device::saa5057_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+saa5057_device::saa5057_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: saa5050_device(mconfig, SAA5057, "SAA5057", tag, owner, clock, "saa5057", __FILE__) { }
diff --git a/src/devices/video/saa5050.h b/src/devices/video/saa5050.h
index bda63c98a8d..30b1e8b0e4a 100644
--- a/src/devices/video/saa5050.h
+++ b/src/devices/video/saa5050.h
@@ -55,8 +55,8 @@ class saa5050_device : public device_t
{
public:
// construction/destruction
- saa5050_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- saa5050_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ saa5050_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ saa5050_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
static void static_set_screen_size(device_t &device, int cols, int rows, int size) { downcast<saa5050_device &>(device).m_cols = cols; downcast<saa5050_device &>(device).m_rows = rows; downcast<saa5050_device &>(device).m_size = size; }
@@ -169,7 +169,7 @@ class saa5051_device : public saa5050_device
{
public:
// construction/destruction
- saa5051_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ saa5051_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -182,7 +182,7 @@ class saa5052_device : public saa5050_device
{
public:
// construction/destruction
- saa5052_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ saa5052_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -195,7 +195,7 @@ class saa5053_device : public saa5050_device
{
public:
// construction/destruction
- saa5053_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ saa5053_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -208,7 +208,7 @@ class saa5054_device : public saa5050_device
{
public:
// construction/destruction
- saa5054_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ saa5054_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -221,7 +221,7 @@ class saa5055_device : public saa5050_device
{
public:
// construction/destruction
- saa5055_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ saa5055_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -234,7 +234,7 @@ class saa5056_device : public saa5050_device
{
public:
// construction/destruction
- saa5056_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ saa5056_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -247,7 +247,7 @@ class saa5057_device : public saa5050_device
{
public:
// construction/destruction
- saa5057_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ saa5057_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/video/scn2674.cpp b/src/devices/video/scn2674.cpp
index 4f81a0b86a1..d653b8aef1c 100644
--- a/src/devices/video/scn2674.cpp
+++ b/src/devices/video/scn2674.cpp
@@ -17,7 +17,7 @@ static ADDRESS_MAP_START( scn2674_vram, AS_0, 8, scn2674_device )
AM_RANGE(0x0000, 0xffff) AM_NOP
ADDRESS_MAP_END
-scn2674_device::scn2674_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+scn2674_device::scn2674_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SCN2674_VIDEO, "Signetics SCN2674 AVDC", tag, owner, clock, "scn2674_device", __FILE__),
device_video_interface(mconfig, *this),
device_memory_interface(mconfig, *this),
diff --git a/src/devices/video/scn2674.h b/src/devices/video/scn2674.h
index 862c65656f6..6c4f5361525 100644
--- a/src/devices/video/scn2674.h
+++ b/src/devices/video/scn2674.h
@@ -25,7 +25,7 @@ class scn2674_device : public device_t,
public device_memory_interface
{
public:
- scn2674_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ scn2674_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
typedef device_delegate<void (bitmap_rgb32 &bitmap, int x, int y, UINT8 linecount, UINT8 charcode, UINT16 address, UINT8 cursor, UINT8 dw, UINT8 lg, UINT8 ul, UINT8 blink)> draw_character_delegate;
diff --git a/src/devices/video/sed1200.cpp b/src/devices/video/sed1200.cpp
index 94706dccde6..06cd7ba7e83 100644
--- a/src/devices/video/sed1200.cpp
+++ b/src/devices/video/sed1200.cpp
@@ -31,27 +31,27 @@ ROM_START( sed1200x0b )
ROM_LOAD( "sed1200-b.bin", 0x000, 0x800, CRC(d0741f51) SHA1(c8c856f1357286a2c8c806af81724a828345357e))
ROM_END
-sed1200_device::sed1200_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+sed1200_device::sed1200_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source), cursor_direction(false), cursor_blinking(false), cursor_full(false), cursor_on(false), display_on(false), cursor_address(0), cgram_address(0), cgrom(nullptr)
{
}
-sed1200d0a_device::sed1200d0a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+sed1200d0a_device::sed1200d0a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
sed1200_device(mconfig, SED1200D0A, "sed1200d-0a", tag, owner, clock, "sed1200", __FILE__)
{
}
-sed1200f0a_device::sed1200f0a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+sed1200f0a_device::sed1200f0a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
sed1200_device(mconfig, SED1200F0A, "sed1200f-0a", tag, owner, clock, "sed1200", __FILE__)
{
}
-sed1200d0b_device::sed1200d0b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+sed1200d0b_device::sed1200d0b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
sed1200_device(mconfig, SED1200D0B, "sed1200d-0b", tag, owner, clock, "sed1200", __FILE__)
{
}
-sed1200f0b_device::sed1200f0b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+sed1200f0b_device::sed1200f0b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
sed1200_device(mconfig, SED1200F0B, "sed1200f-0b", tag, owner, clock, "sed1200", __FILE__)
{
}
diff --git a/src/devices/video/sed1200.h b/src/devices/video/sed1200.h
index fe647b6e9e6..c39f223e331 100644
--- a/src/devices/video/sed1200.h
+++ b/src/devices/video/sed1200.h
@@ -29,7 +29,7 @@
class sed1200_device : public device_t {
public:
- sed1200_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ sed1200_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
void control_w(UINT8 data);
UINT8 control_r();
@@ -54,7 +54,7 @@ private:
class sed1200d0a_device : public sed1200_device {
public:
- sed1200d0a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ sed1200d0a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual const rom_entry *device_rom_region() const override;
@@ -62,7 +62,7 @@ protected:
class sed1200f0a_device : public sed1200_device {
public:
- sed1200f0a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ sed1200f0a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual const rom_entry *device_rom_region() const override;
@@ -70,7 +70,7 @@ protected:
class sed1200d0b_device : public sed1200_device {
public:
- sed1200d0b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ sed1200d0b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual const rom_entry *device_rom_region() const override;
@@ -78,7 +78,7 @@ protected:
class sed1200f0b_device : public sed1200_device {
public:
- sed1200f0b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ sed1200f0b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/video/sed1330.cpp b/src/devices/video/sed1330.cpp
index 89c3be91289..d368c38b1f2 100644
--- a/src/devices/video/sed1330.cpp
+++ b/src/devices/video/sed1330.cpp
@@ -138,7 +138,7 @@ inline void sed1330_device::increment_csr()
// sed1330_device - constructor
//-------------------------------------------------
-sed1330_device::sed1330_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+sed1330_device::sed1330_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SED1330, "SED1330", tag, owner, clock, "sed1330", __FILE__),
device_memory_interface(mconfig, *this),
device_video_interface(mconfig, *this),
@@ -230,7 +230,7 @@ const address_space_config *sed1330_device::memory_space_config(address_spacenum
READ8_MEMBER( sed1330_device::status_r )
{
- if (LOG) logerror("SED1330 '%s' Status Read: %s\n", tag().c_str(), m_bf ? "busy" : "ready");
+ if (LOG) logerror("SED1330 '%s' Status Read: %s\n", tag(), m_bf ? "busy" : "ready");
return m_bf << 6;
}
@@ -261,10 +261,10 @@ WRITE8_MEMBER( sed1330_device::command_w )
{
switch (m_cd)
{
- case CSRDIR_RIGHT: logerror("SED1330 '%s' Cursor Direction: Right\n", tag().c_str()); break;
- case CSRDIR_LEFT: logerror("SED1330 '%s' Cursor Direction: Left\n", tag().c_str()); break;
- case CSRDIR_UP: logerror("SED1330 '%s' Cursor Direction: Up\n", tag().c_str()); break;
- case CSRDIR_DOWN: logerror("SED1330 '%s' Cursor Direction: Down\n", tag().c_str()); break;
+ case CSRDIR_RIGHT: logerror("SED1330 '%s' Cursor Direction: Right\n", tag()); break;
+ case CSRDIR_LEFT: logerror("SED1330 '%s' Cursor Direction: Left\n", tag()); break;
+ case CSRDIR_UP: logerror("SED1330 '%s' Cursor Direction: Up\n", tag()); break;
+ case CSRDIR_DOWN: logerror("SED1330 '%s' Cursor Direction: Down\n", tag()); break;
}
}
break;
@@ -280,7 +280,7 @@ READ8_MEMBER( sed1330_device::data_r )
{
UINT8 data = readbyte(m_csr);
- if (LOG) logerror("SED1330 '%s' Memory Read %02x from %04x\n", tag().c_str(), data, m_csr);
+ if (LOG) logerror("SED1330 '%s' Memory Read %02x from %04x\n", tag(), data, m_csr);
increment_csr();
@@ -308,11 +308,11 @@ WRITE8_MEMBER( sed1330_device::data_w )
if (LOG)
{
- logerror("SED1330 '%s' %s CG ROM\n", tag().c_str(), BIT(data, 0) ? "External" : "Internal");
- logerror("SED1330 '%s' D6 Correction: %s\n", tag().c_str(), BIT(data, 1) ? "enabled" : "disabled");
- logerror("SED1330 '%s' Character Height: %u\n", tag().c_str(), BIT(data, 2) ? 16 : 8);
- logerror("SED1330 '%s' %s Panel Drive\n", tag().c_str(), BIT(data, 3) ? "Dual" : "Single");
- logerror("SED1330 '%s' Screen Top-Line Correction: %s\n", tag().c_str(), BIT(data, 5) ? "disabled" : "enabled");
+ logerror("SED1330 '%s' %s CG ROM\n", tag(), BIT(data, 0) ? "External" : "Internal");
+ logerror("SED1330 '%s' D6 Correction: %s\n", tag(), BIT(data, 1) ? "enabled" : "disabled");
+ logerror("SED1330 '%s' Character Height: %u\n", tag(), BIT(data, 2) ? 16 : 8);
+ logerror("SED1330 '%s' %s Panel Drive\n", tag(), BIT(data, 3) ? "Dual" : "Single");
+ logerror("SED1330 '%s' Screen Top-Line Correction: %s\n", tag(), BIT(data, 5) ? "disabled" : "enabled");
}
break;
@@ -322,29 +322,29 @@ WRITE8_MEMBER( sed1330_device::data_w )
if (LOG)
{
- logerror("SED1330 '%s' Horizontal Character Size: %u\n", tag().c_str(), m_fx);
- logerror("SED1330 '%s' %s AC Drive\n", tag().c_str(), BIT(data, 7) ? "2-frame" : "16-line");
+ logerror("SED1330 '%s' Horizontal Character Size: %u\n", tag(), m_fx);
+ logerror("SED1330 '%s' %s AC Drive\n", tag(), BIT(data, 7) ? "2-frame" : "16-line");
}
break;
case 2:
m_fy = (data & 0x0f) + 1;
- if (LOG) logerror("SED1330 '%s' Vertical Character Size: %u\n", tag().c_str(), m_fy);
+ if (LOG) logerror("SED1330 '%s' Vertical Character Size: %u\n", tag(), m_fy);
break;
case 3:
m_cr = data + 1;
- if (LOG) logerror("SED1330 '%s' Visible Characters Per Line: %u\n", tag().c_str(), m_cr);
+ if (LOG) logerror("SED1330 '%s' Visible Characters Per Line: %u\n", tag(), m_cr);
break;
case 4:
m_tcr = data + 1;
- if (LOG) logerror("SED1330 '%s' Total Characters Per Line: %u\n", tag().c_str(), m_tcr);
+ if (LOG) logerror("SED1330 '%s' Total Characters Per Line: %u\n", tag(), m_tcr);
break;
case 5:
m_lf = data + 1;
- if (LOG) logerror("SED1330 '%s' Frame Height: %u\n", tag().c_str(), m_lf);
+ if (LOG) logerror("SED1330 '%s' Frame Height: %u\n", tag(), m_lf);
break;
case 6:
@@ -353,11 +353,11 @@ WRITE8_MEMBER( sed1330_device::data_w )
case 7:
m_ap = (data << 8) | (m_ap & 0xff);
- if (LOG) logerror("SED1330 '%s' Virtual Screen Width: %u\n", tag().c_str(), m_ap);
+ if (LOG) logerror("SED1330 '%s' Virtual Screen Width: %u\n", tag(), m_ap);
break;
default:
- logerror("SED1330 '%s' Invalid parameter byte %02x\n", tag().c_str(), data);
+ logerror("SED1330 '%s' Invalid parameter byte %02x\n", tag(), data);
}
break;
@@ -368,38 +368,38 @@ WRITE8_MEMBER( sed1330_device::data_w )
m_fp = data >> 2;
if (LOG)
{
- logerror("SED1330 '%s' Display: %s\n", tag().c_str(), BIT(data, 0) ? "enabled" : "disabled");
+ logerror("SED1330 '%s' Display: %s\n", tag(), BIT(data, 0) ? "enabled" : "disabled");
switch (m_fc)
{
- case FC_OFF: logerror("SED1330 '%s' Cursor: disabled\n", tag().c_str()); break;
- case FC_SOLID: logerror("SED1330 '%s' Cursor: solid\n", tag().c_str()); break;
- case FC_FLASH_32: logerror("SED1330 '%s' Cursor: fFR/32\n", tag().c_str()); break;
- case FC_FLASH_64: logerror("SED1330 '%s' Cursor: fFR/64\n", tag().c_str()); break;
+ case FC_OFF: logerror("SED1330 '%s' Cursor: disabled\n", tag()); break;
+ case FC_SOLID: logerror("SED1330 '%s' Cursor: solid\n", tag()); break;
+ case FC_FLASH_32: logerror("SED1330 '%s' Cursor: fFR/32\n", tag()); break;
+ case FC_FLASH_64: logerror("SED1330 '%s' Cursor: fFR/64\n", tag()); break;
}
switch (m_fp & 0x03)
{
- case FC_OFF: logerror("SED1330 '%s' Display Page 1: disabled\n", tag().c_str()); break;
- case FC_SOLID: logerror("SED1330 '%s' Display Page 1: enabled\n", tag().c_str()); break;
- case FC_FLASH_32: logerror("SED1330 '%s' Display Page 1: flash fFR/32\n", tag().c_str()); break;
- case FC_FLASH_64: logerror("SED1330 '%s' Display Page 1: flash fFR/64\n", tag().c_str()); break;
+ case FC_OFF: logerror("SED1330 '%s' Display Page 1: disabled\n", tag()); break;
+ case FC_SOLID: logerror("SED1330 '%s' Display Page 1: enabled\n", tag()); break;
+ case FC_FLASH_32: logerror("SED1330 '%s' Display Page 1: flash fFR/32\n", tag()); break;
+ case FC_FLASH_64: logerror("SED1330 '%s' Display Page 1: flash fFR/64\n", tag()); break;
}
switch ((m_fp >> 2) & 0x03)
{
- case FC_OFF: logerror("SED1330 '%s' Display Page 2/4: disabled\n", tag().c_str()); break;
- case FC_SOLID: logerror("SED1330 '%s' Display Page 2/4: enabled\n", tag().c_str()); break;
- case FC_FLASH_32: logerror("SED1330 '%s' Display Page 2/4: flash fFR/32\n", tag().c_str()); break;
- case FC_FLASH_64: logerror("SED1330 '%s' Display Page 2/4: flash fFR/64\n", tag().c_str()); break;
+ case FC_OFF: logerror("SED1330 '%s' Display Page 2/4: disabled\n", tag()); break;
+ case FC_SOLID: logerror("SED1330 '%s' Display Page 2/4: enabled\n", tag()); break;
+ case FC_FLASH_32: logerror("SED1330 '%s' Display Page 2/4: flash fFR/32\n", tag()); break;
+ case FC_FLASH_64: logerror("SED1330 '%s' Display Page 2/4: flash fFR/64\n", tag()); break;
}
switch ((m_fp >> 4) & 0x03)
{
- case FC_OFF: logerror("SED1330 '%s' Display Page 3: disabled\n", tag().c_str()); break;
- case FC_SOLID: logerror("SED1330 '%s' Display Page 3: enabled\n", tag().c_str()); break;
- case FC_FLASH_32: logerror("SED1330 '%s' Display Page 3: flash fFR/32\n", tag().c_str()); break;
- case FC_FLASH_64: logerror("SED1330 '%s' Display Page 3: flash fFR/64\n", tag().c_str()); break;
+ case FC_OFF: logerror("SED1330 '%s' Display Page 3: disabled\n", tag()); break;
+ case FC_SOLID: logerror("SED1330 '%s' Display Page 3: enabled\n", tag()); break;
+ case FC_FLASH_32: logerror("SED1330 '%s' Display Page 3: flash fFR/32\n", tag()); break;
+ case FC_FLASH_64: logerror("SED1330 '%s' Display Page 3: flash fFR/64\n", tag()); break;
}
}
break;
@@ -413,12 +413,12 @@ WRITE8_MEMBER( sed1330_device::data_w )
case 1:
m_sad1 = (data << 8) | (m_sad1 & 0xff);
- if (LOG) logerror("SED1330 '%s' Display Page 1 Start Address: %04x\n", tag().c_str(), m_sad1);
+ if (LOG) logerror("SED1330 '%s' Display Page 1 Start Address: %04x\n", tag(), m_sad1);
break;
case 2:
m_sl1 = data + 1;
- if (LOG) logerror("SED1330 '%s' Display Block 1 Screen Lines: %u\n", tag().c_str(), m_sl1);
+ if (LOG) logerror("SED1330 '%s' Display Block 1 Screen Lines: %u\n", tag(), m_sl1);
break;
case 3:
@@ -427,12 +427,12 @@ WRITE8_MEMBER( sed1330_device::data_w )
case 4:
m_sad2 = (data << 8) | (m_sad2 & 0xff);
- if (LOG) logerror("SED1330 '%s' Display Page 2 Start Address: %04x\n", tag().c_str(), m_sad2);
+ if (LOG) logerror("SED1330 '%s' Display Page 2 Start Address: %04x\n", tag(), m_sad2);
break;
case 5:
m_sl2 = data + 1;
- if (LOG) logerror("SED1330 '%s' Display Block 2 Screen Lines: %u\n", tag().c_str(), m_sl2);
+ if (LOG) logerror("SED1330 '%s' Display Block 2 Screen Lines: %u\n", tag(), m_sl2);
break;
case 6:
@@ -441,7 +441,7 @@ WRITE8_MEMBER( sed1330_device::data_w )
case 7:
m_sad3 = (data << 8) | (m_sad3 & 0xff);
- if (LOG) logerror("SED1330 '%s' Display Page 3 Start Address: %04x\n", tag().c_str(), m_sad3);
+ if (LOG) logerror("SED1330 '%s' Display Page 3 Start Address: %04x\n", tag(), m_sad3);
break;
case 8:
@@ -450,11 +450,11 @@ WRITE8_MEMBER( sed1330_device::data_w )
case 9:
m_sad4 = (data << 8) | (m_sad4 & 0xff);
- if (LOG) logerror("SED1330 '%s' Display Page 4 Start Address: %04x\n", tag().c_str(), m_sad4);
+ if (LOG) logerror("SED1330 '%s' Display Page 4 Start Address: %04x\n", tag(), m_sad4);
break;
default:
- logerror("SED1330 '%s' Invalid parameter byte %02x\n", tag().c_str(), data);
+ logerror("SED1330 '%s' Invalid parameter byte %02x\n", tag(), data);
}
break;
@@ -463,7 +463,7 @@ WRITE8_MEMBER( sed1330_device::data_w )
{
case 0:
m_crx = (data & 0x0f) + 1;
- if (LOG) logerror("SED1330 '%s' Horizontal Cursor Size: %u\n", tag().c_str(), m_crx);
+ if (LOG) logerror("SED1330 '%s' Horizontal Cursor Size: %u\n", tag(), m_crx);
break;
case 1:
@@ -471,13 +471,13 @@ WRITE8_MEMBER( sed1330_device::data_w )
m_cm = BIT(data, 7);
if (LOG)
{
- logerror("SED1330 '%s' Vertical Cursor Location: %u\n", tag().c_str(), m_cry);
- logerror("SED1330 '%s' Cursor Shape: %s\n", tag().c_str(), BIT(data, 7) ? "Block" : "Underscore");
+ logerror("SED1330 '%s' Vertical Cursor Location: %u\n", tag(), m_cry);
+ logerror("SED1330 '%s' Cursor Shape: %s\n", tag(), BIT(data, 7) ? "Block" : "Underscore");
}
break;
default:
- logerror("SED1330 '%s' Invalid parameter byte %02x\n", tag().c_str(), data);
+ logerror("SED1330 '%s' Invalid parameter byte %02x\n", tag(), data);
}
break;
@@ -490,17 +490,17 @@ WRITE8_MEMBER( sed1330_device::data_w )
case 1:
m_sag = (data << 8) | (m_sag & 0xff);
- if (LOG) logerror("SED1330 '%s' Character Generator RAM Start Address: %04x\n", tag().c_str(), m_sag);
+ if (LOG) logerror("SED1330 '%s' Character Generator RAM Start Address: %04x\n", tag(), m_sag);
break;
default:
- logerror("SED1330 '%s' Invalid parameter byte %02x\n", tag().c_str(), data);
+ logerror("SED1330 '%s' Invalid parameter byte %02x\n", tag(), data);
}
break;
case INSTRUCTION_HDOT_SCR:
m_hdotscr = data & 0x07;
- if (LOG) logerror("SED1330 '%s' Horizontal Dot Scroll: %u\n", tag().c_str(), m_hdotscr);
+ if (LOG) logerror("SED1330 '%s' Horizontal Dot Scroll: %u\n", tag(), m_hdotscr);
break;
case INSTRUCTION_OVLAY:
@@ -512,15 +512,15 @@ WRITE8_MEMBER( sed1330_device::data_w )
{
switch (m_mx)
{
- case MX_OR: logerror("SED1330 '%s' Display Composition Method: OR\n", tag().c_str()); break;
- case MX_XOR: logerror("SED1330 '%s' Display Composition Method: Exclusive-OR\n", tag().c_str()); break;
- case MX_AND: logerror("SED1330 '%s' Display Composition Method: AND\n", tag().c_str()); break;
- case MX_PRIORITY_OR: logerror("SED1330 '%s' Display Composition Method: Priority-OR\n", tag().c_str()); break;
+ case MX_OR: logerror("SED1330 '%s' Display Composition Method: OR\n", tag()); break;
+ case MX_XOR: logerror("SED1330 '%s' Display Composition Method: Exclusive-OR\n", tag()); break;
+ case MX_AND: logerror("SED1330 '%s' Display Composition Method: AND\n", tag()); break;
+ case MX_PRIORITY_OR: logerror("SED1330 '%s' Display Composition Method: Priority-OR\n", tag()); break;
}
- logerror("SED1330 '%s' Display Page 1 Mode: %s\n", tag().c_str(), BIT(data, 2) ? "Graphics" : "Text");
- logerror("SED1330 '%s' Display Page 3 Mode: %s\n", tag().c_str(), BIT(data, 3) ? "Graphics" : "Text");
- logerror("SED1330 '%s' Display Composition Layers: %u\n", tag().c_str(), BIT(data, 4) ? 3 : 2);
+ logerror("SED1330 '%s' Display Page 1 Mode: %s\n", tag(), BIT(data, 2) ? "Graphics" : "Text");
+ logerror("SED1330 '%s' Display Page 3 Mode: %s\n", tag(), BIT(data, 3) ? "Graphics" : "Text");
+ logerror("SED1330 '%s' Display Composition Layers: %u\n", tag(), BIT(data, 4) ? 3 : 2);
}
break;
@@ -533,11 +533,11 @@ WRITE8_MEMBER( sed1330_device::data_w )
case 1:
m_csr = (data << 8) | (m_csr & 0xff);
- if (LOG) logerror("SED1330 '%s' Cursor Address %04x\n", tag().c_str(), m_csr);
+ if (LOG) logerror("SED1330 '%s' Cursor Address %04x\n", tag(), m_csr);
break;
default:
- logerror("SED1330 '%s' Invalid parameter byte %02x\n", tag().c_str(), data);
+ logerror("SED1330 '%s' Invalid parameter byte %02x\n", tag(), data);
}
break;
#if 0
@@ -545,7 +545,7 @@ WRITE8_MEMBER( sed1330_device::data_w )
break;
#endif
case INSTRUCTION_MWRITE:
- if (LOG) logerror("SED1330 '%s' Memory Write %02x to %04x (row %u col %u line %u)\n", tag().c_str(), data, m_csr, m_csr/80/8, m_csr%80, m_csr/80);
+ if (LOG) logerror("SED1330 '%s' Memory Write %02x to %04x (row %u col %u line %u)\n", tag(), data, m_csr, m_csr/80/8, m_csr%80, m_csr/80);
writebyte(m_csr, data);
@@ -556,7 +556,7 @@ WRITE8_MEMBER( sed1330_device::data_w )
break;
#endif
default:
- logerror("SED1330 '%s' Unsupported instruction %02x\n", tag().c_str(), m_ir);
+ logerror("SED1330 '%s' Unsupported instruction %02x\n", tag(), m_ir);
}
m_pbc++;
diff --git a/src/devices/video/sed1330.h b/src/devices/video/sed1330.h
index 10ccaf8e98c..5b6cbc19521 100644
--- a/src/devices/video/sed1330.h
+++ b/src/devices/video/sed1330.h
@@ -38,7 +38,7 @@ class sed1330_device : public device_t,
{
public:
// construction/destruction
- sed1330_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ sed1330_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/video/sed1520.cpp b/src/devices/video/sed1520.cpp
index e2781a5b5e6..d868600595c 100644
--- a/src/devices/video/sed1520.cpp
+++ b/src/devices/video/sed1520.cpp
@@ -28,7 +28,7 @@ const device_type SED1520 = &device_creator<sed1520_device>;
// sed1520_device - constructor
//-------------------------------------------------
-sed1520_device::sed1520_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+sed1520_device::sed1520_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SED1520, "SED1520", tag, owner, clock, "sed1520", __FILE__), m_lcd_on(0), m_busy(0), m_page(0), m_column(0), m_old_column(0), m_start_line(0),
m_adc(0), m_static_drive(0), m_modify_write(false),
m_screen_update_func(nullptr)
@@ -141,7 +141,7 @@ WRITE8_MEMBER(sed1520_device::control_write)
m_page = 3;
}
else
- logerror("%s: invalid SED1520 command: %x\n", tag().c_str(), data);
+ logerror("%s: invalid SED1520 command: %x\n", tag(), data);
}
READ8_MEMBER(sed1520_device::status_read)
diff --git a/src/devices/video/sed1520.h b/src/devices/video/sed1520.h
index 0b12aaa0107..654fd010060 100644
--- a/src/devices/video/sed1520.h
+++ b/src/devices/video/sed1520.h
@@ -30,7 +30,7 @@ class sed1520_device : public device_t
{
public:
// construction/destruction
- sed1520_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ sed1520_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// static configuration helpers
static void static_set_screen_update_cb(device_t &device, sed1520_screen_update_func _cb) { downcast<sed1520_device &>(device).m_screen_update_func = _cb; }
diff --git a/src/devices/video/snes_ppu.cpp b/src/devices/video/snes_ppu.cpp
index affb98e931e..7fdd700278c 100644
--- a/src/devices/video/snes_ppu.cpp
+++ b/src/devices/video/snes_ppu.cpp
@@ -200,7 +200,7 @@ const device_type SNES_PPU = &device_creator<snes_ppu_device>;
// snes_ppu_device - constructor
//-------------------------------------------------
-snes_ppu_device::snes_ppu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+snes_ppu_device::snes_ppu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SNES_PPU, "SNES PPU", tag, owner, clock, "snes_ppu", __FILE__),
device_video_interface(mconfig, *this),
m_openbus_cb(*this)
diff --git a/src/devices/video/snes_ppu.h b/src/devices/video/snes_ppu.h
index 1725d5af556..68634c5db60 100644
--- a/src/devices/video/snes_ppu.h
+++ b/src/devices/video/snes_ppu.h
@@ -70,7 +70,7 @@ class snes_ppu_device : public device_t,
{
public:
// construction/destruction
- snes_ppu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ snes_ppu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// inline configuration helpers
template<class _Object> static devcb_base &static_set_open_bus_callback(device_t &device, _Object object) { return downcast<snes_ppu_device &>(device).m_openbus_cb.set_callback(object); }
diff --git a/src/devices/video/stvvdp1.cpp b/src/devices/video/stvvdp1.cpp
index c2121268633..a98dc8fe709 100644
--- a/src/devices/video/stvvdp1.cpp
+++ b/src/devices/video/stvvdp1.cpp
@@ -175,7 +175,7 @@ READ16_MEMBER( saturn_state::saturn_vdp1_regs_r )
return modr;
default:
if(!space.debugger_access())
- printf ("cpu %s (PC=%08X) VDP1: Read from Registers, Offset %04x\n", space.device().tag().c_str(), space.device().safe_pc(), offset*2);
+ printf ("cpu %s (PC=%08X) VDP1: Read from Registers, Offset %04x\n", space.device().tag(), space.device().safe_pc(), offset*2);
break;
}
diff --git a/src/devices/video/t6a04.cpp b/src/devices/video/t6a04.cpp
index e88b99866fb..71b8e89d3bb 100644
--- a/src/devices/video/t6a04.cpp
+++ b/src/devices/video/t6a04.cpp
@@ -36,7 +36,7 @@ void t6a04_device::device_validity_check(validity_checker &valid) const
// t6a04_device - constructor
//-------------------------------------------------
-t6a04_device::t6a04_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+t6a04_device::t6a04_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, T6A04, "T6A04", tag, owner, clock, "t6a04", __FILE__), m_busy_flag(0), m_display_on(0), m_contrast(0), m_xpos(0), m_ypos(0), m_zpos(0), m_direction(0),
m_active_counter(0), m_word_len(0), m_opa1(0), m_opa2(0), m_output_reg(0),
m_height(0),
diff --git a/src/devices/video/t6a04.h b/src/devices/video/t6a04.h
index add9bd6665d..70d2c938855 100644
--- a/src/devices/video/t6a04.h
+++ b/src/devices/video/t6a04.h
@@ -21,7 +21,7 @@ class t6a04_device : public device_t
{
public:
// construction/destruction
- t6a04_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ t6a04_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
static void set_size(device_t &device, int w, int h)
{
diff --git a/src/devices/video/tea1002.cpp b/src/devices/video/tea1002.cpp
index 2dabafdf8ed..ba518e6a6ac 100644
--- a/src/devices/video/tea1002.cpp
+++ b/src/devices/video/tea1002.cpp
@@ -49,7 +49,7 @@ const device_type TEA1002 = &device_creator<tea1002_device>;
// paula_device - constructor
//-------------------------------------------------
-tea1002_device::tea1002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+tea1002_device::tea1002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, TEA1002, "TEA1002 PAL colour encoder", tag, owner, clock, "tea1002", __FILE__)
{
}
diff --git a/src/devices/video/tea1002.h b/src/devices/video/tea1002.h
index c7a42f3aa0e..b06d798b720 100644
--- a/src/devices/video/tea1002.h
+++ b/src/devices/video/tea1002.h
@@ -45,7 +45,7 @@ class tea1002_device : public device_t
{
public:
// construction/destruction
- tea1002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tea1002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
rgb_t color(int index);
diff --git a/src/devices/video/tlc34076.cpp b/src/devices/video/tlc34076.cpp
index e3d68c71ee0..b695ce08ed7 100644
--- a/src/devices/video/tlc34076.cpp
+++ b/src/devices/video/tlc34076.cpp
@@ -41,7 +41,7 @@ const device_type TLC34076 = &device_creator<tlc34076_device>;
//-------------------------------------------------
// tlc34076_device - constructor
//-------------------------------------------------
-tlc34076_device::tlc34076_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+tlc34076_device::tlc34076_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TLC34076, "TLC34076 VIP", tag, owner, clock, "tlc34076", __FILE__),
m_dacbits(6)
{
diff --git a/src/devices/video/tlc34076.h b/src/devices/video/tlc34076.h
index caca2e4f9ef..cd66143d9b7 100644
--- a/src/devices/video/tlc34076.h
+++ b/src/devices/video/tlc34076.h
@@ -34,7 +34,7 @@ class tlc34076_device : public device_t
{
public:
// construction/destruction
- tlc34076_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tlc34076_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// static configuration helpers
static void static_set_bits(device_t &device, tlc34076_bits bits);
diff --git a/src/devices/video/tms34061.cpp b/src/devices/video/tms34061.cpp
index 84f61eb1ec8..8d535b2951a 100644
--- a/src/devices/video/tms34061.cpp
+++ b/src/devices/video/tms34061.cpp
@@ -29,7 +29,7 @@
const device_type TMS34061 = &device_creator<tms34061_device>;
-tms34061_device::tms34061_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+tms34061_device::tms34061_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TMS34061, "TMS34061 VSC", tag, owner, clock, "tms34061", __FILE__),
device_video_interface(mconfig, *this),
m_rowshift(0),
diff --git a/src/devices/video/tms34061.h b/src/devices/video/tms34061.h
index 5454646b76e..814bf8b39c8 100644
--- a/src/devices/video/tms34061.h
+++ b/src/devices/video/tms34061.h
@@ -68,7 +68,7 @@ class tms34061_device : public device_t,
{
public:
// construction/destruction
- tms34061_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tms34061_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
static void set_rowshift(device_t &device, UINT8 rowshift) { downcast<tms34061_device &>(device).m_rowshift = rowshift; }
static void set_vram_size(device_t &device, UINT32 vramsize) { downcast<tms34061_device &>(device).m_vramsize = vramsize; }
diff --git a/src/devices/video/tms3556.cpp b/src/devices/video/tms3556.cpp
index d85c35dd075..716b1c0269d 100644
--- a/src/devices/video/tms3556.cpp
+++ b/src/devices/video/tms3556.cpp
@@ -80,7 +80,7 @@ inline void tms3556_device::writebyte(offs_t address, UINT8 data)
// tms3556_device - constructor
//-------------------------------------------------
-tms3556_device::tms3556_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+tms3556_device::tms3556_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TMS3556, "Texas Instruments VDP TMS3556", tag, owner, clock, "tms3556", __FILE__),
device_memory_interface(mconfig, *this),
m_space_config("videoram", ENDIANNESS_LITTLE, 8, 17, 0, nullptr, *ADDRESS_MAP_NAME(tms3556)),
diff --git a/src/devices/video/tms3556.h b/src/devices/video/tms3556.h
index de4d1ec47ea..d367a3efc48 100644
--- a/src/devices/video/tms3556.h
+++ b/src/devices/video/tms3556.h
@@ -69,7 +69,7 @@ class tms3556_device : public device_t,
{
public:
// construction/destruction
- tms3556_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tms3556_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER( vram_r );
DECLARE_WRITE8_MEMBER( vram_w );
diff --git a/src/devices/video/tms9927.cpp b/src/devices/video/tms9927.cpp
index e75594d13e7..4b6f82e18b8 100644
--- a/src/devices/video/tms9927.cpp
+++ b/src/devices/video/tms9927.cpp
@@ -34,37 +34,39 @@ const device_type CRT5027 = &device_creator<crt5027_device>;
const device_type CRT5037 = &device_creator<crt5037_device>;
const device_type CRT5057 = &device_creator<crt5057_device>;
-tms9927_device::tms9927_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+tms9927_device::tms9927_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TMS9927, "TMS9927 VTC", tag, owner, clock, "tms9927", __FILE__),
device_video_interface(mconfig, *this),
m_write_vsyn(*this),
m_hpixels_per_column(0),
+ m_selfload_region(nullptr),
m_reset(0)
{
memset(m_reg, 0x00, sizeof(m_reg));
}
-tms9927_device::tms9927_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+tms9927_device::tms9927_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
m_write_vsyn(*this),
m_hpixels_per_column(0),
+ m_selfload_region(nullptr),
m_reset(0)
{
memset(m_reg, 0x00, sizeof(m_reg));
}
-crt5027_device::crt5027_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+crt5027_device::crt5027_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: tms9927_device(mconfig, CRT5027, "CRT5027", tag, owner, clock, "crt5027", __FILE__)
{
}
-crt5037_device::crt5037_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+crt5037_device::crt5037_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: tms9927_device(mconfig, CRT5037, "CRT5037", tag, owner, clock, "crt5037", __FILE__)
{
}
-crt5057_device::crt5057_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+crt5057_device::crt5057_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: tms9927_device(mconfig, CRT5057, "CRT5057", tag, owner, clock, "crt5057", __FILE__)
{
}
@@ -83,7 +85,7 @@ void tms9927_device::device_start()
m_clock = clock();
/* get the self-load PROM */
- if (!m_selfload_region.empty())
+ if (m_selfload_region != nullptr)
{
m_selfload = machine().root_device().memregion(m_selfload_region)->base();
assert(m_selfload != nullptr);
diff --git a/src/devices/video/tms9927.h b/src/devices/video/tms9927.h
index 4ed6f2f236c..40181d16cbc 100644
--- a/src/devices/video/tms9927.h
+++ b/src/devices/video/tms9927.h
@@ -24,14 +24,14 @@ class tms9927_device : public device_t,
public device_video_interface
{
public:
- tms9927_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- tms9927_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ tms9927_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms9927_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~tms9927_device() {}
template<class _Object> static devcb_base &set_vsyn_wr_callback(device_t &device, _Object object) { return downcast<tms9927_device &>(device).m_write_vsyn.set_callback(object); }
static void set_char_width(device_t &device, int pixels) { downcast<tms9927_device &>(device).m_hpixels_per_column = pixels; }
- static void set_region_tag(device_t &device, std::string tag) { downcast<tms9927_device &>(device).m_selfload_region = tag; }
+ static void set_region_tag(device_t &device, const char *tag) { downcast<tms9927_device &>(device).m_selfload_region = tag; }
DECLARE_WRITE8_MEMBER(write);
DECLARE_READ8_MEMBER(read);
@@ -59,7 +59,7 @@ private:
devcb_write_line m_write_vsyn;
int m_hpixels_per_column; /* number of pixels per video memory address */
- std::string m_selfload_region; /* name of the region with self-load data */
+ const char *m_selfload_region; /* name of the region with self-load data */
// internal state
const UINT8 *m_selfload;
@@ -85,7 +85,7 @@ extern const device_type TMS9927;
class crt5027_device : public tms9927_device
{
public:
- crt5027_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ crt5027_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
extern const device_type CRT5027;
@@ -93,7 +93,7 @@ extern const device_type CRT5027;
class crt5037_device : public tms9927_device
{
public:
- crt5037_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ crt5037_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
extern const device_type CRT5037;
@@ -101,7 +101,7 @@ extern const device_type CRT5037;
class crt5057_device : public tms9927_device
{
public:
- crt5057_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ crt5057_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
extern const device_type CRT5057;
diff --git a/src/devices/video/tms9928a.cpp b/src/devices/video/tms9928a.cpp
index a5c77b83dcf..ba7a40a4b6e 100644
--- a/src/devices/video/tms9928a.cpp
+++ b/src/devices/video/tms9928a.cpp
@@ -54,7 +54,7 @@ static ADDRESS_MAP_START(memmap, AS_DATA, 8, tms9928a_device)
AM_RANGE(0x0000, 0x3fff) AM_RAM
ADDRESS_MAP_END
-tms9928a_device::tms9928a_device( const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, bool is_50hz, bool is_reva, bool is_99, const char *shortname, const char *source)
+tms9928a_device::tms9928a_device( const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, bool is_50hz, bool is_reva, bool is_99, const char *shortname, const char *source)
: device_t( mconfig, type, name, tag, owner, clock, shortname, source),
device_memory_interface(mconfig, *this),
device_video_interface(mconfig, *this),
@@ -68,7 +68,7 @@ tms9928a_device::tms9928a_device( const machine_config &mconfig, device_type typ
}
-tms9928a_device::tms9928a_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
+tms9928a_device::tms9928a_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
: device_t( mconfig, TMS9928A, "TMS9928A VDP", tag, owner, clock, "tms9928a", __FILE__),
device_memory_interface(mconfig, *this),
device_video_interface(mconfig, *this),
@@ -82,31 +82,31 @@ tms9928a_device::tms9928a_device( const machine_config &mconfig, std::string tag
// static_set_addrmap(*this, AS_DATA, ADDRESS_MAP_NAME(memmap));
}
-tms9129_device::tms9129_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+tms9129_device::tms9129_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: tms9928a_device( mconfig, TMS9129, "TMS9129", tag, owner, clock, true, true, false, "tms9129", __FILE__)
{ }
-tms9918_device::tms9918_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+tms9918_device::tms9918_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: tms9928a_device( mconfig, TMS9918, "TMS9918", tag, owner, clock, false, false, true, "tms9918", __FILE__)
{ }
-tms9918a_device::tms9918a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+tms9918a_device::tms9918a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: tms9928a_device( mconfig, TMS9918A, "TMS9918A", tag, owner, clock, false, true, true, "tms9918a", __FILE__)
{ }
-tms9118_device::tms9118_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+tms9118_device::tms9118_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: tms9928a_device( mconfig, TMS9118, "TMS9118 VDP", tag, owner, clock, false, true, false, "tms9118", __FILE__)
{ }
-tms9128_device::tms9128_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+tms9128_device::tms9128_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: tms9928a_device( mconfig, TMS9128, "TMS9128 VDP", tag, owner, clock, false, true, false, "tms9128", __FILE__)
{ }
-tms9929_device::tms9929_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+tms9929_device::tms9929_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: tms9928a_device( mconfig, TMS9929, "TMS9929", tag, owner, clock, true, false, true, "tms9929", __FILE__)
{ }
-tms9929a_device::tms9929a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+tms9929a_device::tms9929a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: tms9928a_device( mconfig, TMS9929A, "TMS9929A", tag, owner, clock, true, true, true, "tms9929a", __FILE__)
{ }
@@ -200,7 +200,7 @@ void tms9928a_device::change_register(UINT8 reg, UINT8 val)
val &= Mask[reg];
m_Regs[reg] = val;
- if (TRACE_REG) logerror("TMS9928A('%s'): Reg %d = %02xh\n", tag().c_str(), reg, (int)val);
+ if (TRACE_REG) logerror("TMS9928A('%s'): Reg %d = %02xh\n", tag(), reg, (int)val);
switch (reg)
{
@@ -220,12 +220,12 @@ void tms9928a_device::change_register(UINT8 reg, UINT8 val)
m_mode = ( (m_reva ? (m_Regs[0] & 2) : 0) | ((m_Regs[1] & 0x10)>>4) | ((m_Regs[1] & 8)>>1));
if ((val ^ prev) & 1)
update_backdrop();
- if (TRACE_MODE) logerror("TMS9928A('%s'): %s\n", tag().c_str(), modes[m_mode]);
+ if (TRACE_MODE) logerror("TMS9928A('%s'): %s\n", tag(), modes[m_mode]);
break;
case 1:
check_interrupt();
m_mode = ( (m_reva ? (m_Regs[0] & 2) : 0) | ((m_Regs[1] & 0x10)>>4) | ((m_Regs[1] & 8)>>1));
- if (TRACE_MODE) logerror("TMS9928A('%s'): %s\n", tag().c_str(), modes[m_mode]);
+ if (TRACE_MODE) logerror("TMS9928A('%s'): %s\n", tag(), modes[m_mode]);
break;
case 2:
m_nametbl = (val * 1024) & (m_vram_size - 1);
diff --git a/src/devices/video/tms9928a.h b/src/devices/video/tms9928a.h
index 82798ea7318..8107a1b0d62 100644
--- a/src/devices/video/tms9928a.h
+++ b/src/devices/video/tms9928a.h
@@ -82,8 +82,8 @@ class tms9928a_device : public device_t,
{
public:
// construction/destruction
- tms9928a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- tms9928a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, bool is_50hz, bool is_reva, bool is_99, const char *shortname, const char *source);
+ tms9928a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms9928a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, bool is_50hz, bool is_reva, bool is_99, const char *shortname, const char *source);
static void set_vram_size(device_t &device, int vram_size) { downcast<tms9928a_device &>(device).m_vram_size = vram_size; }
template<class _Object> static devcb_base &set_out_int_line_callback(device_t &device, _Object object) { return downcast<tms9928a_device &>(device).m_out_int_line_cb.set_callback(object); }
@@ -158,49 +158,49 @@ private:
class tms9918_device : public tms9928a_device
{
public:
- tms9918_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tms9918_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class tms9918a_device : public tms9928a_device
{
public:
- tms9918a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tms9918a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class tms9118_device : public tms9928a_device
{
public:
- tms9118_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tms9118_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class tms9128_device : public tms9928a_device
{
public:
- tms9128_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tms9128_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class tms9929_device : public tms9928a_device
{
public:
- tms9929_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tms9929_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class tms9929a_device : public tms9928a_device
{
public:
- tms9929a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tms9929a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class tms9129_device : public tms9928a_device
{
public:
- tms9129_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tms9129_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/video/upd3301.cpp b/src/devices/video/upd3301.cpp
index e94a4a2044b..8370f52c85c 100644
--- a/src/devices/video/upd3301.cpp
+++ b/src/devices/video/upd3301.cpp
@@ -74,7 +74,7 @@ const device_type UPD3301 = &device_creator<upd3301_device>;
// upd3301_device - constructor
//-------------------------------------------------
-upd3301_device::upd3301_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+upd3301_device::upd3301_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, UPD3301, "UPD3301", tag, owner, clock, "upd3301", __FILE__),
device_video_interface(mconfig, *this),
m_write_int(*this),
@@ -189,7 +189,7 @@ void upd3301_device::device_timer(emu_timer &timer, device_timer_id id, int para
switch (id)
{
case TIMER_HRTC:
- if (LOG) logerror("UPD3301 '%s' HRTC: %u\n", tag().c_str(), param);
+ if (LOG) logerror("UPD3301 '%s' HRTC: %u\n", tag(), param);
m_write_hrtc(param);
m_hrtc = param;
@@ -198,7 +198,7 @@ void upd3301_device::device_timer(emu_timer &timer, device_timer_id id, int para
break;
case TIMER_VRTC:
- if (LOG) logerror("UPD3301 '%s' VRTC: %u\n", tag().c_str(), param);
+ if (LOG) logerror("UPD3301 '%s' VRTC: %u\n", tag(), param);
m_write_vrtc(param);
m_vrtc = param;
@@ -258,31 +258,31 @@ WRITE8_MEMBER( upd3301_device::write )
case 0:
m_dma_mode = BIT(data, 7);
m_h = (data & 0x7f) + 2;
- if (LOG) logerror("UPD3301 '%s' DMA Mode: %s\n", tag().c_str(), m_dma_mode ? "character" : "burst");
- if (LOG) logerror("UPD3301 '%s' H: %u\n", tag().c_str(), m_h);
+ if (LOG) logerror("UPD3301 '%s' DMA Mode: %s\n", tag(), m_dma_mode ? "character" : "burst");
+ if (LOG) logerror("UPD3301 '%s' H: %u\n", tag(), m_h);
break;
case 1:
m_b = ((data >> 6) + 1) * 16;
m_l = (data & 0x3f) + 1;
- if (LOG) logerror("UPD3301 '%s' B: %u\n", tag().c_str(), m_b);
- if (LOG) logerror("UPD3301 '%s' L: %u\n", tag().c_str(), m_l);
+ if (LOG) logerror("UPD3301 '%s' B: %u\n", tag(), m_b);
+ if (LOG) logerror("UPD3301 '%s' L: %u\n", tag(), m_l);
break;
case 2:
m_s = BIT(data, 7);
m_c = (data >> 4) & 0x03;
m_r = (data & 0x1f) + 1;
- if (LOG) logerror("UPD3301 '%s' S: %u\n", tag().c_str(), m_s);
- if (LOG) logerror("UPD3301 '%s' C: %u\n", tag().c_str(), m_c);
- if (LOG) logerror("UPD3301 '%s' R: %u\n", tag().c_str(), m_r);
+ if (LOG) logerror("UPD3301 '%s' S: %u\n", tag(), m_s);
+ if (LOG) logerror("UPD3301 '%s' C: %u\n", tag(), m_c);
+ if (LOG) logerror("UPD3301 '%s' R: %u\n", tag(), m_r);
break;
case 3:
m_v = (data >> 5) + 1;
m_z = (data & 0x1f) + 2;
- if (LOG) logerror("UPD3301 '%s' V: %u\n", tag().c_str(), m_v);
- if (LOG) logerror("UPD3301 '%s' Z: %u\n", tag().c_str(), m_z);
+ if (LOG) logerror("UPD3301 '%s' V: %u\n", tag(), m_v);
+ if (LOG) logerror("UPD3301 '%s' Z: %u\n", tag(), m_z);
recompute_parameters();
break;
@@ -291,10 +291,10 @@ WRITE8_MEMBER( upd3301_device::write )
m_at0 = BIT(data, 6);
m_sc = BIT(data, 5);
m_attr = (data & 0x1f) + 1;
- if (LOG) logerror("UPD3301 '%s' AT1: %u\n", tag().c_str(), m_at1);
- if (LOG) logerror("UPD3301 '%s' AT0: %u\n", tag().c_str(), m_at0);
- if (LOG) logerror("UPD3301 '%s' SC: %u\n", tag().c_str(), m_sc);
- if (LOG) logerror("UPD3301 '%s' ATTR: %u\n", tag().c_str(), m_attr);
+ if (LOG) logerror("UPD3301 '%s' AT1: %u\n", tag(), m_at1);
+ if (LOG) logerror("UPD3301 '%s' AT0: %u\n", tag(), m_at0);
+ if (LOG) logerror("UPD3301 '%s' SC: %u\n", tag(), m_sc);
+ if (LOG) logerror("UPD3301 '%s' ATTR: %u\n", tag(), m_attr);
m_mode = MODE_NONE;
break;
@@ -308,12 +308,12 @@ WRITE8_MEMBER( upd3301_device::write )
{
case 0:
m_cx = data & 0x7f;
- if (LOG) logerror("UPD3301 '%s' CX: %u\n", tag().c_str(), m_cx);
+ if (LOG) logerror("UPD3301 '%s' CX: %u\n", tag(), m_cx);
break;
case 1:
m_cy = data & 0x3f;
- if (LOG) logerror("UPD3301 '%s' CY: %u\n", tag().c_str(), m_cy);
+ if (LOG) logerror("UPD3301 '%s' CY: %u\n", tag(), m_cy);
m_mode = MODE_NONE;
break;
@@ -323,7 +323,7 @@ WRITE8_MEMBER( upd3301_device::write )
break;
default:
- if (LOG) logerror("UPD3301 '%s' Invalid Parameter Byte %02x!\n", tag().c_str(), data);
+ if (LOG) logerror("UPD3301 '%s' Invalid Parameter Byte %02x!\n", tag(), data);
}
break;
@@ -334,45 +334,45 @@ WRITE8_MEMBER( upd3301_device::write )
switch (data & 0xe0)
{
case COMMAND_RESET:
- if (LOG) logerror("UPD3301 '%s' Reset\n", tag().c_str());
+ if (LOG) logerror("UPD3301 '%s' Reset\n", tag());
m_mode = MODE_RESET;
set_display(0);
set_interrupt(0);
break;
case COMMAND_START_DISPLAY:
- if (LOG) logerror("UPD3301 '%s' Start Display\n", tag().c_str());
+ if (LOG) logerror("UPD3301 '%s' Start Display\n", tag());
set_display(1);
reset_counters();
break;
case COMMAND_SET_INTERRUPT_MASK:
- if (LOG) logerror("UPD3301 '%s' Set Interrupt Mask\n", tag().c_str());
+ if (LOG) logerror("UPD3301 '%s' Set Interrupt Mask\n", tag());
m_me = BIT(data, 0);
m_mn = BIT(data, 1);
- if (LOG) logerror("UPD3301 '%s' ME: %u\n", tag().c_str(), m_me);
- if (LOG) logerror("UPD3301 '%s' MN: %u\n", tag().c_str(), m_mn);
+ if (LOG) logerror("UPD3301 '%s' ME: %u\n", tag(), m_me);
+ if (LOG) logerror("UPD3301 '%s' MN: %u\n", tag(), m_mn);
break;
case COMMAND_READ_LIGHT_PEN:
- if (LOG) logerror("UPD3301 '%s' Read Light Pen\n", tag().c_str());
+ if (LOG) logerror("UPD3301 '%s' Read Light Pen\n", tag());
m_mode = MODE_READ_LIGHT_PEN;
break;
case COMMAND_LOAD_CURSOR_POSITION:
- if (LOG) logerror("UPD3301 '%s' Load Cursor Position\n", tag().c_str());
+ if (LOG) logerror("UPD3301 '%s' Load Cursor Position\n", tag());
m_mode = MODE_LOAD_CURSOR_POSITION;
m_cm = BIT(data, 0);
- if (LOG) logerror("UPD3301 '%s' CM: %u\n", tag().c_str(), m_cm);
+ if (LOG) logerror("UPD3301 '%s' CM: %u\n", tag(), m_cm);
break;
case COMMAND_RESET_INTERRUPT:
- if (LOG) logerror("UPD3301 '%s' Reset Interrupt\n", tag().c_str());
+ if (LOG) logerror("UPD3301 '%s' Reset Interrupt\n", tag());
set_interrupt(0);
break;
case COMMAND_RESET_COUNTERS:
- if (LOG) logerror("UPD3301 '%s' Reset Counters\n", tag().c_str());
+ if (LOG) logerror("UPD3301 '%s' Reset Counters\n", tag());
m_mode = MODE_RESET_COUNTERS;
reset_counters();
break;
@@ -525,7 +525,7 @@ UINT32 upd3301_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap
void upd3301_device::set_interrupt(int state)
{
- if (LOG) logerror("UPD3301 '%s' Interrupt: %u\n", tag().c_str(), state);
+ if (LOG) logerror("UPD3301 '%s' Interrupt: %u\n", tag(), state);
m_write_int(state);
@@ -542,7 +542,7 @@ void upd3301_device::set_interrupt(int state)
void upd3301_device::set_drq(int state)
{
- if (LOG) logerror("UPD3301 '%s' DRQ: %u\n", tag().c_str(), state);
+ if (LOG) logerror("UPD3301 '%s' DRQ: %u\n", tag(), state);
m_write_drq(state);
}
@@ -624,8 +624,8 @@ void upd3301_device::recompute_parameters()
if (LOG)
{
- if (LOG) logerror("UPD3301 '%s' Screen: %u x %u @ %f Hz\n", tag().c_str(), horiz_pix_total, vert_pix_total, 1 / ATTOSECONDS_TO_DOUBLE(refresh));
- if (LOG) logerror("UPD3301 '%s' Visible Area: (%u, %u) - (%u, %u)\n", tag().c_str(), visarea.min_x, visarea.min_y, visarea.max_x, visarea.max_y);
+ if (LOG) logerror("UPD3301 '%s' Screen: %u x %u @ %f Hz\n", tag(), horiz_pix_total, vert_pix_total, 1 / ATTOSECONDS_TO_DOUBLE(refresh));
+ if (LOG) logerror("UPD3301 '%s' Visible Area: (%u, %u) - (%u, %u)\n", tag(), visarea.min_x, visarea.min_y, visarea.max_x, visarea.max_y);
}
m_screen->configure(horiz_pix_total, vert_pix_total, visarea, refresh);
diff --git a/src/devices/video/upd3301.h b/src/devices/video/upd3301.h
index 857e91946d7..0507eb25e6c 100644
--- a/src/devices/video/upd3301.h
+++ b/src/devices/video/upd3301.h
@@ -79,7 +79,7 @@ class upd3301_device : public device_t,
{
public:
// construction/destruction
- upd3301_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ upd3301_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
static void static_set_character_width(device_t &device, int value) { downcast<upd3301_device &>(device).m_width = value; }
static void static_set_display_callback(device_t &device, upd3301_draw_character_delegate callback) { downcast<upd3301_device &>(device).m_display_cb = callback; }
diff --git a/src/devices/video/upd7220.cpp b/src/devices/video/upd7220.cpp
index f1368f08624..23548f1ecd7 100644
--- a/src/devices/video/upd7220.cpp
+++ b/src/devices/video/upd7220.cpp
@@ -408,7 +408,7 @@ inline void upd7220_device::recompute_parameters()
visarea.max_x = m_aw * horiz_mult - 1;//horiz_pix_total - (m_hfp * 8) - 1;
visarea.max_y = m_al * vert_mult + m_vbp - 1;//vert_pix_total - m_vfp - 1;
- LOG(("uPD7220 '%s' Screen: %u x %u @ %f Hz\n", tag().c_str(), horiz_pix_total, vert_pix_total, 1 / ATTOSECONDS_TO_DOUBLE(refresh)));
+ LOG(("uPD7220 '%s' Screen: %u x %u @ %f Hz\n", tag(), horiz_pix_total, vert_pix_total, 1 / ATTOSECONDS_TO_DOUBLE(refresh)));
LOG(("Visible Area: (%u, %u) - (%u, %u)\n", visarea.min_x, visarea.min_y, visarea.max_x, visarea.max_y));
LOG(("%d %d %d %d %d\n",m_hs,m_hbp,m_aw,m_hfp,m_pitch));
LOG(("%d %d %d %d\n",m_vs,m_vbp,m_al,m_vfp));
@@ -604,7 +604,7 @@ inline void upd7220_device::get_graphics_partition(int index, UINT32 *sad, UINT1
// upd7220_device - constructor
//-------------------------------------------------
-upd7220_device::upd7220_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+upd7220_device::upd7220_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, UPD7220, "uPD7220", tag, owner, clock, "upd7220", __FILE__),
device_memory_interface(mconfig, *this),
device_video_interface(mconfig, *this),
@@ -1101,19 +1101,19 @@ void upd7220_device::process_fifo()
switch (translate_command(m_cr))
{
case COMMAND_INVALID:
- logerror("uPD7220 '%s' Invalid Command Byte %02x\n", tag().c_str(), m_cr);
+ logerror("uPD7220 '%s' Invalid Command Byte %02x\n", tag(), m_cr);
break;
case COMMAND_5A:
if (m_param_ptr == 4)
- logerror("uPD7220 '%s' Undocumented Command 0x5A Executed %02x %02x %02x\n", tag().c_str(),m_pr[1],m_pr[2],m_pr[3] );
+ logerror("uPD7220 '%s' Undocumented Command 0x5A Executed %02x %02x %02x\n", tag(),m_pr[1],m_pr[2],m_pr[3] );
break;
case COMMAND_RESET: /* reset */
switch (m_param_ptr)
{
case 0:
- LOG(("uPD7220 '%s' RESET\n", tag().c_str()));
+ LOG(("uPD7220 '%s' RESET\n", tag()));
m_de = 0;
m_ra[0] = m_ra[1] = m_ra[2] = 0;
@@ -1136,16 +1136,16 @@ void upd7220_device::process_fifo()
m_pitch = m_aw;
- LOG(("uPD7220 '%s' Mode: %02x\n", tag().c_str(), m_mode));
- LOG(("uPD7220 '%s' AW: %u\n", tag().c_str(), m_aw));
- LOG(("uPD7220 '%s' HS: %u\n", tag().c_str(), m_hs));
- LOG(("uPD7220 '%s' VS: %u\n", tag().c_str(), m_vs));
- LOG(("uPD7220 '%s' HFP: %u\n", tag().c_str(), m_hfp));
- LOG(("uPD7220 '%s' HBP: %u\n", tag().c_str(), m_hbp));
- LOG(("uPD7220 '%s' VFP: %u\n", tag().c_str(), m_vfp));
- LOG(("uPD7220 '%s' AL: %u\n", tag().c_str(), m_al));
- LOG(("uPD7220 '%s' VBP: %u\n", tag().c_str(), m_vbp));
- LOG(("uPD7220 '%s' PITCH: %u\n", tag().c_str(), m_pitch));
+ LOG(("uPD7220 '%s' Mode: %02x\n", tag(), m_mode));
+ LOG(("uPD7220 '%s' AW: %u\n", tag(), m_aw));
+ LOG(("uPD7220 '%s' HS: %u\n", tag(), m_hs));
+ LOG(("uPD7220 '%s' VS: %u\n", tag(), m_vs));
+ LOG(("uPD7220 '%s' HFP: %u\n", tag(), m_hfp));
+ LOG(("uPD7220 '%s' HBP: %u\n", tag(), m_hbp));
+ LOG(("uPD7220 '%s' VFP: %u\n", tag(), m_vfp));
+ LOG(("uPD7220 '%s' AL: %u\n", tag(), m_al));
+ LOG(("uPD7220 '%s' VBP: %u\n", tag(), m_vbp));
+ LOG(("uPD7220 '%s' PITCH: %u\n", tag(), m_pitch));
recompute_parameters();
break;
@@ -1167,16 +1167,16 @@ void upd7220_device::process_fifo()
m_pitch = m_aw;
- LOG(("uPD7220 '%s' Mode: %02x\n", tag().c_str(), m_mode));
- LOG(("uPD7220 '%s' AW: %u\n", tag().c_str(), m_aw));
- LOG(("uPD7220 '%s' HS: %u\n", tag().c_str(), m_hs));
- LOG(("uPD7220 '%s' VS: %u\n", tag().c_str(), m_vs));
- LOG(("uPD7220 '%s' HFP: %u\n", tag().c_str(), m_hfp));
- LOG(("uPD7220 '%s' HBP: %u\n", tag().c_str(), m_hbp));
- LOG(("uPD7220 '%s' VFP: %u\n", tag().c_str(), m_vfp));
- LOG(("uPD7220 '%s' AL: %u\n", tag().c_str(), m_al));
- LOG(("uPD7220 '%s' VBP: %u\n", tag().c_str(), m_vbp));
- LOG(("uPD7220 '%s' PITCH: %u\n", tag().c_str(), m_pitch));
+ LOG(("uPD7220 '%s' Mode: %02x\n", tag(), m_mode));
+ LOG(("uPD7220 '%s' AW: %u\n", tag(), m_aw));
+ LOG(("uPD7220 '%s' HS: %u\n", tag(), m_hs));
+ LOG(("uPD7220 '%s' VS: %u\n", tag(), m_vs));
+ LOG(("uPD7220 '%s' HFP: %u\n", tag(), m_hfp));
+ LOG(("uPD7220 '%s' HBP: %u\n", tag(), m_hbp));
+ LOG(("uPD7220 '%s' VFP: %u\n", tag(), m_vfp));
+ LOG(("uPD7220 '%s' AL: %u\n", tag(), m_al));
+ LOG(("uPD7220 '%s' VBP: %u\n", tag(), m_vbp));
+ LOG(("uPD7220 '%s' PITCH: %u\n", tag(), m_pitch));
recompute_parameters();
}
@@ -1185,7 +1185,7 @@ void upd7220_device::process_fifo()
case COMMAND_VSYNC: /* vertical sync mode */
m_m = m_cr & 0x01;
- LOG(("uPD7220 '%s' M: %u\n", tag().c_str(), m_m));
+ LOG(("uPD7220 '%s' M: %u\n", tag(), m_m));
recompute_parameters();
break;
@@ -1196,8 +1196,8 @@ void upd7220_device::process_fifo()
m_lr = (m_pr[1] & 0x1f) + 1;
m_dc = BIT(m_pr[1], 7);
- LOG(("uPD7220 '%s' LR: %u\n", tag().c_str(), m_lr));
- LOG(("uPD7220 '%s' DC: %u\n", tag().c_str(), m_dc));
+ LOG(("uPD7220 '%s' LR: %u\n", tag(), m_lr));
+ LOG(("uPD7220 '%s' DC: %u\n", tag(), m_dc));
}
if(m_param_ptr == 3)
@@ -1206,8 +1206,8 @@ void upd7220_device::process_fifo()
m_sc = BIT(m_pr[2], 5);
m_br = (m_pr[2] >> 6); /* guess, assume that blink rate clears upper bits (if any) */
- LOG(("uPD7220 '%s' CTOP: %u\n", tag().c_str(), m_ctop));
- LOG(("uPD7220 '%s' SC: %u\n", tag().c_str(), m_sc));
+ LOG(("uPD7220 '%s' CTOP: %u\n", tag(), m_ctop));
+ LOG(("uPD7220 '%s' SC: %u\n", tag(), m_sc));
}
if(m_param_ptr == 4)
@@ -1215,21 +1215,21 @@ void upd7220_device::process_fifo()
m_br = ((m_pr[3] & 0x07) << 2) | (m_pr[2] >> 6);
m_cbot = m_pr[3] >> 3;
- LOG(("uPD7220 '%s' BR: %u\n", tag().c_str(), m_br));
- LOG(("uPD7220 '%s' CBOT: %u\n", tag().c_str(), m_cbot));
+ LOG(("uPD7220 '%s' BR: %u\n", tag(), m_br));
+ LOG(("uPD7220 '%s' CBOT: %u\n", tag(), m_cbot));
}
break;
case COMMAND_START: /* start display & end idle mode */
m_de = 1;
- //LOG(("uPD7220 '%s' DE: 1\n", tag().c_str()));
+ //LOG(("uPD7220 '%s' DE: 1\n", tag()));
break;
case COMMAND_BCTRL: /* display blanking control */
m_de = m_cr & 0x01;
- //LOG(("uPD7220 '%s' DE: %u\n", tag().c_str(), m_de));
+ //LOG(("uPD7220 '%s' DE: %u\n", tag(), m_de));
break;
case COMMAND_ZOOM: /* zoom factors specify */
@@ -1238,8 +1238,8 @@ void upd7220_device::process_fifo()
m_gchr = m_pr[1] & 0x0f;
m_disp = m_pr[1] >> 4;
- LOG(("uPD7220 '%s' GCHR: %01x\n", tag().c_str(), m_gchr));
- LOG(("uPD7220 '%s' DISP: %01x\n", tag().c_str(), m_disp));
+ LOG(("uPD7220 '%s' GCHR: %01x\n", tag(), m_gchr));
+ LOG(("uPD7220 '%s' DISP: %01x\n", tag(), m_disp));
}
break;
@@ -1250,12 +1250,12 @@ void upd7220_device::process_fifo()
m_ead = (upper_addr << 16) | (m_pr[2] << 8) | m_pr[1];
- LOG(("uPD7220 '%s' EAD: %06x\n", tag().c_str(), m_ead));
+ LOG(("uPD7220 '%s' EAD: %06x\n", tag(), m_ead));
if(m_param_ptr == 4)
{
m_dad = m_pr[3] >> 4;
- LOG(("uPD7220 '%s' DAD: %01x\n", tag().c_str(), m_dad));
+ LOG(("uPD7220 '%s' DAD: %01x\n", tag(), m_dad));
}
}
break;
@@ -1269,7 +1269,7 @@ void upd7220_device::process_fifo()
{
if (m_ra_addr < 16)
{
- LOG(("uPD7220 '%s' RA%u: %02x\n", tag().c_str(), m_ra_addr, data));
+ LOG(("uPD7220 '%s' RA%u: %02x\n", tag(), m_ra_addr, data));
m_ra[m_ra_addr] = data;
m_ra_addr++;
@@ -1284,7 +1284,7 @@ void upd7220_device::process_fifo()
{
m_pitch = data;
- LOG(("uPD7220 '%s' PITCH: %u\n", tag().c_str(), m_pitch));
+ LOG(("uPD7220 '%s' PITCH: %u\n", tag(), m_pitch));
}
break;
@@ -1307,7 +1307,7 @@ void upd7220_device::process_fifo()
{
m_mask = (m_pr[2] << 8) | m_pr[1];
- LOG(("uPD7220 '%s' MASK: %04x\n", tag().c_str(), m_mask));
+ LOG(("uPD7220 '%s' MASK: %04x\n", tag(), m_mask));
}
break;
@@ -1356,7 +1356,7 @@ void upd7220_device::process_fifo()
else if(m_figs.m_figure_type == 8)
draw_rectangle(((m_ead % eff_pitch) << 4) | (m_dad & 0xf),(m_ead / eff_pitch));
else
- logerror("uPD7220 '%s' Unimplemented command FIGD %02x\n", tag().c_str(),m_figs.m_figure_type);
+ logerror("uPD7220 '%s' Unimplemented command FIGD %02x\n", tag(),m_figs.m_figure_type);
reset_figs_param();
m_sr |= UPD7220_SR_DRAWING_IN_PROGRESS;
@@ -1366,7 +1366,7 @@ void upd7220_device::process_fifo()
if((m_figs.m_figure_type & 0xf) == 2)
draw_char(((m_ead % eff_pitch) << 4) | (m_dad & 0xf),(m_ead / eff_pitch));
else
- logerror("uPD7220 '%s' Unimplemented command GCHRD %02x\n", tag().c_str(),m_figs.m_figure_type);
+ logerror("uPD7220 '%s' Unimplemented command GCHRD %02x\n", tag(),m_figs.m_figure_type);
reset_figs_param();
m_sr |= UPD7220_SR_DRAWING_IN_PROGRESS;
@@ -1407,11 +1407,11 @@ void upd7220_device::process_fifo()
break;
case COMMAND_DMAR: /* DMA read request */
- logerror("uPD7220 '%s' Unimplemented command DMAR\n", tag().c_str());
+ logerror("uPD7220 '%s' Unimplemented command DMAR\n", tag());
break;
case COMMAND_DMAW: /* DMA write request */
- logerror("uPD7220 '%s' Unimplemented command DMAW\n", tag().c_str());
+ logerror("uPD7220 '%s' Unimplemented command DMAW\n", tag());
break;
}
}
@@ -1511,7 +1511,7 @@ WRITE8_MEMBER( upd7220_device::dack_w )
WRITE_LINE_MEMBER( upd7220_device::ext_sync_w )
{
- //LOG(("uPD7220 '%s' External Synchronization: %u\n", tag().c_str(), state));
+ //LOG(("uPD7220 '%s' External Synchronization: %u\n", tag(), state));
if (state)
{
@@ -1675,7 +1675,7 @@ UINT32 upd7220_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap
break;
case UPD7220_MODE_DISPLAY_INVALID:
- LOG(("uPD7220 '%s' Invalid Display Mode!\n", tag().c_str()));
+ LOG(("uPD7220 '%s' Invalid Display Mode!\n", tag()));
}
}
return 0;
diff --git a/src/devices/video/upd7220.h b/src/devices/video/upd7220.h
index 239ca5b67ec..dbde33a93f8 100644
--- a/src/devices/video/upd7220.h
+++ b/src/devices/video/upd7220.h
@@ -82,7 +82,7 @@ class upd7220_device : public device_t,
{
public:
// construction/destruction
- upd7220_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ upd7220_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
static void static_set_display_pixels_callback(device_t &device, upd7220_display_pixels_delegate callback) { downcast<upd7220_device &>(device).m_display_cb = callback; }
static void static_set_draw_text_callback(device_t &device, upd7220_draw_text_delegate callback) { downcast<upd7220_device &>(device).m_draw_text_cb = callback; }
diff --git a/src/devices/video/upd7227.cpp b/src/devices/video/upd7227.cpp
index 3d36e9652af..99800496a28 100644
--- a/src/devices/video/upd7227.cpp
+++ b/src/devices/video/upd7227.cpp
@@ -41,7 +41,7 @@ ADDRESS_MAP_END
// upd7227_device - constructor
//-------------------------------------------------
-upd7227_device::upd7227_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+upd7227_device::upd7227_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, UPD7227, "uPD7227", tag, owner, clock, "upd7227", __FILE__),
device_memory_interface(mconfig, *this),
m_space_config("videoram", ENDIANNESS_BIG, 8, 7, 0, *ADDRESS_MAP_NAME(upd7227_map)),
diff --git a/src/devices/video/upd7227.h b/src/devices/video/upd7227.h
index 6889b3f72ae..681f63a7c17 100644
--- a/src/devices/video/upd7227.h
+++ b/src/devices/video/upd7227.h
@@ -36,7 +36,7 @@ class upd7227_device : public device_t,
{
public:
// construction/destruction
- upd7227_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ upd7227_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// inline configuration helpers
static void static_set_offsets(device_t &device, int sx, int sy);
diff --git a/src/devices/video/v9938.cpp b/src/devices/video/v9938.cpp
index 1ef39a39279..38adc1e58aa 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, const char *name, const char *shortname, std::string tag, device_t *owner, UINT32 clock)
+v99x8_device::v99x8_device(const machine_config &mconfig, device_type type, const char *name, const char *shortname, const char *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),
@@ -122,13 +122,13 @@ v99x8_device::v99x8_device(const machine_config &mconfig, device_type type, cons
static_set_addrmap(*this, AS_DATA, ADDRESS_MAP_NAME(memmap));
}
-v9938_device::v9938_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+v9938_device::v9938_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: v99x8_device(mconfig, V9938, "V9938 VDP", "v9938", tag, owner, clock)
{
m_model = MODEL_V9938;
}
-v9958_device::v9958_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+v9958_device::v9958_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: v99x8_device(mconfig, V9938, "V9958 VDP", "v9958", tag, owner, clock)
{
m_model = MODEL_V9958;
diff --git a/src/devices/video/v9938.h b/src/devices/video/v9938.h
index 583df876df5..c2f9d356666 100644
--- a/src/devices/video/v9938.h
+++ b/src/devices/video/v9938.h
@@ -76,7 +76,7 @@ class v99x8_device : public device_t,
{
protected:
// construction/destruction
- v99x8_device(const machine_config &mconfig, device_type type, const char *name, const char *shortname, std::string tag, device_t *owner, UINT32 clock);
+ v99x8_device(const machine_config &mconfig, device_type type, const char *name, const char *shortname, const char *tag, device_t *owner, UINT32 clock);
public:
template<class _irq> void set_interrupt_callback(_irq irq) {
@@ -277,7 +277,7 @@ protected:
class v9938_device : public v99x8_device
{
public:
- v9938_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ v9938_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_PALETTE_INIT(v9938);
protected:
@@ -287,7 +287,7 @@ protected:
class v9958_device : public v99x8_device
{
public:
- v9958_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ v9958_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_PALETTE_INIT(v9958);
diff --git a/src/devices/video/vic4567.cpp b/src/devices/video/vic4567.cpp
index 3d911940860..8df490408f8 100644
--- a/src/devices/video/vic4567.cpp
+++ b/src/devices/video/vic4567.cpp
@@ -144,7 +144,7 @@
const device_type VIC3 = &device_creator<vic3_device>;
-vic3_device::vic3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+vic3_device::vic3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, VIC3, "4567 VIC III", tag, owner, clock, "vic3", __FILE__),
device_video_interface(mconfig, *this),
m_type(VIC4567_NTSC),
diff --git a/src/devices/video/vic4567.h b/src/devices/video/vic4567.h
index 23f7f680e47..b4b179d43d5 100644
--- a/src/devices/video/vic4567.h
+++ b/src/devices/video/vic4567.h
@@ -124,10 +124,10 @@ class vic3_device : public device_t,
public device_video_interface
{
public:
- vic3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ vic3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~vic3_device() {}
- static void static_set_cpu_tag(device_t &device, std::string tag) { downcast<vic3_device &>(device).m_cpu.set_tag(tag); }
+ static void static_set_cpu_tag(device_t &device, const char *tag) { downcast<vic3_device &>(device).m_cpu.set_tag(tag); }
static void set_vic3_type(device_t &device, vic3_type type) { downcast<vic3_device &>(device).m_type = type; }
template<class _Object> static devcb_base &set_dma_read_callback(device_t &device, _Object object) { return downcast<vic3_device &>(device).m_dma_read_cb.set_callback(object); }
template<class _Object> static devcb_base &set_dma_read_color_callback(device_t &device, _Object object) { return downcast<vic3_device &>(device).m_dma_read_color_cb.set_callback(object); }
diff --git a/src/devices/video/voodoo.cpp b/src/devices/video/voodoo.cpp
index 060ab9736cc..07a3c06f815 100644
--- a/src/devices/video/voodoo.cpp
+++ b/src/devices/video/voodoo.cpp
@@ -5021,8 +5021,8 @@ void voodoo_device::common_start_voodoo(UINT8 type)
int val;
/* validate configuration */
- assert(!m_screen.empty());
- assert(!m_cputag.empty());
+ assert(m_screen != nullptr);
+ assert(m_cputag != nullptr);
assert(m_fbmem > 0);
/* store a pointer back to the device */
@@ -5831,11 +5831,13 @@ static void dump_rasterizer_stats(voodoo_state *v)
}
}
-voodoo_device::voodoo_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+voodoo_device::voodoo_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_fbmem(0),
m_tmumem0(0),
m_tmumem1(0),
+ m_screen(nullptr),
+ m_cputag(nullptr),
m_vblank(*this),
m_stall(*this)
{
@@ -5883,7 +5885,7 @@ void voodoo_device::device_stop()
const device_type VOODOO_1 = &device_creator<voodoo_1_device>;
-voodoo_1_device::voodoo_1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+voodoo_1_device::voodoo_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: voodoo_device(mconfig, VOODOO_1, "3dfx Voodoo Graphics", tag, owner, clock, "voodoo_1", __FILE__)
{
}
@@ -5900,7 +5902,7 @@ void voodoo_1_device::device_start()
const device_type VOODOO_2 = &device_creator<voodoo_2_device>;
-voodoo_2_device::voodoo_2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+voodoo_2_device::voodoo_2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: voodoo_device(mconfig, VOODOO_2, "3dfx Voodoo 2", tag, owner, clock, "voodoo_2", __FILE__)
{
}
@@ -5917,12 +5919,12 @@ void voodoo_2_device::device_start()
const device_type VOODOO_BANSHEE = &device_creator<voodoo_banshee_device>;
-voodoo_banshee_device::voodoo_banshee_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+voodoo_banshee_device::voodoo_banshee_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: voodoo_device(mconfig, VOODOO_BANSHEE, "3dfx Voodoo Banshee", tag, owner, clock, "voodoo_banshee", __FILE__)
{
}
-voodoo_banshee_device::voodoo_banshee_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+voodoo_banshee_device::voodoo_banshee_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: voodoo_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
@@ -5939,7 +5941,7 @@ void voodoo_banshee_device::device_start()
const device_type VOODOO_3 = &device_creator<voodoo_3_device>;
-voodoo_3_device::voodoo_3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+voodoo_3_device::voodoo_3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: voodoo_banshee_device(mconfig, VOODOO_3, "3dfx Voodoo 3", tag, owner, clock, "voodoo_3", __FILE__)
{
}
diff --git a/src/devices/video/voodoo.h b/src/devices/video/voodoo.h
index 9a61385046d..3d92f17f86a 100644
--- a/src/devices/video/voodoo.h
+++ b/src/devices/video/voodoo.h
@@ -71,14 +71,14 @@ void voodoo_set_init_enable(device_t *device, UINT32 newval);
class voodoo_device : public device_t
{
public:
- voodoo_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ voodoo_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~voodoo_device();
static void static_set_fbmem(device_t &device, int value) { downcast<voodoo_device &>(device).m_fbmem = value; }
static void static_set_tmumem(device_t &device, int value1, int value2) { downcast<voodoo_device &>(device).m_tmumem0 = value1; downcast<voodoo_device &>(device).m_tmumem1 = value2; }
- static void static_set_screen_tag(device_t &device, std::string tag) { downcast<voodoo_device &>(device).m_screen = tag; }
- static void static_set_cpu_tag(device_t &device, std::string tag) { downcast<voodoo_device &>(device).m_cputag = tag; }
+ static void static_set_screen_tag(device_t &device, const char *tag) { downcast<voodoo_device &>(device).m_screen = tag; }
+ static void static_set_cpu_tag(device_t &device, const char *tag) { downcast<voodoo_device &>(device).m_cputag = tag; }
template<class _Object> static devcb_base &static_set_vblank_callback(device_t &device, _Object object) { return downcast<voodoo_device &>(device).m_vblank.set_callback(object); }
template<class _Object> static devcb_base &static_set_stall_callback(device_t &device, _Object object) { return downcast<voodoo_device &>(device).m_stall.set_callback(object); }
@@ -92,8 +92,8 @@ public:
UINT8 m_fbmem;
UINT8 m_tmumem0;
UINT8 m_tmumem1;
- std::string m_screen;
- std::string m_cputag;
+ const char * m_screen;
+ const char * m_cputag;
devcb_write_line m_vblank;
devcb_write_line m_stall;
@@ -110,7 +110,7 @@ private:
class voodoo_1_device : public voodoo_device
{
public:
- voodoo_1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ voodoo_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
virtual void device_start() override;
@@ -121,7 +121,7 @@ extern const device_type VOODOO_1;
class voodoo_2_device : public voodoo_device
{
public:
- voodoo_2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ voodoo_2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
virtual void device_start() override;
@@ -132,8 +132,8 @@ extern const device_type VOODOO_2;
class voodoo_banshee_device : public voodoo_device
{
public:
- voodoo_banshee_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- voodoo_banshee_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ voodoo_banshee_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ voodoo_banshee_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
DECLARE_READ32_MEMBER( banshee_r );
DECLARE_WRITE32_MEMBER( banshee_w );
@@ -157,7 +157,7 @@ extern const device_type VOODOO_BANSHEE;
class voodoo_3_device : public voodoo_banshee_device
{
public:
- voodoo_3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ voodoo_3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/video/voodoo_pci.cpp b/src/devices/video/voodoo_pci.cpp
index 2f292af5d49..7570a007efb 100644
--- a/src/devices/video/voodoo_pci.cpp
+++ b/src/devices/video/voodoo_pci.cpp
@@ -71,13 +71,13 @@ DEVICE_ADDRESS_MAP_START(io_map, 32, voodoo_pci_device)
AM_RANGE(0x000, 0x0ff) AM_DEVREADWRITE("voodoo", voodoo_banshee_device, banshee_io_r, banshee_io_w)
ADDRESS_MAP_END
-voodoo_pci_device::voodoo_pci_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+voodoo_pci_device::voodoo_pci_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, VOODOO_PCI, "Voodoo PCI", tag, owner, clock, "voodoo_pci", __FILE__),
m_voodoo(*this, "voodoo"), m_fbmem(2), m_tmumem0(0), m_tmumem1(0)
{
}
-void voodoo_pci_device::set_cpu_tag(std::string _cpu_tag)
+void voodoo_pci_device::set_cpu_tag(const char *_cpu_tag)
{
m_cpu_tag = _cpu_tag;
}
@@ -122,7 +122,7 @@ void voodoo_pci_device::device_reset()
void voodoo_pci_device::map_extra(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)
{
- logerror("%s: map_extra\n", this->tag().c_str());
+ logerror("%s: map_extra\n", this->tag());
// Really awkward way of getting vga address space mapped
// Should really be dependent on voodoo VGAINIT0 bit 8 and IO base + 0xc3 bit 0
if (1) {
@@ -146,7 +146,7 @@ void voodoo_pci_device::map_extra(UINT64 memory_window_start, UINT64 memory_wind
start = (start & 0xFFFF0000) + 0x300;
UINT64 end = (start & 0xFFFF0000) + 0x3ef;
space->install_device_delegate(start, end, *this, bi.map);
- logerror("%s: map %s at %0*x-%0*x\n", this->tag().c_str(), bi.map.name(), bi.flags & M_IO ? 4 : 8, UINT32(start), bi.flags & M_IO ? 4 : 8, UINT32(end));
+ logerror("%s: map %s at %0*x-%0*x\n", this->tag(), bi.map.name(), bi.flags & M_IO ? 4 : 8, UINT32(start), bi.flags & M_IO ? 4 : 8, UINT32(end));
}
}
diff --git a/src/devices/video/voodoo_pci.h b/src/devices/video/voodoo_pci.h
index d7047b84873..93621cd0fa6 100644
--- a/src/devices/video/voodoo_pci.h
+++ b/src/devices/video/voodoo_pci.h
@@ -21,7 +21,7 @@
class voodoo_pci_device : public pci_device {
public:
- voodoo_pci_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ voodoo_pci_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual void map_extra(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) override;
// optional information overrides
@@ -29,7 +29,7 @@ public:
UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
virtual DECLARE_ADDRESS_MAP(config_map, 32) override;
- void set_cpu_tag(std::string tag);
+ void set_cpu_tag(const char *tag);
static void set_type(const int type) {m_type = type;}
void set_fbmem(const int fbmem) {m_fbmem = fbmem;}
void set_tmumem(const int tmumem0, const int tmumem1) {m_tmumem0 = tmumem0; m_tmumem1 = tmumem1;}
@@ -45,7 +45,7 @@ private:
required_device<voodoo_device> m_voodoo;
static int m_type;
int m_fbmem, m_tmumem0, m_tmumem1;
- std::string m_cpu_tag;
+ const char *m_cpu_tag;
UINT32 m_pcictrl_reg[0x10];
DECLARE_ADDRESS_MAP(voodoo_reg_map, 32);