aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/input/ati_remote.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor_core@ameritech.net>2005-05-29 03:29:01 -0400
committerDmitry Torokhov <dtor_core@ameritech.net>2005-05-29 03:29:01 -0400
commit05f091ab4c8c1f12f8dd38ee789489904fea327d (patch)
tree6ad1f600921354b3ea834b84f33ce9397f6818a5 /drivers/usb/input/ati_remote.c
parentab0c3443ad2de03383f2549195badf64779d08a1 (diff)
Input: whitespace fixes in drivers/usb/input
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/usb/input/ati_remote.c')
-rw-r--r--drivers/usb/input/ati_remote.c221
1 files changed, 110 insertions, 111 deletions
diff --git a/drivers/usb/input/ati_remote.c b/drivers/usb/input/ati_remote.c
index 860df26323b1..cf45add81713 100644
--- a/drivers/usb/input/ati_remote.c
+++ b/drivers/usb/input/ati_remote.c
@@ -1,15 +1,15 @@
1/* 1/*
2 * USB ATI Remote support 2 * USB ATI Remote support
3 * 3 *
4 * Version 2.2.0 Copyright (c) 2004 Torrey Hoffman <thoffman@arnor.net> 4 * Version 2.2.0 Copyright (c) 2004 Torrey Hoffman <thoffman@arnor.net>
5 * Version 2.1.1 Copyright (c) 2002 Vladimir Dergachev 5 * Version 2.1.1 Copyright (c) 2002 Vladimir Dergachev
6 * 6 *
7 * This 2.2.0 version is a rewrite / cleanup of the 2.1.1 driver, including 7 * This 2.2.0 version is a rewrite / cleanup of the 2.1.1 driver, including
8 * porting to the 2.6 kernel interfaces, along with other modification 8 * porting to the 2.6 kernel interfaces, along with other modification
9 * to better match the style of the existing usb/input drivers. However, the 9 * to better match the style of the existing usb/input drivers. However, the
10 * protocol and hardware handling is essentially unchanged from 2.1.1. 10 * protocol and hardware handling is essentially unchanged from 2.1.1.
11 * 11 *
12 * The 2.1.1 driver was derived from the usbati_remote and usbkbd drivers by 12 * The 2.1.1 driver was derived from the usbati_remote and usbkbd drivers by
13 * Vojtech Pavlik. 13 * Vojtech Pavlik.
14 * 14 *
15 * Changes: 15 * Changes:
@@ -23,64 +23,64 @@
23 * Added support for the "Lola" remote contributed by: 23 * Added support for the "Lola" remote contributed by:
24 * Seth Cohn <sethcohn@yahoo.com> 24 * Seth Cohn <sethcohn@yahoo.com>
25 * 25 *
26 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 26 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
27 * 27 *
28 * This program is free software; you can redistribute it and/or modify 28 * This program is free software; you can redistribute it and/or modify
29 * it under the terms of the GNU General Public License as published by 29 * it under the terms of the GNU General Public License as published by
30 * the Free Software Foundation; either version 2 of the License, or 30 * the Free Software Foundation; either version 2 of the License, or
31 * (at your option) any later version. 31 * (at your option) any later version.
32 * 32 *
33 * This program is distributed in the hope that it will be useful, 33 * This program is distributed in the hope that it will be useful,
34 * but WITHOUT ANY WARRANTY; without even the implied warranty of 34 * but WITHOUT ANY WARRANTY; without even the implied warranty of
35 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 35 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
36 * GNU General Public License for more details. 36 * GNU General Public License for more details.
37 * 37 *
38 * You should have received a copy of the GNU General Public License 38 * You should have received a copy of the GNU General Public License
39 * along with this program; if not, write to the Free Software 39 * along with this program; if not, write to the Free Software
40 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 40 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
41 * 41 *
42 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 42 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
43 * 43 *
44 * Hardware & software notes 44 * Hardware & software notes
45 * 45 *
46 * These remote controls are distributed by ATI as part of their 46 * These remote controls are distributed by ATI as part of their
47 * "All-In-Wonder" video card packages. The receiver self-identifies as a 47 * "All-In-Wonder" video card packages. The receiver self-identifies as a
48 * "USB Receiver" with manufacturer "X10 Wireless Technology Inc". 48 * "USB Receiver" with manufacturer "X10 Wireless Technology Inc".
49 * 49 *
50 * The "Lola" remote is available from X10. See: 50 * The "Lola" remote is available from X10. See:
51 * http://www.x10.com/products/lola_sg1.htm 51 * http://www.x10.com/products/lola_sg1.htm
52 * The Lola is similar to the ATI remote but has no mouse support, and slightly 52 * The Lola is similar to the ATI remote but has no mouse support, and slightly
53 * different keys. 53 * different keys.
54 * 54 *
55 * It is possible to use multiple receivers and remotes on multiple computers 55 * It is possible to use multiple receivers and remotes on multiple computers
56 * simultaneously by configuring them to use specific channels. 56 * simultaneously by configuring them to use specific channels.
57 * 57 *
58 * The RF protocol used by the remote supports 16 distinct channels, 1 to 16. 58 * The RF protocol used by the remote supports 16 distinct channels, 1 to 16.
59 * Actually, it may even support more, at least in some revisions of the 59 * Actually, it may even support more, at least in some revisions of the
60 * hardware. 60 * hardware.
61 * 61 *
62 * Each remote can be configured to transmit on one channel as follows: 62 * Each remote can be configured to transmit on one channel as follows:
63 * - Press and hold the "hand icon" button. 63 * - Press and hold the "hand icon" button.
64 * - When the red LED starts to blink, let go of the "hand icon" button. 64 * - When the red LED starts to blink, let go of the "hand icon" button.
65 * - When it stops blinking, input the channel code as two digits, from 01 65 * - When it stops blinking, input the channel code as two digits, from 01
66 * to 16, and press the hand icon again. 66 * to 16, and press the hand icon again.
67 * 67 *
68 * The timing can be a little tricky. Try loading the module with debug=1 68 * The timing can be a little tricky. Try loading the module with debug=1
69 * to have the kernel print out messages about the remote control number 69 * to have the kernel print out messages about the remote control number
70 * and mask. Note: debugging prints remote numbers as zero-based hexadecimal. 70 * and mask. Note: debugging prints remote numbers as zero-based hexadecimal.
71 * 71 *
72 * The driver has a "channel_mask" parameter. This bitmask specifies which 72 * The driver has a "channel_mask" parameter. This bitmask specifies which
73 * channels will be ignored by the module. To mask out channels, just add 73 * channels will be ignored by the module. To mask out channels, just add
74 * all the 2^channel_number values together. 74 * all the 2^channel_number values together.
75 * 75 *
76 * For instance, set channel_mask = 2^4 = 16 (binary 10000) to make ati_remote 76 * For instance, set channel_mask = 2^4 = 16 (binary 10000) to make ati_remote
77 * ignore signals coming from remote controls transmitting on channel 4, but 77 * ignore signals coming from remote controls transmitting on channel 4, but
78 * accept all other channels. 78 * accept all other channels.
79 * 79 *
80 * Or, set channel_mask = 65533, (0xFFFD), and all channels except 1 will be 80 * Or, set channel_mask = 65533, (0xFFFD), and all channels except 1 will be
81 * ignored. 81 * ignored.
82 * 82 *
83 * The default is 0 (respond to all channels). Bit 0 and bits 17-32 of this 83 * The default is 0 (respond to all channels). Bit 0 and bits 17-32 of this
84 * parameter are unused. 84 * parameter are unused.
85 * 85 *
86 */ 86 */
@@ -99,13 +99,13 @@
99/* 99/*
100 * Module and Version Information, Module Parameters 100 * Module and Version Information, Module Parameters
101 */ 101 */
102 102
103#define ATI_REMOTE_VENDOR_ID 0x0bc7 103#define ATI_REMOTE_VENDOR_ID 0x0bc7
104#define ATI_REMOTE_PRODUCT_ID 0x004 104#define ATI_REMOTE_PRODUCT_ID 0x004
105#define LOLA_REMOTE_PRODUCT_ID 0x002 105#define LOLA_REMOTE_PRODUCT_ID 0x002
106#define MEDION_REMOTE_PRODUCT_ID 0x006 106#define MEDION_REMOTE_PRODUCT_ID 0x006
107 107
108#define DRIVER_VERSION "2.2.1" 108#define DRIVER_VERSION "2.2.1"
109#define DRIVER_AUTHOR "Torrey Hoffman <thoffman@arnor.net>" 109#define DRIVER_AUTHOR "Torrey Hoffman <thoffman@arnor.net>"
110#define DRIVER_DESC "ATI/X10 RF USB Remote Control" 110#define DRIVER_DESC "ATI/X10 RF USB Remote Control"
111 111
@@ -124,7 +124,7 @@ MODULE_PARM_DESC(debug, "Enable extra debug messages and information");
124#define dbginfo(dev, format, arg...) do { if (debug) dev_info(dev , format , ## arg); } while (0) 124#define dbginfo(dev, format, arg...) do { if (debug) dev_info(dev , format , ## arg); } while (0)
125#undef err 125#undef err
126#define err(format, arg...) printk(KERN_ERR format , ## arg) 126#define err(format, arg...) printk(KERN_ERR format , ## arg)
127 127
128static struct usb_device_id ati_remote_table[] = { 128static struct usb_device_id ati_remote_table[] = {
129 { USB_DEVICE(ATI_REMOTE_VENDOR_ID, ATI_REMOTE_PRODUCT_ID) }, 129 { USB_DEVICE(ATI_REMOTE_VENDOR_ID, ATI_REMOTE_PRODUCT_ID) },
130 { USB_DEVICE(ATI_REMOTE_VENDOR_ID, LOLA_REMOTE_PRODUCT_ID) }, 130 { USB_DEVICE(ATI_REMOTE_VENDOR_ID, LOLA_REMOTE_PRODUCT_ID) },
@@ -148,7 +148,7 @@ static char init2[] = { 0x01, 0x00, 0x20, 0x14, 0x20, 0x20, 0x20 };
148/* Acceleration curve for directional control pad */ 148/* Acceleration curve for directional control pad */
149static char accel[] = { 1, 2, 4, 6, 9, 13, 20 }; 149static char accel[] = { 1, 2, 4, 6, 9, 13, 20 };
150 150
151/* Duplicate event filtering time. 151/* Duplicate event filtering time.
152 * Sequential, identical KIND_FILTERED inputs with less than 152 * Sequential, identical KIND_FILTERED inputs with less than
153 * FILTER_TIME jiffies between them are considered as repeat 153 * FILTER_TIME jiffies between them are considered as repeat
154 * events. The hardware generates 5 events for the first keypress 154 * events. The hardware generates 5 events for the first keypress
@@ -161,10 +161,10 @@ static char accel[] = { 1, 2, 4, 6, 9, 13, 20 };
161static DECLARE_MUTEX(disconnect_sem); 161static DECLARE_MUTEX(disconnect_sem);
162 162
163struct ati_remote { 163struct ati_remote {
164 struct input_dev idev; 164 struct input_dev idev;
165 struct usb_device *udev; 165 struct usb_device *udev;
166 struct usb_interface *interface; 166 struct usb_interface *interface;
167 167
168 struct urb *irq_urb; 168 struct urb *irq_urb;
169 struct urb *out_urb; 169 struct urb *out_urb;
170 struct usb_endpoint_descriptor *endpoint_in; 170 struct usb_endpoint_descriptor *endpoint_in;
@@ -175,12 +175,12 @@ struct ati_remote {
175 dma_addr_t outbuf_dma; 175 dma_addr_t outbuf_dma;
176 176
177 int open; /* open counter */ 177 int open; /* open counter */
178 178
179 unsigned char old_data[2]; /* Detect duplicate events */ 179 unsigned char old_data[2]; /* Detect duplicate events */
180 unsigned long old_jiffies; 180 unsigned long old_jiffies;
181 unsigned long acc_jiffies; /* handle acceleration */ 181 unsigned long acc_jiffies; /* handle acceleration */
182 unsigned int repeat_count; 182 unsigned int repeat_count;
183 183
184 char name[NAME_BUFSIZE]; 184 char name[NAME_BUFSIZE];
185 char phys[NAME_BUFSIZE]; 185 char phys[NAME_BUFSIZE];
186 186
@@ -206,14 +206,14 @@ static struct
206 int type; 206 int type;
207 unsigned int code; 207 unsigned int code;
208 int value; 208 int value;
209} ati_remote_tbl[] = 209} ati_remote_tbl[] =
210{ 210{
211 /* Directional control pad axes */ 211 /* Directional control pad axes */
212 {KIND_ACCEL, 0x35, 0x70, EV_REL, REL_X, -1}, /* left */ 212 {KIND_ACCEL, 0x35, 0x70, EV_REL, REL_X, -1}, /* left */
213 {KIND_ACCEL, 0x36, 0x71, EV_REL, REL_X, 1}, /* right */ 213 {KIND_ACCEL, 0x36, 0x71, EV_REL, REL_X, 1}, /* right */
214 {KIND_ACCEL, 0x37, 0x72, EV_REL, REL_Y, -1}, /* up */ 214 {KIND_ACCEL, 0x37, 0x72, EV_REL, REL_Y, -1}, /* up */
215 {KIND_ACCEL, 0x38, 0x73, EV_REL, REL_Y, 1}, /* down */ 215 {KIND_ACCEL, 0x38, 0x73, EV_REL, REL_Y, 1}, /* down */
216 /* Directional control pad diagonals */ 216 /* Directional control pad diagonals */
217 {KIND_LU, 0x39, 0x74, EV_REL, 0, 0}, /* left up */ 217 {KIND_LU, 0x39, 0x74, EV_REL, 0, 0}, /* left up */
218 {KIND_RU, 0x3a, 0x75, EV_REL, 0, 0}, /* right up */ 218 {KIND_RU, 0x3a, 0x75, EV_REL, 0, 0}, /* right up */
219 {KIND_LD, 0x3c, 0x77, EV_REL, 0, 0}, /* left down */ 219 {KIND_LD, 0x3c, 0x77, EV_REL, 0, 0}, /* left down */
@@ -225,7 +225,7 @@ static struct
225 {KIND_LITERAL, 0x41, 0x7c, EV_KEY, BTN_RIGHT, 1},/* right btn down */ 225 {KIND_LITERAL, 0x41, 0x7c, EV_KEY, BTN_RIGHT, 1},/* right btn down */
226 {KIND_LITERAL, 0x42, 0x7d, EV_KEY, BTN_RIGHT, 0},/* right btn up */ 226 {KIND_LITERAL, 0x42, 0x7d, EV_KEY, BTN_RIGHT, 0},/* right btn up */
227 227
228 /* Artificial "doubleclick" events are generated by the hardware. 228 /* Artificial "doubleclick" events are generated by the hardware.
229 * They are mapped to the "side" and "extra" mouse buttons here. */ 229 * They are mapped to the "side" and "extra" mouse buttons here. */
230 {KIND_FILTERED, 0x3f, 0x7a, EV_KEY, BTN_SIDE, 1}, /* left dblclick */ 230 {KIND_FILTERED, 0x3f, 0x7a, EV_KEY, BTN_SIDE, 1}, /* left dblclick */
231 {KIND_FILTERED, 0x43, 0x7e, EV_KEY, BTN_EXTRA, 1},/* right dblclick */ 231 {KIND_FILTERED, 0x43, 0x7e, EV_KEY, BTN_EXTRA, 1},/* right dblclick */
@@ -273,15 +273,15 @@ static struct
273 {KIND_FILTERED, 0xea, 0x25, EV_KEY, KEY_PLAY, 1}, /* ( >) */ 273 {KIND_FILTERED, 0xea, 0x25, EV_KEY, KEY_PLAY, 1}, /* ( >) */
274 {KIND_FILTERED, 0xe9, 0x24, EV_KEY, KEY_REWIND, 1}, /* (<<) */ 274 {KIND_FILTERED, 0xe9, 0x24, EV_KEY, KEY_REWIND, 1}, /* (<<) */
275 {KIND_FILTERED, 0xeb, 0x26, EV_KEY, KEY_FORWARD, 1}, /* (>>) */ 275 {KIND_FILTERED, 0xeb, 0x26, EV_KEY, KEY_FORWARD, 1}, /* (>>) */
276 {KIND_FILTERED, 0xed, 0x28, EV_KEY, KEY_STOP, 1}, /* ([]) */ 276 {KIND_FILTERED, 0xed, 0x28, EV_KEY, KEY_STOP, 1}, /* ([]) */
277 {KIND_FILTERED, 0xee, 0x29, EV_KEY, KEY_PAUSE, 1}, /* ('') */ 277 {KIND_FILTERED, 0xee, 0x29, EV_KEY, KEY_PAUSE, 1}, /* ('') */
278 {KIND_FILTERED, 0xf0, 0x2b, EV_KEY, KEY_PREVIOUS, 1}, /* (<-) */ 278 {KIND_FILTERED, 0xf0, 0x2b, EV_KEY, KEY_PREVIOUS, 1}, /* (<-) */
279 {KIND_FILTERED, 0xef, 0x2a, EV_KEY, KEY_NEXT, 1}, /* (>+) */ 279 {KIND_FILTERED, 0xef, 0x2a, EV_KEY, KEY_NEXT, 1}, /* (>+) */
280 {KIND_FILTERED, 0xf2, 0x2D, EV_KEY, KEY_INFO, 1}, /* PLAYING */ 280 {KIND_FILTERED, 0xf2, 0x2D, EV_KEY, KEY_INFO, 1}, /* PLAYING */
281 {KIND_FILTERED, 0xf3, 0x2E, EV_KEY, KEY_HOME, 1}, /* TOP */ 281 {KIND_FILTERED, 0xf3, 0x2E, EV_KEY, KEY_HOME, 1}, /* TOP */
282 {KIND_FILTERED, 0xf4, 0x2F, EV_KEY, KEY_END, 1}, /* END */ 282 {KIND_FILTERED, 0xf4, 0x2F, EV_KEY, KEY_END, 1}, /* END */
283 {KIND_FILTERED, 0xf5, 0x30, EV_KEY, KEY_SELECT, 1}, /* SELECT */ 283 {KIND_FILTERED, 0xf5, 0x30, EV_KEY, KEY_SELECT, 1}, /* SELECT */
284 284
285 {KIND_END, 0x00, 0x00, EV_MAX + 1, 0, 0} 285 {KIND_END, 0x00, 0x00, EV_MAX + 1, 0, 0}
286}; 286};
287 287
@@ -315,7 +315,7 @@ static void ati_remote_dump(unsigned char *data, unsigned int len)
315 if ((len == 1) && (data[0] != (unsigned char)0xff) && (data[0] != 0x00)) 315 if ((len == 1) && (data[0] != (unsigned char)0xff) && (data[0] != 0x00))
316 warn("Weird byte 0x%02x", data[0]); 316 warn("Weird byte 0x%02x", data[0]);
317 else if (len == 4) 317 else if (len == 4)
318 warn("Weird key %02x %02x %02x %02x", 318 warn("Weird key %02x %02x %02x %02x",
319 data[0], data[1], data[2], data[3]); 319 data[0], data[1], data[2], data[3]);
320 else 320 else
321 warn("Weird data, len=%d %02x %02x %02x %02x %02x %02x ...", 321 warn("Weird data, len=%d %02x %02x %02x %02x %02x %02x ...",
@@ -338,7 +338,7 @@ static int ati_remote_open(struct input_dev *inputdev)
338 /* On first open, submit the read urb which was set up previously. */ 338 /* On first open, submit the read urb which was set up previously. */
339 ati_remote->irq_urb->dev = ati_remote->udev; 339 ati_remote->irq_urb->dev = ati_remote->udev;
340 if (usb_submit_urb(ati_remote->irq_urb, GFP_KERNEL)) { 340 if (usb_submit_urb(ati_remote->irq_urb, GFP_KERNEL)) {
341 dev_err(&ati_remote->interface->dev, 341 dev_err(&ati_remote->interface->dev,
342 "%s: usb_submit_urb failed!\n", __FUNCTION__); 342 "%s: usb_submit_urb failed!\n", __FUNCTION__);
343 ati_remote->open--; 343 ati_remote->open--;
344 retval = -EIO; 344 retval = -EIO;
@@ -355,7 +355,7 @@ exit:
355static void ati_remote_close(struct input_dev *inputdev) 355static void ati_remote_close(struct input_dev *inputdev)
356{ 356{
357 struct ati_remote *ati_remote = inputdev->private; 357 struct ati_remote *ati_remote = inputdev->private;
358 358
359 if (!--ati_remote->open) 359 if (!--ati_remote->open)
360 usb_kill_urb(ati_remote->irq_urb); 360 usb_kill_urb(ati_remote->irq_urb);
361} 361}
@@ -366,13 +366,13 @@ static void ati_remote_close(struct input_dev *inputdev)
366static void ati_remote_irq_out(struct urb *urb, struct pt_regs *regs) 366static void ati_remote_irq_out(struct urb *urb, struct pt_regs *regs)
367{ 367{
368 struct ati_remote *ati_remote = urb->context; 368 struct ati_remote *ati_remote = urb->context;
369 369
370 if (urb->status) { 370 if (urb->status) {
371 dev_dbg(&ati_remote->interface->dev, "%s: status %d\n", 371 dev_dbg(&ati_remote->interface->dev, "%s: status %d\n",
372 __FUNCTION__, urb->status); 372 __FUNCTION__, urb->status);
373 return; 373 return;
374 } 374 }
375 375
376 ati_remote->send_flags |= SEND_FLAG_COMPLETE; 376 ati_remote->send_flags |= SEND_FLAG_COMPLETE;
377 wmb(); 377 wmb();
378 wake_up(&ati_remote->wait); 378 wake_up(&ati_remote->wait);
@@ -380,16 +380,16 @@ static void ati_remote_irq_out(struct urb *urb, struct pt_regs *regs)
380 380
381/* 381/*
382 * ati_remote_sendpacket 382 * ati_remote_sendpacket
383 * 383 *
384 * Used to send device initialization strings 384 * Used to send device initialization strings
385 */ 385 */
386static int ati_remote_sendpacket(struct ati_remote *ati_remote, u16 cmd, unsigned char *data) 386static int ati_remote_sendpacket(struct ati_remote *ati_remote, u16 cmd, unsigned char *data)
387{ 387{
388 int retval = 0; 388 int retval = 0;
389 389
390 /* Set up out_urb */ 390 /* Set up out_urb */
391 memcpy(ati_remote->out_urb->transfer_buffer + 1, data, LO(cmd)); 391 memcpy(ati_remote->out_urb->transfer_buffer + 1, data, LO(cmd));
392 ((char *) ati_remote->out_urb->transfer_buffer)[0] = HI(cmd); 392 ((char *) ati_remote->out_urb->transfer_buffer)[0] = HI(cmd);
393 393
394 ati_remote->out_urb->transfer_buffer_length = LO(cmd) + 1; 394 ati_remote->out_urb->transfer_buffer_length = LO(cmd) + 1;
395 ati_remote->out_urb->dev = ati_remote->udev; 395 ati_remote->out_urb->dev = ati_remote->udev;
@@ -397,17 +397,17 @@ static int ati_remote_sendpacket(struct ati_remote *ati_remote, u16 cmd, unsigne
397 397
398 retval = usb_submit_urb(ati_remote->out_urb, GFP_ATOMIC); 398 retval = usb_submit_urb(ati_remote->out_urb, GFP_ATOMIC);
399 if (retval) { 399 if (retval) {
400 dev_dbg(&ati_remote->interface->dev, 400 dev_dbg(&ati_remote->interface->dev,
401 "sendpacket: usb_submit_urb failed: %d\n", retval); 401 "sendpacket: usb_submit_urb failed: %d\n", retval);
402 return retval; 402 return retval;
403 } 403 }
404 404
405 wait_event_timeout(ati_remote->wait, 405 wait_event_timeout(ati_remote->wait,
406 ((ati_remote->out_urb->status != -EINPROGRESS) || 406 ((ati_remote->out_urb->status != -EINPROGRESS) ||
407 (ati_remote->send_flags & SEND_FLAG_COMPLETE)), 407 (ati_remote->send_flags & SEND_FLAG_COMPLETE)),
408 HZ); 408 HZ);
409 usb_kill_urb(ati_remote->out_urb); 409 usb_kill_urb(ati_remote->out_urb);
410 410
411 return retval; 411 return retval;
412} 412}
413 413
@@ -419,15 +419,15 @@ static int ati_remote_event_lookup(int rem, unsigned char d1, unsigned char d2)
419 int i; 419 int i;
420 420
421 for (i = 0; ati_remote_tbl[i].kind != KIND_END; i++) { 421 for (i = 0; ati_remote_tbl[i].kind != KIND_END; i++) {
422 /* 422 /*
423 * Decide if the table entry matches the remote input. 423 * Decide if the table entry matches the remote input.
424 */ 424 */
425 if ((((ati_remote_tbl[i].data1 & 0x0f) == (d1 & 0x0f))) && 425 if ((((ati_remote_tbl[i].data1 & 0x0f) == (d1 & 0x0f))) &&
426 ((((ati_remote_tbl[i].data1 >> 4) - 426 ((((ati_remote_tbl[i].data1 >> 4) -
427 (d1 >> 4) + rem) & 0x0f) == 0x0f) && 427 (d1 >> 4) + rem) & 0x0f) == 0x0f) &&
428 (ati_remote_tbl[i].data2 == d2)) 428 (ati_remote_tbl[i].data2 == d2))
429 return i; 429 return i;
430 430
431 } 431 }
432 return -1; 432 return -1;
433} 433}
@@ -435,16 +435,16 @@ static int ati_remote_event_lookup(int rem, unsigned char d1, unsigned char d2)
435/* 435/*
436 * ati_remote_report_input 436 * ati_remote_report_input
437 */ 437 */
438static void ati_remote_input_report(struct urb *urb, struct pt_regs *regs) 438static void ati_remote_input_report(struct urb *urb, struct pt_regs *regs)
439{ 439{
440 struct ati_remote *ati_remote = urb->context; 440 struct ati_remote *ati_remote = urb->context;
441 unsigned char *data= ati_remote->inbuf; 441 unsigned char *data= ati_remote->inbuf;
442 struct input_dev *dev = &ati_remote->idev; 442 struct input_dev *dev = &ati_remote->idev;
443 int index, acc; 443 int index, acc;
444 int remote_num; 444 int remote_num;
445 445
446 /* Deal with strange looking inputs */ 446 /* Deal with strange looking inputs */
447 if ( (urb->actual_length != 4) || (data[0] != 0x14) || 447 if ( (urb->actual_length != 4) || (data[0] != 0x14) ||
448 ((data[3] & 0x0f) != 0x00) ) { 448 ((data[3] & 0x0f) != 0x00) ) {
449 ati_remote_dump(data, urb->actual_length); 449 ati_remote_dump(data, urb->actual_length);
450 return; 450 return;
@@ -453,7 +453,7 @@ static void ati_remote_input_report(struct urb *urb, struct pt_regs *regs)
453 /* Mask unwanted remote channels. */ 453 /* Mask unwanted remote channels. */
454 /* note: remote_num is 0-based, channel 1 on remote == 0 here */ 454 /* note: remote_num is 0-based, channel 1 on remote == 0 here */
455 remote_num = (data[3] >> 4) & 0x0f; 455 remote_num = (data[3] >> 4) & 0x0f;
456 if (channel_mask & (1 << (remote_num + 1))) { 456 if (channel_mask & (1 << (remote_num + 1))) {
457 dbginfo(&ati_remote->interface->dev, 457 dbginfo(&ati_remote->interface->dev,
458 "Masked input from channel 0x%02x: data %02x,%02x, mask= 0x%02lx\n", 458 "Masked input from channel 0x%02x: data %02x,%02x, mask= 0x%02lx\n",
459 remote_num, data[1], data[2], channel_mask); 459 remote_num, data[1], data[2], channel_mask);
@@ -463,37 +463,36 @@ static void ati_remote_input_report(struct urb *urb, struct pt_regs *regs)
463 /* Look up event code index in translation table */ 463 /* Look up event code index in translation table */
464 index = ati_remote_event_lookup(remote_num, data[1], data[2]); 464 index = ati_remote_event_lookup(remote_num, data[1], data[2]);
465 if (index < 0) { 465 if (index < 0) {
466 dev_warn(&ati_remote->interface->dev, 466 dev_warn(&ati_remote->interface->dev,
467 "Unknown input from channel 0x%02x: data %02x,%02x\n", 467 "Unknown input from channel 0x%02x: data %02x,%02x\n",
468 remote_num, data[1], data[2]); 468 remote_num, data[1], data[2]);
469 return; 469 return;
470 } 470 }
471 dbginfo(&ati_remote->interface->dev, 471 dbginfo(&ati_remote->interface->dev,
472 "channel 0x%02x; data %02x,%02x; index %d; keycode %d\n", 472 "channel 0x%02x; data %02x,%02x; index %d; keycode %d\n",
473 remote_num, data[1], data[2], index, ati_remote_tbl[index].code); 473 remote_num, data[1], data[2], index, ati_remote_tbl[index].code);
474 474
475 if (ati_remote_tbl[index].kind == KIND_LITERAL) { 475 if (ati_remote_tbl[index].kind == KIND_LITERAL) {
476 input_regs(dev, regs); 476 input_regs(dev, regs);
477 input_event(dev, ati_remote_tbl[index].type, 477 input_event(dev, ati_remote_tbl[index].type,
478 ati_remote_tbl[index].code, 478 ati_remote_tbl[index].code,
479 ati_remote_tbl[index].value); 479 ati_remote_tbl[index].value);
480 input_sync(dev); 480 input_sync(dev);
481 481
482 ati_remote->old_jiffies = jiffies; 482 ati_remote->old_jiffies = jiffies;
483 return; 483 return;
484 } 484 }
485 485
486 if (ati_remote_tbl[index].kind == KIND_FILTERED) { 486 if (ati_remote_tbl[index].kind == KIND_FILTERED) {
487 /* Filter duplicate events which happen "too close" together. */ 487 /* Filter duplicate events which happen "too close" together. */
488 if ((ati_remote->old_data[0] == data[1]) && 488 if ((ati_remote->old_data[0] == data[1]) &&
489 (ati_remote->old_data[1] == data[2]) && 489 (ati_remote->old_data[1] == data[2]) &&
490 ((ati_remote->old_jiffies + FILTER_TIME) > jiffies)) { 490 ((ati_remote->old_jiffies + FILTER_TIME) > jiffies)) {
491 ati_remote->repeat_count++; 491 ati_remote->repeat_count++;
492 } 492 } else {
493 else {
494 ati_remote->repeat_count = 0; 493 ati_remote->repeat_count = 0;
495 } 494 }
496 495
497 ati_remote->old_data[0] = data[1]; 496 ati_remote->old_data[0] = data[1];
498 ati_remote->old_data[1] = data[2]; 497 ati_remote->old_data[1] = data[2];
499 ati_remote->old_jiffies = jiffies; 498 ati_remote->old_jiffies = jiffies;
@@ -501,7 +500,7 @@ static void ati_remote_input_report(struct urb *urb, struct pt_regs *regs)
501 if ((ati_remote->repeat_count > 0) 500 if ((ati_remote->repeat_count > 0)
502 && (ati_remote->repeat_count < 5)) 501 && (ati_remote->repeat_count < 5))
503 return; 502 return;
504 503
505 504
506 input_regs(dev, regs); 505 input_regs(dev, regs);
507 input_event(dev, ati_remote_tbl[index].type, 506 input_event(dev, ati_remote_tbl[index].type,
@@ -511,13 +510,13 @@ static void ati_remote_input_report(struct urb *urb, struct pt_regs *regs)
511 input_sync(dev); 510 input_sync(dev);
512 511
513 return; 512 return;
514 } 513 }
515 514
516 /* 515 /*
517 * Other event kinds are from the directional control pad, and have an 516 * Other event kinds are from the directional control pad, and have an
518 * acceleration factor applied to them. Without this acceleration, the 517 * acceleration factor applied to them. Without this acceleration, the
519 * control pad is mostly unusable. 518 * control pad is mostly unusable.
520 * 519 *
521 * If elapsed time since last event is > 1/4 second, user "stopped", 520 * If elapsed time since last event is > 1/4 second, user "stopped",
522 * so reset acceleration. Otherwise, user is probably holding the control 521 * so reset acceleration. Otherwise, user is probably holding the control
523 * pad down, so we increase acceleration, ramping up over two seconds to 522 * pad down, so we increase acceleration, ramping up over two seconds to
@@ -559,7 +558,7 @@ static void ati_remote_input_report(struct urb *urb, struct pt_regs *regs)
559 input_report_rel(dev, REL_Y, acc); 558 input_report_rel(dev, REL_Y, acc);
560 break; 559 break;
561 default: 560 default:
562 dev_dbg(&ati_remote->interface->dev, "ati_remote kind=%d\n", 561 dev_dbg(&ati_remote->interface->dev, "ati_remote kind=%d\n",
563 ati_remote_tbl[index].kind); 562 ati_remote_tbl[index].kind);
564 } 563 }
565 input_sync(dev); 564 input_sync(dev);
@@ -586,12 +585,12 @@ static void ati_remote_irq_in(struct urb *urb, struct pt_regs *regs)
586 case -ESHUTDOWN: 585 case -ESHUTDOWN:
587 dev_dbg(&ati_remote->interface->dev, "%s: urb error status, unlink? \n", 586 dev_dbg(&ati_remote->interface->dev, "%s: urb error status, unlink? \n",
588 __FUNCTION__); 587 __FUNCTION__);
589 return; 588 return;
590 default: /* error */ 589 default: /* error */
591 dev_dbg(&ati_remote->interface->dev, "%s: Nonzero urb status %d\n", 590 dev_dbg(&ati_remote->interface->dev, "%s: Nonzero urb status %d\n",
592 __FUNCTION__, urb->status); 591 __FUNCTION__, urb->status);
593 } 592 }
594 593
595 retval = usb_submit_urb(urb, SLAB_ATOMIC); 594 retval = usb_submit_urb(urb, SLAB_ATOMIC);
596 if (retval) 595 if (retval)
597 dev_err(&ati_remote->interface->dev, "%s: usb_submit_urb()=%d\n", 596 dev_err(&ati_remote->interface->dev, "%s: usb_submit_urb()=%d\n",
@@ -614,16 +613,16 @@ static void ati_remote_delete(struct ati_remote *ati_remote)
614 input_unregister_device(&ati_remote->idev); 613 input_unregister_device(&ati_remote->idev);
615 614
616 if (ati_remote->inbuf) 615 if (ati_remote->inbuf)
617 usb_buffer_free(ati_remote->udev, DATA_BUFSIZE, 616 usb_buffer_free(ati_remote->udev, DATA_BUFSIZE,
618 ati_remote->inbuf, ati_remote->inbuf_dma); 617 ati_remote->inbuf, ati_remote->inbuf_dma);
619 618
620 if (ati_remote->outbuf) 619 if (ati_remote->outbuf)
621 usb_buffer_free(ati_remote->udev, DATA_BUFSIZE, 620 usb_buffer_free(ati_remote->udev, DATA_BUFSIZE,
622 ati_remote->outbuf, ati_remote->outbuf_dma); 621 ati_remote->outbuf, ati_remote->outbuf_dma);
623 622
624 if (ati_remote->irq_urb) 623 if (ati_remote->irq_urb)
625 usb_free_urb(ati_remote->irq_urb); 624 usb_free_urb(ati_remote->irq_urb);
626 625
627 if (ati_remote->out_urb) 626 if (ati_remote->out_urb)
628 usb_free_urb(ati_remote->out_urb); 627 usb_free_urb(ati_remote->out_urb);
629 628
@@ -636,21 +635,21 @@ static void ati_remote_input_init(struct ati_remote *ati_remote)
636 int i; 635 int i;
637 636
638 idev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL); 637 idev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
639 idev->keybit[LONG(BTN_MOUSE)] = ( BIT(BTN_LEFT) | BIT(BTN_RIGHT) | 638 idev->keybit[LONG(BTN_MOUSE)] = ( BIT(BTN_LEFT) | BIT(BTN_RIGHT) |
640 BIT(BTN_SIDE) | BIT(BTN_EXTRA) ); 639 BIT(BTN_SIDE) | BIT(BTN_EXTRA) );
641 idev->relbit[0] = BIT(REL_X) | BIT(REL_Y); 640 idev->relbit[0] = BIT(REL_X) | BIT(REL_Y);
642 for (i = 0; ati_remote_tbl[i].kind != KIND_END; i++) 641 for (i = 0; ati_remote_tbl[i].kind != KIND_END; i++)
643 if (ati_remote_tbl[i].type == EV_KEY) 642 if (ati_remote_tbl[i].type == EV_KEY)
644 set_bit(ati_remote_tbl[i].code, idev->keybit); 643 set_bit(ati_remote_tbl[i].code, idev->keybit);
645 644
646 idev->private = ati_remote; 645 idev->private = ati_remote;
647 idev->open = ati_remote_open; 646 idev->open = ati_remote_open;
648 idev->close = ati_remote_close; 647 idev->close = ati_remote_close;
649 648
650 idev->name = ati_remote->name; 649 idev->name = ati_remote->name;
651 idev->phys = ati_remote->phys; 650 idev->phys = ati_remote->phys;
652 651
653 idev->id.bustype = BUS_USB; 652 idev->id.bustype = BUS_USB;
654 idev->id.vendor = le16_to_cpu(ati_remote->udev->descriptor.idVendor); 653 idev->id.vendor = le16_to_cpu(ati_remote->udev->descriptor.idVendor);
655 idev->id.product = le16_to_cpu(ati_remote->udev->descriptor.idProduct); 654 idev->id.product = le16_to_cpu(ati_remote->udev->descriptor.idProduct);
656 idev->id.version = le16_to_cpu(ati_remote->udev->descriptor.bcdDevice); 655 idev->id.version = le16_to_cpu(ati_remote->udev->descriptor.bcdDevice);
@@ -660,27 +659,27 @@ static int ati_remote_initialize(struct ati_remote *ati_remote)
660{ 659{
661 struct usb_device *udev = ati_remote->udev; 660 struct usb_device *udev = ati_remote->udev;
662 int pipe, maxp; 661 int pipe, maxp;
663 662
664 init_waitqueue_head(&ati_remote->wait); 663 init_waitqueue_head(&ati_remote->wait);
665 664
666 /* Set up irq_urb */ 665 /* Set up irq_urb */
667 pipe = usb_rcvintpipe(udev, ati_remote->endpoint_in->bEndpointAddress); 666 pipe = usb_rcvintpipe(udev, ati_remote->endpoint_in->bEndpointAddress);
668 maxp = usb_maxpacket(udev, pipe, usb_pipeout(pipe)); 667 maxp = usb_maxpacket(udev, pipe, usb_pipeout(pipe));
669 maxp = (maxp > DATA_BUFSIZE) ? DATA_BUFSIZE : maxp; 668 maxp = (maxp > DATA_BUFSIZE) ? DATA_BUFSIZE : maxp;
670 669
671 usb_fill_int_urb(ati_remote->irq_urb, udev, pipe, ati_remote->inbuf, 670 usb_fill_int_urb(ati_remote->irq_urb, udev, pipe, ati_remote->inbuf,
672 maxp, ati_remote_irq_in, ati_remote, 671 maxp, ati_remote_irq_in, ati_remote,
673 ati_remote->endpoint_in->bInterval); 672 ati_remote->endpoint_in->bInterval);
674 ati_remote->irq_urb->transfer_dma = ati_remote->inbuf_dma; 673 ati_remote->irq_urb->transfer_dma = ati_remote->inbuf_dma;
675 ati_remote->irq_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; 674 ati_remote->irq_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
676 675
677 /* Set up out_urb */ 676 /* Set up out_urb */
678 pipe = usb_sndintpipe(udev, ati_remote->endpoint_out->bEndpointAddress); 677 pipe = usb_sndintpipe(udev, ati_remote->endpoint_out->bEndpointAddress);
679 maxp = usb_maxpacket(udev, pipe, usb_pipeout(pipe)); 678 maxp = usb_maxpacket(udev, pipe, usb_pipeout(pipe));
680 maxp = (maxp > DATA_BUFSIZE) ? DATA_BUFSIZE : maxp; 679 maxp = (maxp > DATA_BUFSIZE) ? DATA_BUFSIZE : maxp;
681 680
682 usb_fill_int_urb(ati_remote->out_urb, udev, pipe, ati_remote->outbuf, 681 usb_fill_int_urb(ati_remote->out_urb, udev, pipe, ati_remote->outbuf,
683 maxp, ati_remote_irq_out, ati_remote, 682 maxp, ati_remote_irq_out, ati_remote,
684 ati_remote->endpoint_out->bInterval); 683 ati_remote->endpoint_out->bInterval);
685 ati_remote->out_urb->transfer_dma = ati_remote->outbuf_dma; 684 ati_remote->out_urb->transfer_dma = ati_remote->outbuf_dma;
686 ati_remote->out_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; 685 ati_remote->out_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
@@ -688,11 +687,11 @@ static int ati_remote_initialize(struct ati_remote *ati_remote)
688 /* send initialization strings */ 687 /* send initialization strings */
689 if ((ati_remote_sendpacket(ati_remote, 0x8004, init1)) || 688 if ((ati_remote_sendpacket(ati_remote, 0x8004, init1)) ||
690 (ati_remote_sendpacket(ati_remote, 0x8007, init2))) { 689 (ati_remote_sendpacket(ati_remote, 0x8007, init2))) {
691 dev_err(&ati_remote->interface->dev, 690 dev_err(&ati_remote->interface->dev,
692 "Initializing ati_remote hardware failed.\n"); 691 "Initializing ati_remote hardware failed.\n");
693 return 1; 692 return 1;
694 } 693 }
695 694
696 return 0; 695 return 0;
697} 696}
698 697
@@ -769,7 +768,7 @@ static int ati_remote_probe(struct usb_interface *interface, const struct usb_de
769 768
770 if (!strlen(ati_remote->name)) 769 if (!strlen(ati_remote->name))
771 sprintf(ati_remote->name, DRIVER_DESC "(%04x,%04x)", 770 sprintf(ati_remote->name, DRIVER_DESC "(%04x,%04x)",
772 le16_to_cpu(ati_remote->udev->descriptor.idVendor), 771 le16_to_cpu(ati_remote->udev->descriptor.idVendor),
773 le16_to_cpu(ati_remote->udev->descriptor.idProduct)); 772 le16_to_cpu(ati_remote->udev->descriptor.idProduct));
774 773
775 /* Device Hardware Initialization - fills in ati_remote->idev from udev. */ 774 /* Device Hardware Initialization - fills in ati_remote->idev from udev. */
@@ -781,11 +780,11 @@ static int ati_remote_probe(struct usb_interface *interface, const struct usb_de
781 ati_remote_input_init(ati_remote); 780 ati_remote_input_init(ati_remote);
782 input_register_device(&ati_remote->idev); 781 input_register_device(&ati_remote->idev);
783 782
784 dev_info(&ati_remote->interface->dev, "Input registered: %s on %s\n", 783 dev_info(&ati_remote->interface->dev, "Input registered: %s on %s\n",
785 ati_remote->name, path); 784 ati_remote->name, path);
786 785
787 usb_set_intfdata(interface, ati_remote); 786 usb_set_intfdata(interface, ati_remote);
788 787
789error: 788error:
790 if (retval) 789 if (retval)
791 ati_remote_delete(ati_remote); 790 ati_remote_delete(ati_remote);
@@ -808,7 +807,7 @@ static void ati_remote_disconnect(struct usb_interface *interface)
808 warn("%s - null device?\n", __FUNCTION__); 807 warn("%s - null device?\n", __FUNCTION__);
809 return; 808 return;
810 } 809 }
811 810
812 ati_remote_delete(ati_remote); 811 ati_remote_delete(ati_remote);
813 812
814 up(&disconnect_sem); 813 up(&disconnect_sem);
@@ -820,7 +819,7 @@ static void ati_remote_disconnect(struct usb_interface *interface)
820static int __init ati_remote_init(void) 819static int __init ati_remote_init(void)
821{ 820{
822 int result; 821 int result;
823 822
824 result = usb_register(&ati_remote_driver); 823 result = usb_register(&ati_remote_driver);
825 if (result) 824 if (result)
826 err("usb_register error #%d\n", result); 825 err("usb_register error #%d\n", result);
@@ -838,8 +837,8 @@ static void __exit ati_remote_exit(void)
838 usb_deregister(&ati_remote_driver); 837 usb_deregister(&ati_remote_driver);
839} 838}
840 839
841/* 840/*
842 * module specification 841 * module specification
843 */ 842 */
844 843
845module_init(ati_remote_init); 844module_init(ati_remote_init);