diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-10-17 23:00:05 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-10-17 23:00:05 -0700 |
| commit | d650b420eb7c1f22c1b3a58983c352b3b586013d (patch) | |
| tree | 413f74d53dc8c0ceb7f6645166c84d24c02d1f73 | |
| parent | 50c6c4493b67331cfc47c32a623044aa71a95460 (diff) | |
| parent | 0c696a8f2bf8a1898ca8db5ca6962b39ce86c116 (diff) | |
| download | android_external_ant-wireless_ant_native-cm-14.1_prerebase.tar.gz android_external_ant-wireless_ant_native-cm-14.1_prerebase.tar.bz2 android_external_ant-wireless_ant_native-cm-14.1_prerebase.zip | |
Merge tag 'LA.UM.5.5.r1-00900-8x96.0' of git://codeaurora.org/platform/external/ant-wireless/ant_native into cm-14.0cm-14.1_prerebasecm-14.0
"LA.UM.5.5.r1-00900-8x96.0"
| -rw-r--r-- | src/bt-vendor_vfs/Android.mk | 8 | ||||
| -rw-r--r-- | src/bt-vendor_vfs/ant_native_chardev.c | 4 |
2 files changed, 0 insertions, 12 deletions
diff --git a/src/bt-vendor_vfs/Android.mk b/src/bt-vendor_vfs/Android.mk index 5a32efd..26b65bf 100644 --- a/src/bt-vendor_vfs/Android.mk +++ b/src/bt-vendor_vfs/Android.mk @@ -40,14 +40,6 @@ LOCAL_C_INCLUDES += \ endif # BOARD_ANT_WIRELESS_DEVICE = "qualcomm-uart" -ifeq ($(BOARD_HAS_QCA_BT_ROME), true) -LOCAL_CFLAGS += -DBT_SOC_TYPE_ROME -endif - -ifeq ($(BOARD_HAS_QCA_BT_SOC), "cherokee") -LOCAL_CFLAGS += -DBT_SOC_TYPE_CHEROKEE -endif - LOCAL_SRC_FILES := \ $(COMMON_DIR)/ant_utils.c \ $(ANT_DIR)/ant_native_chardev.c \ diff --git a/src/bt-vendor_vfs/ant_native_chardev.c b/src/bt-vendor_vfs/ant_native_chardev.c index f22c3ac..ec801a8 100644 --- a/src/bt-vendor_vfs/ant_native_chardev.c +++ b/src/bt-vendor_vfs/ant_native_chardev.c @@ -902,9 +902,7 @@ int init_transport_bdroid(int on) { return -1; } /*call ANT_USERIAL_OPEN to get ANT handle*/ -#if defined(BT_SOC_TYPE_ROME) || defined(BT_SOC_TYPE_CHEROKEE) ret = vendor_interface->op(BT_VND_OP_ANT_USERIAL_OPEN, fd); -#endif ALOGE("ret value: %d", ret); if (ret != 1) { @@ -917,9 +915,7 @@ int init_transport_bdroid(int on) { } else { if (vendor_interface) { ALOGE("Close and cleanup the interfaces"); -#if defined(BT_SOC_TYPE_ROME) || defined(BT_SOC_TYPE_CHEROKEE) int ret = vendor_interface->op(BT_VND_OP_ANT_USERIAL_CLOSE, NULL); -#endif ALOGE("ret value: %d", ret); ALOGI("Turn off BT power"); powerstate = BT_VND_PWR_OFF; |