| 
241 | 241 | #define DAC_CHIPCONNECT_ENABLE        DAC_CHIPCONNECT_INTERNAL  | 
242 | 242 | #endif  | 
243 | 243 | 
 
  | 
244 |  | -#if defined(STM32L1) || defined(STM32L4) || defined(STM32G0) || defined(STM32L5) || defined(STM32H7) || defined(STM32F4)  | 
 | 244 | +#if defined(STM32L1) || defined(STM32L4) || defined(STM32G0) || defined(STM32L5) || defined(STM32H7) || defined(STM32F4) || defined(STM32G4)  | 
245 | 245 | #define HAL_DAC_MSP_INIT_CB_ID       HAL_DAC_MSPINIT_CB_ID  | 
246 | 246 | #define HAL_DAC_MSP_DEINIT_CB_ID     HAL_DAC_MSPDEINIT_CB_ID  | 
247 | 247 | #endif  | 
 | 
313 | 313 | #endif /* STM32L4 */  | 
314 | 314 | 
 
  | 
315 | 315 | #if defined(STM32G0)  | 
316 |  | -#define DMA_REQUEST_DAC1_CHANNEL1								 DMA_REQUEST_DAC1_CH1  | 
317 |  | -#define DMA_REQUEST_DAC1_CHANNEL2								 DMA_REQUEST_DAC1_CH2  | 
 | 316 | +#define DMA_REQUEST_DAC1_CHANNEL1                DMA_REQUEST_DAC1_CH1  | 
 | 317 | +#define DMA_REQUEST_DAC1_CHANNEL2                DMA_REQUEST_DAC1_CH2  | 
 | 318 | +#define DMA_REQUEST_TIM16_TRIG_COM               DMA_REQUEST_TIM16_COM  | 
 | 319 | +#define DMA_REQUEST_TIM17_TRIG_COM               DMA_REQUEST_TIM17_COM  | 
 | 320 | + | 
 | 321 | +#define LL_DMAMUX_REQ_TIM16_TRIG_COM             LL_DMAMUX_REQ_TIM16_COM  | 
 | 322 | +#define LL_DMAMUX_REQ_TIM17_TRIG_COM             LL_DMAMUX_REQ_TIM17_COM  | 
318 | 323 | #endif  | 
319 | 324 | 
 
  | 
320 | 325 | #if defined(STM32H7)  | 
 | 
643 | 648 | #define HAL_HRTIM_ExternalEventCounterEnable    HAL_HRTIM_ExtEventCounterEnable  | 
644 | 649 | #define HAL_HRTIM_ExternalEventCounterDisable   HAL_HRTIM_ExtEventCounterDisable  | 
645 | 650 | #define HAL_HRTIM_ExternalEventCounterReset     HAL_HRTIM_ExtEventCounterReset  | 
 | 651 | +#define HRTIM_TIMEEVENT_A                       HRTIM_EVENTCOUNTER_A  | 
 | 652 | +#define HRTIM_TIMEEVENT_B                       HRTIM_EVENTCOUNTER_B  | 
 | 653 | +#define HRTIM_TIMEEVENTRESETMODE_UNCONDITIONAL  HRTIM_EVENTCOUNTER_RSTMODE_UNCONDITIONAL  | 
 | 654 | +#define HRTIM_TIMEEVENTRESETMODE_CONDITIONAL    HRTIM_EVENTCOUNTER_RSTMODE_CONDITIONAL  | 
646 | 655 | #endif /* STM32G4 */  | 
647 | 656 | 
 
  | 
648 | 657 | #if defined(STM32H7)  | 
 | 
955 | 964 | #define OPAMP_PGACONNECT_VM0                  OPAMP_PGA_CONNECT_INVERTINGINPUT_IO0  | 
956 | 965 | #define OPAMP_PGACONNECT_VM1                  OPAMP_PGA_CONNECT_INVERTINGINPUT_IO1  | 
957 | 966 | 
 
  | 
958 |  | -#if defined(STM32L1) || defined(STM32L4) || defined(STM32L5) || defined(STM32H7)  | 
 | 967 | +#if defined(STM32L1) || defined(STM32L4) || defined(STM32L5) || defined(STM32H7) || defined(STM32G4)  | 
