Commit 0bf98542 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-core.c: Adds GTCO CalComp Interwrite IPanel PIDs to blacklist
  HID: put usb_interface instead of usb_device into hid->dev to fix udevinfo breakage
  HID: add missing RX, RZ and RY enum values to hid-debug output
  HID: hid/hid-input.c doesn't need to include linux/usb/input.h
  HID: compilation fix when DEBUG_DATA is defined
  HID: proper LED-mapping for SpaceNavigator
  HID: update MAINTAINERS entry for USB-HID
  HID: GEYSER4_ISO needs quirk
  HID: fix some ARM builds due to HID brokenness - make USB_HID depend on INPUT
parents b4a2c87d d8c8a393

MAINTAINERS

+2 −3
Original line number Diff line number Diff line
@@ -3334,9 +3334,8 @@ W: http://www.linux-usb.org/gadget 
S:	Maintained



USB HID/HIDBP DRIVERS

P:	Vojtech Pavlik

M:	vojtech@suse.cz

L:	linux-usb-users@lists.sourceforge.net

P:	Jiri Kosina

M:	jkosina@suse.cz

L:	linux-usb-devel@lists.sourceforge.net

S:	Maintained

drivers/hid/hid-core.c

+5 −1
Original line number Diff line number Diff line
@@ -880,6 +880,10 @@ static void hid_output_field(struct hid_field *field, __u8 *data) 
	unsigned size = field->report_size;

	unsigned n;



	/* make sure the unused bits in the last byte are zeros */

	if (count > 0 && size > 0)

		data[(count*size-1)/8] = 0;



	for (n = 0; n < count; n++) {

		if (field->logical_minimum < 0)	/* signed values */

			implement(data, offset + n * size, size, s32ton(field->value[n], size));
@@ -947,7 +951,7 @@ int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int i 
	}



#ifdef DEBUG_DATA

	printk(KERN_DEBUG __FILE__ ": report (size %u) (%snumbered)\n", len, report_enum->numbered ? "" : "un");

	printk(KERN_DEBUG __FILE__ ": report (size %u) (%snumbered)\n", size, report_enum->numbered ? "" : "un");

#endif



	n = 0;                          /* Normally report number is 0 */

drivers/hid/hid-input.c

+16 −4
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include <linux/module.h>

#include <linux/slab.h>

#include <linux/kernel.h>

#include <linux/usb/input.h>



#undef DEBUG
@@ -364,9 +363,22 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel 
			break;



		case HID_UP_LED:

			if (((usage->hid - 1) & 0xffff) >= LED_MAX)

				goto ignore;

			map_led((usage->hid - 1) & 0xffff);



			switch (usage->hid & 0xffff) {                        /* HID-Value:                   */

				case 0x01:  map_led (LED_NUML);     break;    /*   "Num Lock"                 */

				case 0x02:  map_led (LED_CAPSL);    break;    /*   "Caps Lock"                */

				case 0x03:  map_led (LED_SCROLLL);  break;    /*   "Scroll Lock"              */

				case 0x04:  map_led (LED_COMPOSE);  break;    /*   "Compose"                  */

				case 0x05:  map_led (LED_KANA);     break;    /*   "Kana"                     */

				case 0x27:  map_led (LED_SLEEP);    break;    /*   "Stand-By"                 */

				case 0x4c:  map_led (LED_SUSPEND);  break;    /*   "System Suspend"           */

				case 0x09:  map_led (LED_MUTE);     break;    /*   "Mute"                     */

				case 0x4b:  map_led (LED_MISC);     break;    /*   "Generic Indicator"        */

				case 0x19:  map_led (LED_MAIL);     break;    /*   "Message Waiting"          */

				case 0x4d:  map_led (LED_CHARGING); break;    /*   "External Power Connected" */



				default: goto ignore;

			}

			break;



		case HID_UP_DIGITIZER:

drivers/usb/input/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ comment "USB Input Devices" 
config USB_HID

	tristate "USB Human Interface Device (full HID) support"

	default y

	depends on USB

	depends on USB && INPUT

	select HID

	---help---

	  Say Y here if you want full HID support to connect USB keyboards,

drivers/usb/input/hid-core.c

+24 −16
Original line number Diff line number Diff line
@@ -106,18 +106,18 @@ static void hid_reset(struct work_struct *work) 


	if (test_bit(HID_CLEAR_HALT, &usbhid->iofl)) {

		dev_dbg(&usbhid->intf->dev, "clear halt\n");

		rc = usb_clear_halt(to_usb_device(hid->dev), usbhid->urbin->pipe);

		rc = usb_clear_halt(hid_to_usb_dev(hid), usbhid->urbin->pipe);

		clear_bit(HID_CLEAR_HALT, &usbhid->iofl);

		hid_start_in(hid);

	}



	else if (test_bit(HID_RESET_PENDING, &usbhid->iofl)) {

		dev_dbg(&usbhid->intf->dev, "resetting device\n");

		rc = rc_lock = usb_lock_device_for_reset(to_usb_device(hid->dev), usbhid->intf);

		rc = rc_lock = usb_lock_device_for_reset(hid_to_usb_dev(hid), usbhid->intf);

		if (rc_lock >= 0) {

			rc = usb_reset_composite_device(to_usb_device(hid->dev), usbhid->intf);

			rc = usb_reset_composite_device(hid_to_usb_dev(hid), usbhid->intf);

			if (rc_lock)

				usb_unlock_device(to_usb_device(hid->dev));

				usb_unlock_device(hid_to_usb_dev(hid));

		}

		clear_bit(HID_RESET_PENDING, &usbhid->iofl);

	}
