Input updates for 2.6.16-rc1
Subsystems (2)
cover Input updates for 2.6.16-rc1
Hi Linus,
Please consider doing a pull from:
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/dtor/input.git/
or
master.kernel.org:/pub/scm/linux/kernel/git/dtor/input.git/
The tree contains several patches that fix crashes and a memory leak in several input drivers; many of them are candidates for -stable as well. Additionally there is new ixp4xx beeper driver, and a couple of cleanups.
Full changelog:
Input: hiddev - fix off-by-one for num_values in uref_multi
requests (Ben Collins)
Input: iforce - fix detection of USB devices
Input: a3d - convert to dynamic input_dev allocation
Input: tmdc - handle errors from input_register_device()
Input: turbografx - handle errors from input_register_device()
Input: gamecon - handle errors from input_register_device()
Input: gamecon - fix crash when accessing device
Input: sidewinder - handle errors from input_register_device()
Input: sidewinder - fix an oops (Zinx Verituse)
Input: db9 - handle errors from input_register_device()
Input: db9 - fix possible crash with Saturn gamepads
Input: grip - handle errors from input_register_device()
Input: grip - fix crash when accessing device
Input: make needlessly global code static (Adrian Bunk)
Input: mousedev - fix memory leak (Kimball Murray)
Input: iforce - do not return ENOMEM upon successful
allocation (Alexey Dobriyan)
Input: psmouse - set name for Genius mice
Input: add ixp4xx beeper driver (Alessandro Zummo)
Diffstat:
input/joystick/a3d.c | 88 ++++---- input/joystick/db9.c | 85 ++++--- input/joystick/gamecon.c | 357 ++++++++++++++++++--------------- input/joystick/grip.c | 11 - input/joystick/iforce/iforce-main.c | 2 input/joystick/iforce/iforce-packets.c | 4 input/joystick/iforce/iforce-usb.c | 1 input/joystick/sidewinder.c | 10 input/joystick/tmdc.c | 15 + input/joystick/turbografx.c | 20 + input/joystick/twidjoy.c | 4 input/misc/Kconfig | 12 + input/misc/Makefile | 1 input/misc/ixp4xx-beeper.c | 183 ++++++++++++++++ input/mouse/psmouse-base.c | 1 input/mousedev.c | 9 input/touchscreen/mk712.c | 2 usb/input/hiddev.c | 2 18 files changed, 543 insertions(+), 264 deletions(-)
--
Dmitry
PATCH 1/18 NSLU2 beeper driver
From: Alessandro Zummo <[email protected]>
Input: add ixp4xx beeper driver
This is a driver for beeper found in LinkSys NSLU2 boxes. It should work on any ixp4xx based platform.
---
drivers/input/misc/Kconfig | 12 ++ drivers/input/misc/Makefile | 1 drivers/input/misc/ixp4xx-beeper.c | 183 +++++++++++++++++++++++++++++++++++++ 3 files changed, 196 insertions(+)
drivers/input/misc/Kconfig +12 -0
@@ -50,6 +50,18 @@ config INPUT_WISTRON_BTNS To compile this driver as a module, choose M here: the module will be called wistron_btns. +config INPUT_IXP4XX_BEEPER + tristate "IXP4XX Beeper support" + depends on ARCH_IXP4XX + help + If you say yes here, you can connect a beeper to the + ixp4xx gpio pins. This is used by the LinkSys NSLU2. + + If unsure, say Y. + + To compile this driver as a module, choose M here: the + module will be called ixp4xx-beeper. + config INPUT_UINPUT tristate "User level driver support" help
drivers/input/misc/Makefile +1 -0
@@ -11,3 +11,4 @@ obj-$(CONFIG_INPUT_98SPKR) += 98spkr.o obj-$(CONFIG_INPUT_UINPUT) += uinput.o obj-$(CONFIG_INPUT_WISTRON_BTNS) += wistron_btns.o obj-$(CONFIG_HP_SDC_RTC) += hp_sdc_rtc.o +obj-$(CONFIG_INPUT_IXP4XX_BEEPER) += ixp4xx-beeper.o
drivers/input/misc/ixp4xx-beeper.c new file +183 -0
183 lines not on this page · raw message
PATCH 2/18 psmouse: set name for Genius mice
In reply to Dmitry TorokhovInput: psmouse - set name for Genius mice
---
drivers/input/mouse/psmouse-base.c | 1 + 1 files changed, 1 insertion(+)
drivers/input/mouse/psmouse-base.c +1 -0
@@ -403,6 +403,7 @@ static int genius_detect(struct psmouseset_bit (REL_WHEEL , psmouse->dev->relbit); psmouse->vendor ="Genius" ; + psmouse->name ="Mouse" ; psmouse->pktsize =4 ; }
PATCH 3/18 iforce: do not return ENOMEM upon successful allocation
In reply to Dmitry TorokhovFrom: Alexey Dobriyan <[email protected]>
Input: iforce - do not return ENOMEM upon successful allocation
---
drivers/input/joystick/iforce/iforce-main.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-)
drivers/input/joystick/iforce/iforce-main.c +1 -1
@@ -345,7 +345,7 @@ int iforce_init_device(struct iforce *ifint i; input_dev =input_allocate_device (); -if (input_dev) +if (!input_dev)return -ENOMEM ;init_waitqueue_head (&iforce->wait);
PATCH 4/18 mousedev: fix memory leak
In reply to Dmitry TorokhovFrom: Kimball Murray <[email protected]>
Input: mousedev - fix memory leak
Apparently, "while true; do cat </dev/null >/dev/input/mice; done" causes an OOM in a short amount of time. Funny that nobody noticed, it actually is very easy to trigger just by switching between VT1 and VT7...
---
drivers/input/mousedev.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-)
drivers/input/mousedev.c +3 -6
@@ -356,7 +356,7 @@ static void mousedev_free(struct mousedekfree (mousedev); } -static int mixdev_release (void ) +static void mixdev_release (void ) {struct input_handle *handle;
@@ -370,8 +370,6 @@ static int mixdev_release(void)mousedev_free (mousedev); } } - -return 0 ; }static int mousedev_release (struct inode * inode,struct file * file)
@@ -384,9 +382,8 @@ static int mousedev_release(struct inodeif (!--list->mousedev->open) {if (list->mousedev->minor ==MOUSEDEV_MIX ) -return mixdev_release (); - -if (!mousedev_mix.open) { +mixdev_release (); +else if (!mousedev_mix.open) {if (list->mousedev->exist)input_close_device (&list->mousedev->handle);else
PATCH 5/18 Make needlessly global code static
In reply to Dmitry TorokhovFrom: Adrian Bunk <[email protected]>
Input: make needlessly global code static
---
drivers/input/joystick/twidjoy.c | 4 ++-- drivers/input/touchscreen/mk712.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/input/joystick/twidjoy.c +2 -2
@@ -265,13 +265,13 @@ static struct serio_driver twidjoy_drv =* The functions for inserting/removing us as a module. */ -int __init twidjoy_init (void ) +static int __init twidjoy_init (void ) {serio_register_driver (&twidjoy_drv);return 0 ; } -void __exit twidjoy_exit(void) +static void __exit twidjoy_exit(void) {serio_unregister_driver (&twidjoy_drv); }
drivers/input/touchscreen/mk712.c +1 -1
@@ -154,7 +154,7 @@ static void mk712_close(struct input_devspin_unlock_irqrestore (&mk712_lock, flags); } -int __init mk712_init (void ) +static int __init mk712_init (void ) {int err;
PATCH 6/18 grip: fix crash when accessing device
In reply to Dmitry TorokhovInput: grip - fix crash when accessing device
---
drivers/input/joystick/grip.c | 3 +++ 1 files changed, 3 insertions(+)
drivers/input/joystick/grip.c +3 -0
@@ -192,6 +192,9 @@ static void grip_poll(struct gameport *gfor (i =0 ; i <2 ; i++) { dev = grip->dev[i]; +if (!dev) +continue ; + grip->reads++;switch (grip->mode[i]) {
PATCH 7/18 grip: handle errors from input_register_device()
In reply to Dmitry TorokhovInput: grip - handle errors from input_register_device()
Also set .owner in driver structure so we'll have a link between module and driver in sysfs.
---
drivers/input/joystick/grip.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
drivers/input/joystick/grip.c +6 -2
@@ -384,12 +384,15 @@ static int grip_connect(struct gameportif (t >0 )set_bit (t, input_dev->keybit); -input_register_device (grip->dev[i]); + err =input_register_device (grip->dev[i]); +if (err) + goto fail4; }return 0 ; - fail3:for (i =0 ; i <2 ; i++) + fail4:input_free_device (grip->dev[i]); + fail3:while (--i >=0 )if (grip->dev[i])input_unregister_device (grip->dev[i]); fail2:gameport_close (gameport);
@@ -414,6 +417,7 @@ static void grip_disconnect(struct gamepstatic struct gameport_driver grip_drv = { .driver = { .name ="grip" , + .owner =THIS_MODULE , }, .description =DRIVER_DESC , .connect = grip_connect,
PATCH 8/18 db9: fix possible crash with Saturn gamepads
In reply to Dmitry TorokhovInput: db9 - fix possible crash with Saturn gamepads
---
drivers/input/joystick/db9.c | 70 ++++++++++++++++++++++--------------------- 1 files changed, 36 insertions(+), 34 deletions(-)
drivers/input/joystick/db9.c +36 -34
@@ -275,68 +275,70 @@ static unsigned char db9_saturn_read_pac/* * db9_saturn_report() analyzes packet and reports. */ -static int db9_saturn_report (unsigned char id,unsigned char data[60 ],struct input_dev *dev,int n,int max_pads) +static int db9_saturn_report (unsigned char id,unsigned char data[60 ],struct input_dev *devs[],int n,int max_pads) { +struct input_dev *dev;int tmp, i, j; tmp = (id ==0x41 ) ?60 :10 ; -for (j =0 ; (j < tmp) && (n < max_pads); j +=10 , n++) { +for (j =0 ; j < tmp && n < max_pads; j +=10 , n++) { + dev = devs[n];switch (data[j]) {case 0x16 :/* multi controller (analog 4 axis) */ -input_report_abs (dev + n, db9_abs[5 ], data[j +6 ]); +input_report_abs (dev, db9_abs[5 ], data[j +6 ]);case 0x15 :/* mission stick (analog 3 axis) */ -input_report_abs (dev + n, db9_abs[3 ], data[j +4 ]); -input_report_abs (dev + n, db9_abs[4 ], data[j +5 ]); +input_report_abs (dev, db9_abs[3 ], data[j +4 ]); +input_report_abs (dev, db9_abs[4 ], data[j +5 ]);case 0x13 :/* racing controller (analog 1 axis) */ -input_report_abs (dev + n, db9_abs[2 ], data[j +3 ]); +input_report_abs (dev, db9_abs[2 ], data[j +3 ]);case 0x34 :/* saturn keyboard (udlr ZXC ASD QE Esc) */ case 0x02 :/* digital pad (digital 2 axis + buttons) */ -input_report_abs (dev + n, db9_abs[0 ], !(data[j +1 ] &128 ) - !(data[j +1 ] &64 )); -input_report_abs (dev + n, db9_abs[1 ], !(data[j +1 ] &32 ) - !(data[j +1 ] &16 )); +input_report_abs (dev, db9_abs[0 ], !(data[j +1 ] &128 ) - !(data[j +1 ] &64 )); +input_report_abs (dev, db9_abs[1 ], !(data[j +1 ] &32 ) - !(data[j +1 ] &16 ));for (i =0 ; i <9 ; i++) -input_report_key (dev + n, db9_cd32_btn[i], ~data[j + db9_saturn_byte[i]] & db9_saturn_mask[i]); +input_report_key (dev, db9_cd32_btn[i], ~data[j + db9_saturn_byte[i]] & db9_saturn_mask[i]);break ;case 0x19 :/* mission stick x2 (analog 6 axis + buttons) */ -input_report_abs (dev + n, db9_abs[0 ], !(data[j +1 ] &128 ) - !(data[j +1 ] &64 )); -input_report_abs (dev + n, db9_abs[1 ], !(data[j +1 ] &32 ) - !(data[j +1 ] &16 )); +input_report_abs (dev, db9_abs[0 ], !(data[j +1 ] &128 ) - !(data[j +1 ] &64 )); +input_report_abs (dev, db9_abs[1 ], !(data[j +1 ] &32 ) - !(data[j +1 ] &16 ));for (i =0 ; i <9 ; i++) -input_report_key (dev + n, db9_cd32_btn[i], ~data[j + db9_saturn_byte[i]] & db9_saturn_mask[i]); -input_report_abs (dev + n, db9_abs[2 ], data[j +3 ]); -input_report_abs (dev + n, db9_abs[3 ], data[j +4 ]); -input_report_abs (dev + n, db9_abs[4 ], data[j +5 ]); +input_report_key (dev, db9_cd32_btn[i], ~data[j + db9_saturn_byte[i]] & db9_saturn_mask[i]); +input_report_abs (dev, db9_abs[2 ], data[j +3 ]); +input_report_abs (dev, db9_abs[3 ], data[j +4 ]); +input_report_abs (dev, db9_abs[4 ], data[j +5 ]);/* -input_report_abs(dev + n, db9_abs[8], (data[j + 6] & 128 ? 0 : 1) - (data[j + 6] & 64 ? 0 : 1)); -input_report_abs(dev + n, db9_abs[9], (data[j + 6] & 32 ? 0 : 1) - (data[j + 6] & 16 ? 0 : 1)); +input_report_abs(dev, db9_abs[8], (data[j + 6] & 128 ? 0 : 1) - (data[j + 6] & 64 ? 0 : 1)); +input_report_abs(dev, db9_abs[9], (data[j + 6] & 32 ? 0 : 1) - (data[j + 6] & 16 ? 0 : 1)); */ -input_report_abs (dev + n, db9_abs[6 ], data[j +7 ]); -input_report_abs (dev + n, db9_abs[7 ], data[j +8 ]); -input_report_abs (dev + n, db9_abs[5 ], data[j +9 ]); +input_report_abs (dev, db9_abs[6 ], data[j +7 ]); +input_report_abs (dev, db9_abs[7 ], data[j +8 ]); +input_report_abs (dev, db9_abs[5 ], data[j +9 ]);break ;case 0xd3 :/* sankyo ff (analog 1 axis + stop btn) */ -input_report_key (dev + n,BTN_A , data[j +3 ] &0x80 ); -input_report_abs (dev + n, db9_abs[2 ], data[j +3 ] &0x7f ); +input_report_key (dev,BTN_A , data[j +3 ] &0x80 ); +input_report_abs (dev, db9_abs[2 ], data[j +3 ] &0x7f );break ;case 0xe3 :/* shuttle mouse (analog 2 axis + buttons. signed value) */ -input_report_key (dev + n,BTN_START , data[j +1 ] &0x08 ); -input_report_key (dev + n,BTN_A , data[j +1 ] &0x04 ); -input_report_key (dev + n,BTN_C , data[j +1 ] &0x02 ); -input_report_key (dev + n,BTN_B , data[j +1 ] &0x01 ); -input_report_abs (dev + n, db9_abs[2 ], data[j +2 ] ^0x80 ); -input_report_abs (dev + n, db9_abs[3 ], (0xff -(data[j +3 ] ^0x80 ))+1 );/* */ +input_report_key (dev,BTN_START , data[j +1 ] &0x08 ); +input_report_key (dev,BTN_A , data[j +1 ] &0x04 ); +input_report_key (dev,BTN_C , data[j +1 ] &0x02 ); +input_report_key (dev,BTN_B , data[j +1 ] &0x01 ); +input_report_abs (dev, db9_abs[2 ], data[j +2 ] ^0x80 ); +input_report_abs (dev, db9_abs[3 ], (0xff -(data[j +3 ] ^0x80 ))+1 );/* */ break ;case 0xff :default :/* no pad */ -input_report_abs (dev + n, db9_abs[0 ],0 ); -input_report_abs (dev + n, db9_abs[1 ],0 ); +input_report_abs (dev, db9_abs[0 ],0 ); +input_report_abs (dev, db9_abs[1 ],0 );for (i =0 ; i <9 ; i++) -input_report_key (dev + n, db9_cd32_btn[i],0 ); +input_report_key (dev, db9_cd32_btn[i],0 );break ; } }return n; } -static int db9_saturn (int mode,struct parport *port,struct input_dev *dev) +static int db9_saturn (int mode,struct parport *port,struct input_dev *devs[]) {unsigned char id, data[60 ];int type, n, max_pads;
@@ -361,7 +363,7 @@ static int db9_saturn(int mode, struct p max_pads =min (db9_modes[mode].n_pads,DB9_MAX_DEVICES );for (tmp =0 , i =0 ; i < n; i++) { id =db9_saturn_read_packet (port, data, type + i,1 ); - tmp =db9_saturn_report (id, data, dev, tmp, max_pads); + tmp =db9_saturn_report (id, data, devs, tmp, max_pads); }return 0 ; }
@@ -489,7 +491,7 @@ static void db9_timer(unsigned long privcase DB9_SATURN_DPP :case DB9_SATURN_DPP_2 : -db9_saturn (db9->mode, port, dev); +db9_saturn (db9->mode, port, db9->dev);break ;case DB9_CD32_PAD :
PATCH 9/18 db9: handle errors from input_register_device()
In reply to Dmitry TorokhovInput: db9 - handle errors from input_register_device()
Also db9_remove shouldn't be marked __exit as it is also called from __init code.
---
drivers/input/joystick/db9.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-)
drivers/input/joystick/db9.c +10 -5
@@ -616,7 +616,7 @@ static struct db9 __init *db9_probe(intif (!input_dev) {printk (KERN_ERR "db9.c: Not enough memory for input device\n" ); err = -ENOMEM ; - goto err_free_devs; + goto err_unreg_devs; }sprintf (db9->phys[i],"%s/input%d" , db9->pd->port->name, i);
@@ -642,13 +642,17 @@ static struct db9 __init *db9_probe(intinput_set_abs_params (input_dev, db9_abs[j],1 ,255 ,0 ,0 ); } -input_register_device (input_dev); + err =input_register_device (input_dev); +if (err) + goto err_free_dev; }parport_put_port (pp);return db9; - err_free_devs: + err_free_dev: +input_free_device (db9->dev[i]); + err_unreg_devs:while (--i >=0 )input_unregister_device (db9->dev[i]);kfree (db9);
@@ -660,7 +664,7 @@ static struct db9 __init *db9_probe(intreturn ERR_PTR (err); } -static void __exit db9_remove(struct db9 *db9) +static void db9_remove (struct db9 *db9) {int i;
@@ -698,7 +702,8 @@ static int __init db9_init(void)if (err) {while (--i >=0 ) -db9_remove (db9_base[i]); +if (db9_base[i]) +db9_remove (db9_base[i]);return err; }
PATCH 10/18 sidewinder: fix an oops
In reply to Dmitry TorokhovFrom: Zinx Verituse <[email protected]>
Input: sidewinder - fix an oops
Dynalloc conversion strikes again...
---
drivers/input/joystick/sidewinder.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-)
drivers/input/joystick/sidewinder.c +1 -1
@@ -736,7 +736,7 @@ static int sw_connect(struct gameport *gsprintf (sw->name,"Microsoft SideWinder %s" , sw_name[sw->type]);sprintf (sw->phys[i],"%s/input%d" , gameport->phys, i); - input_dev =input_allocate_device (); + sw->dev[i] = input_dev =input_allocate_device ();if (!input_dev) { err = -ENOMEM ; goto fail3;
PATCH 11/18 sidewinder: handle errors from input_register_device()
In reply to Dmitry TorokhovInput: sidewinder - handle errors from input_register_device()
Also set .owner in driver structure so we'll have a link between module and driver in sysfs.
---
drivers/input/joystick/sidewinder.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
drivers/input/joystick/sidewinder.c +6 -2
@@ -771,12 +771,15 @@ static int sw_connect(struct gameport *gdbg ("%s%s [%d-bit id %d data %d]\n" , sw->name, comment, m, l, k); -input_register_device (sw->dev[i]); + err =input_register_device (sw->dev[i]); +if (err) + goto fail4; }return 0 ; - fail3:while (--i >=0 ) + fail4:input_free_device (sw->dev[i]); + fail3:while (--i >=0 )input_unregister_device (sw->dev[i]); fail2:gameport_close (gameport); fail1:gameport_set_drvdata (gameport,NULL );
@@ -801,6 +804,7 @@ static void sw_disconnect(struct gameporstatic struct gameport_driver sw_drv = { .driver = { .name ="sidewinder" , + .owner =THIS_MODULE , }, .description =DRIVER_DESC , .connect = sw_connect,
PATCH 12/18 gamecon: fix crash when accessing device
In reply to Dmitry TorokhovInput: gamecon - fix crash when accessing device
---
drivers/input/joystick/gamecon.c | 339 ++++++++++++++++++++++----------------- 1 files changed, 192 insertions(+), 147 deletions(-)
drivers/input/joystick/gamecon.c +192 -147
@@ -159,6 +159,48 @@ static void gc_n64_read_packet(struct gc } +static void gc_n64_process_packet (struct gc *gc) +{ +unsigned char data[GC_N64_LENGTH ]; +signed char axes[2 ]; +struct input_dev *dev; +int i, j, s; + +gc_n64_read_packet (gc, data); + +for (i =0 ; i <GC_MAX_DEVICES ; i++) { + + dev = gc->dev[i]; +if (!dev) +continue ; + + s = gc_status_bit[i]; + +if (s & gc->pads[GC_N64 ] & ~(data[8 ] | data[9 ])) { + + axes[0 ] = axes[1 ] =0 ; + +for (j =0 ; j <8 ; j++) { +if (data[23 - j] & s) + axes[0 ] |=1 << j; +if (data[31 - j] & s) + axes[1 ] |=1 << j; + } + +input_report_abs (dev,ABS_X , axes[0 ]); +input_report_abs (dev,ABS_Y , -axes[1 ]); + +input_report_abs (dev,ABS_HAT0X , !(s & data[6 ]) - !(s & data[7 ])); +input_report_abs (dev,ABS_HAT0Y , !(s & data[4 ]) - !(s & data[5 ])); + +for (j =0 ; j <10 ; j++) +input_report_key (dev, gc_n64_btn[j], s & data[gc_n64_bytes[j]]); + +input_sync (dev); + } + } +} +/* * NES/SNES support. */
@@ -198,6 +240,39 @@ static void gc_nes_read_packet(struct gc } } +static void gc_nes_process_packet (struct gc *gc) +{ +unsigned char data[GC_SNES_LENGTH ]; +struct input_dev *dev; +int i, j, s; + +gc_nes_read_packet (gc, gc->pads[GC_SNES ] ?GC_SNES_LENGTH :GC_NES_LENGTH , data); + +for (i =0 ; i <GC_MAX_DEVICES ; i++) { + + dev = gc->dev[i]; +if (!dev) +continue ; + + s = gc_status_bit[i]; + +if (s & (gc->pads[GC_NES ] | gc->pads[GC_SNES ])) { +input_report_abs (dev,ABS_X , !(s & data[6 ]) - !(s & data[7 ])); +input_report_abs (dev,ABS_Y , !(s & data[4 ]) - !(s & data[5 ])); + } + +if (s & gc->pads[GC_NES ]) +for (j =0 ; j <4 ; j++) +input_report_key (dev, gc_snes_btn[j], s & data[gc_nes_bytes[j]]); + +if (s & gc->pads[GC_SNES ]) +for (j =0 ; j <8 ; j++) +input_report_key (dev, gc_snes_btn[j], s & data[gc_snes_bytes[j]]); + +input_sync (dev); + } +} +/* * Multisystem joystick support */
@@ -219,6 +294,35 @@ static void gc_multi_read_packet(struct } } +static void gc_multi_process_packet (struct gc *gc) +{ +unsigned char data[GC_MULTI2_LENGTH ]; +struct input_dev *dev; +int i, s; + +gc_multi_read_packet (gc, gc->pads[GC_MULTI2 ] ?GC_MULTI2_LENGTH :GC_MULTI_LENGTH , data); + +for (i =0 ; i <GC_MAX_DEVICES ; i++) { + + dev = gc->dev[i]; +if (!dev) +continue ; + + s = gc_status_bit[i]; + +if (s & (gc->pads[GC_MULTI ] | gc->pads[GC_MULTI2 ])) { +input_report_abs (dev,ABS_X , !(s & data[2 ]) - !(s & data[3 ])); +input_report_abs (dev,ABS_Y , !(s & data[0 ]) - !(s & data[1 ])); +input_report_key (dev,BTN_TRIGGER , s & data[4 ]); + } + +if (s & gc->pads[GC_MULTI2 ]) +input_report_key (dev,BTN_THUMB , s & data[5 ]); + +input_sync (dev); + } +} +/* * PSX support *
@@ -263,10 +367,11 @@ static short gc_psx_ddr_btn[] = { BTN_0,* the psx pad. */ -static void gc_psx_command (struct gc *gc,int b,unsigned char data[5 ]) +static void gc_psx_command (struct gc *gc,int b,unsigned char data[GC_MAX_DEVICES ]) {int i, j, cmd, read; -for (i =0 ; i <5 ; i++) + +for (i =0 ; i <GC_MAX_DEVICES ; i++) data[i] =0 ;for (i =0 ; i <GC_PSX_LENGTH ; i++, b >>=1 ) {
@@ -274,7 +379,7 @@ static void gc_psx_command(struct gc *gcparport_write_data (gc->pd->port, cmd |GC_PSX_POWER );udelay (gc_psx_delay); read =parport_read_status (gc->pd->port) ^0x80 ; -for (j =0 ; j <5 ; j++) +for (j =0 ; j <GC_MAX_DEVICES ; j++) data[j] |= (read & gc_status_bit[j] & (gc->pads[GC_PSX ] | gc->pads[GC_DDR ])) ? (1 << i) :0 ;parport_write_data (gc->pd->port, cmd |GC_PSX_CLOCK |GC_PSX_POWER );udelay (gc_psx_delay);
@@ -286,11 +391,12 @@ static void gc_psx_command(struct gc *gc* device identifier code. */ -static void gc_psx_read_packet (struct gc *gc,unsigned char data[5 ][GC_PSX_BYTES ],unsigned char id[5 ]) +static void gc_psx_read_packet (struct gc *gc,unsigned char data[GC_MAX_DEVICES ][GC_PSX_BYTES ], +unsigned char id[GC_MAX_DEVICES ]) {int i, j, max_len =0 ;unsigned long flags; -unsigned char data2[5 ]; +unsigned char data2[GC_MAX_DEVICES ];parport_write_data (gc->pd->port,GC_PSX_CLOCK |GC_PSX_SELECT |GC_PSX_POWER );/* Select pad */ udelay (gc_psx_delay);
@@ -303,7 +409,7 @@ static void gc_psx_read_packet(struct gcgc_psx_command (gc,0x42 , id);/* Get device ids */ gc_psx_command (gc,0 , data2);/* Dump status */ -for (i =0 ; i <5 ; i++)/* Find the longest pad */ +for (i =0 ; i <GC_MAX_DEVICES ; i++)/* Find the longest pad */ if ((gc_status_bit[i] & (gc->pads[GC_PSX ] | gc->pads[GC_DDR ])) && (GC_PSX_LEN (id[i]) > max_len) && (GC_PSX_LEN (id[i]) <=GC_PSX_BYTES ))
@@ -311,7 +417,7 @@ static void gc_psx_read_packet(struct gcfor (i =0 ; i < max_len; i++) {/* Read in all the data */ gc_psx_command (gc,0 , data2); -for (j =0 ; j <5 ; j++) +for (j =0 ; j <GC_MAX_DEVICES ; j++) data[j][i] = data2[j]; }
@@ -319,185 +425,124 @@ static void gc_psx_read_packet(struct gcparport_write_data (gc->pd->port,GC_PSX_CLOCK |GC_PSX_SELECT |GC_PSX_POWER ); -for (i =0 ; i <5 ; i++)/* Set id's to the real value */ +for (i =0 ; i <GC_MAX_DEVICES ; i++)/* Set id's to the real value */ id[i] =GC_PSX_ID (id[i]); } -/* -* gc_timer() reads and analyzes console pads data. -*/ - -#define GC_MAX_LENGTH GC_N64_LENGTH - -static void gc_timer (unsigned long private) +static void gc_psx_process_packet (struct gc *gc) { -struct gc *gc = (void *) private; -unsigned char data[GC_MAX_LENGTH ]; -unsigned char data_psx[5 ][GC_PSX_BYTES ]; -int i, j, s; - -/* -* N64 pads - must be read first, any read confuses them for 200 us -*/ - -if (gc->pads[GC_N64 ]) { +unsigned char data[GC_MAX_DEVICES ][GC_PSX_BYTES ]; +unsigned char id[GC_MAX_DEVICES ]; +struct input_dev *dev; +int i, j; -gc_n64_read_packet (gc, data); +gc_psx_read_packet (gc, data, id); -for (i =0 ; i <5 ; i++) { +for (i =0 ; i <GC_MAX_DEVICES ; i++) { - s = gc_status_bit[i]; + dev = gc->dev[i]; +if (!dev) +continue ; -if (s & gc->pads[GC_N64 ] & ~(data[8 ] | data[9 ])) { +switch (id[i]) { -signed char axes[2 ]; - axes[0 ] = axes[1 ] =0 ; +case GC_PSX_RUMBLE : -for (j =0 ; j <8 ; j++) { -if (data[23 - j] & s) axes[0 ] |=1 << j; -if (data[31 - j] & s) axes[1 ] |=1 << j; - } +input_report_key (dev,BTN_THUMBL , ~data[i][0 ] &0x04 ); +input_report_key (dev,BTN_THUMBR , ~data[i][0 ] &0x02 ); -input_report_abs (gc->dev[i],ABS_X , axes[0 ]); -input_report_abs (gc->dev[i],ABS_Y , -axes[1 ]); +case GC_PSX_NEGCON : +case GC_PSX_ANALOG : -input_report_abs (gc->dev[i],ABS_HAT0X , !(s & data[6 ]) - !(s & data[7 ])); -input_report_abs (gc->dev[i],ABS_HAT0Y , !(s & data[4 ]) - !(s & data[5 ])); +if (gc->pads[GC_DDR ] & gc_status_bit[i]) { +for (j =0 ; j <4 ; j++) +input_report_key (dev, gc_psx_ddr_btn[j], ~data[i][0 ] & (0x10 << j)); + }else { +for (j =0 ; j <4 ; j++) +input_report_abs (dev, gc_psx_abs[j +2 ], data[i][j +2 ]); -for (j =0 ; j <10 ; j++) -input_report_key (gc->dev[i], gc_n64_btn[j], s & data[gc_n64_bytes[j]]); +input_report_abs (dev,ABS_X ,128 + !(data[i][0 ] &0x20 ) *127 - !(data[i][0 ] &0x80 ) *128 ); +input_report_abs (dev,ABS_Y ,128 + !(data[i][0 ] &0x40 ) *127 - !(data[i][0 ] &0x10 ) *128 ); + } -input_sync (gc->dev[i]); - } - } - } +for (j =0 ; j <8 ; j++) +input_report_key (dev, gc_psx_btn[j], ~data[i][1 ] & (1 << j)); -/* -* NES and SNES pads -*/ +input_report_key (dev,BTN_START , ~data[i][0 ] &0x08 ); +input_report_key (dev,BTN_SELECT , ~data[i][0 ] &0x01 ); -if (gc->pads[GC_NES ] || gc->pads[GC_SNES ]) { +input_sync (dev); -gc_nes_read_packet (gc, gc->pads[GC_SNES ] ?GC_SNES_LENGTH :GC_NES_LENGTH , data); +break ; -for (i =0 ; i <5 ; i++) { +case GC_PSX_NORMAL : +if (gc->pads[GC_DDR ] & gc_status_bit[i]) { +for (j =0 ; j <4 ; j++) +input_report_key (dev, gc_psx_ddr_btn[j], ~data[i][0 ] & (0x10 << j)); + }else { +input_report_abs (dev,ABS_X ,128 + !(data[i][0 ] &0x20 ) *127 - !(data[i][0 ] &0x80 ) *128 ); +input_report_abs (dev,ABS_Y ,128 + !(data[i][0 ] &0x40 ) *127 - !(data[i][0 ] &0x10 ) *128 ); + +/* for some reason if the extra axes are left unset they drift */ +/* for (j = 0; j < 4; j++) +input_report_abs(dev, gc_psx_abs[j + 2], 128); +* This needs to be debugged properly, +* maybe fuzz processing needs to be done in input_sync() +* --vojtech +*/ + } - s = gc_status_bit[i]; +for (j =0 ; j <8 ; j++) +input_report_key (dev, gc_psx_btn[j], ~data[i][1 ] & (1 << j)); -if (s & (gc->pads[GC_NES ] | gc->pads[GC_SNES ])) { -input_report_abs (gc->dev[i],ABS_X , !(s & data[6 ]) - !(s & data[7 ])); -input_report_abs (gc->dev[i],ABS_Y , !(s & data[4 ]) - !(s & data[5 ])); - } +input_report_key (dev,BTN_START , ~data[i][0 ] &0x08 ); +input_report_key (dev,BTN_SELECT , ~data[i][0 ] &0x01 ); -if (s & gc->pads[GC_NES ]) -for (j =0 ; j <4 ; j++) -input_report_key (gc->dev[i], gc_snes_btn[j], s & data[gc_nes_bytes[j]]); +input_sync (dev); -if (s & gc->pads[GC_SNES ]) -for (j =0 ; j <8 ; j++) -input_report_key (gc->dev[i], gc_snes_btn[j], s & data[gc_snes_bytes[j]]); +break ; -input_sync (gc->dev[i]); +case 0 :/* not a pad, ignore */ +break ; } } +}/* -* Multi and Multi2 joysticks +* gc_timer() initiates reads of console pads data. */ -if (gc->pads[GC_MULTI ] || gc->pads[GC_MULTI2 ]) { +static void gc_timer (unsigned long private) +{ +struct gc *gc = (void *) private; -gc_multi_read_packet (gc, gc->pads[GC_MULTI2 ] ?GC_MULTI2_LENGTH :GC_MULTI_LENGTH , data); +/* +* N64 pads - must be read first, any read confuses them for 200 us +*/ -for (i =0 ; i <5 ; i++) { +if (gc->pads[GC_N64 ]) +gc_n64_process_packet (gc); - s = gc_status_bit[i]; +/* +* NES and SNES pads +*/ -if (s & (gc->pads[GC_MULTI ] | gc->pads[GC_MULTI2 ])) { -input_report_abs (gc->dev[i],ABS_X , !(s & data[2 ]) - !(s & data[3 ])); -input_report_abs (gc->dev[i],ABS_Y , !(s & data[0 ]) - !(s & data[1 ])); -input_report_key (gc->dev[i],BTN_TRIGGER , s & data[4 ]); - } +if (gc->pads[GC_NES ] || gc->pads[GC_SNES ]) +gc_nes_process_packet (gc); -if (s & gc->pads[GC_MULTI2 ]) -input_report_key (gc->dev[i],BTN_THUMB , s & data[5 ]); +/* +* Multi and Multi2 joysticks +*/ -input_sync (gc->dev[i]); - } - } +if (gc->pads[GC_MULTI ] || gc->pads[GC_MULTI2 ]) +gc_multi_process_packet (gc);/* * PSX controllers */ -if (gc->pads[GC_PSX ] || gc->pads[GC_DDR ]) { - -gc_psx_read_packet (gc, data_psx, data); - -for (i =0 ; i <5 ; i++) { -switch (data[i]) { - -case GC_PSX_RUMBLE : - -input_report_key (gc->dev[i],BTN_THUMBL , ~data_psx[i][0 ] &0x04 ); -input_report_key (gc->dev[i],BTN_THUMBR , ~data_psx[i][0 ] &0x02 ); - -case GC_PSX_NEGCON : -case GC_PSX_ANALOG : - -if (gc->pads[GC_DDR ] & gc_status_bit[i]) { -for (j =0 ; j <4 ; j++) -input_report_key (gc->dev[i], gc_psx_ddr_btn[j], ~data_psx[i][0 ] & (0x10 << j)); - }else { -for (j =0 ; j <4 ; j++) -input_report_abs (gc->dev[i], gc_psx_abs[j+2 ], data_psx[i][j +2 ]); - -input_report_abs (gc->dev[i],ABS_X ,128 + !(data_psx[i][0 ] &0x20 ) *127 - !(data_psx[i][0 ] &0x80 ) *128 ); -input_report_abs (gc->dev[i],ABS_Y ,128 + !(data_psx[i][0 ] &0x40 ) *127 - !(data_psx[i][0 ] &0x10 ) *128 ); - } - -for (j =0 ; j <8 ; j++) -input_report_key (gc->dev[i], gc_psx_btn[j], ~data_psx[i][1 ] & (1 << j)); - -input_report_key (gc->dev[i],BTN_START , ~data_psx[i][0 ] &0x08 ); -input_report_key (gc->dev[i],BTN_SELECT , ~data_psx[i][0 ] &0x01 ); - -input_sync (gc->dev[i]); - -break ; - -case GC_PSX_NORMAL : -if (gc->pads[GC_DDR ] & gc_status_bit[i]) { -for (j =0 ; j <4 ; j++) -input_report_key (gc->dev[i], gc_psx_ddr_btn[j], ~data_psx[i][0 ] & (0x10 << j)); - }else { -input_report_abs (gc->dev[i],ABS_X ,128 + !(data_psx[i][0 ] &0x20 ) *127 - !(data_psx[i][0 ] &0x80 ) *128 ); -input_report_abs (gc->dev[i],ABS_Y ,128 + !(data_psx[i][0 ] &0x40 ) *127 - !(data_psx[i][0 ] &0x10 ) *128 ); - -/* for some reason if the extra axes are left unset they drift */ -/* for (j = 0; j < 4; j++) -input_report_abs(gc->dev[i], gc_psx_abs[j+2], 128); -* This needs to be debugged properly, -* maybe fuzz processing needs to be done in input_sync() -* --vojtech -*/ - } - -for (j =0 ; j <8 ; j++) -input_report_key (gc->dev[i], gc_psx_btn[j], ~data_psx[i][1 ] & (1 << j)); - -input_report_key (gc->dev[i],BTN_START , ~data_psx[i][0 ] &0x08 ); -input_report_key (gc->dev[i],BTN_SELECT , ~data_psx[i][0 ] &0x01 ); - -input_sync (gc->dev[i]); - -break ; - -case 0 :/* not a pad, ignore */ -break ; - } - } - } +if (gc->pads[GC_PSX ] || gc->pads[GC_DDR ]) +gc_psx_process_packet (gc);mod_timer (&gc->timer, jiffies +GC_REFRESH_TIME ); }
@@ -654,7 +699,7 @@ static struct gc __init *gc_probe(int pa gc->timer.data = (long ) gc; gc->timer.function = gc_timer; -for (i =0 ; i < n_pads; i++) { +for (i =0 ; i < n_pads && i <GC_MAX_DEVICES ; i++) {if (!pads[i])continue ;
PATCH 13/18 gamecon: handle errors from input_register_device()
In reply to Dmitry TorokhovInput: gamecon - handle errors from input_register_device()
Also gc_remove shouldn't be marked __exit as it is also called from __init code.
---
drivers/input/joystick/gamecon.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-)
drivers/input/joystick/gamecon.c +12 -6
@@ -706,9 +706,11 @@ static struct gc __init *gc_probe(int pasprintf (gc->phys[i],"%s/input%d" , gc->pd->port->name, i); err =gc_setup_pad (gc, i, pads[i]);if (err) - goto err_free_devs; + goto err_unreg_devs; -input_register_device (gc->dev[i]); + err =input_register_device (gc->dev[i]); +if (err) + goto err_free_dev; }if (!gc->pads[0 ]) {
@@ -720,9 +722,12 @@ static struct gc __init *gc_probe(int paparport_put_port (pp);return gc; - err_free_devs: + err_free_dev: +input_free_device (gc->dev[i]); + err_unreg_devs:while (--i >=0 ) -input_unregister_device (gc->dev[i]); +if (gc->dev[i]) +input_unregister_device (gc->dev[i]); err_free_gc:kfree (gc); err_unreg_pardev:
@@ -733,7 +738,7 @@ static struct gc __init *gc_probe(int pareturn ERR_PTR (err); } -static void __exit gc_remove(struct gc *gc) +static void gc_remove (struct gc *gc) {int i;
@@ -771,7 +776,8 @@ static int __init gc_init(void)if (err) {while (--i >=0 ) -gc_remove (gc_base[i]); +if (gc_base[i]) +gc_remove (gc_base[i]);return err; }
PATCH 14/18 turbografx: handle errors from input_register_device()
In reply to Dmitry TorokhovInput: turbografx - handle errors from input_register_device()
Also tgfx_remove shouldn't be marked __exit as it is also called from __init code.
---
drivers/input/joystick/turbografx.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-)
drivers/input/joystick/turbografx.c +13 -7
@@ -204,14 +204,14 @@ static struct tgfx __init *tgfx_probe(inif (n_buttons[i] >6 ) {printk (KERN_ERR "turbografx.c: Invalid number of buttons %d\n" , n_buttons[i]); err = -EINVAL ; - goto err_free_devs; + goto err_unreg_devs; } tgfx->dev[i] = input_dev =input_allocate_device ();if (!input_dev) {printk (KERN_ERR "turbografx.c: Not enough memory for input device\n" ); err = -ENOMEM ; - goto err_free_devs; + goto err_unreg_devs; } tgfx->sticks |= (1 << i);
@@ -238,7 +238,9 @@ static struct tgfx __init *tgfx_probe(infor (j =0 ; j < n_buttons[i]; j++)set_bit (tgfx_buttons[j], input_dev->keybit); -input_register_device (tgfx->dev[i]); + err =input_register_device (tgfx->dev[i]); +if (err) + goto err_free_dev; }if (!tgfx->sticks) {
@@ -249,9 +251,12 @@ static struct tgfx __init *tgfx_probe(inreturn tgfx; - err_free_devs: + err_free_dev: +input_free_device (tgfx->dev[i]); + err_unreg_devs:while (--i >=0 ) -input_unregister_device (tgfx->dev[i]); +if (tgfx->dev[i]) +input_unregister_device (tgfx->dev[i]); err_free_tgfx:kfree (tgfx); err_unreg_pardev:
@@ -262,7 +267,7 @@ static struct tgfx __init *tgfx_probe(inreturn ERR_PTR (err); } -static void __exit tgfx_remove(struct tgfx *tgfx) +static void tgfx_remove (struct tgfx *tgfx) {int i;
@@ -300,7 +305,8 @@ static int __init tgfx_init(void)if (err) {while (--i >=0 ) -tgfx_remove (tgfx_base[i]); +if (tgfx_base[i]) +tgfx_remove (tgfx_base[i]);return err; }
PATCH 15/18 tmdc: handle errors from input_register_device()
In reply to Dmitry TorokhovInput: tmdc - handle errors from input_register_device()
Also set .owner in driver structure so we'll have a link between module and driver in sysfs.
---
drivers/input/joystick/tmdc.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-)
drivers/input/joystick/tmdc.c +11 -4
@@ -284,13 +284,13 @@ static int tmdc_setup_port(struct tmdc *struct tmdc_port *port;struct input_dev *input_dev;int i, j, b =0 ; +int err; tmdc->port[idx] = port =kzalloc (sizeof (struct tmdc_port ),GFP_KERNEL ); input_dev =input_allocate_device ();if (!port || !input_dev) { -kfree (port); -input_free_device (input_dev); -return -ENOMEM ; + err = -ENOMEM ; + goto fail; } port->mode = data[TMDC_BYTE_ID ];
@@ -347,9 +347,15 @@ static int tmdc_setup_port(struct tmdc * b += port->btnc[i]; } -input_register_device (port->dev); + err =input_register_device (port->dev); +if (err) + goto fail;return 0 ; + + fail:input_free_device (input_dev); +kfree (port); +return err; }/*
@@ -424,6 +430,7 @@ static void tmdc_disconnect(struct gamepstatic struct gameport_driver tmdc_drv = { .driver = { .name ="tmdc" , + .owner =THIS_MODULE , }, .description =DRIVER_DESC , .connect = tmdc_connect,
PATCH 16/18 a3d: convert to dynamic input_dev allocation
In reply to Dmitry TorokhovInput: a3d - convert to dynamic input_dev allocation
Also set .owner in driver structure so we'll have a link between module and driver in sysfs.
---
drivers/input/joystick/a3d.c | 88 ++++++++++++++++++++++--------------------- 1 files changed, 46 insertions(+), 42 deletions(-)
drivers/input/joystick/a3d.c +46 -42
@@ -57,7 +57,7 @@ static char *a3d_names[] = { NULL, "FP-Gstruct a3d {struct gameport *gameport;struct gameport *adc; -struct input_dev dev; +struct input_dev *dev;int axes[4 ];int buttons;int mode;
@@ -115,7 +115,7 @@ static int a3d_csum(char *data, int counstatic void a3d_read (struct a3d *a3d,unsigned char *data) { -struct input_dev *dev = &a3d->dev; +struct input_dev *dev = a3d->dev;switch (a3d->mode) {
@@ -265,14 +265,20 @@ static void a3d_close(struct input_dev *static int a3d_connect (struct gameport *gameport,struct gameport_driver *drv) {struct a3d *a3d; +struct input_dev *input_dev;struct gameport *adc;unsigned char data[A3D_MAX_LENGTH ];int i;int err; -if (!(a3d =kzalloc (sizeof (struct a3d ),GFP_KERNEL ))) -return -ENOMEM ; + a3d =kzalloc (sizeof (struct a3d ),GFP_KERNEL ); + input_dev =input_allocate_device (); +if (!a3d || !input_dev) { + err = -ENOMEM ; + goto fail1; + } + a3d->dev = input_dev; a3d->gameport = gameport;gameport_set_drvdata (gameport, a3d);
@@ -302,42 +308,48 @@ static int a3d_connect(struct gameport *sprintf (a3d->phys,"%s/input0" , gameport->phys); + input_dev->name = a3d_names[a3d->mode]; + input_dev->phys = a3d->phys; + input_dev->id.bustype =BUS_GAMEPORT ; + input_dev->id.vendor =GAMEPORT_ID_VENDOR_MADCATZ ; + input_dev->id.product = a3d->mode; + input_dev->id.version =0x0100 ; + input_dev->cdev.dev = &gameport->dev; + input_dev->private = a3d; + input_dev->open = a3d_open; + input_dev->close = a3d_close; +if (a3d->mode ==A3D_MODE_PXL ) {int axes[] = {ABS_X ,ABS_Y ,ABS_THROTTLE ,ABS_RUDDER }; a3d->length =33 ; -init_input_dev (&a3d->dev); - - a3d->dev.evbit[0 ] |=BIT (EV_ABS ) |BIT (EV_KEY ) |BIT (EV_REL ); - a3d->dev.relbit[0 ] |=BIT (REL_X ) |BIT (REL_Y ); - a3d->dev.absbit[0 ] |=BIT (ABS_X ) |BIT (ABS_Y ) |BIT (ABS_THROTTLE ) |BIT (ABS_RUDDER ) - |BIT (ABS_HAT0X ) |BIT (ABS_HAT0Y ) |BIT (ABS_HAT1X ) |BIT (ABS_HAT1Y ); - - a3d->dev.keybit[LONG (BTN_MOUSE )] |=BIT (BTN_RIGHT ) |BIT (BTN_LEFT ) |BIT (BTN_MIDDLE ) - |BIT (BTN_SIDE ) |BIT (BTN_EXTRA ); - - a3d->dev.keybit[LONG (BTN_JOYSTICK )] |=BIT (BTN_TRIGGER ) |BIT (BTN_THUMB ) |BIT (BTN_TOP ) |BIT (BTN_PINKIE ); + input_dev->evbit[0 ] |=BIT (EV_ABS ) |BIT (EV_KEY ) |BIT (EV_REL ); + input_dev->relbit[0 ] |=BIT (REL_X ) |BIT (REL_Y ); + input_dev->absbit[0 ] |=BIT (ABS_X ) |BIT (ABS_Y ) |BIT (ABS_THROTTLE ) |BIT (ABS_RUDDER ) + |BIT (ABS_HAT0X ) |BIT (ABS_HAT0Y ) |BIT (ABS_HAT1X ) |BIT (ABS_HAT1Y ); + input_dev->keybit[LONG (BTN_MOUSE )] |=BIT (BTN_RIGHT ) |BIT (BTN_LEFT ) |BIT (BTN_MIDDLE ) + |BIT (BTN_SIDE ) |BIT (BTN_EXTRA ); + input_dev->keybit[LONG (BTN_JOYSTICK )] |=BIT (BTN_TRIGGER ) |BIT (BTN_THUMB ) |BIT (BTN_TOP ) + |BIT (BTN_PINKIE );a3d_read (a3d, data);for (i =0 ; i <4 ; i++) {if (i <2 ) -input_set_abs_params (&a3d->dev, axes[i],48 , a3d->dev.abs[axes[i]] *2 -48 ,0 ,8 ); +input_set_abs_params (input_dev, axes[i],48 , input_dev->abs[axes[i]] *2 -48 ,0 ,8 );else -input_set_abs_params (&a3d->dev, axes[i],2 ,253 ,0 ,0 ); -input_set_abs_params (&a3d->dev,ABS_HAT0X + i,-1 ,1 ,0 ,0 ); +input_set_abs_params (input_dev, axes[i],2 ,253 ,0 ,0 ); +input_set_abs_params (input_dev,ABS_HAT0X + i,-1 ,1 ,0 ,0 ); } }else { a3d->length =29 ; -init_input_dev (&a3d->dev); - - a3d->dev.evbit[0 ] |=BIT (EV_KEY ) |BIT (EV_REL ); - a3d->dev.relbit[0 ] |=BIT (REL_X ) |BIT (REL_Y ); - a3d->dev.keybit[LONG (BTN_MOUSE )] |=BIT (BTN_RIGHT ) |BIT (BTN_LEFT ) |BIT (BTN_MIDDLE ); + input_dev->evbit[0 ] |=BIT (EV_KEY ) |BIT (EV_REL ); + input_dev->relbit[0 ] |=BIT (REL_X ) |BIT (REL_Y ); + input_dev->keybit[LONG (BTN_MOUSE )] |=BIT (BTN_RIGHT ) |BIT (BTN_LEFT ) |BIT (BTN_MIDDLE );a3d_read (a3d, data);
@@ -358,24 +370,17 @@ static int a3d_connect(struct gameport * } } - a3d->dev.private = a3d; - a3d->dev.open = a3d_open; - a3d->dev.close = a3d_close; - - a3d->dev.name = a3d_names[a3d->mode]; - a3d->dev.phys = a3d->phys; - a3d->dev.id.bustype =BUS_GAMEPORT ; - a3d->dev.id.vendor =GAMEPORT_ID_VENDOR_MADCATZ ; - a3d->dev.id.product = a3d->mode; - a3d->dev.id.version =0x0100 ; - -input_register_device (&a3d->dev); -printk (KERN_INFO "input: %s on %s\n" , a3d_names[a3d->mode], a3d->phys); + err =input_register_device (a3d->dev); +if (err) + goto fail3;return 0 ; -fail2:gameport_close (gameport); -fail1:gameport_set_drvdata (gameport,NULL ); + fail3:if (a3d->adc) +gameport_unregister_port (a3d->adc); + fail2:gameport_close (gameport); + fail1:gameport_set_drvdata (gameport,NULL ); +input_free_device (input_dev);kfree (a3d);return err; }
@@ -384,11 +389,9 @@ static void a3d_disconnect(struct gamepo {struct a3d *a3d =gameport_get_drvdata (gameport); -input_unregister_device (&a3d->dev); -if (a3d->adc) { +input_unregister_device (a3d->dev); +if (a3d->adc)gameport_unregister_port (a3d->adc); - a3d->adc =NULL ; - }gameport_close (gameport);gameport_set_drvdata (gameport,NULL );kfree (a3d);
@@ -397,6 +400,7 @@ static void a3d_disconnect(struct gamepostatic struct gameport_driver a3d_drv = { .driver = { .name ="adc" , + .owner =THIS_MODULE , }, .description =DRIVER_DESC , .connect = a3d_connect,
PATCH 17/18 iforce - fix detection of USB devices
In reply to Dmitry TorokhovInput: iforce - fix detection of USB devices
Recent conversion to wait_event_interruptible_timeout() caused USB detection routine erroneously report timeouts for perfectly working devices.
---
drivers/input/joystick/iforce/iforce-packets.c | 4 ++-- drivers/input/joystick/iforce/iforce-usb.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-)
drivers/input/joystick/iforce/iforce-packets.c +2 -2
@@ -167,9 +167,9 @@ void iforce_process_packet(struct iforce iforce->expect_packet =0 ; iforce->ecmd = cmd; memcpy(iforce->edata, data, IFORCE_MAX_LENGTH); - wake_up(&iforce->wait); }#endif +wake_up (&iforce->wait);if (!iforce->type) { being_used--;
@@ -264,7 +264,7 @@ int iforce_get_id_packet(struct iforce *wait_event_interruptible_timeout (iforce->wait, iforce->ctrl->status != -EINPROGRESS ,HZ ); -if (iforce->ctrl->status != -EINPROGRESS ) { +if (iforce->ctrl->status) {usb_unlink_urb (iforce->ctrl);return -1 ; }
drivers/input/joystick/iforce/iforce-usb.c +0 -1
@@ -95,7 +95,6 @@ static void iforce_usb_irq(struct urb *u goto exit; } -wake_up (&iforce->wait);iforce_process_packet (iforce, (iforce->data[0 ] <<8 ) | (urb->actual_length -1 ), iforce->data +1 , regs);
PATCH 18/18 hiddev: fix off-by-one for num_values in uref_multi requests
In reply to Dmitry TorokhovFrom: Ben Collins <[email protected]>
Input: hiddev - fix off-by-one for num_values in uref_multi requests
Found this when working with a HAPP UGCI device. It has a usage with 7 indexes. I could read them all one at a time, but using a multiref it would only allow me to read the first 6. The patch below fixed it.
---
drivers/usb/input/hiddev.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-)
drivers/usb/input/hiddev.c +1 -1
@@ -631,7 +631,7 @@ static int hiddev_ioctl(struct inode *inelse if ((cmd ==HIDIOCGUSAGES || cmd ==HIDIOCSUSAGES ) && (uref_multi->num_values >HID_MAX_MULTI_USAGES || - uref->usage_index + uref_multi->num_values >= field->report_count)) + uref->usage_index + uref_multi->num_values > field->report_count)) goto inval; }