usb/hid: The HID Simple Driver Interface 0.3.2 (core)
PATCH 1/1 usb/hid: The HID Simple Driver Interface 0.3.2 (core)
Changelogs:
1. A bugfix for clear usage process.
This driver requires:
1. [PATCH] usb: HID Simple Driver Interface 0.3.1 (Kconfig and Makefile), this patch can be used without any change.
PS: Who is the maintainer of the input subsystem today? Should I forward this mail to him/her?
It can be applied on 2.6.18 at least.
Signed-off-by Liyu <[email protected]>
drivers/usb/input.new/hid-core.c renamed from drivers/usb/input/hid-core.c +207 -7
@@ -26,6 +26,7 @@#include <asm/byteorder.h> #include <linux/input.h> #include <linux/wait.h> +#include <linux/mutex.h> #undef DEBUG#undef DEBUG_DATA
@@ -33,6 +34,7 @@#include <linux/usb.h> #include "hid.h" +#include "hid-simple.h" #include <linux/hiddev.h> /*
@@ -46,6 +48,15 @@static char *hid_types[] = {"Device" ,"Pointer" ,"Mouse" ,"Device" ,"Joystick" ,"Gamepad" ,"Keyboard" ,"Keypad" ,"Multi-Axis Controller" }; + +/* +* The global data structure for simple device driver interface. +*/ +static DEFINE_MUTEX (matched_devices_lock); +static DEFINE_MUTEX (simple_drivers_lock); +static struct list_head matched_devices_list; +static struct list_head simple_drivers_list; +/* * Module parameters. */
@@ -785,8 +796,18 @@ static __inline__ int search(__s32 *arrastatic void hid_process_event (struct hid_device *hid,struct hid_field *field,struct hid_usage *usage,__s32 value,int interrupt,struct pt_regs *regs) {hid_dump_input (usage, value); -if (hid->claimed &HID_CLAIMED_INPUT ) +if (hid->claimed &HID_CLAIMED_INPUT ) { +/* event filter here */ +if (hid->simple) { +if (hid->simple->pre_event && + !hid->simple->pre_event (hid, field, usage, + value, regs)) +return ; + }hidinput_hid_event (hid, field, usage, value, regs); +if (hid->simple && hid->simple->post_event) + hid->simple->post_event (hid, field, usage, value, regs); + }if (hid->claimed &HID_CLAIMED_HIDDEV && interrupt)hiddev_hid_event (hid, field, usage, value, regs); }
@@ -832,7 +853,6 @@ static void hid_input_field(struct hid_d && field->usage[field->value[n] - min].hid && search(value, field->value[n], count))hid_process_event (hid, field, &field->usage[field->value[n] - min],0 , interrupt, regs); -if (value[n] >= min && value[n] <= max && field->usage[value[n] - min].hid &&search (field->value, value[n], count))
@@ -2031,8 +2051,33 @@ static void hid_disconnect(struct usb_indel_timer_sync (&hid->io_retry);flush_scheduled_work (); -if (hid->claimed &HID_CLAIMED_INPUT ) +if (hid->claimed &HID_CLAIMED_INPUT ) { +struct list_head *node; +struct matched_device *matched; + + matched =NULL ; +mutex_lock (&matched_devices_lock); +list_for_each (node, &matched_devices_list) { + matched = list_entry(node, struct matched_device, node); +if (matched->intf == intf) { +list_del (&matched->node); +break ; + } + matched =NULL ; + } +mutex_unlock (&matched_devices_lock); +/* disconnect simple device driver if need */ +if (matched && hid->simple) { +hidinput_simple_driver_disconnect (hid); +module_put (hid->simple->owner); +hidinput_simple_driver_pop (hid, matched); + } +if (matched) { + matched->intf =NULL ; +kfree (matched); + }hidinput_disconnect (hid); + }if (hid->claimed &HID_CLAIMED_HIDDEV )hiddev_disconnect (hid);
@@ -2045,6 +2090,141 @@ static void hid_disconnect(struct usb_inhid_free_device (hid); } +#ifdef CONFIG_HID_SIMPLE +static int hidinput_simple_driver_bind_one (struct hidinput_simple_driver *simple, +struct hid_device *hid, +struct matched_device *matched) +{ +int ret; + +if (!try_module_get (simple->owner)) +return -ENODEV ; + ret =hidinput_simple_driver_connect (simple, hid); +if (ret) + goto exit_err; + ret =hidinput_simple_driver_push (hid, simple, matched); +if (ret) + goto exit_err; +hidinput_simple_driver_setup_usage (hid); +printk (KERN_INFO "The Simple HID driver \'%s\' attach on \'%s\'\n" , + simple->name, hid->name); + goto exit; +exit_err: +module_put (simple->owner); +exit: +return ret; +} + +static void hidinput_simple_driver_bind_foreach_simple ( +struct matched_device *matched) +{ +struct hidinput_simple_driver *simple; +struct list_head *node; +struct hid_device *hid; + +if (!matched->intf) +return ; + hid =usb_get_intfdata (matched->intf); +if (!hid || hid->simple) +return ; + +mutex_lock (&simple_drivers_lock); +list_for_each (node, &simple_drivers_list) { + simple = list_entry(node, struct hidinput_simple_driver, node); +if (test_bit (HIDINPUT_SIMPLE_CONNECTED , &simple->flags)) +continue ; +if (usb_match_id (matched->intf, simple->id_table)) { +hidinput_simple_driver_bind_one (simple, hid, matched); +break ; + } + } +mutex_unlock (&simple_drivers_lock); +} + +static void hidinput_simple_driver_bind_foreach (void ) +{ +struct hidinput_simple_driver *simple; +struct matched_device *matched=NULL ; +struct list_head *matched_node =NULL ; +struct list_head *simple_node =NULL ; +struct hid_device *hid=NULL ; + +mutex_lock (&matched_devices_lock); +list_for_each (matched_node, &matched_devices_list) { + matched = list_entry(matched_node, struct matched_device, node); + hid =usb_get_intfdata (matched->intf); +if (hid->simple) +continue ; +mutex_lock (&simple_drivers_lock); +list_for_each (simple_node, &simple_drivers_list) { + simple = list_entry(simple_node, struct hidinput_simple_driver, node); + +if (test_bit (HIDINPUT_SIMPLE_CONNECTED , &simple->flags)) +continue ; +if (!usb_match_id (matched->intf, simple->id_table)) +continue ; +hidinput_simple_driver_bind_one (simple, hid, matched); + } +mutex_unlock (&simple_drivers_lock); + } +mutex_unlock (&matched_devices_lock); +} + +static void hidinput_simple_driver_bind_foreach_matched ( +struct hidinput_simple_driver *simple) +{ +struct list_head *node=NULL ; +struct matched_device *matched; +struct hid_device *hid=NULL ; + +if (!simple ||test_bit (HIDINPUT_SIMPLE_CONNECTED , &simple->flags)) +return ; + +mutex_lock (&matched_devices_lock); +list_for_each (node, &matched_devices_list) { + matched = list_entry(node, struct matched_device, node); + hid =usb_get_intfdata (matched->intf); +if (hid->simple) +continue ; +if (!usb_match_id (matched->intf, simple->id_table)) +continue ; +hidinput_simple_driver_bind_one (simple, hid, matched); + } +mutex_unlock (&matched_devices_lock); +} + +int hidinput_register_simple_driver (struct hidinput_simple_driver *simple) +{ +if (!simple || !simple->name) +return -EINVAL ; + +printk (KERN_INFO "The Simple HID driver \'%s\' register.\n" , + simple->name); +hidinput_simple_driver_init (simple); +hidinput_simple_driver_bind_foreach_matched (simple); + +mutex_lock (&simple_drivers_lock); +list_add (&simple->node, &simple_drivers_list); +mutex_unlock (&simple_drivers_lock); + +return 0 ; +} +EXPORT_SYMBOL_GPL (hidinput_register_simple_driver); + +void hidinput_unregister_simple_driver (struct hidinput_simple_driver *simple) +{ +printk (KERN_INFO "The Simple HID driver \'%s\' unregister.\n" , + simple->name); +hidinput_simple_driver_clear (simple); +mutex_lock (&simple_drivers_lock); +list_del (&simple->node); +mutex_unlock (&simple_drivers_lock); +/* to active simple device driver that it is waiting */ +hidinput_simple_driver_bind_foreach (); +} +EXPORT_SYMBOL_GPL (hidinput_unregister_simple_driver); +#endif +static int hid_probe (struct usb_interface *intf,const struct usb_device_id *id) {struct hid_device *hid;
@@ -2061,15 +2241,25 @@ static int hid_probe(struct usb_interfachid_init_reports (hid);hid_dump_device (hid); -if (!hidinput_connect (hid)) +usb_set_intfdata (intf, hid); + +if (!hidinput_connect (hid)) { +struct matched_device *matched; + matched =kmalloc (sizeof (struct matched_device ),GFP_KERNEL ); +if (matched) { + matched->intf = intf; +mutex_lock (&matched_devices_lock); +list_add (&matched->node, &matched_devices_list); +mutex_unlock (&matched_devices_lock); +hidinput_simple_driver_bind_foreach_simple (matched); + } hid->claimed |=HID_CLAIMED_INPUT ; + }if (!hiddev_connect (hid)) hid->claimed |=HID_CLAIMED_HIDDEV ; -usb_set_intfdata (intf, hid); -if (!hid->claimed) { -printk ("HID device not claimed by input or hiddev\n" ); +printk (KERN_INFO "HID device not claimed by input or hiddev\n" );hid_disconnect (intf);return -ENODEV ; }
@@ -2168,6 +2358,8 @@ static int __init hid_init(void) retval =hiddev_init ();if (retval) goto hiddev_init_fail; +INIT_LIST_HEAD (&matched_devices_list); +INIT_LIST_HEAD (&simple_drivers_list); retval =usb_register (&hid_driver);if (retval) goto usb_register_fail;
@@ -2182,7 +2374,15 @@ hiddev_init_fail: static void __exit hid_exit(void) { +struct list_head *node, *tmp; +struct matched_device *matched; +usb_deregister (&hid_driver); +list_for_each_safe (node, tmp, &matched_devices_list) { + matched = list_entry(node, struct matched_device, node); +list_del (&matched->node); +kfree (matched); + }hiddev_exit (); }
drivers/usb/input.new/hid.h renamed from drivers/usb/input/hid.h +5 -0
@@ -389,8 +389,11 @@ struct hid_input {struct list_head list;struct hid_report *report;struct input_dev *input; +void *private; }; +struct hidinput_simple_driver ; +struct hid_device {/* device report descriptor */ __u8 *rdesc;unsigned rsize;
@@ -454,6 +457,8 @@ struct hid_device { /* device repoint (*ff_event)(struct hid_device *hid,struct input_dev *input,unsigned int type,unsigned int code,int value); +struct hidinput_simple_driver *simple; +#ifdef CONFIG_USB_HIDINPUT_POWERBOOK unsigned long pb_pressed_fn[NBITS (KEY_MAX )];unsigned long pb_pressed_numlock[NBITS (KEY_MAX )];
drivers/usb/input.new/hid-input.c renamed from drivers/usb/input/hid-input.c +21 -4
@@ -34,7 +34,7 @@#undef DEBUG#include "hid.h" - +#include "hid-simple.h" #define unk KEY_UNKNOWNstatic const unsigned char hid_keyboard[256 ] = {
@@ -61,6 +61,8 @@ static const struct {__s32 y; } hid_hat_to_axis[] = {{ 0, 0}, { 0,-1}, { 1,-1}, { 1, 0}, { 1, 1}, { 0, 1}, {-1, 1}, {-1, 0}, {-1,-1}}; +typedef void (*do_usage_t )(struct hid_field *,struct hid_usage *); +#define map_abs (c) do { usage->code = c; usage->type = EV_ABS; bit = input->absbit; max = ABS_MAX; } while (0)#define map_rel (c) do { usage->code = c; usage->type = EV_REL; bit = input->relbit; max = REL_MAX; } while (0)#define map_key (c) do { usage->code = c; usage->type = EV_KEY; bit = input->keybit; max = KEY_MAX; } while (0)
@@ -747,8 +749,13 @@ static int hidinput_input_event(struct istruct hid_field *field;int offset; -if (type ==EV_FF ) +if (type ==EV_FF ) { +if (hid->simple && hid->simple->ff_event) { +if (!hid->simple->ff_event (dev, type, code, value)); +return 0 ; + }return hid_ff_event (hid, dev, type, code, value); + }if (type !=EV_LED )return -1 ;
@@ -767,12 +774,22 @@ static int hidinput_input_event(struct istatic int hidinput_open (struct input_dev *dev) {struct hid_device *hid = dev->private; -return hid_open (hid); +int ret =0 ; + +if (hid->simple && hid->simple->open) + ret = hid->simple->open (dev); +if (!ret) +return hid_open (hid); +else +return ret; }static void hidinput_close (struct input_dev *dev) {struct hid_device *hid = dev->private; + +if (hid->simple && hid->simple->close) + hid->simple->close (dev);hid_close (hid); }
@@ -821,7 +838,7 @@ int hidinput_connect(struct hid_device * input_dev->event = hidinput_input_event; input_dev->open = hidinput_open; input_dev->close = hidinput_close; - +hidinput_simple_driver_ff_init (input_dev); input_dev->name = hid->name; input_dev->phys = hid->phys; input_dev->uniq = hid->uniq;
drivers/usb/input.new/hid-simple.c renamed from drivers/usb/input/hid-simple.c +315 -0
315 lines not on this page · raw message
drivers/usb/input.new/hid-simple.h renamed from drivers/usb/input/hid-simple.h +232 -0
232 lines not on this page · raw message
drivers/usb/input.new/btp2118.c renamed from drivers/usb/input/btp2118.c +434 -0
434 lines not on this page · raw message
drivers/usb/input.new/hid-core.c renamed from drivers/usb/input/hid-core.c +207 -7
282 lines not on this page · raw message
drivers/usb/input.new/hid.h renamed from drivers/usb/input/hid.h +5 -0
@@ -389,8 +389,11 @@ struct hid_input {struct list_head list;struct hid_report *report;struct input_dev *input; +void *private; }; +struct hidinput_simple_driver ; +struct hid_device {/* device report descriptor */ __u8 *rdesc;unsigned rsize;
@@ -454,6 +457,8 @@ struct hid_device { /* device repoint (*ff_event)(struct hid_device *hid,struct input_dev *input,unsigned int type,unsigned int code,int value); +struct hidinput_simple_driver *simple; +#ifdef CONFIG_USB_HIDINPUT_POWERBOOK unsigned long pb_pressed_fn[NBITS (KEY_MAX )];unsigned long pb_pressed_numlock[NBITS (KEY_MAX )];
drivers/usb/input.new/hid-input.c renamed from drivers/usb/input/hid-input.c +21 -4
@@ -34,7 +34,7 @@#undef DEBUG#include "hid.h" - +#include "hid-simple.h" #define unk KEY_UNKNOWNstatic const unsigned char hid_keyboard[256 ] = {
@@ -61,6 +61,8 @@ static const struct {__s32 y; } hid_hat_to_axis[] = {{ 0, 0}, { 0,-1}, { 1,-1}, { 1, 0}, { 1, 1}, { 0, 1}, {-1, 1}, {-1, 0}, {-1,-1}}; +typedef void (*do_usage_t )(struct hid_field *,struct hid_usage *); +#define map_abs (c) do { usage->code = c; usage->type = EV_ABS; bit = input->absbit; max = ABS_MAX; } while (0)#define map_rel (c) do { usage->code = c; usage->type = EV_REL; bit = input->relbit; max = REL_MAX; } while (0)#define map_key (c) do { usage->code = c; usage->type = EV_KEY; bit = input->keybit; max = KEY_MAX; } while (0)
@@ -747,8 +749,13 @@ static int hidinput_input_event(struct istruct hid_field *field;int offset; -if (type ==EV_FF ) +if (type ==EV_FF ) { +if (hid->simple && hid->simple->ff_event) { +if (!hid->simple->ff_event (dev, type, code, value)); +return 0 ; + }return hid_ff_event (hid, dev, type, code, value); + }if (type !=EV_LED )return -1 ;
@@ -767,12 +774,22 @@ static int hidinput_input_event(struct istatic int hidinput_open (struct input_dev *dev) {struct hid_device *hid = dev->private; -return hid_open (hid); +int ret =0 ; + +if (hid->simple && hid->simple->open) + ret = hid->simple->open (dev); +if (!ret) +return hid_open (hid); +else +return ret; }static void hidinput_close (struct input_dev *dev) {struct hid_device *hid = dev->private; + +if (hid->simple && hid->simple->close) + hid->simple->close (dev);hid_close (hid); }
@@ -821,7 +838,7 @@ int hidinput_connect(struct hid_device * input_dev->event = hidinput_input_event; input_dev->open = hidinput_open; input_dev->close = hidinput_close; - +hidinput_simple_driver_ff_init (input_dev); input_dev->name = hid->name; input_dev->phys = hid->phys; input_dev->uniq = hid->uniq;
drivers/usb/input.new/hid-simple.c renamed from drivers/usb/input/hid-simple.c +315 -0
315 lines not on this page · raw message
drivers/usb/input.new/hid-simple.h renamed from drivers/usb/input/hid-simple.h +232 -0
232 lines not on this page · raw message
drivers/usb/input.new/Kconfig renamed from drivers/usb/input/Kconfig +28 -0
@@ -326,3 +326,31 @@ config USB_APPLETOUCH To compile this driver as a module, choose M here: the module will be called appletouch. + +config HID_SIMPLE + bool "HID simple driver interface" + depends on USB_HIDINPUT + help + This simple interface let the writing HID driver more easier. Moreover, + this allow you write force-feedback driver without touch HID input + implementation code. Also, it can be used as input filter. + +config HID_SIMPLE_MSNEK4K + tristate "Microsoft Natural Ergonomic Keyboard 4000 Driver" + depends on HID_SIMPLE + help + Microsoft Natural Ergonomic Keyboard 4000 extend keys support. These + may not work without change user space configration, e.g, XKB conf- + iguration in X. + +config HID_SIMPLE_FF + bool "HID simple driver interface force feedback support" + depends on HID_SIMPLE && !HID_FF + help + This feature can not be compatible with "Force feedback support" (HID_FF). + +config HID_SIMPLE_FF_BTP2118 + tristate "Betop 2118 joystick force feedback support" + depends on HID_SIMPLE_FF + help + This can enable Betop 2118 joystick force feedback feature.
drivers/usb/input.new/Makefile renamed from drivers/usb/input/Makefile +5 -0
@@ -25,6 +25,9 @@ endif ifeq ($(CONFIG_HID_FF),y) usbhid-objs += hid-ff.o endif +ifeq ($(CONFIG_HID_SIMPLE),y) + usbhid-objs += hid-simple.o +endif obj-$(CONFIG_USB_AIPTEK) += aiptek.o obj-$(CONFIG_USB_ATI_REMOTE) += ati_remote.o
@@ -44,6 +47,8 @@ obj-$(CONFIG_USB_ACECAD) += acecad.o obj-$(CONFIG_USB_YEALINK) += yealink.o obj-$(CONFIG_USB_XPAD) += xpad.o obj-$(CONFIG_USB_APPLETOUCH) += appletouch.o +obj-$(CONFIG_HID_SIMPLE_MSNEK4K) += usbnek4k.o +obj-$(CONFIG_HID_SIMPLE_FF_BTP2118) += btp2118.o ifeq ($(CONFIG_USB_DEBUG),y) EXTRA_CFLAGS += -DDEBUG
drivers/usb/input.new/usbnek4k.c renamed from drivers/usb/input/usbnek4k.c +210 -0
210 lines not on this page · raw message