Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=df23fa01acc77444453633e1dec59cd7a4ea8ec3
Commit:     df23fa01acc77444453633e1dec59cd7a4ea8ec3
Parent:     8903795a5275e0366acf961190c57074ad27f9bb
Author:     Greg Kroah-Hartman <[EMAIL PROTECTED]>
AuthorDate: Sat Jan 13 10:57:42 2007 -0800
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Fri Feb 16 15:32:17 2007 -0800

    USB: Driver to charge USB blackberry devices
    
    A simple driver to turn on the charging capability of a USB BlackBerry
    device when it is plugged into the machine.  It does not bind to the
    device, so all userspace programs can still sync properly with it.
    
    Note, if CONFIG_USB_SUSPEND is enabled, it can play havoc with this
    device as the power to the port will be shut down.  This device id will
    have to be added to the global blacklist table when it is created.
    
    Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
 drivers/usb/Makefile            |    1 +
 drivers/usb/misc/Kconfig        |   11 +++
 drivers/usb/misc/Makefile       |    1 +
 drivers/usb/misc/berry_charge.c |  140 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 153 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index 825bf88..8b7ff46 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -51,6 +51,7 @@ obj-$(CONFIG_USB_SERIAL)      += serial/
 obj-$(CONFIG_USB_ADUTUX)       += misc/
 obj-$(CONFIG_USB_APPLEDISPLAY) += misc/
 obj-$(CONFIG_USB_AUERSWALD)    += misc/
+obj-$(CONFIG_USB_BERRY_CHARGE) += misc/
 obj-$(CONFIG_USB_CYPRESS_CY7C63)+= misc/
 obj-$(CONFIG_USB_CYTHERM)      += misc/
 obj-$(CONFIG_USB_EMI26)                += misc/
diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig
index a74bf86..4907e8b 100644
--- a/drivers/usb/misc/Kconfig
+++ b/drivers/usb/misc/Kconfig
@@ -88,6 +88,17 @@ config USB_LCD
          To compile this driver as a module, choose M here: the
          module will be called usblcd.
 
+config USB_BERRY_CHARGE
+       tristate "USB BlackBerry recharge support"
+       depends on USB
+       help
+         Say Y here if you want to connect a BlackBerry device to your
+         computer's USB port and have it automatically switch to "recharge"
+         mode.
+
+         To compile this driver as a module, choose M here: the
+         module will be called berry_charge.
+
 config USB_LED
        tristate "USB LED driver support"
        depends on USB
diff --git a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile
index 2cba07d..dac2d5b 100644
--- a/drivers/usb/misc/Makefile
+++ b/drivers/usb/misc/Makefile
@@ -6,6 +6,7 @@
 obj-$(CONFIG_USB_ADUTUX)       += adutux.o
 obj-$(CONFIG_USB_APPLEDISPLAY) += appledisplay.o
 obj-$(CONFIG_USB_AUERSWALD)    += auerswald.o
+obj-$(CONFIG_USB_BERRY_CHARGE) += berry_charge.o
 obj-$(CONFIG_USB_CYPRESS_CY7C63)+= cypress_cy7c63.o
 obj-$(CONFIG_USB_CYTHERM)      += cytherm.o
 obj-$(CONFIG_USB_EMI26)                += emi26.o
diff --git a/drivers/usb/misc/berry_charge.c b/drivers/usb/misc/berry_charge.c
new file mode 100644
index 0000000..60893c6
--- /dev/null
+++ b/drivers/usb/misc/berry_charge.c
@@ -0,0 +1,140 @@
+/*
+ * USB BlackBerry charging module
+ *
+ * Copyright (C) 2007 Greg Kroah-Hartman <[EMAIL PROTECTED]>
+ *
+ *     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, version 2.
+ *
+ * Information on how to switch configs was taken by the bcharge.cc file
+ * created by the barry.sf.net project.
+ *
+ * bcharge.cc has the following copyright:
+ *     Copyright (C) 2006, Net Direct Inc. (http://www.netdirect.ca/)
+ * and is released under the GPLv2.
+ *
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/usb.h>
+
+#define RIM_VENDOR             0x0fca
+#define BLACKBERRY             0x0001
+
+static int debug;
+
+#ifdef dbg
+#undef dbg
+#endif
+#define dbg(dev, format, arg...)                               \
+       if (debug)                                              \
+               dev_printk(KERN_DEBUG , dev , format , ## arg)
+
+static struct usb_device_id id_table [] = {
+       { USB_DEVICE(RIM_VENDOR, BLACKBERRY) },
+       { },                                    /* Terminating entry */
+};
+MODULE_DEVICE_TABLE(usb, id_table);
+
+static int magic_charge(struct usb_device *udev)
+{
+       char *dummy_buffer = kzalloc(2, GFP_KERNEL);
+       int retval;
+
+       if (!dummy_buffer)
+               return -ENOMEM;
+
+       /* send two magic commands and then set the configuration.  The device
+        * will then reset itself with the new power usage and should start
+        * charging. */
+
+       /* Note, with testing, it only seems that the first message is really
+        * needed (at least for the 8700c), but to be safe, we emulate what
+        * other operating systems seem to be sending to their device.  We
+        * really need to get some specs for this device to be sure about what
+        * is going on here.
+        */
+       dbg(&udev->dev, "Sending first magic command\n");
+       retval = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
+                                0xa5, 0xc0, 0, 1, dummy_buffer, 2, 100);
+       if (retval != 2) {
+               dev_err(&udev->dev, "First magic command failed: %d.\n",
+                       retval);
+               return retval;
+       }
+
+       dbg(&udev->dev, "Sending first magic command\n");
+       retval = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
+                                0xa2, 0x40, 0, 1, dummy_buffer, 0, 100);
+       if (retval != 0) {
+               dev_err(&udev->dev, "Second magic command failed: %d.\n",
+                       retval);
+               return retval;
+       }
+
+       dbg(&udev->dev, "Calling set_configuration\n");
+       retval = usb_driver_set_configuration(udev, 1);
+       if (retval)
+               dev_err(&udev->dev, "Set Configuration failed :%d.\n", retval);
+
+       return retval;
+}
+
+static int berry_probe(struct usb_interface *intf,
+                      const struct usb_device_id *id)
+{
+       struct usb_device *udev = interface_to_usbdev(intf);
+
+       dbg(&udev->dev, "Power is set to %dmA\n",
+           udev->actconfig->desc.bMaxPower * 2);
+
+       /* check the power usage so we don't try to enable something that is
+        * already enabled */
+       if ((udev->actconfig->desc.bMaxPower * 2) == 500) {
+               dbg(&udev->dev, "device is already charging, power is "
+                   "set to %dmA\n", udev->actconfig->desc.bMaxPower * 2);
+               return -ENODEV;
+       }
+
+       /* turn the power on */
+       magic_charge(udev);
+
+       /* we don't really want to bind to the device, userspace programs can
+        * handle the syncing just fine, so get outta here. */
+       return -ENODEV;
+}
+
+static void berry_disconnect(struct usb_interface *intf)
+{
+}
+
+static struct usb_driver berry_driver = {
+       .name =         "berry_charge",
+       .probe =        berry_probe,
+       .disconnect =   berry_disconnect,
+       .id_table =     id_table,
+};
+
+static int __init berry_init(void)
+{
+       return usb_register(&berry_driver);
+}
+
+static void __exit berry_exit(void)
+{
+       usb_deregister(&berry_driver);
+}
+
+module_init(berry_init);
+module_exit(berry_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Greg Kroah-Hartman <[EMAIL PROTECTED]>");
+module_param(debug, bool, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(debug, "Debug enabled or not");
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to