linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] xpad: Add support for two more dance pads and one more guitar
@ 2011-05-31  6:36 Magnus Hörlin
  2011-05-31  7:53 ` Oliver Neukum
  2011-05-31  7:53 ` Dmitry Torokhov
  0 siblings, 2 replies; 6+ messages in thread
From: Magnus Hörlin @ 2011-05-31  6:36 UTC (permalink / raw)
  To: linux-input; +Cc: chf.fritz

[-- Attachment #1: Type: text/plain, Size: 114 bytes --]

Hi.
Please find attached a patch that adds support for some xbox 360 stuff I
bought for my kids.
/Magnus Hörlin


[-- Attachment #2: xpad.c.diff --]
[-- Type: text/x-patch, Size: 1865 bytes --]

--- linux-2.6.orig/drivers/input/joystick/xpad.c	2011-05-30 17:32:49.548000317 +0200
+++ linux-2.6/drivers/input/joystick/xpad.c	2011-05-20 14:17:00.458068908 +0200
@@ -154,10 +154,13 @@
 	{ 0x0f30, 0x8888, "BigBen XBMiniPad Controller", 0, XTYPE_XBOX },
 	{ 0x102c, 0xff0c, "Joytech Wireless Advanced Controller", 0, XTYPE_XBOX },
 	{ 0x12ab, 0x8809, "Xbox DDR dancepad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },
+	{ 0x12ab, 0x0004, "Honey Bee Xbox360 dancepad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },
+	{ 0x0e6f, 0x0105, "HSM3 Xbox360 dancepad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },
 	{ 0x1430, 0x4748, "RedOctane Guitar Hero X-plorer", 0, XTYPE_XBOX360 },
 	{ 0x1430, 0x8888, "TX6500+ Dance Pad (first generation)", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },
 	{ 0x146b, 0x0601, "BigBen Interactive XBOX 360 Controller", 0, XTYPE_XBOX360 },
 	{ 0x045e, 0x028e, "Microsoft X-Box 360 pad", 0, XTYPE_XBOX360 },
+	{ 0x1bad, 0x0002, "Harmonix Rock Band Guitar", 0, XTYPE_XBOX360 },
 	{ 0x1bad, 0x0003, "Harmonix Rock Band Drumkit", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },
 	{ 0x0f0d, 0x0016, "Hori Real Arcade Pro.EX", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },
 	{ 0x0f0d, 0x000d, "Hori Fighting Stick EX2", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },
@@ -236,9 +239,10 @@
 	XPAD_XBOX360_VENDOR(0x046d),		/* Logitech X-Box 360 style controllers */
 	XPAD_XBOX360_VENDOR(0x0738),		/* Mad Catz X-Box 360 controllers */
 	XPAD_XBOX360_VENDOR(0x0e6f),		/* 0x0e6f X-Box 360 controllers */
+	XPAD_XBOX360_VENDOR(0x12ab),		/* X-Box 360 dance pads */
 	XPAD_XBOX360_VENDOR(0x1430),		/* RedOctane X-Box 360 controllers */
 	XPAD_XBOX360_VENDOR(0x146b),		/* BigBen Interactive Controllers */
-	XPAD_XBOX360_VENDOR(0x1bad),		/* Rock Band Drums */
+	XPAD_XBOX360_VENDOR(0x1bad),		/* Harminix Rock Band Guitar and Drums */
 	XPAD_XBOX360_VENDOR(0x0f0d),            /* Hori Controllers */
 	{ }
 };

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] xpad: Add support for two more dance pads and one more guitar
  2011-05-31  6:36 [PATCH] xpad: Add support for two more dance pads and one more guitar Magnus Hörlin
@ 2011-05-31  7:53 ` Oliver Neukum
  2011-05-31  7:53 ` Dmitry Torokhov
  1 sibling, 0 replies; 6+ messages in thread
From: Oliver Neukum @ 2011-05-31  7:53 UTC (permalink / raw)
  To: Magnus Hörlin; +Cc: linux-input, chf.fritz

Am Dienstag, 31. Mai 2011, 08:36:39 schrieb Magnus Hörlin:
> Hi.
> Please find attached a patch that adds support for some xbox 360 stuff I
> bought for my kids.
> /Magnus Hörlin
> 
> 

Thank you for making this patch.
Could you resend it with a "Signed-off-by:" YOUR_MAIL line?

	Regards
		Oliver
-- 
- - - 
SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) 
Maxfeldstraße 5                         
90409 Nürnberg 
Germany 
- - - 
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] xpad: Add support for two more dance pads and one more guitar
  2011-05-31  6:36 [PATCH] xpad: Add support for two more dance pads and one more guitar Magnus Hörlin
  2011-05-31  7:53 ` Oliver Neukum
@ 2011-05-31  7:53 ` Dmitry Torokhov
  2011-05-31  8:14   ` Magnus Hörlin
  1 sibling, 1 reply; 6+ messages in thread
From: Dmitry Torokhov @ 2011-05-31  7:53 UTC (permalink / raw)
  To: Magnus Hörlin; +Cc: linux-input, chf.fritz

Hi Magnus,

On Tue, May 31, 2011 at 08:36:39AM +0200, Magnus Hörlin wrote:
> Hi.
> Please find attached a patch that adds support for some xbox 360 stuff I
> bought for my kids.
> /Magnus Hörlin
> 

Thank you for your patch, but before I can apply it could you please
give me your "signed-off-by: " please (see
Documentation/SubmittingPatches item #12).

Thanks.

-- 
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] xpad: Add support for two more dance pads and one more guitar
  2011-05-31  7:53 ` Dmitry Torokhov
@ 2011-05-31  8:14   ` Magnus Hörlin
  2011-05-31 11:31     ` Christoph Fritz
  0 siblings, 1 reply; 6+ messages in thread
From: Magnus Hörlin @ 2011-05-31  8:14 UTC (permalink / raw)
  To: linux-input; +Cc: dmitry.torokhov, chf.fritz, oneukum

[-- Attachment #1: Type: text/plain, Size: 111 bytes --]

Hi. Sorry for not having RTFM. Now I have.
Thanks,
/Magnus


Signed-off-by: Magnus Hörlin <magnus@alefors.se>

[-- Attachment #2: xpad.c.diff --]
[-- Type: text/x-patch, Size: 1940 bytes --]

--- linux-2.6/drivers/input/joystick/xpad.c.orig	2011-05-31 10:03:56.063804819 +0200
+++ linux-2.6/drivers/input/joystick/xpad.c	2011-05-31 10:04:02.875805046 +0200
@@ -154,10 +154,13 @@ static const struct xpad_device {
 	{ 0x0f30, 0x8888, "BigBen XBMiniPad Controller", 0, XTYPE_XBOX },
 	{ 0x102c, 0xff0c, "Joytech Wireless Advanced Controller", 0, XTYPE_XBOX },
 	{ 0x12ab, 0x8809, "Xbox DDR dancepad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },
+	{ 0x12ab, 0x0004, "Honey Bee Xbox360 dancepad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },
+	{ 0x0e6f, 0x0105, "HSM3 Xbox360 dancepad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },
 	{ 0x1430, 0x4748, "RedOctane Guitar Hero X-plorer", 0, XTYPE_XBOX360 },
 	{ 0x1430, 0x8888, "TX6500+ Dance Pad (first generation)", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },
 	{ 0x146b, 0x0601, "BigBen Interactive XBOX 360 Controller", 0, XTYPE_XBOX360 },
 	{ 0x045e, 0x028e, "Microsoft X-Box 360 pad", 0, XTYPE_XBOX360 },
+	{ 0x1bad, 0x0002, "Harmonix Rock Band Guitar", 0, XTYPE_XBOX360 },
 	{ 0x1bad, 0x0003, "Harmonix Rock Band Drumkit", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },
 	{ 0x0f0d, 0x0016, "Hori Real Arcade Pro.EX", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },
 	{ 0x0f0d, 0x000d, "Hori Fighting Stick EX2", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },
@@ -236,9 +239,10 @@ static struct usb_device_id xpad_table [
 	XPAD_XBOX360_VENDOR(0x046d),		/* Logitech X-Box 360 style controllers */
 	XPAD_XBOX360_VENDOR(0x0738),		/* Mad Catz X-Box 360 controllers */
 	XPAD_XBOX360_VENDOR(0x0e6f),		/* 0x0e6f X-Box 360 controllers */
+	XPAD_XBOX360_VENDOR(0x12ab),		/* X-Box 360 dance pads */
 	XPAD_XBOX360_VENDOR(0x1430),		/* RedOctane X-Box 360 controllers */
 	XPAD_XBOX360_VENDOR(0x146b),		/* BigBen Interactive Controllers */
-	XPAD_XBOX360_VENDOR(0x1bad),		/* Rock Band Drums */
+	XPAD_XBOX360_VENDOR(0x1bad),		/* Harminix Rock Band Guitar and Drums */
 	XPAD_XBOX360_VENDOR(0x0f0d),            /* Hori Controllers */
 	{ }
 };

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] xpad: Add support for two more dance pads and one more guitar
  2011-05-31  8:14   ` Magnus Hörlin
@ 2011-05-31 11:31     ` Christoph Fritz
  2011-06-22 21:48       ` Dmitry Torokhov
  0 siblings, 1 reply; 6+ messages in thread
From: Christoph Fritz @ 2011-05-31 11:31 UTC (permalink / raw)
  To: Magnus Hörlin; +Cc: linux-input, dmitry.torokhov, oneukum

On Tue, 2011-05-31 at 10:14 +0200, Magnus Hörlin wrote:
> +       { 0x12ab, 0x0004, "Honey Bee Xbox360 dancepad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },
> +       { 0x0e6f, 0x0105, "HSM3 Xbox360 dancepad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },

Nice to see that MAP_DPAD_TO_BUTTONS is used.

Reviewed-by: Christoph Fritz <chf.fritz@googlemail.com>

Thanks,
 -- Christoph

--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] xpad: Add support for two more dance pads and one more guitar
  2011-05-31 11:31     ` Christoph Fritz
@ 2011-06-22 21:48       ` Dmitry Torokhov
  0 siblings, 0 replies; 6+ messages in thread
From: Dmitry Torokhov @ 2011-06-22 21:48 UTC (permalink / raw)
  To: Christoph Fritz; +Cc: Magnus Hörlin, linux-input, oneukum

On Tue, May 31, 2011 at 01:31:21PM +0200, Christoph Fritz wrote:
> On Tue, 2011-05-31 at 10:14 +0200, Magnus Hörlin wrote:
> > +       { 0x12ab, 0x0004, "Honey Bee Xbox360 dancepad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },
> > +       { 0x0e6f, 0x0105, "HSM3 Xbox360 dancepad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },
> 
> Nice to see that MAP_DPAD_TO_BUTTONS is used.
> 
> Reviewed-by: Christoph Fritz <chf.fritz@googlemail.com>
> 

Applied to 'next', thanks Magnus.

-- 
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2011-06-22 21:48 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-31  6:36 [PATCH] xpad: Add support for two more dance pads and one more guitar Magnus Hörlin
2011-05-31  7:53 ` Oliver Neukum
2011-05-31  7:53 ` Dmitry Torokhov
2011-05-31  8:14   ` Magnus Hörlin
2011-05-31 11:31     ` Christoph Fritz
2011-06-22 21:48       ` Dmitry Torokhov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).