mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-24 04:34:08 +08:00
Input: fix misspelling of Hangeul key
Fix a mispelling of the korean alphabet name in the input subsystem. See http://en.wikipedia.org/wiki/Hangeul#Names for more details. KEY_HANGUEL left to not break people Signed-off-by: Jerome Pinot <ngc891@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
parent
9e8e30a0cc
commit
b9ab58dd8e
@ -1074,7 +1074,7 @@ static int emulate_raw(struct vc_data *vc, unsigned int keycode,
|
||||
put_queue(vc, 0x1d | up_flag);
|
||||
put_queue(vc, 0x45 | up_flag);
|
||||
return 0;
|
||||
case KEY_HANGUEL:
|
||||
case KEY_HANGEUL:
|
||||
if (!up_flag) put_queue(vc, 0xf1);
|
||||
return 0;
|
||||
case KEY_HANJA:
|
||||
|
@ -150,7 +150,7 @@ static unsigned char atkbd_unxlate_table[128] = {
|
||||
#define ATKBD_RET_EMUL0 0xe0
|
||||
#define ATKBD_RET_EMUL1 0xe1
|
||||
#define ATKBD_RET_RELEASE 0xf0
|
||||
#define ATKBD_RET_HANGUEL 0xf1
|
||||
#define ATKBD_RET_HANGEUL 0xf1
|
||||
#define ATKBD_RET_HANJA 0xf2
|
||||
#define ATKBD_RET_ERR 0xff
|
||||
|
||||
@ -304,7 +304,7 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data,
|
||||
|
||||
if (atkbd->emul ||
|
||||
(code != ATKBD_RET_EMUL0 && code != ATKBD_RET_EMUL1 &&
|
||||
code != ATKBD_RET_HANGUEL && code != ATKBD_RET_HANJA &&
|
||||
code != ATKBD_RET_HANGEUL && code != ATKBD_RET_HANJA &&
|
||||
(code != ATKBD_RET_ERR || atkbd->err_xl) &&
|
||||
(code != ATKBD_RET_BAT || atkbd->bat_xl))) {
|
||||
atkbd->release = code >> 7;
|
||||
@ -333,8 +333,8 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data,
|
||||
case ATKBD_RET_RELEASE:
|
||||
atkbd->release = 1;
|
||||
goto out;
|
||||
case ATKBD_RET_HANGUEL:
|
||||
atkbd_report_key(atkbd->dev, regs, KEY_HANGUEL, 3);
|
||||
case ATKBD_RET_HANGEUL:
|
||||
atkbd_report_key(atkbd->dev, regs, KEY_HANGEUL, 3);
|
||||
goto out;
|
||||
case ATKBD_RET_HANJA:
|
||||
atkbd_report_key(atkbd->dev, regs, KEY_HANJA, 3);
|
||||
|
@ -179,7 +179,7 @@ u8 adb_to_linux_keycodes[128] = {
|
||||
/* 0x65 */ KEY_F9, /* 67 */
|
||||
/* 0x66 */ KEY_HANJA, /* 123 */
|
||||
/* 0x67 */ KEY_F11, /* 87 */
|
||||
/* 0x68 */ KEY_HANGUEL, /* 122 */
|
||||
/* 0x68 */ KEY_HANGEUL, /* 122 */
|
||||
/* 0x69 */ KEY_SYSRQ, /* 99 */
|
||||
/* 0x6a */ 0,
|
||||
/* 0x6b */ KEY_SCROLLLOCK, /* 70 */
|
||||
|
@ -563,7 +563,7 @@ static char *keys[KEY_MAX + 1] = {
|
||||
[KEY_VOLUMEUP] = "VolumeUp", [KEY_POWER] = "Power",
|
||||
[KEY_KPEQUAL] = "KPEqual", [KEY_KPPLUSMINUS] = "KPPlusMinus",
|
||||
[KEY_PAUSE] = "Pause", [KEY_KPCOMMA] = "KPComma",
|
||||
[KEY_HANGUEL] = "Hanguel", [KEY_HANJA] = "Hanja",
|
||||
[KEY_HANGUEL] = "Hangeul", [KEY_HANJA] = "Hanja",
|
||||
[KEY_YEN] = "Yen", [KEY_LEFTMETA] = "LeftMeta",
|
||||
[KEY_RIGHTMETA] = "RightMeta", [KEY_COMPOSE] = "Compose",
|
||||
[KEY_STOP] = "Stop", [KEY_AGAIN] = "Again",
|
||||
|
@ -232,7 +232,8 @@ struct input_absinfo {
|
||||
#define KEY_PAUSE 119
|
||||
|
||||
#define KEY_KPCOMMA 121
|
||||
#define KEY_HANGUEL 122
|
||||
#define KEY_HANGEUL 122
|
||||
#define KEY_HANGUEL KEY_HANGEUL
|
||||
#define KEY_HANJA 123
|
||||
#define KEY_YEN 124
|
||||
#define KEY_LEFTMETA 125
|
||||
|
Loading…
Reference in New Issue
Block a user