From patchwork Mon Oct 5 09:12:03 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anssi Hannula X-Patchwork-Id: 51712 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 n959D7ts002722 for ; Mon, 5 Oct 2009 09:13:08 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932318AbZJEJMr (ORCPT ); Mon, 5 Oct 2009 05:12:47 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932320AbZJEJMq (ORCPT ); Mon, 5 Oct 2009 05:12:46 -0400 Received: from mta-out.inet.fi ([195.156.147.13]:54193 "EHLO jenni2.inet.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932318AbZJEJMq (ORCPT ); Mon, 5 Oct 2009 05:12:46 -0400 Received: from mail.onse.fi (84.249.82.67) by jenni2.inet.fi (8.5.014) id 4A777091023AE05C; Mon, 5 Oct 2009 12:12:07 +0300 Received: from gamma.onse.fi (gamma [10.0.0.7]) by mail.onse.fi (Postfix) with ESMTP id E0B7910DE455; Mon, 5 Oct 2009 12:12:03 +0300 (EEST) Message-ID: <4AC9B863.6000100@iki.fi> Date: Mon, 05 Oct 2009 12:12:03 +0300 From: Anssi Hannula User-Agent: Thunderbird 2.0.0.23 (X11/20090830) MIME-Version: 1.0 To: Dmitry Torokhov CC: Linux input list , Thomas Gruber Subject: [patch] xpad: add BigBen Interactive XBOX 360 Controller 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 2388cf5..79e3edc 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -143,6 +143,7 @@ static const struct xpad_device { { 0x12ab, 0x8809, "Xbox DDR dancepad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX }, { 0x1430, 0x4748, "RedOctane Guitar Hero X-plorer", MAP_DPAD_TO_AXES, XTYPE_XBOX360 }, { 0x1430, 0x8888, "TX6500+ Dance Pad (first generation)", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX }, + { 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 }, { 0xffff, 0xffff, "Chinese-made Xbox Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX }, @@ -209,6 +210,7 @@ static struct usb_device_id xpad_table [] = { XPAD_XBOX360_VENDOR(0x0738), /* Mad Catz X-Box 360 controllers */ XPAD_XBOX360_VENDOR(0x0e6f), /* 0x0e6f X-Box 360 controllers */ XPAD_XBOX360_VENDOR(0x1430), /* RedOctane X-Box 360 controllers */ + XPAD_XBOX360_VENDOR(0x146b), /* BigBen Interactive Controllers */ XPAD_XBOX360_VENDOR(0x1bad), /* Rock Band Drums */ { } };