From patchwork Tue Jan 30 23:19:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brenton Simpson X-Patchwork-Id: 194385 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id gs7csp1555939dyb; Tue, 30 Jan 2024 15:19:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IEfsOIGO3cSTG0SvY0AflURNjA9LRyhnRqN/4bCD/v5FPt8sf0OXPYSl8kDBbjMyEZl96Sc X-Received: by 2002:a2e:80d7:0:b0:2d0:54ef:1dc6 with SMTP id r23-20020a2e80d7000000b002d054ef1dc6mr2731004ljg.33.1706656770451; Tue, 30 Jan 2024 15:19:30 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706656770; cv=pass; d=google.com; s=arc-20160816; b=SiokLtH4ICkbH5wUCIOlc8BavQoWknEE5SIwurSqivg6ZrVrEhnTjzmpukp5MrQrE+ SWV1mVXDJ8WvlP6bCD/Xmxswezw1ZJn0dMhoOYQsYoB54wSMq1mz1/YVVo8UpZDBY1k7 doBYcU+xsJdBYHfoHPcPbu2Vb0mep2FiAOtPfbY62ZxflOKTDKvINyVl3yqcFCgqnOUZ LiQvAS2qsPhpNPI/GaPrxr151XISe4QA5eRV+xRXcFLKNqcIkX6QTVi2Ic/O+0TUXRzW p0o/tlQpvFYcKKub9nWqwLyOA2MgYk96/MFBMfEJleBF61IqXwgW671xUSvH/cPYTXzV VtDg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:from:subject:message-id:references:mime-version :list-unsubscribe:list-subscribe:list-id:precedence:in-reply-to:date :dkim-signature; bh=3ZHtWLch8osUf7MuEnzR3SfbD3ic98HmCKlCawxZtIo=; fh=EsJ4wpQTdbo4v4kVqShAAupyCFF4TWQvRO4ok5sAtR8=; b=wjlFPbs6QNjGJmb93Rh5MvuyrYqY4jcRrjcsNZDdVv5Kc1aqF74hdjgTFnPYgGnv9m xL/Hs+4tCOr6QpNXBjORR5emwC475pTdpKbC0er0eUdWHOg5c7hlfIfWI7TB0PrX0RS5 kqzyD3TtIL4yHnEyF9vqr0vrgoH4IdfxGizLgpBx09FKipZusqjULm7/McEbZfRqhuPt jML2g0eRECDGBcLoQieOQz+ExYqyz9wHS2pEAc/ZBIKP+V08Q/T1NrMCVHXppuXpKufr wN3g/F5f/DOaSMlA0wTaB+YqjCcQ4XwUi7yRtRU8jiNAWLbn2sjvrs+6wpGNkdt11zR7 4ubA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=eUlHjAae; arc=pass (i=1 spf=pass spfdomain=appsforartists-gmr.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-45463-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-45463-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id es14-20020a056402380e00b0055c68a93bcfsi5329359edb.295.2024.01.30.15.19.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 15:19:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-45463-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=eUlHjAae; arc=pass (i=1 spf=pass spfdomain=appsforartists-gmr.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-45463-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-45463-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id DDCA41F2255D for ; Tue, 30 Jan 2024 23:19:29 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4E27E79953; Tue, 30 Jan 2024 23:19:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="eUlHjAae" Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B99D57EF15 for ; Tue, 30 Jan 2024 23:19:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.199 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706656751; cv=none; b=RDjCZe4r20eQIe2pDvuTr0OwwgLK496DmS+HoZteUIUZOnBKSazpCG/YENxu6OM6o/IDvWKngKJCtGVNKgRqauiVF+x9/vRVqI4Vz00de8i5QwZYKD4tceoXxn/lTOCYt94a8EbFqGUqHvLERz50N9BN3VV1R4eVa9eEDmel6uo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706656751; c=relaxed/simple; bh=Ne2zymPGwgNLZ0fzTsCHLLHHtmVdegrwUkI1VwreITE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=YHF2u05H2kbroHcmmumovEVrdy7TvQD1M+e7Pj1kYlKKn838cYjakLGtCSlklFRsqNkZbuQznsQYJH0SUHNm6MPku96T9VzFvxIeMZqqU0z+aYqtK799rCrequqwsTLyAtsIWFnGM8ocVzYfYyrw8S1AJpEjQMjiaPKkN8nG9mA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=appsforartists-gmr.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=eUlHjAae; arc=none smtp.client-ip=209.85.210.199 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=appsforartists-gmr.bounces.google.com Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-6dfc22e98ccso196626b3a.1 for ; Tue, 30 Jan 2024 15:19:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1706656749; x=1707261549; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=3ZHtWLch8osUf7MuEnzR3SfbD3ic98HmCKlCawxZtIo=; b=eUlHjAaeEBtIFR9nvF84wrbDWAubQFTi31gGs0RkbpMXaZrpn9HRUnQL5eS49iPjdu EsdtJbG39sFzVkeeWo9JPBxvBoavZf/EoFebtlpEcY+axxf7hM8z42cOPM79NhG+ugJD ol9psMQGHatd5TMXQBi1QfV+chc8Y4FXBPk+CJQnQuyMnb4n1hVXk++NLzU7kohElMri pwx116sO5SynQwNAJyNH5HV4M8yqf4p9sMM6f/NYthUEUbHIEwpTQr0V+y2nh4mkGfMX UQHB/4Ed+8OJSOq293Nt+o2xculEdIH5uGEU/fVm/1brvDJetf/rDixFycM/UH28Ujl1 B2Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706656749; x=1707261549; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=3ZHtWLch8osUf7MuEnzR3SfbD3ic98HmCKlCawxZtIo=; b=LBmfnxVT6oOWv1Td0hRukLVnpnvGLKA/2N8q5LUObVFWajkdm/AxrrFf2R8BNFy1M0 41eRQhxjMGyP+5vpvjGWsJJ9HTBSJ8feJzMDvVBmszXtqI+zi4b9iqs+gsiaPpJ44XVG onpfKzbj/k/o3TIhZlWjm5WzTpQBXhPpSQ9/ki00Ix7qvz0a7j7RzI0qEKNzGg02TqJt EpAdbo27Uo3FitLbC3y6SffZHavl7CWVUvqCs+ahRquXZjRuwowEM0LDeiImpMlhqitD rX6opEg6L7+0HuUlW8hJfDvjSwuaNi2L6Z+4PlAJtEMcDcFEDaNRmHj08qAtWvH8kqKm VJUQ== X-Gm-Message-State: AOJu0YxWQ3QqatSF3XnvAQEPEiOoA14pUcsfkw+5dxuCNLYGEPawzJMN OUE7VVL1Y68rIEKcxjEJ/3S3XyTXrV2Zqr/H+CxAWzzq/2JiVL7+zDefgnHYOE9s+R8NY1CpQXz Yqr6fSnFpVHKKPdqA0RzsM4Rakw== X-Received: by 2002:aa7:9ec8:0:b0:6de:1b47:8887 with SMTP id r8-20020aa79ec8000000b006de1b478887mr120189pfq.1.1706656748602; Tue, 30 Jan 2024 15:19:08 -0800 (PST) Date: Tue, 30 Jan 2024 23:19:03 +0000 In-Reply-To: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.43.0.429.g432eaa2c6b-goog Message-ID: <20240130231903.293265-1-appsforartists@google.com> Subject: [PATCH] Input: xpad - sort xpad_device by vendor and product ID From: Brenton Simpson To: Dmitry Torokhov , Hans de Goede Cc: Cameron Gutman , Erica Taylor , Ismael Ferreras Morezuelas , Jonathan Frederick , Matthias Benkmann , Matthias Berndt , nate@yocom.org, Sam Lantinga , Vicki Pfau , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, trivial@kernel.org, Brenton Simpson X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789559329336495048 X-GMAIL-MSGID: 1789559329336495048 Signed-off-by: Brenton Simpson --- drivers/input/joystick/xpad.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index 7c4b2a5cc1b5..c67f3d65192d 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -127,6 +127,7 @@ static const struct xpad_device { u8 mapping; u8 xtype; } xpad_device[] = { + /* Please keep this list sorted by vendor and product ID. */ { 0x0079, 0x18d4, "GPD Win 2 X-Box Controller", 0, XTYPE_XBOX360 }, { 0x03eb, 0xff01, "Wooting One (Legacy)", 0, XTYPE_XBOX360 }, { 0x03eb, 0xff02, "Wooting Two (Legacy)", 0, XTYPE_XBOX360 }, @@ -147,9 +148,9 @@ static const struct xpad_device { { 0x045e, 0x02d1, "Microsoft X-Box One pad", 0, XTYPE_XBOXONE }, { 0x045e, 0x02dd, "Microsoft X-Box One pad (Firmware 2015)", 0, XTYPE_XBOXONE }, { 0x045e, 0x02e3, "Microsoft X-Box One Elite pad", MAP_PADDLES, XTYPE_XBOXONE }, - { 0x045e, 0x0b00, "Microsoft X-Box One Elite 2 pad", MAP_PADDLES, XTYPE_XBOXONE }, { 0x045e, 0x02ea, "Microsoft X-Box One S pad", 0, XTYPE_XBOXONE }, { 0x045e, 0x0719, "Xbox 360 Wireless Receiver", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360W }, + { 0x045e, 0x0b00, "Microsoft X-Box One Elite 2 pad", MAP_PADDLES, XTYPE_XBOXONE }, { 0x045e, 0x0b0a, "Microsoft X-Box Adaptive Controller", MAP_PROFILE_BUTTON, XTYPE_XBOXONE }, { 0x045e, 0x0b12, "Microsoft Xbox Series S|X Controller", MAP_SELECT_BUTTON, XTYPE_XBOXONE }, { 0x046d, 0xc21d, "Logitech Gamepad F310", 0, XTYPE_XBOX360 }, @@ -335,7 +336,6 @@ static const struct xpad_device { { 0x20d6, 0x2001, "BDA Xbox Series X Wired Controller", 0, XTYPE_XBOXONE }, { 0x20d6, 0x2009, "PowerA Enhanced Wired Controller for Xbox Series X|S", 0, XTYPE_XBOXONE }, { 0x20d6, 0x281f, "PowerA Wired Controller For Xbox 360", 0, XTYPE_XBOX360 }, - { 0x2e24, 0x0652, "Hyperkin Duke X-Box One pad", 0, XTYPE_XBOXONE }, { 0x24c6, 0x5000, "Razer Atrox Arcade Stick", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 }, { 0x24c6, 0x5300, "PowerA MINI PROEX Controller", 0, XTYPE_XBOX360 }, { 0x24c6, 0x5303, "Xbox Airflo wired controller", 0, XTYPE_XBOX360 }, @@ -350,9 +350,9 @@ static const struct xpad_device { { 0x24c6, 0x5502, "Hori Fighting Stick VX Alt", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 }, { 0x24c6, 0x5503, "Hori Fighting Edge", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 }, { 0x24c6, 0x5506, "Hori SOULCALIBUR V Stick", 0, XTYPE_XBOX360 }, - { 0x24c6, 0x5510, "Hori Fighting Commander ONE (Xbox 360/PC Mode)", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 }, { 0x24c6, 0x550d, "Hori GEM Xbox controller", 0, XTYPE_XBOX360 }, { 0x24c6, 0x550e, "Hori Real Arcade Pro V Kai 360", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 }, + { 0x24c6, 0x5510, "Hori Fighting Commander ONE (Xbox 360/PC Mode)", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 }, { 0x24c6, 0x551a, "PowerA FUSION Pro Controller", 0, XTYPE_XBOXONE }, { 0x24c6, 0x561a, "PowerA FUSION Controller", 0, XTYPE_XBOXONE }, { 0x24c6, 0x5b00, "ThrustMaster Ferrari 458 Racing Wheel", 0, XTYPE_XBOX360 }, @@ -363,6 +363,7 @@ static const struct xpad_device { { 0x2563, 0x058d, "OneXPlayer Gamepad", 0, XTYPE_XBOX360 }, { 0x2dc8, 0x2000, "8BitDo Pro 2 Wired Controller fox Xbox", 0, XTYPE_XBOXONE }, { 0x2dc8, 0x3106, "8BitDo Pro 2 Wired Controller", 0, XTYPE_XBOX360 }, + { 0x2e24, 0x0652, "Hyperkin Duke X-Box One pad", 0, XTYPE_XBOXONE }, { 0x31e3, 0x1100, "Wooting One", 0, XTYPE_XBOX360 }, { 0x31e3, 0x1200, "Wooting Two", 0, XTYPE_XBOX360 }, { 0x31e3, 0x1210, "Wooting Lekker", 0, XTYPE_XBOX360 }, @@ -460,6 +461,9 @@ static const signed short xpad_btn_paddles[] = { { XPAD_XBOXONE_VENDOR_PROTOCOL((vend), 208) } static const struct usb_device_id xpad_table[] = { + /* Please keep this list sorted by vendor ID. Because the lines use different + * macros, you may need to sort it by hand. + */ { USB_INTERFACE_INFO('X', 'B', 0) }, /* Xbox USB-IF not-approved class */ XPAD_XBOX360_VENDOR(0x0079), /* GPD Win 2 controller */ XPAD_XBOX360_VENDOR(0x03eb), /* Wooting Keyboards (Legacy) */