diff options
Diffstat (limited to 'drivers/usb/misc')
-rw-r--r-- | drivers/usb/misc/Kconfig | 61 | ||||
-rw-r--r-- | drivers/usb/misc/Makefile | 5 | ||||
-rw-r--r-- | drivers/usb/misc/adutux.c | 900 | ||||
-rw-r--r-- | drivers/usb/misc/auerswald.c | 6 | ||||
-rw-r--r-- | drivers/usb/misc/cypress_cy7c63.c | 19 | ||||
-rw-r--r-- | drivers/usb/misc/cytherm.c | 35 | ||||
-rw-r--r-- | drivers/usb/misc/ftdi-elan.c | 2809 | ||||
-rw-r--r-- | drivers/usb/misc/idmouse.c | 2 | ||||
-rw-r--r-- | drivers/usb/misc/ldusb.c | 10 | ||||
-rw-r--r-- | drivers/usb/misc/legousbtower.c | 2 | ||||
-rw-r--r-- | drivers/usb/misc/phidget.c | 43 | ||||
-rw-r--r-- | drivers/usb/misc/phidget.h | 12 | ||||
-rw-r--r-- | drivers/usb/misc/phidgetkit.c | 316 | ||||
-rw-r--r-- | drivers/usb/misc/phidgetmotorcontrol.c | 466 | ||||
-rw-r--r-- | drivers/usb/misc/phidgetservo.c | 117 | ||||
-rw-r--r-- | drivers/usb/misc/sisusbvga/sisusb.c | 2 | ||||
-rw-r--r-- | drivers/usb/misc/usb_u132.h | 97 | ||||
-rw-r--r-- | drivers/usb/misc/usblcd.c | 10 | ||||
-rw-r--r-- | drivers/usb/misc/usbled.c | 20 |
19 files changed, 4695 insertions, 237 deletions
diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig index 88928a4be805..c29658f69e2a 100644 --- a/drivers/usb/misc/Kconfig +++ b/drivers/usb/misc/Kconfig | |||
@@ -32,6 +32,16 @@ config USB_EMI26 | |||
32 | To compile this driver as a module, choose M here: the | 32 | To compile this driver as a module, choose M here: the |
33 | module will be called emi26. | 33 | module will be called emi26. |
34 | 34 | ||
35 | config USB_ADUTUX | ||
36 | tristate "ADU devices from Ontrak Control Systems (EXPERIMENTAL)" | ||
37 | depends on USB && EXPERIMENTAL | ||
38 | help | ||
39 | Say Y if you want to use an ADU device from Ontrak Control | ||
40 | Systems. | ||
41 | |||
42 | To compile this driver as a module, choose M here. The module | ||
43 | will be called adutux. | ||
44 | |||
35 | config USB_AUERSWALD | 45 | config USB_AUERSWALD |
36 | tristate "USB Auerswald ISDN support (EXPERIMENTAL)" | 46 | tristate "USB Auerswald ISDN support (EXPERIMENTAL)" |
37 | depends on USB && EXPERIMENTAL | 47 | depends on USB && EXPERIMENTAL |
@@ -115,19 +125,36 @@ config USB_CYTHERM | |||
115 | To compile this driver as a module, choose M here: the | 125 | To compile this driver as a module, choose M here: the |
116 | module will be called cytherm. | 126 | module will be called cytherm. |
117 | 127 | ||
118 | config USB_PHIDGETKIT | 128 | config USB_PHIDGET |
119 | tristate "USB PhidgetKit support" | 129 | tristate "USB Phidgets drivers" |
120 | depends on USB | 130 | depends on USB |
121 | help | 131 | help |
122 | Say Y here if you want to connect a PhidgetKit USB device from | 132 | Say Y here to enable the various drivers for devices from |
123 | Phidgets Inc. | 133 | Phidgets inc. |
134 | |||
135 | config USB_PHIDGETKIT | ||
136 | tristate "USB PhidgetInterfaceKit support" | ||
137 | depends on USB_PHIDGET | ||
138 | help | ||
139 | Say Y here if you want to connect a PhidgetInterfaceKit USB device | ||
140 | from Phidgets Inc. | ||
124 | 141 | ||
125 | To compile this driver as a module, choose M here: the | 142 | To compile this driver as a module, choose M here: the |
126 | module will be called phidgetkit. | 143 | module will be called phidgetkit. |
127 | 144 | ||
145 | config USB_PHIDGETMOTORCONTROL | ||
146 | tristate "USB PhidgetMotorControl support" | ||
147 | depends on USB_PHIDGET | ||
148 | help | ||
149 | Say Y here if you want to connect a PhidgetMotorControl USB device | ||
150 | from Phidgets Inc. | ||
151 | |||
152 | To compile this driver as a module, choose M here: the | ||
153 | module will be called phidgetmotorcontrol. | ||
154 | |||
128 | config USB_PHIDGETSERVO | 155 | config USB_PHIDGETSERVO |
129 | tristate "USB PhidgetServo support" | 156 | tristate "USB PhidgetServo support" |
130 | depends on USB | 157 | depends on USB_PHIDGET |
131 | help | 158 | help |
132 | Say Y here if you want to connect an 1 or 4 Motor PhidgetServo | 159 | Say Y here if you want to connect an 1 or 4 Motor PhidgetServo |
133 | servo controller version 2.0 or 3.0. | 160 | servo controller version 2.0 or 3.0. |
@@ -151,6 +178,30 @@ config USB_IDMOUSE | |||
151 | 178 | ||
152 | See also <http://www.fs.tum.de/~echtler/idmouse/>. | 179 | See also <http://www.fs.tum.de/~echtler/idmouse/>. |
153 | 180 | ||
181 | config USB_FTDI_ELAN | ||
182 | tristate "Elan PCMCIA CardBus Adapter USB Client" | ||
183 | depends on USB | ||
184 | default M | ||
185 | help | ||
186 | ELAN's Uxxx series of adapters are USB to PCMCIA CardBus adapters. | ||
187 | Currently only the U132 adapter is available. | ||
188 | |||
189 | The U132 is specifically designed for CardBus PC cards that contain | ||
190 | an OHCI host controller. Typical PC cards are the Orange Mobile 3G | ||
191 | Option GlobeTrotter Fusion card. The U132 adapter will *NOT* work | ||
192 | with PC cards that do not contain an OHCI controller. To use a U132 | ||
193 | adapter you will need this "ftdi-elan" module as well as the "u132-hcd" | ||
194 | module which is a USB host controller driver that talks to the OHCI | ||
195 | controller within CardBus card that are inserted in the U132 adapter. | ||
196 | |||
197 | This driver has been tested with a CardBus OHCI USB adapter, and | ||
198 | worked with a USB PEN Drive inserted into the first USB port of | ||
199 | the PCCARD. A rather pointless thing to do, but useful for testing. | ||
200 | |||
201 | See also the USB_U132_HCD entry "Elan U132 Adapter Host Controller" | ||
202 | |||
203 | It is safe to say M here. | ||
204 | |||
154 | config USB_APPLEDISPLAY | 205 | config USB_APPLEDISPLAY |
155 | tristate "Apple Cinema Display support" | 206 | tristate "Apple Cinema Display support" |
156 | depends on USB | 207 | depends on USB |
diff --git a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile index 2927260c5812..2be70fa259bf 100644 --- a/drivers/usb/misc/Makefile +++ b/drivers/usb/misc/Makefile | |||
@@ -3,22 +3,25 @@ | |||
3 | # (the ones that don't fit into any other categories) | 3 | # (the ones that don't fit into any other categories) |
4 | # | 4 | # |
5 | 5 | ||
6 | obj-$(CONFIG_USB_ADUTUX) += adutux.o | ||
6 | obj-$(CONFIG_USB_AUERSWALD) += auerswald.o | 7 | obj-$(CONFIG_USB_AUERSWALD) += auerswald.o |
7 | obj-$(CONFIG_USB_CYPRESS_CY7C63)+= cypress_cy7c63.o | 8 | obj-$(CONFIG_USB_CYPRESS_CY7C63)+= cypress_cy7c63.o |
8 | obj-$(CONFIG_USB_CYTHERM) += cytherm.o | 9 | obj-$(CONFIG_USB_CYTHERM) += cytherm.o |
9 | obj-$(CONFIG_USB_EMI26) += emi26.o | 10 | obj-$(CONFIG_USB_EMI26) += emi26.o |
10 | obj-$(CONFIG_USB_EMI62) += emi62.o | 11 | obj-$(CONFIG_USB_EMI62) += emi62.o |
12 | obj-$(CONFIG_USB_FTDI_ELAN) += ftdi-elan.o | ||
11 | obj-$(CONFIG_USB_IDMOUSE) += idmouse.o | 13 | obj-$(CONFIG_USB_IDMOUSE) += idmouse.o |
12 | obj-$(CONFIG_USB_LCD) += usblcd.o | 14 | obj-$(CONFIG_USB_LCD) += usblcd.o |
13 | obj-$(CONFIG_USB_LD) += ldusb.o | 15 | obj-$(CONFIG_USB_LD) += ldusb.o |
14 | obj-$(CONFIG_USB_LED) += usbled.o | 16 | obj-$(CONFIG_USB_LED) += usbled.o |
15 | obj-$(CONFIG_USB_LEGOTOWER) += legousbtower.o | 17 | obj-$(CONFIG_USB_LEGOTOWER) += legousbtower.o |
18 | obj-$(CONFIG_USB_PHIDGET) += phidget.o | ||
16 | obj-$(CONFIG_USB_PHIDGETKIT) += phidgetkit.o | 19 | obj-$(CONFIG_USB_PHIDGETKIT) += phidgetkit.o |
20 | obj-$(CONFIG_USB_PHIDGETMOTORCONTROL) += phidgetmotorcontrol.o | ||
17 | obj-$(CONFIG_USB_PHIDGETSERVO) += phidgetservo.o | 21 | obj-$(CONFIG_USB_PHIDGETSERVO) += phidgetservo.o |
18 | obj-$(CONFIG_USB_RIO500) += rio500.o | 22 | obj-$(CONFIG_USB_RIO500) += rio500.o |
19 | obj-$(CONFIG_USB_TEST) += usbtest.o | 23 | obj-$(CONFIG_USB_TEST) += usbtest.o |
20 | obj-$(CONFIG_USB_USS720) += uss720.o | 24 | obj-$(CONFIG_USB_USS720) += uss720.o |
21 | obj-$(CONFIG_USB_APPLEDISPLAY) += appledisplay.o | ||
22 | 25 | ||
23 | obj-$(CONFIG_USB_SISUSBVGA) += sisusbvga/ | 26 | obj-$(CONFIG_USB_SISUSBVGA) += sisusbvga/ |
24 | 27 | ||
diff --git a/drivers/usb/misc/adutux.c b/drivers/usb/misc/adutux.c new file mode 100644 index 000000000000..d3963199b6ec --- /dev/null +++ b/drivers/usb/misc/adutux.c | |||
@@ -0,0 +1,900 @@ | |||
1 | /* | ||
2 | * adutux - driver for ADU devices from Ontrak Control Systems | ||
3 | * This is an experimental driver. Use at your own risk. | ||
4 | * This driver is not supported by Ontrak Control Systems. | ||
5 | * | ||
6 | * Copyright (c) 2003 John Homppi (SCO, leave this notice here) | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or | ||
9 | * modify it under the terms of the GNU General Public License as | ||
10 | * published by the Free Software Foundation; either version 2 of | ||
11 | * the License, or (at your option) any later version. | ||
12 | * | ||
13 | * derived from the Lego USB Tower driver 0.56: | ||
14 | * Copyright (c) 2003 David Glance <davidgsf@sourceforge.net> | ||
15 | * 2001 Juergen Stuber <stuber@loria.fr> | ||
16 | * that was derived from USB Skeleton driver - 0.5 | ||
17 | * Copyright (c) 2001 Greg Kroah-Hartman (greg@kroah.com) | ||
18 | * | ||
19 | */ | ||
20 | |||
21 | #include <linux/kernel.h> | ||
22 | #include <linux/errno.h> | ||
23 | #include <linux/init.h> | ||
24 | #include <linux/slab.h> | ||
25 | #include <linux/module.h> | ||
26 | #include <linux/usb.h> | ||
27 | #include <asm/uaccess.h> | ||
28 | |||
29 | #ifdef CONFIG_USB_DEBUG | ||
30 | static int debug = 5; | ||
31 | #else | ||
32 | static int debug = 1; | ||
33 | #endif | ||
34 | |||
35 | /* Use our own dbg macro */ | ||
36 | #undef dbg | ||
37 | #define dbg(lvl, format, arg...) \ | ||
38 | do { \ | ||
39 | if (debug >= lvl) \ | ||
40 | printk(KERN_DEBUG __FILE__ " : " format " \n", ## arg); \ | ||
41 | } while (0) | ||
42 | |||
43 | |||
44 | /* Version Information */ | ||
45 | #define DRIVER_VERSION "v0.0.13" | ||
46 | #define DRIVER_AUTHOR "John Homppi" | ||
47 | #define DRIVER_DESC "adutux (see www.ontrak.net)" | ||
48 | |||
49 | /* Module parameters */ | ||
50 | module_param(debug, int, S_IRUGO | S_IWUSR); | ||
51 | MODULE_PARM_DESC(debug, "Debug enabled or not"); | ||
52 | |||
53 | /* Define these values to match your device */ | ||
54 | #define ADU_VENDOR_ID 0x0a07 | ||
55 | #define ADU_PRODUCT_ID 0x0064 | ||
56 | |||
57 | /* table of devices that work with this driver */ | ||
58 | static struct usb_device_id device_table [] = { | ||
59 | { USB_DEVICE(ADU_VENDOR_ID, ADU_PRODUCT_ID) }, /* ADU100 */ | ||
60 | { USB_DEVICE(ADU_VENDOR_ID, ADU_PRODUCT_ID+20) }, /* ADU120 */ | ||
61 | { USB_DEVICE(ADU_VENDOR_ID, ADU_PRODUCT_ID+30) }, /* ADU130 */ | ||
62 | { USB_DEVICE(ADU_VENDOR_ID, ADU_PRODUCT_ID+100) }, /* ADU200 */ | ||
63 | { USB_DEVICE(ADU_VENDOR_ID, ADU_PRODUCT_ID+108) }, /* ADU208 */ | ||
64 | { USB_DEVICE(ADU_VENDOR_ID, ADU_PRODUCT_ID+118) }, /* ADU218 */ | ||
65 | { }/* Terminating entry */ | ||
66 | }; | ||
67 | |||
68 | MODULE_DEVICE_TABLE(usb, device_table); | ||
69 | |||
70 | #ifdef CONFIG_USB_DYNAMIC_MINORS | ||
71 | #define ADU_MINOR_BASE 0 | ||
72 | #else | ||
73 | #define ADU_MINOR_BASE 67 | ||
74 | #endif | ||
75 | |||
76 | /* we can have up to this number of device plugged in at once */ | ||
77 | #define MAX_DEVICES 16 | ||
78 | |||
79 | #define COMMAND_TIMEOUT (2*HZ) /* 60 second timeout for a command */ | ||
80 | |||
81 | /* Structure to hold all of our device specific stuff */ | ||
82 | struct adu_device { | ||
83 | struct semaphore sem; /* locks this structure */ | ||
84 | struct usb_device* udev; /* save off the usb device pointer */ | ||
85 | struct usb_interface* interface; | ||
86 | unsigned char minor; /* the starting minor number for this device */ | ||
87 | char serial_number[8]; | ||
88 | |||
89 | int open_count; /* number of times this port has been opened */ | ||
90 | |||
91 | char* read_buffer_primary; | ||
92 | int read_buffer_length; | ||
93 | char* read_buffer_secondary; | ||
94 | int secondary_head; | ||
95 | int secondary_tail; | ||
96 | spinlock_t buflock; | ||
97 | |||
98 | wait_queue_head_t read_wait; | ||
99 | wait_queue_head_t write_wait; | ||
100 | |||
101 | char* interrupt_in_buffer; | ||
102 | struct usb_endpoint_descriptor* interrupt_in_endpoint; | ||
103 | struct urb* interrupt_in_urb; | ||
104 | int read_urb_finished; | ||
105 | |||
106 | char* interrupt_out_buffer; | ||
107 | struct usb_endpoint_descriptor* interrupt_out_endpoint; | ||
108 | struct urb* interrupt_out_urb; | ||
109 | }; | ||
110 | |||
111 | /* prevent races between open() and disconnect */ | ||
112 | static DEFINE_MUTEX(disconnect_mutex); | ||
113 | static struct usb_driver adu_driver; | ||
114 | |||
115 | static void adu_debug_data(int level, const char *function, int size, | ||
116 | const unsigned char *data) | ||
117 | { | ||
118 | int i; | ||
119 | |||
120 | if (debug < level) | ||
121 | return; | ||
122 | |||
123 | printk(KERN_DEBUG __FILE__": %s - length = %d, data = ", | ||
124 | function, size); | ||
125 | for (i = 0; i < size; ++i) | ||
126 | printk("%.2x ", data[i]); | ||
127 | printk("\n"); | ||
128 | } | ||
129 | |||
130 | /** | ||
131 | * adu_abort_transfers | ||
132 | * aborts transfers and frees associated data structures | ||
133 | */ | ||
134 | static void adu_abort_transfers(struct adu_device *dev) | ||
135 | { | ||
136 | dbg(2," %s : enter", __FUNCTION__); | ||
137 | |||
138 | if (dev == NULL) { | ||
139 | dbg(1," %s : dev is null", __FUNCTION__); | ||
140 | goto exit; | ||
141 | } | ||
142 | |||
143 | if (dev->udev == NULL) { | ||
144 | dbg(1," %s : udev is null", __FUNCTION__); | ||
145 | goto exit; | ||
146 | } | ||
147 | |||
148 | dbg(2," %s : udev state %d", __FUNCTION__, dev->udev->state); | ||
149 | if (dev->udev->state == USB_STATE_NOTATTACHED) { | ||
150 | dbg(1," %s : udev is not attached", __FUNCTION__); | ||
151 | goto exit; | ||
152 | } | ||
153 | |||
154 | /* shutdown transfer */ | ||
155 | usb_unlink_urb(dev->interrupt_in_urb); | ||
156 | usb_unlink_urb(dev->interrupt_out_urb); | ||
157 | |||
158 | exit: | ||
159 | dbg(2," %s : leave", __FUNCTION__); | ||
160 | } | ||
161 | |||
162 | static void adu_delete(struct adu_device *dev) | ||
163 | { | ||
164 | dbg(2, "%s enter", __FUNCTION__); | ||
165 | |||
166 | adu_abort_transfers(dev); | ||
167 | |||
168 | /* free data structures */ | ||
169 | usb_free_urb(dev->interrupt_in_urb); | ||
170 | usb_free_urb(dev->interrupt_out_urb); | ||
171 | kfree(dev->read_buffer_primary); | ||
172 | kfree(dev->read_buffer_secondary); | ||
173 | kfree(dev->interrupt_in_buffer); | ||
174 | kfree(dev->interrupt_out_buffer); | ||
175 | kfree(dev); | ||
176 | |||
177 | dbg(2, "%s : leave", __FUNCTION__); | ||
178 | } | ||
179 | |||
180 | static void adu_interrupt_in_callback(struct urb *urb, struct pt_regs *regs) | ||
181 | { | ||
182 | struct adu_device *dev = urb->context; | ||
183 | |||
184 | dbg(4," %s : enter, status %d", __FUNCTION__, urb->status); | ||
185 | adu_debug_data(5, __FUNCTION__, urb->actual_length, | ||
186 | urb->transfer_buffer); | ||
187 | |||
188 | spin_lock(&dev->buflock); | ||
189 | |||
190 | if (urb->status != 0) { | ||
191 | if ((urb->status != -ENOENT) && (urb->status != -ECONNRESET)) { | ||
192 | dbg(1," %s : nonzero status received: %d", | ||
193 | __FUNCTION__, urb->status); | ||
194 | } | ||
195 | goto exit; | ||
196 | } | ||
197 | |||
198 | if (urb->actual_length > 0 && dev->interrupt_in_buffer[0] != 0x00) { | ||
199 | if (dev->read_buffer_length < | ||
200 | (4 * le16_to_cpu(dev->interrupt_in_endpoint->wMaxPacketSize)) - | ||
201 | (urb->actual_length)) { | ||
202 | memcpy (dev->read_buffer_primary + | ||
203 | dev->read_buffer_length, | ||
204 | dev->interrupt_in_buffer, urb->actual_length); | ||
205 | |||
206 | dev->read_buffer_length += urb->actual_length; | ||
207 | dbg(2," %s reading %d ", __FUNCTION__, | ||
208 | urb->actual_length); | ||
209 | } else { | ||
210 | dbg(1," %s : read_buffer overflow", __FUNCTION__); | ||
211 | } | ||
212 | } | ||
213 | |||
214 | exit: | ||
215 | dev->read_urb_finished = 1; | ||
216 | spin_unlock(&dev->buflock); | ||
217 | /* always wake up so we recover from errors */ | ||
218 | wake_up_interruptible(&dev->read_wait); | ||
219 | adu_debug_data(5, __FUNCTION__, urb->actual_length, | ||
220 | urb->transfer_buffer); | ||
221 | dbg(4," %s : leave, status %d", __FUNCTION__, urb->status); | ||
222 | } | ||
223 | |||
224 | static void adu_interrupt_out_callback(struct urb *urb, struct pt_regs *regs) | ||
225 | { | ||
226 | struct adu_device *dev = urb->context; | ||
227 | |||
228 | dbg(4," %s : enter, status %d", __FUNCTION__, urb->status); | ||
229 | adu_debug_data(5,__FUNCTION__, urb->actual_length, urb->transfer_buffer); | ||
230 | |||
231 | if (urb->status != 0) { | ||
232 | if ((urb->status != -ENOENT) && | ||
233 | (urb->status != -ECONNRESET)) { | ||
234 | dbg(1, " %s :nonzero status received: %d", | ||
235 | __FUNCTION__, urb->status); | ||
236 | } | ||
237 | goto exit; | ||
238 | } | ||
239 | |||
240 | wake_up_interruptible(&dev->write_wait); | ||
241 | exit: | ||
242 | |||
243 | adu_debug_data(5, __FUNCTION__, urb->actual_length, | ||
244 | urb->transfer_buffer); | ||
245 | dbg(4," %s : leave, status %d", __FUNCTION__, urb->status); | ||
246 | } | ||
247 | |||
248 | static int adu_open(struct inode *inode, struct file *file) | ||
249 | { | ||
250 | struct adu_device *dev = NULL; | ||
251 | struct usb_interface *interface; | ||
252 | int subminor; | ||
253 | int retval = 0; | ||
254 | |||
255 | dbg(2,"%s : enter", __FUNCTION__); | ||
256 | |||
257 | subminor = iminor(inode); | ||
258 | |||
259 | mutex_lock(&disconnect_mutex); | ||
260 | |||
261 | interface = usb_find_interface(&adu_driver, subminor); | ||
262 | if (!interface) { | ||
263 | err("%s - error, can't find device for minor %d", | ||
264 | __FUNCTION__, subminor); | ||
265 | retval = -ENODEV; | ||
266 | goto exit_no_device; | ||
267 | } | ||
268 | |||
269 | dev = usb_get_intfdata(interface); | ||
270 | if (!dev) { | ||
271 | retval = -ENODEV; | ||
272 | goto exit_no_device; | ||
273 | } | ||
274 | |||
275 | /* lock this device */ | ||
276 | if ((retval = down_interruptible(&dev->sem))) { | ||
277 | dbg(2, "%s : sem down failed", __FUNCTION__); | ||
278 | goto exit_no_device; | ||
279 | } | ||
280 | |||
281 | /* increment our usage count for the device */ | ||
282 | ++dev->open_count; | ||
283 | dbg(2,"%s : open count %d", __FUNCTION__, dev->open_count); | ||
284 | |||
285 | /* save device in the file's private structure */ | ||
286 | file->private_data = dev; | ||
287 | |||
288 | /* initialize in direction */ | ||
289 | dev->read_buffer_length = 0; | ||
290 | |||
291 | /* fixup first read by having urb waiting for it */ | ||
292 | usb_fill_int_urb(dev->interrupt_in_urb,dev->udev, | ||
293 | usb_rcvintpipe(dev->udev, | ||
294 | dev->interrupt_in_endpoint->bEndpointAddress), | ||
295 | dev->interrupt_in_buffer, | ||
296 | le16_to_cpu(dev->interrupt_in_endpoint->wMaxPacketSize), | ||
297 | adu_interrupt_in_callback, dev, | ||
298 | dev->interrupt_in_endpoint->bInterval); | ||
299 | /* dev->interrupt_in_urb->transfer_flags |= URB_ASYNC_UNLINK; */ | ||
300 | dev->read_urb_finished = 0; | ||
301 | usb_submit_urb(dev->interrupt_in_urb, GFP_KERNEL); | ||
302 | /* we ignore failure */ | ||
303 | /* end of fixup for first read */ | ||
304 | |||
305 | up(&dev->sem); | ||
306 | |||
307 | exit_no_device: | ||
308 | mutex_unlock(&disconnect_mutex); | ||
309 | dbg(2,"%s : leave, return value %d ", __FUNCTION__, retval); | ||
310 | |||
311 | return retval; | ||
312 | } | ||
313 | |||
314 | static int adu_release_internal(struct adu_device *dev) | ||
315 | { | ||
316 | int retval = 0; | ||
317 | |||
318 | dbg(2," %s : enter", __FUNCTION__); | ||
319 | |||
320 | if (dev->udev == NULL) { | ||
321 | /* the device was unplugged before the file was released */ | ||
322 | adu_delete(dev); | ||
323 | goto exit; | ||
324 | } | ||
325 | |||
326 | /* decrement our usage count for the device */ | ||
327 | --dev->open_count; | ||
328 | dbg(2," %s : open count %d", __FUNCTION__, dev->open_count); | ||
329 | if (dev->open_count <= 0) { | ||
330 | adu_abort_transfers(dev); | ||
331 | dev->open_count = 0; | ||
332 | } | ||
333 | |||
334 | exit: | ||
335 | dbg(2," %s : leave", __FUNCTION__); | ||
336 | return retval; | ||
337 | } | ||
338 | |||
339 | static int adu_release(struct inode *inode, struct file *file) | ||
340 | { | ||
341 | struct adu_device *dev = NULL; | ||
342 | int retval = 0; | ||
343 | |||
344 | dbg(2," %s : enter", __FUNCTION__); | ||
345 | |||
346 | if (file == NULL) { | ||
347 | dbg(1," %s : file is NULL", __FUNCTION__); | ||
348 | retval = -ENODEV; | ||
349 | goto exit; | ||
350 | } | ||
351 | |||
352 | dev = file->private_data; | ||
353 | |||
354 | if (dev == NULL) { | ||
355 | dbg(1," %s : object is NULL", __FUNCTION__); | ||
356 | retval = -ENODEV; | ||
357 | goto exit; | ||
358 | } | ||
359 | |||
360 | /* lock our device */ | ||
361 | down(&dev->sem); /* not interruptible */ | ||
362 | |||
363 | if (dev->open_count <= 0) { | ||
364 | dbg(1," %s : device not opened", __FUNCTION__); | ||
365 | retval = -ENODEV; | ||
366 | goto exit; | ||
367 | } | ||
368 | |||
369 | /* do the work */ | ||
370 | retval = adu_release_internal(dev); | ||
371 | |||
372 | exit: | ||
373 | up(&dev->sem); | ||
374 | dbg(2," %s : leave, return value %d", __FUNCTION__, retval); | ||
375 | return retval; | ||
376 | } | ||
377 | |||
378 | static ssize_t adu_read(struct file *file, __user char *buffer, size_t count, | ||
379 | loff_t *ppos) | ||
380 | { | ||
381 | struct adu_device *dev; | ||
382 | size_t bytes_read = 0; | ||
383 | size_t bytes_to_read = count; | ||
384 | int i; | ||
385 | int retval = 0; | ||
386 | int timeout = 0; | ||
387 | int should_submit = 0; | ||
388 | unsigned long flags; | ||
389 | DECLARE_WAITQUEUE(wait, current); | ||
390 | |||
391 | dbg(2," %s : enter, count = %Zd, file=%p", __FUNCTION__, count, file); | ||
392 | |||
393 | dev = file->private_data; | ||
394 | dbg(2," %s : dev=%p", __FUNCTION__, dev); | ||
395 | /* lock this object */ | ||
396 | if (down_interruptible(&dev->sem)) | ||
397 | return -ERESTARTSYS; | ||
398 | |||
399 | /* verify that the device wasn't unplugged */ | ||
400 | if (dev->udev == NULL || dev->minor == 0) { | ||
401 | retval = -ENODEV; | ||
402 | err("No device or device unplugged %d", retval); | ||
403 | goto exit; | ||
404 | } | ||
405 | |||
406 | /* verify that some data was requested */ | ||
407 | if (count == 0) { | ||
408 | dbg(1," %s : read request of 0 bytes", __FUNCTION__); | ||
409 | goto exit; | ||
410 | } | ||
411 | |||
412 | timeout = COMMAND_TIMEOUT; | ||
413 | dbg(2," %s : about to start looping", __FUNCTION__); | ||
414 | while (bytes_to_read) { | ||
415 | int data_in_secondary = dev->secondary_tail - dev->secondary_head; | ||
416 | dbg(2," %s : while, data_in_secondary=%d, status=%d", | ||
417 | __FUNCTION__, data_in_secondary, | ||
418 | dev->interrupt_in_urb->status); | ||
419 | |||
420 | if (data_in_secondary) { | ||
421 | /* drain secondary buffer */ | ||
422 | int amount = bytes_to_read < data_in_secondary ? bytes_to_read : data_in_secondary; | ||
423 | i = copy_to_user(buffer, dev->read_buffer_secondary+dev->secondary_head, amount); | ||
424 | if (i < 0) { | ||
425 | retval = -EFAULT; | ||
426 | goto exit; | ||
427 | } | ||
428 | dev->secondary_head += (amount - i); | ||
429 | bytes_read += (amount - i); | ||
430 | bytes_to_read -= (amount - i); | ||
431 | if (i) { | ||
432 | retval = bytes_read ? bytes_read : -EFAULT; | ||
433 | goto exit; | ||
434 | } | ||
435 | } else { | ||
436 | /* we check the primary buffer */ | ||
437 | spin_lock_irqsave (&dev->buflock, flags); | ||
438 | if (dev->read_buffer_length) { | ||
439 | /* we secure access to the primary */ | ||
440 | char *tmp; | ||
441 | dbg(2," %s : swap, read_buffer_length = %d", | ||
442 | __FUNCTION__, dev->read_buffer_length); | ||
443 | tmp = dev->read_buffer_secondary; | ||
444 | dev->read_buffer_secondary = dev->read_buffer_primary; | ||
445 | dev->read_buffer_primary = tmp; | ||
446 | dev->secondary_head = 0; | ||
447 | dev->secondary_tail = dev->read_buffer_length; | ||
448 | dev->read_buffer_length = 0; | ||
449 | spin_unlock_irqrestore(&dev->buflock, flags); | ||
450 | /* we have a free buffer so use it */ | ||
451 | should_submit = 1; | ||
452 | } else { | ||
453 | /* even the primary was empty - we may need to do IO */ | ||
454 | if (dev->interrupt_in_urb->status == -EINPROGRESS) { | ||
455 | /* somebody is doing IO */ | ||
456 | spin_unlock_irqrestore(&dev->buflock, flags); | ||
457 | dbg(2," %s : submitted already", __FUNCTION__); | ||
458 | } else { | ||
459 | /* we must initiate input */ | ||
460 | dbg(2," %s : initiate input", __FUNCTION__); | ||
461 | dev->read_urb_finished = 0; | ||
462 | |||
463 | usb_fill_int_urb(dev->interrupt_in_urb,dev->udev, | ||
464 | usb_rcvintpipe(dev->udev, | ||
465 | dev->interrupt_in_endpoint->bEndpointAddress), | ||
466 | dev->interrupt_in_buffer, | ||
467 | le16_to_cpu(dev->interrupt_in_endpoint->wMaxPacketSize), | ||
468 | adu_interrupt_in_callback, | ||
469 | dev, | ||
470 | dev->interrupt_in_endpoint->bInterval); | ||
471 | retval = usb_submit_urb(dev->interrupt_in_urb, GFP_KERNEL); | ||
472 | if (!retval) { | ||
473 | spin_unlock_irqrestore(&dev->buflock, flags); | ||
474 | dbg(2," %s : submitted OK", __FUNCTION__); | ||
475 | } else { | ||
476 | if (retval == -ENOMEM) { | ||
477 | retval = bytes_read ? bytes_read : -ENOMEM; | ||
478 | } | ||
479 | spin_unlock_irqrestore(&dev->buflock, flags); | ||
480 | dbg(2," %s : submit failed", __FUNCTION__); | ||
481 | goto exit; | ||
482 | } | ||
483 | } | ||
484 | |||
485 | /* we wait for I/O to complete */ | ||
486 | set_current_state(TASK_INTERRUPTIBLE); | ||
487 | add_wait_queue(&dev->read_wait, &wait); | ||
488 | if (!dev->read_urb_finished) | ||
489 | timeout = schedule_timeout(COMMAND_TIMEOUT); | ||
490 | else | ||
491 | set_current_state(TASK_RUNNING); | ||
492 | remove_wait_queue(&dev->read_wait, &wait); | ||
493 | |||
494 | if (timeout <= 0) { | ||
495 | dbg(2," %s : timeout", __FUNCTION__); | ||
496 | retval = bytes_read ? bytes_read : -ETIMEDOUT; | ||
497 | goto exit; | ||
498 | } | ||
499 | |||
500 | if (signal_pending(current)) { | ||
501 | dbg(2," %s : signal pending", __FUNCTION__); | ||
502 | retval = bytes_read ? bytes_read : -EINTR; | ||
503 | goto exit; | ||
504 | } | ||
505 | } | ||
506 | } | ||
507 | } | ||
508 | |||
509 | retval = bytes_read; | ||
510 | /* if the primary buffer is empty then use it */ | ||
511 | if (should_submit && !dev->interrupt_in_urb->status==-EINPROGRESS) { | ||
512 | usb_fill_int_urb(dev->interrupt_in_urb,dev->udev, | ||
513 | usb_rcvintpipe(dev->udev, | ||
514 | dev->interrupt_in_endpoint->bEndpointAddress), | ||
515 | dev->interrupt_in_buffer, | ||
516 | le16_to_cpu(dev->interrupt_in_endpoint->wMaxPacketSize), | ||
517 | adu_interrupt_in_callback, | ||
518 | dev, | ||
519 | dev->interrupt_in_endpoint->bInterval); | ||
520 | /* dev->interrupt_in_urb->transfer_flags |= URB_ASYNC_UNLINK; */ | ||
521 | dev->read_urb_finished = 0; | ||
522 | usb_submit_urb(dev->interrupt_in_urb, GFP_KERNEL); | ||
523 | /* we ignore failure */ | ||
524 | } | ||
525 | |||
526 | exit: | ||
527 | /* unlock the device */ | ||
528 | up(&dev->sem); | ||
529 | |||
530 | dbg(2," %s : leave, return value %d", __FUNCTION__, retval); | ||
531 | return retval; | ||
532 | } | ||
533 | |||
534 | static ssize_t adu_write(struct file *file, const __user char *buffer, | ||
535 | size_t count, loff_t *ppos) | ||
536 | { | ||
537 | struct adu_device *dev; | ||
538 | size_t bytes_written = 0; | ||
539 | size_t bytes_to_write; | ||
540 | size_t buffer_size; | ||
541 | int retval = 0; | ||
542 | int timeout = 0; | ||
543 | |||
544 | dbg(2," %s : enter, count = %Zd", __FUNCTION__, count); | ||
545 | |||
546 | dev = file->private_data; | ||
547 | |||
548 | /* lock this object */ | ||
549 | down_interruptible(&dev->sem); | ||
550 | |||
551 | /* verify that the device wasn't unplugged */ | ||
552 | if (dev->udev == NULL || dev->minor == 0) { | ||
553 | retval = -ENODEV; | ||
554 | err("No device or device unplugged %d", retval); | ||
555 | goto exit; | ||
556 | } | ||
557 | |||
558 | /* verify that we actually have some data to write */ | ||
559 | if (count == 0) { | ||
560 | dbg(1," %s : write request of 0 bytes", __FUNCTION__); | ||
561 | goto exit; | ||
562 | } | ||
563 | |||
564 | |||
565 | while (count > 0) { | ||
566 | if (dev->interrupt_out_urb->status == -EINPROGRESS) { | ||
567 | timeout = COMMAND_TIMEOUT; | ||
568 | |||
569 | while (timeout > 0) { | ||
570 | if (signal_pending(current)) { | ||
571 | dbg(1," %s : interrupted", __FUNCTION__); | ||
572 | retval = -EINTR; | ||
573 | goto exit; | ||
574 | } | ||
575 | up(&dev->sem); | ||
576 | timeout = interruptible_sleep_on_timeout(&dev->write_wait, timeout); | ||
577 | down_interruptible(&dev->sem); | ||
578 | if (timeout > 0) { | ||
579 | break; | ||
580 | } | ||
581 | dbg(1," %s : interrupted timeout: %d", __FUNCTION__, timeout); | ||
582 | } | ||
583 | |||
584 | |||
585 | dbg(1," %s : final timeout: %d", __FUNCTION__, timeout); | ||
586 | |||
587 | if (timeout == 0) { | ||
588 | dbg(1, "%s - command timed out.", __FUNCTION__); | ||
589 | retval = -ETIMEDOUT; | ||
590 | goto exit; | ||
591 | } | ||
592 | |||
593 | dbg(4," %s : in progress, count = %Zd", __FUNCTION__, count); | ||
594 | |||
595 | } else { | ||
596 | dbg(4," %s : sending, count = %Zd", __FUNCTION__, count); | ||
597 | |||
598 | /* write the data into interrupt_out_buffer from userspace */ | ||
599 | buffer_size = le16_to_cpu(dev->interrupt_out_endpoint->wMaxPacketSize); | ||
600 | bytes_to_write = count > buffer_size ? buffer_size : count; | ||
601 | dbg(4," %s : buffer_size = %Zd, count = %Zd, bytes_to_write = %Zd", | ||
602 | __FUNCTION__, buffer_size, count, bytes_to_write); | ||
603 | |||
604 | if (copy_from_user(dev->interrupt_out_buffer, buffer, bytes_to_write) != 0) { | ||
605 | retval = -EFAULT; | ||
606 | goto exit; | ||
607 | } | ||
608 | |||
609 | /* send off the urb */ | ||
610 | usb_fill_int_urb( | ||
611 | dev->interrupt_out_urb, | ||
612 | dev->udev, | ||
613 | usb_sndintpipe(dev->udev, dev->interrupt_out_endpoint->bEndpointAddress), | ||
614 | dev->interrupt_out_buffer, | ||
615 | bytes_to_write, | ||
616 | adu_interrupt_out_callback, | ||
617 | dev, | ||
618 | dev->interrupt_in_endpoint->bInterval); | ||
619 | /* dev->interrupt_in_urb->transfer_flags |= URB_ASYNC_UNLINK; */ | ||
620 | dev->interrupt_out_urb->actual_length = bytes_to_write; | ||
621 | retval = usb_submit_urb(dev->interrupt_out_urb, GFP_KERNEL); | ||
622 | if (retval < 0) { | ||
623 | err("Couldn't submit interrupt_out_urb %d", retval); | ||
624 | goto exit; | ||
625 | } | ||
626 | |||
627 | buffer += bytes_to_write; | ||
628 | count -= bytes_to_write; | ||
629 | |||
630 | bytes_written += bytes_to_write; | ||
631 | } | ||
632 | } | ||
633 | |||
634 | retval = bytes_written; | ||
635 | |||
636 | exit: | ||
637 | /* unlock the device */ | ||
638 | up(&dev->sem); | ||
639 | |||
640 | dbg(2," %s : leave, return value %d", __FUNCTION__, retval); | ||
641 | |||
642 | return retval; | ||
643 | } | ||
644 | |||
645 | /* file operations needed when we register this driver */ | ||
646 | static struct file_operations adu_fops = { | ||
647 | .owner = THIS_MODULE, | ||
648 | .read = adu_read, | ||
649 | .write = adu_write, | ||
650 | .open = adu_open, | ||
651 | .release = adu_release, | ||
652 | }; | ||
653 | |||
654 | /* | ||
655 | * usb class driver info in order to get a minor number from the usb core, | ||
656 | * and to have the device registered with devfs and the driver core | ||
657 | */ | ||
658 | static struct usb_class_driver adu_class = { | ||
659 | .name = "usb/adutux%d", | ||
660 | .fops = &adu_fops, | ||
661 | .minor_base = ADU_MINOR_BASE, | ||
662 | }; | ||
663 | |||
664 | /** | ||
665 | * adu_probe | ||
666 | * | ||
667 | * Called by the usb core when a new device is connected that it thinks | ||
668 | * this driver might be interested in. | ||
669 | */ | ||
670 | static int adu_probe(struct usb_interface *interface, | ||
671 | const struct usb_device_id *id) | ||
672 | { | ||
673 | struct usb_device *udev = interface_to_usbdev(interface); | ||
674 | struct adu_device *dev = NULL; | ||
675 | struct usb_host_interface *iface_desc; | ||
676 | struct usb_endpoint_descriptor *endpoint; | ||
677 | int retval = -ENODEV; | ||
678 | int in_end_size; | ||
679 | int out_end_size; | ||
680 | int i; | ||
681 | |||
682 | dbg(2," %s : enter", __FUNCTION__); | ||
683 | |||
684 | if (udev == NULL) { | ||
685 | dev_err(&interface->dev, "udev is NULL.\n"); | ||
686 | goto exit; | ||
687 | } | ||
688 | |||
689 | /* allocate memory for our device state and intialize it */ | ||
690 | dev = kzalloc(sizeof(struct adu_device), GFP_KERNEL); | ||
691 | if (dev == NULL) { | ||
692 | dev_err(&interface->dev, "Out of memory\n"); | ||
693 | retval = -ENOMEM; | ||
694 | goto exit; | ||
695 | } | ||
696 | |||
697 | init_MUTEX(&dev->sem); | ||
698 | spin_lock_init(&dev->buflock); | ||
699 | dev->udev = udev; | ||
700 | init_waitqueue_head(&dev->read_wait); | ||
701 | init_waitqueue_head(&dev->write_wait); | ||
702 | |||
703 | iface_desc = &interface->altsetting[0]; | ||
704 | |||
705 | /* set up the endpoint information */ | ||
706 | for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) { | ||
707 | endpoint = &iface_desc->endpoint[i].desc; | ||
708 | |||
709 | if (usb_endpoint_is_int_in(endpoint)) | ||
710 | dev->interrupt_in_endpoint = endpoint; | ||
711 | |||
712 | if (usb_endpoint_is_int_out(endpoint)) | ||
713 | dev->interrupt_out_endpoint = endpoint; | ||
714 | } | ||
715 | if (dev->interrupt_in_endpoint == NULL) { | ||
716 | dev_err(&interface->dev, "interrupt in endpoint not found\n"); | ||
717 | goto error; | ||
718 | } | ||
719 | if (dev->interrupt_out_endpoint == NULL) { | ||
720 | dev_err(&interface->dev, "interrupt out endpoint not found\n"); | ||
721 | goto error; | ||
722 | } | ||
723 | |||
724 | in_end_size = le16_to_cpu(dev->interrupt_in_endpoint->wMaxPacketSize); | ||
725 | out_end_size = le16_to_cpu(dev->interrupt_out_endpoint->wMaxPacketSize); | ||
726 | |||
727 | dev->read_buffer_primary = kmalloc((4 * in_end_size), GFP_KERNEL); | ||
728 | if (!dev->read_buffer_primary) { | ||
729 | dev_err(&interface->dev, "Couldn't allocate read_buffer_primary\n"); | ||
730 | retval = -ENOMEM; | ||
731 | goto error; | ||
732 | } | ||
733 | |||
734 | /* debug code prime the buffer */ | ||
735 | memset(dev->read_buffer_primary, 'a', in_end_size); | ||
736 | memset(dev->read_buffer_primary + in_end_size, 'b', in_end_size); | ||
737 | memset(dev->read_buffer_primary + (2 * in_end_size), 'c', in_end_size); | ||
738 | memset(dev->read_buffer_primary + (3 * in_end_size), 'd', in_end_size); | ||
739 | |||
740 | dev->read_buffer_secondary = kmalloc((4 * in_end_size), GFP_KERNEL); | ||
741 | if (!dev->read_buffer_secondary) { | ||
742 | dev_err(&interface->dev, "Couldn't allocate read_buffer_secondary\n"); | ||
743 | retval = -ENOMEM; | ||
744 | goto error; | ||
745 | } | ||
746 | |||
747 | /* debug code prime the buffer */ | ||
748 | memset(dev->read_buffer_secondary, 'e', in_end_size); | ||
749 | memset(dev->read_buffer_secondary + in_end_size, 'f', in_end_size); | ||
750 | memset(dev->read_buffer_secondary + (2 * in_end_size), 'g', in_end_size); | ||
751 | memset(dev->read_buffer_secondary + (3 * in_end_size), 'h', in_end_size); | ||
752 | |||
753 | dev->interrupt_in_buffer = kmalloc(in_end_size, GFP_KERNEL); | ||
754 | if (!dev->interrupt_in_buffer) { | ||
755 | dev_err(&interface->dev, "Couldn't allocate interrupt_in_buffer\n"); | ||
756 | goto error; | ||
757 | } | ||
758 | |||
759 | /* debug code prime the buffer */ | ||
760 | memset(dev->interrupt_in_buffer, 'i', in_end_size); | ||
761 | |||
762 | dev->interrupt_in_urb = usb_alloc_urb(0, GFP_KERNEL); | ||
763 | if (!dev->interrupt_in_urb) { | ||
764 | dev_err(&interface->dev, "Couldn't allocate interrupt_in_urb\n"); | ||
765 | goto error; | ||
766 | } | ||
767 | dev->interrupt_out_buffer = kmalloc(out_end_size, GFP_KERNEL); | ||
768 | if (!dev->interrupt_out_buffer) { | ||
769 | dev_err(&interface->dev, "Couldn't allocate interrupt_out_buffer\n"); | ||
770 | goto error; | ||
771 | } | ||
772 | dev->interrupt_out_urb = usb_alloc_urb(0, GFP_KERNEL); | ||
773 | if (!dev->interrupt_out_urb) { | ||
774 | dev_err(&interface->dev, "Couldn't allocate interrupt_out_urb\n"); | ||
775 | goto error; | ||
776 | } | ||
777 | |||
778 | if (!usb_string(udev, udev->descriptor.iSerialNumber, dev->serial_number, | ||
779 | sizeof(dev->serial_number))) { | ||
780 | dev_err(&interface->dev, "Could not retrieve serial number\n"); | ||
781 | goto error; | ||
782 | } | ||
783 | dbg(2," %s : serial_number=%s", __FUNCTION__, dev->serial_number); | ||
784 | |||
785 | /* we can register the device now, as it is ready */ | ||
786 | usb_set_intfdata(interface, dev); | ||
787 | |||
788 | retval = usb_register_dev(interface, &adu_class); | ||
789 | |||
790 | if (retval) { | ||
791 | /* something prevented us from registering this driver */ | ||
792 | dev_err(&interface->dev, "Not able to get a minor for this device.\n"); | ||
793 | usb_set_intfdata(interface, NULL); | ||
794 | goto error; | ||
795 | } | ||
796 | |||
797 | dev->minor = interface->minor; | ||
798 | |||
799 | /* let the user know what node this device is now attached to */ | ||
800 | dev_info(&interface->dev, "ADU%d %s now attached to /dev/usb/adutux%d", | ||
801 | udev->descriptor.idProduct, dev->serial_number, | ||
802 | (dev->minor - ADU_MINOR_BASE)); | ||
803 | exit: | ||
804 | dbg(2," %s : leave, return value %p (dev)", __FUNCTION__, dev); | ||
805 | |||
806 | return retval; | ||
807 | |||
808 | error: | ||
809 | adu_delete(dev); | ||
810 | return retval; | ||
811 | } | ||
812 | |||
813 | /** | ||
814 | * adu_disconnect | ||
815 | * | ||
816 | * Called by the usb core when the device is removed from the system. | ||
817 | */ | ||
818 | static void adu_disconnect(struct usb_interface *interface) | ||
819 | { | ||
820 | struct adu_device *dev; | ||
821 | int minor; | ||
822 | |||
823 | dbg(2," %s : enter", __FUNCTION__); | ||
824 | |||
825 | mutex_lock(&disconnect_mutex); /* not interruptible */ | ||
826 | |||
827 | dev = usb_get_intfdata(interface); | ||
828 | usb_set_intfdata(interface, NULL); | ||
829 | |||
830 | down(&dev->sem); /* not interruptible */ | ||
831 | |||
832 | minor = dev->minor; | ||
833 | |||
834 | /* give back our minor */ | ||
835 | usb_deregister_dev(interface, &adu_class); | ||
836 | dev->minor = 0; | ||
837 | |||
838 | /* if the device is not opened, then we clean up right now */ | ||
839 | dbg(2," %s : open count %d", __FUNCTION__, dev->open_count); | ||
840 | if (!dev->open_count) { | ||
841 | up(&dev->sem); | ||
842 | adu_delete(dev); | ||
843 | } else { | ||
844 | dev->udev = NULL; | ||
845 | up(&dev->sem); | ||
846 | } | ||
847 | |||
848 | mutex_unlock(&disconnect_mutex); | ||
849 | |||
850 | dev_info(&interface->dev, "ADU device adutux%d now disconnected", | ||
851 | (minor - ADU_MINOR_BASE)); | ||
852 | |||
853 | dbg(2," %s : leave", __FUNCTION__); | ||
854 | } | ||
855 | |||
856 | /* usb specific object needed to register this driver with the usb subsystem */ | ||
857 | static struct usb_driver adu_driver = { | ||
858 | .name = "adutux", | ||
859 | .probe = adu_probe, | ||
860 | .disconnect = adu_disconnect, | ||
861 | .id_table = device_table, | ||
862 | }; | ||
863 | |||
864 | static int __init adu_init(void) | ||
865 | { | ||
866 | int result; | ||
867 | |||
868 | dbg(2," %s : enter", __FUNCTION__); | ||
869 | |||
870 | /* register this driver with the USB subsystem */ | ||
871 | result = usb_register(&adu_driver); | ||
872 | if (result < 0) { | ||
873 | err("usb_register failed for the "__FILE__" driver. " | ||
874 | "Error number %d", result); | ||
875 | goto exit; | ||
876 | } | ||
877 | |||
878 | info("adutux " DRIVER_DESC " " DRIVER_VERSION); | ||
879 | info("adutux is an experimental driver. Use at your own risk"); | ||
880 | |||
881 | exit: | ||
882 | dbg(2," %s : leave, return value %d", __FUNCTION__, result); | ||
883 | |||
884 | return result; | ||
885 | } | ||
886 | |||
887 | static void __exit adu_exit(void) | ||
888 | { | ||
889 | dbg(2," %s : enter", __FUNCTION__); | ||
890 | /* deregister this driver with the USB subsystem */ | ||
891 | usb_deregister(&adu_driver); | ||
892 | dbg(2," %s : leave", __FUNCTION__); | ||
893 | } | ||
894 | |||
895 | module_init(adu_init); | ||
896 | module_exit(adu_exit); | ||
897 | |||
898 | MODULE_AUTHOR(DRIVER_AUTHOR); | ||
899 | MODULE_DESCRIPTION(DRIVER_DESC); | ||
900 | MODULE_LICENSE("GPL"); | ||
diff --git a/drivers/usb/misc/auerswald.c b/drivers/usb/misc/auerswald.c index 1fef36e71c57..4fd2110b3411 100644 --- a/drivers/usb/misc/auerswald.c +++ b/drivers/usb/misc/auerswald.c | |||
@@ -806,7 +806,7 @@ static void auerbuf_releasebuf( pauerbuf_t bp) | |||
806 | 0 Initial, OK | 806 | 0 Initial, OK |
807 | -EINPROGRESS during submission until end | 807 | -EINPROGRESS during submission until end |
808 | -ENOENT if urb is unlinked | 808 | -ENOENT if urb is unlinked |
809 | -ETIMEDOUT Transfer timed out, NAK | 809 | -ETIME Device did not respond |
810 | -ENOMEM Memory Overflow | 810 | -ENOMEM Memory Overflow |
811 | -ENODEV Specified USB-device or bus doesn't exist | 811 | -ENODEV Specified USB-device or bus doesn't exist |
812 | -ENXIO URB already queued | 812 | -ENXIO URB already queued |
@@ -832,7 +832,7 @@ static int auerswald_status_retry (int status) | |||
832 | { | 832 | { |
833 | switch (status) { | 833 | switch (status) { |
834 | case 0: | 834 | case 0: |
835 | case -ETIMEDOUT: | 835 | case -ETIME: |
836 | case -EOVERFLOW: | 836 | case -EOVERFLOW: |
837 | case -EAGAIN: | 837 | case -EAGAIN: |
838 | case -EPIPE: | 838 | case -EPIPE: |
@@ -1858,7 +1858,7 @@ static int auerchar_release (struct inode *inode, struct file *file) | |||
1858 | 1858 | ||
1859 | /*----------------------------------------------------------------------*/ | 1859 | /*----------------------------------------------------------------------*/ |
1860 | /* File operation structure */ | 1860 | /* File operation structure */ |
1861 | static struct file_operations auerswald_fops = | 1861 | static const struct file_operations auerswald_fops = |
1862 | { | 1862 | { |
1863 | .owner = THIS_MODULE, | 1863 | .owner = THIS_MODULE, |
1864 | .llseek = no_llseek, | 1864 | .llseek = no_llseek, |
diff --git a/drivers/usb/misc/cypress_cy7c63.c b/drivers/usb/misc/cypress_cy7c63.c index 9c46746d5d00..b63b5f34b2aa 100644 --- a/drivers/usb/misc/cypress_cy7c63.c +++ b/drivers/usb/misc/cypress_cy7c63.c | |||
@@ -209,7 +209,7 @@ static int cypress_probe(struct usb_interface *interface, | |||
209 | dev = kzalloc(sizeof(*dev), GFP_KERNEL); | 209 | dev = kzalloc(sizeof(*dev), GFP_KERNEL); |
210 | if (dev == NULL) { | 210 | if (dev == NULL) { |
211 | dev_err(&interface->dev, "Out of memory!\n"); | 211 | dev_err(&interface->dev, "Out of memory!\n"); |
212 | goto error; | 212 | goto error_mem; |
213 | } | 213 | } |
214 | 214 | ||
215 | dev->udev = usb_get_dev(interface_to_usbdev(interface)); | 215 | dev->udev = usb_get_dev(interface_to_usbdev(interface)); |
@@ -218,15 +218,26 @@ static int cypress_probe(struct usb_interface *interface, | |||
218 | usb_set_intfdata(interface, dev); | 218 | usb_set_intfdata(interface, dev); |
219 | 219 | ||
220 | /* create device attribute files */ | 220 | /* create device attribute files */ |
221 | device_create_file(&interface->dev, &dev_attr_port0); | 221 | retval = device_create_file(&interface->dev, &dev_attr_port0); |
222 | device_create_file(&interface->dev, &dev_attr_port1); | 222 | if (retval) |
223 | goto error; | ||
224 | retval = device_create_file(&interface->dev, &dev_attr_port1); | ||
225 | if (retval) | ||
226 | goto error; | ||
223 | 227 | ||
224 | /* let the user know that the device is now attached */ | 228 | /* let the user know that the device is now attached */ |
225 | dev_info(&interface->dev, | 229 | dev_info(&interface->dev, |
226 | "Cypress CY7C63xxx device now attached\n"); | 230 | "Cypress CY7C63xxx device now attached\n"); |
231 | return 0; | ||
227 | 232 | ||
228 | retval = 0; | ||
229 | error: | 233 | error: |
234 | device_remove_file(&interface->dev, &dev_attr_port0); | ||
235 | device_remove_file(&interface->dev, &dev_attr_port1); | ||
236 | usb_set_intfdata(interface, NULL); | ||
237 | usb_put_dev(dev->udev); | ||
238 | kfree(dev); | ||
239 | |||
240 | error_mem: | ||
230 | return retval; | 241 | return retval; |
231 | } | 242 | } |
232 | 243 | ||
diff --git a/drivers/usb/misc/cytherm.c b/drivers/usb/misc/cytherm.c index b20bec445552..04e87acd6e46 100644 --- a/drivers/usb/misc/cytherm.c +++ b/drivers/usb/misc/cytherm.c | |||
@@ -353,7 +353,7 @@ static int cytherm_probe(struct usb_interface *interface, | |||
353 | dev = kzalloc (sizeof(struct usb_cytherm), GFP_KERNEL); | 353 | dev = kzalloc (sizeof(struct usb_cytherm), GFP_KERNEL); |
354 | if (dev == NULL) { | 354 | if (dev == NULL) { |
355 | dev_err (&interface->dev, "Out of memory\n"); | 355 | dev_err (&interface->dev, "Out of memory\n"); |
356 | goto error; | 356 | goto error_mem; |
357 | } | 357 | } |
358 | 358 | ||
359 | dev->udev = usb_get_dev(udev); | 359 | dev->udev = usb_get_dev(udev); |
@@ -362,18 +362,35 @@ static int cytherm_probe(struct usb_interface *interface, | |||
362 | 362 | ||
363 | dev->brightness = 0xFF; | 363 | dev->brightness = 0xFF; |
364 | 364 | ||
365 | device_create_file(&interface->dev, &dev_attr_brightness); | 365 | retval = device_create_file(&interface->dev, &dev_attr_brightness); |
366 | device_create_file(&interface->dev, &dev_attr_temp); | 366 | if (retval) |
367 | device_create_file(&interface->dev, &dev_attr_button); | 367 | goto error; |
368 | device_create_file(&interface->dev, &dev_attr_port0); | 368 | retval = device_create_file(&interface->dev, &dev_attr_temp); |
369 | device_create_file(&interface->dev, &dev_attr_port1); | 369 | if (retval) |
370 | goto error; | ||
371 | retval = device_create_file(&interface->dev, &dev_attr_button); | ||
372 | if (retval) | ||
373 | goto error; | ||
374 | retval = device_create_file(&interface->dev, &dev_attr_port0); | ||
375 | if (retval) | ||
376 | goto error; | ||
377 | retval = device_create_file(&interface->dev, &dev_attr_port1); | ||
378 | if (retval) | ||
379 | goto error; | ||
370 | 380 | ||
371 | dev_info (&interface->dev, | 381 | dev_info (&interface->dev, |
372 | "Cypress thermometer device now attached\n"); | 382 | "Cypress thermometer device now attached\n"); |
373 | return 0; | 383 | return 0; |
374 | 384 | error: | |
375 | error: | 385 | device_remove_file(&interface->dev, &dev_attr_brightness); |
386 | device_remove_file(&interface->dev, &dev_attr_temp); | ||
387 | device_remove_file(&interface->dev, &dev_attr_button); | ||
388 | device_remove_file(&interface->dev, &dev_attr_port0); | ||
389 | device_remove_file(&interface->dev, &dev_attr_port1); | ||
390 | usb_set_intfdata (interface, NULL); | ||
391 | usb_put_dev(dev->udev); | ||
376 | kfree(dev); | 392 | kfree(dev); |
393 | error_mem: | ||
377 | return retval; | 394 | return retval; |
378 | } | 395 | } |
379 | 396 | ||
diff --git a/drivers/usb/misc/ftdi-elan.c b/drivers/usb/misc/ftdi-elan.c new file mode 100644 index 000000000000..b88a09497c28 --- /dev/null +++ b/drivers/usb/misc/ftdi-elan.c | |||
@@ -0,0 +1,2809 @@ | |||
1 | /* | ||
2 | * USB FTDI client driver for Elan Digital Systems's Uxxx adapters | ||
3 | * | ||
4 | * Copyright(C) 2006 Elan Digital Systems Limited | ||
5 | * http://www.elandigitalsystems.com | ||
6 | * | ||
7 | * Author and Maintainer - Tony Olech - Elan Digital Systems | ||
8 | * tony.olech@elandigitalsystems.com | ||
9 | * | ||
10 | * This program is free software;you can redistribute it and/or | ||
11 | * modify it under the terms of the GNU General Public License as | ||
12 | * published by the Free Software Foundation, version 2. | ||
13 | * | ||
14 | * | ||
15 | * This driver was written by Tony Olech(tony.olech@elandigitalsystems.com) | ||
16 | * based on various USB client drivers in the 2.6.15 linux kernel | ||
17 | * with constant reference to the 3rd Edition of Linux Device Drivers | ||
18 | * published by O'Reilly | ||
19 | * | ||
20 | * The U132 adapter is a USB to CardBus adapter specifically designed | ||
21 | * for PC cards that contain an OHCI host controller. Typical PC cards | ||
22 | * are the Orange Mobile 3G Option GlobeTrotter Fusion card. | ||
23 | * | ||
24 | * The U132 adapter will *NOT *work with PC cards that do not contain | ||
25 | * an OHCI controller. A simple way to test whether a PC card has an | ||
26 | * OHCI controller as an interface is to insert the PC card directly | ||
27 | * into a laptop(or desktop) with a CardBus slot and if "lspci" shows | ||
28 | * a new USB controller and "lsusb -v" shows a new OHCI Host Controller | ||
29 | * then there is a good chance that the U132 adapter will support the | ||
30 | * PC card.(you also need the specific client driver for the PC card) | ||
31 | * | ||
32 | * Please inform the Author and Maintainer about any PC cards that | ||
33 | * contain OHCI Host Controller and work when directly connected to | ||
34 | * an embedded CardBus slot but do not work when they are connected | ||
35 | * via an ELAN U132 adapter. | ||
36 | * | ||
37 | */ | ||
38 | #include <linux/config.h> | ||
39 | #include <linux/kernel.h> | ||
40 | #include <linux/errno.h> | ||
41 | #include <linux/init.h> | ||
42 | #include <linux/list.h> | ||
43 | #include <linux/ioctl.h> | ||
44 | #include <linux/slab.h> | ||
45 | #include <linux/module.h> | ||
46 | #include <linux/kref.h> | ||
47 | #include <asm/uaccess.h> | ||
48 | #include <linux/usb.h> | ||
49 | #include <linux/workqueue.h> | ||
50 | #include <linux/platform_device.h> | ||
51 | MODULE_AUTHOR("Tony Olech"); | ||
52 | MODULE_DESCRIPTION("FTDI ELAN driver"); | ||
53 | MODULE_LICENSE("GPL"); | ||
54 | #define INT_MODULE_PARM(n, v) static int n = v;module_param(n, int, 0444) | ||
55 | extern struct platform_driver u132_platform_driver; | ||
56 | static struct workqueue_struct *status_queue; | ||
57 | static struct workqueue_struct *command_queue; | ||
58 | static struct workqueue_struct *respond_queue; | ||
59 | /* | ||
60 | * ftdi_module_lock exists to protect access to global variables | ||
61 | * | ||
62 | */ | ||
63 | static struct semaphore ftdi_module_lock; | ||
64 | static int ftdi_instances = 0; | ||
65 | static struct list_head ftdi_static_list; | ||
66 | /* | ||
67 | * end of the global variables protected by ftdi_module_lock | ||
68 | */ | ||
69 | #include "usb_u132.h" | ||
70 | #define TD_DEVNOTRESP 5 | ||
71 | /* Define these values to match your devices*/ | ||
72 | #define USB_FTDI_ELAN_VENDOR_ID 0x0403 | ||
73 | #define USB_FTDI_ELAN_PRODUCT_ID 0xd6ea | ||
74 | /* table of devices that work with this driver*/ | ||
75 | static struct usb_device_id ftdi_elan_table[] = { | ||
76 | {USB_DEVICE(USB_FTDI_ELAN_VENDOR_ID, USB_FTDI_ELAN_PRODUCT_ID)}, | ||
77 | { /* Terminating entry */ } | ||
78 | }; | ||
79 | |||
80 | MODULE_DEVICE_TABLE(usb, ftdi_elan_table); | ||
81 | /* only the jtag(firmware upgrade device) interface requires | ||
82 | * a device file and corresponding minor number, but the | ||
83 | * interface is created unconditionally - I suppose it could | ||
84 | * be configured or not according to a module parameter. | ||
85 | * But since we(now) require one interface per device, | ||
86 | * and since it unlikely that a normal installation would | ||
87 | * require more than a couple of elan-ftdi devices, 8 seems | ||
88 | * like a reasonable limit to have here, and if someone | ||
89 | * really requires more than 8 devices, then they can frig the | ||
90 | * code and recompile | ||
91 | */ | ||
92 | #define USB_FTDI_ELAN_MINOR_BASE 192 | ||
93 | #define COMMAND_BITS 5 | ||
94 | #define COMMAND_SIZE (1<<COMMAND_BITS) | ||
95 | #define COMMAND_MASK (COMMAND_SIZE-1) | ||
96 | struct u132_command { | ||
97 | u8 header; | ||
98 | u16 length; | ||
99 | u8 address; | ||
100 | u8 width; | ||
101 | u32 value; | ||
102 | int follows; | ||
103 | void *buffer; | ||
104 | }; | ||
105 | #define RESPOND_BITS 5 | ||
106 | #define RESPOND_SIZE (1<<RESPOND_BITS) | ||
107 | #define RESPOND_MASK (RESPOND_SIZE-1) | ||
108 | struct u132_respond { | ||
109 | u8 header; | ||
110 | u8 address; | ||
111 | u32 *value; | ||
112 | int *result; | ||
113 | struct completion wait_completion; | ||
114 | }; | ||
115 | struct u132_target { | ||
116 | void *endp; | ||
117 | struct urb *urb; | ||
118 | int toggle_bits; | ||
119 | int error_count; | ||
120 | int condition_code; | ||
121 | int repeat_number; | ||
122 | int halted; | ||
123 | int skipped; | ||
124 | int actual; | ||
125 | int non_null; | ||
126 | int active; | ||
127 | int abandoning; | ||
128 | void (*callback) (void *endp, struct urb *urb, u8 *buf, int len, | ||
129 | int toggle_bits, int error_count, int condition_code, | ||
130 | int repeat_number, int halted, int skipped, int actual, | ||
131 | int non_null); | ||
132 | }; | ||
133 | /* Structure to hold all of our device specific stuff*/ | ||
134 | struct usb_ftdi { | ||
135 | struct list_head ftdi_list; | ||
136 | struct semaphore u132_lock; | ||
137 | int command_next; | ||
138 | int command_head; | ||
139 | struct u132_command command[COMMAND_SIZE]; | ||
140 | int respond_next; | ||
141 | int respond_head; | ||
142 | struct u132_respond respond[RESPOND_SIZE]; | ||
143 | struct u132_target target[4]; | ||
144 | char device_name[16]; | ||
145 | unsigned synchronized:1; | ||
146 | unsigned enumerated:1; | ||
147 | unsigned registered:1; | ||
148 | unsigned initialized:1; | ||
149 | unsigned card_ejected:1; | ||
150 | int function; | ||
151 | int sequence_num; | ||
152 | int disconnected; | ||
153 | int gone_away; | ||
154 | int stuck_status; | ||
155 | int status_queue_delay; | ||
156 | struct semaphore sw_lock; | ||
157 | struct usb_device *udev; | ||
158 | struct usb_interface *interface; | ||
159 | struct usb_class_driver *class; | ||
160 | struct work_struct status_work; | ||
161 | struct work_struct command_work; | ||
162 | struct work_struct respond_work; | ||
163 | struct u132_platform_data platform_data; | ||
164 | struct resource resources[0]; | ||
165 | struct platform_device platform_dev; | ||
166 | unsigned char *bulk_in_buffer; | ||
167 | size_t bulk_in_size; | ||
168 | size_t bulk_in_last; | ||
169 | size_t bulk_in_left; | ||
170 | __u8 bulk_in_endpointAddr; | ||
171 | __u8 bulk_out_endpointAddr; | ||
172 | struct kref kref; | ||
173 | u32 controlreg; | ||
174 | u8 response[4 + 1024]; | ||
175 | int expected; | ||
176 | int recieved; | ||
177 | int ed_found; | ||
178 | }; | ||
179 | #define kref_to_usb_ftdi(d) container_of(d, struct usb_ftdi, kref) | ||
180 | #define platform_device_to_usb_ftdi(d) container_of(d, struct usb_ftdi, \ | ||
181 | platform_dev) | ||
182 | static struct usb_driver ftdi_elan_driver; | ||
183 | static void ftdi_elan_delete(struct kref *kref) | ||
184 | { | ||
185 | struct usb_ftdi *ftdi = kref_to_usb_ftdi(kref); | ||
186 | dev_warn(&ftdi->udev->dev, "FREEING ftdi=%p\n", ftdi); | ||
187 | usb_put_dev(ftdi->udev); | ||
188 | ftdi->disconnected += 1; | ||
189 | down(&ftdi_module_lock); | ||
190 | list_del_init(&ftdi->ftdi_list); | ||
191 | ftdi_instances -= 1; | ||
192 | up(&ftdi_module_lock); | ||
193 | kfree(ftdi->bulk_in_buffer); | ||
194 | ftdi->bulk_in_buffer = NULL; | ||
195 | } | ||
196 | |||
197 | static void ftdi_elan_put_kref(struct usb_ftdi *ftdi) | ||
198 | { | ||
199 | kref_put(&ftdi->kref, ftdi_elan_delete); | ||
200 | } | ||
201 | |||
202 | static void ftdi_elan_get_kref(struct usb_ftdi *ftdi) | ||
203 | { | ||
204 | kref_get(&ftdi->kref); | ||
205 | } | ||
206 | |||
207 | static void ftdi_elan_init_kref(struct usb_ftdi *ftdi) | ||
208 | { | ||
209 | kref_init(&ftdi->kref); | ||
210 | } | ||
211 | |||
212 | static void ftdi_status_requeue_work(struct usb_ftdi *ftdi, unsigned int delta) | ||
213 | { | ||
214 | if (delta > 0) { | ||
215 | if (queue_delayed_work(status_queue, &ftdi->status_work, delta)) | ||
216 | return; | ||
217 | } else if (queue_work(status_queue, &ftdi->status_work)) | ||
218 | return; | ||
219 | kref_put(&ftdi->kref, ftdi_elan_delete); | ||
220 | return; | ||
221 | } | ||
222 | |||
223 | static void ftdi_status_queue_work(struct usb_ftdi *ftdi, unsigned int delta) | ||
224 | { | ||
225 | if (delta > 0) { | ||
226 | if (queue_delayed_work(status_queue, &ftdi->status_work, delta)) | ||
227 | kref_get(&ftdi->kref); | ||
228 | } else if (queue_work(status_queue, &ftdi->status_work)) | ||
229 | kref_get(&ftdi->kref); | ||
230 | return; | ||
231 | } | ||
232 | |||
233 | static void ftdi_status_cancel_work(struct usb_ftdi *ftdi) | ||
234 | { | ||
235 | if (cancel_delayed_work(&ftdi->status_work)) | ||
236 | kref_put(&ftdi->kref, ftdi_elan_delete); | ||
237 | } | ||
238 | |||
239 | static void ftdi_command_requeue_work(struct usb_ftdi *ftdi, unsigned int delta) | ||
240 | { | ||
241 | if (delta > 0) { | ||
242 | if (queue_delayed_work(command_queue, &ftdi->command_work, | ||
243 | delta)) | ||
244 | return; | ||
245 | } else if (queue_work(command_queue, &ftdi->command_work)) | ||
246 | return; | ||
247 | kref_put(&ftdi->kref, ftdi_elan_delete); | ||
248 | return; | ||
249 | } | ||
250 | |||
251 | static void ftdi_command_queue_work(struct usb_ftdi *ftdi, unsigned int delta) | ||
252 | { | ||
253 | if (delta > 0) { | ||
254 | if (queue_delayed_work(command_queue, &ftdi->command_work, | ||
255 | delta)) | ||
256 | kref_get(&ftdi->kref); | ||
257 | } else if (queue_work(command_queue, &ftdi->command_work)) | ||
258 | kref_get(&ftdi->kref); | ||
259 | return; | ||
260 | } | ||
261 | |||
262 | static void ftdi_command_cancel_work(struct usb_ftdi *ftdi) | ||
263 | { | ||
264 | if (cancel_delayed_work(&ftdi->command_work)) | ||
265 | kref_put(&ftdi->kref, ftdi_elan_delete); | ||
266 | } | ||
267 | |||
268 | static void ftdi_response_requeue_work(struct usb_ftdi *ftdi, | ||
269 | unsigned int delta) | ||
270 | { | ||
271 | if (delta > 0) { | ||
272 | if (queue_delayed_work(respond_queue, &ftdi->respond_work, | ||
273 | delta)) | ||
274 | return; | ||
275 | } else if (queue_work(respond_queue, &ftdi->respond_work)) | ||
276 | return; | ||
277 | kref_put(&ftdi->kref, ftdi_elan_delete); | ||
278 | return; | ||
279 | } | ||
280 | |||
281 | static void ftdi_respond_queue_work(struct usb_ftdi *ftdi, unsigned int delta) | ||
282 | { | ||
283 | if (delta > 0) { | ||
284 | if (queue_delayed_work(respond_queue, &ftdi->respond_work, | ||
285 | delta)) | ||
286 | kref_get(&ftdi->kref); | ||
287 | } else if (queue_work(respond_queue, &ftdi->respond_work)) | ||
288 | kref_get(&ftdi->kref); | ||
289 | return; | ||
290 | } | ||
291 | |||
292 | static void ftdi_response_cancel_work(struct usb_ftdi *ftdi) | ||
293 | { | ||
294 | if (cancel_delayed_work(&ftdi->respond_work)) | ||
295 | kref_put(&ftdi->kref, ftdi_elan_delete); | ||
296 | } | ||
297 | |||
298 | void ftdi_elan_gone_away(struct platform_device *pdev) | ||
299 | { | ||
300 | struct usb_ftdi *ftdi = platform_device_to_usb_ftdi(pdev); | ||
301 | ftdi->gone_away += 1; | ||
302 | ftdi_elan_put_kref(ftdi); | ||
303 | } | ||
304 | |||
305 | |||
306 | EXPORT_SYMBOL_GPL(ftdi_elan_gone_away); | ||
307 | void ftdi_release_platform_dev(struct device *dev) | ||
308 | { | ||
309 | dev->parent = NULL; | ||
310 | } | ||
311 | |||
312 | static void ftdi_elan_do_callback(struct usb_ftdi *ftdi, | ||
313 | struct u132_target *target, u8 *buffer, int length); | ||
314 | static void ftdi_elan_kick_command_queue(struct usb_ftdi *ftdi); | ||
315 | static void ftdi_elan_kick_respond_queue(struct usb_ftdi *ftdi); | ||
316 | static int ftdi_elan_setupOHCI(struct usb_ftdi *ftdi); | ||
317 | static int ftdi_elan_checkingPCI(struct usb_ftdi *ftdi); | ||
318 | static int ftdi_elan_enumeratePCI(struct usb_ftdi *ftdi); | ||
319 | static int ftdi_elan_synchronize(struct usb_ftdi *ftdi); | ||
320 | static int ftdi_elan_stuck_waiting(struct usb_ftdi *ftdi); | ||
321 | static int ftdi_elan_command_engine(struct usb_ftdi *ftdi); | ||
322 | static int ftdi_elan_respond_engine(struct usb_ftdi *ftdi); | ||
323 | static int ftdi_elan_hcd_init(struct usb_ftdi *ftdi) | ||
324 | { | ||
325 | int result; | ||
326 | if (ftdi->platform_dev.dev.parent) | ||
327 | return -EBUSY; | ||
328 | ftdi_elan_get_kref(ftdi); | ||
329 | ftdi->platform_data.potpg = 100; | ||
330 | ftdi->platform_data.reset = NULL; | ||
331 | ftdi->platform_dev.id = ftdi->sequence_num; | ||
332 | ftdi->platform_dev.resource = ftdi->resources; | ||
333 | ftdi->platform_dev.num_resources = ARRAY_SIZE(ftdi->resources); | ||
334 | ftdi->platform_dev.dev.platform_data = &ftdi->platform_data; | ||
335 | ftdi->platform_dev.dev.parent = NULL; | ||
336 | ftdi->platform_dev.dev.release = ftdi_release_platform_dev; | ||
337 | ftdi->platform_dev.dev.dma_mask = NULL; | ||
338 | snprintf(ftdi->device_name, sizeof(ftdi->device_name), "u132_hcd"); | ||
339 | ftdi->platform_dev.name = ftdi->device_name; | ||
340 | dev_info(&ftdi->udev->dev, "requesting module '%s'\n", "u132_hcd"); | ||
341 | request_module("u132_hcd"); | ||
342 | dev_info(&ftdi->udev->dev, "registering '%s'\n", | ||
343 | ftdi->platform_dev.name); | ||
344 | result = platform_device_register(&ftdi->platform_dev); | ||
345 | return result; | ||
346 | } | ||
347 | |||
348 | static void ftdi_elan_abandon_completions(struct usb_ftdi *ftdi) | ||
349 | { | ||
350 | down(&ftdi->u132_lock); | ||
351 | while (ftdi->respond_next > ftdi->respond_head) { | ||
352 | struct u132_respond *respond = &ftdi->respond[RESPOND_MASK & | ||
353 | ftdi->respond_head++]; | ||
354 | *respond->result = -ESHUTDOWN; | ||
355 | *respond->value = 0; | ||
356 | complete(&respond->wait_completion); | ||
357 | } up(&ftdi->u132_lock); | ||
358 | } | ||
359 | |||
360 | static void ftdi_elan_abandon_targets(struct usb_ftdi *ftdi) | ||
361 | { | ||
362 | int ed_number = 4; | ||
363 | down(&ftdi->u132_lock); | ||
364 | while (ed_number-- > 0) { | ||
365 | struct u132_target *target = &ftdi->target[ed_number]; | ||
366 | if (target->active == 1) { | ||
367 | target->condition_code = TD_DEVNOTRESP; | ||
368 | up(&ftdi->u132_lock); | ||
369 | ftdi_elan_do_callback(ftdi, target, NULL, 0); | ||
370 | down(&ftdi->u132_lock); | ||
371 | } | ||
372 | } | ||
373 | ftdi->recieved = 0; | ||
374 | ftdi->expected = 4; | ||
375 | ftdi->ed_found = 0; | ||
376 | up(&ftdi->u132_lock); | ||
377 | } | ||
378 | |||
379 | static void ftdi_elan_flush_targets(struct usb_ftdi *ftdi) | ||
380 | { | ||
381 | int ed_number = 4; | ||
382 | down(&ftdi->u132_lock); | ||
383 | while (ed_number-- > 0) { | ||
384 | struct u132_target *target = &ftdi->target[ed_number]; | ||
385 | target->abandoning = 1; | ||
386 | wait_1:if (target->active == 1) { | ||
387 | int command_size = ftdi->command_next - | ||
388 | ftdi->command_head; | ||
389 | if (command_size < COMMAND_SIZE) { | ||
390 | struct u132_command *command = &ftdi->command[ | ||
391 | COMMAND_MASK & ftdi->command_next]; | ||
392 | command->header = 0x80 | (ed_number << 5) | 0x4; | ||
393 | command->length = 0x00; | ||
394 | command->address = 0x00; | ||
395 | command->width = 0x00; | ||
396 | command->follows = 0; | ||
397 | command->value = 0; | ||
398 | command->buffer = &command->value; | ||
399 | ftdi->command_next += 1; | ||
400 | ftdi_elan_kick_command_queue(ftdi); | ||
401 | } else { | ||
402 | up(&ftdi->u132_lock); | ||
403 | msleep(100); | ||
404 | down(&ftdi->u132_lock); | ||
405 | goto wait_1; | ||
406 | } | ||
407 | } | ||
408 | wait_2:if (target->active == 1) { | ||
409 | int command_size = ftdi->command_next - | ||
410 | ftdi->command_head; | ||
411 | if (command_size < COMMAND_SIZE) { | ||
412 | struct u132_command *command = &ftdi->command[ | ||
413 | COMMAND_MASK & ftdi->command_next]; | ||
414 | command->header = 0x90 | (ed_number << 5); | ||
415 | command->length = 0x00; | ||
416 | command->address = 0x00; | ||
417 | command->width = 0x00; | ||
418 | command->follows = 0; | ||
419 | command->value = 0; | ||
420 | command->buffer = &command->value; | ||
421 | ftdi->command_next += 1; | ||
422 | ftdi_elan_kick_command_queue(ftdi); | ||
423 | } else { | ||
424 | up(&ftdi->u132_lock); | ||
425 | msleep(100); | ||
426 | down(&ftdi->u132_lock); | ||
427 | goto wait_2; | ||
428 | } | ||
429 | } | ||
430 | } | ||
431 | ftdi->recieved = 0; | ||
432 | ftdi->expected = 4; | ||
433 | ftdi->ed_found = 0; | ||
434 | up(&ftdi->u132_lock); | ||
435 | } | ||
436 | |||
437 | static void ftdi_elan_cancel_targets(struct usb_ftdi *ftdi) | ||
438 | { | ||
439 | int ed_number = 4; | ||
440 | down(&ftdi->u132_lock); | ||
441 | while (ed_number-- > 0) { | ||
442 | struct u132_target *target = &ftdi->target[ed_number]; | ||
443 | target->abandoning = 1; | ||
444 | wait:if (target->active == 1) { | ||
445 | int command_size = ftdi->command_next - | ||
446 | ftdi->command_head; | ||
447 | if (command_size < COMMAND_SIZE) { | ||
448 | struct u132_command *command = &ftdi->command[ | ||
449 | COMMAND_MASK & ftdi->command_next]; | ||
450 | command->header = 0x80 | (ed_number << 5) | 0x4; | ||
451 | command->length = 0x00; | ||
452 | command->address = 0x00; | ||
453 | command->width = 0x00; | ||
454 | command->follows = 0; | ||
455 | command->value = 0; | ||
456 | command->buffer = &command->value; | ||
457 | ftdi->command_next += 1; | ||
458 | ftdi_elan_kick_command_queue(ftdi); | ||
459 | } else { | ||
460 | up(&ftdi->u132_lock); | ||
461 | msleep(100); | ||
462 | down(&ftdi->u132_lock); | ||
463 | goto wait; | ||
464 | } | ||
465 | } | ||
466 | } | ||
467 | ftdi->recieved = 0; | ||
468 | ftdi->expected = 4; | ||
469 | ftdi->ed_found = 0; | ||
470 | up(&ftdi->u132_lock); | ||
471 | } | ||
472 | |||
473 | static void ftdi_elan_kick_command_queue(struct usb_ftdi *ftdi) | ||
474 | { | ||
475 | ftdi_command_queue_work(ftdi, 0); | ||
476 | return; | ||
477 | } | ||
478 | |||
479 | static void ftdi_elan_command_work(void *data) | ||
480 | { | ||
481 | struct usb_ftdi *ftdi = data; | ||
482 | if (ftdi->disconnected > 0) { | ||
483 | ftdi_elan_put_kref(ftdi); | ||
484 | return; | ||
485 | } else { | ||
486 | int retval = ftdi_elan_command_engine(ftdi); | ||
487 | if (retval == -ESHUTDOWN) { | ||
488 | ftdi->disconnected += 1; | ||
489 | } else if (retval == -ENODEV) { | ||
490 | ftdi->disconnected += 1; | ||
491 | } else if (retval) | ||
492 | dev_err(&ftdi->udev->dev, "command error %d\n", retval); | ||
493 | ftdi_command_requeue_work(ftdi, msecs_to_jiffies(10)); | ||
494 | return; | ||
495 | } | ||
496 | } | ||
497 | |||
498 | static void ftdi_elan_kick_respond_queue(struct usb_ftdi *ftdi) | ||
499 | { | ||
500 | ftdi_respond_queue_work(ftdi, 0); | ||
501 | return; | ||
502 | } | ||
503 | |||
504 | static void ftdi_elan_respond_work(void *data) | ||
505 | { | ||
506 | struct usb_ftdi *ftdi = data; | ||
507 | if (ftdi->disconnected > 0) { | ||
508 | ftdi_elan_put_kref(ftdi); | ||
509 | return; | ||
510 | } else { | ||
511 | int retval = ftdi_elan_respond_engine(ftdi); | ||
512 | if (retval == 0) { | ||
513 | } else if (retval == -ESHUTDOWN) { | ||
514 | ftdi->disconnected += 1; | ||
515 | } else if (retval == -ENODEV) { | ||
516 | ftdi->disconnected += 1; | ||
517 | } else if (retval == -ENODEV) { | ||
518 | ftdi->disconnected += 1; | ||
519 | } else if (retval == -EILSEQ) { | ||
520 | ftdi->disconnected += 1; | ||
521 | } else { | ||
522 | ftdi->disconnected += 1; | ||
523 | dev_err(&ftdi->udev->dev, "respond error %d\n", retval); | ||
524 | } | ||
525 | if (ftdi->disconnected > 0) { | ||
526 | ftdi_elan_abandon_completions(ftdi); | ||
527 | ftdi_elan_abandon_targets(ftdi); | ||
528 | } | ||
529 | ftdi_response_requeue_work(ftdi, msecs_to_jiffies(10)); | ||
530 | return; | ||
531 | } | ||
532 | } | ||
533 | |||
534 | |||
535 | /* | ||
536 | * the sw_lock is initially held and will be freed | ||
537 | * after the FTDI has been synchronized | ||
538 | * | ||
539 | */ | ||
540 | static void ftdi_elan_status_work(void *data) | ||
541 | { | ||
542 | struct usb_ftdi *ftdi = data; | ||
543 | int work_delay_in_msec = 0; | ||
544 | if (ftdi->disconnected > 0) { | ||
545 | ftdi_elan_put_kref(ftdi); | ||
546 | return; | ||
547 | } else if (ftdi->synchronized == 0) { | ||
548 | down(&ftdi->sw_lock); | ||
549 | if (ftdi_elan_synchronize(ftdi) == 0) { | ||
550 | ftdi->synchronized = 1; | ||
551 | ftdi_command_queue_work(ftdi, 1); | ||
552 | ftdi_respond_queue_work(ftdi, 1); | ||
553 | up(&ftdi->sw_lock); | ||
554 | work_delay_in_msec = 100; | ||
555 | } else { | ||
556 | dev_err(&ftdi->udev->dev, "synchronize failed\n"); | ||
557 | up(&ftdi->sw_lock); | ||
558 | work_delay_in_msec = 10 *1000; | ||
559 | } | ||
560 | } else if (ftdi->stuck_status > 0) { | ||
561 | if (ftdi_elan_stuck_waiting(ftdi) == 0) { | ||
562 | ftdi->stuck_status = 0; | ||
563 | ftdi->synchronized = 0; | ||
564 | } else if ((ftdi->stuck_status++ % 60) == 1) { | ||
565 | dev_err(&ftdi->udev->dev, "WRONG type of card inserted " | ||
566 | "- please remove\n"); | ||
567 | } else | ||
568 | dev_err(&ftdi->udev->dev, "WRONG type of card inserted " | ||
569 | "- checked %d times\n", ftdi->stuck_status); | ||
570 | work_delay_in_msec = 100; | ||
571 | } else if (ftdi->enumerated == 0) { | ||
572 | if (ftdi_elan_enumeratePCI(ftdi) == 0) { | ||
573 | ftdi->enumerated = 1; | ||
574 | work_delay_in_msec = 250; | ||
575 | } else | ||
576 | work_delay_in_msec = 1000; | ||
577 | } else if (ftdi->initialized == 0) { | ||
578 | if (ftdi_elan_setupOHCI(ftdi) == 0) { | ||
579 | ftdi->initialized = 1; | ||
580 | work_delay_in_msec = 500; | ||
581 | } else { | ||
582 | dev_err(&ftdi->udev->dev, "initialized failed - trying " | ||
583 | "again in 10 seconds\n"); | ||
584 | work_delay_in_msec = 10 *1000; | ||
585 | } | ||
586 | } else if (ftdi->registered == 0) { | ||
587 | work_delay_in_msec = 10; | ||
588 | if (ftdi_elan_hcd_init(ftdi) == 0) { | ||
589 | ftdi->registered = 1; | ||
590 | } else | ||
591 | dev_err(&ftdi->udev->dev, "register failed\n"); | ||
592 | work_delay_in_msec = 250; | ||
593 | } else { | ||
594 | if (ftdi_elan_checkingPCI(ftdi) == 0) { | ||
595 | work_delay_in_msec = 250; | ||
596 | } else if (ftdi->controlreg & 0x00400000) { | ||
597 | if (ftdi->gone_away > 0) { | ||
598 | dev_err(&ftdi->udev->dev, "PCI device eject con" | ||
599 | "firmed platform_dev.dev.parent=%p plat" | ||
600 | "form_dev.dev=%p\n", | ||
601 | ftdi->platform_dev.dev.parent, | ||
602 | &ftdi->platform_dev.dev); | ||
603 | platform_device_unregister(&ftdi->platform_dev); | ||
604 | ftdi->platform_dev.dev.parent = NULL; | ||
605 | ftdi->registered = 0; | ||
606 | ftdi->enumerated = 0; | ||
607 | ftdi->card_ejected = 0; | ||
608 | ftdi->initialized = 0; | ||
609 | ftdi->gone_away = 0; | ||
610 | } else | ||
611 | ftdi_elan_flush_targets(ftdi); | ||
612 | work_delay_in_msec = 250; | ||
613 | } else { | ||
614 | dev_err(&ftdi->udev->dev, "PCI device has disappeared\n" | ||
615 | ); | ||
616 | ftdi_elan_cancel_targets(ftdi); | ||
617 | work_delay_in_msec = 500; | ||
618 | ftdi->enumerated = 0; | ||
619 | ftdi->initialized = 0; | ||
620 | } | ||
621 | } | ||
622 | if (ftdi->disconnected > 0) { | ||
623 | ftdi_elan_put_kref(ftdi); | ||
624 | return; | ||
625 | } else { | ||
626 | ftdi_status_requeue_work(ftdi, | ||
627 | msecs_to_jiffies(work_delay_in_msec)); | ||
628 | return; | ||
629 | } | ||
630 | } | ||
631 | |||
632 | |||
633 | /* | ||
634 | * file_operations for the jtag interface | ||
635 | * | ||
636 | * the usage count for the device is incremented on open() | ||
637 | * and decremented on release() | ||
638 | */ | ||
639 | static int ftdi_elan_open(struct inode *inode, struct file *file) | ||
640 | { | ||
641 | int subminor = iminor(inode); | ||
642 | struct usb_interface *interface = usb_find_interface(&ftdi_elan_driver, | ||
643 | subminor); | ||
644 | if (!interface) { | ||
645 | printk(KERN_ERR "can't find device for minor %d\n", subminor); | ||
646 | return -ENODEV; | ||
647 | } else { | ||
648 | struct usb_ftdi *ftdi = usb_get_intfdata(interface); | ||
649 | if (!ftdi) { | ||
650 | return -ENODEV; | ||
651 | } else { | ||
652 | if (down_interruptible(&ftdi->sw_lock)) { | ||
653 | return -EINTR; | ||
654 | } else { | ||
655 | ftdi_elan_get_kref(ftdi); | ||
656 | file->private_data = ftdi; | ||
657 | return 0; | ||
658 | } | ||
659 | } | ||
660 | } | ||
661 | } | ||
662 | |||
663 | static int ftdi_elan_release(struct inode *inode, struct file *file) | ||
664 | { | ||
665 | struct usb_ftdi *ftdi = (struct usb_ftdi *)file->private_data; | ||
666 | if (ftdi == NULL) | ||
667 | return -ENODEV; | ||
668 | up(&ftdi->sw_lock); /* decrement the count on our device */ | ||
669 | ftdi_elan_put_kref(ftdi); | ||
670 | return 0; | ||
671 | } | ||
672 | |||
673 | |||
674 | #define FTDI_ELAN_IOC_MAGIC 0xA1 | ||
675 | #define FTDI_ELAN_IOCDEBUG _IOC(_IOC_WRITE, FTDI_ELAN_IOC_MAGIC, 1, 132) | ||
676 | static int ftdi_elan_ioctl(struct inode *inode, struct file *file, | ||
677 | unsigned int cmd, unsigned long arg) | ||
678 | { | ||
679 | switch (cmd) { | ||
680 | case FTDI_ELAN_IOCDEBUG:{ | ||
681 | char line[132]; | ||
682 | int size = strncpy_from_user(line, | ||
683 | (const char __user *)arg, sizeof(line)); | ||
684 | if (size < 0) { | ||
685 | return -EINVAL; | ||
686 | } else { | ||
687 | printk(KERN_ERR "TODO: ioctl %s\n", line); | ||
688 | return 0; | ||
689 | } | ||
690 | } | ||
691 | default: | ||
692 | return -EFAULT; | ||
693 | } | ||
694 | } | ||
695 | |||
696 | |||
697 | /* | ||
698 | * | ||
699 | * blocking bulk reads are used to get data from the device | ||
700 | * | ||
701 | */ | ||
702 | static ssize_t ftdi_elan_read(struct file *file, char __user *buffer, | ||
703 | size_t count, loff_t *ppos) | ||
704 | { | ||
705 | char data[30 *3 + 4]; | ||
706 | char *d = data; | ||
707 | int m = (sizeof(data) - 1) / 3; | ||
708 | int bytes_read = 0; | ||
709 | int retry_on_empty = 10; | ||
710 | int retry_on_timeout = 5; | ||
711 | struct usb_ftdi *ftdi = (struct usb_ftdi *)file->private_data; | ||
712 | if (ftdi->disconnected > 0) { | ||
713 | return -ENODEV; | ||
714 | } | ||
715 | data[0] = 0; | ||
716 | have:if (ftdi->bulk_in_left > 0) { | ||
717 | if (count-- > 0) { | ||
718 | char *p = ++ftdi->bulk_in_last + ftdi->bulk_in_buffer; | ||
719 | ftdi->bulk_in_left -= 1; | ||
720 | if (bytes_read < m) { | ||
721 | d += sprintf(d, " %02X", 0x000000FF & *p); | ||
722 | } else if (bytes_read > m) { | ||
723 | } else | ||
724 | d += sprintf(d, " .."); | ||
725 | if (copy_to_user(buffer++, p, 1)) { | ||
726 | return -EFAULT; | ||
727 | } else { | ||
728 | bytes_read += 1; | ||
729 | goto have; | ||
730 | } | ||
731 | } else | ||
732 | return bytes_read; | ||
733 | } | ||
734 | more:if (count > 0) { | ||
735 | int packet_bytes = 0; | ||
736 | int retval = usb_bulk_msg(ftdi->udev, | ||
737 | usb_rcvbulkpipe(ftdi->udev, ftdi->bulk_in_endpointAddr), | ||
738 | ftdi->bulk_in_buffer, ftdi->bulk_in_size, | ||
739 | &packet_bytes, msecs_to_jiffies(50)); | ||
740 | if (packet_bytes > 2) { | ||
741 | ftdi->bulk_in_left = packet_bytes - 2; | ||
742 | ftdi->bulk_in_last = 1; | ||
743 | goto have; | ||
744 | } else if (retval == -ETIMEDOUT) { | ||
745 | if (retry_on_timeout-- > 0) { | ||
746 | goto more; | ||
747 | } else if (bytes_read > 0) { | ||
748 | return bytes_read; | ||
749 | } else | ||
750 | return retval; | ||
751 | } else if (retval == 0) { | ||
752 | if (retry_on_empty-- > 0) { | ||
753 | goto more; | ||
754 | } else | ||
755 | return bytes_read; | ||
756 | } else | ||
757 | return retval; | ||
758 | } else | ||
759 | return bytes_read; | ||
760 | } | ||
761 | |||
762 | static void ftdi_elan_write_bulk_callback(struct urb *urb, struct pt_regs *regs) | ||
763 | { | ||
764 | struct usb_ftdi *ftdi = (struct usb_ftdi *)urb->context; | ||
765 | if (urb->status && !(urb->status == -ENOENT || urb->status == | ||
766 | -ECONNRESET || urb->status == -ESHUTDOWN)) { | ||
767 | dev_err(&ftdi->udev->dev, "urb=%p write bulk status received: %" | ||
768 | "d\n", urb, urb->status); | ||
769 | } | ||
770 | usb_buffer_free(urb->dev, urb->transfer_buffer_length, | ||
771 | urb->transfer_buffer, urb->transfer_dma); | ||
772 | } | ||
773 | |||
774 | static int fill_buffer_with_all_queued_commands(struct usb_ftdi *ftdi, | ||
775 | char *buf, int command_size, int total_size) | ||
776 | { | ||
777 | int ed_commands = 0; | ||
778 | int b = 0; | ||
779 | int I = command_size; | ||
780 | int i = ftdi->command_head; | ||
781 | while (I-- > 0) { | ||
782 | struct u132_command *command = &ftdi->command[COMMAND_MASK & | ||
783 | i++]; | ||
784 | int F = command->follows; | ||
785 | u8 *f = command->buffer; | ||
786 | if (command->header & 0x80) { | ||
787 | ed_commands |= 1 << (0x3 & (command->header >> 5)); | ||
788 | } | ||
789 | buf[b++] = command->header; | ||
790 | buf[b++] = (command->length >> 0) & 0x00FF; | ||
791 | buf[b++] = (command->length >> 8) & 0x00FF; | ||
792 | buf[b++] = command->address; | ||
793 | buf[b++] = command->width; | ||
794 | while (F-- > 0) { | ||
795 | buf[b++] = *f++; | ||
796 | } | ||
797 | } | ||
798 | return ed_commands; | ||
799 | } | ||
800 | |||
801 | static int ftdi_elan_total_command_size(struct usb_ftdi *ftdi, int command_size) | ||
802 | { | ||
803 | int total_size = 0; | ||
804 | int I = command_size; | ||
805 | int i = ftdi->command_head; | ||
806 | while (I-- > 0) { | ||
807 | struct u132_command *command = &ftdi->command[COMMAND_MASK & | ||
808 | i++]; | ||
809 | total_size += 5 + command->follows; | ||
810 | } return total_size; | ||
811 | } | ||
812 | |||
813 | static int ftdi_elan_command_engine(struct usb_ftdi *ftdi) | ||
814 | { | ||
815 | int retval; | ||
816 | char *buf; | ||
817 | int ed_commands; | ||
818 | int total_size; | ||
819 | struct urb *urb; | ||
820 | int command_size = ftdi->command_next - ftdi->command_head; | ||
821 | if (command_size == 0) | ||
822 | return 0; | ||
823 | total_size = ftdi_elan_total_command_size(ftdi, command_size); | ||
824 | urb = usb_alloc_urb(0, GFP_KERNEL); | ||
825 | if (!urb) { | ||
826 | dev_err(&ftdi->udev->dev, "could not get a urb to write %d comm" | ||
827 | "ands totaling %d bytes to the Uxxx\n", command_size, | ||
828 | total_size); | ||
829 | return -ENOMEM; | ||
830 | } | ||
831 | buf = usb_buffer_alloc(ftdi->udev, total_size, GFP_KERNEL, | ||
832 | &urb->transfer_dma); | ||
833 | if (!buf) { | ||
834 | dev_err(&ftdi->udev->dev, "could not get a buffer to write %d c" | ||
835 | "ommands totaling %d bytes to the Uxxx\n", command_size, | ||
836 | total_size); | ||
837 | usb_free_urb(urb); | ||
838 | return -ENOMEM; | ||
839 | } | ||
840 | ed_commands = fill_buffer_with_all_queued_commands(ftdi, buf, | ||
841 | command_size, total_size); | ||
842 | usb_fill_bulk_urb(urb, ftdi->udev, usb_sndbulkpipe(ftdi->udev, | ||
843 | ftdi->bulk_out_endpointAddr), buf, total_size, | ||
844 | ftdi_elan_write_bulk_callback, ftdi); | ||
845 | urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; | ||
846 | if (ed_commands) { | ||
847 | char diag[40 *3 + 4]; | ||
848 | char *d = diag; | ||
849 | int m = total_size; | ||
850 | u8 *c = buf; | ||
851 | int s = (sizeof(diag) - 1) / 3; | ||
852 | diag[0] = 0; | ||
853 | while (s-- > 0 && m-- > 0) { | ||
854 | if (s > 0 || m == 0) { | ||
855 | d += sprintf(d, " %02X", *c++); | ||
856 | } else | ||
857 | d += sprintf(d, " .."); | ||
858 | } | ||
859 | } | ||
860 | retval = usb_submit_urb(urb, GFP_KERNEL); | ||
861 | if (retval) { | ||
862 | dev_err(&ftdi->udev->dev, "failed %d to submit urb %p to write " | ||
863 | "%d commands totaling %d bytes to the Uxxx\n", retval, | ||
864 | urb, command_size, total_size); | ||
865 | usb_buffer_free(ftdi->udev, total_size, buf, urb->transfer_dma); | ||
866 | usb_free_urb(urb); | ||
867 | return retval; | ||
868 | } | ||
869 | usb_free_urb(urb); /* release our reference to this urb, | ||
870 | the USB core will eventually free it entirely */ | ||
871 | ftdi->command_head += command_size; | ||
872 | ftdi_elan_kick_respond_queue(ftdi); | ||
873 | return 0; | ||
874 | } | ||
875 | |||
876 | static void ftdi_elan_do_callback(struct usb_ftdi *ftdi, | ||
877 | struct u132_target *target, u8 *buffer, int length) | ||
878 | { | ||
879 | struct urb *urb = target->urb; | ||
880 | int halted = target->halted; | ||
881 | int skipped = target->skipped; | ||
882 | int actual = target->actual; | ||
883 | int non_null = target->non_null; | ||
884 | int toggle_bits = target->toggle_bits; | ||
885 | int error_count = target->error_count; | ||
886 | int condition_code = target->condition_code; | ||
887 | int repeat_number = target->repeat_number; | ||
888 | void (*callback) (void *, struct urb *, u8 *, int, int, int, int, int, | ||
889 | int, int, int, int) = target->callback; | ||
890 | target->active -= 1; | ||
891 | target->callback = NULL; | ||
892 | (*callback) (target->endp, urb, buffer, length, toggle_bits, | ||
893 | error_count, condition_code, repeat_number, halted, skipped, | ||
894 | actual, non_null); | ||
895 | } | ||
896 | |||
897 | static char *have_ed_set_response(struct usb_ftdi *ftdi, | ||
898 | struct u132_target *target, u16 ed_length, int ed_number, int ed_type, | ||
899 | char *b) | ||
900 | { | ||
901 | int payload = (ed_length >> 0) & 0x07FF; | ||
902 | down(&ftdi->u132_lock); | ||
903 | target->actual = 0; | ||
904 | target->non_null = (ed_length >> 15) & 0x0001; | ||
905 | target->repeat_number = (ed_length >> 11) & 0x000F; | ||
906 | if (ed_type == 0x02) { | ||
907 | if (payload == 0 || target->abandoning > 0) { | ||
908 | target->abandoning = 0; | ||
909 | up(&ftdi->u132_lock); | ||
910 | ftdi_elan_do_callback(ftdi, target, 4 + ftdi->response, | ||
911 | payload); | ||
912 | ftdi->recieved = 0; | ||
913 | ftdi->expected = 4; | ||
914 | ftdi->ed_found = 0; | ||
915 | return ftdi->response; | ||
916 | } else { | ||
917 | ftdi->expected = 4 + payload; | ||
918 | ftdi->ed_found = 1; | ||
919 | up(&ftdi->u132_lock); | ||
920 | return b; | ||
921 | } | ||
922 | } else if (ed_type == 0x03) { | ||
923 | if (payload == 0 || target->abandoning > 0) { | ||
924 | target->abandoning = 0; | ||
925 | up(&ftdi->u132_lock); | ||
926 | ftdi_elan_do_callback(ftdi, target, 4 + ftdi->response, | ||
927 | payload); | ||
928 | ftdi->recieved = 0; | ||
929 | ftdi->expected = 4; | ||
930 | ftdi->ed_found = 0; | ||
931 | return ftdi->response; | ||
932 | } else { | ||
933 | ftdi->expected = 4 + payload; | ||
934 | ftdi->ed_found = 1; | ||
935 | up(&ftdi->u132_lock); | ||
936 | return b; | ||
937 | } | ||
938 | } else if (ed_type == 0x01) { | ||
939 | target->abandoning = 0; | ||
940 | up(&ftdi->u132_lock); | ||
941 | ftdi_elan_do_callback(ftdi, target, 4 + ftdi->response, | ||
942 | payload); | ||
943 | ftdi->recieved = 0; | ||
944 | ftdi->expected = 4; | ||
945 | ftdi->ed_found = 0; | ||
946 | return ftdi->response; | ||
947 | } else { | ||
948 | target->abandoning = 0; | ||
949 | up(&ftdi->u132_lock); | ||
950 | ftdi_elan_do_callback(ftdi, target, 4 + ftdi->response, | ||
951 | payload); | ||
952 | ftdi->recieved = 0; | ||
953 | ftdi->expected = 4; | ||
954 | ftdi->ed_found = 0; | ||
955 | return ftdi->response; | ||
956 | } | ||
957 | } | ||
958 | |||
959 | static char *have_ed_get_response(struct usb_ftdi *ftdi, | ||
960 | struct u132_target *target, u16 ed_length, int ed_number, int ed_type, | ||
961 | char *b) | ||
962 | { | ||
963 | down(&ftdi->u132_lock); | ||
964 | target->condition_code = TD_DEVNOTRESP; | ||
965 | target->actual = (ed_length >> 0) & 0x01FF; | ||
966 | target->non_null = (ed_length >> 15) & 0x0001; | ||
967 | target->repeat_number = (ed_length >> 11) & 0x000F; | ||
968 | up(&ftdi->u132_lock); | ||
969 | if (target->active) | ||
970 | ftdi_elan_do_callback(ftdi, target, NULL, 0); | ||
971 | target->abandoning = 0; | ||
972 | ftdi->recieved = 0; | ||
973 | ftdi->expected = 4; | ||
974 | ftdi->ed_found = 0; | ||
975 | return ftdi->response; | ||
976 | } | ||
977 | |||
978 | |||
979 | /* | ||
980 | * The engine tries to empty the FTDI fifo | ||
981 | * | ||
982 | * all responses found in the fifo data are dispatched thus | ||
983 | * the response buffer can only ever hold a maximum sized | ||
984 | * response from the Uxxx. | ||
985 | * | ||
986 | */ | ||
987 | static int ftdi_elan_respond_engine(struct usb_ftdi *ftdi) | ||
988 | { | ||
989 | u8 *b = ftdi->response + ftdi->recieved; | ||
990 | int bytes_read = 0; | ||
991 | int retry_on_empty = 1; | ||
992 | int retry_on_timeout = 3; | ||
993 | int empty_packets = 0; | ||
994 | read:{ | ||
995 | int packet_bytes = 0; | ||
996 | int retval = usb_bulk_msg(ftdi->udev, | ||
997 | usb_rcvbulkpipe(ftdi->udev, ftdi->bulk_in_endpointAddr), | ||
998 | ftdi->bulk_in_buffer, ftdi->bulk_in_size, | ||
999 | &packet_bytes, msecs_to_jiffies(500)); | ||
1000 | char diag[30 *3 + 4]; | ||
1001 | char *d = diag; | ||
1002 | int m = packet_bytes; | ||
1003 | u8 *c = ftdi->bulk_in_buffer; | ||
1004 | int s = (sizeof(diag) - 1) / 3; | ||
1005 | diag[0] = 0; | ||
1006 | while (s-- > 0 && m-- > 0) { | ||
1007 | if (s > 0 || m == 0) { | ||
1008 | d += sprintf(d, " %02X", *c++); | ||
1009 | } else | ||
1010 | d += sprintf(d, " .."); | ||
1011 | } | ||
1012 | if (packet_bytes > 2) { | ||
1013 | ftdi->bulk_in_left = packet_bytes - 2; | ||
1014 | ftdi->bulk_in_last = 1; | ||
1015 | goto have; | ||
1016 | } else if (retval == -ETIMEDOUT) { | ||
1017 | if (retry_on_timeout-- > 0) { | ||
1018 | dev_err(&ftdi->udev->dev, "TIMED OUT with packe" | ||
1019 | "t_bytes = %d with total %d bytes%s\n", | ||
1020 | packet_bytes, bytes_read, diag); | ||
1021 | goto more; | ||
1022 | } else if (bytes_read > 0) { | ||
1023 | dev_err(&ftdi->udev->dev, "ONLY %d bytes%s\n", | ||
1024 | bytes_read, diag); | ||
1025 | return -ENOMEM; | ||
1026 | } else { | ||
1027 | dev_err(&ftdi->udev->dev, "TIMED OUT with packe" | ||
1028 | "t_bytes = %d with total %d bytes%s\n", | ||
1029 | packet_bytes, bytes_read, diag); | ||
1030 | return -ENOMEM; | ||
1031 | } | ||
1032 | } else if (retval == -EILSEQ) { | ||
1033 | dev_err(&ftdi->udev->dev, "error = %d with packet_bytes" | ||
1034 | " = %d with total %d bytes%s\n", retval, | ||
1035 | packet_bytes, bytes_read, diag); | ||
1036 | return retval; | ||
1037 | } else if (retval) { | ||
1038 | dev_err(&ftdi->udev->dev, "error = %d with packet_bytes" | ||
1039 | " = %d with total %d bytes%s\n", retval, | ||
1040 | packet_bytes, bytes_read, diag); | ||
1041 | return retval; | ||
1042 | } else if (packet_bytes == 2) { | ||
1043 | unsigned char s0 = ftdi->bulk_in_buffer[0]; | ||
1044 | unsigned char s1 = ftdi->bulk_in_buffer[1]; | ||
1045 | empty_packets += 1; | ||
1046 | if (s0 == 0x31 && s1 == 0x60) { | ||
1047 | if (retry_on_empty-- > 0) { | ||
1048 | goto more; | ||
1049 | } else | ||
1050 | return 0; | ||
1051 | } else if (s0 == 0x31 && s1 == 0x00) { | ||
1052 | if (retry_on_empty-- > 0) { | ||
1053 | goto more; | ||
1054 | } else | ||
1055 | return 0; | ||
1056 | } else { | ||
1057 | if (retry_on_empty-- > 0) { | ||
1058 | goto more; | ||
1059 | } else | ||
1060 | return 0; | ||
1061 | } | ||
1062 | } else if (packet_bytes == 1) { | ||
1063 | if (retry_on_empty-- > 0) { | ||
1064 | goto more; | ||
1065 | } else | ||
1066 | return 0; | ||
1067 | } else { | ||
1068 | if (retry_on_empty-- > 0) { | ||
1069 | goto more; | ||
1070 | } else | ||
1071 | return 0; | ||
1072 | } | ||
1073 | } | ||
1074 | more:{ | ||
1075 | goto read; | ||
1076 | } | ||
1077 | have:if (ftdi->bulk_in_left > 0) { | ||
1078 | u8 c = ftdi->bulk_in_buffer[++ftdi->bulk_in_last]; | ||
1079 | bytes_read += 1; | ||
1080 | ftdi->bulk_in_left -= 1; | ||
1081 | if (ftdi->recieved == 0 && c == 0xFF) { | ||
1082 | goto have; | ||
1083 | } else | ||
1084 | *b++ = c; | ||
1085 | if (++ftdi->recieved < ftdi->expected) { | ||
1086 | goto have; | ||
1087 | } else if (ftdi->ed_found) { | ||
1088 | int ed_number = (ftdi->response[0] >> 5) & 0x03; | ||
1089 | u16 ed_length = (ftdi->response[2] << 8) | | ||
1090 | ftdi->response[1]; | ||
1091 | struct u132_target *target = &ftdi->target[ed_number]; | ||
1092 | int payload = (ed_length >> 0) & 0x07FF; | ||
1093 | char diag[30 *3 + 4]; | ||
1094 | char *d = diag; | ||
1095 | int m = payload; | ||
1096 | u8 *c = 4 + ftdi->response; | ||
1097 | int s = (sizeof(diag) - 1) / 3; | ||
1098 | diag[0] = 0; | ||
1099 | while (s-- > 0 && m-- > 0) { | ||
1100 | if (s > 0 || m == 0) { | ||
1101 | d += sprintf(d, " %02X", *c++); | ||
1102 | } else | ||
1103 | d += sprintf(d, " .."); | ||
1104 | } | ||
1105 | ftdi_elan_do_callback(ftdi, target, 4 + ftdi->response, | ||
1106 | payload); | ||
1107 | ftdi->recieved = 0; | ||
1108 | ftdi->expected = 4; | ||
1109 | ftdi->ed_found = 0; | ||
1110 | b = ftdi->response; | ||
1111 | goto have; | ||
1112 | } else if (ftdi->expected == 8) { | ||
1113 | u8 buscmd; | ||
1114 | int respond_head = ftdi->respond_head++; | ||
1115 | struct u132_respond *respond = &ftdi->respond[ | ||
1116 | RESPOND_MASK & respond_head]; | ||
1117 | u32 data = ftdi->response[7]; | ||
1118 | data <<= 8; | ||
1119 | data |= ftdi->response[6]; | ||
1120 | data <<= 8; | ||
1121 | data |= ftdi->response[5]; | ||
1122 | data <<= 8; | ||
1123 | data |= ftdi->response[4]; | ||
1124 | *respond->value = data; | ||
1125 | *respond->result = 0; | ||
1126 | complete(&respond->wait_completion); | ||
1127 | ftdi->recieved = 0; | ||
1128 | ftdi->expected = 4; | ||
1129 | ftdi->ed_found = 0; | ||
1130 | b = ftdi->response; | ||
1131 | buscmd = (ftdi->response[0] >> 0) & 0x0F; | ||
1132 | if (buscmd == 0x00) { | ||
1133 | } else if (buscmd == 0x02) { | ||
1134 | } else if (buscmd == 0x06) { | ||
1135 | } else if (buscmd == 0x0A) { | ||
1136 | } else | ||
1137 | dev_err(&ftdi->udev->dev, "Uxxx unknown(%0X) va" | ||
1138 | "lue = %08X\n", buscmd, data); | ||
1139 | goto have; | ||
1140 | } else { | ||
1141 | if ((ftdi->response[0] & 0x80) == 0x00) { | ||
1142 | ftdi->expected = 8; | ||
1143 | goto have; | ||
1144 | } else { | ||
1145 | int ed_number = (ftdi->response[0] >> 5) & 0x03; | ||
1146 | int ed_type = (ftdi->response[0] >> 0) & 0x03; | ||
1147 | u16 ed_length = (ftdi->response[2] << 8) | | ||
1148 | ftdi->response[1]; | ||
1149 | struct u132_target *target = &ftdi->target[ | ||
1150 | ed_number]; | ||
1151 | target->halted = (ftdi->response[0] >> 3) & | ||
1152 | 0x01; | ||
1153 | target->skipped = (ftdi->response[0] >> 2) & | ||
1154 | 0x01; | ||
1155 | target->toggle_bits = (ftdi->response[3] >> 6) | ||
1156 | & 0x03; | ||
1157 | target->error_count = (ftdi->response[3] >> 4) | ||
1158 | & 0x03; | ||
1159 | target->condition_code = (ftdi->response[ | ||
1160 | 3] >> 0) & 0x0F; | ||
1161 | if ((ftdi->response[0] & 0x10) == 0x00) { | ||
1162 | b = have_ed_set_response(ftdi, target, | ||
1163 | ed_length, ed_number, ed_type, | ||
1164 | b); | ||
1165 | goto have; | ||
1166 | } else { | ||
1167 | b = have_ed_get_response(ftdi, target, | ||
1168 | ed_length, ed_number, ed_type, | ||
1169 | b); | ||
1170 | goto have; | ||
1171 | } | ||
1172 | } | ||
1173 | } | ||
1174 | } else | ||
1175 | goto more; | ||
1176 | } | ||
1177 | |||
1178 | |||
1179 | /* | ||
1180 | * create a urb, and a buffer for it, and copy the data to the urb | ||
1181 | * | ||
1182 | */ | ||
1183 | static ssize_t ftdi_elan_write(struct file *file, | ||
1184 | const char __user *user_buffer, size_t count, | ||
1185 | loff_t *ppos) | ||
1186 | { | ||
1187 | int retval = 0; | ||
1188 | struct urb *urb; | ||
1189 | char *buf; | ||
1190 | char data[30 *3 + 4]; | ||
1191 | char *d = data; | ||
1192 | const char __user *s = user_buffer; | ||
1193 | int m = (sizeof(data) - 1) / 3; | ||
1194 | struct usb_ftdi *ftdi = (struct usb_ftdi *)file->private_data; | ||
1195 | if (ftdi->disconnected > 0) { | ||
1196 | return -ENODEV; | ||
1197 | } | ||
1198 | if (count == 0) { | ||
1199 | goto exit; | ||
1200 | } | ||
1201 | urb = usb_alloc_urb(0, GFP_KERNEL); | ||
1202 | if (!urb) { | ||
1203 | retval = -ENOMEM; | ||
1204 | goto error_1; | ||
1205 | } | ||
1206 | buf = usb_buffer_alloc(ftdi->udev, count, GFP_KERNEL, | ||
1207 | &urb->transfer_dma); | ||
1208 | if (!buf) { | ||
1209 | retval = -ENOMEM; | ||
1210 | goto error_2; | ||
1211 | } | ||
1212 | if (copy_from_user(buf, user_buffer, count)) { | ||
1213 | retval = -EFAULT; | ||
1214 | goto error_3; | ||
1215 | } | ||
1216 | usb_fill_bulk_urb(urb, ftdi->udev, usb_sndbulkpipe(ftdi->udev, | ||
1217 | ftdi->bulk_out_endpointAddr), buf, count, | ||
1218 | ftdi_elan_write_bulk_callback, ftdi); | ||
1219 | urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; | ||
1220 | retval = usb_submit_urb(urb, GFP_KERNEL); | ||
1221 | if (retval) { | ||
1222 | dev_err(&ftdi->udev->dev, "failed submitting write urb, error %" | ||
1223 | "d\n", retval); | ||
1224 | goto error_4; | ||
1225 | } | ||
1226 | usb_free_urb(urb); | ||
1227 | exit:; | ||
1228 | if (count > m) { | ||
1229 | int I = m - 1; | ||
1230 | while (I-- > 0) { | ||
1231 | d += sprintf(d, " %02X", 0x000000FF & *s++); | ||
1232 | } | ||
1233 | d += sprintf(d, " .."); | ||
1234 | } else { | ||
1235 | int I = count; | ||
1236 | while (I-- > 0) { | ||
1237 | d += sprintf(d, " %02X", 0x000000FF & *s++); | ||
1238 | } | ||
1239 | } | ||
1240 | return count; | ||
1241 | error_4: error_3:usb_buffer_free(ftdi->udev, count, buf, | ||
1242 | urb->transfer_dma); | ||
1243 | error_2:usb_free_urb(urb); | ||
1244 | error_1:return retval; | ||
1245 | } | ||
1246 | |||
1247 | static struct file_operations ftdi_elan_fops = { | ||
1248 | .owner = THIS_MODULE, | ||
1249 | .llseek = no_llseek, | ||
1250 | .ioctl = ftdi_elan_ioctl, | ||
1251 | .read = ftdi_elan_read, | ||
1252 | .write = ftdi_elan_write, | ||
1253 | .open = ftdi_elan_open, | ||
1254 | .release = ftdi_elan_release, | ||
1255 | }; | ||
1256 | |||
1257 | /* | ||
1258 | * usb class driver info in order to get a minor number from the usb core, | ||
1259 | * and to have the device registered with the driver core | ||
1260 | */ | ||
1261 | static struct usb_class_driver ftdi_elan_jtag_class = { | ||
1262 | .name = "ftdi-%d-jtag", | ||
1263 | .fops = &ftdi_elan_fops, | ||
1264 | .minor_base = USB_FTDI_ELAN_MINOR_BASE, | ||
1265 | }; | ||
1266 | |||
1267 | /* | ||
1268 | * the following definitions are for the | ||
1269 | * ELAN FPGA state machgine processor that | ||
1270 | * lies on the other side of the FTDI chip | ||
1271 | */ | ||
1272 | #define cPCIu132rd 0x0 | ||
1273 | #define cPCIu132wr 0x1 | ||
1274 | #define cPCIiord 0x2 | ||
1275 | #define cPCIiowr 0x3 | ||
1276 | #define cPCImemrd 0x6 | ||
1277 | #define cPCImemwr 0x7 | ||
1278 | #define cPCIcfgrd 0xA | ||
1279 | #define cPCIcfgwr 0xB | ||
1280 | #define cPCInull 0xF | ||
1281 | #define cU132cmd_status 0x0 | ||
1282 | #define cU132flash 0x1 | ||
1283 | #define cPIDsetup 0x0 | ||
1284 | #define cPIDout 0x1 | ||
1285 | #define cPIDin 0x2 | ||
1286 | #define cPIDinonce 0x3 | ||
1287 | #define cCCnoerror 0x0 | ||
1288 | #define cCCcrc 0x1 | ||
1289 | #define cCCbitstuff 0x2 | ||
1290 | #define cCCtoggle 0x3 | ||
1291 | #define cCCstall 0x4 | ||
1292 | #define cCCnoresp 0x5 | ||
1293 | #define cCCbadpid1 0x6 | ||
1294 | #define cCCbadpid2 0x7 | ||
1295 | #define cCCdataoverrun 0x8 | ||
1296 | #define cCCdataunderrun 0x9 | ||
1297 | #define cCCbuffoverrun 0xC | ||
1298 | #define cCCbuffunderrun 0xD | ||
1299 | #define cCCnotaccessed 0xF | ||
1300 | static int ftdi_elan_write_reg(struct usb_ftdi *ftdi, u32 data) | ||
1301 | { | ||
1302 | wait:if (ftdi->disconnected > 0) { | ||
1303 | return -ENODEV; | ||
1304 | } else { | ||
1305 | int command_size; | ||
1306 | down(&ftdi->u132_lock); | ||
1307 | command_size = ftdi->command_next - ftdi->command_head; | ||
1308 | if (command_size < COMMAND_SIZE) { | ||
1309 | struct u132_command *command = &ftdi->command[ | ||
1310 | COMMAND_MASK & ftdi->command_next]; | ||
1311 | command->header = 0x00 | cPCIu132wr; | ||
1312 | command->length = 0x04; | ||
1313 | command->address = 0x00; | ||
1314 | command->width = 0x00; | ||
1315 | command->follows = 4; | ||
1316 | command->value = data; | ||
1317 | command->buffer = &command->value; | ||
1318 | ftdi->command_next += 1; | ||
1319 | ftdi_elan_kick_command_queue(ftdi); | ||
1320 | up(&ftdi->u132_lock); | ||
1321 | return 0; | ||
1322 | } else { | ||
1323 | up(&ftdi->u132_lock); | ||
1324 | msleep(100); | ||
1325 | goto wait; | ||
1326 | } | ||
1327 | } | ||
1328 | } | ||
1329 | |||
1330 | static int ftdi_elan_write_config(struct usb_ftdi *ftdi, int config_offset, | ||
1331 | u8 width, u32 data) | ||
1332 | { | ||
1333 | u8 addressofs = config_offset / 4; | ||
1334 | wait:if (ftdi->disconnected > 0) { | ||
1335 | return -ENODEV; | ||
1336 | } else { | ||
1337 | int command_size; | ||
1338 | down(&ftdi->u132_lock); | ||
1339 | command_size = ftdi->command_next - ftdi->command_head; | ||
1340 | if (command_size < COMMAND_SIZE) { | ||
1341 | struct u132_command *command = &ftdi->command[ | ||
1342 | COMMAND_MASK & ftdi->command_next]; | ||
1343 | command->header = 0x00 | (cPCIcfgwr & 0x0F); | ||
1344 | command->length = 0x04; | ||
1345 | command->address = addressofs; | ||
1346 | command->width = 0x00 | (width & 0x0F); | ||
1347 | command->follows = 4; | ||
1348 | command->value = data; | ||
1349 | command->buffer = &command->value; | ||
1350 | ftdi->command_next += 1; | ||
1351 | ftdi_elan_kick_command_queue(ftdi); | ||
1352 | up(&ftdi->u132_lock); | ||
1353 | return 0; | ||
1354 | } else { | ||
1355 | up(&ftdi->u132_lock); | ||
1356 | msleep(100); | ||
1357 | goto wait; | ||
1358 | } | ||
1359 | } | ||
1360 | } | ||
1361 | |||
1362 | static int ftdi_elan_write_pcimem(struct usb_ftdi *ftdi, int mem_offset, | ||
1363 | u8 width, u32 data) | ||
1364 | { | ||
1365 | u8 addressofs = mem_offset / 4; | ||
1366 | wait:if (ftdi->disconnected > 0) { | ||
1367 | return -ENODEV; | ||
1368 | } else { | ||
1369 | int command_size; | ||
1370 | down(&ftdi->u132_lock); | ||
1371 | command_size = ftdi->command_next - ftdi->command_head; | ||
1372 | if (command_size < COMMAND_SIZE) { | ||
1373 | struct u132_command *command = &ftdi->command[ | ||
1374 | COMMAND_MASK & ftdi->command_next]; | ||
1375 | command->header = 0x00 | (cPCImemwr & 0x0F); | ||
1376 | command->length = 0x04; | ||
1377 | command->address = addressofs; | ||
1378 | command->width = 0x00 | (width & 0x0F); | ||
1379 | command->follows = 4; | ||
1380 | command->value = data; | ||
1381 | command->buffer = &command->value; | ||
1382 | ftdi->command_next += 1; | ||
1383 | ftdi_elan_kick_command_queue(ftdi); | ||
1384 | up(&ftdi->u132_lock); | ||
1385 | return 0; | ||
1386 | } else { | ||
1387 | up(&ftdi->u132_lock); | ||
1388 | msleep(100); | ||
1389 | goto wait; | ||
1390 | } | ||
1391 | } | ||
1392 | } | ||
1393 | |||
1394 | int usb_ftdi_elan_write_pcimem(struct platform_device *pdev, int mem_offset, | ||
1395 | u8 width, u32 data) | ||
1396 | { | ||
1397 | struct usb_ftdi *ftdi = platform_device_to_usb_ftdi(pdev); | ||
1398 | return ftdi_elan_write_pcimem(ftdi, mem_offset, width, data); | ||
1399 | } | ||
1400 | |||
1401 | |||
1402 | EXPORT_SYMBOL_GPL(usb_ftdi_elan_write_pcimem); | ||
1403 | static int ftdi_elan_read_reg(struct usb_ftdi *ftdi, u32 *data) | ||
1404 | { | ||
1405 | wait:if (ftdi->disconnected > 0) { | ||
1406 | return -ENODEV; | ||
1407 | } else { | ||
1408 | int command_size; | ||
1409 | int respond_size; | ||
1410 | down(&ftdi->u132_lock); | ||
1411 | command_size = ftdi->command_next - ftdi->command_head; | ||
1412 | respond_size = ftdi->respond_next - ftdi->respond_head; | ||
1413 | if (command_size < COMMAND_SIZE && respond_size < RESPOND_SIZE) | ||
1414 | { | ||
1415 | struct u132_command *command = &ftdi->command[ | ||
1416 | COMMAND_MASK & ftdi->command_next]; | ||
1417 | struct u132_respond *respond = &ftdi->respond[ | ||
1418 | RESPOND_MASK & ftdi->respond_next]; | ||
1419 | int result = -ENODEV; | ||
1420 | respond->result = &result; | ||
1421 | respond->header = command->header = 0x00 | cPCIu132rd; | ||
1422 | command->length = 0x04; | ||
1423 | respond->address = command->address = cU132cmd_status; | ||
1424 | command->width = 0x00; | ||
1425 | command->follows = 0; | ||
1426 | command->value = 0; | ||
1427 | command->buffer = NULL; | ||
1428 | respond->value = data; | ||
1429 | init_completion(&respond->wait_completion); | ||
1430 | ftdi->command_next += 1; | ||
1431 | ftdi->respond_next += 1; | ||
1432 | ftdi_elan_kick_command_queue(ftdi); | ||
1433 | up(&ftdi->u132_lock); | ||
1434 | wait_for_completion(&respond->wait_completion); | ||
1435 | return result; | ||
1436 | } else { | ||
1437 | up(&ftdi->u132_lock); | ||
1438 | msleep(100); | ||
1439 | goto wait; | ||
1440 | } | ||
1441 | } | ||
1442 | } | ||
1443 | |||
1444 | int usb_ftdi_elan_read_reg(struct platform_device *pdev, u32 *data) | ||
1445 | { | ||
1446 | struct usb_ftdi *ftdi = platform_device_to_usb_ftdi(pdev); | ||
1447 | return ftdi_elan_read_reg(ftdi, data); | ||
1448 | } | ||
1449 | |||
1450 | |||
1451 | EXPORT_SYMBOL_GPL(usb_ftdi_elan_read_reg); | ||
1452 | static int ftdi_elan_read_config(struct usb_ftdi *ftdi, int config_offset, | ||
1453 | u8 width, u32 *data) | ||
1454 | { | ||
1455 | u8 addressofs = config_offset / 4; | ||
1456 | wait:if (ftdi->disconnected > 0) { | ||
1457 | return -ENODEV; | ||
1458 | } else { | ||
1459 | int command_size; | ||
1460 | int respond_size; | ||
1461 | down(&ftdi->u132_lock); | ||
1462 | command_size = ftdi->command_next - ftdi->command_head; | ||
1463 | respond_size = ftdi->respond_next - ftdi->respond_head; | ||
1464 | if (command_size < COMMAND_SIZE && respond_size < RESPOND_SIZE) | ||
1465 | { | ||
1466 | struct u132_command *command = &ftdi->command[ | ||
1467 | COMMAND_MASK & ftdi->command_next]; | ||
1468 | struct u132_respond *respond = &ftdi->respond[ | ||
1469 | RESPOND_MASK & ftdi->respond_next]; | ||
1470 | int result = -ENODEV; | ||
1471 | respond->result = &result; | ||
1472 | respond->header = command->header = 0x00 | (cPCIcfgrd & | ||
1473 | 0x0F); | ||
1474 | command->length = 0x04; | ||
1475 | respond->address = command->address = addressofs; | ||
1476 | command->width = 0x00 | (width & 0x0F); | ||
1477 | command->follows = 0; | ||
1478 | command->value = 0; | ||
1479 | command->buffer = NULL; | ||
1480 | respond->value = data; | ||
1481 | init_completion(&respond->wait_completion); | ||
1482 | ftdi->command_next += 1; | ||
1483 | ftdi->respond_next += 1; | ||
1484 | ftdi_elan_kick_command_queue(ftdi); | ||
1485 | up(&ftdi->u132_lock); | ||
1486 | wait_for_completion(&respond->wait_completion); | ||
1487 | return result; | ||
1488 | } else { | ||
1489 | up(&ftdi->u132_lock); | ||
1490 | msleep(100); | ||
1491 | goto wait; | ||
1492 | } | ||
1493 | } | ||
1494 | } | ||
1495 | |||
1496 | static int ftdi_elan_read_pcimem(struct usb_ftdi *ftdi, int mem_offset, | ||
1497 | u8 width, u32 *data) | ||
1498 | { | ||
1499 | u8 addressofs = mem_offset / 4; | ||
1500 | wait:if (ftdi->disconnected > 0) { | ||
1501 | return -ENODEV; | ||
1502 | } else { | ||
1503 | int command_size; | ||
1504 | int respond_size; | ||
1505 | down(&ftdi->u132_lock); | ||
1506 | command_size = ftdi->command_next - ftdi->command_head; | ||
1507 | respond_size = ftdi->respond_next - ftdi->respond_head; | ||
1508 | if (command_size < COMMAND_SIZE && respond_size < RESPOND_SIZE) | ||
1509 | { | ||
1510 | struct u132_command *command = &ftdi->command[ | ||
1511 | COMMAND_MASK & ftdi->command_next]; | ||
1512 | struct u132_respond *respond = &ftdi->respond[ | ||
1513 | RESPOND_MASK & ftdi->respond_next]; | ||
1514 | int result = -ENODEV; | ||
1515 | respond->result = &result; | ||
1516 | respond->header = command->header = 0x00 | (cPCImemrd & | ||
1517 | 0x0F); | ||
1518 | command->length = 0x04; | ||
1519 | respond->address = command->address = addressofs; | ||
1520 | command->width = 0x00 | (width & 0x0F); | ||
1521 | command->follows = 0; | ||
1522 | command->value = 0; | ||
1523 | command->buffer = NULL; | ||
1524 | respond->value = data; | ||
1525 | init_completion(&respond->wait_completion); | ||
1526 | ftdi->command_next += 1; | ||
1527 | ftdi->respond_next += 1; | ||
1528 | ftdi_elan_kick_command_queue(ftdi); | ||
1529 | up(&ftdi->u132_lock); | ||
1530 | wait_for_completion(&respond->wait_completion); | ||
1531 | return result; | ||
1532 | } else { | ||
1533 | up(&ftdi->u132_lock); | ||
1534 | msleep(100); | ||
1535 | goto wait; | ||
1536 | } | ||
1537 | } | ||
1538 | } | ||
1539 | |||
1540 | int usb_ftdi_elan_read_pcimem(struct platform_device *pdev, int mem_offset, | ||
1541 | u8 width, u32 *data) | ||
1542 | { | ||
1543 | struct usb_ftdi *ftdi = platform_device_to_usb_ftdi(pdev); | ||
1544 | if (ftdi->initialized == 0) { | ||
1545 | return -ENODEV; | ||
1546 | } else | ||
1547 | return ftdi_elan_read_pcimem(ftdi, mem_offset, width, data); | ||
1548 | } | ||
1549 | |||
1550 | |||
1551 | EXPORT_SYMBOL_GPL(usb_ftdi_elan_read_pcimem); | ||
1552 | static int ftdi_elan_edset_setup(struct usb_ftdi *ftdi, u8 ed_number, | ||
1553 | void *endp, struct urb *urb, u8 address, u8 ep_number, u8 toggle_bits, | ||
1554 | void (*callback) (void *endp, struct urb *urb, u8 *buf, int len, | ||
1555 | int toggle_bits, int error_count, int condition_code, int repeat_number, | ||
1556 | int halted, int skipped, int actual, int non_null)) | ||
1557 | { | ||
1558 | u8 ed = ed_number - 1; | ||
1559 | wait:if (ftdi->disconnected > 0) { | ||
1560 | return -ENODEV; | ||
1561 | } else if (ftdi->initialized == 0) { | ||
1562 | return -ENODEV; | ||
1563 | } else { | ||
1564 | int command_size; | ||
1565 | down(&ftdi->u132_lock); | ||
1566 | command_size = ftdi->command_next - ftdi->command_head; | ||
1567 | if (command_size < COMMAND_SIZE) { | ||
1568 | struct u132_target *target = &ftdi->target[ed]; | ||
1569 | struct u132_command *command = &ftdi->command[ | ||
1570 | COMMAND_MASK & ftdi->command_next]; | ||
1571 | command->header = 0x80 | (ed << 5); | ||
1572 | command->length = 0x8007; | ||
1573 | command->address = (toggle_bits << 6) | (ep_number << 2) | ||
1574 | | (address << 0); | ||
1575 | command->width = usb_maxpacket(urb->dev, urb->pipe, | ||
1576 | usb_pipeout(urb->pipe)); | ||
1577 | command->follows = 8; | ||
1578 | command->value = 0; | ||
1579 | command->buffer = urb->setup_packet; | ||
1580 | target->callback = callback; | ||
1581 | target->endp = endp; | ||
1582 | target->urb = urb; | ||
1583 | target->active = 1; | ||
1584 | ftdi->command_next += 1; | ||
1585 | ftdi_elan_kick_command_queue(ftdi); | ||
1586 | up(&ftdi->u132_lock); | ||
1587 | return 0; | ||
1588 | } else { | ||
1589 | up(&ftdi->u132_lock); | ||
1590 | msleep(100); | ||
1591 | goto wait; | ||
1592 | } | ||
1593 | } | ||
1594 | } | ||
1595 | |||
1596 | int usb_ftdi_elan_edset_setup(struct platform_device *pdev, u8 ed_number, | ||
1597 | void *endp, struct urb *urb, u8 address, u8 ep_number, u8 toggle_bits, | ||
1598 | void (*callback) (void *endp, struct urb *urb, u8 *buf, int len, | ||
1599 | int toggle_bits, int error_count, int condition_code, int repeat_number, | ||
1600 | int halted, int skipped, int actual, int non_null)) | ||
1601 | { | ||
1602 | struct usb_ftdi *ftdi = platform_device_to_usb_ftdi(pdev); | ||
1603 | return ftdi_elan_edset_setup(ftdi, ed_number, endp, urb, address, | ||
1604 | ep_number, toggle_bits, callback); | ||
1605 | } | ||
1606 | |||
1607 | |||
1608 | EXPORT_SYMBOL_GPL(usb_ftdi_elan_edset_setup); | ||
1609 | static int ftdi_elan_edset_input(struct usb_ftdi *ftdi, u8 ed_number, | ||
1610 | void *endp, struct urb *urb, u8 address, u8 ep_number, u8 toggle_bits, | ||
1611 | void (*callback) (void *endp, struct urb *urb, u8 *buf, int len, | ||
1612 | int toggle_bits, int error_count, int condition_code, int repeat_number, | ||
1613 | int halted, int skipped, int actual, int non_null)) | ||
1614 | { | ||
1615 | u8 ed = ed_number - 1; | ||
1616 | wait:if (ftdi->disconnected > 0) { | ||
1617 | return -ENODEV; | ||
1618 | } else if (ftdi->initialized == 0) { | ||
1619 | return -ENODEV; | ||
1620 | } else { | ||
1621 | int command_size; | ||
1622 | down(&ftdi->u132_lock); | ||
1623 | command_size = ftdi->command_next - ftdi->command_head; | ||
1624 | if (command_size < COMMAND_SIZE) { | ||
1625 | struct u132_target *target = &ftdi->target[ed]; | ||
1626 | struct u132_command *command = &ftdi->command[ | ||
1627 | COMMAND_MASK & ftdi->command_next]; | ||
1628 | int remaining_length = urb->transfer_buffer_length - | ||
1629 | urb->actual_length; | ||
1630 | command->header = 0x82 | (ed << 5); | ||
1631 | if (remaining_length == 0) { | ||
1632 | command->length = 0x0000; | ||
1633 | } else if (remaining_length > 1024) { | ||
1634 | command->length = 0x8000 | 1023; | ||
1635 | } else | ||
1636 | command->length = 0x8000 | (remaining_length - | ||
1637 | 1); | ||
1638 | command->address = (toggle_bits << 6) | (ep_number << 2) | ||
1639 | | (address << 0); | ||
1640 | command->width = usb_maxpacket(urb->dev, urb->pipe, | ||
1641 | usb_pipeout(urb->pipe)); | ||
1642 | command->follows = 0; | ||
1643 | command->value = 0; | ||
1644 | command->buffer = NULL; | ||
1645 | target->callback = callback; | ||
1646 | target->endp = endp; | ||
1647 | target->urb = urb; | ||
1648 | target->active = 1; | ||
1649 | ftdi->command_next += 1; | ||
1650 | ftdi_elan_kick_command_queue(ftdi); | ||
1651 | up(&ftdi->u132_lock); | ||
1652 | return 0; | ||
1653 | } else { | ||
1654 | up(&ftdi->u132_lock); | ||
1655 | msleep(100); | ||
1656 | goto wait; | ||
1657 | } | ||
1658 | } | ||
1659 | } | ||
1660 | |||
1661 | int usb_ftdi_elan_edset_input(struct platform_device *pdev, u8 ed_number, | ||
1662 | void *endp, struct urb *urb, u8 address, u8 ep_number, u8 toggle_bits, | ||
1663 | void (*callback) (void *endp, struct urb *urb, u8 *buf, int len, | ||
1664 | int toggle_bits, int error_count, int condition_code, int repeat_number, | ||
1665 | int halted, int skipped, int actual, int non_null)) | ||
1666 | { | ||
1667 | struct usb_ftdi *ftdi = platform_device_to_usb_ftdi(pdev); | ||
1668 | return ftdi_elan_edset_input(ftdi, ed_number, endp, urb, address, | ||
1669 | ep_number, toggle_bits, callback); | ||
1670 | } | ||
1671 | |||
1672 | |||
1673 | EXPORT_SYMBOL_GPL(usb_ftdi_elan_edset_input); | ||
1674 | static int ftdi_elan_edset_empty(struct usb_ftdi *ftdi, u8 ed_number, | ||
1675 | void *endp, struct urb *urb, u8 address, u8 ep_number, u8 toggle_bits, | ||
1676 | void (*callback) (void *endp, struct urb *urb, u8 *buf, int len, | ||
1677 | int toggle_bits, int error_count, int condition_code, int repeat_number, | ||
1678 | int halted, int skipped, int actual, int non_null)) | ||
1679 | { | ||
1680 | u8 ed = ed_number - 1; | ||
1681 | wait:if (ftdi->disconnected > 0) { | ||
1682 | return -ENODEV; | ||
1683 | } else if (ftdi->initialized == 0) { | ||
1684 | return -ENODEV; | ||
1685 | } else { | ||
1686 | int command_size; | ||
1687 | down(&ftdi->u132_lock); | ||
1688 | command_size = ftdi->command_next - ftdi->command_head; | ||
1689 | if (command_size < COMMAND_SIZE) { | ||
1690 | struct u132_target *target = &ftdi->target[ed]; | ||
1691 | struct u132_command *command = &ftdi->command[ | ||
1692 | COMMAND_MASK & ftdi->command_next]; | ||
1693 | command->header = 0x81 | (ed << 5); | ||
1694 | command->length = 0x0000; | ||
1695 | command->address = (toggle_bits << 6) | (ep_number << 2) | ||
1696 | | (address << 0); | ||
1697 | command->width = usb_maxpacket(urb->dev, urb->pipe, | ||
1698 | usb_pipeout(urb->pipe)); | ||
1699 | command->follows = 0; | ||
1700 | command->value = 0; | ||
1701 | command->buffer = NULL; | ||
1702 | target->callback = callback; | ||
1703 | target->endp = endp; | ||
1704 | target->urb = urb; | ||
1705 | target->active = 1; | ||
1706 | ftdi->command_next += 1; | ||
1707 | ftdi_elan_kick_command_queue(ftdi); | ||
1708 | up(&ftdi->u132_lock); | ||
1709 | return 0; | ||
1710 | } else { | ||
1711 | up(&ftdi->u132_lock); | ||
1712 | msleep(100); | ||
1713 | goto wait; | ||
1714 | } | ||
1715 | } | ||
1716 | } | ||
1717 | |||
1718 | int usb_ftdi_elan_edset_empty(struct platform_device *pdev, u8 ed_number, | ||
1719 | void *endp, struct urb *urb, u8 address, u8 ep_number, u8 toggle_bits, | ||
1720 | void (*callback) (void *endp, struct urb *urb, u8 *buf, int len, | ||
1721 | int toggle_bits, int error_count, int condition_code, int repeat_number, | ||
1722 | int halted, int skipped, int actual, int non_null)) | ||
1723 | { | ||
1724 | struct usb_ftdi *ftdi = platform_device_to_usb_ftdi(pdev); | ||
1725 | return ftdi_elan_edset_empty(ftdi, ed_number, endp, urb, address, | ||
1726 | ep_number, toggle_bits, callback); | ||
1727 | } | ||
1728 | |||
1729 | |||
1730 | EXPORT_SYMBOL_GPL(usb_ftdi_elan_edset_empty); | ||
1731 | static int ftdi_elan_edset_output(struct usb_ftdi *ftdi, u8 ed_number, | ||
1732 | void *endp, struct urb *urb, u8 address, u8 ep_number, u8 toggle_bits, | ||
1733 | void (*callback) (void *endp, struct urb *urb, u8 *buf, int len, | ||
1734 | int toggle_bits, int error_count, int condition_code, int repeat_number, | ||
1735 | int halted, int skipped, int actual, int non_null)) | ||
1736 | { | ||
1737 | u8 ed = ed_number - 1; | ||
1738 | wait:if (ftdi->disconnected > 0) { | ||
1739 | return -ENODEV; | ||
1740 | } else if (ftdi->initialized == 0) { | ||
1741 | return -ENODEV; | ||
1742 | } else { | ||
1743 | int command_size; | ||
1744 | down(&ftdi->u132_lock); | ||
1745 | command_size = ftdi->command_next - ftdi->command_head; | ||
1746 | if (command_size < COMMAND_SIZE) { | ||
1747 | u8 *b; | ||
1748 | u16 urb_size; | ||
1749 | int i = 0; | ||
1750 | char data[30 *3 + 4]; | ||
1751 | char *d = data; | ||
1752 | int m = (sizeof(data) - 1) / 3; | ||
1753 | int l = 0; | ||
1754 | struct u132_target *target = &ftdi->target[ed]; | ||
1755 | struct u132_command *command = &ftdi->command[ | ||
1756 | COMMAND_MASK & ftdi->command_next]; | ||
1757 | command->header = 0x81 | (ed << 5); | ||
1758 | command->address = (toggle_bits << 6) | (ep_number << 2) | ||
1759 | | (address << 0); | ||
1760 | command->width = usb_maxpacket(urb->dev, urb->pipe, | ||
1761 | usb_pipeout(urb->pipe)); | ||
1762 | command->follows = min(1024, | ||
1763 | urb->transfer_buffer_length - | ||
1764 | urb->actual_length); | ||
1765 | command->value = 0; | ||
1766 | command->buffer = urb->transfer_buffer + | ||
1767 | urb->actual_length; | ||
1768 | command->length = 0x8000 | (command->follows - 1); | ||
1769 | b = command->buffer; | ||
1770 | urb_size = command->follows; | ||
1771 | data[0] = 0; | ||
1772 | while (urb_size-- > 0) { | ||
1773 | if (i > m) { | ||
1774 | } else if (i++ < m) { | ||
1775 | int w = sprintf(d, " %02X", *b++); | ||
1776 | d += w; | ||
1777 | l += w; | ||
1778 | } else | ||
1779 | d += sprintf(d, " .."); | ||
1780 | } | ||
1781 | target->callback = callback; | ||
1782 | target->endp = endp; | ||
1783 | target->urb = urb; | ||
1784 | target->active = 1; | ||
1785 | ftdi->command_next += 1; | ||
1786 | ftdi_elan_kick_command_queue(ftdi); | ||
1787 | up(&ftdi->u132_lock); | ||
1788 | return 0; | ||
1789 | } else { | ||
1790 | up(&ftdi->u132_lock); | ||
1791 | msleep(100); | ||
1792 | goto wait; | ||
1793 | } | ||
1794 | } | ||
1795 | } | ||
1796 | |||
1797 | int usb_ftdi_elan_edset_output(struct platform_device *pdev, u8 ed_number, | ||
1798 | void *endp, struct urb *urb, u8 address, u8 ep_number, u8 toggle_bits, | ||
1799 | void (*callback) (void *endp, struct urb *urb, u8 *buf, int len, | ||
1800 | int toggle_bits, int error_count, int condition_code, int repeat_number, | ||
1801 | int halted, int skipped, int actual, int non_null)) | ||
1802 | { | ||
1803 | struct usb_ftdi *ftdi = platform_device_to_usb_ftdi(pdev); | ||
1804 | return ftdi_elan_edset_output(ftdi, ed_number, endp, urb, address, | ||
1805 | ep_number, toggle_bits, callback); | ||
1806 | } | ||
1807 | |||
1808 | |||
1809 | EXPORT_SYMBOL_GPL(usb_ftdi_elan_edset_output); | ||
1810 | static int ftdi_elan_edset_single(struct usb_ftdi *ftdi, u8 ed_number, | ||
1811 | void *endp, struct urb *urb, u8 address, u8 ep_number, u8 toggle_bits, | ||
1812 | void (*callback) (void *endp, struct urb *urb, u8 *buf, int len, | ||
1813 | int toggle_bits, int error_count, int condition_code, int repeat_number, | ||
1814 | int halted, int skipped, int actual, int non_null)) | ||
1815 | { | ||
1816 | u8 ed = ed_number - 1; | ||
1817 | wait:if (ftdi->disconnected > 0) { | ||
1818 | return -ENODEV; | ||
1819 | } else if (ftdi->initialized == 0) { | ||
1820 | return -ENODEV; | ||
1821 | } else { | ||
1822 | int command_size; | ||
1823 | down(&ftdi->u132_lock); | ||
1824 | command_size = ftdi->command_next - ftdi->command_head; | ||
1825 | if (command_size < COMMAND_SIZE) { | ||
1826 | int remaining_length = urb->transfer_buffer_length - | ||
1827 | urb->actual_length; | ||
1828 | struct u132_target *target = &ftdi->target[ed]; | ||
1829 | struct u132_command *command = &ftdi->command[ | ||
1830 | COMMAND_MASK & ftdi->command_next]; | ||
1831 | command->header = 0x83 | (ed << 5); | ||
1832 | if (remaining_length == 0) { | ||
1833 | command->length = 0x0000; | ||
1834 | } else if (remaining_length > 1024) { | ||
1835 | command->length = 0x8000 | 1023; | ||
1836 | } else | ||
1837 | command->length = 0x8000 | (remaining_length - | ||
1838 | 1); | ||
1839 | command->address = (toggle_bits << 6) | (ep_number << 2) | ||
1840 | | (address << 0); | ||
1841 | command->width = usb_maxpacket(urb->dev, urb->pipe, | ||
1842 | usb_pipeout(urb->pipe)); | ||
1843 | command->follows = 0; | ||
1844 | command->value = 0; | ||
1845 | command->buffer = NULL; | ||
1846 | target->callback = callback; | ||
1847 | target->endp = endp; | ||
1848 | target->urb = urb; | ||
1849 | target->active = 1; | ||
1850 | ftdi->command_next += 1; | ||
1851 | ftdi_elan_kick_command_queue(ftdi); | ||
1852 | up(&ftdi->u132_lock); | ||
1853 | return 0; | ||
1854 | } else { | ||
1855 | up(&ftdi->u132_lock); | ||
1856 | msleep(100); | ||
1857 | goto wait; | ||
1858 | } | ||
1859 | } | ||
1860 | } | ||
1861 | |||
1862 | int usb_ftdi_elan_edset_single(struct platform_device *pdev, u8 ed_number, | ||
1863 | void *endp, struct urb *urb, u8 address, u8 ep_number, u8 toggle_bits, | ||
1864 | void (*callback) (void *endp, struct urb *urb, u8 *buf, int len, | ||
1865 | int toggle_bits, int error_count, int condition_code, int repeat_number, | ||
1866 | int halted, int skipped, int actual, int non_null)) | ||
1867 | { | ||
1868 | struct usb_ftdi *ftdi = platform_device_to_usb_ftdi(pdev); | ||
1869 | return ftdi_elan_edset_single(ftdi, ed_number, endp, urb, address, | ||
1870 | ep_number, toggle_bits, callback); | ||
1871 | } | ||
1872 | |||
1873 | |||
1874 | EXPORT_SYMBOL_GPL(usb_ftdi_elan_edset_single); | ||
1875 | static int ftdi_elan_edset_flush(struct usb_ftdi *ftdi, u8 ed_number, | ||
1876 | void *endp) | ||
1877 | { | ||
1878 | u8 ed = ed_number - 1; | ||
1879 | if (ftdi->disconnected > 0) { | ||
1880 | return -ENODEV; | ||
1881 | } else if (ftdi->initialized == 0) { | ||
1882 | return -ENODEV; | ||
1883 | } else { | ||
1884 | struct u132_target *target = &ftdi->target[ed]; | ||
1885 | down(&ftdi->u132_lock); | ||
1886 | if (target->abandoning > 0) { | ||
1887 | up(&ftdi->u132_lock); | ||
1888 | return 0; | ||
1889 | } else { | ||
1890 | target->abandoning = 1; | ||
1891 | wait_1:if (target->active == 1) { | ||
1892 | int command_size = ftdi->command_next - | ||
1893 | ftdi->command_head; | ||
1894 | if (command_size < COMMAND_SIZE) { | ||
1895 | struct u132_command *command = | ||
1896 | &ftdi->command[COMMAND_MASK & | ||
1897 | ftdi->command_next]; | ||
1898 | command->header = 0x80 | (ed << 5) | | ||
1899 | 0x4; | ||
1900 | command->length = 0x00; | ||
1901 | command->address = 0x00; | ||
1902 | command->width = 0x00; | ||
1903 | command->follows = 0; | ||
1904 | command->value = 0; | ||
1905 | command->buffer = &command->value; | ||
1906 | ftdi->command_next += 1; | ||
1907 | ftdi_elan_kick_command_queue(ftdi); | ||
1908 | } else { | ||
1909 | up(&ftdi->u132_lock); | ||
1910 | msleep(100); | ||
1911 | down(&ftdi->u132_lock); | ||
1912 | goto wait_1; | ||
1913 | } | ||
1914 | } | ||
1915 | up(&ftdi->u132_lock); | ||
1916 | return 0; | ||
1917 | } | ||
1918 | } | ||
1919 | } | ||
1920 | |||
1921 | int usb_ftdi_elan_edset_flush(struct platform_device *pdev, u8 ed_number, | ||
1922 | void *endp) | ||
1923 | { | ||
1924 | struct usb_ftdi *ftdi = platform_device_to_usb_ftdi(pdev); | ||
1925 | return ftdi_elan_edset_flush(ftdi, ed_number, endp); | ||
1926 | } | ||
1927 | |||
1928 | |||
1929 | EXPORT_SYMBOL_GPL(usb_ftdi_elan_edset_flush); | ||
1930 | static int ftdi_elan_flush_input_fifo(struct usb_ftdi *ftdi) | ||
1931 | { | ||
1932 | int retry_on_empty = 10; | ||
1933 | int retry_on_timeout = 5; | ||
1934 | int retry_on_status = 20; | ||
1935 | more:{ | ||
1936 | int packet_bytes = 0; | ||
1937 | int retval = usb_bulk_msg(ftdi->udev, | ||
1938 | usb_rcvbulkpipe(ftdi->udev, ftdi->bulk_in_endpointAddr), | ||
1939 | ftdi->bulk_in_buffer, ftdi->bulk_in_size, | ||
1940 | &packet_bytes, msecs_to_jiffies(100)); | ||
1941 | if (packet_bytes > 2) { | ||
1942 | char diag[30 *3 + 4]; | ||
1943 | char *d = diag; | ||
1944 | int m = (sizeof(diag) - 1) / 3; | ||
1945 | char *b = ftdi->bulk_in_buffer; | ||
1946 | int bytes_read = 0; | ||
1947 | diag[0] = 0; | ||
1948 | while (packet_bytes-- > 0) { | ||
1949 | char c = *b++; | ||
1950 | if (bytes_read < m) { | ||
1951 | d += sprintf(d, " %02X", | ||
1952 | 0x000000FF & c); | ||
1953 | } else if (bytes_read > m) { | ||
1954 | } else | ||
1955 | d += sprintf(d, " .."); | ||
1956 | bytes_read += 1; | ||
1957 | continue; | ||
1958 | } | ||
1959 | goto more; | ||
1960 | } else if (packet_bytes > 1) { | ||
1961 | char s1 = ftdi->bulk_in_buffer[0]; | ||
1962 | char s2 = ftdi->bulk_in_buffer[1]; | ||
1963 | if (s1 == 0x31 && s2 == 0x60) { | ||
1964 | return 0; | ||
1965 | } else if (retry_on_status-- > 0) { | ||
1966 | goto more; | ||
1967 | } else { | ||
1968 | dev_err(&ftdi->udev->dev, "STATUS ERROR retry l" | ||
1969 | "imit reached\n"); | ||
1970 | return -EFAULT; | ||
1971 | } | ||
1972 | } else if (packet_bytes > 0) { | ||
1973 | char b1 = ftdi->bulk_in_buffer[0]; | ||
1974 | dev_err(&ftdi->udev->dev, "only one byte flushed from F" | ||
1975 | "TDI = %02X\n", b1); | ||
1976 | if (retry_on_status-- > 0) { | ||
1977 | goto more; | ||
1978 | } else { | ||
1979 | dev_err(&ftdi->udev->dev, "STATUS ERROR retry l" | ||
1980 | "imit reached\n"); | ||
1981 | return -EFAULT; | ||
1982 | } | ||
1983 | } else if (retval == -ETIMEDOUT) { | ||
1984 | if (retry_on_timeout-- > 0) { | ||
1985 | goto more; | ||
1986 | } else { | ||
1987 | dev_err(&ftdi->udev->dev, "TIMED OUT retry limi" | ||
1988 | "t reached\n"); | ||
1989 | return -ENOMEM; | ||
1990 | } | ||
1991 | } else if (retval == 0) { | ||
1992 | if (retry_on_empty-- > 0) { | ||
1993 | goto more; | ||
1994 | } else { | ||
1995 | dev_err(&ftdi->udev->dev, "empty packet retry l" | ||
1996 | "imit reached\n"); | ||
1997 | return -ENOMEM; | ||
1998 | } | ||
1999 | } else { | ||
2000 | dev_err(&ftdi->udev->dev, "error = %d\n", retval); | ||
2001 | return retval; | ||
2002 | } | ||
2003 | } | ||
2004 | return -1; | ||
2005 | } | ||
2006 | |||
2007 | |||
2008 | /* | ||
2009 | * send the long flush sequence | ||
2010 | * | ||
2011 | */ | ||
2012 | static int ftdi_elan_synchronize_flush(struct usb_ftdi *ftdi) | ||
2013 | { | ||
2014 | int retval; | ||
2015 | struct urb *urb; | ||
2016 | char *buf; | ||
2017 | int I = 257; | ||
2018 | int i = 0; | ||
2019 | urb = usb_alloc_urb(0, GFP_KERNEL); | ||
2020 | if (!urb) { | ||
2021 | dev_err(&ftdi->udev->dev, "could not alloc a urb for flush sequ" | ||
2022 | "ence\n"); | ||
2023 | return -ENOMEM; | ||
2024 | } | ||
2025 | buf = usb_buffer_alloc(ftdi->udev, I, GFP_KERNEL, &urb->transfer_dma); | ||
2026 | if (!buf) { | ||
2027 | dev_err(&ftdi->udev->dev, "could not get a buffer for flush seq" | ||
2028 | "uence\n"); | ||
2029 | usb_free_urb(urb); | ||
2030 | return -ENOMEM; | ||
2031 | } | ||
2032 | while (I-- > 0) | ||
2033 | buf[i++] = 0x55; | ||
2034 | usb_fill_bulk_urb(urb, ftdi->udev, usb_sndbulkpipe(ftdi->udev, | ||
2035 | ftdi->bulk_out_endpointAddr), buf, i, | ||
2036 | ftdi_elan_write_bulk_callback, ftdi); | ||
2037 | urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; | ||
2038 | retval = usb_submit_urb(urb, GFP_KERNEL); | ||
2039 | if (retval) { | ||
2040 | dev_err(&ftdi->udev->dev, "failed to submit urb containing the " | ||
2041 | "flush sequence\n"); | ||
2042 | usb_buffer_free(ftdi->udev, i, buf, urb->transfer_dma); | ||
2043 | usb_free_urb(urb); | ||
2044 | return -ENOMEM; | ||
2045 | } | ||
2046 | usb_free_urb(urb); | ||
2047 | return 0; | ||
2048 | } | ||
2049 | |||
2050 | |||
2051 | /* | ||
2052 | * send the reset sequence | ||
2053 | * | ||
2054 | */ | ||
2055 | static int ftdi_elan_synchronize_reset(struct usb_ftdi *ftdi) | ||
2056 | { | ||
2057 | int retval; | ||
2058 | struct urb *urb; | ||
2059 | char *buf; | ||
2060 | int I = 4; | ||
2061 | int i = 0; | ||
2062 | urb = usb_alloc_urb(0, GFP_KERNEL); | ||
2063 | if (!urb) { | ||
2064 | dev_err(&ftdi->udev->dev, "could not get a urb for the reset se" | ||
2065 | "quence\n"); | ||
2066 | return -ENOMEM; | ||
2067 | } | ||
2068 | buf = usb_buffer_alloc(ftdi->udev, I, GFP_KERNEL, &urb->transfer_dma); | ||
2069 | if (!buf) { | ||
2070 | dev_err(&ftdi->udev->dev, "could not get a buffer for the reset" | ||
2071 | " sequence\n"); | ||
2072 | usb_free_urb(urb); | ||
2073 | return -ENOMEM; | ||
2074 | } | ||
2075 | buf[i++] = 0x55; | ||
2076 | buf[i++] = 0xAA; | ||
2077 | buf[i++] = 0x5A; | ||
2078 | buf[i++] = 0xA5; | ||
2079 | usb_fill_bulk_urb(urb, ftdi->udev, usb_sndbulkpipe(ftdi->udev, | ||
2080 | ftdi->bulk_out_endpointAddr), buf, i, | ||
2081 | ftdi_elan_write_bulk_callback, ftdi); | ||
2082 | urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; | ||
2083 | retval = usb_submit_urb(urb, GFP_KERNEL); | ||
2084 | if (retval) { | ||
2085 | dev_err(&ftdi->udev->dev, "failed to submit urb containing the " | ||
2086 | "reset sequence\n"); | ||
2087 | usb_buffer_free(ftdi->udev, i, buf, urb->transfer_dma); | ||
2088 | usb_free_urb(urb); | ||
2089 | return -ENOMEM; | ||
2090 | } | ||
2091 | usb_free_urb(urb); | ||
2092 | return 0; | ||
2093 | } | ||
2094 | |||
2095 | static int ftdi_elan_synchronize(struct usb_ftdi *ftdi) | ||
2096 | { | ||
2097 | int retval; | ||
2098 | int long_stop = 10; | ||
2099 | int retry_on_timeout = 5; | ||
2100 | int retry_on_empty = 10; | ||
2101 | int err_count = 0; | ||
2102 | retval = ftdi_elan_flush_input_fifo(ftdi); | ||
2103 | if (retval) | ||
2104 | return retval; | ||
2105 | ftdi->bulk_in_left = 0; | ||
2106 | ftdi->bulk_in_last = -1; | ||
2107 | while (long_stop-- > 0) { | ||
2108 | int read_stop; | ||
2109 | int read_stuck; | ||
2110 | retval = ftdi_elan_synchronize_flush(ftdi); | ||
2111 | if (retval) | ||
2112 | return retval; | ||
2113 | retval = ftdi_elan_flush_input_fifo(ftdi); | ||
2114 | if (retval) | ||
2115 | return retval; | ||
2116 | reset:retval = ftdi_elan_synchronize_reset(ftdi); | ||
2117 | if (retval) | ||
2118 | return retval; | ||
2119 | read_stop = 100; | ||
2120 | read_stuck = 10; | ||
2121 | read:{ | ||
2122 | int packet_bytes = 0; | ||
2123 | retval = usb_bulk_msg(ftdi->udev, | ||
2124 | usb_rcvbulkpipe(ftdi->udev, | ||
2125 | ftdi->bulk_in_endpointAddr), | ||
2126 | ftdi->bulk_in_buffer, ftdi->bulk_in_size, | ||
2127 | &packet_bytes, msecs_to_jiffies(500)); | ||
2128 | if (packet_bytes > 2) { | ||
2129 | char diag[30 *3 + 4]; | ||
2130 | char *d = diag; | ||
2131 | int m = (sizeof(diag) - 1) / 3; | ||
2132 | char *b = ftdi->bulk_in_buffer; | ||
2133 | int bytes_read = 0; | ||
2134 | unsigned char c = 0; | ||
2135 | diag[0] = 0; | ||
2136 | while (packet_bytes-- > 0) { | ||
2137 | c = *b++; | ||
2138 | if (bytes_read < m) { | ||
2139 | d += sprintf(d, " %02X", c); | ||
2140 | } else if (bytes_read > m) { | ||
2141 | } else | ||
2142 | d += sprintf(d, " .."); | ||
2143 | bytes_read += 1; | ||
2144 | continue; | ||
2145 | } | ||
2146 | if (c == 0x7E) { | ||
2147 | return 0; | ||
2148 | } else { | ||
2149 | if (c == 0x55) { | ||
2150 | goto read; | ||
2151 | } else if (read_stop-- > 0) { | ||
2152 | goto read; | ||
2153 | } else { | ||
2154 | dev_err(&ftdi->udev->dev, "retr" | ||
2155 | "y limit reached\n"); | ||
2156 | continue; | ||
2157 | } | ||
2158 | } | ||
2159 | } else if (packet_bytes > 1) { | ||
2160 | unsigned char s1 = ftdi->bulk_in_buffer[0]; | ||
2161 | unsigned char s2 = ftdi->bulk_in_buffer[1]; | ||
2162 | if (s1 == 0x31 && s2 == 0x00) { | ||
2163 | if (read_stuck-- > 0) { | ||
2164 | goto read; | ||
2165 | } else | ||
2166 | goto reset; | ||
2167 | } else if (s1 == 0x31 && s2 == 0x60) { | ||
2168 | if (read_stop-- > 0) { | ||
2169 | goto read; | ||
2170 | } else { | ||
2171 | dev_err(&ftdi->udev->dev, "retr" | ||
2172 | "y limit reached\n"); | ||
2173 | continue; | ||
2174 | } | ||
2175 | } else { | ||
2176 | if (read_stop-- > 0) { | ||
2177 | goto read; | ||
2178 | } else { | ||
2179 | dev_err(&ftdi->udev->dev, "retr" | ||
2180 | "y limit reached\n"); | ||
2181 | continue; | ||
2182 | } | ||
2183 | } | ||
2184 | } else if (packet_bytes > 0) { | ||
2185 | if (read_stop-- > 0) { | ||
2186 | goto read; | ||
2187 | } else { | ||
2188 | dev_err(&ftdi->udev->dev, "retry limit " | ||
2189 | "reached\n"); | ||
2190 | continue; | ||
2191 | } | ||
2192 | } else if (retval == -ETIMEDOUT) { | ||
2193 | if (retry_on_timeout-- > 0) { | ||
2194 | goto read; | ||
2195 | } else { | ||
2196 | dev_err(&ftdi->udev->dev, "TIMED OUT re" | ||
2197 | "try limit reached\n"); | ||
2198 | continue; | ||
2199 | } | ||
2200 | } else if (retval == 0) { | ||
2201 | if (retry_on_empty-- > 0) { | ||
2202 | goto read; | ||
2203 | } else { | ||
2204 | dev_err(&ftdi->udev->dev, "empty packet" | ||
2205 | " retry limit reached\n"); | ||
2206 | continue; | ||
2207 | } | ||
2208 | } else { | ||
2209 | err_count += 1; | ||
2210 | dev_err(&ftdi->udev->dev, "error = %d\n", | ||
2211 | retval); | ||
2212 | if (read_stop-- > 0) { | ||
2213 | goto read; | ||
2214 | } else { | ||
2215 | dev_err(&ftdi->udev->dev, "retry limit " | ||
2216 | "reached\n"); | ||
2217 | continue; | ||
2218 | } | ||
2219 | } | ||
2220 | } | ||
2221 | } | ||
2222 | dev_err(&ftdi->udev->dev, "failed to synchronize\n"); | ||
2223 | return -EFAULT; | ||
2224 | } | ||
2225 | |||
2226 | static int ftdi_elan_stuck_waiting(struct usb_ftdi *ftdi) | ||
2227 | { | ||
2228 | int retry_on_empty = 10; | ||
2229 | int retry_on_timeout = 5; | ||
2230 | int retry_on_status = 50; | ||
2231 | more:{ | ||
2232 | int packet_bytes = 0; | ||
2233 | int retval = usb_bulk_msg(ftdi->udev, | ||
2234 | usb_rcvbulkpipe(ftdi->udev, ftdi->bulk_in_endpointAddr), | ||
2235 | ftdi->bulk_in_buffer, ftdi->bulk_in_size, | ||
2236 | &packet_bytes, msecs_to_jiffies(1000)); | ||
2237 | if (packet_bytes > 2) { | ||
2238 | char diag[30 *3 + 4]; | ||
2239 | char *d = diag; | ||
2240 | int m = (sizeof(diag) - 1) / 3; | ||
2241 | char *b = ftdi->bulk_in_buffer; | ||
2242 | int bytes_read = 0; | ||
2243 | diag[0] = 0; | ||
2244 | while (packet_bytes-- > 0) { | ||
2245 | char c = *b++; | ||
2246 | if (bytes_read < m) { | ||
2247 | d += sprintf(d, " %02X", | ||
2248 | 0x000000FF & c); | ||
2249 | } else if (bytes_read > m) { | ||
2250 | } else | ||
2251 | d += sprintf(d, " .."); | ||
2252 | bytes_read += 1; | ||
2253 | continue; | ||
2254 | } | ||
2255 | goto more; | ||
2256 | } else if (packet_bytes > 1) { | ||
2257 | char s1 = ftdi->bulk_in_buffer[0]; | ||
2258 | char s2 = ftdi->bulk_in_buffer[1]; | ||
2259 | if (s1 == 0x31 && s2 == 0x60) { | ||
2260 | return 0; | ||
2261 | } else if (retry_on_status-- > 0) { | ||
2262 | msleep(5); | ||
2263 | goto more; | ||
2264 | } else | ||
2265 | return -EFAULT; | ||
2266 | } else if (packet_bytes > 0) { | ||
2267 | char b1 = ftdi->bulk_in_buffer[0]; | ||
2268 | dev_err(&ftdi->udev->dev, "only one byte flushed from F" | ||
2269 | "TDI = %02X\n", b1); | ||
2270 | if (retry_on_status-- > 0) { | ||
2271 | msleep(5); | ||
2272 | goto more; | ||
2273 | } else { | ||
2274 | dev_err(&ftdi->udev->dev, "STATUS ERROR retry l" | ||
2275 | "imit reached\n"); | ||
2276 | return -EFAULT; | ||
2277 | } | ||
2278 | } else if (retval == -ETIMEDOUT) { | ||
2279 | if (retry_on_timeout-- > 0) { | ||
2280 | goto more; | ||
2281 | } else { | ||
2282 | dev_err(&ftdi->udev->dev, "TIMED OUT retry limi" | ||
2283 | "t reached\n"); | ||
2284 | return -ENOMEM; | ||
2285 | } | ||
2286 | } else if (retval == 0) { | ||
2287 | if (retry_on_empty-- > 0) { | ||
2288 | goto more; | ||
2289 | } else { | ||
2290 | dev_err(&ftdi->udev->dev, "empty packet retry l" | ||
2291 | "imit reached\n"); | ||
2292 | return -ENOMEM; | ||
2293 | } | ||
2294 | } else { | ||
2295 | dev_err(&ftdi->udev->dev, "error = %d\n", retval); | ||
2296 | return -ENOMEM; | ||
2297 | } | ||
2298 | } | ||
2299 | return -1; | ||
2300 | } | ||
2301 | |||
2302 | static int ftdi_elan_checkingPCI(struct usb_ftdi *ftdi) | ||
2303 | { | ||
2304 | int UxxxStatus = ftdi_elan_read_reg(ftdi, &ftdi->controlreg); | ||
2305 | if (UxxxStatus) | ||
2306 | return UxxxStatus; | ||
2307 | if (ftdi->controlreg & 0x00400000) { | ||
2308 | if (ftdi->card_ejected) { | ||
2309 | } else { | ||
2310 | ftdi->card_ejected = 1; | ||
2311 | dev_err(&ftdi->udev->dev, "CARD EJECTED - controlreg = " | ||
2312 | "%08X\n", ftdi->controlreg); | ||
2313 | } | ||
2314 | return -ENODEV; | ||
2315 | } else { | ||
2316 | u8 fn = ftdi->function - 1; | ||
2317 | int activePCIfn = fn << 8; | ||
2318 | u32 pcidata; | ||
2319 | u32 pciVID; | ||
2320 | u32 pciPID; | ||
2321 | int reg = 0; | ||
2322 | UxxxStatus = ftdi_elan_read_config(ftdi, activePCIfn | reg, 0, | ||
2323 | &pcidata); | ||
2324 | if (UxxxStatus) | ||
2325 | return UxxxStatus; | ||
2326 | pciVID = pcidata & 0xFFFF; | ||
2327 | pciPID = (pcidata >> 16) & 0xFFFF; | ||
2328 | if (pciVID == ftdi->platform_data.vendor && pciPID == | ||
2329 | ftdi->platform_data.device) { | ||
2330 | return 0; | ||
2331 | } else { | ||
2332 | dev_err(&ftdi->udev->dev, "vendor=%04X pciVID=%04X devi" | ||
2333 | "ce=%04X pciPID=%04X\n", | ||
2334 | ftdi->platform_data.vendor, pciVID, | ||
2335 | ftdi->platform_data.device, pciPID); | ||
2336 | return -ENODEV; | ||
2337 | } | ||
2338 | } | ||
2339 | } | ||
2340 | |||
2341 | static int ftdi_elan_enumeratePCI(struct usb_ftdi *ftdi) | ||
2342 | { | ||
2343 | u32 latence_timer; | ||
2344 | u32 controlreg; | ||
2345 | int UxxxStatus; | ||
2346 | u32 pcidata; | ||
2347 | int reg = 0; | ||
2348 | int foundOHCI = 0; | ||
2349 | u8 fn; | ||
2350 | int activePCIfn = 0; | ||
2351 | u32 pciVID = 0; | ||
2352 | u32 pciPID = 0; | ||
2353 | UxxxStatus = ftdi_elan_read_reg(ftdi, &controlreg); | ||
2354 | if (UxxxStatus) | ||
2355 | return UxxxStatus; | ||
2356 | UxxxStatus = ftdi_elan_write_reg(ftdi, 0x00000000L); | ||
2357 | if (UxxxStatus) | ||
2358 | return UxxxStatus; | ||
2359 | msleep(750); | ||
2360 | UxxxStatus = ftdi_elan_write_reg(ftdi, 0x00000200L | 0x100); | ||
2361 | if (UxxxStatus) | ||
2362 | return UxxxStatus; | ||
2363 | UxxxStatus = ftdi_elan_write_reg(ftdi, 0x00000200L | 0x500); | ||
2364 | if (UxxxStatus) | ||
2365 | return UxxxStatus; | ||
2366 | UxxxStatus = ftdi_elan_read_reg(ftdi, &controlreg); | ||
2367 | if (UxxxStatus) | ||
2368 | return UxxxStatus; | ||
2369 | UxxxStatus = ftdi_elan_write_reg(ftdi, 0x0000020CL | 0x000); | ||
2370 | if (UxxxStatus) | ||
2371 | return UxxxStatus; | ||
2372 | UxxxStatus = ftdi_elan_write_reg(ftdi, 0x0000020DL | 0x000); | ||
2373 | if (UxxxStatus) | ||
2374 | return UxxxStatus; | ||
2375 | msleep(250); | ||
2376 | UxxxStatus = ftdi_elan_write_reg(ftdi, 0x0000020FL | 0x000); | ||
2377 | if (UxxxStatus) | ||
2378 | return UxxxStatus; | ||
2379 | UxxxStatus = ftdi_elan_read_reg(ftdi, &controlreg); | ||
2380 | if (UxxxStatus) | ||
2381 | return UxxxStatus; | ||
2382 | UxxxStatus = ftdi_elan_write_reg(ftdi, 0x0000025FL | 0x800); | ||
2383 | if (UxxxStatus) | ||
2384 | return UxxxStatus; | ||
2385 | UxxxStatus = ftdi_elan_read_reg(ftdi, &controlreg); | ||
2386 | if (UxxxStatus) | ||
2387 | return UxxxStatus; | ||
2388 | UxxxStatus = ftdi_elan_read_reg(ftdi, &controlreg); | ||
2389 | if (UxxxStatus) | ||
2390 | return UxxxStatus; | ||
2391 | msleep(1000); | ||
2392 | for (fn = 0; (fn < 4) && (!foundOHCI); fn++) { | ||
2393 | activePCIfn = fn << 8; | ||
2394 | ftdi->function = fn + 1; | ||
2395 | UxxxStatus = ftdi_elan_read_config(ftdi, activePCIfn | reg, 0, | ||
2396 | &pcidata); | ||
2397 | if (UxxxStatus) | ||
2398 | return UxxxStatus; | ||
2399 | pciVID = pcidata & 0xFFFF; | ||
2400 | pciPID = (pcidata >> 16) & 0xFFFF; | ||
2401 | if ((pciVID == 0x1045) && (pciPID == 0xc861)) { | ||
2402 | foundOHCI = 1; | ||
2403 | } else if ((pciVID == 0x1033) && (pciPID == 0x0035)) { | ||
2404 | foundOHCI = 1; | ||
2405 | } else if ((pciVID == 0x10b9) && (pciPID == 0x5237)) { | ||
2406 | foundOHCI = 1; | ||
2407 | } else if ((pciVID == 0x11c1) && (pciPID == 0x5802)) { | ||
2408 | foundOHCI = 1; | ||
2409 | } else if ((pciVID == 0x11AB) && (pciPID == 0x1FA6)) { | ||
2410 | } | ||
2411 | } | ||
2412 | if (foundOHCI == 0) { | ||
2413 | return -ENXIO; | ||
2414 | } | ||
2415 | ftdi->platform_data.vendor = pciVID; | ||
2416 | ftdi->platform_data.device = pciPID; | ||
2417 | UxxxStatus = ftdi_elan_write_reg(ftdi, 0x0000025FL | 0x2800); | ||
2418 | if (UxxxStatus) | ||
2419 | return UxxxStatus; | ||
2420 | reg = 16; | ||
2421 | UxxxStatus = ftdi_elan_write_config(ftdi, activePCIfn | reg, 0, | ||
2422 | 0xFFFFFFFF); | ||
2423 | if (UxxxStatus) | ||
2424 | return UxxxStatus; | ||
2425 | UxxxStatus = ftdi_elan_read_config(ftdi, activePCIfn | reg, 0, | ||
2426 | &pcidata); | ||
2427 | if (UxxxStatus) | ||
2428 | return UxxxStatus; | ||
2429 | UxxxStatus = ftdi_elan_write_config(ftdi, activePCIfn | reg, 0, | ||
2430 | 0xF0000000); | ||
2431 | if (UxxxStatus) | ||
2432 | return UxxxStatus; | ||
2433 | UxxxStatus = ftdi_elan_read_config(ftdi, activePCIfn | reg, 0, | ||
2434 | &pcidata); | ||
2435 | if (UxxxStatus) | ||
2436 | return UxxxStatus; | ||
2437 | reg = 12; | ||
2438 | UxxxStatus = ftdi_elan_read_config(ftdi, activePCIfn | reg, 0, | ||
2439 | &latence_timer); | ||
2440 | if (UxxxStatus) | ||
2441 | return UxxxStatus; | ||
2442 | latence_timer &= 0xFFFF00FF; | ||
2443 | latence_timer |= 0x00001600; | ||
2444 | UxxxStatus = ftdi_elan_write_config(ftdi, activePCIfn | reg, 0x00, | ||
2445 | latence_timer); | ||
2446 | if (UxxxStatus) | ||
2447 | return UxxxStatus; | ||
2448 | UxxxStatus = ftdi_elan_read_config(ftdi, activePCIfn | reg, 0, | ||
2449 | &pcidata); | ||
2450 | if (UxxxStatus) | ||
2451 | return UxxxStatus; | ||
2452 | reg = 4; | ||
2453 | UxxxStatus = ftdi_elan_write_config(ftdi, activePCIfn | reg, 0x00, | ||
2454 | 0x06); | ||
2455 | if (UxxxStatus) | ||
2456 | return UxxxStatus; | ||
2457 | UxxxStatus = ftdi_elan_read_config(ftdi, activePCIfn | reg, 0, | ||
2458 | &pcidata); | ||
2459 | if (UxxxStatus) | ||
2460 | return UxxxStatus; | ||
2461 | return 0; | ||
2462 | } | ||
2463 | |||
2464 | static int ftdi_elan_setupOHCI(struct usb_ftdi *ftdi) | ||
2465 | { | ||
2466 | u32 pcidata; | ||
2467 | int U132Status; | ||
2468 | int reg; | ||
2469 | int reset_repeat = 0; | ||
2470 | do_reset:reg = 8; | ||
2471 | U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x0e, 0x01); | ||
2472 | if (U132Status) | ||
2473 | return U132Status; | ||
2474 | reset_check:{ | ||
2475 | U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata); | ||
2476 | if (U132Status) | ||
2477 | return U132Status; | ||
2478 | if (pcidata & 1) { | ||
2479 | msleep(500); | ||
2480 | if (reset_repeat++ > 100) { | ||
2481 | reset_repeat = 0; | ||
2482 | goto do_reset; | ||
2483 | } else | ||
2484 | goto reset_check; | ||
2485 | } | ||
2486 | } | ||
2487 | goto dump_regs; | ||
2488 | msleep(500); | ||
2489 | reg = 0x28; | ||
2490 | U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x00, 0x11000000); | ||
2491 | if (U132Status) | ||
2492 | return U132Status; | ||
2493 | U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata); | ||
2494 | if (U132Status) | ||
2495 | return U132Status; | ||
2496 | reg = 0x40; | ||
2497 | U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x00, 0x2edf); | ||
2498 | if (U132Status) | ||
2499 | return U132Status; | ||
2500 | U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata); | ||
2501 | if (U132Status) | ||
2502 | return U132Status; | ||
2503 | reg = 0x34; | ||
2504 | U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x00, 0x2edf2edf); | ||
2505 | if (U132Status) | ||
2506 | return U132Status; | ||
2507 | U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata); | ||
2508 | if (U132Status) | ||
2509 | return U132Status; | ||
2510 | reg = 4; | ||
2511 | U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x00, 0xA0); | ||
2512 | if (U132Status) | ||
2513 | return U132Status; | ||
2514 | U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata); | ||
2515 | if (U132Status) | ||
2516 | return U132Status; | ||
2517 | msleep(250); | ||
2518 | reg = 8; | ||
2519 | U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x0e, 0x04); | ||
2520 | if (U132Status) | ||
2521 | return U132Status; | ||
2522 | U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata); | ||
2523 | if (U132Status) | ||
2524 | return U132Status; | ||
2525 | reg = 0x28; | ||
2526 | U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata); | ||
2527 | if (U132Status) | ||
2528 | return U132Status; | ||
2529 | reg = 8; | ||
2530 | U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata); | ||
2531 | if (U132Status) | ||
2532 | return U132Status; | ||
2533 | reg = 0x48; | ||
2534 | U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x00, 0x00001200); | ||
2535 | if (U132Status) | ||
2536 | return U132Status; | ||
2537 | U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata); | ||
2538 | if (U132Status) | ||
2539 | return U132Status; | ||
2540 | reg = 0x54; | ||
2541 | U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata); | ||
2542 | if (U132Status) | ||
2543 | return U132Status; | ||
2544 | reg = 0x58; | ||
2545 | U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata); | ||
2546 | if (U132Status) | ||
2547 | return U132Status; | ||
2548 | reg = 0x34; | ||
2549 | U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x00, 0x28002edf); | ||
2550 | if (U132Status) | ||
2551 | return U132Status; | ||
2552 | U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata); | ||
2553 | if (U132Status) | ||
2554 | return U132Status; | ||
2555 | msleep(100); | ||
2556 | reg = 0x50; | ||
2557 | U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x00, 0x10000); | ||
2558 | if (U132Status) | ||
2559 | return U132Status; | ||
2560 | reg = 0x54; | ||
2561 | power_check:U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata); | ||
2562 | if (U132Status) | ||
2563 | return U132Status; | ||
2564 | if (!(pcidata & 1)) { | ||
2565 | msleep(500); | ||
2566 | goto power_check; | ||
2567 | } | ||
2568 | msleep(3000); | ||
2569 | reg = 0x54; | ||
2570 | U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata); | ||
2571 | if (U132Status) | ||
2572 | return U132Status; | ||
2573 | reg = 0x58; | ||
2574 | U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata); | ||
2575 | if (U132Status) | ||
2576 | return U132Status; | ||
2577 | reg = 0x54; | ||
2578 | U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x00, 0x02); | ||
2579 | if (U132Status) | ||
2580 | return U132Status; | ||
2581 | U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata); | ||
2582 | if (U132Status) | ||
2583 | return U132Status; | ||
2584 | reg = 0x54; | ||
2585 | U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x00, 0x10); | ||
2586 | if (U132Status) | ||
2587 | return U132Status; | ||
2588 | U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata); | ||
2589 | if (U132Status) | ||
2590 | return U132Status; | ||
2591 | msleep(750); | ||
2592 | reg = 0x54; | ||
2593 | if (0) { | ||
2594 | U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x00, 0x02); | ||
2595 | if (U132Status) | ||
2596 | return U132Status; | ||
2597 | } | ||
2598 | if (0) { | ||
2599 | U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata); | ||
2600 | if (U132Status) | ||
2601 | return U132Status; | ||
2602 | } | ||
2603 | reg = 0x54; | ||
2604 | U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata); | ||
2605 | if (U132Status) | ||
2606 | return U132Status; | ||
2607 | reg = 0x58; | ||
2608 | U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata); | ||
2609 | if (U132Status) | ||
2610 | return U132Status; | ||
2611 | dump_regs:for (reg = 0; reg <= 0x54; reg += 4) { | ||
2612 | U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata); | ||
2613 | if (U132Status) | ||
2614 | return U132Status; | ||
2615 | } | ||
2616 | return 0; | ||
2617 | } | ||
2618 | |||
2619 | |||
2620 | /* | ||
2621 | * we use only the first bulk-in and bulk-out endpoints | ||
2622 | */ | ||
2623 | static int ftdi_elan_probe(struct usb_interface *interface, | ||
2624 | const struct usb_device_id *id) | ||
2625 | { | ||
2626 | struct usb_host_interface *iface_desc; | ||
2627 | struct usb_endpoint_descriptor *endpoint; | ||
2628 | size_t buffer_size; | ||
2629 | int i; | ||
2630 | int retval = -ENOMEM; | ||
2631 | struct usb_ftdi *ftdi = kmalloc(sizeof(struct usb_ftdi), GFP_KERNEL); | ||
2632 | if (ftdi == NULL) { | ||
2633 | printk(KERN_ERR "Out of memory\n"); | ||
2634 | return -ENOMEM; | ||
2635 | } | ||
2636 | memset(ftdi, 0x00, sizeof(struct usb_ftdi)); | ||
2637 | down(&ftdi_module_lock); | ||
2638 | list_add_tail(&ftdi->ftdi_list, &ftdi_static_list); | ||
2639 | ftdi->sequence_num = ++ftdi_instances; | ||
2640 | up(&ftdi_module_lock); | ||
2641 | ftdi_elan_init_kref(ftdi); | ||
2642 | init_MUTEX(&ftdi->sw_lock); | ||
2643 | ftdi->udev = usb_get_dev(interface_to_usbdev(interface)); | ||
2644 | ftdi->interface = interface; | ||
2645 | init_MUTEX(&ftdi->u132_lock); | ||
2646 | ftdi->expected = 4; | ||
2647 | iface_desc = interface->cur_altsetting; | ||
2648 | for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) { | ||
2649 | endpoint = &iface_desc->endpoint[i].desc; | ||
2650 | if (!ftdi->bulk_in_endpointAddr && | ||
2651 | ((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK) | ||
2652 | == USB_DIR_IN) && ((endpoint->bmAttributes & | ||
2653 | USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_BULK)) | ||
2654 | { | ||
2655 | buffer_size = le16_to_cpu(endpoint->wMaxPacketSize); | ||
2656 | ftdi->bulk_in_size = buffer_size; | ||
2657 | ftdi->bulk_in_endpointAddr = endpoint->bEndpointAddress; | ||
2658 | ftdi->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL); | ||
2659 | if (!ftdi->bulk_in_buffer) { | ||
2660 | dev_err(&ftdi->udev->dev, "Could not allocate b" | ||
2661 | "ulk_in_buffer\n"); | ||
2662 | retval = -ENOMEM; | ||
2663 | goto error; | ||
2664 | } | ||
2665 | } | ||
2666 | if (!ftdi->bulk_out_endpointAddr && | ||
2667 | ((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK) | ||
2668 | == USB_DIR_OUT) && ((endpoint->bmAttributes & | ||
2669 | USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_BULK)) | ||
2670 | { | ||
2671 | ftdi->bulk_out_endpointAddr = | ||
2672 | endpoint->bEndpointAddress; | ||
2673 | } | ||
2674 | } | ||
2675 | if (!(ftdi->bulk_in_endpointAddr && ftdi->bulk_out_endpointAddr)) { | ||
2676 | dev_err(&ftdi->udev->dev, "Could not find both bulk-in and bulk" | ||
2677 | "-out endpoints\n"); | ||
2678 | retval = -ENODEV; | ||
2679 | goto error; | ||
2680 | } | ||
2681 | dev_info(&ftdi->udev->dev, "interface %d has I=%02X O=%02X\n", | ||
2682 | iface_desc->desc.bInterfaceNumber, ftdi->bulk_in_endpointAddr, | ||
2683 | ftdi->bulk_out_endpointAddr); | ||
2684 | usb_set_intfdata(interface, ftdi); | ||
2685 | if (iface_desc->desc.bInterfaceNumber == 0 && | ||
2686 | ftdi->bulk_in_endpointAddr == 0x81 && | ||
2687 | ftdi->bulk_out_endpointAddr == 0x02) { | ||
2688 | retval = usb_register_dev(interface, &ftdi_elan_jtag_class); | ||
2689 | if (retval) { | ||
2690 | dev_err(&ftdi->udev->dev, "Not able to get a minor for " | ||
2691 | "this device.\n"); | ||
2692 | usb_set_intfdata(interface, NULL); | ||
2693 | retval = -ENOMEM; | ||
2694 | goto error; | ||
2695 | } else { | ||
2696 | ftdi->class = &ftdi_elan_jtag_class; | ||
2697 | dev_info(&ftdi->udev->dev, "USB FDTI=%p JTAG interface " | ||
2698 | "%d now attached to ftdi%d\n", ftdi, | ||
2699 | iface_desc->desc.bInterfaceNumber, | ||
2700 | interface->minor); | ||
2701 | return 0; | ||
2702 | } | ||
2703 | } else if (iface_desc->desc.bInterfaceNumber == 1 && | ||
2704 | ftdi->bulk_in_endpointAddr == 0x83 && | ||
2705 | ftdi->bulk_out_endpointAddr == 0x04) { | ||
2706 | ftdi->class = NULL; | ||
2707 | dev_info(&ftdi->udev->dev, "USB FDTI=%p ELAN interface %d now a" | ||
2708 | "ctivated\n", ftdi, iface_desc->desc.bInterfaceNumber); | ||
2709 | INIT_WORK(&ftdi->status_work, ftdi_elan_status_work, | ||
2710 | (void *)ftdi); | ||
2711 | INIT_WORK(&ftdi->command_work, ftdi_elan_command_work, | ||
2712 | (void *)ftdi); | ||
2713 | INIT_WORK(&ftdi->respond_work, ftdi_elan_respond_work, | ||
2714 | (void *)ftdi); | ||
2715 | ftdi_status_queue_work(ftdi, msecs_to_jiffies(3 *1000)); | ||
2716 | return 0; | ||
2717 | } else { | ||
2718 | dev_err(&ftdi->udev->dev, | ||
2719 | "Could not find ELAN's U132 device\n"); | ||
2720 | retval = -ENODEV; | ||
2721 | goto error; | ||
2722 | } | ||
2723 | error:if (ftdi) { | ||
2724 | ftdi_elan_put_kref(ftdi); | ||
2725 | } | ||
2726 | return retval; | ||
2727 | } | ||
2728 | |||
2729 | static void ftdi_elan_disconnect(struct usb_interface *interface) | ||
2730 | { | ||
2731 | struct usb_ftdi *ftdi = usb_get_intfdata(interface); | ||
2732 | ftdi->disconnected += 1; | ||
2733 | if (ftdi->class) { | ||
2734 | int minor = interface->minor; | ||
2735 | struct usb_class_driver *class = ftdi->class; | ||
2736 | usb_set_intfdata(interface, NULL); | ||
2737 | usb_deregister_dev(interface, class); | ||
2738 | dev_info(&ftdi->udev->dev, "USB FTDI U132 jtag interface on min" | ||
2739 | "or %d now disconnected\n", minor); | ||
2740 | } else { | ||
2741 | ftdi_status_cancel_work(ftdi); | ||
2742 | ftdi_command_cancel_work(ftdi); | ||
2743 | ftdi_response_cancel_work(ftdi); | ||
2744 | ftdi_elan_abandon_completions(ftdi); | ||
2745 | ftdi_elan_abandon_targets(ftdi); | ||
2746 | if (ftdi->registered) { | ||
2747 | platform_device_unregister(&ftdi->platform_dev); | ||
2748 | ftdi->synchronized = 0; | ||
2749 | ftdi->enumerated = 0; | ||
2750 | ftdi->registered = 0; | ||
2751 | } | ||
2752 | flush_workqueue(status_queue); | ||
2753 | flush_workqueue(command_queue); | ||
2754 | flush_workqueue(respond_queue); | ||
2755 | ftdi->disconnected += 1; | ||
2756 | usb_set_intfdata(interface, NULL); | ||
2757 | dev_info(&ftdi->udev->dev, "USB FTDI U132 host controller inter" | ||
2758 | "face now disconnected\n"); | ||
2759 | } | ||
2760 | ftdi_elan_put_kref(ftdi); | ||
2761 | } | ||
2762 | |||
2763 | static struct usb_driver ftdi_elan_driver = { | ||
2764 | .name = "ftdi-elan", | ||
2765 | .probe = ftdi_elan_probe, | ||
2766 | .disconnect = ftdi_elan_disconnect, | ||
2767 | .id_table = ftdi_elan_table, | ||
2768 | }; | ||
2769 | static int __init ftdi_elan_init(void) | ||
2770 | { | ||
2771 | int result; | ||
2772 | printk(KERN_INFO "driver %s built at %s on %s\n", ftdi_elan_driver.name, | ||
2773 | __TIME__, __DATE__); | ||
2774 | init_MUTEX(&ftdi_module_lock); | ||
2775 | INIT_LIST_HEAD(&ftdi_static_list); | ||
2776 | status_queue = create_singlethread_workqueue("ftdi-status-control"); | ||
2777 | command_queue = create_singlethread_workqueue("ftdi-command-engine"); | ||
2778 | respond_queue = create_singlethread_workqueue("ftdi-respond-engine"); | ||
2779 | result = usb_register(&ftdi_elan_driver); | ||
2780 | if (result) | ||
2781 | printk(KERN_ERR "usb_register failed. Error number %d\n", | ||
2782 | result); | ||
2783 | return result; | ||
2784 | } | ||
2785 | |||
2786 | static void __exit ftdi_elan_exit(void) | ||
2787 | { | ||
2788 | struct usb_ftdi *ftdi; | ||
2789 | struct usb_ftdi *temp; | ||
2790 | usb_deregister(&ftdi_elan_driver); | ||
2791 | printk(KERN_INFO "ftdi_u132 driver deregistered\n"); | ||
2792 | list_for_each_entry_safe(ftdi, temp, &ftdi_static_list, ftdi_list) { | ||
2793 | ftdi_status_cancel_work(ftdi); | ||
2794 | ftdi_command_cancel_work(ftdi); | ||
2795 | ftdi_response_cancel_work(ftdi); | ||
2796 | } flush_workqueue(status_queue); | ||
2797 | destroy_workqueue(status_queue); | ||
2798 | status_queue = NULL; | ||
2799 | flush_workqueue(command_queue); | ||
2800 | destroy_workqueue(command_queue); | ||
2801 | command_queue = NULL; | ||
2802 | flush_workqueue(respond_queue); | ||
2803 | destroy_workqueue(respond_queue); | ||
2804 | respond_queue = NULL; | ||
2805 | } | ||
2806 | |||
2807 | |||
2808 | module_init(ftdi_elan_init); | ||
2809 | module_exit(ftdi_elan_exit); | ||
diff --git a/drivers/usb/misc/idmouse.c b/drivers/usb/misc/idmouse.c index fcd69c52aea9..8e6e195a22ba 100644 --- a/drivers/usb/misc/idmouse.c +++ b/drivers/usb/misc/idmouse.c | |||
@@ -98,7 +98,7 @@ static int idmouse_probe(struct usb_interface *interface, | |||
98 | static void idmouse_disconnect(struct usb_interface *interface); | 98 | static void idmouse_disconnect(struct usb_interface *interface); |
99 | 99 | ||
100 | /* file operation pointers */ | 100 | /* file operation pointers */ |
101 | static struct file_operations idmouse_fops = { | 101 | static const struct file_operations idmouse_fops = { |
102 | .owner = THIS_MODULE, | 102 | .owner = THIS_MODULE, |
103 | .read = idmouse_read, | 103 | .read = idmouse_read, |
104 | .open = idmouse_open, | 104 | .open = idmouse_open, |
diff --git a/drivers/usb/misc/ldusb.c b/drivers/usb/misc/ldusb.c index f30ab1fbb3c8..10b640339d8d 100644 --- a/drivers/usb/misc/ldusb.c +++ b/drivers/usb/misc/ldusb.c | |||
@@ -589,7 +589,7 @@ exit: | |||
589 | } | 589 | } |
590 | 590 | ||
591 | /* file operations needed when we register this driver */ | 591 | /* file operations needed when we register this driver */ |
592 | static struct file_operations ld_usb_fops = { | 592 | static const struct file_operations ld_usb_fops = { |
593 | .owner = THIS_MODULE, | 593 | .owner = THIS_MODULE, |
594 | .read = ld_usb_read, | 594 | .read = ld_usb_read, |
595 | .write = ld_usb_write, | 595 | .write = ld_usb_write, |
@@ -657,15 +657,11 @@ static int ld_usb_probe(struct usb_interface *intf, const struct usb_device_id * | |||
657 | for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) { | 657 | for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) { |
658 | endpoint = &iface_desc->endpoint[i].desc; | 658 | endpoint = &iface_desc->endpoint[i].desc; |
659 | 659 | ||
660 | if (((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN) && | 660 | if (usb_endpoint_is_int_in(endpoint)) |
661 | ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT)) { | ||
662 | dev->interrupt_in_endpoint = endpoint; | 661 | dev->interrupt_in_endpoint = endpoint; |
663 | } | ||
664 | 662 | ||
665 | if (((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_OUT) && | 663 | if (usb_endpoint_is_int_out(endpoint)) |
666 | ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT)) { | ||
667 | dev->interrupt_out_endpoint = endpoint; | 664 | dev->interrupt_out_endpoint = endpoint; |
668 | } | ||
669 | } | 665 | } |
670 | if (dev->interrupt_in_endpoint == NULL) { | 666 | if (dev->interrupt_in_endpoint == NULL) { |
671 | dev_err(&intf->dev, "Interrupt in endpoint not found\n"); | 667 | dev_err(&intf->dev, "Interrupt in endpoint not found\n"); |
diff --git a/drivers/usb/misc/legousbtower.c b/drivers/usb/misc/legousbtower.c index 7699d970e680..77c36e63c7bf 100644 --- a/drivers/usb/misc/legousbtower.c +++ b/drivers/usb/misc/legousbtower.c | |||
@@ -259,7 +259,7 @@ static void tower_disconnect (struct usb_interface *interface); | |||
259 | static DEFINE_MUTEX (disconnect_mutex); | 259 | static DEFINE_MUTEX (disconnect_mutex); |
260 | 260 | ||
261 | /* file operations needed when we register this driver */ | 261 | /* file operations needed when we register this driver */ |
262 | static struct file_operations tower_fops = { | 262 | static const struct file_operations tower_fops = { |
263 | .owner = THIS_MODULE, | 263 | .owner = THIS_MODULE, |
264 | .read = tower_read, | 264 | .read = tower_read, |
265 | .write = tower_write, | 265 | .write = tower_write, |
diff --git a/drivers/usb/misc/phidget.c b/drivers/usb/misc/phidget.c new file mode 100644 index 000000000000..735ed33f4f7f --- /dev/null +++ b/drivers/usb/misc/phidget.c | |||
@@ -0,0 +1,43 @@ | |||
1 | /* | ||
2 | * USB Phidgets class | ||
3 | * | ||
4 | * Copyright (C) 2006 Sean Young <sean@mess.org> | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License as published by | ||
8 | * the Free Software Foundation; either version 2 of the License, or | ||
9 | * (at your option) any later version. | ||
10 | */ | ||
11 | |||
12 | #include <linux/kernel.h> | ||
13 | #include <linux/module.h> | ||
14 | #include <linux/init.h> | ||
15 | #include <linux/err.h> | ||
16 | #include <linux/device.h> | ||
17 | |||
18 | struct class *phidget_class; | ||
19 | |||
20 | static int __init init_phidget(void) | ||
21 | { | ||
22 | phidget_class = class_create(THIS_MODULE, "phidget"); | ||
23 | |||
24 | if (IS_ERR(phidget_class)) | ||
25 | return PTR_ERR(phidget_class); | ||
26 | |||
27 | return 0; | ||
28 | } | ||
29 | |||
30 | static void __exit cleanup_phidget(void) | ||
31 | { | ||
32 | class_destroy(phidget_class); | ||
33 | } | ||
34 | |||
35 | EXPORT_SYMBOL_GPL(phidget_class); | ||
36 | |||
37 | module_init(init_phidget); | ||
38 | module_exit(cleanup_phidget); | ||
39 | |||
40 | MODULE_LICENSE("GPL"); | ||
41 | MODULE_AUTHOR("Sean Young <sean@mess.org>"); | ||
42 | MODULE_DESCRIPTION("Container module for phidget class"); | ||
43 | |||
diff --git a/drivers/usb/misc/phidget.h b/drivers/usb/misc/phidget.h new file mode 100644 index 000000000000..c4011907d431 --- /dev/null +++ b/drivers/usb/misc/phidget.h | |||
@@ -0,0 +1,12 @@ | |||
1 | /* | ||
2 | * USB Phidgets class | ||
3 | * | ||
4 | * Copyright (C) 2006 Sean Young <sean@mess.org> | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License as published by | ||
8 | * the Free Software Foundation; either version 2 of the License, or | ||
9 | * (at your option) any later version. | ||
10 | */ | ||
11 | |||
12 | extern struct class *phidget_class; | ||
diff --git a/drivers/usb/misc/phidgetkit.c b/drivers/usb/misc/phidgetkit.c index bfbbbfbb92bc..9a8d137d39f9 100644 --- a/drivers/usb/misc/phidgetkit.c +++ b/drivers/usb/misc/phidgetkit.c | |||
@@ -20,6 +20,8 @@ | |||
20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
21 | #include <linux/usb.h> | 21 | #include <linux/usb.h> |
22 | 22 | ||
23 | #include "phidget.h" | ||
24 | |||
23 | #define DRIVER_AUTHOR "Sean Young <sean@mess.org>" | 25 | #define DRIVER_AUTHOR "Sean Young <sean@mess.org>" |
24 | #define DRIVER_DESC "USB PhidgetInterfaceKit Driver" | 26 | #define DRIVER_DESC "USB PhidgetInterfaceKit Driver" |
25 | 27 | ||
@@ -57,11 +59,15 @@ ifkit(8, 8, 4, 0); | |||
57 | ifkit(0, 8, 8, 1); | 59 | ifkit(0, 8, 8, 1); |
58 | ifkit(0, 16, 16, 0); | 60 | ifkit(0, 16, 16, 0); |
59 | 61 | ||
62 | static unsigned long device_no; | ||
63 | |||
60 | struct interfacekit { | 64 | struct interfacekit { |
61 | struct usb_device *udev; | 65 | struct usb_device *udev; |
62 | struct usb_interface *intf; | 66 | struct usb_interface *intf; |
63 | struct driver_interfacekit *ifkit; | 67 | struct driver_interfacekit *ifkit; |
68 | struct device *dev; | ||
64 | unsigned long outputs; | 69 | unsigned long outputs; |
70 | int dev_no; | ||
65 | u8 inputs[MAX_INTERFACES]; | 71 | u8 inputs[MAX_INTERFACES]; |
66 | u16 sensors[MAX_INTERFACES]; | 72 | u16 sensors[MAX_INTERFACES]; |
67 | u8 lcd_files_on; | 73 | u8 lcd_files_on; |
@@ -180,21 +186,24 @@ exit: | |||
180 | } | 186 | } |
181 | 187 | ||
182 | #define set_lcd_line(number) \ | 188 | #define set_lcd_line(number) \ |
183 | static ssize_t lcd_line_##number(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \ | 189 | static ssize_t lcd_line_##number(struct device *dev, \ |
184 | { \ | 190 | struct device_attribute *attr, \ |
185 | struct usb_interface *intf = to_usb_interface(dev); \ | 191 | const char *buf, size_t count) \ |
186 | struct interfacekit *kit = usb_get_intfdata(intf); \ | 192 | { \ |
187 | change_string(kit, buf, number - 1); \ | 193 | struct interfacekit *kit = dev_get_drvdata(dev); \ |
188 | return count; \ | 194 | change_string(kit, buf, number - 1); \ |
189 | } \ | 195 | return count; \ |
190 | static DEVICE_ATTR(lcd_line_##number, S_IWUGO, NULL, lcd_line_##number); | 196 | } |
197 | |||
198 | #define lcd_line_attr(number) \ | ||
199 | __ATTR(lcd_line_##number, S_IWUGO, NULL, lcd_line_##number) | ||
200 | |||
191 | set_lcd_line(1); | 201 | set_lcd_line(1); |
192 | set_lcd_line(2); | 202 | set_lcd_line(2); |
193 | 203 | ||
194 | static ssize_t set_backlight(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) | 204 | static ssize_t set_backlight(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
195 | { | 205 | { |
196 | struct usb_interface *intf = to_usb_interface(dev); | 206 | struct interfacekit *kit = dev_get_drvdata(dev); |
197 | struct interfacekit *kit = usb_get_intfdata(intf); | ||
198 | int enabled; | 207 | int enabled; |
199 | unsigned char *buffer; | 208 | unsigned char *buffer; |
200 | int retval = -ENOMEM; | 209 | int retval = -ENOMEM; |
@@ -226,23 +235,30 @@ exit: | |||
226 | kfree(buffer); | 235 | kfree(buffer); |
227 | return retval; | 236 | return retval; |
228 | } | 237 | } |
229 | static DEVICE_ATTR(backlight, S_IWUGO, NULL, set_backlight); | 238 | |
239 | static struct device_attribute dev_lcd_line_attrs[] = { | ||
240 | lcd_line_attr(1), | ||
241 | lcd_line_attr(2), | ||
242 | __ATTR(backlight, S_IWUGO, NULL, set_backlight) | ||
243 | }; | ||
230 | 244 | ||
231 | static void remove_lcd_files(struct interfacekit *kit) | 245 | static void remove_lcd_files(struct interfacekit *kit) |
232 | { | 246 | { |
247 | int i; | ||
248 | |||
233 | if (kit->lcd_files_on) { | 249 | if (kit->lcd_files_on) { |
234 | dev_dbg(&kit->udev->dev, "Removing lcd files\n"); | 250 | dev_dbg(&kit->udev->dev, "Removing lcd files\n"); |
235 | device_remove_file(&kit->intf->dev, &dev_attr_lcd_line_1); | 251 | |
236 | device_remove_file(&kit->intf->dev, &dev_attr_lcd_line_2); | 252 | for (i=0; i<ARRAY_SIZE(dev_lcd_line_attrs); i++) |
237 | device_remove_file(&kit->intf->dev, &dev_attr_backlight); | 253 | device_remove_file(kit->dev, &dev_lcd_line_attrs[i]); |
238 | } | 254 | } |
239 | } | 255 | } |
240 | 256 | ||
241 | static ssize_t enable_lcd_files(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) | 257 | static ssize_t enable_lcd_files(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
242 | { | 258 | { |
243 | struct usb_interface *intf = to_usb_interface(dev); | 259 | struct interfacekit *kit = dev_get_drvdata(dev); |
244 | struct interfacekit *kit = usb_get_intfdata(intf); | ||
245 | int enable; | 260 | int enable; |
261 | int i, rc; | ||
246 | 262 | ||
247 | if (kit->ifkit->has_lcd == 0) | 263 | if (kit->ifkit->has_lcd == 0) |
248 | return -ENODEV; | 264 | return -ENODEV; |
@@ -253,9 +269,12 @@ static ssize_t enable_lcd_files(struct device *dev, struct device_attribute *att | |||
253 | if (enable) { | 269 | if (enable) { |
254 | if (!kit->lcd_files_on) { | 270 | if (!kit->lcd_files_on) { |
255 | dev_dbg(&kit->udev->dev, "Adding lcd files\n"); | 271 | dev_dbg(&kit->udev->dev, "Adding lcd files\n"); |
256 | device_create_file(&kit->intf->dev, &dev_attr_lcd_line_1); | 272 | for (i=0; i<ARRAY_SIZE(dev_lcd_line_attrs); i++) { |
257 | device_create_file(&kit->intf->dev, &dev_attr_lcd_line_2); | 273 | rc = device_create_file(kit->dev, |
258 | device_create_file(&kit->intf->dev, &dev_attr_backlight); | 274 | &dev_lcd_line_attrs[i]); |
275 | if (rc) | ||
276 | goto out; | ||
277 | } | ||
259 | kit->lcd_files_on = 1; | 278 | kit->lcd_files_on = 1; |
260 | } | 279 | } |
261 | } else { | 280 | } else { |
@@ -266,7 +285,13 @@ static ssize_t enable_lcd_files(struct device *dev, struct device_attribute *att | |||
266 | } | 285 | } |
267 | 286 | ||
268 | return count; | 287 | return count; |
288 | out: | ||
289 | while (i-- > 0) | ||
290 | device_remove_file(kit->dev, &dev_lcd_line_attrs[i]); | ||
291 | |||
292 | return rc; | ||
269 | } | 293 | } |
294 | |||
270 | static DEVICE_ATTR(lcd, S_IWUGO, NULL, enable_lcd_files); | 295 | static DEVICE_ATTR(lcd, S_IWUGO, NULL, enable_lcd_files); |
271 | 296 | ||
272 | static void interfacekit_irq(struct urb *urb, struct pt_regs *regs) | 297 | static void interfacekit_irq(struct urb *urb, struct pt_regs *regs) |
@@ -362,24 +387,24 @@ static void do_notify(void *data) | |||
362 | for (i=0; i<kit->ifkit->inputs; i++) { | 387 | for (i=0; i<kit->ifkit->inputs; i++) { |
363 | if (test_and_clear_bit(i, &kit->input_events)) { | 388 | if (test_and_clear_bit(i, &kit->input_events)) { |
364 | sprintf(sysfs_file, "input%d", i + 1); | 389 | sprintf(sysfs_file, "input%d", i + 1); |
365 | sysfs_notify(&kit->intf->dev.kobj, NULL, sysfs_file); | 390 | sysfs_notify(&kit->dev->kobj, NULL, sysfs_file); |
366 | } | 391 | } |
367 | } | 392 | } |
368 | 393 | ||
369 | for (i=0; i<kit->ifkit->sensors; i++) { | 394 | for (i=0; i<kit->ifkit->sensors; i++) { |
370 | if (test_and_clear_bit(i, &kit->sensor_events)) { | 395 | if (test_and_clear_bit(i, &kit->sensor_events)) { |
371 | sprintf(sysfs_file, "sensor%d", i + 1); | 396 | sprintf(sysfs_file, "sensor%d", i + 1); |
372 | sysfs_notify(&kit->intf->dev.kobj, NULL, sysfs_file); | 397 | sysfs_notify(&kit->dev->kobj, NULL, sysfs_file); |
373 | } | 398 | } |
374 | } | 399 | } |
375 | } | 400 | } |
376 | 401 | ||
377 | #define show_set_output(value) \ | 402 | #define show_set_output(value) \ |
378 | static ssize_t set_output##value(struct device *dev, struct device_attribute *attr, const char *buf, \ | 403 | static ssize_t set_output##value(struct device *dev, \ |
379 | size_t count) \ | 404 | struct device_attribute *attr, \ |
405 | const char *buf, size_t count) \ | ||
380 | { \ | 406 | { \ |
381 | struct usb_interface *intf = to_usb_interface(dev); \ | 407 | struct interfacekit *kit = dev_get_drvdata(dev); \ |
382 | struct interfacekit *kit = usb_get_intfdata(intf); \ | ||
383 | int enabled; \ | 408 | int enabled; \ |
384 | int retval; \ | 409 | int retval; \ |
385 | \ | 410 | \ |
@@ -391,15 +416,19 @@ static ssize_t set_output##value(struct device *dev, struct device_attribute *at | |||
391 | return retval ? retval : count; \ | 416 | return retval ? retval : count; \ |
392 | } \ | 417 | } \ |
393 | \ | 418 | \ |
394 | static ssize_t show_output##value(struct device *dev, struct device_attribute *attr, char *buf) \ | 419 | static ssize_t show_output##value(struct device *dev, \ |
420 | struct device_attribute *attr, \ | ||
421 | char *buf) \ | ||
395 | { \ | 422 | { \ |
396 | struct usb_interface *intf = to_usb_interface(dev); \ | 423 | struct interfacekit *kit = dev_get_drvdata(dev); \ |
397 | struct interfacekit *kit = usb_get_intfdata(intf); \ | ||
398 | \ | 424 | \ |
399 | return sprintf(buf, "%d\n", !!test_bit(value - 1, &kit->outputs));\ | 425 | return sprintf(buf, "%d\n", !!test_bit(value - 1, &kit->outputs));\ |
400 | } \ | 426 | } |
401 | static DEVICE_ATTR(output##value, S_IWUGO | S_IRUGO, \ | 427 | |
402 | show_output##value, set_output##value); | 428 | #define output_attr(value) \ |
429 | __ATTR(output##value, S_IWUGO | S_IRUGO, \ | ||
430 | show_output##value, set_output##value) | ||
431 | |||
403 | show_set_output(1); | 432 | show_set_output(1); |
404 | show_set_output(2); | 433 | show_set_output(2); |
405 | show_set_output(3); | 434 | show_set_output(3); |
@@ -417,15 +446,24 @@ show_set_output(14); | |||
417 | show_set_output(15); | 446 | show_set_output(15); |
418 | show_set_output(16); | 447 | show_set_output(16); |
419 | 448 | ||
449 | static struct device_attribute dev_output_attrs[] = { | ||
450 | output_attr(1), output_attr(2), output_attr(3), output_attr(4), | ||
451 | output_attr(5), output_attr(6), output_attr(7), output_attr(8), | ||
452 | output_attr(9), output_attr(10), output_attr(11), output_attr(12), | ||
453 | output_attr(13), output_attr(14), output_attr(15), output_attr(16) | ||
454 | }; | ||
455 | |||
420 | #define show_input(value) \ | 456 | #define show_input(value) \ |
421 | static ssize_t show_input##value(struct device *dev, struct device_attribute *attr, char *buf) \ | 457 | static ssize_t show_input##value(struct device *dev, \ |
458 | struct device_attribute *attr, char *buf) \ | ||
422 | { \ | 459 | { \ |
423 | struct usb_interface *intf = to_usb_interface(dev); \ | 460 | struct interfacekit *kit = dev_get_drvdata(dev); \ |
424 | struct interfacekit *kit = usb_get_intfdata(intf); \ | ||
425 | \ | 461 | \ |
426 | return sprintf(buf, "%d\n", (int)kit->inputs[value - 1]); \ | 462 | return sprintf(buf, "%d\n", (int)kit->inputs[value - 1]); \ |
427 | } \ | 463 | } |
428 | static DEVICE_ATTR(input##value, S_IRUGO, show_input##value, NULL); | 464 | |
465 | #define input_attr(value) \ | ||
466 | __ATTR(input##value, S_IRUGO, show_input##value, NULL) | ||
429 | 467 | ||
430 | show_input(1); | 468 | show_input(1); |
431 | show_input(2); | 469 | show_input(2); |
@@ -444,15 +482,25 @@ show_input(14); | |||
444 | show_input(15); | 482 | show_input(15); |
445 | show_input(16); | 483 | show_input(16); |
446 | 484 | ||
485 | static struct device_attribute dev_input_attrs[] = { | ||
486 | input_attr(1), input_attr(2), input_attr(3), input_attr(4), | ||
487 | input_attr(5), input_attr(6), input_attr(7), input_attr(8), | ||
488 | input_attr(9), input_attr(10), input_attr(11), input_attr(12), | ||
489 | input_attr(13), input_attr(14), input_attr(15), input_attr(16) | ||
490 | }; | ||
491 | |||
447 | #define show_sensor(value) \ | 492 | #define show_sensor(value) \ |
448 | static ssize_t show_sensor##value(struct device *dev, struct device_attribute *attr, char *buf) \ | 493 | static ssize_t show_sensor##value(struct device *dev, \ |
494 | struct device_attribute *attr, \ | ||
495 | char *buf) \ | ||
449 | { \ | 496 | { \ |
450 | struct usb_interface *intf = to_usb_interface(dev); \ | 497 | struct interfacekit *kit = dev_get_drvdata(dev); \ |
451 | struct interfacekit *kit = usb_get_intfdata(intf); \ | ||
452 | \ | 498 | \ |
453 | return sprintf(buf, "%d\n", (int)kit->sensors[value - 1]); \ | 499 | return sprintf(buf, "%d\n", (int)kit->sensors[value - 1]); \ |
454 | } \ | 500 | } |
455 | static DEVICE_ATTR(sensor##value, S_IRUGO, show_sensor##value, NULL); | 501 | |
502 | #define sensor_attr(value) \ | ||
503 | __ATTR(sensor##value, S_IRUGO, show_sensor##value, NULL) | ||
456 | 504 | ||
457 | show_sensor(1); | 505 | show_sensor(1); |
458 | show_sensor(2); | 506 | show_sensor(2); |
@@ -463,6 +511,11 @@ show_sensor(6); | |||
463 | show_sensor(7); | 511 | show_sensor(7); |
464 | show_sensor(8); | 512 | show_sensor(8); |
465 | 513 | ||
514 | static struct device_attribute dev_sensor_attrs[] = { | ||
515 | sensor_attr(1), sensor_attr(2), sensor_attr(3), sensor_attr(4), | ||
516 | sensor_attr(5), sensor_attr(6), sensor_attr(7), sensor_attr(8) | ||
517 | }; | ||
518 | |||
466 | static int interfacekit_probe(struct usb_interface *intf, const struct usb_device_id *id) | 519 | static int interfacekit_probe(struct usb_interface *intf, const struct usb_device_id *id) |
467 | { | 520 | { |
468 | struct usb_device *dev = interface_to_usbdev(intf); | 521 | struct usb_device *dev = interface_to_usbdev(intf); |
@@ -471,6 +524,7 @@ static int interfacekit_probe(struct usb_interface *intf, const struct usb_devic | |||
471 | struct interfacekit *kit; | 524 | struct interfacekit *kit; |
472 | struct driver_interfacekit *ifkit; | 525 | struct driver_interfacekit *ifkit; |
473 | int pipe, maxp, rc = -ENOMEM; | 526 | int pipe, maxp, rc = -ENOMEM; |
527 | int bit, value, i; | ||
474 | 528 | ||
475 | ifkit = (struct driver_interfacekit *)id->driver_info; | 529 | ifkit = (struct driver_interfacekit *)id->driver_info; |
476 | if (!ifkit) | 530 | if (!ifkit) |
@@ -493,6 +547,7 @@ static int interfacekit_probe(struct usb_interface *intf, const struct usb_devic | |||
493 | if (!kit) | 547 | if (!kit) |
494 | goto out; | 548 | goto out; |
495 | 549 | ||
550 | kit->dev_no = -1; | ||
496 | kit->ifkit = ifkit; | 551 | kit->ifkit = ifkit; |
497 | kit->data = usb_buffer_alloc(dev, URB_INT_SIZE, SLAB_ATOMIC, &kit->data_dma); | 552 | kit->data = usb_buffer_alloc(dev, URB_INT_SIZE, SLAB_ATOMIC, &kit->data_dma); |
498 | if (!kit->data) | 553 | if (!kit->data) |
@@ -513,85 +568,80 @@ static int interfacekit_probe(struct usb_interface *intf, const struct usb_devic | |||
513 | 568 | ||
514 | usb_set_intfdata(intf, kit); | 569 | usb_set_intfdata(intf, kit); |
515 | 570 | ||
571 | do { | ||
572 | bit = find_first_zero_bit(&device_no, sizeof(device_no)); | ||
573 | value = test_and_set_bit(bit, &device_no); | ||
574 | } while(value); | ||
575 | kit->dev_no = bit; | ||
576 | |||
577 | kit->dev = device_create(phidget_class, &kit->udev->dev, 0, | ||
578 | "interfacekit%d", kit->dev_no); | ||
579 | if (IS_ERR(kit->dev)) { | ||
580 | rc = PTR_ERR(kit->dev); | ||
581 | kit->dev = NULL; | ||
582 | goto out; | ||
583 | } | ||
584 | dev_set_drvdata(kit->dev, kit); | ||
585 | |||
516 | if (usb_submit_urb(kit->irq, GFP_KERNEL)) { | 586 | if (usb_submit_urb(kit->irq, GFP_KERNEL)) { |
517 | rc = -EIO; | 587 | rc = -EIO; |
518 | goto out; | 588 | goto out; |
519 | } | 589 | } |
520 | 590 | ||
521 | if (ifkit->outputs >= 4) { | 591 | for (i=0; i<ifkit->outputs; i++ ) { |
522 | device_create_file(&intf->dev, &dev_attr_output1); | 592 | rc = device_create_file(kit->dev, &dev_output_attrs[i]); |
523 | device_create_file(&intf->dev, &dev_attr_output2); | 593 | if (rc) |
524 | device_create_file(&intf->dev, &dev_attr_output3); | 594 | goto out2; |
525 | device_create_file(&intf->dev, &dev_attr_output4); | ||
526 | } | ||
527 | if (ifkit->outputs >= 8) { | ||
528 | device_create_file(&intf->dev, &dev_attr_output5); | ||
529 | device_create_file(&intf->dev, &dev_attr_output6); | ||
530 | device_create_file(&intf->dev, &dev_attr_output7); | ||
531 | device_create_file(&intf->dev, &dev_attr_output8); | ||
532 | } | ||
533 | if (ifkit->outputs == 16) { | ||
534 | device_create_file(&intf->dev, &dev_attr_output9); | ||
535 | device_create_file(&intf->dev, &dev_attr_output10); | ||
536 | device_create_file(&intf->dev, &dev_attr_output11); | ||
537 | device_create_file(&intf->dev, &dev_attr_output12); | ||
538 | device_create_file(&intf->dev, &dev_attr_output13); | ||
539 | device_create_file(&intf->dev, &dev_attr_output14); | ||
540 | device_create_file(&intf->dev, &dev_attr_output15); | ||
541 | device_create_file(&intf->dev, &dev_attr_output16); | ||
542 | } | 595 | } |
543 | 596 | ||
544 | if (ifkit->inputs >= 4) { | 597 | for (i=0; i<ifkit->inputs; i++ ) { |
545 | device_create_file(&intf->dev, &dev_attr_input1); | 598 | rc = device_create_file(kit->dev, &dev_input_attrs[i]); |
546 | device_create_file(&intf->dev, &dev_attr_input2); | 599 | if (rc) |
547 | device_create_file(&intf->dev, &dev_attr_input3); | 600 | goto out3; |
548 | device_create_file(&intf->dev, &dev_attr_input4); | ||
549 | } | ||
550 | if (ifkit->inputs >= 8) { | ||
551 | device_create_file(&intf->dev, &dev_attr_input5); | ||
552 | device_create_file(&intf->dev, &dev_attr_input6); | ||
553 | device_create_file(&intf->dev, &dev_attr_input7); | ||
554 | device_create_file(&intf->dev, &dev_attr_input8); | ||
555 | } | ||
556 | if (ifkit->inputs == 16) { | ||
557 | device_create_file(&intf->dev, &dev_attr_input9); | ||
558 | device_create_file(&intf->dev, &dev_attr_input10); | ||
559 | device_create_file(&intf->dev, &dev_attr_input11); | ||
560 | device_create_file(&intf->dev, &dev_attr_input12); | ||
561 | device_create_file(&intf->dev, &dev_attr_input13); | ||
562 | device_create_file(&intf->dev, &dev_attr_input14); | ||
563 | device_create_file(&intf->dev, &dev_attr_input15); | ||
564 | device_create_file(&intf->dev, &dev_attr_input16); | ||
565 | } | 601 | } |
566 | 602 | ||
567 | if (ifkit->sensors >= 4) { | 603 | for (i=0; i<ifkit->sensors; i++ ) { |
568 | device_create_file(&intf->dev, &dev_attr_sensor1); | 604 | rc = device_create_file(kit->dev, &dev_sensor_attrs[i]); |
569 | device_create_file(&intf->dev, &dev_attr_sensor2); | 605 | if (rc) |
570 | device_create_file(&intf->dev, &dev_attr_sensor3); | 606 | goto out4; |
571 | device_create_file(&intf->dev, &dev_attr_sensor4); | ||
572 | } | ||
573 | if (ifkit->sensors >= 7) { | ||
574 | device_create_file(&intf->dev, &dev_attr_sensor5); | ||
575 | device_create_file(&intf->dev, &dev_attr_sensor6); | ||
576 | device_create_file(&intf->dev, &dev_attr_sensor7); | ||
577 | } | 607 | } |
578 | if (ifkit->sensors == 8) | ||
579 | device_create_file(&intf->dev, &dev_attr_sensor8); | ||
580 | 608 | ||
581 | if (ifkit->has_lcd) | 609 | if (ifkit->has_lcd) { |
582 | device_create_file(&intf->dev, &dev_attr_lcd); | 610 | rc = device_create_file(kit->dev, &dev_attr_lcd); |
611 | if (rc) | ||
612 | goto out4; | ||
613 | |||
614 | } | ||
583 | 615 | ||
584 | dev_info(&intf->dev, "USB PhidgetInterfaceKit %d/%d/%d attached\n", | 616 | dev_info(&intf->dev, "USB PhidgetInterfaceKit %d/%d/%d attached\n", |
585 | ifkit->sensors, ifkit->inputs, ifkit->outputs); | 617 | ifkit->sensors, ifkit->inputs, ifkit->outputs); |
586 | 618 | ||
587 | return 0; | 619 | return 0; |
588 | 620 | ||
621 | out4: | ||
622 | while (i-- > 0) | ||
623 | device_remove_file(kit->dev, &dev_sensor_attrs[i]); | ||
624 | |||
625 | i = ifkit->inputs; | ||
626 | out3: | ||
627 | while (i-- > 0) | ||
628 | device_remove_file(kit->dev, &dev_input_attrs[i]); | ||
629 | |||
630 | i = ifkit->outputs; | ||
631 | out2: | ||
632 | while (i-- > 0) | ||
633 | device_remove_file(kit->dev, &dev_output_attrs[i]); | ||
589 | out: | 634 | out: |
590 | if (kit) { | 635 | if (kit) { |
591 | if (kit->irq) | 636 | if (kit->irq) |
592 | usb_free_urb(kit->irq); | 637 | usb_free_urb(kit->irq); |
593 | if (kit->data) | 638 | if (kit->data) |
594 | usb_buffer_free(dev, URB_INT_SIZE, kit->data, kit->data_dma); | 639 | usb_buffer_free(dev, URB_INT_SIZE, kit->data, kit->data_dma); |
640 | if (kit->dev) | ||
641 | device_unregister(kit->dev); | ||
642 | if (kit->dev_no >= 0) | ||
643 | clear_bit(kit->dev_no, &device_no); | ||
644 | |||
595 | kfree(kit); | 645 | kfree(kit); |
596 | } | 646 | } |
597 | 647 | ||
@@ -601,6 +651,7 @@ out: | |||
601 | static void interfacekit_disconnect(struct usb_interface *interface) | 651 | static void interfacekit_disconnect(struct usb_interface *interface) |
602 | { | 652 | { |
603 | struct interfacekit *kit; | 653 | struct interfacekit *kit; |
654 | int i; | ||
604 | 655 | ||
605 | kit = usb_get_intfdata(interface); | 656 | kit = usb_get_intfdata(interface); |
606 | usb_set_intfdata(interface, NULL); | 657 | usb_set_intfdata(interface, NULL); |
@@ -613,73 +664,28 @@ static void interfacekit_disconnect(struct usb_interface *interface) | |||
613 | 664 | ||
614 | cancel_delayed_work(&kit->do_notify); | 665 | cancel_delayed_work(&kit->do_notify); |
615 | 666 | ||
616 | if (kit->ifkit->outputs >= 4) { | 667 | for (i=0; i<kit->ifkit->outputs; i++) |
617 | device_remove_file(&interface->dev, &dev_attr_output1); | 668 | device_remove_file(kit->dev, &dev_output_attrs[i]); |
618 | device_remove_file(&interface->dev, &dev_attr_output2); | ||
619 | device_remove_file(&interface->dev, &dev_attr_output3); | ||
620 | device_remove_file(&interface->dev, &dev_attr_output4); | ||
621 | } | ||
622 | if (kit->ifkit->outputs >= 8) { | ||
623 | device_remove_file(&interface->dev, &dev_attr_output5); | ||
624 | device_remove_file(&interface->dev, &dev_attr_output6); | ||
625 | device_remove_file(&interface->dev, &dev_attr_output7); | ||
626 | device_remove_file(&interface->dev, &dev_attr_output8); | ||
627 | } | ||
628 | if (kit->ifkit->outputs == 16) { | ||
629 | device_remove_file(&interface->dev, &dev_attr_output9); | ||
630 | device_remove_file(&interface->dev, &dev_attr_output10); | ||
631 | device_remove_file(&interface->dev, &dev_attr_output11); | ||
632 | device_remove_file(&interface->dev, &dev_attr_output12); | ||
633 | device_remove_file(&interface->dev, &dev_attr_output13); | ||
634 | device_remove_file(&interface->dev, &dev_attr_output14); | ||
635 | device_remove_file(&interface->dev, &dev_attr_output15); | ||
636 | device_remove_file(&interface->dev, &dev_attr_output16); | ||
637 | } | ||
638 | 669 | ||
639 | if (kit->ifkit->inputs >= 4) { | 670 | for (i=0; i<kit->ifkit->inputs; i++) |
640 | device_remove_file(&interface->dev, &dev_attr_input1); | 671 | device_remove_file(kit->dev, &dev_input_attrs[i]); |
641 | device_remove_file(&interface->dev, &dev_attr_input2); | ||
642 | device_remove_file(&interface->dev, &dev_attr_input3); | ||
643 | device_remove_file(&interface->dev, &dev_attr_input4); | ||
644 | } | ||
645 | if (kit->ifkit->inputs >= 8) { | ||
646 | device_remove_file(&interface->dev, &dev_attr_input5); | ||
647 | device_remove_file(&interface->dev, &dev_attr_input6); | ||
648 | device_remove_file(&interface->dev, &dev_attr_input7); | ||
649 | device_remove_file(&interface->dev, &dev_attr_input8); | ||
650 | } | ||
651 | if (kit->ifkit->inputs == 16) { | ||
652 | device_remove_file(&interface->dev, &dev_attr_input9); | ||
653 | device_remove_file(&interface->dev, &dev_attr_input10); | ||
654 | device_remove_file(&interface->dev, &dev_attr_input11); | ||
655 | device_remove_file(&interface->dev, &dev_attr_input12); | ||
656 | device_remove_file(&interface->dev, &dev_attr_input13); | ||
657 | device_remove_file(&interface->dev, &dev_attr_input14); | ||
658 | device_remove_file(&interface->dev, &dev_attr_input15); | ||
659 | device_remove_file(&interface->dev, &dev_attr_input16); | ||
660 | } | ||
661 | 672 | ||
662 | if (kit->ifkit->sensors >= 4) { | 673 | for (i=0; i<kit->ifkit->sensors; i++) |
663 | device_remove_file(&interface->dev, &dev_attr_sensor1); | 674 | device_remove_file(kit->dev, &dev_sensor_attrs[i]); |
664 | device_remove_file(&interface->dev, &dev_attr_sensor2); | 675 | |
665 | device_remove_file(&interface->dev, &dev_attr_sensor3); | 676 | if (kit->ifkit->has_lcd) { |
666 | device_remove_file(&interface->dev, &dev_attr_sensor4); | 677 | device_remove_file(kit->dev, &dev_attr_lcd); |
667 | } | 678 | remove_lcd_files(kit); |
668 | if (kit->ifkit->sensors >= 7) { | ||
669 | device_remove_file(&interface->dev, &dev_attr_sensor5); | ||
670 | device_remove_file(&interface->dev, &dev_attr_sensor6); | ||
671 | device_remove_file(&interface->dev, &dev_attr_sensor7); | ||
672 | } | 679 | } |
673 | if (kit->ifkit->sensors == 8) | ||
674 | device_remove_file(&interface->dev, &dev_attr_sensor8); | ||
675 | 680 | ||
676 | if (kit->ifkit->has_lcd) | 681 | device_unregister(kit->dev); |
677 | device_remove_file(&interface->dev, &dev_attr_lcd); | ||
678 | 682 | ||
679 | dev_info(&interface->dev, "USB PhidgetInterfaceKit %d/%d/%d detached\n", | 683 | dev_info(&interface->dev, "USB PhidgetInterfaceKit %d/%d/%d detached\n", |
680 | kit->ifkit->sensors, kit->ifkit->inputs, kit->ifkit->outputs); | 684 | kit->ifkit->sensors, kit->ifkit->inputs, kit->ifkit->outputs); |
681 | 685 | ||
682 | usb_put_dev(kit->udev); | 686 | usb_put_dev(kit->udev); |
687 | clear_bit(kit->dev_no, &device_no); | ||
688 | |||
683 | kfree(kit); | 689 | kfree(kit); |
684 | } | 690 | } |
685 | 691 | ||
diff --git a/drivers/usb/misc/phidgetmotorcontrol.c b/drivers/usb/misc/phidgetmotorcontrol.c new file mode 100644 index 000000000000..6b59b620d616 --- /dev/null +++ b/drivers/usb/misc/phidgetmotorcontrol.c | |||
@@ -0,0 +1,466 @@ | |||
1 | /* | ||
2 | * USB Phidget MotorControl driver | ||
3 | * | ||
4 | * Copyright (C) 2006 Sean Young <sean@mess.org> | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License as published by | ||
8 | * the Free Software Foundation; either version 2 of the License, or | ||
9 | * (at your option) any later version. | ||
10 | */ | ||
11 | |||
12 | #include <linux/kernel.h> | ||
13 | #include <linux/errno.h> | ||
14 | #include <linux/init.h> | ||
15 | #include <linux/module.h> | ||
16 | #include <linux/usb.h> | ||
17 | |||
18 | #include "phidget.h" | ||
19 | |||
20 | #define DRIVER_AUTHOR "Sean Young <sean@mess.org>" | ||
21 | #define DRIVER_DESC "USB PhidgetMotorControl Driver" | ||
22 | |||
23 | #define USB_VENDOR_ID_GLAB 0x06c2 | ||
24 | #define USB_DEVICE_ID_MOTORCONTROL 0x0058 | ||
25 | |||
26 | #define URB_INT_SIZE 8 | ||
27 | |||
28 | static unsigned long device_no; | ||
29 | |||
30 | struct motorcontrol { | ||
31 | struct usb_device *udev; | ||
32 | struct usb_interface *intf; | ||
33 | struct device *dev; | ||
34 | int dev_no; | ||
35 | u8 inputs[4]; | ||
36 | s8 desired_speed[2]; | ||
37 | s8 speed[2]; | ||
38 | s16 _current[2]; | ||
39 | s8 acceleration[2]; | ||
40 | struct urb *irq; | ||
41 | unsigned char *data; | ||
42 | dma_addr_t data_dma; | ||
43 | |||
44 | struct work_struct do_notify; | ||
45 | unsigned long input_events; | ||
46 | unsigned long speed_events; | ||
47 | unsigned long exceed_events; | ||
48 | }; | ||
49 | |||
50 | static struct usb_device_id id_table[] = { | ||
51 | { USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_MOTORCONTROL) }, | ||
52 | {} | ||
53 | }; | ||
54 | MODULE_DEVICE_TABLE(usb, id_table); | ||
55 | |||
56 | static int set_motor(struct motorcontrol *mc, int motor) | ||
57 | { | ||
58 | u8 *buffer; | ||
59 | int speed, speed2, acceleration; | ||
60 | int retval; | ||
61 | |||
62 | buffer = kzalloc(8, GFP_KERNEL); | ||
63 | if (!buffer) { | ||
64 | dev_err(&mc->intf->dev, "%s - out of memory\n", __FUNCTION__); | ||
65 | return -ENOMEM; | ||
66 | } | ||
67 | |||
68 | acceleration = mc->acceleration[motor] * 10; | ||
69 | /* -127 <= speed <= 127 */ | ||
70 | speed = (mc->desired_speed[motor] * 127) / 100; | ||
71 | /* -0x7300 <= speed2 <= 0x7300 */ | ||
72 | speed2 = (mc->desired_speed[motor] * 230 * 128) / 100; | ||
73 | |||
74 | buffer[0] = motor; | ||
75 | buffer[1] = speed; | ||
76 | buffer[2] = acceleration >> 8; | ||
77 | buffer[3] = acceleration; | ||
78 | buffer[4] = speed2 >> 8; | ||
79 | buffer[5] = speed2; | ||
80 | |||
81 | retval = usb_control_msg(mc->udev, | ||
82 | usb_sndctrlpipe(mc->udev, 0), | ||
83 | 0x09, 0x21, 0x0200, 0x0000, buffer, 8, 2000); | ||
84 | |||
85 | if (retval != 8) | ||
86 | dev_err(&mc->intf->dev, "usb_control_msg returned %d\n", | ||
87 | retval); | ||
88 | kfree(buffer); | ||
89 | |||
90 | return retval < 0 ? retval : 0; | ||
91 | } | ||
92 | |||
93 | static void motorcontrol_irq(struct urb *urb, struct pt_regs *regs) | ||
94 | { | ||
95 | struct motorcontrol *mc = urb->context; | ||
96 | unsigned char *buffer = mc->data; | ||
97 | int i, level; | ||
98 | int status; | ||
99 | |||
100 | switch (urb->status) { | ||
101 | case 0: /* success */ | ||
102 | break; | ||
103 | case -ECONNRESET: /* unlink */ | ||
104 | case -ENOENT: | ||
105 | case -ESHUTDOWN: | ||
106 | return; | ||
107 | /* -EPIPE: should clear the halt */ | ||
108 | default: /* error */ | ||
109 | goto resubmit; | ||
110 | } | ||
111 | |||
112 | /* digital inputs */ | ||
113 | for (i=0; i<4; i++) { | ||
114 | level = (buffer[0] >> i) & 1; | ||
115 | if (mc->inputs[i] != level) { | ||
116 | mc->inputs[i] = level; | ||
117 | set_bit(i, &mc->input_events); | ||
118 | } | ||
119 | } | ||
120 | |||
121 | /* motor speed */ | ||
122 | if (buffer[2] == 0) { | ||
123 | for (i=0; i<2; i++) { | ||
124 | level = ((s8)buffer[4+i]) * 100 / 127; | ||
125 | if (mc->speed[i] != level) { | ||
126 | mc->speed[i] = level; | ||
127 | set_bit(i, &mc->speed_events); | ||
128 | } | ||
129 | } | ||
130 | } else { | ||
131 | int index = buffer[3] & 1; | ||
132 | |||
133 | level = ((s8)buffer[4] << 8) | buffer[5]; | ||
134 | level = level * 100 / 29440; | ||
135 | if (mc->speed[index] != level) { | ||
136 | mc->speed[index] = level; | ||
137 | set_bit(index, &mc->speed_events); | ||
138 | } | ||
139 | |||
140 | level = ((s8)buffer[6] << 8) | buffer[7]; | ||
141 | mc->_current[index] = level * 100 / 1572; | ||
142 | } | ||
143 | |||
144 | if (buffer[1] & 1) | ||
145 | set_bit(0, &mc->exceed_events); | ||
146 | |||
147 | if (buffer[1] & 2) | ||
148 | set_bit(1, &mc->exceed_events); | ||
149 | |||
150 | if (mc->input_events || mc->exceed_events || mc->speed_events) | ||
151 | schedule_work(&mc->do_notify); | ||
152 | |||
153 | resubmit: | ||
154 | status = usb_submit_urb(urb, SLAB_ATOMIC); | ||
155 | if (status) | ||
156 | dev_err(&mc->intf->dev, | ||
157 | "can't resubmit intr, %s-%s/motorcontrol0, status %d", | ||
158 | mc->udev->bus->bus_name, | ||
159 | mc->udev->devpath, status); | ||
160 | } | ||
161 | |||
162 | static void do_notify(void *data) | ||
163 | { | ||
164 | struct motorcontrol *mc = data; | ||
165 | int i; | ||
166 | char sysfs_file[8]; | ||
167 | |||
168 | for (i=0; i<4; i++) { | ||
169 | if (test_and_clear_bit(i, &mc->input_events)) { | ||
170 | sprintf(sysfs_file, "input%d", i); | ||
171 | sysfs_notify(&mc->dev->kobj, NULL, sysfs_file); | ||
172 | } | ||
173 | } | ||
174 | |||
175 | for (i=0; i<2; i++) { | ||
176 | if (test_and_clear_bit(i, &mc->speed_events)) { | ||
177 | sprintf(sysfs_file, "speed%d", i); | ||
178 | sysfs_notify(&mc->dev->kobj, NULL, sysfs_file); | ||
179 | } | ||
180 | } | ||
181 | |||
182 | for (i=0; i<2; i++) { | ||
183 | if (test_and_clear_bit(i, &mc->exceed_events)) | ||
184 | dev_warn(&mc->intf->dev, | ||
185 | "motor #%d exceeds 1.5 Amp current limit\n", i); | ||
186 | } | ||
187 | } | ||
188 | |||
189 | #define show_set_speed(value) \ | ||
190 | static ssize_t set_speed##value(struct device *dev, \ | ||
191 | struct device_attribute *attr, \ | ||
192 | const char *buf, size_t count) \ | ||
193 | { \ | ||
194 | struct motorcontrol *mc = dev_get_drvdata(dev); \ | ||
195 | int speed; \ | ||
196 | int retval; \ | ||
197 | \ | ||
198 | if (sscanf(buf, "%d", &speed) < 1) \ | ||
199 | return -EINVAL; \ | ||
200 | \ | ||
201 | if (speed < -100 || speed > 100) \ | ||
202 | return -EINVAL; \ | ||
203 | \ | ||
204 | mc->desired_speed[value] = speed; \ | ||
205 | \ | ||
206 | retval = set_motor(mc, value); \ | ||
207 | \ | ||
208 | return retval ? retval : count; \ | ||
209 | } \ | ||
210 | \ | ||
211 | static ssize_t show_speed##value(struct device *dev, \ | ||
212 | struct device_attribute *attr, \ | ||
213 | char *buf) \ | ||
214 | { \ | ||
215 | struct motorcontrol *mc = dev_get_drvdata(dev); \ | ||
216 | \ | ||
217 | return sprintf(buf, "%d\n", mc->speed[value]); \ | ||
218 | } | ||
219 | |||
220 | #define speed_attr(value) \ | ||
221 | __ATTR(speed##value, S_IWUGO | S_IRUGO, \ | ||
222 | show_speed##value, set_speed##value) | ||
223 | |||
224 | show_set_speed(0); | ||
225 | show_set_speed(1); | ||
226 | |||
227 | #define show_set_acceleration(value) \ | ||
228 | static ssize_t set_acceleration##value(struct device *dev, \ | ||
229 | struct device_attribute *attr, \ | ||
230 | const char *buf, size_t count) \ | ||
231 | { \ | ||
232 | struct motorcontrol *mc = dev_get_drvdata(dev); \ | ||
233 | int acceleration; \ | ||
234 | int retval; \ | ||
235 | \ | ||
236 | if (sscanf(buf, "%d", &acceleration) < 1) \ | ||
237 | return -EINVAL; \ | ||
238 | \ | ||
239 | if (acceleration < 0 || acceleration > 100) \ | ||
240 | return -EINVAL; \ | ||
241 | \ | ||
242 | mc->acceleration[value] = acceleration; \ | ||
243 | \ | ||
244 | retval = set_motor(mc, value); \ | ||
245 | \ | ||
246 | return retval ? retval : count; \ | ||
247 | } \ | ||
248 | \ | ||
249 | static ssize_t show_acceleration##value(struct device *dev, \ | ||
250 | struct device_attribute *attr, \ | ||
251 | char *buf) \ | ||
252 | { \ | ||
253 | struct motorcontrol *mc = dev_get_drvdata(dev); \ | ||
254 | \ | ||
255 | return sprintf(buf, "%d\n", mc->acceleration[value]); \ | ||
256 | } | ||
257 | |||
258 | #define acceleration_attr(value) \ | ||
259 | __ATTR(acceleration##value, S_IWUGO | S_IRUGO, \ | ||
260 | show_acceleration##value, set_acceleration##value) | ||
261 | |||
262 | show_set_acceleration(0); | ||
263 | show_set_acceleration(1); | ||
264 | |||
265 | #define show_current(value) \ | ||
266 | static ssize_t show_current##value(struct device *dev, \ | ||
267 | struct device_attribute *attr, \ | ||
268 | char *buf) \ | ||
269 | { \ | ||
270 | struct motorcontrol *mc = dev_get_drvdata(dev); \ | ||
271 | \ | ||
272 | return sprintf(buf, "%dmA\n", (int)mc->_current[value]); \ | ||
273 | } | ||
274 | |||
275 | #define current_attr(value) \ | ||
276 | __ATTR(current##value, S_IRUGO, show_current##value, NULL) | ||
277 | |||
278 | show_current(0); | ||
279 | show_current(1); | ||
280 | |||
281 | #define show_input(value) \ | ||
282 | static ssize_t show_input##value(struct device *dev, \ | ||
283 | struct device_attribute *attr, \ | ||
284 | char *buf) \ | ||
285 | { \ | ||
286 | struct motorcontrol *mc = dev_get_drvdata(dev); \ | ||
287 | \ | ||
288 | return sprintf(buf, "%d\n", (int)mc->inputs[value]); \ | ||
289 | } | ||
290 | |||
291 | #define input_attr(value) \ | ||
292 | __ATTR(input##value, S_IRUGO, show_input##value, NULL) | ||
293 | |||
294 | show_input(0); | ||
295 | show_input(1); | ||
296 | show_input(2); | ||
297 | show_input(3); | ||
298 | |||
299 | static struct device_attribute dev_attrs[] = { | ||
300 | input_attr(0), | ||
301 | input_attr(1), | ||
302 | input_attr(2), | ||
303 | input_attr(3), | ||
304 | speed_attr(0), | ||
305 | speed_attr(1), | ||
306 | acceleration_attr(0), | ||
307 | acceleration_attr(1), | ||
308 | current_attr(0), | ||
309 | current_attr(1) | ||
310 | }; | ||
311 | |||
312 | static int motorcontrol_probe(struct usb_interface *intf, const struct usb_device_id *id) | ||
313 | { | ||
314 | struct usb_device *dev = interface_to_usbdev(intf); | ||
315 | struct usb_host_interface *interface; | ||
316 | struct usb_endpoint_descriptor *endpoint; | ||
317 | struct motorcontrol *mc; | ||
318 | int pipe, maxp, rc = -ENOMEM; | ||
319 | int bit, value, i; | ||
320 | |||
321 | interface = intf->cur_altsetting; | ||
322 | if (interface->desc.bNumEndpoints != 1) | ||
323 | return -ENODEV; | ||
324 | |||
325 | endpoint = &interface->endpoint[0].desc; | ||
326 | if (!(endpoint->bEndpointAddress & 0x80)) | ||
327 | return -ENODEV; | ||
328 | |||
329 | /* | ||
330 | * bmAttributes | ||
331 | */ | ||
332 | pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress); | ||
333 | maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe)); | ||
334 | |||
335 | mc = kzalloc(sizeof(*mc), GFP_KERNEL); | ||
336 | if (!mc) | ||
337 | goto out; | ||
338 | |||
339 | mc->dev_no = -1; | ||
340 | mc->data = usb_buffer_alloc(dev, URB_INT_SIZE, SLAB_ATOMIC, &mc->data_dma); | ||
341 | if (!mc->data) | ||
342 | goto out; | ||
343 | |||
344 | mc->irq = usb_alloc_urb(0, GFP_KERNEL); | ||
345 | if (!mc->irq) | ||
346 | goto out; | ||
347 | |||
348 | mc->udev = usb_get_dev(dev); | ||
349 | mc->intf = intf; | ||
350 | mc->acceleration[0] = mc->acceleration[1] = 10; | ||
351 | INIT_WORK(&mc->do_notify, do_notify, mc); | ||
352 | usb_fill_int_urb(mc->irq, mc->udev, pipe, mc->data, | ||
353 | maxp > URB_INT_SIZE ? URB_INT_SIZE : maxp, | ||
354 | motorcontrol_irq, mc, endpoint->bInterval); | ||
355 | mc->irq->transfer_dma = mc->data_dma; | ||
356 | mc->irq->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; | ||
357 | |||
358 | usb_set_intfdata(intf, mc); | ||
359 | |||
360 | do { | ||
361 | bit = find_first_zero_bit(&device_no, sizeof(device_no)); | ||
362 | value = test_and_set_bit(bit, &device_no); | ||
363 | } while(value); | ||
364 | mc->dev_no = bit; | ||
365 | |||
366 | mc->dev = device_create(phidget_class, &mc->udev->dev, 0, | ||
367 | "motorcontrol%d", mc->dev_no); | ||
368 | if (IS_ERR(mc->dev)) { | ||
369 | rc = PTR_ERR(mc->dev); | ||
370 | mc->dev = NULL; | ||
371 | goto out; | ||
372 | } | ||
373 | |||
374 | dev_set_drvdata(mc->dev, mc); | ||
375 | |||
376 | if (usb_submit_urb(mc->irq, GFP_KERNEL)) { | ||
377 | rc = -EIO; | ||
378 | goto out; | ||
379 | } | ||
380 | |||
381 | for (i=0; i<ARRAY_SIZE(dev_attrs); i++) { | ||
382 | rc = device_create_file(mc->dev, &dev_attrs[i]); | ||
383 | if (rc) | ||
384 | goto out2; | ||
385 | } | ||
386 | |||
387 | dev_info(&intf->dev, "USB PhidgetMotorControl attached\n"); | ||
388 | |||
389 | return 0; | ||
390 | out2: | ||
391 | while (i-- > 0) | ||
392 | device_remove_file(mc->dev, &dev_attrs[i]); | ||
393 | out: | ||
394 | if (mc) { | ||
395 | if (mc->irq) | ||
396 | usb_free_urb(mc->irq); | ||
397 | if (mc->data) | ||
398 | usb_buffer_free(dev, URB_INT_SIZE, mc->data, mc->data_dma); | ||
399 | if (mc->dev) | ||
400 | device_unregister(mc->dev); | ||
401 | if (mc->dev_no >= 0) | ||
402 | clear_bit(mc->dev_no, &device_no); | ||
403 | |||
404 | kfree(mc); | ||
405 | } | ||
406 | |||
407 | return rc; | ||
408 | } | ||
409 | |||
410 | static void motorcontrol_disconnect(struct usb_interface *interface) | ||
411 | { | ||
412 | struct motorcontrol *mc; | ||
413 | int i; | ||
414 | |||
415 | mc = usb_get_intfdata(interface); | ||
416 | usb_set_intfdata(interface, NULL); | ||
417 | if (!mc) | ||
418 | return; | ||
419 | |||
420 | usb_kill_urb(mc->irq); | ||
421 | usb_free_urb(mc->irq); | ||
422 | usb_buffer_free(mc->udev, URB_INT_SIZE, mc->data, mc->data_dma); | ||
423 | |||
424 | cancel_delayed_work(&mc->do_notify); | ||
425 | |||
426 | for (i=0; i<ARRAY_SIZE(dev_attrs); i++) | ||
427 | device_remove_file(mc->dev, &dev_attrs[i]); | ||
428 | |||
429 | device_unregister(mc->dev); | ||
430 | |||
431 | usb_put_dev(mc->udev); | ||
432 | clear_bit(mc->dev_no, &device_no); | ||
433 | kfree(mc); | ||
434 | |||
435 | dev_info(&interface->dev, "USB PhidgetMotorControl detached\n"); | ||
436 | } | ||
437 | |||
438 | static struct usb_driver motorcontrol_driver = { | ||
439 | .name = "phidgetmotorcontrol", | ||
440 | .probe = motorcontrol_probe, | ||
441 | .disconnect = motorcontrol_disconnect, | ||
442 | .id_table = id_table | ||
443 | }; | ||
444 | |||
445 | static int __init motorcontrol_init(void) | ||
446 | { | ||
447 | int retval = 0; | ||
448 | |||
449 | retval = usb_register(&motorcontrol_driver); | ||
450 | if (retval) | ||
451 | err("usb_register failed. Error number %d", retval); | ||
452 | |||
453 | return retval; | ||
454 | } | ||
455 | |||
456 | static void __exit motorcontrol_exit(void) | ||
457 | { | ||
458 | usb_deregister(&motorcontrol_driver); | ||
459 | } | ||
460 | |||
461 | module_init(motorcontrol_init); | ||
462 | module_exit(motorcontrol_exit); | ||
463 | |||
464 | MODULE_AUTHOR(DRIVER_AUTHOR); | ||
465 | MODULE_DESCRIPTION(DRIVER_DESC); | ||
466 | MODULE_LICENSE("GPL"); | ||
diff --git a/drivers/usb/misc/phidgetservo.c b/drivers/usb/misc/phidgetservo.c index c0df79c96538..7163f05c5b27 100644 --- a/drivers/usb/misc/phidgetservo.c +++ b/drivers/usb/misc/phidgetservo.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * USB PhidgetServo driver 1.0 | 2 | * USB PhidgetServo driver 1.0 |
3 | * | 3 | * |
4 | * Copyright (C) 2004 Sean Young <sean@mess.org> | 4 | * Copyright (C) 2004, 2006 Sean Young <sean@mess.org> |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or modify | 6 | * This program is free software; you can redistribute it and/or modify |
7 | * it under the terms of the GNU General Public License as published by | 7 | * it under the terms of the GNU General Public License as published by |
@@ -15,14 +15,6 @@ | |||
15 | * | 15 | * |
16 | * CAUTION: Generally you should use 0 < degrees < 180 as anything else | 16 | * CAUTION: Generally you should use 0 < degrees < 180 as anything else |
17 | * is probably beyond the range of your servo and may damage it. | 17 | * is probably beyond the range of your servo and may damage it. |
18 | * | ||
19 | * Jun 16, 2004: Sean Young <sean@mess.org> | ||
20 | * - cleanups | ||
21 | * - was using memory after kfree() | ||
22 | * Aug 8, 2004: Sean Young <sean@mess.org> | ||
23 | * - set the highest angle as high as the hardware allows, there are | ||
24 | * some odd servos out there | ||
25 | * | ||
26 | */ | 18 | */ |
27 | 19 | ||
28 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
@@ -32,6 +24,8 @@ | |||
32 | #include <linux/module.h> | 24 | #include <linux/module.h> |
33 | #include <linux/usb.h> | 25 | #include <linux/usb.h> |
34 | 26 | ||
27 | #include "phidget.h" | ||
28 | |||
35 | #define DRIVER_AUTHOR "Sean Young <sean@mess.org>" | 29 | #define DRIVER_AUTHOR "Sean Young <sean@mess.org>" |
36 | #define DRIVER_DESC "USB PhidgetServo Driver" | 30 | #define DRIVER_DESC "USB PhidgetServo Driver" |
37 | 31 | ||
@@ -70,8 +64,12 @@ static struct usb_device_id id_table[] = { | |||
70 | 64 | ||
71 | MODULE_DEVICE_TABLE(usb, id_table); | 65 | MODULE_DEVICE_TABLE(usb, id_table); |
72 | 66 | ||
67 | static int unsigned long device_no; | ||
68 | |||
73 | struct phidget_servo { | 69 | struct phidget_servo { |
74 | struct usb_device *udev; | 70 | struct usb_device *udev; |
71 | struct device *dev; | ||
72 | int dev_no; | ||
75 | ulong type; | 73 | ulong type; |
76 | int pulse[4]; | 74 | int pulse[4]; |
77 | int degrees[4]; | 75 | int degrees[4]; |
@@ -203,16 +201,16 @@ change_position_v20(struct phidget_servo *servo, int servo_no, int degrees, | |||
203 | } | 201 | } |
204 | 202 | ||
205 | #define show_set(value) \ | 203 | #define show_set(value) \ |
206 | static ssize_t set_servo##value (struct device *dev, struct device_attribute *attr, \ | 204 | static ssize_t set_servo##value (struct device *dev, \ |
205 | struct device_attribute *attr, \ | ||
207 | const char *buf, size_t count) \ | 206 | const char *buf, size_t count) \ |
208 | { \ | 207 | { \ |
209 | int degrees, minutes, retval; \ | 208 | int degrees, minutes, retval; \ |
210 | struct usb_interface *intf = to_usb_interface (dev); \ | 209 | struct phidget_servo *servo = dev_get_drvdata(dev); \ |
211 | struct phidget_servo *servo = usb_get_intfdata (intf); \ | ||
212 | \ | 210 | \ |
213 | minutes = 0; \ | 211 | minutes = 0; \ |
214 | /* must at least convert degrees */ \ | 212 | /* must at least convert degrees */ \ |
215 | if (sscanf (buf, "%d.%d", °rees, &minutes) < 1) { \ | 213 | if (sscanf(buf, "%d.%d", °rees, &minutes) < 1) { \ |
216 | return -EINVAL; \ | 214 | return -EINVAL; \ |
217 | } \ | 215 | } \ |
218 | \ | 216 | \ |
@@ -220,86 +218,127 @@ static ssize_t set_servo##value (struct device *dev, struct device_attribute *at | |||
220 | return -EINVAL; \ | 218 | return -EINVAL; \ |
221 | \ | 219 | \ |
222 | if (servo->type & SERVO_VERSION_30) \ | 220 | if (servo->type & SERVO_VERSION_30) \ |
223 | retval = change_position_v30 (servo, value, degrees, \ | 221 | retval = change_position_v30(servo, value, degrees, \ |
224 | minutes); \ | 222 | minutes); \ |
225 | else \ | 223 | else \ |
226 | retval = change_position_v20 (servo, value, degrees, \ | 224 | retval = change_position_v20(servo, value, degrees, \ |
227 | minutes); \ | 225 | minutes); \ |
228 | \ | 226 | \ |
229 | return retval < 0 ? retval : count; \ | 227 | return retval < 0 ? retval : count; \ |
230 | } \ | 228 | } \ |
231 | \ | 229 | \ |
232 | static ssize_t show_servo##value (struct device *dev, struct device_attribute *attr, char *buf) \ | 230 | static ssize_t show_servo##value (struct device *dev, \ |
231 | struct device_attribute *attr, \ | ||
232 | char *buf) \ | ||
233 | { \ | 233 | { \ |
234 | struct usb_interface *intf = to_usb_interface (dev); \ | 234 | struct phidget_servo *servo = dev_get_drvdata(dev); \ |
235 | struct phidget_servo *servo = usb_get_intfdata (intf); \ | ||
236 | \ | 235 | \ |
237 | return sprintf (buf, "%d.%02d\n", servo->degrees[value], \ | 236 | return sprintf(buf, "%d.%02d\n", servo->degrees[value], \ |
238 | servo->minutes[value]); \ | 237 | servo->minutes[value]); \ |
239 | } \ | 238 | } |
240 | static DEVICE_ATTR(servo##value, S_IWUGO | S_IRUGO, \ | ||
241 | show_servo##value, set_servo##value); | ||
242 | 239 | ||
240 | #define servo_attr(value) \ | ||
241 | __ATTR(servo##value, S_IWUGO | S_IRUGO, \ | ||
242 | show_servo##value, set_servo##value) | ||
243 | show_set(0); | 243 | show_set(0); |
244 | show_set(1); | 244 | show_set(1); |
245 | show_set(2); | 245 | show_set(2); |
246 | show_set(3); | 246 | show_set(3); |
247 | 247 | ||
248 | static struct device_attribute dev_attrs[] = { | ||
249 | servo_attr(0), servo_attr(1), servo_attr(2), servo_attr(3) | ||
250 | }; | ||
251 | |||
248 | static int | 252 | static int |
249 | servo_probe(struct usb_interface *interface, const struct usb_device_id *id) | 253 | servo_probe(struct usb_interface *interface, const struct usb_device_id *id) |
250 | { | 254 | { |
251 | struct usb_device *udev = interface_to_usbdev(interface); | 255 | struct usb_device *udev = interface_to_usbdev(interface); |
252 | struct phidget_servo *dev; | 256 | struct phidget_servo *dev; |
257 | int bit, value, rc; | ||
258 | int servo_count, i; | ||
253 | 259 | ||
254 | dev = kzalloc(sizeof (struct phidget_servo), GFP_KERNEL); | 260 | dev = kzalloc(sizeof (struct phidget_servo), GFP_KERNEL); |
255 | if (dev == NULL) { | 261 | if (dev == NULL) { |
256 | dev_err(&interface->dev, "%s - out of memory\n", __FUNCTION__); | 262 | dev_err(&interface->dev, "%s - out of memory\n", __FUNCTION__); |
257 | return -ENOMEM; | 263 | rc = -ENOMEM; |
264 | goto out; | ||
258 | } | 265 | } |
259 | 266 | ||
260 | dev->udev = usb_get_dev(udev); | 267 | dev->udev = usb_get_dev(udev); |
261 | dev->type = id->driver_info; | 268 | dev->type = id->driver_info; |
269 | dev->dev_no = -1; | ||
262 | usb_set_intfdata(interface, dev); | 270 | usb_set_intfdata(interface, dev); |
263 | 271 | ||
264 | device_create_file(&interface->dev, &dev_attr_servo0); | 272 | do { |
265 | if (dev->type & SERVO_COUNT_QUAD) { | 273 | bit = find_first_zero_bit(&device_no, sizeof(device_no)); |
266 | device_create_file(&interface->dev, &dev_attr_servo1); | 274 | value = test_and_set_bit(bit, &device_no); |
267 | device_create_file(&interface->dev, &dev_attr_servo2); | 275 | } while (value); |
268 | device_create_file(&interface->dev, &dev_attr_servo3); | 276 | dev->dev_no = bit; |
277 | |||
278 | dev->dev = device_create(phidget_class, &dev->udev->dev, 0, | ||
279 | "servo%d", dev->dev_no); | ||
280 | if (IS_ERR(dev->dev)) { | ||
281 | rc = PTR_ERR(dev->dev); | ||
282 | dev->dev = NULL; | ||
283 | goto out; | ||
284 | } | ||
285 | |||
286 | servo_count = dev->type & SERVO_COUNT_QUAD ? 4 : 1; | ||
287 | |||
288 | for (i=0; i<servo_count; i++) { | ||
289 | rc = device_create_file(dev->dev, &dev_attrs[i]); | ||
290 | if (rc) | ||
291 | goto out2; | ||
269 | } | 292 | } |
270 | 293 | ||
271 | dev_info(&interface->dev, "USB %d-Motor PhidgetServo v%d.0 attached\n", | 294 | dev_info(&interface->dev, "USB %d-Motor PhidgetServo v%d.0 attached\n", |
272 | dev->type & SERVO_COUNT_QUAD ? 4 : 1, | 295 | servo_count, dev->type & SERVO_VERSION_30 ? 3 : 2); |
273 | dev->type & SERVO_VERSION_30 ? 3 : 2); | ||
274 | 296 | ||
275 | if(!(dev->type & SERVO_VERSION_30)) | 297 | if (!(dev->type & SERVO_VERSION_30)) |
276 | dev_info(&interface->dev, | 298 | dev_info(&interface->dev, |
277 | "WARNING: v2.0 not tested! Please report if it works.\n"); | 299 | "WARNING: v2.0 not tested! Please report if it works.\n"); |
278 | 300 | ||
279 | return 0; | 301 | return 0; |
302 | out2: | ||
303 | while (i-- > 0) | ||
304 | device_remove_file(dev->dev, &dev_attrs[i]); | ||
305 | out: | ||
306 | if (dev) { | ||
307 | if (dev->dev) | ||
308 | device_unregister(dev->dev); | ||
309 | if (dev->dev_no >= 0) | ||
310 | clear_bit(dev->dev_no, &device_no); | ||
311 | |||
312 | kfree(dev); | ||
313 | } | ||
314 | |||
315 | return rc; | ||
280 | } | 316 | } |
281 | 317 | ||
282 | static void | 318 | static void |
283 | servo_disconnect(struct usb_interface *interface) | 319 | servo_disconnect(struct usb_interface *interface) |
284 | { | 320 | { |
285 | struct phidget_servo *dev; | 321 | struct phidget_servo *dev; |
322 | int servo_count, i; | ||
286 | 323 | ||
287 | dev = usb_get_intfdata(interface); | 324 | dev = usb_get_intfdata(interface); |
288 | usb_set_intfdata(interface, NULL); | 325 | usb_set_intfdata(interface, NULL); |
289 | 326 | ||
290 | device_remove_file(&interface->dev, &dev_attr_servo0); | 327 | if (!dev) |
291 | if (dev->type & SERVO_COUNT_QUAD) { | 328 | return; |
292 | device_remove_file(&interface->dev, &dev_attr_servo1); | 329 | |
293 | device_remove_file(&interface->dev, &dev_attr_servo2); | 330 | servo_count = dev->type & SERVO_COUNT_QUAD ? 4 : 1; |
294 | device_remove_file(&interface->dev, &dev_attr_servo3); | 331 | |
295 | } | 332 | for (i=0; i<servo_count; i++) |
333 | device_remove_file(dev->dev, &dev_attrs[i]); | ||
296 | 334 | ||
335 | device_unregister(dev->dev); | ||
297 | usb_put_dev(dev->udev); | 336 | usb_put_dev(dev->udev); |
298 | 337 | ||
299 | dev_info(&interface->dev, "USB %d-Motor PhidgetServo v%d.0 detached\n", | 338 | dev_info(&interface->dev, "USB %d-Motor PhidgetServo v%d.0 detached\n", |
300 | dev->type & SERVO_COUNT_QUAD ? 4 : 1, | 339 | servo_count, dev->type & SERVO_VERSION_30 ? 3 : 2); |
301 | dev->type & SERVO_VERSION_30 ? 3 : 2); | ||
302 | 340 | ||
341 | clear_bit(dev->dev_no, &device_no); | ||
303 | kfree(dev); | 342 | kfree(dev); |
304 | } | 343 | } |
305 | 344 | ||
diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c index e16582f3733c..a44124c7e851 100644 --- a/drivers/usb/misc/sisusbvga/sisusb.c +++ b/drivers/usb/misc/sisusbvga/sisusb.c | |||
@@ -3179,7 +3179,7 @@ sisusb_compat_ioctl(struct file *f, unsigned int cmd, unsigned long arg) | |||
3179 | } | 3179 | } |
3180 | #endif | 3180 | #endif |
3181 | 3181 | ||
3182 | static struct file_operations usb_sisusb_fops = { | 3182 | static const struct file_operations usb_sisusb_fops = { |
3183 | .owner = THIS_MODULE, | 3183 | .owner = THIS_MODULE, |
3184 | .open = sisusb_open, | 3184 | .open = sisusb_open, |
3185 | .release = sisusb_release, | 3185 | .release = sisusb_release, |
diff --git a/drivers/usb/misc/usb_u132.h b/drivers/usb/misc/usb_u132.h new file mode 100644 index 000000000000..551ba8906d62 --- /dev/null +++ b/drivers/usb/misc/usb_u132.h | |||
@@ -0,0 +1,97 @@ | |||
1 | /* | ||
2 | * Common Header File for the Elan Digital Systems U132 adapter | ||
3 | * this file should be included by both the "ftdi-u132" and | ||
4 | * the "u132-hcd" modules. | ||
5 | * | ||
6 | * Copyright(C) 2006 Elan Digital Systems Limited | ||
7 | *(http://www.elandigitalsystems.com) | ||
8 | * | ||
9 | * Author and Maintainer - Tony Olech - Elan Digital Systems | ||
10 | *(tony.olech@elandigitalsystems.com) | ||
11 | * | ||
12 | * This program is free software;you can redistribute it and/or | ||
13 | * modify it under the terms of the GNU General Public License as | ||
14 | * published by the Free Software Foundation, version 2. | ||
15 | * | ||
16 | * | ||
17 | * The driver was written by Tony Olech(tony.olech@elandigitalsystems.com) | ||
18 | * based on various USB client drivers in the 2.6.15 linux kernel | ||
19 | * with constant reference to the 3rd Edition of Linux Device Drivers | ||
20 | * published by O'Reilly | ||
21 | * | ||
22 | * The U132 adapter is a USB to CardBus adapter specifically designed | ||
23 | * for PC cards that contain an OHCI host controller. Typical PC cards | ||
24 | * are the Orange Mobile 3G Option GlobeTrotter Fusion card. | ||
25 | * | ||
26 | * The U132 adapter will *NOT *work with PC cards that do not contain | ||
27 | * an OHCI controller. A simple way to test whether a PC card has an | ||
28 | * OHCI controller as an interface is to insert the PC card directly | ||
29 | * into a laptop(or desktop) with a CardBus slot and if "lspci" shows | ||
30 | * a new USB controller and "lsusb -v" shows a new OHCI Host Controller | ||
31 | * then there is a good chance that the U132 adapter will support the | ||
32 | * PC card.(you also need the specific client driver for the PC card) | ||
33 | * | ||
34 | * Please inform the Author and Maintainer about any PC cards that | ||
35 | * contain OHCI Host Controller and work when directly connected to | ||
36 | * an embedded CardBus slot but do not work when they are connected | ||
37 | * via an ELAN U132 adapter. | ||
38 | * | ||
39 | * The driver consists of two modules, the "ftdi-u132" module is | ||
40 | * a USB client driver that interfaces to the FTDI chip within | ||
41 | * the U132 adapter manufactured by Elan Digital Systems, and the | ||
42 | * "u132-hcd" module is a USB host controller driver that talks | ||
43 | * to the OHCI controller within CardBus card that are inserted | ||
44 | * in the U132 adapter. | ||
45 | * | ||
46 | * The "ftdi-u132" module should be loaded automatically by the | ||
47 | * hot plug system when the U132 adapter is plugged in. The module | ||
48 | * initialises the adapter which mostly consists of synchronising | ||
49 | * the FTDI chip, before continuously polling the adapter to detect | ||
50 | * PC card insertions. As soon as a PC card containing a recognised | ||
51 | * OHCI controller is seen the "ftdi-u132" module explicitly requests | ||
52 | * the kernel to load the "u132-hcd" module. | ||
53 | * | ||
54 | * The "ftdi-u132" module provides the interface to the inserted | ||
55 | * PC card and the "u132-hcd" module uses the API to send and recieve | ||
56 | * data. The API features call-backs, so that part of the "u132-hcd" | ||
57 | * module code will run in the context of one of the kernel threads | ||
58 | * of the "ftdi-u132" module. | ||
59 | * | ||
60 | */ | ||
61 | int ftdi_elan_switch_on_diagnostics(int number); | ||
62 | void ftdi_elan_gone_away(struct platform_device *pdev); | ||
63 | void start_usb_lock_device_tracing(void); | ||
64 | struct u132_platform_data { | ||
65 | u16 vendor; | ||
66 | u16 device; | ||
67 | u8 potpg; | ||
68 | void (*port_power) (struct device *dev, int is_on); | ||
69 | void (*reset) (struct device *dev); | ||
70 | }; | ||
71 | int usb_ftdi_elan_edset_single(struct platform_device *pdev, u8 ed_number, | ||
72 | void *endp, struct urb *urb, u8 address, u8 ep_number, u8 toggle_bits, | ||
73 | void (*callback) (void *endp, struct urb *urb, u8 *buf, int len, | ||
74 | int toggle_bits, int error_count, int condition_code, int repeat_number, | ||
75 | int halted, int skipped, int actual, int non_null)); | ||
76 | int usb_ftdi_elan_edset_output(struct platform_device *pdev, u8 ed_number, | ||
77 | void *endp, struct urb *urb, u8 address, u8 ep_number, u8 toggle_bits, | ||
78 | void (*callback) (void *endp, struct urb *urb, u8 *buf, int len, | ||
79 | int toggle_bits, int error_count, int condition_code, int repeat_number, | ||
80 | int halted, int skipped, int actual, int non_null)); | ||
81 | int usb_ftdi_elan_edset_empty(struct platform_device *pdev, u8 ed_number, | ||
82 | void *endp, struct urb *urb, u8 address, u8 ep_number, u8 toggle_bits, | ||
83 | void (*callback) (void *endp, struct urb *urb, u8 *buf, int len, | ||
84 | int toggle_bits, int error_count, int condition_code, int repeat_number, | ||
85 | int halted, int skipped, int actual, int non_null)); | ||
86 | int usb_ftdi_elan_edset_input(struct platform_device *pdev, u8 ed_number, | ||
87 | void *endp, struct urb *urb, u8 address, u8 ep_number, u8 toggle_bits, | ||
88 | void (*callback) (void *endp, struct urb *urb, u8 *buf, int len, | ||
89 | int toggle_bits, int error_count, int condition_code, int repeat_number, | ||
90 | int halted, int skipped, int actual, int non_null)); | ||
91 | int usb_ftdi_elan_edset_setup(struct platform_device *pdev, u8 ed_number, | ||
92 | void *endp, struct urb *urb, u8 address, u8 ep_number, u8 toggle_bits, | ||
93 | void (*callback) (void *endp, struct urb *urb, u8 *buf, int len, | ||
94 | int toggle_bits, int error_count, int condition_code, int repeat_number, | ||
95 | int halted, int skipped, int actual, int non_null)); | ||
96 | int usb_ftdi_elan_edset_flush(struct platform_device *pdev, u8 ed_number, | ||
97 | void *endp); | ||
diff --git a/drivers/usb/misc/usblcd.c b/drivers/usb/misc/usblcd.c index e095772dd8e9..dbaca9f1efad 100644 --- a/drivers/usb/misc/usblcd.c +++ b/drivers/usb/misc/usblcd.c | |||
@@ -239,7 +239,7 @@ error: | |||
239 | return retval; | 239 | return retval; |
240 | } | 240 | } |
241 | 241 | ||
242 | static struct file_operations lcd_fops = { | 242 | static const struct file_operations lcd_fops = { |
243 | .owner = THIS_MODULE, | 243 | .owner = THIS_MODULE, |
244 | .read = lcd_read, | 244 | .read = lcd_read, |
245 | .write = lcd_write, | 245 | .write = lcd_write, |
@@ -290,9 +290,7 @@ static int lcd_probe(struct usb_interface *interface, const struct usb_device_id | |||
290 | endpoint = &iface_desc->endpoint[i].desc; | 290 | endpoint = &iface_desc->endpoint[i].desc; |
291 | 291 | ||
292 | if (!dev->bulk_in_endpointAddr && | 292 | if (!dev->bulk_in_endpointAddr && |
293 | (endpoint->bEndpointAddress & USB_DIR_IN) && | 293 | usb_endpoint_is_bulk_in(endpoint)) { |
294 | ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) | ||
295 | == USB_ENDPOINT_XFER_BULK)) { | ||
296 | /* we found a bulk in endpoint */ | 294 | /* we found a bulk in endpoint */ |
297 | buffer_size = le16_to_cpu(endpoint->wMaxPacketSize); | 295 | buffer_size = le16_to_cpu(endpoint->wMaxPacketSize); |
298 | dev->bulk_in_size = buffer_size; | 296 | dev->bulk_in_size = buffer_size; |
@@ -305,9 +303,7 @@ static int lcd_probe(struct usb_interface *interface, const struct usb_device_id | |||
305 | } | 303 | } |
306 | 304 | ||
307 | if (!dev->bulk_out_endpointAddr && | 305 | if (!dev->bulk_out_endpointAddr && |
308 | !(endpoint->bEndpointAddress & USB_DIR_IN) && | 306 | usb_endpoint_is_bulk_out(endpoint)) { |
309 | ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) | ||
310 | == USB_ENDPOINT_XFER_BULK)) { | ||
311 | /* we found a bulk out endpoint */ | 307 | /* we found a bulk out endpoint */ |
312 | dev->bulk_out_endpointAddr = endpoint->bEndpointAddress; | 308 | dev->bulk_out_endpointAddr = endpoint->bEndpointAddress; |
313 | } | 309 | } |
diff --git a/drivers/usb/misc/usbled.c b/drivers/usb/misc/usbled.c index 0c5ee0ad6bb9..49c5c5c4c431 100644 --- a/drivers/usb/misc/usbled.c +++ b/drivers/usb/misc/usbled.c | |||
@@ -108,22 +108,34 @@ static int led_probe(struct usb_interface *interface, const struct usb_device_id | |||
108 | dev = kzalloc(sizeof(struct usb_led), GFP_KERNEL); | 108 | dev = kzalloc(sizeof(struct usb_led), GFP_KERNEL); |
109 | if (dev == NULL) { | 109 | if (dev == NULL) { |
110 | dev_err(&interface->dev, "Out of memory\n"); | 110 | dev_err(&interface->dev, "Out of memory\n"); |
111 | goto error; | 111 | goto error_mem; |
112 | } | 112 | } |
113 | 113 | ||
114 | dev->udev = usb_get_dev(udev); | 114 | dev->udev = usb_get_dev(udev); |
115 | 115 | ||
116 | usb_set_intfdata (interface, dev); | 116 | usb_set_intfdata (interface, dev); |
117 | 117 | ||
118 | device_create_file(&interface->dev, &dev_attr_blue); | 118 | retval = device_create_file(&interface->dev, &dev_attr_blue); |
119 | device_create_file(&interface->dev, &dev_attr_red); | 119 | if (retval) |
120 | device_create_file(&interface->dev, &dev_attr_green); | 120 | goto error; |
121 | retval = device_create_file(&interface->dev, &dev_attr_red); | ||
122 | if (retval) | ||
123 | goto error; | ||
124 | retval = device_create_file(&interface->dev, &dev_attr_green); | ||
125 | if (retval) | ||
126 | goto error; | ||
121 | 127 | ||
122 | dev_info(&interface->dev, "USB LED device now attached\n"); | 128 | dev_info(&interface->dev, "USB LED device now attached\n"); |
123 | return 0; | 129 | return 0; |
124 | 130 | ||
125 | error: | 131 | error: |
132 | device_remove_file(&interface->dev, &dev_attr_blue); | ||
133 | device_remove_file(&interface->dev, &dev_attr_red); | ||
134 | device_remove_file(&interface->dev, &dev_attr_green); | ||
135 | usb_set_intfdata (interface, NULL); | ||
136 | usb_put_dev(dev->udev); | ||
126 | kfree(dev); | 137 | kfree(dev); |
138 | error_mem: | ||
127 | return retval; | 139 | return retval; |
128 | } | 140 | } |
129 | 141 | ||