diff options
author | 2019-01-18 23:09:04 -0500 | |
---|---|---|
committer | 2019-01-18 23:11:56 -0500 | |
commit | d08a9aa7b847464422f0ebec3b674e0f565858e3 (patch) | |
tree | 9681bfe0577ca3176e1e0a0832bc07538df0c42c /src/devices/bus/s100 | |
parent | c907852448e8005d727604bfb148b82b20337bb0 (diff) |
bus/epson_sio, bus/s100: Clean up some MCFGs (nw)
Diffstat (limited to 'src/devices/bus/s100')
-rw-r--r-- | src/devices/bus/s100/nsmdsa.cpp | 12 | ||||
-rw-r--r-- | src/devices/bus/s100/nsmdsa.h | 3 | ||||
-rw-r--r-- | src/devices/bus/s100/nsmdsad.cpp | 12 | ||||
-rw-r--r-- | src/devices/bus/s100/nsmdsad.h | 3 |
4 files changed, 14 insertions, 16 deletions
diff --git a/src/devices/bus/s100/nsmdsa.cpp b/src/devices/bus/s100/nsmdsa.cpp index 8efa1c9f392..a4adcfbe1b5 100644 --- a/src/devices/bus/s100/nsmdsa.cpp +++ b/src/devices/bus/s100/nsmdsa.cpp @@ -57,10 +57,11 @@ static void mds_a_floppies(device_slot_interface &device) // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_START(s100_mds_a_device::device_add_mconfig) - MCFG_FLOPPY_DRIVE_ADD("floppy0", mds_a_floppies, "525sd", floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("floppy1", mds_a_floppies, "525sd", floppy_image_device::default_floppy_formats) -MACHINE_CONFIG_END +void s100_mds_a_device::device_add_mconfig(machine_config &config) +{ + for (auto &floppy : m_floppy) + FLOPPY_CONNECTOR(config, floppy, mds_a_floppies, "525sd", floppy_image_device::default_floppy_formats); +} @@ -75,8 +76,7 @@ MACHINE_CONFIG_END s100_mds_a_device::s100_mds_a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, S100_MDS_A, tag, owner, clock), device_s100_card_interface(mconfig, *this), - m_floppy0(*this, "floppy0"), - m_floppy1(*this, "floppy1"), + m_floppy(*this, "floppy%u", 0U), m_psel_rom(*this, "psel"), m_pgm_rom(*this, "pgm") { diff --git a/src/devices/bus/s100/nsmdsa.h b/src/devices/bus/s100/nsmdsa.h index 5bcaf7505c0..9f12f491bb5 100644 --- a/src/devices/bus/s100/nsmdsa.h +++ b/src/devices/bus/s100/nsmdsa.h @@ -42,8 +42,7 @@ protected: virtual uint8_t s100_smemr_r(address_space &space, offs_t offset) override; private: - required_device<floppy_connector> m_floppy0; - required_device<floppy_connector> m_floppy1; + required_device_array<floppy_connector, 2> m_floppy; required_memory_region m_psel_rom; required_memory_region m_pgm_rom; }; diff --git a/src/devices/bus/s100/nsmdsad.cpp b/src/devices/bus/s100/nsmdsad.cpp index d13f6a7f748..4c071576cca 100644 --- a/src/devices/bus/s100/nsmdsad.cpp +++ b/src/devices/bus/s100/nsmdsad.cpp @@ -58,10 +58,11 @@ static void mds_ad_floppies(device_slot_interface &device) // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_START(s100_mds_ad_device::device_add_mconfig) - MCFG_FLOPPY_DRIVE_ADD("floppy0", mds_ad_floppies, "525dd", floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("floppy1", mds_ad_floppies, "525dd", floppy_image_device::default_floppy_formats) -MACHINE_CONFIG_END +void s100_mds_ad_device::device_add_mconfig(machine_config &config) +{ + for (auto &floppy : m_floppy) + FLOPPY_CONNECTOR(config, floppy, mds_ad_floppies, "525dd", floppy_image_device::default_floppy_formats); +} @@ -76,8 +77,7 @@ MACHINE_CONFIG_END s100_mds_ad_device::s100_mds_ad_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, S100_MDS_AD, tag, owner, clock), device_s100_card_interface(mconfig, *this), - m_floppy0(*this, "floppy0"), - m_floppy1(*this, "floppy1"), + m_floppy(*this, "floppy%u", 0U), m_dsel_rom(*this, "dsel"), m_dpgm_rom(*this, "dpgm"), m_dwe_rom(*this, "dwe") diff --git a/src/devices/bus/s100/nsmdsad.h b/src/devices/bus/s100/nsmdsad.h index f10d3c0af23..01d80e35b9c 100644 --- a/src/devices/bus/s100/nsmdsad.h +++ b/src/devices/bus/s100/nsmdsad.h @@ -42,8 +42,7 @@ protected: virtual uint8_t s100_smemr_r(address_space &space, offs_t offset) override; private: - required_device<floppy_connector> m_floppy0; - required_device<floppy_connector> m_floppy1; + required_device_array<floppy_connector, 2> m_floppy; required_memory_region m_dsel_rom; required_memory_region m_dpgm_rom; required_memory_region m_dwe_rom; |