max/tmk_keyboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ibmpc_usb: Fix error handling #718

Browse source 
Error was not recovered properly when it happens before entering to LOOP state
This commit is contained in:
tmk 2022-05-29 00:06:00 +09:00
parent 29d59610e1
commit 27178e9569
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
converter/ibmpc_usb/ibmpc_usb.cpp
View file

@ -178,12 +178,18 @@ uint8_t IBMPCConverter::process_interface(void)
if (ibmpc.error) { if (ibmpc.error) {
xprintf("\n%u ERR:%02X ISR:%04X ", timer_read(), ibmpc.error, ibmpc.isr_debug); xprintf("\n%u ERR:%02X ISR:%04X ", timer_read(), ibmpc.error, ibmpc.isr_debug);
/* Error handling:
* IBMPC_ERR_PARITY Reinit
* IBMPC_ERR_PARITY_AA AT/XT Auto-Switching
* IBMPC_ERR_SEND Ignore
* IBMPC_ERR_TIMEOUT Reinit
* IBMPC_ERR_FULL Ignore
* IBMPC_ERR_ILLEGAL Reinit
* IBMPC_ERR_FF Ignore(not used)
*/
// when recv error, neither send error nor buffer full // when recv error, neither send error nor buffer full
if (!(ibmpc.error & (IBMPC_ERR_SEND | IBMPC_ERR_FULL))) { if (!(ibmpc.error & (IBMPC_ERR_SEND | IBMPC_ERR_FULL))) {
if (state == LOOP) { state = ERROR;
// Reset
state = ERROR;
}
if (ibmpc.error == IBMPC_ERR_PARITY_AA) { if (ibmpc.error == IBMPC_ERR_PARITY_AA) {
// AT/XT Auto-Switching support // AT/XT Auto-Switching support
// https://github.com/tmk/tmk_keyboard/wiki/IBM-PC-Keyboard-Converter#atxt-auto-switching // https://github.com/tmk/tmk_keyboard/wiki/IBM-PC-Keyboard-Converter#atxt-auto-switching
@ -219,6 +225,7 @@ uint8_t IBMPCConverter::process_interface(void)
case INIT: case INIT:
xprintf("I%u ", timer_read()); xprintf("I%u ", timer_read());
init_time = timer_read(); init_time = timer_read();
ibmpc.host_isr_clear();
ibmpc.host_enable(); ibmpc.host_enable();
state = WAIT_SETTLE; state = WAIT_SETTLE;
break; break;