|
236 | 236 | #define DAC_WAVEGENERATION_NOISE DAC_WAVE_NOISE |
237 | 237 | #define DAC_WAVEGENERATION_TRIANGLE DAC_WAVE_TRIANGLE |
238 | 238 |
|
| 239 | +#if defined(STM32L1) || defined(STM32L4) || defined(STM32G0) |
| 240 | +#define HAL_DAC_MSP_INIT_CB_ID HAL_DAC_MSPINIT_CB_ID |
| 241 | +#define HAL_DAC_MSP_DEINIT_CB_ID HAL_DAC_MSPDEINIT_CB_ID |
| 242 | +#endif |
| 243 | + |
239 | 244 | /** |
240 | 245 | * @} |
241 | 246 | */ |
|
486 | 491 | #define HAL_SYSCFG_FASTMODEPLUS_I2C1 I2C_FASTMODEPLUS_I2C1 |
487 | 492 | #define HAL_SYSCFG_FASTMODEPLUS_I2C2 I2C_FASTMODEPLUS_I2C2 |
488 | 493 | #define HAL_SYSCFG_FASTMODEPLUS_I2C3 I2C_FASTMODEPLUS_I2C3 |
| 494 | + |
489 | 495 | /** |
490 | 496 | * @} |
491 | 497 | */ |
|
599 | 605 | #define __HAL_HRTIM_GetClockPrescaler __HAL_HRTIM_GETCLOCKPRESCALER |
600 | 606 | #define __HAL_HRTIM_SetCompare __HAL_HRTIM_SETCOMPARE |
601 | 607 | #define __HAL_HRTIM_GetCompare __HAL_HRTIM_GETCOMPARE |
| 608 | + |
602 | 609 | /** |
603 | 610 | * @} |
604 | 611 | */ |
|
738 | 745 | #define OPAMP_PGACONNECT_VM0 OPAMP_PGA_CONNECT_INVERTINGINPUT_IO0 |
739 | 746 | #define OPAMP_PGACONNECT_VM1 OPAMP_PGA_CONNECT_INVERTINGINPUT_IO1 |
740 | 747 |
|
| 748 | +#if defined(STM32L1) || defined(STM32L4) |
| 749 | +#define HAL_OPAMP_MSP_INIT_CB_ID HAL_OPAMP_MSPINIT_CB_ID |
| 750 | +#define HAL_OPAMP_MSP_DEINIT_CB_ID HAL_OPAMP_MSPDEINIT_CB_ID |
| 751 | +#endif |
| 752 | + |
| 753 | + |
741 | 754 | /** |
742 | 755 | * @} |
743 | 756 | */ |
|
753 | 766 |
|
754 | 767 | #define I2S_FLAG_TXE I2S_FLAG_TXP |
755 | 768 | #define I2S_FLAG_RXNE I2S_FLAG_RXP |
756 | | - #define I2S_FLAG_FRE I2S_FLAG_TIFRE |
757 | 769 | #endif |
758 | 770 |
|
759 | 771 | #if defined(STM32F7) |
|
971 | 983 | #define IS_TIM_HALL_INTERFACE_INSTANCE IS_TIM_HALL_SENSOR_INTERFACE_INSTANCE |
972 | 984 | #endif |
973 | 985 |
|
| 986 | +#if defined(STM32H7) |
| 987 | +#define TIM_TIM1_ETR_COMP1_OUT TIM_TIM1_ETR_COMP1 |
| 988 | +#define TIM_TIM1_ETR_COMP2_OUT TIM_TIM1_ETR_COMP2 |
| 989 | +#define TIM_TIM8_ETR_COMP1_OUT TIM_TIM8_ETR_COMP1 |
| 990 | +#define TIM_TIM8_ETR_COMP2_OUT TIM_TIM8_ETR_COMP2 |
| 991 | +#define TIM_TIM2_ETR_COMP1_OUT TIM_TIM2_ETR_COMP1 |
| 992 | +#define TIM_TIM2_ETR_COMP2_OUT TIM_TIM2_ETR_COMP2 |
| 993 | +#define TIM_TIM3_ETR_COMP1_OUT TIM_TIM3_ETR_COMP1 |
| 994 | +#define TIM_TIM1_TI1_COMP1_OUT TIM_TIM1_TI1_COMP1 |
| 995 | +#define TIM_TIM8_TI1_COMP2_OUT TIM_TIM8_TI1_COMP2 |
| 996 | +#define TIM_TIM2_TI4_COMP1_OUT TIM_TIM2_TI4_COMP1 |
| 997 | +#define TIM_TIM2_TI4_COMP2_OUT TIM_TIM2_TI4_COMP2 |
| 998 | +#define TIM_TIM2_TI4_COMP1COMP2_OUT TIM_TIM2_TI4_COMP1_COMP2 |
| 999 | +#define TIM_TIM3_TI1_COMP1_OUT TIM_TIM3_TI1_COMP1 |
| 1000 | +#define TIM_TIM3_TI1_COMP2_OUT TIM_TIM3_TI1_COMP2 |
| 1001 | +#define TIM_TIM3_TI1_COMP1COMP2_OUT TIM_TIM3_TI1_COMP1_COMP2 |
| 1002 | +#endif |
| 1003 | + |
974 | 1004 | /** |
975 | 1005 | * @} |
976 | 1006 | */ |
|
1250 | 1280 |
|
1251 | 1281 | #define HAL_I2CFastModePlusConfig(SYSCFG_I2CFastModePlus, cmd) (((cmd)==ENABLE)? HAL_I2CEx_EnableFastModePlus(SYSCFG_I2CFastModePlus): HAL_I2CEx_DisableFastModePlus(SYSCFG_I2CFastModePlus)) |
1252 | 1282 |
|
1253 | | -#if defined(STM32H7) || defined(STM32G0) |
| 1283 | +#if defined(STM32H7) || defined(STM32WB) || defined(STM32G0) || defined(STM32F4) || defined(STM32F7) || defined(STM32L0) || defined(STM32L4) |
1254 | 1284 | #define HAL_I2C_Master_Sequential_Transmit_IT HAL_I2C_Master_Seq_Transmit_IT |
1255 | 1285 | #define HAL_I2C_Master_Sequential_Receive_IT HAL_I2C_Master_Seq_Receive_IT |
1256 | 1286 | #define HAL_I2C_Slave_Sequential_Transmit_IT HAL_I2C_Slave_Seq_Transmit_IT |
|
1259 | 1289 | #define HAL_I2C_Master_Sequential_Receive_DMA HAL_I2C_Master_Seq_Receive_DMA |
1260 | 1290 | #define HAL_I2C_Slave_Sequential_Transmit_DMA HAL_I2C_Slave_Seq_Transmit_DMA |
1261 | 1291 | #define HAL_I2C_Slave_Sequential_Receive_DMA HAL_I2C_Slave_Seq_Receive_DMA |
1262 | | -#endif /* STM32H7 || STM32G0 */ |
| 1292 | +#endif /* STM32H7 || STM32WB || STM32G0 || STM32F4 || STM32F7 || STM32L0 || STM32L4 */ |
| 1293 | + |
| 1294 | +#if defined(STM32F4) |
| 1295 | +#define HAL_FMPI2C_Master_Sequential_Transmit_IT HAL_FMPI2C_Master_Seq_Transmit_IT |
| 1296 | +#define HAL_FMPI2C_Master_Sequential_Receive_IT HAL_FMPI2C_Master_Seq_Receive_IT |
| 1297 | +#define HAL_FMPI2C_Slave_Sequential_Transmit_IT HAL_FMPI2C_Slave_Seq_Transmit_IT |
| 1298 | +#define HAL_FMPI2C_Slave_Sequential_Receive_IT HAL_FMPI2C_Slave_Seq_Receive_IT |
| 1299 | +#define HAL_FMPI2C_Master_Sequential_Transmit_DMA HAL_FMPI2C_Master_Seq_Transmit_DMA |
| 1300 | +#define HAL_FMPI2C_Master_Sequential_Receive_DMA HAL_FMPI2C_Master_Seq_Receive_DMA |
| 1301 | +#define HAL_FMPI2C_Slave_Sequential_Transmit_DMA HAL_FMPI2C_Slave_Seq_Transmit_DMA |
| 1302 | +#define HAL_FMPI2C_Slave_Sequential_Receive_DMA HAL_FMPI2C_Slave_Seq_Receive_DMA |
| 1303 | +#endif /* STM32F4 */ |
1263 | 1304 | /** |
1264 | 1305 | * @} |
1265 | 1306 | */ |
|
1339 | 1380 | #define HAL_TIM_DMAError TIM_DMAError |
1340 | 1381 | #define HAL_TIM_DMACaptureCplt TIM_DMACaptureCplt |
1341 | 1382 | #define HAL_TIMEx_DMACommutationCplt TIMEx_DMACommutationCplt |
1342 | | -#if defined(STM32H7) || defined(STM32G0) || defined(STM32F7) || defined(STM32F4) || defined(STM32L0) |
| 1383 | +#if defined(STM32H7) || defined(STM32G0) || defined(STM32F7) || defined(STM32F4) || defined(STM32L0) || defined(STM32L4) |
1343 | 1384 | #define HAL_TIM_SlaveConfigSynchronization HAL_TIM_SlaveConfigSynchro |
1344 | 1385 | #define HAL_TIM_SlaveConfigSynchronization_IT HAL_TIM_SlaveConfigSynchro_IT |
1345 | 1386 | #define HAL_TIMEx_CommutationCallback HAL_TIMEx_CommutCallback |
|
2235 | 2276 | #define __QSPI_FORCE_RESET __HAL_RCC_QSPI_FORCE_RESET |
2236 | 2277 | #define __QSPI_RELEASE_RESET __HAL_RCC_QSPI_RELEASE_RESET |
2237 | 2278 |
|
| 2279 | +#if defined(STM32WB) |
| 2280 | +#define __HAL_RCC_QSPI_CLK_DISABLE __HAL_RCC_QUADSPI_CLK_DISABLE |
| 2281 | +#define __HAL_RCC_QSPI_CLK_ENABLE __HAL_RCC_QUADSPI_CLK_ENABLE |
| 2282 | +#define __HAL_RCC_QSPI_CLK_SLEEP_DISABLE __HAL_RCC_QUADSPI_CLK_SLEEP_DISABLE |
| 2283 | +#define __HAL_RCC_QSPI_CLK_SLEEP_ENABLE __HAL_RCC_QUADSPI_CLK_SLEEP_ENABLE |
| 2284 | +#define __HAL_RCC_QSPI_FORCE_RESET __HAL_RCC_QUADSPI_FORCE_RESET |
| 2285 | +#define __HAL_RCC_QSPI_RELEASE_RESET __HAL_RCC_QUADSPI_RELEASE_RESET |
| 2286 | +#define __HAL_RCC_QSPI_IS_CLK_ENABLED __HAL_RCC_QUADSPI_IS_CLK_ENABLED |
| 2287 | +#define __HAL_RCC_QSPI_IS_CLK_DISABLED __HAL_RCC_QUADSPI_IS_CLK_DISABLED |
| 2288 | +#define __HAL_RCC_QSPI_IS_CLK_SLEEP_ENABLED __HAL_RCC_QUADSPI_IS_CLK_SLEEP_ENABLED |
| 2289 | +#define __HAL_RCC_QSPI_IS_CLK_SLEEP_DISABLED __HAL_RCC_QUADSPI_IS_CLK_SLEEP_DISABLED |
| 2290 | +#define QSPI_IRQHandler QUADSPI_IRQHandler |
| 2291 | +#endif /* __HAL_RCC_QUADSPI_CLK_ENABLE */ |
| 2292 | + |
2238 | 2293 | #define __RNG_CLK_DISABLE __HAL_RCC_RNG_CLK_DISABLE |
2239 | 2294 | #define __RNG_CLK_ENABLE __HAL_RCC_RNG_CLK_ENABLE |
2240 | 2295 | #define __RNG_CLK_SLEEP_DISABLE __HAL_RCC_RNG_CLK_SLEEP_DISABLE |
|
2451 | 2506 | #define __USB_OTG_FS_CLK_DISABLE __HAL_RCC_USB_OTG_FS_CLK_DISABLE |
2452 | 2507 | #define __USB_OTG_FS_CLK_ENABLE __HAL_RCC_USB_OTG_FS_CLK_ENABLE |
2453 | 2508 | #define __USB_RELEASE_RESET __HAL_RCC_USB_RELEASE_RESET |
| 2509 | + |
| 2510 | +#if defined(STM32H7) |
| 2511 | +#define __HAL_RCC_WWDG_CLK_DISABLE __HAL_RCC_WWDG1_CLK_DISABLE |
| 2512 | +#define __HAL_RCC_WWDG_CLK_ENABLE __HAL_RCC_WWDG1_CLK_ENABLE |
| 2513 | +#define __HAL_RCC_WWDG_CLK_SLEEP_DISABLE __HAL_RCC_WWDG1_CLK_SLEEP_DISABLE |
| 2514 | +#define __HAL_RCC_WWDG_CLK_SLEEP_ENABLE __HAL_RCC_WWDG1_CLK_SLEEP_ENABLE |
| 2515 | + |
| 2516 | +#define __HAL_RCC_WWDG_FORCE_RESET ((void)0U) /* Not available on the STM32H7*/ |
| 2517 | +#define __HAL_RCC_WWDG_RELEASE_RESET ((void)0U) /* Not available on the STM32H7*/ |
| 2518 | + |
| 2519 | + |
| 2520 | +#define __HAL_RCC_WWDG_IS_CLK_ENABLED __HAL_RCC_WWDG1_IS_CLK_ENABLED |
| 2521 | +#define __HAL_RCC_WWDG_IS_CLK_DISABLED __HAL_RCC_WWDG1_IS_CLK_DISABLED |
| 2522 | +#endif |
| 2523 | + |
2454 | 2524 | #define __WWDG_CLK_DISABLE __HAL_RCC_WWDG_CLK_DISABLE |
2455 | 2525 | #define __WWDG_CLK_ENABLE __HAL_RCC_WWDG_CLK_ENABLE |
2456 | 2526 | #define __WWDG_CLK_SLEEP_DISABLE __HAL_RCC_WWDG_CLK_SLEEP_DISABLE |
2457 | 2527 | #define __WWDG_CLK_SLEEP_ENABLE __HAL_RCC_WWDG_CLK_SLEEP_ENABLE |
2458 | 2528 | #define __WWDG_FORCE_RESET __HAL_RCC_WWDG_FORCE_RESET |
2459 | 2529 | #define __WWDG_RELEASE_RESET __HAL_RCC_WWDG_RELEASE_RESET |
| 2530 | + |
2460 | 2531 | #define __TIM21_CLK_ENABLE __HAL_RCC_TIM21_CLK_ENABLE |
2461 | 2532 | #define __TIM21_CLK_DISABLE __HAL_RCC_TIM21_CLK_DISABLE |
2462 | 2533 | #define __TIM21_FORCE_RESET __HAL_RCC_TIM21_FORCE_RESET |
|
2789 | 2860 | #define __WWDG_IS_CLK_ENABLED __HAL_RCC_WWDG_IS_CLK_ENABLED |
2790 | 2861 | #define __WWDG_IS_CLK_DISABLED __HAL_RCC_WWDG_IS_CLK_DISABLED |
2791 | 2862 |
|
| 2863 | +#if defined(STM32L1) |
| 2864 | +#define __HAL_RCC_CRYP_CLK_DISABLE __HAL_RCC_AES_CLK_DISABLE |
| 2865 | +#define __HAL_RCC_CRYP_CLK_ENABLE __HAL_RCC_AES_CLK_ENABLE |
| 2866 | +#define __HAL_RCC_CRYP_CLK_SLEEP_DISABLE __HAL_RCC_AES_CLK_SLEEP_DISABLE |
| 2867 | +#define __HAL_RCC_CRYP_CLK_SLEEP_ENABLE __HAL_RCC_AES_CLK_SLEEP_ENABLE |
| 2868 | +#define __HAL_RCC_CRYP_FORCE_RESET __HAL_RCC_AES_FORCE_RESET |
| 2869 | +#define __HAL_RCC_CRYP_RELEASE_RESET __HAL_RCC_AES_RELEASE_RESET |
| 2870 | +#endif /* STM32L1 */ |
| 2871 | + |
2792 | 2872 | #if defined(STM32F4) |
2793 | 2873 | #define __HAL_RCC_SDMMC1_FORCE_RESET __HAL_RCC_SDIO_FORCE_RESET |
2794 | 2874 | #define __HAL_RCC_SDMMC1_RELEASE_RESET __HAL_RCC_SDIO_RELEASE_RESET |
|
2905 | 2985 |
|
2906 | 2986 | #if defined(STM32L4) |
2907 | 2987 | #define RCC_RTCCLKSOURCE_NO_CLK RCC_RTCCLKSOURCE_NONE |
2908 | | -#elif defined(STM32G0) |
| 2988 | +#elif defined(STM32WB) || defined(STM32G0) |
2909 | 2989 | #else |
2910 | 2990 | #define RCC_RTCCLKSOURCE_NONE RCC_RTCCLKSOURCE_NO_CLK |
2911 | 2991 | #endif |
|
3149 | 3229 | #define SDIO_IRQHandler SDMMC1_IRQHandler |
3150 | 3230 | #endif |
3151 | 3231 |
|
3152 | | -#if defined(STM32F7) || defined(STM32F4) || defined(STM32F2) |
| 3232 | +#if defined(STM32F7) || defined(STM32F4) || defined(STM32F2) || defined(STM32L4) |
3153 | 3233 | #define HAL_SD_CardCIDTypedef HAL_SD_CardCIDTypeDef |
3154 | 3234 | #define HAL_SD_CardCSDTypedef HAL_SD_CardCSDTypeDef |
3155 | 3235 | #define HAL_SD_CardStatusTypedef HAL_SD_CardStatusTypeDef |
|
3408 | 3488 | * @} |
3409 | 3489 | */ |
3410 | 3490 |
|
| 3491 | +/** @defgroup HAL_QSPI_Aliased_Macros HAL QSPI Aliased Macros maintained for legacy purpose |
| 3492 | + * @{ |
| 3493 | + */ |
| 3494 | +#if defined (STM32L4) |
| 3495 | +#define HAL_QPSI_TIMEOUT_DEFAULT_VALUE HAL_QSPI_TIMEOUT_DEFAULT_VALUE |
| 3496 | +#endif |
| 3497 | +/** |
| 3498 | + * @} |
| 3499 | + */ |
| 3500 | + |
3411 | 3501 | /** @defgroup HAL_PPP_Aliased_Macros HAL PPP Aliased Macros maintained for legacy purpose |
3412 | 3502 | * @{ |
3413 | 3503 | */ |
|
0 commit comments