diff options
author | 2016-01-20 21:42:13 +0100 | |
---|---|---|
committer | 2016-01-20 21:42:13 +0100 | |
commit | 4e8e3066f847cc0fa11539f4d9ab8a63f70ca475 (patch) | |
tree | 25d48b50f2b89dd5b9e7dbbfeeb85c534ec6852a /src/devices/bus/bml3/bml3bus.h | |
parent | 3a8ccb89b426509be06089a19c51ecf55567ed1b (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/bml3/bml3bus.h')
-rw-r--r-- | src/devices/bus/bml3/bml3bus.h | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/devices/bus/bml3/bml3bus.h b/src/devices/bus/bml3/bml3bus.h index a7c9b82d63a..36c20f4159e 100644 --- a/src/devices/bus/bml3/bml3bus.h +++ b/src/devices/bus/bml3/bml3bus.h @@ -56,18 +56,17 @@ class bml3bus_slot_device : public device_t, { public: // construction/destruction - bml3bus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - bml3bus_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); + bml3bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + bml3bus_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); // device-level overrides virtual void device_start() override; // inline configuration - static void static_set_bml3bus_slot(device_t &device, std::string tag, std::string slottag); + static void static_set_bml3bus_slot(device_t &device, const char *tag, const char *slottag); protected: // configuration - std::string m_bml3bus_tag; - std::string m_bml3bus_slottag; + const char *m_bml3bus_tag, *m_bml3bus_slottag; }; // device type definition @@ -80,11 +79,11 @@ class bml3bus_device : public device_t { public: // construction/destruction - bml3bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - bml3bus_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); + bml3bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + bml3bus_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); // inline configuration - static void static_set_cputag(device_t &device, std::string tag); + static void static_set_cputag(device_t &device, const char *tag); template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<bml3bus_device &>(device).m_out_nmi_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<bml3bus_device &>(device).m_out_irq_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_firq_callback(device_t &device, _Object object) { return downcast<bml3bus_device &>(device).m_out_firq_cb.set_callback(object); } @@ -113,7 +112,7 @@ protected: devcb_write_line m_out_firq_cb; device_bml3bus_card_interface *m_device_list[BML3BUS_MAX_SLOTS]; - std::string m_cputag; + const char *m_cputag; }; @@ -143,11 +142,10 @@ public: void lower_slot_firq() { m_bml3bus->set_firq_line(CLEAR_LINE); } // inline configuration - static void static_set_bml3bus_tag(device_t &device, std::string tag, std::string slottag); + static void static_set_bml3bus_tag(device_t &device, const char *tag, const char *slottag); public: bml3bus_device *m_bml3bus; - std::string m_bml3bus_tag; - std::string m_bml3bus_slottag; + const char *m_bml3bus_tag, *m_bml3bus_slottag; int m_slot; device_bml3bus_card_interface *m_next; }; |