diff options
| author | Kiran Kelageri <kirankelageri@codeaurora.org> | 2015-08-04 14:49:15 -0700 |
|---|---|---|
| committer | Kiran Kelageri <kirankelageri@codeaurora.org> | 2015-08-12 14:30:45 -0700 |
| commit | 0736d4b7caabc85949f099709733e1c8b42b2aa4 (patch) | |
| tree | 948c235973adacd30f8a927f90c4c0d358b7b835 | |
| parent | fa74a2f8531d1840db7b22f35120d3e9cb41cf56 (diff) | |
| download | android_external_ant-wireless_ant_native-0736d4b7caabc85949f099709733e1c8b42b2aa4.tar.gz android_external_ant-wireless_ant_native-0736d4b7caabc85949f099709733e1c8b42b2aa4.tar.bz2 android_external_ant-wireless_ant_native-0736d4b7caabc85949f099709733e1c8b42b2aa4.zip | |
ANT: Enable ANT feature.
Enabling ANT feature, fixed compilation errors.
Change-Id: I4004b068523549453ae8c49c49d0b18a6ae2d4e6
| -rw-r--r-- | src/bt-vendor_vfs/Android.mk | 5 | ||||
| -rw-r--r-- | src/bt-vendor_vfs/ant_native_chardev.c | 3 | ||||
| -rw-r--r-- | src/bt-vendor_vfs/ant_rx_chardev.c | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/bt-vendor_vfs/Android.mk b/src/bt-vendor_vfs/Android.mk index 368af0f..ef6dc81 100644 --- a/src/bt-vendor_vfs/Android.mk +++ b/src/bt-vendor_vfs/Android.mk @@ -19,13 +19,16 @@ include $(CLEAR_VARS) LOCAL_CFLAGS := -g -c -W -Wall -O2 # needed to pull in the header file for libbt-vendor.so -BDROID_DIR:= external/bluetooth/bluedroid +BDROID_DIR:= system/bt +QCOM_DIR:= hardware/qcom/bt/libbt-vendor # Added hci/include to give access to the header for the libbt-vendorso interface. LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/src/common/inc \ $(LOCAL_PATH)/$(ANT_DIR)/inc \ $(BDROID_DIR)/hci/include \ + $(QCOM_DIR)/include \ + ifeq ($(BOARD_ANT_WIRELESS_DEVICE),"qualcomm-uart") LOCAL_C_INCLUDES += \ diff --git a/src/bt-vendor_vfs/ant_native_chardev.c b/src/bt-vendor_vfs/ant_native_chardev.c index 844aef0..96c8173 100644 --- a/src/bt-vendor_vfs/ant_native_chardev.c +++ b/src/bt-vendor_vfs/ant_native_chardev.c @@ -34,6 +34,7 @@ #include <stdint.h> /* for uint64_t */ #include <sys/eventfd.h> /* For eventfd() */ #include <unistd.h> /* for read(), write(), and close() */ +#include <string.h> #include "ant_types.h" #include "ant_native.h" @@ -43,7 +44,7 @@ #include "ant_rx_chardev.h" #include "ant_hci_defines.h" #include "ant_log.h" -#include "bt_vendor_lib.h" /* used by qualcomms code to call into libbt-vendor.so */ +#include "bt_vendor_qcom.h" /* used by qualcomms code to call into libbt-vendor.so */ #include <cutils/properties.h> /* used by qualcomms additions for logging. */ // The following functions are dummy implementations of the callbacks required by libbt-vendor. static void vendor_fwcfg_cb(bt_vendor_op_result_t result) { diff --git a/src/bt-vendor_vfs/ant_rx_chardev.c b/src/bt-vendor_vfs/ant_rx_chardev.c index 69656b2..6336524 100644 --- a/src/bt-vendor_vfs/ant_rx_chardev.c +++ b/src/bt-vendor_vfs/ant_rx_chardev.c @@ -30,6 +30,7 @@ #include <poll.h> #include <pthread.h> #include <stdint.h> /* for uint64_t */ +#include <string.h> #include "ant_types.h" #include "antradio_power.h" |