summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/at_keybc.cpp
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2019-03-26 11:13:37 +1100
committer Vas Crabb <vas@vastheman.com>2019-03-26 11:13:37 +1100
commit97b67170277437131adf6ed4d60139c172529e4f (patch)
tree7a5cbf608f191075f1612b1af15832c206a3fe2d /src/devices/machine/at_keybc.cpp
parentb380514764cf857469bae61c11143a19f79a74c5 (diff)
(nw) Clean up the mess on master
This effectively reverts b380514764cf857469bae61c11143a19f79a74c5 and c24473ddff715ecec2e258a6eb38960cf8c8e98e, restoring the state at 598cd5227223c3b04ca31f0dbc1981256d9ea3ff. Before pushing, please check that what you're about to push is sane. Check your local commit log and ensure there isn't anything out-of-place before pushing to mainline. When things like this happen, it wastes everyone's time. I really don't need this in a week when real work™ is busting my balls and I'm behind where I want to be with preparing for MAME release.
Diffstat (limited to 'src/devices/machine/at_keybc.cpp')
-rw-r--r--src/devices/machine/at_keybc.cpp24
1 files changed, 13 insertions, 11 deletions
diff --git a/src/devices/machine/at_keybc.cpp b/src/devices/machine/at_keybc.cpp
index aec9154a38f..5e6ac779569 100644
--- a/src/devices/machine/at_keybc.cpp
+++ b/src/devices/machine/at_keybc.cpp
@@ -74,6 +74,8 @@ 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)
@@ -108,22 +110,22 @@ DEFINE_DEVICE_TYPE(PS2_KEYBOARD_CONTROLLER, ps2_keyboard_controller_device, "ps2
// KEYBOARD CONTROLLER DEVICE BASE
//**************************************************************************
-READ8_MEMBER(at_kbc_device_base::data_r)
+uint8_t at_kbc_device_base::data_r()
{
- return m_mcu->upi41_master_r(space, 0U);
+ return m_mcu->upi41_master_r(machine().dummy_space(), 0U);
}
-READ8_MEMBER(at_kbc_device_base::status_r)
+uint8_t at_kbc_device_base::status_r()
{
- return m_mcu->upi41_master_r(space, 1U);
+ return m_mcu->upi41_master_r(machine().dummy_space(), 1U);
}
-WRITE8_MEMBER(at_kbc_device_base::data_w)
+void at_kbc_device_base::data_w(uint8_t data)
{
machine().scheduler().synchronize(timer_expired_delegate(FUNC(at_kbc_device_base::write_data), this), unsigned(data));
}
-WRITE8_MEMBER(at_kbc_device_base::command_w)
+void at_kbc_device_base::command_w(uint8_t data)
{
machine().scheduler().synchronize(timer_expired_delegate(FUNC(at_kbc_device_base::write_command), this), unsigned(data));
}
@@ -263,7 +265,7 @@ ioport_constructor at_keyboard_controller_device::device_input_ports() const
return INPUT_PORTS_NAME(at_kbc);
}
-WRITE8_MEMBER(at_keyboard_controller_device::p2_w)
+void at_keyboard_controller_device::p2_w(uint8_t data)
{
set_hot_res(BIT(~data, 0));
set_gate_a20(BIT(data, 1));
@@ -277,11 +279,11 @@ WRITE8_MEMBER(at_keyboard_controller_device::p2_w)
// PS/2 KEYBOARD/MOUSE CONTROLLER DEVICE
//**************************************************************************
-READ8_MEMBER(ps2_keyboard_controller_device::data_r)
+uint8_t ps2_keyboard_controller_device::data_r()
{
set_kbd_irq(0U);
set_mouse_irq(0U);
- return m_mcu->upi41_master_r(space, 0U);
+ return m_mcu->upi41_master_r(machine().dummy_space(), 0U);
}
WRITE_LINE_MEMBER(ps2_keyboard_controller_device::mouse_clk_w)
@@ -383,12 +385,12 @@ TIMER_CALLBACK_MEMBER(ps2_keyboard_controller_device::set_mouse_data_in)
m_mouse_data_in = param ? 1U : 0U;
}
-READ8_MEMBER(ps2_keyboard_controller_device::p1_r)
+uint8_t ps2_keyboard_controller_device::p1_r()
{
return kbd_data_r() | (mouse_data_r() << 1) | 0xfcU;
}
-WRITE8_MEMBER(ps2_keyboard_controller_device::p2_w)
+void ps2_keyboard_controller_device::p2_w(uint8_t data)
{
set_hot_res(BIT(~data, 0));
set_gate_a20(BIT(data, 1));