From 508c6c119ac35f48c6d025c9c2975969b5b5ec93 Mon Sep 17 00:00:00 2001 From: angelosa Date: Sun, 25 Jun 2023 01:06:22 +0200 Subject: chore: misc cleanups in PCI world --- src/devices/machine/i82443bx_host.cpp | 2 +- src/devices/machine/w83977tf.cpp | 8 +++++--- src/mame/misc/xtom3d.cpp | 2 +- src/mame/pc/pcipc.cpp | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/devices/machine/i82443bx_host.cpp b/src/devices/machine/i82443bx_host.cpp index 96b228993d2..5f833f63fd4 100644 --- a/src/devices/machine/i82443bx_host.cpp +++ b/src/devices/machine/i82443bx_host.cpp @@ -17,7 +17,7 @@ #define LOG_MAP (1U << 3) // log full remaps #define VERBOSE (LOG_GENERAL | LOG_IO | LOG_TODO | LOG_MAP) -#define LOG_OUTPUT_FUNC osd_printf_warning +//#define LOG_OUTPUT_FUNC osd_printf_warning #include "logmacro.h" diff --git a/src/devices/machine/w83977tf.cpp b/src/devices/machine/w83977tf.cpp index c37c44c1e3d..fb354f9c8ba 100644 --- a/src/devices/machine/w83977tf.cpp +++ b/src/devices/machine/w83977tf.cpp @@ -6,6 +6,8 @@ Winbond W83977TF TODO: - PoC for a generic (LPC) Super I/O type, to be merged with fdc37c93x; +- savquest (in pciagp) fails keyboard self test (PC=e140c reads bit 0 high + from port $64?) ***************************************************************************/ @@ -75,11 +77,11 @@ void w83977tf_device::device_add_mconfig(machine_config &config) KBDC8042(config, m_kbdc); m_kbdc->set_keyboard_type(kbdc8042_device::KBDC8042_PS2); - m_kbdc->set_interrupt_type(kbdc8042_device::KBDC8042_DOUBLE); - m_kbdc->input_buffer_full_callback().set(FUNC(w83977tf_device::irq_keyboard_w)); - m_kbdc->input_buffer_full_mouse_callback().set(FUNC(w83977tf_device::irq_mouse_w)); +// m_kbdc->set_interrupt_type(kbdc8042_device::KBDC8042_DOUBLE); m_kbdc->system_reset_callback().set(FUNC(w83977tf_device::kbdp20_gp20_reset_w)); m_kbdc->gate_a20_callback().set(FUNC(w83977tf_device::kbdp21_gp25_gatea20_w)); + m_kbdc->input_buffer_full_callback().set(FUNC(w83977tf_device::irq_keyboard_w)); + m_kbdc->input_buffer_full_mouse_callback().set(FUNC(w83977tf_device::irq_mouse_w)); } diff --git a/src/mame/misc/xtom3d.cpp b/src/mame/misc/xtom3d.cpp index 2130c1119af..c439b5cd40b 100644 --- a/src/mame/misc/xtom3d.cpp +++ b/src/mame/misc/xtom3d.cpp @@ -265,7 +265,7 @@ void isa16_oksan_lpc::device_add_mconfig(machine_config &config) m_kbdc->set_keyboard_type(kbdc8042_device::KBDC8042_STANDARD); m_kbdc->system_reset_callback().set_inputline(":maincpu", INPUT_LINE_RESET); m_kbdc->gate_a20_callback().set_inputline(":maincpu", INPUT_LINE_A20); - m_kbdc->input_buffer_full_callback().set(":pci:07.0", FUNC(i82371sb_isa_device::pc_irq1_w)); + m_kbdc->input_buffer_full_callback().set(":pci:07.0", FUNC(i82371eb_isa_device::pc_irq1_w)); } diff --git a/src/mame/pc/pcipc.cpp b/src/mame/pc/pcipc.cpp index c5f5066efb1..e2c6f7b9279 100644 --- a/src/mame/pc/pcipc.cpp +++ b/src/mame/pc/pcipc.cpp @@ -529,8 +529,8 @@ void pcipc_state::winbond_superio_config(device_t *device) // fdc.set_sysopt_pin(1); fdc.gp20_reset().set_inputline(":maincpu", INPUT_LINE_RESET); fdc.gp25_gatea20().set_inputline(":maincpu", INPUT_LINE_A20); - fdc.irq1().set(":pci:07.0", FUNC(i82371sb_isa_device::pc_irq1_w)); - fdc.irq8().set(":pci:07.0", FUNC(i82371sb_isa_device::pc_irq8n_w)); + fdc.irq1().set(":pci:07.0", FUNC(i82371eb_isa_device::pc_irq1_w)); + fdc.irq8().set(":pci:07.0", FUNC(i82371eb_isa_device::pc_irq8n_w)); // fdc.txd1().set(":serport0", FUNC(rs232_port_device::write_txd)); // fdc.ndtr1().set(":serport0", FUNC(rs232_port_device::write_dtr)); // fdc.nrts1().set(":serport0", FUNC(rs232_port_device::write_rts)); -- cgit v1.2.3