summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/a1bus
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-01-16 12:24:11 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2016-01-16 14:54:42 +0100
commit1f90ceab075c4869298e963bf0a14a0aac2f1caa (patch)
tree49984b30e3c6da6a0be068dbfcd02882bdafdc08 /src/devices/bus/a1bus
parent34161178c431b018cba0d0286951c69aee80e968 (diff)
tags are now strings (nw)
fix start project for custom builds in Visual Studio (nw)
Diffstat (limited to 'src/devices/bus/a1bus')
-rw-r--r--src/devices/bus/a1bus/a1bus.cpp28
-rw-r--r--src/devices/bus/a1bus/a1bus.h24
-rw-r--r--src/devices/bus/a1bus/a1cassette.cpp4
-rw-r--r--src/devices/bus/a1bus/a1cassette.h4
-rw-r--r--src/devices/bus/a1bus/a1cffa.cpp4
-rw-r--r--src/devices/bus/a1bus/a1cffa.h4
6 files changed, 34 insertions, 34 deletions
diff --git a/src/devices/bus/a1bus/a1bus.cpp b/src/devices/bus/a1bus/a1bus.cpp
index c3ebc73c6de..b0ea52156ca 100644
--- a/src/devices/bus/a1bus/a1bus.cpp
+++ b/src/devices/bus/a1bus/a1bus.cpp
@@ -24,21 +24,19 @@ const device_type A1BUS_SLOT = &device_creator<a1bus_slot_device>;
//-------------------------------------------------
// a1bus_slot_device - constructor
//-------------------------------------------------
-a1bus_slot_device::a1bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a1bus_slot_device::a1bus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A1BUS_SLOT, "Apple I Slot", tag, owner, clock, "a1bus_slot", __FILE__),
- device_slot_interface(mconfig, *this),
- m_a1bus_tag(nullptr),
- m_a1bus_slottag(nullptr)
+ device_slot_interface(mconfig, *this)
{
}
-a1bus_slot_device::a1bus_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) :
+a1bus_slot_device::a1bus_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) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
- device_slot_interface(mconfig, *this), m_a1bus_tag(nullptr), m_a1bus_slottag(nullptr)
+ device_slot_interface(mconfig, *this)
{
}
-void a1bus_slot_device::static_set_a1bus_slot(device_t &device, const char *tag, const char *slottag)
+void a1bus_slot_device::static_set_a1bus_slot(device_t &device, std::string tag, std::string slottag)
{
a1bus_slot_device &a1bus_card = dynamic_cast<a1bus_slot_device &>(device);
a1bus_card.m_a1bus_tag = tag;
@@ -62,7 +60,7 @@ void a1bus_slot_device::device_start()
const device_type A1BUS = &device_creator<a1bus_device>;
-void a1bus_device::static_set_cputag(device_t &device, const char *tag)
+void a1bus_device::static_set_cputag(device_t &device, std::string tag)
{
a1bus_device &a1bus = downcast<a1bus_device &>(device);
a1bus.m_cputag = tag;
@@ -76,17 +74,17 @@ void a1bus_device::static_set_cputag(device_t &device, const char *tag)
// a1bus_device - constructor
//-------------------------------------------------
-a1bus_device::a1bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a1bus_device::a1bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A1BUS, "Apple I Bus", tag, owner, clock, "a1bus", __FILE__), m_maincpu(nullptr),
m_out_irq_cb(*this),
- m_out_nmi_cb(*this), m_device(nullptr), m_cputag(nullptr)
+ m_out_nmi_cb(*this), m_device(nullptr)
{
}
-a1bus_device::a1bus_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) :
+a1bus_device::a1bus_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_maincpu(nullptr),
m_out_irq_cb(*this),
- m_out_nmi_cb(*this), m_device(nullptr), m_cputag(nullptr)
+ m_out_nmi_cb(*this), m_device(nullptr)
{
}
//-------------------------------------------------
@@ -140,7 +138,7 @@ void a1bus_device::install_device(offs_t start, offs_t end, read8_delegate rhand
m_maincpu->space(AS_PROGRAM).install_readwrite_handler(start, end, rhandler, whandler);
}
-void a1bus_device::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data)
+void a1bus_device::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, std::string tag, UINT8 *data)
{
// printf("install_bank: %s @ %x->%x mask %x mirror %x\n", tag, start, end, mask, mirror);
m_maincpu = machine().device<cpu_device>(m_cputag);
@@ -169,7 +167,7 @@ WRITE_LINE_MEMBER( a1bus_device::nmi_w ) { m_out_nmi_cb(state); }
device_a1bus_card_interface::device_a1bus_card_interface(const machine_config &mconfig, device_t &device)
: device_slot_card_interface(mconfig, device),
m_a1bus(nullptr),
- m_a1bus_tag(nullptr), m_a1bus_slottag(nullptr), m_next(nullptr)
+ m_next(nullptr)
{
}
@@ -182,7 +180,7 @@ device_a1bus_card_interface::~device_a1bus_card_interface()
{
}
-void device_a1bus_card_interface::static_set_a1bus_tag(device_t &device, const char *tag, const char *slottag)
+void device_a1bus_card_interface::static_set_a1bus_tag(device_t &device, std::string tag, std::string slottag)
{
device_a1bus_card_interface &a1bus_card = dynamic_cast<device_a1bus_card_interface &>(device);
a1bus_card.m_a1bus_tag = tag;
diff --git a/src/devices/bus/a1bus/a1bus.h b/src/devices/bus/a1bus/a1bus.h
index e9726073ddb..70b9532167b 100644
--- a/src/devices/bus/a1bus/a1bus.h
+++ b/src/devices/bus/a1bus/a1bus.h
@@ -49,17 +49,18 @@ class a1bus_slot_device : public device_t,
{
public:
// construction/destruction
- a1bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a1bus_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);
+ a1bus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a1bus_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);
// device-level overrides
virtual void device_start() override;
// inline configuration
- static void static_set_a1bus_slot(device_t &device, const char *tag, const char *slottag);
+ static void static_set_a1bus_slot(device_t &device, std::string tag, std::string slottag);
protected:
// configuration
- const char *m_a1bus_tag, *m_a1bus_slottag;
+ std::string m_a1bus_tag;
+ std::string m_a1bus_slottag;
};
// device type definition
@@ -72,11 +73,11 @@ class a1bus_device : public device_t
{
public:
// construction/destruction
- a1bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a1bus_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);
+ a1bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a1bus_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
- static void static_set_cputag(device_t &device, const char *tag);
+ static void static_set_cputag(device_t &device, std::string tag);
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<a1bus_device &>(device).m_out_irq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<a1bus_device &>(device).m_out_nmi_cb.set_callback(object); }
@@ -87,7 +88,7 @@ public:
void set_nmi_line(int state);
void install_device(offs_t start, offs_t end, read8_delegate rhandler, write8_delegate whandler);
- void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data);
+ void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, std::string tag, UINT8 *data);
DECLARE_WRITE_LINE_MEMBER( irq_w );
DECLARE_WRITE_LINE_MEMBER( nmi_w );
@@ -104,7 +105,7 @@ protected:
devcb_write_line m_out_nmi_cb;
device_a1bus_card_interface *m_device;
- const char *m_cputag;
+ std::string m_cputag;
};
@@ -135,10 +136,11 @@ public:
void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, char *tag, UINT8 *data);
// inline configuration
- static void static_set_a1bus_tag(device_t &device, const char *tag, const char *slottag);
+ static void static_set_a1bus_tag(device_t &device, std::string tag, std::string slottag);
public:
a1bus_device *m_a1bus;
- const char *m_a1bus_tag, *m_a1bus_slottag;
+ std::string m_a1bus_tag;
+ std::string m_a1bus_slottag;
device_a1bus_card_interface *m_next;
};
diff --git a/src/devices/bus/a1bus/a1cassette.cpp b/src/devices/bus/a1bus/a1cassette.cpp
index 7168133647c..090aa58bfcd 100644
--- a/src/devices/bus/a1bus/a1cassette.cpp
+++ b/src/devices/bus/a1bus/a1cassette.cpp
@@ -56,14 +56,14 @@ const rom_entry *a1bus_cassette_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a1bus_cassette_device::a1bus_cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a1bus_cassette_device::a1bus_cassette_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A1BUS_CASSETTE, "Apple I cassette board", tag, owner, clock, "a1cass", __FILE__),
device_a1bus_card_interface(mconfig, *this),
m_cassette(*this, "cassette"), m_rom(nullptr), m_cassette_output_flipflop(0)
{
}
-a1bus_cassette_device::a1bus_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) :
+a1bus_cassette_device::a1bus_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) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a1bus_card_interface(mconfig, *this),
m_cassette(*this, "cassette"), m_rom(nullptr), m_cassette_output_flipflop(0)
diff --git a/src/devices/bus/a1bus/a1cassette.h b/src/devices/bus/a1bus/a1cassette.h
index 482704b31cf..c63353979dd 100644
--- a/src/devices/bus/a1bus/a1cassette.h
+++ b/src/devices/bus/a1bus/a1cassette.h
@@ -24,8 +24,8 @@ class a1bus_cassette_device:
{
public:
// construction/destruction
- a1bus_cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a1bus_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);
+ a1bus_cassette_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a1bus_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);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/a1bus/a1cffa.cpp b/src/devices/bus/a1bus/a1cffa.cpp
index 912401a0642..e9a29649c97 100644
--- a/src/devices/bus/a1bus/a1cffa.cpp
+++ b/src/devices/bus/a1bus/a1cffa.cpp
@@ -51,14 +51,14 @@ const rom_entry *a1bus_cffa_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a1bus_cffa_device::a1bus_cffa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a1bus_cffa_device::a1bus_cffa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A1BUS_CFFA, "CFFA Compact Flash for Apple I", tag, owner, clock, "cffa1", __FILE__),
device_a1bus_card_interface(mconfig, *this),
m_ata(*this, CFFA_ATA_TAG), m_rom(nullptr), m_lastdata(0), m_writeprotect(false)
{
}
-a1bus_cffa_device::a1bus_cffa_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) :
+a1bus_cffa_device::a1bus_cffa_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_a1bus_card_interface(mconfig, *this),
m_ata(*this, CFFA_ATA_TAG), m_rom(nullptr), m_lastdata(0), m_writeprotect(false)
diff --git a/src/devices/bus/a1bus/a1cffa.h b/src/devices/bus/a1bus/a1cffa.h
index d395468891b..738d1bcbcc2 100644
--- a/src/devices/bus/a1bus/a1cffa.h
+++ b/src/devices/bus/a1bus/a1cffa.h
@@ -25,8 +25,8 @@ class a1bus_cffa_device:
{
public:
// construction/destruction
- a1bus_cffa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a1bus_cffa_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);
+ a1bus_cffa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a1bus_cffa_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);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;