From aaf0cc00c4d1fa199f66631ceeb2b6130a19541d Mon Sep 17 00:00:00 2001 From: wangmengyang Date: Thu, 16 Mar 2017 16:48:39 +0800 Subject: [PATCH] component/bt: minor issue fixes for pre-merge 1. arrange the order of profile ID enums 2. add directory "external" and move SBC codec source into it --- components/bt/bluedroid/btc/core/btc_task.c | 5 +---- components/bt/bluedroid/btc/include/btc_task.h | 5 +---- components/bt/bluedroid/btc/profile/std/a2dp/btc_avk.c | 2 +- .../{embdrv => external}/sbc/decoder/include/oi_assert.h | 0 .../{embdrv => external}/sbc/decoder/include/oi_bitstream.h | 0 .../{embdrv => external}/sbc/decoder/include/oi_bt_spec.h | 0 .../{embdrv => external}/sbc/decoder/include/oi_codec_sbc.h | 0 .../sbc/decoder/include/oi_codec_sbc_private.h | 0 .../{embdrv => external}/sbc/decoder/include/oi_common.h | 0 .../{embdrv => external}/sbc/decoder/include/oi_cpu_dep.h | 0 .../{embdrv => external}/sbc/decoder/include/oi_modules.h | 0 .../sbc/decoder/include/oi_osinterface.h | 0 .../{embdrv => external}/sbc/decoder/include/oi_status.h | 0 .../{embdrv => external}/sbc/decoder/include/oi_stddefs.h | 0 .../{embdrv => external}/sbc/decoder/include/oi_string.h | 0 .../{embdrv => external}/sbc/decoder/include/oi_time.h | 0 .../{embdrv => external}/sbc/decoder/include/oi_utils.h | 0 .../bluedroid/{embdrv => external}/sbc/decoder/srce/alloc.c | 0 .../{embdrv => external}/sbc/decoder/srce/bitalloc-sbc.c | 0 .../{embdrv => external}/sbc/decoder/srce/bitalloc.c | 0 .../{embdrv => external}/sbc/decoder/srce/bitstream-decode.c | 0 .../{embdrv => external}/sbc/decoder/srce/decoder-oina.c | 0 .../{embdrv => external}/sbc/decoder/srce/decoder-private.c | 0 .../{embdrv => external}/sbc/decoder/srce/decoder-sbc.c | 0 .../{embdrv => external}/sbc/decoder/srce/dequant.c | 0 .../{embdrv => external}/sbc/decoder/srce/framing-sbc.c | 0 .../{embdrv => external}/sbc/decoder/srce/framing.c | 0 .../{embdrv => external}/sbc/decoder/srce/oi_codec_version.c | 0 .../sbc/decoder/srce/readsamplesjoint.inc | 0 .../sbc/decoder/srce/synthesis-8-generated.c | 0 .../{embdrv => external}/sbc/decoder/srce/synthesis-dct8.c | 0 .../{embdrv => external}/sbc/decoder/srce/synthesis-sbc.c | 0 .../{embdrv => external}/sbc/encoder/include/sbc_dct.h | 0 .../sbc/encoder/include/sbc_enc_func_declare.h | 0 .../{embdrv => external}/sbc/encoder/include/sbc_encoder.h | 0 .../{embdrv => external}/sbc/encoder/include/sbc_if.h | 0 .../{embdrv => external}/sbc/encoder/include/sbc_types.h | 0 .../{embdrv => external}/sbc/encoder/srce/sbc_analysis.c | 0 .../{embdrv => external}/sbc/encoder/srce/sbc_dct.c | 0 .../{embdrv => external}/sbc/encoder/srce/sbc_dct_coeffs.c | 0 .../sbc/encoder/srce/sbc_enc_bit_alloc_mono.c | 0 .../sbc/encoder/srce/sbc_enc_bit_alloc_ste.c | 0 .../{embdrv => external}/sbc/encoder/srce/sbc_enc_coeffs.c | 0 .../{embdrv => external}/sbc/encoder/srce/sbc_encoder.c | 0 .../{embdrv => external}/sbc/encoder/srce/sbc_packing.c | 0 components/bt/component.mk | 4 ++-- 46 files changed, 5 insertions(+), 11 deletions(-) rename components/bt/bluedroid/{embdrv => external}/sbc/decoder/include/oi_assert.h (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/decoder/include/oi_bitstream.h (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/decoder/include/oi_bt_spec.h (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/decoder/include/oi_codec_sbc.h (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/decoder/include/oi_codec_sbc_private.h (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/decoder/include/oi_common.h (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/decoder/include/oi_cpu_dep.h (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/decoder/include/oi_modules.h (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/decoder/include/oi_osinterface.h (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/decoder/include/oi_status.h (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/decoder/include/oi_stddefs.h (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/decoder/include/oi_string.h (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/decoder/include/oi_time.h (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/decoder/include/oi_utils.h (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/decoder/srce/alloc.c (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/decoder/srce/bitalloc-sbc.c (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/decoder/srce/bitalloc.c (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/decoder/srce/bitstream-decode.c (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/decoder/srce/decoder-oina.c (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/decoder/srce/decoder-private.c (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/decoder/srce/decoder-sbc.c (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/decoder/srce/dequant.c (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/decoder/srce/framing-sbc.c (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/decoder/srce/framing.c (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/decoder/srce/oi_codec_version.c (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/decoder/srce/readsamplesjoint.inc (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/decoder/srce/synthesis-8-generated.c (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/decoder/srce/synthesis-dct8.c (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/decoder/srce/synthesis-sbc.c (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/encoder/include/sbc_dct.h (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/encoder/include/sbc_enc_func_declare.h (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/encoder/include/sbc_encoder.h (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/encoder/include/sbc_if.h (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/encoder/include/sbc_types.h (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/encoder/srce/sbc_analysis.c (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/encoder/srce/sbc_dct.c (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/encoder/srce/sbc_dct_coeffs.c (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/encoder/srce/sbc_enc_bit_alloc_mono.c (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/encoder/srce/sbc_enc_bit_alloc_ste.c (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/encoder/srce/sbc_enc_coeffs.c (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/encoder/srce/sbc_encoder.c (100%) rename components/bt/bluedroid/{embdrv => external}/sbc/encoder/srce/sbc_packing.c (100%) diff --git a/components/bt/bluedroid/btc/core/btc_task.c b/components/bt/bluedroid/btc/core/btc_task.c index 735ee3ab01..2adee92177 100644 --- a/components/bt/bluedroid/btc/core/btc_task.c +++ b/components/bt/bluedroid/btc/core/btc_task.c @@ -40,13 +40,10 @@ static btc_func_t profile_tab[BTC_PID_NUM] = { [BTC_PID_GATTS] = {btc_gatts_call_handler, btc_gatts_cb_handler }, [BTC_PID_GATTC] = {btc_gattc_call_handler, btc_gattc_cb_handler }, [BTC_PID_GAP_BLE] = {btc_gap_ble_call_handler, btc_gap_ble_cb_handler }, - [BTC_PID_GAP_BT] = {btc_gap_bt_call_handler, NULL }, - [BTC_PID_SDP] = {NULL, NULL}, [BTC_PID_BLE_HID] = {NULL, NULL}, - [BTC_PID_BT_HID] = {NULL, NULL}, - [BTC_PID_SPP] = {NULL, NULL}, [BTC_PID_SPPLIKE] = {NULL, NULL}, [BTC_PID_BLUFI] = {btc_blufi_call_handler, btc_blufi_cb_handler }, + [BTC_PID_GAP_BT] = {btc_gap_bt_call_handler, NULL }, [BTC_PID_DM_SEC] = {NULL, btc_dm_sec_cb_handler }, [BTC_PID_PRF_QUE] = {btc_profile_queue_handler, NULL }, [BTC_PID_A2DP] = {btc_a2dp_call_handler, btc_a2dp_cb_handler }, diff --git a/components/bt/bluedroid/btc/include/btc_task.h b/components/bt/bluedroid/btc/include/btc_task.h index 4cd2ab1d6e..f37ffd437c 100644 --- a/components/bt/bluedroid/btc/include/btc_task.h +++ b/components/bt/bluedroid/btc/include/btc_task.h @@ -38,13 +38,10 @@ typedef enum { BTC_PID_GATTS, BTC_PID_GATTC, BTC_PID_GAP_BLE, - BTC_PID_GAP_BT, - BTC_PID_SDP, BTC_PID_BLE_HID, - BTC_PID_BT_HID, - BTC_PID_SPP, BTC_PID_SPPLIKE, BTC_PID_BLUFI, + BTC_PID_GAP_BT, BTC_PID_DM_SEC, BTC_PID_PRF_QUE, BTC_PID_A2DP, diff --git a/components/bt/bluedroid/btc/profile/std/a2dp/btc_avk.c b/components/bt/bluedroid/btc/profile/std/a2dp/btc_avk.c index 02290bc3f5..7d7819f26f 100644 --- a/components/bt/bluedroid/btc/profile/std/a2dp/btc_avk.c +++ b/components/bt/bluedroid/btc/profile/std/a2dp/btc_avk.c @@ -140,7 +140,7 @@ static inline void btc_a2d_cb_to_app(esp_a2d_cb_event_t event, esp_a2d_cb_param_ } } -static const char *dump_av_sm_state_name(btc_av_state_t state) +UNUSED_ATTR static const char *dump_av_sm_state_name(btc_av_state_t state) { switch (state) { CASE_RETURN_STR(BTC_AV_STATE_IDLE) diff --git a/components/bt/bluedroid/embdrv/sbc/decoder/include/oi_assert.h b/components/bt/bluedroid/external/sbc/decoder/include/oi_assert.h similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/decoder/include/oi_assert.h rename to components/bt/bluedroid/external/sbc/decoder/include/oi_assert.h diff --git a/components/bt/bluedroid/embdrv/sbc/decoder/include/oi_bitstream.h b/components/bt/bluedroid/external/sbc/decoder/include/oi_bitstream.h similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/decoder/include/oi_bitstream.h rename to components/bt/bluedroid/external/sbc/decoder/include/oi_bitstream.h diff --git a/components/bt/bluedroid/embdrv/sbc/decoder/include/oi_bt_spec.h b/components/bt/bluedroid/external/sbc/decoder/include/oi_bt_spec.h similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/decoder/include/oi_bt_spec.h rename to components/bt/bluedroid/external/sbc/decoder/include/oi_bt_spec.h diff --git a/components/bt/bluedroid/embdrv/sbc/decoder/include/oi_codec_sbc.h b/components/bt/bluedroid/external/sbc/decoder/include/oi_codec_sbc.h similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/decoder/include/oi_codec_sbc.h rename to components/bt/bluedroid/external/sbc/decoder/include/oi_codec_sbc.h diff --git a/components/bt/bluedroid/embdrv/sbc/decoder/include/oi_codec_sbc_private.h b/components/bt/bluedroid/external/sbc/decoder/include/oi_codec_sbc_private.h similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/decoder/include/oi_codec_sbc_private.h rename to components/bt/bluedroid/external/sbc/decoder/include/oi_codec_sbc_private.h diff --git a/components/bt/bluedroid/embdrv/sbc/decoder/include/oi_common.h b/components/bt/bluedroid/external/sbc/decoder/include/oi_common.h similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/decoder/include/oi_common.h rename to components/bt/bluedroid/external/sbc/decoder/include/oi_common.h diff --git a/components/bt/bluedroid/embdrv/sbc/decoder/include/oi_cpu_dep.h b/components/bt/bluedroid/external/sbc/decoder/include/oi_cpu_dep.h similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/decoder/include/oi_cpu_dep.h rename to components/bt/bluedroid/external/sbc/decoder/include/oi_cpu_dep.h diff --git a/components/bt/bluedroid/embdrv/sbc/decoder/include/oi_modules.h b/components/bt/bluedroid/external/sbc/decoder/include/oi_modules.h similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/decoder/include/oi_modules.h rename to components/bt/bluedroid/external/sbc/decoder/include/oi_modules.h diff --git a/components/bt/bluedroid/embdrv/sbc/decoder/include/oi_osinterface.h b/components/bt/bluedroid/external/sbc/decoder/include/oi_osinterface.h similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/decoder/include/oi_osinterface.h rename to components/bt/bluedroid/external/sbc/decoder/include/oi_osinterface.h diff --git a/components/bt/bluedroid/embdrv/sbc/decoder/include/oi_status.h b/components/bt/bluedroid/external/sbc/decoder/include/oi_status.h similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/decoder/include/oi_status.h rename to components/bt/bluedroid/external/sbc/decoder/include/oi_status.h diff --git a/components/bt/bluedroid/embdrv/sbc/decoder/include/oi_stddefs.h b/components/bt/bluedroid/external/sbc/decoder/include/oi_stddefs.h similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/decoder/include/oi_stddefs.h rename to components/bt/bluedroid/external/sbc/decoder/include/oi_stddefs.h diff --git a/components/bt/bluedroid/embdrv/sbc/decoder/include/oi_string.h b/components/bt/bluedroid/external/sbc/decoder/include/oi_string.h similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/decoder/include/oi_string.h rename to components/bt/bluedroid/external/sbc/decoder/include/oi_string.h diff --git a/components/bt/bluedroid/embdrv/sbc/decoder/include/oi_time.h b/components/bt/bluedroid/external/sbc/decoder/include/oi_time.h similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/decoder/include/oi_time.h rename to components/bt/bluedroid/external/sbc/decoder/include/oi_time.h diff --git a/components/bt/bluedroid/embdrv/sbc/decoder/include/oi_utils.h b/components/bt/bluedroid/external/sbc/decoder/include/oi_utils.h similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/decoder/include/oi_utils.h rename to components/bt/bluedroid/external/sbc/decoder/include/oi_utils.h diff --git a/components/bt/bluedroid/embdrv/sbc/decoder/srce/alloc.c b/components/bt/bluedroid/external/sbc/decoder/srce/alloc.c similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/decoder/srce/alloc.c rename to components/bt/bluedroid/external/sbc/decoder/srce/alloc.c diff --git a/components/bt/bluedroid/embdrv/sbc/decoder/srce/bitalloc-sbc.c b/components/bt/bluedroid/external/sbc/decoder/srce/bitalloc-sbc.c similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/decoder/srce/bitalloc-sbc.c rename to components/bt/bluedroid/external/sbc/decoder/srce/bitalloc-sbc.c diff --git a/components/bt/bluedroid/embdrv/sbc/decoder/srce/bitalloc.c b/components/bt/bluedroid/external/sbc/decoder/srce/bitalloc.c similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/decoder/srce/bitalloc.c rename to components/bt/bluedroid/external/sbc/decoder/srce/bitalloc.c diff --git a/components/bt/bluedroid/embdrv/sbc/decoder/srce/bitstream-decode.c b/components/bt/bluedroid/external/sbc/decoder/srce/bitstream-decode.c similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/decoder/srce/bitstream-decode.c rename to components/bt/bluedroid/external/sbc/decoder/srce/bitstream-decode.c diff --git a/components/bt/bluedroid/embdrv/sbc/decoder/srce/decoder-oina.c b/components/bt/bluedroid/external/sbc/decoder/srce/decoder-oina.c similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/decoder/srce/decoder-oina.c rename to components/bt/bluedroid/external/sbc/decoder/srce/decoder-oina.c diff --git a/components/bt/bluedroid/embdrv/sbc/decoder/srce/decoder-private.c b/components/bt/bluedroid/external/sbc/decoder/srce/decoder-private.c similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/decoder/srce/decoder-private.c rename to components/bt/bluedroid/external/sbc/decoder/srce/decoder-private.c diff --git a/components/bt/bluedroid/embdrv/sbc/decoder/srce/decoder-sbc.c b/components/bt/bluedroid/external/sbc/decoder/srce/decoder-sbc.c similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/decoder/srce/decoder-sbc.c rename to components/bt/bluedroid/external/sbc/decoder/srce/decoder-sbc.c diff --git a/components/bt/bluedroid/embdrv/sbc/decoder/srce/dequant.c b/components/bt/bluedroid/external/sbc/decoder/srce/dequant.c similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/decoder/srce/dequant.c rename to components/bt/bluedroid/external/sbc/decoder/srce/dequant.c diff --git a/components/bt/bluedroid/embdrv/sbc/decoder/srce/framing-sbc.c b/components/bt/bluedroid/external/sbc/decoder/srce/framing-sbc.c similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/decoder/srce/framing-sbc.c rename to components/bt/bluedroid/external/sbc/decoder/srce/framing-sbc.c diff --git a/components/bt/bluedroid/embdrv/sbc/decoder/srce/framing.c b/components/bt/bluedroid/external/sbc/decoder/srce/framing.c similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/decoder/srce/framing.c rename to components/bt/bluedroid/external/sbc/decoder/srce/framing.c diff --git a/components/bt/bluedroid/embdrv/sbc/decoder/srce/oi_codec_version.c b/components/bt/bluedroid/external/sbc/decoder/srce/oi_codec_version.c similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/decoder/srce/oi_codec_version.c rename to components/bt/bluedroid/external/sbc/decoder/srce/oi_codec_version.c diff --git a/components/bt/bluedroid/embdrv/sbc/decoder/srce/readsamplesjoint.inc b/components/bt/bluedroid/external/sbc/decoder/srce/readsamplesjoint.inc similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/decoder/srce/readsamplesjoint.inc rename to components/bt/bluedroid/external/sbc/decoder/srce/readsamplesjoint.inc diff --git a/components/bt/bluedroid/embdrv/sbc/decoder/srce/synthesis-8-generated.c b/components/bt/bluedroid/external/sbc/decoder/srce/synthesis-8-generated.c similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/decoder/srce/synthesis-8-generated.c rename to components/bt/bluedroid/external/sbc/decoder/srce/synthesis-8-generated.c diff --git a/components/bt/bluedroid/embdrv/sbc/decoder/srce/synthesis-dct8.c b/components/bt/bluedroid/external/sbc/decoder/srce/synthesis-dct8.c similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/decoder/srce/synthesis-dct8.c rename to components/bt/bluedroid/external/sbc/decoder/srce/synthesis-dct8.c diff --git a/components/bt/bluedroid/embdrv/sbc/decoder/srce/synthesis-sbc.c b/components/bt/bluedroid/external/sbc/decoder/srce/synthesis-sbc.c similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/decoder/srce/synthesis-sbc.c rename to components/bt/bluedroid/external/sbc/decoder/srce/synthesis-sbc.c diff --git a/components/bt/bluedroid/embdrv/sbc/encoder/include/sbc_dct.h b/components/bt/bluedroid/external/sbc/encoder/include/sbc_dct.h similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/encoder/include/sbc_dct.h rename to components/bt/bluedroid/external/sbc/encoder/include/sbc_dct.h diff --git a/components/bt/bluedroid/embdrv/sbc/encoder/include/sbc_enc_func_declare.h b/components/bt/bluedroid/external/sbc/encoder/include/sbc_enc_func_declare.h similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/encoder/include/sbc_enc_func_declare.h rename to components/bt/bluedroid/external/sbc/encoder/include/sbc_enc_func_declare.h diff --git a/components/bt/bluedroid/embdrv/sbc/encoder/include/sbc_encoder.h b/components/bt/bluedroid/external/sbc/encoder/include/sbc_encoder.h similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/encoder/include/sbc_encoder.h rename to components/bt/bluedroid/external/sbc/encoder/include/sbc_encoder.h diff --git a/components/bt/bluedroid/embdrv/sbc/encoder/include/sbc_if.h b/components/bt/bluedroid/external/sbc/encoder/include/sbc_if.h similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/encoder/include/sbc_if.h rename to components/bt/bluedroid/external/sbc/encoder/include/sbc_if.h diff --git a/components/bt/bluedroid/embdrv/sbc/encoder/include/sbc_types.h b/components/bt/bluedroid/external/sbc/encoder/include/sbc_types.h similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/encoder/include/sbc_types.h rename to components/bt/bluedroid/external/sbc/encoder/include/sbc_types.h diff --git a/components/bt/bluedroid/embdrv/sbc/encoder/srce/sbc_analysis.c b/components/bt/bluedroid/external/sbc/encoder/srce/sbc_analysis.c similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/encoder/srce/sbc_analysis.c rename to components/bt/bluedroid/external/sbc/encoder/srce/sbc_analysis.c diff --git a/components/bt/bluedroid/embdrv/sbc/encoder/srce/sbc_dct.c b/components/bt/bluedroid/external/sbc/encoder/srce/sbc_dct.c similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/encoder/srce/sbc_dct.c rename to components/bt/bluedroid/external/sbc/encoder/srce/sbc_dct.c diff --git a/components/bt/bluedroid/embdrv/sbc/encoder/srce/sbc_dct_coeffs.c b/components/bt/bluedroid/external/sbc/encoder/srce/sbc_dct_coeffs.c similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/encoder/srce/sbc_dct_coeffs.c rename to components/bt/bluedroid/external/sbc/encoder/srce/sbc_dct_coeffs.c diff --git a/components/bt/bluedroid/embdrv/sbc/encoder/srce/sbc_enc_bit_alloc_mono.c b/components/bt/bluedroid/external/sbc/encoder/srce/sbc_enc_bit_alloc_mono.c similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/encoder/srce/sbc_enc_bit_alloc_mono.c rename to components/bt/bluedroid/external/sbc/encoder/srce/sbc_enc_bit_alloc_mono.c diff --git a/components/bt/bluedroid/embdrv/sbc/encoder/srce/sbc_enc_bit_alloc_ste.c b/components/bt/bluedroid/external/sbc/encoder/srce/sbc_enc_bit_alloc_ste.c similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/encoder/srce/sbc_enc_bit_alloc_ste.c rename to components/bt/bluedroid/external/sbc/encoder/srce/sbc_enc_bit_alloc_ste.c diff --git a/components/bt/bluedroid/embdrv/sbc/encoder/srce/sbc_enc_coeffs.c b/components/bt/bluedroid/external/sbc/encoder/srce/sbc_enc_coeffs.c similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/encoder/srce/sbc_enc_coeffs.c rename to components/bt/bluedroid/external/sbc/encoder/srce/sbc_enc_coeffs.c diff --git a/components/bt/bluedroid/embdrv/sbc/encoder/srce/sbc_encoder.c b/components/bt/bluedroid/external/sbc/encoder/srce/sbc_encoder.c similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/encoder/srce/sbc_encoder.c rename to components/bt/bluedroid/external/sbc/encoder/srce/sbc_encoder.c diff --git a/components/bt/bluedroid/embdrv/sbc/encoder/srce/sbc_packing.c b/components/bt/bluedroid/external/sbc/encoder/srce/sbc_packing.c similarity index 100% rename from components/bt/bluedroid/embdrv/sbc/encoder/srce/sbc_packing.c rename to components/bt/bluedroid/external/sbc/encoder/srce/sbc_packing.c diff --git a/components/bt/component.mk b/components/bt/component.mk index 3f86ac34d4..4323a929cb 100644 --- a/components/bt/component.mk +++ b/components/bt/component.mk @@ -11,7 +11,7 @@ COMPONENT_ADD_INCLUDEDIRS := bluedroid/bta/include \ bluedroid/hci/include \ bluedroid/osi/include \ bluedroid/utils/include \ - bluedroid/embdrv/sbc/decoder/include \ + bluedroid/external/sbc/decoder/include \ bluedroid/btc/core/include \ bluedroid/btc/profile/esp/blufi/include \ bluedroid/btc/profile/esp/include \ @@ -63,7 +63,7 @@ COMPONENT_SRCDIRS := bluedroid/bta/dm \ bluedroid/hci \ bluedroid/main \ bluedroid/osi \ - bluedroid/embdrv/sbc/decoder/srce \ + bluedroid/external/sbc/decoder/srce \ bluedroid/btc/core \ bluedroid/btc/profile/esp/blufi \ bluedroid/btc/profile/std/gap \ -- 2.40.0