Skip to content

Commit 2e14f95

Browse files
gautierg-stgautierg-st
committed
stm32cube: update stm32u0 to cube version V1.2.0
Update Cube version for STM32U0xx series on https://github.com/STMicroelectronics from version v1.1.0 to version v1.2.0 Signed-off-by: Guillaume Gautier <[email protected]>
1 parent 5a5a61d commit 2e14f95

21 files changed

+320
-169
lines changed

‎stm32cube/stm32u0xx/CMakeLists.txt‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,10 @@ zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_I2C drivers/src/stm32u0xx_hal_
2626
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_I2C_EX drivers/src/stm32u0xx_hal_i2c_ex.c)
2727
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_IRDA drivers/src/stm32u0xx_hal_irda.c)
2828
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_IWDG drivers/src/stm32u0xx_hal_iwdg.c)
29-
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_LCD drivers/src/stm32u0xx_hal_lcd.c)
30-
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_LPTIM drivers/src/stm32u0xx_hal_lptim.c)
29+
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_LCD drivers/src/stm32u0xx_hal_lcd.c)
30+
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_LPTIM drivers/src/stm32u0xx_hal_lptim.c)
3131
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_OPAMP drivers/src/stm32u0xx_hal_opamp.c)
3232
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_OPAMP_EX drivers/src/stm32u0xx_hal_opamp_ex.c)
33-
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_OSPI drivers/src/stm32u0xx_hal_ospi.c)
34-
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_OTFDEC drivers/src/stm32u0xx_hal_otfdec.c)
3533
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_PCD drivers/src/stm32u0xx_hal_pcd.c)
3634
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_PCD_EX drivers/src/stm32u0xx_hal_pcd_ex.c)
3735
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_PWR drivers/src/stm32u0xx_hal_pwr.c)
@@ -45,7 +43,7 @@ zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_SMARTCARD_EX drivers/src/stm32
4543
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_SPI drivers/src/stm32u0xx_hal_spi.c)
4644
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_SPI_EX drivers/src/stm32u0xx_hal_spi_ex.c)
4745
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_TIM drivers/src/stm32u0xx_hal_tim.c)
48-
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_TIM_EX drivers/src/stm32u0xx_hal_tim_ex.c)
46+
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_TIM_EX drivers/src/stm32u0xx_hal_tim_ex.c)
4947
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_TSC drivers/src/stm32u0xx_hal_tsc.c)
5048
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_UART drivers/src/stm32u0xx_hal_uart.c)
5149
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_UART_EX drivers/src/stm32u0xx_hal_uart_ex.c)
@@ -73,9 +71,3 @@ zephyr_library_sources_ifdef(CONFIG_USE_STM32_LL_TIM drivers/src/stm32u0xx_ll_ti
7371
zephyr_library_sources_ifdef(CONFIG_USE_STM32_LL_USART drivers/src/stm32u0xx_ll_usart.c)
7472
zephyr_library_sources_ifdef(CONFIG_USE_STM32_LL_USB drivers/src/stm32u0xx_ll_usb.c)
7573
zephyr_library_sources_ifdef(CONFIG_USE_STM32_LL_UTILS drivers/src/stm32u0xx_ll_utils.c)
76-
77-
78-
79-
80-
81-

‎stm32cube/stm32u0xx/README‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Origin:
66
https://www.st.com/en/embedded-software/stm32cubeu0.html
77

88
Status:
9-
version v1.1.0
9+
version v1.2.0
1010

1111
Purpose:
1212
ST Microelectronics official MCU package for STM32U0 series.
@@ -23,7 +23,7 @@ URL:
2323
https://github.com/STMicroelectronics/STM32CubeU0
2424

2525
Commit:
26-
6452b2170313f522b4a3372054d2462b77d890d1
26+
6f2310fce68e53f7277583774141bbf016df1838
2727

2828
Maintained-by:
2929
External
@@ -40,12 +40,6 @@ Patch List:
4040
-dos2unix applied
4141
-trailing white spaces removed
4242

43-
*Created LL_SetFlashLatency function that return UTILS_SetFlashLatency
44-
Impacted files:
45-
stm32cube/stm32u0xx/drivers/src/stm32u0xx_ll_utils.c
46-
stm32cube/stm32u0xx/drivers/include/stm32u0xx_ll_utils.h
47-
Internal reference 187914.
48-
4943
*Provision to enable hal & ll asserts added
5044
-Added stm32cube/stm32u0xx/drivers/include/stm32_assert.h
5145
-Removed unused stm32cube/stm32u0xx/drivers/include/stm32_assert_template.h
@@ -54,3 +48,4 @@ Patch List:
5448
Impacted files:
5549
stm32cube/stm32u0xx/drivers/include/Legacy/stm32_hal_legacy.h
5650

51+
See release_note.html from STM32Cube

‎stm32cube/stm32u0xx/drivers/include/Legacy/stm32_hal_legacy.h‎

Lines changed: 53 additions & 10 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) && !defined(STM32H5)
475476
/* #define PAGESIZE FLASH_PAGE_SIZE */
477+
#endif /* STM32F2 && STM32F4 && STM32F7 && STM32H7 && STM32H5 */
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
*/
@@ -1264,10 +1279,10 @@ extern "C" {
12641279
#define RTC_TAMPERPIN_PA0 RTC_TAMPERPIN_POS1
12651280
#define RTC_TAMPERPIN_PI8 RTC_TAMPERPIN_POS1
12661281

1267-
#if defined(STM32H5) || defined(STM32H7RS)
1282+
#if defined(STM32H5) || defined(STM32H7RS) || defined(STM32N6)
12681283
#define TAMP_SECRETDEVICE_ERASE_NONE TAMP_DEVICESECRETS_ERASE_NONE
12691284
#define TAMP_SECRETDEVICE_ERASE_BKP_SRAM TAMP_DEVICESECRETS_ERASE_BKPSRAM
1270-
#endif /* STM32H5 || STM32H7RS */
1285+
#endif /* STM32H5 || STM32H7RS || STM32N6 */
12711286

12721287
#if defined(STM32WBA)
12731288
#define TAMP_SECRETDEVICE_ERASE_NONE TAMP_DEVICESECRETS_ERASE_NONE
@@ -1279,10 +1294,10 @@ extern "C" {
12791294
#define TAMP_SECRETDEVICE_ERASE_ALL TAMP_DEVICESECRETS_ERASE_ALL
12801295
#endif /* STM32WBA */
12811296

1282-
#if defined(STM32H5) || defined(STM32WBA) || defined(STM32H7RS)
1297+
#if defined(STM32H5) || defined(STM32WBA) || defined(STM32H7RS) || defined(STM32N6)
12831298
#define TAMP_SECRETDEVICE_ERASE_DISABLE TAMP_DEVICESECRETS_ERASE_NONE
12841299
#define TAMP_SECRETDEVICE_ERASE_ENABLE TAMP_SECRETDEVICE_ERASE_ALL
1285-
#endif /* STM32H5 || STM32WBA || STM32H7RS */
1300+
#endif /* STM32H5 || STM32WBA || STM32H7RS || STM32N6 */
12861301

12871302
#if defined(STM32F7)
12881303
#define RTC_TAMPCR_TAMPXE RTC_TAMPER_ENABLE_BITS_MASK
@@ -1466,7 +1481,7 @@ extern "C" {
14661481
#define TIM_TIM3_TI1_COMP1COMP2_OUT TIM_TIM3_TI1_COMP1_COMP2
14671482
#endif
14681483

1469-
#if defined(STM32U5) || defined(STM32MP2)
1484+
#if defined(STM32U5)
14701485
#define OCREF_CLEAR_SELECT_Pos OCREF_CLEAR_SELECT_POS
14711486
#define OCREF_CLEAR_SELECT_Msk OCREF_CLEAR_SELECT_MSK
14721487
#endif
@@ -2014,12 +2029,12 @@ extern "C" {
20142029
/** @defgroup HAL_RTC_Aliased_Functions HAL RTC Aliased Functions maintained for legacy purpose
20152030
* @{
20162031
*/
2017-
#if defined(STM32H5) || defined(STM32WBA) || defined(STM32H7RS)
2032+
#if defined(STM32H5) || defined(STM32WBA) || defined(STM32H7RS) || defined(STM32N6)
20182033
#define HAL_RTCEx_SetBoothardwareKey HAL_RTCEx_LockBootHardwareKey
20192034
#define HAL_RTCEx_BKUPBlock_Enable HAL_RTCEx_BKUPBlock
20202035
#define HAL_RTCEx_BKUPBlock_Disable HAL_RTCEx_BKUPUnblock
20212036
#define HAL_RTCEx_Erase_SecretDev_Conf HAL_RTCEx_ConfigEraseDeviceSecrets
2022-
#endif /* STM32H5 || STM32WBA || STM32H7RS */
2037+
#endif /* STM32H5 || STM32WBA || STM32H7RS || STM32N6 */
20232038

20242039
/**
20252040
* @}
@@ -3680,7 +3695,7 @@ extern "C" {
36803695
#endif
36813696

36823697
#if defined(STM32L4) || defined(STM32WB) || defined(STM32G0) || defined(STM32G4) || defined(STM32L5) || \
3683-
defined(STM32WL) || defined(STM32C0) || defined(STM32H7RS) || defined(STM32U0)
3698+
defined(STM32WL) || defined(STM32C0) || defined(STM32N6) || defined(STM32H7RS) || defined(STM32U0)
36843699
#define RCC_RTCCLKSOURCE_NO_CLK RCC_RTCCLKSOURCE_NONE
36853700
#else
36863701
#define RCC_RTCCLKSOURCE_NONE RCC_RTCCLKSOURCE_NO_CLK
@@ -3931,7 +3946,8 @@ 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 (STM32V7) || defined (STM32H5) || defined (STM32C0) || defined (STM32N6) || \
3950+
defined (STM32H7RS) || defined (STM32U0) || defined (STM32U3)
39353951
#else
39363952
#define __HAL_RTC_CLEAR_FLAG __HAL_RTC_EXTI_CLEAR_FLAG
39373953
#endif
@@ -4225,6 +4241,33 @@ extern "C" {
42254241

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

‎stm32cube/stm32u0xx/drivers/include/stm32_assert_template.h‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
/**
2+
******************************************************************************
3+
* @file stm32_assert.h
4+
* @author GPM Application Team
5+
* @brief STM32 assert template file.
6+
* This file should be copied to the application folder and renamed
7+
* to stm32_assert.h.
8+
******************************************************************************
9+
* @attention
10+
*
11+
* Copyright (c) 2023 STMicroelectronics.
12+
* All rights reserved.
13+
*
14+
* This software is licensed under terms that can be found in the LICENSE file
15+
* in the root directory of this software component.
16+
* If no LICENSE file comes with this software, it is provided AS-IS.
17+
*
18+
******************************************************************************
19+
*/
20+
21+
/* Define to prevent recursive inclusion -------------------------------------*/
22+
#ifndef __STM32_ASSERT_H
23+
#define __STM32_ASSERT_H
24+
25+
#ifdef __cplusplus
26+
extern "C" {
27+
#endif
28+
29+
/* Exported types ------------------------------------------------------------*/
30+
/* Exported constants --------------------------------------------------------*/
31+
/* Includes ------------------------------------------------------------------*/
32+
/* Exported macro ------------------------------------------------------------*/
33+
#ifdef USE_FULL_ASSERT
34+
/**
35+
* @brief The assert_param macro is used for function's parameters check.
36+
* @param expr If expr is false, it calls assert_failed function
37+
* which reports the name of the source file and the source
38+
* line number of the call that failed.
39+
* If expr is true, it returns no value.
40+
* @retval None
41+
*/
42+
#define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
43+
/* Exported functions ------------------------------------------------------- */
44+
void assert_failed(uint8_t *file, uint32_t line);
45+
#else
46+
#define assert_param(expr) ((void)0U)
47+
#endif /* USE_FULL_ASSERT */
48+
49+
#ifdef __cplusplus
50+
}
51+
#endif
52+
53+
#endif /* __STM32_ASSERT_H */

‎stm32cube/stm32u0xx/drivers/include/stm32u0xx_hal_pcd.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,14 @@ PCD_StateTypeDef HAL_PCD_GetState(PCD_HandleTypeDef const *hpcd);
462462
#define PCD_SET_BULK_EP_DBUF PCD_SET_EP_KIND
463463
#define PCD_CLEAR_BULK_EP_DBUF PCD_CLEAR_EP_KIND
464464

465+
/**
466+
* @brief Sets/clears directly STATUS_OUT bit in the endpoint register.
467+
* @param USBx USB peripheral instance register address.
468+
* @param bEpNum Endpoint Number.
469+
* @retval None
470+
*/
471+
#define PCD_SET_OUT_STATUS USB_DRD_SET_CHEP_KIND
472+
#define PCD_CLEAR_OUT_STATUS USB_DRD_CLEAR_CHEP_KIND
465473

466474
/**
467475
* @brief Clears bit CTR_RX / CTR_TX in the endpoint register.

‎stm32cube/stm32u0xx/drivers/include/stm32u0xx_hal_pcd_ex.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ extern "C" {
4747
*/
4848

4949

50-
5150
HAL_StatusTypeDef HAL_PCDEx_PMAConfig(PCD_HandleTypeDef *hpcd, uint16_t ep_addr,
5251
uint16_t ep_kind, uint32_t pmaadress);
5352

‎stm32cube/stm32u0xx/drivers/include/stm32u0xx_hal_rcc.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@ typedef struct
619619
*/
620620
/* Flags in the CR register */
621621
#define RCC_FLAG_MSIRDY ((uint32_t)((CR_REG_INDEX << 5U) | RCC_CR_MSIRDY_Pos)) /*!< MSI Ready flag */
622-
#define RCC_FLAG_HSIRDY ((uint32_t)((CR_REG_INDEX << 5U) | RCC_CR_HSIDY_Pos)) /*!< HSI Ready flag */
622+
#define RCC_FLAG_HSIRDY ((uint32_t)((CR_REG_INDEX << 5U) | RCC_CR_HSIRDY_Pos)) /*!< HSI Ready flag */
623623
#define RCC_FLAG_HSERDY ((uint32_t)((CR_REG_INDEX << 5U) | RCC_CR_HSERDY_Pos)) /*!< HSE Ready flag */
624624
#define RCC_FLAG_PLLRDY ((uint32_t)((CR_REG_INDEX << 5U) | RCC_CR_PLLRDY_Pos)) /*!< PLL Ready flag */
625625

‎stm32cube/stm32u0xx/drivers/include/stm32u0xx_ll_usb.h‎

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -53,26 +53,26 @@ typedef enum
5353
*/
5454
typedef struct
5555
{
56-
uint32_t dev_endpoints; /*!< Device Endpoints number.
56+
uint8_t dev_endpoints; /*!< Device Endpoints number.
5757
This parameter depends on the used USB core.
5858
This parameter must be a number between Min_Data = 1 and Max_Data = 15 */
5959

60-
uint32_t speed; /*!< USB Core speed.
61-
This parameter can be any value of @ref PCD_Speed/HCD_Speed
62-
(HCD_SPEED_xxx, HCD_SPEED_xxx) */
60+
uint8_t speed; /*!< USB Core speed.
61+
This parameter can be any value of @ref PCD_Speed/HCD_Speed
62+
(HCD_SPEED_xxx, HCD_SPEED_xxx) */
6363

64-
uint32_t ep0_mps; /*!< Set the Endpoint 0 Max Packet size. */
64+
uint8_t ep0_mps; /*!< Set the Endpoint 0 Max Packet size. */
6565

66-
uint32_t phy_itface; /*!< Select the used PHY interface.
67-
This parameter can be any value of @ref PCD_PHY_Module/HCD_PHY_Module */
66+
uint8_t phy_itface; /*!< Select the used PHY interface.
67+
This parameter can be any value of @ref PCD_PHY_Module/HCD_PHY_Module */
6868

69-
uint32_t Sof_enable; /*!< Enable or disable the output of the SOF signal. */
69+
uint8_t Sof_enable; /*!< Enable or disable the output of the SOF signal. */
7070

71-
uint32_t low_power_enable; /*!< Enable or disable the low Power Mode. */
71+
uint8_t low_power_enable; /*!< Enable or disable the low Power Mode. */
7272

73-
uint32_t lpm_enable; /*!< Enable or disable Link Power Management. */
73+
uint8_t lpm_enable; /*!< Enable or disable Link Power Management. */
7474

75-
uint32_t battery_charging_enable; /*!< Enable or disable Battery charging. */
75+
uint8_t battery_charging_enable; /*!< Enable or disable Battery charging. */
7676
} USB_CfgTypeDef;
7777

7878
typedef struct
@@ -526,20 +526,17 @@ typedef USB_EPTypeDef USB_DRD_EPTypeDef;
526526
\
527527
(pdwReg) &= ~(USB_CNTRX_BLSIZE | USB_CNTRX_NBLK_MSK); \
528528
\
529-
if ((wCount) > 62U) \
529+
if ((wCount) == 0U) \
530530
{ \
531-
USB_DRD_CALC_BLK32((pdwReg), (wCount), wNBlocks); \
531+
(pdwReg) |= USB_CNTRX_BLSIZE; \
532+
} \
533+
else if ((wCount) <= 62U) \
534+
{ \
535+
USB_DRD_CALC_BLK2((pdwReg), (wCount), wNBlocks); \
532536
} \
533537
else \
534538
{ \
535-
if ((wCount) == 0U) \
536-
{ \
537-
(pdwReg) |= USB_CNTRX_BLSIZE; \
538-
} \
539-
else \
540-
{ \
541-
USB_DRD_CALC_BLK2((pdwReg), (wCount), wNBlocks); \
542-
} \
539+
USB_DRD_CALC_BLK32((pdwReg), (wCount), wNBlocks); \
543540
} \
544541
} while(0) /* USB_DRD_SET_CHEP_CNT_RX_REG */
545542

‎stm32cube/stm32u0xx/drivers/src/stm32u0xx_hal.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
* @brief STM32U0xx HAL Driver version number
5656
*/
5757
#define __STM32U0xx_HAL_VERSION_MAIN (0x01U) /*!< [31:24] main version */
58-
#define __STM32U0xx_HAL_VERSION_SUB1 (0x01U) /*!< [23:16] sub1 version */
58+
#define __STM32U0xx_HAL_VERSION_SUB1 (0x02U) /*!< [23:16] sub1 version */
5959
#define __STM32U0xx_HAL_VERSION_SUB2 (0x00U) /*!< [15:8] sub2 version */
6060
#define __STM32U0xx_HAL_VERSION_RC (0x00U) /*!< [7:0] release candidate */
6161
#define __STM32U0xx_HAL_VERSION ((__STM32U0xx_HAL_VERSION_MAIN << 24U)\

0 commit comments

Comments
 (0)