[PATCH] INPUT: rename input_dev_class to input_class to be correct.
[deliverable/linux.git] / drivers / input / input.c
index 88636a204525e84862972ea7034c02ae020ae4bb..a8f65fa7e17a056a797b1b06b4872f967f8d8c95 100644 (file)
 #include <linux/interrupt.h>
 #include <linux/poll.h>
 #include <linux/device.h>
-#include <linux/devfs_fs_kernel.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>");
 MODULE_DESCRIPTION("Input core");
 MODULE_LICENSE("GPL");
 
+EXPORT_SYMBOL(input_allocate_device);
 EXPORT_SYMBOL(input_register_device);
 EXPORT_SYMBOL(input_unregister_device);
 EXPORT_SYMBOL(input_register_handler);
@@ -39,7 +39,7 @@ EXPORT_SYMBOL(input_close_device);
 EXPORT_SYMBOL(input_accept_process);
 EXPORT_SYMBOL(input_flush_device);
 EXPORT_SYMBOL(input_event);
-EXPORT_SYMBOL(input_class);
+EXPORT_SYMBOL_GPL(input_class);
 
 #define INPUT_DEVICES  256
 
@@ -308,6 +308,7 @@ static struct input_device_id *input_match_device(struct input_device_id *id, st
                MATCH_BIT(ledbit, LED_MAX);
                MATCH_BIT(sndbit, SND_MAX);
                MATCH_BIT(ffbit,  FF_MAX);
+               MATCH_BIT(swbit,  SW_MAX);
 
                return id;
        }
@@ -433,6 +434,23 @@ static void input_call_hotplug(char *verb, struct input_dev *dev)
 
 #endif
 
+static int input_print_bitmap(char *buf, unsigned long *bitmap, int max)
+{
+       int i;
+       int len = 0;
+
+       for (i = NBITS(max) - 1; i > 0; i--)
+               if (bitmap[i])
+                       break;
+
+       for (; i >= 0; i--)
+               len += sprintf(buf + len, "%lx%s", bitmap[i], i > 0 ? " " : "");
+
+       len += sprintf(buf + len, "\n");
+
+       return len;
+}
+
 #ifdef CONFIG_PROC_FS
 
 static struct proc_dir_entry *proc_bus_input_dir;
@@ -454,37 +472,38 @@ static unsigned int input_devices_poll(struct file *file, poll_table *wait)
        return 0;
 }
 
