R/W on Reg

Author: burrbull

src/generate/generic.rs

@@ -43,7 +43,7 @@ pub fn render() -> Result<Vec<Tokens>> {
         {
             ///Reads the contents of the register
             #[inline(always)]
-            pub fn read(&self) -> R<U, REG> {
+            pub fn read(&self) -> R<U, Self> {
                 R::new((*self.0).get())
             }
         }
@@ -73,7 +73,7 @@ pub fn render() -> Result<Vec<Tokens>> {
             #[inline(always)]
             pub fn write<F>(&self, f: F)
             where
-                F: FnOnce(&mut W<U, REG>) -> &mut W<U, REG>
+                F: FnOnce(&mut W<U, Self>) -> &mut W<U, Self>
             {
 
                 (*self.0).set(f(&mut W::new(Self::reset_value())).bits);
@@ -92,7 +92,7 @@ pub fn render() -> Result<Vec<Tokens>> {
             #[inline(always)]
             pub fn write_with_zero<F>(&self, f: F)
             where
-                F: FnOnce(&mut W<U, REG>) -> &mut W<U, REG>
+                F: FnOnce(&mut W<U, Self>) -> &mut W<U, Self>
             {
 
                 (*self.0).set(f(&mut W::new(U::default())).bits);
@@ -111,7 +111,7 @@ pub fn render() -> Result<Vec<Tokens>> {
             #[inline(always)]
             pub fn modify<F>(&self, f: F)
             where
-                for<'w> F: FnOnce(&R<U, REG>, &'w mut W<U, REG>) -> &'w mut W<U, REG>
+                for<'w> F: FnOnce(&R<U, Self>, &'w mut W<U, Self>) -> &'w mut W<U, Self>
             {
                 let bits = (*self.0).get();
                 (*self.0).set(f(&R::new(bits), &mut W::new(bits)).bits);

src/generate/register.rs

@@ -47,7 +47,7 @@ pub fn render(
         let desc = format!("Reader for register {}", register.name);
         mod_items.push(quote! {
             #[doc = #desc]
-            pub type R = crate::R<#rty, super::#_name_pc>;
+            pub type R = crate::R<#rty, super::#name_pc>;
         });
     }
 
@@ -61,7 +61,7 @@ pub fn render(
         let desc = format!("Writer for register {}", register.name);
         mod_items.push(quote! {
             #[doc = #desc]
-            pub type W = crate::W<#rty, super::#_name_pc>;
+            pub type W = crate::W<#rty, super::#name_pc>;
             impl crate::ResetValue<#rty> for super::#name_pc {
                 #[inline(always)]
                 fn reset_value() -> #rty { #rv }