959 | 968 | #define HAL_OPAMP_MSP_INIT_CB_ID       HAL_OPAMP_MSPINIT_CB_ID  | 
960 | 969 | #define HAL_OPAMP_MSP_DEINIT_CB_ID     HAL_OPAMP_MSPDEINIT_CB_ID  | 
961 | 970 | #endif  | 
 | 
1014 | 1023 | /**  | 
1015 | 1024 |   * @}  | 
1016 | 1025 |   */  | 
1017 |  | - | 
 | 1026 | +    | 
1018 | 1027 | /** @defgroup HAL_RTC_Aliased_Defines HAL RTC Aliased Defines maintained for legacy purpose  | 
1019 | 1028 |   * @{  | 
1020 | 1029 |   */  | 
 | 
1450 | 1459 | #define HASH_HMACKeyType_ShortKey  HASH_HMAC_KEYTYPE_SHORTKEY  | 
1451 | 1460 | #define HASH_HMACKeyType_LongKey   HASH_HMAC_KEYTYPE_LONGKEY  | 
1452 | 1461 | 
 
  | 
1453 |  | -#if defined(STM32L4) || defined(STM32L5)  | 
1454 |  | -    | 
 | 1462 | +#if defined(STM32L4) || defined(STM32L5) || defined(STM32F4) || defined(STM32F7) || defined(STM32H7)  | 
 | 1463 | + | 
1455 | 1464 | #define HAL_HASH_MD5_Accumulate                HAL_HASH_MD5_Accmlt  | 
1456 | 1465 | #define HAL_HASH_MD5_Accumulate_End            HAL_HASH_MD5_Accmlt_End  | 
1457 | 1466 | #define HAL_HASH_MD5_Accumulate_IT             HAL_HASH_MD5_Accmlt_IT  | 
 | 
1472 | 1481 | #define HAL_HASHEx_SHA256_Accumulate_IT        HAL_HASHEx_SHA256_Accmlt_IT  | 
1473 | 1482 | #define HAL_HASHEx_SHA256_Accumulate_End_IT    HAL_HASHEx_SHA256_Accmlt_End_IT  | 
1474 | 1483 | 
 
  | 
1475 |  | -#endif  /* STM32L4 || STM32L5 */    | 
 | 1484 | +#endif  /* STM32L4 || STM32L5 || STM32F4 || STM32F7 || STM32H7 */  | 
1476 | 1485 | /**  | 
1477 | 1486 |   * @}  | 
1478 | 1487 |   */  | 
 | 
1531 | 1540 | 
 
  | 
1532 | 1541 | #define HAL_I2CFastModePlusConfig(SYSCFG_I2CFastModePlus, cmd) (((cmd)==ENABLE)? HAL_I2CEx_EnableFastModePlus(SYSCFG_I2CFastModePlus): HAL_I2CEx_DisableFastModePlus(SYSCFG_I2CFastModePlus))  | 
1533 | 1542 | 
 
  | 
1534 |  | -#if defined(STM32H7) || defined(STM32WB) || defined(STM32G0) || defined(STM32F0) || defined(STM32F1) || defined(STM32F2) || defined(STM32F3) || defined(STM32F4) || defined(STM32F7) || defined(STM32L0) || defined(STM32L4) || defined(STM32L5) || defined(STM32G4)  | 
 | 1543 | +#if defined(STM32H7) || defined(STM32WB) || defined(STM32G0) || defined(STM32F0) || defined(STM32F1) || defined(STM32F2) || defined(STM32F3) || defined(STM32F4) || defined(STM32F7) || defined(STM32L0) || defined(STM32L4) || defined(STM32L5) || defined(STM32G4) || defined(STM32L1)  | 
