diff options
author | 2019-03-25 23:13:40 +0100 | |
---|---|---|
committer | 2019-03-25 23:13:40 +0100 | |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/bus/s100/nsmdsa.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/s100/nsmdsa.cpp')
-rw-r--r-- | src/devices/bus/s100/nsmdsa.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/devices/bus/s100/nsmdsa.cpp b/src/devices/bus/s100/nsmdsa.cpp index 90d19b3fcb3..8efa1c9f392 100644 --- a/src/devices/bus/s100/nsmdsa.cpp +++ b/src/devices/bus/s100/nsmdsa.cpp @@ -57,11 +57,10 @@ static void mds_a_floppies(device_slot_interface &device) // device_add_mconfig - add device configuration //------------------------------------------------- -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); -} +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 @@ -76,7 +75,8 @@ void s100_mds_a_device::device_add_mconfig(machine_config &config) 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_floppy(*this, "floppy%u", 0U), + m_floppy0(*this, "floppy0"), + m_floppy1(*this, "floppy1"), m_psel_rom(*this, "psel"), m_pgm_rom(*this, "pgm") { @@ -105,7 +105,7 @@ void s100_mds_a_device::device_reset() // s100_smemr_r - memory read //------------------------------------------------- -uint8_t s100_mds_a_device::s100_smemr_r(offs_t offset) +uint8_t s100_mds_a_device::s100_smemr_r(address_space &space, offs_t offset) { return 0xff; } |