Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d1af97b42d | ||
|
|
c945804480 | ||
|
|
8cfcbfedf8 | ||
|
|
1c37dceb14 |
@@ -192,7 +192,7 @@ static int drv_pin_configure(struct mr_pin *pin, int number, int mode)
|
||||
{
|
||||
HAL_NVIC_DisableIRQ(pin_irq_map[exti_line]);
|
||||
}
|
||||
} else
|
||||
} else if ((exti_line >= 10) && (exti_line <= 15))
|
||||
{
|
||||
if ((pin_irq_mask[10] == -1) &&
|
||||
(pin_irq_mask[11] == -1) &&
|
||||
@@ -203,6 +203,9 @@ static int drv_pin_configure(struct mr_pin *pin, int number, int mode)
|
||||
{
|
||||
HAL_NVIC_DisableIRQ(pin_irq_map[exti_line]);
|
||||
}
|
||||
} else
|
||||
{
|
||||
HAL_NVIC_DisableIRQ(pin_irq_map[exti_line]);
|
||||
}
|
||||
pin_irq_mask[exti_line] = -1;
|
||||
}
|
||||
|
||||
@@ -303,7 +303,7 @@ static int drv_pwm_read(struct mr_pwm *pwm, int channel, uint32_t *compare_value
|
||||
uint32_t Channel = (channel - 1) << 2;
|
||||
|
||||
#ifdef MR_USING_PWM_CHANNEL_CHECK
|
||||
if ((Channel & TIM_CHANNEL_ALL) || (Channel == 0))
|
||||
if (Channel & TIM_CHANNEL_ALL)
|
||||
{
|
||||
return MR_EINVAL;
|
||||
}
|
||||
@@ -319,7 +319,7 @@ static int drv_pwm_write(struct mr_pwm *pwm, int channel, uint32_t compare_value
|
||||
uint32_t Channel = (channel - 1) << 2;
|
||||
|
||||
#ifdef MR_USING_PWM_CHANNEL_CHECK
|
||||
if ((Channel & TIM_CHANNEL_ALL) || (Channel == 0))
|
||||
if (Channel & TIM_CHANNEL_ALL)
|
||||
{
|
||||
return MR_EINVAL;
|
||||
}
|
||||
|
||||
@@ -220,7 +220,7 @@ static int drv_pin_configure(struct mr_pin *pin, int number, int mode)
|
||||
{
|
||||
EXTI_InitStructure.EXTI_LineCmd = ENABLE;
|
||||
}
|
||||
} else
|
||||
} else if ((exti_line >= 10) && (exti_line <= 15))
|
||||
{
|
||||
if ((pin_irq_mask[10] == -1) &&
|
||||
(pin_irq_mask[11] == -1) &&
|
||||
@@ -234,6 +234,9 @@ static int drv_pin_configure(struct mr_pin *pin, int number, int mode)
|
||||
{
|
||||
EXTI_InitStructure.EXTI_LineCmd = ENABLE;
|
||||
}
|
||||
} else
|
||||
{
|
||||
EXTI_InitStructure.EXTI_LineCmd = DISABLE;
|
||||
}
|
||||
#endif /* MR_USING_CH32V00X */
|
||||
pin_irq_mask[exti_line] = -1;
|
||||
|
||||
@@ -235,7 +235,7 @@ MR_INLINE void msh_parse_cmd(void)
|
||||
for (const struct mr_msh_cmd *msh_cmd = ((&_mr_msh_cmd_start) + 1);
|
||||
msh_cmd < &_mr_msh_cmd_end;
|
||||
msh_cmd++) {
|
||||
if (strncmp(msh_cmd->name, msh.buf, strlen(msh_cmd->name)) != 0) {
|
||||
if (strcmp(msh_cmd->name, msh.buf) != 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
@@ -276,7 +276,7 @@ static int mr_serial_ioctl(struct mr_dev *dev, int cmd, void *args)
|
||||
if (args != MR_NULL) {
|
||||
size_t bufsz = *(size_t *)args;
|
||||
|
||||
if (ops->stop_dma_rx) {
|
||||
if (ops->stop_dma_rx == MR_NULL) {
|
||||
return MR_EIO;
|
||||
}
|
||||
ops->stop_dma_rx(serial);
|
||||
@@ -299,6 +299,10 @@ static int mr_serial_ioctl(struct mr_dev *dev, int cmd, void *args)
|
||||
if (args != MR_NULL) {
|
||||
size_t bufsz = *(size_t *)args;
|
||||
|
||||
if (serial->nonblock_state != MR_DISABLE) {
|
||||
return MR_EBUSY;
|
||||
}
|
||||
|
||||
uint8_t *pool = mr_realloc(serial->dma_wr_buf, bufsz);
|
||||
if ((pool == MR_NULL) && (bufsz != 0)) {
|
||||
return MR_ENOMEM;
|
||||
|
||||
@@ -425,14 +425,14 @@ static int mr_spi_dev_ioctl(struct mr_dev *dev, int cmd, void *args)
|
||||
|
||||
if (spi_dev->config.host_slave == MR_SPI_HOST) {
|
||||
spi_dev_cs_set(spi_dev, MR_ENABLE);
|
||||
ret = (int)spi_dev_transfer(dev->parent,
|
||||
ret = (int)spi_dev_transfer(spi_dev,
|
||||
transfer.rd_buf,
|
||||
transfer.wr_buf,
|
||||
transfer.size,
|
||||
MR_SPI_RDWR);
|
||||
spi_dev_cs_set(spi_dev, MR_DISABLE);
|
||||
} else {
|
||||
ret = (int)spi_dev_transfer(dev->parent,
|
||||
ret = (int)spi_dev_transfer(spi_dev,
|
||||
transfer.rd_buf,
|
||||
transfer.wr_buf,
|
||||
transfer.size,
|
||||
|
||||
Reference in New Issue
Block a user