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/saturn | |
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/saturn')
-rw-r--r-- | src/devices/bus/saturn/bram.cpp | 10 | ||||
-rw-r--r-- | src/devices/bus/saturn/bram.h | 10 | ||||
-rw-r--r-- | src/devices/bus/saturn/dram.cpp | 6 | ||||
-rw-r--r-- | src/devices/bus/saturn/dram.h | 6 | ||||
-rw-r--r-- | src/devices/bus/saturn/rom.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/saturn/rom.h | 4 | ||||
-rw-r--r-- | src/devices/bus/saturn/sat_slot.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/saturn/sat_slot.h | 4 |
8 files changed, 24 insertions, 24 deletions
diff --git a/src/devices/bus/saturn/bram.cpp b/src/devices/bus/saturn/bram.cpp index a8da0d2e12f..28d0aba2945 100644 --- a/src/devices/bus/saturn/bram.cpp +++ b/src/devices/bus/saturn/bram.cpp @@ -21,32 +21,32 @@ const device_type SATURN_BRAM_16MB = &device_creator<saturn_bram16mb_device>; const device_type SATURN_BRAM_32MB = &device_creator<saturn_bram32mb_device>; -saturn_bram_device::saturn_bram_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) +saturn_bram_device::saturn_bram_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_sat_cart_interface( mconfig, *this ), device_nvram_interface(mconfig, *this) { } -saturn_bram4mb_device::saturn_bram4mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +saturn_bram4mb_device::saturn_bram4mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : saturn_bram_device(mconfig, SATURN_BRAM_4MB, "Saturn Battery RAM 4Mbit Cart", tag, owner, clock, "sat_bram_4mb", __FILE__) { m_cart_type = 0x21; } -saturn_bram8mb_device::saturn_bram8mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +saturn_bram8mb_device::saturn_bram8mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : saturn_bram_device(mconfig, SATURN_BRAM_8MB, "Saturn Battery RAM 8Mbit Cart", tag, owner, clock, "sat_bram_8mb", __FILE__) { m_cart_type = 0x22; } -saturn_bram16mb_device::saturn_bram16mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +saturn_bram16mb_device::saturn_bram16mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : saturn_bram_device(mconfig, SATURN_BRAM_16MB, "Saturn Battery RAM 16Mbit Cart", tag, owner, clock, "sat_bram_16mb", __FILE__) { m_cart_type = 0x23; } -saturn_bram32mb_device::saturn_bram32mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +saturn_bram32mb_device::saturn_bram32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : saturn_bram_device(mconfig, SATURN_BRAM_32MB, "Saturn Battery RAM 32Mbit Cart", tag, owner, clock, "sat_bram_32mb", __FILE__) { m_cart_type = 0x24; diff --git a/src/devices/bus/saturn/bram.h b/src/devices/bus/saturn/bram.h index c43734eb455..e6237ff76ce 100644 --- a/src/devices/bus/saturn/bram.h +++ b/src/devices/bus/saturn/bram.h @@ -14,7 +14,7 @@ class saturn_bram_device : public device_t, { public: // construction/destruction - saturn_bram_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); + saturn_bram_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; @@ -34,28 +34,28 @@ class saturn_bram4mb_device : public saturn_bram_device { public: // construction/destruction - saturn_bram4mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + saturn_bram4mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class saturn_bram8mb_device : public saturn_bram_device { public: // construction/destruction - saturn_bram8mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + saturn_bram8mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class saturn_bram16mb_device : public saturn_bram_device { public: // construction/destruction - saturn_bram16mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + saturn_bram16mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class saturn_bram32mb_device : public saturn_bram_device { public: // construction/destruction - saturn_bram32mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + saturn_bram32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/bus/saturn/dram.cpp b/src/devices/bus/saturn/dram.cpp index 0ac5008de27..d1078fcc722 100644 --- a/src/devices/bus/saturn/dram.cpp +++ b/src/devices/bus/saturn/dram.cpp @@ -19,19 +19,19 @@ const device_type SATURN_DRAM_8MB = &device_creator<saturn_dram8mb_device>; const device_type SATURN_DRAM_32MB = &device_creator<saturn_dram32mb_device>; -saturn_dram_device::saturn_dram_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) +saturn_dram_device::saturn_dram_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_sat_cart_interface( mconfig, *this ) { } -saturn_dram8mb_device::saturn_dram8mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +saturn_dram8mb_device::saturn_dram8mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : saturn_dram_device(mconfig, SATURN_DRAM_8MB, "Saturn Data RAM 8Mbit Cart", tag, owner, clock, "sat_dram_8mb", __FILE__) { m_cart_type = 0x5a; } -saturn_dram32mb_device::saturn_dram32mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +saturn_dram32mb_device::saturn_dram32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : saturn_dram_device(mconfig, SATURN_DRAM_32MB, "Saturn Data RAM 32Mbit Cart", tag, owner, clock, "sat_dram_32mb", __FILE__) { m_cart_type = 0x5c; diff --git a/src/devices/bus/saturn/dram.h b/src/devices/bus/saturn/dram.h index 571eaf47759..29ddbfcbcdc 100644 --- a/src/devices/bus/saturn/dram.h +++ b/src/devices/bus/saturn/dram.h @@ -13,7 +13,7 @@ class saturn_dram_device : public device_t, { public: // construction/destruction - saturn_dram_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); + saturn_dram_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; @@ -30,14 +30,14 @@ class saturn_dram8mb_device : public saturn_dram_device { public: // construction/destruction - saturn_dram8mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + saturn_dram8mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class saturn_dram32mb_device : public saturn_dram_device { public: // construction/destruction - saturn_dram32mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + saturn_dram32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/bus/saturn/rom.cpp b/src/devices/bus/saturn/rom.cpp index 3c34ec1aa9b..7b8068735a1 100644 --- a/src/devices/bus/saturn/rom.cpp +++ b/src/devices/bus/saturn/rom.cpp @@ -18,13 +18,13 @@ const device_type SATURN_ROM = &device_creator<saturn_rom_device>; -saturn_rom_device::saturn_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) +saturn_rom_device::saturn_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_sat_cart_interface( mconfig, *this ) { } -saturn_rom_device::saturn_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +saturn_rom_device::saturn_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SATURN_ROM, "Saturn ROM Carts", tag, owner, clock, "sat_rom", __FILE__), device_sat_cart_interface( mconfig, *this ) { diff --git a/src/devices/bus/saturn/rom.h b/src/devices/bus/saturn/rom.h index a81293930d9..ffd80e272ee 100644 --- a/src/devices/bus/saturn/rom.h +++ b/src/devices/bus/saturn/rom.h @@ -13,8 +13,8 @@ class saturn_rom_device : public device_t, { public: // construction/destruction - saturn_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); - saturn_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + saturn_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); + saturn_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/saturn/sat_slot.cpp b/src/devices/bus/saturn/sat_slot.cpp index 3b860444277..dba415c8a47 100644 --- a/src/devices/bus/saturn/sat_slot.cpp +++ b/src/devices/bus/saturn/sat_slot.cpp @@ -56,7 +56,7 @@ device_sat_cart_interface::~device_sat_cart_interface() // rom_alloc - alloc the space for the cart //------------------------------------------------- -void device_sat_cart_interface::rom_alloc(UINT32 size, std::string tag) +void device_sat_cart_interface::rom_alloc(UINT32 size, const char *tag) { if (m_rom == nullptr) { @@ -101,7 +101,7 @@ void device_sat_cart_interface::dram1_alloc(UINT32 size) //------------------------------------------------- // sat_cart_slot_device - constructor //------------------------------------------------- -sat_cart_slot_device::sat_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +sat_cart_slot_device::sat_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SATURN_CART_SLOT, "Saturn Cartridge Slot", tag, owner, clock, "sat_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), m_cart(nullptr) diff --git a/src/devices/bus/saturn/sat_slot.h b/src/devices/bus/saturn/sat_slot.h index 6bfe37ebda1..e8a711c3a0b 100644 --- a/src/devices/bus/saturn/sat_slot.h +++ b/src/devices/bus/saturn/sat_slot.h @@ -31,7 +31,7 @@ public: virtual int get_cart_type() { return m_cart_type; }; - void rom_alloc(UINT32 size, std::string tag); + void rom_alloc(UINT32 size, const char *tag); void bram_alloc(UINT32 size); void dram0_alloc(UINT32 size); void dram1_alloc(UINT32 size); @@ -64,7 +64,7 @@ class sat_cart_slot_device : public device_t, { public: // construction/destruction - sat_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sat_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~sat_cart_slot_device(); // device-level overrides |