From ecce531619cfa3e62812f3690abb6b46eab089e6 Mon Sep 17 00:00:00 2001 From: Curt Coder Date: Sun, 23 Jun 2013 22:14:52 +0000 Subject: [PATCH] (MESS) ibm5160: Keyboard WIP. (nw) --- src/mess/machine/kb_pcat84.c | 8 ++++---- src/mess/machine/kb_pcat84.h | 6 +++--- src/mess/machine/kb_pcxt83.c | 4 ++-- src/mess/machine/kb_pcxt83.h | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/mess/machine/kb_pcat84.c b/src/mess/machine/kb_pcat84.c index 3d00143027c..4001b0071bb 100644 --- a/src/mess/machine/kb_pcat84.c +++ b/src/mess/machine/kb_pcat84.c @@ -24,7 +24,7 @@ // MACROS / CONSTANTS //************************************************************************** -#define I8048_TAG "i8048" +#define I8048_TAG "m5" @@ -49,7 +49,7 @@ ROM_START( ibm_pc_at_84_keyboard ) D 878154 8441 D H */ - ROM_LOAD( "1503099.bin", 0x000, 0x400, CRC(1e921f37) SHA1(5f722bdb3b57f5a532c02a5c3f78f30d785796f2) ) + ROM_LOAD( "1503099.m5", 0x000, 0x400, CRC(1e921f37) SHA1(5f722bdb3b57f5a532c02a5c3f78f30d785796f2) ) ROM_END @@ -76,7 +76,7 @@ ROM_START( ibm_3270pc_122_keyboard ) D 8512 D H */ - ROM_LOAD( "1385001.bin", 0x000, 0x400, CRC(c19767e9) SHA1(a3701e4617383a4de0fd5e2e86c4b74beaf94a7b) ) + ROM_LOAD( "1385001.m5", 0x000, 0x400, CRC(c19767e9) SHA1(a3701e4617383a4de0fd5e2e86c4b74beaf94a7b) ) ROM_END @@ -580,8 +580,8 @@ WRITE8_MEMBER( ibm_pc_at_84_keyboard_device::p2_w ) output_set_led_value(LED_NUM, BIT(data, 1)); output_set_led_value(LED_CAPS, BIT(data, 2)); - m_pc_kbdc->clock_write_from_kb(!BIT(data, 6)); m_pc_kbdc->data_write_from_kb(!BIT(data, 7)); + m_pc_kbdc->clock_write_from_kb(!BIT(data, 6)); } diff --git a/src/mess/machine/kb_pcat84.h b/src/mess/machine/kb_pcat84.h index 0c768068002..f3f00accbb7 100644 --- a/src/mess/machine/kb_pcat84.h +++ b/src/mess/machine/kb_pcat84.h @@ -9,8 +9,8 @@ #pragma once -#ifndef __PCAT84_KEYBOARD__ -#define __PCAT84_KEYBOARD__ +#ifndef __PC_KBD_IBM_PC_AT_84__ +#define __PC_KBD_IBM_PC_AT_84__ #include "emu.h" #include "cpu/mcs48/mcs48.h" @@ -52,7 +52,7 @@ protected: virtual void device_reset(); // device_pc_kbd_interface overrides - virtual DECLARE_WRITE_LINE_MEMBER( clock_write ) { m_maincpu->set_input_line(INPUT_LINE_IRQ0, state); }; + virtual DECLARE_WRITE_LINE_MEMBER( clock_write ) { m_maincpu->set_input_line(MCS48_INPUT_IRQ, state); }; virtual DECLARE_WRITE_LINE_MEMBER( data_write ) { }; private: diff --git a/src/mess/machine/kb_pcxt83.c b/src/mess/machine/kb_pcxt83.c index 2fe660961c1..f095b23553e 100644 --- a/src/mess/machine/kb_pcxt83.c +++ b/src/mess/machine/kb_pcxt83.c @@ -1,6 +1,6 @@ /********************************************************************** - IBM Model F PC/XT 5150/5160 83-key keyboard emulation + IBM Model F PC/XT 83-key keyboard emulation Copyright MESS Team. Visit http://mamedev.org for licensing and usage restrictions. @@ -328,8 +328,8 @@ WRITE8_MEMBER( ibm_pc_xt_83_keyboard_device::bus_w ) */ - m_pc_kbdc->clock_write_from_kb(BIT(data, 5)); m_pc_kbdc->data_write_from_kb(BIT(data, 6)); + m_pc_kbdc->clock_write_from_kb(BIT(data, 5)); if (BIT(data, 7)) { diff --git a/src/mess/machine/kb_pcxt83.h b/src/mess/machine/kb_pcxt83.h index 321c9fd1105..9cd08574316 100644 --- a/src/mess/machine/kb_pcxt83.h +++ b/src/mess/machine/kb_pcxt83.h @@ -1,6 +1,6 @@ /********************************************************************** - IBM Model F PC/XT 5150/5160 83-key keyboard emulation + IBM Model F PC/XT 83-key keyboard emulation Copyright MESS Team. Visit http://mamedev.org for licensing and usage restrictions. @@ -9,8 +9,8 @@ #pragma once -#ifndef __PCXT83_KEYBOARD__ -#define __PCXT83_KEYBOARD__ +#ifndef __PC_KBD_IBM_PC_XT_83__ +#define __PC_KBD_IBM_PC_XT_83__ #include "emu.h" #include "cpu/mcs48/mcs48.h" @@ -49,7 +49,7 @@ protected: virtual void device_reset(); // device_pc_kbd_interface overrides - virtual DECLARE_WRITE_LINE_MEMBER( clock_write ) { m_maincpu->set_input_line(INPUT_LINE_IRQ0, !state); }; + virtual DECLARE_WRITE_LINE_MEMBER( clock_write ) { m_maincpu->set_input_line(MCS48_INPUT_IRQ, !state); }; virtual DECLARE_WRITE_LINE_MEMBER( data_write ) { }; private: