usb/hid: The HID Simple Driver Patches 0.4.1 (all-in-one)
PATCH 1/1 usb/hid: The HID Simple Driver Patches 0.4.1 (all-in-one)
This patch set include follow patches:
1. [PATCH] usb/hid: The HID Simple Driver Interface 0.4.1 (core)
2. [PATCH] usb/hid:Microsoft Natural Ergonomic Keyboard 4000 Driver 0.4.0
3. Some related kbuild changes.
The code base is 2.6.19.
Is this ready to merge? or What still is problem in them? Thanks.
Signed-off-by Liyu <[email protected]>
drivers/usb/input/hid-core.c +200 -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. */
@@ -818,8 +829,13 @@ 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) {hid_dump_input (usage, value); -if (hid->claimed &HID_CLAIMED_INPUT ) -hidinput_hid_event (hid, field, usage, value); +if (hid->claimed &HID_CLAIMED_INPUT ) { +if (!hidinput_simple_event_filter (hid, field, usage, value)) +return ; +hidinput_hid_event (hid, field, usage, value); +hidinput_simple_event_post (hid, field, usage, value); + } +if (hid->claimed &HID_CLAIMED_HIDDEV && interrupt)hiddev_hid_event (hid, field, usage, value); }
@@ -2097,8 +2113,32 @@ 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 =NULL ; +struct hidinput_simple_driver *simple = hid->simple; + +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 && simple) { +hidinput_simple_driver_disconnect (hid, matched); +module_put (simple->owner); + } +if (matched) { + matched->intf =NULL ; +kfree (matched); + }hidinput_disconnect (hid); + }if (hid->claimed &HID_CLAIMED_HIDDEV )hiddev_disconnect (hid);
@@ -2111,6 +2151,139 @@ 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 reload) +{ +int ret; + +if (!try_module_get (simple->owner)) +return -ENODEV ; +/* +* If the simple driver register itself after device insert, +* we must send hotplug message to userspace again, elsewise, +* we will break down some applications. +*/ +if (reload &&hidinput_disconnect_core (hid)) { +module_put (simple->owner); +return -ENODEV ; + } + ret =hidinput_simple_driver_connect (simple, hid, matched); + +if (reload) +hidinput_reconnect_core (hid);/* To activate this input_dev */ +if (!ret) +printk (KERN_INFO "The simple driver \'%s\' attach" +" to the device \'%s\'\n" , simple->name, hid->name); +else +module_put (simple->owner); +return 0 ; +} + +/* Only be called in hid_probe(), so we just use the hid of matched->intf. */ +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 || !matched->intf)/* should not get here */ +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 (usb_match_id (matched->intf, simple->id_table)) { +if (!hidinput_simple_driver_bind_one (simple, hid, matched,0 )) +break ; + } + } +mutex_unlock (&simple_drivers_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) +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 || hid->simple) +continue ; +if (!usb_match_id (matched->intf, simple->id_table)) +continue ; +if (!hidinput_simple_driver_bind_one (simple, hid, matched,1 )) +break ; + } +mutex_unlock (&matched_devices_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 , *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 || 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 (!usb_match_id (matched->intf, simple->id_table)) +continue ; +hidinput_simple_driver_bind_one (simple, hid, matched,1 ); + } +mutex_unlock (&simple_drivers_lock); + } +mutex_unlock (&matched_devices_lock); +} + +int hidinput_register_simple_driver (struct hidinput_simple_driver *simple) +{ +if (!simple || !simple->name) +return -EINVAL ; + +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) +{ +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;
@@ -2127,15 +2300,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 ; }
@@ -2234,6 +2417,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;
@@ -2248,7 +2433,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/hid.h +14 -1
@@ -33,7 +33,7 @@#include <linux/list.h> #include <linux/timer.h> #include <linux/workqueue.h> - +#include <linux/mutex.h> /* * USB HID (Human Interface Device) interface class code */
@@ -390,8 +390,15 @@ struct hid_input {struct list_head list;struct hid_report *report;struct input_dev *input; +unsigned long input_lock;/* To protect accessing input_dev from +* hid-input processing. But it not +* necessary for accessing this input_dev +* instance from input subsystem. */ +void *private; }; +struct hidinput_simple_driver ; +struct hid_device {/* device report descriptor */ __u8 *rdesc;unsigned rsize;
@@ -450,6 +457,8 @@ struct hid_device { /* device repochar phys[64 ];/* Device physical location */ char uniq[64 ];/* Device unique identifier (serial #) */ +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 )];
@@ -504,12 +513,16 @@ extern void hidinput_hid_event(struct hiextern void hidinput_report_event (struct hid_device *hid,struct hid_report *report);extern int hidinput_connect (struct hid_device *);extern void hidinput_disconnect (struct hid_device *); +extern void hidinput_reconnect_core (struct hid_device *); +extern int hidinput_disconnect_core (struct hid_device *);#else #define IS_INPUT_APPLICATION (a) (0)static inline void hidinput_hid_event (struct hid_device *hid,struct hid_field *field,struct hid_usage *usage,__s32 value) { }static inline void hidinput_report_event (struct hid_device *hid,struct hid_report *report) { }static inline int hidinput_connect (struct hid_device *hid) {return -ENODEV ; }static inline void hidinput_disconnect (struct hid_device *hid) { } +static inline void hidinput_reconnect_core (struct hid_device *hid) { } +static inline int hidinput_disconnect_core (struct hid_device *hid) {return -ENODEV ; }#endif int hid_open (struct hid_device *);
drivers/usb/input/hid-input.c +147 -40
357 lines not on this page · raw message
drivers/usb/input/hid-simple.c +326 -0
326 lines not on this page · raw message
drivers/usb/input/hid-simple.h +221 -0
221 lines not on this page · raw message
drivers/usb/input/Kconfig +17 -0
@@ -348,3 +348,20 @@ 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 + configuration in X. +
drivers/usb/input/Makefile +4 -0
@@ -29,6 +29,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
@@ -48,6 +51,7 @@ 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 ifeq ($(CONFIG_USB_DEBUG),y) EXTRA_CFLAGS += -DDEBUG
drivers/usb/input/usbnek4k.c +251 -0
251 lines not on this page · raw message