-#define SPRINTF_BIT_B(bit, name, max) \
-       do { \
-               len += sprintf(buf + len, "B: %s", name); \
-               for (i = NBITS(max) - 1; i >= 0; i--) \
-                       if (dev->bit[i]) break; \
-               for (; i >= 0; i--) \
-                       len += sprintf(buf + len, "%lx ", dev->bit[i]); \
-               len += sprintf(buf + len, "\n"); \
+#define SPRINTF_BIT_B(ev, bm)                                          \
+       do {                                                            \
+               len += sprintf(buf + len, "B: %s=", #ev);               \
+               len += input_print_bitmap(buf + len,                    \
+                                       dev->bm##bit, ev##_MAX);        \
        } while (0)
 
-#define SPRINTF_BIT_B2(bit, name, max, ev) \
-       do { \
-               if (test_bit(ev, dev->evbit)) \
-                       SPRINTF_BIT_B(bit, name, max); \
+#define SPRINTF_BIT_B2(ev, bm)                                         \
+       do {                                                            \
+               if (test_bit(EV_##ev, dev->evbit))                      \
+                       SPRINTF_BIT_B(ev, bm);                          \
        } while (0)
 
 static int input_devices_read(char *buf, char **start, off_t pos, int count, int *eof, void *data)
 {
        struct input_dev *dev;
        struct input_handle *handle;
+       const char *path;
 
        off_t at = 0;
-       int i, len, cnt = 0;
+       int len, cnt = 0;
 
        list_for_each_entry(dev, &input_dev_list, node) {
 
+               path = dev->dynalloc ? kobject_get_path(&dev->cdev.kobj, GFP_KERNEL) : NULL;
+
                len = sprintf(buf, "I: Bus=%04x Vendor=%04x Product=%04x Version=%04x\n",
                        dev->id.bustype, dev->id.vendor, dev->id.product, dev->id.version);
 
                len += sprintf(buf + len, "N: Name=\"%s\"\n", dev->name ? dev->name : "");
                len += sprintf(buf + len, "P: Phys=%s\n", dev->phys ? dev->phys : "");
+               len += sprintf(buf + len, "S: Sysfs=%s\n", path ? path : "");
                len += sprintf(buf + len, "H: Handlers=");
 
                list_for_each_entry(handle, &dev->h_list, d_node)
@@ -492,15 +511,15 @@ static int input_devices_read(char *buf, char **start, off_t pos, int count, int
 
                len += sprintf(buf + len, "\n");
 
-               SPRINTF_BIT_B(evbit, "EV=", EV_MAX);
-               SPRINTF_BIT_B2(keybit, "KEY=", KEY_MAX, EV_KEY);
-               SPRINTF_BIT_B2(relbit, "REL=", REL_MAX, EV_REL);
-               SPRINTF_BIT_B2(absbit, "ABS=", ABS_MAX, EV_ABS);
-               SPRINTF_BIT_B2(mscbit, "MSC=", MSC_MAX, EV_MSC);
-               SPRINTF_BIT_B2(ledbit, "LED=", LED_MAX, EV_LED);
-               SPRINTF_BIT_B2(sndbit, "SND=", SND_MAX, EV_SND);
-               SPRINTF_BIT_B2(ffbit,  "FF=",  FF_MAX, EV_FF);
-               SPRINTF_BIT_B2(swbit,  "SW=",  SW_MAX, EV_SW);
+               SPRINTF_BIT_B(EV, ev);
+               SPRINTF_BIT_B2(KEY, key);
+               SPRINTF_BIT_B2(REL, rel);
+               SPRINTF_BIT_B2(ABS, abs);
+               SPRINTF_BIT_B2(MSC, msc);
+               SPRINTF_BIT_B2(LED, led);
+               SPRINTF_BIT_B2(SND, snd);
+               SPRINTF_BIT_B2(FF, ff);
+               SPRINTF_BIT_B2(SW, sw);
 
                len += sprintf(buf + len, "\n");
 
@@ -515,6 +534,8 @@ static int input_devices_read(char *buf, char **start, off_t pos, int count, int
                        if (cnt >= count)
                                break;
                }
+
+               kfree(path);
        }
 
        if (&dev->node == &input_dev_list)
@@ -605,6 +626,154 @@ static inline int input_proc_init(void) { return 0; }
 static inline void input_proc_exit(void) { }
 #endif
 
+#define INPUT_DEV_STRING_ATTR_SHOW(name)                                       \
+static ssize_t input_dev_show_##name(struct class_device *dev, char *buf)      \
+{                                                                              \
+       struct input_dev *input_dev = to_input_dev(dev);                        \
+       int retval;                                                             \
+                                                                               \
+       retval = down_interruptible(&input_dev->sem);                           \
+       if (retval)                                                             \
+               return retval;                                                  \
+                                                                               \
+       retval = sprintf(buf, "%s\n", input_dev->name ? input_dev->name : "");  \
+                                                                               \
+       up(&input_dev->sem);                                                    \
+                                                                               \
+       return retval;                                                          \
+}                                                                              \
+static CLASS_DEVICE_ATTR(name, S_IRUGO, input_dev_show_##name, NULL);
+
+INPUT_DEV_STRING_ATTR_SHOW(name);
+INPUT_DEV_STRING_ATTR_SHOW(phys);
+INPUT_DEV_STRING_ATTR_SHOW(uniq);
+
+static struct attribute *input_dev_attrs[] = {
+       &class_device_attr_name.attr,
+       &class_device_attr_phys.attr,
+       &class_device_attr_uniq.attr,
+       NULL
+};
+
+static struct attribute_group input_dev_group = {
+       .attrs  = input_dev_attrs,
+};
+
+#define INPUT_DEV_ID_ATTR(name)                                                        \
+static ssize_t input_dev_show_id_##name(struct class_device *dev, char *buf)   \
+{                                                                              \
+       struct input_dev *input_dev = to_input_dev(dev);                        \
+       return sprintf(buf, "%04x\n", input_dev->id.name);                      \
+}                                                                              \
+static CLASS_DEVICE_ATTR(name, S_IRUGO, input_dev_show_id_##name, NULL);
+
+INPUT_DEV_ID_ATTR(bustype);
+INPUT_DEV_ID_ATTR(vendor);
+INPUT_DEV_ID_ATTR(product);
+INPUT_DEV_ID_ATTR(version);
+
+static struct attribute *input_dev_id_attrs[] = {
+       &class_device_attr_bustype.attr,
+       &class_device_attr_vendor.attr,
+       &class_device_attr_product.attr,
+       &class_device_attr_version.attr,
+       NULL
+};
+
+static struct attribute_group input_dev_id_attr_group = {
+       .name   = "id",
+       .attrs  = input_dev_id_attrs,
+};
+
+#define INPUT_DEV_CAP_ATTR(ev, bm)                                             \
+static ssize_t input_dev_show_cap_##bm(struct class_device *dev, char *buf)    \
+{                                                                              \
+       struct input_dev *input_dev = to_input_dev(dev);                        \
+       return input_print_bitmap(buf, input_dev->bm##bit, ev##_MAX);           \
+}                                                                              \
+static CLASS_DEVICE_ATTR(bm, S_IRUGO, input_dev_show_cap_##bm, NULL);
+
+INPUT_DEV_CAP_ATTR(EV, ev);
+INPUT_DEV_CAP_ATTR(KEY, key);
+INPUT_DEV_CAP_ATTR(REL, rel);
+INPUT_DEV_CAP_ATTR(ABS, abs);
+INPUT_DEV_CAP_ATTR(MSC, msc);
+INPUT_DEV_CAP_ATTR(LED, led);
+INPUT_DEV_CAP_ATTR(SND, snd);
+INPUT_DEV_CAP_ATTR(FF, ff);
+INPUT_DEV_CAP_ATTR(SW, sw);
+
+static struct attribute *input_dev_caps_attrs[] = {
+       &class_device_attr_ev.attr,
+       &class_device_attr_key.attr,
+       &class_device_attr_rel.attr,
+       &class_device_attr_abs.attr,
+       &class_device_attr_msc.attr,
+       &class_device_attr_led.attr,
+       &class_device_attr_snd.attr,
+       &class_device_attr_ff.attr,
+       &class_device_attr_sw.attr,
+       NULL
+};
+
+static struct attribute_group input_dev_caps_attr_group = {
+       .name   = "capabilities",
+       .attrs  = input_dev_caps_attrs,
+};
+
+static void input_dev_release(struct class_device *class_dev)
+{
+       struct input_dev *dev = to_input_dev(class_dev);
+
+       kfree(dev);
+       module_put(THIS_MODULE);
+}
+
+struct class input_class = {
+       .name                   = "input",
+       .release                = input_dev_release,
+};
+
+struct input_dev *input_allocate_device(void)
+{
+       struct input_dev *dev;
+
+       dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
+       if (dev) {
+               dev->dynalloc = 1;
+               dev->cdev.class = &input_class;
+               class_device_initialize(&dev->cdev);
+               INIT_LIST_HEAD(&dev->h_list);
+               INIT_LIST_HEAD(&dev->node);
+       }
+
+       return dev;
+}
+
+static void input_register_classdevice(struct input_dev *dev)
+{
+       static atomic_t input_no = ATOMIC_INIT(0);
+       const char *path;
+
+       __module_get(THIS_MODULE);
+
+       dev->dev = dev->cdev.dev;
+
+       snprintf(dev->cdev.class_id, sizeof(dev->cdev.class_id),
+                "input%ld", (unsigned long) atomic_inc_return(&input_no) - 1);
+
+       path = kobject_get_path(&dev->cdev.class->subsys.kset.kobj, GFP_KERNEL);
+       printk(KERN_INFO "input: %s/%s as %s\n",
+               dev->name ? dev->name : "Unspecified device",
+               path ? path : "", dev->cdev.class_id);
+       kfree(path);
+
+       class_device_add(&dev->cdev);
+       sysfs_create_group(&dev->cdev.kobj, &input_dev_group);
+       sysfs_create_group(&dev->cdev.kobj, &input_dev_id_attr_group);
+       sysfs_create_group(&dev->cdev.kobj, &input_dev_caps_attr_group);
+}
+
 void input_register_device(struct input_dev *dev)
 {
        struct input_handle *handle;
@@ -631,12 +800,16 @@ void input_register_device(struct input_dev *dev)
        INIT_LIST_HEAD(&dev->h_list);
        list_add_tail(&dev->node, &input_dev_list);
 
+       if (dev->dynalloc)
+               input_register_classdevice(dev);
+
        list_for_each_entry(handler, &input_handler_list, node)
                if (!handler->blacklist || !input_match_device(handler->blacklist, dev))
                        if ((id = input_match_device(handler->id_table, dev)))
                                if ((handle = handler->connect(handler, dev, id)))
                                        input_link_handle(handle);
 
+
 #ifdef CONFIG_HOTPLUG
        input_call_hotplug("add", dev);
 #endif
@@ -665,6 +838,12 @@ void input_unregister_device(struct input_dev *dev)
 
        list_del_init(&dev->node);
 
+       if (dev->dynalloc) {
+               sysfs_remove_group(&dev->cdev.kobj, &input_dev_caps_attr_group);
+               sysfs_remove_group(&dev->cdev.kobj, &input_dev_id_attr_group);
+               class_device_unregister(&dev->cdev);
+       }
+
        input_wakeup_procfs_readers();
 }
 
@@ -747,16 +926,14 @@ static struct file_operations input_fops = {
        .open = input_open_file,
 };
 
-struct class *input_class;
-
 static int __init input_init(void)
 {
        int err;
 
-       input_class = class_create(THIS_MODULE, "input");
-       if (IS_ERR(input_class)) {
-               printk(KERN_ERR "input: unable to register input class\n");
-               return PTR_ERR(input_class);
+       err = class_register(&input_class);
+       if (err) {
+               printk(KERN_ERR "input: unable to register input_dev class\n");
+               return err;
        }
 
        err = input_proc_init();
@@ -769,24 +946,18 @@ static int __init input_init(void)
                goto fail2;
        }
 
-       err = devfs_mk_dir("input");
-       if (err)
-               goto fail3;
-
        return 0;
 
- fail3:        unregister_chrdev(INPUT_MAJOR, "input");
  fail2:        input_proc_exit();
- fail1:        class_destroy(input_class);
+ fail1:        class_unregister(&input_class);
        return err;
 }
 
 static void __exit input_exit(void)
 {
        input_proc_exit();
-       devfs_remove("input");
        unregister_chrdev(INPUT_MAJOR, "input");
-       class_destroy(input_class);
+       class_unregister(&input_class);
 }
 
 subsys_initcall(input_init);
This page took 0.051016 seconds and 5 git commands to generate.