@@ -99,7 +99,7 @@ typedef enum
99
99
TIM17_IRQn = 22, /*!< TIM17 global Interrupt */
100
100
I2C1_IRQn = 23, /*!< I2C1 Interrupt (combined with EXTI 23) */
101
101
I2C2_IRQn = 24, /*!< I2C2 Interrupt */
102
- SPI1_IRQn = 25, /*!< SPI1 Interrupt */
102
+ SPI1_IRQn = 25, /*!< SPI1/I2S1 Interrupt */
103
103
SPI2_IRQn = 26, /*!< SPI2 Interrupt */
104
104
USART1_IRQn = 27, /*!< USART1 Interrupt */
105
105
USART2_IRQn = 28, /*!< USART2 Interrupt */
@@ -151,6 +151,7 @@ typedef struct
151
151
152
152
153
153
154
+
154
155
/**
155
156
* @brief CRC calculation unit
156
157
*/
@@ -550,7 +551,6 @@ typedef struct
550
551
#define SRAM_BASE (0x20000000UL) /*!< SRAM base address */
551
552
#define PERIPH_BASE (0x40000000UL) /*!< Peripheral base address */
552
553
#define IOPORT_BASE (0x50000000UL) /*!< IOPORT base address */
553
-
554
554
#define SRAM_SIZE_MAX (0x00002000UL) /*!< maximum SRAM size (up to 8 KBytes) */
555
555
556
556
/*!< Peripheral memory map */
@@ -615,7 +615,6 @@ typedef struct
615
615
616
616
#define DMAMUX1_ChannelStatus_BASE (DMAMUX1_BASE + 0x00000080UL)
617
617
#define DMAMUX1_RequestGenStatus_BASE (DMAMUX1_BASE + 0x00000140UL)
618
- #define DMAMUX1_IdRegisters_BASE (DMAMUX1_BASE + 0x000003EC)
619
618
620
619
/*!< IOPORT */
621
620
#define GPIOA_BASE (IOPORT_BASE + 0x00000000UL)
@@ -661,7 +660,6 @@ typedef struct
661
660
#define TIM16 ((TIM_TypeDef *) TIM16_BASE)
662
661
#define TIM17 ((TIM_TypeDef *) TIM17_BASE)
663
662
#define DMA1 ((DMA_TypeDef *) DMA1_BASE)
664
-
665
663
#define FLASH ((FLASH_TypeDef *) FLASH_R_BASE)
666
664
#define CRC ((CRC_TypeDef *) CRC_BASE)
667
665
#define GPIOA ((GPIO_TypeDef *) GPIOA_BASE)
@@ -680,7 +678,6 @@ typedef struct
680
678
#define DMA1_Channel3 ((DMA_Channel_TypeDef *) DMA1_Channel3_BASE)
681
679
#define DMA1_Channel4 ((DMA_Channel_TypeDef *) DMA1_Channel4_BASE)
682
680
#define DMA1_Channel5 ((DMA_Channel_TypeDef *) DMA1_Channel5_BASE)
683
-
684
681
#define DMAMUX1 ((DMAMUX_Channel_TypeDef *) DMAMUX1_BASE)
685
682
#define DMAMUX1_Channel0 ((DMAMUX_Channel_TypeDef *) DMAMUX1_Channel0_BASE)
686
683
#define DMAMUX1_Channel1 ((DMAMUX_Channel_TypeDef *) DMAMUX1_Channel1_BASE)
@@ -695,7 +692,6 @@ typedef struct
695
692
696
693
#define DMAMUX1_ChannelStatus ((DMAMUX_ChannelStatus_TypeDef *) DMAMUX1_ChannelStatus_BASE)
697
694
#define DMAMUX1_RequestGenStatus ((DMAMUX_RequestGenStatus_TypeDef *) DMAMUX1_RequestGenStatus_BASE)
698
- #define DMAMUX1_IdRegisters ((DMAMUX_IdRegisters_TypeDef *) DMAMUX1_IdRegisters_BASE)
699
695
700
696
#define DBG ((DBG_TypeDef *) DBG_BASE)
701
697
@@ -1772,27 +1768,6 @@ typedef struct
1772
1768
#define DMAMUX_RGCFR_COF3_Msk (0x1UL << DMAMUX_RGCFR_COF3_Pos) /*!< 0x00000008 */
1773
1769
#define DMAMUX_RGCFR_COF3 DMAMUX_RGCFR_COF3_Msk /*!< Clear Overrun flag 3 */
1774
1770
1775
- /***************** Bits definition for DMAMUX_IPHW_CFGR2 register ************/
1776
- #define DMAMUX_IPHW_CFGR2_NB_EXT_REQ_Pos (0U)
1777
- #define DMAMUX_IPHW_CFGR2_NB_EXT_REQ_Msk (0xFFUL << DMAMUX_IPHW_CFGR2_NB_EXT_REQ_Pos) /*!< 0x000000FF */
1778
- #define DMAMUX_IPHW_CFGR2_NB_EXT_REQ DMAMUX_IPHW_CFGR2_NB_EXT_REQ_Msk /*!< Number of external request sources */
1779
-
1780
- /***************** Bits definition for DMAMUX_IPHW_CFGR1 register ************/
1781
- #define DMAMUX_IPHW_CFGR1_NB_STREAMS_Pos (0U)
1782
- #define DMAMUX_IPHW_CFGR1_NB_STREAMS_Msk (0xFFUL << DMAMUX_IPHW_CFGR1_NB_STREAMS_Pos) /*!< 0x000000FF */
1783
- #define DMAMUX_IPHW_CFGR1_NB_STREAMS DMAMUX_IPHW_CFGR1_NB_STREAMS_Msk /*!< Number of DMA streams */
1784
-
1785
- #define DMAMUX_IPHW_CFGR1_NB_PERIPH_REQ_Pos (8U)
1786
- #define DMAMUX_IPHW_CFGR1_NB_PERIPH_REQ_Msk (0xFFUL << DMAMUX_IPHW_CFGR1_NB_PERIPH_REQ_Pos) /*!< 0x0000FF00 */
1787
- #define DMAMUX_IPHW_CFGR1_NB_PERIPH_REQ DMAMUX_IPHW_CFGR1_NB_PERIPH_REQ_Msk /*!< Number of peripheral requests */
1788
-
1789
- #define DMAMUX_IPHW_CFGR1_NB_SYNC_TRIG_Pos (16U)
1790
- #define DMAMUX_IPHW_CFGR1_NB_SYNC_TRIG_Msk (0xFFUL << DMAMUX_IPHW_CFGR1_NB_SYNC_TRIG_Pos) /*!< 0x00FF0000 */
1791
- #define DMAMUX_IPHW_CFGR1_NB_SYNC_TRIG DMAMUX_IPHW_CFGR1_NB_SYNC_TRIG_Msk /*!< Number of synchronization triggers */
1792
-
1793
- #define DMAMUX_IPHW_CFGR1_NB_REQ_GEN_Pos (24U)
1794
- #define DMAMUX_IPHW_CFGR1_NB_REQ_GEN_Msk (0xFFUL << DMAMUX_IPHW_CFGR1_NB_REQ_GEN_Pos) /*!< 0xFF000000 */
1795
- #define DMAMUX_IPHW_CFGR1_NB_REQ_GEN DMAMUX_IPHW_CFGR1_NB_REQ_GEN_Msk /*!< Number of request generation blocks */
1796
1771
/******************************************************************************/
1797
1772
/* */
1798
1773
/* External Interrupt/Event Controller */
@@ -2347,7 +2322,6 @@ typedef struct
2347
2322
#define EXTI_EMR1_EM31 EXTI_EMR1_EM31_Msk /*!< Event Mask on line 31 */
2348
2323
2349
2324
2350
-
2351
2325
/******************************************************************************/
2352
2326
/* */
2353
2327
/* FLASH */
@@ -4042,6 +4016,7 @@ typedef struct
4042
4016
#define PWR_PUCRD_PU3_Pos (3U)
4043
4017
#define PWR_PUCRD_PU3_Msk (0x1UL << PWR_PUCRD_PU3_Pos) /*!< 0x00000008 */
4044
4018
#define PWR_PUCRD_PU3 PWR_PUCRD_PU3_Msk /*!< Pin PD3 Pull-Up set */
4019
+
4045
4020
/******************** Bit definition for PWR_PDCRD register *****************/
4046
4021
#define PWR_PDCRD_PD0_Pos (0U)
4047
4022
#define PWR_PDCRD_PD0_Msk (0x1UL << PWR_PDCRD_PD0_Pos) /*!< 0x00000001 */
@@ -4563,10 +4538,10 @@ typedef struct
4563
4538
#define RCC_APBSMENR1_RTCAPBSMEN_Msk (0x1UL << RCC_APBSMENR1_RTCAPBSMEN_Pos) /*!< 0x00000400 */
4564
4539
#define RCC_APBSMENR1_RTCAPBSMEN RCC_APBSMENR1_RTCAPBSMEN_Msk
4565
4540
#define RCC_APBSMENR1_WWDGSMEN_Pos (11U)
4566
- #define RCC_APBSMENR1_WWDGSMEN_Msk (0x1UL << RCC_APBSMENR1_WWDGSMEN_Pos) /*!< 0x00000800 */
4541
+ #define RCC_APBSMENR1_WWDGSMEN_Msk (0x1UL << RCC_APBSMENR1_WWDGSMEN_Pos) /*!< 0x00000800 */
4567
4542
#define RCC_APBSMENR1_WWDGSMEN RCC_APBSMENR1_WWDGSMEN_Msk
4568
4543
#define RCC_APBSMENR1_SPI2SMEN_Pos (14U)
4569
- #define RCC_APBSMENR1_SPI2SMEN_Msk (0x1UL << RCC_APBSMENR1_SPI2SMEN_Pos) /*!< 0x00004000 */
4544
+ #define RCC_APBSMENR1_SPI2SMEN_Msk (0x1UL << RCC_APBSMENR1_SPI2SMEN_Pos) /*!< 0x00004000 */
4570
4545
#define RCC_APBSMENR1_SPI2SMEN RCC_APBSMENR1_SPI2SMEN_Msk
4571
4546
#define RCC_APBSMENR1_USART2SMEN_Pos (17U)
4572
4547
#define RCC_APBSMENR1_USART2SMEN_Msk (0x1UL << RCC_APBSMENR1_USART2SMEN_Pos) /*!< 0x00020000 */
@@ -5315,7 +5290,6 @@ typedef struct
5315
5290
#define RTC_SCR_CALRAF_Msk (0x1UL << RTC_SCR_CALRAF_Pos) /*!< 0x00000001 */
5316
5291
#define RTC_SCR_CALRAF RTC_SCR_CALRAF_Msk
5317
5292
5318
-
5319
5293
/******************************************************************************/
5320
5294
/* */
5321
5295
/* Tamper and backup register (TAMP) */
@@ -5487,7 +5461,6 @@ typedef struct
5487
5461
#define TAMP_BKP4R_Msk (0xFFFFFFFFUL << TAMP_BKP4R_Pos) /*!< 0xFFFFFFFF */
5488
5462
#define TAMP_BKP4R TAMP_BKP4R_Msk
5489
5463
5490
-
5491
5464
/******************************************************************************/
5492
5465
/* */
5493
5466
/* Serial Peripheral Interface (SPI) */
@@ -7396,7 +7369,6 @@ typedef struct
7396
7369
#define USART_PRESC_PRESCALER_2 (0x4UL << USART_PRESC_PRESCALER_Pos) /*!< 0x00000004 */
7397
7370
#define USART_PRESC_PRESCALER_3 (0x8UL << USART_PRESC_PRESCALER_Pos) /*!< 0x00000008 */
7398
7371
7399
-
7400
7372
/******************************************************************************/
7401
7373
/* */
7402
7374
/* VREFBUF */
@@ -7569,7 +7541,6 @@ typedef struct
7569
7541
((INSTANCE) == GPIOC) || \
7570
7542
((INSTANCE) == GPIOD) || \
7571
7543
((INSTANCE) == GPIOF))
7572
-
7573
7544
/******************************* GPIO AF Instances ****************************/
7574
7545
#define IS_GPIO_AF_INSTANCE(INSTANCE) IS_GPIO_ALL_INSTANCE(INSTANCE)
7575
7546
@@ -7595,6 +7566,7 @@ typedef struct
7595
7566
/******************************** SPI Instances *******************************/
7596
7567
#define IS_SPI_ALL_INSTANCE(INSTANCE) (((INSTANCE) == SPI1) || \
7597
7568
((INSTANCE) == SPI2))
7569
+
7598
7570
/******************************** SPI Instances *******************************/
7599
7571
#define IS_I2S_ALL_INSTANCE(INSTANCE) ((INSTANCE) == SPI1)
7600
7572
@@ -7841,7 +7813,6 @@ typedef struct
7841
7813
#define IS_UART_INSTANCE(INSTANCE) (((INSTANCE) == USART1) || \
7842
7814
((INSTANCE) == USART2))
7843
7815
7844
-
7845
7816
/******************** USART Instances : Synchronous mode **********************/
7846
7817
#define IS_USART_INSTANCE(INSTANCE) (((INSTANCE) == USART1) || \
7847
7818
((INSTANCE) == USART2))
0 commit comments