summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/a800
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/a800')
-rw-r--r--src/devices/bus/a800/a800_slot.cpp10
-rw-r--r--src/devices/bus/a800/a800_slot.h10
-rw-r--r--src/devices/bus/a800/a8sio.cpp17
-rw-r--r--src/devices/bus/a800/a8sio.h20
-rw-r--r--src/devices/bus/a800/cassette.cpp4
-rw-r--r--src/devices/bus/a800/cassette.h4
-rw-r--r--src/devices/bus/a800/oss.cpp8
-rw-r--r--src/devices/bus/a800/oss.h8
-rw-r--r--src/devices/bus/a800/rom.cpp22
-rw-r--r--src/devices/bus/a800/rom.h24
-rw-r--r--src/devices/bus/a800/sparta.cpp2
-rw-r--r--src/devices/bus/a800/sparta.h2
12 files changed, 66 insertions, 65 deletions
diff --git a/src/devices/bus/a800/a800_slot.cpp b/src/devices/bus/a800/a800_slot.cpp
index 19f51ea9c7d..b2e46a421da 100644
--- a/src/devices/bus/a800/a800_slot.cpp
+++ b/src/devices/bus/a800/a800_slot.cpp
@@ -59,7 +59,7 @@ device_a800_cart_interface::~device_a800_cart_interface ()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_a800_cart_interface::rom_alloc(UINT32 size, std::string tag)
+void device_a800_cart_interface::rom_alloc(UINT32 size, const char *tag)
{
if (m_rom == nullptr)
{
@@ -101,14 +101,14 @@ void device_a800_cart_interface::nvram_alloc(UINT32 size)
//-------------------------------------------------
// ****_cart_slot_device - constructor
//-------------------------------------------------
-a800_cart_slot_device::a800_cart_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) :
+a800_cart_slot_device::a800_cart_slot_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, __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this), m_cart(nullptr), m_type(0)
{
}
-a800_cart_slot_device::a800_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+a800_cart_slot_device::a800_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A800_CART_SLOT, "Atari 8bit Cartridge Slot", tag, owner, clock, "a800_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this), m_cart(nullptr), m_type(0)
@@ -116,13 +116,13 @@ a800_cart_slot_device::a800_cart_slot_device(const machine_config &mconfig, std:
}
-a5200_cart_slot_device::a5200_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+a5200_cart_slot_device::a5200_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
a800_cart_slot_device(mconfig, A5200_CART_SLOT, "Atari 5200 Cartridge Slot", tag, owner, clock, "a5200_cart_slot", __FILE__)
{
}
-xegs_cart_slot_device::xegs_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+xegs_cart_slot_device::xegs_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
a800_cart_slot_device(mconfig, XEGS_CART_SLOT, "Atari XEGS Cartridge Slot", tag, owner, clock, "xegs_cart_slot", __FILE__)
{
}
diff --git a/src/devices/bus/a800/a800_slot.h b/src/devices/bus/a800/a800_slot.h
index d20816ad5d6..6efdd0839e9 100644
--- a/src/devices/bus/a800/a800_slot.h
+++ b/src/devices/bus/a800/a800_slot.h
@@ -56,7 +56,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_80xx) {}
virtual DECLARE_WRITE8_MEMBER(write_d5xx) {}
- void rom_alloc(UINT32 size, std::string tag);
+ void rom_alloc(UINT32 size, const char *tag);
void ram_alloc(UINT32 size);
void nvram_alloc(UINT32 size);
UINT8* get_rom_base() { return m_rom; }
@@ -85,8 +85,8 @@ class a800_cart_slot_device : public device_t,
{
public:
// construction/destruction
- a800_cart_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);
- a800_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a800_cart_slot_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);
+ a800_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~a800_cart_slot_device();
// device-level overrides
@@ -136,7 +136,7 @@ class a5200_cart_slot_device : public a800_cart_slot_device
{
public:
// construction/destruction
- a5200_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a5200_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~a5200_cart_slot_device();
virtual const char *file_extensions() const override { return "bin,rom,car,a52"; }
@@ -151,7 +151,7 @@ class xegs_cart_slot_device : public a800_cart_slot_device
{
public:
// construction/destruction
- xegs_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ xegs_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~xegs_cart_slot_device();
virtual const char *file_extensions() const override { return "bin,rom,car"; }
diff --git a/src/devices/bus/a800/a8sio.cpp b/src/devices/bus/a800/a8sio.cpp
index aa3b843a096..54f45ecb208 100644
--- a/src/devices/bus/a800/a8sio.cpp
+++ b/src/devices/bus/a800/a8sio.cpp
@@ -48,19 +48,19 @@ const device_type A8SIO_SLOT = &device_creator<a8sio_slot_device>;
//-------------------------------------------------
// a8sio_slot_device - constructor
//-------------------------------------------------
-a8sio_slot_device::a8sio_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+a8sio_slot_device::a8sio_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, A8SIO_SLOT, "Atari 8 bit SIO Slot", tag, owner, clock, "a8sio_slot", __FILE__)
- , device_slot_interface(mconfig, *this)
+ , device_slot_interface(mconfig, *this), m_a8sio_tag(nullptr), m_a8sio_slottag(nullptr)
{
}
-a8sio_slot_device::a8sio_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) :
+a8sio_slot_device::a8sio_slot_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_slot_interface(mconfig, *this)
+ device_slot_interface(mconfig, *this), m_a8sio_tag(nullptr), m_a8sio_slottag(nullptr)
{
}
-void a8sio_slot_device::static_set_a8sio_slot(device_t &device, std::string tag, std::string slottag)
+void a8sio_slot_device::static_set_a8sio_slot(device_t &device, const char *tag, const char *slottag)
{
a8sio_slot_device &a8sio_ext = dynamic_cast<a8sio_slot_device &>(device);
a8sio_ext.m_a8sio_tag = tag;
@@ -98,7 +98,7 @@ const device_type A8SIO = &device_creator<a8sio_device>;
// a8sio_device - constructor
//-------------------------------------------------
-a8sio_device::a8sio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+a8sio_device::a8sio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, A8SIO, "Atari 8 biot SIO", tag, owner, clock, "a8sio", __FILE__)
, m_out_clock_in_cb(*this)
, m_out_data_in_cb(*this)
@@ -106,7 +106,7 @@ a8sio_device::a8sio_device(const machine_config &mconfig, std::string tag, devic
{
}
-a8sio_device::a8sio_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)
+a8sio_device::a8sio_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_out_clock_in_cb(*this)
, m_out_data_in_cb(*this)
@@ -182,6 +182,7 @@ WRITE8_MEMBER( a8sio_device::audio_in_w )
device_a8sio_card_interface::device_a8sio_card_interface(const machine_config &mconfig, device_t &device)
: device_slot_card_interface(mconfig, device)
, m_a8sio(nullptr)
+ , m_a8sio_tag(nullptr), m_a8sio_slottag(nullptr)
{
}
@@ -194,7 +195,7 @@ device_a8sio_card_interface::~device_a8sio_card_interface()
{
}
-void device_a8sio_card_interface::static_set_a8sio_tag(device_t &device, std::string tag, std::string slottag)
+void device_a8sio_card_interface::static_set_a8sio_tag(device_t &device, const char *tag, const char *slottag)
{
device_a8sio_card_interface &a8sio_card = dynamic_cast<device_a8sio_card_interface &>(device);
a8sio_card.m_a8sio_tag = tag;
diff --git a/src/devices/bus/a800/a8sio.h b/src/devices/bus/a800/a8sio.h
index 60a54d53cf0..0a06c0c93b8 100644
--- a/src/devices/bus/a800/a8sio.h
+++ b/src/devices/bus/a800/a8sio.h
@@ -54,19 +54,19 @@ class a8sio_slot_device : public device_t,
{
public:
// construction/destruction
- a8sio_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- a8sio_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);
+ a8sio_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a8sio_slot_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-level overrides
virtual void device_start() override;
// inline configuration
- static void static_set_a8sio_slot(device_t &device, std::string tag, std::string slottag);
+ static void static_set_a8sio_slot(device_t &device, const char *tag, const char *slottag);
protected:
// configuration
- std::string m_a8sio_tag;
- std::string m_a8sio_slottag;
+ const char *m_a8sio_tag;
+ const char *m_a8sio_slottag;
};
@@ -80,8 +80,8 @@ class a8sio_device : public device_t
{
public:
// construction/destruction
- a8sio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- a8sio_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);
+ a8sio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a8sio_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
template<class _Object> static devcb_base &set_clock_in_callback(device_t &device, _Object object) { return downcast<a8sio_device &>(device).m_out_clock_in_cb.set_callback(object); }
@@ -128,14 +128,14 @@ public:
void set_a8sio_device();
// inline configuration
- static void static_set_a8sio_tag(device_t &device, std::string tag, std::string slottag);
+ static void static_set_a8sio_tag(device_t &device, const char *tag, const char *slottag);
virtual DECLARE_WRITE_LINE_MEMBER( motor_w );
public:
a8sio_device *m_a8sio;
- std::string m_a8sio_tag;
- std::string m_a8sio_slottag;
+ const char *m_a8sio_tag;
+ const char *m_a8sio_slottag;
};
diff --git a/src/devices/bus/a800/cassette.cpp b/src/devices/bus/a800/cassette.cpp
index 15e273c7096..3a6406d44a1 100644
--- a/src/devices/bus/a800/cassette.cpp
+++ b/src/devices/bus/a800/cassette.cpp
@@ -44,7 +44,7 @@ machine_config_constructor a8sio_cassette_device::device_mconfig_additions() con
// LIVE DEVICE
//**************************************************************************
-a8sio_cassette_device::a8sio_cassette_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+a8sio_cassette_device::a8sio_cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, A8SIO_CASSETTE, "Atari 8 bit cassette", tag, owner, clock, "a8sio_cass", __FILE__)
, device_a8sio_card_interface(mconfig, *this)
, m_cassette(*this, "cassette"), m_read_timer(nullptr)
@@ -53,7 +53,7 @@ a8sio_cassette_device::a8sio_cassette_device(const machine_config &mconfig, std:
{
}
-a8sio_cassette_device::a8sio_cassette_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)
+a8sio_cassette_device::a8sio_cassette_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_a8sio_card_interface(mconfig, *this)
, m_cassette(*this, "cassette"), m_read_timer(nullptr)
diff --git a/src/devices/bus/a800/cassette.h b/src/devices/bus/a800/cassette.h
index 94b63b0894f..d3bb24bbc4f 100644
--- a/src/devices/bus/a800/cassette.h
+++ b/src/devices/bus/a800/cassette.h
@@ -27,8 +27,8 @@ class a8sio_cassette_device
{
public:
// construction/destruction
- a8sio_cassette_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- a8sio_cassette_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);
+ a8sio_cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a8sio_cassette_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);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/a800/oss.cpp b/src/devices/bus/a800/oss.cpp
index 3671352cc34..5cdc7e72126 100644
--- a/src/devices/bus/a800/oss.cpp
+++ b/src/devices/bus/a800/oss.cpp
@@ -21,26 +21,26 @@ const device_type A800_ROM_OSS43 = &device_creator<a800_rom_oss43_device>;
const device_type A800_ROM_OSS91 = &device_creator<a800_rom_oss91_device>;
-a800_rom_oss8k_device::a800_rom_oss8k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+a800_rom_oss8k_device::a800_rom_oss8k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: a800_rom_device(mconfig, A800_ROM_OSS8K, "Atari 800 ROM Carts OSS 8K", tag, owner, clock, "a800_oss8k", __FILE__),
m_bank(0)
{
}
-a800_rom_oss34_device::a800_rom_oss34_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+a800_rom_oss34_device::a800_rom_oss34_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: a800_rom_device(mconfig, A800_ROM_OSS34, "Atari 800 ROM Carts OSS-034M", tag, owner, clock, "a800_034m", __FILE__), m_bank(0)
{
}
-a800_rom_oss43_device::a800_rom_oss43_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+a800_rom_oss43_device::a800_rom_oss43_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: a800_rom_device(mconfig, A800_ROM_OSS43, "Atari 800 ROM Carts OSS-043M", tag, owner, clock, "a800_043m", __FILE__), m_bank(0)
{
}
-a800_rom_oss91_device::a800_rom_oss91_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+a800_rom_oss91_device::a800_rom_oss91_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: a800_rom_device(mconfig, A800_ROM_OSS91, "Atari 800 ROM Carts OSS-M091", tag, owner, clock, "a800_m091", __FILE__), m_bank(0)
{
}
diff --git a/src/devices/bus/a800/oss.h b/src/devices/bus/a800/oss.h
index 2eee7810b9e..20524eedd64 100644
--- a/src/devices/bus/a800/oss.h
+++ b/src/devices/bus/a800/oss.h
@@ -12,7 +12,7 @@ class a800_rom_oss8k_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_oss8k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a800_rom_oss8k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -32,7 +32,7 @@ class a800_rom_oss34_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_oss34_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a800_rom_oss34_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -52,7 +52,7 @@ class a800_rom_oss43_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_oss43_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a800_rom_oss43_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -72,7 +72,7 @@ class a800_rom_oss91_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_oss91_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a800_rom_oss91_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/a800/rom.cpp b/src/devices/bus/a800/rom.cpp
index 4fdae4c4b7b..1a21ab92039 100644
--- a/src/devices/bus/a800/rom.cpp
+++ b/src/devices/bus/a800/rom.cpp
@@ -30,69 +30,69 @@ const device_type A5200_ROM_2CHIPS = &device_creator<a5200_rom_2chips_device>;
const device_type A5200_ROM_BBSB = &device_creator<a5200_rom_bbsb_device>;
-a800_rom_device::a800_rom_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)
+a800_rom_device::a800_rom_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_a800_cart_interface( mconfig, *this )
{
}
-a800_rom_device::a800_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+a800_rom_device::a800_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, A800_ROM, "Atari 800 ROM Carts", tag, owner, clock, "a800_rom", __FILE__),
device_a800_cart_interface( mconfig, *this )
{
}
-a800_rom_bbsb_device::a800_rom_bbsb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+a800_rom_bbsb_device::a800_rom_bbsb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: a800_rom_device(mconfig, A800_ROM_BBSB, "Atari 800 ROM Cart BBSB", tag, owner, clock, "a800_bbsb", __FILE__)
{
}
-xegs_rom_device::xegs_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+xegs_rom_device::xegs_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: a800_rom_device(mconfig, XEGS_ROM, "Atari XEGS 64K ROM Carts", tag, owner, clock, "a800_xegs", __FILE__), m_bank(0)
{
}
-a800_rom_williams_device::a800_rom_williams_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+a800_rom_williams_device::a800_rom_williams_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: a800_rom_device(mconfig, A800_ROM_WILLIAMS, "Atari 800 64K ROM Carts Williams", tag, owner, clock, "a800_williams", __FILE__), m_bank(0)
{
}
-a800_rom_express_device::a800_rom_express_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+a800_rom_express_device::a800_rom_express_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: a800_rom_device(mconfig, A800_ROM_EXPRESS, "Atari 800 64K ROM Carts Express/Diamond", tag, owner, clock, "a800_express", __FILE__), m_bank(0)
{
}
-a800_rom_turbo_device::a800_rom_turbo_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+a800_rom_turbo_device::a800_rom_turbo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: a800_rom_device(mconfig, A800_ROM_TURBO, "Atari 800 64K ROM Carts Turbosoft", tag, owner, clock, "a800_turbo", __FILE__), m_bank(0)
{
}
-a800_rom_telelink2_device::a800_rom_telelink2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+a800_rom_telelink2_device::a800_rom_telelink2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: a800_rom_device(mconfig, A800_ROM_TELELINK2, "Atari 800 64K ROM Cart Telelink II", tag, owner, clock, "a800_tlink2", __FILE__)
{
}
-a800_rom_microcalc_device::a800_rom_microcalc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+a800_rom_microcalc_device::a800_rom_microcalc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: a800_rom_device(mconfig, A800_ROM_MICROCALC, "Atari 800 64K ROM Cart SITSA MicroCalc", tag, owner, clock, "a800_sitsa", __FILE__), m_bank(0)
{
}
-a5200_rom_2chips_device::a5200_rom_2chips_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+a5200_rom_2chips_device::a5200_rom_2chips_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: a800_rom_device(mconfig, A5200_ROM_2CHIPS, "Atari 5200 ROM Cart 16K in 2 Chips", tag, owner, clock, "a5200_16k2c", __FILE__)
{
}
-a5200_rom_bbsb_device::a5200_rom_bbsb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+a5200_rom_bbsb_device::a5200_rom_bbsb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: a800_rom_device(mconfig, A5200_ROM_BBSB, "Atari 5200 ROM Cart BBSB", tag, owner, clock, "a5200_bbsb", __FILE__)
{
}
diff --git a/src/devices/bus/a800/rom.h b/src/devices/bus/a800/rom.h
index 03ed54272ab..f02b5be43ef 100644
--- a/src/devices/bus/a800/rom.h
+++ b/src/devices/bus/a800/rom.h
@@ -13,8 +13,8 @@ class a800_rom_device : public device_t,
{
public:
// construction/destruction
- a800_rom_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);
- a800_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a800_rom_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);
+ a800_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -30,7 +30,7 @@ class a800_rom_bbsb_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_bbsb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a800_rom_bbsb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -50,7 +50,7 @@ class a800_rom_williams_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_williams_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a800_rom_williams_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -70,7 +70,7 @@ class a800_rom_express_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_express_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a800_rom_express_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -90,7 +90,7 @@ class a800_rom_blizzard_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_blizzard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a800_rom_blizzard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -106,7 +106,7 @@ class a800_rom_turbo_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_turbo_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a800_rom_turbo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -126,7 +126,7 @@ class a800_rom_telelink2_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_telelink2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a800_rom_telelink2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual DECLARE_READ8_MEMBER(read_80xx) override;
virtual DECLARE_WRITE8_MEMBER(write_80xx) override;
@@ -141,7 +141,7 @@ class a800_rom_microcalc_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_microcalc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a800_rom_microcalc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -161,7 +161,7 @@ class xegs_rom_device : public a800_rom_device
{
public:
// construction/destruction
- xegs_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ xegs_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -181,7 +181,7 @@ class a5200_rom_2chips_device : public a800_rom_device
{
public:
// construction/destruction
- a5200_rom_2chips_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a5200_rom_2chips_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual DECLARE_READ8_MEMBER(read_80xx) override;
};
@@ -193,7 +193,7 @@ class a5200_rom_bbsb_device : public a800_rom_device
{
public:
// construction/destruction
- a5200_rom_bbsb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a5200_rom_bbsb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/a800/sparta.cpp b/src/devices/bus/a800/sparta.cpp
index c5981e225ae..44204cd7fa7 100644
--- a/src/devices/bus/a800/sparta.cpp
+++ b/src/devices/bus/a800/sparta.cpp
@@ -18,7 +18,7 @@
const device_type A800_ROM_SPARTADOS = &device_creator<a800_rom_spartados_device>;
-a800_rom_spartados_device::a800_rom_spartados_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+a800_rom_spartados_device::a800_rom_spartados_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: a800_rom_device(mconfig, A800_ROM_SPARTADOS, "Atari 800 SpartaDOS ROM Carts", tag, owner, clock, "a800_sparta", __FILE__),
m_bank(0),
m_subslot_enabled(0)
diff --git a/src/devices/bus/a800/sparta.h b/src/devices/bus/a800/sparta.h
index 586d1c7f7b1..5588cb464fd 100644
--- a/src/devices/bus/a800/sparta.h
+++ b/src/devices/bus/a800/sparta.h
@@ -12,7 +12,7 @@ class a800_rom_spartados_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_spartados_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a800_rom_spartados_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;