From eda98ca8faee53f0552f8fec6c5359c23297d27e Mon Sep 17 00:00:00 2001 From: GengYuchao Date: Mon, 4 Jul 2022 21:24:08 +0800 Subject: [PATCH] remove breaking change --- porting/nimble/src/nimble_port.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/porting/nimble/src/nimble_port.c b/porting/nimble/src/nimble_port.c index 0d8bbd7d2..c19d6000e 100644 --- a/porting/nimble/src/nimble_port.c +++ b/porting/nimble/src/nimble_port.c @@ -90,7 +90,7 @@ esp_err_t esp_nimble_init(void) npl_freertos_mempool_init(); -#if true //need delete esp_nimble_hci_and_controller_init then can be use +#if false //need delete esp_nimble_hci_and_controller_init then can be use if(esp_nimble_hci_init() != ESP_OK) { ESP_LOGE(NIMBLE_PORT_LOG_TAG, "hci inits failed\n"); return ESP_FAIL; @@ -120,7 +120,7 @@ esp_err_t esp_nimble_init(void) */ esp_err_t esp_nimble_deinit(void) { -#if !SOC_ESP_NIMBLE_CONTROLLER //need delete esp_nimble_hci_and_controller_init then can be use +#if false && !SOC_ESP_NIMBLE_CONTROLLER //need delete esp_nimble_hci_and_controller_init then can be use if(esp_nimble_hci_deinit() != ESP_OK) { ESP_LOGE(NIMBLE_PORT_LOG_TAG, "hci deinit failed\n"); return ESP_FAIL; @@ -136,7 +136,7 @@ esp_err_t esp_nimble_deinit(void) void nimble_port_init(void) { -#if CONFIG_BT_CONTROLLER_ENABLED +#if SOC_ESP_NIMBLE_CONTROLLER && CONFIG_BT_CONTROLLER_ENABLED esp_bt_controller_config_t config_opts = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); if(esp_bt_controller_init(&config_opts) != ESP_OK) { ESP_LOGE(NIMBLE_PORT_LOG_TAG, "controller init failed\n");