From patchwork Sun Apr 10 15:57:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kenney Phillis X-Patchwork-Id: 696661 X-Patchwork-Delegate: jikos@jikos.cz Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3AFvRso021670 for ; Sun, 10 Apr 2011 15:57:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754612Ab1DJP50 (ORCPT ); Sun, 10 Apr 2011 11:57:26 -0400 Received: from mail-gx0-f174.google.com ([209.85.161.174]:59508 "EHLO mail-gx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754449Ab1DJP5Z (ORCPT ); Sun, 10 Apr 2011 11:57:25 -0400 Received: by gxk21 with SMTP id 21so1906390gxk.19 for ; Sun, 10 Apr 2011 08:57:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:subject:from:to:content-type:date:message-id :mime-version:x-mailer:content-transfer-encoding; bh=vjhtCIwBiORwsqxmRz6cQuL5Lu/kdSaFHUgb9wookA0=; b=f6wjqzHtmTHlgl8qWR6TVMYRb0KfnFTRtzE8YZOoLEBCefY2XGUX6USK6FNUzJZy7t lTuc8MA/RvDbPYVpOnf1tIlRijWxKO8NhYelwlCbsqTTZ3b8V+j8jjij2uL5OEYVtRpG 2lXYciZDOC1vEXAqHnmSnBtlVcq0+qEZsSURg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; b=b8SNFTMDKbrby18Tpgdsby5IpJysP1h9YovIIxRP0bhT8ML2noja8UNB5o5hBprIM6 YUkbGi7Ln8/6AGkr50lwyNVGEYqzkO3z5YdkW1/lH6hIEkx2OjZyenP8pkzE2xJcfMjt O13i4junbvnJQlVEZu9BFLSu/1wmWTs8LJGgs= Received: by 10.100.107.1 with SMTP id f1mr2722297anc.167.1302451045266; Sun, 10 Apr 2011 08:57:25 -0700 (PDT) Received: from [192.168.3.127] (pool-71-96-228-228.dfw.dsl-w.verizon.net [71.96.228.228]) by mx.google.com with ESMTPS id d36sm5117926and.30.2011.04.10.08.57.22 (version=SSLv3 cipher=OTHER); Sun, 10 Apr 2011 08:57:23 -0700 (PDT) Subject: [PATCH] HID: add USB ID for Alienware Dual Compatible Game Pad in hid-pl From: Kenney Phillis To: linux-input@vger.kernel.org Date: Sun, 10 Apr 2011 10:57:11 -0500 Message-ID: <1302451031.21823.39.camel@dandel-desktop> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sun, 10 Apr 2011 15:57:27 +0000 (UTC) Add support for 187c:0600 device into hid-pl driver. This device has the values in separate fields and resembles devices handled by hid-zpff. Signed-off-by: Kenney Phillis --- Forgot to sign the last email. The tests for the modifications used the fftest tool. The only effects not working are called 'Dampening Condition', 'Constant Force' and 'Spring Condition'. drivers/hid/hid-core.c | 1 + drivers/hid/hid-ids.h | 3 +++ drivers/hid/hid-pl.c | 5 +++++ 3 files changed, 9 insertions(+), 0 deletions(-) .driver_data = 1 }, /* Twin USB Joystick */ { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR), diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index e968776..d7cb7aa 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1290,6 +1290,7 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) }, { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_RP_649) }, { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802) }, + { HID_USB_DEVICE(USB_VENDOR_ID_ALIENWARE, USB_DEVICE_ID_ALIENWARE_GAMEPAD) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ATV_IRCONTROL) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE) }, diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 65ac53d..c0bda19 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -58,6 +58,9 @@ #define USB_VENDOR_ID_ALCOR 0x058f #define USB_DEVICE_ID_ALCOR_USBRS232 0x9720 +#define USB_VENDOR_ID_ALIENWARE 0x187c +#define USB_DEVICE_ID_ALIENWARE_GAMEPAD 0x0600 + #define USB_VENDOR_ID_ALPS 0x0433 #define USB_DEVICE_ID_IBM_GAMEPAD 0x1101 diff --git a/drivers/hid/hid-pl.c b/drivers/hid/hid-pl.c index 06e5300..46d117d 100644 --- a/drivers/hid/hid-pl.c +++ b/drivers/hid/hid-pl.c @@ -14,6 +14,9 @@ * 0e8f:0003 "GASIA USB Gamepad" * - another version of the König gamepad * + * 187c:0600 "Alienware Dual Compatible Game Pad" + * - USB/PS2 Game Controller with Alienware branding. + * * Copyright (c) 2007, 2009 Anssi Hannula */ @@ -201,6 +204,8 @@ err: } static const struct hid_device_id pl_devices[] = { + { HID_USB_DEVICE(USB_VENDOR_ID_ALIENWARE, USB_DEVICE_ID_ALIENWARE_GAMEPAD) }, + /* Alienware Dual Compatible */ { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR),