libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[sensor] To streamline the code.| 精简代码，去除冗余的代码。

This commit is contained in:
guozhanxin 2019-06-13 17:51:32 +08:00
parent 2600f82e39
commit 7d6fa2388d
1 changed files with 21 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
components/drivers/sensors/sensor.c
View File

@ -116,24 +116,6 @@ static rt_err_t rt_sensor_irq_init(rt_sensor_t sensor)
return 0; return 0;
} }
/* Sensor interrupt enable */
static void rt_sensor_irq_enable(rt_sensor_t sensor)
{
if (sensor->config.irq_pin.pin != RT_PIN_NONE)
{
rt_pin_irq_enable(sensor->config.irq_pin.pin, RT_TRUE);
}
}
/* Sensor interrupt disable */
static void rt_sensor_irq_disable(rt_sensor_t sensor)
{
if (sensor->config.irq_pin.pin != RT_PIN_NONE)
{
rt_pin_irq_enable(sensor->config.irq_pin.pin, RT_FALSE);
}
}
/* RT-Thread Device Interface */ /* RT-Thread Device Interface */
static rt_err_t rt_sensor_open(rt_device_t dev, rt_uint16_t oflag) static rt_err_t rt_sensor_open(rt_device_t dev, rt_uint16_t oflag)
{ {
@ -160,31 +142,34 @@ static rt_err_t rt_sensor_open(rt_device_t dev, rt_uint16_t oflag)
if (oflag & RT_DEVICE_FLAG_RDONLY && dev->flag & RT_DEVICE_FLAG_RDONLY) if (oflag & RT_DEVICE_FLAG_RDONLY && dev->flag & RT_DEVICE_FLAG_RDONLY)
{ {
/* If polling mode is supported, configure it to polling mode */ if (sensor->ops->control != RT_NULL)
if (sensor->ops->control(sensor, RT_SENSOR_CTRL_SET_MODE, (void *)RT_SENSOR_MODE_POLLING) == RT_EOK)
{ {
sensor->config.mode = RT_SENSOR_MODE_POLLING; /* If polling mode is supported, configure it to polling mode */
sensor->ops->control(sensor, RT_SENSOR_CTRL_SET_MODE, (void *)RT_SENSOR_MODE_POLLING);
} }
sensor->config.mode = RT_SENSOR_MODE_POLLING;
} }
else if (oflag & RT_DEVICE_FLAG_INT_RX && dev->flag & RT_DEVICE_FLAG_INT_RX) else if (oflag & RT_DEVICE_FLAG_INT_RX && dev->flag & RT_DEVICE_FLAG_INT_RX)
{ {
/* If interrupt mode is supported, configure it to interrupt mode */ if (sensor->ops->control != RT_NULL)
if (sensor->ops->control(sensor, RT_SENSOR_CTRL_SET_MODE, (void *)RT_SENSOR_MODE_INT) == RT_EOK)
{ {
sensor->config.mode = RT_SENSOR_MODE_INT; /* If interrupt mode is supported, configure it to interrupt mode */
/* Initialization sensor interrupt */ sensor->ops->control(sensor, RT_SENSOR_CTRL_SET_MODE, (void *)RT_SENSOR_MODE_INT);
rt_sensor_irq_init(sensor);
} }
/* Initialization sensor interrupt */
rt_sensor_irq_init(sensor);
sensor->config.mode = RT_SENSOR_MODE_INT;
} }
else if (oflag & RT_DEVICE_FLAG_FIFO_RX && dev->flag & RT_DEVICE_FLAG_FIFO_RX) else if (oflag & RT_DEVICE_FLAG_FIFO_RX && dev->flag & RT_DEVICE_FLAG_FIFO_RX)
{ {
/* If fifo mode is supported, configure it to fifo mode */ if (sensor->ops->control != RT_NULL)
if (sensor->ops->control(sensor, RT_SENSOR_CTRL_SET_MODE, (void *)RT_SENSOR_MODE_FIFO) == RT_EOK)
{ {
sensor->config.mode = RT_SENSOR_MODE_FIFO; /* If fifo mode is supported, configure it to fifo mode */
/* Initialization sensor interrupt */ sensor->ops->control(sensor, RT_SENSOR_CTRL_SET_MODE, (void *)RT_SENSOR_MODE_FIFO);
rt_sensor_irq_init(sensor);
} }
/* Initialization sensor interrupt */
rt_sensor_irq_init(sensor);
sensor->config.mode = RT_SENSOR_MODE_FIFO;
} }
else else
{ {
@ -208,7 +193,7 @@ __exit:
return res; return res;
} }
static rt_err_t rt_sensor_close(rt_device_t dev) static rt_err_t rt_sensor_close(rt_device_t dev)
{ {
rt_sensor_t sensor = (rt_sensor_t)dev; rt_sensor_t sensor = (rt_sensor_t)dev;
int i; int i;
@ -227,7 +212,10 @@ static rt_err_t rt_sensor_close(rt_device_t dev)
} }
/* Sensor disable interrupt */ /* Sensor disable interrupt */
rt_sensor_irq_disable(sensor); if (sensor->config.irq_pin.pin != RT_PIN_NONE)
{
rt_pin_irq_enable(sensor->config.irq_pin.pin, RT_FALSE);
}
if (sensor->module != RT_NULL && sensor->info.fifo_max > 0 && sensor->data_buf != RT_NULL) if (sensor->module != RT_NULL && sensor->info.fifo_max > 0 && sensor->data_buf != RT_NULL)
{ {
@ -346,25 +334,6 @@ static rt_err_t rt_sensor_control(rt_device_t dev, int cmd, void *args)
LOG_D("set odr %d", sensor->config.odr); LOG_D("set odr %d", sensor->config.odr);
} }
break; break;
case RT_SENSOR_CTRL_SET_MODE:
/* Configuration sensor work mode */
result = sensor->ops->control(sensor, RT_SENSOR_CTRL_SET_MODE, args);
if (result == RT_EOK)
{
sensor->config.mode = (rt_uint32_t)args & 0xFF;
LOG_D("set work mode code:", sensor->config.mode);
if (sensor->config.mode == RT_SENSOR_MODE_POLLING)
{
rt_sensor_irq_disable(sensor);
}
else if (sensor->config.mode == RT_SENSOR_MODE_INT || sensor->config.mode == RT_SENSOR_MODE_FIFO)
{
rt_sensor_irq_enable(sensor);
}
}
break;
case RT_SENSOR_CTRL_SET_POWER: case RT_SENSOR_CTRL_SET_POWER:
/* Configuration sensor power mode */ /* Configuration sensor power mode */