AV control and data path added

Change-Id: I88ec6084c140fa257154a98e23e075900e84cc8c

3 files changed, 46 insertions, 51 deletions

diff --git a/include/bt_target.h b/include/bt_target.h
index bedea09..1b4c128 100644
--- a/include/bt_target.h
+++ b/include/bt_target.h
@@ -3002,13 +3002,6 @@ Range: Minimum 12000 (12 secs) on BR/EDR when supporting PBF.
 #define A2D_M24_INCLUDED        A2D_INCLUDED
 #endif
 
-/*************************************************************************
- * VDP Definitions
- */
-#ifndef VDP_INCLUDED
-#define VDP_INCLUDED            FALSE
-#endif
-
 /******************************************************************************
 **
 ** AVCTP
diff --git a/include/buildcfg_crespo.h b/include/buildcfg_crespo.h
index b858686..0060149 100644
--- a/include/buildcfg_crespo.h
+++ b/include/buildcfg_crespo.h
@@ -1,21 +1,21 @@
 #ifndef BUILDCFG_H
 #define BUILDCFG_H
-#define AVCT_INCLUDED   FALSE
-#define AVRC_INCLUDED   FALSE
-//#define AVRC_METADATA_INCLUDED   TRUE
-//#define AVRC_ADV_CTRL_INCLUDED   FALSE
-#define AVDT_INCLUDED   FALSE
+#define AVCT_INCLUDED   TRUE
+#define AVRC_INCLUDED   TRUE
+#define AVRC_METADATA_INCLUDED   TRUE
+#define AVRC_ADV_CTRL_INCLUDED      FALSE
+#define AVDT_INCLUDED   TRUE
+#define AVDTC_INCLUDED   FALSE               # Makefile only
 #define AT91_MAIN_INCLUDED   FALSE
 #define AT91_DRV_INCLUDED   FALSE
 #define AT91_LIB_INCLUDED   FALSE
 #define AT91_GKI_INCLUDED   FALSE
 #define UNV_INCLUDED   FALSE
 #define BBY_MAIN_INCLUDED   FALSE
-#define A2D_INCLUDED   FALSE
-#define A2D_SBC_INCLUDED   FALSE
+#define A2D_INCLUDED   TRUE
+#define A2D_SBC_INCLUDED   TRUE
 #define A2D_M12_INCLUDED   FALSE
 #define A2D_M24_INCLUDED   FALSE
-#define VDP_INCLUDED       FALSE
 #define VDP_H263_INCLUDED   FALSE
 #define VDP_MPEG_INCLUDED   FALSE
 #define VDP_VEND_INCLUDED   FALSE
@@ -30,11 +30,15 @@
 #define BIP_DISPLAY_INCLUDED   FALSE
 #define BPP_INCLUDED   FALSE
 #define BPP_SND_INCLUDED   FALSE
+#define BTM_INCLUDED   FALSE                 # Makefile only
+#define BTU_INCLUDED   FALSE                 # Makefile only
+#define BTUTHIN_INCLUDED   FALSE            # Makefile only
 #define DUN_INCLUDED   FALSE
 #define GAP_INCLUDED   FALSE
 #define GOEP_INCLUDED   FALSE
 #define GOEP_FS_INCLUDED   FALSE
 #define GATT_PTS   FALSE
+#define HCIC_INCLUDED   TRUE                # Makefile only
 #define HCITHIN_INCLUDED   FALSE
 #define BTM_SEC_MAX_SERVICE_RECORDS   32
 #define L2CAP_INCLUDED   TRUE
@@ -53,12 +57,11 @@
 #define MAX_RFC_PORTS   30
 #define MAX_BD_CONNECTIONS   7
 #define BTA_RFC_MTU_SIZE   (L2CAP_MTU_SIZE-L2CAP_MIN_OFFSET-RFCOMM_DATA_OVERHEAD)
-#define BTA_JV_DEF_RFC_MTU   BTA_RFC_MTU_SIZE
-#define PORT_TX_BUF_HIGH_WM   15
+#define PORT_TX_BUF_HIGH_WM   10
 #define PORT_RX_BUF_HIGH_WM   10
 #define PORT_RX_BUF_LOW_WM   4
 #define PORT_RX_BUF_CRITICAL_WM   15
-#define PORT_TX_BUF_CRITICAL_WM   25
+#define PORT_TX_BUF_CRITICAL_WM   15
 #define PORT_RX_LOW_WM   (BTA_RFC_MTU_SIZE * PORT_RX_BUF_LOW_WM)
 #define PORT_RX_HIGH_WM   (BTA_RFC_MTU_SIZE * PORT_RX_BUF_HIGH_WM)
 #define PORT_RX_CRITICAL_WM   (BTA_RFC_MTU_SIZE * PORT_RX_BUF_CRITICAL_WM)
@@ -67,12 +70,18 @@
 #define BTA_DUN_MTU   BTA_RFC_MTU_SIZE
 #define BTA_SPP_MTU   BTA_RFC_MTU_SIZE
 #define BTA_FAX_MTU   BTA_RFC_MTU_SIZE
+#define SDP_INCLUDED   TRUE                 # Makefile only
 #define SDP_DI_INCLUDED   TRUE
 #define SDP_RAW_DATA_INCLUDED   TRUE
 #define SDP_RAW_PDU_INCLUDED   TRUE
 #define SDP_POOL_ID   3
+#define SDP_MAX_REC_ATTR   25
+#define SDP_MAX_ATTR_LEN   400
+#define SDP_MAX_PAD_LEN   600
+#define XML_INCLUDED   TRUE                 # Makefile only
 #define BNEP_INCLUDED   FALSE
 #define PAN_INCLUDED   FALSE
+#define ANT_INCLUDED   FALSE
 #define SAP_SERVER_INCLUDED   FALSE
 #define HID_DEV_INCLUDED   FALSE
 #define HID_HOST_INCLUDED   FALSE
@@ -86,14 +95,17 @@
 #define SMP_INCLUDED   FALSE
 #define SMP_HOST_ENCRYPT_INCLUDED   FALSE
 #define CE_TEST_INCLUDED   FALSE
+#define FLASHEXE_INCLUDED   TRUE            # Makefile only
 #define SER_INCLUDED   FALSE
 #define RPC_INCLUDED   FALSE
+#define HSA_INCLUDED   FALSE                 # Makefile only
 #define MMI_INCLUDED   FALSE
 #define SAP_INCLUDED   FALSE
+#define SBC_ENCODER_INCLUDED   FALSE         # Makefile only
+#define SBC_DECODER_INCLUDED   FALSE        # Makefile only
 #define SBC_NO_PCM_CPY_OPTION   FALSE
 #define SBC_IPAQ_OPT   FALSE
 #define SBC_IS_64_MULT_IN_QUANTIZER   FALSE
-//#define MCA_INCLUDED   TRUE
 #define BTE_HCIUTILS_HOOK_INCLUDED   FALSE
 #define BTA_INCLUDED   TRUE
 #define BTA_AG_INCLUDED   TRUE
@@ -114,10 +126,8 @@
 #define BTA_HD_INCLUDED   FALSE
 #define BTA_HH_INCLUDED   FALSE
 #define HH_USE_BTHID   FALSE
-#define BTA_AR_INCLUDED   FALSE
-#define BTA_AV_INCLUDED   FALSE
-#define BTA_AV_VDP_INCLUDED   FALSE
-#define BTA_AVK_INCLUDED   FALSE
+#define BTA_AR_INCLUDED   TRUE
+#define BTA_AV_INCLUDED   TRUE
 #define BTA_PBS_INCLUDED   FALSE
 #define BTA_PBC_INCLUDED   FALSE
 #define BTA_FM_INCLUDED   FALSE
@@ -134,18 +144,18 @@
 #define BTA_JV_INCLUDED   FALSE
 #define BTA_EIR_CANNED_UUID_LIST   FALSE
 #define BTA_GATT_INCLUDED   FALSE
-#define BTA_HL_INCLUDED   TRUE
-#define BTA_HL_DEBUG    TRUE
+#define MMP_INCLUDED   FALSE		# Makefile only
+#define BTELIB_INCLUDED   FALSE  	# Makefile only
 #define RSI_INCLUDED   TRUE
 #define RPC_TRACE_ONLY   FALSE
 #define ANDROID_APP_INCLUDED   TRUE
 #define ANDROID_USE_LOGCAT   TRUE
 #define LINUX_GKI_INCLUDED   TRUE
-#define TICKS_PER_SEC   10
+#define TICKS_PER_SEC   100
 #define QUICK_TIMER_TICKS_PER_SEC   10
 #define BTA_SYS_TIMER_PERIOD   100
 #define GKI_BUF1_SIZE   288
-#define GKI_BUF3_MAX   100
+#define GKI_BUF3_MAX   200
 #define GKI_BUF3_SIZE   (4096+16)
 #define GKI_BUF4_SIZE   (8080+26)
 #define GKI_SHUTDOWN_EVT   APPL_EVT_7
@@ -154,13 +164,9 @@
 #define LINUX_OS   TRUE
 #define BTU_TASK           0
 #define BTIF_TASK          1
-#define GKI_MAX_TASKS      2
-//#define BTE_APPL_TASK      2
-//#define SBC_ENCODE_TASK   3
-//#define AV_SRC_READ_TASK   4
-//#define PBS_SQL_TASK   5
+#define A2DP_MEDIA_TASK    2
+#define GKI_MAX_TASKS      3
 #define BTM_APP_DEV_INIT   bte_main_post_reset_init
-#define BTE_RESET_BAUD_ON_BT_DISABLE   FALSE
 #define BTE_IDLE_TASK_INCLUDED   FALSE
 #define APPL_INCLUDED   TRUE
 #define USE_UART_HCI   TRUE
@@ -194,8 +200,6 @@
 #define BTAPP_TESTMODE_INCLUDED   TRUE
 #define HCILP_INCLUDED   TRUE
 #define HCISU_H4_INCLUDED   TRUE
-#define BT_PCM_DEF_CLK   0
-#define BT_PCM_DEF_ROLE   0
 #define BT_USE_TRACES       TRUE
 #define BT_TRACE_BTIF       TRUE
 #define BTTRC_INCLUDED      FALSE
@@ -223,13 +227,11 @@
 #define BTAPP_TEST_OOB_INCLUDED   TRUE
 #define ENABLE_PCM_LOGGER   FALSE
 #define BTM_DISC_DURING_RS   TRUE
-#define PAN_DTUN   TRUE
 #define BT_UART_PORT   "/dev/s3c2410_serial0"
 #define BTM_WBS_INCLUDED   FALSE
-
+#define HL_INCLUDED FALSE
 #define NO_GKI_RUN_RETURN TRUE
-
 #define BTE_MAIN_CFG_DEFAULT_PATCHFILE_NAME     ("/vendor/firmware/bcm4329.hcd")
-
 #define AG_VOICE_SETTINGS HCI_DEFAULT_VOICE_SETTINGS
 #endif
+
diff --git a/include/buildcfg_maguro.h b/include/buildcfg_maguro.h
index 556f8dd..a2e0123 100644
--- a/include/buildcfg_maguro.h
+++ b/include/buildcfg_maguro.h
@@ -1,8 +1,10 @@
 #ifndef BUILDCFG_H
 #define BUILDCFG_H
-#define AVCT_INCLUDED   FALSE
-#define AVRC_INCLUDED   FALSE
-#define AVDT_INCLUDED   FALSE
+#define AVCT_INCLUDED   TRUE
+#define AVRC_INCLUDED   TRUE
+#define AVRC_METADATA_INCLUDED   TRUE
+#define AVRC_ADV_CTRL_INCLUDED      FALSE
+#define AVDT_INCLUDED   TRUE
 #define AVDTC_INCLUDED   FALSE               # Makefile only
 #define AT91_MAIN_INCLUDED   FALSE
 #define AT91_DRV_INCLUDED   FALSE
@@ -10,11 +12,10 @@
 #define AT91_GKI_INCLUDED   FALSE
 #define UNV_INCLUDED   FALSE
 #define BBY_MAIN_INCLUDED   FALSE
-#define A2D_INCLUDED   FALSE
-#define A2D_SBC_INCLUDED   FALSE
+#define A2D_INCLUDED   TRUE
+#define A2D_SBC_INCLUDED   TRUE
 #define A2D_M12_INCLUDED   FALSE
 #define A2D_M24_INCLUDED   FALSE
-#define VDP_INCLUDED       FALSE
 #define VDP_H263_INCLUDED   FALSE
 #define VDP_MPEG_INCLUDED   FALSE
 #define VDP_VEND_INCLUDED   FALSE
@@ -125,10 +126,8 @@
 #define BTA_HD_INCLUDED   FALSE
 #define BTA_HH_INCLUDED   FALSE
 #define HH_USE_BTHID   FALSE
-#define BTA_AR_INCLUDED   FALSE
-#define BTA_AV_INCLUDED   FALSE
-#define BTA_AV_VDP_INCLUDED   FALSE
-#define BTA_AVK_INCLUDED   FALSE
+#define BTA_AR_INCLUDED   TRUE
+#define BTA_AV_INCLUDED   TRUE
 #define BTA_PBS_INCLUDED   FALSE
 #define BTA_PBC_INCLUDED   FALSE
 #define BTA_FM_INCLUDED   FALSE
@@ -152,7 +151,7 @@
 #define ANDROID_APP_INCLUDED   TRUE
 #define ANDROID_USE_LOGCAT   TRUE
 #define LINUX_GKI_INCLUDED   TRUE
-#define TICKS_PER_SEC   10
+#define TICKS_PER_SEC   100
 #define QUICK_TIMER_TICKS_PER_SEC   10
 #define BTA_SYS_TIMER_PERIOD   100
 #define GKI_BUF1_SIZE   288
@@ -165,7 +164,8 @@
 #define LINUX_OS   TRUE
 #define BTU_TASK           0
 #define BTIF_TASK          1
-#define GKI_MAX_TASKS      2
+#define A2DP_MEDIA_TASK    2
+#define GKI_MAX_TASKS      3
 #define BTM_APP_DEV_INIT   bte_main_post_reset_init
 #define BTE_IDLE_TASK_INCLUDED   FALSE
 #define APPL_INCLUDED   TRUE