Commit 0bf98542 authored by Linus Torvalds's avatar Linus Torvalds

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
...@@ -3334,9 +3334,8 @@ W: http://www.linux-usb.org/gadget ...@@ -3334,9 +3334,8 @@ W: http://www.linux-usb.org/gadget
S: Maintained S: Maintained
USB HID/HIDBP DRIVERS USB HID/HIDBP DRIVERS
P: Vojtech Pavlik P: Jiri Kosina
M: vojtech@suse.cz M: jkosina@suse.cz
L: linux-usb-users@lists.sourceforge.net
L: linux-usb-devel@lists.sourceforge.net L: linux-usb-devel@lists.sourceforge.net
S: Maintained S: Maintained
......
...@@ -880,6 +880,10 @@ static void hid_output_field(struct hid_field *field, __u8 *data) ...@@ -880,6 +880,10 @@ static void hid_output_field(struct hid_field *field, __u8 *data)
unsigned size = field->report_size; unsigned size = field->report_size;
unsigned n; 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++) { for (n = 0; n < count; n++) {
if (field->logical_minimum < 0) /* signed values */ if (field->logical_minimum < 0) /* signed values */
implement(data, offset + n * size, size, s32ton(field->value[n], size)); 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 ...@@ -947,7 +951,7 @@ int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int i
} }
#ifdef DEBUG_DATA #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 #endif
n = 0; /* Normally report number is 0 */ n = 0; /* Normally report number is 0 */
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/usb/input.h>
#undef DEBUG #undef DEBUG
...@@ -364,9 +363,22 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel ...@@ -364,9 +363,22 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
break; break;
case HID_UP_LED: case HID_UP_LED:
if (((usage->hid - 1) & 0xffff) >= LED_MAX)
goto ignore; switch (usage->hid & 0xffff) { /* HID-Value: */
map_led((usage->hid - 1) & 0xffff); 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; break;
case HID_UP_DIGITIZER: case HID_UP_DIGITIZER:
......
...@@ -7,7 +7,7 @@ comment "USB Input Devices" ...@@ -7,7 +7,7 @@ comment "USB Input Devices"
config USB_HID config USB_HID
tristate "USB Human Interface Device (full HID) support" tristate "USB Human Interface Device (full HID) support"
default y default y
depends on USB depends on USB && INPUT
select HID select HID
---help--- ---help---
Say Y here if you want full HID support to connect USB keyboards, Say Y here if you want full HID support to connect USB keyboards,
......
...@@ -106,18 +106,18 @@ static void hid_reset(struct work_struct *work) ...@@ -106,18 +106,18 @@ static void hid_reset(struct work_struct *work)
if (test_bit(HID_CLEAR_HALT, &usbhid->iofl)) { if (test_bit(HID_CLEAR_HALT, &usbhid->iofl)) {
dev_dbg(&usbhid->intf->dev, "clear halt\n"); 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); clear_bit(HID_CLEAR_HALT, &usbhid->iofl);
hid_start_in(hid); hid_start_in(hid);
} }
else if (test_bit(HID_RESET_PENDING, &usbhid->iofl)) { else if (test_bit(HID_RESET_PENDING, &usbhid->iofl)) {
dev_dbg(&usbhid->intf->dev, "resetting device\n"); 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) { 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) 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); clear_bit(HID_RESET_PENDING, &usbhid->iofl);
} }
...@@ -129,8 +129,8 @@ static void hid_reset(struct work_struct *work) ...@@ -129,8 +129,8 @@ static void hid_reset(struct work_struct *work)
break; break;
default: default:
err("can't reset device, %s-%s/input%d, status %d", err("can't reset device, %s-%s/input%d, status %d",
to_usb_device(hid->dev)->bus->bus_name, hid_to_usb_dev(hid)->bus->bus_name,
to_usb_device(hid->dev)->devpath, hid_to_usb_dev(hid)->devpath,
usbhid->ifnum, rc); usbhid->ifnum, rc);
/* FALLTHROUGH */ /* FALLTHROUGH */
case -EHOSTUNREACH: case -EHOSTUNREACH:
...@@ -217,8 +217,8 @@ static void hid_irq_in(struct urb *urb) ...@@ -217,8 +217,8 @@ static void hid_irq_in(struct urb *urb)
clear_bit(HID_IN_RUNNING, &usbhid->iofl); clear_bit(HID_IN_RUNNING, &usbhid->iofl);
if (status != -EPERM) { if (status != -EPERM) {
err("can't resubmit intr, %s-%s/input%d, status %d", err("can't resubmit intr, %s-%s/input%d, status %d",
to_usb_device(hid->dev)->bus->bus_name, hid_to_usb_dev(hid)->bus->bus_name,
to_usb_device(hid->dev)->devpath, hid_to_usb_dev(hid)->devpath,
usbhid->ifnum, status); usbhid->ifnum, status);
hid_io_error(hid); hid_io_error(hid);
} }
...@@ -251,7 +251,7 @@ static int hid_submit_out(struct hid_device *hid) ...@@ -251,7 +251,7 @@ static int hid_submit_out(struct hid_device *hid)
hid_output_report(report, usbhid->outbuf); hid_output_report(report, usbhid->outbuf);
usbhid->urbout->transfer_buffer_length = ((report->size - 1) >> 3) + 1 + (report->id > 0); 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"); dbg("submitting out urb");
...@@ -276,13 +276,13 @@ static int hid_submit_ctrl(struct hid_device *hid) ...@@ -276,13 +276,13 @@ static int hid_submit_ctrl(struct hid_device *hid)
len = ((report->size - 1) >> 3) + 1 + (report->id > 0); len = ((report->size - 1) >> 3) + 1 + (report->id > 0);
if (dir == USB_DIR_OUT) { if (dir == USB_DIR_OUT) {
hid_output_report(report, usbhid->ctrlbuf); 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; usbhid->urbctrl->transfer_buffer_length = len;
} else { } else {
int maxpacket, padlen; int maxpacket, padlen;
usbhid->urbctrl->pipe = usb_rcvctrlpipe(to_usb_device(hid->dev), 0); usbhid->urbctrl->pipe = usb_rcvctrlpipe(hid_to_usb_dev(hid), 0);
maxpacket = usb_maxpacket(to_usb_device(hid->dev), usbhid->urbctrl->pipe, 0); maxpacket = usb_maxpacket(hid_to_usb_dev(hid), usbhid->urbctrl->pipe, 0);
if (maxpacket > 0) { if (maxpacket > 0) {
padlen = (len + maxpacket - 1) / maxpacket; padlen = (len + maxpacket - 1) / maxpacket;
padlen *= maxpacket; padlen *= maxpacket;
...@@ -292,7 +292,7 @@ static int hid_submit_ctrl(struct hid_device *hid) ...@@ -292,7 +292,7 @@ static int hid_submit_ctrl(struct hid_device *hid)
padlen = 0; padlen = 0;
usbhid->urbctrl->transfer_buffer_length = padlen; 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->bRequestType = USB_TYPE_CLASS | USB_RECIP_INTERFACE | dir;
usbhid->cr->bRequest = (dir == USB_DIR_OUT) ? HID_REQ_SET_REPORT : HID_REQ_GET_REPORT; 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) ...@@ -582,6 +582,8 @@ void usbhid_init_reports(struct hid_device *hid)
} }
#define USB_VENDOR_ID_GTCO 0x078c #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_90 0x0090
#define USB_DEVICE_ID_GTCO_100 0x0100 #define USB_DEVICE_ID_GTCO_100 0x0100
#define USB_DEVICE_ID_GTCO_101 0x0101 #define USB_DEVICE_ID_GTCO_101 0x0101
...@@ -627,6 +629,9 @@ void usbhid_init_reports(struct hid_device *hid) ...@@ -627,6 +629,9 @@ void usbhid_init_reports(struct hid_device *hid)
#define USB_DEVICE_ID_GTCO_1004 0x1004 #define USB_DEVICE_ID_GTCO_1004 0x1004
#define USB_DEVICE_ID_GTCO_1005 0x1005 #define USB_DEVICE_ID_GTCO_1005 0x1005
#define USB_DEVICE_ID_GTCO_1006 0x1006 #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 #define USB_VENDOR_ID_WACOM 0x056a
...@@ -875,6 +880,9 @@ static const struct hid_blacklist { ...@@ -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_1004, HID_QUIRK_IGNORE },
{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1005, 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, 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_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_CASSY, HID_QUIRK_IGNORE },
{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POCKETCASSY, HID_QUIRK_IGNORE }, { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POCKETCASSY, HID_QUIRK_IGNORE },
...@@ -951,7 +959,7 @@ static const struct hid_blacklist { ...@@ -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_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_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_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_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_FOUNTAIN_TP_ONLY, HID_QUIRK_POWERBOOK_HAS_FN },
{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_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) ...@@ -1187,7 +1195,7 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
hid->version = le16_to_cpu(hdesc->bcdHID); hid->version = le16_to_cpu(hdesc->bcdHID);
hid->country = hdesc->bCountryCode; hid->country = hdesc->bCountryCode;
hid->dev = &dev->dev; hid->dev = &intf->dev;
usbhid->intf = intf; usbhid->intf = intf;
usbhid->ifnum = interface->desc.bInterfaceNumber; usbhid->ifnum = interface->desc.bInterfaceNumber;
...@@ -1282,7 +1290,7 @@ static void hid_disconnect(struct usb_interface *intf) ...@@ -1282,7 +1290,7 @@ static void hid_disconnect(struct usb_interface *intf)
usb_free_urb(usbhid->urbctrl); usb_free_urb(usbhid->urbctrl);
usb_free_urb(usbhid->urbout); 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); hid_free_device(hid);
} }
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/hid.h> #include <linux/hid.h>
#include "usbhid.h"
/* /*
* This table contains pointers to initializers. To add support for new * This table contains pointers to initializers. To add support for new
...@@ -70,8 +71,8 @@ static struct hid_ff_initializer inits[] = { ...@@ -70,8 +71,8 @@ static struct hid_ff_initializer inits[] = {
int hid_ff_init(struct hid_device* hid) int hid_ff_init(struct hid_device* hid)
{ {
struct hid_ff_initializer *init; struct hid_ff_initializer *init;
int vendor = le16_to_cpu(to_usb_device(hid->dev)->descriptor.idVendor); int vendor = le16_to_cpu(hid_to_usb_dev(hid)->descriptor.idVendor);
int product = le16_to_cpu(to_usb_device(hid->dev)->descriptor.idProduct); int product = le16_to_cpu(hid_to_usb_dev(hid)->descriptor.idProduct);
for (init = inits; init->idVendor; init++) for (init = inits; init->idVendor; init++)
if (init->idVendor == vendor && init->idProduct == product) if (init->idVendor == vendor && init->idProduct == product)
......
...@@ -384,7 +384,7 @@ static int hiddev_ioctl(struct inode *inode, struct file *file, unsigned int cmd ...@@ -384,7 +384,7 @@ static int hiddev_ioctl(struct inode *inode, struct file *file, unsigned int cmd
struct hiddev_list *list = file->private_data; struct hiddev_list *list = file->private_data;
struct hiddev *hiddev = list->hiddev; struct hiddev *hiddev = list->hiddev;
struct hid_device *hid = hiddev->hid; struct hid_device *hid = hiddev->hid;
struct usb_device *dev = to_usb_device(hid->dev); struct usb_device *dev = hid_to_usb_dev(hid);
struct hiddev_collection_info cinfo; struct hiddev_collection_info cinfo;
struct hiddev_report_info rinfo; struct hiddev_report_info rinfo;
struct hiddev_field_info finfo; struct hiddev_field_info finfo;
......
...@@ -80,5 +80,8 @@ struct usbhid_device { ...@@ -80,5 +80,8 @@ struct usbhid_device {
}; };
#define hid_to_usb_dev(hid_dev) \
container_of(hid_dev->dev->parent, struct usb_device, dev)
#endif #endif
...@@ -700,9 +700,10 @@ static char *keys[KEY_MAX + 1] = { ...@@ -700,9 +700,10 @@ static char *keys[KEY_MAX + 1] = {
static char *relatives[REL_MAX + 1] = { static char *relatives[REL_MAX + 1] = {
[REL_X] = "X", [REL_Y] = "Y", [REL_X] = "X", [REL_Y] = "Y",
[REL_Z] = "Z", [REL_HWHEEL] = "HWheel", [REL_Z] = "Z", [REL_RX] = "Rx",
[REL_DIAL] = "Dial", [REL_WHEEL] = "Wheel", [REL_RY] = "Ry", [REL_RZ] = "Rz",
[REL_MISC] = "Misc", [REL_HWHEEL] = "HWheel", [REL_DIAL] = "Dial",
[REL_WHEEL] = "Wheel", [REL_MISC] = "Misc",
}; };
static char *absolutes[ABS_MAX + 1] = { static char *absolutes[ABS_MAX + 1] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment