diff options
author | 2019-03-25 23:13:40 +0100 | |
---|---|---|
committer | 2019-03-25 23:13:40 +0100 | |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/machine/at_keybc.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/machine/at_keybc.cpp')
-rw-r--r-- | src/devices/machine/at_keybc.cpp | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/devices/machine/at_keybc.cpp b/src/devices/machine/at_keybc.cpp index 5e6ac779569..aec9154a38f 100644 --- a/src/devices/machine/at_keybc.cpp +++ b/src/devices/machine/at_keybc.cpp @@ -74,8 +74,6 @@ ROM_START(at_kbc) ROMX_LOAD("1503033.bin", 0x0000, 0x0800, CRC(5a81c0d2) SHA1(0100f8789fb4de74706ae7f9473a12ec2b9bd729), ROM_BIOS(0)) ROM_SYSTEM_BIOS(1, "ptl", "PTL 1986") // unknown controller BIOS, (c) 1985, 1986 PTL ROMX_LOAD("yan25d05.bin", 0x0000, 0x0800, CRC(70c798f1) SHA1(ae9a79c7184a17331b70a50035ff63c757df094c), ROM_BIOS(1)) - ROM_SYSTEM_BIOS(2, "award15", "Award 1985 V1.5") // MIPS Rx2030 i8742 keyboard controller - ROMX_LOAD("keyboard_1.5.bin", 0x0000, 0x0800, CRC(f86ba0f7) SHA1(1ad475451db35a76d929824c035d582279fbe3a3), ROM_BIOS(2)) ROM_END ROM_START(ps2_kbc) @@ -110,22 +108,22 @@ DEFINE_DEVICE_TYPE(PS2_KEYBOARD_CONTROLLER, ps2_keyboard_controller_device, "ps2 // KEYBOARD CONTROLLER DEVICE BASE //************************************************************************** -uint8_t at_kbc_device_base::data_r() +READ8_MEMBER(at_kbc_device_base::data_r) { - return m_mcu->upi41_master_r(machine().dummy_space(), 0U); + return m_mcu->upi41_master_r(space, 0U); } -uint8_t at_kbc_device_base::status_r() +READ8_MEMBER(at_kbc_device_base::status_r) { - return m_mcu->upi41_master_r(machine().dummy_space(), 1U); + return m_mcu->upi41_master_r(space, 1U); } -void at_kbc_device_base::data_w(uint8_t data) +WRITE8_MEMBER(at_kbc_device_base::data_w) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(at_kbc_device_base::write_data), this), unsigned(data)); } -void at_kbc_device_base::command_w(uint8_t data) +WRITE8_MEMBER(at_kbc_device_base::command_w) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(at_kbc_device_base::write_command), this), unsigned(data)); } @@ -265,7 +263,7 @@ ioport_constructor at_keyboard_controller_device::device_input_ports() const return INPUT_PORTS_NAME(at_kbc); } -void at_keyboard_controller_device::p2_w(uint8_t data) +WRITE8_MEMBER(at_keyboard_controller_device::p2_w) { set_hot_res(BIT(~data, 0)); set_gate_a20(BIT(data, 1)); @@ -279,11 +277,11 @@ void at_keyboard_controller_device::p2_w(uint8_t data) // PS/2 KEYBOARD/MOUSE CONTROLLER DEVICE //************************************************************************** -uint8_t ps2_keyboard_controller_device::data_r() +READ8_MEMBER(ps2_keyboard_controller_device::data_r) { set_kbd_irq(0U); set_mouse_irq(0U); - return m_mcu->upi41_master_r(machine().dummy_space(), 0U); + return m_mcu->upi41_master_r(space, 0U); } WRITE_LINE_MEMBER(ps2_keyboard_controller_device::mouse_clk_w) @@ -385,12 +383,12 @@ TIMER_CALLBACK_MEMBER(ps2_keyboard_controller_device::set_mouse_data_in) m_mouse_data_in = param ? 1U : 0U; } -uint8_t ps2_keyboard_controller_device::p1_r() +READ8_MEMBER(ps2_keyboard_controller_device::p1_r) { return kbd_data_r() | (mouse_data_r() << 1) | 0xfcU; } -void ps2_keyboard_controller_device::p2_w(uint8_t data) +WRITE8_MEMBER(ps2_keyboard_controller_device::p2_w) { set_hot_res(BIT(~data, 0)); set_gate_a20(BIT(data, 1)); |