Pārlūkot izejas kodu

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
wangmengyang 9 gadi atpakaļ
vecāks
revīzija
aaf0cc00c4
46 mainītis faili ar 5 papildinājumiem un 11 dzēšanām
  1. 1 4
      components/bt/bluedroid/btc/core/btc_task.c
  2. 1 4
      components/bt/bluedroid/btc/include/btc_task.h
  3. 1 1
      components/bt/bluedroid/btc/profile/std/a2dp/btc_avk.c
  4. 0 0
      components/bt/bluedroid/external/sbc/decoder/include/oi_assert.h
  5. 0 0
      components/bt/bluedroid/external/sbc/decoder/include/oi_bitstream.h
  6. 0 0
      components/bt/bluedroid/external/sbc/decoder/include/oi_bt_spec.h
  7. 0 0
      components/bt/bluedroid/external/sbc/decoder/include/oi_codec_sbc.h
  8. 0 0
      components/bt/bluedroid/external/sbc/decoder/include/oi_codec_sbc_private.h
  9. 0 0
      components/bt/bluedroid/external/sbc/decoder/include/oi_common.h
  10. 0 0
      components/bt/bluedroid/external/sbc/decoder/include/oi_cpu_dep.h
  11. 0 0
      components/bt/bluedroid/external/sbc/decoder/include/oi_modules.h
  12. 0 0
      components/bt/bluedroid/external/sbc/decoder/include/oi_osinterface.h
  13. 0 0
      components/bt/bluedroid/external/sbc/decoder/include/oi_status.h
  14. 0 0
      components/bt/bluedroid/external/sbc/decoder/include/oi_stddefs.h
  15. 0 0
      components/bt/bluedroid/external/sbc/decoder/include/oi_string.h
  16. 0 0
      components/bt/bluedroid/external/sbc/decoder/include/oi_time.h
  17. 0 0
      components/bt/bluedroid/external/sbc/decoder/include/oi_utils.h
  18. 0 0
      components/bt/bluedroid/external/sbc/decoder/srce/alloc.c
  19. 0 0
      components/bt/bluedroid/external/sbc/decoder/srce/bitalloc-sbc.c
  20. 0 0
      components/bt/bluedroid/external/sbc/decoder/srce/bitalloc.c
  21. 0 0
      components/bt/bluedroid/external/sbc/decoder/srce/bitstream-decode.c
  22. 0 0
      components/bt/bluedroid/external/sbc/decoder/srce/decoder-oina.c
  23. 0 0
      components/bt/bluedroid/external/sbc/decoder/srce/decoder-private.c
  24. 0 0
      components/bt/bluedroid/external/sbc/decoder/srce/decoder-sbc.c
  25. 0 0
      components/bt/bluedroid/external/sbc/decoder/srce/dequant.c
  26. 0 0
      components/bt/bluedroid/external/sbc/decoder/srce/framing-sbc.c
  27. 0 0
      components/bt/bluedroid/external/sbc/decoder/srce/framing.c
  28. 0 0
      components/bt/bluedroid/external/sbc/decoder/srce/oi_codec_version.c
  29. 0 0
      components/bt/bluedroid/external/sbc/decoder/srce/readsamplesjoint.inc
  30. 0 0
      components/bt/bluedroid/external/sbc/decoder/srce/synthesis-8-generated.c
  31. 0 0
      components/bt/bluedroid/external/sbc/decoder/srce/synthesis-dct8.c
  32. 0 0
      components/bt/bluedroid/external/sbc/decoder/srce/synthesis-sbc.c
  33. 0 0
      components/bt/bluedroid/external/sbc/encoder/include/sbc_dct.h
  34. 0 0
      components/bt/bluedroid/external/sbc/encoder/include/sbc_enc_func_declare.h
  35. 0 0
      components/bt/bluedroid/external/sbc/encoder/include/sbc_encoder.h
  36. 0 0
      components/bt/bluedroid/external/sbc/encoder/include/sbc_if.h
  37. 0 0
      components/bt/bluedroid/external/sbc/encoder/include/sbc_types.h
  38. 0 0
      components/bt/bluedroid/external/sbc/encoder/srce/sbc_analysis.c
  39. 0 0
      components/bt/bluedroid/external/sbc/encoder/srce/sbc_dct.c
  40. 0 0
      components/bt/bluedroid/external/sbc/encoder/srce/sbc_dct_coeffs.c
  41. 0 0
      components/bt/bluedroid/external/sbc/encoder/srce/sbc_enc_bit_alloc_mono.c
  42. 0 0
      components/bt/bluedroid/external/sbc/encoder/srce/sbc_enc_bit_alloc_ste.c
  43. 0 0
      components/bt/bluedroid/external/sbc/encoder/srce/sbc_enc_coeffs.c
  44. 0 0
      components/bt/bluedroid/external/sbc/encoder/srce/sbc_encoder.c
  45. 0 0
      components/bt/bluedroid/external/sbc/encoder/srce/sbc_packing.c
  46. 2 2
      components/bt/component.mk

+ 1 - 4
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     },

+ 1 - 4
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,

+ 1 - 1
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)

