Merge #316

316: move reset_value r=therealprof a=burrbull

move `reset_value` to be public method of register struct (not `W`).

It's breaking change, but I think this can't break existent code.

Co-authored-by: Andrey Zgarbul <[email protected]>

Author: bors[bot]

src/generate/register.rs

@@ -87,7 +87,7 @@ pub fn render(
             where
                 F: FnOnce(&mut W) -> &mut W
             {
-                self.register.set(f(&mut W::reset_value()).bits);
+                self.register.set(f(&mut W { bits: Self::reset_value() }).bits);
             }
         });
 
@@ -104,13 +104,20 @@ pub fn render(
             .map(util::hex)
             .ok_or_else(|| format!("Register {} has no reset value", register.name))?;
 
-        w_impl_items.push(quote! {
+        reg_impl_items.push(quote! {
             /// Reset value of the register
             #[inline]
-            pub const fn reset_value() -> W {
-                W { bits: #rv }
+            pub const fn reset_value() -> #rty {
+                #rv
             }
+            /// Writes the reset value to the register
+            #[inline]
+            pub fn reset(&self) {
+                self.register.set(Self::reset_value())
+            }
+        });
 
+        w_impl_items.push(quote! {
             /// Writes raw bits to the register
             #[inline]
             pub #unsafety fn bits(&mut self, bits: #rty) -> &mut Self {
@@ -120,16 +127,6 @@ pub fn render(
         });
     }
 
-    if access == Access::ReadWrite {
-        reg_impl_items.push(quote! {
-            /// Writes the reset value to the register
-            #[inline]
-            pub fn reset(&self) {
-                self.write(|w| w)
-            }
-        })
-    }
-
     mod_items.push(quote! {
         impl super::#name_pc {
             #(#reg_impl_items)*
@@ -372,7 +369,7 @@ pub fn fields(
                     #[doc = #description]
                     #[inline]
                     pub fn #sc(&self) -> #pc_r {
-                        #pc_r::_from({ #value })
+                        #pc_r::_from( #value )
                     }
                 });