Don't #include legacy header "flopdrv.h" except where it's still used (nw)

src/devices/bus/bml3/bml3mp1802.h

@@ -15,7 +15,7 @@
 #pragma once
 
 #include "bml3bus.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "machine/wd_fdc.h"
 
 

src/devices/bus/coco/coco_fdc.cpp

@@ -45,7 +45,7 @@
 #include "emu.h"
 #include "cococart.h"
 #include "coco_fdc.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "machine/msm6242.h"
 #include "machine/ds1315.h"
 #include "machine/wd_fdc.h"

src/devices/bus/coco/dragon_fdc.cpp

@@ -69,7 +69,7 @@
 #include "dragon_fdc.h"
 
 #include "coco_fdc.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "machine/wd_fdc.h"
 #include "formats/dmk_dsk.h"
 #include "formats/jvc_dsk.h"

src/devices/bus/isa/fdc.cpp

@@ -10,7 +10,6 @@
 #include "fdc.h"
 #include "machine/busmouse.h"
 #include "machine/pc_fdc.h"
-#include "imagedev/flopdrv.h"
 #include "formats/pc_dsk.h"
 #include "formats/naslite_dsk.h"
 

src/devices/bus/isa/fdc.h

@@ -11,6 +11,7 @@
 #pragma once
 
 #include "isa.h"
+#include "imagedev/floppy.h"
 #include "machine/busmouse.h"
 #include "machine/upd765.h"
 

src/devices/bus/isa/mc1502_fdc.h

@@ -13,7 +13,7 @@
 
 
 #include "isa.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "machine/wd_fdc.h"
 
 //**************************************************************************

src/devices/bus/isa/myb3k_fdc.cpp

@@ -26,7 +26,6 @@
 
 #include "emu.h"
 #include "myb3k_fdc.h"
-#include "imagedev/flopdrv.h"
 #include "formats/pc_dsk.h"
 #include "formats/imd_dsk.h"
 

src/devices/bus/isa/myb3k_fdc.h

@@ -11,6 +11,7 @@
 #pragma once
 
 #include "isa.h"
+#include "imagedev/floppy.h"
 #include "machine/wd_fdc.h"
 #include "formats/imd_dsk.h"
 

src/devices/bus/isa/p1_fdc.h

@@ -13,7 +13,6 @@
 
 
 #include "isa.h"
-#include "imagedev/flopdrv.h"
 #include "machine/wd_fdc.h"
 
 //**************************************************************************

src/devices/bus/msx_cart/disk.h

@@ -8,7 +8,6 @@
 #include "bus/msx_cart/cartridge.h"
 #include "machine/wd_fdc.h"
 #include "machine/upd765.h"
-#include "imagedev/flopdrv.h"
 #include "imagedev/floppy.h"
 
 

src/devices/bus/msx_slot/disk.h

@@ -9,7 +9,6 @@
 #include "bus/msx_slot/rom.h"
 #include "machine/wd_fdc.h"
 #include "machine/upd765.h"
-#include "imagedev/flopdrv.h"
 #include "imagedev/floppy.h"
 
 

src/devices/bus/ti99/peb/bwg.h

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "peribox.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "machine/mm58274c.h"
 #include "machine/wd_fdc.h"
 #include "machine/ram.h"

src/mame/drivers/a5105.cpp

@@ -22,7 +22,7 @@ ToDo:
 
 #include "cpu/z80/z80.h"
 #include "imagedev/cassette.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "machine/ram.h"
 #include "machine/upd765.h"
 #include "machine/z80ctc.h"

src/mame/drivers/agat.cpp

@@ -56,7 +56,6 @@
 #include "cpu/m6502/m6502.h"
 
 #include "imagedev/cassette.h"
-#include "imagedev/flopdrv.h"
 
 #include "machine/bankdev.h"
 #include "machine/kb3600.h"
@@ -74,8 +73,6 @@
 #include "softlist.h"
 #include "speaker.h"
 
