|
7 | 7 | ******************************************************************************
|
8 | 8 | * @attention
|
9 | 9 | *
|
10 |
| - * <h2><center>© COPYRIGHT(c) 2017 STMicroelectronics</center></h2> |
| 10 | + * <h2><center>© COPYRIGHT(c) 2018 STMicroelectronics</center></h2> |
11 | 11 | *
|
12 | 12 | * Redistribution and use in source and binary forms, with or without modification,
|
13 | 13 | * are permitted provided that the following conditions are met:
|
|
444 | 444 | #define OB_RDP_LEVEL0 OB_RDP_LEVEL_0
|
445 | 445 | #define OB_RDP_LEVEL1 OB_RDP_LEVEL_1
|
446 | 446 | #define OB_RDP_LEVEL2 OB_RDP_LEVEL_2
|
447 |
| -#if defined(STM32G0) |
448 |
| -#define OB_BOOT_LOCK_DISABLE OB_BOOT_ENTRY_FORCED_NONE |
449 |
| -#define OB_BOOT_LOCK_ENABLE OB_BOOT_ENTRY_FORCED_FLASH |
450 |
| -#else |
451 | 447 | #define OB_BOOT_ENTRY_FORCED_NONE OB_BOOT_LOCK_DISABLE
|
452 | 448 | #define OB_BOOT_ENTRY_FORCED_FLASH OB_BOOT_LOCK_ENABLE
|
| 449 | + |
| 450 | +#if defined(STM32H7) |
| 451 | +#define FLASH_FLAG_SNECCE_BANK1RR FLASH_FLAG_SNECCERR_BANK1 |
| 452 | +#define FLASH_FLAG_DBECCE_BANK1RR FLASH_FLAG_DBECCERR_BANK1 |
| 453 | +#define FLASH_FLAG_STRBER_BANK1R FLASH_FLAG_STRBERR_BANK1 |
| 454 | +#define FLASH_FLAG_SNECCE_BANK2RR FLASH_FLAG_SNECCERR_BANK2 |
| 455 | +#define FLASH_FLAG_DBECCE_BANK2RR FLASH_FLAG_DBECCERR_BANK2 |
| 456 | +#define FLASH_FLAG_STRBER_BANK2R FLASH_FLAG_STRBERR_BANK2 |
453 | 457 | #endif
|
454 | 458 |
|
455 | 459 | /**
|
|
494 | 498 | /** @defgroup LL_FMC_Aliased_Defines LL FMC Aliased Defines maintained for compatibility purpose
|
495 | 499 | * @{
|
496 | 500 | */
|
497 |
| -#if defined(STM32L4) || defined(STM32F7) || defined(STM32H7) || defined(STM32G4) |
| 501 | +#if defined(STM32L4) || defined(STM32F7) || defined(STM32H7) |
498 | 502 | #define FMC_NAND_PCC_WAIT_FEATURE_DISABLE FMC_NAND_WAIT_FEATURE_DISABLE
|
499 | 503 | #define FMC_NAND_PCC_WAIT_FEATURE_ENABLE FMC_NAND_WAIT_FEATURE_ENABLE
|
500 | 504 | #define FMC_NAND_PCC_MEM_BUS_WIDTH_8 FMC_NAND_MEM_BUS_WIDTH_8
|
501 | 505 | #define FMC_NAND_PCC_MEM_BUS_WIDTH_16 FMC_NAND_MEM_BUS_WIDTH_16
|
502 |
| -#else |
| 506 | +#elif defined(STM32F1) || defined(STM32F2) || defined(STM32F3) || defined(STM32F4) |
503 | 507 | #define FMC_NAND_WAIT_FEATURE_DISABLE FMC_NAND_PCC_WAIT_FEATURE_DISABLE
|
504 | 508 | #define FMC_NAND_WAIT_FEATURE_ENABLE FMC_NAND_PCC_WAIT_FEATURE_ENABLE
|
505 | 509 | #define FMC_NAND_MEM_BUS_WIDTH_8 FMC_NAND_PCC_MEM_BUS_WIDTH_8
|
|
540 | 544 | #define GPIO_AF12_SDMMC GPIO_AF12_SDMMC1
|
541 | 545 | #endif
|
542 | 546 |
|
| 547 | +#if defined(STM32H7) |
| 548 | +#define GPIO_AF7_SDIO1 GPIO_AF7_SDMMC1 |
| 549 | +#define GPIO_AF8_SDIO1 GPIO_AF8_SDMMC1 |
| 550 | +#define GPIO_AF12_SDIO1 GPIO_AF12_SDMMC1 |
| 551 | +#define GPIO_AF9_SDIO2 GPIO_AF9_SDMMC2 |
| 552 | +#define GPIO_AF10_SDIO2 GPIO_AF10_SDMMC2 |
| 553 | +#define GPIO_AF11_SDIO2 GPIO_AF11_SDMMC2 |
| 554 | +#endif |
| 555 | + |
543 | 556 | #define GPIO_AF0_LPTIM GPIO_AF0_LPTIM1
|
544 | 557 | #define GPIO_AF1_LPTIM GPIO_AF1_LPTIM1
|
545 | 558 | #define GPIO_AF2_LPTIM GPIO_AF2_LPTIM1
|
546 | 559 |
|
547 |
| -#if defined(STM32L0) || defined(STM32L4) || defined(STM32F4) || defined(STM32F2) || defined(STM32F7) || defined(STM32G4) |
| 560 | +#if defined(STM32L0) || defined(STM32L4) || defined(STM32F4) || defined(STM32F2) || defined(STM32F7) || defined(STM32H7) |
548 | 561 | #define GPIO_SPEED_LOW GPIO_SPEED_FREQ_LOW
|
549 | 562 | #define GPIO_SPEED_MEDIUM GPIO_SPEED_FREQ_MEDIUM
|
550 | 563 | #define GPIO_SPEED_FAST GPIO_SPEED_FREQ_HIGH
|
551 | 564 | #define GPIO_SPEED_HIGH GPIO_SPEED_FREQ_VERY_HIGH
|
552 |
| -#endif /* STM32L0 || STM32L4 || STM32F4 || STM32F2 || STM32F7 || STM32G4 */ |
| 565 | +#endif /* STM32L0 || STM32L4 || STM32F4 || STM32F2 || STM32F7 || STM32H7*/ |
553 | 566 |
|
554 | 567 | #if defined(STM32L1)
|
555 | 568 | #define GPIO_SPEED_VERY_LOW GPIO_SPEED_FREQ_LOW
|
|
605 | 618 | #define I2C_NOSTRETCH_ENABLED I2C_NOSTRETCH_ENABLE
|
606 | 619 | #define I2C_ANALOGFILTER_ENABLED I2C_ANALOGFILTER_ENABLE
|
607 | 620 | #define I2C_ANALOGFILTER_DISABLED I2C_ANALOGFILTER_DISABLE
|
608 |
| -#if defined(STM32F0) || defined(STM32F1) || defined(STM32F3) || defined(STM32G0) || defined(STM32L4) || defined(STM32L1) || defined(STM32F7) |
| 621 | +#if defined(STM32F0) || defined(STM32F1) || defined(STM32F3) || defined(STM32L4) || defined(STM32L1) || defined(STM32F7) |
609 | 622 | #define HAL_I2C_STATE_MEM_BUSY_TX HAL_I2C_STATE_BUSY_TX
|
610 | 623 | #define HAL_I2C_STATE_MEM_BUSY_RX HAL_I2C_STATE_BUSY_RX
|
611 | 624 | #define HAL_I2C_STATE_MASTER_BUSY_TX HAL_I2C_STATE_BUSY_TX
|
|
737 | 750 | * @{
|
738 | 751 | */
|
739 | 752 | #define I2S_STANDARD_PHILLIPS I2S_STANDARD_PHILIPS
|
| 753 | + |
| 754 | +#if defined(STM32H7) |
| 755 | + #define I2S_IT_TXE I2S_IT_TXP |
| 756 | + #define I2S_IT_RXNE I2S_IT_RXP |
| 757 | + |
| 758 | + #define I2S_FLAG_TXE I2S_FLAG_TXP |
| 759 | + #define I2S_FLAG_RXNE I2S_FLAG_RXP |
| 760 | + #define I2S_FLAG_FRE I2S_FLAG_TIFRE |
| 761 | +#endif |
| 762 | + |
740 | 763 | #if defined(STM32F7)
|
741 | 764 | #define I2S_CLOCK_SYSCLK I2S_CLOCK_PLL
|
742 | 765 | #endif
|
|
861 | 884 | #define SPI_NSS_PULSE_DISABLED SPI_NSS_PULSE_DISABLE
|
862 | 885 | #define SPI_NSS_PULSE_ENABLED SPI_NSS_PULSE_ENABLE
|
863 | 886 |
|
| 887 | +#if defined(STM32H7) |
| 888 | + |
| 889 | + #define SPI_FLAG_TXE SPI_FLAG_TXP |
| 890 | + #define SPI_FLAG_RXNE SPI_FLAG_RXP |
| 891 | + |
| 892 | + #define SPI_IT_TXE SPI_IT_TXP |
| 893 | + #define SPI_IT_RXNE SPI_IT_RXP |
| 894 | + |
| 895 | + #define SPI_FRLVL_EMPTY SPI_RX_FIFO_0PACKET |
| 896 | + #define SPI_FRLVL_QUARTER_FULL SPI_RX_FIFO_1PACKET |
| 897 | + #define SPI_FRLVL_HALF_FULL SPI_RX_FIFO_2PACKET |
| 898 | + #define SPI_FRLVL_FULL SPI_RX_FIFO_3PACKET |
| 899 | + |
| 900 | +#endif /* STM32H7 */ |
| 901 | + |
864 | 902 | /**
|
865 | 903 | * @}
|
866 | 904 | */
|
|
932 | 970 | #define TIM22_TI1_GPIO1 TIM22_TI1_GPIO
|
933 | 971 | #define TIM22_TI1_GPIO2 TIM22_TI1_GPIO
|
934 | 972 | #endif
|
| 973 | + |
| 974 | +#if defined(STM32F3) |
| 975 | +#define IS_TIM_HALL_INTERFACE_INSTANCE IS_TIM_HALL_SENSOR_INTERFACE_INSTANCE |
| 976 | +#endif |
935 | 977 | /**
|
936 | 978 | * @}
|
937 | 979 | */
|
|
1288 | 1330 | #define HAL_TIM_DMAError TIM_DMAError
|
1289 | 1331 | #define HAL_TIM_DMACaptureCplt TIM_DMACaptureCplt
|
1290 | 1332 | #define HAL_TIMEx_DMACommutationCplt TIMEx_DMACommutationCplt
|
| 1333 | +#if defined(STM32H7) |
| 1334 | +#define HAL_TIM_SlaveConfigSynchronization HAL_TIM_SlaveConfigSynchro |
| 1335 | +#define HAL_TIM_SlaveConfigSynchronization_IT HAL_TIM_SlaveConfigSynchro_IT |
| 1336 | +#define HAL_TIMEx_CommutationCallback HAL_TIMEx_CommutCallback |
| 1337 | +#define HAL_TIMEx_ConfigCommutationEvent HAL_TIMEx_ConfigCommutEvent |
| 1338 | +#define HAL_TIMEx_ConfigCommutationEvent_IT HAL_TIMEx_ConfigCommutEvent_IT |
| 1339 | +#define HAL_TIMEx_ConfigCommutationEvent_DMA HAL_TIMEx_ConfigCommutEvent_DMA |
| 1340 | +#endif /* STM32H7 */ |
1291 | 1341 | /**
|
1292 | 1342 | * @}
|
1293 | 1343 | */
|
|
1770 | 1820 | #define IS_I2S_INSTANCE IS_I2S_ALL_INSTANCE
|
1771 | 1821 | #define IS_I2S_INSTANCE_EXT IS_I2S_ALL_INSTANCE_EXT
|
1772 | 1822 |
|
| 1823 | +#if defined(STM32H7) |
| 1824 | + #define __HAL_I2S_CLEAR_FREFLAG __HAL_I2S_CLEAR_TIFREFLAG |
| 1825 | +#endif |
| 1826 | + |
1773 | 1827 | /**
|
1774 | 1828 | * @}
|
1775 | 1829 | */
|
|
2165 | 2219 | #define __QSPI_FORCE_RESET __HAL_RCC_QSPI_FORCE_RESET
|
2166 | 2220 | #define __QSPI_RELEASE_RESET __HAL_RCC_QSPI_RELEASE_RESET
|
2167 | 2221 |
|
2168 |
| -#if defined(STM32WB) |
2169 |
| -#define __HAL_RCC_QSPI_CLK_DISABLE __HAL_RCC_QUADSPI_CLK_DISABLE |
2170 |
| -#define __HAL_RCC_QSPI_CLK_ENABLE __HAL_RCC_QUADSPI_CLK_ENABLE |
2171 |
| -#define __HAL_RCC_QSPI_CLK_SLEEP_DISABLE __HAL_RCC_QUADSPI_CLK_SLEEP_DISABLE |
2172 |
| -#define __HAL_RCC_QSPI_CLK_SLEEP_ENABLE __HAL_RCC_QUADSPI_CLK_SLEEP_ENABLE |
2173 |
| -#define __HAL_RCC_QSPI_FORCE_RESET __HAL_RCC_QUADSPI_FORCE_RESET |
2174 |
| -#define __HAL_RCC_QSPI_RELEASE_RESET __HAL_RCC_QUADSPI_RELEASE_RESET |
2175 |
| -#define __HAL_RCC_QSPI_IS_CLK_ENABLED __HAL_RCC_QUADSPI_IS_CLK_ENABLED |
2176 |
| -#define __HAL_RCC_QSPI_IS_CLK_DISABLED __HAL_RCC_QUADSPI_IS_CLK_DISABLED |
2177 |
| -#define __HAL_RCC_QSPI_IS_CLK_SLEEP_ENABLED __HAL_RCC_QUADSPI_IS_CLK_SLEEP_ENABLED |
2178 |
| -#define __HAL_RCC_QSPI_IS_CLK_SLEEP_DISABLED __HAL_RCC_QUADSPI_IS_CLK_SLEEP_DISABLED |
2179 |
| -#define QSPI_IRQHandler QUADSPI_IRQHandler |
2180 |
| -#endif /* __HAL_RCC_QUADSPI_CLK_ENABLE */ |
2181 | 2222 |
|
2182 | 2223 | #define __RNG_CLK_DISABLE __HAL_RCC_RNG_CLK_DISABLE
|
2183 | 2224 | #define __RNG_CLK_ENABLE __HAL_RCC_RNG_CLK_ENABLE
|
|
2849 | 2890 |
|
2850 | 2891 | #if defined(STM32L4)
|
2851 | 2892 | #define RCC_RTCCLKSOURCE_NO_CLK RCC_RTCCLKSOURCE_NONE
|
2852 |
| -#elif defined(STM32WB) || defined(STM32G0) || defined(STM32G4) |
2853 | 2893 | #else
|
2854 | 2894 | #define RCC_RTCCLKSOURCE_NONE RCC_RTCCLKSOURCE_NO_CLK
|
2855 | 2895 | #endif
|
|
2977 | 3017 | /** @defgroup HAL_RTC_Aliased_Macros HAL RTC Aliased Macros maintained for legacy purpose
|
2978 | 3018 | * @{
|
2979 | 3019 | */
|
2980 |
| -#if defined (STM32G0) |
| 3020 | +#if defined (STM32L412xx) || defined (STM32L422xx) |
2981 | 3021 | #else
|
2982 | 3022 | #define __HAL_RTC_CLEAR_FLAG __HAL_RTC_EXTI_CLEAR_FLAG
|
2983 | 3023 | #endif
|
|
3109 | 3149 | #define HAL_SDEx_Read_DMADoubleBuffer1CpltCallback HAL_SDEx_Read_DMADoubleBuf1CpltCallback
|
3110 | 3150 | #define HAL_SDEx_Write_DMADoubleBuffer0CpltCallback HAL_SDEx_Write_DMADoubleBuf0CpltCallback
|
3111 | 3151 | #define HAL_SDEx_Write_DMADoubleBuffer1CpltCallback HAL_SDEx_Write_DMADoubleBuf1CpltCallback
|
| 3152 | +#define HAL_SD_DriveTransciver_1_8V_Callback HAL_SD_DriveTransceiver_1_8V_Callback |
3112 | 3153 | #endif
|
3113 | 3154 | /**
|
3114 | 3155 | * @}
|
|
3298 | 3339 | * @{
|
3299 | 3340 | */
|
3300 | 3341 | #define __HAL_LTDC_LAYER LTDC_LAYER
|
3301 |
| -#if defined(STM32F7) |
3302 |
| -#else |
3303 | 3342 | #define __HAL_LTDC_RELOAD_CONFIG __HAL_LTDC_RELOAD_IMMEDIATE_CONFIG
|
3304 |
| -#endif |
3305 | 3343 | /**
|
3306 | 3344 | * @}
|
3307 | 3345 | */
|
|
0 commit comments