diff options
Diffstat (limited to 'src/devices/bus/amiga/zorro/zorro.cpp')
-rw-r--r-- | src/devices/bus/amiga/zorro/zorro.cpp | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/devices/bus/amiga/zorro/zorro.cpp b/src/devices/bus/amiga/zorro/zorro.cpp index b5a8e2768c9..72f4eaed43d 100644 --- a/src/devices/bus/amiga/zorro/zorro.cpp +++ b/src/devices/bus/amiga/zorro/zorro.cpp @@ -21,20 +21,22 @@ const device_type ZORRO_SLOT = &device_creator<zorro_slot_device>; // zorro_slot_device - constructor //------------------------------------------------- -zorro_slot_device::zorro_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +zorro_slot_device::zorro_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ZORRO_SLOT, "Zorro slot", tag, owner, clock, "zorro_slot", __FILE__), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), + m_zorro_tag(nullptr) { } zorro_slot_device::zorro_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) : + 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_zorro_tag(nullptr) { } -void zorro_slot_device::set_zorro_slot(device_t &device, device_t *owner, std::string zorro_tag) +void zorro_slot_device::set_zorro_slot(device_t &device, device_t *owner, const char *zorro_tag) { zorro_slot_device &zorro_card = dynamic_cast<zorro_slot_device &>(device); zorro_card.m_owner = owner; @@ -66,9 +68,10 @@ void zorro_slot_device::device_start() //------------------------------------------------- zorro_device::zorro_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) : + 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_space(nullptr), + m_cputag(nullptr), m_ovr_handler(*this), m_int2_handler(*this), m_int6_handler(*this) @@ -79,7 +82,7 @@ zorro_device::zorro_device(const machine_config &mconfig, device_type type, cons // set_cputag - set cpu we are attached to //------------------------------------------------- -void zorro_device::set_cputag(device_t &device, std::string tag) +void zorro_device::set_cputag(device_t &device, const char *tag) { zorro_device &zorro = downcast<zorro_device &>(device); zorro.m_cputag = tag; @@ -117,7 +120,7 @@ const device_type EXP_SLOT = &device_creator<exp_slot_device>; // exp_slot_device - constructor //------------------------------------------------- -exp_slot_device::exp_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +exp_slot_device::exp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : zorro_device(mconfig, EXP_SLOT, "86-pin expansion slot", tag, owner, clock, "exp_slot", __FILE__), m_ipl_handler(*this), m_dev(nullptr) @@ -125,7 +128,7 @@ exp_slot_device::exp_slot_device(const machine_config &mconfig, std::string tag, } exp_slot_device::exp_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) : + const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : zorro_device(mconfig, type, name, tag, owner, clock, shortname, source), m_ipl_handler(*this), m_dev(nullptr) @@ -183,7 +186,7 @@ const device_type ZORRO2 = &device_creator<zorro2_device>; // zorro2_device - constructor //------------------------------------------------- -zorro2_device::zorro2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +zorro2_device::zorro2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : zorro_device(mconfig, ZORRO2, "Zorro-II bus", tag, owner, clock, "zorro2", __FILE__), m_eint1_handler(*this), m_eint4_handler(*this), @@ -194,7 +197,7 @@ zorro2_device::zorro2_device(const machine_config &mconfig, std::string tag, dev } zorro2_device::zorro2_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) : + const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : zorro_device(mconfig, type, name, tag, owner, clock, shortname, source), m_eint1_handler(*this), m_eint4_handler(*this), |