diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2016-01-20 21:35:11 +0100 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2016-01-20 21:35:11 +0100 |
commit | 7c9cd3feea638281df93381c5a7a871d79a7ba17 (patch) | |
tree | 1a857a2593c63a7ab3dee7eb248577701780f2e0 /src/devices/video | |
parent | 8193c47c1925d937acc80f043ea9eadac39fd791 (diff) |
Revert "rest of device parameters to std::string (nw)"
This reverts commit caba131d844ade3f2b30d6be24ea6cf46b2949d7.
Diffstat (limited to 'src/devices/video')
37 files changed, 78 insertions, 78 deletions
diff --git a/src/devices/video/315_5124.cpp b/src/devices/video/315_5124.cpp index e1cf7676201..90f3eae1fa1 100644 --- a/src/devices/video/315_5124.cpp +++ b/src/devices/video/315_5124.cpp @@ -176,7 +176,7 @@ sega315_5124_device::sega315_5124_device(const machine_config &mconfig, std::str } -sega315_5124_device::sega315_5124_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT8 cram_size, UINT8 palette_offset, bool supports_224_240, std::string shortname, std::string source) +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) : device_t( mconfig, type, name, tag, owner, clock, shortname, source) , device_memory_interface(mconfig, *this) , device_video_interface(mconfig, *this) diff --git a/src/devices/video/315_5124.h b/src/devices/video/315_5124.h index b5875c6e5ec..8d54f34a2e4 100644 --- a/src/devices/video/315_5124.h +++ b/src/devices/video/315_5124.h @@ -61,7 +61,7 @@ class sega315_5124_device : public device_t, public: // construction/destruction sega315_5124_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - sega315_5124_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT8 cram_size, UINT8 palette_offset, bool supports_224_240, std::string shortname, std::string source); + 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); static void set_signal_type(device_t &device, bool is_pal) { downcast<sega315_5124_device &>(device).m_is_pal = is_pal; } diff --git a/src/devices/video/clgd542x.cpp b/src/devices/video/clgd542x.cpp index f3b0bfd3347..89a356148af 100644 --- a/src/devices/video/clgd542x.cpp +++ b/src/devices/video/clgd542x.cpp @@ -46,7 +46,7 @@ cirrus_gd5428_device::cirrus_gd5428_device(const machine_config &mconfig, std::s { } -cirrus_gd5428_device::cirrus_gd5428_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) +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) : svga_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/video/clgd542x.h b/src/devices/video/clgd542x.h index 07267d22e3c..03ebe0d206a 100644 --- a/src/devices/video/clgd542x.h +++ b/src/devices/video/clgd542x.h @@ -17,7 +17,7 @@ class cirrus_gd5428_device : public svga_device public: // construction/destruction cirrus_gd5428_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - cirrus_gd5428_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); + 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); virtual READ8_MEMBER(port_03c0_r) override; virtual WRITE8_MEMBER(port_03c0_w) override; virtual READ8_MEMBER(port_03b0_r) override; diff --git a/src/devices/video/dl1416.cpp b/src/devices/video/dl1416.cpp index 8edeacd3669..722ced731fe 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) +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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_write_enable(FALSE), m_chip_enable(FALSE), diff --git a/src/devices/video/dl1416.h b/src/devices/video/dl1416.h index e4464f219f9..00cb4e4f574 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); + 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() {} template<class _Object> static devcb_base &set_update_handler(device_t &device, _Object object) { return downcast<dl1416_device &>(device).m_update.set_callback(object); } diff --git a/src/devices/video/fixfreq.cpp b/src/devices/video/fixfreq.cpp index d95eb1d225a..cfb46649a93 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) +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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this, false), m_htotal(0), m_vtotal(0), m_vid(0), m_last_x(0), m_last_y(0), m_cur_bm(0), // default to NTSC "704x480@30i" diff --git a/src/devices/video/fixfreq.h b/src/devices/video/fixfreq.h index 25582401100..fb7b6ae3ec9 100644 --- a/src/devices/video/fixfreq.h +++ b/src/devices/video/fixfreq.h @@ -72,7 +72,7 @@ class fixedfreq_device : public device_t, public: // construction/destruction fixedfreq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - fixedfreq_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); + 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); // 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/hd44780.cpp b/src/devices/video/hd44780.cpp index 92629219499..765270f1a5e 100644 --- a/src/devices/video/hd44780.cpp +++ b/src/devices/video/hd44780.cpp @@ -52,7 +52,7 @@ hd44780_device::hd44780_device(const machine_config &mconfig, std::string tag, d set_charset_type(CHARSET_HD44780_A00); } -hd44780_device::hd44780_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : +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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_pixel_update_func(nullptr) { diff --git a/src/devices/video/hd44780.h b/src/devices/video/hd44780.h index 23cd681ae96..81191315e41 100644 --- a/src/devices/video/hd44780.h +++ b/src/devices/video/hd44780.h @@ -39,7 +39,7 @@ class hd44780_device : public device_t public: // construction/destruction hd44780_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - hd44780_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); + 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); // 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; } diff --git a/src/devices/video/i8244.cpp b/src/devices/video/i8244.cpp index 060644e2983..ab44e6f197a 100644 --- a/src/devices/video/i8244.cpp +++ b/src/devices/video/i8244.cpp @@ -114,7 +114,7 @@ i8244_device::i8244_device(const machine_config &mconfig, std::string tag, devic } -i8244_device::i8244_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, int lines, std::string shortname, std::string source) +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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) , device_sound_interface(mconfig, *this) , device_video_interface(mconfig, *this) diff --git a/src/devices/video/i8244.h b/src/devices/video/i8244.h index 1c1ce4734fc..cb3cbaff7ca 100644 --- a/src/devices/video/i8244.h +++ b/src/devices/video/i8244.h @@ -81,7 +81,7 @@ class i8244_device : public device_t public: // construction/destruction i8244_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - i8244_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, int lines, std::string shortname, std::string source); + 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); // static configuration helpers static void set_screen_tag(device_t &device, const char *screen_tag) { downcast<i8244_device &>(device).m_screen_tag = screen_tag; } diff --git a/src/devices/video/i82730.cpp b/src/devices/video/i82730.cpp index 7e9fbeacde3..1450abc9112 100644 --- a/src/devices/video/i82730.cpp +++ b/src/devices/video/i82730.cpp @@ -232,13 +232,13 @@ void i82730_device::mode_set() // output some debug info if (VERBOSE) { - logerror("%s('%s'): ---- setting mode ----\n", shortname().c_str(), basetag().c_str()); - logerror("%s('%s'): dma burst length %02x, space %02x\n", shortname().c_str(), basetag().c_str(), m_dma_burst_length, m_dma_burst_space); - logerror("%s('%s'): margin %02x, lpr %02x\n", shortname().c_str(), basetag().c_str(), m_margin, m_lpr); + logerror("%s('%s'): ---- setting mode ----\n", shortname(), basetag()); + logerror("%s('%s'): dma burst length %02x, space %02x\n", shortname(), basetag(), m_dma_burst_length, m_dma_burst_space); + logerror("%s('%s'): margin %02x, lpr %02x\n", shortname(), basetag(), m_margin, m_lpr); logerror("%s('%s'): hsyncstp: %02x, line_length: %02x, hfldstrt: %02x, hbrdstart: %02x, hfldstop: %02x, hbrdstop: %02x\n", - shortname().c_str(), basetag().c_str(), hsyncstp, line_length, m_hfldstrt, hbrdstrt, hfldstp, hbrdstp); + shortname(), basetag(), hsyncstp, line_length, m_hfldstrt, hbrdstrt, hfldstp, hbrdstp); logerror("%s('%s'): frame_length %04x, vsyncstp: %04x, vfldstrt: %04x, vfldstp: %04x\n", - shortname().c_str(), basetag().c_str(), frame_length, m_vsyncstp, m_vfldstrt, m_vfldstp); + shortname(), basetag(), frame_length, m_vsyncstp, m_vfldstrt, m_vfldstp); } } @@ -248,7 +248,7 @@ void i82730_device::execute_command() UINT16 tmp; if (VERBOSE_COMMANDS && command < ARRAY_LENGTH(m_command_names)) - logerror("%s('%s'): executing command: %s [cbp = %08x]\n", shortname().c_str(), basetag().c_str(), m_command_names[command], m_cbp); + logerror("%s('%s'): executing command: %s [cbp = %08x]\n", shortname(), basetag(), m_command_names[command], m_cbp); tmp = read_word(m_cbp + 2); m_list_switch = BIT(tmp, 6); @@ -295,12 +295,12 @@ void i82730_device::execute_command() case 0x06: m_intmask = read_word(m_cbp + 22); if (VERBOSE_COMMANDS) - logerror("%s('%s'): intmask now %04x\n", shortname().c_str(), basetag().c_str(), m_intmask); + logerror("%s('%s'): intmask now %04x\n", shortname(), basetag(), m_intmask); break; // LPEN ENABLE case 0x07: - fatalerror("%s('%s'): Unimplemented command %s\n", shortname().c_str(), basetag().c_str(), m_command_names[command]); + fatalerror("%s('%s'): Unimplemented command %s\n", shortname(), basetag(), m_command_names[command]); break; // READ STATUS @@ -311,22 +311,22 @@ void i82730_device::execute_command() // LD CUR POS case 0x09: - fatalerror("%s('%s'): Unimplemented command %s\n", shortname().c_str(), basetag().c_str(), m_command_names[command]); + fatalerror("%s('%s'): Unimplemented command %s\n", shortname(), basetag(), m_command_names[command]); break; // SELF TEST case 0x0a: - fatalerror("%s('%s'): Unimplemented command %s\n", shortname().c_str(), basetag().c_str(), m_command_names[command]); + fatalerror("%s('%s'): Unimplemented command %s\n", shortname(), basetag(), m_command_names[command]); break; // TEST ROW BUFFER case 0x0b: - fatalerror("%s('%s'): Unimplemented command %s\n", shortname().c_str(), basetag().c_str(), m_command_names[command]); + fatalerror("%s('%s'): Unimplemented command %s\n", shortname(), basetag(), m_command_names[command]); break; default: if (VERBOSE_COMMANDS) - logerror("%s('%s'): executing command: (reserved) [cbp = %08x]\n", shortname().c_str(), basetag().c_str(), m_cbp); + logerror("%s('%s'): executing command: (reserved) [cbp = %08x]\n", shortname(), basetag(), m_cbp); m_status |= RCC; update_interrupts(); break; @@ -356,12 +356,12 @@ void i82730_device::load_row() m_sptr += 2; if (VERBOSE_DATASTREAM) - logerror("%s('%s'): SET FIELD ATTRIB to %04x\n", shortname().c_str(), basetag().c_str(), m_field_attribute_mask); + logerror("%s('%s'): SET FIELD ATTRIB to %04x\n", shortname(), basetag(), m_field_attribute_mask); break; default: - fatalerror("%s('%s'): Unimplemented datastream command %02x\n", shortname().c_str(), basetag().c_str(), data >> 8); + fatalerror("%s('%s'): Unimplemented datastream command %02x\n", shortname(), basetag(), data >> 8); } } else @@ -468,7 +468,7 @@ TIMER_CALLBACK_MEMBER( i82730_device::row_update ) WRITE_LINE_MEMBER( i82730_device::ca_w ) { if (VERBOSE) - logerror("%s('%s'): ca_w %d\n", shortname().c_str(), basetag().c_str(), state); + logerror("%s('%s'): ca_w %d\n", shortname(), basetag(), state); // falling edge if (m_ca == 1 && state == 0) @@ -493,10 +493,10 @@ WRITE_LINE_MEMBER( i82730_device::ca_w ) // output some debug info if (VERBOSE) { - logerror("%s('%s'): ---- initializing ----\n", shortname().c_str(), basetag().c_str()); - logerror("%s('%s'): %s system bus\n", shortname().c_str(), basetag().c_str(), sysbus_16bit() ? "16-bit" : "8-bit"); - logerror("%s('%s'): intermediate block pointer: %08x\n", shortname().c_str(), basetag().c_str(), m_ibp); - logerror("%s('%s'): addrbus: %s, clno: %d, clpos: %d, mode: %s, dtw16: %s, srdy: %s\n", shortname().c_str(), basetag().c_str(), + logerror("%s('%s'): ---- initializing ----\n", shortname(), basetag()); + logerror("%s('%s'): %s system bus\n", shortname(), basetag(), sysbus_16bit() ? "16-bit" : "8-bit"); + logerror("%s('%s'): intermediate block pointer: %08x\n", shortname(), basetag(), m_ibp); + logerror("%s('%s'): addrbus: %s, clno: %d, clpos: %d, mode: %s, dtw16: %s, srdy: %s\n", shortname(), basetag(), BIT(scb, 0) ? "32-bit" : "16-bit", (scb >> 1) & 0x03, (scb >> 3) & 0x03, BIT(scb, 5) ? "master" : "slave", BIT(scb, 6) ? "16-bit" : "8-bit", BIT(scb, 7) ? "synchronous" : "asynchronous"); } @@ -515,7 +515,7 @@ WRITE_LINE_MEMBER( i82730_device::ca_w ) WRITE_LINE_MEMBER( i82730_device::irst_w ) { if (VERBOSE) - logerror("%s('%s'): irst_w %d\n", shortname().c_str(), basetag().c_str(), state); + logerror("%s('%s'): irst_w %d\n", shortname(), basetag(), state); m_sint_handler(0); } diff --git a/src/devices/video/mc6845.cpp b/src/devices/video/mc6845.cpp index 8970b236616..ac0f8de8046 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) +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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this, false), m_show_border_area(true), @@ -1454,7 +1454,7 @@ ams40489_device::ams40489_device(const machine_config &mconfig, std::string tag, } -mos8563_device::mos8563_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) +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) : mc6845_device(mconfig, type, name, tag, owner, clock, shortname, source), device_memory_interface(mconfig, *this), m_videoram_space_config("videoram", ENDIANNESS_LITTLE, 8, 16, 0, nullptr, *ADDRESS_MAP_NAME(mos8563_videoram_map)), diff --git a/src/devices/video/mc6845.h b/src/devices/video/mc6845.h index 6d27e079c32..8eb450a4957 100644 --- a/src/devices/video/mc6845.h +++ b/src/devices/video/mc6845.h @@ -100,7 +100,7 @@ class mc6845_device : public device_t, public: // construction/destruction mc6845_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - mc6845_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); + 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); 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) @@ -430,7 +430,7 @@ class mos8563_device : public mc6845_device, public device_memory_interface { public: - mos8563_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); + mos8563_device(const machine_config &mconfig, 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); virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; diff --git a/src/devices/video/mc6847.cpp b/src/devices/video/mc6847.cpp index 816f1c3d4a9..5297a549ef1 100644 --- a/src/devices/video/mc6847.cpp +++ b/src/devices/video/mc6847.cpp @@ -129,8 +129,8 @@ const UINT32 mc6847_base_device::s_palette[mc6847_base_device::PALETTE_LENGTH] = // ctor //------------------------------------------------- -mc6847_friend_device::mc6847_friend_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, - const UINT8 *fontdata, bool is_mc6847t1, double tpfs, int field_sync_falling_edge_scanline, bool supports_partial_body_scanlines, std::string shortname, std::string source) +mc6847_friend_device::mc6847_friend_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, + const UINT8 *fontdata, bool is_mc6847t1, double tpfs, int field_sync_falling_edge_scanline, bool supports_partial_body_scanlines, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_write_hsync(*this), m_write_fsync(*this), @@ -546,7 +546,7 @@ const char *mc6847_friend_device::describe_context(void) // ctor //------------------------------------------------- -mc6847_base_device::mc6847_base_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, const UINT8 *fontdata, double tpfs, std::string shortname, std::string source) : +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_friend_device(mconfig, type, name, tag, owner, clock, fontdata, (type == MC6847T1_NTSC) || (type == MC6847T1_PAL), tpfs, 25+191, true, shortname, source), m_input_cb(*this), m_black_and_white(false), diff --git a/src/devices/video/mc6847.h b/src/devices/video/mc6847.h index 8ccd509bb55..46489296677 100644 --- a/src/devices/video/mc6847.h +++ b/src/devices/video/mc6847.h @@ -90,8 +90,8 @@ public: static void set_get_char_rom(device_t &device, mc6847_get_char_rom_delegate callback) { downcast<mc6847_friend_device &>(device).m_charrom_cb = callback; } protected: - mc6847_friend_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, - const UINT8 *fontdata, bool is_mc6847t1, double tpfs, int field_sync_falling_edge_scanline, bool supports_partial_body_scanlines, std::string shortname, std::string source); + mc6847_friend_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, + const UINT8 *fontdata, bool is_mc6847t1, double tpfs, int field_sync_falling_edge_scanline, bool supports_partial_body_scanlines, const char *shortname, const char *source); // video mode constants static const UINT8 MODE_AG = 0x80; @@ -537,7 +537,7 @@ public: DECLARE_WRITE_LINE_MEMBER( inv_w ) { change_mode(MODE_INV, state); } protected: - mc6847_base_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, const UINT8 *fontdata, double tpfs, std::string shortname, std::string source); + 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); // device-level overrides virtual void device_start() override; diff --git a/src/devices/video/mos6566.cpp b/src/devices/video/mos6566.cpp index e9a8dbd8fd2..bc98816dd20 100644 --- a/src/devices/video/mos6566.cpp +++ b/src/devices/video/mos6566.cpp @@ -595,7 +595,7 @@ mos6566_device::mos6566_device(const machine_config &mconfig, std::string tag, d { } -mos6566_device::mos6566_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source) +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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_memory_interface(mconfig, *this), device_video_interface(mconfig, *this), @@ -618,7 +618,7 @@ mos6566_device::mos6566_device(const machine_config &mconfig, device_type type, mos6567_device::mos6567_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :mos6566_device(mconfig, MOS6567, "MOS6567", tag, owner, clock, TYPE_6567, "mos6567", __FILE__) { } -mos6567_device::mos6567_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source) +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) :mos6566_device(mconfig, type, name, tag, owner, clock, variant, shortname, source) { } mos8562_device::mos8562_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) @@ -630,7 +630,7 @@ mos8564_device::mos8564_device(const machine_config &mconfig, std::string tag, d mos6569_device::mos6569_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :mos6566_device(mconfig, MOS6566, "MOS6569", tag, owner, clock, TYPE_6569, "mos6569", __FILE__) { } -mos6569_device::mos6569_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source) +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) :mos6566_device(mconfig, type, name, tag, owner, clock, variant, shortname, source) { } mos8565_device::mos8565_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) diff --git a/src/devices/video/mos6566.h b/src/devices/video/mos6566.h index 273476ccae2..c6d7f68eb95 100644 --- a/src/devices/video/mos6566.h +++ b/src/devices/video/mos6566.h @@ -211,7 +211,7 @@ class mos6566_device : public device_t, { public: // construction/destruction - mos6566_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source); + mos6566_device(const machine_config &mconfig, 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); static void static_set_cpu_tag(device_t &device, std::string tag) { downcast<mos6566_device &>(device).m_cpu.set_tag(tag); } @@ -375,7 +375,7 @@ class mos6567_device : public mos6566_device public: // construction/destruction mos6567_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - mos6567_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source); + 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); }; @@ -410,7 +410,7 @@ class mos6569_device : public mos6566_device public: // construction/destruction mos6569_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - mos6569_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source); + 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); // device-level overrides virtual void execute_run() override; diff --git a/src/devices/video/msm6222b.cpp b/src/devices/video/msm6222b.cpp index ad50e57ee2c..eb73cae37a4 100644 --- a/src/devices/video/msm6222b.cpp +++ b/src/devices/video/msm6222b.cpp @@ -21,7 +21,7 @@ ROM_START( msm6222b_01 ) ROM_LOAD( "msm6222b-01.bin", 0x0000, 0x1000, CRC(8ffa8521) SHA1(e108b520e6d20459a7bbd5958bbfa1d551a690bd) ) ROM_END -msm6222b_device::msm6222b_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : +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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), cursor_direction(false), cursor_blinking(false), two_line(false), shift_on_write(false), double_height(false), cursor_on(false), display_on(false), adc(0), shift(0), cgrom(nullptr) { } diff --git a/src/devices/video/msm6222b.h b/src/devices/video/msm6222b.h index f5c42a83caf..cc83e0727f0 100644 --- a/src/devices/video/msm6222b.h +++ b/src/devices/video/msm6222b.h @@ -22,7 +22,7 @@ class msm6222b_device : public device_t { public: msm6222b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - msm6222b_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); + 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); void control_w(UINT8 data); UINT8 control_r(); diff --git a/src/devices/video/pc_vga.cpp b/src/devices/video/pc_vga.cpp index 043164a1ff6..3046612e10a 100644 --- a/src/devices/video/pc_vga.cpp +++ b/src/devices/video/pc_vga.cpp @@ -125,7 +125,7 @@ const device_type ATI_VGA = &device_creator<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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) +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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_palette(*this, "^palette"), m_screen(*this,"^screen") @@ -139,7 +139,7 @@ vga_device::vga_device(const machine_config &mconfig, std::string tag, device_t { } -svga_device::svga_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) +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) : vga_device(mconfig, type, name, tag, owner, clock, shortname, source) { } @@ -154,7 +154,7 @@ s3_vga_device::s3_vga_device(const machine_config &mconfig, std::string tag, dev { } -s3_vga_device::s3_vga_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) +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) : ati_vga_device(mconfig, type, name, tag, owner, clock, shortname, source) { } @@ -169,7 +169,7 @@ ati_vga_device::ati_vga_device(const machine_config &mconfig, std::string tag, d { } -ati_vga_device::ati_vga_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) +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) : svga_device(mconfig, type, name, tag, owner, clock, shortname, source) { } @@ -179,12 +179,12 @@ ibm8514a_device::ibm8514a_device(const machine_config &mconfig, std::string tag, { } -ibm8514a_device::ibm8514a_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) +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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) { } -mach8_device::mach8_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) +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) : ibm8514a_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/video/pc_vga.h b/src/devices/video/pc_vga.h index 5b674a009df..750180ffea3 100644 --- a/src/devices/video/pc_vga.h +++ b/src/devices/video/pc_vga.h @@ -40,7 +40,7 @@ class vga_device : public device_t public: // construction/destruction vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - vga_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); + vga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); virtual 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); + 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); virtual void zero() override; virtual UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override; @@ -272,7 +272,7 @@ protected: class ibm8514a_device : public device_t { public: - ibm8514a_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); + 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); void set_vga(std::string tag) { m_vga_tag.assign(tag); } @@ -411,7 +411,7 @@ extern const device_type IBM8514A; class mach8_device : public ibm8514a_device { public: - mach8_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); + 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); READ16_MEMBER(mach8_ec0_r); @@ -516,7 +516,7 @@ class ati_vga_device : public svga_device public: // construction/destruction ati_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - ati_vga_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); + 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); virtual READ8_MEMBER(mem_r) override; virtual WRITE8_MEMBER(mem_w) override; @@ -554,7 +554,7 @@ class s3_vga_device : public ati_vga_device public: // construction/destruction s3_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - s3_vga_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); + 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); virtual READ8_MEMBER(port_03b0_r) override; virtual WRITE8_MEMBER(port_03b0_w) override; diff --git a/src/devices/video/psx.cpp b/src/devices/video/psx.cpp index 4d621ccc830..ae780ec8237 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : +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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_vblank_handler(*this) #if DEBUG_VIEWER diff --git a/src/devices/video/psx.h b/src/devices/video/psx.h index 6b0dde4c6a6..a19138bb509 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); + 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); virtual machine_config_constructor device_mconfig_additions() const override; // static configuration helpers diff --git a/src/devices/video/saa5050.cpp b/src/devices/video/saa5050.cpp index 719a1dd23d2..40d87bdb656 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : +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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_char_rom(*this, "chargen"), m_read_d(*this), diff --git a/src/devices/video/saa5050.h b/src/devices/video/saa5050.h index eeec8031fad..bda63c98a8d 100644 --- a/src/devices/video/saa5050.h +++ b/src/devices/video/saa5050.h @@ -55,7 +55,7 @@ class saa5050_device : public device_t { public: // construction/destruction - saa5050_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); + 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); 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; } diff --git a/src/devices/video/sed1200.cpp b/src/devices/video/sed1200.cpp index 15d99c019fd..94706dccde6 100644 --- a/src/devices/video/sed1200.cpp +++ b/src/devices/video/sed1200.cpp @@ -31,7 +31,7 @@ ROM_START( sed1200x0b ) ROM_LOAD( "sed1200-b.bin", 0x000, 0x800, CRC(d0741f51) SHA1(c8c856f1357286a2c8c806af81724a828345357e)) ROM_END -sed1200_device::sed1200_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : +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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), cursor_direction(false), cursor_blinking(false), cursor_full(false), cursor_on(false), display_on(false), cursor_address(0), cgram_address(0), cgrom(nullptr) { } diff --git a/src/devices/video/sed1200.h b/src/devices/video/sed1200.h index 440347d7209..fe647b6e9e6 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); + 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); void control_w(UINT8 data); UINT8 control_r(); diff --git a/src/devices/video/tms9927.cpp b/src/devices/video/tms9927.cpp index 02e9edb98da..e75594d13e7 100644 --- a/src/devices/video/tms9927.cpp +++ b/src/devices/video/tms9927.cpp @@ -44,7 +44,7 @@ tms9927_device::tms9927_device(const machine_config &mconfig, std::string tag, d memset(m_reg, 0x00, sizeof(m_reg)); } -tms9927_device::tms9927_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) +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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), m_write_vsyn(*this), diff --git a/src/devices/video/tms9927.h b/src/devices/video/tms9927.h index 0478d91adb9..4ed6f2f236c 100644 --- a/src/devices/video/tms9927.h +++ b/src/devices/video/tms9927.h @@ -25,7 +25,7 @@ class tms9927_device : public device_t, { public: tms9927_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - tms9927_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); + 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() {} 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); } diff --git a/src/devices/video/tms9928a.cpp b/src/devices/video/tms9928a.cpp index b33b2231a77..a5c77b83dcf 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, std::string name, std::string tag, device_t *owner, UINT32 clock, bool is_50hz, bool is_reva, bool is_99, std::string shortname, std::string source) +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) : device_t( mconfig, type, name, tag, owner, clock, shortname, source), device_memory_interface(mconfig, *this), device_video_interface(mconfig, *this), diff --git a/src/devices/video/tms9928a.h b/src/devices/video/tms9928a.h index 60b51b30c96..82798ea7318 100644 --- a/src/devices/video/tms9928a.h +++ b/src/devices/video/tms9928a.h @@ -83,7 +83,7 @@ class tms9928a_device : public device_t, public: // construction/destruction tms9928a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - tms9928a_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, bool is_50hz, bool is_reva, bool is_99, std::string shortname, std::string source); + 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); 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); } diff --git a/src/devices/video/v9938.cpp b/src/devices/video/v9938.cpp index 43a822b8678..1ef39a39279 100644 --- a/src/devices/video/v9938.cpp +++ b/src/devices/video/v9938.cpp @@ -88,7 +88,7 @@ const device_type V9938 = &device_creator<v9938_device>; const device_type V9958 = &device_creator<v9958_device>; -v99x8_device::v99x8_device(const machine_config &mconfig, device_type type, std::string name, 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, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__), device_memory_interface(mconfig, *this), device_video_interface(mconfig, *this), diff --git a/src/devices/video/v9938.h b/src/devices/video/v9938.h index 8db93e4b2bd..583df876df5 100644 --- a/src/devices/video/v9938.h +++ b/src/devices/video/v9938.h @@ -76,7 +76,7 @@ class v99x8_device : public device_t, { protected: // construction/destruction - v99x8_device(const machine_config &mconfig, device_type type, std::string name, 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, std::string tag, device_t *owner, UINT32 clock); public: template<class _irq> void set_interrupt_callback(_irq irq) { diff --git a/src/devices/video/voodoo.cpp b/src/devices/video/voodoo.cpp index 0e1ea93255f..060ab9736cc 100644 --- a/src/devices/video/voodoo.cpp +++ b/src/devices/video/voodoo.cpp @@ -5831,7 +5831,7 @@ static void dump_rasterizer_stats(voodoo_state *v) } } -voodoo_device::voodoo_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) +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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_fbmem(0), m_tmumem0(0), @@ -5922,7 +5922,7 @@ voodoo_banshee_device::voodoo_banshee_device(const machine_config &mconfig, std: { } -voodoo_banshee_device::voodoo_banshee_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) +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_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/video/voodoo.h b/src/devices/video/voodoo.h index 041cc960f34..9a61385046d 100644 --- a/src/devices/video/voodoo.h +++ b/src/devices/video/voodoo.h @@ -71,7 +71,7 @@ void voodoo_set_init_enable(device_t *device, UINT32 newval); class voodoo_device : public device_t { public: - voodoo_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); + 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(); @@ -133,7 +133,7 @@ class voodoo_banshee_device : public voodoo_device { public: voodoo_banshee_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - voodoo_banshee_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); + 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); DECLARE_READ32_MEMBER( banshee_r ); DECLARE_WRITE32_MEMBER( banshee_w ); |