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/astrocde | |
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/astrocde')
-rw-r--r-- | src/devices/bus/astrocde/exp.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/astrocde/exp.h | 2 | ||||
-rw-r--r-- | src/devices/bus/astrocde/ram.cpp | 14 | ||||
-rw-r--r-- | src/devices/bus/astrocde/ram.h | 14 | ||||
-rw-r--r-- | src/devices/bus/astrocde/rom.cpp | 8 | ||||
-rw-r--r-- | src/devices/bus/astrocde/rom.h | 8 | ||||
-rw-r--r-- | src/devices/bus/astrocde/slot.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/astrocde/slot.h | 4 |
8 files changed, 28 insertions, 28 deletions
diff --git a/src/devices/bus/astrocde/exp.cpp b/src/devices/bus/astrocde/exp.cpp index 5c81eb6b4ef..2d6e7eb51b3 100644 --- a/src/devices/bus/astrocde/exp.cpp +++ b/src/devices/bus/astrocde/exp.cpp @@ -35,7 +35,7 @@ device_astrocade_card_interface::~device_astrocade_card_interface() //------------------------------------------------- // astrocade_exp_device - constructor //------------------------------------------------- -astrocade_exp_device::astrocade_exp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +astrocade_exp_device::astrocade_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ASTROCADE_EXP_SLOT, "Bally Astrocade expansion", tag, owner, clock, "astrocde_exp", __FILE__), device_slot_interface(mconfig, *this), m_card_mounted(false), m_card(nullptr) diff --git a/src/devices/bus/astrocde/exp.h b/src/devices/bus/astrocde/exp.h index 31326a2db29..b2d6e3643ea 100644 --- a/src/devices/bus/astrocde/exp.h +++ b/src/devices/bus/astrocde/exp.h @@ -25,7 +25,7 @@ class astrocade_exp_device : public device_t, { public: // construction/destruction - astrocade_exp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + astrocade_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~astrocade_exp_device(); // device-level overrides diff --git a/src/devices/bus/astrocde/ram.cpp b/src/devices/bus/astrocde/ram.cpp index c63a13af887..95ebb6816aa 100644 --- a/src/devices/bus/astrocde/ram.cpp +++ b/src/devices/bus/astrocde/ram.cpp @@ -68,45 +68,45 @@ const device_type ASTROCADE_WHITERAM = &device_creator<astrocade_whiteram_dev const device_type ASTROCADE_RL64RAM = &device_creator<astrocade_rl64ram_device>; -astrocade_blueram_4k_device::astrocade_blueram_4k_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) +astrocade_blueram_4k_device::astrocade_blueram_4k_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_astrocade_card_interface(mconfig, *this), m_write_prot(*this, "RAM_PROTECT") { } -astrocade_blueram_4k_device::astrocade_blueram_4k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +astrocade_blueram_4k_device::astrocade_blueram_4k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ASTROCADE_BLUERAM_4K, "Bally Astrocade Blue RAM 4K", tag, owner, clock, "astrocade_br4", __FILE__), device_astrocade_card_interface(mconfig, *this), m_write_prot(*this, "RAM_PROTECT") { } -astrocade_blueram_16k_device::astrocade_blueram_16k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +astrocade_blueram_16k_device::astrocade_blueram_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : astrocade_blueram_4k_device(mconfig, ASTROCADE_BLUERAM_16K, "Bally Astrocade Blue RAM 16K", tag, owner, clock, "astrocade_br16", __FILE__) { } -astrocade_blueram_32k_device::astrocade_blueram_32k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +astrocade_blueram_32k_device::astrocade_blueram_32k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : astrocade_blueram_4k_device(mconfig, ASTROCADE_BLUERAM_32K, "Bally Astrocade Blue RAM 32K", tag, owner, clock, "astrocade_br32", __FILE__) { } -astrocade_viper_sys1_device::astrocade_viper_sys1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +astrocade_viper_sys1_device::astrocade_viper_sys1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ASTROCADE_VIPER_SYS1, "Bally Astrocade Viper System 1", tag, owner, clock, "astrocade_vs1", __FILE__), device_astrocade_card_interface(mconfig, *this), m_write_prot(*this, "RAM_PROTECT") { } -astrocade_whiteram_device::astrocade_whiteram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +astrocade_whiteram_device::astrocade_whiteram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ASTROCADE_WHITERAM, "Bally Astrocade Lil' White RAM 32K", tag, owner, clock, "astrocade_lwr", __FILE__), device_astrocade_card_interface(mconfig, *this), m_write_prot(*this, "RAM_PROTECT") { } -astrocade_rl64ram_device::astrocade_rl64ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +astrocade_rl64ram_device::astrocade_rl64ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ASTROCADE_RL64RAM, "Bally Astrocade R&L RAM 64K", tag, owner, clock, "astrocade_rl64", __FILE__), device_astrocade_card_interface(mconfig, *this), m_write_prot(*this, "RAM_PROTECT") diff --git a/src/devices/bus/astrocde/ram.h b/src/devices/bus/astrocde/ram.h index b279056b9cb..673e7bef8d9 100644 --- a/src/devices/bus/astrocde/ram.h +++ b/src/devices/bus/astrocde/ram.h @@ -13,8 +13,8 @@ class astrocade_blueram_4k_device : public device_t, { public: // construction/destruction - astrocade_blueram_4k_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); - astrocade_blueram_4k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + astrocade_blueram_4k_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); + astrocade_blueram_4k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override { m_ram.resize(0x1000); save_item(NAME(m_ram)); } @@ -36,7 +36,7 @@ class astrocade_blueram_16k_device : public astrocade_blueram_4k_device { public: // construction/destruction - astrocade_blueram_16k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + astrocade_blueram_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual void device_start() override { m_ram.resize(0x4000); save_item(NAME(m_ram)); } }; @@ -47,7 +47,7 @@ class astrocade_blueram_32k_device : public astrocade_blueram_4k_device { public: // construction/destruction - astrocade_blueram_32k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + astrocade_blueram_32k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual void device_start() override { m_ram.resize(0x8000); save_item(NAME(m_ram)); } }; @@ -59,7 +59,7 @@ class astrocade_viper_sys1_device : public device_t, { public: // construction/destruction - astrocade_viper_sys1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + astrocade_viper_sys1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override { m_ram.resize(0x4000); save_item(NAME(m_ram)); } @@ -82,7 +82,7 @@ class astrocade_whiteram_device : public device_t, { public: // construction/destruction - astrocade_whiteram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + astrocade_whiteram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override { m_ram.resize(0x8000); save_item(NAME(m_ram)); } @@ -105,7 +105,7 @@ class astrocade_rl64ram_device : public device_t, { public: // construction/destruction - astrocade_rl64ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + astrocade_rl64ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override { m_ram.resize(0xb000); save_item(NAME(m_ram)); } diff --git a/src/devices/bus/astrocde/rom.cpp b/src/devices/bus/astrocde/rom.cpp index 31a9bc0934f..201a4d1afe6 100644 --- a/src/devices/bus/astrocde/rom.cpp +++ b/src/devices/bus/astrocde/rom.cpp @@ -22,24 +22,24 @@ const device_type ASTROCADE_ROM_256K = &device_creator<astrocade_rom_256k_device const device_type ASTROCADE_ROM_512K = &device_creator<astrocade_rom_512k_device>; -astrocade_rom_device::astrocade_rom_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) +astrocade_rom_device::astrocade_rom_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_astrocade_cart_interface(mconfig, *this) { } -astrocade_rom_device::astrocade_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +astrocade_rom_device::astrocade_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ASTROCADE_ROM_STD, "Bally Astrocade Standard Carts", tag, owner, clock, "astrocade_rom", __FILE__), device_astrocade_cart_interface(mconfig, *this) { } -astrocade_rom_256k_device::astrocade_rom_256k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +astrocade_rom_256k_device::astrocade_rom_256k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : astrocade_rom_device(mconfig, ASTROCADE_ROM_256K, "Bally Astrocade 256K Carts", tag, owner, clock, "astrocade_256k", __FILE__), m_base_bank(0) { } -astrocade_rom_512k_device::astrocade_rom_512k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +astrocade_rom_512k_device::astrocade_rom_512k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : astrocade_rom_device(mconfig, ASTROCADE_ROM_512K, "Bally Astrocade 512K Carts", tag, owner, clock, "astrocade_512k", __FILE__), m_base_bank(0) { } diff --git a/src/devices/bus/astrocde/rom.h b/src/devices/bus/astrocde/rom.h index 531e10bbbb2..28fcb0d43bb 100644 --- a/src/devices/bus/astrocde/rom.h +++ b/src/devices/bus/astrocde/rom.h @@ -13,8 +13,8 @@ class astrocade_rom_device : public device_t, { public: // construction/destruction - astrocade_rom_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); - astrocade_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + astrocade_rom_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); + astrocade_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override {} @@ -30,7 +30,7 @@ class astrocade_rom_256k_device : public astrocade_rom_device { public: // construction/destruction - astrocade_rom_256k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + astrocade_rom_256k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual void device_start() override; virtual void device_reset() override; @@ -48,7 +48,7 @@ class astrocade_rom_512k_device : public astrocade_rom_device { public: // construction/destruction - astrocade_rom_512k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + astrocade_rom_512k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual void device_start() override; virtual void device_reset() override; diff --git a/src/devices/bus/astrocde/slot.cpp b/src/devices/bus/astrocde/slot.cpp index 0faaf550865..8ae7bbe8c15 100644 --- a/src/devices/bus/astrocde/slot.cpp +++ b/src/devices/bus/astrocde/slot.cpp @@ -45,7 +45,7 @@ device_astrocade_cart_interface::~device_astrocade_cart_interface() // rom_alloc - alloc the space for the cart //------------------------------------------------- -void device_astrocade_cart_interface::rom_alloc(UINT32 size, std::string tag) +void device_astrocade_cart_interface::rom_alloc(UINT32 size, const char *tag) { if (m_rom == nullptr) { @@ -62,7 +62,7 @@ void device_astrocade_cart_interface::rom_alloc(UINT32 size, std::string tag) //------------------------------------------------- // astrocade_cart_slot_device - constructor //------------------------------------------------- -astrocade_cart_slot_device::astrocade_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +astrocade_cart_slot_device::astrocade_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ASTROCADE_CART_SLOT, "Bally Astrocade Cartridge Slot", tag, owner, clock, "astrocade_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), diff --git a/src/devices/bus/astrocde/slot.h b/src/devices/bus/astrocde/slot.h index 2a22a3a64a0..1a28ccf4b96 100644 --- a/src/devices/bus/astrocde/slot.h +++ b/src/devices/bus/astrocde/slot.h @@ -29,7 +29,7 @@ public: // reading and writing virtual DECLARE_READ8_MEMBER(read_rom) { return 0xff; } - void rom_alloc(UINT32 size, std::string tag); + void rom_alloc(UINT32 size, const char *tag); UINT8* get_rom_base() { return m_rom; } UINT32 get_rom_size() { return m_rom_size; } @@ -48,7 +48,7 @@ class astrocade_cart_slot_device : public device_t, { public: // construction/destruction - astrocade_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + astrocade_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~astrocade_cart_slot_device(); // device-level overrides |