From patchwork Fri Apr 8 00:25:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kenney Phillis X-Patchwork-Id: 693841 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 p388EDsx003611 for ; Fri, 8 Apr 2011 08:15:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757198Ab1DHAZP (ORCPT ); Thu, 7 Apr 2011 20:25:15 -0400 Received: from mail-yx0-f174.google.com ([209.85.213.174]:35926 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757140Ab1DHAZO (ORCPT ); Thu, 7 Apr 2011 20:25:14 -0400 Received: by yxs7 with SMTP id 7so1247759yxs.19 for ; Thu, 07 Apr 2011 17:25:14 -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=Q9TUZn7sI+VOgz8zb7WT/eapdHgE38DjmCM6vMBXnW0=; b=Tfg0Uxeh2tWTv2tT2vSX3tp617aJMU1eyssX/kDM/mSJBQgvlrnGAzuxBIHPvsQlSb UFZSD/rSmHFgujlazf21+4VLoPpXof25la+mbHKgMISY57XZGpfiZxaSJqA9GNkrgkbj jcUA1GyRrTu3Fp4eYWXHtZJBp0tVEGOOsjGfM= 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=Uljztp4J0rVZ0yHN+fRODQpucPsM0Ro9XfVVv1TKXZMw7aop4hQjhdd2lGzQPvP6QW 6jyQBC/eMFbeDULq+ROIr71JUmlAlYbe0hV33BVTMqECiG9H5hmya/sFIKb8SDtRkUEg tVlNhQ5SbBuoogZDHMT/G71i9zGxQOw8nIoq0= Received: by 10.151.25.11 with SMTP id c11mr1296039ybj.445.1302222313823; Thu, 07 Apr 2011 17:25:13 -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 f2sm1176506ybh.7.2011.04.07.17.25.11 (version=SSLv3 cipher=OTHER); Thu, 07 Apr 2011 17:25:12 -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: Thu, 07 Apr 2011 19:25:09 -0500 Message-ID: <1302222309.4174.0.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]); Fri, 08 Apr 2011 08:15:05 +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. --- 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),