Retro/pcem
Watch
1
0
Fork
You've already forked pcem
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Set mono/colour bit correctly in AT keyboard input port.

Browse source 
Keyboard controller queue now has priority over key queue.
Fixes 'display type not set' errors on several machines when using MDA/Hercules.
This commit is contained in:
SarahW 2017-04-19 17:46:35 +01:00
commit adc7728291
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/keyboard_at.c
View file

@ -93,7 +93,13 @@ void keyboard_at_poll()
}
}
if (!(keyboard_at.status & STAT_OFULL) && keyboard_at.out_new == -1 && /*!(keyboard_at.mem[0] & 0x20) &&*/
if (keyboard_at.out_new == -1 && !(keyboard_at.status & STAT_OFULL) &&
key_ctrl_queue_start != key_ctrl_queue_end)
{
keyboard_at.out_new = key_ctrl_queue[key_ctrl_queue_start];
key_ctrl_queue_start = (key_ctrl_queue_start + 1) & 0xf;
}
else if (!(keyboard_at.status & STAT_OFULL) && keyboard_at.out_new == -1 && /*!(keyboard_at.mem[0] & 0x20) &&*/
mouse_queue_start != mouse_queue_end)
{
keyboard_at.out_new = mouse_queue[mouse_queue_start] | 0x100;
@ -105,12 +111,6 @@ void keyboard_at_poll()
keyboard_at.out_new = key_queue[key_queue_start];
key_queue_start = (key_queue_start + 1) & 0xf;
}
else if (keyboard_at.out_new == -1 && !(keyboard_at.status & STAT_OFULL) &&
key_ctrl_queue_start != key_ctrl_queue_end)
{
keyboard_at.out_new = key_ctrl_queue[key_ctrl_queue_start];
key_ctrl_queue_start = (key_ctrl_queue_start + 1) & 0xf;
}
}
void keyboard_at_adddata(uint8_t val)
@ -487,7 +487,7 @@ void keyboard_at_reset()
keyboard_at.mem[0] = 0x11;
keyboard_at.wantirq = 0;
keyboard_at.output_port = 0xcf;
keyboard_at.input_port = 0xb0;
keyboard_at.input_port = (MDA) ? 0xf0 : 0xb0;
keyboard_at.out_new = -1;
keyboard_at.last_irq = 0;