From patchwork Tue Jun 9 22:56:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Rojtberg X-Patchwork-Id: 6575571 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C45FBC0433 for ; Tue, 9 Jun 2015 22:56:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CA258204A9 for ; Tue, 9 Jun 2015 22:56:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DBF38204AE for ; Tue, 9 Jun 2015 22:56:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753351AbbFIW4d (ORCPT ); Tue, 9 Jun 2015 18:56:33 -0400 Received: from mail-wg0-f50.google.com ([74.125.82.50]:36060 "EHLO mail-wg0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753110AbbFIW4c (ORCPT ); Tue, 9 Jun 2015 18:56:32 -0400 Received: by wgbgq6 with SMTP id gq6so22964269wgb.3 for ; Tue, 09 Jun 2015 15:56:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QBCVcFW0XSnJcWWxt+JtJILITugd44P0JQYxeTs2bI4=; b=UkvdMpOa9/5jmzqeWbBFSynbfXzKHRm29tBNnL/w5qhOtWpbfbXzknYSHjkxuxGrhW wjsGe6Iua6I19S/37a/AFM82sB7NaZfJH9BP1zAsegeE2cKX2Ai9kzFr9R5hd51UqIsy 8+YDPtSQOCFC9cGRKxCxxDGIvwZwyg4Uuu5JExFwjkZVM9G1qoI3QQ2cBYAQaCTyVGH4 aU6IE4WmVyFzoP7JzNtmSnPUwdA48nHaPU53FnJ9t3gf1J2ml8M+aZ64AZZdeHeJn6xV /YTOATzlPX5fVlAdmxF+V0EIy8qjXTkqneSSaei0ptGFkuNLoDBa70zBLUO2fqj4BSP3 6Kpg== X-Received: by 10.180.100.101 with SMTP id ex5mr2170533wib.13.1433890591484; Tue, 09 Jun 2015 15:56:31 -0700 (PDT) Received: from deepwhite.fritz.box (p5DDCED14.dip0.t-ipconnect.de. [93.220.237.20]) by mx.google.com with ESMTPSA id g15sm4954649wiv.22.2015.06.09.15.56.30 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 09 Jun 2015 15:56:30 -0700 (PDT) From: Pavel Rojtberg X-Google-Original-From: Pavel Rojtberg < rojtberg@gmail.com > To: linux-input@vger.kernel.org, pgriffais@valvesoftware.com, dmitry.torokhov@gmail.com, gregkh@linuxfoundation.org Cc: Pavel Rojtberg Subject: [PATCH v2 2/2] Input: xpad: re-send LED command on present event Date: Wed, 10 Jun 2015 00:56:19 +0200 Message-Id: <1433890579-2124-3-git-send-email-rojtberg@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1433890579-2124-1-git-send-email-rojtberg@gmail.com> References: <1433890579-2124-1-git-send-email-rojtberg@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Pavel Rojtberg the controller only receives commands when its present. So for the correct LED to be lit the LED command has to be sent on the present event. move led_no to xpad struct to remember the pad number. Signed-off-by: Pavel Rojtberg --- drivers/input/joystick/xpad.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index 6f8755e..f8969a9 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -344,6 +344,7 @@ struct usb_xpad { int mapping; /* map d-pad to buttons or to axes */ int xtype; /* type of xbox device */ + unsigned long led_no; /* led to lit on xbox360 controllers */ }; /* @@ -488,6 +489,8 @@ static void xpad360_process_packet(struct usb_xpad *xpad, input_sync(dev); } +static void xpad_send_led_command(struct usb_xpad *xpad, int command); + /* * xpad360w_process_packet * @@ -510,6 +513,8 @@ static void xpad360w_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned cha if (data[1] & 0x80) { xpad->pad_present = 1; usb_submit_urb(xpad->bulk_out, GFP_ATOMIC); + /* Light up the segment corresponding to controller number */ + xpad_send_led_command(xpad, (xpad->led_no % 4) + 2); } else xpad->pad_present = 0; } @@ -946,7 +951,6 @@ static void xpad_led_set(struct led_classdev *led_cdev, static int xpad_led_probe(struct usb_xpad *xpad) { static atomic_t led_seq = ATOMIC_INIT(-1); - unsigned long led_no; struct xpad_led *led; struct led_classdev *led_cdev; int error; @@ -958,9 +962,9 @@ static int xpad_led_probe(struct usb_xpad *xpad) if (!led) return -ENOMEM; - led_no = atomic_inc_return(&led_seq); + xpad->led_no = atomic_inc_return(&led_seq); - snprintf(led->name, sizeof(led->name), "xpad%lu", led_no); + snprintf(led->name, sizeof(led->name), "xpad%lu", xpad->led_no); led->xpad = xpad; led_cdev = &led->led_cdev; @@ -974,10 +978,8 @@ static int xpad_led_probe(struct usb_xpad *xpad) return error; } - /* - * Light up the segment corresponding to controller number - */ - xpad_send_led_command(xpad, (led_no % 4) + 2); + /* Light up the segment corresponding to controller number */ + xpad_send_led_command(xpad, (xpad->led_no % 4) + 2); return 0; } @@ -994,6 +996,7 @@ static void xpad_led_disconnect(struct usb_xpad *xpad) #else static int xpad_led_probe(struct usb_xpad *xpad) { return 0; } static void xpad_led_disconnect(struct usb_xpad *xpad) { } +static void xpad_send_led_command(struct usb_xpad *xpad, int command) { } #endif