diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-01-13 13:57:42 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-02-16 18:32:17 -0500 |
commit | df23fa01acc77444453633e1dec59cd7a4ea8ec3 (patch) | |
tree | edfd5471e69dcc8b3e031066117d07cb647b3a92 /drivers/usb | |
parent | 8903795a5275e0366acf961190c57074ad27f9bb (diff) |
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 <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/Makefile | 1 | ||||
-rw-r--r-- | drivers/usb/misc/Kconfig | 11 | ||||
-rw-r--r-- | drivers/usb/misc/Makefile | 1 | ||||
-rw-r--r-- | 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 825bf884537a..8b7ff467d262 100644 --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile | |||
@@ -51,6 +51,7 @@ obj-$(CONFIG_USB_SERIAL) += serial/ | |||
51 | obj-$(CONFIG_USB_ADUTUX) += misc/ | 51 | obj-$(CONFIG_USB_ADUTUX) += misc/ |
52 | obj-$(CONFIG_USB_APPLEDISPLAY) += misc/ | 52 | obj-$(CONFIG_USB_APPLEDISPLAY) += misc/ |
53 | obj-$(CONFIG_USB_AUERSWALD) += misc/ | 53 | obj-$(CONFIG_USB_AUERSWALD) += misc/ |
54 | obj-$(CONFIG_USB_BERRY_CHARGE) += misc/ | ||
54 | obj-$(CONFIG_USB_CYPRESS_CY7C63)+= misc/ | 55 | obj-$(CONFIG_USB_CYPRESS_CY7C63)+= misc/ |
55 | obj-$(CONFIG_USB_CYTHERM) += misc/ | 56 | obj-$(CONFIG_USB_CYTHERM) += misc/ |
56 | obj-$(CONFIG_USB_EMI26) += misc/ | 57 | obj-$(CONFIG_USB_EMI26) += misc/ |
diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig index a74bf8617e7f..4907e8b80070 100644 --- a/drivers/usb/misc/Kconfig +++ b/drivers/usb/misc/Kconfig | |||
@@ -88,6 +88,17 @@ config USB_LCD | |||
88 | To compile this driver as a module, choose M here: the | 88 | To compile this driver as a module, choose M here: the |
89 | module will be called usblcd. | 89 | module will be called usblcd. |
90 | 90 | ||
91 | config USB_BERRY_CHARGE | ||
92 | tristate "USB BlackBerry recharge support" | ||
93 | depends on USB | ||
94 | help | ||
95 | Say Y here if you want to connect a BlackBerry device to your | ||
96 | computer's USB port and have it automatically switch to "recharge" | ||
97 | mode. | ||
98 | |||
99 | To compile this driver as a module, choose M here: the | ||
100 | module will be called berry_charge. | ||
101 | |||
91 | config USB_LED | 102 | config USB_LED |
92 | tristate "USB LED driver support" | 103 | tristate "USB LED driver support" |
93 | depends on USB | 104 | depends on USB |
diff --git a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile index 2cba07d31971..dac2d5b71566 100644 --- a/drivers/usb/misc/Makefile +++ b/drivers/usb/misc/Makefile | |||
@@ -6,6 +6,7 @@ | |||
6 | obj-$(CONFIG_USB_ADUTUX) += adutux.o | 6 | obj-$(CONFIG_USB_ADUTUX) += adutux.o |
7 | obj-$(CONFIG_USB_APPLEDISPLAY) += appledisplay.o | 7 | obj-$(CONFIG_USB_APPLEDISPLAY) += appledisplay.o |
8 | obj-$(CONFIG_USB_AUERSWALD) += auerswald.o | 8 | obj-$(CONFIG_USB_AUERSWALD) += auerswald.o |
9 | obj-$(CONFIG_USB_BERRY_CHARGE) += berry_charge.o | ||
9 | obj-$(CONFIG_USB_CYPRESS_CY7C63)+= cypress_cy7c63.o | 10 | obj-$(CONFIG_USB_CYPRESS_CY7C63)+= cypress_cy7c63.o |
10 | obj-$(CONFIG_USB_CYTHERM) += cytherm.o | 11 | obj-$(CONFIG_USB_CYTHERM) += cytherm.o |
11 | obj-$(CONFIG_USB_EMI26) += emi26.o | 12 | 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 000000000000..60893c6c8221 --- /dev/null +++ b/drivers/usb/misc/berry_charge.c | |||
@@ -0,0 +1,140 @@ | |||
1 | /* | ||
2 | * USB BlackBerry charging module | ||
3 | * | ||
4 | * Copyright (C) 2007 Greg Kroah-Hartman <gregkh@suse.de> | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or | ||
7 | * modify it under the terms of the GNU General Public License as | ||
8 | * published by the Free Software Foundation, version 2. | ||
9 | * | ||
10 | * Information on how to switch configs was taken by the bcharge.cc file | ||
11 | * created by the barry.sf.net project. | ||
12 | * | ||
13 | * bcharge.cc has the following copyright: | ||
14 | * Copyright (C) 2006, Net Direct Inc. (http://www.netdirect.ca/) | ||
15 | * and is released under the GPLv2. | ||
16 | * | ||
17 | * | ||
18 | */ | ||
19 | |||
20 | #include <linux/kernel.h> | ||
21 | #include <linux/errno.h> | ||
22 | #include <linux/init.h> | ||
23 | #include <linux/slab.h> | ||
24 | #include <linux/module.h> | ||
25 | #include <linux/usb.h> | ||
26 | |||
27 | #define RIM_VENDOR 0x0fca | ||
28 | #define BLACKBERRY 0x0001 | ||
29 | |||
30 | static int debug; | ||
31 | |||
32 | #ifdef dbg | ||
33 | #undef dbg | ||
34 | #endif | ||
35 | #define dbg(dev, format, arg...) \ | ||
36 | if (debug) \ | ||
37 | dev_printk(KERN_DEBUG , dev , format , ## arg) | ||
38 | |||
39 | static struct usb_device_id id_table [] = { | ||
40 | { USB_DEVICE(RIM_VENDOR, BLACKBERRY) }, | ||
41 | { }, /* Terminating entry */ | ||
42 | }; | ||
43 | MODULE_DEVICE_TABLE(usb, id_table); | ||
44 | |||
45 | static int magic_charge(struct usb_device *udev) | ||
46 | { | ||
47 | char *dummy_buffer = kzalloc(2, GFP_KERNEL); | ||
48 | int retval; | ||
49 | |||
50 | if (!dummy_buffer) | ||
51 | return -ENOMEM; | ||
52 | |||
53 | /* send two magic commands and then set the configuration. The device | ||
54 | * will then reset itself with the new power usage and should start | ||
55 | * charging. */ | ||
56 | |||
57 | /* Note, with testing, it only seems that the first message is really | ||
58 | * needed (at least for the 8700c), but to be safe, we emulate what | ||
59 | * other operating systems seem to be sending to their device. We | ||
60 | * really need to get some specs for this device to be sure about what | ||
61 | * is going on here. | ||
62 | */ | ||
63 | dbg(&udev->dev, "Sending first magic command\n"); | ||
64 | retval = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), | ||
65 | 0xa5, 0xc0, 0, 1, dummy_buffer, 2, 100); | ||
66 | if (retval != 2) { | ||
67 | dev_err(&udev->dev, "First magic command failed: %d.\n", | ||
68 | retval); | ||
69 | return retval; | ||
70 | } | ||
71 | |||
72 | dbg(&udev->dev, "Sending first magic command\n"); | ||
73 | retval = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), | ||
74 | 0xa2, 0x40, 0, 1, dummy_buffer, 0, 100); | ||
75 | if (retval != 0) { | ||
76 | dev_err(&udev->dev, "Second magic command failed: %d.\n", | ||
77 | retval); | ||
78 | return retval; | ||
79 | } | ||
80 | |||
81 | dbg(&udev->dev, "Calling set_configuration\n"); | ||
82 | retval = usb_driver_set_configuration(udev, 1); | ||
83 | if (retval) | ||
84 | dev_err(&udev->dev, "Set Configuration failed :%d.\n", retval); | ||
85 | |||
86 | return retval; | ||
87 | } | ||
88 | |||
89 | static int berry_probe(struct usb_interface *intf, | ||
90 | const struct usb_device_id *id) | ||
91 | { | ||
92 | struct usb_device *udev = interface_to_usbdev(intf); | ||
93 | |||
94 | dbg(&udev->dev, "Power is set to %dmA\n", | ||
95 | udev->actconfig->desc.bMaxPower * 2); | ||
96 | |||
97 | /* check the power usage so we don't try to enable something that is | ||
98 | * already enabled */ | ||
99 | if ((udev->actconfig->desc.bMaxPower * 2) == 500) { | ||
100 | dbg(&udev->dev, "device is already charging, power is " | ||
101 | "set to %dmA\n", udev->actconfig->desc.bMaxPower * 2); | ||
102 | return -ENODEV; | ||
103 | } | ||
104 | |||
105 | /* turn the power on */ | ||
106 | magic_charge(udev); | ||
107 | |||
108 | /* we don't really want to bind to the device, userspace programs can | ||
109 | * handle the syncing just fine, so get outta here. */ | ||
110 | return -ENODEV; | ||
111 | } | ||
112 | |||
113 | static void berry_disconnect(struct usb_interface *intf) | ||
114 | { | ||
115 | } | ||
116 | |||
117 | static struct usb_driver berry_driver = { | ||
118 | .name = "berry_charge", | ||
119 | .probe = berry_probe, | ||
120 | .disconnect = berry_disconnect, | ||
121 | .id_table = id_table, | ||
122 | }; | ||
123 | |||
124 | static int __init berry_init(void) | ||
125 | { | ||
126 | return usb_register(&berry_driver); | ||
127 | } | ||
128 | |||
129 | static void __exit berry_exit(void) | ||
130 | { | ||
131 | usb_deregister(&berry_driver); | ||
132 | } | ||
133 | |||
134 | module_init(berry_init); | ||
135 | module_exit(berry_exit); | ||
136 | |||
137 | MODULE_LICENSE("GPL"); | ||
138 | MODULE_AUTHOR("Greg Kroah-Hartman <gregkh@suse.de>"); | ||
139 | module_param(debug, bool, S_IRUGO | S_IWUSR); | ||
140 | MODULE_PARM_DESC(debug, "Debug enabled or not"); | ||