1535 | 1544 | #define HAL_I2C_Master_Sequential_Transmit_IT  HAL_I2C_Master_Seq_Transmit_IT  | 
1536 | 1545 | #define HAL_I2C_Master_Sequential_Receive_IT   HAL_I2C_Master_Seq_Receive_IT  | 
1537 | 1546 | #define HAL_I2C_Slave_Sequential_Transmit_IT   HAL_I2C_Slave_Seq_Transmit_IT  | 
1538 | 1547 | #define HAL_I2C_Slave_Sequential_Receive_IT    HAL_I2C_Slave_Seq_Receive_IT  | 
1539 |  | -#endif /* STM32H7 || STM32WB  || STM32G0 || STM32F0 || STM32F1 || STM32F2 || STM32F3 || STM32F4 || STM32F7 || STM32L0 || STM32L4 || STM32L5 || STM32G4 */  | 
1540 |  | -#if defined(STM32H7) || defined(STM32WB) || defined(STM32G0) || defined(STM32F4) || defined(STM32F7) || defined(STM32L0) || defined(STM32L4) || defined(STM32L5) || defined(STM32G4)  | 
 | 1548 | +#endif /* STM32H7 || STM32WB  || STM32G0 || STM32F0 || STM32F1 || STM32F2 || STM32F3 || STM32F4 || STM32F7 || STM32L0 || STM32L4 || STM32L5 || STM32G4 || STM32L1 */  | 
 | 1549 | +#if defined(STM32H7) || defined(STM32WB) || defined(STM32G0) || defined(STM32F4) || defined(STM32F7) || defined(STM32L0) || defined(STM32L4) || defined(STM32L5) || defined(STM32G4)|| defined(STM32L1)  | 
1541 | 1550 | #define HAL_I2C_Master_Sequential_Transmit_DMA HAL_I2C_Master_Seq_Transmit_DMA  | 
1542 | 1551 | #define HAL_I2C_Master_Sequential_Receive_DMA  HAL_I2C_Master_Seq_Receive_DMA  | 
1543 | 1552 | #define HAL_I2C_Slave_Sequential_Transmit_DMA  HAL_I2C_Slave_Seq_Transmit_DMA  | 
1544 | 1553 | #define HAL_I2C_Slave_Sequential_Receive_DMA   HAL_I2C_Slave_Seq_Receive_DMA  | 
1545 |  | -#endif /* STM32H7 || STM32WB  || STM32G0 || STM32F4 || STM32F7 || STM32L0 || STM32L4 || STM32L5 || STM32G4 */  | 
 | 1554 | +#endif /* STM32H7 || STM32WB  || STM32G0 || STM32F4 || STM32F7 || STM32L0 || STM32L4 || STM32L5 || STM32G4 || STM32L1 */  | 
1546 | 1555 | 
 
  | 
1547 | 1556 | #if defined(STM32F4)  | 
1548 | 1557 | #define HAL_FMPI2C_Master_Sequential_Transmit_IT  HAL_FMPI2C_Master_Seq_Transmit_IT  | 
 | 
1563 | 1572 |   */  | 
1564 | 1573 | 
 
  | 
1565 | 1574 | #if defined(STM32G0)  | 
1566 |  | -#define HAL_PWR_ConfigPVD															HAL_PWREx_ConfigPVD  | 
1567 |  | -#define HAL_PWR_EnablePVD															HAL_PWREx_EnablePVD  | 
1568 |  | -#define HAL_PWR_DisablePVD													  HAL_PWREx_DisablePVD  | 
1569 |  | -#define HAL_PWR_PVD_IRQHandler											  HAL_PWREx_PVD_IRQHandler  | 
 | 1575 | +#define HAL_PWR_ConfigPVD                             HAL_PWREx_ConfigPVD  | 
 | 1576 | +#define HAL_PWR_EnablePVD                             HAL_PWREx_EnablePVD  | 
 | 1577 | +#define HAL_PWR_DisablePVD                            HAL_PWREx_DisablePVD  | 
 | 1578 | +#define HAL_PWR_PVD_IRQHandler                        HAL_PWREx_PVD_IRQHandler  | 
1570 | 1579 | #endif  | 
1571 | 1580 | #define HAL_PWR_PVDConfig                             HAL_PWR_ConfigPVD  | 
1572 | 1581 | #define HAL_PWR_DisableBkUpReg                        HAL_PWREx_DisableBkUpReg  | 
 | 
