From 04ae6ce25ea46d3137c003ec839ea4faa6d75530 Mon Sep 17 00:00:00 2001 From: Ulf Lilleengen Date: Wed, 18 Aug 2021 13:59:51 +0200 Subject: [PATCH 1/3] Add SPI2s1_v3_5 --- parse.py | 1 + 1 file changed, 1 insertion(+) diff --git a/parse.py b/parse.py index f6596a9..d9a3f7d 100755 --- a/parse.py +++ b/parse.py @@ -329,6 +329,7 @@ perimap = [ ('.*:RNG:rng1_v3_1', 'rng_v1/RNG'), ('.*:SPI:spi2s1_v2_2', 'spi_v1/SPI'), ('.*:SPI:spi2s1_v3_3', 'spi_v2/SPI'), + ('.*:SPI:spi2s1_v3_5', 'spi_v2/SPI'), ('.*:SPI:spi2s1_v3_1', 'spi_v2/SPI'), ('.*:SPI:spi2s2_v1_1', 'spi_v3/SPI'), ('.*:SPI:spi2s2_v1_0', 'spi_v3/SPI'), From d9708f6bfc67b0d9a21b21b531901218791e1383 Mon Sep 17 00:00:00 2001 From: Ulf Lilleengen Date: Wed, 18 Aug 2021 14:00:14 +0200 Subject: [PATCH 2/3] Use correct peripheral name for SUBGHZ SPI * Add SPI2s1_v3_5 register block for SUBGHZSPI peripheral --- parse.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/parse.py b/parse.py index d9a3f7d..0cc114f 100755 --- a/parse.py +++ b/parse.py @@ -330,6 +330,7 @@ perimap = [ ('.*:SPI:spi2s1_v2_2', 'spi_v1/SPI'), ('.*:SPI:spi2s1_v3_3', 'spi_v2/SPI'), ('.*:SPI:spi2s1_v3_5', 'spi_v2/SPI'), + ('.*:SUBGHZSPI:.*', 'spi_v2/SPI'), ('.*:SPI:spi2s1_v3_1', 'spi_v2/SPI'), ('.*:SPI:spi2s2_v1_1', 'spi_v3/SPI'), ('.*:SPI:spi2s2_v1_0', 'spi_v3/SPI'), @@ -657,6 +658,8 @@ def parse_chips(): if pname == 'SYS': pname = 'SYSCFG' + if pname == 'SUBGHZ': + pname = 'SUBGHZSPI' if pname in FAKE_PERIPHERALS: continue if pname.startswith('ADC'): From 63d1af4eca72f2e35820a682ec3e740fbc38e83f Mon Sep 17 00:00:00 2001 From: Ulf Lilleengen Date: Wed, 18 Aug 2021 14:16:49 +0200 Subject: [PATCH 3/3] Rerun parse.py --- extract.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extract.sh b/extract.sh index 2f52429..c1b2fb0 100755 --- a/extract.sh +++ b/extract.sh @@ -6,7 +6,7 @@ board=$1 peri=$2 mkdir -p regs/$peri -cargo build --release --manifest-path ../../svd2rust/Cargo.toml +cargo build --release --manifest-path ../../svd4rust/Cargo.toml transform="transform.yaml" @@ -28,7 +28,7 @@ for f in `ls $query`; do f=${f#"stm32"} f=${f%".svd"} echo -n processing $f ... - RUST_LOG=info ../../svd2rust/target/release/svd4rust extract-peripheral --svd sources/svd/stm32$f.svd --transform $transform --peripheral $peri > regs/$peri/$f.yaml 2> regs/$peri/$f.yaml.out + RUST_LOG=info ../../svd4rust/target/release/svd4rust extract-peripheral --svd sources/svd/stm32$f.svd --transform $transform --peripheral $peri > regs/$peri/$f.yaml 2> regs/$peri/$f.yaml.out if [ $? -ne 0 ]; then mv regs/$peri/$f.yaml.out regs/$peri/$f.err rm regs/$peri/$f.yaml