UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bluetooth: btintel: Add combined set_diag functions 

This patch adds a combined set_diag functions.
It also changes the btintel_set_diag_mfg() to static since it is no
longer used by others.

Signed-off-by: Tedd Ho-Jeong An <tedd.an@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Tedd Ho-Jeong An 2021-08-04 17:32:14 -07:00 committed by Marcel Holtmann
parent ffcba827c0
commit 553807141a
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/bluetooth/btintel.c
View File

@ -181,6 +181,23 @@ static int btintel_set_diag_mfg(struct hci_dev *hdev, bool enable)
return ret; return ret;
} }
static int btintel_set_diag_combined(struct hci_dev *hdev, bool enable)
{
int ret;
/* Legacy ROM device needs to be in the manufacturer mode to apply
* diagnostic setting
*
* This flag is set after reading the Intel version.
*/
if (btintel_test_flag(hdev, INTEL_ROM_LEGACY))
ret = btintel_set_diag_mfg(hdev, enable);
else
ret = btintel_set_diag(hdev, enable);
return ret;
}
void btintel_hw_error(struct hci_dev *hdev, u8 code) void btintel_hw_error(struct hci_dev *hdev, u8 code)
{ {
struct sk_buff *skb; struct sk_buff *skb;
@ -1737,6 +1754,7 @@ static int btintel_setup_combined(struct hci_dev *hdev)
case 0x07: /* WP */ case 0x07: /* WP */
case 0x08: /* StP */ case 0x08: /* StP */
/* Legacy ROM product */ /* Legacy ROM product */
btintel_set_flag(hdev, INTEL_ROM_LEGACY);
/* These devices have an issue with LED which doesn't /* These devices have an issue with LED which doesn't
* go off immediately during shutdown. Set the flag * go off immediately during shutdown. Set the flag
@ -1828,7 +1846,7 @@ int btintel_configure_setup(struct hci_dev *hdev)
hdev->manufacturer = 2; hdev->manufacturer = 2;
hdev->setup = btintel_setup_combined; hdev->setup = btintel_setup_combined;
hdev->shutdown = btintel_shutdown_combined; hdev->shutdown = btintel_shutdown_combined;
hdev->set_diag = btintel_set_diag_mfg; hdev->set_diag = btintel_set_diag_combined;
hdev->set_bdaddr = btintel_set_bdaddr; hdev->set_bdaddr = btintel_set_bdaddr;
return 0; return 0;

1
drivers/bluetooth/btintel.h
View File

@ -146,6 +146,7 @@ enum {
INTEL_BOOTING, INTEL_BOOTING,
INTEL_BROKEN_INITIAL_NCMD, INTEL_BROKEN_INITIAL_NCMD,
INTEL_BROKEN_LED, INTEL_BROKEN_LED,
INTEL_ROM_LEGACY,
__INTEL_NUM_FLAGS, __INTEL_NUM_FLAGS,
}; };