associated RegisterBlock

Author: burrbull

src/generate/generic.rs

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

src/generate/peripheral.rs

@@ -81,13 +81,14 @@ pub fn render(p_original: &Peripheral, index: &Index, config: &Config) -> Result
             #phtml
             #doc_alias
             #feature_attribute
-            pub type #p_ty = crate::Periph<#base::RegisterBlock, #pspec>;
+            pub type #p_ty = crate::Periph<#pspec>;
 
             #feature_attribute
             pub struct #pspec;
 
             #feature_attribute
             impl PeripheralSpec for #pspec {
+                type RB = #base::RegisterBlock;
                 const ADDRESS: usize = #address;
                 const NAME: &str = #name_str;
             }