diff options
Diffstat (limited to 'src/devices/bus/isa/isa.cpp')
-rw-r--r-- | src/devices/bus/isa/isa.cpp | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/devices/bus/isa/isa.cpp b/src/devices/bus/isa/isa.cpp index 0d8f0c777e1..308d5c487a9 100644 --- a/src/devices/bus/isa/isa.cpp +++ b/src/devices/bus/isa/isa.cpp @@ -24,17 +24,16 @@ const device_type ISA8_SLOT = &device_creator<isa8_slot_device>; //------------------------------------------------- // isa8_slot_device - constructor //------------------------------------------------- -isa8_slot_device::isa8_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_slot_device::isa8_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_SLOT, "ISA8_SLOT", tag, owner, clock, "isa8_slot", __FILE__), device_slot_interface(mconfig, *this), - m_owner(nullptr), - m_isa_tag(nullptr) + m_owner(nullptr) { } -isa8_slot_device::isa8_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) : +isa8_slot_device::isa8_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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_interface(mconfig, *this), m_owner(nullptr), m_isa_tag(nullptr) + device_slot_interface(mconfig, *this), m_owner(nullptr) { } @@ -74,7 +73,7 @@ const device_type ISA16_SLOT = &device_creator<isa16_slot_device>; //------------------------------------------------- // isa16_slot_device - constructor //------------------------------------------------- -isa16_slot_device::isa16_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa16_slot_device::isa16_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : isa8_slot_device(mconfig, ISA16_SLOT, "ISA16_SLOT", tag, owner, clock, "isa16_slot", __FILE__) { } @@ -103,7 +102,7 @@ void isa16_slot_device::device_start() const device_type ISA8 = &device_creator<isa8_device>; -void isa8_device::static_set_cputag(device_t &device, const char *tag) +void isa8_device::static_set_cputag(device_t &device, std::string tag) { isa8_device &isa = downcast<isa8_device &>(device); isa.m_cputag = tag; @@ -135,7 +134,7 @@ void isa8_device::device_config_complete() // isa8_device - constructor //------------------------------------------------- -isa8_device::isa8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_device::isa8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8, "ISA8", tag, owner, clock, "isa8", __FILE__), device_memory_interface(mconfig, *this), m_program_config("ISA 8-bit program", ENDIANNESS_LITTLE, 8, 24, 0, nullptr), @@ -150,7 +149,7 @@ isa8_device::isa8_device(const machine_config &mconfig, const char *tag, device_ m_out_irq7_cb(*this), m_out_drq1_cb(*this), m_out_drq2_cb(*this), - m_out_drq3_cb(*this), m_cputag(nullptr), + m_out_drq3_cb(*this), m_write_iochck(*this) { for(int i=0;i<8;i++) @@ -163,7 +162,7 @@ isa8_device::isa8_device(const machine_config &mconfig, const char *tag, device_ m_allocspaces = false; } -isa8_device::isa8_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) : +isa8_device::isa8_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_memory_interface(mconfig, *this), m_program_config("ISA 8-bit program", ENDIANNESS_LITTLE, 8, 24, 0, nullptr), @@ -178,7 +177,7 @@ isa8_device::isa8_device(const machine_config &mconfig, device_type type, const m_out_irq7_cb(*this), m_out_drq1_cb(*this), m_out_drq2_cb(*this), - m_out_drq3_cb(*this), m_cputag(nullptr), + m_out_drq3_cb(*this), m_write_iochck(*this) { for(int i=0;i<8;i++) @@ -320,7 +319,7 @@ void isa8_device::install_device(offs_t start, offs_t end, offs_t mask, offs_t m } -void isa8_device::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data) +void isa8_device::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, std::string tag, UINT8 *data) { m_prgspace->install_readwrite_bank(start, end, mask, mirror, tag ); machine().root_device().membank(tag)->set_base(data); @@ -331,7 +330,7 @@ void isa8_device::unmap_bank(offs_t start, offs_t end, offs_t mask, offs_t mirro m_prgspace->unmap_readwrite(start, end, mask, mirror); } -void isa8_device::install_rom(device_t *dev, offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, const char *region) +void isa8_device::install_rom(device_t *dev, offs_t start, offs_t end, offs_t mask, offs_t mirror, std::string tag, const char *region) { if (machine().root_device().memregion("isa")) { UINT8 *src = dev->memregion(region)->base(); @@ -462,7 +461,7 @@ const device_type ISA16 = &device_creator<isa16_device>; // isa16_device - constructor //------------------------------------------------- -isa16_device::isa16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa16_device::isa16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : isa8_device(mconfig, ISA16, "ISA16", tag, owner, clock, "isa16", __FILE__), m_out_irq10_cb(*this), m_out_irq11_cb(*this), |