mirror of
https://github.com/libretro/Lakka-LibreELEC.git
synced 2025-03-01 06:51:22 +00:00
213 lines
9.0 KiB
Diff
213 lines
9.0 KiB
Diff
From patchwork Sun Feb 7 21:49:06 2021
|
|
Content-Type: text/plain; charset="utf-8"
|
|
MIME-Version: 1.0
|
|
Content-Transfer-Encoding: 7bit
|
|
X-Patchwork-Submitter: Roderick Colenbrander <roderick@gaikai.com>
|
|
X-Patchwork-Id: 12073423
|
|
X-Patchwork-Delegate: jikos@jikos.cz
|
|
Return-Path: <linux-input-owner@kernel.org>
|
|
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
|
|
aws-us-west-2-korg-lkml-1.web.codeaurora.org
|
|
X-Spam-Level:
|
|
X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED,
|
|
DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH,
|
|
MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham
|
|
autolearn_force=no version=3.4.0
|
|
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
|
|
by smtp.lore.kernel.org (Postfix) with ESMTP id E7A2CC4332D
|
|
for <linux-input@archiver.kernel.org>; Sun, 7 Feb 2021 21:50:52 +0000 (UTC)
|
|
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
|
|
by mail.kernel.org (Postfix) with ESMTP id D11B364E42
|
|
for <linux-input@archiver.kernel.org>; Sun, 7 Feb 2021 21:50:52 +0000 (UTC)
|
|
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
|
|
id S229601AbhBGVuj (ORCPT <rfc822;linux-input@archiver.kernel.org>);
|
|
Sun, 7 Feb 2021 16:50:39 -0500
|
|
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54924 "EHLO
|
|
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
|
|
with ESMTP id S229581AbhBGVuh (ORCPT
|
|
<rfc822;linux-input@vger.kernel.org>); Sun, 7 Feb 2021 16:50:37 -0500
|
|
Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com
|
|
[IPv6:2607:f8b0:4864:20::52f])
|
|
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F1F9BC0617A9
|
|
for <linux-input@vger.kernel.org>;
|
|
Sun, 7 Feb 2021 13:49:26 -0800 (PST)
|
|
Received: by mail-pg1-x52f.google.com with SMTP id e7so37574pge.0
|
|
for <linux-input@vger.kernel.org>;
|
|
Sun, 07 Feb 2021 13:49:26 -0800 (PST)
|
|
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
|
d=gaikai-com.20150623.gappssmtp.com; s=20150623;
|
|
h=from:to:cc:subject:date:message-id:in-reply-to:references
|
|
:mime-version:content-transfer-encoding;
|
|
bh=BS7DivJFl5AT7V+WqM5Kz27qKRGDnECZ9lanj9m1Rjc=;
|
|
b=tS04iCE+pLwsPdcQKJSZLUrTPBDfeeJoVLIUxvu4TPHLXbjYr1/+76gCtvaRP8TxYu
|
|
YwMTeXecoyfT5ljpIfmoRX5q98MR5M54S8l1yNe3udk+lAXqjIfysT/Scc/eoN9JiXy2
|
|
NNv+1v3X1iCd1NSDFnzgKeON73rTHa0sDwIw0qvuTlC1fKRSvpOVag4g8Hy5nENuguo8
|
|
aFQfbcmip4DEl9nQlpWWvQZ+IYeI9EtzK99CUL/2uyzXZj0ke2IXZyJ9kX4ex4+G2Tdx
|
|
bqZK3IK1ZUA1Ol5y3xL3rx/8cfB57hM4FTlxNoSY3euPKNNzb/cp/hO7k6Po1Orhgczl
|
|
iQTQ==
|
|
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
|
d=1e100.net; s=20161025;
|
|
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
|
|
:references:mime-version:content-transfer-encoding;
|
|
bh=BS7DivJFl5AT7V+WqM5Kz27qKRGDnECZ9lanj9m1Rjc=;
|
|
b=YuGBs9gKYXdp+ZbEQNx9Cz4dTRmxUFiKk366dn+l7kz9JTuLOTasu/KI/H/VZeZpf3
|
|
YNlb4wCvlkY8QUyhhNhPxHM8b2t7MX4dPMFQNKw2o0CyM86wLf08MwbnBLsCTBHQpIoV
|
|
3+xW1T09FXEfk85SL/03j5z8BHSNu3YqPgGFc7/xWBqtplw6edOZGkAnEnZXIFPJQUM0
|
|
u0PiJ/evq1yBCdSeRUm9sHjTs3miDrwpHsM3S/3qfgUm/yIDdOwRQNeBSUlRssTCFMGW
|
|
dY2NXhTCzedT3FQ/qY8DBuWhkdvQpxyHm2UDS2szN8tVD04hjPpNwqPGo0x5kB2lQ8dz
|
|
RyiA==
|
|
X-Gm-Message-State: AOAM532tTm/odCgLWoR4HnztIB76cHXjcSjO7pfNw1HW2kqKPQaK1OCM
|
|
uMLCu0CNCUnt6ohQ2gQ6P2tvYg==
|
|
X-Google-Smtp-Source:
|
|
ABdhPJy0Q1HFBQMzwWsq5OuB9UJsMGkAoMfvRrrHHPbE5xAIm7BhYOiikE0cGIuo+6GPiNWN5wwiGg==
|
|
X-Received: by 2002:aa7:86d8:0:b029:1b5:1121:729a with SMTP id
|
|
h24-20020aa786d80000b02901b51121729amr4032882pfo.57.1612734566592;
|
|
Sun, 07 Feb 2021 13:49:26 -0800 (PST)
|
|
Received: from us8c16456344dc.lan (cpe-76-87-77-78.socal.res.rr.com.
|
|
[76.87.77.78])
|
|
by smtp.gmail.com with ESMTPSA id
|
|
a141sm16578991pfa.189.2021.02.07.13.49.25
|
|
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
|
|
Sun, 07 Feb 2021 13:49:26 -0800 (PST)
|
|
From: Roderick Colenbrander <roderick@gaikai.com>
|
|
To: Jiri Kosina <jikos@kernel.org>,
|
|
Benjamin Tissoires <benjamin.tissoires@redhat.com>
|
|
Cc: linux-input@vger.kernel.org, Chris Ye <lzye@google.com>, =?utf-8?q?Barna?=
|
|
=?utf-8?q?b=C3=A1s_P=C5=91cze?= <pobrn@protonmail.com>, =?utf-8?q?Samuel_?=
|
|
=?utf-8?q?=C4=8Cavoj?= <sammko@sammserver.com>, =?utf-8?q?Florian_M=C3=A4rk?=
|
|
=?utf-8?q?l?= <linux@florianmaerkl.de>,
|
|
Roderick Colenbrander <roderick.colenbrander@sony.com>
|
|
Subject: [PATCH v6 11/13] HID: playstation: add DualSense player LEDs support.
|
|
Date: Sun, 7 Feb 2021 13:49:06 -0800
|
|
Message-Id: <20210207214908.79573-12-roderick@gaikai.com>
|
|
X-Mailer: git-send-email 2.26.2
|
|
In-Reply-To: <20210207214908.79573-1-roderick@gaikai.com>
|
|
References: <20210207214908.79573-1-roderick@gaikai.com>
|
|
MIME-Version: 1.0
|
|
Precedence: bulk
|
|
List-ID: <linux-input.vger.kernel.org>
|
|
X-Mailing-List: linux-input@vger.kernel.org
|
|
|
|
From: Roderick Colenbrander <roderick.colenbrander@sony.com>
|
|
|
|
The DualSense features 5 player LEDs below its touchpad, which are
|
|
meant as player id indications. This patch exposes the player LEDs
|
|
as individual LEDs.
|
|
|
|
Signed-off-by: Roderick Colenbrander <roderick.colenbrander@sony.com>
|
|
---
|
|
drivers/hid/hid-playstation.c | 60 ++++++++++++++++++++++++++++++++++-
|
|
1 file changed, 59 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/hid/hid-playstation.c b/drivers/hid/hid-playstation.c
|
|
index c436ac8f7a6f..2d96785c397d 100644
|
|
--- a/drivers/hid/hid-playstation.c
|
|
+++ b/drivers/hid/hid-playstation.c
|
|
@@ -112,6 +112,7 @@ struct ps_led_info {
|
|
#define DS_OUTPUT_VALID_FLAG1_POWER_SAVE_CONTROL_ENABLE BIT(1)
|
|
#define DS_OUTPUT_VALID_FLAG1_LIGHTBAR_CONTROL_ENABLE BIT(2)
|
|
#define DS_OUTPUT_VALID_FLAG1_RELEASE_LEDS BIT(3)
|
|
+#define DS_OUTPUT_VALID_FLAG1_PLAYER_INDICATOR_CONTROL_ENABLE BIT(4)
|
|
#define DS_OUTPUT_VALID_FLAG2_LIGHTBAR_SETUP_CONTROL_ENABLE BIT(1)
|
|
#define DS_OUTPUT_POWER_SAVE_CONTROL_MIC_MUTE BIT(4)
|
|
#define DS_OUTPUT_LIGHTBAR_SETUP_LIGHT_OUT BIT(1)
|
|
@@ -157,6 +158,11 @@ struct dualsense {
|
|
bool last_btn_mic_state;
|
|
struct led_classdev mute_led;
|
|
|
|
+ /* Player leds */
|
|
+ bool update_player_leds;
|
|
+ uint8_t player_leds_state;
|
|
+ struct led_classdev player_leds[5];
|
|
+
|
|
struct work_struct output_worker;
|
|
void *output_report_dmabuf;
|
|
uint8_t output_seq; /* Sequence number for output report. */
|
|
@@ -778,6 +784,35 @@ static void dualsense_mute_led_set_brightness(struct led_classdev *led, enum led
|
|
|
|
}
|
|
|
|
+static enum led_brightness dualsense_player_led_get_brightness(struct led_classdev *led)
|
|
+{
|
|
+ struct hid_device *hdev = to_hid_device(led->dev->parent);
|
|
+ struct dualsense *ds = hid_get_drvdata(hdev);
|
|
+
|
|
+ return !!(ds->player_leds_state & BIT(led - ds->player_leds));
|
|
+}
|
|
+
|
|
+static void dualsense_player_led_set_brightness(struct led_classdev *led, enum led_brightness value)
|
|
+{
|
|
+ struct hid_device *hdev = to_hid_device(led->dev->parent);
|
|
+ struct dualsense *ds = hid_get_drvdata(hdev);
|
|
+ unsigned long flags;
|
|
+ unsigned int led_index;
|
|
+
|
|
+ spin_lock_irqsave(&ds->base.lock, flags);
|
|
+
|
|
+ led_index = led - ds->player_leds;
|
|
+ if (value == LED_OFF)
|
|
+ ds->player_leds_state &= ~BIT(led_index);
|
|
+ else
|
|
+ ds->player_leds_state |= BIT(led_index);
|
|
+
|
|
+ ds->update_player_leds = true;
|
|
+ spin_unlock_irqrestore(&ds->base.lock, flags);
|
|
+
|
|
+ schedule_work(&ds->output_worker);
|
|
+}
|
|
+
|
|
static void dualsense_init_output_report(struct dualsense *ds, struct dualsense_output_report *rp,
|
|
void *buf)
|
|
{
|
|
@@ -870,6 +905,13 @@ static void dualsense_output_worker(struct work_struct *work)
|
|
ds->update_lightbar = false;
|
|
}
|
|
|
|
+ if (ds->update_player_leds) {
|
|
+ common->valid_flag1 |= DS_OUTPUT_VALID_FLAG1_PLAYER_INDICATOR_CONTROL_ENABLE;
|
|
+ common->player_leds = ds->player_leds_state;
|
|
+
|
|
+ ds->update_player_leds = false;
|
|
+ }
|
|
+
|
|
if (ds->update_mic_mute) {
|
|
common->valid_flag1 |= DS_OUTPUT_VALID_FLAG1_MIC_MUTE_LED_CONTROL_ENABLE;
|
|
common->mute_button_led = ds->mic_muted;
|
|
@@ -1119,12 +1161,20 @@ static struct ps_device *dualsense_create(struct hid_device *hdev)
|
|
struct dualsense *ds;
|
|
struct ps_device *ps_dev;
|
|
uint8_t max_output_report_size;
|
|
- int ret;
|
|
+ int i, ret;
|
|
|
|
static const struct ps_led_info mute_led_info = {
|
|
"micmute", dualsense_mute_led_get_brightness, dualsense_mute_led_set_brightness
|
|
};
|
|
|
|
+ static const struct ps_led_info player_leds_info[] = {
|
|
+ { "led1", dualsense_player_led_get_brightness, dualsense_player_led_set_brightness },
|
|
+ { "led2", dualsense_player_led_get_brightness, dualsense_player_led_set_brightness },
|
|
+ { "led3", dualsense_player_led_get_brightness, dualsense_player_led_set_brightness },
|
|
+ { "led4", dualsense_player_led_get_brightness, dualsense_player_led_set_brightness },
|
|
+ { "led5", dualsense_player_led_get_brightness, dualsense_player_led_set_brightness }
|
|
+ };
|
|
+
|
|
ds = devm_kzalloc(&hdev->dev, sizeof(*ds), GFP_KERNEL);
|
|
if (!ds)
|
|
return ERR_PTR(-ENOMEM);
|
|
@@ -1206,6 +1256,14 @@ static struct ps_device *dualsense_create(struct hid_device *hdev)
|
|
if (ret)
|
|
goto err;
|
|
|
|
+ for (i = 0; i < ARRAY_SIZE(player_leds_info); i++) {
|
|
+ const struct ps_led_info *led_info = &player_leds_info[i];
|
|
+
|
|
+ ret = ps_led_register(ps_dev, &ds->player_leds[i], led_info);
|
|
+ if (ret < 0)
|
|
+ goto err;
|
|
+ }
|
|
+
|
|
return &ds->base;
|
|
|
|
err:
|