Merge pull request #276 from romancardenas/master

Revert riscv elements and unstable-riscv feature

Author: burrbull

svd-encoder/CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+- Revert the `riscv` element, as well as the `unstable-riscv` feature.
+
 ## [v0.14.5] - 2023-08-20
 
 - Adapt the `riscv` element to handle `riscv::Exception`.

svd-encoder/Cargo.toml

@@ -11,9 +11,6 @@ rust-version = "1.65.0"
 version = "0.14.5"
 readme = "README.md"
 
-[features]
-unstable-riscv = ["svd-rs/unstable-riscv"]
-
 [dependencies]
 convert_case = "0.6.0"
 svd-rs = { version = "0.14.9", path = "../svd-rs" }

svd-encoder/src/device.rs

@@ -34,12 +34,6 @@ impl Encode for Device {
             elem.children.push(new_node("licenseText", v.clone()));
         }
 
-        #[cfg(feature = "unstable-riscv")]
-        if let Some(v) = &self.riscv {
-            elem.children
-                .push(XMLNode::Element(v.encode_with_config(config)?));
-        }
-
         if let Some(v) = &self.cpu {
             elem.children
                 .push(XMLNode::Element(v.encode_with_config(config)?));

svd-encoder/src/lib.rs

@@ -103,7 +103,5 @@ mod readaction;
 mod register;
 mod registercluster;
 mod registerproperties;
-#[cfg(feature = "unstable-riscv")]
-mod riscv;
 mod usage;
 mod writeconstraint;

svd-encoder/src/riscv.rs

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## Unreleased
+
+- Revert the `riscv` element, as well as the `unstable-riscv` feature.
+
 ## [v0.14.7] - 2024-10-03
 
 - Bump svd-rs to 0.14.9

svd-parser/CHANGELOG.md

@@ -17,7 +17,6 @@ readme = "README.md"
 [features]
 derive-from = ["svd-rs/derive-from"]
 expand = ["derive-from"]
-unstable-riscv = ["svd-rs/unstable-riscv"]
 
 [dependencies]
 svd-rs = { version = "0.14.9", path = "../svd-rs" }

svd-parser/Cargo.toml

@@ -1,6 +1,4 @@
 use super::*;
-#[cfg(feature = "unstable-riscv")]
-use crate::svd::riscv::Riscv;
 use crate::svd::{cpu::Cpu, peripheral::Peripheral, registerproperties::RegisterProperties};
 
 /// Parses a SVD file
@@ -33,10 +31,6 @@ impl Parse for Device {
                     .collect();
                 ps?
             });
-        #[cfg(feature = "unstable-riscv")]
-        if let Some(riscv) = optional::<Riscv>("riscv", tree, config)? {
-            device = device.riscv(riscv);
-        }
         if let Some(version) = tree.get_child_text_opt("version")? {
             device = device.version(version)
         }

svd-parser/src/device.rs

@@ -211,8 +211,6 @@ mod readaction;
 mod register;
 mod registercluster;
 mod registerproperties;
-#[cfg(feature = "unstable-riscv")]
-mod riscv;
 mod usage;
 mod writeconstraint;