From: "Barnabás Pőcze" <pobrn@protonmail.com>
To: Roderick Colenbrander <roderick@gaikai.com>
Cc: Jiri Kosina <jikos@kernel.org>,
Benjamin Tissoires <benjamin.tissoires@redhat.com>,
"linux-input@vger.kernel.org" <linux-input@vger.kernel.org>,
Chris Ye <lzye@google.com>,
Roderick Colenbrander <roderick.colenbrander@sony.com>
Subject: Re: [PATCH v2 11/13] HID: playstation: add DualSense player LEDs support.
Date: Thu, 07 Jan 2021 22:17:27 +0000 [thread overview]
Message-ID: <I-mPsiYl6UK2Pv00TjQu-X85mOLisznQUwrv_sFvWsijaUILSMLqNURJ1mlZ7DJ6_Ue_EvV6q_QDZWIrDm1VBMc8-ILr3zMnmShh8HV6R84=@protonmail.com> (raw)
In-Reply-To: <20210102223109.996781-12-roderick@gaikai.com>
Hi
2021. január 2., szombat 23:31 keltezéssel, Roderick Colenbrander írta:
> 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>
>
> diff --git a/drivers/hid/hid-playstation.c b/drivers/hid/hid-playstation.c
> index ebf8a6550308..183f011f081b 100644
> --- a/drivers/hid/hid-playstation.c
> +++ b/drivers/hid/hid-playstation.c
> [...]
> +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 &= ~(1 << led_index);
> + else
> + ds->player_leds_state |= (1 << led_index);
A minor thing: I think `BIT(led_index)` should be used here.
> +
> + 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)
> {
> @@ -820,6 +855,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) {
> if (ds->mic_muted) {
> common->valid_flag1 |= DS_OUTPUT_VALID_FLAG1_MIC_MUTE_LED_CONTROL_ENABLE;
> @@ -1065,12 +1107,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;
>
> struct ps_led_info mute_led_info = {
> "micmute", dualsense_mute_led_get_brightness, dualsense_mute_led_set_brightness
> };
>
> + 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 }
> + };
I think it would make sense to make `player_leds_info` and even `mute_led_info`
`const` and `static`.
> +
> ds = devm_kzalloc(&hdev->dev, sizeof(*ds), GFP_KERNEL);
> if (!ds)
> return ERR_PTR(-ENOMEM);
> @@ -1149,6 +1199,14 @@ static struct ps_device *dualsense_create(struct hid_device *hdev)
> if (ret < 0)
> goto err;
>
> + for (i = 0; i < ARRAY_SIZE(player_leds_info); i++) {
> + 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:
Regards,
Barnabás Pőcze
next prev parent reply other threads:[~2021-01-07 22:18 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-02 22:30 [PATCH v2 00/13] HID: new driver for PS5 'DualSense' controller Roderick Colenbrander
2021-01-02 22:30 ` [PATCH v2 01/13] HID: playstation: initial DualSense USB support Roderick Colenbrander
2021-01-04 12:20 ` Jiri Kosina
2021-01-05 8:20 ` Benjamin Tissoires
2021-01-07 17:14 ` Barnabás Pőcze
2021-01-08 7:12 ` Roderick Colenbrander
2021-01-08 11:53 ` Barnabás Pőcze
2021-01-02 22:30 ` [PATCH v2 02/13] HID: playstation: use DualSense MAC address as unique identifier Roderick Colenbrander
2021-01-07 17:22 ` Barnabás Pőcze
2021-01-02 22:30 ` [PATCH v2 03/13] HID: playstation: add DualSense battery support Roderick Colenbrander
2021-01-07 17:50 ` Barnabás Pőcze
2021-01-02 22:31 ` [PATCH v2 04/13] HID: playstation: add DualSense touchpad support Roderick Colenbrander
2021-01-07 17:55 ` Barnabás Pőcze
2021-01-02 22:31 ` [PATCH v2 05/13] HID: playstation: add DualSense accelerometer and gyroscope support Roderick Colenbrander
2021-01-07 13:34 ` Florian Märkl
2021-01-08 5:51 ` Roderick Colenbrander
2021-01-07 18:51 ` Barnabás Pőcze
2021-01-08 6:06 ` Roderick Colenbrander
2021-01-08 12:01 ` Barnabás Pőcze
2021-01-08 17:15 ` Siarhei Vishniakou
2021-01-08 19:54 ` Roderick Colenbrander
2021-01-09 0:11 ` Siarhei Vishniakou
2021-01-11 0:06 ` Roderick Colenbrander
2021-01-02 22:31 ` [PATCH v2 06/13] HID: playstation: track devices in list Roderick Colenbrander
2021-01-07 20:13 ` Barnabás Pőcze
2021-01-02 22:31 ` [PATCH v2 07/13] HID: playstation: add DualSense Bluetooth support Roderick Colenbrander
2021-01-07 20:18 ` Barnabás Pőcze
2021-01-02 22:31 ` [PATCH v2 08/13] HID: playstation: add DualSense classic rumble support Roderick Colenbrander
2021-01-07 20:41 ` Barnabás Pőcze
2021-01-07 20:48 ` Barnabás Pőcze
2021-01-08 17:01 ` Roderick Colenbrander
2021-01-02 22:31 ` [PATCH v2 09/13] HID: playstation: add DualSense lightbar support Roderick Colenbrander
2021-01-07 21:01 ` Barnabás Pőcze
2021-01-02 22:31 ` [PATCH v2 10/13] HID: playstation: add microphone mute support for DualSense Roderick Colenbrander
2021-01-07 21:57 ` Barnabás Pőcze
2021-01-02 22:31 ` [PATCH v2 11/13] HID: playstation: add DualSense player LEDs support Roderick Colenbrander
2021-01-07 22:17 ` Barnabás Pőcze [this message]
2021-01-02 22:31 ` [PATCH v2 12/13] HID: playstation: DualSense set LEDs to default player id Roderick Colenbrander
2021-01-07 22:25 ` Barnabás Pőcze
2021-01-02 22:31 ` [PATCH v2 13/13] HID: playstation: report DualSense hardware and firmware version Roderick Colenbrander
2021-01-07 22:26 ` Barnabás Pőcze
2021-01-09 1:35 ` Roderick Colenbrander
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='I-mPsiYl6UK2Pv00TjQu-X85mOLisznQUwrv_sFvWsijaUILSMLqNURJ1mlZ7DJ6_Ue_EvV6q_QDZWIrDm1VBMc8-ILr3zMnmShh8HV6R84=@protonmail.com' \
--to=pobrn@protonmail.com \
--cc=benjamin.tissoires@redhat.com \
--cc=jikos@kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=lzye@google.com \
--cc=roderick.colenbrander@sony.com \
--cc=roderick@gaikai.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).