sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

risc-v/esp32c3: Fix some BLE driver issues

Browse Source 
1. remove SMP functions because ESP32-C3 is singal core
2. disable phy_printf in ble adapter when enable Wi-Fi
3. fix BLE character device macro
This commit is contained in:
Dong Heng 2021-07-02 14:16:25 +08:00 committed by Xiang Xiao
parent 6d3ccf37ab
commit 4f2df0311d
2 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/risc-v/src/esp32c3/esp32c3_ble.c
View File

@ -323,7 +323,7 @@ int esp32c3_ble_initialize(void)
} }
#if defined(CONFIG_UART_BTH4) #if defined(CONFIG_UART_BTH4)
ret = uart_bth4_register(CONFIG_BT_UART_ON_DEV_NAME, &g_ble_priv.drv); ret = uart_bth4_register(CONFIG_ESP32C3_BLE_TTY_NAME, &g_ble_priv.drv);
#else #else
ret = bt_netdev_register(&g_ble_priv.drv); ret = bt_netdev_register(&g_ble_priv.drv);
#endif #endif

20
arch/risc-v/src/esp32c3/esp32c3_ble_adapter.c
View File

@ -529,10 +529,6 @@ static int32_t esp_task_create_pinned_to_core(void *entry,
uint32_t core_id) uint32_t core_id)
{ {
int pid; int pid;
#ifdef CONFIG_SMP
int ret;
cpu_set_t cpuset;
#endif
pid = kthread_create(name, prio, stack_depth, entry, pid = kthread_create(name, prio, stack_depth, entry,
(char * const *)param); (char * const *)param);
@ -542,20 +538,6 @@ static int32_t esp_task_create_pinned_to_core(void *entry,
{ {
*((int *)task_handle) = pid; *((int *)task_handle) = pid;
} }
#ifdef CONFIG_SMP
if (core_id < CONFIG_SMP_NCPUS)
{
CPU_ZERO(&cpuset);
CPU_SET(core_id, &cpuset);
ret = nxsched_set_affinity(pid, sizeof(cpuset), &cpuset);
if (ret)
{
wlerr("Failed to set affinity error=%d\n", ret);
return false;
}
}
#endif
} }
else else
{ {
@ -1686,6 +1668,7 @@ static void btdm_controller_mem_init(void)
* *
****************************************************************************/ ****************************************************************************/
#ifndef CONFIG_ESP32C3_WIFI
int phy_printf(const char *format, ...) int phy_printf(const char *format, ...)
{ {
#ifdef CONFIG_DEBUG_WIRELESS_INFO #ifdef CONFIG_DEBUG_WIRELESS_INFO
@ -1698,6 +1681,7 @@ int phy_printf(const char *format, ...)
return 0; return 0;
} }
#endif
/**************************************************************************** /****************************************************************************
* Name: bt_phy_enable_clock * Name: bt_phy_enable_clock