USB input layer improvements

diff -u -r1.16 hid-core.c
@@ -621,6 +621,8 @@
 	for (i = 0; i < HID_REPORT_TYPES; i++)
 		INIT_LIST_HEAD(&device->report_enum[i].report_list);
 
+	INIT_LIST_HEAD(&device->inputs);
+
 	if (!(device->rdesc = (__u8 *)kmalloc(size, GFP_KERNEL))) {
 		kfree(device);
 		return NULL;

@@ -1291,8 +1300,20 @@
 		hid->claimed |= HID_CLAIMED_HIDDEV;
 	printk(KERN_INFO);
 
-	if (hid->claimed & HID_CLAIMED_INPUT)
-		printk("input%d", hid->input.number);
+	if (hid->claimed & HID_CLAIMED_INPUT) {
+		struct list_head *lh;
+		struct hid_input *hidinput;
+		int count = 0;
+
+		list_for_each (lh, &hid->inputs) {
+			hidinput = list_entry(lh, struct hid_input, list);
+
+			if (count++)
+				printk(",");
+
+			printk("input%d", hidinput->input.number);
+		}
+	}
 	if (hid->claimed == (HID_CLAIMED_INPUT | HID_CLAIMED_HIDDEV))
 		printk(",");
 	if (hid->claimed & HID_CLAIMED_HIDDEV)

136 lines not on this page · raw message

diff -u -r1.10 hid.h
@@ -294,6 +294,13 @@
 #define HID_CLAIMED_INPUT	1
 #define HID_CLAIMED_HIDDEV	2
 
+struct hid_input {
+	struct list_head list;
+	struct hid_field **fields;
+	int maxfield;
+	struct input_dev input;
+};
+
 struct hid_device {							/* device report descriptor */
 	 __u8 *rdesc;
 	unsigned rsize;

@@ -316,7 +323,7 @@
 	unsigned claimed;						/* Claimed by hidinput, hiddev? */	
 	unsigned quirks;						/* Various quirks the device can pull on us */
 
-	struct input_dev input;						/* The input structure */
+	struct list_head inputs;					/* The list of inputs */
 	void *hiddev;							/* The hiddev structure */
 	int minor;							/* Hiddev minor number */
 

diff -u -r1.16 hid-core.c
@@ -752,14 +754,21 @@
 	unsigned count = field->report_count;
 	unsigned offset = field->report_offset;
 	unsigned size = field->report_size;
-	__s32 min = field->logical_minimum;
-	__s32 max = field->logical_maximum;
+	__s32 min, max;
 	__s32 value[count]; /* WARNING: gcc specific */
 
+	if (field->physical_minimum != field->physical_maximum) {
+		min = field->physical_minimum;
+		max = field->physical_maximum;
+	} else {
+		min = field->logical_minimum;
+		max = field->logical_maximum;
+	}
+
 	for (n = 0; n < count; n++) {
+			__u32 val = extract(data, offset + n * size, size);
 
-			value[n] = min < 0 ? snto32(extract(data, offset + n * size, size), size) :
-						    extract(data, offset + n * size, size);
+			value[n] = min < 0 ? snto32(val, size) : val;
 
 			if (!(field->flags & HID_MAIN_ITEM_VARIABLE) /* Ignore report if ErrorRollOver */
 			    && value[n] >= min && value[n] <= max

diff -u -r1.7 hid-input.c
@@ -277,8 +297,15 @@
 	if (usage->code > max) return;
 
 	if (usage->type == EV_ABS) {
-		int a = field->logical_minimum;
-		int b = field->logical_maximum;
+		int a, b;
+
+		if (field->physical_minimum != field->physical_maximum) {
+			a = field->physical_minimum;
+			b = field->physical_maximum;
+		} else {
+			a = field->logical_minimum;
+			b = field->logical_maximum;
+		}
 
 		input->absmin[usage->code] = a;
 		input->absmax[usage->code] = b;

diff -u -u -r1.11 hid-input.c
@@ -60,9 +60,29 @@
 	__s32 y;
 }  hid_hat_to_axis[] = {{ 0, 0}, { 0,-1}, { 1,-1}, { 1, 0}, { 1, 1}, { 0, 1}, {-1, 1}, {-1, 0}, {-1,-1}};
 
-static void hidinput_configure_usage(struct hid_device *device, struct hid_field *field, struct hid_usage *usage)
+static struct input_dev *find_input(struct hid_device *hid, struct hid_field *field)
 {
-	struct input_dev *input = &device->input;
+	struct list_head *lh;
+	struct hid_input *hidinput;
+
+	list_for_each (lh, &hid->inputs) {
+		int i;
+
+		hidinput = list_entry(lh, struct hid_input, list);
+
+		for (i = 0; i < hidinput->maxfield; i++)
+			if (hidinput->fields[i] == field)
+				return &hidinput->input;
+	}
+
+	return NULL;
+}
+
+static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_field *field,
+				     struct hid_usage *usage)
+{
+	struct input_dev *input = &hidinput->input;
+	struct hid_device *device = hidinput->input.private;
 	int max;
 	int is_abs = 0;
 	unsigned long *bit;

@@ -387,9 +407,12 @@
 
 void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct hid_usage *usage, __s32 value, struct pt_regs *regs)
 {
-	struct input_dev *input = &hid->input;
+	struct input_dev *input = find_input(hid, field);
 	int *quirks = &hid->quirks;
 
+	if (!input)
+		return;
+
 	input_regs(input, regs);
 
 	if (usage->hat_min != usage->hat_max) {

@@ -442,7 +465,13 @@
 
 void hidinput_report_event(struct hid_device *hid, struct hid_report *report)
 {
-	input_sync(&hid->input);
+	struct list_head *lh;
+	struct hid_input *hidinput;
+
+	list_for_each (lh, &hid->inputs) {
+		hidinput = list_entry(lh, struct hid_input, list);
+		input_sync(&hidinput->input);
+        }
 }
 
 static int hidinput_input_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)

@@ -489,7 +518,7 @@
 	struct hid_report_enum *report_enum;
 	struct hid_report *report;
 	struct list_head *list;
-	int i, j, k;
+	int i, j;
 
 	for (i = 0; i < hid->maxcollection; i++)
 		if (hid->collection[i].type == HID_COLLECTION_APPLICATION &&

@@ -499,37 +528,63 @@
 	if (i == hid->maxcollection)
 		return -1;
 
-	hid->input.private = hid;
-	hid->input.event = hidinput_input_event;
-	hid->input.open = hidinput_open;
-	hid->input.close = hidinput_close;
-
-	hid->input.name = hid->name;
-	hid->input.phys = hid->phys;
-	hid->input.uniq = hid->uniq;
-	hid->input.id.bustype = BUS_USB;
-	hid->input.id.vendor = dev->descriptor.idVendor;
-	hid->input.id.product = dev->descriptor.idProduct;
-	hid->input.id.version = dev->descriptor.bcdDevice;
-
-	for (k = HID_INPUT_REPORT; k <= HID_OUTPUT_REPORT; k++) {
-		report_enum = hid->report_enum + k;
-		list = report_enum->report_list.next;
-		while (list != &report_enum->report_list) {
-			report = (struct hid_report *) list;
-			for (i = 0; i < report->maxfield; i++)
-				for (j = 0; j < report->field[i]->maxusage; j++)
-					hidinput_configure_usage(hid, report->field[i], report->field[i]->usage + j);
-			list = list->next;
+	report_enum = hid->report_enum + HID_INPUT_REPORT;
+	list = report_enum->report_list.next;
+	while (list != &report_enum->report_list) {
+		struct hid_input *hidinput;
+
+		report = (struct hid_report *) list;
+
+		if (!report->maxfield)
+			continue;
+
+		hidinput = kmalloc(sizeof(*hidinput), GFP_KERNEL);
+		if (!hidinput) {
+			err("Out of memory during hid input probe");
+			return -1;
 		}
-	}
 
-	input_register_device(&hid->input);
+		memset(hidinput, 0, sizeof(*hidinput));
+
+		hidinput->input.private = hid;
+		hidinput->input.event = hidinput_input_event;
+		hidinput->input.open = hidinput_open;
+		hidinput->input.close = hidinput_close;
+
+		hidinput->input.name = hid->name;
+		hidinput->input.phys = hid->phys;
+		hidinput->input.uniq = hid->uniq;
+		hidinput->input.id.bustype = BUS_USB;
+		hidinput->input.id.vendor = dev->descriptor.idVendor;
+		hidinput->input.id.product = dev->descriptor.idProduct;
+		hidinput->input.id.version = dev->descriptor.bcdDevice;
+
+		hidinput->fields = report->field;
+		hidinput->maxfield = report->maxfield;
+
+		for (i = 0; i < report->maxfield; i++)
+			for (j = 0; j < report->field[i]->maxusage; j++)
+				hidinput_configure_usage(hidinput, report->field[i],
+							 report->field[i]->usage + j);
+
+		list_add_tail(&hidinput->list, &hid->inputs);
+
+		input_register_device(&hidinput->input);
+
+		list = list->next;
+	}
 
 	return 0;
 }
 
 void hidinput_disconnect(struct hid_device *hid)
 {
-	input_unregister_device(&hid->input);
+	struct list_head *lh, *next;
+	struct hid_input *hidinput;
+
+	list_for_each_safe (lh, next, &hid->inputs) {
+		hidinput = list_entry(lh, struct hid_input, list);
+		input_unregister_device(&hidinput->input);
+		list_del(&hidinput->list);
+	}
 }

diff -u -u -r1.11 hid.h
@@ -321,6 +321,13 @@
 #define HID_CTRL_RUNNING	1
 #define HID_OUT_RUNNING		2
 
+struct hid_input {
+	struct list_head list;
+	struct hid_field **fields;
+	int maxfield;
+	struct input_dev input;
+};
+
 struct hid_device {							/* device report descriptor */
 	 __u8 *rdesc;
 	unsigned rsize;

@@ -360,7 +367,7 @@
 	unsigned claimed;						/* Claimed by hidinput, hiddev? */	
 	unsigned quirks;						/* Various quirks the device can pull on us */
 
-	struct input_dev input;						/* The input structure */
+	struct list_head inputs;					/* The list of inputs */
 	void *hiddev;							/* The hiddev structure */
 	int minor;							/* Hiddev minor number */