From 55fe12bc2e545fde93b51e3594198bd004ea38b2 Mon Sep 17 00:00:00 2001 From: AJR Date: Tue, 10 Oct 2023 11:12:13 -0400 Subject: funkball: Remove AT keyboard --- src/mame/misc/funkball.cpp | 2 +- src/mame/shared/pcshare.cpp | 7 ++++++- src/mame/shared/pcshare.h | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/mame/misc/funkball.cpp b/src/mame/misc/funkball.cpp index 32880cb3d1a..073a1e66cd0 100644 --- a/src/mame/misc/funkball.cpp +++ b/src/mame/misc/funkball.cpp @@ -744,7 +744,7 @@ void funkball_state::funkball(machine_config &config) m_maincpu->set_addrmap(AS_IO, &funkball_state::funkball_io); m_maincpu->set_irq_acknowledge_callback("pic8259_1", FUNC(pic8259_device::inta_cb)); - pcat_common(config); + pcat_common_nokeyboard(config); pci_bus_legacy_device &pcibus(PCI_BUS_LEGACY(config, "pcibus", 0, 0)); pcibus.set_device(7, FUNC(funkball_state::voodoo_0_pci_r), FUNC(funkball_state::voodoo_0_pci_w)); diff --git a/src/mame/shared/pcshare.cpp b/src/mame/shared/pcshare.cpp index fbf36a0b5cf..8a7c6b0ff79 100644 --- a/src/mame/shared/pcshare.cpp +++ b/src/mame/shared/pcshare.cpp @@ -139,7 +139,7 @@ void pcat_base_state::pcat32_io_common(address_map &map) map(0x00c0, 0x00df).rw(m_dma8237_2, FUNC(am9517a_device::read), FUNC(am9517a_device::write)).umask32(0x00ff00ff); } -void pcat_base_state::pcat_common(machine_config &config) +void pcat_base_state::pcat_common_nokeyboard(machine_config &config) { PIC8259(config, m_pic8259_1, 0); m_pic8259_1->out_int_callback().set_inputline(m_maincpu, 0); @@ -177,6 +177,11 @@ void pcat_base_state::pcat_common(machine_config &config) m_kbdc->system_reset_callback().set_inputline(m_maincpu, INPUT_LINE_RESET); m_kbdc->gate_a20_callback().set_inputline(m_maincpu, INPUT_LINE_A20); m_kbdc->input_buffer_full_callback().set(m_pic8259_1, FUNC(pic8259_device::ir1_w)); +} + +void pcat_base_state::pcat_common(machine_config &config) +{ + pcat_common_nokeyboard(config); m_kbdc->set_keyboard_tag("at_keyboard"); at_keyboard_device &at_keyb(AT_KEYB(config, "at_keyboard", pc_keyboard_device::KEYBOARD_TYPE::AT, 1)); diff --git a/src/mame/shared/pcshare.h b/src/mame/shared/pcshare.h index 7daebc02eb7..857e4d9b861 100644 --- a/src/mame/shared/pcshare.h +++ b/src/mame/shared/pcshare.h @@ -42,6 +42,7 @@ public: protected: void pcat_common(machine_config &config); + void pcat_common_nokeyboard(machine_config &config); void pcat32_io_common(address_map &map); -- cgit v1.2.3