From patchwork Thu Nov 26 21:28:45 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?Tmljb2xhcyBMw4PCqXZlaWxsw4PCqQ==?= X-Patchwork-Id: 63230 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nAQLXFoF015700 for ; Thu, 26 Nov 2009 21:33:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1749667AbZKZVdH (ORCPT ); Thu, 26 Nov 2009 16:33:07 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751511AbZKZVdH (ORCPT ); Thu, 26 Nov 2009 16:33:07 -0500 Received: from smtp5-g21.free.fr ([212.27.42.5]:49218 "EHLO smtp5-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750919AbZKZVdG (ORCPT ); Thu, 26 Nov 2009 16:33:06 -0500 Received: from smtp5-g21.free.fr (localhost [127.0.0.1]) by smtp5-g21.free.fr (Postfix) with ESMTP id BAFC2D48134; Thu, 26 Nov 2009 22:33:07 +0100 (CET) Received: from localhost.localdomain (bob75-6-82-238-74-76.fbx.proxad.net [82.238.74.76]) by smtp5-g21.free.fr (Postfix) with ESMTP id CB7F8D48082; Thu, 26 Nov 2009 22:33:04 +0100 (CET) Received: from 192.168.0.75 ([192.168.0.75]) by localhost.localdomain ([127.0.0.1]) with ESMTP (ZOE); Thu, 26 Nov 2009 22:35:36 +0100 (CET) Message-ID: <4B0EF30D.1030705@free.fr> Date: Thu, 26 Nov 2009 22:28:45 +0100 From: =?ISO-8859-1?Q?Nicolas_L=E9veill=E9?= User-Agent: Thunderbird 2.0.0.22 (X11/20090605) MIME-Version: 1.0 To: Dmitry Torokhov CC: linux-input@vger.kernel.org Subject: [PATCH 1/2] Added two new Xbox 360 devices Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index 79e3edc..482cb12 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -125,6 +125,7 @@ static const struct xpad_device { { 0x0738, 0x4540, "Mad Catz Beat Pad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX }, { 0x0738, 0x4556, "Mad Catz Lynx Wireless Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX }, { 0x0738, 0x4716, "Mad Catz Wired Xbox 360 Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX360 }, + { 0x0738, 0x4738, "Mad Catz Wired Xbox 360 Controller (SFIV)", MAP_DPAD_TO_AXES, XTYPE_XBOX360 }, { 0x0738, 0x6040, "Mad Catz Beat Pad Pro", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX }, { 0x0c12, 0x8802, "Zeroplus Xbox Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX }, { 0x0c12, 0x880a, "Pelican Eclipse PL-2023", MAP_DPAD_TO_AXES, XTYPE_XBOX }, @@ -146,6 +147,7 @@ static const struct xpad_device { { 0x146b, 0x0601, "BigBen Interactive XBOX 360 Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX360 }, { 0x045e, 0x028e, "Microsoft X-Box 360 pad", MAP_DPAD_TO_AXES, XTYPE_XBOX360 }, { 0x1bad, 0x0003, "Harmonix Rock Band Drumkit", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 }, + { 0x0f0d, 0x0016, "Hori Real Arcade Pro.EX", MAP_DPAD_TO_AXES, XTYPE_XBOX360 }, { 0xffff, 0xffff, "Chinese-made Xbox Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX }, { 0x0000, 0x0000, "Generic X-Box pad", MAP_DPAD_UNKNOWN, XTYPE_UNKNOWN } }; @@ -212,6 +214,7 @@ static struct usb_device_id xpad_table [] = { 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(0x0f0d), /* Hori Controllers */ { } };