From c5ffacbb1fc171651b705acdcc6a85cb7f8df1ef Mon Sep 17 00:00:00 2001 From: eZio Pan Date: Tue, 27 Feb 2024 11:01:46 +0800 Subject: [PATCH] add comp_h7 to chips.rs --- data/registers/comp_h7_a.yaml | 2 +- data/registers/comp_h7_b.yaml | 4 ++-- stm32-data-gen/src/chips.rs | 2 ++ transforms/COMP_h.yaml | 4 ++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/data/registers/comp_h7_a.yaml b/data/registers/comp_h7_a.yaml index c1c4109..3dede7b 100644 --- a/data/registers/comp_h7_a.yaml +++ b/data/registers/comp_h7_a.yaml @@ -1,4 +1,4 @@ -block/COMP1: +block/COMP: description: COMP1. items: - name: SR diff --git a/data/registers/comp_h7_b.yaml b/data/registers/comp_h7_b.yaml index 8e95d64..5dfdb03 100644 --- a/data/registers/comp_h7_b.yaml +++ b/data/registers/comp_h7_b.yaml @@ -1,4 +1,4 @@ -block/COMP1: +block/COMP: description: COMP1. items: - name: SR @@ -59,7 +59,7 @@ fieldset/CFGR1: - name: INMSEL description: COMP channel 1 inverting input selection field. bit_offset: 16 - bit_size: 4 + bit_size: 3 enum: INMSEL - name: INPSEL description: COMP channel 1 non-inverting input selection bit. diff --git a/stm32-data-gen/src/chips.rs b/stm32-data-gen/src/chips.rs index 2c98a86..26dff72 100644 --- a/stm32-data-gen/src/chips.rs +++ b/stm32-data-gen/src/chips.rs @@ -616,6 +616,8 @@ impl PeriMatcher { ("STM32G0.1.*:.*:COMP:.*", ("comp", "v1", "COMP")), ("STM32G4.*:.*:COMP:.*", ("comp", "v2", "COMP")), ("STM32WL.*:.*:COMP:.*", ("comp", "v3", "COMP")), + ("STM32H7[45].*:COMP:.*", ("comp", "h7_b", "COMP")), + ("STM32H7[AB].*:COMP:.*", ("comp", "h7_a", "COMP")), (r".*:.*:DCACHE:.*", ("dcache", "v1", "DCACHE")), (".*:.*:PSSI:.*", ("pssi", "v1", "PSSI")), (".*:.*:DTS:.*", ("dts", "v1", "DTS")), diff --git a/transforms/COMP_h.yaml b/transforms/COMP_h.yaml index 2b8306d..786453c 100644 --- a/transforms/COMP_h.yaml +++ b/transforms/COMP_h.yaml @@ -1,5 +1,9 @@ transforms: + - !Rename + from: ^(COMP)\d$ + to: $1 + - !MakeFieldArray fieldsets: ^(SR|ICFR)$ from: (C?C)\d(IF|VAL)