summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/isa/myb3k_fdc.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/isa/myb3k_fdc.cpp')
-rw-r--r--src/devices/bus/isa/myb3k_fdc.cpp42
1 files changed, 14 insertions, 28 deletions
diff --git a/src/devices/bus/isa/myb3k_fdc.cpp b/src/devices/bus/isa/myb3k_fdc.cpp
index dcef550db51..49b142d66bc 100644
--- a/src/devices/bus/isa/myb3k_fdc.cpp
+++ b/src/devices/bus/isa/myb3k_fdc.cpp
@@ -24,10 +24,7 @@
#include "emu.h"
#include "myb3k_fdc.h"
-#include "formats/pc_dsk.h"
-#include "formats/imd_dsk.h"
-//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already
#define LOG_READ (1U << 1)
#define LOG_CMD (1U << 2)
@@ -56,19 +53,6 @@ void isa8_myb3k_fdc471x_device_base::map(address_map &map)
map(0x05, 0x05).r(FUNC(isa8_myb3k_fdc471x_device_base::myb3k_fdc_status));
}
-FLOPPY_FORMATS_MEMBER( isa8_myb3k_fdc4710_device::myb3k_floppy_formats )
- FLOPPY_IMD_FORMAT
-FLOPPY_FORMATS_END
-
-FLOPPY_FORMATS_MEMBER( isa8_myb3k_fdc4711_device::myb3k_floppy_formats )
- FLOPPY_PC_FORMAT,
- FLOPPY_IMD_FORMAT
-FLOPPY_FORMATS_END
-
-FLOPPY_FORMATS_MEMBER( isa8_myb3k_fdc4712_device::myb3k_floppy_formats )
- FLOPPY_IMD_FORMAT
-FLOPPY_FORMATS_END
-
static void myb3k_sd_floppies(device_slot_interface &device)
{
device.option_add("525sd", FLOPPY_525_SD);
@@ -97,8 +81,8 @@ void isa8_myb3k_fdc471x_device_base::device_add_mconfig(machine_config &config)
void isa8_myb3k_fdc4710_device::device_add_mconfig(machine_config &config)
{
MB8876(config, m_fdc, XTAL(15'974'400) / 8); /* From StepOne schematics */
- FLOPPY_CONNECTOR(config, m_floppy_connectors[0], myb3k_sd_floppies, "525sd", isa8_myb3k_fdc4710_device::myb3k_floppy_formats);
- FLOPPY_CONNECTOR(config, m_floppy_connectors[1], myb3k_sd_floppies, "525sd", isa8_myb3k_fdc4710_device::myb3k_floppy_formats);
+ FLOPPY_CONNECTOR(config, m_floppy_connectors[0], myb3k_sd_floppies, "525sd", floppy_image_device::default_mfm_floppy_formats);
+ FLOPPY_CONNECTOR(config, m_floppy_connectors[1], myb3k_sd_floppies, "525sd", floppy_image_device::default_mfm_floppy_formats);
isa8_myb3k_fdc471x_device_base::device_add_mconfig(config);
}
@@ -107,10 +91,10 @@ void isa8_myb3k_fdc4710_device::device_add_mconfig(machine_config &config)
void isa8_myb3k_fdc4711_device::device_add_mconfig(machine_config &config)
{
FD1791(config, m_fdc, XTAL(15'974'400) / 16);
- FLOPPY_CONNECTOR(config, m_floppy_connectors[0], myb3k_qd_floppies, "525qd", isa8_myb3k_fdc4711_device::myb3k_floppy_formats);
- FLOPPY_CONNECTOR(config, m_floppy_connectors[1], myb3k_qd_floppies, "525qd", isa8_myb3k_fdc4711_device::myb3k_floppy_formats);
- FLOPPY_CONNECTOR(config, m_floppy_connectors[2], myb3k_qd_floppies, "525qd", isa8_myb3k_fdc4711_device::myb3k_floppy_formats);
- FLOPPY_CONNECTOR(config, m_floppy_connectors[3], myb3k_qd_floppies, "525qd", isa8_myb3k_fdc4711_device::myb3k_floppy_formats);
+ FLOPPY_CONNECTOR(config, m_floppy_connectors[0], myb3k_qd_floppies, "525qd", floppy_image_device::default_pc_floppy_formats);
+ FLOPPY_CONNECTOR(config, m_floppy_connectors[1], myb3k_qd_floppies, "525qd", floppy_image_device::default_pc_floppy_formats);
+ FLOPPY_CONNECTOR(config, m_floppy_connectors[2], myb3k_qd_floppies, "525qd", floppy_image_device::default_pc_floppy_formats);
+ FLOPPY_CONNECTOR(config, m_floppy_connectors[3], myb3k_qd_floppies, "525qd", floppy_image_device::default_pc_floppy_formats);
isa8_myb3k_fdc471x_device_base::device_add_mconfig(config);
}
@@ -118,10 +102,10 @@ void isa8_myb3k_fdc4711_device::device_add_mconfig(machine_config &config)
void isa8_myb3k_fdc4712_device::device_add_mconfig(machine_config &config)
{
MB8876(config, m_fdc, XTAL(15'974'400) / 8);
- FLOPPY_CONNECTOR(config, m_floppy_connectors[0], myb3k_8inch_floppies, "8dsdd", isa8_myb3k_fdc4712_device::myb3k_floppy_formats);
- FLOPPY_CONNECTOR(config, m_floppy_connectors[1], myb3k_8inch_floppies, "8dsdd", isa8_myb3k_fdc4712_device::myb3k_floppy_formats);
- FLOPPY_CONNECTOR(config, m_floppy_connectors[2], myb3k_8inch_floppies, "8dsdd", isa8_myb3k_fdc4712_device::myb3k_floppy_formats);
- FLOPPY_CONNECTOR(config, m_floppy_connectors[3], myb3k_8inch_floppies, "8dsdd", isa8_myb3k_fdc4712_device::myb3k_floppy_formats);
+ FLOPPY_CONNECTOR(config, m_floppy_connectors[0], myb3k_8inch_floppies, "8dsdd", floppy_image_device::default_mfm_floppy_formats);
+ FLOPPY_CONNECTOR(config, m_floppy_connectors[1], myb3k_8inch_floppies, "8dsdd", floppy_image_device::default_mfm_floppy_formats);
+ FLOPPY_CONNECTOR(config, m_floppy_connectors[2], myb3k_8inch_floppies, "8dsdd", floppy_image_device::default_mfm_floppy_formats);
+ FLOPPY_CONNECTOR(config, m_floppy_connectors[3], myb3k_8inch_floppies, "8dsdd", floppy_image_device::default_mfm_floppy_formats);
isa8_myb3k_fdc471x_device_base::device_add_mconfig(config);
}
@@ -177,7 +161,7 @@ void isa8_myb3k_fdc471x_device_base::device_start()
//-------------------------------------------------
// irq_w - signal interrupt request to ISA bus
//-------------------------------------------------
-WRITE_LINE_MEMBER( isa8_myb3k_fdc471x_device_base::irq_w )
+void isa8_myb3k_fdc471x_device_base::irq_w(int state)
{
LOG("%s: %d\n", FUNCNAME, state);
m_isa->irq6_w(state ? ASSERT_LINE : CLEAR_LINE);
@@ -186,7 +170,7 @@ WRITE_LINE_MEMBER( isa8_myb3k_fdc471x_device_base::irq_w )
//-------------------------------------------------
// drq_w - signal dma request to ISA bus
//-------------------------------------------------
-WRITE_LINE_MEMBER( isa8_myb3k_fdc471x_device_base::drq_w )
+void isa8_myb3k_fdc471x_device_base::drq_w(int state)
{
LOG("%s: %d\n", FUNCNAME, state);
@@ -194,8 +178,10 @@ WRITE_LINE_MEMBER( isa8_myb3k_fdc471x_device_base::drq_w )
{
case 1:
m_isa->drq1_w(state);
+ [[fallthrough]]; // FIXME: really?
case 2:
m_isa->drq2_w(state);
+ [[fallthrough]]; // FIXME: really?
default:
break;
}