Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp

# Conflicts:
#	components/bt/bluedroid/bta/include/bta_api.h
#	components/bt/bluedroid/bta/include/bta_gattc_int.h
#	components/bt/bluedroid/hci/hci_hal_h4.c
#	components/bt/bluedroid/hci/hci_layer.c
#	components/bt/bluedroid/include/bt_target.h
#	components/bt/bluedroid/stack/btu/btu_init.c

diff --cc components/bt/bluedroid/bta/include/bta_api.h
index 9b8a4059956149940d986b19b31a3c5b227ccd9d,338fb968910befed79f156d459d64249e8791639..182482ef0fd929bb45f4b4210c7e2a7f7edb242e
--- 1/components/bt/bluedroid/bta/include/bta_api.h
--- 2/components/bt/bluedroid/bta/include/bta_api.h
+++ b/components/bt/bluedroid/bta/include/bta_api.h
@@@ -28,7 -28,8 +28,8 @@@
  #include "bt_target.h"
  #include "bt_types.h"
  #include "btm_api.h"
 -// #include "uipc_msg.h"
 +#include "uipc_msg.h"
+ #include "sdp_api.h"
  
  #if BLE_INCLUDED == TRUE
  #include "btm_ble_api.h"

diff --cc components/bt/bluedroid/hci/hci_hal_h4.c
Simple merge

diff --cc components/bt/bluedroid/hci/hci_layer.c
Simple merge

diff --cc components/bt/bluedroid/include/bt_target.h
Simple merge

diff --cc components/bt/bluedroid/osi/include/thread.h
index 60e41990d8ffca9a85e4194dd3cdaa4d988eb3b0,11bf0f585047f34c2f52e65b76c6b1f77b5cf16f..d4d41542b8af1260e03c416ac8758ff239ec6165
--- 1/components/bt/bluedroid/osi/include/thread.h
--- 2/components/bt/bluedroid/osi/include/thread.h
+++ b/components/bt/bluedroid/osi/include/thread.h
@@@ -40,9 -40,29 +40,29 @@@ enum 
      SIG_PRF_WORK = 0xfd,
      SIG_BTU_START_UP = 0xfe,
      SIG_BTU_WORK = 0xff,
 -    SIG_BTIF_WORK = 0xff
 +    // SIG_BTIF_WORK = 0xff
  };
  
+ #define HCI_HOST_TASK_STACK_SIZE      1024
+ #define HCI_HOST_TASK_PRIO                    (configMAX_PRIORITIES - 3)
+ #define HCI_HOST_TASK_NAME                    "hciHostT"
+ #define HCI_HOST_QUEUE_NUM                    30
+ 
+ #define HCI_H4_TASK_STACK_SIZE                1024
+ #define HCI_H4_TASK_PRIO                      (configMAX_PRIORITIES - 3)
+ #define HCI_H4_TASK_NAME                      "hciH4T"
+ #define HCI_H4_QUEUE_NUM                      30
+ 
+ #define BTU_TASK_STACK_SIZE                   4096
+ #define BTU_TASK_PRIO                         (configMAX_PRIORITIES - 1)
+ #define BTU_TASK_NAME                         "btuT"
+ #define BTU_QUEUE_NUM                         30
+ 
+ #define BTC_TASK_QUEUE_NUM            20
+ #define BTC_TASK_STACK_SIZE           CONFIG_BTC_TASK_STACK_SIZE      //by menuconfig
+ #define BTC_TASK_NAME                 "btcT"
+ #define BTC_TASK_PRIO                 (configMAX_PRIORITIES - 5)
+ 
  void btu_task_post(uint32_t sig);
  void hci_host_task_post(void);
  void hci_hal_h4_task_post(void);

