diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-09-22 05:30:18 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2016-09-22 05:30:18 -0700 |
| commit | 0c696a8f2bf8a1898ca8db5ca6962b39ce86c116 (patch) | |
| tree | b8327ddf124531f79e17bd6494cfb5b04bc54510 | |
| parent | 2f2495e8092d02265b87a14373877b4d711f50be (diff) | |
| parent | 97fd7b8901527a2d14c024f152487f7a3640fd8f (diff) | |
| download | android_external_ant-wireless_ant_native-0c696a8f2bf8a1898ca8db5ca6962b39ce86c116.tar.gz android_external_ant-wireless_ant_native-0c696a8f2bf8a1898ca8db5ca6962b39ce86c116.tar.bz2 android_external_ant-wireless_ant_native-0c696a8f2bf8a1898ca8db5ca6962b39ce86c116.zip | |
Merge 97fd7b8901527a2d14c024f152487f7a3640fd8f on remote branch
Change-Id: I87f68701c289fc4d87b068e1a99fa54265b1cf4f
| -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 0b13cc5..60d68cf 100644 --- a/src/bt-vendor_vfs/Android.mk +++ b/src/bt-vendor_vfs/Android.mk @@ -36,14 +36,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; |