summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/econet
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-01-20 21:42:13 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2016-01-20 21:42:13 +0100
commit4e8e3066f847cc0fa11539f4d9ab8a63f70ca475 (patch)
tree25d48b50f2b89dd5b9e7dbbfeeb85c534ec6852a /src/devices/bus/econet
parent3a8ccb89b426509be06089a19c51ecf55567ed1b (diff)
reverting:
SHA-1: 1f90ceab075c4869298e963bf0a14a0aac2f1caa * tags are now strings (nw) fix start project for custom builds in Visual Studio (nw)
Diffstat (limited to 'src/devices/bus/econet')
-rw-r--r--src/devices/bus/econet/e01.cpp6
-rw-r--r--src/devices/bus/econet/e01.h6
-rw-r--r--src/devices/bus/econet/econet.cpp10
-rw-r--r--src/devices/bus/econet/econet.h4
4 files changed, 13 insertions, 13 deletions
diff --git a/src/devices/bus/econet/e01.cpp b/src/devices/bus/econet/e01.cpp
index 71da0802380..ed60ccc2d28 100644
--- a/src/devices/bus/econet/e01.cpp
+++ b/src/devices/bus/econet/e01.cpp
@@ -77,7 +77,7 @@
const device_type E01 = &device_creator<e01_device>;
const device_type E01S = &device_creator<e01s_device>;
-e01s_device::e01s_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+e01s_device::e01s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
:e01_device(mconfig, E01S, "Acorn FileStore E01S", tag, owner, clock, "e01s", __FILE__) { m_variant = TYPE_E01S; }
@@ -372,7 +372,7 @@ inline void e01_device::hdc_irq_enable(int enabled)
// e01_device - constructor
//-------------------------------------------------
-e01_device::e01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+e01_device::e01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, E01, "Acorn FileStore E01", tag, owner, clock, "e01" , __FILE__),
device_econet_interface(mconfig, *this),
m_maincpu(*this, R65C102_TAG),
@@ -402,7 +402,7 @@ e01_device::e01_device(const machine_config &mconfig, std::string tag, device_t
}
-e01_device::e01_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)
+e01_device::e01_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_econet_interface(mconfig, *this),
m_maincpu(*this, R65C102_TAG),
diff --git a/src/devices/bus/econet/e01.h b/src/devices/bus/econet/e01.h
index ef3d1fcb4bd..e83b9a0b6bd 100644
--- a/src/devices/bus/econet/e01.h
+++ b/src/devices/bus/econet/e01.h
@@ -28,8 +28,8 @@ class e01_device : public device_t,
{
public:
// construction/destruction
- e01_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);
- e01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ e01_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);
+ e01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
enum
{
@@ -121,7 +121,7 @@ class e01s_device : public e01_device
{
public:
// construction/destruction
- e01s_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ e01s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/bus/econet/econet.cpp b/src/devices/bus/econet/econet.cpp
index cd5615b1d10..e56d843db32 100644
--- a/src/devices/bus/econet/econet.cpp
+++ b/src/devices/bus/econet/econet.cpp
@@ -53,7 +53,7 @@ device_econet_interface::device_econet_interface(const machine_config &mconfig,
// econet_slot_device - constructor
//-------------------------------------------------
-econet_slot_device::econet_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+econet_slot_device::econet_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ECONET_SLOT, "Econet station", tag, owner, clock, "econet_slot", __FILE__),
device_slot_interface(mconfig, *this), m_address(0), m_econet(nullptr)
{
@@ -100,7 +100,7 @@ inline void econet_device::set_signal(device_t *device, int signal, int state)
{
if (m_line[signal] != state)
{
- if (LOG) logerror("Econet: '%s' %s %u\n", tag().c_str(), SIGNAL_NAME[signal], state);
+ if (LOG) logerror("Econet: '%s' %s %u\n", tag(), SIGNAL_NAME[signal], state);
m_line[signal] = state;
changed = true;
}
@@ -111,11 +111,11 @@ inline void econet_device::set_signal(device_t *device, int signal, int state)
while (entry)
{
- if (entry->m_device->tag() == device->tag())
+ if (!strcmp(entry->m_device->tag(), device->tag()))
{
if (entry->m_line[signal] != state)
{
- if (LOG) logerror("Econet: '%s' %s %u\n", device->tag().c_str(), SIGNAL_NAME[signal], state);
+ if (LOG) logerror("Econet: '%s' %s %u\n", device->tag(), SIGNAL_NAME[signal], state);
entry->m_line[signal] = state;
changed = true;
}
@@ -193,7 +193,7 @@ inline int econet_device::get_signal(int signal)
// econet_device - constructor
//-------------------------------------------------
-econet_device::econet_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+econet_device::econet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ECONET, "Econet", tag, owner, clock, "econet", __FILE__),
m_write_clk(*this),
m_write_data(*this)
diff --git a/src/devices/bus/econet/econet.h b/src/devices/bus/econet/econet.h
index 625baa35358..e37cf989696 100644
--- a/src/devices/bus/econet/econet.h
+++ b/src/devices/bus/econet/econet.h
@@ -56,7 +56,7 @@ class econet_device : public device_t
{
public:
// construction/destruction
- econet_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ econet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_clk_wr_callback(device_t &device, _Object object) { return downcast<econet_device &>(device).m_write_clk.set_callback(object); }
template<class _Object> static devcb_base &set_data_wr_callback(device_t &device, _Object object) { return downcast<econet_device &>(device).m_write_data.set_callback(object); }
@@ -116,7 +116,7 @@ class econet_slot_device : public device_t,
{
public:
// construction/destruction
- econet_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ econet_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;