diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_dac.c b/bsp/stm32/libraries/HAL_Drivers/drv_dac.c index b165d09c21..73e6133ca9 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_dac.c +++ b/bsp/stm32/libraries/HAL_Drivers/drv_dac.c @@ -81,7 +81,7 @@ static rt_uint32_t stm32_dac_get_channel(rt_uint32_t channel) static rt_err_t stm32_set_dac_value(struct rt_dac_device *device, rt_uint32_t channel, rt_uint32_t *value) { uint32_t dac_channel; - DAC_ChannelConfTypeDef dac_ChanConf; + DAC_ChannelConfTypeDef DAC_ChanConf; DAC_HandleTypeDef *stm32_dac_handler; RT_ASSERT(device != RT_NULL); @@ -89,7 +89,7 @@ static rt_err_t stm32_set_dac_value(struct rt_dac_device *device, rt_uint32_t ch stm32_dac_handler = device->parent.user_data; - rt_memset(&dac_ChanConf, 0, sizeof(dac_ChanConf)); + rt_memset(&DAC_ChanConf, 0, sizeof(DAC_ChanConf)); #if defined(SOC_SERIES_STM32MP1) if (channel <= 2 && channel > 0) @@ -105,11 +105,11 @@ static rt_err_t stm32_set_dac_value(struct rt_dac_device *device, rt_uint32_t ch #endif #if defined(SOC_SERIES_STM32MP1) - dac_ChanConf.DAC_Trigger=DAC_TRIGGER_NONE; - dac_ChanConf.DAC_OutputBuffer=DAC_OUTPUTBUFFER_DISABLE; + DAC_ChanConf.DAC_Trigger=DAC_TRIGGER_NONE; + DAC_ChanConf.DAC_OutputBuffer=DAC_OUTPUTBUFFER_DISABLE; #endif /* config dac out channel*/ - if (HAL_DAC_ConfigChannel(stm32_dac_handler, &dac_ChanConf, dac_channel) != HAL_OK) + if (HAL_DAC_ConfigChannel(stm32_dac_handler, &DAC_ChanConf, dac_channel) != HAL_OK) { LOG_D("Config dac out channel Error!\n"); return -RT_ERROR; diff --git a/components/drivers/include/drivers/dac.h b/components/drivers/include/drivers/dac.h index c79fa534b5..b6043348dc 100644 --- a/components/drivers/include/drivers/dac.h +++ b/components/drivers/include/drivers/dac.h @@ -29,8 +29,8 @@ typedef struct rt_dac_device *rt_dac_device_t; typedef enum { - RT_dac_CMD_ENABLE, - RT_dac_CMD_DISABLE, + RT_DAC_CMD_ENABLE, + RT_DAC_CMD_DISABLE, } rt_dac_cmd_t; rt_err_t rt_hw_dac_register(rt_dac_device_t dac,const char *name, const struct rt_dac_ops *ops, const void *user_data); diff --git a/components/drivers/misc/dac.c b/components/drivers/misc/dac.c index 3c53642c96..336c78d018 100644 --- a/components/drivers/misc/dac.c +++ b/components/drivers/misc/dac.c @@ -47,11 +47,11 @@ static rt_err_t _dac_control(rt_device_t dev, int cmd, void *args) { return -RT_ENOSYS; } - if (cmd == RT_dac_CMD_ENABLE) + if (cmd == RT_DAC_CMD_ENABLE) { result = dac->ops->enabled(dac, (rt_uint32_t)args); } - else if (cmd == RT_dac_CMD_DISABLE) + else if (cmd == RT_DAC_CMD_DISABLE) { result = dac->ops->disabled(dac, (rt_uint32_t)args); }