commit 3cb59fb825dd9a6758ab4ba0fff156a54fa1ee73
author Linux Build Service Account <lnxbuild@localhost> Mon Jul 07 21:55:21 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Jul 07 21:55:21 2014 -0700
tree 53f60480749b8d3c3eefccb66be4dfc6f4fd86d6
parent 9f9ee431dfb6708f6a9ac5c028585cf42f225461
parent 898e63ff4c026c877e426ea0e816c493309190a5

Merge "Merge remote-tracking branch 'remotes/quic/caf/github/master' into new"

src/bt-vendor_vfs/Android.mk

diff --git a/src/bt-vendor_vfs/Android.mk b/src/bt-vendor_vfs/Android.mk
index e6813d0..b1ba1e5 100644
--- a/src/bt-vendor_vfs/Android.mk
+++ b/src/bt-vendor_vfs/Android.mk
@@ -33,6 +33,10 @@
 
 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)/JAntNative.cpp \
    $(COMMON_DIR)/ant_utils.c \

src/bt-vendor_vfs/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 @@
             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 @@
     } 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;