From 01982519ce2e54e2c5740374d7138effa8375c21 Mon Sep 17 00:00:00 2001 From: chemicstry Date: Mon, 11 Jul 2022 01:36:23 +0300 Subject: [PATCH] Cleanup single bit enable fields from flash --- data/registers/flash_f0.yaml | 163 +---------------------------------- data/registers/flash_f2.yaml | 108 ----------------------- data/registers/flash_f3.yaml | 17 ---- data/registers/flash_f4.yaml | 108 ----------------------- data/registers/flash_f7.yaml | 9 -- 5 files changed, 2 insertions(+), 403 deletions(-) diff --git a/data/registers/flash_f0.yaml b/data/registers/flash_f0.yaml index 36a4d88..fdf75e7 100644 --- a/data/registers/flash_f0.yaml +++ b/data/registers/flash_f0.yaml @@ -48,15 +48,13 @@ fieldset/ACR: bit_size: 3 enum: LATENCY - name: PRFTBE - description: PRFTBE + description: Prefetch buffer enable bit_offset: 4 bit_size: 1 - enum: PRFTBE - name: PRFTBS - description: PRFTBS + description: Prefetch buffer status bit_offset: 5 bit_size: 1 - enum_read: PRFTBSR fieldset/AR: description: Flash address register fields: @@ -71,57 +69,46 @@ 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 bit_size: 1 - enum: OPTPG - name: OPTER 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: LOCK - 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: FORCE_OPTLOAD description: Force option byte loading bit_offset: 13 bit_size: 1 - enum: FORCE_OPTLOAD fieldset/KEYR: description: Flash key register fields: @@ -136,7 +123,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 @@ -204,22 +190,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: PGERR - name: WRPRT description: Write protection error bit_offset: 4 bit_size: 1 - enum: WRPRT - name: EOP description: End of operation bit_offset: 5 bit_size: 1 - enum: EOP fieldset/WRPR: description: Write protection register fields: @@ -236,51 +218,6 @@ enum/BOOT_SEL: - name: BOOT0 description: BOOT0 signal is defined by BOOT0 pin value (legacy mode) value: 1 -enum/BSYR: - bit_size: 1 - variants: - - name: Inactive - description: No write/erase operation is in progress - value: 0 - - name: Active - description: A write/erase operation is in progress - value: 1 -enum/EOP: - bit_size: 1 - variants: - - name: NoEvent - description: No EOP operation occurred - value: 0 - - name: Event - description: An EOP event occurred - 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/FORCE_OPTLOAD: - bit_size: 1 - variants: - - name: Inactive - description: Force option byte loading inactive - value: 0 - - name: Active - description: Force option byte loading active - value: 1 enum/LATENCY: bit_size: 3 variants: @@ -290,87 +227,6 @@ enum/LATENCY: - name: WS1 description: 1 wait state value: 1 -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/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 disabled - value: 0 - - name: Enabled - description: Option byte write enabled - 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/PGERR: - bit_size: 1 - variants: - - name: NoError - description: No programming error occurred - value: 0 - - name: Error - description: A programming error occurred - 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/PRFTBSR: - bit_size: 1 - variants: - - name: Disabled - description: Prefetch buffer is disabled - value: 0 - - name: Enabled - description: Prefetch buffer is enabled - value: 1 enum/RAM_PARITY_CHECK: bit_size: 1 variants: @@ -392,12 +248,6 @@ enum/RDPRT: - name: Level2 description: Level 2 value: 3 -enum/STRT: - bit_size: 1 - variants: - - name: Start - description: Trigger an erase operation - value: 1 enum/VDDA_MONITOR: bit_size: 1 variants: @@ -416,15 +266,6 @@ enum/WDG_SW: - name: Software description: Software watchdog value: 1 -enum/WRPRT: - 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/nBOOT0: bit_size: 1 variants: diff --git a/data/registers/flash_f2.yaml b/data/registers/flash_f2.yaml index 70c31c9..fe4993b 100644 --- a/data/registers/flash_f2.yaml +++ b/data/registers/flash_f2.yaml @@ -40,27 +40,22 @@ fieldset/ACR: description: Prefetch enable bit_offset: 8 bit_size: 1 - enum: PRFTEN - name: ICEN description: Instruction cache enable bit_offset: 9 bit_size: 1 - enum: ICEN - name: DCEN description: Data cache enable bit_offset: 10 bit_size: 1 - enum: DCEN - name: ICRST description: Instruction cache reset bit_offset: 11 bit_size: 1 - enum: ICRST - name: DCRST description: Data cache reset bit_offset: 12 bit_size: 1 - enum: DCRST fieldset/CR: description: Control register fields: @@ -68,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 bit_offset: 2 bit_size: 1 - enum: MER - name: SNB description: Sector number bit_offset: 3 @@ -92,22 +84,18 @@ 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: LOCK description: Lock bit_offset: 31 bit_size: 1 - enum: LOCK fieldset/KEYR: description: Flash key register fields: @@ -188,60 +176,6 @@ fieldset/SR: description: Busy bit_offset: 16 bit_size: 1 -enum/DCEN: - bit_size: 1 - variants: - - name: Disabled - description: Data cache is disabled - value: 0 - - name: Enabled - description: Data cache is enabled - value: 1 -enum/DCRST: - bit_size: 1 - variants: - - name: NotReset - description: Data cache is not reset - value: 0 - - name: Reset - description: Data cache 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/ICEN: - bit_size: 1 - variants: - - name: Disabled - description: Instruction cache is disabled - value: 0 - - name: Enabled - description: Instruction cache is enabled - value: 1 -enum/ICRST: - bit_size: 1 - variants: - - name: NotReset - description: Instruction cache is not reset - value: 0 - - name: Reset - description: Instruction cache is reset - value: 1 enum/LATENCY: bit_size: 3 variants: @@ -269,36 +203,6 @@ enum/LATENCY: - name: WS7 description: 7 wait states value: 7 -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: @@ -314,15 +218,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 diff --git a/data/registers/flash_f3.yaml b/data/registers/flash_f3.yaml index 102491e..e706456 100644 --- a/data/registers/flash_f3.yaml +++ b/data/registers/flash_f3.yaml @@ -85,7 +85,6 @@ fieldset/CR: description: Option byte programming bit_offset: 4 bit_size: 1 - enum: OPTPG - name: OPTER description: Option byte erase bit_offset: 5 @@ -114,7 +113,6 @@ fieldset/CR: description: Force option byte loading bit_offset: 13 bit_size: 1 - enum: OBL_LAUNCH fieldset/KEYR: description: Flash key register fields: @@ -218,21 +216,6 @@ enum/LATENCY: - name: WS2 description: "2 wait states, if 48 < HCLK <= 72 MHz" value: 2 -enum/OBL_LAUNCH: - bit_size: 1 - variants: - - name: Inactive - description: Force option byte loading inactive - value: 0 - - name: Active - description: Force option byte loading active - value: 1 -enum/OPTPG: - bit_size: 1 - variants: - - name: OptionByteProgramming - description: Program option byte activated - value: 1 enum/RDPRT: bit_size: 2 variants: diff --git a/data/registers/flash_f4.yaml b/data/registers/flash_f4.yaml index 103ff07..47a6f03 100644 --- a/data/registers/flash_f4.yaml +++ b/data/registers/flash_f4.yaml @@ -40,27 +40,22 @@ fieldset/ACR: description: Prefetch enable bit_offset: 8 bit_size: 1 - enum: PRFTEN - name: ICEN description: Instruction cache enable bit_offset: 9 bit_size: 1 - enum: ICEN - name: DCEN description: Data cache enable bit_offset: 10 bit_size: 1 - enum: DCEN - name: ICRST description: Instruction cache reset bit_offset: 11 bit_size: 1 - enum: ICRST - name: DCRST description: Data cache reset bit_offset: 12 bit_size: 1 - enum: DCRST fieldset/CR: description: Control register fields: @@ -68,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 bit_offset: 2 bit_size: 1 - enum: MER - name: SNB description: Sector number bit_offset: 3 @@ -92,22 +84,18 @@ 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: LOCK description: Lock bit_offset: 31 bit_size: 1 - enum: LOCK fieldset/KEYR: description: Flash key register fields: @@ -188,60 +176,6 @@ fieldset/SR: description: Busy bit_offset: 16 bit_size: 1 -enum/DCEN: - bit_size: 1 - variants: - - name: Disabled - description: Data cache is disabled - value: 0 - - name: Enabled - description: Data cache is enabled - value: 1 -enum/DCRST: - bit_size: 1 - variants: - - name: NotReset - description: Data cache is not reset - value: 0 - - name: Reset - description: Data cache 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/ICEN: - bit_size: 1 - variants: - - name: Disabled - description: Instruction cache is disabled - value: 0 - - name: Enabled - description: Instruction cache is enabled - value: 1 -enum/ICRST: - bit_size: 1 - variants: - - name: NotReset - description: Instruction cache is not reset - value: 0 - - name: Reset - description: Instruction cache is reset - value: 1 enum/LATENCY: bit_size: 3 variants: @@ -293,36 +227,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: @@ -338,15 +242,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 diff --git a/data/registers/flash_f7.yaml b/data/registers/flash_f7.yaml index 3e9ae06..103fe1a 100644 --- a/data/registers/flash_f7.yaml +++ b/data/registers/flash_f7.yaml @@ -226,15 +226,6 @@ fieldset/SR: description: Busy bit_offset: 16 bit_size: 1 -enum/ARTRST: - bit_size: 1 - variants: - - name: NotReset - description: Accelerator is not reset - value: 0 - - name: Reset - description: Accelerator is reset - value: 1 enum/LATENCY: bit_size: 4 variants: