generate SVD-YAML

esp-rs · Mar 29, 2024 · 8ee0719 · 8ee0719
1 parent 6256183
commit 8ee0719
Show file tree

Hide file tree

Showing 14 changed files with 345,048 additions and 5 deletions.
diff --git a/esp32/svd/esp32.svd.yaml b/esp32/svd/esp32.svd.yaml
diff --git a/esp32c2/svd/esp32c2.svd.yaml b/esp32c2/svd/esp32c2.svd.yaml
diff --git a/esp32c3/svd/esp32c3.svd.yaml b/esp32c3/svd/esp32c3.svd.yaml
diff --git a/esp32c6-lp/svd/esp32c6-lp.svd.yaml b/esp32c6-lp/svd/esp32c6-lp.svd.yaml
diff --git a/esp32c6/svd/esp32c6.svd.yaml b/esp32c6/svd/esp32c6.svd.yaml
diff --git a/esp32h2/svd/esp32h2.svd.yaml b/esp32h2/svd/esp32h2.svd.yaml
diff --git a/esp32p4/svd/esp32p4.svd.yaml b/esp32p4/svd/esp32p4.svd.yaml
diff --git a/esp32s2-ulp/svd/esp32s2-ulp.svd.yaml b/esp32s2-ulp/svd/esp32s2-ulp.svd.yaml
diff --git a/esp32s2/svd/esp32s2.svd.yaml b/esp32s2/svd/esp32s2.svd.yaml
diff --git a/esp32s3-ulp/svd/esp32s3-ulp.svd.yaml b/esp32s3-ulp/svd/esp32s3-ulp.svd.yaml
diff --git a/esp32s3/svd/esp32s3.svd.yaml b/esp32s3/svd/esp32s3.svd.yaml
diff --git a/xtask/Cargo.lock b/xtask/Cargo.lock
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
@@ -13,5 +13,5 @@ log        = "0.4.20"
 semver     = "1.0.21"
 strum      = { version = "0.26.1", features = ["derive"] }
 svd2rust   = { version = "0.32.0", default-features = false }
-svdtools   = "0.3.12"
+svdtools   = "0.3.13"
 toml_edit  = "0.22.4"
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
@@ -10,7 +10,9 @@ use anyhow::{Error, Result};
 use clap::{Parser, Subcommand, ValueEnum};
 use strum::{Display, EnumIter, IntoEnumIterator};
 use svd2rust::{
-    config::{IdentFormats, IdentFormatsTheme}, util::IdentFormat, Config, Target
+    config::{IdentFormats, IdentFormatsTheme},
+    util::IdentFormat,
+    Config, Target,
 };
 use svdtools::{html::html_cli::svd2html, patch::Config as PatchConfig};
 use toml_edit::Document;
@@ -67,6 +69,13 @@ enum Commands {
         chips: Vec<Chip>,
     },
 
+    /// Patches and generates SVD-like YAML
+    SvdYaml {
+        /// Package(s) to target
+        #[arg(value_enum, default_values_t = Chip::iter())]
+        chips: Vec<Chip>,
+    },
+
     /// Generate the specified package(s)
     ///
     /// Additionally patches the releavant SVD(s) prior to generating the
@@ -130,6 +139,10 @@ fn main() -> Result<()> {
             .iter()
             .try_for_each(|chip| patch_svd(&workspace, chip)),
 
+        Commands::SvdYaml { chips } => chips
+            .iter()
+            .try_for_each(|chip| generate_yaml(&workspace, chip)),
+
         Commands::Generate { chips } => chips
             .iter()
             .try_for_each(|chip: &Chip| generate_package(&workspace, chip)),
@@ -182,6 +195,27 @@ fn patch_svd(workspace: &Path, chip: &Chip) -> Result<()> {
     Ok(())
 }
 
+fn generate_yaml(workspace: &Path, chip: &Chip) -> Result<()> {
+    use svdtools::convert::convert_cli::{convert, InputFormat, OutputFormat, ParserConfig};
+    patch_svd(workspace, chip)?;
+    let svd_path = workspace.join(chip.to_string()).join("svd");
+    let from = svd_path.join(format!("{chip}.svd"));
+    let to = svd_path.join(format!("{chip}.svd.yaml"));
+    let parser_config = ParserConfig {
+        expand: false,
+        expand_properties: false,
+        ignore_enums: false,
+    };
+    convert(
+        &from,
+        &to,
+        Some(InputFormat::Xml),
+        Some(OutputFormat::Yaml),
+        parser_config,
+        None,
+    )
+}
+
 fn generate_package(workspace: &Path, chip: &Chip) -> Result<()> {
     // Patch the SVD prior to generating the package:
     patch_svd(workspace, chip)?;
@@ -222,7 +256,10 @@ fn generate_package(workspace: &Path, chip: &Chip) -> Result<()> {
         _ => IdentFormats::default_theme(),
     };
     ident_formats.insert("enum_name".into(), IdentFormat::default().constant_case());
-    ident_formats.insert("enum_read_name".into(), IdentFormat::default().constant_case());
+    ident_formats.insert(
+        "enum_read_name".into(),
+        IdentFormat::default().constant_case(),
+    );
     ident_formats.insert("enum_value".into(), IdentFormat::default().pascal_case());
     ident_formats.extend(config.ident_formats.drain());
     config.ident_formats = ident_formats;