linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [RFC v2] [HID] allow using external Hid Descriptors.
@ 2009-12-24 13:52 Marcin Tolysz
  2009-12-31 19:24 ` Marcin Tolysz
  0 siblings, 1 reply; 2+ messages in thread
From: Marcin Tolysz @ 2009-12-24 13:52 UTC (permalink / raw)
  To: linux-input; +Cc: Jiri Kosina

It simple yet effective way of changing HID device descriptors
using kernel firmware loading mechanism.
Each time kernel will initialise a new hid device it will print
as INFO the searched location for new descriptor.

Just place your new descriptor in binary format in this location
i.e. somewhere in /lib/firmware/hid/
and it will use it in-place of HID descriptor of the device.

This is good enough for now but ideally there should be a way of
hotswaping it (i.e. while using this device) now we need to reconnect it.
This would be ideal for some game controllers where you change its layout
dynamically depending on add-ons you connect to it (i.e. wii)

There are few questions:
1) What file name should have in it? What in it: SN, VEN,PROD,BUS,VER,...
 giving the ability to hard code each device, or to rely on "hotplug".
2) Should we print the info each time as we can see the info from
 the firmware_class telling us the location.

Signed-off-by: Marcin Tolysz <tolysz@gmail.com>
---
 drivers/hid/hid-core.c |   29 ++++++++++++++++++++++++++++-
 1 files changed, 28 insertions(+), 1 deletions(-)

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 80792d3..4ee4299 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -27,6 +27,7 @@
 #include <linux/wait.h>
 #include <linux/vmalloc.h>
 #include <linux/sched.h>
+#include <linux/firmware.h>
 
 #include <linux/hid.h>
 #include <linux/hiddev.h>
@@ -640,6 +641,10 @@ int hid_parse_report(struct hid_device *device, __u8 *start,
 	struct hid_item item;
 	__u8 *end;
 	int ret;
+	const struct firmware *fw;
+	int fw_fail;
+	const char *file;
+
 	static int (*dispatch_type[])(struct hid_parser *parser,
 				      struct hid_item *item) = {
 		hid_parser_main,
@@ -650,10 +655,28 @@ int hid_parse_report(struct hid_device *device, __u8 *start,
 
 	if (device->driver->report_fixup)
 		device->driver->report_fixup(device, start, size);
+	/* Now try to load a hid descriptor from a file firmware
+	if succesful ignoring this fixup thing */
+	file = kasprintf(GFP_KERNEL, "hid/%04X:%04X:%04X:%04X.bin",
+			device->bus, device->vendor, device->product, device->version);
+
+	fw_fail = request_firmware(&fw, file, &device->dev);
+
+	if (fw_fail)
+		pr_info("To relace HID descriptor place it in /lib/firmaware/%s\n", file);
+	else{
+		start = fw->data;
+		size = fw->size;
+		pr_info("HID descriptor relaced with /lib/firmaware/%s\n", file);
+	}
+	kfree(file);
 
 	device->rdesc = kmalloc(size, GFP_KERNEL);
-	if (device->rdesc == NULL)
+	if (device->rdesc == NULL) {
+		if (!fw_fail)
+			release_firmware(fw);
 		return -ENOMEM;
+	}
 	memcpy(device->rdesc, start, size);
 	device->rsize = size;
 
@@ -690,6 +713,8 @@ int hid_parse_report(struct hid_device *device, __u8 *start,
 				dbg_hid("unbalanced delimiter at end of report description\n");
 				goto err;
 			}
+			if (!fw_fail)
+				release_firmware(fw);
 			vfree(parser);
 			return 0;
 		}
@@ -697,6 +722,8 @@ int hid_parse_report(struct hid_device *device, __u8 *start,
 
 	dbg_hid("item fetching failed at offset %d\n", (int)(end - start));
 err:
+	if (!fw_fail)
+		release_firmware(fw);
 	vfree(parser);
 	return ret;
 }
-- 
1.6.5.7


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2009-12-31 19:24 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-24 13:52 [RFC v2] [HID] allow using external Hid Descriptors Marcin Tolysz
2009-12-31 19:24 ` Marcin Tolysz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).