patch-2.3.38 linux/drivers/usb/joydev.c

• Lines: 44
• Date: Fri Jan 7 14:11:21 2000
• Orig file: v2.3.37/linux/drivers/usb/joydev.c
• Orig date: Tue Jan 4 13:57:17 2000

diff -u --recursive --new-file v2.3.37/linux/drivers/usb/joydev.c linux/drivers/usb/joydev.c
@@ -60,8 +60,8 @@
 	struct JS_DATA_SAVE_TYPE glue;
 	int nabs;
 	int nkey;
-	__u16 keymap[KEY_MAX - BTN_0];
-	__u16 keypam[KEY_MAX - BTN_0];
+	__u16 keymap[KEY_MAX - BTN_MISC];
+	__u16 keypam[KEY_MAX - BTN_MISC];
 	__u8 absmap[ABS_MAX];
 	__u8 abspam[ABS_MAX];
 };
@@ -111,9 +111,9 @@
 	switch (type) {
 
 		case EV_KEY:
-			if (code < BTN_0 || value == 2) return;
+			if (code < BTN_MISC || value == 2) return;
 			event.type = JS_EVENT_BUTTON;
-			event.number = joydev->keymap[code - BTN_0];
+			event.number = joydev->keymap[code - BTN_MISC];
 			event.value = value;
 			break;
 
@@ -407,10 +407,17 @@
 			joydev->nabs++;
 		}
 
-	for (i = 0; i < KEY_MAX - BTN_0; i++)
-		if (test_bit(i + BTN_0, dev->keybit)) {
+	for (i = BTN_JOYSTICK - BTN_MISC; i < KEY_MAX - BTN_MISC; i++)
+		if (test_bit(i + BTN_MISC, dev->keybit)) {
 			joydev->keymap[i] = joydev->nkey;
-			joydev->keypam[joydev->nkey] = i + BTN_0;
+			joydev->keypam[joydev->nkey] = i + BTN_MISC;
+			joydev->nkey++;
+		}
+
+	for (i = 0; i < BTN_JOYSTICK - BTN_MISC; i++)
+		if (test_bit(i + BTN_MISC, dev->keybit)) {
+			joydev->keymap[i] = joydev->nkey;
+			joydev->keypam[joydev->nkey] = i + BTN_MISC;
 			joydev->nkey++;
 		}