err() was a very old USB-specific macro that I thought had
gone away.  This patch removes it from being used in the
driver and uses dev_err() instead.

CC: Dmitry Torokhov <dmitry.torokhov@gmail.com>
CC: "Magnus Hörlin" <magnus@alefors.se>
CC: Rusty Russell <rusty@rustcorp.com.au>
CC: Mauro Carvalho Chehab <mchehab@redhat.com>
CC: Chris Moeller <kode54@gmail.c>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

module_param(bool) used to counter-intuitively take an int.  In
fddd5201 (mid-2009) we allowed bool or int/unsigned int using a messy
trick.

It's time to remove the int/unsigned int option.  For this version
it'll simply give a warning, but it'll break next kernel version.
Acked-by: NMauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: NRusty Russell <rusty@rustcorp.com.au>

This converts the drivers in drivers/input/* to use the
module_usb_driver() macro which makes the code smaller and a bit
simpler.

Added bonus is that it removes some unneeded kernel log messages about
drivers loading and/or unloading.

Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Ville Syrjala <syrjala@sci.fi>
Cc: Henk Vergonet <Henk.Vergonet@gmail.com>
Cc: Alessandro Rubini <rubini@ipvvis.unipv.it>
Cc: Henrik Rydberg <rydberg@euromail.se>
Cc: "Magnus Hörlin" <magnus@alefors.se>
Cc: Chris Moeller <kode54@gmail.c>
Cc: Christoph Fritz <chf.fritz@googlemail.com>
Cc: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Cc: Jesper Juhl <jj@chaosbits.net>
Cc: Edwin van Vliet <edwin@cheatah.nl>
Cc: Ping Cheng <pingc@wacom.com>
Cc: Eduard Hasenleithner <eduard@hasenleithner.at>
Cc: Alexander Strakh <strakh@ispras.ru>
Cc: Glenn Sommer <gsommer@datanordisk.dk>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

This patch implements rumble support for XBox360 Wireless Controllers.
Signed-off-by: NChris Moeller <kode54@gmail.c>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

Signed-off-by: NMagnus Hörlin <magnus@alefors.se>
Reviewed-by: NChristoph Fritz <chf.fritz@googlemail.com>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

As pointed out by Oliver Neukum:
xpad->irq_in is currently submitted before xpad->bulk_out is allocated.
That however is a race, because the callback for irq_in can call
xpad360w_process_packet(), which will in turn submit the bulk URB.

This patch moves initialization for xpad->bulk_out earlier, so we can
ensure xpad->bulk_out is initialized before submitting urb.
Signed-off-by: NAxel Lin <axel.lin@gmail.com>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

ixpad can never be NULL here; if it is NULL we would not have been bound to
the interface and then why would we be called?
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

Properly free the resources in error path by the reverse order of resource
allocation.
Signed-off-by: NAxel Lin <axel.lin@gmail.com>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

In xpad_led_disconnect(), what we really want is to kfree(xpad_led).
In xpad_disconnect(), add a missing kfree(xpad->bdata) to fix the memory leak.
Signed-off-by: NAxel Lin <axel.lin@gmail.com>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

In current implementation, xpad_probe return 0 when
usb_alloc_urb failed for xpad->bulk_out and kzalloc failed for xpad->bdata.

This patch removes the initialization for error variable,
assign the error code at the place the error happens instead.
Signed-off-by: NAxel Lin <axel.lin@gmail.com>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

This patch adds USB Vendor and Product ID for Pelican PL-3601 'TSZ'
Wired Xbox 360 Controller to the device table.
Signed-off-by: NChristoph Fritz <chf.fritz@googlemail.com>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

Signed-off-by: NChris Merrett <chrisfu@hardc0re.org.uk>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

Dance pads don't have any axes/sticks, only buttons for directions. For
example buttons like left+right will get triggered at once, an axis
can't handle this anyway.  So this patch adds a module parameter named
"sticks_to_null" for unknown devices. A known dance pad makes use of
it by changing to a new mapping-option named DANCEPAD_MAP_CONFIG. Other
tested devices may follow by adding this mapping-option too.

Some buttons of xpad-devices are addressing mouse-buttons instead of
gamepad-buttons. This gets fixed too.
Signed-off-by: NChristoph Fritz <chf.fritz@googlemail.com>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

For more clearance what the functions actually do,

  usb_buffer_alloc() is renamed to usb_alloc_coherent()
  usb_buffer_free()  is renamed to usb_free_coherent()

They should only be used in code which really needs DMA coherency.

All call sites have been changed accordingly, except for staging
drivers.
Signed-off-by: NDaniel Mack <daniel@caiaq.de>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Pedro Ribeiro <pedrib@gmail.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

Signed-off-by: NBenjamin Valentin <benpicco@zedat.fu-berlin.de>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

xbox_play_effect() is called while holding dev->event_lock with
interrupts disabled and thus may not use GFP_KERNEL when submitting
urbs.
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

Certain devices implement triggers as buttons rather than axes. In
particular, arcade sticks such as the HORI Real Arcade Pro.EX do not
have analog buttons.

These devices are now setup to present buttons rather than axes for
triggers.

User-space applications often also have problems with
axes-as-buttons. Activating MAP_TRIGGERS_TO_BUTTONS for a device
removes the artificial difference between buttons and triggers.
Signed-off-by: NNicolas Léveillé <nicolas@uucidl.com>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

Added two new Xbox 360 devices:
   - HORI Real Arcade Pro.EX
   - Mad Catz SFIV Fightpad
Signed-off-by: NNicolas Léveillé <nicolas@uucidl.com>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

Add BigBen Interactive XBOX 360 Controller (146b:0601) to xpad driver.
Signed-off-by: NThomas Gruber <kerneldev@tuxpower.org>
Signed-off-by: NAnssi Hannula <anssi.hannula@iki.fi>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

Signed-off-by: NCorbin Simpson <MostAwesomeDude@gmail.com>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

This avoids an infinite loop.
Signed-off-by: NMichael Gruber <lists.mg@googlemail.com>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

USB should not be having it's own printk macros, so remove info() and
use the system-wide standard of dev_info() wherever possible.
Acked-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: NHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>

Signed-off-by: NHarley Laue <losinggeneration@gmail.com>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: NHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

If both CONFIG_JOYSTICK_XPAD_FF and CONFIG_JOYSTICK_XPAD_LEDS are unset
xpad_bulk_out is not defined and build fails. Move it out of the #ifdef
block so it is always defined.
Reported-by: NIngo Molnar <mingo@elte.hu>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

USB is moving to transfering status as a parameter. To ease the transition
urb->status is to be touched only once in a function. The xpad driver has
been overlooked. Dmitry wants this to go through the USB tree.
Signed-off-by: NOliver Neukum <oneukum@suse.de>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

The messages for led/rumble are exactly 3 and 8 bytes respectively.
Hence set up the transfer_buffer_length accordingly.
Signed-off-by: NMichael Gruber <lists.mg@googlemail.com>
Acked-by: NAnssi Hannula <anssi.hannula@gmail.com>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

GFP_ATOMIC should not be used when GFP_KERNEL can be used.
Signed-off-by: NOliver Neukum <oneukum@suse.de>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

Signed-off-by: NBrian Magnuson <bdmagnuson@gmail.com>
Signed-off-by: NAnssi Hannula <anssi.hannula@gmail.com>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

The driver version numbers and changelog have not been updated in a
long while to reflect actual changes. Remove the version number and
add a notice that later changes can be tracked in SCM.
Signed-off-by: NAnssi Hannula <anssi.hannula@gmail.com>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

Commit 4994cd8d introduced a
regression which causes xpad to report force feedback cababilities
for non-360 controllers too, even while there is no actual support
for those.

Fix that by adding a check for XTYPE_XBOX360 to xpad_init_ff().
Signed-off-by: NAnssi Hannula <anssi.hannula@gmail.com>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

The buttons BTN_C and BTN_Z are only used in the original xbox
controller, not in xbox360 controller. Therefore only add them to
keybit when the controller is a non-360 one.
Signed-off-by: NAnssi Hannula <anssi.hannula@gmail.com>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

Add Mad Catz and 0x0e6f xbox360 controllers which are already found
in xpad_device[] table in xpad.c into the vendor id list. Also add
Logitech into the vendor list for Logitech Chillstream gamepads.
Also add the RedOctane Guitar Hero X-plorer.
Signed-off-by: NAnssi Hannula <anssi.hannula@gmail.com>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

The commit ae91d10a inverted Y and RY
axes on xbox360 so that up is positive and down is negative.
This is wrong, as axes on game controllers have up as negative per
convention. Also, even xpad itself reports HAT0X with up as negative.

Fix that by inverting them again.

Also, according to http://bugzilla.kernel.org/show_bug.cgi?id=10337 the
original xbox controllers also have the Y and RY axes inverted.
Fix that by inverting them as well.

Cc: Brian Magnuson <bdmagnuson@gmail.com>
Signed-off-by: NAnssi Hannula <anssi.hannula@gmail.com>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

For devices not specifically listed in xpad.c, xpad->dpad_mapping
is initially set to MAP_DPAD_UNKNOWN. In xpad_probe() it gets changed
to either MAP_DPAD_TO_BUTTONS or MAP_DPAD_TO_AXES, depending on the
module parameter dpad_to_buttons.

However, MAP_DPAD_UNKNOWN is defined as -1, while the field is u8.
This results in actual value of 255, causing the MAP_DPAD_UNKNOWN
check in xpad_probe() to fail.
Fix that by defining MAP_DPAD_UNKNOWN as 2 instead.

Also, setting module parameter dpad_to_buttons to 1 should obviously
map dpad to buttons, while the default behaviour (0) should be to map
dpad to axes. However, dpad_to_buttons is directly assigned to
xpad->dpad_mapping, and as MAP_DPAD_TO_BUTTONS is 0, the actual
behaviour is reversed.
Fix that by negating dpad_to_buttons in assignment.
Signed-off-by: NAnssi Hannula <anssi.hannula@gmail.com>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

Match Xbox 360 controllers using the interface info, i.e. interface
class 255 (Vendor specific), subclass 93 and protocol 1, instead of
specifying the device ids individually. As the class is vendor-specific,
we have to still match against vendor id as well, though.
Signed-off-by: NAnssi Hannula <anssi.hannula@gmail.com>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

Drop #include <linux/moduleparam.h> in files that also include
linux/module.h, since module.h includes moduleparam.h already.
Signed-off-by: NJulia Lawall <julia@diku.dk>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

Add USB IDs of Mad Catz Wired Xbox 360 Controller and
Pelican 'TSZ' Wired Xbox 360 Controller.
Signed-off-by: NJoshua J Bowman <bowmanj@augsburg.edu>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

get rid of input BIT* duplicate defines

use newly global defined macros for input layer. Also remove includes of
input.h from non-input sources only for BIT macro definiton. Define the
macro temporarily in local manner, all those local definitons will be
removed further in this patchset (to not break bisecting).
BIT macro will be globally defined (1<<x)
Signed-off-by: NJiri Slaby <jirislaby@gmail.com>
Cc: <dtor@mail.ru>
Acked-by: NJiri Kosina <jkosina@suse.cz>
Cc: <lenb@kernel.org>
Acked-by: NMarcel Holtmann <marcel@holtmann.org>
Cc: <perex@suse.cz>
Acked-by: NMauro Carvalho Chehab <mchehab@infradead.org>
Cc: <vernux@us.ibm.com>
Cc: <malattia@linux.it>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>