Skip to content

Commit 5e72ff9

Browse files
authored
Merge pull request #1452 from fpistm/G0update
Update STM32G0 HAL and CMSIS drivers
2 parents 0686e2d + ad3de30 commit 5e72ff9

File tree

156 files changed

+6960
-4709
lines changed

Some content is hidden

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

156 files changed

+6960
-4709
lines changed

Diff for: libraries/SrcWrapper/src/HAL/stm32yyxx_hal_smbus_ex.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
#pragma GCC diagnostic push
33
#pragma GCC diagnostic ignored "-Wunused-parameter"
44

5-
#ifdef STM32G4xx
5+
#ifdef STM32G0xx
6+
#include "stm32g0xx_hal_smbus_ex.c"
7+
#elif STM32G4xx
68
#include "stm32g4xx_hal_smbus_ex.c"
79
#elif STM32L0xx
810
#include "stm32l0xx_hal_smbus_ex.c"

Diff for: system/Drivers/CMSIS/Device/ST/STM32G0xx/Include/stm32g030xx.h

+14-8
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,15 @@
1414
******************************************************************************
1515
* @attention
1616
*
17-
* <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
18-
* All rights reserved.</center></h2>
17+
* Copyright (c) 2018-2021 STMicroelectronics.
18+
* All rights reserved.
1919
*
20-
* This software component is licensed by ST under Apache License, Version 2.0,
21-
* the "License"; You may not use this file except in compliance with the
22-
* License. You may obtain a copy of the License at:
23-
* opensource.org/licenses/Apache-2.0
20+
* This software is licensed under terms that can be found in the LICENSE file
21+
* in the root directory of this software component.
22+
* If no LICENSE file comes with this software, it is provided AS-IS.
2423
*
2524
******************************************************************************
2625
*/
27-
2826
/** @addtogroup CMSIS_Device
2927
* @{
3028
*/
@@ -662,6 +660,15 @@ typedef struct
662660
* @{
663661
*/
664662

663+
/** @addtogroup Hardware_Constant_Definition
664+
* @{
665+
*/
666+
#define LSI_STARTUP_TIME 130U /*!< LSI Maximum startup time in us */
667+
668+
/**
669+
* @}
670+
*/
671+
665672
/** @addtogroup Peripheral_Registers_Bits_Definition
666673
* @{
667674
*/
@@ -1592,7 +1599,6 @@ typedef struct
15921599
#define DMAMUX_CxCR_DMAREQ_ID_4 (0x10UL << DMAMUX_CxCR_DMAREQ_ID_Pos) /*!< 0x00000010 */
15931600
#define DMAMUX_CxCR_DMAREQ_ID_5 (0x20UL << DMAMUX_CxCR_DMAREQ_ID_Pos) /*!< 0x00000020 */
15941601
#define DMAMUX_CxCR_DMAREQ_ID_6 (0x40UL << DMAMUX_CxCR_DMAREQ_ID_Pos) /*!< 0x00000040 */
1595-
#define DMAMUX_CxCR_DMAREQ_ID_7 (0x80UL << DMAMUX_CxCR_DMAREQ_ID_Pos) /*!< 0x00000080 */
15961602
#define DMAMUX_CxCR_SOIE_Pos (8U)
15971603
#define DMAMUX_CxCR_SOIE_Msk (0x1UL << DMAMUX_CxCR_SOIE_Pos) /*!< 0x00000100 */
15981604
#define DMAMUX_CxCR_SOIE DMAMUX_CxCR_SOIE_Msk /*!< Synchro overrun interrupt enable */

Diff for: system/Drivers/CMSIS/Device/ST/STM32G0xx/Include/stm32g031xx.h

+14-8
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,15 @@
1414
******************************************************************************
1515
* @attention
1616
*
17-
* <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
18-
* All rights reserved.</center></h2>
17+
* Copyright (c) 2018-2021 STMicroelectronics.
18+
* All rights reserved.
1919
*
20-
* This software component is licensed by ST under Apache License, Version 2.0,
21-
* the "License"; You may not use this file except in compliance with the
22-
* License. You may obtain a copy of the License at:
23-
* opensource.org/licenses/Apache-2.0
20+
* This software is licensed under terms that can be found in the LICENSE file
21+
* in the root directory of this software component.
22+
* If no LICENSE file comes with this software, it is provided AS-IS.
2423
*
2524
******************************************************************************
2625
*/
27-
2826
/** @addtogroup CMSIS_Device
2927
* @{
3028
*/
@@ -705,6 +703,15 @@ typedef struct
705703
* @{
706704
*/
707705

706+
/** @addtogroup Hardware_Constant_Definition
707+
* @{
708+
*/
709+
#define LSI_STARTUP_TIME 130U /*!< LSI Maximum startup time in us */
710+
711+
/**
712+
* @}
713+
*/
714+
708715
/** @addtogroup Peripheral_Registers_Bits_Definition
709716
* @{
710717
*/
@@ -1635,7 +1642,6 @@ typedef struct
16351642
#define DMAMUX_CxCR_DMAREQ_ID_4 (0x10UL << DMAMUX_CxCR_DMAREQ_ID_Pos) /*!< 0x00000010 */
16361643
#define DMAMUX_CxCR_DMAREQ_ID_5 (0x20UL << DMAMUX_CxCR_DMAREQ_ID_Pos) /*!< 0x00000020 */
16371644
#define DMAMUX_CxCR_DMAREQ_ID_6 (0x40UL << DMAMUX_CxCR_DMAREQ_ID_Pos) /*!< 0x00000040 */
1638-
#define DMAMUX_CxCR_DMAREQ_ID_7 (0x80UL << DMAMUX_CxCR_DMAREQ_ID_Pos) /*!< 0x00000080 */
16391645
#define DMAMUX_CxCR_SOIE_Pos (8U)
16401646
#define DMAMUX_CxCR_SOIE_Msk (0x1UL << DMAMUX_CxCR_SOIE_Pos) /*!< 0x00000100 */
16411647
#define DMAMUX_CxCR_SOIE DMAMUX_CxCR_SOIE_Msk /*!< Synchro overrun interrupt enable */

Diff for: system/Drivers/CMSIS/Device/ST/STM32G0xx/Include/stm32g041xx.h

+14-8
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,15 @@
1414
******************************************************************************
1515
* @attention
1616
*
17-
* <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
18-
* All rights reserved.</center></h2>
17+
* Copyright (c) 2018-2021 STMicroelectronics.
18+
* All rights reserved.
1919
*
20-
* This software component is licensed by ST under Apache License, Version 2.0,
21-
* the "License"; You may not use this file except in compliance with the
22-
* License. You may obtain a copy of the License at:
23-
* opensource.org/licenses/Apache-2.0
20+
* This software is licensed under terms that can be found in the LICENSE file
21+
* in the root directory of this software component.
22+
* If no LICENSE file comes with this software, it is provided AS-IS.
2423
*
2524
******************************************************************************
2625
*/
27-
2826
/** @addtogroup CMSIS_Device
2927
* @{
3028
*/
@@ -752,6 +750,15 @@ typedef struct
752750
* @{
753751
*/
754752

753+
/** @addtogroup Hardware_Constant_Definition
754+
* @{
755+
*/
756+
#define LSI_STARTUP_TIME 130U /*!< LSI Maximum startup time in us */
757+
758+
/**
759+
* @}
760+
*/
761+
755762
/** @addtogroup Peripheral_Registers_Bits_Definition
756763
* @{
757764
*/
@@ -1871,7 +1878,6 @@ typedef struct
18711878
#define DMAMUX_CxCR_DMAREQ_ID_4 (0x10UL << DMAMUX_CxCR_DMAREQ_ID_Pos) /*!< 0x00000010 */
18721879
#define DMAMUX_CxCR_DMAREQ_ID_5 (0x20UL << DMAMUX_CxCR_DMAREQ_ID_Pos) /*!< 0x00000020 */
18731880
#define DMAMUX_CxCR_DMAREQ_ID_6 (0x40UL << DMAMUX_CxCR_DMAREQ_ID_Pos) /*!< 0x00000040 */
1874-
#define DMAMUX_CxCR_DMAREQ_ID_7 (0x80UL << DMAMUX_CxCR_DMAREQ_ID_Pos) /*!< 0x00000080 */
18751881
#define DMAMUX_CxCR_SOIE_Pos (8U)
18761882
#define DMAMUX_CxCR_SOIE_Msk (0x1UL << DMAMUX_CxCR_SOIE_Pos) /*!< 0x00000100 */
18771883
#define DMAMUX_CxCR_SOIE DMAMUX_CxCR_SOIE_Msk /*!< Synchro overrun interrupt enable */

Diff for: system/Drivers/CMSIS/Device/ST/STM32G0xx/Include/stm32g050xx.h

+14-8
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,15 @@
1414
******************************************************************************
1515
* @attention
1616
*
17-
* <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
18-
* All rights reserved.</center></h2>
17+
* Copyright (c) 2018-2021 STMicroelectronics.
18+
* All rights reserved.
1919
*
20-
* This software component is licensed by ST under Apache License, Version 2.0,
21-
* the "License"; You may not use this file except in compliance with the
22-
* License. You may obtain a copy of the License at:
23-
* opensource.org/licenses/Apache-2.0
20+
* This software is licensed under terms that can be found in the LICENSE file
21+
* in the root directory of this software component.
22+
* If no LICENSE file comes with this software, it is provided AS-IS.
2423
*
2524
******************************************************************************
2625
*/
27-
2826
/** @addtogroup CMSIS_Device
2927
* @{
3028
*/
@@ -681,6 +679,15 @@ typedef struct
681679
* @{
682680
*/
683681

682+
/** @addtogroup Hardware_Constant_Definition
683+
* @{
684+
*/
685+
#define LSI_STARTUP_TIME 130U /*!< LSI Maximum startup time in us */
686+
687+
/**
688+
* @}
689+
*/
690+
684691
/** @addtogroup Peripheral_Registers_Bits_Definition
685692
* @{
686693
*/
@@ -1611,7 +1618,6 @@ typedef struct
16111618
#define DMAMUX_CxCR_DMAREQ_ID_4 (0x10UL << DMAMUX_CxCR_DMAREQ_ID_Pos) /*!< 0x00000010 */
16121619
#define DMAMUX_CxCR_DMAREQ_ID_5 (0x20UL << DMAMUX_CxCR_DMAREQ_ID_Pos) /*!< 0x00000020 */
16131620
#define DMAMUX_CxCR_DMAREQ_ID_6 (0x40UL << DMAMUX_CxCR_DMAREQ_ID_Pos) /*!< 0x00000040 */
1614-
#define DMAMUX_CxCR_DMAREQ_ID_7 (0x80UL << DMAMUX_CxCR_DMAREQ_ID_Pos) /*!< 0x00000080 */
16151621
#define DMAMUX_CxCR_SOIE_Pos (8U)
16161622
#define DMAMUX_CxCR_SOIE_Msk (0x1UL << DMAMUX_CxCR_SOIE_Pos) /*!< 0x00000100 */
16171623
#define DMAMUX_CxCR_SOIE DMAMUX_CxCR_SOIE_Msk /*!< Synchro overrun interrupt enable */

Diff for: system/Drivers/CMSIS/Device/ST/STM32G0xx/Include/stm32g051xx.h

+14-8
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,15 @@
1414
******************************************************************************
1515
* @attention
1616
*
17-
* <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
18-
* All rights reserved.</center></h2>
17+
* Copyright (c) 2018-2021 STMicroelectronics.
18+
* All rights reserved.
1919
*
20-
* This software component is licensed by ST under Apache License, Version 2.0,
21-
* the "License"; You may not use this file except in compliance with the
22-
* License. You may obtain a copy of the License at:
23-
* opensource.org/licenses/Apache-2.0
20+
* This software is licensed under terms that can be found in the LICENSE file
21+
* in the root directory of this software component.
22+
* If no LICENSE file comes with this software, it is provided AS-IS.
2423
*
2524
******************************************************************************
2625
*/
27-
2826
/** @addtogroup CMSIS_Device
2927
* @{
3028
*/
@@ -768,6 +766,15 @@ typedef struct
768766
* @{
769767
*/
770768

769+
/** @addtogroup Hardware_Constant_Definition
770+
* @{
771+
*/
772+
#define LSI_STARTUP_TIME 130U /*!< LSI Maximum startup time in us */
773+
774+
/**
775+
* @}
776+
*/
777+
771778
/** @addtogroup Peripheral_Registers_Bits_Definition
772779
* @{
773780
*/
@@ -1929,7 +1936,6 @@ typedef struct
19291936
#define DMAMUX_CxCR_DMAREQ_ID_4 (0x10UL << DMAMUX_CxCR_DMAREQ_ID_Pos) /*!< 0x00000010 */
19301937
#define DMAMUX_CxCR_DMAREQ_ID_5 (0x20UL << DMAMUX_CxCR_DMAREQ_ID_Pos) /*!< 0x00000020 */
19311938
#define DMAMUX_CxCR_DMAREQ_ID_6 (0x40UL << DMAMUX_CxCR_DMAREQ_ID_Pos) /*!< 0x00000040 */
1932-
#define DMAMUX_CxCR_DMAREQ_ID_7 (0x80UL << DMAMUX_CxCR_DMAREQ_ID_Pos) /*!< 0x00000080 */
19331939
#define DMAMUX_CxCR_SOIE_Pos (8U)
19341940
#define DMAMUX_CxCR_SOIE_Msk (0x1UL << DMAMUX_CxCR_SOIE_Pos) /*!< 0x00000100 */
19351941
#define DMAMUX_CxCR_SOIE DMAMUX_CxCR_SOIE_Msk /*!< Synchro overrun interrupt enable */

Diff for: system/Drivers/CMSIS/Device/ST/STM32G0xx/Include/stm32g061xx.h

+14-8
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,15 @@
1414
******************************************************************************
1515
* @attention
1616
*
17-
* <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
18-
* All rights reserved.</center></h2>
17+
* Copyright (c) 2018-2021 STMicroelectronics.
18+
* All rights reserved.
1919
*
20-
* This software component is licensed by ST under Apache License, Version 2.0,
21-
* the "License"; You may not use this file except in compliance with the
22-
* License. You may obtain a copy of the License at:
23-
* opensource.org/licenses/Apache-2.0
20+
* This software is licensed under terms that can be found in the LICENSE file
21+
* in the root directory of this software component.
22+
* If no LICENSE file comes with this software, it is provided AS-IS.
2423
*
2524
******************************************************************************
2625
*/
27-
2826
/** @addtogroup CMSIS_Device
2927
* @{
3028
*/
@@ -815,6 +813,15 @@ typedef struct
815813
* @{
816814
*/
817815

816+
/** @addtogroup Hardware_Constant_Definition
817+
* @{
818+
*/
819+
#define LSI_STARTUP_TIME 130U /*!< LSI Maximum startup time in us */
820+
821+
/**
822+
* @}
823+
*/
824+
818825
/** @addtogroup Peripheral_Registers_Bits_Definition
819826
* @{
820827
*/
@@ -2165,7 +2172,6 @@ typedef struct
21652172
#define DMAMUX_CxCR_DMAREQ_ID_4 (0x10UL << DMAMUX_CxCR_DMAREQ_ID_Pos) /*!< 0x00000010 */
21662173
#define DMAMUX_CxCR_DMAREQ_ID_5 (0x20UL << DMAMUX_CxCR_DMAREQ_ID_Pos) /*!< 0x00000020 */
21672174
#define DMAMUX_CxCR_DMAREQ_ID_6 (0x40UL << DMAMUX_CxCR_DMAREQ_ID_Pos) /*!< 0x00000040 */
2168-
#define DMAMUX_CxCR_DMAREQ_ID_7 (0x80UL << DMAMUX_CxCR_DMAREQ_ID_Pos) /*!< 0x00000080 */
21692175
#define DMAMUX_CxCR_SOIE_Pos (8U)
21702176
#define DMAMUX_CxCR_SOIE_Msk (0x1UL << DMAMUX_CxCR_SOIE_Pos) /*!< 0x00000100 */
21712177
#define DMAMUX_CxCR_SOIE DMAMUX_CxCR_SOIE_Msk /*!< Synchro overrun interrupt enable */

Diff for: system/Drivers/CMSIS/Device/ST/STM32G0xx/Include/stm32g070xx.h

+14-8
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,15 @@
1414
******************************************************************************
1515
* @attention
1616
*
17-
* <h2><center>&copy; Copyright (c) 2018 STMicroelectronics.
18-
* All rights reserved.</center></h2>
17+
* Copyright (c) 2018-2021 STMicroelectronics.
18+
* All rights reserved.
1919
*
20-
* This software component is licensed by ST under Apache License, Version 2.0,
21-
* the "License"; You may not use this file except in compliance with the
22-
* License. You may obtain a copy of the License at:
23-
* opensource.org/licenses/Apache-2.0
20+
* This software is licensed under terms that can be found in the LICENSE file
21+
* in the root directory of this software component.
22+
* If no LICENSE file comes with this software, it is provided AS-IS.
2423
*
2524
******************************************************************************
2625
*/
27-
2826
/** @addtogroup CMSIS_Device
2927
* @{
3028
*/
@@ -684,6 +682,15 @@ typedef struct
684682
* @{
685683
*/
686684

685+
/** @addtogroup Hardware_Constant_Definition
686+
* @{
687+
*/
688+
#define LSI_STARTUP_TIME 130U /*!< LSI Maximum startup time in us */
689+
690+
/**
691+
* @}
692+
*/
693+
687694
/** @addtogroup Peripheral_Registers_Bits_Definition
688695
* @{
689696
*/
@@ -1614,7 +1621,6 @@ typedef struct
16141621
#define DMAMUX_CxCR_DMAREQ_ID_4 (0x10UL << DMAMUX_CxCR_DMAREQ_ID_Pos) /*!< 0x00000010 */
16151622
#define DMAMUX_CxCR_DMAREQ_ID_5 (0x20UL << DMAMUX_CxCR_DMAREQ_ID_Pos) /*!< 0x00000020 */
16161623
#define DMAMUX_CxCR_DMAREQ_ID_6 (0x40UL << DMAMUX_CxCR_DMAREQ_ID_Pos) /*!< 0x00000040 */
1617-
#define DMAMUX_CxCR_DMAREQ_ID_7 (0x80UL << DMAMUX_CxCR_DMAREQ_ID_Pos) /*!< 0x00000080 */
16181624
#define DMAMUX_CxCR_SOIE_Pos (8U)
16191625
#define DMAMUX_CxCR_SOIE_Msk (0x1UL << DMAMUX_CxCR_SOIE_Pos) /*!< 0x00000100 */
16201626
#define DMAMUX_CxCR_SOIE DMAMUX_CxCR_SOIE_Msk /*!< Synchro overrun interrupt enable */

Diff for: system/Drivers/CMSIS/Device/ST/STM32G0xx/Include/stm32g071xx.h

+14-8
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,15 @@
1414
******************************************************************************
1515
* @attention
1616
*
17-
* <h2><center>&copy; Copyright (c) 2018 STMicroelectronics.
18-
* All rights reserved.</center></h2>
17+
* Copyright (c) 2018-2021 STMicroelectronics.
18+
* All rights reserved.
1919
*
20-
* This software component is licensed by ST under Apache License, Version 2.0,
21-
* the "License"; You may not use this file except in compliance with the
22-
* License. You may obtain a copy of the License at:
23-
* opensource.org/licenses/Apache-2.0
20+
* This software is licensed under terms that can be found in the LICENSE file
21+
* in the root directory of this software component.
22+
* If no LICENSE file comes with this software, it is provided AS-IS.
2423
*
2524
******************************************************************************
2625
*/
27-
2826
/** @addtogroup CMSIS_Device
2927
* @{
3028
*/
@@ -821,6 +819,15 @@ typedef struct
821819
* @{
822820
*/
823821

822+
/** @addtogroup Hardware_Constant_Definition
823+
* @{
824+
*/
825+
#define LSI_STARTUP_TIME 130U /*!< LSI Maximum startup time in us */
826+
827+
/**
828+
* @}
829+
*/
830+
824831
/** @addtogroup Peripheral_Registers_Bits_Definition
825832
* @{
826833
*/
@@ -2119,7 +2126,6 @@ typedef struct
21192126
#define DMAMUX_CxCR_DMAREQ_ID_4 (0x10UL << DMAMUX_CxCR_DMAREQ_ID_Pos) /*!< 0x00000010 */
21202127
#define DMAMUX_CxCR_DMAREQ_ID_5 (0x20UL << DMAMUX_CxCR_DMAREQ_ID_Pos) /*!< 0x00000020 */
21212128
#define DMAMUX_CxCR_DMAREQ_ID_6 (0x40UL << DMAMUX_CxCR_DMAREQ_ID_Pos) /*!< 0x00000040 */
2122-
#define DMAMUX_CxCR_DMAREQ_ID_7 (0x80UL << DMAMUX_CxCR_DMAREQ_ID_Pos) /*!< 0x00000080 */
21232129
#define DMAMUX_CxCR_SOIE_Pos (8U)
21242130
#define DMAMUX_CxCR_SOIE_Msk (0x1UL << DMAMUX_CxCR_SOIE_Pos) /*!< 0x00000100 */
21252131
#define DMAMUX_CxCR_SOIE DMAMUX_CxCR_SOIE_Msk /*!< Synchro overrun interrupt enable */

0 commit comments

Comments
 (0)