AV control and data path added

Change-Id: I88ec6084c140fa257154a98e23e075900e84cc8c

8 files changed, 9 insertions, 13 deletions

diff --git a/stack/Android.mk b/stack/Android.mk
index 29d59d4..34c191c 100644
--- a/stack/Android.mk
+++ b/stack/Android.mk
@@ -8,6 +8,7 @@ LOCAL_C_INCLUDES:= . \
                    $(LOCAL_PATH)/include \
                    $(LOCAL_PATH)/avct \
                    $(LOCAL_PATH)/btm \
+                   $(LOCAL_PATH)/avrc \
                    $(LOCAL_PATH)/l2cap \
                    $(LOCAL_PATH)/avdt \
                    $(LOCAL_PATH)/gatt \
@@ -41,6 +42,10 @@ endif
 LOCAL_PRELINK_MODULE:=false
 LOCAL_SRC_FILES:= \
     ./dun/dun_api.c \
+    ./a2dp/a2d_api.c \
+    ./a2dp/a2d_m24.c \
+    ./a2dp/a2d_m12.c \
+    ./a2dp/a2d_sbc.c \
     ./avrc/avrc_bld_tg.c \
     ./avrc/avrc_api.c \
     ./avrc/avrc_utils.c \
@@ -157,10 +162,6 @@ LOCAL_SRC_FILES:= \
     ./xml/xml_flp.c \
     ./xml/xml_mlp.c \
     ./xml/xml_bld.c \
-    ./a2dp/a2d_api.c \
-    ./a2dp/a2d_m24.c \
-    ./a2dp/a2d_m12.c \
-    ./a2dp/a2d_sbc.c \
     ./pan/pan_main.c \
     ./pan/pan_api.c \
     ./pan/pan_utils.c \
diff --git a/stack/avdt/avdt_int.h b/stack/avdt/avdt_int.h
index 837e943..cb62e31 100644
--- a/stack/avdt/avdt_int.h
+++ b/stack/avdt/avdt_int.h
@@ -27,7 +27,6 @@
 #endif
 #endif
 
-
 /*****************************************************************************
 ** constants
 *****************************************************************************/
diff --git a/stack/btm/btm_dev.c b/stack/btm/btm_dev.c
index 3651589..f163403 100644
--- a/stack/btm/btm_dev.c
+++ b/stack/btm/btm_dev.c
@@ -111,7 +111,7 @@ BOOLEAN BTM_SecAddDevice (BD_ADDR bd_addr, DEV_CLASS dev_class, BD_NAME bd_name,
         p_dev_rec->link_key_type = key_type;
     }
 
-#if defined(BSA_MIXED_MODE_INCLUDED) && (BSA_MIXED_MODE_INCLUDED == TRUE)
+#if defined(BTIF_MIXED_MODE_INCLUDED) && (BTIF_MIXED_MODE_INCLUDED == TRUE)
     p_dev_rec->sm4 = BTM_SM4_KNOWN;
 #endif
 
diff --git a/stack/include/avrc_api.h b/stack/include/avrc_api.h
index 859c872..d7e8ee4 100644
--- a/stack/include/avrc_api.h
+++ b/stack/include/avrc_api.h
@@ -10,7 +10,7 @@
 *****************************************************************************/
 #ifndef AVRC_API_H
 #define AVRC_API_H
-
+#include "bt_target.h"
 #include "avct_api.h"
 #include "sdp_api.h"
 #include "avrc_defs.h"
diff --git a/stack/include/btu.h b/stack/include/btu.h
index c47839e..6a3b68f 100644
--- a/stack/include/btu.h
+++ b/stack/include/btu.h
@@ -21,7 +21,6 @@
 #define BTU_HCI_RCV_MBOX        TASK_MBOX_0     /* Messages from HCI  */
 #define BTU_BTIF_MBOX           TASK_MBOX_1     /* Messages to BTIF   */
 
-
 /* callbacks
 */
 typedef void (*tBTU_TIMER_CALLBACK)(TIMER_LIST_ENT *p_tle);
diff --git a/stack/include/goep_util.h b/stack/include/goep_util.h
index 8bfe4af..600c6d0 100644
--- a/stack/include/goep_util.h
+++ b/stack/include/goep_util.h
@@ -226,7 +226,7 @@ GOEP_API extern void GOEP_TraceSupportedDataTypes(UINT8 data_types, UINT8 *p_dat
 #define GOEP_ErrorName(_x) ""
 #endif
 #define GOEP_TraceSupportedDataTypes(x, y)
-#endif /* end if BT_TRACE_PROTOCOL */
+#endif
 
 
 /*****************************************************************************
diff --git a/stack/l2cap/l2c_int.h b/stack/l2cap/l2c_int.h
index 6dd93b0..0630e12 100644
--- a/stack/l2cap/l2c_int.h
+++ b/stack/l2cap/l2c_int.h
@@ -26,7 +26,7 @@
 #define L2CAP_LINK_FLOW_CONTROL_TOUT 2            /* 2  seconds */
 #define L2CAP_LINK_DISCONNECT_TOUT   30           /* 30 seconds */
 
-#ifndef L2CAP_CHNL_CONNECT_TOUT      /* BSA needs to override for internal project needs */
+#ifndef L2CAP_CHNL_CONNECT_TOUT      /* BTIF needs to override for internal project needs */
 #define L2CAP_CHNL_CONNECT_TOUT      60           /* 60 seconds */
 #endif
 
diff --git a/stack/smp/smp_utils.c b/stack/smp/smp_utils.c
index 7e4700f..89c9f5e 100644
--- a/stack/smp/smp_utils.c
+++ b/stack/smp/smp_utils.c
@@ -21,9 +21,6 @@
     #include "l2c_int.h"
     #include "smp_int.h"
 
-    #if (BT_TRACE_PROTOCOL == TRUE)
-        #include "trace_api.h"
-    #endif
 
     #define SMP_PAIRING_REQ_SIZE    7
     #define SMP_CONFIRM_CMD_SIZE    (BT_OCTET16_LEN + 1)