diff options
author | AJR <ajrhacker@users.noreply.github.com> | 2018-06-22 10:39:15 -0400 |
---|---|---|
committer | AJR <ajrhacker@users.noreply.github.com> | 2018-06-22 10:39:15 -0400 |
commit | e0080fb10463f221393e6b37557c569090240ee2 (patch) | |
tree | 24ba084351e4002ce9a19804bb3ce015f80f3f26 | |
parent | cc7fbd926efbf38134d08c2fa606e19c7d6f6bba (diff) |
mz3500.cpp, pc9801.cpp: More machine().device cleanup (nw)
-rw-r--r-- | src/mame/drivers/mz3500.cpp | 19 | ||||
-rw-r--r-- | src/mame/drivers/pc9801.cpp | 6 |
2 files changed, 8 insertions, 17 deletions
diff --git a/src/mame/drivers/mz3500.cpp b/src/mame/drivers/mz3500.cpp index 7bfe7006ae5..3308b0ed4bb 100644 --- a/src/mame/drivers/mz3500.cpp +++ b/src/mame/drivers/mz3500.cpp @@ -55,7 +55,8 @@ public: m_beeper(*this, "beeper"), m_palette(*this, "palette"), m_system_dsw(*this, "SYSTEM_DSW"), - m_fd_dsw(*this, "FD_DSW") + m_fd_dsw(*this, "FD_DSW"), + m_floppy_connector(*this, "upd765a:%u", 0U) { } // devices @@ -121,7 +122,7 @@ protected: private: required_ioport m_system_dsw; required_ioport m_fd_dsw; - floppy_connector *m_floppy_connector[4]; + required_device_array<floppy_connector, 4> m_floppy_connector; }; void mz3500_state::video_start() @@ -757,13 +758,6 @@ void mz3500_state::machine_start() m_char_rom = memregion("gfx1")->base(); m_work_ram = make_unique_clear<uint8_t[]>(0x40000); m_shared_ram = make_unique_clear<uint8_t[]>(0x800); - - static const char *const m_fddnames[4] = { "upd765a:0", "upd765a:1", "upd765a:2", "upd765a:3"}; - - for (int i = 0; i < 4; i++) - { - m_floppy_connector[i] = machine().device<floppy_connector>(m_fddnames[i]); - } } void mz3500_state::machine_reset() @@ -777,10 +771,7 @@ void mz3500_state::machine_reset() //m_slave->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); m_srdy = 0; - upd765a_device *fdc; - fdc = machine().device<upd765a_device>(":upd765a"); - - if (fdc) + if (m_fdc.found()) { m_fdd_sel = 0; { @@ -790,7 +781,7 @@ void mz3500_state::machine_reset() elem->get_device()->set_rpm(300); } - machine().device<upd765a_device>("upd765a")->set_rate(250000); + m_fdc->set_rate(250000); } } diff --git a/src/mame/drivers/pc9801.cpp b/src/mame/drivers/pc9801.cpp index e670d49f51a..baa2cb7063d 100644 --- a/src/mame/drivers/pc9801.cpp +++ b/src/mame/drivers/pc9801.cpp @@ -916,8 +916,8 @@ READ8_MEMBER(pc9801_state::pc9801rs_2dd_r) { switch(offset & 6) { - case 0: return machine().device<upd765a_device>("upd765_2hd")->msr_r(space, 0, 0xff); - case 2: return machine().device<upd765a_device>("upd765_2hd")->fifo_r(space, 0, 0xff); + case 0: return m_fdc_2hd->msr_r(space, 0, 0xff); + case 2: return m_fdc_2hd->fifo_r(space, 0, 0xff); case 4: return 0x44; //2dd flag } } @@ -936,7 +936,7 @@ WRITE8_MEMBER(pc9801_state::pc9801rs_2dd_w) { switch(offset & 6) { - case 2: machine().device<upd765a_device>("upd765_2hd")->fifo_w(space, 0, data, 0xff); return; + case 2: m_fdc_2hd->fifo_w(space, 0, data, 0xff); return; case 4: logerror("%02x 2DD FDC ctrl\n",data); return; } } |