summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2018-05-31 11:43:26 -0400
committer AJR <ajrhacker@users.noreply.github.com>2018-05-31 11:43:26 -0400
commit929f11935f414d99729ad421e862c820cfcd56b8 (patch)
tree0a2f339dcb337a89c83c1805a4a0f5c649db8daf
parent9787ba3fde9906980689769bef94f5e0197f700b (diff)
cps3.cpp: Eliminate machine().device (nw)
-rw-r--r--src/mame/drivers/cps3.cpp11
-rw-r--r--src/mame/includes/cps3.h9
2 files changed, 11 insertions, 9 deletions
diff --git a/src/mame/drivers/cps3.cpp b/src/mame/drivers/cps3.cpp
index 49958c74349..5eb9245715e 100644
--- a/src/mame/drivers/cps3.cpp
+++ b/src/mame/drivers/cps3.cpp
@@ -773,13 +773,8 @@ void cps3_state::cps3_decrypt_bios()
void cps3_state::init_common(void)
{
- // flash roms
- for (int simmnum = 0; simmnum < 7; simmnum++)
- for (int chipnum = 0; chipnum < 8; chipnum++)
- m_simm[simmnum][chipnum] = machine().device<fujitsu_29f016a_device>(string_format("simm%d.%d", simmnum + 1, chipnum).c_str());
-
m_eeprom = std::make_unique<uint32_t[]>(0x400/4);
- machine().device<nvram_device>("eeprom")->set_base(m_eeprom.get(), 0x400);
+ subdevice<nvram_device>("eeprom")->set_base(m_eeprom.get(), 0x400);
}
@@ -1410,8 +1405,8 @@ READ32_MEMBER(cps3_state::cps3_gfxflash_r)
uint32_t result = 0;
if (m_cram_gfxflash_bank&1) offset += 0x200000/4;
- fujitsu_29f016a_device *chip0 = m_simm[2 + m_cram_gfxflash_bank/8][(m_cram_gfxflash_bank % 8) & ~1];
- fujitsu_29f016a_device *chip1 = m_simm[2 + m_cram_gfxflash_bank/8][(m_cram_gfxflash_bank % 8) | 1];
+ fujitsu_29f016a_device *chip0 = m_simm[2 + m_cram_gfxflash_bank/8][(m_cram_gfxflash_bank % 8) & ~1].target();
+ fujitsu_29f016a_device *chip1 = m_simm[2 + m_cram_gfxflash_bank/8][(m_cram_gfxflash_bank % 8) | 1].target();
if (chip0 == nullptr || chip1 == nullptr)
return 0xffffffff;
diff --git a/src/mame/includes/cps3.h b/src/mame/includes/cps3.h
index eba68c89c02..293c7815a5b 100644
--- a/src/mame/includes/cps3.h
+++ b/src/mame/includes/cps3.h
@@ -20,6 +20,13 @@ public:
, m_gfxdecode(*this, "gfxdecode")
, m_palette(*this, "palette")
, m_cps3sound(*this, "cps3sound")
+ , m_simm{{*this, "simm1.%u", 0U},
+ {*this, "simm2.%u", 0U},
+ {*this, "simm3.%u", 0U},
+ {*this, "simm4.%u", 0U},
+ {*this, "simm5.%u", 0U},
+ {*this, "simm6.%u", 0U},
+ {*this, "simm7.%u", 0U}}
, m_mainram(*this, "mainram")
, m_spriteram(*this, "spriteram")
, m_colourram(*this, "colourram")
@@ -40,6 +47,7 @@ public:
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
required_device<cps3_sound_device> m_cps3sound;
+ optional_device_array<fujitsu_29f016a_device, 8> m_simm[7];
required_shared_ptr<uint32_t> m_mainram;
required_shared_ptr<uint32_t> m_spriteram;
@@ -56,7 +64,6 @@ public:
optional_memory_region m_user4_region;
optional_memory_region m_user5_region;
- fujitsu_29f016a_device *m_simm[7][8];
uint32_t m_cram_gfxflash_bank;
std::unique_ptr<uint32_t[]> m_char_ram;
std::unique_ptr<uint32_t[]> m_eeprom;