mirror of
https://github.com/espressif/esp-idf.git
synced 2025-08-02 12:14:32 +02:00
fix(nimble): fixed missing controller disabled guard in esp_nimble_deinit
This commit is contained in:
committed by
Rahul Tank
parent
fbbf6d2708
commit
86aaec48a0
@@ -776,17 +776,82 @@ menu "Host-controller Transport"
|
|||||||
help
|
help
|
||||||
Use UART transport
|
Use UART transport
|
||||||
|
|
||||||
|
config BT_NIMBLE_TRANSPORT_UART_PORT
|
||||||
|
int "Uart port"
|
||||||
|
depends on BT_CONTROLLER_DISABLED && BT_NIMBLE_TRANSPORT_UART
|
||||||
|
default 1
|
||||||
|
help
|
||||||
|
Uart port
|
||||||
|
|
||||||
|
choice BT_NIMBLE_USE_HCI_UART_PARITY
|
||||||
|
prompt "Uart PARITY"
|
||||||
|
default UART_PARITY_NONE
|
||||||
|
help
|
||||||
|
Uart Parity
|
||||||
|
|
||||||
|
config UART_PARITY_NONE
|
||||||
|
bool "None"
|
||||||
|
config UART_PARITY_ODD
|
||||||
|
bool "Odd"
|
||||||
|
config UART_PARITY_EVEN
|
||||||
|
bool "Even"
|
||||||
|
endchoice
|
||||||
|
|
||||||
|
config BT_NIMBLE_TRANSPORT_UART_PARITY_NONE
|
||||||
|
int
|
||||||
|
default 0 if !UART_PARITY_NONE
|
||||||
|
default 1 if UART_PARITY_NONE
|
||||||
|
|
||||||
|
config BT_NIMBLE_TRANSPORT_UART_PARITY_ODD
|
||||||
|
int
|
||||||
|
default 0 if !UART_PARITY_ODD
|
||||||
|
default 1 if UART_PARITY_ODD
|
||||||
|
|
||||||
|
config BT_NIMBLE_TRANSPORT_UART_PARITY_EVEN
|
||||||
|
int
|
||||||
|
default 0 if !UART_PARITY_EVEN
|
||||||
|
default 1 if UART_PARITY_EVEN
|
||||||
|
|
||||||
config BT_NIMBLE_UART_RX_PIN
|
config BT_NIMBLE_UART_RX_PIN
|
||||||
int "Rx pin for Nimble Uart"
|
int "UART Rx pin"
|
||||||
depends on BT_CONTROLLER_DISABLED && BT_NIMBLE_TRANSPORT_UART
|
depends on BT_CONTROLLER_DISABLED && BT_NIMBLE_TRANSPORT_UART
|
||||||
default 5
|
default 5
|
||||||
help
|
help
|
||||||
Rx pin for Nimble Transport
|
Rx pin for Nimble Transport
|
||||||
|
|
||||||
config BT_NIMBLE_UART_TX_PIN
|
config BT_NIMBLE_UART_TX_PIN
|
||||||
int "Tx pin for Nimble Uart"
|
int "UART Tx pin"
|
||||||
depends on BT_CONTROLLER_DISABLED && BT_NIMBLE_TRANSPORT_UART
|
depends on BT_CONTROLLER_DISABLED && BT_NIMBLE_TRANSPORT_UART
|
||||||
default 4
|
default 4
|
||||||
help
|
help
|
||||||
Tx pin for Nimble Transport
|
Tx pin for Nimble Transport
|
||||||
|
|
||||||
|
choice BT_NIMBLE_USE_HCI_UART_FLOW_CTRL
|
||||||
|
prompt "Uart Flow Control"
|
||||||
|
default UART_HW_FLOWCTRL_DISABLE
|
||||||
|
help
|
||||||
|
Uart Flow Control
|
||||||
|
|
||||||
|
config UART_HW_FLOWCTRL_DISABLE
|
||||||
|
bool "Disable"
|
||||||
|
config UART_HW_FLOWCTRL_CTS_RTS
|
||||||
|
bool "Enable hardware flow control"
|
||||||
|
endchoice
|
||||||
|
|
||||||
|
config BT_NIMBLE_HCI_UART_FLOW_CTRL
|
||||||
|
int
|
||||||
|
default 0 if UART_HW_FLOWCTRL_DISABLE
|
||||||
|
default 1 if UART_HW_FLOWCTRL_CTS_RTS
|
||||||
|
|
||||||
|
config BT_NIMBLE_HCI_UART_RTS_PIN
|
||||||
|
int "UART Rts Pin"
|
||||||
|
default 19
|
||||||
|
help
|
||||||
|
UART HCI RTS pin
|
||||||
|
|
||||||
|
config BT_NIMBLE_HCI_UART_CTS_PIN
|
||||||
|
int "UART Cts Pin"
|
||||||
|
default 23
|
||||||
|
help
|
||||||
|
UART HCI CTS pin
|
||||||
endmenu
|
endmenu
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
|
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: Apache-2.0
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
@@ -1775,25 +1775,23 @@
|
|||||||
|
|
||||||
#if CONFIG_BT_CONTROLLER_DISABLED
|
#if CONFIG_BT_CONTROLLER_DISABLED
|
||||||
#ifndef MYNEWT_VAL_BLE_TRANSPORT_UART_PORT
|
#ifndef MYNEWT_VAL_BLE_TRANSPORT_UART_PORT
|
||||||
/* #ifdef CONFIG_BT_NIMBLE_TRANSPORT_UART_PORT */
|
#define MYNEWT_VAL_BLE_TRANSPORT_UART_PORT CONFIG_BT_NIMBLE_TRANSPORT_UART_PORT
|
||||||
#define MYNEWT_VAL_BLE_TRANSPORT_UART_PORT /* CONFIG_BT_NIMBLE_TRANSPORT_UART_PORT */ (1)
|
|
||||||
/* #endif */
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef MYNEWT_VAL_BLE_TRANSPORT_UART_PARITY_none
|
#ifndef MYNEWT_VAL_BLE_TRANSPORT_UART_PARITY__none
|
||||||
#define MYNEWT_VAL_BLE_TRANSPORT_UART_PARITY_none MYNEWT_VAL_BLE_HCI_UART_PARITY
|
#define MYNEWT_VAL_BLE_TRANSPORT_UART_PARITY__none CONFIG_BT_NIMBLE_TRANSPORT_UART_PARITY_NONE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef MYNEWT_VAL_BLE_TRANSPORT_UART_PARITY__odd
|
#ifndef MYNEWT_VAL_BLE_TRANSPORT_UART_PARITY__odd
|
||||||
#define MYNEWT_VAL_BLE_TRANSPORT_UART_PARITY__odd (0)
|
#define MYNEWT_VAL_BLE_TRANSPORT_UART_PARITY__odd CONFIG_BT_NIMBLE_TRANSPORT_UART_PARITY_ODD
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef MYNEWT_VAL_BLE_TRANSPORT_UART_PARITY__even
|
#ifndef MYNEWT_VAL_BLE_TRANSPORT_UART_PARITY__even
|
||||||
#define MYNEWT_VAL_BLE_TRANSPORT_UART_PARITY__even (0)
|
#define MYNEWT_VAL_BLE_TRANSPORT_UART_PARITY__even CONFIG_BT_NIMBLE_TRANSPORT_UART_PARITY_EVEN
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef MYNEWT_VAL_BLE_TRANSPORT_UART_FLOW_CONTROL__rtscts
|
#ifndef MYNEWT_VAL_BLE_TRANSPORT_UART_FLOW_CONTROL__rtscts
|
||||||
#define MYNEWT_VAL_BLE_TRANSPORT_UART_FLOW_CONTROL__rtscts (0)
|
#define MYNEWT_VAL_BLE_TRANSPORT_UART_FLOW_CONTROL__rtscts CONFIG_BT_NIMBLE_HCI_UART_FLOW_CTRL
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef MYNEWT_VAL_BLE_TRANSPORT_UART_BAUDRATE
|
#ifndef MYNEWT_VAL_BLE_TRANSPORT_UART_BAUDRATE
|
||||||
|
Reference in New Issue
Block a user