diff --git a/components/bt/controller/lib_esp32 b/components/bt/controller/lib_esp32 index 492b6043bb..6d007b7167 160000 --- a/components/bt/controller/lib_esp32 +++ b/components/bt/controller/lib_esp32 @@ -1 +1 @@ -Subproject commit 492b6043bb0abd7e44623ea4931e49a43926459f +Subproject commit 6d007b7167146b31256b29fed31e04dc46989885 diff --git a/components/bt/host/bluedroid/api/esp_bt_main.c b/components/bt/host/bluedroid/api/esp_bt_main.c index 8ab1c1222f..2058e86c65 100644 --- a/components/bt/host/bluedroid/api/esp_bt_main.c +++ b/components/bt/host/bluedroid/api/esp_bt_main.c @@ -144,7 +144,7 @@ esp_err_t esp_bluedroid_init_with_cfg(esp_bluedroid_config_t *cfg) osi_mem_dbg_init(); #endif - ret = bluedriod_config_init(cfg); + ret = bluedroid_config_init(cfg); if (ret != BT_STATUS_SUCCESS) { LOG_ERROR("Bluedroid stack initialize fail, ret:%d", ret); return ESP_FAIL; @@ -228,7 +228,7 @@ esp_err_t esp_bluedroid_deinit(void) btc_deinit(); - bluedriod_config_deinit(); + bluedroid_config_deinit(); #if (BT_HCI_LOG_INCLUDED == TRUE) bt_hci_log_deinit(); diff --git a/components/bt/host/bluedroid/api/esp_gap_bt_api.c b/components/bt/host/bluedroid/api/esp_gap_bt_api.c index bb00987531..86619430b9 100644 --- a/components/bt/host/bluedroid/api/esp_gap_bt_api.c +++ b/components/bt/host/bluedroid/api/esp_gap_bt_api.c @@ -322,7 +322,7 @@ esp_err_t esp_bt_gap_set_security_param(esp_bt_sp_param_t param_type, return ESP_ERR_INVALID_STATE; } - if (!(bluedriod_config_get()->get_ssp_enabled())) { + if (!(bluedroid_config_get()->get_ssp_enabled())) { ESP_LOGE(TAG, "%s is not supported when `ssp_en` in `esp_bluedroid_config_t` is disabled!", __func__); return ESP_ERR_NOT_SUPPORTED; } @@ -347,7 +347,7 @@ esp_err_t esp_bt_gap_ssp_passkey_reply(esp_bd_addr_t bd_addr, bool accept, uint3 return ESP_ERR_INVALID_STATE; } - if (!(bluedriod_config_get()->get_ssp_enabled())) { + if (!(bluedroid_config_get()->get_ssp_enabled())) { ESP_LOGE(TAG, "%s is not supported when `ssp_en` in `esp_bluedroid_config_t` is disabled!", __func__); return ESP_ERR_NOT_SUPPORTED; } @@ -371,7 +371,7 @@ esp_err_t esp_bt_gap_ssp_confirm_reply(esp_bd_addr_t bd_addr, bool accept) return ESP_ERR_INVALID_STATE; } - if (!(bluedriod_config_get()->get_ssp_enabled())) { + if (!(bluedroid_config_get()->get_ssp_enabled())) { ESP_LOGE(TAG, "%s is not supported when `ssp_en` in `esp_bluedroid_config_t` is disabled!", __func__); return ESP_ERR_NOT_SUPPORTED; } diff --git a/components/bt/host/bluedroid/config/include/config/stack_config.h b/components/bt/host/bluedroid/config/include/config/stack_config.h index 8b7777234e..a7f6117f12 100644 --- a/components/bt/host/bluedroid/config/include/config/stack_config.h +++ b/components/bt/host/bluedroid/config/include/config/stack_config.h @@ -14,8 +14,8 @@ struct bluedroid_config { bool (*get_ssp_enabled)(void); }; -bt_status_t bluedriod_config_init(esp_bluedroid_config_t *cfg); +bt_status_t bluedroid_config_init(esp_bluedroid_config_t *cfg); -void bluedriod_config_deinit(void); +void bluedroid_config_deinit(void); -const struct bluedroid_config *bluedriod_config_get(void); +const struct bluedroid_config *bluedroid_config_get(void); diff --git a/components/bt/host/bluedroid/config/stack_config.c b/components/bt/host/bluedroid/config/stack_config.c index 66d04a6396..93c7c47e4a 100644 --- a/components/bt/host/bluedroid/config/stack_config.c +++ b/components/bt/host/bluedroid/config/stack_config.c @@ -25,7 +25,7 @@ static bool get_ssp_enabled(void) return cfg->ssp_en; } -bt_status_t bluedriod_config_init(esp_bluedroid_config_t *cfg) +bt_status_t bluedroid_config_init(esp_bluedroid_config_t *cfg) { s_stack_config_env = osi_calloc(sizeof(struct stack_config_env_tag)); if (!s_stack_config_env) { @@ -40,7 +40,7 @@ bt_status_t bluedriod_config_init(esp_bluedroid_config_t *cfg) return BT_STATUS_SUCCESS; } -void bluedriod_config_deinit(void) +void bluedroid_config_deinit(void) { if (s_stack_config_env) { osi_free(s_stack_config_env); @@ -48,7 +48,7 @@ void bluedriod_config_deinit(void) } } -const struct bluedroid_config *bluedriod_config_get(void) +const struct bluedroid_config *bluedroid_config_get(void) { assert(s_stack_config_env); return &s_stack_config_env->interface; diff --git a/components/bt/host/bluedroid/device/controller.c b/components/bt/host/bluedroid/device/controller.c index 537e0e5030..1cdf2cc125 100644 --- a/components/bt/host/bluedroid/device/controller.c +++ b/components/bt/host/bluedroid/device/controller.c @@ -188,7 +188,7 @@ static void start_up(void) // dependent on what we configure from page 0 and host SSP configuration controller_param.simple_pairing_supported = HCI_SIMPLE_PAIRING_SUPPORTED( controller_param.features_classic[0].as_array) && - (bluedriod_config_get()->get_ssp_enabled()); + (bluedroid_config_get()->get_ssp_enabled()); if (controller_param.simple_pairing_supported) { response = AWAIT_COMMAND(controller_param.packet_factory->make_write_simple_pairing_mode(HCI_SP_MODE_ENABLED)); controller_param.packet_parser->parse_generic_command_complete(response);