diff options
Diffstat (limited to 'src/devices/bus/a2bus/a2eauxslot.cpp')
-rw-r--r-- | src/devices/bus/a2bus/a2eauxslot.cpp | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/src/devices/bus/a2bus/a2eauxslot.cpp b/src/devices/bus/a2bus/a2eauxslot.cpp index f1d4836d37b..e8601235b46 100644 --- a/src/devices/bus/a2bus/a2eauxslot.cpp +++ b/src/devices/bus/a2bus/a2eauxslot.cpp @@ -26,21 +26,19 @@ const device_type A2EAUXSLOT_SLOT = &device_creator<a2eauxslot_slot_device>; //------------------------------------------------- // a2eauxslot_slot_device - constructor //------------------------------------------------- -a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2EAUXSLOT_SLOT, "Apple IIe AUX Slot", tag, owner, clock, "a2eauxslot_slot", __FILE__), - device_slot_interface(mconfig, *this), - m_a2eauxslot_tag(nullptr), - m_a2eauxslot_slottag(nullptr) + device_slot_interface(mconfig, *this) { } -a2eauxslot_slot_device::a2eauxslot_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) : +a2eauxslot_slot_device::a2eauxslot_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_a2eauxslot_tag(nullptr), m_a2eauxslot_slottag(nullptr) + device_slot_interface(mconfig, *this) { } -void a2eauxslot_slot_device::static_set_a2eauxslot_slot(device_t &device, const char *tag, const char *slottag) +void a2eauxslot_slot_device::static_set_a2eauxslot_slot(device_t &device, std::string tag, std::string slottag) { a2eauxslot_slot_device &a2eauxslot_card = dynamic_cast<a2eauxslot_slot_device &>(device); a2eauxslot_card.m_a2eauxslot_tag = tag; @@ -64,7 +62,7 @@ void a2eauxslot_slot_device::device_start() const device_type A2EAUXSLOT = &device_creator<a2eauxslot_device>; -void a2eauxslot_device::static_set_cputag(device_t &device, const char *tag) +void a2eauxslot_device::static_set_cputag(device_t &device, std::string tag) { a2eauxslot_device &a2eauxslot = downcast<a2eauxslot_device &>(device); a2eauxslot.m_cputag = tag; @@ -78,17 +76,17 @@ void a2eauxslot_device::static_set_cputag(device_t &device, const char *tag) // a2eauxslot_device - constructor //------------------------------------------------- -a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2EAUXSLOT, "Apple IIe AUX Bus", tag, owner, clock, "a2eauxslot", __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) { } -a2eauxslot_device::a2eauxslot_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) : +a2eauxslot_device::a2eauxslot_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) { } //------------------------------------------------- @@ -155,7 +153,7 @@ WRITE_LINE_MEMBER( a2eauxslot_device::nmi_w ) { m_out_nmi_cb(state); } device_a2eauxslot_card_interface::device_a2eauxslot_card_interface(const machine_config &mconfig, device_t &device) : device_slot_card_interface(mconfig, device), m_a2eauxslot(nullptr), - m_a2eauxslot_tag(nullptr), m_a2eauxslot_slottag(nullptr), m_slot(0), m_next(nullptr) + m_slot(0), m_next(nullptr) { } @@ -168,7 +166,7 @@ device_a2eauxslot_card_interface::~device_a2eauxslot_card_interface() { } -void device_a2eauxslot_card_interface::static_set_a2eauxslot_tag(device_t &device, const char *tag, const char *slottag) +void device_a2eauxslot_card_interface::static_set_a2eauxslot_tag(device_t &device, std::string tag, std::string slottag) { device_a2eauxslot_card_interface &a2eauxslot_card = dynamic_cast<device_a2eauxslot_card_interface &>(device); a2eauxslot_card.m_a2eauxslot_tag = tag; |