You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2022/07/29 19:15:30 UTC

[incubator-nuttx] 01/04: driver/sensor: add name prefix "sensor_" for sensor register

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

commit 3fdd036ba6eee2ffd76cfba561ab1b044e3275e2
Author: Jiuzhu Dong <do...@xiaomi.com>
AuthorDate: Tue Mar 29 11:39:44 2022 +0800

    driver/sensor: add name prefix "sensor_" for sensor register
    
    Signed-off-by: Jiuzhu Dong <do...@xiaomi.com>
---
 drivers/sensors/sensor.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/sensors/sensor.c b/drivers/sensors/sensor.c
index c1587c7f3f..c6001dbf9c 100644
--- a/drivers/sensors/sensor.c
+++ b/drivers/sensors/sensor.c
@@ -46,8 +46,7 @@
 /* Device naming ************************************************************/
 
 #define ROUNDUP(x, esize)  ((x + (esize - 1)) / (esize)) * (esize)
-#define DEVNAME_FMT        "/dev/sensor/%s%s%d"
-#define DEVNAME_MAX        64
+#define DEVNAME_FMT        "/dev/sensor/sensor_%s%s%d"
 #define DEVNAME_UNCAL      "_uncal"
 
 /****************************************************************************
@@ -880,11 +879,11 @@ static void sensor_notify_event(FAR void *priv)
 
 int sensor_register(FAR struct sensor_lowerhalf_s *lower, int devno)
 {
-  char path[DEVNAME_MAX];
+  char path[PATH_MAX];
 
   DEBUGASSERT(lower != NULL);
 
-  snprintf(path, DEVNAME_MAX, DEVNAME_FMT,
+  snprintf(path, PATH_MAX, DEVNAME_FMT,
            g_sensor_info[lower->type].name,
            lower->uncalibrated ? DEVNAME_UNCAL : "",
            devno);
@@ -1007,9 +1006,9 @@ drv_err:
 
 void sensor_unregister(FAR struct sensor_lowerhalf_s *lower, int devno)
 {
-  char path[DEVNAME_MAX];
+  char path[PATH_MAX];
 
-  snprintf(path, DEVNAME_MAX, DEVNAME_FMT,
+  snprintf(path, PATH_MAX, DEVNAME_FMT,
            g_sensor_info[lower->type].name,
            lower->uncalibrated ? DEVNAME_UNCAL : "",
            devno);