diff --cc components/bt/bluedroid/stack/btu/btu_init.c
index 68c4e03b5c09ca965c1ba8abb3da9159089fb61c,b4309f42c4b76792f5782e94d955132e7bd1bf2a..150073c0053a9c77014684c4db337646db46f332
--- 1/components/bt/bluedroid/stack/btu/btu_init.c
--- 2/components/bt/bluedroid/stack/btu/btu_init.c
+++ b/components/bt/bluedroid/stack/btu/btu_init.c
@@@ -200,9 -200,8 +200,8 @@@ void BTU_StartUp(void
          goto error_exit;
      }
  
--    xBtuQueue = xQueueCreate(60, sizeof(BtTaskEvt_t));
-     xTaskCreate(btu_task_thread_handler, "BtuT", 2048 + 1024, NULL, configMAX_PRIORITIES - 1, &xBtuTaskHandle);
- 
++    xBtuQueue = xQueueCreate(BTU_QUEUE_NUM, sizeof(BtTaskEvt_t));
+     xTaskCreate(btu_task_thread_handler, BTU_TASK_NAME, BTU_TASK_STACK_SIZE, NULL, BTU_TASK_PRIO, &xBtuTaskHandle);
      btu_task_post(SIG_BTU_START_UP);
      /*
          // Continue startup on bt workqueue thread.

diff --cc components/bt/component.mk
index 35c34e773b34c5e8bb2187d3109ddf4f2858cd48,0d4f7b280d42fd3345d4924d7076035550a6162f..a591dee3ac0305eacc27314cfc5ad7203c2c3a0d
--- 1/components/bt/component.mk
--- 2/components/bt/component.mk
+++ b/components/bt/component.mk
@@@ -83,7 -70,7 +83,7 @@@ COMPONENT_SRCDIRS :=  bluedroid/bta/d
                        bluedroid                               \
                        .
  
--include $(IDF_PATH)/make/component_common.mk
++#include $(IDF_PATH)/make/component_common.mk
  
  ALL_LIB_FILES := $(patsubst %,$(COMPONENT_PATH)/lib/lib%.a,$(LIBS))
  $(COMPONENT_LIBRARY): $(ALL_LIB_FILES)

diff --cc examples/09_a2dp/components/bluedroid_demos/component.mk
index 3260abf0ef720716f849999b18a9a6690f822378,0000000000000000000000000000000000000000..714c9cd13c5d2f7dd876a358747fc39173bfc861
mode 100755,000000..100755
--- 1/examples/09_a2dp/components/bluedroid_demos/component.mk
--- /dev/null
+++ b/examples/09_a2dp/components/bluedroid_demos/component.mk
@@@ -1,30 -1,0 +1,30 @@@
- include $(IDF_PATH)/make/component_common.mk
 +#
 +# Main Makefile. This is basically the same as a component makefile.
 +#
 +# This Makefile should, at the very least, just include $(SDK_PATH)/make/component_common.mk. By default, 
 +# this will take the sources in the src/ directory, compile them and link them into 
 +# lib(subdirectory_name).a in the build directory. This behaviour is entirely configurable,
 +# please read the ESP-IDF documents if you need to do this.
 +#
 +
 +COMPONENT_ADD_INCLUDEDIRS :=  \
 +                              udrv/include                            \
 +                              btif/include                            \
 +                              audio_a2dp_hw/include                   \
 +                              embdrv/sbc/encoder/include              \
 +                              embdrv/sbc/decoder/include              \
 +                              include                                 \
 +
 +COMPONENT_SRCDIRS :=  \
 +                      app_core                                \
 +                      app_project                             \
 +                      udrv/ulinux                             \
 +                      embdrv/sbc/encoder/srce                 \
 +                      embdrv/sbc/decoder/srce                 \
 +                      btif/co                                 \
 +                      btif
 +
 +CFLAGS += -Wno-error=unused-label -Wno-error=return-type -Wno-error=missing-braces -Wno-error=pointer-sign -Wno-error=parentheses -I./include
 +
 +
++#include $(IDF_PATH)/make/component_common.mk