summaryrefslogtreecommitdiff
path: root/components
diff options
context:
space:
mode:
authorMan, Jianting (Meco) <[email protected]>2022-04-22 10:26:41 -0400
committerGitHub <[email protected]>2022-04-22 22:26:41 +0800
commitc2a0995545a0b51f9e69e6e4f4681b71d9e52a6d (patch)
tree1bd01809956d0415cb447ef45660fbc9522323f2 /components
parentb06228ec7e20232c268ff47f1f3503db31f116a5 (diff)
[adc] 支持adc框架获取BSP的ADC分辨率 (#5853)
Diffstat (limited to 'components')
-rw-r--r--components/drivers/include/drivers/adc.h2
-rw-r--r--components/drivers/misc/adc.c22
2 files changed, 17 insertions, 7 deletions
diff --git a/components/drivers/include/drivers/adc.h b/components/drivers/include/drivers/adc.h
index 2ff4102a3b..d251a33a53 100644
--- a/components/drivers/include/drivers/adc.h
+++ b/components/drivers/include/drivers/adc.h
@@ -18,6 +18,7 @@ struct rt_adc_ops
{
rt_err_t (*enabled)(struct rt_adc_device *device, rt_uint32_t channel, rt_bool_t enabled);
rt_err_t (*convert)(struct rt_adc_device *device, rt_uint32_t channel, rt_uint32_t *value);
+ rt_uint8_t (*get_resolution)(struct rt_adc_device *device);
};
struct rt_adc_device
@@ -31,6 +32,7 @@ typedef enum
{
RT_ADC_CMD_ENABLE = RT_DEVICE_CTRL_BASE(ADC) + 1,
RT_ADC_CMD_DISABLE = RT_DEVICE_CTRL_BASE(ADC) + 2,
+ RT_ADC_CMD_GET_RESOLUTION = RT_DEVICE_CTRL_BASE(ADC) + 3,
} rt_adc_cmd_t;
rt_err_t rt_hw_adc_register(rt_adc_device_t adc,const char *name, const struct rt_adc_ops *ops, const void *user_data);
diff --git a/components/drivers/misc/adc.c b/components/drivers/misc/adc.c
index d54a14193b..ae324a16ec 100644
--- a/components/drivers/misc/adc.c
+++ b/components/drivers/misc/adc.c
@@ -41,21 +41,27 @@ static rt_size_t _adc_read(rt_device_t dev, rt_off_t pos, void *buffer, rt_size_
static rt_err_t _adc_control(rt_device_t dev, int cmd, void *args)
{
- rt_err_t result = RT_EOK;
+ rt_err_t result = -RT_EINVAL;
rt_adc_device_t adc = (struct rt_adc_device *)dev;
- if (adc->ops->enabled == RT_NULL)
- {
- return -RT_ENOSYS;
- }
- if (cmd == RT_ADC_CMD_ENABLE)
+ if (cmd == RT_ADC_CMD_ENABLE && adc->ops->enabled)
{
result = adc->ops->enabled(adc, (rt_uint32_t)args, RT_TRUE);
}
- else if (cmd == RT_ADC_CMD_DISABLE)
+ else if (cmd == RT_ADC_CMD_DISABLE && adc->ops->enabled)
{
result = adc->ops->enabled(adc, (rt_uint32_t)args, RT_FALSE);
}
+ else if (cmd == RT_ADC_CMD_GET_RESOLUTION && adc->ops->get_resolution)
+ {
+ rt_uint8_t resolution = adc->ops->get_resolution(adc);
+ if(resolution != 0)
+ {
+ *((rt_uint8_t*)args) = resolution;
+ LOG_D("ADC resolution:%d", resolution);
+ result = RT_EOK;
+ }
+ }
return result;
}
@@ -115,6 +121,7 @@ rt_err_t rt_adc_enable(rt_adc_device_t dev, rt_uint32_t channel)
rt_err_t result = RT_EOK;
RT_ASSERT(dev);
+
if (dev->ops->enabled != RT_NULL)
{
result = dev->ops->enabled(dev, channel, RT_TRUE);
@@ -132,6 +139,7 @@ rt_err_t rt_adc_disable(rt_adc_device_t dev, rt_uint32_t channel)
rt_err_t result = RT_EOK;
RT_ASSERT(dev);
+
if (dev->ops->enabled != RT_NULL)
{
result = dev->ops->enabled(dev, channel, RT_FALSE);