Crate can now be built without manual adjustments.

I let svd2rust build both the Cortex-M and RISC-V versions of the PAC, and then
join them together in a custom lib.rs file.

Note that, GHA and Debian disagree about sorting so I re-sorted the files in an Ubuntu 20.04 container.

Author: thejpster

.cargo/config.toml

@@ -0,0 +1,3 @@
+[build]
+# Set a default target so the docs build
+target = "riscv32imac-unknown-none-elf"

.github/workflows/build_and_test.yml

@@ -5,16 +5,16 @@ jobs:
     name: cargo-check
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
         with:
-          target: thumbv8m.main-none-eabi
-      - run: cargo build --target=thumbv8m.main-none-eabi
+          target: thumbv8m.main-none-eabihf
+      - run: cargo build --target=thumbv8m.main-none-eabihf
   check-riscv:
     name: cargo-check
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
         with:
           target: riscv32imac-unknown-none-elf

.github/workflows/clippy.yml

@@ -6,20 +6,20 @@ jobs:
     env:
       RUSTFLAGS: "-D warnings"
     steps:
-      - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@1.64.0
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
         with:
           target: thumbv8m.main-none-eabihf
           components: clippy
-      - run: cargo clippy --target=thumbv8m.main-none-eabihf -- -D warnings
+      - run: cargo clippy --target=thumbv8m.main-none-eabihf
   clippy-check-riscv:
     runs-on: ubuntu-20.04
     env:
       RUSTFLAGS: "-D warnings"
     steps:
-      - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@1.64.0
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
         with:
           target: riscv32imac-unknown-none-elf
           components: clippy
-      - run: cargo clippy --target=riscv32imac-unknown-none-elf -- -D warnings
+      - run: cargo clippy --target=riscv32imac-unknown-none-elf

.github/workflows/rustfmt.yml

@@ -7,7 +7,7 @@ jobs:
     env:
       RUSTFLAGS: "-D warnings"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: rustfmt

.github/workflows/update.yml

@@ -0,0 +1,9 @@
+on: [push, pull_request]
+name: Run update.sh and check for changed files
+jobs:
+  update-and-diff:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v4
+      - run: ./update.sh
+      - run: git diff --exit-code

Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "rp235x-pac"
-version = "0.6.0"
+version = "0.1.0"
 authors = ["The RP-RS team"]
-edition = "2018"
+edition = "2021"
 homepage = "https://github.com/rp-rs/rp235x-pac"
 description = "A Peripheral Access Crate for the Raspberry Pi RP235x microcontrollers"
 license = "BSD-3-Clause"

sortFieldsAlphaNum.sh

@@ -17,38 +17,39 @@ set -e
 
 # This array should be populated with enough characters to locate a struct that needs to have its fields alphabetized.
 alphaTargets=('struct Peripherals')
+FILE=$1
 
 for ((i = 0; i < ${#alphaTargets[@]}; i++)); do
 
   # File line count
-  maxLen=$(cat src/lib.rs | wc -l)
+  maxLen=$(cat ${FILE} | wc -l)
 
   # This will find the line number before the starting line of the block to replace
-  blockStart=$(cat src/lib.rs | grep "${alphaTargets[$i]}" -m 1 -n | cut -d ":" -f1)
+  blockStart=$(cat ${FILE} | grep "${alphaTargets[$i]}" -m 1 -n | cut -d ":" -f1)
 
   # This will find the line number after the ending line of the block to replace
-  blockEnd=$(cat src/lib.rs | grep "${alphaTargets[$i]}" -A $maxLen | grep -m 1 -n "}" | cut -d ":" -f1)
+  blockEnd=$(cat ${FILE} | grep "${alphaTargets[$i]}" -A $maxLen | grep -m 1 -n "}" | cut -d ":" -f1)
   blockEndLine=$(($blockEnd - 2)) # used for grep display count after match
   blockEnd=$((blockEndLine + blockStart)) # used for tail
 
   # Calculate the tail number needed to crop to blockEnd
   blockTail=$((maxLen-blockEnd))
 
   # This will replace the parts that need to be sorted.
-  toReplace=$(cat src/lib.rs | grep "${alphaTargets[$i]}" -A $blockEndLine | tail -n $blockEndLine)
+  toReplace=$(cat ${FILE} | grep "${alphaTargets[$i]}" -A $blockEndLine | tail -n $blockEndLine)
   if [ "$(uname)" == "Darwin" ]; then
     alphabetized=$(echo "$toReplace" | sed '$!N;s/\n/ /' | sort | sed 's/     /\n    /')
   else
     alphabetized=$(echo "$toReplace" | sed '$!N;s/\n/ /' | sort | sed -E 's/\s{5}/\n    /')
   fi
 
   # Grab the parts that we aren't sorting
-  libSrcHead=$(cat src/lib.rs | head -n $blockStart)
-  libSrcTail=$(cat src/lib.rs | tail -n $blockTail)
+  libSrcHead=$(cat ${FILE} | head -n $blockStart)
+  libSrcTail=$(cat ${FILE} | tail -n $blockTail)
 
   # Write out the sorted file
-  echo "$libSrcHead" > src/lib.rs
-  echo "$alphabetized" >> src/lib.rs
-  echo "$libSrcTail" >> src/lib.rs
+  echo "$libSrcHead" > ${FILE}
+  echo "$alphabetized" >> ${FILE}
+  echo "$libSrcTail" >> ${FILE}
 
 done