80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Attempt to fix the keyboard lock and make parts more readable.

Browse Source
This commit is contained in:
OBattler
2016-07-13 01:47:54 +02:00
parent 88235e4cee
commit 487f6167d0
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/keyboard_at.c
View File

@@ -20,6 +20,18 @@
#define STAT_IFULL 0x02 #define STAT_IFULL 0x02
#define STAT_OFULL 0x01 #define STAT_OFULL 0x01
#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
struct struct
{ {
int initialised; int initialised;
@@ -240,14 +252,14 @@ void keyboard_at_write(uint16_t port, uint8_t val, void *priv)
/* Addition by OBattler: Scan code translate ON/OFF. */ /* Addition by OBattler: Scan code translate ON/OFF. */
// pclog("KEYBOARD_AT: Writing %02X to system register\n", val); // pclog("KEYBOARD_AT: Writing %02X to system register\n", val);
mode &= 0x93; mode &= 0x93;
mode |= (val & 0x6C); mode |= (val & MODE_MASK);
if (first_write) if (first_write)
{ {
/* A bit of a hack, but it will make the keyboard behave correctly, regardless /* A bit of a hack, but it will make the keyboard behave correctly, regardless
of what the BIOS sets here. */ of what the BIOS sets here. */
mode &= 0xFC; mode &= 0xFC;
dtrans = mode & 0x60; dtrans = mode & (CCB_TRANSLATE | CCB_PCMODE);
if ((mode & 0x60) == 0x40) if ((mode & (CCB_TRANSLATE | CCB_PCMODE)) == CCB_TRANSLATE)
{ {
/* Bit 6 on, bit 5 off, the only case in which translation is on, /* Bit 6 on, bit 5 off, the only case in which translation is on,
therefore, set to set 2. */ therefore, set to set 2. */
@@ -601,10 +613,8 @@ uint8_t keyboard_at_read(uint16_t port, void *priv)
return ppi.pb&~0xe0; return ppi.pb&~0xe0;
case 0x64: case 0x64:
temp = keyboard_at.status; temp = (keyboard_at.status & 0xFB) | (mode & CCB_SYSTEM);
temp &= 0xEB; if (mode & CCB_IGNORELOCK) temp |= STAT_LOCK;
temp |= (mode & 4);
if (mode & 8) temp |= STAT_LOCK;
keyboard_at.status &= ~(STAT_RTIMEOUT/* | STAT_TTIMEOUT*/); keyboard_at.status &= ~(STAT_RTIMEOUT/* | STAT_TTIMEOUT*/);
break; break;
} }