diff options
| author | Sudhir Sharma <sudhshar@codeaurora.org> | 2014-06-03 20:20:02 -0700 |
|---|---|---|
| committer | Sudhir Sharma <sudhshar@codeaurora.org> | 2014-06-03 20:53:39 -0700 |
| commit | f834bd6803ea316cfb8c7ba82fc181de91358c36 (patch) | |
| tree | 770c9c7238250143b639db99ab62f2b16f3b0d42 | |
| parent | 116dd9c059e5b8ffeb69774c460718ed19806ee9 (diff) | |
| parent | 9f9ee431dfb6708f6a9ac5c028585cf42f225461 (diff) | |
| download | android_external_ant-wireless_ant_native-f834bd6803ea316cfb8c7ba82fc181de91358c36.tar.gz android_external_ant-wireless_ant_native-f834bd6803ea316cfb8c7ba82fc181de91358c36.tar.bz2 android_external_ant-wireless_ant_native-f834bd6803ea316cfb8c7ba82fc181de91358c36.zip | |
Merge tag 'AU_LINUX_ANDROID_KK.04.04.02.010.421' into HEAD
AU_LINUX_ANDROID_KK.04.04.02.010.421 based on quic/aosp/kk
Change-Id: If79c66fd0c0d3233c449d98ce9da4718b8b30810
| -rw-r--r-- | src/bt-vendor_vfs/Android.mk | 4 | ||||
| -rw-r--r-- | src/bt-vendor_vfs/ant_native_chardev.c | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/bt-vendor_vfs/Android.mk b/src/bt-vendor_vfs/Android.mk index 5ecd74d..d37c576 100644 --- a/src/bt-vendor_vfs/Android.mk +++ b/src/bt-vendor_vfs/Android.mk @@ -33,6 +33,10 @@ LOCAL_C_INCLUDES += \ endif # BOARD_ANT_WIRELESS_DEVICE = "qualcomm-uart" +ifeq ($(BOARD_HAS_QCA_BT_ROME), true) +LOCAL_CFLAGS += -DBT_SOC_TYPE_ROME +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 a90c8c4..844aef0 100644 --- a/src/bt-vendor_vfs/ant_native_chardev.c +++ b/src/bt-vendor_vfs/ant_native_chardev.c @@ -901,7 +901,9 @@ int init_transport_bdroid(int on) { return -1; } /*call ANT_USERIAL_OPEN to get ANT handle*/ +#ifdef BT_SOC_TYPE_ROME ret = vendor_interface->op(BT_VND_OP_ANT_USERIAL_OPEN, fd); +#endif ALOGE("ret value: %d", ret); if (ret != 1) { @@ -914,8 +916,9 @@ int init_transport_bdroid(int on) { } else { if (vendor_interface) { ALOGE("Close and cleanup the interfaces"); +#ifdef BT_SOC_TYPE_ROME 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; |