[incubator-nuttx] 03/04: arch/sim: Extend hcitty_register to accept device name

[ac...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit aa37399c8936a86aa18fa23c47b1a1cbc215737a
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Mon Jan 18 02:31:16 2021 +0800

    arch/sim: Extend hcitty_register to accept device name
    
    Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
 arch/sim/src/sim/up_hcitty.c         | 8 ++------
 arch/sim/src/sim/up_internal.h       | 2 +-
 boards/sim/sim/sim/src/sim_bringup.c | 4 ++--
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/arch/sim/src/sim/up_hcitty.c b/arch/sim/src/sim/up_hcitty.c
index 5b29656..6bf99ab 100644
--- a/arch/sim/src/sim/up_hcitty.c
+++ b/arch/sim/src/sim/up_hcitty.c
@@ -28,7 +28,6 @@
 #include <nuttx/nuttx.h>
 
 #include <string.h>
-#include <stdio.h>
 #include <poll.h>
 #include <queue.h>
 
@@ -411,14 +410,11 @@ void bthcitty_loop(void)
     }
 }
 
-int bthcitty_register(int dev_id)
+int bthcitty_register(const char *name, int id)
 {
   FAR struct bthcitty_s *dev;
-  unsigned char name[16];
   int ret;
 
-  snprintf(name, sizeof(name), "/dev/ttyHCI%d", dev_id);
-
   dev = (FAR struct bthcitty_s *)kmm_zalloc(sizeof(struct bthcitty_s));
   if (dev == NULL)
     {
@@ -426,7 +422,7 @@ int bthcitty_register(int dev_id)
     }
 
   dev->fd = -1;
-  dev->id = dev_id;
+  dev->id = id;
 
   nxsem_init(&dev->recvlock, 0, 1);
   nxsem_init(&dev->sendlock, 0, 1);
diff --git a/arch/sim/src/sim/up_internal.h b/arch/sim/src/sim/up_internal.h
index ddca786..55863c6 100644
--- a/arch/sim/src/sim/up_internal.h
+++ b/arch/sim/src/sim/up_internal.h
@@ -400,7 +400,7 @@ int bthcisock_loop(void);
 /* up_hcitty.c **************************************************************/
 
 #ifdef CONFIG_SIM_HCITTY
-int bthcitty_register(int dev_id);
+int  bthcitty_register(const char *name, int id);
 void bthcitty_loop(void);
 #endif
 
diff --git a/boards/sim/sim/sim/src/sim_bringup.c b/boards/sim/sim/sim/src/sim_bringup.c
index b50d148..ea5bd4f 100644
--- a/boards/sim/sim/sim/src/sim_bringup.c
+++ b/boards/sim/sim/sim/src/sim_bringup.c
@@ -349,9 +349,9 @@ int sim_bringup(void)
 #endif
 
 #ifdef CONFIG_SIM_HCITTY
-  /* Register the Host Bluetooth network device via HCI socket */
+  /* Register the HCI TTY device via HCI socket */
 
-  ret = bthcitty_register(0);  /* Use HCI0 */
+  ret = bthcitty_register("/dev/ttyHCI", 0);  /* Use HCI0 */
   if (ret < 0)
     {
       syslog(LOG_ERR, "ERROR: bthcitty_register() failed: %d\n", ret);