AV control and data path added

Change-Id: I88ec6084c140fa257154a98e23e075900e84cc8c

3 files changed, 26 insertions, 23 deletions

diff --git a/main/Android.mk b/main/Android.mk
index f30a24a..8e78c61 100644
--- a/main/Android.mk
+++ b/main/Android.mk
@@ -8,14 +8,14 @@ include $(CLEAR_VARS)
 
 # HAL layer 
 LOCAL_SRC_FILES:= \
-	../btif/src/bluetooth.c\
+	../btif/src/bluetooth.c
 
 # platform specific
 LOCAL_SRC_FILES+= \
         bte_main.c \
 	bte_init.c \
 	bte_version.c \
-	bte_logmsg.c\
+	bte_logmsg.c
 
 # BTIF
 LOCAL_SRC_FILES += \
@@ -23,7 +23,9 @@ LOCAL_SRC_FILES += \
 	../btif/src/btif_dm.c \
 	../btif/src/btif_storage.c \
 	../btif/src/btif_util.c \
+	../btif/src/btif_sm.c \
 	../btif/src/btif_hf.c \
+	../btif/src/btif_av.c
 
 # callouts
 LOCAL_SRC_FILES+= \
@@ -31,10 +33,24 @@ LOCAL_SRC_FILES+= \
 	../btif/co/bta_fs_co.c \
 	../btif/co/bta_ag_co.c \
 	../btif/co/bta_dm_co.c \
+	../btif/co/bta_av_co.c
+
+# sbc encoder
+LOCAL_SRC_FILES+= \
+	../embdrv/sbc/encoder/srce/sbc_analysis.c \
+	../embdrv/sbc/encoder/srce/sbc_dct.c \
+	../embdrv/sbc/encoder/srce/sbc_dct_coeffs.c \
+	../embdrv/sbc/encoder/srce/sbc_enc_bit_alloc_mono.c \
+	../embdrv/sbc/encoder/srce/sbc_enc_bit_alloc_ste.c \
+	../embdrv/sbc/encoder/srce/sbc_enc_coeffs.c \
+	../embdrv/sbc/encoder/srce/sbc_encoder.c \
+	../embdrv/sbc/encoder/srce/sbc_packing.c \
+	../btif/src/btif_media_task.c
 
 # candidates for vendor lib (keep here for now)
 LOCAL_SRC_FILES+= \
 	../udrv/ulinux/unv_linux.c\
+	../udrv/ulinux/uipc.c
 
 
 LOCAL_C_INCLUDES+= . \
@@ -46,13 +62,18 @@ LOCAL_C_INCLUDES+= . \
                    $(LOCAL_PATH)/../include \
                    $(LOCAL_PATH)/../stack/include \
                    $(LOCAL_PATH)/../stack/l2cap \
+                   $(LOCAL_PATH)/../stack/a2dp \
                    $(LOCAL_PATH)/../stack/btm \
+                   $(LOCAL_PATH)/../stack/avdt \
                    $(LOCAL_PATH)/../hcis \
                    $(LOCAL_PATH)/../hcis/include \
                    $(LOCAL_PATH)/../hcis/patchram \
                    $(LOCAL_PATH)/../udrv/include \
                    $(LOCAL_PATH)/../btif/include \
+                   $(LOCAL_PATH)/../btif/co \
                    $(LOCAL_PATH)/../vendor/libvendor/include\
+                   $(LOCAL_PATH)/../brcm/include \
+		   		   $(LOCAL_PATH)/../embdrv/sbc/encoder/include
 
 LOCAL_CFLAGS += -DBUILDCFG -Werror
 
@@ -75,7 +96,7 @@ LOCAL_SHARED_LIBRARIES := \
     libbt-vendor
 
 #LOCAL_WHOLE_STATIC_LIBRARIES := libbt-brcm_gki libbt-brcm_stack libbt-brcm_bta
-LOCAL_STATIC_LIBRARIES := libbt-brcm_gki libbt-brcm_stack libbt-brcm_bta
+LOCAL_STATIC_LIBRARIES := libbt-brcm_gki libbt-brcm_bta libbt-brcm_stack
 
 LOCAL_MODULE := bluetooth.default
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
diff --git a/main/bte_init.c b/main/bte_init.c
index 638f2be..14a6006 100644
--- a/main/bte_init.c
+++ b/main/bte_init.c
@@ -113,9 +113,6 @@
 #include "a2d_api.h"
 #endif
 
-#if (defined(VDP_INCLUDED) && VDP_INCLUDED == TRUE)
-#include "vdp_api.h"
-#endif
 
 #if (defined(HID_DEV_INCLUDED) && HID_DEV_INCLUDED == TRUE)
 #include "hidd_api.h"
@@ -211,9 +208,6 @@
 #if BTA_AV_INCLUDED==TRUE
 #include "bta_av_int.h"
 #endif
