summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/gba
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/gba')
-rw-r--r--src/devices/bus/gba/gba_slot.cpp4
-rw-r--r--src/devices/bus/gba/gba_slot.h4
-rw-r--r--src/devices/bus/gba/rom.cpp14
-rw-r--r--src/devices/bus/gba/rom.h14
4 files changed, 18 insertions, 18 deletions
diff --git a/src/devices/bus/gba/gba_slot.cpp b/src/devices/bus/gba/gba_slot.cpp
index 217f3f9e954..83ee37755ff 100644
--- a/src/devices/bus/gba/gba_slot.cpp
+++ b/src/devices/bus/gba/gba_slot.cpp
@@ -46,7 +46,7 @@ device_gba_cart_interface::~device_gba_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_gba_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_gba_cart_interface::rom_alloc(UINT32 size, std::string tag)
{
if (m_rom == nullptr)
{
@@ -74,7 +74,7 @@ void device_gba_cart_interface::nvram_alloc(UINT32 size)
//-------------------------------------------------
// gba_cart_slot_device - constructor
//-------------------------------------------------
-gba_cart_slot_device::gba_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+gba_cart_slot_device::gba_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, GBA_CART_SLOT, "Game Boy Advance Cartridge Slot", tag, owner, clock, "gba_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
diff --git a/src/devices/bus/gba/gba_slot.h b/src/devices/bus/gba/gba_slot.h
index 9d9a6a48be7..55a01a30827 100644
--- a/src/devices/bus/gba/gba_slot.h
+++ b/src/devices/bus/gba/gba_slot.h
@@ -36,7 +36,7 @@ public:
virtual DECLARE_READ32_MEMBER(read_ram) { return 0xffffffff; }
virtual DECLARE_WRITE32_MEMBER(write_ram) {};
- void rom_alloc(UINT32 size, const char *tag);
+ void rom_alloc(UINT32 size, std::string tag);
void nvram_alloc(UINT32 size);
UINT32* get_rom_base() { return m_rom; }
UINT32* get_nvram_base() { return &m_nvram[0]; }
@@ -61,7 +61,7 @@ class gba_cart_slot_device : public device_t,
{
public:
// construction/destruction
- gba_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gba_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~gba_cart_slot_device();
// device-level overrides
diff --git a/src/devices/bus/gba/rom.cpp b/src/devices/bus/gba/rom.cpp
index 8e857dfe004..13e773bca18 100644
--- a/src/devices/bus/gba/rom.cpp
+++ b/src/devices/bus/gba/rom.cpp
@@ -29,40 +29,40 @@ const device_type GBA_ROM_FLASH = &device_creator<gba_rom_flash_device>;
const device_type GBA_ROM_FLASH1M = &device_creator<gba_rom_flash1m_device>;
-gba_rom_device::gba_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)
+gba_rom_device::gba_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)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_gba_cart_interface( mconfig, *this )
{
}
-gba_rom_device::gba_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gba_rom_device::gba_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, GBA_ROM_STD, "GBA Carts", tag, owner, clock, "gba_rom", __FILE__),
device_gba_cart_interface( mconfig, *this )
{
}
-gba_rom_sram_device::gba_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gba_rom_sram_device::gba_rom_sram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: gba_rom_device(mconfig, GBA_ROM_SRAM, "GBA Carts + SRAM", tag, owner, clock, "gba_sram", __FILE__)
{
}
-gba_rom_eeprom_device::gba_rom_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gba_rom_eeprom_device::gba_rom_eeprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: gba_rom_device(mconfig, GBA_ROM_EEPROM, "GBA Carts + EEPROM", tag, owner, clock, "gba_eeprom", __FILE__)
{
}
-gba_rom_eeprom64_device::gba_rom_eeprom64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gba_rom_eeprom64_device::gba_rom_eeprom64_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: gba_rom_device(mconfig, GBA_ROM_EEPROM64, "GBA Carts + EEPROM 64K", tag, owner, clock, "gba_eeprom64", __FILE__)
{
}
-gba_rom_flash_device::gba_rom_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gba_rom_flash_device::gba_rom_flash_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: gba_rom_device(mconfig, GBA_ROM_FLASH, "GBA Carts + Panasonic Flash", tag, owner, clock, "gba_flash", __FILE__), m_flash_mask(0),
m_flash(*this, "flash")
{
}
-gba_rom_flash1m_device::gba_rom_flash1m_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gba_rom_flash1m_device::gba_rom_flash1m_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: gba_rom_device(mconfig, GBA_ROM_FLASH1M, "GBA Carts + Sanyo Flash", tag, owner, clock, "gba_flash1m", __FILE__), m_flash_mask(0),
m_flash(*this, "flash")
{
diff --git a/src/devices/bus/gba/rom.h b/src/devices/bus/gba/rom.h
index f9a3c16cb2e..d9f58bddac4 100644
--- a/src/devices/bus/gba/rom.h
+++ b/src/devices/bus/gba/rom.h
@@ -14,8 +14,8 @@ class gba_rom_device : public device_t,
{
public:
// construction/destruction
- gba_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);
- gba_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gba_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);
+ gba_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -31,7 +31,7 @@ class gba_rom_sram_device : public gba_rom_device
{
public:
// construction/destruction
- gba_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gba_rom_sram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ32_MEMBER(read_ram) override;
@@ -44,7 +44,7 @@ class gba_rom_flash_device : public gba_rom_device
{
public:
// construction/destruction
- gba_rom_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gba_rom_flash_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -66,7 +66,7 @@ class gba_rom_flash1m_device : public gba_rom_device
{
public:
// construction/destruction
- gba_rom_flash1m_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gba_rom_flash1m_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -127,7 +127,7 @@ class gba_rom_eeprom_device : public gba_rom_device
{
public:
// construction/destruction
- gba_rom_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gba_rom_eeprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -147,7 +147,7 @@ class gba_rom_eeprom64_device : public gba_rom_device
{
public:
// construction/destruction
- gba_rom_eeprom64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gba_rom_eeprom64_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;