This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 6aeb2e2996bcdd27ad4872c3d7ae25b080df0e95 Author: chengkai <[email protected]> AuthorDate: Thu Oct 17 11:27:17 2024 +0800 Add space before error, bt_driver_register_internal not trigger error, add defconfig DRIVERS_BLUETOOTH. Signed-off-by: chengkai <[email protected]> --- arch/sim/src/sim/sim_hcisocket.c | 2 +- boards/arm/nrf53/nrf5340-dk/configs/sdc_cpunet/defconfig | 2 ++ boards/arm/nrf53/nrf5340-dk/configs/sdc_nimble_cpunet/defconfig | 2 ++ drivers/wireless/bluetooth/bt_driver.c | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/sim/src/sim/sim_hcisocket.c b/arch/sim/src/sim/sim_hcisocket.c index 06b4e7d80d..ad444791a0 100644 --- a/arch/sim/src/sim/sim_hcisocket.c +++ b/arch/sim/src/sim/sim_hcisocket.c @@ -314,7 +314,7 @@ int sim_bthcisock_register(int dev_id) return ret; } #else -# error "Please select CONFIG_DRIVERS_BLUETOOTH" +# error "Please select CONFIG_DRIVERS_BLUETOOTH" #endif return work_queue(HPWORK, &dev->worker, sim_bthcisock_work, dev, 0); diff --git a/boards/arm/nrf53/nrf5340-dk/configs/sdc_cpunet/defconfig b/boards/arm/nrf53/nrf5340-dk/configs/sdc_cpunet/defconfig index d1d3fe10bb..566bb33538 100644 --- a/boards/arm/nrf53/nrf5340-dk/configs/sdc_cpunet/defconfig +++ b/boards/arm/nrf53/nrf5340-dk/configs/sdc_cpunet/defconfig @@ -30,6 +30,8 @@ CONFIG_BTSAK=y CONFIG_BUILTIN=y CONFIG_DEFAULT_SMALL=y CONFIG_DISABLE_MQUEUE_SYSV=y +CONFIG_DRIVERS_BLUETOOTH=y +CONFIG_DRIVERS_WIRELESS=y CONFIG_EXPERIMENTAL=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y diff --git a/boards/arm/nrf53/nrf5340-dk/configs/sdc_nimble_cpunet/defconfig b/boards/arm/nrf53/nrf5340-dk/configs/sdc_nimble_cpunet/defconfig index d351b06c94..f968544cad 100644 --- a/boards/arm/nrf53/nrf5340-dk/configs/sdc_nimble_cpunet/defconfig +++ b/boards/arm/nrf53/nrf5340-dk/configs/sdc_nimble_cpunet/defconfig @@ -34,6 +34,8 @@ CONFIG_BOARDCTL_MKRD=y CONFIG_BOARD_LOOPSPERMSEC=5500 CONFIG_DEFAULT_SMALL=y CONFIG_DISABLE_MQUEUE_SYSV=y +CONFIG_DRIVERS_BLUETOOTH=y +CONFIG_DRIVERS_WIRELESS=y CONFIG_EXAMPLES_NIMBLE=y CONFIG_EXPERIMENTAL=y CONFIG_FILE_STREAM=y diff --git a/drivers/wireless/bluetooth/bt_driver.c b/drivers/wireless/bluetooth/bt_driver.c index bb2a80efdd..fcf371f552 100644 --- a/drivers/wireless/bluetooth/bt_driver.c +++ b/drivers/wireless/bluetooth/bt_driver.c @@ -62,7 +62,7 @@ static int bt_driver_register_internal(FAR struct bt_driver_s *driver, #elif defined(CONFIG_NET_BLUETOOTH) return bt_netdev_register(driver); #else -# error "Please select CONFIG_UART_BTH4 or CONFIG_NET_BLUETOOTH" + return -ENOSYS; #endif }
