From f2498652f1497474c59ff3e460ebd04a37b1a3b7 Mon Sep 17 00:00:00 2001 From: Matous Hybl Date: Fri, 6 May 2022 21:52:51 +0200 Subject: [PATCH] Clean-up F3 and F7 flash registers --- data/registers/flash_f3.yaml | 219 ----------------------------------- data/registers/flash_f7.yaml | 79 ------------- 2 files changed, 298 deletions(-) diff --git a/data/registers/flash_f3.yaml b/data/registers/flash_f3.yaml index b8cdd2b..102491e 100644 --- a/data/registers/flash_f3.yaml +++ b/data/registers/flash_f3.yaml @@ -51,17 +51,14 @@ fieldset/ACR: description: Flash half cycle access enable bit_offset: 3 bit_size: 1 - enum: HLFCYA - name: PRFTBE description: PRFTBE bit_offset: 4 bit_size: 1 - enum: PRFTBE - name: PRFTBS description: PRFTBS bit_offset: 5 bit_size: 1 - enum: PRFTBS fieldset/AR: description: Flash address register fields: @@ -76,17 +73,14 @@ fieldset/CR: description: Programming bit_offset: 0 bit_size: 1 - enum: PG - name: PER description: Page erase bit_offset: 1 bit_size: 1 - enum: PER - name: MER description: Mass erase bit_offset: 2 bit_size: 1 - enum: MER - name: OPTPG description: Option byte programming bit_offset: 4 @@ -96,33 +90,26 @@ fieldset/CR: description: Option byte erase bit_offset: 5 bit_size: 1 - enum: OPTER - name: STRT description: Start bit_offset: 6 bit_size: 1 - enum: STRT - name: LOCK description: Lock bit_offset: 7 bit_size: 1 - enum_read: LOCKR - enum_write: LOCKW - name: OPTWRE description: Option bytes write enable bit_offset: 9 bit_size: 1 - enum: OPTWRE - name: ERRIE description: Error interrupt enable bit_offset: 10 bit_size: 1 - enum: ERRIE - name: EOPIE description: End of operation interrupt enable bit_offset: 12 bit_size: 1 - enum: EOPIE - name: OBL_LAUNCH description: Force option byte loading bit_offset: 13 @@ -142,7 +129,6 @@ fieldset/OBR: description: Option byte error bit_offset: 0 bit_size: 1 - enum: OPTERR - name: RDPRT description: Read protection Level status bit_offset: 1 @@ -167,12 +153,10 @@ fieldset/OBR: description: BOOT1 bit_offset: 12 bit_size: 1 - enum: nBOOT - name: VDDA_MONITOR description: VDDA_MONITOR bit_offset: 13 bit_size: 1 - enum: VDDA_MONITOR - name: SRAM_PARITY_CHECK description: SRAM_PARITY_CHECK bit_offset: 14 @@ -181,7 +165,6 @@ fieldset/OBR: description: SDADC12_VDD_MONITOR bit_offset: 15 bit_size: 1 - enum: SDADC_VDD_MONITOR - name: Data0 description: Data0 bit_offset: 16 @@ -204,25 +187,18 @@ fieldset/SR: description: Busy bit_offset: 0 bit_size: 1 - enum_read: BSYR - name: PGERR description: Programming error bit_offset: 2 bit_size: 1 - enum_read: PGERRR - enum_write: PGERRW - name: WRPRTERR description: Write protection error bit_offset: 4 bit_size: 1 - enum_read: WRPRTERRR - enum_write: WRPRTERRW - name: EOP description: End of operation bit_offset: 5 bit_size: 1 - enum_read: EOPR - enum_write: EOPW fieldset/WRPR: description: Write protection register fields: @@ -230,57 +206,6 @@ fieldset/WRPR: description: Write protect bit_offset: 0 bit_size: 32 -enum/BSYR: - bit_size: 1 - variants: - - name: Inactive - description: No write/erase operation is in progress - value: 0 - - name: Active - description: No write/erase operation is in progress - value: 1 -enum/EOPIE: - bit_size: 1 - variants: - - name: Disabled - description: End of operation interrupt disabled - value: 0 - - name: Enabled - description: End of operation interrupt enabled - value: 1 -enum/EOPR: - bit_size: 1 - variants: - - name: NoEvent - description: No EOP event occurred - value: 0 - - name: Event - description: An EOP event occurred - value: 1 -enum/EOPW: - bit_size: 1 - variants: - - name: Reset - description: Reset EOP event - value: 1 -enum/ERRIE: - bit_size: 1 - variants: - - name: Disabled - description: Error interrupt generation disabled - value: 0 - - name: Enabled - description: Error interrupt generation enabled - value: 1 -enum/HLFCYA: - bit_size: 1 - variants: - - name: Disabled - description: Half cycle is disabled - value: 0 - - name: Enabled - description: Half cycle is enabled - value: 1 enum/LATENCY: bit_size: 3 variants: @@ -293,27 +218,6 @@ enum/LATENCY: - name: WS2 description: "2 wait states, if 48 < HCLK <= 72 MHz" value: 2 -enum/LOCKR: - bit_size: 1 - variants: - - name: Unlocked - description: FLASH_CR register is unlocked - value: 0 - - name: Locked - description: FLASH_CR register is locked - value: 1 -enum/LOCKW: - bit_size: 1 - variants: - - name: Lock - description: Lock the FLASH_CR register - value: 1 -enum/MER: - bit_size: 1 - variants: - - name: MassErase - description: Erase activated for all user sectors - value: 1 enum/OBL_LAUNCH: bit_size: 1 variants: @@ -323,78 +227,12 @@ enum/OBL_LAUNCH: - name: Active description: Force option byte loading active value: 1 -enum/OPTER: - bit_size: 1 - variants: - - name: OptionByteErase - description: Erase option byte activated - value: 1 -enum/OPTERR: - bit_size: 1 - variants: - - name: OptionByteError - description: The loaded option byte and its complement do not match - value: 1 enum/OPTPG: bit_size: 1 variants: - name: OptionByteProgramming description: Program option byte activated value: 1 -enum/OPTWRE: - bit_size: 1 - variants: - - name: Disabled - description: Option byte write enabled - value: 0 - - name: Enabled - description: Option byte write disabled - value: 1 -enum/PER: - bit_size: 1 - variants: - - name: PageErase - description: Erase activated for selected page - value: 1 -enum/PG: - bit_size: 1 - variants: - - name: Program - description: Flash programming activated - value: 1 -enum/PGERRR: - bit_size: 1 - variants: - - name: NoError - description: No programming error occurred - value: 0 - - name: Error - description: A programming error occurred - value: 1 -enum/PGERRW: - bit_size: 1 - variants: - - name: Reset - description: Reset programming error - value: 1 -enum/PRFTBE: - bit_size: 1 - variants: - - name: Disabled - description: Prefetch is disabled - value: 0 - - name: Enabled - description: Prefetch is enabled - value: 1 -enum/PRFTBS: - bit_size: 1 - variants: - - name: Disabled - description: Prefetch buffer is disabled - value: 0 - - name: Enabled - description: Prefetch buffer is enabled - value: 1 enum/RDPRT: bit_size: 2 variants: @@ -407,39 +245,6 @@ enum/RDPRT: - name: Level2 description: Level 2 value: 3 -enum/SDADC_VDD_MONITOR: - bit_size: 1 - variants: - - name: Disabled - description: VDDSD12 monitoring disabled - value: 0 - - name: Enabled - description: VDDSD12 monitoring enabled - value: 1 -enum/SRAM_PARITY_CHECK: - bit_size: 1 - variants: - - name: Disabled - description: RAM parity check disabled - value: 0 - - name: Enabled - description: RAM parity check enabled - value: 1 -enum/STRT: - bit_size: 1 - variants: - - name: Start - description: Trigger an erase operation - value: 1 -enum/VDDA_MONITOR: - bit_size: 1 - variants: - - name: Disabled - description: VDDA power supply supervisor disabled - value: 0 - - name: Enabled - description: VDDA power supply supervisor enabled - value: 1 enum/WDG_SW: bit_size: 1 variants: @@ -449,30 +254,6 @@ enum/WDG_SW: - name: Software description: Software watchdog value: 1 -enum/WRPRTERRR: - bit_size: 1 - variants: - - name: NoError - description: No write protection error occurred - value: 0 - - name: Error - description: A write protection error occurred - value: 1 -enum/WRPRTERRW: - bit_size: 1 - variants: - - name: Reset - description: Reset write protection error - value: 1 -enum/nBOOT: - bit_size: 1 - variants: - - name: Disabled - description: "Together with BOOT0, select the device boot mode" - value: 0 - - name: Enabled - description: "Together with BOOT0, select the device boot mode" - value: 1 enum/nRST_STDBY: bit_size: 1 variants: diff --git a/data/registers/flash_f7.yaml b/data/registers/flash_f7.yaml index 5f34009..3e9ae06 100644 --- a/data/registers/flash_f7.yaml +++ b/data/registers/flash_f7.yaml @@ -48,17 +48,14 @@ fieldset/ACR: description: Prefetch enable bit_offset: 8 bit_size: 1 - enum: PRFTEN - name: ARTEN description: ART Accelerator Enable bit_offset: 9 bit_size: 1 - enum: ARTEN - name: ARTRST description: ART Accelerator reset bit_offset: 11 bit_size: 1 - enum: ARTRST fieldset/CR: description: Control register fields: @@ -66,17 +63,14 @@ fieldset/CR: description: Programming bit_offset: 0 bit_size: 1 - enum: PG - name: SER description: Sector Erase bit_offset: 1 bit_size: 1 - enum: SER - name: MER description: Mass Erase of sectors 0 to 11 bit_offset: 2 bit_size: 1 - enum: MER - name: SNB description: Sector number bit_offset: 3 @@ -90,17 +84,14 @@ fieldset/CR: description: Start bit_offset: 16 bit_size: 1 - enum: STRT - name: EOPIE description: End of operation interrupt enable bit_offset: 24 bit_size: 1 - enum: EOPIE - name: ERRIE description: Error interrupt enable bit_offset: 25 bit_size: 1 - enum: ERRIE - name: RDERRIE description: PCROP error interrupt enable bit_offset: 26 @@ -109,7 +100,6 @@ fieldset/CR: description: Lock bit_offset: 31 bit_size: 1 - enum: LOCK fieldset/KEYR: description: Flash key register fields: @@ -236,15 +226,6 @@ fieldset/SR: description: Busy bit_offset: 16 bit_size: 1 -enum/ARTEN: - bit_size: 1 - variants: - - name: Disabled - description: ART Accelerator is disabled - value: 0 - - name: Enabled - description: ART Accelerator is enabled - value: 1 enum/ARTRST: bit_size: 1 variants: @@ -254,24 +235,6 @@ enum/ARTRST: - name: Reset description: Accelerator is reset value: 1 -enum/EOPIE: - bit_size: 1 - variants: - - name: Disabled - description: End of operation interrupt disabled - value: 0 - - name: Enabled - description: End of operation interrupt enabled - value: 1 -enum/ERRIE: - bit_size: 1 - variants: - - name: Disabled - description: Error interrupt generation disabled - value: 0 - - name: Enabled - description: Error interrupt generation enabled - value: 1 enum/LATENCY: bit_size: 4 variants: @@ -323,36 +286,6 @@ enum/LATENCY: - name: WS15 description: 15 wait states value: 15 -enum/LOCK: - bit_size: 1 - variants: - - name: Unlocked - description: FLASH_CR register is unlocked - value: 0 - - name: Locked - description: FLASH_CR register is locked - value: 1 -enum/MER: - bit_size: 1 - variants: - - name: MassErase - description: Erase activated for all user sectors - value: 1 -enum/PG: - bit_size: 1 - variants: - - name: Program - description: Flash programming activated - value: 1 -enum/PRFTEN: - bit_size: 1 - variants: - - name: Disabled - description: Prefetch is disabled - value: 0 - - name: Enabled - description: Prefetch is enabled - value: 1 enum/PSIZE: bit_size: 2 variants: @@ -368,15 +301,3 @@ enum/PSIZE: - name: PSIZE64 description: Program x64 value: 3 -enum/SER: - bit_size: 1 - variants: - - name: SectorErase - description: Erase activated for selected sector - value: 1 -enum/STRT: - bit_size: 1 - variants: - - name: Start - description: Trigger an erase operation - value: 1