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 10/13] HID: playstation: add microphone mute support for DualSense.
Date: Thu, 07 Jan 2021 21:57:55 +0000 [thread overview]
Message-ID: <4yIVE2AxrwY_p2Y48xsx2F9ZDdgoZtQoNbjNKpPdM5U-OYomokG4hpc3KlFC6LYG6jFdHwwxASx8M4gn2sjlr8hNdc2kXi0FppcTYVAsFkY=@protonmail.com> (raw)
In-Reply-To: <20210102223109.996781-11-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 controller has a built-in microphone exposed as an
> audio device over USB (or HID using Bluetooth). A dedicated
> button on the controller handles mute, but software has to configure
> the device to mute the audio stream.
>
> This patch captures the mute button and schedules an output report
> to mute/unmute the audio stream as well as toggle the mute LED.
>
> Signed-off-by: Roderick Colenbrander <roderick.colenbrander@sony.com>
>
> diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
> index c80c81916f4a..9b1803f8f935 100644
> --- a/drivers/hid/Kconfig
> +++ b/drivers/hid/Kconfig
> @@ -857,6 +857,7 @@ config HID_PLAYSTATION
> tristate "PlayStation HID Driver"
> default !EXPERT
> depends on HID
I think maybe "select NEW_LEDS" should be here as well?
> + select LEDS_CLASS
> select LEDS_CLASS_MULTICOLOR
> select POWER_SUPPLY
> help
> diff --git a/drivers/hid/hid-playstation.c b/drivers/hid/hid-playstation.c
> index 3b26445acbb9..ebf8a6550308 100644
> --- a/drivers/hid/hid-playstation.c
> +++ b/drivers/hid/hid-playstation.c
> [...]
> +static int ps_led_register(struct ps_device *ps_dev, struct led_classdev *led,
> + struct ps_led_info *led_info)
> +{
> + int ret;
> +
> + led->name = devm_kasprintf(&ps_dev->hdev->dev, GFP_KERNEL,
> + "playstation::%pMR::%s", ps_dev->mac_address, led_info->name);
> +
> + if (!led->name)
> + return -ENOMEM;
> +
> + led->brightness = 0;
> + led->max_brightness = 1;
> + led->flags = LED_CORE_SUSPENDRESUME;
> + led->brightness_get = led_info->brightness_get;
> + led->brightness_set = led_info->brightness_set;
> +
> + ret = devm_led_classdev_register(&ps_dev->hdev->dev, led);
> + if (ret) {
> + hid_err(ps_dev->hdev, "Failed to register LED %s: %d\n", led_info->name, ret);
Another inconsistency with log messages is that sometimes the error code is printed,
sometimes it is not. I believe it would be preferable if there was no incosistency.
> + return ret;
> + }
> +
> + return 0;
> +}
> [...]
> +static enum led_brightness dualsense_mute_led_get_brightness(struct led_classdev *led)
> +{
> + struct hid_device *hdev = to_hid_device(led->dev->parent);
> + struct dualsense *ds = hid_get_drvdata(hdev);
I think these two lines could be replaced with:
```
struct dualsense *ds = container_of(led, struct dualsense, mute_led);
```
> +
> + return ds->mic_muted;
> +}
> [...]
> static void dualsense_init_output_report(struct dualsense *ds, struct dualsense_output_report *rp,
> void *buf)
> {
> @@ -763,6 +820,26 @@ static void dualsense_output_worker(struct work_struct *work)
> ds->update_lightbar = false;
> }
>
> + if (ds->update_mic_mute) {
> + if (ds->mic_muted) {
> + common->valid_flag1 |= DS_OUTPUT_VALID_FLAG1_MIC_MUTE_LED_CONTROL_ENABLE;
> + common->mute_button_led = 1; /* Enable mute LED. */
> +
> + /* Disable microphone */
> + common->valid_flag1 |= DS_OUTPUT_VALID_FLAG1_POWER_SAVE_CONTROL_ENABLE;
> + common->power_save_control |= DS_OUTPUT_POWER_SAVE_CONTROL_MIC_MUTE;
> + } else {
> + common->valid_flag1 |= DS_OUTPUT_VALID_FLAG1_MIC_MUTE_LED_CONTROL_ENABLE;
> + common->mute_button_led = 0; /* Disable mute LED. */
> +
> + /* Enable microphone */
> + common->valid_flag1 |= DS_OUTPUT_VALID_FLAG1_POWER_SAVE_CONTROL_ENABLE;
> + common->power_save_control &= ~DS_OUTPUT_POWER_SAVE_CONTROL_MIC_MUTE;
> + }
> +
I'd put the first two lines (or at least the first line) outside the conditional.
> + ds->update_mic_mute = false;
> + }
> +
> spin_unlock_irqrestore(&ds->base.lock, flags);
>
> dualsense_send_output_report(ds, &report);
> @@ -777,6 +854,7 @@ static int dualsense_parse_report(struct ps_device *ps_dev, struct hid_report *r
> uint8_t battery_data, battery_capacity, charging_status, value;
> int battery_status;
> uint16_t sensor_timestamp;
> + bool btn_mic_state;
> unsigned long flags;
> int i;
>
> @@ -829,6 +907,22 @@ static int dualsense_parse_report(struct ps_device *ps_dev, struct hid_report *r
> input_report_key(ds->gamepad, BTN_MODE, ds_report->buttons[2] & DS_BUTTONS2_PS_HOME);
> input_sync(ds->gamepad);
>
> + /* The DualSense has an internal microphone, which can be muted through a mute button
> + * on the device. The driver expected to read the button state and program the device
> [...]
"The driver is expected" ?
Regards,
Barnabás Pőcze
next prev parent reply other threads:[~2021-01-07 21:58 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 [this message]
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
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='4yIVE2AxrwY_p2Y48xsx2F9ZDdgoZtQoNbjNKpPdM5U-OYomokG4hpc3KlFC6LYG6jFdHwwxASx8M4gn2sjlr8hNdc2kXi0FppcTYVAsFkY=@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).