Skip to content

Commit 26074e9

Browse files
authored
Merge pull request 86Box#5246 from akmed772/master
Add a keyboard ID, keyboard scancode set 81h and 82h for PS/55 machine
2 parents 470b065 + 0b97701 commit 26074e9

File tree

4 files changed

+1120
-96
lines changed

4 files changed

+1120
-96
lines changed

src/86box.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1094,8 +1094,8 @@ pc_init_modules(void)
10941094
void
10951095
pc_send_ca(uint16_t sc)
10961096
{
1097-
if (keyboard_mode == 0x8A) {
1098-
/* Use R-Alt because PS/55 DOS assigns L-Alt Kanji */
1097+
if (keyboard_mode >= 0x81) {
1098+
/* Use R-Alt because PS/55 DOS and OS/2 assign L-Alt Kanji */
10991099
keyboard_input(1, 0x1D); /* Ctrl key pressed */
11001100
keyboard_input(1, 0x138); /* R-Alt key pressed */
11011101
keyboard_input(1, sc);

src/device/keyboard.c

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -85,34 +85,6 @@ typedef struct {
8585
const uint8_t brk[4];
8686
} scconvtbl;
8787

88-
/* Is this a left-over of something planned earlier? */
89-
#ifdef USE_SCCONV55_82
90-
static scconvtbl scconv55_82[18 + 1] =
91-
{
92-
// clang-format off
93-
{.sc = 0x02 , .mk = { 0x5f, 0 }, .brk = { 0xf0, 0x5f, 0 } }, /* '1' -> 'Clear/ /SysRq' */
94-
{.sc = 0x03 , .mk = { 0x48, 0 }, .brk = { 0xf0, 0x48, 0 } }, /* '2' -> '終了 (Exit)' */
95-
{.sc = 0x04 , .mk = { 0x38, 0 }, .brk = { 0xf0, 0x38, 0 } }, /* '3' -> 'メッセージ (Message)/ /応答 (Respond)' */
96-
{.sc = 0x05 , .mk = { 0x30, 0 }, .brk = { 0xf0, 0x30, 0 } }, /* '4' -> 'サイズ変換 (Change Size)/ /横倍角 (2x Width)' */
97-
{.sc = 0x06 , .mk = { 0x20, 0 }, .brk = { 0xf0, 0x20, 0 } }, /* '5' -> '単語登録 (Register Word)/ /再交換 (Re-change)' */
98-
{.sc = 0x07 , .mk = { 0x28, 0 }, .brk = { 0xf0, 0x28, 0 } }, /* '6' -> '漢字 (Kanji)/ /番号 (Number)' */
99-
{.sc = 0x08 , .mk = { 0x60, 0 }, .brk = { 0xf0, 0x60, 0 } }, /* '7' -> '取消 (Cancel)' */
100-
{.sc = 0x09 , .mk = { 0x40, 0 }, .brk = { 0xf0, 0x40, 0 } }, /* '8' -> 'コピー (Copy)/ /移動 (Move)' */
101-
{.sc = 0x3d , .mk = { 0x1f, 0 }, .brk = { 0xf0, 0x1f, 0 } }, /* 'F3' -> 'Cr Bnk/領域呼出 (Call Range)/All Cr/登録 (Register)' */
102-
{.sc = 0x3e , .mk = { 0x27, 0 }, .brk = { 0xf0, 0x27, 0 } }, /* 'F4' -> '割込み (Interrupt)' */
103-
{.sc = 0x3f , .mk = { 0x2f, 0 }, .brk = { 0xf0, 0x2f, 0 } }, /* 'F5' -> 'UF1' */
104-
{.sc = 0x40 , .mk = { 0x5e, 0 }, .brk = { 0xf0, 0x5e, 0 } }, /* 'F6' -> 'UF2' */
105-
{.sc = 0x41 , .mk = { 0x08, 0 }, .brk = { 0xf0, 0x08, 0 } }, /* 'F7' -> 'UF3' */
106-
{.sc = 0x42 , .mk = { 0x10, 0 }, .brk = { 0xf0, 0x10, 0 } }, /* 'F8' -> 'UF4' */
107-
{.sc = 0x43 , .mk = { 0x50, 0 }, .brk = { 0xf0, 0x50, 0 } }, /* 'F9' -> 'EOF/Erase/ErInp' */
108-
{.sc = 0x44 , .mk = { 0x18, 0 }, .brk = { 0xf0, 0x18, 0 } }, /* 'F10' -> 'Attn/ /CrSel' */
109-
{.sc = 0x57 , .mk = { 0x17, 0 }, .brk = { 0xf0, 0x17, 0 } }, /* 'F11' -> 'PA1/ /DvCncl' */
110-
{.sc = 0x58 , .mk = { 0x37, 0 }, .brk = { 0xf0, 0x37, 0 } }, /* 'F12' -> 'PA2/ /PA3' */
111-
{.sc = 0 , .mk = { 0 }, .brk = { 0 } } /* end */
112-
// clang-format on
113-
};
114-
#endif
115-
11688
static scconvtbl scconv55_8a[18 + 1] =
11789
{
11890
// clang-format off

0 commit comments

Comments
 (0)