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 | |
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')
-rw-r--r-- | src/devices/bus/bml3/bml3bus.cpp | 26 | ||||
-rw-r--r-- | src/devices/bus/bml3/bml3bus.h | 22 | ||||
-rw-r--r-- | src/devices/bus/bml3/bml3kanji.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/bml3/bml3kanji.h | 2 | ||||
-rw-r--r-- | src/devices/bus/bml3/bml3mp1802.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/bml3/bml3mp1802.h | 2 | ||||
-rw-r--r-- | src/devices/bus/bml3/bml3mp1805.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/bml3/bml3mp1805.h | 2 |
8 files changed, 29 insertions, 31 deletions
diff --git a/src/devices/bus/bml3/bml3bus.cpp b/src/devices/bus/bml3/bml3bus.cpp index d28e7f49ca8..0438cc58997 100644 --- a/src/devices/bus/bml3/bml3bus.cpp +++ b/src/devices/bus/bml3/bml3bus.cpp @@ -60,19 +60,19 @@ const device_type BML3BUS_SLOT = &device_creator<bml3bus_slot_device>; //------------------------------------------------- // bml3bus_slot_device - constructor //------------------------------------------------- -bml3bus_slot_device::bml3bus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +bml3bus_slot_device::bml3bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, BML3BUS_SLOT, "Hitachi MB-6890 Slot", tag, owner, clock, "bml3bus_slot", __FILE__), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_bml3bus_tag(nullptr), m_bml3bus_slottag(nullptr) { } -bml3bus_slot_device::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::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_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_bml3bus_tag(nullptr), m_bml3bus_slottag(nullptr) { } -void bml3bus_slot_device::static_set_bml3bus_slot(device_t &device, std::string tag, std::string slottag) +void bml3bus_slot_device::static_set_bml3bus_slot(device_t &device, const char *tag, const char *slottag) { bml3bus_slot_device &bml3bus_card = dynamic_cast<bml3bus_slot_device &>(device); bml3bus_card.m_bml3bus_tag = tag; @@ -96,7 +96,7 @@ void bml3bus_slot_device::device_start() const device_type BML3BUS = &device_creator<bml3bus_device>; -void bml3bus_device::static_set_cputag(device_t &device, std::string tag) +void bml3bus_device::static_set_cputag(device_t &device, const char *tag) { bml3bus_device &bml3bus = downcast<bml3bus_device &>(device); bml3bus.m_cputag = tag; @@ -110,19 +110,19 @@ void bml3bus_device::static_set_cputag(device_t &device, std::string tag) // bml3bus_device - constructor //------------------------------------------------- -bml3bus_device::bml3bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +bml3bus_device::bml3bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, BML3BUS, "Hitachi MB-6890 Bus", tag, owner, clock, "bml3bus", __FILE__), m_maincpu(nullptr), m_out_nmi_cb(*this), m_out_irq_cb(*this), - m_out_firq_cb(*this) + m_out_firq_cb(*this), m_cputag(nullptr) { } -bml3bus_device::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::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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr), m_out_nmi_cb(*this), m_out_irq_cb(*this), - m_out_firq_cb(*this) + m_out_firq_cb(*this), m_cputag(nullptr) { } //------------------------------------------------- @@ -204,7 +204,7 @@ WRITE_LINE_MEMBER( bml3bus_device::firq_w ) { m_out_firq_cb(state); } device_bml3bus_card_interface::device_bml3bus_card_interface(const machine_config &mconfig, device_t &device) : device_slot_card_interface(mconfig, device), m_bml3bus(nullptr), - m_slot(0), m_next(nullptr) + m_bml3bus_tag(nullptr), m_bml3bus_slottag(nullptr), m_slot(0), m_next(nullptr) { } @@ -217,7 +217,7 @@ device_bml3bus_card_interface::~device_bml3bus_card_interface() { } -void device_bml3bus_card_interface::static_set_bml3bus_tag(device_t &device, std::string tag, std::string slottag) +void device_bml3bus_card_interface::static_set_bml3bus_tag(device_t &device, const char *tag, const char *slottag) { device_bml3bus_card_interface &bml3bus_card = dynamic_cast<device_bml3bus_card_interface &>(device); bml3bus_card.m_bml3bus_tag = tag; @@ -227,7 +227,7 @@ void device_bml3bus_card_interface::static_set_bml3bus_tag(device_t &device, std void device_bml3bus_card_interface::set_bml3bus_device() { // extract the slot number from the last digit of the slot tag - int tlen = strlen(m_bml3bus_slottag.c_str()); + int tlen = strlen(m_bml3bus_slottag); m_slot = (m_bml3bus_slottag[tlen-1] - '1'); 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; }; diff --git a/src/devices/bus/bml3/bml3kanji.cpp b/src/devices/bus/bml3/bml3kanji.cpp index 105fac45a7f..0b0d4f519e2 100644 --- a/src/devices/bus/bml3/bml3kanji.cpp +++ b/src/devices/bus/bml3/bml3kanji.cpp @@ -72,7 +72,7 @@ WRITE8_MEMBER( bml3bus_kanji_device::bml3_kanji_w ) // LIVE DEVICE //************************************************************************** -bml3bus_kanji_device::bml3bus_kanji_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +bml3bus_kanji_device::bml3bus_kanji_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, BML3BUS_KANJI, "Hitachi MP-9740 Kanji Character ROM Card", tag, owner, clock, "bml3kanji", __FILE__), device_bml3bus_card_interface(mconfig, *this), m_kanji_addr(0), m_rom(nullptr) { diff --git a/src/devices/bus/bml3/bml3kanji.h b/src/devices/bus/bml3/bml3kanji.h index 443b04cff36..8a1c8dd24df 100644 --- a/src/devices/bus/bml3/bml3kanji.h +++ b/src/devices/bus/bml3/bml3kanji.h @@ -24,7 +24,7 @@ class bml3bus_kanji_device: { public: // construction/destruction - bml3bus_kanji_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + bml3bus_kanji_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/bml3/bml3mp1802.cpp b/src/devices/bus/bml3/bml3mp1802.cpp index 9435c1499aa..911d72c725e 100644 --- a/src/devices/bus/bml3/bml3mp1802.cpp +++ b/src/devices/bus/bml3/bml3mp1802.cpp @@ -106,7 +106,7 @@ WRITE8_MEMBER( bml3bus_mp1802_device::bml3_mp1802_w) // LIVE DEVICE //************************************************************************** -bml3bus_mp1802_device::bml3bus_mp1802_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +bml3bus_mp1802_device::bml3bus_mp1802_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, BML3BUS_MP1802, "Hitachi MP-1802 Floppy Controller Card", tag, owner, clock, "bml3mp1802", __FILE__), device_bml3bus_card_interface(mconfig, *this), m_fdc(*this, "fdc"), diff --git a/src/devices/bus/bml3/bml3mp1802.h b/src/devices/bus/bml3/bml3mp1802.h index 75dcddf1747..de42c95261a 100644 --- a/src/devices/bus/bml3/bml3mp1802.h +++ b/src/devices/bus/bml3/bml3mp1802.h @@ -28,7 +28,7 @@ class bml3bus_mp1802_device: { public: // construction/destruction - bml3bus_mp1802_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + bml3bus_mp1802_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/bml3/bml3mp1805.cpp b/src/devices/bus/bml3/bml3mp1805.cpp index 3622e65a1cd..e1b2317b7c6 100644 --- a/src/devices/bus/bml3/bml3mp1805.cpp +++ b/src/devices/bus/bml3/bml3mp1805.cpp @@ -137,7 +137,7 @@ WRITE8_MEMBER( bml3bus_mp1805_device::bml3_mp1805_w) // LIVE DEVICE //************************************************************************** -bml3bus_mp1805_device::bml3bus_mp1805_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +bml3bus_mp1805_device::bml3bus_mp1805_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, BML3BUS_MP1805, "Hitachi MP-1805 Floppy Controller Card", tag, owner, clock, "bml3mp1805", __FILE__), device_bml3bus_card_interface(mconfig, *this), m_mc6843(*this, "mc6843"), m_rom(nullptr) diff --git a/src/devices/bus/bml3/bml3mp1805.h b/src/devices/bus/bml3/bml3mp1805.h index 0f79aa21eda..57ffdfefcaa 100644 --- a/src/devices/bus/bml3/bml3mp1805.h +++ b/src/devices/bus/bml3/bml3mp1805.h @@ -27,7 +27,7 @@ class bml3bus_mp1805_device: { public: // construction/destruction - bml3bus_mp1805_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + bml3bus_mp1805_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; |