mirror of
				https://github.com/espressif/esp-idf.git
				synced 2025-11-04 06:11:06 +00:00 
			
		
		
		
	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
This commit is contained in:
		@@ -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     },
 | 
			
		||||
 
 | 
			
		||||
@@ -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,
 | 
			
		||||
 
 | 
			
		||||
@@ -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)
 | 
			
		||||
 
 | 
			
		||||
@@ -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		\
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user