PeripheralSpec

Author: burrbull

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 
 ## [Unreleased]
 
+- Use marker struct instead of address in `Periph` with `PeripheralSpec` trait
+
 ## [v0.37.0] - 2025-08-14
 
 - Fix new `mismatched-lifetime-syntaxes` lint warnings

src/config.rs

@@ -284,11 +284,12 @@ impl IdentFormats {
             ("register".into(), pascal.clone()),
             ("cluster".into(), pascal.clone()),
             ("register_spec".into(), pascal.clone().suffix("Spec")),
-            ("peripheral".into(), pascal),
+            ("peripheral".into(), pascal.clone()),
             (
                 "peripheral_singleton".into(),
                 IdentFormat::default().snake_case(),
             ),
+            ("peripheral_spec".into(), pascal.suffix("Spec")),
         ]);
 
         map
@@ -309,7 +310,8 @@ impl IdentFormats {
             ("register".into(), constant.clone()),
             ("register_spec".into(), constant.clone().suffix("_SPEC")),
             ("peripheral".into(), constant.clone()),
-            ("peripheral_singleton".into(), constant),
+            ("peripheral_singleton".into(), constant.clone()),
+            ("peripheral_spec".into(), constant.suffix("_SPEC")),
         ]);
 
         map

src/generate/generic.rs

@@ -1,15 +1,28 @@
 use core::marker;
 
 /// Generic peripheral accessor
-pub struct Periph<RB, const A: usize> {
-    _marker: marker::PhantomData<RB>,
+pub struct Periph<RB, PER> {
+    _marker: marker::PhantomData<(RB, PER)>,
 }
 
-unsafe impl<RB, const A: usize> Send for Periph<RB, A> {}
+pub trait PeripheralSpec {
+    ///Pointer to the register block
+    const ADDRESS: usize;
+    ///Debug name
+    const NAME: &str;
+}
+
+unsafe impl<RB, PER> Send for Periph<RB, PER> {}
+
+impl<RB, PER: PeripheralSpec> core::fmt::Debug for Periph<RB, PER> {
+    fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
+        f.debug_struct(PER::NAME).finish()
+    }
+}
 
-impl<RB, const A: usize> Periph<RB, A> {
+impl<RB, PER: PeripheralSpec> Periph<RB, PER> {
     ///Pointer to the register block
-    pub const PTR: *const RB = A as *const _;
+    pub const PTR: *const RB = PER::ADDRESS as *const _;
 
     ///Return the pointer to the register block
     #[inline(always)]
@@ -37,7 +50,7 @@ impl<RB, const A: usize> Periph<RB, A> {
     }
 }
 
-impl<RB, const A: usize> core::ops::Deref for Periph<RB, A> {
+impl<RB, PER: PeripheralSpec> core::ops::Deref for Periph<RB, PER> {
     type Target = RB;
 
     #[inline(always)]

src/generate/peripheral.rs

@@ -72,20 +72,24 @@ pub fn render(p_original: &Peripheral, index: &Index, config: &Config) -> Result
                          feature_attribute: &TokenStream,
                          doc: &str,
                          p_ty: &Ident,
+                         name_str: &str,
                          doc_alias: Option<TokenStream>,
                          address: LitInt| {
+        let pspec = ident(name_str, config, "peripheral_spec", Span::call_site());
         out.extend(quote! {
             #[doc = #doc]
             #phtml
             #doc_alias
             #feature_attribute
-            pub type #p_ty = crate::Periph<#base::RegisterBlock, #address>;
+            pub type #p_ty = crate::Periph<#base::RegisterBlock, #pspec>;
 
             #feature_attribute
-            impl core::fmt::Debug for #p_ty {
-                fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
-                    f.debug_struct(#name_str).finish()
-                }
+            pub struct #pspec;
+
+            #feature_attribute
+            impl PeripheralSpec for #pspec {
+                const ADDRESS: usize = #address;
+                const NAME: &str = #name_str;
             }
         });
     };
@@ -113,6 +117,7 @@ pub fn render(p_original: &Peripheral, index: &Index, config: &Config) -> Result
                     &feature_attribute_n,
                     &doc,
                     &p_ty,
+                    &name_str,
                     doc_alias,
                     address,
                 );
@@ -138,7 +143,15 @@ pub fn render(p_original: &Peripheral, index: &Index, config: &Config) -> Result
                 feature_attribute.extend(quote! { #[cfg(feature = #p_feature)] })
             };
             // Insert the peripheral structure
-            per_to_tokens(&mut out, &feature_attribute, &doc, &p_ty, None, address);
+            per_to_tokens(
+                &mut out,
+                &feature_attribute,
+                &doc,
+                &p_ty,
+                &name_str,
+                None,
+                address,
+            );
 
             // Derived peripherals may not require re-implementation, and will instead
             // use a single definition of the non-derived version.