bluetooth: Revert utterly broken MTK patch

MTK please stop sending completely broken patches to AOSP thanks
This commit is contained in:
Peter Cai 2024-03-12 22:50:46 -04:00
parent c5a6c7eb2a
commit 6e4f421edb
3 changed files with 93 additions and 2 deletions

View file

@ -1,7 +1,7 @@
From 638bd11ae1854619a40a5abbedcfdf397e2e1f53 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Wed, 24 Aug 2022 10:41:29 -0400
Subject: [PATCH 1/2] gd: hci: Ignore unexpected status events
Subject: [PATCH 1/3] gd: hci: Ignore unexpected status events
For some reason, on some old devices, the controller will report a
remote to support SNIFF_SUBRATING even when it does not. Just ignore the

View file

@ -1,7 +1,7 @@
From 1e1aee85f08b67be4b8805c9c0727ce826b0793a Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Wed, 24 Aug 2022 15:45:18 -0400
Subject: [PATCH 2/2] audio_hal_interface: Optionally use sysbta HAL
Subject: [PATCH 2/3] audio_hal_interface: Optionally use sysbta HAL
Required to support sysbta, our system-side bt audio implementation.

View file

@ -0,0 +1,91 @@
From b2dff222788e6fe7e28e27f277980025f9548fa3 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Tue, 12 Mar 2024 22:33:37 -0400
Subject: [PATCH 3/3] Revert "BT: Add Low latency flow for Mediatek BT Chip"
This reverts commit 78b3684eb205e1b4bc0aa3e12138687e73f78ebe.
---
system/stack/include/hcidefs.h | 9 ---------
system/stack/l2cap/l2c_utils.cc | 32 --------------------------------
2 files changed, 41 deletions(-)
diff --git a/system/stack/include/hcidefs.h b/system/stack/include/hcidefs.h
index a8ad4499bf..344507f76d 100644
--- a/system/stack/include/hcidefs.h
+++ b/system/stack/include/hcidefs.h
@@ -916,9 +916,6 @@ typedef struct {
// TODO Remove this once all UNISOC specific hacks are removed.
#define LMP_COMPID_UNISOC 0x073F
-// TODO Remove this once all Mediatek specific hacks are removed.
-#define LMP_COMPID_MEDIATEK 0x0046
-
/* Parameter information for HCI_SYNA_SET_ACL_PRIORITY */
#define HCI_SYNA_ACL_PRIORITY_PARAM_SIZE 3
#define HCI_SYNA_ACL_NORMAL_PRIORITY 0xF0
@@ -932,12 +929,6 @@ typedef struct {
#define HCI_UNISOC_ACL_NORMAL_PRIORITY 0x00
#define HCI_UNISOC_ACL_HIGH_PRIORITY 0xFF
-/* Parameter information for HCI_MTK_SET_ACL_PRIORITY */
-#define HCI_MTK_ACL_PRIORITY_PARAM_SIZE 1
-#define HCI_MTK_SET_ACL_PRIORITY (0xFD95 | HCI_GRP_VENDOR_SPECIFIC)
-#define HCI_MTK_ACL_NORMAL_PRIORITY 0x00
-#define HCI_MTK_ACL_HIGH_PRIORITY 0x01
-
/*
* Define packet size
*/
diff --git a/system/stack/l2cap/l2c_utils.cc b/system/stack/l2cap/l2c_utils.cc
index 7b722f426a..ef213c4de6 100644
--- a/system/stack/l2cap/l2c_utils.cc
+++ b/system/stack/l2cap/l2c_utils.cc
@@ -2338,34 +2338,6 @@ static void l2cu_set_acl_priority_unisoc(tL2C_LCB* p_lcb,
HCI_UNISOC_ACL_PRIORITY_PARAM_SIZE, command, NULL);
}
-/*******************************************************************************
- *
- * Function l2cu_set_acl_priority_latency_mtk
- *
- * Description Sends a VSC to set the ACL priority and recorded latency on
- * Mediatek chip.
- *
- * Returns void
- *
- ******************************************************************************/
-
-static void l2cu_set_acl_priority_latency_mtk(tL2C_LCB* p_lcb,
- tL2CAP_PRIORITY priority) {
- uint8_t vs_param;
- if (priority == L2CAP_PRIORITY_HIGH) {
- // priority to high, if using latency mode check preset latency
- LOG_INFO("Set ACL priority: High Priority Mode");
- vs_param = HCI_MTK_ACL_HIGH_PRIORITY;
- } else {
- // priority to normal
- LOG_INFO("Set ACL priority: Normal Mode");
- vs_param = HCI_MTK_ACL_NORMAL_PRIORITY;
- }
-
- BTM_VendorSpecificCommand(HCI_MTK_SET_ACL_PRIORITY,
- HCI_MTK_ACL_PRIORITY_PARAM_SIZE, &vs_param, NULL);
-}
-
/*******************************************************************************
*
* Function l2cu_set_acl_priority
@@ -2410,10 +2382,6 @@ bool l2cu_set_acl_priority(const RawAddress& bd_addr, tL2CAP_PRIORITY priority,
l2cu_set_acl_priority_unisoc(p_lcb, priority);
break;
- case LMP_COMPID_MEDIATEK:
- l2cu_set_acl_priority_latency_mtk(p_lcb, priority);
- break;
-
default:
/* Not supported/required for other vendors */
break;
--
2.43.1