summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/cbmiec/c1581.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/cbmiec/c1581.cpp')
-rw-r--r--src/devices/bus/cbmiec/c1581.cpp28
1 files changed, 16 insertions, 12 deletions
diff --git a/src/devices/bus/cbmiec/c1581.cpp b/src/devices/bus/cbmiec/c1581.cpp
index f589cb2f427..21c70937eb3 100644
--- a/src/devices/bus/cbmiec/c1581.cpp
+++ b/src/devices/bus/cbmiec/c1581.cpp
@@ -17,6 +17,9 @@
#include "emu.h"
#include "c1581.h"
+#include "cpu/m6502/m6502.h"
+#include "formats/d81_dsk.h"
+
//**************************************************************************
@@ -33,8 +36,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
-DEFINE_DEVICE_TYPE(C1563, c1563_device, "c1563", "Commodore 1563 3.5 Disk Drive")
-DEFINE_DEVICE_TYPE(C1581, c1581_device, "c1581", "Commodore 1581 3.5 Disk Drive")
+DEFINE_DEVICE_TYPE(C1563, c1563_device, "c1563", "Commodore 1563 3.5\" Disk Drive")
+DEFINE_DEVICE_TYPE(C1581, c1581_device, "c1581", "Commodore 1581 3.5\" Disk Drive")
//-------------------------------------------------
@@ -102,21 +105,21 @@ void c1581_device::c1581_mem(address_map &map)
// MOS8520_INTERFACE( cia_intf )
//-------------------------------------------------
-WRITE_LINE_MEMBER( c1581_device::cnt_w )
+void c1581_device::cnt_w(int state)
{
m_cnt_out = state;
update_iec();
}
-WRITE_LINE_MEMBER( c1581_device::sp_w )
+void c1581_device::sp_w(int state)
{
m_sp_out = state;
update_iec();
}
-READ8_MEMBER( c1581_device::cia_pa_r )
+uint8_t c1581_device::cia_pa_r()
{
/*
@@ -147,7 +150,7 @@ READ8_MEMBER( c1581_device::cia_pa_r )
return data;
}
-WRITE8_MEMBER( c1581_device::cia_pa_w )
+void c1581_device::cia_pa_w(uint8_t data)
{
/*
@@ -177,7 +180,7 @@ WRITE8_MEMBER( c1581_device::cia_pa_w )
m_leds[LED_ACT] = BIT(data, 6);
}
-READ8_MEMBER( c1581_device::cia_pb_r )
+uint8_t c1581_device::cia_pb_r()
{
/*
@@ -211,7 +214,7 @@ READ8_MEMBER( c1581_device::cia_pb_r )
return data;
}
-WRITE8_MEMBER( c1581_device::cia_pb_w )
+void c1581_device::cia_pb_w(uint8_t data)
{
/*
@@ -258,9 +261,10 @@ static void c1581_floppies(device_slot_interface &device)
// FLOPPY_FORMATS( c1581_device::floppy_formats )
//-------------------------------------------------
-FLOPPY_FORMATS_MEMBER( c1581_device::floppy_formats )
- FLOPPY_D81_FORMAT
-FLOPPY_FORMATS_END
+void c1581_device::floppy_formats(format_registration &fr)
+{
+ fr.add(FLOPPY_D81_FORMAT);
+}
//-------------------------------------------------
@@ -282,7 +286,7 @@ void c1581_device::device_add_mconfig(machine_config &config)
m_cia->pb_wr_callback().set(FUNC(c1581_device::cia_pb_w));
WD1772(config, m_fdc, 16_MHz_XTAL / 2);
- FLOPPY_CONNECTOR(config, WD1772_TAG":0", c1581_floppies, "35dd", c1581_device::floppy_formats, true);
+ FLOPPY_CONNECTOR(config, WD1772_TAG":0", c1581_floppies, "35dd", c1581_device::floppy_formats, true).enable_sound(true);
}