Skip to content

fix[STM32][I2C]: allow INT and DMA flags to coexist in hard i2c config #11330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wdfk-prog wants to merge 1 commit into
base: master
Choose a base branch
from
+24 −16
Open

fix[STM32][I2C]: allow INT and DMA flags to coexist in hard i2c config #11330

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 24 additions & 16 deletions bsp/stm32/libraries/HAL_Drivers/drivers/drv_hard_i2c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,19 +650,21 @@ static void stm32_get_info(void)

#if defined (BSP_I2C1_TX_USING_INT)
i2c_objs[I2C1_INDEX].i2c_dma_flag |= RT_DEVICE_FLAG_INT_TX;
#elif defined(BSP_I2C1_TX_USING_DMA)
#endif /* defined (BSP_I2C1_TX_USING_INT) */
#if defined(BSP_I2C1_TX_USING_DMA)
i2c_objs[I2C1_INDEX].i2c_dma_flag |= RT_DEVICE_FLAG_DMA_TX;
static struct dma_config I2C1_dma_tx = I2C1_TX_DMA_CONFIG;
i2c_config[I2C1_INDEX].dma_tx = &I2C1_dma_tx;
#endif /* defined (BSP_I2C1_TX_USING_INT) */
#endif /* defined (BSP_I2C1_TX_USING_DMA) */

#if defined (BSP_I2C1_RX_USING_INT)
i2c_objs[I2C1_INDEX].i2c_dma_flag |= RT_DEVICE_FLAG_INT_RX;
#elif defined(BSP_I2C1_RX_USING_DMA)
#endif /* defined (BSP_I2C1_RX_USING_INT) */
#if defined(BSP_I2C1_RX_USING_DMA)
i2c_objs[I2C1_INDEX].i2c_dma_flag |= RT_DEVICE_FLAG_DMA_RX;
static struct dma_config I2C1_dma_rx = I2C1_RX_DMA_CONFIG;
i2c_config[I2C1_INDEX].dma_rx = &I2C1_dma_rx;
#endif /* defined (BSP_I2C1_RX_USING_INT) */
#endif /* defined (BSP_I2C1_RX_USING_DMA) */

#endif /* defined(BSP_USING_HARD_I2C1) */

Expand All @@ -671,19 +673,21 @@ static void stm32_get_info(void)

#if defined (BSP_I2C2_TX_USING_INT)
i2c_objs[I2C2_INDEX].i2c_dma_flag |= RT_DEVICE_FLAG_INT_TX;
#elif defined(BSP_I2C2_TX_USING_DMA)
#endif /* defined (BSP_I2C2_TX_USING_INT) */
#if defined(BSP_I2C2_TX_USING_DMA)
i2c_objs[I2C2_INDEX].i2c_dma_flag |= RT_DEVICE_FLAG_DMA_TX;
static struct dma_config I2C2_dma_tx = I2C2_TX_DMA_CONFIG;
i2c_config[I2C2_INDEX].dma_tx = &I2C2_dma_tx;
#endif /* defined (BSP_I2C2_TX_USING_INT) */
#endif /* defined (BSP_I2C2_TX_USING_DMA) */

#if defined (BSP_I2C2_RX_USING_INT)
i2c_objs[I2C2_INDEX].i2c_dma_flag |= RT_DEVICE_FLAG_INT_RX;
#elif defined(BSP_I2C2_RX_USING_DMA)
#endif /* defined (BSP_I2C2_RX_USING_INT) */
#if defined(BSP_I2C2_RX_USING_DMA)
i2c_objs[I2C2_INDEX].i2c_dma_flag |= RT_DEVICE_FLAG_DMA_RX;
static struct dma_config I2C2_dma_rx = I2C2_RX_DMA_CONFIG;
i2c_config[I2C2_INDEX].dma_rx = &I2C2_dma_rx;
#endif /* defined (BSP_I2C2_RX_USING_INT) */
#endif /* defined (BSP_I2C2_RX_USING_DMA) */

#endif /* defined(BSP_USING_HARD_I2C2) */

Expand All @@ -692,19 +696,21 @@ static void stm32_get_info(void)

#if defined (BSP_I2C3_TX_USING_INT)
i2c_objs[I2C3_INDEX].i2c_dma_flag |= RT_DEVICE_FLAG_INT_TX;
#elif defined(BSP_I2C3_TX_USING_DMA)
#endif /* defined (BSP_I2C3_TX_USING_INT) */
#if defined(BSP_I2C3_TX_USING_DMA)
i2c_objs[I2C3_INDEX].i2c_dma_flag |= RT_DEVICE_FLAG_DMA_TX;
static struct dma_config I2C3_dma_tx = I2C3_TX_DMA_CONFIG;
i2c_config[I2C3_INDEX].dma_tx = &I2C3_dma_tx;
#endif /* defined (BSP_I2C3_TX_USING_INT) */
#endif /* defined (BSP_I2C3_TX_USING_DMA) */

#if defined (BSP_I2C3_RX_USING_INT)
i2c_objs[I2C3_INDEX].i2c_dma_flag |= RT_DEVICE_FLAG_INT_RX;
#elif defined(BSP_I2C3_RX_USING_DMA)
#endif /* defined (BSP_I2C3_RX_USING_INT) */
#if defined(BSP_I2C3_RX_USING_DMA)
i2c_objs[I2C3_INDEX].i2c_dma_flag |= RT_DEVICE_FLAG_DMA_RX;
static struct dma_config I2C3_dma_rx = I2C3_RX_DMA_CONFIG;
i2c_config[I2C3_INDEX].dma_rx = &I2C3_dma_rx;
#endif /* defined (BSP_I2C3_RX_USING_INT) */
#endif /* defined (BSP_I2C3_RX_USING_DMA) */

#endif /* defined(BSP_USING_HARD_I2C3) */

Expand All @@ -713,19 +719,21 @@ static void stm32_get_info(void)

#if defined (BSP_I2C4_TX_USING_INT)
i2c_objs[I2C4_INDEX].i2c_dma_flag |= RT_DEVICE_FLAG_INT_TX;
#elif defined(BSP_I2C4_TX_USING_DMA)
#endif /* defined (BSP_I2C4_TX_USING_INT) */
#if defined(BSP_I2C4_TX_USING_DMA)
i2c_objs[I2C4_INDEX].i2c_dma_flag |= RT_DEVICE_FLAG_DMA_TX;
static struct dma_config I2C4_dma_tx = I2C4_TX_DMA_CONFIG;
i2c_config[I2C4_INDEX].dma_tx = &I2C4_dma_tx;
#endif /* defined (BSP_I2C4_TX_USING_INT) */
#endif /* defined (BSP_I2C4_TX_USING_DMA) */

#if defined (BSP_I2C4_RX_USING_INT)
i2c_objs[I2C4_INDEX].i2c_dma_flag |= RT_DEVICE_FLAG_INT_RX;
#elif defined(BSP_I2C4_RX_USING_DMA)
#endif /* defined (BSP_I2C4_RX_USING_INT) */
#if defined(BSP_I2C4_RX_USING_DMA)
i2c_objs[I2C4_INDEX].i2c_dma_flag |= RT_DEVICE_FLAG_DMA_RX;
static struct dma_config I2C4_dma_rx = I2C4_RX_DMA_CONFIG;
i2c_config[I2C4_INDEX].dma_rx = &I2C4_dma_rx;
#endif /* defined (BSP_I2C4_RX_USING_INT) */
#endif /* defined (BSP_I2C4_RX_USING_DMA) */

#endif /* defined(BSP_USING_HARD_I2C4) */
}
Expand Down
Loading