claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed PS/2 mouse to PCI (PIIX) wiring, fixes recently introduced PS/2 mouse hangs;

Browse Source 
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.
This commit is contained in:
OBattler
2017-09-07 01:52:36 +02:00
parent b41b4a0926
commit 17d9c5c463
8 changed files with 213 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/piix.c
View File

@@ -200,10 +200,7 @@ void piix_write(int func, int addr, uint8_t val, void *priv)
}
else if (addr == 0x4E)
{
if ((val ^ card_piix[addr]) & 0x10)
{
keyboard_at_mouse_set_enabled((val & 0x10) ? 1 : 0);
}
keyboard_at_set_mouse_scan((val & 0x10) ? 1 : 0);
card_piix[addr] = val;
}
else if (addr == 0x6A)
@@ -304,6 +301,10 @@ uint8_t piix_read(int func, int addr, void *priv)
else if (piix_type == 3)
return card_piix[addr];
}
else if (addr == 0x4E)
{
return (card_piix[addr] & 0xEF) | keyboard_at_get_mouse_scan();
}
else if (addr == 0x69)
{
return card_piix[addr] & 0xFE;
@@ -693,7 +694,8 @@ void piix3_reset(void)
card_piix[0x09] = 0x00; card_piix[0x0a] = 0x01; card_piix[0x0b] = 0x06;
card_piix[0x0e] = 0x80; /*Multi-function device*/
card_piix[0x4c] = 0x4d;
card_piix[0x4e] = card_piix[0x4f] = 0x03;
card_piix[0x4e] = 0x03;
card_piix[0x4f] = 0x00;
card_piix[0x60] = card_piix[0x61] = card_piix[0x62] = card_piix[0x63] = 0x80;
card_piix[0x69] = 0x02;
card_piix[0x70] = 0xc0;