@@ -129,8 +129,8 @@ static void hid_reset(struct work_struct *work) 
		break;

	default:

		err("can't reset device, %s-%s/input%d, status %d",

				to_usb_device(hid->dev)->bus->bus_name,

				to_usb_device(hid->dev)->devpath,

				hid_to_usb_dev(hid)->bus->bus_name,

				hid_to_usb_dev(hid)->devpath,

				usbhid->ifnum, rc);

		/* FALLTHROUGH */

	case -EHOSTUNREACH:
@@ -217,8 +217,8 @@ static void hid_irq_in(struct urb *urb) 
		clear_bit(HID_IN_RUNNING, &usbhid->iofl);

		if (status != -EPERM) {

			err("can't resubmit intr, %s-%s/input%d, status %d",

					to_usb_device(hid->dev)->bus->bus_name,

					to_usb_device(hid->dev)->devpath,

					hid_to_usb_dev(hid)->bus->bus_name,

					hid_to_usb_dev(hid)->devpath,

					usbhid->ifnum, status);

			hid_io_error(hid);

		}
@@ -251,7 +251,7 @@ static int hid_submit_out(struct hid_device *hid) 


	hid_output_report(report, usbhid->outbuf);

	usbhid->urbout->transfer_buffer_length = ((report->size - 1) >> 3) + 1 + (report->id > 0);

	usbhid->urbout->dev = to_usb_device(hid->dev);

	usbhid->urbout->dev = hid_to_usb_dev(hid);



	dbg("submitting out urb");
@@ -276,13 +276,13 @@ static int hid_submit_ctrl(struct hid_device *hid) 
	len = ((report->size - 1) >> 3) + 1 + (report->id > 0);

	if (dir == USB_DIR_OUT) {

		hid_output_report(report, usbhid->ctrlbuf);

		usbhid->urbctrl->pipe = usb_sndctrlpipe(to_usb_device(hid->dev), 0);

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

		usbhid->urbctrl->transfer_buffer_length = len;

	} else {

		int maxpacket, padlen;



		usbhid->urbctrl->pipe = usb_rcvctrlpipe(to_usb_device(hid->dev), 0);

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

		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 *= maxpacket;
@@ -292,7 +292,7 @@ static int hid_submit_ctrl(struct hid_device *hid) 
			padlen = 0;

		usbhid->urbctrl->transfer_buffer_length = padlen;

	}

	usbhid->urbctrl->dev = to_usb_device(hid->dev);

	usbhid->urbctrl->dev = hid_to_usb_dev(hid);



	usbhid->cr->bRequestType = USB_TYPE_CLASS | USB_RECIP_INTERFACE | dir;

	usbhid->cr->bRequest = (dir == USB_DIR_OUT) ? HID_REQ_SET_REPORT : HID_REQ_GET_REPORT;
@@ -582,6 +582,8 @@ void usbhid_init_reports(struct hid_device *hid) 
}



#define USB_VENDOR_ID_GTCO		0x078c

#define USB_VENDOR_ID_GTCO_IPANEL_1	0x08ca

#define USB_VENDOR_ID_GTCO_IPANEL_2     0x5543

#define USB_DEVICE_ID_GTCO_90		0x0090

#define USB_DEVICE_ID_GTCO_100		0x0100

#define USB_DEVICE_ID_GTCO_101		0x0101
@@ -627,6 +629,9 @@ void usbhid_init_reports(struct hid_device *hid) 
#define USB_DEVICE_ID_GTCO_1004		0x1004

#define USB_DEVICE_ID_GTCO_1005		0x1005

#define USB_DEVICE_ID_GTCO_1006		0x1006

#define USB_DEVICE_ID_GTCO_10		0x0010

#define USB_DEVICE_ID_GTCO_8		0x0008

#define USB_DEVICE_ID_GTCO_d            0x000d



#define USB_VENDOR_ID_WACOM		0x056a
@@ -875,6 +880,9 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1004, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1005, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1006, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO_IPANEL_1, USB_DEVICE_ID_GTCO_10, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO_IPANEL_2, USB_DEVICE_ID_GTCO_8, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO_IPANEL_2, USB_DEVICE_ID_GTCO_d, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_KBGEAR, USB_DEVICE_ID_KBGEAR_JAMSTUDIO, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CASSY, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POCKETCASSY, HID_QUIRK_IGNORE },
@@ -951,7 +959,7 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ISO, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_POWERBOOK_ISO_KEYBOARD},

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS, HID_QUIRK_POWERBOOK_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ANSI, HID_QUIRK_POWERBOOK_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO, HID_QUIRK_POWERBOOK_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_POWERBOOK_ISO_KEYBOARD},

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS, HID_QUIRK_POWERBOOK_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY, HID_QUIRK_POWERBOOK_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY, HID_QUIRK_POWERBOOK_HAS_FN },
@@ -1187,7 +1195,7 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf) 


	hid->version = le16_to_cpu(hdesc->bcdHID);

	hid->country = hdesc->bCountryCode;

	hid->dev = &dev->dev;

	hid->dev = &intf->dev;

	usbhid->intf = intf;

	usbhid->ifnum = interface->desc.bInterfaceNumber;
@@ -1282,7 +1290,7 @@ static void hid_disconnect(struct usb_interface *intf) 
	usb_free_urb(usbhid->urbctrl);

	usb_free_urb(usbhid->urbout);



	hid_free_buffers(to_usb_device(hid->dev), hid);

	hid_free_buffers(hid_to_usb_dev(hid), hid);

	hid_free_device(hid);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE