claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
d56df03a530348985919333c5599bbdf95670b19
86Box/src/keyboard_at.c

2483 lines
116 KiB
C
Raw Normal View History

Added my name to all the emulator's files that I touched; Unfinished JEGA emulation based on akm's DOSVAX (AX-emulating fork of DOSBox), not yet hooked into the reset of the emulator.
2017-05-30 03:38:38 +02:00
/*
* 86Box A hypervisor and IBM PC system emulator that specializes in
* running old operating systems and software designed for IBM
* PC systems and compatibles from 1981 through fairly recent
* system designs based on the PCI bus.
*
* This file is part of the 86Box distribution.
*
* Intel 8042 (AT keyboard controller) emulation.
*
The AT keyboard now returns the correct ID again, fixes some NT 3.5 versions.
2018-09-21 15:01:34 +02:00
* Version: @(#)keyboard_at.c 1.0.41 2018/09/21
Added my name to all the emulator's files that I touched; Unfinished JEGA emulation based on akm's DOSVAX (AX-emulating fork of DOSBox), not yet hooked into the reset of the emulator.
2017-05-30 03:38:38 +02:00
*
MonsterCommit(tm) with typo-fixes, void-ness fixes, correct CaPs for directories, etc. No real code changes.
2017-08-24 01:14:39 -04:00
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
Added my name to all the emulator's files that I touched; Unfinished JEGA emulation based on akm's DOSVAX (AX-emulating fork of DOSBox), not yet hooked into the reset of the emulator.
2017-05-30 03:38:38 +02:00
* Miran Grca, <mgrca8@gmail.com>
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
* Fred N. van Kempen, <decwiz@yahoo.com>
Another cleanup run.
2017-10-17 01:59:09 -04:00
*
Fixed all the compile-breaking mistakes.
2018-01-01 03:15:06 +01:00
* Copyright 2008-2018 Sarah Walker.
The FDC is now a device_t, and the FDC code has been cleaned up; Merged floppy.c and fdd.c and renamed floppy_*.c (the floppy image format handlers) to fdd_*.c; Reading the AT or PS/2 keyboard controller status no longer clears the transmit timeout bit, fixes error 8601 (mouse error) on the IBM PS/2 Model 80; MMU translate and DMA physical reads and writes now go through _mem_exec instead of directly to ram[], should fix the last remaining problems with remapped mappings; Implemented the Sound gain dialog; Added the resource for the "New floppy image" dialog and the needed functions for the functionality of exporting the currently mounted floppy image as 86F, both of which should be finished in the next commit; Applied the CD-ROM fixes from the PCem commit; Added the "Keep ratio" option for full screen stretch.
2018-01-17 18:43:36 +01:00
* Copyright 2016-2018 Miran Grca.
* Copyright 2017,2018 Fred N. van Kempen.
Added my name to all the emulator's files that I touched; Unfinished JEGA emulation based on akm's DOSVAX (AX-emulating fork of DOSBox), not yet hooked into the reset of the emulator.
2017-05-30 03:38:38 +02:00
*/
Another massive cleanup run. Ibm.h no longer includes system header files. ROM loading simplified, and moved from mem.c to rom.c. Fixes in Makefile. Corrected mamy wrong includes. Removed old junk from days long gone. First phase of new SCAT chipset driver - no longer gives errors in BIOS, but NOT DONE YET.
2017-09-25 04:31:20 -04:00
#include <stdio.h>
Timer counters now 64-bit; Cleaned up floppy code a lot and reverted to single poller; Fixed segment present bit and limit checking at read/write within segment; The ASUS boards now have memregs too; RTC code improved based on suggestion by Sarah Walker; Fixed SVGA odd/even emulation and added chain odd/even support; Removed non-existent CPU's.
2016-07-19 02:44:32 +02:00
#include <stdint.h>
More cleanups, also updated Makefile.local with all "user-settable" parts.
2017-10-19 21:08:34 -04:00
#include <stdlib.h>
Another massive cleanup run. Ibm.h no longer includes system header files. ROM loading simplified, and moved from mem.c to rom.c. Fixes in Makefile. Corrected mamy wrong includes. Removed old junk from days long gone. First phase of new SCAT chipset driver - no longer gives errors in BIOS, but NOT DONE YET.
2017-09-25 04:31:20 -04:00
#include <string.h>
More cleanups, also updated Makefile.local with all "user-settable" parts.
2017-10-19 21:08:34 -04:00
#include <stdarg.h>
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
#define HAVE_STDARG_H
Another massive cleanup run. Ibm.h no longer includes system header files. ROM loading simplified, and moved from mem.c to rom.c. Fixes in Makefile. Corrected mamy wrong includes. Removed old junk from days long gone. First phase of new SCAT chipset driver - no longer gives errors in BIOS, but NOT DONE YET.
2017-09-25 04:31:20 -04:00
#include <wchar.h>
Another cleanup run.
2017-10-17 01:59:09 -04:00
#include "86box.h"
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
#include "cpu/cpu.h"
Initial submission of the PCem-Experimental source code.
2016-06-26 00:34:39 +02:00
#include "io.h"
#include "pic.h"
#include "pit.h"
Cleanup, moving stuff out of ibm.h and such. Moved more configuration variables into main. Minor changes for multiplatform.
2017-11-02 02:28:00 -05:00
#include "ppi.h"
Another major cleanup - folders for cdrom and floppy, renamed disc to floppy, renamed SuperIO stuff, others as needed.
2017-09-04 01:52:29 -04:00
#include "mem.h"
Another massive cleanup run. Ibm.h no longer includes system header files. ROM loading simplified, and moved from mem.c to rom.c. Fixes in Makefile. Corrected mamy wrong includes. Removed old junk from days long gone. First phase of new SCAT chipset driver - no longer gives errors in BIOS, but NOT DONE YET.
2017-09-25 04:31:20 -04:00
#include "rom.h"
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
#include "device.h"
Initial submission of the PCem-Experimental source code.
2016-06-26 00:34:39 +02:00
#include "timer.h"
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
#include "machine/machine.h"
Added the Xi8088.
2018-03-02 20:47:18 +01:00
#include "machine/m_xt_xi8088.h"
Renamed the Paradise WD90C11 Standalone to Paradise WD90C11-LR and made it use the correct BIOS; Added the Paradise PVGA1A (standalone) and the Paradise WD90C30-LR, both with configurable video memory; Added the Toshiba T3100e.
2017-12-31 06:37:19 +01:00
#include "machine/m_at_t3100e.h"
The FDC is now a device_t, and the FDC code has been cleaned up; Merged floppy.c and fdd.c and renamed floppy_*.c (the floppy image format handlers) to fdd_*.c; Reading the AT or PS/2 keyboard controller status no longer clears the transmit timeout bit, fixes error 8601 (mouse error) on the IBM PS/2 Model 80; MMU translate and DMA physical reads and writes now go through _mem_exec instead of directly to ram[], should fix the last remaining problems with remapped mappings; Implemented the Sound gain dialog; Added the resource for the "New floppy image" dialog and the needed functions for the functionality of exporting the currently mounted floppy image as 86F, both of which should be finished in the next commit; Applied the CD-ROM fixes from the PCem commit; Added the "Keep ratio" option for full screen stretch.
2018-01-17 18:43:36 +01:00
#include "floppy/fdd.h"
Another major cleanup - folders for cdrom and floppy, renamed disc to floppy, renamed SuperIO stuff, others as needed.
2017-09-04 01:52:29 -04:00
#include "floppy/fdc.h"
Lowercase all CAPS to prevent case sensitive errors in non-Windows platforms
2017-08-27 04:33:47 +01:00
#include "sound/sound.h"
#include "sound/snd_speaker.h"
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
#include "video/video.h"
Initial submission of the PCem-Experimental source code.
2016-06-26 00:34:39 +02:00
#include "keyboard.h"
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#define STAT_PARITY 0x80
#define STAT_RTIMEOUT 0x40
#define STAT_TTIMEOUT 0x20
#define STAT_MFULL 0x20
#define STAT_LOCK 0x10
#define STAT_CD 0x08
#define STAT_SYSFLAG 0x04
#define STAT_IFULL 0x02
#define STAT_OFULL 0x01
#define PS2_REFRESH_TIME (16LL * TIMER_USEC)
#define CCB_UNUSED 0x80
#define CCB_TRANSLATE 0x40
#define CCB_PCMODE 0x20
#define CCB_ENABLEKBD 0x10
#define CCB_IGNORELOCK 0x08
#define CCB_SYSTEM 0x04
#define CCB_ENABLEMINT 0x02
#define CCB_ENABLEKINT 0x01
#define CCB_MASK 0x68
#define MODE_MASK 0x6c
Attempt to fix the keyboard lock and make parts more readable.
2016-07-13 01:47:54 +02:00
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
#define KBC_TYPE_ISA 0x00
#define KBC_TYPE_PS2_1 0x01
#define KBC_TYPE_PS2_2 0x02
#define KBC_TYPE_MASK 0x03
#define KBC_VEN_GENERIC 0x00
#define KBC_VEN_AMI 0x04
#define KBC_VEN_IBM_MCA 0x08
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#define KBC_VEN_QUADTEL 0x0c
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
#define KBC_VEN_TOSHIBA 0x10
Removed ROM set checking from several files.
2018-09-15 16:15:39 +02:00
#define KBC_VEN_XI8088 0x14
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#define KBC_VEN_MASK 0x1c
Added a few keyboard controller commands used by the AMI BIOS'es; The port 92 handler in mem.c now flushes MMU cache when toggling the A20 gate; Added ability to reload previous disc after ejecting it; Fixed the START/STOP UNIT command for both SCSI and ATAPI; Applied mainline PCem commit: All XT models can now use 64kb RAM. Patch from ecksemmess .
2017-01-04 05:58:44 +01:00
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
typedef struct {
int initialized;
int want60,
wantirq,
wantirq12;
uint8_t command;
uint8_t status;
uint8_t mem[0x100];
uint8_t out;
Ported over the PCem AT keyboard fix.
2018-03-13 02:48:24 +01:00
int out_new, out_delayed;
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
uint8_t secr_phase;
uint8_t mem_addr;
Initial submission of the PCem-Experimental source code.
2016-06-26 00:34:39 +02:00
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
uint8_t input_port,
output_port;
Initial submission of the PCem-Experimental source code.
2016-06-26 00:34:39 +02:00
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
uint8_t old_output_port;
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
uint8_t key_command;
int key_wantdata;
Initial submission of the PCem-Experimental source code.
2016-06-26 00:34:39 +02:00
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
int last_irq;
Initial submission of the PCem-Experimental source code.
2016-06-26 00:34:39 +02:00
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
uint8_t last_scan_code;
int dtrans;
int first_write;
int64_t refresh_time;
int refresh;
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
uint32_t flags;
uint8_t output_locked;
int64_t pulse_cb;
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
uint8_t ami_stat;
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
uint8_t (*write60_ven)(void *p, uint8_t val);
uint8_t (*write64_ven)(void *p, uint8_t val);
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
} atkbd_t;
/* bit 0 = repeat, bit 1 = makes break code? */
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
uint8_t keyboard_set3_flags[512];
uint8_t keyboard_set3_all_repeat;
uint8_t keyboard_set3_all_break;
Initial submission of the PCem-Experimental source code.
2016-06-26 00:34:39 +02:00
/* Bits 0 - 1 = scan code set, bit 6 = translate or not. */
Temporarily removed scan code set 1 support from the AT keyboard, fixes the keyboard in TSX.
2018-08-20 04:03:48 +02:00
/* Q */
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
uint8_t keyboard_mode = 0x42;
Initial submission of the PCem-Experimental source code.
2016-06-26 00:34:39 +02:00
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
int mouse_queue_start = 0,
mouse_queue_end = 0;
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
static uint8_t key_ctrl_queue[16];
static int key_ctrl_queue_start = 0,
key_ctrl_queue_end = 0;
static uint8_t key_queue[16];
static int key_queue_start = 0,
key_queue_end = 0;
static uint8_t mouse_queue[16];
Fixes for PS/2 mouse crash (since AT keyboard rework) from TheCollector1995.
2017-11-09 22:05:29 -05:00
static void (*mouse_write)(uint8_t val, void *priv) = NULL;
static void *mouse_p = NULL;
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
static uint8_t sc_or = 0;
static atkbd_t *CurrentKbd = NULL; // FIXME: remove!!! --FvK
/* Non-translated to translated scan codes. */
Got RAM usage down slightly further by merging in mode code from VARCem; Fixed the mouse.
2018-03-19 08:01:13 +01:00
static const uint8_t nont_to_t[256] = {
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
0xff, 0x43, 0x41, 0x3f, 0x3d, 0x3b, 0x3c, 0x58,
0x64, 0x44, 0x42, 0x40, 0x3e, 0x0f, 0x29, 0x59,
0x65, 0x38, 0x2a, 0x70, 0x1d, 0x10, 0x02, 0x5a,
0x66, 0x71, 0x2c, 0x1f, 0x1e, 0x11, 0x03, 0x5b,
0x67, 0x2e, 0x2d, 0x20, 0x12, 0x05, 0x04, 0x5c,
0x68, 0x39, 0x2f, 0x21, 0x14, 0x13, 0x06, 0x5d,
0x69, 0x31, 0x30, 0x23, 0x22, 0x15, 0x07, 0x5e,
0x6a, 0x72, 0x32, 0x24, 0x16, 0x08, 0x09, 0x5f,
0x6b, 0x33, 0x25, 0x17, 0x18, 0x0b, 0x0a, 0x60,
0x6c, 0x34, 0x35, 0x26, 0x27, 0x19, 0x0c, 0x61,
0x6d, 0x73, 0x28, 0x74, 0x1a, 0x0d, 0x62, 0x6e,
0x3a, 0x36, 0x1c, 0x1b, 0x75, 0x2b, 0x63, 0x76,
0x55, 0x56, 0x77, 0x78, 0x79, 0x7a, 0x0e, 0x7b,
0x7c, 0x4f, 0x7d, 0x4b, 0x47, 0x7e, 0x7f, 0x6f,
0x52, 0x53, 0x50, 0x4c, 0x4d, 0x48, 0x01, 0x45,
0x57, 0x4e, 0x51, 0x4a, 0x37, 0x49, 0x46, 0x54,
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
0x80, 0x81, 0x82, 0x41, 0x54, 0x85, 0x86, 0x87,
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
};
Temporarily removed scan code set 1 support from the AT keyboard, fixes the keyboard in TSX.
2018-08-20 04:03:48 +02:00
#if 0
Got RAM usage down slightly further by merging in mode code from VARCem; Fixed the mouse.
2018-03-19 08:01:13 +01:00
static const scancode scancode_set1[512] = {
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
{ { -1},{ -1} }, { { 0x01,-1},{ 0x81,-1} }, { { 0x02,-1},{ 0x82,-1} }, { { 0x03,-1},{ 0x83,-1} }, /*000*/
{ { 0x04,-1},{ 0x84,-1} }, { { 0x05,-1},{ 0x85,-1} }, { { 0x06,-1},{ 0x86,-1} }, { { 0x07,-1},{ 0x87,-1} }, /*004*/
{ { 0x08,-1},{ 0x88,-1} }, { { 0x09,-1},{ 0x89,-1} }, { { 0x0a,-1},{ 0x8a,-1} }, { { 0x0b,-1},{ 0x8b,-1} }, /*008*/
{ { 0x0c,-1},{ 0x8c,-1} }, { { 0x0d,-1},{ 0x8d,-1} }, { { 0x0e,-1},{ 0x8e,-1} }, { { 0x0f,-1},{ 0x8f,-1} }, /*00c*/
{ { 0x10,-1},{ 0x90,-1} }, { { 0x11,-1},{ 0x91,-1} }, { { 0x12,-1},{ 0x92,-1} }, { { 0x13,-1},{ 0x93,-1} }, /*010*/
{ { 0x14,-1},{ 0x94,-1} }, { { 0x15,-1},{ 0x95,-1} }, { { 0x16,-1},{ 0x96,-1} }, { { 0x17,-1},{ 0x97,-1} }, /*014*/
{ { 0x18,-1},{ 0x98,-1} }, { { 0x19,-1},{ 0x99,-1} }, { { 0x1a,-1},{ 0x9a,-1} }, { { 0x1b,-1},{ 0x9b,-1} }, /*018*/
{ { 0x1c,-1},{ 0x9c,-1} }, { { 0x1d,-1},{ 0x9d,-1} }, { { 0x1e,-1},{ 0x9e,-1} }, { { 0x1f,-1},{ 0x9f,-1} }, /*01c*/
{ { 0x20,-1},{ 0xa0,-1} }, { { 0x21,-1},{ 0xa1,-1} }, { { 0x22,-1},{ 0xa2,-1} }, { { 0x23,-1},{ 0xa3,-1} }, /*020*/
{ { 0x24,-1},{ 0xa4,-1} }, { { 0x25,-1},{ 0xa5,-1} }, { { 0x26,-1},{ 0xa6,-1} }, { { 0x27,-1},{ 0xa7,-1} }, /*024*/
{ { 0x28,-1},{ 0xa8,-1} }, { { 0x29,-1},{ 0xa9,-1} }, { { 0x2a,-1},{ 0xaa,-1} }, { { 0x2b,-1},{ 0xab,-1} }, /*028*/
{ { 0x2c,-1},{ 0xac,-1} }, { { 0x2d,-1},{ 0xad,-1} }, { { 0x2e,-1},{ 0xae,-1} }, { { 0x2f,-1},{ 0xaf,-1} }, /*02c*/
{ { 0x30,-1},{ 0xb0,-1} }, { { 0x31,-1},{ 0xb1,-1} }, { { 0x32,-1},{ 0xb2,-1} }, { { 0x33,-1},{ 0xb3,-1} }, /*030*/
{ { 0x34,-1},{ 0xb4,-1} }, { { 0x35,-1},{ 0xb5,-1} }, { { 0x36,-1},{ 0xb6,-1} }, { { 0x37,-1},{ 0xb7,-1} }, /*034*/
{ { 0x38,-1},{ 0xb8,-1} }, { { 0x39,-1},{ 0xb9,-1} }, { { 0x3a,-1},{ 0xba,-1} }, { { 0x3b,-1},{ 0xbb,-1} }, /*038*/
{ { 0x3c,-1},{ 0xbc,-1} }, { { 0x3d,-1},{ 0xbd,-1} }, { { 0x3e,-1},{ 0xbe,-1} }, { { 0x3f,-1},{ 0xbf,-1} }, /*03c*/
{ { 0x40,-1},{ 0xc0,-1} }, { { 0x41,-1},{ 0xc1,-1} }, { { 0x42,-1},{ 0xc2,-1} }, { { 0x43,-1},{ 0xc3,-1} }, /*040*/
{ { 0x44,-1},{ 0xc4,-1} }, { { 0x45,-1},{ 0xc5,-1} }, { { 0x46,-1},{ 0xc6,-1} }, { { 0x47,-1},{ 0xc7,-1} }, /*044*/
{ { 0x48,-1},{ 0xc8,-1} }, { { 0x49,-1},{ 0xc9,-1} }, { { 0x4a,-1},{ 0xca,-1} }, { { 0x4b,-1},{ 0xcb,-1} }, /*048*/
{ { 0x4c,-1},{ 0xcc,-1} }, { { 0x4d,-1},{ 0xcd,-1} }, { { 0x4e,-1},{ 0xce,-1} }, { { 0x4f,-1},{ 0xcf,-1} }, /*04c*/
{ { 0x50,-1},{ 0xd0,-1} }, { { 0x51,-1},{ 0xd1,-1} }, { { 0x52,-1},{ 0xd2,-1} }, { { 0x53,-1},{ 0xd3,-1} }, /*050*/
{ { 0x54,-1},{ 0xd4,-1} }, { { 0x55,-1},{ 0xd5,-1} }, { { 0x56,-1},{ 0xd6,-1} }, { { 0x57,-1},{ 0xd7,-1} }, /*054*/
{ { 0x58,-1},{ 0xd8,-1} }, { { 0x59,-1},{ 0xd9,-1} }, { { 0x5a,-1},{ 0xda,-1} }, { { 0x5b,-1},{ 0xdb,-1} }, /*058*/
{ { 0x5c,-1},{ 0xdc,-1} }, { { 0x5d,-1},{ 0xdd,-1} }, { { 0x5e,-1},{ 0xde,-1} }, { { 0x5f,-1},{ 0xdf,-1} }, /*05c*/
{ { 0x60,-1},{ 0xe0,-1} }, { { 0x61,-1},{ 0xe1,-1} }, { { 0x62,-1},{ 0xe2,-1} }, { { 0x63,-1},{ 0xe3,-1} }, /*060*/
{ { 0x64,-1},{ 0xe4,-1} }, { { 0x65,-1},{ 0xe5,-1} }, { { 0x66,-1},{ 0xe6,-1} }, { { 0x67,-1},{ 0xe7,-1} }, /*064*/
{ { 0x68,-1},{ 0xe8,-1} }, { { 0x69,-1},{ 0xe9,-1} }, { { 0x6a,-1},{ 0xea,-1} }, { { 0x6b,-1},{ 0xeb,-1} }, /*068*/
{ { 0x6c,-1},{ 0xec,-1} }, { { 0x6d,-1},{ 0xed,-1} }, { { 0x6e,-1},{ 0xee,-1} }, { { 0x6f,-1},{ 0xef,-1} }, /*06c*/
{ { 0x70,-1},{ 0xf0,-1} }, { { 0x71,-1},{ 0xf1,-1} }, { { 0x72,-1},{ 0xf2,-1} }, { { 0x73,-1},{ 0xf3,-1} }, /*070*/
{ { 0x74,-1},{ 0xf4,-1} }, { { 0x75,-1},{ 0xf5,-1} }, { { 0x76,-1},{ 0xf6,-1} }, { { 0x77,-1},{ 0xf7,-1} }, /*074*/
{ { 0x78,-1},{ 0xf8,-1} }, { { 0x79,-1},{ 0xf9,-1} }, { { 0x7a,-1},{ 0xfa,-1} }, { { 0x7b,-1},{ 0xfb,-1} }, /*078*/
{ { 0x7c,-1},{ 0xfc,-1} }, { { 0x7d,-1},{ 0xfd,-1} }, { { 0x7e,-1},{ 0xfe,-1} }, { { 0x7f,-1},{ 0xff,-1} }, /*07c*/
{ { 0x80,-1},{ -1} }, { { 0x81,-1},{ -1} }, { { 0x82,-1},{ -1} }, { { -1},{ -1} }, /*080*/
{ { -1},{ -1} }, { { 0x85,-1},{ -1} }, { { 0x86,-1},{ -1} }, { { 0x87,-1},{ -1} }, /*084*/
{ { 0x88,-1},{ -1} }, { { 0x89,-1},{ -1} }, { { 0x8a,-1},{ -1} }, { { 0x8b,-1},{ -1} }, /*088*/
{ { 0x8c,-1},{ -1} }, { { 0x8d,-1},{ -1} }, { { 0x8e,-1},{ -1} }, { { 0x8f,-1},{ -1} }, /*08c*/
{ { 0x90,-1},{ -1} }, { { 0x91,-1},{ -1} }, { { 0x92,-1},{ -1} }, { { 0x93,-1},{ -1} }, /*090*/
{ { 0x94,-1},{ -1} }, { { 0x95,-1},{ -1} }, { { 0x96,-1},{ -1} }, { { 0x97,-1},{ -1} }, /*094*/
{ { 0x98,-1},{ -1} }, { { 0x99,-1},{ -1} }, { { 0x9a,-1},{ -1} }, { { 0x9b,-1},{ -1} }, /*098*/
{ { 0x9c,-1},{ -1} }, { { 0x9d,-1},{ -1} }, { { 0x9e,-1},{ -1} }, { { 0x9f,-1},{ -1} }, /*09c*/
{ { 0xa0,-1},{ -1} }, { { 0xa1,-1},{ -1} }, { { 0xa2,-1},{ -1} }, { { 0xa3,-1},{ -1} }, /*0a0*/
{ { 0xa4,-1},{ -1} }, { { 0xa5,-1},{ -1} }, { { 0xa6,-1},{ -1} }, { { 0xa7,-1},{ -1} }, /*0a4*/
{ { 0xa8,-1},{ -1} }, { { 0xa9,-1},{ -1} }, { { 0xaa,-1},{ -1} }, { { 0xab,-1},{ -1} }, /*0a8*/
{ { 0xac,-1},{ -1} }, { { 0xad,-1},{ -1} }, { { 0xae,-1},{ -1} }, { { 0xaf,-1},{ -1} }, /*0ac*/
{ { 0xb0,-1},{ -1} }, { { 0xb1,-1},{ -1} }, { { 0xb2,-1},{ -1} }, { { 0xb3,-1},{ -1} }, /*0b0*/
{ { 0xb4,-1},{ -1} }, { { 0xb5,-1},{ -1} }, { { 0xb6,-1},{ -1} }, { { 0xb7,-1},{ -1} }, /*0b4*/
{ { 0xb8,-1},{ -1} }, { { 0xb9,-1},{ -1} }, { { 0xba,-1},{ -1} }, { { 0xbb,-1},{ -1} }, /*0b8*/
{ { 0xbc,-1},{ -1} }, { { 0xbd,-1},{ -1} }, { { 0xbe,-1},{ -1} }, { { 0xbf,-1},{ -1} }, /*0bc*/
{ { 0xc0,-1},{ -1} }, { { 0xc1,-1},{ -1} }, { { 0xc2,-1},{ -1} }, { { 0xc3,-1},{ -1} }, /*0c0*/
{ { 0xc4,-1},{ -1} }, { { 0xc5,-1},{ -1} }, { { 0xc6,-1},{ -1} }, { { 0xc7,-1},{ -1} }, /*0c4*/
{ { 0xc8,-1},{ -1} }, { { 0xc9,-1},{ -1} }, { { 0xca,-1},{ -1} }, { { 0xcb,-1},{ -1} }, /*0c8*/
{ { 0xcc,-1},{ -1} }, { { 0xcd,-1},{ -1} }, { { 0xce,-1},{ -1} }, { { 0xcf,-1},{ -1} }, /*0cc*/
{ { 0xd0,-1},{ -1} }, { { 0xd1,-1},{ -1} }, { { 0xd2,-1},{ -1} }, { { 0xd3,-1},{ -1} }, /*0d0*/
{ { 0xd4,-1},{ -1} }, { { 0xd5,-1},{ -1} }, { { 0xd6,-1},{ -1} }, { { 0xd7,-1},{ -1} }, /*0d4*/
{ { 0xd8,-1},{ -1} }, { { 0xd9,-1},{ -1} }, { { 0xda,-1},{ -1} }, { { 0xdb,-1},{ -1} }, /*0d8*/
{ { 0xdc,-1},{ -1} }, { { 0xdd,-1},{ -1} }, { { 0xde,-1},{ -1} }, { { 0xdf,-1},{ -1} }, /*0dc*/
{ { 0xe0,-1},{ -1} }, { { 0xe1,-1},{ -1} }, { { 0xe2,-1},{ -1} }, { { 0xe3,-1},{ -1} }, /*0e0*/
{ { 0xe4,-1},{ -1} }, { { 0xe5,-1},{ -1} }, { { 0xe6,-1},{ -1} }, { { 0xe7,-1},{ -1} }, /*0e4*/
{ { 0xe8,-1},{ -1} }, { { 0xe9,-1},{ -1} }, { { 0xea,-1},{ -1} }, { { 0xeb,-1},{ -1} }, /*0e8*/
{ { 0xec,-1},{ -1} }, { { 0xed,-1},{ -1} }, { { 0xee,-1},{ -1} }, { { 0xef,-1},{ -1} }, /*0ec*/
{ { -1},{ -1} }, { { 0xf1,-1},{ -1} }, { { 0xf2,-1},{ -1} }, { { 0xf3,-1},{ -1} }, /*0f0*/
{ { 0xf4,-1},{ -1} }, { { 0xf5,-1},{ -1} }, { { 0xf6,-1},{ -1} }, { { 0xf7,-1},{ -1} }, /*0f4*/
{ { 0xf8,-1},{ -1} }, { { 0xf9,-1},{ -1} }, { { 0xfa,-1},{ -1} }, { { 0xfb,-1},{ -1} }, /*0f8*/
{ { 0xfc,-1},{ -1} }, { { 0xfd,-1},{ -1} }, { { 0xfe,-1},{ -1} }, { { 0xff,-1},{ -1} }, /*0fc*/
{ {0xe1,0x1d,-1},{0xe1, 0x9d,-1} }, { {0xe0,0x01,-1},{0xe0, 0x81,-1} }, { {0xe0,0x02,-1},{0xe0, 0x82,-1} }, { {0xe0,0x03,-1},{0xe0, 0x83,-1} }, /*100*/
{ {0xe0,0x04,-1},{0xe0, 0x84,-1} }, { {0xe0,0x05,-1},{0xe0, 0x85,-1} }, { {0xe0,0x06,-1},{0xe0, 0x86,-1} }, { {0xe0,0x07,-1},{0xe0, 0x87,-1} }, /*104*/
{ {0xe0,0x08,-1},{0xe0, 0x88,-1} }, { {0xe0,0x09,-1},{0xe0, 0x89,-1} }, { {0xe0,0x0a,-1},{0xe0, 0x8a,-1} }, { {0xe0,0x0b,-1},{0xe0, 0x8b,-1} }, /*108*/
{ {0xe0,0x0c,-1},{0xe0, 0x8c,-1} }, { { -1},{ -1} }, { {0xe0,0x0e,-1},{0xe0, 0x8e,-1} }, { {0xe0,0x0f,-1},{0xe0, 0x8f,-1} }, /*10c*/
{ {0xe0,0x10,-1},{0xe0, 0x90,-1} }, { {0xe0,0x11,-1},{0xe0, 0x91,-1} }, { {0xe0,0x12,-1},{0xe0, 0x92,-1} }, { {0xe0,0x13,-1},{0xe0, 0x93,-1} }, /*110*/
{ {0xe0,0x14,-1},{0xe0, 0x94,-1} }, { {0xe0,0x15,-1},{0xe0, 0x95,-1} }, { {0xe0,0x16,-1},{0xe0, 0x96,-1} }, { {0xe0,0x17,-1},{0xe0, 0x97,-1} }, /*114*/
{ {0xe0,0x18,-1},{0xe0, 0x98,-1} }, { {0xe0,0x19,-1},{0xe0, 0x99,-1} }, { {0xe0,0x1a,-1},{0xe0, 0x9a,-1} }, { {0xe0,0x1b,-1},{0xe0, 0x9b,-1} }, /*118*/
{ {0xe0,0x1c,-1},{0xe0, 0x9c,-1} }, { {0xe0,0x1d,-1},{0xe0, 0x9d,-1} }, { {0xe0,0x1e,-1},{0xe0, 0x9e,-1} }, { {0xe0,0x1f,-1},{0xe0, 0x9f,-1} }, /*11c*/
{ {0xe0,0x20,-1},{0xe0, 0xa0,-1} }, { {0xe0,0x21,-1},{0xe0, 0xa1,-1} }, { {0xe0,0x22,-1},{0xe0, 0xa2,-1} }, { {0xe0,0x23,-1},{0xe0, 0xa3,-1} }, /*120*/
{ {0xe0,0x24,-1},{0xe0, 0xa4,-1} }, { {0xe0,0x25,-1},{0xe0, 0xa5,-1} }, { {0xe0,0x26,-1},{0xe0, 0xa6,-1} }, { { -1},{ -1} }, /*124*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*128*/
{ {0xe0,0x2c,-1},{0xe0, 0xac,-1} }, { {0xe0,0x2d,-1},{0xe0, 0xad,-1} }, { {0xe0,0x2e,-1},{0xe0, 0xae,-1} }, { {0xe0,0x2f,-1},{0xe0, 0xaf,-1} }, /*12c*/
{ {0xe0,0x30,-1},{0xe0, 0xb0,-1} }, { {0xe0,0x31,-1},{0xe0, 0xb1,-1} }, { {0xe0,0x32,-1},{0xe0, 0xb2,-1} }, { { -1},{ -1} }, /*130*/
{ {0xe0,0x34,-1},{0xe0, 0xb4,-1} }, { {0xe0,0x35,-1},{0xe0, 0xb5,-1} }, { { -1},{ -1} }, { {0xe0,0x37,-1},{0xe0, 0xb7,-1} }, /*134*/
{ {0xe0,0x38,-1},{0xe0, 0xb8,-1} }, { { -1},{ -1} }, { {0xe0,0x3a,-1},{0xe0, 0xba,-1} }, { {0xe0,0x3b,-1},{0xe0, 0xbb,-1} }, /*138*/
{ {0xe0,0x3c,-1},{0xe0, 0xbc,-1} }, { {0xe0,0x3d,-1},{0xe0, 0xbd,-1} }, { {0xe0,0x3e,-1},{0xe0, 0xbe,-1} }, { {0xe0,0x3f,-1},{0xe0, 0xbf,-1} }, /*13c*/
{ {0xe0,0x40,-1},{0xe0, 0xc0,-1} }, { {0xe0,0x41,-1},{0xe0, 0xc1,-1} }, { {0xe0,0x42,-1},{0xe0, 0xc2,-1} }, { {0xe0,0x43,-1},{0xe0, 0xc3,-1} }, /*140*/
{ {0xe0,0x44,-1},{0xe0, 0xc4,-1} }, { { -1},{ -1} }, { {0xe0,0x46,-1},{0xe0, 0xc6,-1} }, { {0xe0,0x47,-1},{0xe0, 0xc7,-1} }, /*144*/
{ {0xe0,0x48,-1},{0xe0, 0xc8,-1} }, { {0xe0,0x49,-1},{0xe0, 0xc9,-1} }, { { -1},{ -1} }, { {0xe0,0x4b,-1},{0xe0, 0xcb,-1} }, /*148*/
{ {0xe0,0x4c,-1},{0xe0, 0xcc,-1} }, { {0xe0,0x4d,-1},{0xe0, 0xcd,-1} }, { {0xe0,0x4e,-1},{0xe0, 0xce,-1} }, { {0xe0,0x4f,-1},{0xe0, 0xcf,-1} }, /*14c*/
{ {0xe0,0x50,-1},{0xe0, 0xd0,-1} }, { {0xe0,0x51,-1},{0xe0, 0xd1,-1} }, { {0xe0,0x52,-1},{0xe0, 0xd2,-1} }, { {0xe0,0x53,-1},{0xe0, 0xd3,-1} }, /*150*/
{ { -1},{ -1} }, { {0xe0,0x55,-1},{0xe0, 0xd5,-1} }, { { -1},{ -1} }, { {0xe0,0x57,-1},{0xe0, 0xd7,-1} }, /*154*/
{ {0xe0,0x58,-1},{0xe0, 0xd8,-1} }, { {0xe0,0x59,-1},{0xe0, 0xd9,-1} }, { {0xe0,0x5a,-1},{0xe0, 0xaa,-1} }, { {0xe0,0x5b,-1},{0xe0, 0xdb,-1} }, /*158*/
{ {0xe0,0x5c,-1},{0xe0, 0xdc,-1} }, { {0xe0,0x5d,-1},{0xe0, 0xdd,-1} }, { {0xe0,0x5e,-1},{0xe0, 0xee,-1} }, { {0xe0,0x5f,-1},{0xe0, 0xdf,-1} }, /*15c*/
{ { -1},{ -1} }, { {0xe0,0x61,-1},{0xe0, 0xe1,-1} }, { {0xe0,0x62,-1},{0xe0, 0xe2,-1} }, { {0xe0,0x63,-1},{0xe0, 0xe3,-1} }, /*160*/
{ {0xe0,0x64,-1},{0xe0, 0xe4,-1} }, { {0xe0,0x65,-1},{0xe0, 0xe5,-1} }, { {0xe0,0x66,-1},{0xe0, 0xe6,-1} }, { {0xe0,0x67,-1},{0xe0, 0xe7,-1} }, /*164*/
{ {0xe0,0x68,-1},{0xe0, 0xe8,-1} }, { {0xe0,0x69,-1},{0xe0, 0xe9,-1} }, { {0xe0,0x6a,-1},{0xe0, 0xea,-1} }, { {0xe0,0x6b,-1},{0xe0, 0xeb,-1} }, /*168*/
{ {0xe0,0x6c,-1},{0xe0, 0xec,-1} }, { {0xe0,0x6d,-1},{0xe0, 0xed,-1} }, { {0xe0,0x6e,-1},{0xe0, 0xee,-1} }, { { -1},{ -1} }, /*16c*/
{ {0xe0,0x70,-1},{0xe0, 0xf0,-1} }, { {0xe0,0x71,-1},{0xe0, 0xf1,-1} }, { {0xe0,0x72,-1},{0xe0, 0xf2,-1} }, { {0xe0,0x73,-1},{0xe0, 0xf3,-1} }, /*170*/
{ {0xe0,0x74,-1},{0xe0, 0xf4,-1} }, { {0xe0,0x75,-1},{0xe0, 0xf5,-1} }, { { -1},{ -1} }, { {0xe0,0x77,-1},{0xe0, 0xf7,-1} }, /*174*/
{ {0xe0,0x78,-1},{0xe0, 0xf8,-1} }, { {0xe0,0x79,-1},{0xe0, 0xf9,-1} }, { {0xe0,0x7a,-1},{0xe0, 0xfa,-1} }, { {0xe0,0x7b,-1},{0xe0, 0xfb,-1} }, /*178*/
{ {0xe0,0x7c,-1},{0xe0, 0xfc,-1} }, { {0xe0,0x7d,-1},{0xe0, 0xfd,-1} }, { {0xe0,0x7e,-1},{0xe0, 0xfe,-1} }, { {0xe0,0x7f,-1},{0xe0, 0xff,-1} }, /*17c*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*180*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*184*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*188*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*18c*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*190*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*194*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*198*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*19c*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1a0*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1a4*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1a8*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1ac*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1c0*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1c4*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1c8*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1cc*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1d0*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1d4*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1d8*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1dc*/
{ { -1},{ -1} }, { {0xe0,0xe1,-1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1e0*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1e4*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1e8*/
{ { -1},{ -1} }, { { -1},{ -1} }, { {0xe0,0xee,-1},{ -1} }, { { -1},{ -1} }, /*1ec*/
{ { -1},{ -1} }, { {0xe0,0xf1,-1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1f0*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1f4*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1f8*/
{ { -1},{ -1} }, { { -1},{ -1} }, { {0xe0,0xfe,-1},{ -1} }, { {0xe0,0xff,-1},{ -1} } /*1fc*/
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
};
Temporarily removed scan code set 1 support from the AT keyboard, fixes the keyboard in TSX.
2018-08-20 04:03:48 +02:00
#endif
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
Got RAM usage down slightly further by merging in mode code from VARCem; Fixed the mouse.
2018-03-19 08:01:13 +01:00
static const scancode scancode_set2[512] = {
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
{ { -1},{ -1} }, { { 0x76,-1},{ 0xF0,0x76,-1} }, { { 0x16,-1},{ 0xF0,0x16,-1} }, { { 0x1E,-1},{ 0xF0,0x1E,-1} }, /*000*/
{ { 0x26,-1},{ 0xF0,0x26,-1} }, { { 0x25,-1},{ 0xF0,0x25,-1} }, { { 0x2E,-1},{ 0xF0,0x2E,-1} }, { { 0x36,-1},{ 0xF0,0x36,-1} }, /*004*/
{ { 0x3D,-1},{ 0xF0,0x3D,-1} }, { { 0x3E,-1},{ 0xF0,0x3E,-1} }, { { 0x46,-1},{ 0xF0,0x46,-1} }, { { 0x45,-1},{ 0xF0,0x45,-1} }, /*008*/
{ { 0x4E,-1},{ 0xF0,0x4E,-1} }, { { 0x55,-1},{ 0xF0,0x55,-1} }, { { 0x66,-1},{ 0xF0,0x66,-1} }, { { 0x0D,-1},{ 0xF0,0x0D,-1} }, /*00c*/
{ { 0x15,-1},{ 0xF0,0x15,-1} }, { { 0x1D,-1},{ 0xF0,0x1D,-1} }, { { 0x24,-1},{ 0xF0,0x24,-1} }, { { 0x2D,-1},{ 0xF0,0x2D,-1} }, /*010*/
{ { 0x2C,-1},{ 0xF0,0x2C,-1} }, { { 0x35,-1},{ 0xF0,0x35,-1} }, { { 0x3C,-1},{ 0xF0,0x3C,-1} }, { { 0x43,-1},{ 0xF0,0x43,-1} }, /*014*/
{ { 0x44,-1},{ 0xF0,0x44,-1} }, { { 0x4D,-1},{ 0xF0,0x4D,-1} }, { { 0x54,-1},{ 0xF0,0x54,-1} }, { { 0x5B,-1},{ 0xF0,0x5B,-1} }, /*018*/
{ { 0x5A,-1},{ 0xF0,0x5A,-1} }, { { 0x14,-1},{ 0xF0,0x14,-1} }, { { 0x1C,-1},{ 0xF0,0x1C,-1} }, { { 0x1B,-1},{ 0xF0,0x1B,-1} }, /*01c*/
{ { 0x23,-1},{ 0xF0,0x23,-1} }, { { 0x2B,-1},{ 0xF0,0x2B,-1} }, { { 0x34,-1},{ 0xF0,0x34,-1} }, { { 0x33,-1},{ 0xF0,0x33,-1} }, /*020*/
{ { 0x3B,-1},{ 0xF0,0x3B,-1} }, { { 0x42,-1},{ 0xF0,0x42,-1} }, { { 0x4B,-1},{ 0xF0,0x4B,-1} }, { { 0x4C,-1},{ 0xF0,0x4C,-1} }, /*024*/
{ { 0x52,-1},{ 0xF0,0x52,-1} }, { { 0x0E,-1},{ 0xF0,0x0E,-1} }, { { 0x12,-1},{ 0xF0,0x12,-1} }, { { 0x5D,-1},{ 0xF0,0x5D,-1} }, /*028*/
{ { 0x1A,-1},{ 0xF0,0x1A,-1} }, { { 0x22,-1},{ 0xF0,0x22,-1} }, { { 0x21,-1},{ 0xF0,0x21,-1} }, { { 0x2A,-1},{ 0xF0,0x2A,-1} }, /*02c*/
{ { 0x32,-1},{ 0xF0,0x32,-1} }, { { 0x31,-1},{ 0xF0,0x31,-1} }, { { 0x3A,-1},{ 0xF0,0x3A,-1} }, { { 0x41,-1},{ 0xF0,0x41,-1} }, /*030*/
{ { 0x49,-1},{ 0xF0,0x49,-1} }, { { 0x4A,-1},{ 0xF0,0x4A,-1} }, { { 0x59,-1},{ 0xF0,0x59,-1} }, { { 0x7C,-1},{ 0xF0,0x7C,-1} }, /*034*/
{ { 0x11,-1},{ 0xF0,0x11,-1} }, { { 0x29,-1},{ 0xF0,0x29,-1} }, { { 0x58,-1},{ 0xF0,0x58,-1} }, { { 0x05,-1},{ 0xF0,0x05,-1} }, /*038*/
{ { 0x06,-1},{ 0xF0,0x06,-1} }, { { 0x04,-1},{ 0xF0,0x04,-1} }, { { 0x0C,-1},{ 0xF0,0x0C,-1} }, { { 0x03,-1},{ 0xF0,0x03,-1} }, /*03c*/
{ { 0x0B,-1},{ 0xF0,0x0B,-1} }, { { 0x83,-1},{ 0xF0,0x83,-1} }, { { 0x0A,-1},{ 0xF0,0x0A,-1} }, { { 0x01,-1},{ 0xF0,0x01,-1} }, /*040*/
{ { 0x09,-1},{ 0xF0,0x09,-1} }, { { 0x77,-1},{ 0xF0,0x77,-1} }, { { 0x7E,-1},{ 0xF0,0x7E,-1} }, { { 0x6C,-1},{ 0xF0,0x6C,-1} }, /*044*/
{ { 0x75,-1},{ 0xF0,0x75,-1} }, { { 0x7D,-1},{ 0xF0,0x7D,-1} }, { { 0x7B,-1},{ 0xF0,0x7B,-1} }, { { 0x6B,-1},{ 0xF0,0x6B,-1} }, /*048*/
{ { 0x73,-1},{ 0xF0,0x73,-1} }, { { 0x74,-1},{ 0xF0,0x74,-1} }, { { 0x79,-1},{ 0xF0,0x79,-1} }, { { 0x69,-1},{ 0xF0,0x69,-1} }, /*04c*/
{ { 0x72,-1},{ 0xF0,0x72,-1} }, { { 0x7A,-1},{ 0xF0,0x7A,-1} }, { { 0x70,-1},{ 0xF0,0x70,-1} }, { { 0x71,-1},{ 0xF0,0x71,-1} }, /*050*/
{ { 0x84,-1},{ 0xF0,0x84,-1} }, { { 0x60,-1},{ 0xF0,0x60,-1} }, { { 0x61,-1},{ 0xF0,0x61,-1} }, { { 0x78,-1},{ 0xF0,0x78,-1} }, /*054*/
{ { 0x07,-1},{ 0xF0,0x07,-1} }, { { 0x0F,-1},{ 0xF0,0x0F,-1} }, { { 0x17,-1},{ 0xF0,0x17,-1} }, { { 0x1F,-1},{ 0xF0,0x1F,-1} }, /*058*/
{ { 0x27,-1},{ 0xF0,0x27,-1} }, { { 0x2F,-1},{ 0xF0,0x2F,-1} }, { { 0x37,-1},{ 0xF0,0x37,-1} }, { { 0x3F,-1},{ 0xF0,0x3F,-1} }, /*05c*/
{ { 0x47,-1},{ 0xF0,0x47,-1} }, { { 0x4F,-1},{ 0xF0,0x4F,-1} }, { { 0x56,-1},{ 0xF0,0x56,-1} }, { { 0x5E,-1},{ 0xF0,0x5E,-1} }, /*060*/
{ { 0x08,-1},{ 0xF0,0x08,-1} }, { { 0x10,-1},{ 0xF0,0x10,-1} }, { { 0x18,-1},{ 0xF0,0x18,-1} }, { { 0x20,-1},{ 0xF0,0x20,-1} }, /*064*/
{ { 0x28,-1},{ 0xF0,0x28,-1} }, { { 0x30,-1},{ 0xF0,0x30,-1} }, { { 0x38,-1},{ 0xF0,0x38,-1} }, { { 0x40,-1},{ 0xF0,0x40,-1} }, /*068*/
{ { 0x48,-1},{ 0xF0,0x48,-1} }, { { 0x50,-1},{ 0xF0,0x50,-1} }, { { 0x57,-1},{ 0xF0,0x57,-1} }, { { 0x6F,-1},{ 0xF0,0x6F,-1} }, /*06c*/
{ { 0x13,-1},{ 0xF0,0x13,-1} }, { { 0x19,-1},{ 0xF0,0x19,-1} }, { { 0x39,-1},{ 0xF0,0x39,-1} }, { { 0x51,-1},{ 0xF0,0x51,-1} }, /*070*/
{ { 0x53,-1},{ 0xF0,0x53,-1} }, { { 0x5C,-1},{ 0xF0,0x5C,-1} }, { { 0x5F,-1},{ 0xF0,0x5F,-1} }, { { 0x62,-1},{ 0xF0,0x62,-1} }, /*074*/
{ { 0x63,-1},{ 0xF0,0x63,-1} }, { { 0x64,-1},{ 0xF0,0x64,-1} }, { { 0x65,-1},{ 0xF0,0x65,-1} }, { { 0x67,-1},{ 0xF0,0x67,-1} }, /*078*/
{ { 0x68,-1},{ 0xF0,0x68,-1} }, { { 0x6A,-1},{ 0xF0,0x6A,-1} }, { { 0x6D,-1},{ 0xF0,0x6D,-1} }, { { 0x6E,-1},{ 0xF0,0x6E,-1} }, /*07c*/
{ { 0x80,-1},{ 0xf0,0x80,-1} }, { { 0x81,-1},{ 0xf0,0x81,-1} }, { { 0x82,-1},{ 0xf0,0x82,-1} }, { { -1},{ -1} }, /*080*/
{ { -1},{ -1} }, { { 0x85,-1},{ 0xf0,0x54,-1} }, { { 0x86,-1},{ 0xf0,0x86,-1} }, { { 0x87,-1},{ 0xf0,0x87,-1} }, /*084*/
{ { 0x88,-1},{ 0xf0,0x88,-1} }, { { 0x89,-1},{ 0xf0,0x89,-1} }, { { 0x8a,-1},{ 0xf0,0x8a,-1} }, { { 0x8b,-1},{ 0xf0,0x8b,-1} }, /*088*/
{ { 0x8c,-1},{ 0xf0,0x8c,-1} }, { { 0x8d,-1},{ 0xf0,0x8d,-1} }, { { 0x8e,-1},{ 0xf0,0x8e,-1} }, { { 0x8f,-1},{ 0xf0,0x8f,-1} }, /*08c*/
{ { 0x90,-1},{ 0xf0,0x90,-1} }, { { 0x91,-1},{ 0xf0,0x91,-1} }, { { 0x92,-1},{ 0xf0,0x92,-1} }, { { 0x93,-1},{ 0xf0,0x93,-1} }, /*090*/
{ { 0x94,-1},{ 0xf0,0x94,-1} }, { { 0x95,-1},{ 0xf0,0x95,-1} }, { { 0x96,-1},{ 0xf0,0x96,-1} }, { { 0x97,-1},{ 0xf0,0x97,-1} }, /*094*/
{ { 0x98,-1},{ 0xf0,0x98,-1} }, { { 0x99,-1},{ 0xf0,0x99,-1} }, { { 0x9a,-1},{ 0xf0,0x9a,-1} }, { { 0x9b,-1},{ 0xf0,0x9b,-1} }, /*098*/
{ { 0x9c,-1},{ 0xf0,0x9c,-1} }, { { 0x9d,-1},{ 0xf0,0x9d,-1} }, { { 0x9e,-1},{ 0xf0,0x9e,-1} }, { { 0x9f,-1},{ 0xf0,0x9f,-1} }, /*09c*/
{ { 0xa0,-1},{ 0xf0,0xa0,-1} }, { { 0xa1,-1},{ 0xf0,0xa1,-1} }, { { 0xa2,-1},{ 0xf0,0xa2,-1} }, { { 0xa3,-1},{ 0xf0,0xa3,-1} }, /*0a0*/
{ { 0xa4,-1},{ 0xf0,0xa4,-1} }, { { 0xa5,-1},{ 0xf0,0xa5,-1} }, { { 0xa6,-1},{ 0xf0,0xa6,-1} }, { { 0xa7,-1},{ 0xf0,0xa7,-1} }, /*0a4*/
{ { 0xa8,-1},{ 0xf0,0xa8,-1} }, { { 0xa9,-1},{ 0xf0,0xa9,-1} }, { { 0xaa,-1},{ 0xf0,0xaa,-1} }, { { 0xab,-1},{ 0xf0,0xab,-1} }, /*0a8*/
{ { 0xac,-1},{ 0xf0,0xac,-1} }, { { 0xad,-1},{ 0xf0,0xad,-1} }, { { 0xae,-1},{ 0xf0,0xae,-1} }, { { 0xaf,-1},{ 0xf0,0xaf,-1} }, /*0ac*/
{ { 0xb0,-1},{ 0xf0,0xb0,-1} }, { { 0xb1,-1},{ 0xf0,0xb1,-1} }, { { 0xb2,-1},{ 0xf0,0xb2,-1} }, { { 0xb3,-1},{ 0xf0,0xb3,-1} }, /*0b0*/
{ { 0xb4,-1},{ 0xf0,0xb4,-1} }, { { 0xb5,-1},{ 0xf0,0xb5,-1} }, { { 0xb6,-1},{ 0xf0,0xb6,-1} }, { { 0xb7,-1},{ 0xf0,0xb7,-1} }, /*0b4*/
{ { 0xb8,-1},{ 0xf0,0xb8,-1} }, { { 0xb9,-1},{ 0xf0,0xb9,-1} }, { { 0xba,-1},{ 0xf0,0xba,-1} }, { { 0xbb,-1},{ 0xf0,0xbb,-1} }, /*0b8*/
{ { 0xbc,-1},{ 0xf0,0xbc,-1} }, { { 0xbd,-1},{ 0xf0,0xbd,-1} }, { { 0xbe,-1},{ 0xf0,0xbe,-1} }, { { 0xbf,-1},{ 0xf0,0xbf,-1} }, /*0bc*/
{ { 0xc0,-1},{ 0xf0,0xc0,-1} }, { { 0xc1,-1},{ 0xf0,0xc1,-1} }, { { 0xc2,-1},{ 0xf0,0xc2,-1} }, { { 0xc3,-1},{ 0xf0,0xc3,-1} }, /*0c0*/
{ { 0xc4,-1},{ 0xf0,0xc4,-1} }, { { 0xc5,-1},{ 0xf0,0xc5,-1} }, { { 0xc6,-1},{ 0xf0,0xc6,-1} }, { { 0xc7,-1},{ 0xf0,0xc7,-1} }, /*0c4*/
{ { 0xc8,-1},{ 0xf0,0xc8,-1} }, { { 0xc9,-1},{ 0xf0,0xc9,-1} }, { { 0xca,-1},{ 0xf0,0xca,-1} }, { { 0xcb,-1},{ 0xf0,0xcb,-1} }, /*0c8*/
{ { 0xcc,-1},{ 0xf0,0xcc,-1} }, { { 0xcd,-1},{ 0xf0,0xcd,-1} }, { { 0xce,-1},{ 0xf0,0xce,-1} }, { { 0xcf,-1},{ 0xf0,0xcf,-1} }, /*0cc*/
{ { 0xd0,-1},{ 0xf0,0xd0,-1} }, { { 0xd1,-1},{ 0xf0,0xd0,-1} }, { { 0xd2,-1},{ 0xf0,0xd2,-1} }, { { 0xd3,-1},{ 0xf0,0xd3,-1} }, /*0d0*/
{ { 0xd4,-1},{ 0xf0,0xd4,-1} }, { { 0xd5,-1},{ 0xf0,0xd5,-1} }, { { 0xd6,-1},{ 0xf0,0xd6,-1} }, { { 0xd7,-1},{ 0xf0,0xd7,-1} }, /*0d4*/
{ { 0xd8,-1},{ 0xf0,0xd8,-1} }, { { 0xd9,-1},{ 0xf0,0xd9,-1} }, { { 0xda,-1},{ 0xf0,0xda,-1} }, { { 0xdb,-1},{ 0xf0,0xdb,-1} }, /*0d8*/
{ { 0xdc,-1},{ 0xf0,0xdc,-1} }, { { 0xdd,-1},{ 0xf0,0xdd,-1} }, { { 0xde,-1},{ 0xf0,0xde,-1} }, { { 0xdf,-1},{ 0xf0,0xdf,-1} }, /*0dc*/
{ { 0xe0,-1},{ 0xf0,0xe0,-1} }, { { 0xe1,-1},{ 0xf0,0xe1,-1} }, { { 0xe2,-1},{ 0xf0,0xe2,-1} }, { { 0xe3,-1},{ 0xf0,0xe3,-1} }, /*0e0*/
{ { 0xe4,-1},{ 0xf0,0xe4,-1} }, { { 0xe5,-1},{ 0xf0,0xe5,-1} }, { { 0xe6,-1},{ 0xf0,0xe6,-1} }, { { 0xe7,-1},{ 0xf0,0xe7,-1} }, /*0e4*/
{ { 0xe8,-1},{ 0xf0,0xe8,-1} }, { { 0xe9,-1},{ 0xf0,0xe9,-1} }, { { 0xea,-1},{ 0xf0,0xea,-1} }, { { 0xeb,-1},{ 0xf0,0xeb,-1} }, /*0e8*/
{ { 0xec,-1},{ 0xf0,0xec,-1} }, { { 0xed,-1},{ 0xf0,0xed,-1} }, { { 0xee,-1},{ 0xf0,0xee,-1} }, { { 0xef,-1},{ 0xf0,0xef,-1} }, /*0ec*/
{ { -1},{ -1} }, { { 0xf1,-1},{ 0xf0,0xf1,-1} }, { { 0xf2,-1},{ 0xf0,0xf2,-1} }, { { 0xf3,-1},{ 0xf0,0xf3,-1} }, /*0f0*/
{ { 0xf4,-1},{ 0xf0,0xf4,-1} }, { { 0xf5,-1},{ 0xf0,0xf5,-1} }, { { 0xf6,-1},{ 0xf0,0xf6,-1} }, { { 0xf7,-1},{ 0xf0,0xf7,-1} }, /*0f4*/
{ { 0xf8,-1},{ 0xf0,0xf8,-1} }, { { 0xf9,-1},{ 0xf0,0xf9,-1} }, { { 0xfa,-1},{ 0xf0,0xfa,-1} }, { { 0xfb,-1},{ 0xf0,0xfb,-1} }, /*0f8*/
{ { 0xfc,-1},{ 0xf0,0xfc,-1} }, { { 0xfd,-1},{ 0xf0,0xfd,-1} }, { { 0xfe,-1},{ 0xf0,0xfe,-1} }, { { 0xff,-1},{ 0xf0,0xff,-1} }, /*0fc*/
{ {0xe1,0x14,-1},{0xe1,0xf0,0x14,-1} }, { {0xe0,0x76,-1},{0xe0,0xF0,0x76,-1} }, { {0xe0,0x16,-1},{0xe0,0xF0,0x16,-1} }, { {0xe0,0x1E,-1},{0xe0,0xF0,0x1E,-1} }, /*100*/
{ {0xe0,0x26,-1},{0xe0,0xF0,0x26,-1} }, { {0xe0,0x25,-1},{0xe0,0xF0,0x25,-1} }, { {0xe0,0x2E,-1},{0xe0,0xF0,0x2E,-1} }, { {0xe0,0x36,-1},{0xe0,0xF0,0x36,-1} }, /*104*/
{ {0xe0,0x3D,-1},{0xe0,0xF0,0x3D,-1} }, { {0xe0,0x3E,-1},{0xe0,0xF0,0x3E,-1} }, { {0xe0,0x46,-1},{0xe0,0xF0,0x46,-1} }, { {0xe0,0x45,-1},{0xe0,0xF0,0x45,-1} }, /*108*/
{ {0xe0,0x4E,-1},{0xe0,0xF0,0x4E,-1} }, { { -1},{ -1} }, { {0xe0,0x66,-1},{0xe0,0xF0,0x66,-1} }, { {0xe0,0x0D,-1},{0xe0,0xF0,0x0D,-1} }, /*10c*/
{ {0xe0,0x15,-1},{0xe0,0xF0,0x15,-1} }, { {0xe0,0x1D,-1},{0xe0,0xF0,0x1D,-1} }, { {0xe0,0x24,-1},{0xe0,0xF0,0x24,-1} }, { {0xe0,0x2D,-1},{0xe0,0xF0,0x2D,-1} }, /*110*/
{ {0xe0,0x2C,-1},{0xe0,0xF0,0x2C,-1} }, { {0xe0,0x35,-1},{0xe0,0xF0,0x35,-1} }, { {0xe0,0x3C,-1},{0xe0,0xF0,0x3C,-1} }, { {0xe0,0x43,-1},{0xe0,0xF0,0x43,-1} }, /*114*/
{ {0xe0,0x44,-1},{0xe0,0xF0,0x44,-1} }, { {0xe0,0x4D,-1},{0xe0,0xF0,0x4D,-1} }, { {0xe0,0x54,-1},{0xe0,0xF0,0x54,-1} }, { {0xe0,0x5B,-1},{0xe0,0xF0,0x5B,-1} }, /*118*/
{ {0xe0,0x5A,-1},{0xe0,0xF0,0x5A,-1} }, { {0xe0,0x14,-1},{0xe0,0xF0,0x14,-1} }, { {0xe0,0x1C,-1},{0xe0,0xF0,0x1C,-1} }, { {0xe0,0x1B,-1},{0xe0,0xF0,0x1B,-1} }, /*11c*/
{ {0xe0,0x23,-1},{0xe0,0xF0,0x23,-1} }, { {0xe0,0x2B,-1},{0xe0,0xF0,0x2B,-1} }, { {0xe0,0x34,-1},{0xe0,0xF0,0x34,-1} }, { {0xe0,0x33,-1},{0xe0,0xF0,0x33,-1} }, /*120*/
{ {0xe0,0x3B,-1},{0xe0,0xF0,0x3B,-1} }, { {0xe0,0x42,-1},{0xe0,0xF0,0x42,-1} }, { {0xe0,0x4B,-1},{0xe0,0xF0,0x4B,-1} }, { { -1},{ -1} }, /*124*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*128*/
{ {0xe0,0x1A,-1},{0xe0,0xF0,0x1A,-1} }, { {0xe0,0x22,-1},{0xe0,0xF0,0x22,-1} }, { {0xe0,0x21,-1},{0xe0,0xF0,0x21,-1} }, { {0xe0,0x2A,-1},{0xe0,0xF0,0x2A,-1} }, /*12c*/
{ {0xe0,0x32,-1},{0xe0,0xF0,0x32,-1} }, { {0xe0,0x31,-1},{0xe0,0xF0,0x31,-1} }, { {0xe0,0x3A,-1},{0xe0,0xF0,0x3A,-1} }, { { -1},{ -1} }, /*130*/
{ {0xe0,0x49,-1},{0xe0,0xF0,0x49,-1} }, { {0xe0,0x4A,-1},{0xe0,0xF0,0x4A,-1} }, { { -1},{ -1} }, { {0xe0,0x7C,-1},{0xe0,0xF0,0x7C,-1} }, /*134*/
{ {0xe0,0x11,-1},{0xe0,0xF0,0x11,-1} }, { { -1},{ -1} }, { {0xe0,0x58,-1},{0xe0,0xF0,0x58,-1} }, { {0xe0,0x05,-1},{0xe0,0xF0,0x05,-1} }, /*138*/
{ {0xe0,0x06,-1},{0xe0,0xF0,0x06,-1} }, { {0xe0,0x04,-1},{0xe0,0xF0,0x04,-1} }, { {0xe0,0x0C,-1},{0xe0,0xF0,0x0C,-1} }, { {0xe0,0x03,-1},{0xe0,0xF0,0x03,-1} }, /*13c*/
{ {0xe0,0x0B,-1},{0xe0,0xF0,0x0B,-1} }, { {0xe0,0x02,-1},{0xe0,0xF0,0x02,-1} }, { {0xe0,0x0A,-1},{0xe0,0xF0,0x0A,-1} }, { {0xe0,0x01,-1},{0xe0,0xF0,0x01,-1} }, /*140*/
{ {0xe0,0x09,-1},{0xe0,0xF0,0x09,-1} }, { { -1},{ -1} }, { {0xe0,0x7E,-1},{0xe0,0xF0,0x7E,-1} }, { {0xe0,0x6C,-1},{0xe0,0xF0,0x6C,-1} }, /*144*/
{ {0xe0,0x75,-1},{0xe0,0xF0,0x75,-1} }, { {0xe0,0x7D,-1},{0xe0,0xF0,0x7D,-1} }, { { -1},{ -1} }, { {0xe0,0x6B,-1},{0xe0,0xF0,0x6B,-1} }, /*148*/
{ {0xe0,0x73,-1},{0xe0,0xF0,0x73,-1} }, { {0xe0,0x74,-1},{0xe0,0xF0,0x74,-1} }, { {0xe0,0x79,-1},{0xe0,0xF0,0x79,-1} }, { {0xe0,0x69,-1},{0xe0,0xF0,0x69,-1} }, /*14c*/
{ {0xe0,0x72,-1},{0xe0,0xF0,0x72,-1} }, { {0xe0,0x7A,-1},{0xe0,0xF0,0x7A,-1} }, { {0xe0,0x70,-1},{0xe0,0xF0,0x70,-1} }, { {0xe0,0x71,-1},{0xe0,0xF0,0x71,-1} }, /*150*/
{ { -1},{ -1} }, { {0xe0,0x60,-1},{0xe0,0xF0,0x60,-1} }, { { -1},{ -1} }, { {0xe0,0x78,-1},{0xe0,0xF0,0x78,-1} }, /*154*/
{ {0xe0,0x07,-1},{0xe0,0xF0,0x07,-1} }, { {0xe0,0x0F,-1},{0xe0,0xF0,0x0F,-1} }, { {0xe0,0x17,-1},{0xe0,0xF0,0x17,-1} }, { {0xe0,0x1F,-1},{0xe0,0xF0,0x1F,-1} }, /*158*/
{ {0xe0,0x27,-1},{0xe0,0xF0,0x27,-1} }, { {0xe0,0x2F,-1},{0xe0,0xF0,0x2F,-1} }, { {0xe0,0x37,-1},{0xe0,0xF0,0x37,-1} }, { {0xe0,0x3F,-1},{0xe0,0xF0,0x3F,-1} }, /*15c*/
{ { -1},{ -1} }, { {0xe0,0x4F,-1},{0xe0,0xF0,0x4F,-1} }, { {0xe0,0x56,-1},{0xe0,0xF0,0x56,-1} }, { {0xe0,0x5E,-1},{0xe0,0xF0,0x5E,-1} }, /*160*/
{ {0xe0,0x08,-1},{0xe0,0xF0,0x08,-1} }, { {0xe0,0x10,-1},{0xe0,0xF0,0x10,-1} }, { {0xe0,0x18,-1},{0xe0,0xF0,0x18,-1} }, { {0xe0,0x20,-1},{0xe0,0xF0,0x20,-1} }, /*164*/
{ {0xe0,0x28,-1},{0xe0,0xF0,0x28,-1} }, { {0xe0,0x30,-1},{0xe0,0xF0,0x30,-1} }, { {0xe0,0x38,-1},{0xe0,0xF0,0x38,-1} }, { {0xe0,0x40,-1},{0xe0,0xF0,0x40,-1} }, /*168*/
{ {0xe0,0x48,-1},{0xe0,0xF0,0x48,-1} }, { {0xe0,0x50,-1},{0xe0,0xF0,0x50,-1} }, { {0xe0,0x57,-1},{0xe0,0xF0,0x57,-1} }, { { -1},{ -1} }, /*16c*/
{ {0xe0,0x13,-1},{0xe0,0xF0,0x13,-1} }, { {0xe0,0x19,-1},{0xe0,0xF0,0x19,-1} }, { {0xe0,0x39,-1},{0xe0,0xF0,0x39,-1} }, { {0xe0,0x51,-1},{0xe0,0xF0,0x51,-1} }, /*170*/
{ {0xe0,0x53,-1},{0xe0,0xF0,0x53,-1} }, { {0xe0,0x5C,-1},{0xe0,0xF0,0x5C,-1} }, { { -1},{ -1} }, { {0xe0,0x62,-1},{0xe0,0xF0,0x62,-1} }, /*174*/
{ {0xe0,0x63,-1},{0xe0,0xF0,0x63,-1} }, { {0xe0,0x64,-1},{0xe0,0xF0,0x64,-1} }, { {0xe0,0x65,-1},{0xe0,0xF0,0x65,-1} }, { {0xe0,0x67,-1},{0xe0,0xF0,0x67,-1} }, /*178*/
{ {0xe0,0x68,-1},{0xe0,0xF0,0x68,-1} }, { {0xe0,0x6A,-1},{0xe0,0xF0,0x6A,-1} }, { {0xe0,0x6D,-1},{0xe0,0xF0,0x6D,-1} }, { {0xe0,0x6E,-1},{0xe0,0xF0,0x6E,-1} }, /*17c*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*180*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*184*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*188*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*18c*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*190*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*194*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*198*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*19c*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1a0*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1a4*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1a8*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1ac*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1c0*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1c4*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1c8*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1cc*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1d0*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1d4*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1d8*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1dc*/
{ { -1},{ -1} }, { {0xe0,0xe1,-1},{0xe0,0xF0,0xE1,-1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1e0*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1e4*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1e8*/
{ { -1},{ -1} }, { { -1},{ -1} }, { {0xe0,0xee,-1},{0xe0,0xF0,0xEE,-1} }, { { -1},{ -1} }, /*1ec*/
{ { -1},{ -1} }, { {0xe0,0xf1,-1},{0xe0,0xF0,0xF1,-1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1f0*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1f4*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1f8*/
{ { -1},{ -1} }, { { -1},{ -1} }, { {0xe0,0xfe,-1},{0xe0,0xF0,0xFE,-1} }, { {0xe0,0xff,-1},{0xe0,0xF0,0xFF,-1} } /*1fc*/
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
};
Got RAM usage down slightly further by merging in mode code from VARCem; Fixed the mouse.
2018-03-19 08:01:13 +01:00
static const scancode scancode_set3[512] = {
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
{ { -1},{ -1} }, { { 0x08,-1},{ 0xf0,0x08,-1} }, { { 0x16,-1},{ 0xf0,0x16,-1} }, { { 0x1E,-1},{ 0xf0,0x1E,-1} }, /*000*/
{ { 0x26,-1},{ 0xf0,0x26,-1} }, { { 0x25,-1},{ 0xf0,0x25,-1} }, { { 0x2E,-1},{ 0xf0,0x2E,-1} }, { { 0x36,-1},{ 0xf0,0x36,-1} }, /*004*/
{ { 0x3D,-1},{ 0xf0,0x3D,-1} }, { { 0x3E,-1},{ 0xf0,0x3E,-1} }, { { 0x46,-1},{ 0xf0,0x46,-1} }, { { 0x45,-1},{ 0xf0,0x45,-1} }, /*008*/
{ { 0x4E,-1},{ 0xf0,0x4E,-1} }, { { 0x55,-1},{ 0xf0,0x55,-1} }, { { 0x66,-1},{ 0xf0,0x66,-1} }, { { 0x0D,-1},{ 0xf0,0x0D,-1} }, /*00c*/
{ { 0x15,-1},{ 0xf0,0x15,-1} }, { { 0x1D,-1},{ 0xf0,0x1D,-1} }, { { 0x24,-1},{ 0xf0,0x24,-1} }, { { 0x2D,-1},{ 0xf0,0x2D,-1} }, /*010*/
{ { 0x2C,-1},{ 0xf0,0x2C,-1} }, { { 0x35,-1},{ 0xf0,0x35,-1} }, { { 0x3C,-1},{ 0xf0,0x3C,-1} }, { { 0x43,-1},{ 0xf0,0x43,-1} }, /*014*/
{ { 0x44,-1},{ 0xf0,0x44,-1} }, { { 0x4D,-1},{ 0xf0,0x4D,-1} }, { { 0x54,-1},{ 0xf0,0x54,-1} }, { { 0x5B,-1},{ 0xf0,0x5B,-1} }, /*018*/
{ { 0x5A,-1},{ 0xf0,0x5A,-1} }, { { 0x11,-1},{ 0xf0,0x11,-1} }, { { 0x1C,-1},{ 0xf0,0x1C,-1} }, { { 0x1B,-1},{ 0xf0,0x1B,-1} }, /*01c*/
{ { 0x23,-1},{ 0xf0,0x23,-1} }, { { 0x2B,-1},{ 0xf0,0x2B,-1} }, { { 0x34,-1},{ 0xf0,0x34,-1} }, { { 0x33,-1},{ 0xf0,0x33,-1} }, /*020*/
{ { 0x3B,-1},{ 0xf0,0x3B,-1} }, { { 0x42,-1},{ 0xf0,0x42,-1} }, { { 0x4B,-1},{ 0xf0,0x4B,-1} }, { { 0x4C,-1},{ 0xf0,0x4C,-1} }, /*024*/
{ { 0x52,-1},{ 0xf0,0x52,-1} }, { { 0x0E,-1},{ 0xf0,0x0E,-1} }, { { 0x12,-1},{ 0xf0,0x12,-1} }, { { 0x5C,-1},{ 0xf0,0x5C,-1} }, /*028*/
{ { 0x1A,-1},{ 0xf0,0x1A,-1} }, { { 0x22,-1},{ 0xf0,0x22,-1} }, { { 0x21,-1},{ 0xf0,0x21,-1} }, { { 0x2A,-1},{ 0xf0,0x2A,-1} }, /*02c*/
{ { 0x32,-1},{ 0xf0,0x32,-1} }, { { 0x31,-1},{ 0xf0,0x31,-1} }, { { 0x3A,-1},{ 0xf0,0x3A,-1} }, { { 0x41,-1},{ 0xf0,0x41,-1} }, /*030*/
{ { 0x49,-1},{ 0xf0,0x49,-1} }, { { 0x4A,-1},{ 0xf0,0x4A,-1} }, { { 0x59,-1},{ 0xf0,0x59,-1} }, { { 0x7E,-1},{ 0xf0,0x7E,-1} }, /*034*/
{ { 0x19,-1},{ 0xf0,0x19,-1} }, { { 0x29,-1},{ 0xf0,0x29,-1} }, { { 0x14,-1},{ 0xf0,0x14,-1} }, { { 0x07,-1},{ 0xf0,0x07,-1} }, /*038*/
{ { 0x0F,-1},{ 0xf0,0x0F,-1} }, { { 0x17,-1},{ 0xf0,0x17,-1} }, { { 0x1F,-1},{ 0xf0,0x1F,-1} }, { { 0x27,-1},{ 0xf0,0x27,-1} }, /*03c*/
{ { 0x2F,-1},{ 0xf0,0x2F,-1} }, { { 0x37,-1},{ 0xf0,0x37,-1} }, { { 0x3F,-1},{ 0xf0,0x3F,-1} }, { { 0x47,-1},{ 0xf0,0x47,-1} }, /*040*/
{ { 0x4F,-1},{ 0xf0,0x4F,-1} }, { { 0x76,-1},{ 0xf0,0x76,-1} }, { { 0x5F,-1},{ 0xf0,0x5F,-1} }, { { 0x6C,-1},{ 0xf0,0x6C,-1} }, /*044*/
{ { 0x75,-1},{ 0xf0,0x75,-1} }, { { 0x7D,-1},{ 0xf0,0x7D,-1} }, { { 0x84,-1},{ 0xf0,0x84,-1} }, { { 0x6B,-1},{ 0xf0,0x6B,-1} }, /*048*/
{ { 0x73,-1},{ 0xf0,0x73,-1} }, { { 0x74,-1},{ 0xf0,0x74,-1} }, { { 0x7C,-1},{ 0xf0,0x7C,-1} }, { { 0x69,-1},{ 0xf0,0x69,-1} }, /*04c*/
{ { 0x72,-1},{ 0xf0,0x72,-1} }, { { 0x7A,-1},{ 0xf0,0x7A,-1} }, { { 0x70,-1},{ 0xf0,0x70,-1} }, { { 0x71,-1},{ 0xf0,0x71,-1} }, /*050*/
{ { 0x57,-1},{ 0xf0,0x57,-1} }, { { 0x60,-1},{ 0xf0,0x60,-1} }, { { -1},{ -1} }, { { 0x56,-1},{ 0xf0,0x56,-1} }, /*054*/
{ { 0x5E,-1},{ 0xf0,0x5E,-1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*058*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*05c*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*060*/
{ { -1},{ -1} }, { { 0x10,-1},{ 0xf0,0x10,-1} }, { { 0x18,-1},{ 0xf0,0x18,-1} }, { { 0x20,-1},{ 0xf0,0x20,-1} }, /*064*/
{ { 0x28,-1},{ 0xf0,0x28,-1} }, { { 0x30,-1},{ 0xf0,0x30,-1} }, { { 0x38,-1},{ 0xf0,0x38,-1} }, { { 0x40,-1},{ 0xf0,0x40,-1} }, /*068*/
{ { 0x48,-1},{ 0xf0,0x48,-1} }, { { 0x50,-1},{ 0xf0,0x50,-1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*06c*/
{ { 0x87,-1},{ 0xf0,0x87,-1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { 0x51,-1},{ 0xf0,0x51,-1} }, /*070*/
{ { 0x53,-1},{ 0xf0,0x53,-1} }, { { 0x5C,-1},{ 0xf0,0x5C,-1} }, { { -1},{ -1} }, { { 0x62,-1},{ 0xf0,0x62,-1} }, /*074*/
{ { 0x63,-1},{ 0xf0,0x63,-1} }, { { 0x86,-1},{ 0xf0,0x86,-1} }, { { -1},{ -1} }, { { 0x85,-1},{ 0xf0,0x85,-1} }, /*078*/
{ { 0x68,-1},{ 0xf0,0x68,-1} }, { { 0x13,-1},{ 0xf0,0x13,-1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*07c*/
{ { 0x80,-1},{ 0xf0,0x80,-1} }, { { 0x81,-1},{ 0xf0,0x81,-1} }, { { 0x82,-1},{ 0xf0,0x82,-1} }, { { -1},{ -1} }, /*080*/
{ { -1},{ -1} }, { { 0x85,-1},{ 0xf0,0x54,-1} }, { { 0x86,-1},{ 0xf0,0x86,-1} }, { { 0x87,-1},{ 0xf0,0x87,-1} }, /*084*/
{ { 0x88,-1},{ 0xf0,0x88,-1} }, { { 0x89,-1},{ 0xf0,0x89,-1} }, { { 0x8a,-1},{ 0xf0,0x8a,-1} }, { { 0x8b,-1},{ 0xf0,0x8b,-1} }, /*088*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { 0x8e,-1},{ 0xf0,0x8e,-1} }, { { 0x8f,-1},{ 0xf0,0x8f,-1} }, /*08c*/
{ { 0x90,-1},{ 0xf0,0x90,-1} }, { { 0x91,-1},{ 0xf0,0x91,-1} }, { { 0x92,-1},{ 0xf0,0x92,-1} }, { { 0x93,-1},{ 0xf0,0x93,-1} }, /*090*/
{ { 0x94,-1},{ 0xf0,0x94,-1} }, { { 0x95,-1},{ 0xf0,0x95,-1} }, { { 0x96,-1},{ 0xf0,0x96,-1} }, { { 0x97,-1},{ 0xf0,0x97,-1} }, /*094*/
{ { 0x98,-1},{ 0xf0,0x98,-1} }, { { 0x99,-1},{ 0xf0,0x99,-1} }, { { 0x9a,-1},{ 0xf0,0x9a,-1} }, { { 0x9b,-1},{ 0xf0,0x9b,-1} }, /*098*/
{ { 0x9c,-1},{ 0xf0,0x9c,-1} }, { { 0x9d,-1},{ 0xf0,0x9d,-1} }, { { 0x9e,-1},{ 0xf0,0x9e,-1} }, { { 0x9f,-1},{ 0xf0,0x9f,-1} }, /*09c*/
{ { 0xa0,-1},{ 0xf0,0xa0,-1} }, { { 0xa1,-1},{ 0xf0,0xa1,-1} }, { { 0xa2,-1},{ 0xf0,0xa2,-1} }, { { 0xa3,-1},{ 0xf0,0xa3,-1} }, /*0a0*/
{ { 0xa4,-1},{ 0xf0,0xa4,-1} }, { { 0xa5,-1},{ 0xf0,0xa5,-1} }, { { 0xa6,-1},{ 0xf0,0xa6,-1} }, { { 0xa7,-1},{ 0xf0,0xa7,-1} }, /*0a4*/
{ { 0xa8,-1},{ 0xf0,0xa8,-1} }, { { 0xa9,-1},{ 0xf0,0xa9,-1} }, { { 0xaa,-1},{ 0xf0,0xaa,-1} }, { { 0xab,-1},{ 0xf0,0xab,-1} }, /*0a8*/
{ { 0xac,-1},{ 0xf0,0xac,-1} }, { { 0xad,-1},{ 0xf0,0xad,-1} }, { { 0xae,-1},{ 0xf0,0xae,-1} }, { { 0xaf,-1},{ 0xf0,0xaf,-1} }, /*0ac*/
{ { 0xb0,-1},{ 0xf0,0xb0,-1} }, { { 0xb1,-1},{ 0xf0,0xb1,-1} }, { { 0xb2,-1},{ 0xf0,0xb2,-1} }, { { 0xb3,-1},{ 0xf0,0xb3,-1} }, /*0b0*/
{ { 0xb4,-1},{ 0xf0,0xb4,-1} }, { { 0xb5,-1},{ 0xf0,0xb5,-1} }, { { 0xb6,-1},{ 0xf0,0xb6,-1} }, { { 0xb7,-1},{ 0xf0,0xb7,-1} }, /*0b4*/
{ { 0xb8,-1},{ 0xf0,0xb8,-1} }, { { 0xb9,-1},{ 0xf0,0xb9,-1} }, { { 0xba,-1},{ 0xf0,0xba,-1} }, { { 0xbb,-1},{ 0xf0,0xbb,-1} }, /*0b8*/
{ { 0xbc,-1},{ 0xf0,0xbc,-1} }, { { 0xbd,-1},{ 0xf0,0xbd,-1} }, { { 0xbe,-1},{ 0xf0,0xbe,-1} }, { { 0xbf,-1},{ 0xf0,0xbf,-1} }, /*0bc*/
{ { 0xc0,-1},{ 0xf0,0xc0,-1} }, { { 0xc1,-1},{ 0xf0,0xc1,-1} }, { { 0xc2,-1},{ 0xf0,0xc2,-1} }, { { 0xc3,-1},{ 0xf0,0xc3,-1} }, /*0c0*/
{ { 0xc4,-1},{ 0xf0,0xc4,-1} }, { { 0xc5,-1},{ 0xf0,0xc5,-1} }, { { 0xc6,-1},{ 0xf0,0xc6,-1} }, { { 0xc7,-1},{ 0xf0,0xc7,-1} }, /*0c4*/
{ { 0xc8,-1},{ 0xf0,0xc8,-1} }, { { 0xc9,-1},{ 0xf0,0xc9,-1} }, { { 0xca,-1},{ 0xf0,0xca,-1} }, { { 0xcb,-1},{ 0xf0,0xcb,-1} }, /*0c8*/
{ { 0xcc,-1},{ 0xf0,0xcc,-1} }, { { 0xcd,-1},{ 0xf0,0xcd,-1} }, { { 0xce,-1},{ 0xf0,0xce,-1} }, { { 0xcf,-1},{ 0xf0,0xcf,-1} }, /*0cc*/
{ { 0xd0,-1},{ 0xf0,0xd0,-1} }, { { 0xd1,-1},{ 0xf0,0xd0,-1} }, { { 0xd2,-1},{ 0xf0,0xd2,-1} }, { { 0xd3,-1},{ 0xf0,0xd3,-1} }, /*0d0*/
{ { 0xd4,-1},{ 0xf0,0xd4,-1} }, { { 0xd5,-1},{ 0xf0,0xd5,-1} }, { { 0xd6,-1},{ 0xf0,0xd6,-1} }, { { 0xd7,-1},{ 0xf0,0xd7,-1} }, /*0d4*/
{ { 0xd8,-1},{ 0xf0,0xd8,-1} }, { { 0xd9,-1},{ 0xf0,0xd9,-1} }, { { 0xda,-1},{ 0xf0,0xda,-1} }, { { 0xdb,-1},{ 0xf0,0xdb,-1} }, /*0d8*/
{ { 0xdc,-1},{ 0xf0,0xdc,-1} }, { { 0xdd,-1},{ 0xf0,0xdd,-1} }, { { 0xde,-1},{ 0xf0,0xde,-1} }, { { 0xdf,-1},{ 0xf0,0xdf,-1} }, /*0dc*/
{ { 0xe0,-1},{ 0xf0,0xe0,-1} }, { { 0xe1,-1},{ 0xf0,0xe1,-1} }, { { 0xe2,-1},{ 0xf0,0xe2,-1} }, { { 0xe3,-1},{ 0xf0,0xe3,-1} }, /*0e0*/
{ { 0xe4,-1},{ 0xf0,0xe4,-1} }, { { 0xe5,-1},{ 0xf0,0xe5,-1} }, { { 0xe6,-1},{ 0xf0,0xe6,-1} }, { { 0xe7,-1},{ 0xf0,0xe7,-1} }, /*0e4*/
{ { 0xe8,-1},{ 0xf0,0xe8,-1} }, { { 0xe9,-1},{ 0xf0,0xe9,-1} }, { { 0xea,-1},{ 0xf0,0xea,-1} }, { { 0xeb,-1},{ 0xf0,0xeb,-1} }, /*0e8*/
{ { 0xec,-1},{ 0xf0,0xec,-1} }, { { 0xed,-1},{ 0xf0,0xed,-1} }, { { 0xee,-1},{ 0xf0,0xee,-1} }, { { 0xef,-1},{ 0xf0,0xef,-1} }, /*0ec*/
{ { -1},{ -1} }, { { 0xf1,-1},{ 0xf0,0xf1,-1} }, { { 0xf2,-1},{ 0xf0,0xf2,-1} }, { { 0xf3,-1},{ 0xf0,0xf3,-1} }, /*0f0*/
{ { 0xf4,-1},{ 0xf0,0xf4,-1} }, { { 0xf5,-1},{ 0xf0,0xf5,-1} }, { { 0xf6,-1},{ 0xf0,0xf6,-1} }, { { 0xf7,-1},{ 0xf0,0xf7,-1} }, /*0f4*/
{ { 0xf8,-1},{ 0xf0,0xf8,-1} }, { { 0xf9,-1},{ 0xf0,0xf9,-1} }, { { 0xfa,-1},{ 0xf0,0xfa,-1} }, { { 0xfb,-1},{ 0xf0,0xfb,-1} }, /*0f8*/
{ { 0xfc,-1},{ 0xf0,0xfc,-1} }, { { 0xfd,-1},{ 0xf0,0xfd,-1} }, { { 0xfe,-1},{ 0xf0,0xfe,-1} }, { { 0xff,-1},{ 0xf0,0xff,-1} }, /*0fc*/
{ { 0x62,-1},{ 0xF0,0x62,-1} }, { {0xe0,0x76,-1},{0xe0,0xF0,0x76,-1} }, { {0xe0,0x16,-1},{0xe0,0xF0,0x16,-1} }, { {0xe0,0x1E,-1},{0xe0,0xF0,0x1E,-1} }, /*100*/
{ {0xe0,0x26,-1},{0xe0,0xF0,0x26,-1} }, { {0xe0,0x25,-1},{0xe0,0xF0,0x25,-1} }, { {0xe0,0x2E,-1},{0xe0,0xF0,0x2E,-1} }, { {0xe0,0x36,-1},{0xe0,0xF0,0x36,-1} }, /*104*/
{ {0xe0,0x3D,-1},{0xe0,0xF0,0x3D,-1} }, { {0xe0,0x3E,-1},{0xe0,0xF0,0x3E,-1} }, { {0xe0,0x46,-1},{0xe0,0xF0,0x46,-1} }, { {0xe0,0x45,-1},{0xe0,0xF0,0x45,-1} }, /*108*/
{ {0xe0,0x4E,-1},{0xe0,0xF0,0x4E,-1} }, { { -1},{ -1} }, { {0xe0,0x66,-1},{0xe0,0xF0,0x66,-1} }, { {0xe0,0x0D,-1},{0xe0,0xF0,0x0D,-1} }, /*10c*/
{ {0xe0,0x15,-1},{0xe0,0xF0,0x15,-1} }, { {0xe0,0x1D,-1},{0xe0,0xF0,0x1D,-1} }, { {0xe0,0x24,-1},{0xe0,0xF0,0x24,-1} }, { {0xe0,0x2D,-1},{0xe0,0xF0,0x2D,-1} }, /*110*/
{ {0xe0,0x2C,-1},{0xe0,0xF0,0x2C,-1} }, { {0xe0,0x35,-1},{0xe0,0xF0,0x35,-1} }, { {0xe0,0x3C,-1},{0xe0,0xF0,0x3C,-1} }, { {0xe0,0x43,-1},{0xe0,0xF0,0x43,-1} }, /*114*/
{ {0xe0,0x44,-1},{0xe0,0xF0,0x44,-1} }, { {0xe0,0x4D,-1},{0xe0,0xF0,0x4D,-1} }, { {0xe0,0x54,-1},{0xe0,0xF0,0x54,-1} }, { {0xe0,0x5B,-1},{0xe0,0xF0,0x5B,-1} }, /*118*/
{ { 0x79,-1},{ 0xf0,0x79,-1} }, { { 0x58,-1},{ 0xf0,0x58,-1} }, { {0xe0,0x1C,-1},{0xe0,0xF0,0x1C,-1} }, { {0xe0,0x1B,-1},{0xe0,0xF0,0x1B,-1} }, /*11c*/
{ {0xe0,0x23,-1},{0xe0,0xF0,0x23,-1} }, { {0xe0,0x2B,-1},{0xe0,0xF0,0x2B,-1} }, { {0xe0,0x34,-1},{0xe0,0xF0,0x34,-1} }, { {0xe0,0x33,-1},{0xe0,0xF0,0x33,-1} }, /*120*/
{ {0xe0,0x3B,-1},{0xe0,0xF0,0x3B,-1} }, { {0xe0,0x42,-1},{0xe0,0xF0,0x42,-1} }, { {0xe0,0x4B,-1},{0xe0,0xF0,0x4B,-1} }, { { -1},{ -1} }, /*124*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*128*/
{ {0xe0,0x1A,-1},{0xe0,0xF0,0x1A,-1} }, { {0xe0,0x22,-1},{0xe0,0xF0,0x22,-1} }, { {0xe0,0x21,-1},{0xe0,0xF0,0x21,-1} }, { {0xe0,0x2A,-1},{0xe0,0xF0,0x2A,-1} }, /*12c*/
{ {0xe0,0x32,-1},{0xe0,0xF0,0x32,-1} }, { {0xe0,0x31,-1},{0xe0,0xF0,0x31,-1} }, { {0xe0,0x3A,-1},{0xe0,0xF0,0x3A,-1} }, { { -1},{ -1} }, /*130*/
{ {0xe0,0x49,-1},{0xe0,0xF0,0x49,-1} }, { { 0x77,-1},{ 0xf0,0x77,-1} }, { { -1},{ -1} }, { { 0x57,-1},{ 0xf0,0x57,-1} }, /*134*/
{ { 0x39,-1},{ 0xf0,0x39,-1} }, { { -1},{ -1} }, { {0xe0,0x58,-1},{0xe0,0xF0,0x58,-1} }, { {0xe0,0x05,-1},{0xe0,0xF0,0x05,-1} }, /*138*/
{ {0xe0,0x06,-1},{0xe0,0xF0,0x06,-1} }, { {0xe0,0x04,-1},{0xe0,0xF0,0x04,-1} }, { {0xe0,0x0C,-1},{0xe0,0xF0,0x0C,-1} }, { {0xe0,0x03,-1},{0xe0,0xF0,0x03,-1} }, /*13c*/
{ {0xe0,0x0B,-1},{0xe0,0xF0,0x0B,-1} }, { {0xe0,0x02,-1},{0xe0,0xF0,0x02,-1} }, { {0xe0,0x0A,-1},{0xe0,0xF0,0x0A,-1} }, { {0xe0,0x01,-1},{0xe0,0xF0,0x01,-1} }, /*140*/
{ {0xe0,0x09,-1},{0xe0,0xF0,0x09,-1} }, { { -1},{ -1} }, { {0xe0,0x7E,-1},{0xe0,0xF0,0x7E,-1} }, { { 0x6E,-1},{ 0xf0,0x6E,-1} }, /*144*/
{ { 0x63,-1},{ 0xf0,0x63,-1} }, { { 0x6F,-1},{ 0xf0,0x6F,-1} }, { { -1},{ -1} }, { { 0x61,-1},{ 0xf0,0x61,-1} }, /*148*/
{ {0xe0,0x73,-1},{0xe0,0xF0,0x73,-1} }, { { 0x6A,-1},{ 0xf0,0x6A,-1} }, { {0xe0,0x79,-1},{0xe0,0xF0,0x79,-1} }, { { 0x65,-1},{ 0xf0,0x65,-1} }, /*14c*/
{ { 0x60,-1},{ 0xf0,0x60,-1} }, { { 0x6D,-1},{ 0xf0,0x6D,-1} }, { { 0x67,-1},{ 0xf0,0x67,-1} }, { { 0x64,-1},{ 0xf0,0x64,-1} }, /*150*/
{ { 0xd4,-1},{ 0xf0,0xD4,-1} }, { {0xe0,0x60,-1},{0xe0,0xF0,0x60,-1} }, { { -1},{ -1} }, { {0xe0,0x78,-1},{0xe0,0xF0,0x78,-1} }, /*154*/
{ {0xe0,0x07,-1},{0xe0,0xF0,0x07,-1} }, { {0xe0,0x0F,-1},{0xe0,0xF0,0x0F,-1} }, { {0xe0,0x17,-1},{0xe0,0xF0,0x17,-1} }, { { 0x8B,-1},{ 0xf0,0x8B,-1} }, /*158*/
{ { 0x8C,-1},{ 0xf0,0x8C,-1} }, { { 0x8D,-1},{ 0xf0,0x8D,-1} }, { { -1},{ -1} }, { { 0x7F,-1},{ 0xf0,0x7F,-1} }, /*15c*/
{ { -1},{ -1} }, { {0xe0,0x4F,-1},{0xe0,0xF0,0x4F,-1} }, { {0xe0,0x56,-1},{0xe0,0xF0,0x56,-1} }, { { -1},{ -1} }, /*160*/
{ {0xe0,0x08,-1},{0xe0,0xF0,0x08,-1} }, { {0xe0,0x10,-1},{0xe0,0xF0,0x10,-1} }, { {0xe0,0x18,-1},{0xe0,0xF0,0x18,-1} }, { {0xe0,0x20,-1},{0xe0,0xF0,0x20,-1} }, /*164*/
{ {0xe0,0x28,-1},{0xe0,0xF0,0x28,-1} }, { {0xe0,0x30,-1},{0xe0,0xF0,0x30,-1} }, { {0xe0,0x38,-1},{0xe0,0xF0,0x38,-1} }, { {0xe0,0x40,-1},{0xe0,0xF0,0x40,-1} }, /*168*/
{ {0xe0,0x48,-1},{0xe0,0xF0,0x48,-1} }, { {0xe0,0x50,-1},{0xe0,0xF0,0x50,-1} }, { {0xe0,0x57,-1},{0xe0,0xF0,0x57,-1} }, { { -1},{ -1} }, /*16c*/
{ {0xe0,0x13,-1},{0xe0,0xF0,0x13,-1} }, { {0xe0,0x19,-1},{0xe0,0xF0,0x19,-1} }, { {0xe0,0x39,-1},{0xe0,0xF0,0x39,-1} }, { {0xe0,0x51,-1},{0xe0,0xF0,0x51,-1} }, /*170*/
{ {0xe0,0x53,-1},{0xe0,0xF0,0x53,-1} }, { {0xe0,0x5C,-1},{0xe0,0xF0,0x5C,-1} }, { { -1},{ -1} }, { {0xe0,0x62,-1},{0xe0,0xF0,0x62,-1} }, /*174*/
{ {0xe0,0x63,-1},{0xe0,0xF0,0x63,-1} }, { {0xe0,0x64,-1},{0xe0,0xF0,0x64,-1} }, { {0xe0,0x65,-1},{0xe0,0xF0,0x65,-1} }, { {0xe0,0x67,-1},{0xe0,0xF0,0x67,-1} }, /*178*/
{ {0xe0,0x68,-1},{0xe0,0xF0,0x68,-1} }, { {0xe0,0x6A,-1},{0xe0,0xF0,0x6A,-1} }, { {0xe0,0x6D,-1},{0xe0,0xF0,0x6D,-1} }, { {0xe0,0x6E,-1},{0xe0,0xF0,0x6E,-1} }, /*17c*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*180*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*184*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*188*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*18c*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*190*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*194*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*198*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*19c*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1a0*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1a4*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1a8*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1ac*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1c0*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1c4*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1c8*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1cc*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1d0*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1d4*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1d8*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1dc*/
{ { -1},{ -1} }, { {0xe0,0xe1,-1},{0xe0,0xF0,0xE1,-1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1e0*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1e4*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1e8*/
{ { -1},{ -1} }, { { -1},{ -1} }, { {0xe0,0xee,-1},{0xe0,0xF0,0xEE,-1} }, { { -1},{ -1} }, /*1ec*/
{ { -1},{ -1} }, { {0xe0,0xf1,-1},{0xe0,0xF0,0xF1,-1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1f0*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1f4*/
{ { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, { { -1},{ -1} }, /*1f8*/
{ { -1},{ -1} }, { { -1},{ -1} }, { {0xe0,0xfe,-1},{0xe0,0xF0,0xFE,-1} }, { {0xe0,0xff,-1},{0xe0,0xF0,0xFF,-1} } /*1fc*/
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
};
Temporarily removed scan code set 1 support from the AT keyboard, fixes the keyboard in TSX.
2018-08-20 04:03:48 +02:00
#ifdef ENABLE_KEYBOARD_AT_LOG
#define ENABLE_KEYBOARD_LOG
int keyboard_at_do_log = ENABLE_KEYBOARD_AT_LOG;
#endif
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
static void
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
kbd_log(const char *fmt, ...)
Fixed PS/2 mouse to PCI (PIIX) wiring, fixes recently introduced PS/2 mouse hangs; The AT keyboard "write to mouse" command now returns 0xFF (error) when no PS/2 mouse is attached - fixes hangs on AOpen AP53, ASUS P/I-P55T2S, and Tyan Titan Pro/ATX when not using PS/2 mouse; Fixed the emulation of the SMC FDC37C669 Super I/O chip - serial ports now work correctly on the AOpen AP53 and the ASUS P/I-P55T2S.
2017-09-07 01:52:36 +02:00
{
#ifdef ENABLE_KEYBOARD_AT_LOG
The PS/2 Model 80 memory expansion board initialization now correctly sets up the RAM mappings; The per-device log functions now all call pclog().
2017-12-05 23:35:35 +01:00
va_list ap;
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
if (keyboard_at_do_log) {
va_start(ap, fmt);
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
pclog_ex(fmt, ap);
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
va_end(ap);
}
Fixed PS/2 mouse to PCI (PIIX) wiring, fixes recently introduced PS/2 mouse hangs; The AT keyboard "write to mouse" command now returns 0xFF (error) when no PS/2 mouse is attached - fixes hangs on AOpen AP53, ASUS P/I-P55T2S, and Tyan Titan Pro/ATX when not using PS/2 mouse; Fixed the emulation of the SMC FDC37C669 Super I/O chip - serial ports now work correctly on the AOpen AP53 and the ASUS P/I-P55T2S.
2017-09-07 01:52:36 +02:00
#endif
}
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
static void
kbd_setmap(atkbd_t *kbd)
Initial submission of the PCem-Experimental source code.
2016-06-26 00:34:39 +02:00
{
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
switch (keyboard_mode & 3) {
Temporarily removed scan code set 1 support from the AT keyboard, fixes the keyboard in TSX.
2018-08-20 04:03:48 +02:00
#if 0
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
case 1:
default:
Got RAM usage down slightly further by merging in mode code from VARCem; Fixed the mouse.
2018-03-19 08:01:13 +01:00
keyboard_set_table(scancode_set1);
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
break;
case 2:
Got RAM usage down slightly further by merging in mode code from VARCem; Fixed the mouse.
2018-03-19 08:01:13 +01:00
keyboard_set_table(scancode_set2);
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
break;
Temporarily removed scan code set 1 support from the AT keyboard, fixes the keyboard in TSX.
2018-08-20 04:03:48 +02:00
#else
case 2:
default:
keyboard_set_table(scancode_set2);
break;
#endif
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
case 3:
Got RAM usage down slightly further by merging in mode code from VARCem; Fixed the mouse.
2018-03-19 08:01:13 +01:00
keyboard_set_table(scancode_set3);
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
break;
}
if (keyboard_mode & 0x20)
Temporarily removed scan code set 1 support from the AT keyboard, fixes the keyboard in TSX.
2018-08-20 04:03:48 +02:00
keyboard_set_table(scancode_set2);
Initial submission of the PCem-Experimental source code.
2016-06-26 00:34:39 +02:00
}
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
static void
kbd_poll(void *priv)
Initial submission of the PCem-Experimental source code.
2016-06-26 00:34:39 +02:00
{
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
atkbd_t *kbd = (atkbd_t *)priv;
keyboard_delay += (1000LL * TIMER_USEC);
if ((kbd->out_new != -1) && !kbd->last_irq) {
kbd->wantirq = 0;
if (kbd->out_new & 0x100) {
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: want mouse data\n");
#endif
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
if (kbd->mem[0] & 0x02)
picint(0x1000);
kbd->out = kbd->out_new & 0xff;
kbd->out_new = -1;
kbd->status |= STAT_OFULL;
kbd->status &= ~STAT_IFULL;
kbd->status |= STAT_MFULL;
kbd->last_irq = 0x1000;
} else {
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: want keyboard data\n");
#endif
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
if (kbd->mem[0] & 0x01)
picint(2);
Ported over the VARCem NVR commit.
2018-03-13 03:46:10 +01:00
kbd->out = kbd->out_new & 0xff;
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd->out_new = -1;
kbd->status |= STAT_OFULL;
kbd->status &= ~STAT_IFULL;
kbd->status &= ~STAT_MFULL;
kbd->last_irq = 2;
Initial submission of the PCem-Experimental source code.
2016-06-26 00:34:39 +02:00
}
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
}
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
if (kbd->out_new == -1 && !(kbd->status & STAT_OFULL) && key_ctrl_queue_start != key_ctrl_queue_end) {
Ported over the VARCem NVR commit.
2018-03-13 03:46:10 +01:00
kbd->out_new = key_ctrl_queue[key_ctrl_queue_start] | 0x200;
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
key_ctrl_queue_start = (key_ctrl_queue_start + 1) & 0xf;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
} else if (!(kbd->status & STAT_OFULL) && kbd->out_new == -1 && kbd->out_delayed != -1) {
Ported over the VARCem NVR commit.
2018-03-13 03:46:10 +01:00
kbd->out_new = kbd->out_delayed;
kbd->out_delayed = -1;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
} else if (!(kbd->status & STAT_OFULL) && kbd->out_new == -1 && !(kbd->mem[0] & 0x10) && kbd->out_delayed != -1) {
Ported over the VARCem NVR commit.
2018-03-13 03:46:10 +01:00
kbd->out_new = kbd->out_delayed;
kbd->out_delayed = -1;
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
} else if (!(kbd->status & STAT_OFULL) && kbd->out_new == -1/* && !(kbd->mem[0] & 0x20)*/ &&
(mouse_queue_start != mouse_queue_end)) {
kbd->out_new = mouse_queue[mouse_queue_start] | 0x100;
mouse_queue_start = (mouse_queue_start + 1) & 0xf;
} else if (!(kbd->status&STAT_OFULL) && kbd->out_new == -1 &&
!(kbd->mem[0]&0x10) && (key_queue_start != key_queue_end)) {
kbd->out_new = key_queue[key_queue_start];
key_queue_start = (key_queue_start + 1) & 0xf;
}
Initial submission of the PCem-Experimental source code.
2016-06-26 00:34:39 +02:00
}
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
static void
kbd_adddata(uint8_t val)
Initial submission of the PCem-Experimental source code.
2016-06-26 00:34:39 +02:00
{
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
key_ctrl_queue[key_ctrl_queue_end] = val;
key_ctrl_queue_end = (key_ctrl_queue_end + 1) & 0xf;
Ported over the PCem AT keyboard fix.
2018-03-13 02:48:24 +01:00
Ported over the VARCem NVR commit.
2018-03-13 03:46:10 +01:00
if (!(CurrentKbd->out_new & 0x300)) {
CurrentKbd->out_delayed = CurrentKbd->out_new;
CurrentKbd->out_new = -1;
Ported over the PCem AT keyboard fix.
2018-03-13 02:48:24 +01:00
}
Initial submission of the PCem-Experimental source code.
2016-06-26 00:34:39 +02:00
}
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
static void
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
kbd_adddata_vals(uint8_t *val, uint8_t len)
Initial submission of the PCem-Experimental source code.
2016-06-26 00:34:39 +02:00
{
Temporarily removed scan code set 1 support from the AT keyboard, fixes the keyboard in TSX.
2018-08-20 04:03:48 +02:00
int xt_mode = (keyboard_mode & 0x20) && ((CurrentKbd->flags & KBC_TYPE_MASK) < KBC_TYPE_PS2_1);
int translate = (keyboard_mode & 0x40);
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
int i;
uint8_t or = 0;
uint8_t send;
Temporarily removed scan code set 1 support from the AT keyboard, fixes the keyboard in TSX.
2018-08-20 04:03:48 +02:00
#if 0
translate = translate || (keyboard_mode & 0x40) && !xt_mode;
#else
translate = translate || (keyboard_mode & 0x40) || xt_mode;
translate = translate || ((CurrentKbd->flags & KBC_TYPE_MASK) == KBC_TYPE_PS2_2);
#endif
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
for (i = 0; i < len; i++) {
if (translate) {
if (val[i] == 0xf0) {
or = 0x80;
continue;
}
send = nont_to_t[val[i]] | or;
if (or == 0x80)
or = 0;
} else
send = val[i];
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("%02X", send);
#endif
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
kbd_adddata(send);
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
if (i < (len - 1)) kbd_log(" ");
#endif
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
}
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
if (translate) {
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
kbd_log(" original: (");
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
for (i = 0; i < len; i++) {
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
kbd_log("%02X", val[i]);
if (i < (len - 1)) kbd_log(" ");
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
}
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
kbd_log(")");
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
}
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
kbd_log("\n");
#endif
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
}
static void
kbd_adddata_keyboard(uint16_t val)
{
Temporarily removed scan code set 1 support from the AT keyboard, fixes the keyboard in TSX.
2018-08-20 04:03:48 +02:00
int xt_mode = (keyboard_mode & 0x20) && ((CurrentKbd->flags & KBC_TYPE_MASK) < KBC_TYPE_PS2_1);
int translate = (keyboard_mode & 0x40);
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
uint8_t fake_shift[4];
uint8_t num_lock = 0, shift_states = 0;
Temporarily removed scan code set 1 support from the AT keyboard, fixes the keyboard in TSX.
2018-08-20 04:03:48 +02:00
#if 0
translate = translate || (keyboard_mode & 0x40) && !xt_mode;
#else
translate = translate || (keyboard_mode & 0x40) || xt_mode;
translate = translate || ((CurrentKbd->flags & KBC_TYPE_MASK) == KBC_TYPE_PS2_2);
#endif
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
keyboard_get_states(NULL, &num_lock, NULL);
shift_states = keyboard_get_shift() & STATE_SHIFT_MASK;
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
/* Allow for scan code translation. */
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
if (translate && (val == 0xf0)) {
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: translate is on, F0 prefix detected\n");
#endif
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
sc_or = 0x80;
return;
}
/* Skip break code if translated make code has bit 7 set. */
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
if (translate && (sc_or == 0x80) && (val & 0x80)) {
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: translate is on, skipping scan code: %02X (original: F0 %02X)\n", nont_to_t[val], val);
#endif
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
sc_or = 0;
return;
}
Renamed the Paradise WD90C11 Standalone to Paradise WD90C11-LR and made it use the correct BIOS; Added the Paradise PVGA1A (standalone) and the Paradise WD90C30-LR, both with configurable video memory; Added the Toshiba T3100e.
2017-12-31 06:37:19 +01:00
/* Test for T3100E 'Fn' key (Right Alt / Right Ctrl) */
Removed ROM set checking from several files.
2018-09-15 16:15:39 +02:00
if (CurrentKbd && ((CurrentKbd->flags & KBC_VEN_MASK) == KBC_VEN_TOSHIBA) && (keyboard_recv(0xb8) || keyboard_recv(0x9d))) {
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
switch (val) {
Renamed the Paradise WD90C11 Standalone to Paradise WD90C11-LR and made it use the correct BIOS; Added the Paradise PVGA1A (standalone) and the Paradise WD90C30-LR, both with configurable video memory; Added the Toshiba T3100e.
2017-12-31 06:37:19 +01:00
case 0x4f: t3100e_notify_set(0x01); break; /* End */
case 0x50: t3100e_notify_set(0x02); break; /* Down */
case 0x51: t3100e_notify_set(0x03); break; /* PgDn */
case 0x52: t3100e_notify_set(0x04); break; /* Ins */
case 0x53: t3100e_notify_set(0x05); break; /* Del */
case 0x54: t3100e_notify_set(0x06); break; /* SysRQ */
case 0x45: t3100e_notify_set(0x07); break; /* NumLock */
case 0x46: t3100e_notify_set(0x08); break; /* ScrLock */
case 0x47: t3100e_notify_set(0x09); break; /* Home */
case 0x48: t3100e_notify_set(0x0A); break; /* Up */
case 0x49: t3100e_notify_set(0x0B); break; /* PgUp */
case 0x4A: t3100e_notify_set(0x0C); break; /* Keypad -*/
case 0x4B: t3100e_notify_set(0x0D); break; /* Left */
case 0x4C: t3100e_notify_set(0x0E); break; /* KP 5 */
case 0x4D: t3100e_notify_set(0x0F); break; /* Right */
}
}
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: translate is %s, ", translate ? "on" : "off");
#endif
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
switch(val) {
case FAKE_LSHIFT_ON:
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("fake left shift on, scan code: ");
#endif
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
if (num_lock) {
if (shift_states) {
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("N/A (one or both shifts on)\n");
#endif
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
break;
} else {
/* Num lock on and no shifts are pressed, send non-inverted fake shift. */
switch(keyboard_mode & 0x02) {
case 1:
fake_shift[0] = 0xe0; fake_shift[1] = 0x2a;
kbd_adddata_vals(fake_shift, 2);
break;
case 2:
fake_shift[0] = 0xe0; fake_shift[1] = 0x12;
kbd_adddata_vals(fake_shift, 2);
break;
default:
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("N/A (scan code set %i)\n", keyboard_mode & 0x02);
#endif
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
break;
}
}
} else {
if (shift_states & STATE_LSHIFT) {
/* Num lock off and left shift pressed. */
switch(keyboard_mode & 0x02) {
case 1:
fake_shift[0] = 0xe0; fake_shift[1] = 0xaa;
kbd_adddata_vals(fake_shift, 2);
break;
case 2:
fake_shift[0] = 0xe0; fake_shift[1] = 0xf0; fake_shift[2] = 0x12;
kbd_adddata_vals(fake_shift, 3);
break;
default:
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("N/A (scan code set %i)\n", keyboard_mode & 0x02);
#endif
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
break;
}
}
if (shift_states & STATE_RSHIFT) {
/* Num lock off and right shift pressed. */
switch(keyboard_mode & 0x02) {
case 1:
fake_shift[0] = 0xe0; fake_shift[1] = 0xb6;
kbd_adddata_vals(fake_shift, 2);
break;
case 2:
fake_shift[0] = 0xe0; fake_shift[1] = 0xf0; fake_shift[2] = 0x59;
kbd_adddata_vals(fake_shift, 3);
break;
default:
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("N/A (scan code set %i)\n", keyboard_mode & 0x02);
#endif
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
break;
}
}
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
if (!shift_states)
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
kbd_log("N/A (both shifts off)\n");
#endif
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
}
break;
case FAKE_LSHIFT_OFF:
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("fake left shift on, scan code: ");
#endif
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
if (num_lock) {
if (shift_states) {
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("N/A (one or both shifts on)\n");
#endif
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
break;
} else {
/* Num lock on and no shifts are pressed, send non-inverted fake shift. */
switch(keyboard_mode & 0x02) {
case 1:
fake_shift[0] = 0xe0; fake_shift[1] = 0xaa;
kbd_adddata_vals(fake_shift, 2);
break;
case 2:
fake_shift[0] = 0xe0; fake_shift[1] = 0xf0; fake_shift[2] = 0x12;
kbd_adddata_vals(fake_shift, 3);
break;
default:
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("N/A (scan code set %i)\n", keyboard_mode & 0x02);
#endif
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
break;
}
}
} else {
if (shift_states & STATE_LSHIFT) {
/* Num lock off and left shift pressed. */
switch(keyboard_mode & 0x02) {
case 1:
fake_shift[0] = 0xe0; fake_shift[1] = 0x2a;
kbd_adddata_vals(fake_shift, 2);
break;
case 2:
fake_shift[0] = 0xe0; fake_shift[1] = 0x12;
kbd_adddata_vals(fake_shift, 2);
break;
default:
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("N/A (scan code set %i)\n", keyboard_mode & 0x02);
#endif
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
break;
}
}
if (shift_states & STATE_RSHIFT) {
/* Num lock off and right shift pressed. */
switch(keyboard_mode & 0x02) {
case 1:
fake_shift[0] = 0xe0; fake_shift[1] = 0x36;
kbd_adddata_vals(fake_shift, 2);
break;
case 2:
fake_shift[0] = 0xe0; fake_shift[1] = 0x59;
kbd_adddata_vals(fake_shift, 2);
break;
default:
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("N/A (scan code set %i)\n", keyboard_mode & 0x02);
#endif
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
break;
}
}
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
if (!shift_states)
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
kbd_log("N/A (both shifts off)\n");
#endif
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
}
break;
default:
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("scan code: ");
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
if (translate) {
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
kbd_log("%02X (original: ", (nont_to_t[val] | sc_or));
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
if (sc_or == 0x80)
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
kbd_log("F0 ");
kbd_log("%02X)\n", val);
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
} else
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
kbd_log("%02X\n", val);
#endif
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
key_queue[key_queue_end] = (translate ? (nont_to_t[val] | sc_or) : val);
key_queue_end = (key_queue_end + 1) & 0xf;
break;
}
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
if (sc_or == 0x80) sc_or = 0;
Initial submission of the PCem-Experimental source code.
2016-06-26 00:34:39 +02:00
}
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
static void
kbd_output_write(atkbd_t *kbd, uint8_t val)
{
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: write output port: %02X (old: %02X)\n", val, kbd->output_port);
#endif
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
if ((kbd->output_port ^ val) & 0x20) { /*IRQ 12*/
if (val & 0x20)
picint(1 << 12);
else
picintc(1 << 12);
}
if ((kbd->output_port ^ val) & 0x10) { /*IRQ 1*/
if (val & 0x10)
picint(1 << 1);
else
picintc(1 << 1);
}
if ((kbd->output_port ^ val) & 0x02) { /*A20 enable change*/
mem_a20_key = val & 0x02;
mem_a20_recalc();
flushmmucache();
}
if ((kbd->output_port ^ val) & 0x01) { /*Reset*/
if (! (val & 0x01)) {
/* Pin 0 selected. */
softresetx86(); /*Pulse reset!*/
cpu_set_edx();
}
}
kbd->output_port = val;
}
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
static void
kbd_cmd_write(atkbd_t *kbd, uint8_t val)
{
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: write command byte: %02X (old: %02X)\n", val, kbd->mem[0]);
#endif
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
if ((val & 1) && (kbd->status & STAT_OFULL))
kbd->wantirq = 1;
if (!(val & 1) && kbd->wantirq)
kbd->wantirq = 0;
/* PS/2 type 2 keyboard controllers always force the XLAT bit to 0. */
if ((kbd->flags & KBC_TYPE_MASK) == KBC_TYPE_PS2_2) {
val &= ~CCB_TRANSLATE;
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
kbd->mem[0] &= ~CCB_TRANSLATE;
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
}
/* Scan code translate ON/OFF. */
keyboard_mode &= 0x93;
keyboard_mode |= (val & MODE_MASK);
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
keyboard_scan = !(val & 0x10);
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: keyboard is now %s\n", keyboard_scan ? "enabled" : "disabled");
kbd_log("ATkbd: keyboard interrupt is now %s\n", (val & 0x01) ? "enabled" : "disabled");
#endif
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
/* ISA AT keyboard controllers use bit 5 for keyboard mode (1 = PC/XT, 2 = AT);
PS/2 (and EISA/PCI) keyboard controllers use it as the PS/2 mouse enable switch. */
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
if (((kbd->flags & KBC_VEN_MASK) == KBC_VEN_AMI) ||
((kbd->flags & KBC_TYPE_MASK) >= KBC_TYPE_PS2_1)) {
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
keyboard_mode &= ~CCB_PCMODE;
mouse_scan = !(val & 0x20);
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: mouse is now %s\n", mouse_scan ? "enabled" : "disabled");
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
kbd_log("ATkbd: mouse interrupt is now %s\n", (val & 0x02) ? "enabled" : "disabled");
#endif
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
}
Temporarily removed scan code set 1 support from the AT keyboard, fixes the keyboard in TSX.
2018-08-20 04:03:48 +02:00
kbd_log("Command byte now: %02X (%02X)\n", kbd->mem[0], val);
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
}
static void
kbd_output_pulse(atkbd_t *kbd, uint8_t mask)
{
Fixed the output port bit pulse commands, fixes KBC reset (and with it, PS/2 model 80 hanging).
2018-01-07 19:50:28 +01:00
if (mask != 0xF) {
kbd->old_output_port = kbd->output_port & ~(0xF0 | mask);
kbd_output_write(kbd, kbd->output_port & (0xF0 | mask));
kbd->pulse_cb = 6LL * TIMER_USEC;
}
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
}
static void
kbd_pulse_poll(void *p)
{
atkbd_t *kbd = (atkbd_t *) p;
kbd_output_write(kbd, kbd->output_port | kbd->old_output_port);
kbd->pulse_cb = 0LL;
}
Added the 3Com 3C503 Network card; Several bug fixes; Preliminar addition of the SDL 2 renderer (does not yet work correctly in full screen mode); SCSI devices no longer have configurable LUN's (this matches the configurability of real SCSI devices); SCSI LUN's are now handed by the device's handler; Removed all unused strings; Removed some unused code files; Significantly rewrote the bus mouse emulation.
2018-07-15 01:41:53 +02:00
static void
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
kbd_keyboard_set(atkbd_t *kbd, uint8_t enable)
Added the 3Com 3C503 Network card; Several bug fixes; Preliminar addition of the SDL 2 renderer (does not yet work correctly in full screen mode); SCSI devices no longer have configurable LUN's (this matches the configurability of real SCSI devices); SCSI LUN's are now handed by the device's handler; Removed all unused strings; Removed some unused code files; Significantly rewrote the bus mouse emulation.
2018-07-15 01:41:53 +02:00
{
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
kbd->mem[0] &= 0xef;
kbd->mem[0] |= (enable ? 0x00 : 0x10);
Added the 3Com 3C503 Network card; Several bug fixes; Preliminar addition of the SDL 2 renderer (does not yet work correctly in full screen mode); SCSI devices no longer have configurable LUN's (this matches the configurability of real SCSI devices); SCSI LUN's are now handed by the device's handler; Removed all unused strings; Removed some unused code files; Significantly rewrote the bus mouse emulation.
2018-07-15 01:41:53 +02:00
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
if (enable)
kbd->status |= STAT_LOCK;
else
kbd->status &= ~STAT_LOCK;
Added the 3Com 3C503 Network card; Several bug fixes; Preliminar addition of the SDL 2 renderer (does not yet work correctly in full screen mode); SCSI devices no longer have configurable LUN's (this matches the configurability of real SCSI devices); SCSI LUN's are now handed by the device's handler; Removed all unused strings; Removed some unused code files; Significantly rewrote the bus mouse emulation.
2018-07-15 01:41:53 +02:00
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
keyboard_scan = enable;
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
}
static void
kbd_mouse_set(atkbd_t *kbd, uint8_t enable)
{
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
kbd->mem[0] &= 0xdf;
kbd->mem[0] |= (enable ? 0x00 : 0x20);
mouse_scan = enable;
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
}
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
static uint8_t
kbd_write64_generic(void *p, uint8_t val)
{
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
atkbd_t *kbd = (atkbd_t *)p;
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
switch (val) {
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xa4: /*Check if password installed*/
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
if ((kbd->flags & KBC_TYPE_MASK) >= KBC_TYPE_PS2_1) {
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: check if password installed\n");
#endif
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
kbd_adddata(0xf1);
return 0;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
}
#ifdef ENABLE_KEYBOARD_LOG
else
kbd_log("ATkbd: bad command A4\n");
#endif
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
break;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xa7: /*Disable mouse port*/
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
if ((kbd->flags & KBC_TYPE_MASK) >= KBC_TYPE_PS2_1) {
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: disable mouse port\n");
#endif
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
kbd_mouse_set(kbd, 0);
return 0;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
}
#ifdef ENABLE_KEYBOARD_LOG
else
kbd_log("ATkbd: bad command A7\n");
#endif
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
break;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xa8: /*Enable mouse port*/
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
if ((kbd->flags & KBC_TYPE_MASK) >= KBC_TYPE_PS2_1) {
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: enable mouse port\n");
#endif
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
kbd_mouse_set(kbd, 1);
return 0;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
}
#ifdef ENABLE_KEYBOARD_LOG
else
kbd_log("ATkbd: bad command A8\n");
#endif
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
break;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xa9: /*Test mouse port*/
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: test mouse port\n");
#endif
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
if ((kbd->flags & KBC_TYPE_MASK) >= KBC_TYPE_PS2_1) {
if (mouse_write)
kbd_adddata(0x00); /*no error*/
else
kbd_adddata(0xff); /*no mouse*/
return 0;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
}
#ifdef ENABLE_KEYBOARD_LOG
else
kbd_log("ATkbd: bad command A9\n");
#endif
The FDC is now a device_t, and the FDC code has been cleaned up; Merged floppy.c and fdd.c and renamed floppy_*.c (the floppy image format handlers) to fdd_*.c; Reading the AT or PS/2 keyboard controller status no longer clears the transmit timeout bit, fixes error 8601 (mouse error) on the IBM PS/2 Model 80; MMU translate and DMA physical reads and writes now go through _mem_exec instead of directly to ram[], should fix the last remaining problems with remapped mappings; Implemented the Sound gain dialog; Added the resource for the "New floppy image" dialog and the needed functions for the functionality of exporting the currently mounted floppy image as 86F, both of which should be finished in the next commit; Applied the CD-ROM fixes from the PCem commit; Added the "Keep ratio" option for full screen stretch.
2018-01-17 18:43:36 +01:00
break;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xaf: /*Read keyboard version*/
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: read keyboard version\n");
#endif
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
kbd_adddata(0x00);
return 0;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xc0: /*Read input port*/
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: read input port\n");
#endif
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
kbd_adddata(kbd->input_port | 4 | fdc_ps1_525());
kbd->input_port = ((kbd->input_port + 1) & 3) | (kbd->input_port & 0xfc) | fdc_ps1_525();
Fixed the behavior of PS/2-style keyboard controllers when no PS/2 mouse is attached, fixes NetBSD 7.1 hanging.
2018-01-06 01:01:50 +01:00
return 0;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xd3: /*Write mouse output buffer*/
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
if ((kbd->flags & KBC_TYPE_MASK) >= KBC_TYPE_PS2_1) {
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: write mouse output buffer\n");
#endif
Fixed the behavior of PS/2-style keyboard controllers when no PS/2 mouse is attached, fixes NetBSD 7.1 hanging.
2018-01-06 01:01:50 +01:00
kbd->want60 = 1;
return 0;
}
break;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xd4: /*Write to mouse*/
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
if ((kbd->flags & KBC_TYPE_MASK) >= KBC_TYPE_PS2_1) {
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: write to mouse\n");
#endif
Fixed the behavior of PS/2-style keyboard controllers when no PS/2 mouse is attached, fixes NetBSD 7.1 hanging.
2018-01-06 01:01:50 +01:00
kbd->want60 = 1;
return 0;
}
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
break;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
case 0xf0: case 0xf1: case 0xf2: case 0xf3:
case 0xf4: case 0xf5: case 0xf6: case 0xf7:
case 0xf8: case 0xf9: case 0xfa: case 0xfb:
case 0xfc: case 0xfd: case 0xfe: case 0xff:
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
// kbd_log("ATkbd: pulse %01X\n", val & 0x0f);
#endif
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
kbd_output_pulse(kbd, val & 0x0f);
Fixed the behavior of PS/2-style keyboard controllers when no PS/2 mouse is attached, fixes NetBSD 7.1 hanging.
2018-01-06 01:01:50 +01:00
return 0;
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
}
return 1;
}
static uint8_t
kbd_write60_ami(void *p, uint8_t val)
{
atkbd_t *kbd = (atkbd_t *) p;
switch(kbd->command) {
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
/* 0x40 - 0x5F are aliases for 0x60-0x7F */
case 0x40: case 0x41: case 0x42: case 0x43:
case 0x44: case 0x45: case 0x46: case 0x47:
case 0x48: case 0x49: case 0x4a: case 0x4b:
case 0x4c: case 0x4d: case 0x4e: case 0x4f:
case 0x50: case 0x51: case 0x52: case 0x53:
case 0x54: case 0x55: case 0x56: case 0x57:
case 0x58: case 0x59: case 0x5a: case 0x5b:
case 0x5c: case 0x5d: case 0x5e: case 0x5f:
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: AMI - alias write to %08X\n", kbd->command);
#endif
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
kbd->mem[kbd->command & 0x1f] = val;
if (kbd->command == 0x60)
kbd_cmd_write(kbd, val);
return 0;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xaf: /*AMI - set extended controller RAM*/
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: AMI - set extended controller RAM\n");
#endif
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
if (kbd->secr_phase == 1) {
kbd->mem_addr = val;
kbd->want60 = 1;
kbd->secr_phase = 2;
} else if (kbd->secr_phase == 2) {
kbd->mem[kbd->mem_addr] = val;
kbd->secr_phase = 0;
}
return 0;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xcb: /*AMI - set keyboard mode*/
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: AMI - set keyboard mode\n");
#endif
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
return 0;
}
return 1;
}
static uint8_t
kbd_write64_ami(void *p, uint8_t val)
{
atkbd_t *kbd = (atkbd_t *) p;
switch (val) {
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
case 0x00: case 0x01: case 0x02: case 0x03:
case 0x04: case 0x05: case 0x06: case 0x07:
case 0x08: case 0x09: case 0x0a: case 0x0b:
case 0x0c: case 0x0d: case 0x0e: case 0x0f:
case 0x10: case 0x11: case 0x12: case 0x13:
case 0x14: case 0x15: case 0x16: case 0x17:
case 0x18: case 0x19: case 0x1a: case 0x1b:
case 0x1c: case 0x1d: case 0x1e: case 0x1f:
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: AMI - alias read from %08X\n", val);
#endif
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
kbd_adddata(kbd->mem[val]);
return 0;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
case 0x40: case 0x41: case 0x42: case 0x43:
case 0x44: case 0x45: case 0x46: case 0x47:
case 0x48: case 0x49: case 0x4a: case 0x4b:
case 0x4c: case 0x4d: case 0x4e: case 0x4f:
case 0x50: case 0x51: case 0x52: case 0x53:
case 0x54: case 0x55: case 0x56: case 0x57:
case 0x58: case 0x59: case 0x5a: case 0x5b:
case 0x5c: case 0x5d: case 0x5e: case 0x5f:
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: AMI - alias write to %08X\n", kbd->command);
#endif
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
kbd->want60 = 1;
return 0;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xa1: /*AMI - get controller version*/
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: AMI - get controller version\n");
#endif
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
return 0;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
case 0xa2: /*AMI - reset keyboard controller lines P22 and P23 low*/
if ((kbd->flags & KBC_TYPE_MASK) < KBC_TYPE_PS2_1) {
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: AMI - clear KBC lines P22 and P23\n");
#endif
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
kbd_output_write(kbd, kbd->output_port & 0xf3);
kbd_adddata(0x00);
return 0;
}
break;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
case 0xa3: /*AMI - set keyboard controller lines P22 and P23 high*/
if ((kbd->flags & KBC_TYPE_MASK) < KBC_TYPE_PS2_1) {
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: AMI - set KBC lines P22 and P23\n");
#endif
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
kbd_output_write(kbd, kbd->output_port | 0x0c);
kbd_adddata(0x00);
return 0;
}
break;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xa4: /* AMI - write clock = low */
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
if ((kbd->flags & KBC_TYPE_MASK) < KBC_TYPE_PS2_1) {
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: AMI - write clock = low\n");
#endif
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
kbd->ami_stat &= 0xfe;
return 0;
}
break;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xa5: /* AMI - write clock = high */
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
if ((kbd->flags & KBC_TYPE_MASK) < KBC_TYPE_PS2_1) {
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: AMI - write clock = high\n");
#endif
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
kbd->ami_stat |= 0x01;
return 0;
}
break;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xa6: /* AMI - read clock */
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
if ((kbd->flags & KBC_TYPE_MASK) < KBC_TYPE_PS2_1) {
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: AMI - read clock\n");
#endif
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
kbd_adddata(!!(kbd->ami_stat & 1));
return 0;
}
break;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xa7: /* AMI - write cache bad */
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
if ((kbd->flags & KBC_TYPE_MASK) < KBC_TYPE_PS2_1) {
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: AMI - write cache bad\n");
#endif
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
kbd->ami_stat &= 0xfd;
return 0;
}
break;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xa8: /* AMI - write cache good */
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
if ((kbd->flags & KBC_TYPE_MASK) < KBC_TYPE_PS2_1) {
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: AMI - write cache good\n");
#endif
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
kbd->ami_stat |= 0x02;
return 0;
}
break;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xa9: /* AMI - read cache */
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
if ((kbd->flags & KBC_TYPE_MASK) < KBC_TYPE_PS2_1) {
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: AMI - read cache\n");
#endif
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
kbd_adddata(!!(kbd->ami_stat & 2));
return 0;
}
break;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xaf: /*Set extended controller RAM*/
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: set extended controller RAM\n");
#endif
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
kbd->want60 = 1;
kbd->secr_phase = 1;
return 0;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
case 0xb0: case 0xb1: case 0xb2: case 0xb3:
/*Set keyboard controller line P10-P13 (input port bits 0-3) low*/
if (!PCI || (val > 0xb1))
kbd->input_port &= ~(1 << (val & 0x03));
kbd_adddata(0x00);
return 0;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
case 0xb4: case 0xb5:
/*Set keyboard controller line P22-P23 (output port bits 2-3) low*/
if (!PCI)
kbd_output_write(kbd, kbd->output_port & ~(4 << (val & 0x01)));
kbd_adddata(0x00);
return 0;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
case 0xb8: case 0xb9: case 0xba: case 0xbb:
/*Set keyboard controller line P10-P13 (input port bits 0-3) high*/
Fixed the part of keyboard_at.c that was breaking the Premiere/PCI, again.
2018-09-17 22:23:22 +02:00
if (!PCI || (val > 0xb9)) {
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
kbd->input_port |= (1 << (val & 0x03));
Fixed the part of keyboard_at.c that was breaking the Premiere/PCI, again.
2018-09-17 22:23:22 +02:00
kbd_adddata(0x00);
}
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
return 0;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
case 0xbc: case 0xbd:
/*Set keyboard controller line P22-P23 (output port bits 2-3) high*/
if (!PCI)
kbd_output_write(kbd, kbd->output_port | (4 << (val & 0x01)));
kbd_adddata(0x00);
return 0;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
case 0xc8: /*AMI - unblock keyboard controller lines P22 and P23
(allow command D1 to change bits 2 and 3 of the output
port)*/
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: AMI - unblock KBC lines P22 and P23\n");
#endif
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
kbd->output_locked = 1;
return 0;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
case 0xc9: /*AMI - block keyboard controller lines P22 and P23
(prevent command D1 from changing bits 2 and 3 of the
output port)*/
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: AMI - block KBC lines P22 and P23\n");
#endif
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
kbd->output_locked = 1;
return 0;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xca: /*AMI - read keyboard mode*/
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: AMI - read keyboard mode\n");
#endif
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
kbd_adddata(0x00); /*ISA mode*/
return 0;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xcb: /*AMI - set keyboard mode*/
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: AMI - set keyboard mode\n");
#endif
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
kbd->want60 = 1;
return 0;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xef: /*??? - sent by AMI486*/
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: ??? - sent by AMI486\n");
#endif
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
return 0;
}
return kbd_write64_generic(kbd, val);
}
static uint8_t
kbd_write64_ibm_mca(void *p, uint8_t val)
{
atkbd_t *kbd = (atkbd_t *) p;
switch (val) {
Fixed the behavior of PS/2-style keyboard controllers when no PS/2 mouse is attached, fixes NetBSD 7.1 hanging.
2018-01-06 01:01:50 +01:00
case 0xc1: /*Copy bits 0 to 3 of input port to status bits 4 to 7*/
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: copy bits 0 to 3 of input port to status bits 4 to 7\n");
#endif
Fixed the behavior of PS/2-style keyboard controllers when no PS/2 mouse is attached, fixes NetBSD 7.1 hanging.
2018-01-06 01:01:50 +01:00
kbd->status &= 0xf;
kbd->status |= ((((kbd->input_port & 0xfc) | 0x84 | fdc_ps1_525()) & 0xf) << 4);
return 0;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
Fixed the behavior of PS/2-style keyboard controllers when no PS/2 mouse is attached, fixes NetBSD 7.1 hanging.
2018-01-06 01:01:50 +01:00
case 0xc2: /*Copy bits 4 to 7 of input port to status bits 4 to 7*/
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: copy bits 4 to 7 of input port to status bits 4 to 7\n");
#endif
Fixed the behavior of PS/2-style keyboard controllers when no PS/2 mouse is attached, fixes NetBSD 7.1 hanging.
2018-01-06 01:01:50 +01:00
kbd->status &= 0xf;
kbd->status |= (((kbd->input_port & 0xfc) | 0x84 | fdc_ps1_525()) & 0xf0);
return 0;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
case 0xaf:
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: bad KBC command AF\n");
#endif
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
return 1;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
case 0xf0: case 0xf1: case 0xf2: case 0xf3:
case 0xf4: case 0xf5: case 0xf6: case 0xf7:
case 0xf8: case 0xf9: case 0xfa: case 0xfb:
case 0xfc: case 0xfd: case 0xfe: case 0xff:
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: pulse: %01X\n", (val & 0x03) | 0x0c);
#endif
Fixed the output port bit pulse commands, fixes KBC reset (and with it, PS/2 model 80 hanging).
2018-01-07 19:50:28 +01:00
kbd_output_pulse(kbd, (val & 0x03) | 0x0c);
Fixed the behavior of PS/2-style keyboard controllers when no PS/2 mouse is attached, fixes NetBSD 7.1 hanging.
2018-01-06 01:01:50 +01:00
return 0;
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
}
return kbd_write64_generic(kbd, val);
}
static uint8_t
kbd_write60_quadtel(void *p, uint8_t val)
{
atkbd_t *kbd = (atkbd_t *) p;
switch(kbd->command) {
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xcf: /*??? - sent by MegaPC BIOS*/
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: ??? - sent by MegaPC BIOS\n");
#endif
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
return 0;
}
return 1;
}
static uint8_t
kbd_write64_quadtel(void *p, uint8_t val)
{
atkbd_t *kbd = (atkbd_t *) p;
switch (val) {
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
case 0xaf:
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: bad KBC command AF\n");
#endif
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
return 1;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xcf: /*??? - sent by MegaPC BIOS*/
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: ??? - sent by MegaPC BIOS\n");
#endif
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
kbd->want60 = 1;
return 0;
}
return kbd_write64_generic(kbd, val);
}
static uint8_t
kbd_write60_toshiba(void *p, uint8_t val)
{
atkbd_t *kbd = (atkbd_t *) p;
switch(kbd->command) {
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xb6: /* T3100e - set color/mono switch */
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
t3100e_mono_set(val);
return 0;
}
return 1;
}
static uint8_t
kbd_write64_toshiba(void *p, uint8_t val)
{
atkbd_t *kbd = (atkbd_t *) p;
switch (val) {
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
case 0xaf:
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: bad KBC command AF\n");
#endif
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
return 1;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xb0: /* T3100e: Turbo on */
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
t3100e_turbo_set(1);
return 0;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xb1: /* T3100e: Turbo off */
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
t3100e_turbo_set(0);
return 0;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xb2: /* T3100e: Select external display */
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
t3100e_display_set(0x00);
return 0;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xb3: /* T3100e: Select internal display */
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
t3100e_display_set(0x01);
return 0;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xb4: /* T3100e: Get configuration / status */
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
kbd_adddata(t3100e_config_get());
return 0;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xb5: /* T3100e: Get colour / mono byte */
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
kbd_adddata(t3100e_mono_get());
return 0;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xb6: /* T3100e: Set colour / mono byte */
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
kbd->want60 = 1;
return 0;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xb7: /* T3100e: Emulate PS/2 keyboard - not implemented */
case 0xb8: /* T3100e: Emulate AT keyboard - not implemented */
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
return 0;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xbb: /* T3100e: Read 'Fn' key.
Return it for right Ctrl and right Alt; on the real
T3100e, these keystrokes could only be generated
using 'Fn'. */
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
if (keyboard_recv(0xb8) || /* Right Alt */
keyboard_recv(0x9d)) /* Right Ctrl */
kbd_adddata(0x04);
else kbd_adddata(0x00);
return 0;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xbc: /* T3100e: Reset Fn+Key notification */
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
t3100e_notify_set(0x00);
return 0;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xc0: /*Read input port*/
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: read input port\n");
#endif
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
/* The T3100e returns all bits set except bit 6 which
* is set by t3100e_mono_set() */
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
kbd->input_port = (t3100e_mono_get() & 1) ? 0xff : 0xbf;
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
kbd_adddata(kbd->input_port);
return 0;
}
return kbd_write64_generic(kbd, val);
}
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
static void
kbd_write(uint16_t port, uint8_t val, void *priv)
Initial submission of the PCem-Experimental source code.
2016-06-26 00:34:39 +02:00
{
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
atkbd_t *kbd = (atkbd_t *)priv;
int i = 0;
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
int bad = 1;
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
uint8_t mask;
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
Removed ROM set checking from several files.
2018-09-15 16:15:39 +02:00
if (((kbd->flags & KBC_VEN_MASK) == KBC_VEN_XI8088) && (port == 0x63))
Added the Xi8088.
2018-03-02 20:47:18 +01:00
port = 0x61;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef _DEBUG
kbd_log("ATkbd: write(%04X, %02X)\n", port, val);
#endif
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
switch (port) {
case 0x60:
if (kbd->want60) {
/*Write to controller*/
kbd->want60 = 0;
switch (kbd->command) {
case 0x60: case 0x61: case 0x62: case 0x63:
case 0x64: case 0x65: case 0x66: case 0x67:
case 0x68: case 0x69: case 0x6a: case 0x6b:
case 0x6c: case 0x6d: case 0x6e: case 0x6f:
case 0x70: case 0x71: case 0x72: case 0x73:
case 0x74: case 0x75: case 0x76: case 0x77:
case 0x78: case 0x79: case 0x7a: case 0x7b:
case 0x7c: case 0x7d: case 0x7e: case 0x7f:
kbd->mem[kbd->command & 0x1f] = val;
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
if (kbd->command == 0x60)
kbd_cmd_write(kbd, val);
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
break;
case 0xd1: /*Write output port*/
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
// kbd_log("ATkbd: write output port\n");
#endif
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
if (kbd->output_locked) {
/*If keyboard controller lines P22-P23 are blocked,
we force them to remain unchanged.*/
val &= ~0x0c;
val |= (kbd->output_port & 0x0c);
Initial submission of the PCem-Experimental source code.
2016-06-26 00:34:39 +02:00
}
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
kbd_output_write(kbd, val);
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
break;
case 0xd2: /*Write to keyboard output buffer*/
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: write to keyboard output buffer\n");
#endif
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd_adddata_keyboard(val);
break;
case 0xd3: /*Write to mouse output buffer*/
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: write to mouse output buffer\n");
#endif
Fixed the behavior of PS/2-style keyboard controllers when no PS/2 mouse is attached, fixes NetBSD 7.1 hanging.
2018-01-06 01:01:50 +01:00
if (mouse_write && ((kbd->flags & KBC_TYPE_MASK) >= KBC_TYPE_PS2_1))
keyboard_at_adddata_mouse(val);
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
break;
case 0xd4: /*Write to mouse*/
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: write to mouse (%02X)\n", val);
#endif
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
kbd_mouse_set(kbd, 1);
Added the "New Floppy Image" functionality with its own dialog box, can create 86F, Japanese FDI, and IMG images; The settings dialog now keeps track of MFM/XTIDE/ESDI/IDE channels and SCSI ID's and LUN's; The IBM PS/2 Model 50 now installs a Model 80-style memory expansion card (MCA ID FCFF) when more than 2 MB RAM is selected, and now supports a maximum of 10 MB RAM.
2018-01-19 15:39:13 +01:00
if (mouse_write && ((kbd->flags & KBC_TYPE_MASK) >= KBC_TYPE_PS2_1))
Fixes for PS/2 mouse crash (since AT keyboard rework) from TheCollector1995.
2017-11-09 22:05:29 -05:00
mouse_write(val, mouse_p);
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
else if (!mouse_write && ((kbd->flags & KBC_TYPE_MASK) >= KBC_TYPE_PS2_1)) {
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: adding 0xFF to queue\n");
#endif
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
keyboard_at_adddata_mouse(0xff);
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
}
Initial submission of the PCem-Experimental source code.
2016-06-26 00:34:39 +02:00
break;
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
default:
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
/* Run the vendor-specific command handler, if present,
otherwise (or if the former returns 1), assume bad command. */
if (kbd->write60_ven)
bad = kbd->write60_ven(kbd, val);
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
if (bad)
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
kbd_log("ATkbd: bad keyboard controller 0060 write %02X command %02X\n", val, kbd->command);
#else
(void)bad;
#endif
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
}
} else {
/*Write to keyboard*/
kbd->mem[0] &= ~0x10;
if (kbd->key_wantdata) {
kbd->key_wantdata = 0;
switch (kbd->key_command) {
case 0xed: /*Set/reset LEDs*/
Temporarily removed scan code set 1 support from the AT keyboard, fixes the keyboard in TSX.
2018-08-20 04:03:48 +02:00
if (val & 0xf8)
goto do_command; /* Command ED does command if command is recognized. */
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd_adddata_keyboard(0xfa);
break;
case 0xf0: /*Get/set scancode set*/
Temporarily removed scan code set 1 support from the AT keyboard, fixes the keyboard in TSX.
2018-08-20 04:03:48 +02:00
kbd_adddata_keyboard(0xfa);
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
if (val == 0) {
Temporarily removed scan code set 1 support from the AT keyboard, fixes the keyboard in TSX.
2018-08-20 04:03:48 +02:00
kbd_log("Get scan code set: %02X\n", keyboard_mode & 3);
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd_adddata_keyboard(keyboard_mode & 3);
} else {
Temporarily removed scan code set 1 support from the AT keyboard, fixes the keyboard in TSX.
2018-08-20 04:03:48 +02:00
if ((val <= 3) && (val != 1)) {
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
keyboard_mode &= 0xFC;
keyboard_mode |= (val & 3);
Temporarily removed scan code set 1 support from the AT keyboard, fixes the keyboard in TSX.
2018-08-20 04:03:48 +02:00
kbd_log("Scan code set now: %02X\n", val);
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
}
kbd_setmap(kbd);
}
break;
case 0xf3: /*Set typematic rate/delay*/
kbd_adddata_keyboard(0xfa);
break;
default:
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: bad keyboard 0060 write %02X command %02X\n", val, kbd->key_command);
#endif
break;
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
}
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
/* Keyboard command is now done. */
kbd->key_command = 0x00;
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
} else {
Temporarily removed scan code set 1 support from the AT keyboard, fixes the keyboard in TSX.
2018-08-20 04:03:48 +02:00
do_command:
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
/* No keyboard command in progress. */
kbd->key_command = 0x00;
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
kbd_keyboard_set(kbd, 1);
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
switch (val) {
Initial submission of the PCem-Experimental source code.
2016-06-26 00:34:39 +02:00
case 0x00:
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: command 00\n");
#endif
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd_adddata_keyboard(0xfa);
break;
Initial submission of the PCem-Experimental source code.
2016-06-26 00:34:39 +02:00
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
case 0x05: /*??? - sent by NT 4.0*/
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: NT4.0 command FE\n");
#endif
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd_adddata_keyboard(0xfe);
break;
Initial submission of the PCem-Experimental source code.
2016-06-26 00:34:39 +02:00
Added a few keyboard controller commands used by the AMI BIOS'es; The port 92 handler in mem.c now flushes MMU cache when toggling the A20 gate; Added ability to reload previous disc after ejecting it; Fixed the START/STOP UNIT command for both SCSI and ATAPI; Applied mainline PCem commit: All XT models can now use 64kb RAM. Patch from ecksemmess .
2017-01-04 05:58:44 +01:00
case 0x71: /*These two commands are sent by Pentium-era AMI BIOS'es.*/
case 0x82:
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: Pentium-era AMI BIOS command %02X\n", val);
#endif
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
break;
Added a few keyboard controller commands used by the AMI BIOS'es; The port 92 handler in mem.c now flushes MMU cache when toggling the A20 gate; Added ability to reload previous disc after ejecting it; Fixed the START/STOP UNIT command for both SCSI and ATAPI; Applied mainline PCem commit: All XT models can now use 64kb RAM. Patch from ecksemmess .
2017-01-04 05:58:44 +01:00
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
case 0xed: /*Set/reset LEDs*/
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: set/reset leds\n");
#endif
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd_adddata_keyboard(0xfa);
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
kbd->key_wantdata = 1;
kbd->key_command = val;
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
break;
Added a few keyboard controller commands used by the AMI BIOS'es; The port 92 handler in mem.c now flushes MMU cache when toggling the A20 gate; Added ability to reload previous disc after ejecting it; Fixed the START/STOP UNIT command for both SCSI and ATAPI; Applied mainline PCem commit: All XT models can now use 64kb RAM. Patch from ecksemmess .
2017-01-04 05:58:44 +01:00
case 0xee: /*Diagnostic echo*/
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: ECHO\n");
#endif
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd_adddata_keyboard(0xee);
break;
Added a few keyboard controller commands used by the AMI BIOS'es; The port 92 handler in mem.c now flushes MMU cache when toggling the A20 gate; Added ability to reload previous disc after ejecting it; Fixed the START/STOP UNIT command for both SCSI and ATAPI; Applied mainline PCem commit: All XT models can now use 64kb RAM. Patch from ecksemmess .
2017-01-04 05:58:44 +01:00
case 0xef: /*NOP (No OPeration). Reserved for future use.*/
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: NOP\n");
#endif
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
break;
Initial submission of the PCem-Experimental source code.
2016-06-26 00:34:39 +02:00
case 0xf0: /*Get/set scan code set*/
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: scan code set\n");
#endif
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd_adddata_keyboard(0xfa);
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
kbd->key_wantdata = 1;
kbd->key_command = val;
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
break;
case 0xf2: /*Read ID*/
/* Fixed as translation will be done in kbd_adddata_keyboard(). */
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: read keyboard id\n");
#endif
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd_adddata_keyboard(0xfa);
The AT keyboard now returns the correct ID again, fixes some NT 3.5 versions.
2018-09-21 15:01:34 +02:00
kbd_adddata_keyboard(0xab);
kbd_adddata_keyboard(0x83);
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
break;
case 0xf3: /*Set typematic rate/delay*/
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: set typematic rate/delay\n");
#endif
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd_adddata_keyboard(0xfa);
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
kbd->key_wantdata = 1;
kbd->key_command = val;
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
break;
case 0xf4: /*Enable keyboard*/
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: enable keyboard via keyboard\n");
#endif
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd_adddata_keyboard(0xfa);
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
keyboard_scan = 1;
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
break;
case 0xf5: /*Disable keyboard*/
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: disable keyboard via keyboard\n");
#endif
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd_adddata_keyboard(0xfa);
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
keyboard_scan = 0;
Temporarily removed scan code set 1 support from the AT keyboard, fixes the keyboard in TSX.
2018-08-20 04:03:48 +02:00
/* Disabling the keyboard also resets it to the default values, so continue below. */
// break;
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
case 0xf6: /*Set defaults*/
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: set defaults\n");
#endif
kbd_adddata_keyboard(0xfa);
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
keyboard_set3_all_break = 0;
keyboard_set3_all_repeat = 0;
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
memset(keyboard_set3_flags, 0, 512);
Temporarily removed scan code set 1 support from the AT keyboard, fixes the keyboard in TSX.
2018-08-20 04:03:48 +02:00
/* Q */
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
keyboard_mode = (keyboard_mode & 0xFC) | 0x02;
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd_setmap(kbd);
break;
case 0xf7: /*Set all keys to repeat*/
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: set all keys to repeat\n");
#endif
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd_adddata_keyboard(0xfa);
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
keyboard_set3_all_break = 1;
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
break;
case 0xf8: /*Set all keys to give make/break codes*/
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: set all keys to give make/break codes\n");
#endif
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd_adddata_keyboard(0xfa);
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
keyboard_set3_all_break = 1;
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
break;
case 0xf9: /*Set all keys to give make codes only*/
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: set all keys to give make codes only\n");
#endif
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd_adddata_keyboard(0xfa);
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
keyboard_set3_all_break = 0;
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
break;
case 0xfa: /*Set all keys to repeat and give make/break codes*/
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: set all keys to repeat and give make/break codes\n");
#endif
kbd_adddata_keyboard(0xfa);
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
keyboard_set3_all_repeat = 1;
keyboard_set3_all_break = 1;
break;
case 0xfe: /*Resend last scan code*/
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: reset last scan code\n");
#endif
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd_adddata_keyboard(kbd->last_scan_code);
break;
case 0xff: /*Reset*/
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: kbd reset\n");
#endif
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
key_queue_start = key_queue_end = 0; /*Clear key queue*/
kbd_adddata_keyboard(0xfa);
kbd_adddata_keyboard(0xaa);
Temporarily removed scan code set 1 support from the AT keyboard, fixes the keyboard in TSX.
2018-08-20 04:03:48 +02:00
/* Set scan code set to 2. */
/* Q */
keyboard_mode = (keyboard_mode & 0xFC) | 0x02;
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd_setmap(kbd);
break;
Initial submission of the PCem-Experimental source code.
2016-06-26 00:34:39 +02:00
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
default:
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: bad keyboard command %02X\n", val);
#endif
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd_adddata_keyboard(0xfe);
}
Added a few keyboard controller commands used by the AMI BIOS'es; The port 92 handler in mem.c now flushes MMU cache when toggling the A20 gate; Added ability to reload previous disc after ejecting it; Fixed the START/STOP UNIT command for both SCSI and ATAPI; Applied mainline PCem commit: All XT models can now use 64kb RAM. Patch from ecksemmess .
2017-01-04 05:58:44 +01:00
}
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
}
break;
case 0x61:
ppi.pb = val;
timer_process();
timer_update_outstanding();
speaker_update();
speaker_gated = val & 1;
speaker_enable = val & 2;
if (speaker_enable)
was_speaker_enable = 1;
pit_set_gate(&pit, 2, val & 1);
Added the Xi8088.
2018-03-02 20:47:18 +01:00
Removed ROM set checking from several files.
2018-09-15 16:15:39 +02:00
if ((kbd->flags & KBC_VEN_MASK) == KBC_VEN_XI8088) {
Added the Xi8088.
2018-03-02 20:47:18 +01:00
if (val & 0x04)
xi8088_turbo_set(1);
else
xi8088_turbo_set(0);
}
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
break;
case 0x64:
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
/*
* Try to recover from bad commands.
*
* If we get a command here, but seem to be still in
* keyboard-command data mode, abort that...
*/
if (kbd->key_wantdata || kbd->key_command) {
kbd_log("ATkbd: *** BUG ALERT *** aborting previous keyboard command 0x%02X (data %d)\n", kbd->key_command, kbd->key_wantdata);
/* If they were waiting for data.. */
kbd_adddata(0xfa);
/* Abort the previous command. */
kbd->key_command = 0x00;
kbd->key_wantdata = 0;
}
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd->want60 = 0;
kbd->command = val;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
/*New controller command*/
switch (val) {
case 0x20: case 0x21: case 0x22: case 0x23:
case 0x24: case 0x25: case 0x26: case 0x27:
case 0x28: case 0x29: case 0x2a: case 0x2b:
case 0x2c: case 0x2d: case 0x2e: case 0x2f:
case 0x30: case 0x31: case 0x32: case 0x33:
case 0x34: case 0x35: case 0x36: case 0x37:
case 0x38: case 0x39: case 0x3a: case 0x3b:
case 0x3c: case 0x3d: case 0x3e: case 0x3f:
kbd_adddata(kbd->mem[val & 0x1f]);
break;
case 0x60: case 0x61: case 0x62: case 0x63:
case 0x64: case 0x65: case 0x66: case 0x67:
case 0x68: case 0x69: case 0x6a: case 0x6b:
case 0x6c: case 0x6d: case 0x6e: case 0x6f:
case 0x70: case 0x71: case 0x72: case 0x73:
case 0x74: case 0x75: case 0x76: case 0x77:
case 0x78: case 0x79: case 0x7a: case 0x7b:
case 0x7c: case 0x7d: case 0x7e: case 0x7f:
kbd->want60 = 1;
break;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xaa: /*Self-test*/
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: self-test\n");
#endif
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
if ((kbd->flags & KBC_VEN_MASK) == KBC_VEN_TOSHIBA)
Renamed the Paradise WD90C11 Standalone to Paradise WD90C11-LR and made it use the correct BIOS; Added the Paradise PVGA1A (standalone) and the Paradise WD90C30-LR, both with configurable video memory; Added the Toshiba T3100e.
2017-12-31 06:37:19 +01:00
kbd->status |= STAT_IFULL;
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
if (! kbd->initialized) {
kbd->initialized = 1;
key_ctrl_queue_start = key_ctrl_queue_end = 0;
kbd->status &= ~STAT_OFULL;
}
kbd->status |= STAT_SYSFLAG;
kbd->mem[0] |= 0x04;
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
kbd_keyboard_set(kbd, 1);
if ((kbd->flags & KBC_TYPE_MASK) >= KBC_TYPE_PS2_1)
kbd_mouse_set(kbd, 1);
kbd_output_write(kbd, 0xcf);
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd_adddata(0x55);
break;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xab: /*Interface test*/
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: interface test\n");
#endif
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd_adddata(0x00); /*no error*/
break;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xac: /*Diagnostic dump*/
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: diagnostic dump\n");
#endif
for (i = 0; i < 16; i++)
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd_adddata(kbd->mem[i]);
kbd_adddata((kbd->input_port & 0xf0) | 0x80);
kbd_adddata(kbd->output_port);
kbd_adddata(kbd->status);
break;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xad: /*Disable keyboard*/
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: disable keyboard\n");
#endif
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
kbd_keyboard_set(kbd, 0);
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
break;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xae: /*Enable keyboard*/
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: enable keyboard\n");
#endif
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
kbd_keyboard_set(kbd, 1);
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
break;
Added a few keyboard controller commands used by the AMI BIOS'es; The port 92 handler in mem.c now flushes MMU cache when toggling the A20 gate; Added ability to reload previous disc after ejecting it; Fixed the START/STOP UNIT command for both SCSI and ATAPI; Applied mainline PCem commit: All XT models can now use 64kb RAM. Patch from ecksemmess .
2017-01-04 05:58:44 +01:00
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xd0: /*Read output port*/
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: read output port\n");
#endif
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
mask = 0xff;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
if (! keyboard_scan)
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
mask &= 0xbf;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
if (!mouse_scan && ((kbd->flags & KBC_TYPE_MASK) >= KBC_TYPE_PS2_1))
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
mask &= 0xf7;
kbd_adddata(kbd->output_port & mask);
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
break;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xd1: /*Write output port*/
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: write output port\n");
#endif
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd->want60 = 1;
break;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xd2: /*Write keyboard output buffer*/
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: write keyboard output buffer\n");
#endif
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd->want60 = 1;
break;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xdd: /* Disable A20 Address Line */
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: disable A20\n");
#endif
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
kbd_output_write(kbd, kbd->output_port & 0xfd);
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
break;
Commented out excess FPU logging; SCSI controller is now reset on x86 soft reset, fixes DOS driver hangs after soft reset; SCSI controller reset control is now implemented more accurately, on a 50 ms timer; For the PS/1 Model 2011, the Keyboard Input Port bit 6 now correctly reports if the currently selected (in FDC DOR) floppy drive is 3.5" or 5.25"; Commented out excess DMA logging; Added support for FDF floppy images; Fixed handling of CDB allocated length field for the CD-ROM INQUIRY command; (S)VGA port 03C1 write is back again (it was incorrectly gone in some builds); Commented out Compaq/Paradise VGA; PS/1 Model 2121+ISA now correctly allows selecting graphics card.
2017-03-05 19:42:56 +01:00
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xdf: /* Enable A20 Address Line */
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: enable A20\n");
#endif
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
kbd_output_write(kbd, kbd->output_port | 0x02);
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
break;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
case 0xe0: /*Read test inputs*/
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: read test inputs\n");
#endif
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd_adddata(0x00);
break;
default:
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
/* Run the vendor-specific command handler, if present,
otherwise (or if the former returns 1), assume bad command. */
if (kbd->write64_ven)
bad = kbd->write64_ven(kbd, val);
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
if (bad)
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
kbd_log("ATkbd: bad controller command %02X\n", val);
#endif
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
}
break;
}
}
static uint8_t
kbd_read(uint16_t port, void *priv)
{
atkbd_t *kbd = (atkbd_t *)priv;
uint8_t ret = 0xff;
Removed ROM set checking from several files.
2018-09-15 16:15:39 +02:00
if (((kbd->flags & KBC_VEN_MASK) == KBC_VEN_XI8088) && (port == 0x63))
Added the Xi8088.
2018-03-02 20:47:18 +01:00
port = 0x61;
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
switch (port) {
case 0x60:
ret = kbd->out;
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
kbd->status &= ~(STAT_OFULL);
Fixed a few bugs in the PS/2 mouse emulation, fixes PS/2 mouse in 3-button and Wheel modes on Windows 95; The AT keyboard controller no longer does picintc(kbd->last_irq) when kbd->last_irq is 0.
2018-09-13 02:16:01 +02:00
if (kbd->last_irq)
picintc(kbd->last_irq);
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd->last_irq = 0;
break;
case 0x61:
ret = ppi.pb & ~0xe0;
if (ppispeakon)
ret |= 0x20;
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
if ((kbd->flags & KBC_TYPE_MASK) != KBC_TYPE_ISA) {
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
if (kbd->refresh)
ret |= 0x10;
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
else
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
ret &= ~0x10;
}
Removed ROM set checking from several files.
2018-09-15 16:15:39 +02:00
if ((kbd->flags & KBC_VEN_MASK) == KBC_VEN_XI8088) {
Added the Xi8088.
2018-03-02 20:47:18 +01:00
if (xi8088_turbo_get())
ret |= 0x04;
else
ret &= ~0x04;
}
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
break;
case 0x64:
ret = (kbd->status & 0xFB) | (keyboard_mode & CCB_SYSTEM);
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#if 0
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
ret |= STAT_LOCK;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#endif
The FDC is now a device_t, and the FDC code has been cleaned up; Merged floppy.c and fdd.c and renamed floppy_*.c (the floppy image format handlers) to fdd_*.c; Reading the AT or PS/2 keyboard controller status no longer clears the transmit timeout bit, fixes error 8601 (mouse error) on the IBM PS/2 Model 80; MMU translate and DMA physical reads and writes now go through _mem_exec instead of directly to ram[], should fix the last remaining problems with remapped mappings; Implemented the Sound gain dialog; Added the resource for the "New floppy image" dialog and the needed functions for the functionality of exporting the currently mounted floppy image as 86F, both of which should be finished in the next commit; Applied the CD-ROM fixes from the PCem commit; Added the "Keep ratio" option for full screen stretch.
2018-01-17 18:43:36 +01:00
/* The transmit timeout (TTIMEOUT) flag should *NOT* be cleared, otherwise
the IBM PS/2 Model 80's BIOS gives error 8601 (mouse error). */
kbd->status &= ~(STAT_RTIMEOUT/* | STAT_TTIMEOUT*/);
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
break;
}
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef _DEBUG
kbd_log("ATkbd: read(%04X) = %02X\n", port, ret);
#endif
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
return(ret);
Initial submission of the PCem-Experimental source code.
2016-06-26 00:34:39 +02:00
}
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
static void
kbd_refresh(void *priv)
Various improvements to PCI and PCI boards.
2017-09-04 05:15:12 +02:00
{
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
atkbd_t *kbd = (atkbd_t *)priv;
kbd->refresh = !kbd->refresh;
kbd->refresh_time += PS2_REFRESH_TIME;
Fixed PS/2 mouse to PCI (PIIX) wiring, fixes recently introduced PS/2 mouse hangs; The AT keyboard "write to mouse" command now returns 0xFF (error) when no PS/2 mouse is attached - fixes hangs on AOpen AP53, ASUS P/I-P55T2S, and Tyan Titan Pro/ATX when not using PS/2 mouse; Fixed the emulation of the SMC FDC37C669 Super I/O chip - serial ports now work correctly on the AOpen AP53 and the ASUS P/I-P55T2S.
2017-09-07 01:52:36 +02:00
}
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
static void
kbd_reset(void *priv)
Fixed PS/2 mouse to PCI (PIIX) wiring, fixes recently introduced PS/2 mouse hangs; The AT keyboard "write to mouse" command now returns 0xFF (error) when no PS/2 mouse is attached - fixes hangs on AOpen AP53, ASUS P/I-P55T2S, and Tyan Titan Pro/ATX when not using PS/2 mouse; Fixed the emulation of the SMC FDC37C669 Super I/O chip - serial ports now work correctly on the AOpen AP53 and the ASUS P/I-P55T2S.
2017-09-07 01:52:36 +02:00
{
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
atkbd_t *kbd = (atkbd_t *)priv;
kbd->initialized = 0;
kbd->dtrans = 0;
kbd->first_write = 1;
kbd->status = STAT_LOCK | STAT_CD;
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
kbd->mem[0] = 0x01;
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd->wantirq = 0;
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
kbd_output_write(kbd, 0xcf);
Ported the relevant PCem commits to 86box.
2018-02-24 17:25:50 +01:00
kbd->input_port = (video_is_mda()) ? 0xf0 : 0xb0;
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd->out_new = -1;
kbd->last_irq = 0;
kbd->secr_phase = 0;
kbd->key_wantdata = 0;
Temporarily removed scan code set 1 support from the AT keyboard, fixes the keyboard in TSX.
2018-08-20 04:03:48 +02:00
/* Q */
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
keyboard_mode = 0x02 | kbd->dtrans;
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
kbd_keyboard_set(kbd, 1);
kbd_mouse_set(kbd, 0);
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
sc_or = 0;
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
keyboard_update_states(0, 0, 0);
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
Improved passing of scan codes to the emulated keyboards; Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0); Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse; Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select; Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves; The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again; Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME; Finally properly fixed the regular CD Audio MSF/LBA conversion mess; Applied all applicable PCem commits.
2018-01-13 22:56:13 +01:00
memset(keyboard_set3_flags, 0, 512);
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd_setmap(kbd);
}
Fixed PS/2 mouse to PCI (PIIX) wiring, fixes recently introduced PS/2 mouse hangs; The AT keyboard "write to mouse" command now returns 0xFF (error) when no PS/2 mouse is attached - fixes hangs on AOpen AP53, ASUS P/I-P55T2S, and Tyan Titan Pro/ATX when not using PS/2 mouse; Fixed the emulation of the SMC FDC37C669 Super I/O chip - serial ports now work correctly on the AOpen AP53 and the ASUS P/I-P55T2S.
2017-09-07 01:52:36 +02:00
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
static void *
Applied a whole slew of patches, getting RAM usage down by a further 10 MB.
2018-03-19 01:02:04 +01:00
kbd_init(const device_t *info)
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
{
atkbd_t *kbd;
kbd = (atkbd_t *)malloc(sizeof(atkbd_t));
memset(kbd, 0x00, sizeof(atkbd_t));
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
kbd->flags = info->local;
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd_reset(kbd);
io_sethandler(0x0060, 5,
kbd_read, NULL, NULL, kbd_write, NULL, NULL, kbd);
keyboard_send = kbd_adddata_keyboard;
Fixed PS/2 mouse to PCI (PIIX) wiring, fixes recently introduced PS/2 mouse hangs; The AT keyboard "write to mouse" command now returns 0xFF (error) when no PS/2 mouse is attached - fixes hangs on AOpen AP53, ASUS P/I-P55T2S, and Tyan Titan Pro/ATX when not using PS/2 mouse; Fixed the emulation of the SMC FDC37C669 Super I/O chip - serial ports now work correctly on the AOpen AP53 and the ASUS P/I-P55T2S.
2017-09-07 01:52:36 +02:00
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
timer_add(kbd_poll, &keyboard_delay, TIMER_ALWAYS_ENABLED, kbd);
Fixed PS/2 mouse to PCI (PIIX) wiring, fixes recently introduced PS/2 mouse hangs; The AT keyboard "write to mouse" command now returns 0xFF (error) when no PS/2 mouse is attached - fixes hangs on AOpen AP53, ASUS P/I-P55T2S, and Tyan Titan Pro/ATX when not using PS/2 mouse; Fixed the emulation of the SMC FDC37C669 Super I/O chip - serial ports now work correctly on the AOpen AP53 and the ASUS P/I-P55T2S.
2017-09-07 01:52:36 +02:00
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
if ((kbd->flags & KBC_TYPE_MASK) != KBC_TYPE_ISA) {
Temporarily removed scan code set 1 support from the AT keyboard, fixes the keyboard in TSX.
2018-08-20 04:03:48 +02:00
#if 0
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
if ((kbd->flags & KBC_TYPE_MASK) == KBC_TYPE_PS2_2) {
/*
* These machines force translation off, so the
Temporarily removed scan code set 1 support from the AT keyboard, fixes the keyboard in TSX.
2018-08-20 04:03:48 +02:00
* the keyboard must start in scan code set 1.
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
*/
keyboard_mode &= ~0x03;
Temporarily removed scan code set 1 support from the AT keyboard, fixes the keyboard in TSX.
2018-08-20 04:03:48 +02:00
keyboard_mode |= 0x01;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
}
Temporarily removed scan code set 1 support from the AT keyboard, fixes the keyboard in TSX.
2018-08-20 04:03:48 +02:00
#endif
Fixed some things regarding the PS/2 Model 70 Type 3 and 4 (but the 12903 error remains, and is also present on PCem, so waiting for an upstream fix), and slightly debloated the PS/2 MCA code.
2018-03-22 19:05:51 +01:00
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
timer_add(kbd_refresh,
&kbd->refresh_time, TIMER_ALWAYS_ENABLED, kbd);
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
}
timer_add(kbd_pulse_poll,
&kbd->pulse_cb, &kbd->pulse_cb, kbd);
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
kbd->write60_ven = NULL;
kbd->write64_ven = NULL;
switch(kbd->flags & KBC_VEN_MASK) {
case KBC_VEN_GENERIC:
kbd->write64_ven = &kbd_write64_generic;
break;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
case KBC_VEN_AMI:
kbd->write60_ven = &kbd_write60_ami;
kbd->write64_ven = &kbd_write64_ami;
break;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
case KBC_VEN_IBM_MCA:
kbd->write64_ven = &kbd_write64_ibm_mca;
break;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
case KBC_VEN_QUADTEL:
kbd->write60_ven = &kbd_write60_quadtel;
kbd->write64_ven = &kbd_write64_quadtel;
break;
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
case KBC_VEN_TOSHIBA:
kbd->write60_ven = &kbd_write60_toshiba;
kbd->write64_ven = &kbd_write64_toshiba;
break;
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
}
/* We need this, sadly. */
CurrentKbd = kbd;
return(kbd);
Various improvements to PCI and PCI boards.
2017-09-04 05:15:12 +02:00
}
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
static void
kbd_close(void *priv)
Initial submission of the PCem-Experimental source code.
2016-06-26 00:34:39 +02:00
{
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
atkbd_t *kbd = (atkbd_t *)priv;
Fixes for PS/2 mouse crash (since AT keyboard rework) from TheCollector1995.
2017-11-09 22:05:29 -05:00
kbd_reset(kbd);
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
/* Stop timers. */
keyboard_delay = 0;
kbd->refresh_time = 0;
keyboard_scan = 0;
keyboard_send = NULL;
/* Disable the scancode maps. */
keyboard_set_table(NULL);
CurrentKbd = NULL;
free(kbd);
Initial submission of the PCem-Experimental source code.
2016-06-26 00:34:39 +02:00
}
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
Applied a whole slew of patches, getting RAM usage down by a further 10 MB.
2018-03-19 01:02:04 +01:00
const device_t keyboard_at_device = {
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
"PC/AT Keyboard",
0,
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
KBC_TYPE_ISA | KBC_VEN_GENERIC,
kbd_init,
kbd_close,
kbd_reset,
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
NULL, NULL, NULL, NULL
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
};
Applied a whole slew of patches, getting RAM usage down by a further 10 MB.
2018-03-19 01:02:04 +01:00
const device_t keyboard_at_ami_device = {
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
"PC/AT Keyboard (AMI)",
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
0,
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
KBC_TYPE_ISA | KBC_VEN_AMI,
kbd_init,
kbd_close,
kbd_reset,
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
NULL, NULL, NULL, NULL
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
};
Applied a whole slew of patches, getting RAM usage down by a further 10 MB.
2018-03-19 01:02:04 +01:00
const device_t keyboard_at_toshiba_device = {
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
"PC/AT Keyboard (Toshiba)",
0,
KBC_TYPE_ISA | KBC_VEN_TOSHIBA,
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd_init,
kbd_close,
kbd_reset,
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
NULL, NULL, NULL, NULL
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
};
Applied a whole slew of patches, getting RAM usage down by a further 10 MB.
2018-03-19 01:02:04 +01:00
const device_t keyboard_ps2_device = {
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
"PS/2 Keyboard",
0,
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
KBC_TYPE_PS2_1 | KBC_VEN_GENERIC,
kbd_init,
kbd_close,
kbd_reset,
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
NULL, NULL, NULL, NULL
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
};
Removed ROM set checking from several files.
2018-09-15 16:15:39 +02:00
const device_t keyboard_ps2_xi8088_device = {
"PS/2 Keyboard (Xi8088)",
0,
KBC_TYPE_PS2_1 | KBC_VEN_XI8088,
kbd_init,
kbd_close,
kbd_reset,
NULL, NULL, NULL, NULL
};
Applied a whole slew of patches, getting RAM usage down by a further 10 MB.
2018-03-19 01:02:04 +01:00
const device_t keyboard_ps2_ami_device = {
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
"PS/2 Keyboard (AMI)",
0,
KBC_TYPE_PS2_1 | KBC_VEN_AMI,
kbd_init,
kbd_close,
kbd_reset,
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
NULL, NULL, NULL, NULL
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
};
Applied a whole slew of patches, getting RAM usage down by a further 10 MB.
2018-03-19 01:02:04 +01:00
const device_t keyboard_ps2_mca_device = {
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
"PS/2 Keyboard",
0,
KBC_TYPE_PS2_1 | KBC_VEN_IBM_MCA,
The Quadtel variant of the 8042 (used by the Amstrad MegaPC) is now correctly PS/2 type.
2018-01-04 07:56:37 +01:00
kbd_init,
kbd_close,
kbd_reset,
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
NULL, NULL, NULL, NULL
The Quadtel variant of the 8042 (used by the Amstrad MegaPC) is now correctly PS/2 type.
2018-01-04 07:56:37 +01:00
};
Fixed some things regarding the PS/2 Model 70 Type 3 and 4 (but the 12903 error remains, and is also present on PCem, so waiting for an upstream fix), and slightly debloated the PS/2 MCA code.
2018-03-22 19:05:51 +01:00
const device_t keyboard_ps2_mca_2_device = {
"PS/2 Keyboard",
0,
KBC_TYPE_PS2_2 | KBC_VEN_IBM_MCA,
kbd_init,
kbd_close,
kbd_reset,
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
NULL, NULL, NULL, NULL
Fixed some things regarding the PS/2 Model 70 Type 3 and 4 (but the 12903 error remains, and is also present on PCem, so waiting for an upstream fix), and slightly debloated the PS/2 MCA code.
2018-03-22 19:05:51 +01:00
};
Applied a whole slew of patches, getting RAM usage down by a further 10 MB.
2018-03-19 01:02:04 +01:00
const device_t keyboard_ps2_quadtel_device = {
The Quadtel variant of the 8042 (used by the Amstrad MegaPC) is now correctly PS/2 type.
2018-01-04 07:56:37 +01:00
"PS/2 Keyboard (Quadtel/MegaPC)",
0,
KBC_TYPE_PS2_1 | KBC_VEN_QUADTEL,
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
kbd_init,
kbd_close,
kbd_reset,
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
NULL, NULL, NULL, NULL
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
};
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
Applied all relevant PCem commits; Extensively cleaned up and changed the CD-ROM code; Removed CD-ROM IOCTTL (it was causing performance and stability issues); Turned a lot of things into device_t's; Added the PS/1 Model 2011 XTA and standalone XTA hard disk controllers, ported from Varcem; Numerous FDC fixes for the PS/1 Model 2121; NVR changes ported from Varcem; The PCap code no longer requires libpcap to be compiled; Numerous fixes to various SCSI controllers; Updated NukedOPL to 1.8; Fixes to OpenAL initialization and closing, should give less Audio issues now; Revorked parts of the common (S)VGA code (also based on code from QEMU); Removed the Removable SCSI hard disks (they were a never finished experiment so there was no need to keep them there); Cleaned up the SCSI hard disk and Iomega ZIP code (but more cleanups of that are coming in the future); In some occasions (IDE hard disks in multiple sector mode and SCSI hard disks) the status bar icon is no longer updated, should improve performance a bit; Redid the way the tertiary and quaternary IDE controllers are configured (and they are now device_t's); Extensively reworked the IDE code and fixed quite a few bugs; Fixes to XT MFM, AT MFM, and AT ESDI code; Some changes to XTIDE and MCA ESDI code; Some fixes to the CD-ROM image handler.
2018-04-25 23:51:13 +02:00
const device_t keyboard_ps2_pci_device = {
"PS/2 Keyboard",
DEVICE_PCI,
KBC_TYPE_PS2_1 | KBC_VEN_GENERIC,
kbd_init,
kbd_close,
kbd_reset,
Removed win_status.c and the related stuff as it was not updated for a while and no longer displayed useful information.
2018-04-26 13:33:29 +02:00
NULL, NULL, NULL
Applied all relevant PCem commits; Extensively cleaned up and changed the CD-ROM code; Removed CD-ROM IOCTTL (it was causing performance and stability issues); Turned a lot of things into device_t's; Added the PS/1 Model 2011 XTA and standalone XTA hard disk controllers, ported from Varcem; Numerous FDC fixes for the PS/1 Model 2121; NVR changes ported from Varcem; The PCap code no longer requires libpcap to be compiled; Numerous fixes to various SCSI controllers; Updated NukedOPL to 1.8; Fixes to OpenAL initialization and closing, should give less Audio issues now; Revorked parts of the common (S)VGA code (also based on code from QEMU); Removed the Removable SCSI hard disks (they were a never finished experiment so there was no need to keep them there); Cleaned up the SCSI hard disk and Iomega ZIP code (but more cleanups of that are coming in the future); In some occasions (IDE hard disks in multiple sector mode and SCSI hard disks) the status bar icon is no longer updated, should improve performance a bit; Redid the way the tertiary and quaternary IDE controllers are configured (and they are now device_t's); Extensively reworked the IDE code and fixed quite a few bugs; Fixes to XT MFM, AT MFM, and AT ESDI code; Some changes to XTIDE and MCA ESDI code; Some fixes to the CD-ROM image handler.
2018-04-25 23:51:13 +02:00
};
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
Applied all relevant PCem commits; Extensively cleaned up and changed the CD-ROM code; Removed CD-ROM IOCTTL (it was causing performance and stability issues); Turned a lot of things into device_t's; Added the PS/1 Model 2011 XTA and standalone XTA hard disk controllers, ported from Varcem; Numerous FDC fixes for the PS/1 Model 2121; NVR changes ported from Varcem; The PCap code no longer requires libpcap to be compiled; Numerous fixes to various SCSI controllers; Updated NukedOPL to 1.8; Fixes to OpenAL initialization and closing, should give less Audio issues now; Revorked parts of the common (S)VGA code (also based on code from QEMU); Removed the Removable SCSI hard disks (they were a never finished experiment so there was no need to keep them there); Cleaned up the SCSI hard disk and Iomega ZIP code (but more cleanups of that are coming in the future); In some occasions (IDE hard disks in multiple sector mode and SCSI hard disks) the status bar icon is no longer updated, should improve performance a bit; Redid the way the tertiary and quaternary IDE controllers are configured (and they are now device_t's); Extensively reworked the IDE code and fixed quite a few bugs; Fixes to XT MFM, AT MFM, and AT ESDI code; Some changes to XTIDE and MCA ESDI code; Some fixes to the CD-ROM image handler.
2018-04-25 23:51:13 +02:00
const device_t keyboard_ps2_ami_pci_device = {
"PS/2 Keyboard (AMI)",
DEVICE_PCI,
KBC_TYPE_PS2_1 | KBC_VEN_AMI,
kbd_init,
kbd_close,
kbd_reset,
Removed win_status.c and the related stuff as it was not updated for a while and no longer displayed useful information.
2018-04-26 13:33:29 +02:00
NULL, NULL, NULL
Applied all relevant PCem commits; Extensively cleaned up and changed the CD-ROM code; Removed CD-ROM IOCTTL (it was causing performance and stability issues); Turned a lot of things into device_t's; Added the PS/1 Model 2011 XTA and standalone XTA hard disk controllers, ported from Varcem; Numerous FDC fixes for the PS/1 Model 2121; NVR changes ported from Varcem; The PCap code no longer requires libpcap to be compiled; Numerous fixes to various SCSI controllers; Updated NukedOPL to 1.8; Fixes to OpenAL initialization and closing, should give less Audio issues now; Revorked parts of the common (S)VGA code (also based on code from QEMU); Removed the Removable SCSI hard disks (they were a never finished experiment so there was no need to keep them there); Cleaned up the SCSI hard disk and Iomega ZIP code (but more cleanups of that are coming in the future); In some occasions (IDE hard disks in multiple sector mode and SCSI hard disks) the status bar icon is no longer updated, should improve performance a bit; Redid the way the tertiary and quaternary IDE controllers are configured (and they are now device_t's); Extensively reworked the IDE code and fixed quite a few bugs; Fixes to XT MFM, AT MFM, and AT ESDI code; Some changes to XTIDE and MCA ESDI code; Some fixes to the CD-ROM image handler.
2018-04-25 23:51:13 +02:00
};
Fixed PS/2 mouse to PCI (PIIX) wiring, fixes recently introduced PS/2 mouse hangs; The AT keyboard "write to mouse" command now returns 0xFF (error) when no PS/2 mouse is attached - fixes hangs on AOpen AP53, ASUS P/I-P55T2S, and Tyan Titan Pro/ATX when not using PS/2 mouse; Fixed the emulation of the SMC FDC37C669 Super I/O chip - serial ports now work correctly on the AOpen AP53 and the ASUS P/I-P55T2S.
2017-09-07 01:52:36 +02:00
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
void
keyboard_at_reset(void)
{
atkbd_t *kbd = CurrentKbd;
if (kbd != NULL)
kbd_reset(kbd);
}
Initial submission of the PCem-Experimental source code.
2016-06-26 00:34:39 +02:00
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
void
Fixes for PS/2 mouse crash (since AT keyboard rework) from TheCollector1995.
2017-11-09 22:05:29 -05:00
keyboard_at_set_mouse(void (*func)(uint8_t val, void *priv), void *priv)
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
{
Fixes for PS/2 mouse crash (since AT keyboard rework) from TheCollector1995.
2017-11-09 22:05:29 -05:00
mouse_write = func;
mouse_p = priv;
Initial submission of the PCem-Experimental source code.
2016-06-26 00:34:39 +02:00
}
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
void
keyboard_at_adddata_keyboard_raw(uint8_t val)
Vastly overhauled the UI, there's now a completely new Settings dialog as well as a status bar with disk activity icons and removable drive menus; Thoroughly clean up the code to vastly reduce the number of compiler warnings and found and fixed several bugs in the process; Applied all mainline PCem commits; Added SCSI hard disk emulation; Commented out all unfinished machines and graphics cards; Added the AOpen AP53 and ASUS P/I-P55T2 machines as well as another Tyan 440FX machine, all three with AMI WinBIOS (patch from TheCollector1995); Added the Diamond Stealth 3D 3000 (S3 ViRGE/VX) graphics card (patch from TheCollector1995); Added the PS/2 XT IDE (AccuLogic) HDD Controller (patch from TheCollector1995); Added Microsoft/Logitech Bus Mouse emulation (patch from waltje); Overhauled the makefiles (patch from waltje); Added the Adaptec AHA-1542CF SCSI controller (patch from waltje); Added preliminary (but still unfinished) Adaptec AHA-154x SCSI controller BIOS support (patch from waltje); Added an ISABugger debugging device (patch from waltje); Added sanity checks to the Direct3D code.
2017-05-05 01:49:42 +02:00
{
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
key_queue[key_queue_end] = val;
key_queue_end = (key_queue_end + 1) & 0xf;
Vastly overhauled the UI, there's now a completely new Settings dialog as well as a status bar with disk activity icons and removable drive menus; Thoroughly clean up the code to vastly reduce the number of compiler warnings and found and fixed several bugs in the process; Applied all mainline PCem commits; Added SCSI hard disk emulation; Commented out all unfinished machines and graphics cards; Added the AOpen AP53 and ASUS P/I-P55T2 machines as well as another Tyan 440FX machine, all three with AMI WinBIOS (patch from TheCollector1995); Added the Diamond Stealth 3D 3000 (S3 ViRGE/VX) graphics card (patch from TheCollector1995); Added the PS/2 XT IDE (AccuLogic) HDD Controller (patch from TheCollector1995); Added Microsoft/Logitech Bus Mouse emulation (patch from waltje); Overhauled the makefiles (patch from waltje); Added the Adaptec AHA-1542CF SCSI controller (patch from waltje); Added preliminary (but still unfinished) Adaptec AHA-154x SCSI controller BIOS support (patch from waltje); Added an ISABugger debugging device (patch from waltje); Added sanity checks to the Direct3D code.
2017-05-05 01:49:42 +02:00
}
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
void
keyboard_at_adddata_mouse(uint8_t val)
Initial submission of the PCem-Experimental source code.
2016-06-26 00:34:39 +02:00
{
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
mouse_queue[mouse_queue_end] = val;
mouse_queue_end = (mouse_queue_end + 1) & 0xf;
Initial submission of the PCem-Experimental source code.
2016-06-26 00:34:39 +02:00
}
Applied all mainline PCem commits; Added experimental NVidia Riva TNT2 emulation (patch from MoochMcGee); ASUS P/I-P54TP4XE, ASUS P/I-P55T2P4, and ASUS P/I-P55TVP4 are back; National Semiconductor PC87306 Super I/O chip now correctly reenables devices after a chip power cycle; Several FDC improvements and the behavior is now a bit closer to real hardware (based on actual tests); Added MR Intel Advanced/ATX with Microid Research BIOS with support for 4 floppy drives and up to 4 IDE controllers; Added floppy drives 3 and 4, bringing the maximum to 4; You can now connect hard disks to the tertiary IDE controller; Correct undocumented behavior of the LEA instruction with register is back on 286 and later CPU's; Pentium-rea models with Intel chipsets now have port 92 (with alternate reset and alternate A20 toggle); Overhauled DMA channel read and write routines and fixed cascading; Improved IMG detection of a bad BPB (or complete lack of a BPB); Added preliminary emulation of PS/2 1.44 MB and PC-98 1.25 MB 3-mode drives (both have an inverted DENSEL pin); Removed the incorrect Amstrad mouse patch from TheCollector1995; Fixed ATAPI CD-ROM disk change detection; Windows IOCTL CD-ROM handler now tries to use direct SCSI passthrough for more things, including obtaining CD-ROM capacity; The Diamond Stealth32 (ET4000/W32p) now also works correctly on the two Award SiS 496/497 boxes; The (S)VGA handler now converts 6-bit RAMDAC RGB channels to standard 8-bit RGB using a lookup table generated at emulator start, calculated using the correct intensity conversion method and treating intensity 64 as equivalent to 63; Moved a few options from the Configuration dialog box to the menu; SIO, PIIX, and PIIX3 now have the reset control register on port CF9 as they should; Several bugfixes.
2016-12-23 03:16:24 +01:00
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
void
keyboard_at_set_mouse_scan(uint8_t val)
Applied all mainline PCem commits; Added experimental NVidia Riva TNT2 emulation (patch from MoochMcGee); ASUS P/I-P54TP4XE, ASUS P/I-P55T2P4, and ASUS P/I-P55TVP4 are back; National Semiconductor PC87306 Super I/O chip now correctly reenables devices after a chip power cycle; Several FDC improvements and the behavior is now a bit closer to real hardware (based on actual tests); Added MR Intel Advanced/ATX with Microid Research BIOS with support for 4 floppy drives and up to 4 IDE controllers; Added floppy drives 3 and 4, bringing the maximum to 4; You can now connect hard disks to the tertiary IDE controller; Correct undocumented behavior of the LEA instruction with register is back on 286 and later CPU's; Pentium-rea models with Intel chipsets now have port 92 (with alternate reset and alternate A20 toggle); Overhauled DMA channel read and write routines and fixed cascading; Improved IMG detection of a bad BPB (or complete lack of a BPB); Added preliminary emulation of PS/2 1.44 MB and PC-98 1.25 MB 3-mode drives (both have an inverted DENSEL pin); Removed the incorrect Amstrad mouse patch from TheCollector1995; Fixed ATAPI CD-ROM disk change detection; Windows IOCTL CD-ROM handler now tries to use direct SCSI passthrough for more things, including obtaining CD-ROM capacity; The Diamond Stealth32 (ET4000/W32p) now also works correctly on the two Award SiS 496/497 boxes; The (S)VGA handler now converts 6-bit RAMDAC RGB channels to standard 8-bit RGB using a lookup table generated at emulator start, calculated using the correct intensity conversion method and treating intensity 64 as equivalent to 63; Moved a few options from the Configuration dialog box to the menu; SIO, PIIX, and PIIX3 now have the reset control register on port CF9 as they should; Several bugfixes.
2016-12-23 03:16:24 +01:00
{
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
atkbd_t *kbd = CurrentKbd;
uint8_t temp_mouse_scan = val ? 1 : 0;
if (temp_mouse_scan == mouse_scan) return;
Fixed keyboard/mouse disable handling, fixes moving the PS/2 mouse in the P55T2S BIOS' CMOS Setup; The "Write data to mouse" command no longer times out when there is PS/2 mouse, and instead adds the 0xFF byte to the queue, properly fixes the hang when entering into the P55T2S BIOS' CMOS Setup with mouse set to anything other than PS/2; Removed the incorrect implementation of the OPTi 495 register 0x27 bit 7, it had nothing to do with A20, and the A20 stuck error was caused by the previously incorrect implementation of the 8042 output port bit pulse commands which is no longer the case; The 8042 now once again correctly initializes with A20 Gate on.
2018-01-08 05:46:52 +01:00
kbd_mouse_set(kbd, val ? 1 : 0);
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
Ported over the AT keyboard fixes from VARCem and reverted a fix of my own, fixes mouse in some cases.
2018-08-13 21:55:11 +02:00
#ifdef ENABLE_KEYBOARD_LOG
kbd_log("ATkbd: mouse scan %sabled via PCI\n", mouse_scan ? "en" : "dis");
#endif
Applied all mainline PCem commits; Added experimental NVidia Riva TNT2 emulation (patch from MoochMcGee); ASUS P/I-P54TP4XE, ASUS P/I-P55T2P4, and ASUS P/I-P55TVP4 are back; National Semiconductor PC87306 Super I/O chip now correctly reenables devices after a chip power cycle; Several FDC improvements and the behavior is now a bit closer to real hardware (based on actual tests); Added MR Intel Advanced/ATX with Microid Research BIOS with support for 4 floppy drives and up to 4 IDE controllers; Added floppy drives 3 and 4, bringing the maximum to 4; You can now connect hard disks to the tertiary IDE controller; Correct undocumented behavior of the LEA instruction with register is back on 286 and later CPU's; Pentium-rea models with Intel chipsets now have port 92 (with alternate reset and alternate A20 toggle); Overhauled DMA channel read and write routines and fixed cascading; Improved IMG detection of a bad BPB (or complete lack of a BPB); Added preliminary emulation of PS/2 1.44 MB and PC-98 1.25 MB 3-mode drives (both have an inverted DENSEL pin); Removed the incorrect Amstrad mouse patch from TheCollector1995; Fixed ATAPI CD-ROM disk change detection; Windows IOCTL CD-ROM handler now tries to use direct SCSI passthrough for more things, including obtaining CD-ROM capacity; The Diamond Stealth32 (ET4000/W32p) now also works correctly on the two Award SiS 496/497 boxes; The (S)VGA handler now converts 6-bit RAMDAC RGB channels to standard 8-bit RGB using a lookup table generated at emulator start, calculated using the correct intensity conversion method and treating intensity 64 as equivalent to 63; Moved a few options from the Configuration dialog box to the menu; SIO, PIIX, and PIIX3 now have the reset control register on port CF9 as they should; Several bugfixes.
2016-12-23 03:16:24 +01:00
}
Vastly overhauled the UI, there's now a completely new Settings dialog as well as a status bar with disk activity icons and removable drive menus; Thoroughly clean up the code to vastly reduce the number of compiler warnings and found and fixed several bugs in the process; Applied all mainline PCem commits; Added SCSI hard disk emulation; Commented out all unfinished machines and graphics cards; Added the AOpen AP53 and ASUS P/I-P55T2 machines as well as another Tyan 440FX machine, all three with AMI WinBIOS (patch from TheCollector1995); Added the Diamond Stealth 3D 3000 (S3 ViRGE/VX) graphics card (patch from TheCollector1995); Added the PS/2 XT IDE (AccuLogic) HDD Controller (patch from TheCollector1995); Added Microsoft/Logitech Bus Mouse emulation (patch from waltje); Overhauled the makefiles (patch from waltje); Added the Adaptec AHA-1542CF SCSI controller (patch from waltje); Added preliminary (but still unfinished) Adaptec AHA-154x SCSI controller BIOS support (patch from waltje); Added an ISABugger debugging device (patch from waltje); Added sanity checks to the Direct3D code.
2017-05-05 01:49:42 +02:00
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
uint8_t
keyboard_at_get_mouse_scan(void)
Vastly overhauled the UI, there's now a completely new Settings dialog as well as a status bar with disk activity icons and removable drive menus; Thoroughly clean up the code to vastly reduce the number of compiler warnings and found and fixed several bugs in the process; Applied all mainline PCem commits; Added SCSI hard disk emulation; Commented out all unfinished machines and graphics cards; Added the AOpen AP53 and ASUS P/I-P55T2 machines as well as another Tyan 440FX machine, all three with AMI WinBIOS (patch from TheCollector1995); Added the Diamond Stealth 3D 3000 (S3 ViRGE/VX) graphics card (patch from TheCollector1995); Added the PS/2 XT IDE (AccuLogic) HDD Controller (patch from TheCollector1995); Added Microsoft/Logitech Bus Mouse emulation (patch from waltje); Overhauled the makefiles (patch from waltje); Added the Adaptec AHA-1542CF SCSI controller (patch from waltje); Added preliminary (but still unfinished) Adaptec AHA-154x SCSI controller BIOS support (patch from waltje); Added an ISABugger debugging device (patch from waltje); Added sanity checks to the Direct3D code.
2017-05-05 01:49:42 +02:00
{
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
return(mouse_scan ? 0x10 : 0x00);
Vastly overhauled the UI, there's now a completely new Settings dialog as well as a status bar with disk activity icons and removable drive menus; Thoroughly clean up the code to vastly reduce the number of compiler warnings and found and fixed several bugs in the process; Applied all mainline PCem commits; Added SCSI hard disk emulation; Commented out all unfinished machines and graphics cards; Added the AOpen AP53 and ASUS P/I-P55T2 machines as well as another Tyan 440FX machine, all three with AMI WinBIOS (patch from TheCollector1995); Added the Diamond Stealth 3D 3000 (S3 ViRGE/VX) graphics card (patch from TheCollector1995); Added the PS/2 XT IDE (AccuLogic) HDD Controller (patch from TheCollector1995); Added Microsoft/Logitech Bus Mouse emulation (patch from waltje); Overhauled the makefiles (patch from waltje); Added the Adaptec AHA-1542CF SCSI controller (patch from waltje); Added preliminary (but still unfinished) Adaptec AHA-154x SCSI controller BIOS support (patch from waltje); Added an ISABugger debugging device (patch from waltje); Added sanity checks to the Direct3D code.
2017-05-05 01:49:42 +02:00
}
Reference in New Issue Copy Permalink