Register reader/writer use reg spec, not type alias

Author: couchand

src/generate/generic.rs

@@ -87,7 +87,7 @@ where
     /// let flag = reader.field2().bit_is_set();
     /// ```
     #[inline(always)]
-    pub fn read(&self) -> R<REG::Ux, Self> {
+    pub fn read(&self) -> R<REG> {
         R {
             bits: self.register.get(),
             _reg: marker::PhantomData,
@@ -139,7 +139,7 @@ where
     #[inline(always)]
     pub fn write<F>(&self, f: F)
     where
-        F: FnOnce(&mut W<REG::Ux, Self>) -> &mut W<REG::Ux, Self>,
+        F: FnOnce(&mut W<REG>) -> &mut W<REG>,
     {
         self.register.set(
             f(&mut W {
@@ -162,7 +162,7 @@ where
     #[inline(always)]
     pub fn write_with_zero<F>(&self, f: F)
     where
-        F: FnOnce(&mut W<REG::Ux, Self>) -> &mut W<REG::Ux, Self>,
+        F: FnOnce(&mut W<REG>) -> &mut W<REG>,
     {
         self.register.set(
             f(&mut W {
@@ -199,7 +199,7 @@ where
     #[inline(always)]
     pub fn modify<F>(&self, f: F)
     where
-        for<'w> F: FnOnce(&R<REG::Ux, Self>, &'w mut W<REG::Ux, Self>) -> &'w mut W<REG::Ux, Self>,
+        for<'w> F: FnOnce(&R<REG>, &'w mut W<REG>) -> &'w mut W<REG>,
     {
         let bits = self.register.get();
         self.register.set(
@@ -218,47 +218,38 @@ where
     }
 }
 
-/// Register/field reader.
+/// Register reader.
 ///
 /// Result of the `read` methods of registers. Also used as a closure argument in the `modify`
 /// method.
-pub struct R<U, T> {
-    pub(crate) bits: U,
-    _reg: marker::PhantomData<T>,
+pub struct R<REG: Register> {
+    pub(crate) bits: REG::Ux,
+    _reg: marker::PhantomData<REG>,
 }
 
-impl<U, T> R<U, T>
+impl<REG: Register> R<REG>
 where
-    U: Copy,
+    REG::Ux: Copy,
 {
-    /// Creates a new instance of the reader.
+    /// Reads raw bits from register.
     #[inline(always)]
-    pub(crate) fn new(bits: U) -> Self {
-        Self {
-            bits,
-            _reg: marker::PhantomData,
-        }
-    }
-
-    /// Reads raw bits from register/field.
-    #[inline(always)]
-    pub fn bits(&self) -> U {
+    pub fn bits(&self) -> REG::Ux {
         self.bits
     }
 }
 
-impl<U, T, FI> PartialEq<FI> for R<U, T>
+impl<REG: Register, FI> PartialEq<FI> for R<REG>
 where
-    U: PartialEq,
-    FI: Copy + Into<U>,
+    REG::Ux: PartialEq,
+    FI: Copy + Into<REG::Ux>,
 {
     #[inline(always)]
     fn eq(&self, other: &FI) -> bool {
         self.bits.eq(&(*other).into())
     }
 }
 
-impl<FI> R<bool, FI> {
+impl<REG: Register<Ux=bool>> R<REG> {
     /// Value of the field as raw bits.
     #[inline(always)]
     pub fn bit(&self) -> bool {
@@ -279,16 +270,16 @@ impl<FI> R<bool, FI> {
 /// Register writer.
 ///
 /// Used as an argument to the closures in the `write` and `modify` methods of the register.
-pub struct W<U, T> {
+pub struct W<REG: Register> {
     ///Writable bits
-    pub(crate) bits: U,
-    _reg: marker::PhantomData<T>,
+    pub(crate) bits: REG::Ux,
+    _reg: marker::PhantomData<REG>,
 }
 
-impl<U, T> W<U, T> {
+impl<REG: Register> W<REG> {
     /// Writes raw bits to the register.
     #[inline(always)]
-    pub unsafe fn bits(&mut self, bits: U) -> &mut Self {
+    pub unsafe fn bits(&mut self, bits: REG::Ux) -> &mut Self {
         self.bits = bits;
         self
     }
@@ -302,3 +293,60 @@ pub enum Variant<U, T> {
     /// Raw bits.
     Res(U),
 }
+
+/// Field reader.
+///
+/// Result of the `read` methods of fields.
+pub struct FieldReader<U, T> {
+    pub(crate) bits: U,
+    _reg: marker::PhantomData<T>,
+}
+
+impl<U, T> FieldReader<U, T>
+where
+    U: Copy,
+{
+    /// Creates a new instance of the reader.
+    #[inline(always)]
+    pub(crate) fn new(bits: U) -> Self {
+        Self {
+            bits,
+            _reg: marker::PhantomData,
+        }
+    }
+
+    /// Reads raw bits from field.
+    #[inline(always)]
+    pub fn bits(&self) -> U {
+        self.bits
+    }
+}
+
+impl<U, T, FI> PartialEq<FI> for FieldReader<U, T>
+where
+    U: PartialEq,
+    FI: Copy + Into<U>,
+{
+    #[inline(always)]
+    fn eq(&self, other: &FI) -> bool {
+        self.bits.eq(&(*other).into())
+    }
+}
+
+impl<FI> FieldReader<bool, FI> {
+    /// Value of the field as raw bits.
+    #[inline(always)]
+    pub fn bit(&self) -> bool {
+        self.bits
+    }
+    /// Returns `true` if the bit is clear (0).
+    #[inline(always)]
+    pub fn bit_is_clear(&self) -> bool {
+        !self.bit()
+    }
+    /// Returns `true` if the bit is set (1).
+    #[inline(always)]
+    pub fn bit_is_set(&self) -> bool {
+        self.bit()
+    }
+}

src/generate/register.rs

@@ -55,7 +55,7 @@ pub fn render(
         let desc = format!("Reader of register {}", register.name);
         mod_items.extend(quote! {
             #[doc = #desc]
-            pub type R = crate::R<#rty, super::#name_pc>;
+            pub type R = crate::R<super::#u_name_pc>;
         });
         methods.push("read");
     }
@@ -65,7 +65,7 @@ pub fn render(
         let desc = format!("Writer for register {}", register.name);
         mod_items.extend(quote! {
             #[doc = #desc]
-            pub type W = crate::W<#rty, super::#name_pc>;
+            pub type W = crate::W<super::#u_name_pc>;
         });
         if let Some(rv) = res_val.map(util::hex) {
             let doc = format!("Register {} `reset()`'s with value {}", register.name, &rv);
@@ -381,7 +381,7 @@ pub fn fields(
 
                     mod_items.extend(quote! {
                         #[doc = #readerdoc]
-                        pub type #name_pc_r = crate::R<#fty, #name_pc_a>;
+                        pub type #name_pc_r = crate::FieldReader<#fty, #name_pc_a>;
                     });
                 } else {
                     let has_reserved_variant = evs.values.len() != (1 << width);
@@ -463,7 +463,7 @@ pub fn fields(
 
                     mod_items.extend(quote! {
                         #[doc = #readerdoc]
-                        pub type #name_pc_r = crate::R<#fty, #name_pc_a>;
+                        pub type #name_pc_r = crate::FieldReader<#fty, #name_pc_a>;
                         impl #name_pc_r {
                             #enum_items
                         }
@@ -472,7 +472,7 @@ pub fn fields(
             } else {
                 mod_items.extend(quote! {
                     #[doc = #readerdoc]
-                    pub type #name_pc_r = crate::R<#fty, #fty>;
+                    pub type #name_pc_r = crate::FieldReader<#fty, #fty>;
                 })
             }
         }