Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aedfb5c7 authored by Andreas Schwab's avatar Andreas Schwab Committed by Greg Kroah-Hartman
Browse files

Input: atakbd - fix Atari keymap 



[ Upstream commit 9e62df51be993035c577371ffee5477697a56aad ]

Fix errors in Atari keymap (mostly in keypad, help and undo keys).

Patch provided on debian-68k ML by Andreas Schwab <schwab@linux-m68k.org>,
keymap array size and unhandled scancode limit adjusted to 0x73 by me.

Tested-by: default avatarMichael Schmitz <schmitzmic@gmail.com>
Signed-off-by: default avatarMichael Schmitz <schmitzmic@gmail.com>
Signed-off-by: default avatarAndreas Schwab <schwab@linux-m68k.org>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 89c3a401

drivers/input/keyboard/atakbd.c

+26 −38
Original line number Diff line number Diff line
@@ -79,8 +79,7 @@ MODULE_LICENSE("GPL"); 
 */





static unsigned char atakbd_keycode[0x72] = {	/* American layout */

	[0]	 = KEY_GRAVE,

static unsigned char atakbd_keycode[0x73] = {	/* American layout */

	[1]	 = KEY_ESC,

	[2]	 = KEY_1,

	[3]	 = KEY_2,
@@ -121,9 +120,9 @@ static unsigned char atakbd_keycode[0x72] = { /* American layout */ 
	[38]	 = KEY_L,

	[39]	 = KEY_SEMICOLON,

	[40]	 = KEY_APOSTROPHE,

	[41]	 = KEY_BACKSLASH,	/* FIXME, '#' */

	[41]	 = KEY_GRAVE,

	[42]	 = KEY_LEFTSHIFT,

	[43]	 = KEY_GRAVE,		/* FIXME: '~' */

	[43]	 = KEY_BACKSLASH,

	[44]	 = KEY_Z,

	[45]	 = KEY_X,

	[46]	 = KEY_C,
@@ -149,45 +148,34 @@ static unsigned char atakbd_keycode[0x72] = { /* American layout */ 
	[66]	 = KEY_F8,

	[67]	 = KEY_F9,

	[68]	 = KEY_F10,

	[69]	 = KEY_ESC,

	[70]	 = KEY_DELETE,

	[71]	 = KEY_KP7,

	[72]	 = KEY_KP8,

	[73]	 = KEY_KP9,

	[71]	 = KEY_HOME,

	[72]	 = KEY_UP,

	[74]	 = KEY_KPMINUS,

	[75]	 = KEY_KP4,

	[76]	 = KEY_KP5,

	[77]	 = KEY_KP6,

	[75]	 = KEY_LEFT,

	[77]	 = KEY_RIGHT,

	[78]	 = KEY_KPPLUS,

	[79]	 = KEY_KP1,

	[80]	 = KEY_KP2,

	[81]	 = KEY_KP3,

	[82]	 = KEY_KP0,

	[83]	 = KEY_KPDOT,

	[90]	 = KEY_KPLEFTPAREN,

	[91]	 = KEY_KPRIGHTPAREN,

	[92]	 = KEY_KPASTERISK,	/* FIXME */

	[93]	 = KEY_KPASTERISK,

	[94]	 = KEY_KPPLUS,

	[95]	 = KEY_HELP,

	[80]	 = KEY_DOWN,

	[82]	 = KEY_INSERT,

	[83]	 = KEY_DELETE,

	[96]	 = KEY_102ND,

	[97]	 = KEY_KPASTERISK,	/* FIXME */

	[98]	 = KEY_KPSLASH,

	[97]	 = KEY_UNDO,

	[98]	 = KEY_HELP,

	[99]	 = KEY_KPLEFTPAREN,

	[100]	 = KEY_KPRIGHTPAREN,

	[101]	 = KEY_KPSLASH,

	[102]	 = KEY_KPASTERISK,

	[103]	 = KEY_UP,

	[104]	 = KEY_KPASTERISK,	/* FIXME */

	[105]	 = KEY_LEFT,

	[106]	 = KEY_RIGHT,

	[107]	 = KEY_KPASTERISK,	/* FIXME */

	[108]	 = KEY_DOWN,

	[109]	 = KEY_KPASTERISK,	/* FIXME */

	[110]	 = KEY_KPASTERISK,	/* FIXME */

	[111]	 = KEY_KPASTERISK,	/* FIXME */

	[112]	 = KEY_KPASTERISK,	/* FIXME */

	[113]	 = KEY_KPASTERISK	/* FIXME */

	[103]	 = KEY_KP7,

	[104]	 = KEY_KP8,

	[105]	 = KEY_KP9,

	[106]	 = KEY_KP4,

	[107]	 = KEY_KP5,

	[108]	 = KEY_KP6,

	[109]	 = KEY_KP1,

	[110]	 = KEY_KP2,

	[111]	 = KEY_KP3,

	[112]	 = KEY_KP0,

	[113]	 = KEY_KPDOT,

	[114]	 = KEY_KPENTER,

};



static struct input_dev *atakbd_dev;
@@ -195,7 +183,7 @@ static struct input_dev *atakbd_dev; 
static void atakbd_interrupt(unsigned char scancode, char down)

{



	if (scancode < 0x72) {		/* scancodes < 0xf2 are keys */

	if (scancode < 0x73) {		/* scancodes < 0xf3 are keys */



		// report raw events here?
@@ -209,7 +197,7 @@ static void atakbd_interrupt(unsigned char scancode, char down) 
			input_report_key(atakbd_dev, scancode, down);

			input_sync(atakbd_dev);

		}

	} else				/* scancodes >= 0xf2 are mouse data, most likely */

	} else				/* scancodes >= 0xf3 are mouse data, most likely */

		printk(KERN_INFO "atakbd: unhandled scancode %x\n", scancode);



	return;