diff options
Diffstat (limited to 'src/devices/bus/newbrain/fdc.cpp')
-rw-r--r-- | src/devices/bus/newbrain/fdc.cpp | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/src/devices/bus/newbrain/fdc.cpp b/src/devices/bus/newbrain/fdc.cpp index 7cadbd0bddd..c726a36f020 100644 --- a/src/devices/bus/newbrain/fdc.cpp +++ b/src/devices/bus/newbrain/fdc.cpp @@ -113,10 +113,10 @@ void newbrain_fdc_device::device_add_mconfig(machine_config &config) UPD765A(config, m_fdc, 8'000'000, false, true); m_fdc->intrq_wr_callback().set(FUNC(newbrain_fdc_device::fdc_int_w)); - FLOPPY_CONNECTOR(config, UPD765_TAG ":0", newbrain_floppies, "525dd", floppy_image_device::default_floppy_formats); - FLOPPY_CONNECTOR(config, UPD765_TAG ":1", newbrain_floppies, "525dd", floppy_image_device::default_floppy_formats); - FLOPPY_CONNECTOR(config, UPD765_TAG ":2", newbrain_floppies, nullptr, floppy_image_device::default_floppy_formats); - FLOPPY_CONNECTOR(config, UPD765_TAG ":3", newbrain_floppies, nullptr, floppy_image_device::default_floppy_formats); + FLOPPY_CONNECTOR(config, UPD765_TAG ":0", newbrain_floppies, "525dd", floppy_image_device::default_mfm_floppy_formats); + FLOPPY_CONNECTOR(config, UPD765_TAG ":1", newbrain_floppies, "525dd", floppy_image_device::default_mfm_floppy_formats); + FLOPPY_CONNECTOR(config, UPD765_TAG ":2", newbrain_floppies, nullptr, floppy_image_device::default_mfm_floppy_formats); + FLOPPY_CONNECTOR(config, UPD765_TAG ":3", newbrain_floppies, nullptr, floppy_image_device::default_mfm_floppy_formats); NEWBRAIN_EXPANSION_SLOT(config, m_exp, XTAL(16'000'000)/8, newbrain_expansion_cards, nullptr); } @@ -135,11 +135,8 @@ newbrain_fdc_device::newbrain_fdc_device(const machine_config &mconfig, const ch device_newbrain_expansion_slot_interface(mconfig, *this), m_maincpu(*this, Z80_TAG), m_fdc(*this, UPD765_TAG), - m_floppy0(*this, UPD765_TAG ":0"), - m_floppy1(*this, UPD765_TAG ":1"), - m_floppy2(*this, UPD765_TAG ":2"), - m_floppy3(*this, UPD765_TAG ":3"), - m_exp(*this, NEWBRAIN_EXPANSION_SLOT_TAG) + m_floppy(*this, UPD765_TAG ":%u", 0U), + m_exp(*this, "exp") { } @@ -224,10 +221,9 @@ void newbrain_fdc_device::iorq_w(offs_t offset, uint8_t data, bool &prtov) void newbrain_fdc_device::moton(int state) { - if (m_floppy0->get_device()) m_floppy0->get_device()->mon_w(!state); - if (m_floppy1->get_device()) m_floppy1->get_device()->mon_w(!state); - if (m_floppy2->get_device()) m_floppy2->get_device()->mon_w(!state); - if (m_floppy3->get_device()) m_floppy3->get_device()->mon_w(!state); + for (auto &floppy : m_floppy) + if (floppy->get_device()) + floppy->get_device()->mon_w(!state); } @@ -235,7 +231,7 @@ void newbrain_fdc_device::moton(int state) // fdc_int_w - //------------------------------------------------- -WRITE_LINE_MEMBER( newbrain_fdc_device::fdc_int_w ) +void newbrain_fdc_device::fdc_int_w(int state) { m_fdc_int = state; } |