lkml.org 
[lkml]   [2020]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH] Bluetooth: btusb: WBS support USB alternate setting 1
From
Date
Hi Hilda,

> For WBS support, btusb driver could be set to alternate setting 1.

please be more descriptive since this is special for Realtek devices.

>
> Signed-off-by: Hilda Wu <hildawu@realtek.com>
> ---
> drivers/bluetooth/btusb.c | 16 +++++++++++-----
> 1 file changed, 11 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
> index c7cc8e594166..7942f9314fd7 100644
> --- a/drivers/bluetooth/btusb.c
> +++ b/drivers/bluetooth/btusb.c
> @@ -453,6 +453,7 @@ static const struct dmi_system_id btusb_needs_reset_resume_table[] = {
> #define BTUSB_HW_RESET_ACTIVE 12
> #define BTUSB_TX_WAIT_VND_EVT 13
> #define BTUSB_WAKEUP_DISABLE 14
> +#define BTUSB_WBS_ALT1 15

Use BTUSB_USE_ALT1_FOR_WBS as a more descriptive name.

>
> struct btusb_data {
> struct hci_dev *hdev;
> @@ -1666,14 +1667,18 @@ static void btusb_work(struct work_struct *work)
> new_alts = data->sco_num;
> }
> } else if (data->air_mode == HCI_NOTIFY_ENABLE_SCO_TRANSP) {
> -
> - data->usb_alt6_packet_flow = true;
> -
> /* Check if Alt 6 is supported for Transparent audio */
> - if (btusb_find_altsetting(data, 6))
> + if (btusb_find_altsetting(data, 6)) {
> + data->usb_alt6_packet_flow = true;
> new_alts = 6;
> - else
> + } else if (test_bit(BTUSB_WBS_ALT1, &data->flags)) {
> + if (btusb_find_altsetting(data, 1))
> + new_alts = 1;
> + else
> + bt_dev_err(hdev, "Device does not support ALT setting 1");

Scrap this check and error and move it into the probe() function if you actually have Realtek hardware that does not support alternate setting 1.

> + } else {
> bt_dev_err(hdev, "Device does not support ALT setting 6");
> + }
> }
>
> if (btusb_switch_alt_setting(hdev, new_alts) < 0)
> @@ -3965,6 +3970,7 @@ static int btusb_probe(struct usb_interface *intf,
> * (DEVICE_REMOTE_WAKEUP)
> */
> set_bit(BTUSB_WAKEUP_DISABLE, &data->flags);
> + set_bit(BTUSB_WBS_ALT1, &data->flags);
>
> err = usb_autopm_get_interface(intf);
> if (err < 0)

Regards

Marcel

\
 
 \ /
  Last update: 2020-06-29 23:15    [W:0.031 / U:3.376 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site