libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

[bsp][hc32]优化can驱动和pwm驱动 (#8217) 

**为什么提交这份PR (why to submit this PR)**
1. hc32驱动函数和rtt函数声明之间的参数类型不一致，在mdk编译时产生警告。
2. hc32的can设备，在注册时就把can中断使能了。导致can设备在打开前，就会产生中断。
3. hc32的pwm驱动，不支持PWM_CMD_SET_PERIOD和PWM_CMD_SET_PULSE指令，导致rt_pwm_set_pulse()函数返回失败。
**你的解决方案是什么 (what is your solution)**
1. 修改hc32驱动函数参数类型和声明一致。
2. 注册can设备时主动禁止can中断，因为打开设备时会主动打开中断。
3. 修改pwm驱动，增加PWM_CMD_SET_PERIOD和PWM_CMD_SET_PULSE指令支持。
This commit is contained in:
梁生 2023-11-14 22:18:32 +08:00 committed by GitHub
parent 6d7e393ce9
commit 7a56058c61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 50 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bsp/hc32/libraries/hc32_drivers/drv_adc.c
View File

@ -151,14 +151,14 @@ static void _adc_internal_trigger1_set(adc_device *p_adc_dev)
AOS_SetTriggerEventSrc(u32TriggerSel, p_adc_dev->init.internal_trig1_sel);
}
static rt_err_t _adc_enable(struct rt_adc_device *device, rt_uint32_t channel, rt_bool_t enabled)
static rt_err_t _adc_enable(struct rt_adc_device *device, rt_int8_t channel, rt_bool_t enabled)
{
adc_device *p_adc_dev = rt_container_of(device, adc_device, rt_adc);
ADC_ChCmd(p_adc_dev->instance, ADC_SEQ_A, channel, (en_functional_state_t)enabled);
return 0;
}
static rt_err_t _adc_convert(struct rt_adc_device *device, rt_uint32_t channel, rt_uint32_t *value)
static rt_err_t _adc_convert(struct rt_adc_device *device, rt_int8_t channel, rt_uint32_t *value)
{
rt_err_t rt_ret = -RT_ERROR;

5
bsp/hc32/libraries/hc32_drivers/drv_can.c
View File

@ -362,7 +362,7 @@ static rt_err_t _can_control(struct rt_can_device *can, int cmd, void *arg)
return RT_EOK;
}
static int _can_sendmsg(struct rt_can_device *can, const void *buf, rt_uint32_t box_num)
static rt_ssize_t _can_sendmsg(struct rt_can_device *can, const void *buf, rt_uint32_t box_num)
{
struct rt_can_msg *pmsg = (struct rt_can_msg *) buf;
stc_can_tx_frame_t stc_tx_frame = {0};
@ -398,7 +398,7 @@ static int _can_sendmsg(struct rt_can_device *can, const void *buf, rt_uint32_t
return RT_EOK;
}
static int _can_recvmsg(struct rt_can_device *can, void *buf, rt_uint32_t fifo)
static rt_ssize_t _can_recvmsg(struct rt_can_device *can, void *buf, rt_uint32_t fifo)
{
int32_t ll_ret;
struct rt_can_msg *pmsg;
@ -655,6 +655,7 @@ int rt_hw_can_init(void)
/* register CAN device */
rt_hw_board_can_init(g_can_dev_array[i].instance);
CAN_IntCmd(g_can_dev_array[i].instance, CAN_INT_ALL, DISABLE);
rt_hw_can_register(&g_can_dev_array[i].rt_can,
g_can_dev_array[i].init.name,
&_can_ops,

49
bsp/hc32/libraries/hc32_drivers/drv_pwm_tmra.c
View File

@ -160,13 +160,12 @@ static rt_err_t drv_pwm_set(CM_TMRA_TypeDef *TMRAx, struct rt_pwm_configuration
rt_uint32_t u32clkFreq;
rt_uint64_t u64clk_ns;
rt_uint64_t u64val;
//
u32clkFreq = get_tmra_clk_freq(TMRAx);
u64clk_ns = (rt_uint64_t)1000000000ul / u32clkFreq;
u64val = (rt_uint64_t)configuration->period / u64clk_ns;
if ((configuration->period <= u64clk_ns) || (u64val > 0xFFFF))
{
// clk not match, need change div
/* clk not match, need change div */
uint32_t div_bit;
u32clkFreq = get_tmra_clk_freq_not_div(TMRAx);
u64clk_ns = (rt_uint64_t)1000000000ul / u32clkFreq;
@ -177,7 +176,6 @@ static rt_err_t drv_pwm_set(CM_TMRA_TypeDef *TMRAx, struct rt_pwm_configuration
u64val /= 2;
}
if (div_bit > 10) return -RT_ERROR;
//
TMRA_SetClockDiv(TMRAx, div_bit << TMRA_BCSTR_CKDIV_POS);
u32clkFreq = get_tmra_clk_freq(TMRAx);
u64clk_ns = (rt_uint64_t)1000000000ul / u32clkFreq;
@ -187,13 +185,51 @@ static rt_err_t drv_pwm_set(CM_TMRA_TypeDef *TMRAx, struct rt_pwm_configuration
return RT_EOK;
}
static rt_err_t drv_pwm_set_period(CM_TMRA_TypeDef *TMRAx, struct rt_pwm_configuration *configuration)
{
rt_uint32_t u32clkFreq;
rt_uint64_t u64clk_ns;
rt_uint64_t u64val;
u32clkFreq = get_tmra_clk_freq(TMRAx);
u64clk_ns = (rt_uint64_t)1000000000ul / u32clkFreq;
u64val = (rt_uint64_t)configuration->period / u64clk_ns;
if ((configuration->period <= u64clk_ns) || (u64val > 0xFFFF))
{
/* clk not match, need change div */
uint32_t div_bit;
u32clkFreq = get_tmra_clk_freq_not_div(TMRAx);
u64clk_ns = (rt_uint64_t)1000000000ul / u32clkFreq;
u64val = (rt_uint64_t)configuration->period / u64clk_ns;
for (div_bit=0; div_bit<= 10; div_bit++)
{
if (u64val < 0xFFFF) break;
u64val /= 2;
}
if (div_bit > 10) return -RT_ERROR;
TMRA_SetClockDiv(TMRAx, div_bit << TMRA_BCSTR_CKDIV_POS);
u32clkFreq = get_tmra_clk_freq(TMRAx);
u64clk_ns = (rt_uint64_t)1000000000ul / u32clkFreq;
}
TMRA_SetPeriodValue(TMRAx, configuration->period / u64clk_ns);
return RT_EOK;
}
static rt_err_t drv_pwm_set_pulse(CM_TMRA_TypeDef *TMRAx, struct rt_pwm_configuration *configuration)
{
rt_uint32_t u32clkFreq;
rt_uint64_t u64clk_ns;
u32clkFreq = get_tmra_clk_freq(TMRAx);
u64clk_ns = (rt_uint64_t)1000000000ul / u32clkFreq;
TMRA_SetCompareValue(TMRAx, configuration->channel, configuration->pulse / u64clk_ns);
return RT_EOK;
}
static rt_err_t drv_pwm_control(struct rt_device_pwm *device, int cmd, void *arg)
{
struct rt_pwm_configuration *configuration = (struct rt_pwm_configuration *)arg;
struct hc32_pwm_tmra *pwm;
pwm = rt_container_of(device, struct hc32_pwm_tmra, pwm_device);
CM_TMRA_TypeDef *TMRAx = pwm->instance;
switch (cmd)
{
case PWMN_CMD_ENABLE:
@ -208,6 +244,10 @@ static rt_err_t drv_pwm_control(struct rt_device_pwm *device, int cmd, void *arg
return drv_pwm_set(TMRAx, configuration);
case PWM_CMD_GET:
return drv_pwm_get(TMRAx, configuration);
case PWM_CMD_SET_PERIOD:
return drv_pwm_set_period(TMRAx, configuration);
case PWM_CMD_SET_PULSE:
return drv_pwm_set_pulse(TMRAx, configuration);
default:
return -RT_EINVAL;
}
@ -217,7 +257,6 @@ static rt_err_t _pwm_tmra_init(struct hc32_pwm_tmra *device)
{
CM_TMRA_TypeDef *TMRAx;
uint32_t i;
//
RT_ASSERT(device != RT_NULL);
TMRAx = device->instance;
TMRA_Init(TMRAx, &device->stcTmraInit);

3
bsp/hc32/libraries/hc32_drivers/drv_spi.c
View File

@ -392,7 +392,7 @@ static void hc32_spi_enable(CM_SPI_TypeDef *SPIx)
}
}
static rt_uint32_t hc32_spi_xfer(struct rt_spi_device *device, struct rt_spi_message *message)
static rt_ssize_t hc32_spi_xfer(struct rt_spi_device *device, struct rt_spi_message *message)
{
int32_t state;
rt_size_t message_length, already_send_length;
@ -450,7 +450,6 @@ static rt_uint32_t hc32_spi_xfer(struct rt_spi_device *device, struct rt_spi_mes
{
recv_buf = (rt_uint8_t *)message->recv_buf + already_send_length;
}
if (message->send_buf && message->recv_buf)
{
if ((spi_drv->spi_dma_flag & RT_DEVICE_FLAG_DMA_TX) && (spi_drv->spi_dma_flag & RT_DEVICE_FLAG_DMA_RX))