USB: move trancevibrator.c to the proper usb directory

It's not a input driver, so it doesn't belong in the input directory.


Cc: Sam Hocevar <sam@zoy.org>
Cc: Dmitry Torokhov <dtor@insightbb.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

3 files changed, 170 insertions, 0 deletions

diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig
index c29658f69e2a..a74bf8617e7f 100644
--- a/drivers/usb/misc/Kconfig
+++ b/drivers/usb/misc/Kconfig
@@ -223,6 +223,16 @@ config USB_LD
           To compile this driver as a module, choose M here: the
           module will be called ldusb.
 
+config USB_TRANCEVIBRATOR
+        tristate "PlayStation 2 Trance Vibrator driver support"
+        depends on USB
+        help
+          Say Y here if you want to connect a PlayStation 2 Trance Vibrator
+          device to your computer's USB port.
+
+          To compile this driver as a module, choose M here: the
+          module will be called trancevibrator.
+
 config USB_TEST
         tristate "USB testing driver (DEVELOPMENT)"
         depends on USB && USB_DEVICEFS && EXPERIMENTAL
diff --git a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile
index 2be70fa259bf..11dc59540cda 100644
--- a/drivers/usb/misc/Makefile
+++ b/drivers/usb/misc/Makefile
@@ -21,6 +21,7 @@ obj-$(CONFIG_USB_PHIDGETMOTORCONTROL)	+= phidgetmotorcontrol.o
 obj-$(CONFIG_USB_PHIDGETSERVO)  += phidgetservo.o
 obj-$(CONFIG_USB_RIO500)        += rio500.o
 obj-$(CONFIG_USB_TEST)          += usbtest.o
+obj-$(CONFIG_USB_TRANCEVIBRATOR)        += trancevibrator.o
 obj-$(CONFIG_USB_USS720)        += uss720.o
 
 obj-$(CONFIG_USB_SISUSBVGA)     += sisusbvga/
diff --git a/drivers/usb/misc/trancevibrator.c b/drivers/usb/misc/trancevibrator.c
new file mode 100644
index 000000000000..33cd91d11eca
--- /dev/null
+++ b/drivers/usb/misc/trancevibrator.c
@@ -0,0 +1,159 @@
+/*
+ * PlayStation 2 Trance Vibrator driver
+ *
+ * Copyright (C) 2006 Sam Hocevar <sam@zoy.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/* Standard include files */
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/usb.h>
+
+/* Version Information */
+#define DRIVER_VERSION "v1.1"
+#define DRIVER_AUTHOR "Sam Hocevar, sam@zoy.org"
+#define DRIVER_DESC "PlayStation 2 Trance Vibrator driver"
+
+#define TRANCEVIBRATOR_VENDOR_ID        0x0b49  /* ASCII Corporation */
+#define TRANCEVIBRATOR_PRODUCT_ID       0x064f  /* Trance Vibrator */
+
+static struct usb_device_id id_table [] = {
+        { USB_DEVICE(TRANCEVIBRATOR_VENDOR_ID, TRANCEVIBRATOR_PRODUCT_ID) },
+        { },
+};
+MODULE_DEVICE_TABLE (usb, id_table);
+
+/* Driver-local specific stuff */
+struct trancevibrator {
+        struct usb_device *udev;
+        unsigned int speed;
+};
+
+static ssize_t show_speed(struct device *dev, struct device_attribute *attr,
+                          char *buf)
+{
+        struct usb_interface *intf = to_usb_interface(dev);
+        struct trancevibrator *tv = usb_get_intfdata(intf);
+
+        return sprintf(buf, "%d\n", tv->speed);
+}
+
+static ssize_t set_speed(struct device *dev, struct device_attribute *attr,
+                         const char *buf, size_t count)
+{
+        struct usb_interface *intf = to_usb_interface(dev);
+        struct trancevibrator *tv = usb_get_intfdata(intf);
+        int temp, retval;
+
+        temp = simple_strtoul(buf, NULL, 10);
+        if (temp > 255)
+                temp = 255;
+        else if (temp < 0)
+                temp = 0;
+        tv->speed = temp;
+
+        dev_dbg(&tv->udev->dev, "speed = %d\n", tv->speed);
+
+        /* Set speed */
+        retval = usb_control_msg(tv->udev, usb_sndctrlpipe(tv->udev, 0),
+                                 0x01, /* vendor request: set speed */
+                                 USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_OTHER,
+                                 tv->speed, /* speed value */
+                                 0, NULL, 0, USB_CTRL_GET_TIMEOUT);
+        if (retval) {
+                dev_dbg(&tv->udev->dev, "retval = %d\n", retval);
+                return retval;
+        }
+        return count;
+}
+
+static DEVICE_ATTR(speed, S_IWUGO | S_IRUGO, show_speed, set_speed);
+
+static int tv_probe(struct usb_interface *interface,
+                    const struct usb_device_id *id)
+{
+        struct usb_device *udev = interface_to_usbdev(interface);
+        struct trancevibrator *dev;
+        int retval;
+
+        dev = kzalloc(sizeof(struct trancevibrator), GFP_KERNEL);
+        if (dev == NULL) {
+                dev_err(&interface->dev, "Out of memory\n");
+                retval = -ENOMEM;
+                goto error;
+        }
+
+        dev->udev = usb_get_dev(udev);
+        usb_set_intfdata(interface, dev);
+        retval = device_create_file(&interface->dev, &dev_attr_speed);
+        if (retval)
+                goto error_create_file;
+
+        return 0;
+
+error_create_file:
+        usb_put_dev(udev);
+        usb_set_intfdata(interface, NULL);
+error:
+        kfree(dev);
+        return retval;
+}
+
+static void tv_disconnect(struct usb_interface *interface)
+{
+        struct trancevibrator *dev;
+
+        dev = usb_get_intfdata (interface);
+        usb_set_intfdata(interface, NULL);
+        device_remove_file(&interface->dev, &dev_attr_speed);
+        usb_put_dev(dev->udev);
+        kfree(dev);
+}
+
+/* USB subsystem object */
+static struct usb_driver tv_driver = {
+        .name =         "trancevibrator",
+        .probe =        tv_probe,
+        .disconnect =   tv_disconnect,
+        .id_table =     id_table,
+};
+
+static int __init tv_init(void)
+{
+        int retval = usb_register(&tv_driver);
+        if (retval) {
+                err("usb_register failed. Error number %d", retval);
+                return retval;
+        }
+
+        info(DRIVER_VERSION ":" DRIVER_DESC);
+        return 0;
+}
+
+static void __exit tv_exit(void)
+{
+        usb_deregister(&tv_driver);
+}
+
+module_init (tv_init);
+module_exit (tv_exit);
+
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL");