From caba131d844ade3f2b30d6be24ea6cf46b2949d7 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sat, 16 Jan 2016 20:05:32 +0100 Subject: rest of device parameters to std::string (nw) --- src/devices/bus/isa/aga.cpp | 2 +- src/devices/bus/isa/aga.h | 2 +- src/devices/bus/isa/cga.cpp | 4 ++-- src/devices/bus/isa/cga.h | 4 ++-- src/devices/bus/isa/com.cpp | 2 +- src/devices/bus/isa/com.h | 2 +- src/devices/bus/isa/ega.cpp | 2 +- src/devices/bus/isa/ega.h | 2 +- src/devices/bus/isa/fdc.cpp | 2 +- src/devices/bus/isa/fdc.h | 2 +- src/devices/bus/isa/hdc.cpp | 4 ++-- src/devices/bus/isa/hdc.h | 4 ++-- src/devices/bus/isa/isa.cpp | 4 ++-- src/devices/bus/isa/isa.h | 4 ++-- src/devices/bus/isa/mach32.cpp | 8 ++++---- src/devices/bus/isa/mach32.h | 8 ++++---- src/devices/bus/isa/mda.cpp | 2 +- src/devices/bus/isa/mda.h | 2 +- src/devices/bus/isa/pgc.cpp | 2 +- src/devices/bus/isa/pgc.h | 2 +- src/devices/bus/isa/s3virge.cpp | 4 ++-- src/devices/bus/isa/s3virge.h | 4 ++-- src/devices/bus/isa/sblaster.cpp | 6 +++--- src/devices/bus/isa/sblaster.h | 6 +++--- 24 files changed, 42 insertions(+), 42 deletions(-) (limited to 'src/devices/bus/isa') diff --git a/src/devices/bus/isa/aga.cpp b/src/devices/bus/isa/aga.cpp index ce3194ad28f..3073d555090 100644 --- a/src/devices/bus/isa/aga.cpp +++ b/src/devices/bus/isa/aga.cpp @@ -78,7 +78,7 @@ isa8_aga_device::isa8_aga_device(const machine_config &mconfig, std::string tag, { } -isa8_aga_device::isa8_aga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +isa8_aga_device::isa8_aga_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_isa8_card_interface(mconfig, *this), m_palette(*this, "palette"), diff --git a/src/devices/bus/isa/aga.h b/src/devices/bus/isa/aga.h index e9a312f4569..8ed6588ea99 100644 --- a/src/devices/bus/isa/aga.h +++ b/src/devices/bus/isa/aga.h @@ -38,7 +38,7 @@ class isa8_aga_device : public: // construction/destruction isa8_aga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - isa8_aga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + isa8_aga_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // device-level overrides virtual void device_start() override; // optional information overrides diff --git a/src/devices/bus/isa/cga.cpp b/src/devices/bus/isa/cga.cpp index ef2ca006d86..53ddc855134 100644 --- a/src/devices/bus/isa/cga.cpp +++ b/src/devices/bus/isa/cga.cpp @@ -320,7 +320,7 @@ isa8_cga_device::isa8_cga_device(const machine_config &mconfig, std::string tag, m_superimpose = false; } -isa8_cga_device::isa8_cga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +isa8_cga_device::isa8_cga_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_isa8_card_interface(mconfig, *this), m_cga_config(*this, "cga_config"), m_framecnt(0), m_mode_control(0), m_color_select(0), @@ -478,7 +478,7 @@ isa8_cga_superimpose_device::isa8_cga_superimpose_device(const machine_config &m m_superimpose = true; } -isa8_cga_superimpose_device::isa8_cga_superimpose_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +isa8_cga_superimpose_device::isa8_cga_superimpose_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : isa8_cga_device( mconfig, type, name, tag, owner, clock, shortname, source) { m_superimpose = true; diff --git a/src/devices/bus/isa/cga.h b/src/devices/bus/isa/cga.h index 7a3adcd15b3..8e2f9c32a62 100644 --- a/src/devices/bus/isa/cga.h +++ b/src/devices/bus/isa/cga.h @@ -27,7 +27,7 @@ class isa8_cga_device : public: // construction/destruction isa8_cga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - isa8_cga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + isa8_cga_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual MC6845_UPDATE_ROW( crtc_update_row ); MC6845_UPDATE_ROW( cga_text_inten_update_row ); @@ -98,7 +98,7 @@ class isa8_cga_superimpose_device : public: // construction/destruction isa8_cga_superimpose_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - isa8_cga_superimpose_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + isa8_cga_superimpose_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); }; // device type definition diff --git a/src/devices/bus/isa/com.cpp b/src/devices/bus/isa/com.cpp index 676fde0c221..eb615b4e9eb 100644 --- a/src/devices/bus/isa/com.cpp +++ b/src/devices/bus/isa/com.cpp @@ -101,7 +101,7 @@ isa8_com_device::isa8_com_device(const machine_config &mconfig, std::string tag, { } -isa8_com_device::isa8_com_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +isa8_com_device::isa8_com_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_isa8_card_interface(mconfig, *this) { diff --git a/src/devices/bus/isa/com.h b/src/devices/bus/isa/com.h index a514a586022..f7945492628 100644 --- a/src/devices/bus/isa/com.h +++ b/src/devices/bus/isa/com.h @@ -22,7 +22,7 @@ class isa8_com_device : public: // construction/destruction isa8_com_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - isa8_com_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + isa8_com_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/isa/ega.cpp b/src/devices/bus/isa/ega.cpp index 59e82fcbb8a..69b268db46d 100644 --- a/src/devices/bus/isa/ega.cpp +++ b/src/devices/bus/isa/ega.cpp @@ -578,7 +578,7 @@ isa8_ega_device::isa8_ega_device(const machine_config &mconfig, std::string tag, { } -isa8_ega_device::isa8_ega_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +isa8_ega_device::isa8_ega_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_isa8_card_interface(mconfig, *this), m_crtc_ega(nullptr), m_vram(nullptr), m_videoram(nullptr), m_charA(nullptr), m_charB(nullptr), m_misc_output(0), m_feature_control(0), m_frame_cnt(0), m_hsync(0), m_vsync(0), m_vblank(0), m_display_enable(0), m_video_mode(0), diff --git a/src/devices/bus/isa/ega.h b/src/devices/bus/isa/ega.h index 6edb0dba81a..763d15e5e67 100644 --- a/src/devices/bus/isa/ega.h +++ b/src/devices/bus/isa/ega.h @@ -22,7 +22,7 @@ class isa8_ega_device : public: // construction/destruction isa8_ega_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - isa8_ega_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + isa8_ega_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/isa/fdc.cpp b/src/devices/bus/isa/fdc.cpp index 4bf1b974227..8178eaf868b 100644 --- a/src/devices/bus/isa/fdc.cpp +++ b/src/devices/bus/isa/fdc.cpp @@ -72,7 +72,7 @@ static MACHINE_CONFIG_FRAGMENT( cfg_superio ) MACHINE_CONFIG_END -isa8_fdc_device::isa8_fdc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +isa8_fdc_device::isa8_fdc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_isa8_card_interface(mconfig, *this), fdc(*this, "fdc") diff --git a/src/devices/bus/isa/fdc.h b/src/devices/bus/isa/fdc.h index 3a2c85b7d01..41343657da2 100644 --- a/src/devices/bus/isa/fdc.h +++ b/src/devices/bus/isa/fdc.h @@ -26,7 +26,7 @@ class isa8_fdc_device : { public: // construction/destruction - isa8_fdc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + isa8_fdc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); required_device fdc; diff --git a/src/devices/bus/isa/hdc.cpp b/src/devices/bus/isa/hdc.cpp index 6bf46ee72c0..1c380577ddd 100644 --- a/src/devices/bus/isa/hdc.cpp +++ b/src/devices/bus/isa/hdc.cpp @@ -169,7 +169,7 @@ xt_hdc_device::xt_hdc_device(const machine_config &mconfig, std::string tag, dev m_type = STANDARD; } -xt_hdc_device::xt_hdc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +xt_hdc_device::xt_hdc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), buffer_ptr(nullptr), csb(0), status(0), error(0), m_type(0), m_current_cmd(0), m_irq_handler(*this), m_drq_handler(*this), drv(0), timer(nullptr), data_cnt(0), hdc_control(0), hdcdma_src(nullptr), hdcdma_dst(nullptr), hdcdma_read(0), hdcdma_write(0), hdcdma_size(0) @@ -925,7 +925,7 @@ isa8_hdc_device::isa8_hdc_device(const machine_config &mconfig, std::string tag, { } -isa8_hdc_device::isa8_hdc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +isa8_hdc_device::isa8_hdc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_isa8_card_interface(mconfig, *this), m_hdc(*this,"hdc"), dip(0) diff --git a/src/devices/bus/isa/hdc.h b/src/devices/bus/isa/hdc.h index afd8c46e0b8..fb05f823009 100644 --- a/src/devices/bus/isa/hdc.h +++ b/src/devices/bus/isa/hdc.h @@ -32,7 +32,7 @@ class xt_hdc_device : public: // construction/destruction xt_hdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - xt_hdc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + xt_hdc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } template static devcb_base &set_drq_handler(device_t &device, _Object object) { return downcast(device).m_drq_handler.set_callback(object); } @@ -143,7 +143,7 @@ class isa8_hdc_device : public: // construction/destruction isa8_hdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - isa8_hdc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + isa8_hdc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); DECLARE_READ8_MEMBER(pc_hdc_r); DECLARE_WRITE8_MEMBER(pc_hdc_w); diff --git a/src/devices/bus/isa/isa.cpp b/src/devices/bus/isa/isa.cpp index 308d5c487a9..2265b36e1c2 100644 --- a/src/devices/bus/isa/isa.cpp +++ b/src/devices/bus/isa/isa.cpp @@ -31,7 +31,7 @@ isa8_slot_device::isa8_slot_device(const machine_config &mconfig, std::string ta { } -isa8_slot_device::isa8_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +isa8_slot_device::isa8_slot_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_slot_interface(mconfig, *this), m_owner(nullptr) { @@ -162,7 +162,7 @@ isa8_device::isa8_device(const machine_config &mconfig, std::string tag, device_ m_allocspaces = false; } -isa8_device::isa8_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +isa8_device::isa8_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_memory_interface(mconfig, *this), m_program_config("ISA 8-bit program", ENDIANNESS_LITTLE, 8, 24, 0, nullptr), diff --git a/src/devices/bus/isa/isa.h b/src/devices/bus/isa/isa.h index 5c8ee7a3151..29dbe233aa7 100644 --- a/src/devices/bus/isa/isa.h +++ b/src/devices/bus/isa/isa.h @@ -163,7 +163,7 @@ class isa8_slot_device : public device_t, public: // construction/destruction isa8_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - isa8_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + isa8_slot_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // device-level overrides virtual void device_start() override; @@ -187,7 +187,7 @@ class isa8_device : public device_t, public: // construction/destruction isa8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - isa8_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + isa8_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // inline configuration static void static_set_cputag(device_t &device, std::string tag); static void static_set_custom_spaces(device_t &device); diff --git a/src/devices/bus/isa/mach32.cpp b/src/devices/bus/isa/mach32.cpp index 51054d22fee..69489874b2e 100644 --- a/src/devices/bus/isa/mach32.cpp +++ b/src/devices/bus/isa/mach32.cpp @@ -29,7 +29,7 @@ mach32_8514a_device::mach32_8514a_device(const machine_config &mconfig, std::str { } -mach32_8514a_device::mach32_8514a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +mach32_8514a_device::mach32_8514a_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : mach8_device(mconfig, type, name, tag, owner, clock, shortname, source), m_chip_ID(0), m_membounds(0) @@ -44,7 +44,7 @@ mach32_device::mach32_device(const machine_config &mconfig, std::string tag, dev { } -mach32_device::mach32_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +mach32_device::mach32_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : ati_vga_device(mconfig, type, name, tag, owner, clock, shortname, source), m_8514a(*this,"8514a") { @@ -100,7 +100,7 @@ mach64_8514a_device::mach64_8514a_device(const machine_config &mconfig, std::str { } -mach64_8514a_device::mach64_8514a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +mach64_8514a_device::mach64_8514a_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : mach32_8514a_device(mconfig, type, name, tag, owner, clock, shortname, source) { } @@ -113,7 +113,7 @@ mach64_device::mach64_device(const machine_config &mconfig, std::string tag, dev { } -mach64_device::mach64_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +mach64_device::mach64_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : mach32_device(mconfig, type, name, tag, owner, clock, shortname, source), m_8514a(*this,"8514a") { diff --git a/src/devices/bus/isa/mach32.h b/src/devices/bus/isa/mach32.h index 52758769a75..7273ec7a125 100644 --- a/src/devices/bus/isa/mach32.h +++ b/src/devices/bus/isa/mach32.h @@ -19,7 +19,7 @@ class mach32_8514a_device : public mach8_device public: // construction/destruction mach32_8514a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - mach32_8514a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + mach32_8514a_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); DECLARE_READ16_MEMBER(mach32_chipid_r) { return m_chip_ID; } DECLARE_WRITE16_MEMBER(mach32_clksel_w) { mach8.clksel = data; } // read only on the mach8 @@ -41,7 +41,7 @@ class mach32_device : public ati_vga_device public: // construction/destruction mach32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - mach32_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + mach32_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); required_device m_8514a; // provides accelerated 2D drawing, derived from the Mach8 device @@ -138,7 +138,7 @@ class mach64_8514a_device : public mach32_8514a_device public: // construction/destruction mach64_8514a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - mach64_8514a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + mach64_8514a_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); protected: virtual void device_start() override; @@ -152,7 +152,7 @@ class mach64_device : public mach32_device public: // construction/destruction mach64_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - mach64_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + mach64_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); required_device m_8514a; // provides accelerated 2D drawing, derived from the Mach8 device diff --git a/src/devices/bus/isa/mda.cpp b/src/devices/bus/isa/mda.cpp index 3cebdb0db0b..37d495aa1ef 100644 --- a/src/devices/bus/isa/mda.cpp +++ b/src/devices/bus/isa/mda.cpp @@ -158,7 +158,7 @@ isa8_mda_device::isa8_mda_device(const machine_config &mconfig, std::string tag, { } -isa8_mda_device::isa8_mda_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +isa8_mda_device::isa8_mda_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_isa8_card_interface(mconfig, *this), m_framecnt(0), m_mode_control(0), m_update_row_type(-1), m_chr_gen(nullptr), m_vsync(0), m_hsync(0), m_pixel(0), diff --git a/src/devices/bus/isa/mda.h b/src/devices/bus/isa/mda.h index dc0edb10927..16b13da6831 100644 --- a/src/devices/bus/isa/mda.h +++ b/src/devices/bus/isa/mda.h @@ -23,7 +23,7 @@ public: // construction/destruction isa8_mda_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - isa8_mda_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + isa8_mda_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/isa/pgc.cpp b/src/devices/bus/isa/pgc.cpp index 2c7484f584d..e9ed56bd7db 100644 --- a/src/devices/bus/isa/pgc.cpp +++ b/src/devices/bus/isa/pgc.cpp @@ -212,7 +212,7 @@ isa8_pgc_device::isa8_pgc_device(const machine_config &mconfig, std::string tag, { } -isa8_pgc_device::isa8_pgc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +isa8_pgc_device::isa8_pgc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_isa8_card_interface(mconfig, *this), m_cpu(*this, "maincpu"), diff --git a/src/devices/bus/isa/pgc.h b/src/devices/bus/isa/pgc.h index d86084ec61c..81537841f19 100644 --- a/src/devices/bus/isa/pgc.h +++ b/src/devices/bus/isa/pgc.h @@ -24,7 +24,7 @@ class isa8_pgc_device : public: // construction/destruction isa8_pgc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - isa8_pgc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + isa8_pgc_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/isa/s3virge.cpp b/src/devices/bus/isa/s3virge.cpp index 2d3950e678c..f0befece7ea 100644 --- a/src/devices/bus/isa/s3virge.cpp +++ b/src/devices/bus/isa/s3virge.cpp @@ -25,7 +25,7 @@ s3virge_vga_device::s3virge_vga_device(const machine_config &mconfig, std::strin { } -s3virge_vga_device::s3virge_vga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +s3virge_vga_device::s3virge_vga_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : s3_vga_device(mconfig, type, name, tag, owner, clock, shortname, source) { } @@ -35,7 +35,7 @@ s3virgedx_vga_device::s3virgedx_vga_device(const machine_config &mconfig, std::s { } -s3virgedx_vga_device::s3virgedx_vga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +s3virgedx_vga_device::s3virgedx_vga_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source) : s3virge_vga_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/bus/isa/s3virge.h b/src/devices/bus/isa/s3virge.h index 4a7bad4b8c2..8d04b6720e5 100644 --- a/src/devices/bus/isa/s3virge.h +++ b/src/devices/bus/isa/s3virge.h @@ -20,7 +20,7 @@ class s3virge_vga_device : public s3_vga_device public: // construction/destruction s3virge_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - s3virge_vga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + s3virge_vga_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); virtual READ8_MEMBER(port_03b0_r) override; virtual WRITE8_MEMBER(port_03b0_w) override; @@ -52,7 +52,7 @@ class s3virgedx_vga_device : public s3virge_vga_device public: // construction/destruction s3virgedx_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - s3virgedx_vga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + s3virgedx_vga_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); protected: // device-level overrides diff --git a/src/devices/bus/isa/sblaster.cpp b/src/devices/bus/isa/sblaster.cpp index f416f10e4a4..14374e3114e 100644 --- a/src/devices/bus/isa/sblaster.cpp +++ b/src/devices/bus/isa/sblaster.cpp @@ -1101,7 +1101,7 @@ machine_config_constructor isa16_sblaster16_device::device_mconfig_additions() c // LIVE DEVICE //************************************************************************** -sb_device::sb_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source) : +sb_device::sb_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, std::string shortname, std::string source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_serial_interface(mconfig, *this), m_dacl(*this, "sbdacl"), @@ -1111,14 +1111,14 @@ sb_device::sb_device(const machine_config &mconfig, device_type type, std::strin { } -sb8_device::sb8_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source) : +sb8_device::sb8_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, std::string shortname, std::string source) : sb_device(mconfig, type, tag, owner, clock, name, shortname, source), device_isa8_card_interface(mconfig, *this), m_ym3812(*this, "ym3812") { } -sb16_device::sb16_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source) : +sb16_device::sb16_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, std::string shortname, std::string source) : sb_device(mconfig, type, tag, owner, clock, name, shortname, source), device_isa16_card_interface(mconfig, *this) { diff --git a/src/devices/bus/isa/sblaster.h b/src/devices/bus/isa/sblaster.h index 01c3921244b..b9c95b9b751 100644 --- a/src/devices/bus/isa/sblaster.h +++ b/src/devices/bus/isa/sblaster.h @@ -97,7 +97,7 @@ class sb_device : { public: // construction/destruction - sb_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source); + sb_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, std::string shortname, std::string source); required_device m_dacl; required_device m_dacr; @@ -158,7 +158,7 @@ class sb8_device : public sb_device, { public: // construction/destruction - sb8_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source); + sb8_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, std::string shortname, std::string source); DECLARE_READ8_MEMBER(ym3812_16_r); DECLARE_WRITE8_MEMBER(ym3812_16_w); @@ -212,7 +212,7 @@ class sb16_device : public sb_device, { public: // construction/destruction - sb16_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source); + sb16_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, std::string shortname, std::string source); DECLARE_READ8_MEMBER(mpu401_r); DECLARE_WRITE8_MEMBER(mpu401_w); DECLARE_READ8_MEMBER(mixer_r); -- cgit v1.2.3-70-g09d2