From e999a155600da9e2f3d873d0da27fb314f9a1fc7 Mon Sep 17 00:00:00 2001 From: Dan Pasanen Date: Tue, 14 Feb 2017 13:35:05 -0600 Subject: Revert "Bluetooth-Wipower: Enable WiPower feature." This reverts commit 10df4bbd4a0872be624c3559a00dfaedc137d717. Change-Id: If4e248056df949c59098a5e0ba8b56aee23ab597 --- Android.mk | 4 ---- btif/src/bluetooth.c | 11 ----------- main/Android.mk | 11 ----------- stack/btm/btm_ble_multi_adv.c | 30 +----------------------------- 4 files changed, 1 insertion(+), 55 deletions(-) diff --git a/Android.mk b/Android.mk index 6acb661c0..b370cc06f 100644 --- a/Android.mk +++ b/Android.mk @@ -23,10 +23,6 @@ endif bluetooth_CFLAGS += -DUSE_AUDIO_TRACK -ifeq ($(BOARD_USES_WIPOWER),true) -bluetooth_CFLAGS += -DWIPOWER_SUPPORTED -endif - bluetooth_CFLAGS += -DEXPORT_SYMBOL="__attribute__((visibility(\"default\")))" # diff --git a/btif/src/bluetooth.c b/btif/src/bluetooth.c index 008e5968f..cc587f861 100644 --- a/btif/src/bluetooth.c +++ b/btif/src/bluetooth.c @@ -45,9 +45,6 @@ #include #include #include -#ifdef WIPOWER_SUPPORTED -#include -#endif #include "bt_utils.h" #include "btif_api.h" @@ -118,9 +115,6 @@ extern btgatt_interface_t *btif_gatt_get_interface(); /* avrc target */ extern btrc_interface_t *btif_rc_get_interface(); /* avrc controller */ -#ifdef WIPOWER_SUPPORTED -extern wipower_interface_t *get_wipower_interface(); -#endif extern btrc_interface_t *btif_rc_ctrl_get_interface(); /*SDP search client*/ extern btsdp_interface_t *btif_sdp_get_interface(); @@ -463,11 +457,6 @@ static const void* get_profile_interface (const char *profile_id) if (is_profile(profile_id, BT_PROFILE_AV_RC_ID)) return btif_rc_get_interface(); -#ifdef WIPOWER_SUPPORTED - if (is_profile(profile_id, BT_PROFILE_WIPOWER_VENDOR_ID)) - return get_wipower_interface(); -#endif - if (is_profile(profile_id, BT_PROFILE_AV_RC_CTRL_ID)) return btif_rc_ctrl_get_interface(); diff --git a/main/Android.mk b/main/Android.mk index 4ee80deba..2286997e8 100644 --- a/main/Android.mk +++ b/main/Android.mk @@ -26,11 +26,6 @@ LOCAL_SRC_FILES+= \ LOCAL_SRC_FILES+= \ ../udrv/ulinux/uipc.c -ifeq ($(BOARD_USES_WIPOWER),true) -LOCAL_SRC_FILES += \ - ../../../vendor/qcom/opensource/bluetooth/wipower-host/core/src/wipower.c -endif - LOCAL_C_INCLUDES+= . \ $(LOCAL_PATH)/../ \ $(LOCAL_PATH)/../bta/include \ @@ -61,12 +56,6 @@ LOCAL_C_INCLUDES+= . \ external/zlib \ $(call include-path-for, audio-utils) -ifeq ($(BOARD_USES_WIPOWER),true) -LOCAL_C_INCLUDES+= \ - vendor/qcom/opensource/bluetooth/hal/include \ - vendor/qcom/opensource/bluetooth/wipower-host/core/include -endif - LOCAL_SHARED_LIBRARIES := \ libcutils \ libdl \ diff --git a/stack/btm/btm_ble_multi_adv.c b/stack/btm/btm_ble_multi_adv.c index 53b192d3b..e7d5efc7c 100644 --- a/stack/btm/btm_ble_multi_adv.c +++ b/stack/btm/btm_ble_multi_adv.c @@ -43,12 +43,6 @@ #define BTM_BLE_MULTI_ADV_CB_EVT_MASK 0xF0 #define BTM_BLE_MULTI_ADV_SUBCODE_MASK 0x0F -#ifdef WIPOWER_SUPPORTED -#define WIPOWER_16_UUID_LSB 0xFE -#define WIPOWER_16_UUID_MSB 0xFF -static bool is_wipower_adv = false; -#endif - /************************************************************************************ ** Static variables ************************************************************************************/ @@ -56,10 +50,6 @@ tBTM_BLE_MULTI_ADV_CB btm_multi_adv_cb; tBTM_BLE_MULTI_ADV_INST_IDX_Q btm_multi_adv_idx_q; pthread_mutex_t btm_multi_adv_lock = PTHREAD_MUTEX_INITIALIZER; -#ifdef WIPOWER_SUPPORTED -UINT8 wipower_inst_id = BTM_BLE_MULTI_ADV_DEFAULT_STD; -#endif - /************************************************************************************ ** Externs ************************************************************************************/ @@ -724,13 +714,6 @@ tBTM_STATUS BTM_BleCfgAdvInstData (UINT8 inst_id, BOOLEAN is_scan_rsp, btm_ble_build_adv_data(&data_mask, &pp, p_data); *p_len = (UINT8)(pp - param - 2); UINT8_TO_STREAM(pp_temp, inst_id); -#ifdef WIPOWER_SUPPORTED - if (param[7] == WIPOWER_16_UUID_LSB && param[8] == WIPOWER_16_UUID_MSB) - { - is_wipower_adv = true; - wipower_inst_id = inst_id; - } -#endif if ((rt = BTM_VendorSpecificCommand (HCI_BLE_MULTI_ADV_OCF, (UINT8)BTM_BLE_MULTI_ADV_WRITE_DATA_LEN, @@ -824,13 +807,7 @@ void btm_ble_multi_adv_vse_cback(UINT8 len, UINT8 *p) adv_inst != BTM_BLE_MULTI_ADV_DEFAULT_STD) { BTM_TRACE_EVENT("btm_ble_multi_adv_reenable called"); -#ifdef WIPOWER_SUPPORTED - if (!(is_wipower_adv && (adv_inst == wipower_inst_id))) { - btm_ble_multi_adv_reenable(adv_inst); - } -#else - btm_ble_multi_adv_reenable(adv_inst); -#endif + btm_ble_multi_adv_reenable(adv_inst); } /* re-enable connectibility */ else if (adv_inst == BTM_BLE_MULTI_ADV_DEFAULT_STD) @@ -897,11 +874,6 @@ void btm_ble_multi_adv_init() *******************************************************************************/ void btm_ble_multi_adv_cleanup(void) { -#ifdef WIPOWER_SUPPORTED - is_wipower_adv = false; - wipower_inst_id = BTM_BLE_MULTI_ADV_DEFAULT_STD; -#endif - pthread_mutex_lock(&btm_multi_adv_lock); if (btm_multi_adv_cb.p_adv_inst) { for (size_t i = 0; i < btm_cb.cmn_ble_vsc_cb.adv_inst_max; i++) { -- cgit v1.2.3