andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed some regressions. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12413 110e8d01-0319-4d1e-a829-52ad28d1bb01
This commit is contained in:
Giovanni Di Sirio 2018-11-09 12:20:06 +00:00
parent 9d6eb6ebf4
commit bd22f71672
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os/hal/ports/STM32/LLD/I2Cv2/hal_i2c_lld.h
View File

@ -257,6 +257,7 @@
/* The following checks are only required when there is a DMA able to /* The following checks are only required when there is a DMA able to
reassign streams to different channels.*/ reassign streams to different channels.*/
#if STM32_ADVANCED_DMA #if STM32_ADVANCED_DMA
/* Check on the presence of the DMA streams settings in mcuconf.h.*/ /* Check on the presence of the DMA streams settings in mcuconf.h.*/
#if STM32_I2C_USE_I2C1 && (!defined(STM32_I2C_I2C1_RX_DMA_STREAM) || \ #if STM32_I2C_USE_I2C1 && (!defined(STM32_I2C_I2C1_RX_DMA_STREAM) || \
!defined(STM32_I2C_I2C1_TX_DMA_STREAM)) !defined(STM32_I2C_I2C1_TX_DMA_STREAM))
@ -326,6 +327,7 @@
STM32_I2C4_TX_DMA_MSK) STM32_I2C4_TX_DMA_MSK)
#error "invalid DMA stream associated to I2C4 TX" #error "invalid DMA stream associated to I2C4 TX"
#endif #endif
#endif /* STM32_ADVANCED_DMA */ #endif /* STM32_ADVANCED_DMA */
#if !defined(STM32_DMA_REQUIRED) #if !defined(STM32_DMA_REQUIRED)

6
os/hal/ports/STM32/LLD/SPIv2/hal_spi_lld.h
View File

@ -301,6 +301,10 @@
#error "Invalid DMA priority assigned to SPI6" #error "Invalid DMA priority assigned to SPI6"
#endif #endif
/* The following checks are only required when there is a DMA able to
reassign streams to different channels.*/
#if STM32_ADVANCED_DMA
/* Devices with DMAMUX require a different kind of check.*/ /* Devices with DMAMUX require a different kind of check.*/
#if STM32_DMA_SUPPORTS_DMAMUX #if STM32_DMA_SUPPORTS_DMAMUX
@ -487,6 +491,8 @@
#endif /* !STM32_DMA_SUPPORTS_DMAMUX */ #endif /* !STM32_DMA_SUPPORTS_DMAMUX */
#endif /* STM32_ADVANCED_DMA */
#if !defined(STM32_DMA_REQUIRED) #if !defined(STM32_DMA_REQUIRED)
#define STM32_DMA_REQUIRED #define STM32_DMA_REQUIRED
#endif #endif

18
os/hal/ports/STM32/LLD/TIMv1/hal_gpt_lld.h
View File

@ -149,6 +149,24 @@
#define STM32_GPT_USE_TIM14 FALSE #define STM32_GPT_USE_TIM14 FALSE
#endif #endif
/**
* @brief GPTD21 driver enable switch.
* @details If set to @p TRUE the support for GPTD21 is included.
* @note The default is @p TRUE.
*/
#if !defined(STM32_GPT_USE_TIM21) || defined(__DOXYGEN__)
#define STM32_GPT_USE_TIM21 FALSE
#endif
/**
* @brief GPTD22 driver enable switch.
* @details If set to @p TRUE the support for GPTD22 is included.
* @note The default is @p TRUE.
*/
#if !defined(STM32_GPT_USE_TIM22) || defined(__DOXYGEN__)
#define STM32_GPT_USE_TIM22 FALSE
#endif
/** /**
* @brief GPTD1 interrupt priority level setting. * @brief GPTD1 interrupt priority level setting.
*/ */