Skip to content

Commit 00c813b

Browse files
fpistmfpistm
committed
system(WBA) update STM32WBAxx HAL Drivers to v1.5.0
Included in STM32CubeWBA FW v1.5.0 Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent b0f56e7 commit 00c813b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+753
-385
lines changed

‎system/Drivers/STM32WBAxx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,9 @@ extern "C" {
472472
#define TYPEPROGRAMDATA_FASTBYTE FLASH_TYPEPROGRAMDATA_FASTBYTE
473473
#define TYPEPROGRAMDATA_FASTHALFWORD FLASH_TYPEPROGRAMDATA_FASTHALFWORD
474474
#define TYPEPROGRAMDATA_FASTWORD FLASH_TYPEPROGRAMDATA_FASTWORD
475+
#if !defined(STM32F2) && !defined(STM32F4) && !defined(STM32F7) && !defined(STM32H7)
475476
#define PAGESIZE FLASH_PAGE_SIZE
477+
#endif /* STM32F2 && STM32F4 && STM32F7 && STM32H7 */
476478
#define TYPEPROGRAM_FASTBYTE FLASH_TYPEPROGRAM_BYTE
477479
#define TYPEPROGRAM_FASTHALFWORD FLASH_TYPEPROGRAM_HALFWORD
478480
#define TYPEPROGRAM_FASTWORD FLASH_TYPEPROGRAM_WORD
@@ -601,6 +603,15 @@ extern "C" {
601603
#define HAL_SYSCFG_DisableIOAnalogSwitchVDD HAL_SYSCFG_DisableIOSwitchVDD
602604
#endif /* STM32G4 */
603605

606+
#if defined(STM32U5)
607+
608+
#define HAL_SYSCFG_EnableIOAnalogSwitchBooster HAL_SYSCFG_EnableIOAnalogBooster
609+
#define HAL_SYSCFG_DisableIOAnalogSwitchBooster HAL_SYSCFG_DisableIOAnalogBooster
610+
#define HAL_SYSCFG_EnableIOAnalogSwitchVoltageSelection HAL_SYSCFG_EnableIOAnalogVoltageSelection
611+
#define HAL_SYSCFG_DisableIOAnalogSwitchVoltageSelection HAL_SYSCFG_DisableIOAnalogVoltageSelection
612+
613+
#endif /* STM32U5 */
614+
604615
#if defined(STM32H5)
605616
#define SYSCFG_IT_FPU_IOC SBS_IT_FPU_IOC
606617
#define SYSCFG_IT_FPU_DZC SBS_IT_FPU_DZC
@@ -875,6 +886,10 @@ extern "C" {
875886
#define __HAL_HRTIM_SetCompare __HAL_HRTIM_SETCOMPARE
876887
#define __HAL_HRTIM_GetCompare __HAL_HRTIM_GETCOMPARE
877888

889+
#if defined(STM32F3) || defined(STM32G4) || defined(STM32H7)
890+
#define HRTIMInterruptResquests HRTIMInterruptRequests
891+
#endif /* STM32F3 || STM32G4 || STM32H7 */
892+
878893
#if defined(STM32G4)
879894
#define HAL_HRTIM_ExternalEventCounterConfig HAL_HRTIM_ExtEventCounterConfig
880895
#define HAL_HRTIM_ExternalEventCounterEnable HAL_HRTIM_ExtEventCounterEnable
@@ -1012,8 +1027,8 @@ extern "C" {
10121027
#define HRTIM_CALIBRATIONRATE_910 (HRTIM_DLLCR_CALRTE_0)
10131028
#define HRTIM_CALIBRATIONRATE_114 (HRTIM_DLLCR_CALRTE_1)
10141029
#define HRTIM_CALIBRATIONRATE_14 (HRTIM_DLLCR_CALRTE_1 | HRTIM_DLLCR_CALRTE_0)
1015-
10161030
#endif /* STM32F3 */
1031+
10171032
/**
10181033
* @}
10191034
*/
@@ -3931,7 +3946,7 @@ extern "C" {
39313946
*/
39323947
#if defined (STM32G0) || defined (STM32L5) || defined (STM32L412xx) || defined (STM32L422xx) || \
39333948
defined (STM32L4P5xx)|| defined (STM32L4Q5xx) || defined (STM32G4) || defined (STM32WL) || defined (STM32U5) || \
3934-
defined (STM32WBA) || defined (STM32H5) || defined (STM32C0) || defined (STM32H7RS) || defined (STM32U0)
3949+
defined (STM32WBA) || defined (STM32H5) || defined (STM32C0) || defined (STM32H7RS) || defined (STM32U0)
39353950
#else
39363951
#define __HAL_RTC_CLEAR_FLAG __HAL_RTC_EXTI_CLEAR_FLAG
39373952
#endif
@@ -4225,6 +4240,33 @@ extern "C" {
42254240

42264241
#define HAL_PCD_SetTxFiFo HAL_PCDEx_SetTxFiFo
42274242
#define HAL_PCD_SetRxFiFo HAL_PCDEx_SetRxFiFo
4243+
#if defined(STM32U5)
4244+
#define USB_OTG_GOTGCTL_BSESVLD USB_OTG_GOTGCTL_BSVLD
4245+
#define USB_OTG_GAHBCFG_GINT USB_OTG_GAHBCFG_GINTMSK
4246+
#define USB_OTG_GUSBCFG_PHYLPCS USB_OTG_GUSBCFG_PHYLPC
4247+
#define USB_OTG_GRSTCTL_HSRST USB_OTG_GRSTCTL_PSRST
4248+
#define USB_OTG_GINTSTS_BOUTNAKEFF USB_OTG_GINTSTS_GONAKEFF
4249+
#define USB_OTG_GINTSTS_WKUINT USB_OTG_GINTSTS_WKUPINT
4250+
#define USB_OTG_GINTMSK_PXFRM_IISOOXFRM USB_OTG_GINTMSK_IPXFRM_IISOOXFRM
4251+
#define USB_OTG_GRXSTSP_EPNUM USB_OTG_GRXSTSP_EPNUM_CHNUM
4252+
#define USB_OTG_GLPMCFG_L1ResumeOK USB_OTG_GLPMCFG_L1RSMOK
4253+
#define USB_OTG_HPTXFSIZ_PTXFD USB_OTG_HPTXFSIZ_PTXFSIZ
4254+
#define USB_OTG_HCCHAR_MC USB_OTG_HCCHAR_MCNT
4255+
#define USB_OTG_HCCHAR_MC_0 USB_OTG_HCCHAR_MCNT_0
4256+
#define USB_OTG_HCCHAR_MC_1 USB_OTG_HCCHAR_MCNT_1
4257+
#define USB_OTG_HCINTMSK_AHBERR USB_OTG_HCINTMSK_AHBERRM
4258+
#define USB_OTG_HCTSIZ_DOPING USB_OTG_HCTSIZ_DOPNG
4259+
#define USB_OTG_DOEPMSK_OPEM USB_OTG_DOEPMSK_OUTPKTERRM
4260+
#define USB_OTG_DIEPCTL_SODDFRM USB_OTG_DIEPCTL_SD1PID_SODDFRM
4261+
#define USB_OTG_DIEPTSIZ_MULCNT USB_OTG_DIEPTSIZ_MCNT
4262+
#define USB_OTG_DOEPCTL_SODDFRM USB_OTG_DOEPCTL_SD1PID_SODDFRM
4263+
#define USB_OTG_DOEPCTL_DPID USB_OTG_DOEPCTL_DPID_EONUM
4264+
#define USB_OTG_DOEPTSIZ_STUPCNT USB_OTG_DOEPTSIZ_RXDPID
4265+
#define USB_OTG_DOEPTSIZ_STUPCNT_0 USB_OTG_DOEPTSIZ_RXDPID_0
4266+
#define USB_OTG_DOEPTSIZ_STUPCNT_1 USB_OTG_DOEPTSIZ_RXDPID_1
4267+
#define USB_OTG_PCGCCTL_STOPCLK USB_OTG_PCGCCTL_STPPCLK
4268+
#define USB_OTG_PCGCCTL_GATECLK USB_OTG_PCGCCTL_GATEHCLK
4269+
#endif
42284270
/**
42294271
* @}
42304272
*/

‎system/Drivers/STM32WBAxx_HAL_Driver/Inc/stm32wbaxx_hal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ extern HAL_TickFreqTypeDef uwTickFreq;
7979
* @brief STM32WBAxx HAL Driver version number
8080
*/
8181
#define __STM32WBAxx_HAL_VERSION_MAIN (0x01U) /*!< [31:24] main version */
82-
#define __STM32WBAxx_HAL_VERSION_SUB1 (0x04U) /*!< [23:16] sub1 version */
82+
#define __STM32WBAxx_HAL_VERSION_SUB1 (0x05U) /*!< [23:16] sub1 version */
8383
#define __STM32WBAxx_HAL_VERSION_SUB2 (0x00U) /*!< [15:8] sub2 version */
8484
#define __STM32WBAxx_HAL_VERSION_RC (0x00U) /*!< [7:0] release candidate */
8585
#define __STM32WBAxx_HAL_VERSION ((__STM32WBAxx_HAL_VERSION_MAIN << 24U)\

‎system/Drivers/STM32WBAxx_HAL_Driver/Inc/stm32wbaxx_hal_comp.h

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,10 @@ typedef void (*pCOMP_CallbackTypeDef)(COMP_HandleTypeDef *hcomp); /*!< pointer
228228
/* Note: For the characteristics of comparator power modes */
229229
/* (propagation delay and power consumption), */
230230
/* refer to device datasheet. */
231-
#define COMP_POWERMODE_HIGHSPEED (0x00000000UL) /*!< High Speed */
232-
#define COMP_POWERMODE_MEDIUMSPEED (COMP_CSR_PWRMODE_0) /*!< Medium Speed */
231+
#define COMP_POWERMODE_HIGHSPEED (0x00000000UL) /*!< High speed */
232+
#define COMP_POWERMODE_INTERMSPEED (COMP_CSR_PWRMODE_0) /*!< Intermediate speed */
233+
#define COMP_POWERMODE_MEDIUMSPEED (COMP_CSR_PWRMODE_1) /*!< Medium speed */
234+
#define COMP_POWERMODE_ULTRALOWPOWER (COMP_CSR_PWRMODE_1 | COMP_CSR_PWRMODE_0) /*!< Ultra-low power */
233235
/**
234236
* @}
235237
*/
@@ -418,16 +420,16 @@ typedef void (*pCOMP_CallbackTypeDef)(COMP_HandleTypeDef *hcomp); /*!< pointer
418420
* @brief Enable the COMP1 EXTI line rising & falling edge trigger.
419421
* @retval None
420422
*/
421-
#define __HAL_COMP_COMP1_EXTI_ENABLE_RISING_FALLING_EDGE() do { \
422-
LL_EXTI_EnableRisingTrig_0_31(COMP_EXTI_LINE_COMP1); \
423-
LL_EXTI_EnableFallingTrig_0_31(COMP_EXTI_LINE_COMP1);\
423+
#define __HAL_COMP_COMP1_EXTI_ENABLE_RISING_FALLING_EDGE() do { \
424+
LL_EXTI_EnableRisingTrig_0_31(COMP_EXTI_LINE_COMP1); \
425+
LL_EXTI_EnableFallingTrig_0_31(COMP_EXTI_LINE_COMP1); \
424426
} while(0)
425427

426428
/**
427429
* @brief Disable the COMP1 EXTI line rising & falling edge trigger.
428430
* @retval None
429431
*/
430-
#define __HAL_COMP_COMP1_EXTI_DISABLE_RISING_FALLING_EDGE() do { \
432+
#define __HAL_COMP_COMP1_EXTI_DISABLE_RISING_FALLING_EDGE() do { \
431433
LL_EXTI_DisableRisingTrig_0_31(COMP_EXTI_LINE_COMP1); \
432434
LL_EXTI_DisableFallingTrig_0_31(COMP_EXTI_LINE_COMP1);\
433435
} while(0)
@@ -514,17 +516,17 @@ typedef void (*pCOMP_CallbackTypeDef)(COMP_HandleTypeDef *hcomp); /*!< pointer
514516
* @brief Enable the COMP2 EXTI line rising & falling edge trigger.
515517
* @retval None
516518
*/
517-
#define __HAL_COMP_COMP2_EXTI_ENABLE_RISING_FALLING_EDGE() do { \
518-
LL_EXTI_EnableRisingTrig_0_31(COMP_EXTI_LINE_COMP2);\
519-
LL_EXTI_EnableFallingTrig_0_31(COMP_EXTI_LINE_COMP2);\
519+
#define __HAL_COMP_COMP2_EXTI_ENABLE_RISING_FALLING_EDGE() do { \
520+
LL_EXTI_EnableRisingTrig_0_31(COMP_EXTI_LINE_COMP2); \
521+
LL_EXTI_EnableFallingTrig_0_31(COMP_EXTI_LINE_COMP2); \
520522
} while(0)
521523

522524
/**
523525
* @brief Disable the COMP2 EXTI line rising & falling edge trigger.
524526
* @retval None
525527
*/
526-
#define __HAL_COMP_COMP2_EXTI_DISABLE_RISING_FALLING_EDGE() do { \
527-
LL_EXTI_DisableRisingTrig_0_31(COMP_EXTI_LINE_COMP2);\
528+
#define __HAL_COMP_COMP2_EXTI_DISABLE_RISING_FALLING_EDGE() do { \
529+
LL_EXTI_DisableRisingTrig_0_31(COMP_EXTI_LINE_COMP2); \
528530
LL_EXTI_DisableFallingTrig_0_31(COMP_EXTI_LINE_COMP2);\
529531
} while(0)
530532

@@ -662,18 +664,20 @@ typedef void (*pCOMP_CallbackTypeDef)(COMP_HandleTypeDef *hcomp); /*!< pointer
662664
((__WINDOWOUTPUT__) == COMP_WINDOWOUTPUT_BOTH) )
663665

664666
#define IS_COMP_POWERMODE(__POWERMODE__) (((__POWERMODE__) == COMP_POWERMODE_HIGHSPEED) || \
665-
((__POWERMODE__) == COMP_POWERMODE_MEDIUMSPEED) )
667+
((__POWERMODE__) == COMP_POWERMODE_INTERMSPEED) || \
668+
((__POWERMODE__) == COMP_POWERMODE_MEDIUMSPEED) || \
669+
((__POWERMODE__) == COMP_POWERMODE_ULTRALOWPOWER) )
666670

667671
#define IS_COMP_INPUT_PLUS(__COMP_INSTANCE__, __INPUT_PLUS__) ((__INPUT_PLUS__) == COMP_INPUT_PLUS_IO1)
668672

669673
/* Note: On this STM32 series, comparator input minus parameters are */
670674
/* the same on all COMP instances. */
671675
/* However, comparator instance kept as macro parameter for */
672-
/* compatibility with other STM32 families. */
673-
#define IS_COMP_INPUT_MINUS(__COMP_INSTANCE__, __INPUT_MINUS__) (((__INPUT_MINUS__) == COMP_INPUT_MINUS_1_4VREFINT) ||\
674-
((__INPUT_MINUS__) == COMP_INPUT_MINUS_1_2VREFINT) ||\
675-
((__INPUT_MINUS__) == COMP_INPUT_MINUS_3_4VREFINT) ||\
676-
((__INPUT_MINUS__) == COMP_INPUT_MINUS_VREFINT) ||\
676+
/* compatibility with other STM32 series. */
677+
#define IS_COMP_INPUT_MINUS(__COMP_INSTANCE__, __INPUT_MINUS__) (((__INPUT_MINUS__) == COMP_INPUT_MINUS_1_4VREFINT) || \
678+
((__INPUT_MINUS__) == COMP_INPUT_MINUS_1_2VREFINT) || \
679+
((__INPUT_MINUS__) == COMP_INPUT_MINUS_3_4VREFINT) || \
680+
((__INPUT_MINUS__) == COMP_INPUT_MINUS_VREFINT) || \
677681
((__INPUT_MINUS__) == COMP_INPUT_MINUS_IO1))
678682

679683
#define IS_COMP_HYSTERESIS(__HYSTERESIS__) (((__HYSTERESIS__) == COMP_HYSTERESIS_NONE) || \
@@ -685,14 +689,14 @@ typedef void (*pCOMP_CallbackTypeDef)(COMP_HandleTypeDef *hcomp); /*!< pointer
685689
((__POL__) == COMP_OUTPUTPOL_INVERTED))
686690

687691
#define IS_COMP_BLANKINGSRC_INSTANCE(__INSTANCE__, __OUTPUT_BLANKING_SOURCE__) \
688-
((((__INSTANCE__) == COMP1) && \
692+
((((__INSTANCE__) == COMP1) && \
689693
(((__OUTPUT_BLANKING_SOURCE__) == COMP_BLANKINGSRC_NONE) || \
690694
((__OUTPUT_BLANKING_SOURCE__) == COMP_BLANKINGSRC_TIM1_OC5_COMP1) || \
691695
((__OUTPUT_BLANKING_SOURCE__) == COMP_BLANKINGSRC_TIM2_OC3_COMP1) || \
692696
((__OUTPUT_BLANKING_SOURCE__) == COMP_BLANKINGSRC_TIM3_OC3_COMP1))) \
693-
|| \
694-
(((__INSTANCE__) == COMP2) && \
695-
(((__OUTPUT_BLANKING_SOURCE__) == COMP_BLANKINGSRC_NONE) || \
697+
|| \
698+
(((__INSTANCE__) == COMP2) && \
699+
(((__OUTPUT_BLANKING_SOURCE__) == COMP_BLANKINGSRC_NONE) || \
696700
((__OUTPUT_BLANKING_SOURCE__) == COMP_BLANKINGSRC_TIM3_OC4_COMP2))))
697701

698702

‎system/Drivers/STM32WBAxx_HAL_Driver/Inc/stm32wbaxx_hal_conf_template.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,9 @@ extern "C" {
9595
*/
9696
#if !defined (LSI_VALUE)
9797
#define LSI_VALUE 32000UL /*!< LSI Typical Value in Hz*/
98-
#endif /* LSI_VALUE */ /*!< Value of the Internal Low Speed oscillator in Hz. The real value may vary depending on the variations in voltage and temperature.*/
98+
#endif /* LSI_VALUE */ /*!< Value of the Internal Low Speed oscillator in Hz
99+
The real value may vary depending on the variations in voltage
100+
and temperature.*/
99101

100102
#if defined (RCC_LSI2_SUPPORT)
101103
#if !defined (LSI2_VALUE)
@@ -158,8 +160,8 @@ extern "C" {
158160
#define USE_HAL_CRYP_REGISTER_CALLBACKS 0U /* CRYP register callback disabled */
159161
#define USE_HAL_HASH_REGISTER_CALLBACKS 0U /* HASH register callback disabled */
160162
#define USE_HAL_I2C_REGISTER_CALLBACKS 0U /* I2C register callback disabled */
161-
#define USE_HAL_IWDG_REGISTER_CALLBACKS 0U /* IWDG register callback disabled */
162163
#define USE_HAL_IRDA_REGISTER_CALLBACKS 0U /* IRDA register callback disabled */
164+
#define USE_HAL_IWDG_REGISTER_CALLBACKS 0U /* IWDG register callback disabled */
163165
#define USE_HAL_LPTIM_REGISTER_CALLBACKS 0U /* LPTIM register callback disabled */
164166
#define USE_HAL_PKA_REGISTER_CALLBACKS 0U /* PKA register callback disabled */
165167
#define USE_HAL_RAMCFG_REGISTER_CALLBACKS 0U /* RAMCFG register callback disabled */
@@ -191,12 +193,10 @@ extern "C" {
191193

192194
#define USE_HAL_HASH_SUSPEND_RESUME 0U
193195

194-
195196
/* Includes ------------------------------------------------------------------*/
196197
/**
197198
* @brief Include module's header file
198199
*/
199-
200200
#ifdef HAL_DMA_MODULE_ENABLED
201201
#include "stm32wbaxx_hal_dma.h"
202202
#endif /* HAL_DMA_MODULE_ENABLED */

‎system/Drivers/STM32WBAxx_HAL_Driver/Inc/stm32wbaxx_hal_def.h

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,16 @@ typedef enum
113113
}while (0)
114114
#endif /* USE_RTOS */
115115

116-
#if defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050) /* ARM Compiler V6 */
116+
#if defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
117+
/* ARM Compiler V6 */
117118
#ifndef __weak
118119
#define __weak __attribute__((weak))
119120
#endif /* __weak */
120121
#ifndef __packed
121122
#define __packed __attribute__((packed))
122123
#endif /* __packed */
123-
#elif defined (__GNUC__) /* GNU Compiler */
124+
#elif defined (__GNUC__)
125+
/* GNU Compiler */
124126
#ifndef __weak
125127
#define __weak __attribute__((weak))
126128
#endif /* __weak */
@@ -148,11 +150,14 @@ typedef enum
148150
#endif /* __ARMCC_VERSION || __GNUC__ */
149151

150152
/* Macro to get variable aligned on 32-bytes, needed for cache maintenance purpose */
151-
#if defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050) /* ARM Compiler V6 */
153+
#if defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
154+
/* ARM Compiler V6 */
152155
#define ALIGN_32BYTES(buf) __ALIGNED(32) buf
153-
#elif defined (__ICCARM__) /* IAR Compiler */
156+
#elif defined (__ICCARM__)
157+
/* IAR Compiler */
154158
#define ALIGN_32BYTES(buf) _Pragma("data_alignment=32") buf
155-
#elif defined (__GNUC__) /* GNU Compiler */
159+
#elif defined (__GNUC__)
160+
/* GNU Compiler */
156161
#define ALIGN_32BYTES(buf) buf __attribute__ ((aligned (32)))
157162
#endif /* __ARMCC_VERSION */
158163

‎system/Drivers/STM32WBAxx_HAL_Driver/Inc/stm32wbaxx_hal_dma.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,7 @@ typedef struct __DMA_HandleTypeDef
412412
#define DMA_SRC_ALLOCATED_PORT1 DMA_CTR1_SAP /*!< Source allocated Port 1 */
413413
#define DMA_DEST_ALLOCATED_PORT0 0x00000000U /*!< Destination allocated Port 0 */
414414
#define DMA_DEST_ALLOCATED_PORT1 DMA_CTR1_DAP /*!< Destination allocated Port 1 */
415+
415416
/**
416417
* @}
417418
*/
@@ -463,7 +464,6 @@ typedef struct __DMA_HandleTypeDef
463464
*/
464465

465466

466-
467467
/**
468468
* @}
469469
*/

‎system/Drivers/STM32WBAxx_HAL_Driver/Inc/stm32wbaxx_hal_dma_ex.h

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ typedef struct __DMA_QListTypeDef
190190
=> Packed at the destination data width */
191191
#define DMA_DATA_UNPACK DMA_CTR1_PAM_1 /*!< If source data width > destination data width
192192
=> Unpacked at the destination data width */
193+
193194
/**
194195
* @}
195196
*/
@@ -281,6 +282,7 @@ typedef struct __DMA_QListTypeDef
281282
* @{
282283
*/
283284
#define DMA_GPDMA_LINEAR_NODE (DMA_CHANNEL_TYPE_GPDMA | DMA_CHANNEL_TYPE_LINEAR_ADDR) /*!< Defines the GPDMA linear addressing node type */
285+
284286
/**
285287
* @}
286288
*/
@@ -418,6 +420,7 @@ HAL_StatusTypeDef HAL_DMAEx_Resume(DMA_HandleTypeDef *const hdma);
418420
* @{
419421
*/
420422
uint32_t HAL_DMAEx_GetFifoLevel(DMA_HandleTypeDef const *const hdma);
423+
421424
/**
422425
* @}
423426
*/
@@ -457,9 +460,10 @@ typedef struct
457460
* @brief DMAEx Private Constants
458461
* @{
459462
*/
460-
#define DMA_LINKEDLIST (0x0080U) /* DMA channel linked-list mode */
463+
#define DMA_LINKEDLIST (0x0080U ) /* DMA channel linked-list mode */
461464

462465
#define DMA_CHANNEL_TYPE_LINEAR_ADDR (0x0001U) /* DMA channel linear addressing mode */
466+
#define DMA_CHANNEL_TYPE_2D_ADDR (0x0002U) /* DMA channel 2D addressing mode */
463467
#define DMA_CHANNEL_TYPE_GPDMA (0x0020U) /* GPDMA channel node */
464468

465469
#define NODE_TYPE_MASK (0x00FFU) /* DMA channel node type */
@@ -511,14 +515,6 @@ typedef struct
511515
#define IS_DMA_REPEAT_COUNT(COUNT) \
512516
(((COUNT) > 0U) && ((COUNT) <= (DMA_CBR1_BRC >> DMA_CBR1_BRC_Pos)))
513517

514-
#define IS_DMA_BURST_ADDR_OFFSET(BURST_ADDR_OFFSET) \
515-
(((BURST_ADDR_OFFSET) > DMA_BURST_ADDR_OFFSET_MIN) && \
516-
((BURST_ADDR_OFFSET) < DMA_BURST_ADDR_OFFSET_MAX))
517-
518-
#define IS_DMA_BLOCK_ADDR_OFFSET(BLOCK_ADDR_OFFSET) \
519-
(((BLOCK_ADDR_OFFSET) > DMA_BLOCK_ADDR_OFFSET_MIN) && \
520-
((BLOCK_ADDR_OFFSET) < DMA_BLOCK_ADDR_OFFSET_MAX))
521-
522518
#define IS_DMA_LINK_ALLOCATED_PORT(LINK_ALLOCATED_PORT) \
523519
(((LINK_ALLOCATED_PORT) & (~(DMA_CCR_LAP))) == 0U)
524520

0 commit comments

Comments
 (0)