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

Commit d3246691 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: update key codes for Apple aluminium
  HID: fix comment in hid_input_report()
  HID: BADPAD entry for NATSU Playstation USB adapter
  HID: Use DIV_ROUND_UP
  HID: remove HID_QUIRK_APPLE_ISO_KEYBOARD for 4th generation macbook
parents 74fe0305 07146648

drivers/hid/hid-core.c

+1 −1
Original line number Diff line number Diff line
@@ -968,7 +968,7 @@ int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int i 
		size--;

	}



	/* dump the report descriptor */

	/* dump the report */

	dbg_hid("report %d (size %u) = ", n, size);

	for (i = 0; i < size; i++)

		dbg_hid_line(" %02x", data[i]);

drivers/hid/hid-input.c

+10 −12
Original line number Diff line number Diff line
@@ -100,13 +100,11 @@ static struct hidinput_key_translation apple_fn_keys[] = { 
	{ KEY_BACKSPACE, KEY_DELETE },

	{ KEY_F1,       KEY_BRIGHTNESSDOWN, APPLE_FLAG_FKEY },

	{ KEY_F2,       KEY_BRIGHTNESSUP,   APPLE_FLAG_FKEY },

	{ KEY_F3,       KEY_CYCLEWINDOWS,       APPLE_FLAG_FKEY }, /* Exposé */

	{ KEY_F3,       KEY_FN_F5,          APPLE_FLAG_FKEY }, /* Expos */

	{ KEY_F4,       KEY_FN_F4,          APPLE_FLAG_FKEY }, /* Dashboard */

	{ KEY_F5,       KEY_FN_F5 },

	{ KEY_F6,       KEY_FN_F6 },

	{ KEY_F7,       KEY_BACK,               APPLE_FLAG_FKEY },

	{ KEY_F7,       KEY_PREVIOUSSONG,   APPLE_FLAG_FKEY },

	{ KEY_F8,       KEY_PLAYPAUSE,      APPLE_FLAG_FKEY },

	{ KEY_F9,       KEY_FORWARD,            APPLE_FLAG_FKEY },

	{ KEY_F9,       KEY_NEXTSONG,       APPLE_FLAG_FKEY },

	{ KEY_F10,      KEY_MUTE,           APPLE_FLAG_FKEY },

	{ KEY_F11,      KEY_VOLUMEDOWN,     APPLE_FLAG_FKEY },

	{ KEY_F12,      KEY_VOLUMEUP,       APPLE_FLAG_FKEY },

drivers/hid/usbhid/hid-core.c

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ static int hid_submit_ctrl(struct hid_device *hid) 
		usbhid->urbctrl->pipe = usb_rcvctrlpipe(hid_to_usb_dev(hid), 0);

		maxpacket = usb_maxpacket(hid_to_usb_dev(hid), usbhid->urbctrl->pipe, 0);

		if (maxpacket > 0) {

			padlen = (len + maxpacket - 1) / maxpacket;

			padlen = DIV_ROUND_UP(len, maxpacket);

			padlen *= maxpacket;

			if (padlen > usbhid->bufsize)

				padlen = usbhid->bufsize;

drivers/hid/usbhid/hid-quirks.c

+5 −1
Original line number Diff line number Diff line
@@ -345,6 +345,9 @@ 
#define USB_VENDOR_ID_NATIONAL_SEMICONDUCTOR 0x0400

#define USB_DEVICE_ID_N_S_HARMONY       0xc359



#define USB_VENDOR_ID_NATSU             0x08b7

#define USB_DEVICE_ID_NATSU_GAMEPAD     0x0001



#define USB_VENDOR_ID_NEC		0x073e

#define USB_DEVICE_ID_NEC_USB_GAME_PAD	0x0301
@@ -426,6 +429,7 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_DRIVING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },

	{ USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FLYING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },

	{ USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FIGHTING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },

	{ USB_VENDOR_ID_NATSU, USB_DEVICE_ID_NATSU_GAMEPAD, HID_QUIRK_BADPAD },

	{ USB_VENDOR_ID_NEC, USB_DEVICE_ID_NEC_USB_GAME_PAD, HID_QUIRK_BADPAD },

	{ USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RUMBLEPAD, HID_QUIRK_BADPAD },

	{ USB_VENDOR_ID_TOPMAX, USB_DEVICE_ID_TOPMAX_COBRAPAD, HID_QUIRK_BADPAD },
@@ -624,7 +628,7 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_JIS, HID_QUIRK_APPLE_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE | HID_QUIRK_APPLE_ISO_KEYBOARD },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI, HID_QUIRK_APPLE_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },