Commit 7426ef52 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'upstream' into for-linus 

Conflicts:
	drivers/hid/hid-wacom.c
parents 537b60d1 a8ab5d58

Documentation/ABI/testing/sysfs-wacom

0 → 100644
+10 −0
Original line number Diff line number Diff line 
What:		/sys/class/hidraw/hidraw*/device/speed

Date:		April 2010

Kernel Version:	2.6.35

Contact:	linux-bluetooth@vger.kernel.org

Description:

		The /sys/class/hidraw/hidraw*/device/speed file controls

		reporting speed of wacom bluetooth tablet. Reading from

		this file returns 1 if tablet reports in high speed mode

		or 0 otherwise. Writing to this file one of these values

		switches reporting speed.

drivers/hid/Kconfig

+17 −2
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ config HID_SAMSUNG 
	depends on USB_HID

	default !EMBEDDED

	---help---

	Support for Samsung InfraRed remote control.

	Support for Samsung InfraRed remote control or keyboards.



config HID_SONY

	tristate "Sony" if EMBEDDED
@@ -332,7 +332,7 @@ config HID_TOPSEED 
	depends on USB_HID

	default !EMBEDDED

	---help---

	Say Y if you have a TopSeed Cyberlink remote control.

	Say Y if you have a TopSeed Cyberlink or BTC Emprex remote control.



config HID_THRUSTMASTER

	tristate "ThrustMaster devices support" if EMBEDDED
@@ -357,6 +357,14 @@ config HID_WACOM 
	---help---

	Support for Wacom Graphire Bluetooth tablet.



config HID_WACOM_POWER_SUPPLY

	bool "Wacom Bluetooth devices power supply status support"

	depends on HID_WACOM

	select POWER_SUPPLY

	---help---

	  Say Y here if you want to enable power supply status monitoring for

	  Wacom Bluetooth devices.



config HID_ZEROPLUS

	tristate "Zeroplus based game controller support" if EMBEDDED

	depends on USB_HID
@@ -372,6 +380,13 @@ config ZEROPLUS_FF 
	  Say Y here if you have a Zeroplus based game controller and want

	  to have force feedback support for it.



config HID_ZYDACRON

	tristate "Zydacron remote control support" if EMBEDDED

	depends on USB_HID

	default !EMBEDDED

	---help---

	Support for Zydacron remote control.



endmenu



endif # HID_SUPPORT

drivers/hid/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ obj-$(CONFIG_HID_THRUSTMASTER) += hid-tmff.o 
obj-$(CONFIG_HID_TOPSEED)	+= hid-topseed.o

obj-$(CONFIG_HID_TWINHAN)	+= hid-twinhan.o

obj-$(CONFIG_HID_ZEROPLUS)	+= hid-zpff.o

obj-$(CONFIG_HID_ZYDACRON)	+= hid-zydacron.o

obj-$(CONFIG_HID_WACOM)		+= hid-wacom.o



obj-$(CONFIG_USB_HID)		+= usbhid/

drivers/hid/hid-3m-pct.c

+28 −3
Original line number Diff line number Diff line 
/*

 *  HID driver for 3M PCT multitouch panels

 *

 *  Copyright (c) 2009 Stephane Chatty <chatty@enac.fr>

 *  Copyright (c) 2009-2010 Stephane Chatty <chatty@enac.fr>

 *

 */
@@ -25,7 +25,7 @@ MODULE_LICENSE("GPL"); 
#include "hid-ids.h"



struct mmm_finger {

	__s32 x, y;

	__s32 x, y, w, h;

	__u8 rank;

