summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--src/devices/bus/a2bus/corvfdc01.h1
-rw-r--r--src/devices/bus/a2bus/corvfdc02.h1
-rw-r--r--src/devices/bus/bbc/fdc/acorn.cpp3
-rw-r--r--src/devices/bus/bbc/fdc/acorn.h3
-rw-r--r--src/devices/bus/isa/fdc.cpp1
-rw-r--r--src/devices/bus/isa/mc1502_fdc.cpp1
-rw-r--r--src/devices/bus/isa/mufdc.cpp1
-rw-r--r--src/devices/bus/isa/myb3k_fdc.cpp2
-rw-r--r--src/devices/bus/isa/myb3k_fdc.h1
-rw-r--r--src/devices/bus/isa/omti8621.cpp1
-rw-r--r--src/devices/bus/isa/p1_fdc.cpp1
-rw-r--r--src/devices/bus/isbx/isbc_218a.cpp2
-rw-r--r--src/devices/bus/isbx/isbc_218a.h1
-rw-r--r--src/devices/bus/rc2014/fdc.cpp17
-rw-r--r--src/devices/bus/snes/profighter.cpp2
-rw-r--r--src/devices/bus/spectrum/d40.h1
-rw-r--r--src/devices/bus/vme/sys68k_iscsi.cpp1
-rw-r--r--src/devices/machine/applefdintf.cpp1
-rw-r--r--src/devices/machine/fdc37c665gt.h1
-rw-r--r--src/devices/machine/fdc37c93x.cpp1
-rw-r--r--src/devices/machine/pdc.h1
-rw-r--r--src/mame/acorn/aa310.cpp1
-rw-r--r--src/mame/ampro/lb186.cpp1
-rw-r--r--src/mame/ampro/lbpc.cpp1
-rw-r--r--src/mame/amstrad/nc.cpp2
-rw-r--r--src/mame/amstrad/pc1512.h2
-rw-r--r--src/mame/amstrad/pcw16.h1
-rw-r--r--src/mame/be/bebox.cpp1
-rw-r--r--src/mame/ceres/ceres.cpp1
-rw-r--r--src/mame/dec/rainbow.cpp1
-rw-r--r--src/mame/emusys/emu3.cpp1
-rw-r--r--src/mame/ericsson/eispc.cpp2
-rw-r--r--src/mame/ibm/rtpc.cpp3
-rw-r--r--src/mame/intel/isbc_208.cpp2
-rw-r--r--src/mame/intergraph/interpro.cpp1
-rw-r--r--src/mame/mg1/mg1.cpp1
-rw-r--r--src/mame/microsoft/jazz.cpp3
-rw-r--r--src/mame/mips/mips.cpp4
-rw-r--r--src/mame/next/next.cpp3
-rw-r--r--src/mame/olivetti/m20.cpp1
-rw-r--r--src/mame/olivetti/m24.cpp1
-rw-r--r--src/mame/olympiaint/peoplepc.cpp12
-rw-r--r--src/mame/pc/nforcepc.cpp2
-rw-r--r--src/mame/pc/nforcepc.h3
-rw-r--r--src/mame/rm/rmnimbus.cpp2
-rw-r--r--src/mame/sanyo/mbc55x.h2
-rw-r--r--src/mame/sfrj/tim011.cpp2
-rw-r--r--src/mame/siemens/pcd.cpp2
-rw-r--r--src/mame/skeleton/fanucspmg.cpp14
-rw-r--r--src/mame/skeleton/mindset.cpp1
-rw-r--r--src/mame/skeleton/pt68k4.cpp14
-rw-r--r--src/mame/skeleton/sb180.cpp15
-rw-r--r--src/mame/sony/news_38xx.cpp3
-rw-r--r--src/mame/sony/news_68k.cpp3
-rw-r--r--src/mame/sony/news_r3k.cpp3
-rw-r--r--src/mame/sony/news_r4k.cpp2
-rw-r--r--src/mame/sun/sun3x.cpp4
-rw-r--r--src/mame/sun/sun4.cpp3
-rw-r--r--src/mame/ta/alphatro.cpp3
-rw-r--r--src/mame/wang/wangpc.cpp1
60 files changed, 25 insertions, 143 deletions
diff --git a/src/devices/bus/a2bus/corvfdc01.h b/src/devices/bus/a2bus/corvfdc01.h
index 1d731d2460e..29670de473f 100644
--- a/src/devices/bus/a2bus/corvfdc01.h
+++ b/src/devices/bus/a2bus/corvfdc01.h
@@ -15,7 +15,6 @@
#include "a2bus.h"
#include "machine/wd_fdc.h"
-#include "formats/imd_dsk.h"
#include "imagedev/floppy.h"
//**************************************************************************
diff --git a/src/devices/bus/a2bus/corvfdc02.h b/src/devices/bus/a2bus/corvfdc02.h
index af057f13be3..24e25d159fd 100644
--- a/src/devices/bus/a2bus/corvfdc02.h
+++ b/src/devices/bus/a2bus/corvfdc02.h
@@ -16,7 +16,6 @@
#include "a2bus.h"
#include "imagedev/floppy.h"
#include "machine/upd765.h"
-#include "formats/imd_dsk.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/devices/bus/bbc/fdc/acorn.cpp b/src/devices/bus/bbc/fdc/acorn.cpp
index 66e351cd973..8fb970f77d2 100644
--- a/src/devices/bus/bbc/fdc/acorn.cpp
+++ b/src/devices/bus/bbc/fdc/acorn.cpp
@@ -10,6 +10,9 @@
#include "emu.h"
#include "acorn.h"
+#include "formats/acorn_dsk.h"
+#include "formats/fsd_dsk.h"
+
//**************************************************************************
// DEVICE DEFINITIONS
diff --git a/src/devices/bus/bbc/fdc/acorn.h b/src/devices/bus/bbc/fdc/acorn.h
index 1f10b956581..6b4adea4fbf 100644
--- a/src/devices/bus/bbc/fdc/acorn.h
+++ b/src/devices/bus/bbc/fdc/acorn.h
@@ -16,9 +16,6 @@
#include "imagedev/floppy.h"
#include "machine/i8271.h"
#include "machine/wd_fdc.h"
-#include "formats/acorn_dsk.h"
-#include "formats/fsd_dsk.h"
-#include "formats/pc_dsk.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/devices/bus/isa/fdc.cpp b/src/devices/bus/isa/fdc.cpp
index 66f3a403e71..1d41a496e75 100644
--- a/src/devices/bus/isa/fdc.cpp
+++ b/src/devices/bus/isa/fdc.cpp
@@ -9,7 +9,6 @@
#include "emu.h"
#include "fdc.h"
#include "machine/busmouse.h"
-#include "formats/pc_dsk.h"
#include "formats/naslite_dsk.h"
#include "formats/ibmxdf_dsk.h"
diff --git a/src/devices/bus/isa/mc1502_fdc.cpp b/src/devices/bus/isa/mc1502_fdc.cpp
index 12d86efa3cb..b2629e97946 100644
--- a/src/devices/bus/isa/mc1502_fdc.cpp
+++ b/src/devices/bus/isa/mc1502_fdc.cpp
@@ -10,7 +10,6 @@
#include "mc1502_fdc.h"
#include "cpu/i86/i86.h"
-#include "formats/pc_dsk.h"
//**************************************************************************
diff --git a/src/devices/bus/isa/mufdc.cpp b/src/devices/bus/isa/mufdc.cpp
index a17be9429ff..5c9ebd84923 100644
--- a/src/devices/bus/isa/mufdc.cpp
+++ b/src/devices/bus/isa/mufdc.cpp
@@ -18,7 +18,6 @@
#include "mufdc.h"
#include "formats/naslite_dsk.h"
-#include "formats/pc_dsk.h"
//**************************************************************************
diff --git a/src/devices/bus/isa/myb3k_fdc.cpp b/src/devices/bus/isa/myb3k_fdc.cpp
index d789850bce9..49b142d66bc 100644
--- a/src/devices/bus/isa/myb3k_fdc.cpp
+++ b/src/devices/bus/isa/myb3k_fdc.cpp
@@ -24,8 +24,6 @@
#include "emu.h"
#include "myb3k_fdc.h"
-#include "formats/pc_dsk.h"
-#include "formats/imd_dsk.h"
#define LOG_READ (1U << 1)
#define LOG_CMD (1U << 2)
diff --git a/src/devices/bus/isa/myb3k_fdc.h b/src/devices/bus/isa/myb3k_fdc.h
index be29847dc52..c3d77fd0929 100644
--- a/src/devices/bus/isa/myb3k_fdc.h
+++ b/src/devices/bus/isa/myb3k_fdc.h
@@ -13,7 +13,6 @@
#include "isa.h"
#include "imagedev/floppy.h"
#include "machine/wd_fdc.h"
-#include "formats/imd_dsk.h"
class isa8_myb3k_fdc471x_device_base :
public device_t,
diff --git a/src/devices/bus/isa/omti8621.cpp b/src/devices/bus/isa/omti8621.cpp
index a6528105f98..149638160c3 100644
--- a/src/devices/bus/isa/omti8621.cpp
+++ b/src/devices/bus/isa/omti8621.cpp
@@ -16,7 +16,6 @@
#include "omti8621.h"
#include "image.h"
#include "imagedev/harddriv.h"
-#include "formats/pc_dsk.h"
#include "formats/naslite_dsk.h"
#include "formats/apollo_dsk.h"
diff --git a/src/devices/bus/isa/p1_fdc.cpp b/src/devices/bus/isa/p1_fdc.cpp
index 44369a37e41..651262b4110 100644
--- a/src/devices/bus/isa/p1_fdc.cpp
+++ b/src/devices/bus/isa/p1_fdc.cpp
@@ -10,7 +10,6 @@
#include "p1_fdc.h"
#include "cpu/i86/i86.h"
-#include "formats/pc_dsk.h"
//**************************************************************************
diff --git a/src/devices/bus/isbx/isbc_218a.cpp b/src/devices/bus/isbx/isbc_218a.cpp
index c0a6434fcd6..a337ad96525 100644
--- a/src/devices/bus/isbx/isbc_218a.cpp
+++ b/src/devices/bus/isbx/isbc_218a.cpp
@@ -9,6 +9,8 @@
#include "emu.h"
#include "isbc_218a.h"
+#include "formats/flopimg.h"
+
//**************************************************************************
// MACROS / CONSTANTS
diff --git a/src/devices/bus/isbx/isbc_218a.h b/src/devices/bus/isbx/isbc_218a.h
index b5bb4947d3e..d170bfe7ff7 100644
--- a/src/devices/bus/isbx/isbc_218a.h
+++ b/src/devices/bus/isbx/isbc_218a.h
@@ -12,7 +12,6 @@
#pragma once
#include "isbx.h"
-#include "formats/pc_dsk.h"
#include "imagedev/floppy.h"
#include "machine/upd765.h"
diff --git a/src/devices/bus/rc2014/fdc.cpp b/src/devices/bus/rc2014/fdc.cpp
index ba8ce96d7ab..b650e96f7ad 100644
--- a/src/devices/bus/rc2014/fdc.cpp
+++ b/src/devices/bus/rc2014/fdc.cpp
@@ -11,8 +11,6 @@
#include "machine/upd765.h"
#include "imagedev/floppy.h"
-#include "formats/imd_dsk.h"
-#include "formats/pc_dsk.h"
namespace {
@@ -91,21 +89,14 @@ static void rc2014_floppies(device_slot_interface &device)
device.option_add("35hd", FLOPPY_35_HD);
}
-static void rc2014_floppy_formats(format_registration &fr)
-{
- fr.add_mfm_containers();
- fr.add(FLOPPY_IMD_FORMAT);
- fr.add(FLOPPY_PC_FORMAT);
-}
-
void rc2014_fdc9266_device::device_add_mconfig(machine_config &config)
{
// FDC9266
UPD765A(config, m_fdc, XTAL(8'000'000), true, true);
// floppy drives
- FLOPPY_CONNECTOR(config, m_floppy[0], rc2014_floppies, "35hd", rc2014_floppy_formats);
- FLOPPY_CONNECTOR(config, m_floppy[1], rc2014_floppies, "35hd", rc2014_floppy_formats);
+ FLOPPY_CONNECTOR(config, m_floppy[0], rc2014_floppies, "35hd", floppy_image_device::default_pc_floppy_formats);
+ FLOPPY_CONNECTOR(config, m_floppy[1], rc2014_floppies, "35hd", floppy_image_device::default_pc_floppy_formats);
}
static INPUT_PORTS_START( rc2014_fdc9266_jumpers )
@@ -202,8 +193,8 @@ void rc2014_wd37c65_device::device_add_mconfig(machine_config &config)
WD37C65C(config, m_fdc, 16_MHz_XTAL);
// floppy drives
- FLOPPY_CONNECTOR(config, m_floppy[0], rc2014_floppies, "35hd", rc2014_floppy_formats);
- FLOPPY_CONNECTOR(config, m_floppy[1], rc2014_floppies, "35hd", rc2014_floppy_formats);
+ FLOPPY_CONNECTOR(config, m_floppy[0], rc2014_floppies, "35hd", floppy_image_device::default_pc_floppy_formats);
+ FLOPPY_CONNECTOR(config, m_floppy[1], rc2014_floppies, "35hd", floppy_image_device::default_pc_floppy_formats);
}
static INPUT_PORTS_START( rc2014_wd37c65_jumpers )
diff --git a/src/devices/bus/snes/profighter.cpp b/src/devices/bus/snes/profighter.cpp
index 92a048f15b1..6453c27bde7 100644
--- a/src/devices/bus/snes/profighter.cpp
+++ b/src/devices/bus/snes/profighter.cpp
@@ -19,8 +19,6 @@
#include "imagedev/floppy.h"
#include "machine/upd765.h"
-#include "formats/pc_dsk.h"
-
DEFINE_DEVICE_TYPE(SNS_PRO_FIGHTER_Q, sns_pro_fighter_q_device, "profighterq", "Super Pro. Fighter Q (variant 1)");
DEFINE_DEVICE_TYPE(SNS_PRO_FIGHTER_QA, sns_pro_fighter_qa_device, "profighterqa", "Super Pro. Fighter Q (variant 2)");
diff --git a/src/devices/bus/spectrum/d40.h b/src/devices/bus/spectrum/d40.h
index d2f83b88cce..f03c71cabbb 100644
--- a/src/devices/bus/spectrum/d40.h
+++ b/src/devices/bus/spectrum/d40.h
@@ -17,7 +17,6 @@
#include "machine/wd_fdc.h"
#include "machine/upd765.h"
#include "machine/i8255.h"
-#include "formats/pc_dsk.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/devices/bus/vme/sys68k_iscsi.cpp b/src/devices/bus/vme/sys68k_iscsi.cpp
index a856864ed94..2d0ee64b605 100644
--- a/src/devices/bus/vme/sys68k_iscsi.cpp
+++ b/src/devices/bus/vme/sys68k_iscsi.cpp
@@ -150,7 +150,6 @@
#include "machine/wd_fdc.h"
#include "machine/hd63450.h" // compatible with MC68450
#include "machine/clock.h"
-#include "formats/pc_dsk.h"
#define VERBOSE (0) // (LOG_GENERAL)
//#define LOG_OUTPUT_FUNC osd_printf_info
diff --git a/src/devices/machine/applefdintf.cpp b/src/devices/machine/applefdintf.cpp
index 8c30e6a0a8c..97afd3aa5a4 100644
--- a/src/devices/machine/applefdintf.cpp
+++ b/src/devices/machine/applefdintf.cpp
@@ -6,7 +6,6 @@
#include "formats/ap2_dsk.h"
#include "formats/ap_dsk35.h"
#include "formats/as_dsk.h"
-#include "formats/pc_dsk.h"
#include "formats/fs_prodos.h"
void applefdintf_device::formats_525_13(format_registration &fr)
diff --git a/src/devices/machine/fdc37c665gt.h b/src/devices/machine/fdc37c665gt.h
index 7317a6d6af0..17e768438c0 100644
--- a/src/devices/machine/fdc37c665gt.h
+++ b/src/devices/machine/fdc37c665gt.h
@@ -16,7 +16,6 @@ SMSC FDC37C665GT High Performance Multi-Mode Parallel Port Super I/O Floppy Disk
// floppy disk controller
#include "machine/upd765.h"
#include "imagedev/floppy.h"
-#include "formats/pc_dsk.h"
// parallel port
#include "machine/pc_lpt.h"
// serial port
diff --git a/src/devices/machine/fdc37c93x.cpp b/src/devices/machine/fdc37c93x.cpp
index 313ecbeeedb..81118b696d9 100644
--- a/src/devices/machine/fdc37c93x.cpp
+++ b/src/devices/machine/fdc37c93x.cpp
@@ -12,7 +12,6 @@ SMSC FDC37C93x Plug and Play Compatible Ultra I/O Controller
#include "machine/fdc37c93x.h"
#include "formats/naslite_dsk.h"
-#include "formats/pc_dsk.h"
DEFINE_DEVICE_TYPE(FDC37C93X, fdc37c93x_device, "fdc37c93x", "SMSC FDC37C93X Super I/O")
diff --git a/src/devices/machine/pdc.h b/src/devices/machine/pdc.h
index 416354b9c48..9a9eb1d4d42 100644
--- a/src/devices/machine/pdc.h
+++ b/src/devices/machine/pdc.h
@@ -14,7 +14,6 @@
#include "cpu/z80/z80.h"
#include "machine/upd765.h"
#include "machine/am9517a.h"
-#include "formats/pc_dsk.h"
#include "machine/hdc92x4.h"
#include "imagedev/mfmhd.h"
diff --git a/src/mame/acorn/aa310.cpp b/src/mame/acorn/aa310.cpp
index fb25a0b3b96..3a417e6fbc6 100644
--- a/src/mame/acorn/aa310.cpp
+++ b/src/mame/acorn/aa310.cpp
@@ -143,7 +143,6 @@
#include "formats/acorn_dsk.h"
#include "formats/apd_dsk.h"
#include "formats/jfd_dsk.h"
-#include "formats/pc_dsk.h"
#include "formats/st_dsk.h"
#include "screen.h"
#include "softlist.h"
diff --git a/src/mame/ampro/lb186.cpp b/src/mame/ampro/lb186.cpp
index d8e75cba675..fb41a10be8c 100644
--- a/src/mame/ampro/lb186.cpp
+++ b/src/mame/ampro/lb186.cpp
@@ -9,7 +9,6 @@
#include "bus/rs232/rs232.h"
#include "machine/ncr5380.h"
#include "imagedev/floppy.h"
-#include "formats/pc_dsk.h"
#include "formats/naslite_dsk.h"
diff --git a/src/mame/ampro/lbpc.cpp b/src/mame/ampro/lbpc.cpp
index 0e983a4fd50..d52925d8132 100644
--- a/src/mame/ampro/lbpc.cpp
+++ b/src/mame/ampro/lbpc.cpp
@@ -21,7 +21,6 @@
#include "bus/pc_kbd/pc_kbdc.h"
#include "bus/rs232/rs232.h"
#include "cpu/nec/v5x.h"
-#include "formats/pc_dsk.h"
#include "imagedev/floppy.h"
#include "machine/ins8250.h"
#include "machine/ncr5380.h"
diff --git a/src/mame/amstrad/nc.cpp b/src/mame/amstrad/nc.cpp
index f56cc07c312..953d45af03d 100644
--- a/src/mame/amstrad/nc.cpp
+++ b/src/mame/amstrad/nc.cpp
@@ -62,8 +62,6 @@
#include "screen.h"
#include "speaker.h"
-#include "formats/pc_dsk.h"
-
#define LOG_DEBUG (1U << 1)
#define LOG_IRQ (1U << 2)
diff --git a/src/mame/amstrad/pc1512.h b/src/mame/amstrad/pc1512.h
index 527996511d9..6de439f03f1 100644
--- a/src/mame/amstrad/pc1512.h
+++ b/src/mame/amstrad/pc1512.h
@@ -25,8 +25,6 @@
#include "sound/spkrdev.h"
#include "ams40041.h"
-#include "formats/pc_dsk.h"
-
#define I8086_TAG "ic120"
#define I8087_TAG "ic119"
#define I8048_TAG "i8048"
diff --git a/src/mame/amstrad/pcw16.h b/src/mame/amstrad/pcw16.h
index 529e9f7c2c6..01b547efa50 100644
--- a/src/mame/amstrad/pcw16.h
+++ b/src/mame/amstrad/pcw16.h
@@ -18,7 +18,6 @@
#include "machine/ins8250.h" /* pc com port */
#include "sound/beep.h" /* pcw/pcw16 beeper */
#include "machine/intelfsh.h"
-#include "formats/pc_dsk.h"
#include "imagedev/floppy.h"
#include "machine/ram.h"
#include "machine/timer.h"
diff --git a/src/mame/be/bebox.cpp b/src/mame/be/bebox.cpp
index 6f8e358035c..d20c38b6965 100644
--- a/src/mame/be/bebox.cpp
+++ b/src/mame/be/bebox.cpp
@@ -26,7 +26,6 @@
/* Devices */
#include "bus/scsi/scsicd.h"
#include "bus/scsi/scsihd.h"
-#include "formats/pc_dsk.h"
#include "machine/8042kbdc.h"
uint8_t bebox_state::at_dma8237_1_r(offs_t offset) { return m_dma8237[1]->read(offset / 2); }
diff --git a/src/mame/ceres/ceres.cpp b/src/mame/ceres/ceres.cpp
index f965b7c54e5..0230c3323f8 100644
--- a/src/mame/ceres/ceres.cpp
+++ b/src/mame/ceres/ceres.cpp
@@ -32,7 +32,6 @@
#include "bus/rs232/rs232.h"
#include "imagedev/harddriv.h"
#include "imagedev/floppy.h"
-#include "formats/imd_dsk.h"
// video
#include "screen.h"
diff --git a/src/mame/dec/rainbow.cpp b/src/mame/dec/rainbow.cpp
index df0f5a754f9..cba9f19d317 100644
--- a/src/mame/dec/rainbow.cpp
+++ b/src/mame/dec/rainbow.cpp
@@ -330,7 +330,6 @@ W17 pulls J1 serial port pin 1 to GND when set (chassis to logical GND).
#include "machine/wd_fdc.h"
#include "formats/rx50_dsk.h"
-#include "formats/pc_dsk.h" // PC Formats
#include "imagedev/floppy.h"
#include "imagedev/harddriv.h"
diff --git a/src/mame/emusys/emu3.cpp b/src/mame/emusys/emu3.cpp
index 9f2d29ada77..2a3175fc8bc 100644
--- a/src/mame/emusys/emu3.cpp
+++ b/src/mame/emusys/emu3.cpp
@@ -30,7 +30,6 @@
#include "bus/rs232/terminal.h"
#include "imagedev/floppy.h"
-#include "formats/pc_dsk.h"
// video
#include "video/hd44780.h"
diff --git a/src/mame/ericsson/eispc.cpp b/src/mame/ericsson/eispc.cpp
index d1dafb05af7..bf86ac78fe3 100644
--- a/src/mame/ericsson/eispc.cpp
+++ b/src/mame/ericsson/eispc.cpp
@@ -70,8 +70,6 @@
#include "sound/spkrdev.h"
#include "speaker.h"
#include "imagedev/floppy.h"
-#include "formats/imd_dsk.h"
-#include "formats/pc_dsk.h"
#include "bus/rs232/rs232.h"
#define LOG_PPI (1U << 1)
diff --git a/src/mame/ibm/rtpc.cpp b/src/mame/ibm/rtpc.cpp
index 5dcf400b045..23f7ffd5662 100644
--- a/src/mame/ibm/rtpc.cpp
+++ b/src/mame/ibm/rtpc.cpp
@@ -103,15 +103,12 @@
#include "machine/input_merger.h"
#include "imagedev/floppy.h"
-#include "formats/pc_dsk.h"
#define LOG_KLS (1U << 1)
//#define VERBOSE (LOG_GENERAL|LOG_KLS)
#include "logmacro.h"
-#include "debugger.h"
-
#include "rtpc.lh"
namespace {
diff --git a/src/mame/intel/isbc_208.cpp b/src/mame/intel/isbc_208.cpp
index 69444a6bc2d..cb67980d982 100644
--- a/src/mame/intel/isbc_208.cpp
+++ b/src/mame/intel/isbc_208.cpp
@@ -6,7 +6,7 @@
#include "emu.h"
#include "isbc_208.h"
-#include "formats/pc_dsk.h"
+#include "formats/flopimg.h"
DEFINE_DEVICE_TYPE(ISBC_208, isbc_208_device, "isbc_208", "ISBC 208 Flexible Disk Driver Controller")
diff --git a/src/mame/intergraph/interpro.cpp b/src/mame/intergraph/interpro.cpp
index ec5b0d67590..34df79c0f6d 100644
--- a/src/mame/intergraph/interpro.cpp
+++ b/src/mame/intergraph/interpro.cpp
@@ -255,7 +255,6 @@
#include "bus/interpro/keyboard/keyboard.h"
#include "bus/interpro/mouse/mouse.h"
-#include "formats/pc_dsk.h"
#include "softlist.h"
#include "machine/input_merger.h"
diff --git a/src/mame/mg1/mg1.cpp b/src/mame/mg1/mg1.cpp
index 9914704443d..cf5b44892b1 100644
--- a/src/mame/mg1/mg1.cpp
+++ b/src/mame/mg1/mg1.cpp
@@ -37,7 +37,6 @@
#include "bus/rs232/rs232.h"
#include "imagedev/floppy.h"
#include "formats/applix_dsk.h"
-#include "formats/pc_dsk.h"
// video
#include "screen.h"
diff --git a/src/mame/microsoft/jazz.cpp b/src/mame/microsoft/jazz.cpp
index d18a2a15eda..d86a1019f1c 100644
--- a/src/mame/microsoft/jazz.cpp
+++ b/src/mame/microsoft/jazz.cpp
@@ -91,11 +91,8 @@
#include "bus/pc_kbd/keyboards.h"
#include "imagedev/floppy.h"
-#include "formats/pc_dsk.h"
#include "softlist.h"
-#include "debugger.h"
-
#include "jazz.lh"
#define VERBOSE 0
diff --git a/src/mame/mips/mips.cpp b/src/mame/mips/mips.cpp
index cf6217c83f6..183a09722a7 100644
--- a/src/mame/mips/mips.cpp
+++ b/src/mame/mips/mips.cpp
@@ -238,12 +238,8 @@
#include "sound/spkrdev.h"
#include "speaker.h"
-#include "formats/pc_dsk.h"
-
#include "imagedev/floppy.h"
-#include "debugger.h"
-
#define LOG_MMU (1U << 1)
#define LOG_IOCB (1U << 2)
diff --git a/src/mame/next/next.cpp b/src/mame/next/next.cpp
index c3da8e0dfd1..80e911f736c 100644
--- a/src/mame/next/next.cpp
+++ b/src/mame/next/next.cpp
@@ -33,8 +33,7 @@
#include "screen.h"
#include "softlist.h"
-#include "formats/mfi_dsk.h"
-#include "formats/pc_dsk.h"
+#include "formats/flopimg.h"
uint32_t next_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
diff --git a/src/mame/olivetti/m20.cpp b/src/mame/olivetti/m20.cpp
index 29421e25b2e..077b557ae60 100644
--- a/src/mame/olivetti/m20.cpp
+++ b/src/mame/olivetti/m20.cpp
@@ -57,7 +57,6 @@ E I1 Vectored interrupt error
#include "softlist_dev.h"
#include "formats/m20_dsk.h"
-#include "formats/pc_dsk.h"
namespace {
diff --git a/src/mame/olivetti/m24.cpp b/src/mame/olivetti/m24.cpp
index 9369be3bea2..10eec219795 100644
--- a/src/mame/olivetti/m24.cpp
+++ b/src/mame/olivetti/m24.cpp
@@ -37,7 +37,6 @@
#include "sound/spkrdev.h"
#include "speaker.h"
-#include "formats/pc_dsk.h"
#include "formats/naslite_dsk.h"
#include "formats/m20_dsk.h"
diff --git a/src/mame/olympiaint/peoplepc.cpp b/src/mame/olympiaint/peoplepc.cpp
index 4e1a6644c50..f7b3773c85b 100644
--- a/src/mame/olympiaint/peoplepc.cpp
+++ b/src/mame/olympiaint/peoplepc.cpp
@@ -38,7 +38,6 @@ The keyboard has a sticker that proclaims it was made by Fujitsu Limited.
#include "bus/rs232/keyboard.h"
#include "emupal.h"
#include "screen.h"
-#include "formats/imd_dsk.h"
namespace {
@@ -91,7 +90,6 @@ private:
void hrq_w(int state);
uint8_t memory_read_byte(offs_t offset);
void memory_write_byte(offs_t offset, uint8_t data);
- static void floppy_formats(format_registration &fr);
void floppy_load(floppy_image_device *dev);
void floppy_unload(floppy_image_device *dev);
@@ -251,12 +249,6 @@ static void peoplepc_floppies(device_slot_interface &device)
device.option_add("525qd", FLOPPY_525_QD);
}
-void peoplepc_state::floppy_formats(format_registration &fr)
-{
- fr.add_mfm_containers();
- fr.add(FLOPPY_IMD_FORMAT);
-}
-
void peoplepc_keyboard_devices(device_slot_interface &device)
{
device.option_add("keyboard", SERIAL_KEYBOARD);
@@ -322,8 +314,8 @@ void peoplepc_state::olypeopl(machine_config &config)
UPD765A(config, m_fdc, XTAL(8'000'000)/2, true, true);
m_fdc->intrq_wr_callback().set("pic8259_0", FUNC(pic8259_device::ir2_w));
m_fdc->drq_wr_callback().set(m_dmac, FUNC(i8257_device::dreq0_w));
- FLOPPY_CONNECTOR(config, "upd765:0", peoplepc_floppies, "525qd", peoplepc_state::floppy_formats);
- FLOPPY_CONNECTOR(config, "upd765:1", peoplepc_floppies, "525qd", peoplepc_state::floppy_formats);
+ FLOPPY_CONNECTOR(config, "upd765:0", peoplepc_floppies, "525qd", floppy_image_device::default_mfm_floppy_formats);
+ FLOPPY_CONNECTOR(config, "upd765:1", peoplepc_floppies, "525qd", floppy_image_device::default_mfm_floppy_formats);
I8251(config, m_8251key, XTAL(14'745'600)/6);
m_8251key->rxrdy_handler().set("pic8259_1", FUNC(pic8259_device::ir1_w));
diff --git a/src/mame/pc/nforcepc.cpp b/src/mame/pc/nforcepc.cpp
index 668bce37e53..27eb960f73c 100644
--- a/src/mame/pc/nforcepc.cpp
+++ b/src/mame/pc/nforcepc.cpp
@@ -36,6 +36,8 @@
#include "bus/isa/isa.h"
#include "video/virge_pci.h"
+#include "formats/naslite_dsk.h"
+
#if 1
// for now let's use this as the contents of the spd chip in the ddr dimm memory module
diff --git a/src/mame/pc/nforcepc.h b/src/mame/pc/nforcepc.h
index 2faec6f050f..30335783d99 100644
--- a/src/mame/pc/nforcepc.h
+++ b/src/mame/pc/nforcepc.h
@@ -15,9 +15,6 @@
#include "machine/pci.h"
#include "machine/upd765.h"
-#include "formats/naslite_dsk.h"
-#include "formats/pc_dsk.h"
-
// NVIDIA Corporation nForce CPU bridge
diff --git a/src/mame/rm/rmnimbus.cpp b/src/mame/rm/rmnimbus.cpp
index e9f915e9753..33c9073f55d 100644
--- a/src/mame/rm/rmnimbus.cpp
+++ b/src/mame/rm/rmnimbus.cpp
@@ -25,8 +25,6 @@
#include "softlist.h"
#include "speaker.h"
-#include "formats/pc_dsk.h"
-
static void rmnimbus_floppies(device_slot_interface &device)
{
diff --git a/src/mame/sanyo/mbc55x.h b/src/mame/sanyo/mbc55x.h
index f9b9238168f..dceced9628f 100644
--- a/src/mame/sanyo/mbc55x.h
+++ b/src/mame/sanyo/mbc55x.h
@@ -28,8 +28,6 @@
#include "emupal.h"
-#include "formats/pc_dsk.h"
-
#define MAINCPU_TAG "maincpu"
diff --git a/src/mame/sfrj/tim011.cpp b/src/mame/sfrj/tim011.cpp
index 7a548ff15ac..a1d180b7238 100644
--- a/src/mame/sfrj/tim011.cpp
+++ b/src/mame/sfrj/tim011.cpp
@@ -11,7 +11,6 @@
#include "emu.h"
#include "cpu/z180/z180.h"
#include "imagedev/floppy.h"
-#include "formats/imd_dsk.h"
#include "formats/tim011_dsk.h"
#include "machine/upd765.h"
#include "bus/rs232/rs232.h"
@@ -135,7 +134,6 @@ static void tim011_floppies(device_slot_interface &device)
static void tim011_floppy_formats(format_registration &fr)
{
fr.add_mfm_containers();
- fr.add(FLOPPY_IMD_FORMAT);
fr.add(FLOPPY_TIM011_FORMAT);
}
diff --git a/src/mame/siemens/pcd.cpp b/src/mame/siemens/pcd.cpp
index 7f1615635ef..a5be586ff9c 100644
--- a/src/mame/siemens/pcd.cpp
+++ b/src/mame/siemens/pcd.cpp
@@ -27,8 +27,6 @@
#include "speaker.h"
-#include "formats/pc_dsk.h"
-
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mame/skeleton/fanucspmg.cpp b/src/mame/skeleton/fanucspmg.cpp
index 3ea67864429..27cdf60b017 100644
--- a/src/mame/skeleton/fanucspmg.cpp
+++ b/src/mame/skeleton/fanucspmg.cpp
@@ -544,8 +544,6 @@ the keypad symbols seem to use a different matrix pattern from the rest?
#include "screen.h"
-#include "formats/imd_dsk.h"
-
namespace {
@@ -592,8 +590,6 @@ private:
required_shared_ptr<uint8_t> m_shared;
required_memory_region m_chargen;
- static void floppy_formats(format_registration &fr);
-
uint8_t memory_read_byte(offs_t offset);
void memory_write_byte(offs_t offset, uint8_t data);
uint8_t shared_r(offs_t offset);
@@ -941,12 +937,6 @@ static void fanuc_floppies(device_slot_interface &device)
device.option_add("525dd", FLOPPY_525_DD);
}
-void fanucspmg_state::floppy_formats(format_registration &fr)
-{
- fr.add_mfm_containers();
- fr.add(FLOPPY_IMD_FORMAT);
-}
-
void fanucspmg_state::fanucspmg(machine_config &config)
{
/* basic machine hardware */
@@ -1000,8 +990,8 @@ void fanucspmg_state::fanucspmg(machine_config &config)
UPD765A(config, m_fdc, 8'000'000, true, true);
m_fdc->intrq_wr_callback().set(m_pic[0], FUNC(pic8259_device::ir3_w));
m_fdc->drq_wr_callback().set(m_dmac, FUNC(i8257_device::dreq0_w));
- FLOPPY_CONNECTOR(config, FDC_TAG":0", fanuc_floppies, "525dd", fanucspmg_state::floppy_formats);
- FLOPPY_CONNECTOR(config, FDC_TAG":1", fanuc_floppies, "525dd", fanucspmg_state::floppy_formats);
+ FLOPPY_CONNECTOR(config, FDC_TAG":0", fanuc_floppies, "525dd", floppy_image_device::default_mfm_floppy_formats);
+ FLOPPY_CONNECTOR(config, FDC_TAG":1", fanuc_floppies, "525dd", floppy_image_device::default_mfm_floppy_formats);
screen_device &screen(SCREEN(config, SCREEN_TAG, SCREEN_TYPE_RASTER));
screen.set_raw(XTAL(15'000'000), 640, 0, 512, 390, 0, 384);
diff --git a/src/mame/skeleton/mindset.cpp b/src/mame/skeleton/mindset.cpp
index 98161025f92..8f32a403bfd 100644
--- a/src/mame/skeleton/mindset.cpp
+++ b/src/mame/skeleton/mindset.cpp
@@ -6,7 +6,6 @@
#include "cpu/mcs48/mcs48.h"
#include "imagedev/floppy.h"
#include "machine/upd765.h"
-#include "formats/pc_dsk.h"
#include "sound/dac.h"
#include "machine/ins8250.h"
#include "bus/rs232/rs232.h"
diff --git a/src/mame/skeleton/pt68k4.cpp b/src/mame/skeleton/pt68k4.cpp
index 808138282cc..e4c6bf9aac3 100644
--- a/src/mame/skeleton/pt68k4.cpp
+++ b/src/mame/skeleton/pt68k4.cpp
@@ -77,8 +77,6 @@ TODO: 68230 device
#include "softlist.h"
#include "speaker.h"
-#include "formats/imd_dsk.h"
-
namespace {
@@ -131,8 +129,6 @@ private:
void keyboard_clock_w(int state);
void keyboard_data_w(int state);
- static void floppy_formats(format_registration &fr);
-
void pt68k2_mem(address_map &map);
void pt68k4_mem(address_map &map);
@@ -158,12 +154,6 @@ private:
bool m_irq5_duart1 = false, m_irq5_isa = false;
};
-void pt68k4_state::floppy_formats(format_registration &fr)
-{
- fr.add_mfm_containers();
- fr.add(FLOPPY_IMD_FORMAT);
-}
-
static void pt68k_floppies(device_slot_interface &device)
{
device.option_add("525dd", FLOPPY_525_DD);
@@ -430,8 +420,8 @@ void pt68k4_state::pt68k2(machine_config &config)
M48T02(config, TIMEKEEPER_TAG, 0);
WD1772(config, m_wdfdc, 16_MHz_XTAL / 2);
- FLOPPY_CONNECTOR(config, m_floppy_connector[0], pt68k_floppies, "525dd", pt68k4_state::floppy_formats);
- FLOPPY_CONNECTOR(config, m_floppy_connector[1], pt68k_floppies, "525dd", pt68k4_state::floppy_formats);
+ FLOPPY_CONNECTOR(config, m_floppy_connector[0], pt68k_floppies, "525dd", floppy_image_device::default_mfm_floppy_formats);
+ FLOPPY_CONNECTOR(config, m_floppy_connector[1], pt68k_floppies, "525dd", floppy_image_device::default_mfm_floppy_formats);
ISA8(config, m_isa, 0);
m_isa->set_custom_spaces();
diff --git a/src/mame/skeleton/sb180.cpp b/src/mame/skeleton/sb180.cpp
index 48947bab7c0..de863cea978 100644
--- a/src/mame/skeleton/sb180.cpp
+++ b/src/mame/skeleton/sb180.cpp
@@ -9,7 +9,6 @@
#include "emu.h"
#include "cpu/z180/z180.h"
#include "imagedev/floppy.h"
-#include "formats/imd_dsk.h"
#include "machine/upd765.h"
#include "bus/rs232/rs232.h"
@@ -76,12 +75,6 @@ static void sb180_floppies(device_slot_interface &device)
device.option_add("35dd", FLOPPY_35_DD);
}
-static void sb180_floppy_formats(format_registration &fr)
-{
- fr.add_mfm_containers();
- fr.add(FLOPPY_IMD_FORMAT);
-}
-
static DEVICE_INPUT_DEFAULTS_START( terminal )
DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 )
DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 )
@@ -105,10 +98,10 @@ void sb180_state::sb180(machine_config &config)
m_fdc->drq_wr_callback().set_inputline(m_maincpu, Z180_INPUT_LINE_DREQ1);
/* floppy drives */
- FLOPPY_CONNECTOR(config, m_floppy[0], sb180_floppies, "35dd", sb180_floppy_formats);
- FLOPPY_CONNECTOR(config, m_floppy[1], sb180_floppies, "35dd", sb180_floppy_formats);
- FLOPPY_CONNECTOR(config, m_floppy[2], sb180_floppies, "35dd", sb180_floppy_formats);
- FLOPPY_CONNECTOR(config, m_floppy[3], sb180_floppies, "35dd", sb180_floppy_formats);
+ FLOPPY_CONNECTOR(config, m_floppy[0], sb180_floppies, "35dd", floppy_image_device::default_mfm_floppy_formats);
+ FLOPPY_CONNECTOR(config, m_floppy[1], sb180_floppies, "35dd", floppy_image_device::default_mfm_floppy_formats);
+ FLOPPY_CONNECTOR(config, m_floppy[2], sb180_floppies, "35dd", floppy_image_device::default_mfm_floppy_formats);
+ FLOPPY_CONNECTOR(config, m_floppy[3], sb180_floppies, "35dd", floppy_image_device::default_mfm_floppy_formats);
rs232_port_device &rs232(RS232_PORT(config, "rs232", default_rs232_devices, "terminal"));
rs232.set_option_device_input_defaults("terminal", DEVICE_INPUT_DEFAULTS_NAME(terminal)); // must be below the DEVICE_INPUT_DEFAULTS_START block
diff --git a/src/mame/sony/news_38xx.cpp b/src/mame/sony/news_38xx.cpp
index a381305de82..0181aabdd74 100644
--- a/src/mame/sony/news_38xx.cpp
+++ b/src/mame/sony/news_38xx.cpp
@@ -42,9 +42,6 @@
#include "machine/input_merger.h"
#include "imagedev/floppy.h"
-#include "formats/pc_dsk.h"
-
-#include "debugger.h"
#define VERBOSE 1
#include "logmacro.h"
diff --git a/src/mame/sony/news_68k.cpp b/src/mame/sony/news_68k.cpp
index d09e59eecff..4a48222633a 100644
--- a/src/mame/sony/news_68k.cpp
+++ b/src/mame/sony/news_68k.cpp
@@ -40,9 +40,6 @@
#include "machine/input_merger.h"
#include "imagedev/floppy.h"
-#include "formats/pc_dsk.h"
-
-#include "debugger.h"
#define VERBOSE 0
#include "logmacro.h"
diff --git a/src/mame/sony/news_r3k.cpp b/src/mame/sony/news_r3k.cpp
index bfd72be0002..2d09b4fb48e 100644
--- a/src/mame/sony/news_r3k.cpp
+++ b/src/mame/sony/news_r3k.cpp
@@ -48,9 +48,6 @@
#include "bus/rs232/rs232.h"
#include "imagedev/floppy.h"
-#include "formats/pc_dsk.h"
-
-#include "debugger.h"
#define VERBOSE 0
#include "logmacro.h"
diff --git a/src/mame/sony/news_r4k.cpp b/src/mame/sony/news_r4k.cpp
index f25df0f9dac..0aa864dd087 100644
--- a/src/mame/sony/news_r4k.cpp
+++ b/src/mame/sony/news_r4k.cpp
@@ -108,8 +108,6 @@
#include "machine/upd765.h"
#include "machine/z80scc.h"
-#include "formats/pc_dsk.h"
-
#define LOG_INTERRUPT (1U << 1)
#define LOG_ALL_INTERRUPT (1U << 2)
#define LOG_LED (1U << 3)
diff --git a/src/mame/sun/sun3x.cpp b/src/mame/sun/sun3x.cpp
index 69f463f5652..c996c14d56e 100644
--- a/src/mame/sun/sun3x.cpp
+++ b/src/mame/sun/sun3x.cpp
@@ -131,8 +131,6 @@
#include "bus/nscsi/cd.h"
#include "bus/nscsi/hd.h"
#include "cpu/m68000/m68030.h"
-#include "formats/mfi_dsk.h"
-#include "formats/pc_dsk.h"
#include "imagedev/floppy.h"
#include "machine/icm7170.h"
#include "machine/ncr53c90.h"
@@ -147,6 +145,8 @@
#include "screen.h"
+#include "formats/flopimg.h"
+
namespace {
diff --git a/src/mame/sun/sun4.cpp b/src/mame/sun/sun4.cpp
index ac65b1094dc..66e67e2bd9c 100644
--- a/src/mame/sun/sun4.cpp
+++ b/src/mame/sun/sun4.cpp
@@ -435,9 +435,6 @@
#include "debugger.h"
#include "screen.h"
-#include "formats/mfi_dsk.h"
-#include "formats/pc_dsk.h"
-
#define LOG_AUXIO (1U << 1)
#define LOG_IRQ_READS (1U << 2)
#define LOG_IRQ_WRITES (1U << 3)
diff --git a/src/mame/ta/alphatro.cpp b/src/mame/ta/alphatro.cpp
index 629a1ae9dfb..25354502cfa 100644
--- a/src/mame/ta/alphatro.cpp
+++ b/src/mame/ta/alphatro.cpp
@@ -29,9 +29,6 @@
#include "cpu/z80/z80.h"
#include "imagedev/cassette.h"
#include "imagedev/floppy.h"
-#include "formats/pc_dsk.h"
-#include "formats/dsk_dsk.h"
-#include "formats/td0_dsk.h"
#include "machine/clock.h"
#include "machine/i8251.h"
#include "machine/ram.h"
diff --git a/src/mame/wang/wangpc.cpp b/src/mame/wang/wangpc.cpp
index c5335f0f172..288b4c83f4c 100644
--- a/src/mame/wang/wangpc.cpp
+++ b/src/mame/wang/wangpc.cpp
@@ -25,7 +25,6 @@
#include "bus/rs232/rs232.h"
#include "bus/wangpc/wangpc.h"
#include "cpu/i86/i86.h"
-#include "formats/pc_dsk.h"
#include "imagedev/floppy.h"
#include "machine/am9517a.h"
#include "machine/i8255.h"