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 diff --git a/parse.py b/parse.py index f6596a9..0cc114f 100755 --- a/parse.py +++ b/parse.py @@ -329,6 +329,8 @@ 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'), + ('.*: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'), @@ -656,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'):