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 2023/01/26 02:24:13 UTC
[nuttx] 02/05: drivers/sensors/msa301: switch from semaphore to mutex for exclusive access
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/nuttx.git
commit 6e3cb045319e46fc74efda0abc158621072eec00
Author: Petro Karashchenko <pe...@gmail.com>
AuthorDate: Wed Jan 25 22:57:46 2023 +0200
drivers/sensors/msa301: switch from semaphore to mutex for exclusive access
Signed-off-by: Petro Karashchenko <pe...@gmail.com>
---
drivers/sensors/msa301.c | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/drivers/sensors/msa301.c b/drivers/sensors/msa301.c
index d1a04b28b5..e225bb1f22 100644
--- a/drivers/sensors/msa301.c
+++ b/drivers/sensors/msa301.c
@@ -30,6 +30,7 @@
#include <stdio.h>
#include <nuttx/kmalloc.h>
#include <nuttx/signal.h>
+#include <nuttx/mutex.h>
#include <nuttx/fs/fs.h>
#include <nuttx/i2c/i2c_master.h>
#include <nuttx/sensors/msa301.h>
@@ -46,7 +47,7 @@ struct msa301_dev_s
uint8_t addr; /* I2C address */
msa301_range_t range;
FAR const struct msa301_ops_s *ops;
- sem_t exclsem;
+ mutex_t lock;
struct msa301_sensor_data_s sensor_data; /* Sensor data container */
};
@@ -99,9 +100,8 @@ static int msa301_ioctl(FAR struct file *filep, int cmd,
/* Common Register Function */
-static int msa301_register(FAR const char * devpath,
- FAR struct i2c_master_s * i2c,
- uint8_t addr,
+static int msa301_register(FAR const char *devpath,
+ FAR struct i2c_master_s *i2c, uint8_t addr,
FAR const struct msa301_ops_s *ops);
/****************************************************************************
@@ -487,7 +487,7 @@ static int msa301_open(FAR struct file *filep)
DEBUGASSERT(priv != NULL);
- nxsem_wait(&priv->exclsem);
+ nxmutex_lock(&priv->lock);
priv->ops->start(priv);
@@ -517,7 +517,7 @@ static int msa301_close(FAR struct file *filep)
priv->ops->stop(priv);
- nxsem_post(&priv->exclsem);
+ nxmutex_unlock(&priv->lock);
return OK;
}
@@ -651,9 +651,8 @@ static int msa301_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
*
****************************************************************************/
-static int msa301_register(FAR const char * devpath,
- FAR struct i2c_master_s * i2c,
- uint8_t addr,
+static int msa301_register(FAR const char *devpath,
+ FAR struct i2c_master_s *i2c, uint8_t addr,
FAR const struct msa301_ops_s *ops)
{
FAR struct msa301_dev_s *priv;
@@ -698,7 +697,7 @@ static int msa301_register(FAR const char * devpath,
return ret;
}
- nxsem_init(&priv->exclsem, 0, 1);
+ nxmutex_init(&priv->lock);
/* Register the character driver */
@@ -706,7 +705,7 @@ static int msa301_register(FAR const char * devpath,
if (ret < 0)
{
snerr("ERROR: Failed to register driver: %d\n", ret);
- nxsem_destroy(&priv->exclsem);
+ nxmutex_destroy(&priv->lock);
kmm_free(priv);
return ret;
}
@@ -738,8 +737,8 @@ static int msa301_register(FAR const char * devpath,
int msa301_sensor_register(FAR const char * devpath,
FAR struct i2c_master_s *i2c)
{
- return msa301_register(devpath, i2c,
- MSA301_ACCEL_ADDR0, &g_msa301_sensor_ops);
+ return msa301_register(devpath, i2c, MSA301_ACCEL_ADDR0,
+ &g_msa301_sensor_ops);
}
#endif /* CONFIG_I2C && CONFIG_SENSORS_MSA301 */