-#include "formats/ap2_dsk.h"
-
 
 #define A7_CPU_TAG "maincpu"
 #define A7_KBDC_TAG "ay3600"

src/mame/drivers/apple2.cpp

@@ -44,7 +44,6 @@ II Plus: RAM options reduced to 16/32/48 KB.
 #include "cpu/m6502/m6502.h"
 
 #include "imagedev/cassette.h"
-#include "imagedev/flopdrv.h"
 
 #include "machine/74259.h"
 #include "machine/bankdev.h"

src/mame/drivers/apricot.cpp

@@ -19,7 +19,7 @@
 #include "cpu/i86/i86.h"
 #include "cpu/i8089/i8089.h"
 #include "formats/apridisk.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "machine/clock.h"
 #include "machine/ram.h"
 #include "machine/74153.h"

src/mame/drivers/apricotf.cpp

@@ -28,7 +28,7 @@
 #include "bus/centronics/ctronics.h"
 #include "cpu/i86/i86.h"
 #include "formats/apridisk.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "machine/apricotkb.h"
 #include "machine/buffer.h"
 #include "machine/input_merger.h"

src/mame/drivers/dgn_beta.cpp

@@ -52,7 +52,7 @@ documentation still exists.
 
 #include "formats/vdk_dsk.h"
 #include "formats/dmk_dsk.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 
 
 /*

src/mame/drivers/dragon.cpp

@@ -18,7 +18,7 @@
 #include "formats/vdk_dsk.h"
 #include "formats/dmk_dsk.h"
 #include "formats/sdf_dsk.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 
 #include "bus/coco/dragon_fdc.h"
 #include "bus/coco/dragon_jcbsnd.h"

src/mame/drivers/fm7.cpp

@@ -52,7 +52,6 @@
 #include "bus/centronics/dsjoy.h"
 
 #include "imagedev/cassette.h"
-#include "imagedev/flopdrv.h"
 
 #include "formats/fm7_cas.h"
 

src/mame/drivers/lb186.cpp

@@ -8,7 +8,7 @@
 #include "bus/rs232/rs232.h"
 #include "machine/nscsi_hd.h"
 #include "machine/ncr5380n.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "formats/pc_dsk.h"
 #include "formats/naslite_dsk.h"
 

src/mame/drivers/mz2000.cpp

@@ -21,7 +21,7 @@
 
 #include "cpu/z80/z80.h"
 #include "imagedev/cassette.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "machine/i8255.h"
 #include "machine/pit8253.h"
 #include "machine/rp5c15.h"

src/mame/drivers/pc100.cpp

@@ -55,7 +55,7 @@
 #include "emu.h"
 
 #include "cpu/i86/i86.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "machine/i8251.h"
 #include "machine/i8255.h"
 #include "machine/msm58321.h"

src/mame/drivers/pk8020.cpp

@@ -16,7 +16,6 @@
 #include "bus/rs232/rs232.h"
 #include "cpu/i8085/i8085.h"
 #include "machine/i8255.h"
-#include "imagedev/flopdrv.h"
 #include "formats/pk8020_dsk.h"
 #include "machine/ram.h"
 #include "screen.h"

src/mame/drivers/rainbow.cpp

@@ -346,7 +346,7 @@ 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/flopdrv.h"
+#include "imagedev/floppy.h"
 
 #include "imagedev/harddriv.h"
 #include "machine/wd2010.h"

src/mame/drivers/rmnimbus.cpp

@@ -14,7 +14,7 @@
 #include "machine/rmnkbd.h"
 
 #include "cpu/mcs51/mcs51.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 
 #include "bus/isa/fdc.h"
 #include "bus/rs232/rs232.h"

src/mame/drivers/tk2000.cpp

@@ -19,7 +19,6 @@
 
 #include "cpu/m6502/m6502.h"
 #include "imagedev/cassette.h"
-#include "imagedev/flopdrv.h"
 #include "machine/bankdev.h"
 #include "machine/ram.h"
 #include "machine/timer.h"

src/mame/drivers/z100.cpp

@@ -146,7 +146,7 @@ ZDIPSW      EQU 0FFH    ; Configuration dip switches
 #include "emu.h"
 #include "cpu/i86/i86.h"
 //#include "bus/s100/s100.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "machine/6821pia.h"
 #include "machine/pic8259.h"
 #include "machine/wd_fdc.h"

src/mame/drivers/z80ne.cpp

@@ -94,7 +94,6 @@
 #include "emu.h"
 #include "cpu/z80/z80.h"
 #include "includes/z80ne.h"
-#include "imagedev/flopdrv.h"
 #include "formats/dmk_dsk.h"
 #include "machine/ram.h"
 #include "softlist.h"

src/mame/includes/abc80.h

@@ -15,8 +15,6 @@
 #include "bus/rs232/rs232.h"
 #include "cpu/z80/z80.h"
 #include "machine/z80daisy.h"
-#include "imagedev/flopdrv.h"
-#include "imagedev/printer.h"
 #include "imagedev/cassette.h"
 #include "imagedev/snapquik.h"
 #include "machine/abc80kb.h"

src/mame/includes/atom.h

@@ -8,7 +8,7 @@
 
 #include "cpu/m6502/m6502.h"
 #include "imagedev/cassette.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "imagedev/snapquik.h"
 #include "machine/6522via.h"
 #include "machine/i8255.h"

src/mame/includes/dgnalpha.h

@@ -15,6 +15,7 @@
 
 
 #include "includes/dragon.h"
+#include "imagedev/floppy.h"
 #include "sound/ay8910.h"
 #include "machine/wd_fdc.h"
 

src/mame/includes/hec2hrp.h

@@ -43,7 +43,7 @@
 
 #pragma once
 
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "imagedev/cassette.h"
 #include "imagedev/printer.h"
 #include "machine/upd765.h"

src/mame/includes/mbc55x.h

@@ -14,7 +14,7 @@
 
 #include "bus/centronics/ctronics.h"
 #include "cpu/i86/i86.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "machine/bankdev.h"
 #include "machine/i8251.h"
 #include "machine/i8255.h"

src/mame/includes/msx.h

@@ -20,7 +20,6 @@
 #include "sound/ym2413.h"
 #include "video/v9938.h"
 #include "video/tms9928a.h"
-#include "imagedev/flopdrv.h"
 #include "imagedev/cassette.h"
 #include "formats/fmsx_cas.h"
 #include "formats/msx_dsk.h"

src/mame/includes/mz2500.h

@@ -27,7 +27,7 @@
 #include "speaker.h"
 
 //#include "imagedev/cassette.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 
 #define RP5C15_TAG      "rp5c15"
 

src/mame/includes/partner.h

@@ -13,6 +13,7 @@
 
 #include "includes/radio86.h"
 
+#include "imagedev/floppy.h"
 #include "machine/i8255.h"
 #include "machine/wd_fdc.h"
 #include "machine/ram.h"

src/mame/includes/pk8020.h

@@ -11,6 +11,7 @@
 #pragma once
 
 #include "imagedev/cassette.h"
+#include "imagedev/floppy.h"
 #include "machine/i8251.h"
 #include "machine/i8255.h"
 #include "machine/pic8259.h"

src/mame/includes/rm380z.h

@@ -15,7 +15,7 @@ Research Machines RM 380Z
 #include "cpu/z80/z80.h"
 #include "imagedev/cassette.h"
 #include "machine/ram.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "machine/wd_fdc.h"
 #include "machine/keyboard.h"
 

src/mame/includes/sorcerer.h

@@ -18,7 +18,7 @@
 #include "machine/ram.h"
 #include "imagedev/cassette.h"
 #include "imagedev/snapquik.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "formats/sorc_dsk.h"
 #include "formats/sorc_cas.h"
 #include "machine/micropolis.h"

src/mame/includes/swtpc09.h

@@ -14,7 +14,7 @@
 #include "cpu/m6809/m6809.h"
 #include "video/generic.h"
 #include "machine/wd_fdc.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "machine/6840ptm.h"
 #include "machine/6821pia.h"
 #include "machine/6850acia.h"

src/mame/includes/trs80.h

@@ -11,7 +11,7 @@
 #include "cpu/z80/z80.h"
 #include "machine/bankdev.h"
 #include "imagedev/cassette.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "imagedev/snapquik.h"
 #include "machine/ay31015.h"
 #include "machine/com8116.h"

src/mame/includes/trs80m3.h

@@ -12,7 +12,7 @@
 #include "machine/ram.h"
 #include "machine/bankdev.h"
 #include "imagedev/cassette.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "imagedev/snapquik.h"
 #include "machine/ay31015.h"
 #include "machine/com8116.h"

src/mame/includes/vector06.h

@@ -16,7 +16,7 @@
 #include "cpu/i8085/i8085.h"
 
 #include "imagedev/cassette.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 
 #include "machine/ram.h"
 #include "machine/wd_fdc.h"

src/mame/includes/x1.h

@@ -16,7 +16,7 @@
 #include "cpu/z80/z80.h"
 #include "machine/z80daisy.h"
 #include "imagedev/cassette.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "machine/bankdev.h"
 #include "machine/i8255.h"
 #include "machine/timer.h"

src/mame/includes/z80ne.h

@@ -17,6 +17,7 @@
 
 #include "video/mc6847.h"
 #include "imagedev/cassette.h"
+#include "imagedev/floppy.h"
 #include "machine/ay31015.h"
 #include "machine/kr2376.h"
 #include "machine/ram.h"

src/mame/machine/dgn_beta.cpp

@@ -67,7 +67,7 @@
 #include "includes/dgn_beta.h"
 #include "includes/coco.h"
 #include "machine/mos6551.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 
 #include "debugger.h"
 #include "debug/debugcon.h"

src/mame/machine/dgnalpha.cpp

@@ -69,7 +69,6 @@ keeping track of it in a variable in the driver.
 #include "emu.h"
 #include "includes/dgnalpha.h"
 #include "sound/ay8910.h"
-#include "imagedev/flopdrv.h"
 
 //-------------------------------------------------
 //  device_start

src/mame/machine/imds2ioc.h

@@ -11,7 +11,7 @@
 #include "sound/beep.h"
 #include "machine/pit8253.h"
 #include "machine/i8271.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "bus/centronics/ctronics.h"
 #include "emupal.h"
 

src/mame/machine/partner.cpp

@@ -14,7 +14,6 @@
 #include "imagedev/cassette.h"
 #include "includes/radio86.h"
 #include "includes/partner.h"
-#include "imagedev/flopdrv.h"
 
 /* Driver initialization */
 void partner_state::init_partner()

src/mame/machine/pk8020.cpp

@@ -13,7 +13,6 @@
 #include "emu.h"
 #include "includes/pk8020.h"
 #include "cpu/i8085/i8085.h"
-#include "imagedev/flopdrv.h"
 
 
 READ8_MEMBER(pk8020_state::keyboard_r)

src/mame/machine/rmnimbus.cpp

@@ -66,7 +66,7 @@ chdman createhd -o ST125N.chd -chs 41921,1,1 -ss 512
 #include "debugger.h"
 #include "debug/debugcon.h"
 #include "debug/debugcpu.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 
 
 

src/mame/machine/vtech2.cpp

@@ -18,8 +18,6 @@
 #include "emu.h"
 #include "includes/vtech2.h"
 
-#include "imagedev/flopdrv.h"
-
 /* public */
 
 /* static */

src/mame/machine/z80ne.cpp

@@ -13,9 +13,6 @@
 #include "emu.h"
 #include "includes/z80ne.h"
 
-/* Devices */
-#include "imagedev/flopdrv.h"
-
 //#define VERBOSE 1
 #include "logmacro.h"