From patchwork Mon Jun 27 14:30:10 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Herrmann X-Patchwork-Id: 921012 X-Patchwork-Delegate: jikos@jikos.cz Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5REV8XX016430 for ; Mon, 27 Jun 2011 14:31:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752722Ab1F0ObG (ORCPT ); Mon, 27 Jun 2011 10:31:06 -0400 Received: from mail-fx0-f52.google.com ([209.85.161.52]:40385 "EHLO mail-fx0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752720Ab1F0ObF (ORCPT ); Mon, 27 Jun 2011 10:31:05 -0400 Received: by mail-fx0-f52.google.com with SMTP id 18so1868769fxd.11 for ; Mon, 27 Jun 2011 07:31:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=O+FBH/obpsvvsw1uvT0YYeqUOAQoTyB2NOIK2lpesaI=; b=R7sC6thoPdwx2Bs/u3H4nQy6O7+YrLV0p4o12XS4X36YZQe3nTdnXrHnY8m9IiiJY6 ZnoK58jy0LhN20pP2mDODwEtgybO71bipg24sm4I8tXjXnjA62Zt8+yv+Y/jebWRjmgp cgayZXnCmn/yS15IVBo/BJWrEKPhUWlIlSwcQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=T2MR52cYuPiH/+UGG41DTMCffYjQVjX7hnFKV/YYV+Sy3pFX286fAlG21YTEEp/zJl fcKTPN5mvVhDxDsvoXs6lWvbvocIGGgrssyxZM+sKZU6NenEGp0f4G+aCfZb/VgKg/Ry DuDXr2Fcp1JgLhLPPtAFQTW1+2wsS99l63rfY= Received: by 10.223.62.194 with SMTP id y2mr8986905fah.123.1309185064937; Mon, 27 Jun 2011 07:31:04 -0700 (PDT) Received: from localhost.localdomain (stgt-5f73b179.pool.mediaWays.net [95.115.177.121]) by mx.google.com with ESMTPS id f3sm3570523faa.6.2011.06.27.07.31.02 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 27 Jun 2011 07:31:03 -0700 (PDT) From: David Herrmann To: linux-input@vger.kernel.org Cc: padovan@profusion.mobi, jkosina@suse.cz, oliver@neukum.org, David Herrmann Subject: [PATCH 09/12] HID: wiimote: Add wiimote input button parser Date: Mon, 27 Jun 2011 16:30:10 +0200 Message-Id: <1309185013-484-9-git-send-email-dh.herrmann@googlemail.com> X-Mailer: git-send-email 1.7.5.2 In-Reply-To: <1309185013-484-1-git-send-email-dh.herrmann@googlemail.com> References: <1309185013-484-1-git-send-email-dh.herrmann@googlemail.com> 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 (demeter2.kernel.org [140.211.167.43]); Mon, 27 Jun 2011 14:31:10 +0000 (UTC) Parse input report 0x30 from the wiimote as button input. We need to send events for all buttons on every input report because the wiimote does not send events for single buttons but always for all buttons to us. The input layer, however, filters redundant events. Signed-off-by: David Herrmann --- drivers/hid/hid-wiimote.c | 66 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 66 insertions(+), 0 deletions(-) diff --git a/drivers/hid/hid-wiimote.c b/drivers/hid/hid-wiimote.c index 9ae333d..3049fc8 100644 --- a/drivers/hid/hid-wiimote.c +++ b/drivers/hid/hid-wiimote.c @@ -39,6 +39,39 @@ struct wiimote_data { struct work_struct worker; }; +enum wiiproto_reqs { + WIIPROTO_REQ_DRM_K = 0x30, +}; + +enum wiiproto_keys { + WIIPROTO_KEY_LEFT, + WIIPROTO_KEY_RIGHT, + WIIPROTO_KEY_UP, + WIIPROTO_KEY_DOWN, + WIIPROTO_KEY_PLUS, + WIIPROTO_KEY_MINUS, + WIIPROTO_KEY_ONE, + WIIPROTO_KEY_TWO, + WIIPROTO_KEY_A, + WIIPROTO_KEY_B, + WIIPROTO_KEY_HOME, + WIIPROTO_KEY_COUNT +}; + +static __u16 wiiproto_keymap[] = { + KEY_LEFT, /* WIIPROTO_KEY_LEFT */ + KEY_RIGHT, /* WIIPROTO_KEY_RIGHT */ + KEY_UP, /* WIIPROTO_KEY_UP */ + KEY_DOWN, /* WIIPROTO_KEY_DOWN */ + KEY_NEXT, /* WIIPROTO_KEY_PLUS */ + KEY_PREVIOUS, /* WIIPROTO_KEY_MINUS */ + BTN_1, /* WIIPROTO_KEY_ONE */ + BTN_2, /* WIIPROTO_KEY_TWO */ + BTN_A, /* WIIPROTO_KEY_A */ + BTN_B, /* WIIPROTO_KEY_B */ + BTN_MODE, /* WIIPROTO_KEY_HOME */ +}; + static ssize_t wiimote_hid_send(struct hid_device *hdev, __u8 *buffer, size_t count) { @@ -138,6 +171,33 @@ static int wiimote_input_event(struct input_dev *dev, unsigned int type, return 0; } +static void handler_keys(struct wiimote_data *wdata, const __u8 *payload) +{ + input_event(wdata->input, EV_KEY, wiiproto_keymap[WIIPROTO_KEY_LEFT], + !!(payload[0] & 0x01)); + input_event(wdata->input, EV_KEY, wiiproto_keymap[WIIPROTO_KEY_RIGHT], + !!(payload[0] & 0x02)); + input_event(wdata->input, EV_KEY, wiiproto_keymap[WIIPROTO_KEY_DOWN], + !!(payload[0] & 0x04)); + input_event(wdata->input, EV_KEY, wiiproto_keymap[WIIPROTO_KEY_UP], + !!(payload[0] & 0x08)); + input_event(wdata->input, EV_KEY, wiiproto_keymap[WIIPROTO_KEY_PLUS], + !!(payload[0] & 0x10)); + input_event(wdata->input, EV_KEY, wiiproto_keymap[WIIPROTO_KEY_TWO], + !!(payload[1] & 0x01)); + input_event(wdata->input, EV_KEY, wiiproto_keymap[WIIPROTO_KEY_ONE], + !!(payload[1] & 0x02)); + input_event(wdata->input, EV_KEY, wiiproto_keymap[WIIPROTO_KEY_B], + !!(payload[1] & 0x04)); + input_event(wdata->input, EV_KEY, wiiproto_keymap[WIIPROTO_KEY_A], + !!(payload[1] & 0x08)); + input_event(wdata->input, EV_KEY, wiiproto_keymap[WIIPROTO_KEY_MINUS], + !!(payload[1] & 0x10)); + input_event(wdata->input, EV_KEY, wiiproto_keymap[WIIPROTO_KEY_HOME], + !!(payload[1] & 0x80)); + input_event(wdata->input, EV_SYN, SYN_REPORT, 0); +} + struct wiiproto_handler { __u8 id; size_t size; @@ -145,6 +205,7 @@ struct wiiproto_handler { }; static struct wiiproto_handler handlers[] = { + { .id = WIIPROTO_REQ_DRM_K, .size = 2, .func = handler_keys }, { .id = 0 } }; @@ -175,6 +236,7 @@ static int wiimote_hid_event(struct hid_device *hdev, struct hid_report *report, static struct wiimote_data *wiimote_create(struct hid_device *hdev) { struct wiimote_data *wdata; + int i; wdata = kzalloc(sizeof(*wdata), GFP_KERNEL); if (!wdata) @@ -198,6 +260,10 @@ static struct wiimote_data *wiimote_create(struct hid_device *hdev) wdata->input->id.version = wdata->hdev->version; wdata->input->name = WIIMOTE_NAME; + set_bit(EV_KEY, wdata->input->evbit); + for (i = 0; i < WIIPROTO_KEY_COUNT; ++i) + set_bit(wiiproto_keymap[i], wdata->input->keybit); + spin_lock_init(&wdata->qlock); INIT_WORK(&wdata->worker, wiimote_worker);