Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-03-27 02:29:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

bluetooth: Fix the incompatibility made by https://github.com/apache/nuttx/pull/14224

Browse Source 
that pr requires chip turn on CONFIG_DRIVERS_BLUETOOTH to use bluetooth,
but not all defconig enable this option, so let's map bt_driver_register
to bt_netdev_register in header file in this case, and revert the unnessary
change in the related chip and board folders.

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao
2024-10-17 18:50:38 +08:00
committed by archer
parent 7aa7bf70c1
commit 24cb8c25ab
10 changed files with 12 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/wireless/bluetooth/bt_driver.c
View File

@@ -44,20 +44,12 @@
****************************************************************************/
static int bt_driver_register_internal(FAR struct bt_driver_s *driver,
int id, bool bt)
FAR const char *prefix, int id)
{
#ifdef CONFIG_UART_BTH4
char name[32];
if (bt)
{
snprintf(name, sizeof(name), "/dev/ttyBT%d", id);
}
else
{
snprintf(name, sizeof(name), "/dev/ttyBLE%d", id);
}
snprintf(name, sizeof(name), prefix, id);
return uart_bth4_register(name, driver);
#elif defined(CONFIG_NET_BLUETOOTH)
return bt_netdev_register(driver);
@@ -109,20 +101,20 @@ int bt_driver_register_with_id(FAR struct bt_driver_s *driver, int id)
return ret;
}
ret = bt_driver_register_internal(btdrv, id, true);
ret = bt_driver_register_internal(btdrv, "/dev/ttyBT%d", id);
if (ret < 0)
{
return ret;
}
ret = bt_driver_register_internal(bledrv, id, false);
ret = bt_driver_register_internal(bledrv, "/dev/ttyBLE%d", id);
if (ret < 0)
{
return ret;
}
#else
ret = bt_driver_register_internal(driver, id, true);
ret = bt_driver_register_internal(driver, "/dev/ttyHCI%d", id);
if (ret < 0)
{
return ret;