diff options
Diffstat (limited to 'src/devices/bus/a2bus/a2bus.h')
-rw-r--r-- | src/devices/bus/a2bus/a2bus.h | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/devices/bus/a2bus/a2bus.h b/src/devices/bus/a2bus/a2bus.h index 07d4e57781d..7bfa03213c8 100644 --- a/src/devices/bus/a2bus/a2bus.h +++ b/src/devices/bus/a2bus/a2bus.h @@ -63,17 +63,18 @@ class a2bus_slot_device : public device_t, { public: // construction/destruction - a2bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - a2bus_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); + a2bus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a2bus_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_a2bus_slot(device_t &device, const char *tag, const char *slottag); + static void static_set_a2bus_slot(device_t &device, std::string tag, std::string slottag); protected: // configuration - const char *m_a2bus_tag, *m_a2bus_slottag; + std::string m_a2bus_tag; + std::string m_a2bus_slottag; }; // device type definition @@ -88,11 +89,11 @@ class a2bus_device : public device_t friend class a2bus_mcms2_device; public: // construction/destruction - a2bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - a2bus_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); + a2bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a2bus_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<a2bus_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<a2bus_device &>(device).m_out_nmi_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_inh_callback(device_t &device, _Object object) { return downcast<a2bus_device &>(device).m_out_inh_cb.set_callback(object); } @@ -128,7 +129,7 @@ protected: devcb_write8 m_out_inh_cb; device_a2bus_card_interface *m_device_list[8]; - const char *m_cputag; + std::string m_cputag; UINT8 m_slot_irq_mask; UINT8 m_slot_nmi_mask; @@ -186,10 +187,11 @@ public: void slot_dma_write_no_space(UINT16 offset, UINT8 data) { m_a2bus->dma_nospace_w(offset, data); } // inline configuration - static void static_set_a2bus_tag(device_t &device, const char *tag, const char *slottag); + static void static_set_a2bus_tag(device_t &device, std::string tag, std::string slottag); public: a2bus_device *m_a2bus; - const char *m_a2bus_tag, *m_a2bus_slottag; + std::string m_a2bus_tag; + std::string m_a2bus_slottag; int m_slot; device_a2bus_card_interface *m_next; }; |