-#if BTA_AVK_INCLUDED==TRUE
-#include "bta_avk_int.h"
-#endif
 
 #if BTA_SC_INCLUDED==TRUE
 #include "bta_sc_int.h"
@@ -384,9 +378,6 @@ BT_API void BTE_InitStack(void)
     A2D_Init();
 #endif  /* AADP */
 
-#if (defined(VDP_INCLUDED) && VDP_INCLUDED == TRUE)
-    VDP_Init();
-#endif
 
 #if (defined(AVRC_INCLUDED) && AVRC_INCLUDED == TRUE)
     AVRC_Init();
@@ -481,9 +472,6 @@ BT_API void BTE_InitStack(void)
 #if BTA_AV_INCLUDED==TRUE
     memset((void *)bta_av_cb_ptr, 0, sizeof(tBTA_AV_CB));
 #endif
-#if BTA_AVK_INCLUDED==TRUE
-    memset((void *)bta_avk_cb_ptr, 0, sizeof(tBTA_AVK_CB));
-#endif
 #if BTA_PR_INCLUDED==TRUE
     memset((void *)bta_pr_cb_ptr, 0, sizeof(tBTA_PR_CB));
 #endif
diff --git a/main/bte_logmsg.c b/main/bte_logmsg.c
index 494c1a6..471728e 100644
--- a/main/bte_logmsg.c
+++ b/main/bte_logmsg.c
@@ -73,9 +73,6 @@
 #include "pan_api.h"
 #endif
 #include "sdp_api.h"
-#if (VDP_INCLUDED==TRUE)
-#include "vdp_api.h"
-#endif
 
 #if (BLE_INCLUDED==TRUE)
 #include "gatt_api.h"
@@ -330,7 +327,7 @@ const tBTTRC_FUNC_MAP bttrc_set_level_map[] = {
     { BTTRC_ID_STK_OBEX, BTTRC_ID_STK_OBEX, (const tBTTRC_SET_TRACE_LEVEL *)OBX_SetTraceLevel, "TRC_OBEX" },
 #endif
 #if (AVCT_INCLUDED==TRUE)
-    { BTTRC_ID_STK_AVCT, BTTRC_ID_STK_AVCT, (tBTTRC_SET_TRACE_LEVEL *)NULL, "TRC_AVCT" },
+    //{ BTTRC_ID_STK_AVCT, BTTRC_ID_STK_AVCT, (tBTTRC_SET_TRACE_LEVEL *)NULL, "TRC_AVCT" },
 #endif
 #if (AVDT_INCLUDED==TRUE)
     { BTTRC_ID_STK_AVDT, BTTRC_ID_STK_AVDT, (const tBTTRC_SET_TRACE_LEVEL *)AVDT_SetTraceLevel, "TRC_AVDT" },
@@ -339,7 +336,7 @@ const tBTTRC_FUNC_MAP bttrc_set_level_map[] = {
     { BTTRC_ID_STK_AVRC, BTTRC_ID_STK_AVRC, (const tBTTRC_SET_TRACE_LEVEL *)AVRC_SetTraceLevel, "TRC_AVRC" },
 #endif
 #if (AVDT_INCLUDED==TRUE)
-    { BTTRC_ID_AVDT_SCB, BTTRC_ID_AVDT_CCB, (tBTTRC_SET_TRACE_LEVEL *)NULL, "TRC_AVDT_SCB" },
+    //{ BTTRC_ID_AVDT_SCB, BTTRC_ID_AVDT_CCB, (tBTTRC_SET_TRACE_LEVEL *)NULL, "TRC_AVDT_SCB" },
 #endif
 #if (A2D_INCLUDED==TRUE)
     { BTTRC_ID_STK_A2D, BTTRC_ID_STK_A2D, (const tBTTRC_SET_TRACE_LEVEL *)A2D_SetTraceLevel, "TRC_A2D" },
@@ -373,9 +370,6 @@ const tBTTRC_FUNC_MAP bttrc_set_level_map[] = {
     { BTTRC_ID_STK_SAP, BTTRC_ID_STK_SAP, (tBTTRC_SET_TRACE_LEVEL *)NULL, "TRC_SAP" },
 #endif
     { BTTRC_ID_STK_SDP, BTTRC_ID_STK_SDP, (const tBTTRC_SET_TRACE_LEVEL *)SDP_SetTraceLevel, "TRC_SDP" },
-#if (VDP_INCLUDED==TRUE)
-    { BTTRC_ID_STK_VDP, BTTRC_ID_STK_VDP, (const tBTTRC_SET_TRACE_LEVEL *)VDP_SetTraceLevel, "TRC_VDP" },
-#endif
 #if (BLE_INCLUDED==TRUE)
     { BTTRC_ID_STK_GATT, BTTRC_ID_STK_GATT, (const tBTTRC_SET_TRACE_LEVEL *)GATT_SetTraceLevel , "TRC_GATT" },
 #endif