From patchwork Tue Jun 14 23:45:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Herrmann X-Patchwork-Id: 880602 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.4) with ESMTP id p5ENjw6S019029 for ; Tue, 14 Jun 2011 23:46:38 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753703Ab1FNXq2 (ORCPT ); Tue, 14 Jun 2011 19:46:28 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:40020 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752089Ab1FNXq2 (ORCPT ); Tue, 14 Jun 2011 19:46:28 -0400 Received: by mail-fx0-f46.google.com with SMTP id 17so41850fxm.19 for ; Tue, 14 Jun 2011 16:46:27 -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=YTYbXdApFZhZoeNWCeMspHh6a0WWKQBocjHxw5msUjo=; b=x9I/sCpRlYL5ZF/uS7Y8IsWFG+zuv+JPNWKsak8uTfWDBoNzULcyMXzcBfkwBnubeZ W//PsHH/o3CmW7yaZAzSfsVimq2UDsaqLqwdloIWhzKmYRh+3srH/0TkrcAHptmQUY6f Wf6DAOeoz9lYC2o3dTbbaIK5wNbl+OSn3v7ps= 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=wRR41YNmCnCNc9HTTdLsn73dPwXWyvr4GaTcdLTOlJQreQoYDw7GPNXSHqYsxswn9Q wtziOL10aOUoNOIY0E3K60OMqQLSJ46DDsF2AQWsmt7rhbXsEhpoWVmEpKmN3EPo13tU LN+Pg1/4Pvz3furhxoK34TlPGpW5730L5nOFc= Received: by 10.223.7.8 with SMTP id b8mr10610fab.19.1308095187590; Tue, 14 Jun 2011 16:46:27 -0700 (PDT) Received: from localhost.localdomain (stgt-4d0383f8.pool.mediaWays.net [77.3.131.248]) by mx.google.com with ESMTPS id g7sm2963789fac.39.2011.06.14.16.46.26 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 14 Jun 2011 16:46:27 -0700 (PDT) From: David Herrmann To: linux-input@vger.kernel.org Cc: jkosina@suse.cz, padovan@profusion.mobi, dh.herrmann@googlemail.com Subject: [RFC 11/12] HID: wiimote: Cache wiimote led state Date: Wed, 15 Jun 2011 01:45:56 +0200 Message-Id: <1308095157-4699-12-git-send-email-dh.herrmann@googlemail.com> X-Mailer: git-send-email 1.7.5.2 In-Reply-To: <1308095157-4699-1-git-send-email-dh.herrmann@googlemail.com> References: <1308095157-4699-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 (demeter1.kernel.org [140.211.167.41]); Tue, 14 Jun 2011 23:46:38 +0000 (UTC) Save the current state of the leds in the wiimote data structure. This allows us to discard new led requests that wouldn't change anything. Protect the whole state structure by a spinlock. Every wiiproto_* function expects this spinlock to be held when called. Signed-off-by: David Herrmann --- drivers/hid/hid-wiimote.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/drivers/hid/hid-wiimote.c b/drivers/hid/hid-wiimote.c index fbdd7ef..eb86c5d 100644 --- a/drivers/hid/hid-wiimote.c +++ b/drivers/hid/hid-wiimote.c @@ -27,6 +27,11 @@ struct wiimote_buf { size_t size; }; +struct wiimote_state { + spinlock_t lock; + __u8 flags; +}; + struct wiimote_data { atomic_t ready; struct hid_device *hdev; @@ -37,12 +42,16 @@ struct wiimote_data { __u8 tail; struct wiimote_buf outq[WIIMOTE_BUFSIZE]; struct work_struct worker; + + struct wiimote_state state; }; #define WIIPROTO_FLAG_LED1 0x01 #define WIIPROTO_FLAG_LED2 0x02 #define WIIPROTO_FLAG_LED3 0x04 #define WIIPROTO_FLAG_LED4 0x08 +#define WIIPROTO_FLAGS_LEDS (WIIPROTO_FLAG_LED1 | WIIPROTO_FLAG_LED2 | \ + WIIPROTO_FLAG_LED3 | WIIPROTO_FLAG_LED4) enum wiiproto_reqs { WIIPROTO_REQ_LED = 0x11, @@ -164,6 +173,11 @@ static void wiiproto_req_leds(struct wiimote_data *wdata, int leds) { __u8 cmd[2]; + leds &= WIIPROTO_FLAGS_LEDS; + if ((wdata->state.flags & WIIPROTO_FLAGS_LEDS) == leds) + return; + wdata->state.flags = (wdata->state.flags & ~WIIPROTO_FLAGS_LEDS) | leds; + cmd[0] = WIIPROTO_REQ_LED; cmd[1] = 0; @@ -234,6 +248,7 @@ static int wiimote_hid_event(struct hid_device *hdev, struct hid_report *report, struct wiimote_data *wdata = hid_get_drvdata(hdev); struct wiiproto_handler *h; int i; + unsigned long flags; if (!atomic_read(&wdata->ready)) return -EBUSY; @@ -241,12 +256,16 @@ static int wiimote_hid_event(struct hid_device *hdev, struct hid_report *report, if (size < 1) return -EINVAL; + spin_lock_irqsave(&wdata->state.lock, flags); + for (i = 0; handlers[i].id; ++i) { h = &handlers[i]; if (h->id == raw_data[0] && h->size < size) h->func(wdata, &raw_data[1]); } + spin_unlock_irqrestore(&wdata->state.lock, flags); + return 0; } @@ -284,6 +303,8 @@ static struct wiimote_data *wiimote_create(struct hid_device *hdev) spin_lock_init(&wdata->qlock); INIT_WORK(&wdata->worker, wiimote_worker); + spin_lock_init(&wdata->state.lock); + return wdata; } @@ -319,7 +340,12 @@ static int wiimote_hid_probe(struct hid_device *hdev, atomic_set(&wdata->ready, 1); hid_info(hdev, "New device registered\n"); + + /* by default set led1 after device initialization */ + spin_lock(&wdata->state.lock); wiiproto_req_leds(wdata, WIIPROTO_FLAG_LED1); + spin_unlock(&wdata->state.lock); + return 0; err_stop: