[incubator-nuttx] branch master updated: risc-v/esp32c3: Fix some BLE driver issues

[xiaoxiang]

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/incubator-nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new 4f2df03  risc-v/esp32c3: Fix some BLE driver issues
4f2df03 is described below

commit 4f2df0311d8a5ccdc07589814dddfee2c056fa6f
Author: Dong Heng <dongh...@espressif.com>
AuthorDate: Fri Jul 2 14:16:25 2021 +0800

    risc-v/esp32c3: Fix some BLE driver issues
    
    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
---
 arch/risc-v/src/esp32c3/esp32c3_ble.c         |  2 +-
 arch/risc-v/src/esp32c3/esp32c3_ble_adapter.c | 20 ++------------------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/arch/risc-v/src/esp32c3/esp32c3_ble.c 
b/arch/risc-v/src/esp32c3/esp32c3_ble.c
index b655b73..47bab8b 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_ble.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_ble.c
@@ -323,7 +323,7 @@ int esp32c3_ble_initialize(void)
     }
 
 #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
   ret = bt_netdev_register(&g_ble_priv.drv);
 #endif
diff --git a/arch/risc-v/src/esp32c3/esp32c3_ble_adapter.c 
b/arch/risc-v/src/esp32c3/esp32c3_ble_adapter.c
index 406686c..21926fb 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_ble_adapter.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_ble_adapter.c
@@ -529,10 +529,6 @@ static int32_t esp_task_create_pinned_to_core(void *entry,
                                               uint32_t core_id)
 {
   int pid;
-#ifdef CONFIG_SMP
-  int ret;
-  cpu_set_t cpuset;
-#endif
 
   pid = kthread_create(name, prio, stack_depth, entry,
                       (char * const *)param);
@@ -542,20 +538,6 @@ static int32_t esp_task_create_pinned_to_core(void *entry,
         {
           *((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
     {
@@ -1686,6 +1668,7 @@ static void btdm_controller_mem_init(void)
  *
  ****************************************************************************/
 
+#ifndef CONFIG_ESP32C3_WIFI
 int phy_printf(const char *format, ...)
 {
 #ifdef CONFIG_DEBUG_WIRELESS_INFO
@@ -1698,6 +1681,7 @@ int phy_printf(const char *format, ...)
 
   return 0;
 }
+#endif
 
 /****************************************************************************
  * Name: bt_phy_enable_clock