3243 | 3252 | #define RCC_MCOSOURCE_PLLCLK_NODIV  RCC_MCO1SOURCE_PLLCLK  | 
3244 | 3253 | #define RCC_MCOSOURCE_PLLCLK_DIV2   RCC_MCO1SOURCE_PLLCLK_DIV2  | 
3245 | 3254 | 
 
  | 
3246 |  | -#if defined(STM32L4)  | 
 | 3255 | +#if defined(STM32L4) || defined(STM32WB) || defined(STM32G0) || defined(STM32G4) || defined(STM32L5)  | 
3247 | 3256 | #define RCC_RTCCLKSOURCE_NO_CLK     RCC_RTCCLKSOURCE_NONE  | 
3248 |  | -#elif defined(STM32WB) || defined(STM32G0) || defined(STM32G4) || defined(STM32L5)  | 
3249 | 3257 | #else  | 
3250 | 3258 | #define RCC_RTCCLKSOURCE_NONE       RCC_RTCCLKSOURCE_NO_CLK  | 
3251 | 3259 | #endif  | 
 | 
3373 | 3381 | /** @defgroup HAL_RTC_Aliased_Macros HAL RTC Aliased Macros maintained for legacy purpose  | 
3374 | 3382 |   * @{  | 
3375 | 3383 |   */  | 
3376 |  | -#if defined (STM32G0) || defined (STM32L5) || defined (STM32L412xx) || defined (STM32L422xx) || defined (STM32G4)  | 
 | 3384 | +#if defined (STM32G0) || defined (STM32L5) || defined (STM32L412xx) || defined (STM32L422xx) || defined (STM32L4P5xx) || defined (STM32L4Q5xx) || defined (STM32G4)  | 
3377 | 3385 | #else  | 
3378 | 3386 | #define __HAL_RTC_CLEAR_FLAG                      __HAL_RTC_EXTI_CLEAR_FLAG  | 
3379 | 3387 | #endif  | 
 | 
3481 | 3489 | #define  __HAL_SD_SDIO_CLEAR_FLAG   __HAL_SD_SDMMC_CLEAR_FLAG  | 
3482 | 3490 | #define  __HAL_SD_SDIO_GET_IT       __HAL_SD_SDMMC_GET_IT  | 
3483 | 3491 | #define  __HAL_SD_SDIO_CLEAR_IT     __HAL_SD_SDMMC_CLEAR_IT  | 
3484 |  | -#define  SDIO_STATIC_FLAGS	        SDMMC_STATIC_FLAGS  | 
3485 |  | -#define  SDIO_CMD0TIMEOUT	          SDMMC_CMD0TIMEOUT  | 
3486 |  | -#define  SD_SDIO_SEND_IF_COND	      SD_SDMMC_SEND_IF_COND  | 
 | 3492 | +#define  SDIO_STATIC_FLAGS          SDMMC_STATIC_FLAGS  | 
 | 3493 | +#define  SDIO_CMD0TIMEOUT           SDMMC_CMD0TIMEOUT  | 
 | 3494 | +#define  SD_SDIO_SEND_IF_COND       SD_SDMMC_SEND_IF_COND  | 
3487 | 3495 | /* alias CMSIS for compatibilities */  | 
3488 | 3496 | #define  SDIO_IRQn                  SDMMC1_IRQn  | 
3489 | 3497 | #define  SDIO_IRQHandler            SDMMC1_IRQHandler  | 
 | 
3751 | 3759 | /** @defgroup HAL_QSPI_Aliased_Macros HAL QSPI Aliased Macros maintained for legacy purpose  | 
3752 | 3760 |   * @{  | 
3753 | 3761 |   */  | 
3754 |  | -#if defined (STM32L4)  | 
 | 3762 | +#if defined (STM32L4) || defined (STM32F4) || defined (STM32F7) || defined(STM32H7)  | 
3755 | 3763 | #define HAL_QPSI_TIMEOUT_DEFAULT_VALUE HAL_QSPI_TIMEOUT_DEFAULT_VALUE  | 
3756 |  | -#endif  | 
 | 3764 | +#endif /* STM32L4 || STM32F4 || STM32F7 */  | 
3757 | 3765 | /**  | 
3758 | 3766 |   * @}  | 
3759 | 3767 |   */  | 
 | 
0 commit comments