summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/isa/fdc.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/isa/fdc.cpp')
-rw-r--r--src/devices/bus/isa/fdc.cpp31
1 files changed, 15 insertions, 16 deletions
diff --git a/src/devices/bus/isa/fdc.cpp b/src/devices/bus/isa/fdc.cpp
index 3cd3f093ac7..1d41a496e75 100644
--- a/src/devices/bus/isa/fdc.cpp
+++ b/src/devices/bus/isa/fdc.cpp
@@ -9,7 +9,6 @@
#include "emu.h"
#include "fdc.h"
#include "machine/busmouse.h"
-#include "formats/pc_dsk.h"
#include "formats/naslite_dsk.h"
#include "formats/ibmxdf_dsk.h"
@@ -46,12 +45,12 @@ isa8_fdc_device::isa8_fdc_device(const machine_config &mconfig, device_type type
{
}
-WRITE_LINE_MEMBER( isa8_fdc_device::irq_w )
+void isa8_fdc_device::irq_w(int state)
{
m_isa->irq6_w(state ? ASSERT_LINE : CLEAR_LINE);
}
-WRITE_LINE_MEMBER( isa8_fdc_device::drq_w )
+void isa8_fdc_device::drq_w(int state)
{
m_isa->drq2_w(state ? ASSERT_LINE : CLEAR_LINE);
}
@@ -148,13 +147,13 @@ uint8_t isa8_upd765_fdc_device::dir_r()
return 0x00;
}
-WRITE_LINE_MEMBER(isa8_upd765_fdc_device::fdc_irq_w)
+void isa8_upd765_fdc_device::fdc_irq_w(int state)
{
fdc_irq = state;
check_irq();
}
-WRITE_LINE_MEMBER(isa8_upd765_fdc_device::fdc_drq_w)
+void isa8_upd765_fdc_device::fdc_drq_w(int state)
{
fdc_drq = state;
check_drq();
@@ -192,8 +191,8 @@ void isa8_fdc_xt_device::device_add_mconfig(machine_config &config)
upd765a_device &upd765a(UPD765A(config, m_fdc, 8'000'000, false, false));
upd765a.intrq_wr_callback().set(FUNC(isa8_fdc_xt_device::fdc_irq_w));
upd765a.drq_wr_callback().set(FUNC(isa8_fdc_xt_device::fdc_drq_w));
- FLOPPY_CONNECTOR(config, "fdc:0", pc_dd_floppies, "525dd", isa8_fdc_device::floppy_formats);
- FLOPPY_CONNECTOR(config, "fdc:1", pc_dd_floppies, "525dd", isa8_fdc_device::floppy_formats);
+ FLOPPY_CONNECTOR(config, "fdc:0", pc_dd_floppies, "525dd", isa8_fdc_device::floppy_formats).enable_sound(true);
+ FLOPPY_CONNECTOR(config, "fdc:1", pc_dd_floppies, "525dd", isa8_fdc_device::floppy_formats).enable_sound(true);
}
void isa8_fdc_xt_device::device_start()
@@ -231,8 +230,8 @@ void isa8_fdc_at_device::device_add_mconfig(machine_config &config)
upd765a_device &upd765a(UPD765A(config, m_fdc, 8'000'000, false, false));
upd765a.intrq_wr_callback().set(FUNC(isa8_fdc_at_device::fdc_irq_w));
upd765a.drq_wr_callback().set(FUNC(isa8_fdc_at_device::fdc_drq_w));
- FLOPPY_CONNECTOR(config, "fdc:0", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats);
- FLOPPY_CONNECTOR(config, "fdc:1", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats);
+ FLOPPY_CONNECTOR(config, "fdc:0", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats).enable_sound(true);
+ FLOPPY_CONNECTOR(config, "fdc:1", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats).enable_sound(true);
}
// Decoding is through a PAL, so presumably complete
@@ -261,8 +260,8 @@ void isa8_fdc_smc_device::device_add_mconfig(machine_config &config)
smc37c78_device &smc(SMC37C78(config, m_fdc, 24'000'000));
smc.intrq_wr_callback().set(FUNC(isa8_fdc_device::irq_w));
smc.drq_wr_callback().set(FUNC(isa8_fdc_device::drq_w));
- FLOPPY_CONNECTOR(config, "fdc:0", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats);
- FLOPPY_CONNECTOR(config, "fdc:1", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats);
+ FLOPPY_CONNECTOR(config, "fdc:0", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats).enable_sound(true);
+ FLOPPY_CONNECTOR(config, "fdc:1", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats).enable_sound(true);
}
void isa8_fdc_smc_device::device_start()
@@ -282,8 +281,8 @@ void isa8_fdc_ps2_device::device_add_mconfig(machine_config &config)
n82077aa.set_mode(n82077aa_device::mode_t::PS2);
n82077aa.intrq_wr_callback().set(FUNC(isa8_fdc_device::irq_w));
n82077aa.drq_wr_callback().set(FUNC(isa8_fdc_device::drq_w));
- FLOPPY_CONNECTOR(config, "fdc:0", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats);
- FLOPPY_CONNECTOR(config, "fdc:1", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats);
+ FLOPPY_CONNECTOR(config, "fdc:0", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats).enable_sound(true);
+ FLOPPY_CONNECTOR(config, "fdc:1", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats).enable_sound(true);
}
void isa8_fdc_ps2_device::device_start()
@@ -302,8 +301,8 @@ void isa8_fdc_superio_device::device_add_mconfig(machine_config &config)
pc_fdc_superio_device &superio(PC_FDC_SUPERIO(config, m_fdc, 24'000'000));
superio.intrq_wr_callback().set(FUNC(isa8_fdc_device::irq_w));
superio.drq_wr_callback().set(FUNC(isa8_fdc_device::drq_w));
- FLOPPY_CONNECTOR(config, "fdc:0", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats);
- FLOPPY_CONNECTOR(config, "fdc:1", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats);
+ FLOPPY_CONNECTOR(config, "fdc:0", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats).enable_sound(true);
+ FLOPPY_CONNECTOR(config, "fdc:1", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats).enable_sound(true);
}
void isa8_fdc_superio_device::device_start()
@@ -325,7 +324,7 @@ void isa8_ec1841_0003_device::device_start()
m_isa->install_device(0x023c, 0x023f, *m_bus_mouse, &bus_mouse_device::map);
}
-WRITE_LINE_MEMBER( isa8_ec1841_0003_device::aux_irq_w )
+void isa8_ec1841_0003_device::aux_irq_w(int state)
{
m_isa->irq4_w(state ? ASSERT_LINE : CLEAR_LINE);
}