From patchwork Thu Oct 1 20:57:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Rojtberg X-Patchwork-Id: 7311431 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 259A39F1D5 for ; Thu, 1 Oct 2015 20:58:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3C6102080E for ; Thu, 1 Oct 2015 20:58:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 35A8B2080B for ; Thu, 1 Oct 2015 20:58:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757213AbbJAU5t (ORCPT ); Thu, 1 Oct 2015 16:57:49 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:32877 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757148AbbJAU5s (ORCPT ); Thu, 1 Oct 2015 16:57:48 -0400 Received: by wiclk2 with SMTP id lk2so8097177wic.0 for ; Thu, 01 Oct 2015 13:57:47 -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=MQez5t9hY/FG3voAc1a8zBne89fFdBI5Ozq9ao+m8YA=; b=i5JD+f6v/n5arSqc39Zjm2H/CO0hhIBFQBPUc1A3ro2/ysa6YlI13VKO28F5PVeXD3 ryin7S4zQrRMSZzIqpp1yTeIueooX54/JHBbOcLWo0ceiKpmOeX5ay4kIo0OtSzVtMlD HQjaCGPKk1cIbOW8ciLLS0RhPWkFU3Bw/FCGtX5K3H+DXhqEMetDWDIF2H5VsSDFjDNi jLlJzAH0gec7zOLy5HcgCDq/C9PVx0CnAK51HmTHRdfDgJG6YLCeeRZbVEIHbbn0E6rR jfGWxUJRei+b4SvOqRpIew0H+2TPa6c2IUEoBX/sbiytIN1sWH7jCcqyTsWUhEDo60/z ljOA== X-Received: by 10.194.242.167 with SMTP id wr7mr12416695wjc.27.1443733067548; Thu, 01 Oct 2015 13:57:47 -0700 (PDT) Received: from deepwhite.fritz.box (p5790B98A.dip0.t-ipconnect.de. [87.144.185.138]) by smtp.gmail.com with ESMTPSA id lb10sm7989698wjc.9.2015.10.01.13.57.46 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Oct 2015 13:57:46 -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 10/15] Input: xpad: use ida() for finding the pad_nr Date: Thu, 1 Oct 2015 22:57:21 +0200 Message-Id: <1443733046-29610-11-git-send-email-rojtberg@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1443733046-29610-1-git-send-email-rojtberg@gmail.com> References: <1443733046-29610-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 pad_nr corresponds to the lit up LED on the controller. Therefore there should be no gaps when enumerating. Currently a LED is only re-assigned after a controller is re-connected 4 times. This patch uses ida to track connected pads - this way we can re-assign freed up pad number immediately. Consider the following case: 1. pad A is connected and gets pad_nr = 0 2. pad B is connected and gets pad_nr = 1 3. pad A is disconnected 4. pad A is connected again using ida() controller A now correctly gets pad_nr = 0 again. Signed-off-by: Pavel Rojtberg --- drivers/input/joystick/xpad.c | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index 31bcd78..7d53e8e 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -342,11 +342,14 @@ struct usb_xpad { int mapping; /* map d-pad to buttons or to axes */ int xtype; /* type of xbox device */ - unsigned long pad_nr; /* the order x360 pads were attached */ + int pad_nr; /* the order x360 pads were attached */ const char *name; /* name of the device */ struct work_struct work; /* init/remove device from callback */ }; +static DEFINE_SPINLOCK(xpad_pad_seq_lock); +static DEFINE_IDA(xpad_pad_seq); + static int xpad_init_input(struct usb_xpad *xpad); static void xpad_deinit_input(struct usb_xpad *xpad); @@ -946,6 +949,24 @@ static void xpad_send_led_command(struct usb_xpad *xpad, int command) */ static void xpad_identify_controller(struct usb_xpad *xpad) { + int res = 0; + + if (xpad->xtype != XTYPE_XBOX360 && xpad->xtype != XTYPE_XBOX360W) + return; + + while(res == -EAGAIN) { + if(!ida_pre_get(&xpad_pad_seq, GFP_KERNEL)) { + dev_dbg(&xpad->dev->dev, + "%s - ida_pre_get failed. giving up\n", + __func__); + return; + } + + spin_lock(&xpad_pad_seq_lock); + res = ida_get_new(&xpad_pad_seq, &xpad->pad_nr); + spin_unlock(&xpad_pad_seq_lock); + } + xpad_send_led_command(xpad, (xpad->pad_nr % 4) + 2); } @@ -960,7 +981,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); struct xpad_led *led; struct led_classdev *led_cdev; int error; @@ -972,9 +992,7 @@ static int xpad_led_probe(struct usb_xpad *xpad) if (!led) return -ENOMEM; - xpad->pad_nr = atomic_inc_return(&led_seq); - - snprintf(led->name, sizeof(led->name), "xpad%lu", xpad->pad_nr); + snprintf(led->name, sizeof(led->name), "xpad%d", xpad->pad_nr); led->xpad = xpad; led_cdev = &led->led_cdev; @@ -1132,6 +1150,8 @@ static int xpad_init_input(struct usb_xpad *xpad) xpad_set_up_abs(input_dev, xpad_abs_triggers[i]); } + xpad_identify_controller(xpad); + error = xpad_init_ff(xpad); if (error) goto fail_init_ff; @@ -1144,8 +1164,6 @@ static int xpad_init_input(struct usb_xpad *xpad) if (error) goto fail_input_register; - xpad_identify_controller(xpad); - return 0; fail_input_register: @@ -1305,6 +1323,11 @@ static void xpad_deinit_input(struct usb_xpad *xpad) { xpad_led_disconnect(xpad); input_unregister_device(xpad->dev); + + if (xpad->xtype != XTYPE_XBOX360 && xpad->xtype != XTYPE_XBOX360W) + return; + + ida_remove(&xpad_pad_seq, xpad->pad_nr); } static void xpad_disconnect(struct usb_interface *intf)