	bool touch, valid;

};
@@ -82,7 +82,18 @@ static int mmm_input_mapping(struct hid_device *hdev, struct hid_input *hi, 
			/* touchscreen emulation */

			hid_map_usage(hi, usage, bit, max, EV_KEY, BTN_TOUCH);

			return 1;

		case HID_DG_WIDTH:

			hid_map_usage(hi, usage, bit, max,

					EV_ABS, ABS_MT_TOUCH_MAJOR);

			return 1;

		case HID_DG_HEIGHT:

			hid_map_usage(hi, usage, bit, max,

					EV_ABS, ABS_MT_TOUCH_MINOR);

			input_set_abs_params(hi->input, ABS_MT_ORIENTATION,

					1, 1, 0, 0);

			return 1;

		case HID_DG_CONTACTID:

			field->logical_maximum = 59;

			hid_map_usage(hi, usage, bit, max,

					EV_ABS, ABS_MT_TRACKING_ID);

			return 1;
@@ -128,9 +139,15 @@ static void mmm_filter_event(struct mmm_data *md, struct input_dev *input) 
			/* this finger is just placeholder data, ignore */

		} else if (f->touch) {

			/* this finger is on the screen */

			int wide = (f->w > f->h);

			input_event(input, EV_ABS, ABS_MT_TRACKING_ID, i);

			input_event(input, EV_ABS, ABS_MT_POSITION_X, f->x);

			input_event(input, EV_ABS, ABS_MT_POSITION_Y, f->y);

			input_event(input, EV_ABS, ABS_MT_ORIENTATION, wide);

			input_event(input, EV_ABS, ABS_MT_TOUCH_MAJOR,

						wide ? f->w : f->h);

			input_event(input, EV_ABS, ABS_MT_TOUCH_MINOR,

						wide ? f->h : f->w);

			input_mt_sync(input);

			/*

			 * touchscreen emulation: maintain the age rank
@@ -197,6 +214,14 @@ static int mmm_event(struct hid_device *hid, struct hid_field *field, 
		case HID_DG_CONFIDENCE:

			md->valid = value;

			break;

		case HID_DG_WIDTH:

			if (md->valid)

				md->f[md->curid].w = value;

			break;

		case HID_DG_HEIGHT:

			if (md->valid)

				md->f[md->curid].h = value;

			break;

		case HID_DG_CONTACTID:

			if (md->valid) {

				md->curid = value;
@@ -255,6 +280,7 @@ static void mmm_remove(struct hid_device *hdev) 


static const struct hid_device_id mmm_devices[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_3M, USB_DEVICE_ID_3M1968) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_3M, USB_DEVICE_ID_3M2256) },

	{ }

};

MODULE_DEVICE_TABLE(hid, mmm_devices);
@@ -287,5 +313,4 @@ static void __exit mmm_exit(void) 


module_init(mmm_init);

module_exit(mmm_exit);

MODULE_LICENSE("GPL");

drivers/hid/hid-core.c

+13 −10
Original line number Diff line number Diff line
@@ -653,10 +653,9 @@ int hid_parse_report(struct hid_device *device, __u8 *start, 
	if (device->driver->report_fixup)

		device->driver->report_fixup(device, start, size);



	device->rdesc = kmalloc(size, GFP_KERNEL);

	device->rdesc = kmemdup(start, size, GFP_KERNEL);

	if (device->rdesc == NULL)

		return -ENOMEM;

	memcpy(device->rdesc, start, size);

	device->rsize = size;



	parser = vmalloc(sizeof(struct hid_parser));
@@ -940,13 +939,8 @@ static void hid_output_field(struct hid_field *field, __u8 *data) 
	unsigned count = field->report_count;

	unsigned offset = field->report_offset;

	unsigned size = field->report_size;

	unsigned bitsused = offset + count * size;

	unsigned n;



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

	if (count > 0 && size > 0 && (bitsused % 8) != 0)

		data[(bitsused-1)/8] &= (1 << (bitsused % 8)) - 1;



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

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

			implement(data, offset + n * size, size, s32ton(field->value[n], size));
@@ -966,6 +960,7 @@ void hid_output_report(struct hid_report *report, __u8 *data) 
	if (report->id > 0)

		*data++ = report->id;



	memset(data, 0, ((report->size - 1) >> 3) + 1);

	for (n = 0; n < report->maxfield; n++)

		hid_output_field(report->field[n], data);

}
@@ -1167,6 +1162,8 @@ int hid_connect(struct hid_device *hdev, unsigned int connect_mask) 
	unsigned int i;

	int len;



	if (hdev->quirks & HID_QUIRK_HIDDEV_FORCE)

		connect_mask |= (HID_CONNECT_HIDDEV_FORCE | HID_CONNECT_HIDDEV);

	if (hdev->bus != BUS_USB)

		connect_mask &= ~HID_CONNECT_HIDDEV;

	if (hid_hiddev(hdev))
@@ -1246,6 +1243,7 @@ EXPORT_SYMBOL_GPL(hid_disconnect); 
/* a list of devices for which there is a specialized driver on HID bus */

static const struct hid_device_id hid_blacklist[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_3M, USB_DEVICE_ID_3M1968) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_3M, USB_DEVICE_ID_3M2256) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ATV_IRCONTROL) },
@@ -1290,6 +1288,7 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION_SOLAR) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },
@@ -1343,6 +1342,7 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },
@@ -1359,8 +1359,10 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_TWINHAN, USB_DEVICE_ID_TWINHAN_IR_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ZYDACRON, USB_DEVICE_ID_ZYDACRON_REMOTE_CONTROL) },



	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT) },

	{ }
@@ -1757,7 +1759,7 @@ int hid_add_device(struct hid_device *hdev) 


	/* we need to kill them here, otherwise they will stay allocated to

	 * wait for coming driver */

	if (hid_ignore(hdev))

	if (!(hdev->quirks & HID_QUIRK_NO_IGNORE) && hid_ignore(hdev))

		return -ENODEV;



	/* XXX hack, any other cleaner solution after the driver core
@@ -1765,11 +1767,12 @@ int hid_add_device(struct hid_device *hdev) 
	dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,

		     hdev->vendor, hdev->product, atomic_inc_return(&id));



	hid_debug_register(hdev, dev_name(&hdev->dev));

	ret = device_add(&hdev->dev);

	if (!ret)

		hdev->status |= HID_STAT_ADDED;



	hid_debug_register(hdev, dev_name(&hdev->dev));

	else

		hid_debug_unregister(hdev);



	return ret;

}