diff --git a/src/devices/bus/isa/mufdc.cpp b/src/devices/bus/isa/mufdc.cpp index 3e40653e175..61cbeecc95a 100644 --- a/src/devices/bus/isa/mufdc.cpp +++ b/src/devices/bus/isa/mufdc.cpp @@ -161,7 +161,7 @@ void mufdc_device::device_start() void mufdc_device::device_reset() { m_isa->install_rom(this, 0xc8000, 0xc9fff, shortname(), "option"); - m_isa->install_device(0x3f0, 0x3f7, *m_fdc, &pc_fdc_interface::map); + m_isa->install_device(0x3f0, 0x3f7, *m_fdc, &mcs3201_device::map); m_isa->set_dma_channel(2, this, true); } diff --git a/src/devices/bus/isa/mufdc.h b/src/devices/bus/isa/mufdc.h index 2fa000757e4..fd21c1feb28 100644 --- a/src/devices/bus/isa/mufdc.h +++ b/src/devices/bus/isa/mufdc.h @@ -57,7 +57,7 @@ private: DECLARE_WRITE_LINE_MEMBER( fdc_irq_w ); DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); - required_device m_fdc; + required_device m_fdc; required_ioport m_config; }; diff --git a/src/devices/machine/fdc37c93x.cpp b/src/devices/machine/fdc37c93x.cpp index d29fe2fa89e..b18ed597097 100644 --- a/src/devices/machine/fdc37c93x.cpp +++ b/src/devices/machine/fdc37c93x.cpp @@ -536,7 +536,7 @@ void fdc37c93x_device::map_fdc_addresses() { uint16_t base = get_base_address(LogicalDevice::FDC, 0); - m_isa->install_device(base, base + 7, *floppy_controller_fdcdev, &pc_fdc_interface::map); + m_isa->install_device(base, base + 7, *floppy_controller_fdcdev, &smc37c78_device::map); } void fdc37c93x_device::unmap_fdc_addresses() diff --git a/src/devices/machine/fdc37c93x.h b/src/devices/machine/fdc37c93x.h index a4a67d2ccf3..ae5a9619b78 100644 --- a/src/devices/machine/fdc37c93x.h +++ b/src/devices/machine/fdc37c93x.h @@ -147,7 +147,7 @@ private: devcb_write_line m_txd2_callback; devcb_write_line m_ndtr2_callback; devcb_write_line m_nrts2_callback; - required_device floppy_controller_fdcdev; + required_device floppy_controller_fdcdev; required_device pc_lpt_lptdev; required_device pc_serial1_comdev; required_device pc_serial2_comdev; diff --git a/src/mame/drivers/ibmpcjr.cpp b/src/mame/drivers/ibmpcjr.cpp index ca25960204c..97573e6f3a7 100644 --- a/src/mame/drivers/ibmpcjr.cpp +++ b/src/mame/drivers/ibmpcjr.cpp @@ -6,7 +6,6 @@ #include "imagedev/cassette.h" #include "machine/i8255.h" #include "machine/ins8250.h" -#include "machine/pc_fdc.h" #include "machine/pc_lpt.h" #include "machine/pckeybrd.h" #include "machine/pic8259.h" diff --git a/src/mame/drivers/nforcepc.cpp b/src/mame/drivers/nforcepc.cpp index afa0ff16c86..8ac0bd3a62c 100644 --- a/src/mame/drivers/nforcepc.cpp +++ b/src/mame/drivers/nforcepc.cpp @@ -897,7 +897,7 @@ void it8703f_device::map_fdc_addresses() { uint16_t base = get_base_address(LogicalDevice::FDC, 0); - iospace->install_device(base, base + 7, *floppy_controller_fdcdev, &pc_fdc_interface::map); + iospace->install_device(base, base + 7, *floppy_controller_fdcdev, &smc37c78_device::map); } void it8703f_device::map_lpt(address_map& map) diff --git a/src/mame/drivers/pt68k4.cpp b/src/mame/drivers/pt68k4.cpp index f8dd84ebcd2..be50ddce5c8 100644 --- a/src/mame/drivers/pt68k4.cpp +++ b/src/mame/drivers/pt68k4.cpp @@ -57,7 +57,6 @@ TODO: 68230 device #include "cpu/m68000/m68000.h" #include "machine/mc68681.h" -#include "machine/pc_fdc.h" #include "machine/timekpr.h" #include "machine/wd_fdc.h" #include "sound/spkrdev.h" diff --git a/src/mame/drivers/tandy1t.cpp b/src/mame/drivers/tandy1t.cpp index 96c42eb4661..4141cc45363 100644 --- a/src/mame/drivers/tandy1t.cpp +++ b/src/mame/drivers/tandy1t.cpp @@ -40,7 +40,6 @@ Tandy 1000 (80386) variations: #include "machine/genpc.h" #include "machine/pckeybrd.h" #include "machine/nvram.h" -#include "machine/pc_fdc.h" #include "machine/bankdev.h" #include "video/pc_t1t.h" #include "sound/sn76496.h" diff --git a/src/mame/includes/nforcepc.h b/src/mame/includes/nforcepc.h index 573d7c2fed0..c5122a117e9 100644 --- a/src/mame/includes/nforcepc.h +++ b/src/mame/includes/nforcepc.h @@ -286,7 +286,7 @@ private: devcb_write_line m_txd2_callback; devcb_write_line m_ndtr2_callback; devcb_write_line m_nrts2_callback; - required_device floppy_controller_fdcdev; + required_device floppy_controller_fdcdev; required_device pc_lpt_lptdev; required_device pc_serial1_comdev; required_device pc_serial2_comdev;