From patchwork Tue Apr 2 17:58:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Herrmann X-Patchwork-Id: 2379731 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id D33973FDDA for ; Tue, 2 Apr 2013 17:59:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759201Ab3DBR7L (ORCPT ); Tue, 2 Apr 2013 13:59:11 -0400 Received: from mail-bk0-f41.google.com ([209.85.214.41]:59099 "EHLO mail-bk0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757797Ab3DBR7K (ORCPT ); Tue, 2 Apr 2013 13:59:10 -0400 Received: by mail-bk0-f41.google.com with SMTP id i18so355747bkv.28 for ; Tue, 02 Apr 2013 10:59:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=AKrLyaC/NL1hExkw0slHxGHQTLSHm9CIVdYK6ggQp5M=; b=rRibWEjU41nrsmQb22IshYIj2D3WTfkdEcfpbVpWcej8raO01jPFm+991LPCJ3gY57 ymbIl56RkXbRmLR0CEvaOE9K4e0Etm9La8Hlpgh4EboDBhyMHKzVZS6agS79QkupO0qz 4uQIEi1Ro9BtUtMYGw3FOyMZqgzUf1UPtcAITuop15Tq4ptAgC0RicVYy3eMAR1WT92H ZyY4L0aViPCxTYMsr1S+ivDtzyK70TZxEubTMPY3QQCqMAw4eLBrOCiRSLojJVG9YyWA ihbaDivydJpmU/6NwgzTDMWyK8FWf+yYKoVXvlG3oqRLHnT3MP+vM0JfvWAIsMrpxHzQ DpGQ== X-Received: by 10.205.40.72 with SMTP id tp8mr7248575bkb.31.1364925548804; Tue, 02 Apr 2013 10:59:08 -0700 (PDT) Received: from localhost.localdomain (stgt-5f71b631.pool.mediaWays.net. [95.113.182.49]) by mx.google.com with ESMTPS id ge12sm1021309bkc.19.2013.04.02.10.59.06 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 02 Apr 2013 10:59:07 -0700 (PDT) From: David Herrmann To: linux-input@vger.kernel.org Cc: Jiri Kosina , David Herrmann Subject: [PATCH 2/3] HID: wiimote: add 2nd generation Wii Remote IDs Date: Tue, 2 Apr 2013 19:58:35 +0200 Message-Id: <1364925516-5724-2-git-send-email-dh.herrmann@gmail.com> X-Mailer: git-send-email 1.8.2 In-Reply-To: <1364925516-5724-1-git-send-email-dh.herrmann@gmail.com> References: <1364925516-5724-1-git-send-email-dh.herrmann@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org This adds the 2nd generation Wii Remote IDs. They have a different Bluetooth chipset (CSR instead of Broadcom) and are more restrictive in what they accept as input. Hence, you need up-to-date BlueZ and Bluetooth HIDP modules to use these devices. Signed-off-by: David Herrmann --- drivers/hid/hid-core.c | 1 + drivers/hid/hid-ids.h | 1 + drivers/hid/hid-wiimote-core.c | 2 ++ 3 files changed, 4 insertions(+) diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index ceb3040..b0ad27a 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1741,6 +1741,7 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT) }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE) }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE2) }, { } }; diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 266e2ae..a775b1c 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -605,6 +605,7 @@ #define USB_VENDOR_ID_NINTENDO 0x057e #define USB_DEVICE_ID_NINTENDO_WIIMOTE 0x0306 +#define USB_DEVICE_ID_NINTENDO_WIIMOTE2 0x0330 #define USB_VENDOR_ID_NOVATEK 0x0603 #define USB_DEVICE_ID_NOVATEK_PCT 0x0600 diff --git a/drivers/hid/hid-wiimote-core.c b/drivers/hid/hid-wiimote-core.c index c73bc80..d2c69b9 100644 --- a/drivers/hid/hid-wiimote-core.c +++ b/drivers/hid/hid-wiimote-core.c @@ -1291,6 +1291,8 @@ static void wiimote_hid_remove(struct hid_device *hdev) static const struct hid_device_id wiimote_hid_devices[] = { { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE) }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, + USB_DEVICE_ID_NINTENDO_WIIMOTE2) }, { } }; MODULE_DEVICE_TABLE(hid, wiimote_hid_devices);