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

ibmpc_usb: Fix keyboard_kind for Zenith Z-150 AT

Browse source
This commit is contained in:
tmk 2021-02-10 14:34:35 +09:00
parent 7d9e554a8d
commit 8381eb480f
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
converter/ibmpc_usb/ibmpc_usb.c
View file

@ -50,6 +50,11 @@ static int16_t read_wait(uint16_t wait_ms)
return code; return code;
} }
#define ID_STR(id) (id == 0xFFFE ? "_????" : \
(id == 0xFFFD ? "_Z150" : \
(id == 0x0000 ? "_AT84" : \
"")))
static uint16_t read_keyboard_id(void) static uint16_t read_keyboard_id(void)
{ {
uint16_t id = 0; uint16_t id = 0;
@ -281,7 +286,7 @@ uint8_t matrix_scan(void)
} else if (0xFFFE == keyboard_id) { // CodeSet2 PS/2 fails to response? } else if (0xFFFE == keyboard_id) { // CodeSet2 PS/2 fails to response?
keyboard_kind = PC_AT; keyboard_kind = PC_AT;
} else if (0xFFFD == keyboard_id) { // Zenith Z-150 AT } else if (0xFFFD == keyboard_id) { // Zenith Z-150 AT
keyboard_kind = PC_AT_Z150; keyboard_kind = PC_AT;
} else if (0x00FF == keyboard_id) { // Mouse is not supported } else if (0x00FF == keyboard_id) { // Mouse is not supported
xprintf("Mouse: not supported\n"); xprintf("Mouse: not supported\n");
keyboard_kind = NONE; keyboard_kind = NONE;
@ -340,7 +345,7 @@ uint8_t matrix_scan(void)
} }
} }
xprintf("\nID:%04X(%s) ", keyboard_id, KEYBOARD_KIND_STR(keyboard_kind)); xprintf("\nID:%04X(%s%s) ", keyboard_id, KEYBOARD_KIND_STR(keyboard_kind), ID_STR(keyboard_id));
state = SETUP; state = SETUP;
break; break;
@ -352,9 +357,6 @@ uint8_t matrix_scan(void)
case PC_AT: case PC_AT:
led_set(host_keyboard_leds()); led_set(host_keyboard_leds());
break; break;
case PC_AT_Z150:
// TODO: do not set indicators temporarily for debug
break;
case PC_TERMINAL: case PC_TERMINAL:
// Set all keys to make/break type // Set all keys to make/break type
ibmpc_host_send(0xF8); ibmpc_host_send(0xF8);
@ -392,7 +394,6 @@ uint8_t matrix_scan(void)
if (process_cs1(code) == -1) state = INIT; if (process_cs1(code) == -1) state = INIT;
break; break;
case PC_AT: case PC_AT:
case PC_AT_Z150:
if (process_cs2(code) == -1) state = INIT; if (process_cs2(code) == -1) state = INIT;
break; break;
case PC_TERMINAL: case PC_TERMINAL:

3
converter/ibmpc_usb/ibmpc_usb.h
View file

@ -1,12 +1,11 @@
#ifndef IBMPC_USB_H #ifndef IBMPC_USB_H
#define IBMPC_USB_H #define IBMPC_USB_H
typedef enum { NONE, PC_XT, PC_AT, PC_TERMINAL, PC_AT_Z150 } keyboard_kind_t; typedef enum { NONE, PC_XT, PC_AT, PC_TERMINAL } keyboard_kind_t;
#define KEYBOARD_KIND_STR(kind) \ #define KEYBOARD_KIND_STR(kind) \
(kind == PC_XT ? "XT" : \ (kind == PC_XT ? "XT" : \
kind == PC_AT ? "AT" : \ kind == PC_AT ? "AT" : \
kind == PC_TERMINAL ? "TERMINAL" : \ kind == PC_TERMINAL ? "TERMINAL" : \
kind == PC_AT_Z150 ? "AT_Z150" : \
"NONE") "NONE")