summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/cbmiec/fd2000.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/cbmiec/fd2000.cpp')
-rw-r--r--src/devices/bus/cbmiec/fd2000.cpp20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/devices/bus/cbmiec/fd2000.cpp b/src/devices/bus/cbmiec/fd2000.cpp
index c4d1bd311c1..4b4834271a1 100644
--- a/src/devices/bus/cbmiec/fd2000.cpp
+++ b/src/devices/bus/cbmiec/fd2000.cpp
@@ -20,6 +20,8 @@
#include "emu.h"
#include "fd2000.h"
+#include "formats/d81_dsk.h"
+
//**************************************************************************
@@ -113,7 +115,7 @@ void fd4000_device::fd4000_mem(address_map &map)
}
-READ8_MEMBER( fd2000_device::via_pa_r )
+uint8_t fd2000_device::via_pa_r()
{
/*
@@ -133,7 +135,7 @@ READ8_MEMBER( fd2000_device::via_pa_r )
return 0;
}
-WRITE8_MEMBER( fd2000_device::via_pa_w )
+void fd2000_device::via_pa_w(uint8_t data)
{
/*
@@ -151,7 +153,7 @@ WRITE8_MEMBER( fd2000_device::via_pa_w )
*/
}
-READ8_MEMBER( fd2000_device::via_pb_r )
+uint8_t fd2000_device::via_pb_r()
{
/*
@@ -176,7 +178,7 @@ READ8_MEMBER( fd2000_device::via_pb_r )
return data;
}
-WRITE8_MEMBER( fd2000_device::via_pb_w )
+void fd2000_device::via_pb_w(uint8_t data)
{
/*
@@ -204,10 +206,10 @@ static void fd4000_floppies(device_slot_interface &device)
device.option_add("35ed", FLOPPY_35_ED); // TEAC FD-235J
}
/*
-FLOPPY_FORMATS_MEMBER( fd2000_device::floppy_formats )
+void fd2000_device::floppy_formats(format_registration &fr)
FLOPPY_D81_FORMAT
FLOPPY_D2M_FORMAT
-FLOPPY_FORMATS_END
+}
*/
@@ -219,7 +221,7 @@ void fd2000_device::add_common_devices(machine_config &config)
{
M65C02(config, m_maincpu, 24_MHz_XTAL / 12);
- via6522_device &via(VIA6522(config, G65SC22P2_TAG, 24_MHz_XTAL / 12));
+ via6522_device &via(R65C22(config, G65SC22P2_TAG, 24_MHz_XTAL / 12));
via.readpa_handler().set(FUNC(fd2000_device::via_pa_r));
via.readpb_handler().set(FUNC(fd2000_device::via_pb_r));
via.writepa_handler().set(FUNC(fd2000_device::via_pa_w));
@@ -231,7 +233,7 @@ void fd2000_device::device_add_mconfig(machine_config &config)
add_common_devices(config);
m_maincpu->set_addrmap(AS_PROGRAM, &fd2000_device::fd2000_mem);
DP8473(config, m_fdc, 24_MHz_XTAL);
- FLOPPY_CONNECTOR(config, DP8473V_TAG":0", fd2000_floppies, "35hd", floppy_image_device::default_floppy_formats, true);//fd2000_device::floppy_formats);
+ FLOPPY_CONNECTOR(config, DP8473V_TAG":0", fd2000_floppies, "35hd", floppy_image_device::default_mfm_floppy_formats, true);//fd2000_device::floppy_formats);
}
void fd4000_device::device_add_mconfig(machine_config &config)
@@ -239,7 +241,7 @@ void fd4000_device::device_add_mconfig(machine_config &config)
add_common_devices(config);
m_maincpu->set_addrmap(AS_PROGRAM, &fd4000_device::fd4000_mem);
PC8477A(config, m_fdc, 24_MHz_XTAL);
- FLOPPY_CONNECTOR(config, PC8477AV1_TAG":0", fd4000_floppies, "35ed", floppy_image_device::default_floppy_formats, true);//fd2000_device::floppy_formats);
+ FLOPPY_CONNECTOR(config, PC8477AV1_TAG":0", fd4000_floppies, "35ed", floppy_image_device::default_mfm_floppy_formats, true);//fd2000_device::floppy_formats);
}