+ 0 - 0
components/bt/bluedroid/embdrv/sbc/decoder/include/oi_assert.h → components/bt/bluedroid/external/sbc/decoder/include/oi_assert.h


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/decoder/include/oi_bitstream.h → components/bt/bluedroid/external/sbc/decoder/include/oi_bitstream.h


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/decoder/include/oi_bt_spec.h → components/bt/bluedroid/external/sbc/decoder/include/oi_bt_spec.h


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/decoder/include/oi_codec_sbc.h → components/bt/bluedroid/external/sbc/decoder/include/oi_codec_sbc.h


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/decoder/include/oi_codec_sbc_private.h → components/bt/bluedroid/external/sbc/decoder/include/oi_codec_sbc_private.h


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/decoder/include/oi_common.h → components/bt/bluedroid/external/sbc/decoder/include/oi_common.h


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/decoder/include/oi_cpu_dep.h → components/bt/bluedroid/external/sbc/decoder/include/oi_cpu_dep.h


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/decoder/include/oi_modules.h → components/bt/bluedroid/external/sbc/decoder/include/oi_modules.h


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/decoder/include/oi_osinterface.h → components/bt/bluedroid/external/sbc/decoder/include/oi_osinterface.h


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/decoder/include/oi_status.h → components/bt/bluedroid/external/sbc/decoder/include/oi_status.h


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/decoder/include/oi_stddefs.h → components/bt/bluedroid/external/sbc/decoder/include/oi_stddefs.h


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/decoder/include/oi_string.h → components/bt/bluedroid/external/sbc/decoder/include/oi_string.h


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/decoder/include/oi_time.h → components/bt/bluedroid/external/sbc/decoder/include/oi_time.h


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/decoder/include/oi_utils.h → components/bt/bluedroid/external/sbc/decoder/include/oi_utils.h


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/decoder/srce/alloc.c → components/bt/bluedroid/external/sbc/decoder/srce/alloc.c


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/decoder/srce/bitalloc-sbc.c → components/bt/bluedroid/external/sbc/decoder/srce/bitalloc-sbc.c


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/decoder/srce/bitalloc.c → components/bt/bluedroid/external/sbc/decoder/srce/bitalloc.c


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/decoder/srce/bitstream-decode.c → components/bt/bluedroid/external/sbc/decoder/srce/bitstream-decode.c


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/decoder/srce/decoder-oina.c → components/bt/bluedroid/external/sbc/decoder/srce/decoder-oina.c


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/decoder/srce/decoder-private.c → components/bt/bluedroid/external/sbc/decoder/srce/decoder-private.c


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/decoder/srce/decoder-sbc.c → components/bt/bluedroid/external/sbc/decoder/srce/decoder-sbc.c


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/decoder/srce/dequant.c → components/bt/bluedroid/external/sbc/decoder/srce/dequant.c


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/decoder/srce/framing-sbc.c → components/bt/bluedroid/external/sbc/decoder/srce/framing-sbc.c


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/decoder/srce/framing.c → components/bt/bluedroid/external/sbc/decoder/srce/framing.c


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/decoder/srce/oi_codec_version.c → components/bt/bluedroid/external/sbc/decoder/srce/oi_codec_version.c


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/decoder/srce/readsamplesjoint.inc → components/bt/bluedroid/external/sbc/decoder/srce/readsamplesjoint.inc


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/decoder/srce/synthesis-8-generated.c → components/bt/bluedroid/external/sbc/decoder/srce/synthesis-8-generated.c


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/decoder/srce/synthesis-dct8.c → components/bt/bluedroid/external/sbc/decoder/srce/synthesis-dct8.c


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/decoder/srce/synthesis-sbc.c → components/bt/bluedroid/external/sbc/decoder/srce/synthesis-sbc.c


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/encoder/include/sbc_dct.h → components/bt/bluedroid/external/sbc/encoder/include/sbc_dct.h


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/encoder/include/sbc_enc_func_declare.h → components/bt/bluedroid/external/sbc/encoder/include/sbc_enc_func_declare.h


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/encoder/include/sbc_encoder.h → components/bt/bluedroid/external/sbc/encoder/include/sbc_encoder.h


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/encoder/include/sbc_if.h → components/bt/bluedroid/external/sbc/encoder/include/sbc_if.h


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/encoder/include/sbc_types.h → components/bt/bluedroid/external/sbc/encoder/include/sbc_types.h


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/encoder/srce/sbc_analysis.c → components/bt/bluedroid/external/sbc/encoder/srce/sbc_analysis.c


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/encoder/srce/sbc_dct.c → components/bt/bluedroid/external/sbc/encoder/srce/sbc_dct.c


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/encoder/srce/sbc_dct_coeffs.c → components/bt/bluedroid/external/sbc/encoder/srce/sbc_dct_coeffs.c


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/encoder/srce/sbc_enc_bit_alloc_mono.c → components/bt/bluedroid/external/sbc/encoder/srce/sbc_enc_bit_alloc_mono.c


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/encoder/srce/sbc_enc_bit_alloc_ste.c → components/bt/bluedroid/external/sbc/encoder/srce/sbc_enc_bit_alloc_ste.c


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/encoder/srce/sbc_enc_coeffs.c → components/bt/bluedroid/external/sbc/encoder/srce/sbc_enc_coeffs.c


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/encoder/srce/sbc_encoder.c → components/bt/bluedroid/external/sbc/encoder/srce/sbc_encoder.c


+ 0 - 0
components/bt/bluedroid/embdrv/sbc/encoder/srce/sbc_packing.c → components/bt/bluedroid/external/sbc/encoder/srce/sbc_packing.c


+ 2 - 2
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		\