summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Curt Coder <curtcoder@mail.com>2012-11-28 15:57:24 +0000
committer Curt Coder <curtcoder@mail.com>2012-11-28 15:57:24 +0000
commit023298b926920578e629f0b7d0c4f90f1ced3324 (patch)
tree8ba81d3f84d54faf329a6221fc767469f3976c52 /src
parent52582aac7b7c4429a537c4c30ac564119e9bccb0 (diff)
(MESS) abc_fd2: Floppy modernization. (nw)
Diffstat (limited to 'src')
-rw-r--r--src/mess/machine/abc_fd2.c35
-rw-r--r--src/mess/machine/abc_fd2.h10
2 files changed, 14 insertions, 31 deletions
diff --git a/src/mess/machine/abc_fd2.c b/src/mess/machine/abc_fd2.c
index b9796afb6c6..f2e650f8bf4 100644
--- a/src/mess/machine/abc_fd2.c
+++ b/src/mess/machine/abc_fd2.c
@@ -126,29 +126,12 @@ static const z80_daisy_config daisy_chain[] =
//-------------------------------------------------
-// wd17xx_interface fdc_intf
+// SLOT_INTERFACE( abc_fd2_floppies )
//-------------------------------------------------
-static const floppy_interface fd2_floppy_interface =
-{
- DEVCB_NULL,
- DEVCB_NULL,
- DEVCB_NULL,
- DEVCB_NULL,
- DEVCB_NULL,
- FLOPPY_STANDARD_5_25_SSSD,
- LEGACY_FLOPPY_OPTIONS_NAME(default),
- "floppy_5_25",
- NULL
-};
-
-static const wd17xx_interface fdc_intf =
-{
- DEVCB_NULL,
- DEVCB_NULL,
- DEVCB_NULL,
- { FLOPPY_0, FLOPPY_1, NULL, NULL }
-};
+static SLOT_INTERFACE_START( abc_fd2_floppies )
+ SLOT_INTERFACE( "525sssd", FLOPPY_525_SSSD )
+SLOT_INTERFACE_END
//-------------------------------------------------
@@ -162,8 +145,10 @@ static MACHINE_CONFIG_FRAGMENT( abc_fd2 )
MCFG_CPU_CONFIG(daisy_chain)
MCFG_Z80PIO_ADD(Z80PIO_TAG, XTAL_4MHz/2, pio_intf) // ?
- MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(fd2_floppy_interface)
- MCFG_FD1771_ADD(FD1771_TAG, fdc_intf)
+ MCFG_FD1771x_ADD(FD1771_TAG, XTAL_4MHz/2 *8) // ?
+
+ MCFG_FLOPPY_DRIVE_ADD(FD1771_TAG":0", abc_fd2_floppies, "525sssd", NULL, floppy_image_device::default_floppy_formats)
+ MCFG_FLOPPY_DRIVE_ADD(FD1771_TAG":1", abc_fd2_floppies, "525sssd", NULL, floppy_image_device::default_floppy_formats)
MACHINE_CONFIG_END
@@ -193,8 +178,8 @@ abc_fd2_device::abc_fd2_device(const machine_config &mconfig, const char *tag, d
m_maincpu(*this, Z80_TAG),
m_pio(*this, Z80PIO_TAG),
m_fdc(*this, FD1771_TAG),
- m_image0(*this, FLOPPY_0),
- m_image1(*this, FLOPPY_1)
+ m_floppy0(*this, FD1771_TAG":0"),
+ m_floppy1(*this, FD1771_TAG":1")
{
}
diff --git a/src/mess/machine/abc_fd2.h b/src/mess/machine/abc_fd2.h
index 3b75d565846..b12cca66dca 100644
--- a/src/mess/machine/abc_fd2.h
+++ b/src/mess/machine/abc_fd2.h
@@ -16,10 +16,8 @@
#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
-#include "formats/basicdsk.h"
-#include "imagedev/flopdrv.h"
#include "machine/abcbus.h"
-#include "machine/wd17xx.h"
+#include "machine/wd_fdc.h"
#include "machine/z80pio.h"
@@ -54,9 +52,9 @@ protected:
private:
required_device<cpu_device> m_maincpu;
required_device<z80pio_device> m_pio;
- required_device<fd1771_device> m_fdc;
- required_device<legacy_floppy_image_device> m_image0;
- required_device<legacy_floppy_image_device> m_image1;
+ required_device<fd1771_t> m_fdc;
+ required_device<floppy_connector> m_floppy0;
+ required_device<floppy_connector> m_floppy1;
};