|
|
@@ -874,11 +874,7 @@ typedef struct
|
|
|
__IO uint32_t B1CR; /*!< GFXMMU buffer 1 configuration register, Address offset: 0x24 */
|
|
|
__IO uint32_t B2CR; /*!< GFXMMU buffer 2 configuration register, Address offset: 0x28 */
|
|
|
__IO uint32_t B3CR; /*!< GFXMMU buffer 3 configuration register, Address offset: 0x2C */
|
|
|
- uint32_t RESERVED2[1008]; /*!< Reserved2, Address offset: 0x30 to 0xFEC */
|
|
|
- __IO uint32_t HWCFGR; /*!< GFXMMU hardware configuration register, Address offset: 0xFF0 */
|
|
|
- __IO uint32_t VERR; /*!< GFXMMU version register, Address offset: 0xFF4 */
|
|
|
- __IO uint32_t IPIDR; /*!< GFXMMU identification register, Address offset: 0xFF8 */
|
|
|
- __IO uint32_t SIDR; /*!< GFXMMU size identification register, Address offset: 0xFFC */
|
|
|
+ uint32_t RESERVED2[1012]; /*!< Reserved2, Address offset: 0x30 to 0xFFC */
|
|
|
__IO uint32_t LUT[2048]; /*!< GFXMMU LUT registers, Address offset: 0x1000 to 0x2FFC
|
|
|
For LUT line i, LUTiL = LUT[2*i] and LUTiH = LUT[(2*i)+1] */
|
|
|
} GFXMMU_TypeDef;
|
|
|
@@ -1821,7 +1817,7 @@ typedef struct
|
|
|
typedef struct
|
|
|
{
|
|
|
__IO uint32_t CR; /*!< OCTOSPI IO Manager Control register, Address offset: 0x00 */
|
|
|
- __IO uint32_t PCR[8]; /*!< OCTOSPI IO Manager Port[1:8] Configuration register, Address offset: 0x04-0x20 */
|
|
|
+ __IO uint32_t PCR[3]; /*!< OCTOSPI IO Manager Port[1:3] Configuration register, Address offset: 0x04-0x20 */
|
|
|
} OCTOSPIM_TypeDef;
|
|
|
|
|
|
/**
|
|
|
@@ -6497,6 +6493,9 @@ typedef struct
|
|
|
#define DMA_SxCR_PBURST DMA_SxCR_PBURST_Msk /*!< Peripheral burst transfer configuration */
|
|
|
#define DMA_SxCR_PBURST_0 (0x1UL << DMA_SxCR_PBURST_Pos) /*!< 0x00200000 */
|
|
|
#define DMA_SxCR_PBURST_1 (0x2UL << DMA_SxCR_PBURST_Pos) /*!< 0x00400000 */
|
|
|
+#define DMA_SxCR_TRBUFF_Pos (20U)
|
|
|
+#define DMA_SxCR_TRBUFF_Msk (0x1UL << DMA_SxCR_TRBUFF_Pos) /*!< 0x00100000 */
|
|
|
+#define DMA_SxCR_TRBUFF DMA_SxCR_TRBUFF_Msk /*!< bufferable transfers enabled/disable */
|
|
|
#define DMA_SxCR_CT_Pos (19U)
|
|
|
#define DMA_SxCR_CT_Msk (0x1UL << DMA_SxCR_CT_Pos) /*!< 0x00080000 */
|
|
|
#define DMA_SxCR_CT DMA_SxCR_CT_Msk /*!< Current target (only in double buffer mode) */
|
|
|
@@ -9463,29 +9462,6 @@ typedef struct
|
|
|
#define GFXMMU_B3CR_PBBA_Msk (0x1FFUL << GFXMMU_B3CR_PBBA_Pos) /*!< 0xFF800000 */
|
|
|
#define GFXMMU_B3CR_PBBA GFXMMU_B3CR_PBBA_Msk /*!< PBBA[31:23] bits (Physical buffer base address) */
|
|
|
|
|
|
-/****************** Bits definition for GFXMMU_HWCFGR register ****************/
|
|
|
-#define GFXMMU_HWCFGR_TBD_Pos (0U)
|
|
|
-#define GFXMMU_HWCFGR_TBD_Msk (0xFFFFFFFFUL << GFXMMU_HWCFGR_TBD_Pos) /*!< 0xFFFFFFFF */
|
|
|
-#define GFXMMU_HWCFGR_TBD GFXMMU_HWCFGR_TBD_Msk /*!< TBD[31:0] bits (To be defined) */
|
|
|
-
|
|
|
-/****************** Bits definition for GFXMMU_VERR register ******************/
|
|
|
-#define GFXMMU_VERR_MINREV_Pos (0U)
|
|
|
-#define GFXMMU_VERR_MINREV_Msk (0xFUL << GFXMMU_VERR_MINREV_Pos) /*!< 0x0000000F */
|
|
|
-#define GFXMMU_VERR_MINREV GFXMMU_VERR_MINREV_Msk /*!< MINREV[3:0] bits (Minor revision) */
|
|
|
-#define GFXMMU_VERR_MAJREV_Pos (4U)
|
|
|
-#define GFXMMU_VERR_MAJREV_Msk (0xFUL << GFXMMU_VERR_MAJREV_Pos) /*!< 0x000000F0 */
|
|
|
-#define GFXMMU_VERR_MAJREV GFXMMU_VERR_MAJREV_Msk /*!< MAJREV[3:0] bits (Major revision) */
|
|
|
-
|
|
|
-/****************** Bits definition for GFXMMU_IPIDR register *****************/
|
|
|
-#define GFXMMU_IPIDR_ID_Pos (0U)
|
|
|
-#define GFXMMU_IPIDR_ID_Msk (0xFFFFFFFFUL << GFXMMU_IPIDR_ID_Pos) /*!< 0xFFFFFFFF */
|
|
|
-#define GFXMMU_IPIDR_ID GFXMMU_IPIDR_ID_Msk /*!< ID[31:0] bits (Identification code) */
|
|
|
-
|
|
|
-/****************** Bits definition for GFXMMU_SIDR register ******************/
|
|
|
-#define GFXMMU_SIDR_SID_Pos (0U)
|
|
|
-#define GFXMMU_SIDR_SID_Msk (0xFFFFFFFFUL << GFXMMU_SIDR_SID_Pos) /*!< 0xFFFFFFFF */
|
|
|
-#define GFXMMU_SIDR_SID GFXMMU_SIDR_SID_Msk /*!< SID[31:0] bits (Size and id) */
|
|
|
-
|
|
|
/****************** Bits definition for GFXMMU_LUTxL register *****************/
|
|
|
#define GFXMMU_LUTxL_EN_Pos (0U)
|
|
|
#define GFXMMU_LUTxL_EN_Msk (0x1UL << GFXMMU_LUTxL_EN_Pos) /*!< 0x00000001 */
|
|
|
@@ -13342,12 +13318,6 @@ typedef struct
|
|
|
#define RCC_AHB2ENR_HSEMEN_Pos (2U)
|
|
|
#define RCC_AHB2ENR_HSEMEN_Msk (0x1UL << RCC_AHB2ENR_HSEMEN_Pos) /*!< 0x00000004 */
|
|
|
#define RCC_AHB2ENR_HSEMEN RCC_AHB2ENR_HSEMEN_Msk
|
|
|
-#define RCC_AHB2ENR_CRYPEN_Pos (4U)
|
|
|
-#define RCC_AHB2ENR_CRYPEN_Msk (0x1UL << RCC_AHB2ENR_CRYPEN_Pos) /*!< 0x00000010 */
|
|
|
-#define RCC_AHB2ENR_CRYPEN RCC_AHB2ENR_CRYPEN_Msk
|
|
|
-#define RCC_AHB2ENR_HASHEN_Pos (5U)
|
|
|
-#define RCC_AHB2ENR_HASHEN_Msk (0x1UL << RCC_AHB2ENR_HASHEN_Pos) /*!< 0x00000020 */
|
|
|
-#define RCC_AHB2ENR_HASHEN RCC_AHB2ENR_HASHEN_Msk
|
|
|
#define RCC_AHB2ENR_RNGEN_Pos (6U)
|
|
|
#define RCC_AHB2ENR_RNGEN_Msk (0x1UL << RCC_AHB2ENR_RNGEN_Pos) /*!< 0x00000040 */
|
|
|
#define RCC_AHB2ENR_RNGEN RCC_AHB2ENR_RNGEN_Msk
|
|
|
@@ -13663,12 +13633,6 @@ typedef struct
|
|
|
#define RCC_AHB2RSTR_HSEMRST_Pos (2U)
|
|
|
#define RCC_AHB2RSTR_HSEMRST_Msk (0x1UL << RCC_AHB2RSTR_HSEMRST_Pos) /*!< 0x00000004 */
|
|
|
#define RCC_AHB2RSTR_HSEMRST RCC_AHB2RSTR_HSEMRST_Msk
|
|
|
-#define RCC_AHB2RSTR_CRYPRST_Pos (4U)
|
|
|
-#define RCC_AHB2RSTR_CRYPRST_Msk (0x1UL << RCC_AHB2RSTR_CRYPRST_Pos) /*!< 0x00000010 */
|
|
|
-#define RCC_AHB2RSTR_CRYPRST RCC_AHB2RSTR_CRYPRST_Msk
|
|
|
-#define RCC_AHB2RSTR_HASHRST_Pos (5U)
|
|
|
-#define RCC_AHB2RSTR_HASHRST_Msk (0x1UL << RCC_AHB2RSTR_HASHRST_Pos) /*!< 0x00000020 */
|
|
|
-#define RCC_AHB2RSTR_HASHRST RCC_AHB2RSTR_HASHRST_Msk
|
|
|
#define RCC_AHB2RSTR_RNGRST_Pos (6U)
|
|
|
#define RCC_AHB2RSTR_RNGRST_Msk (0x1UL << RCC_AHB2RSTR_RNGRST_Pos) /*!< 0x00000040 */
|
|
|
#define RCC_AHB2RSTR_RNGRST RCC_AHB2RSTR_RNGRST_Msk
|
|
|
@@ -14096,12 +14060,6 @@ typedef struct
|
|
|
#define RCC_AHB2LPENR_DCMI_PSSILPEN_Pos (0U)
|
|
|
#define RCC_AHB2LPENR_DCMI_PSSILPEN_Msk (0x1UL << RCC_AHB2LPENR_DCMI_PSSILPEN_Pos) /*!< 0x00000001 */
|
|
|
#define RCC_AHB2LPENR_DCMI_PSSILPEN RCC_AHB2LPENR_DCMI_PSSILPEN_Msk
|
|
|
-#define RCC_AHB2LPENR_CRYPLPEN_Pos (4U)
|
|
|
-#define RCC_AHB2LPENR_CRYPLPEN_Msk (0x1UL << RCC_AHB2LPENR_CRYPLPEN_Pos) /*!< 0x00000010 */
|
|
|
-#define RCC_AHB2LPENR_CRYPLPEN RCC_AHB2LPENR_CRYPLPEN_Msk
|
|
|
-#define RCC_AHB2LPENR_HASHLPEN_Pos (5U)
|
|
|
-#define RCC_AHB2LPENR_HASHLPEN_Msk (0x1UL << RCC_AHB2LPENR_HASHLPEN_Pos) /*!< 0x00000020 */
|
|
|
-#define RCC_AHB2LPENR_HASHLPEN RCC_AHB2LPENR_HASHLPEN_Msk
|
|
|
#define RCC_AHB2LPENR_RNGLPEN_Pos (6U)
|
|
|
#define RCC_AHB2LPENR_RNGLPEN_Msk (0x1UL << RCC_AHB2LPENR_RNGLPEN_Pos) /*!< 0x00000040 */
|
|
|
#define RCC_AHB2LPENR_RNGLPEN RCC_AHB2LPENR_RNGLPEN_Msk
|
|
|
@@ -18949,39 +18907,48 @@ typedef struct
|
|
|
/* OCTOSPIM */
|
|
|
/* */
|
|
|
/******************************************************************************/
|
|
|
+
|
|
|
+/*************** Bit definition for OCTOSPIM_CR register ********************/
|
|
|
+#define OCTOSPIM_CR_MUXEN_Pos (0U)
|
|
|
+#define OCTOSPIM_CR_MUXEN_Msk (0x1UL << OCTOSPIM_CR_MUXEN_Pos) /*!< 0x00000001 */
|
|
|
+#define OCTOSPIM_CR_MUXEN OCTOSPIM_CR_MUXEN_Msk /*!< Multiplexed mode enable */
|
|
|
+#define OCTOSPIM_CR_REQ2ACK_TIME_Pos (16U)
|
|
|
+#define OCTOSPIM_CR_REQ2ACK_TIME_Msk (0xFFUL << OCTOSPIM_CR_REQ2ACK_TIME_Pos)/*!< 0x00FF0000 */
|
|
|
+#define OCTOSPIM_CR_REQ2ACK_TIME OCTOSPIM_CR_REQ2ACK_TIME_Msk /*!< REQ to ACK time */
|
|
|
+
|
|
|
/*************** Bit definition for OCTOSPIM_PCR register *******************/
|
|
|
#define OCTOSPIM_PCR_CLKEN_Pos (0U)
|
|
|
#define OCTOSPIM_PCR_CLKEN_Msk (0x1UL << OCTOSPIM_PCR_CLKEN_Pos) /*!< 0x00000001 */
|
|
|
-#define OCTOSPIM_PCR_CLKEN OCTOSPIM_PCR_CLKEN_Msk /*!< CLK/CLKn Enable for Port n */
|
|
|
+#define OCTOSPIM_PCR_CLKEN OCTOSPIM_PCR_CLKEN_Msk /*!< CLK/CLKn Enable for Port n */
|
|
|
#define OCTOSPIM_PCR_CLKSRC_Pos (1U)
|
|
|
#define OCTOSPIM_PCR_CLKSRC_Msk (0x1UL << OCTOSPIM_PCR_CLKSRC_Pos) /*!< 0x00000002 */
|
|
|
-#define OCTOSPIM_PCR_CLKSRC OCTOSPIM_PCR_CLKSRC_Msk /*!< CLK/CLKn Source for Port n */
|
|
|
+#define OCTOSPIM_PCR_CLKSRC OCTOSPIM_PCR_CLKSRC_Msk /*!< CLK/CLKn Source for Port n */
|
|
|
#define OCTOSPIM_PCR_DQSEN_Pos (4U)
|
|
|
#define OCTOSPIM_PCR_DQSEN_Msk (0x1UL << OCTOSPIM_PCR_DQSEN_Pos) /*!< 0x00000010 */
|
|
|
-#define OCTOSPIM_PCR_DQSEN OCTOSPIM_PCR_DQSEN_Msk /*!< DQS Enable for Port n */
|
|
|
+#define OCTOSPIM_PCR_DQSEN OCTOSPIM_PCR_DQSEN_Msk /*!< DQS Enable for Port n */
|
|
|
#define OCTOSPIM_PCR_DQSSRC_Pos (5U)
|
|
|
#define OCTOSPIM_PCR_DQSSRC_Msk (0x1UL << OCTOSPIM_PCR_DQSSRC_Pos) /*!< 0x00000020 */
|
|
|
-#define OCTOSPIM_PCR_DQSSRC OCTOSPIM_PCR_DQSSRC_Msk /*!< DQS Source for Port n */
|
|
|
+#define OCTOSPIM_PCR_DQSSRC OCTOSPIM_PCR_DQSSRC_Msk /*!< DQS Source for Port n */
|
|
|
#define OCTOSPIM_PCR_NCSEN_Pos (8U)
|
|
|
#define OCTOSPIM_PCR_NCSEN_Msk (0x1UL << OCTOSPIM_PCR_NCSEN_Pos) /*!< 0x00000100 */
|
|
|
-#define OCTOSPIM_PCR_NCSEN OCTOSPIM_PCR_NCSEN_Msk /*!< nCS Enable for Port n */
|
|
|
+#define OCTOSPIM_PCR_NCSEN OCTOSPIM_PCR_NCSEN_Msk /*!< nCS Enable for Port n */
|
|
|
#define OCTOSPIM_PCR_NCSSRC_Pos (9U)
|
|
|
#define OCTOSPIM_PCR_NCSSRC_Msk (0x1UL << OCTOSPIM_PCR_NCSSRC_Pos) /*!< 0x00000200 */
|
|
|
-#define OCTOSPIM_PCR_NCSSRC OCTOSPIM_PCR_NCSSRC_Msk /*!< nCS Source for Port n */
|
|
|
+#define OCTOSPIM_PCR_NCSSRC OCTOSPIM_PCR_NCSSRC_Msk /*!< nCS Source for Port n */
|
|
|
#define OCTOSPIM_PCR_IOLEN_Pos (16U)
|
|
|
#define OCTOSPIM_PCR_IOLEN_Msk (0x1UL << OCTOSPIM_PCR_IOLEN_Pos) /*!< 0x00010000 */
|
|
|
-#define OCTOSPIM_PCR_IOLEN OCTOSPIM_PCR_IOLEN_Msk /*!< IO[3:0] Enable for Port n */
|
|
|
+#define OCTOSPIM_PCR_IOLEN OCTOSPIM_PCR_IOLEN_Msk /*!< IO[3:0] Enable for Port n */
|
|
|
#define OCTOSPIM_PCR_IOLSRC_Pos (17U)
|
|
|
#define OCTOSPIM_PCR_IOLSRC_Msk (0x3UL << OCTOSPIM_PCR_IOLSRC_Pos) /*!< 0x00060000 */
|
|
|
-#define OCTOSPIM_PCR_IOLSRC OCTOSPIM_PCR_IOLSRC_Msk /*!< IO[3:0] Source for Port n */
|
|
|
+#define OCTOSPIM_PCR_IOLSRC OCTOSPIM_PCR_IOLSRC_Msk /*!< IO[3:0] Source for Port n */
|
|
|
#define OCTOSPIM_PCR_IOLSRC_0 (0x1UL << OCTOSPIM_PCR_IOLSRC_Pos) /*!< 0x00020000 */
|
|
|
#define OCTOSPIM_PCR_IOLSRC_1 (0x2UL << OCTOSPIM_PCR_IOLSRC_Pos) /*!< 0x00040000 */
|
|
|
#define OCTOSPIM_PCR_IOHEN_Pos (24U)
|
|
|
#define OCTOSPIM_PCR_IOHEN_Msk (0x1UL << OCTOSPIM_PCR_IOHEN_Pos) /*!< 0x01000000 */
|
|
|
-#define OCTOSPIM_PCR_IOHEN OCTOSPIM_PCR_IOHEN_Msk /*!< IO[7:4] Enable for Port n */
|
|
|
+#define OCTOSPIM_PCR_IOHEN OCTOSPIM_PCR_IOHEN_Msk /*!< IO[7:4] Enable for Port n */
|
|
|
#define OCTOSPIM_PCR_IOHSRC_Pos (25U)
|
|
|
#define OCTOSPIM_PCR_IOHSRC_Msk (0x3UL << OCTOSPIM_PCR_IOHSRC_Pos) /*!< 0x06000000 */
|
|
|
-#define OCTOSPIM_PCR_IOHSRC OCTOSPIM_PCR_IOHSRC_Msk /*!< IO[7:4] Source for Port n */
|
|
|
+#define OCTOSPIM_PCR_IOHSRC OCTOSPIM_PCR_IOHSRC_Msk /*!< IO[7:4] Source for Port n */
|
|
|
#define OCTOSPIM_PCR_IOHSRC_0 (0x1UL << OCTOSPIM_PCR_IOHSRC_Pos) /*!< 0x02000000 */
|
|
|
#define OCTOSPIM_PCR_IOHSRC_1 (0x2UL << OCTOSPIM_PCR_IOHSRC_Pos) /*!< 0x04000000 */
|
|
|
/******************************************************************************/
|
|
|
@@ -19751,6 +19718,8 @@ typedef struct
|
|
|
/* DBG */
|
|
|
/* */
|
|
|
/******************************************************************************/
|
|
|
+/********************************* DEVICE ID ********************************/
|
|
|
+#define STM32H7_DEV_ID 0x480UL
|
|
|
|
|
|
/******************** Bit definition for DBGMCU_IDCODE register *************/
|
|
|
#define DBGMCU_IDCODE_DEV_ID_Pos (0U)
|