revert

Author: burrbull

src/generate/register.rs

@@ -485,10 +485,11 @@ pub fn fields(
                     unsafety = None;
                 }
 
+                let mut base_pc_w = None;
                 if Some(evs) != evs_r.as_ref() {
                     pc_w = &f.pc_w;
 
-                    base.as_ref().map(|base| {
+                    base_pc_w = base.as_ref().map(|base| {
                         let pc = base.field.to_sanitized_upper_case();
                         let base_pc_w = Ident::from(&*format!("{}_AW", pc));
                         derive_from_base(mod_items, &base, &pc_w, &base_pc_w, f.name)
@@ -515,13 +516,23 @@ pub fn fields(
                     let sc = &v.sc;
 
                     let doc = util::escape_brackets(util::respace(&v.doc).as_ref());
+                    if let Some(enum_) = base_pc_w.as_ref() {
+                        proxy_items.push(quote! {
+                            #[doc = #doc]
+                            #[inline(always)]
+                            pub fn #sc(self) -> &'a mut W {
+                                self.variant(#enum_::#pc)
+                            }
+                        });
+                    } else {
                         proxy_items.push(quote! {
                             #[doc = #doc]
                             #[inline(always)]
                             pub fn #sc(self) -> &'a mut W {
                                 self.variant(#pc_w::#pc)
                             }
                         });
+                    }
                 }
             }
 
@@ -685,7 +696,7 @@ fn add_from_variants(mod_items: &mut Vec<Tokens>, variants: &Vec<Variant>, pc: &
     });
 }
 
-fn derive_from_base(mod_items: &mut Vec<Tokens>, base: &Base, pc: &Ident, base_pc: &Ident, fname: &str) {
+fn derive_from_base(mod_items: &mut Vec<Tokens>, base: &Base, pc: &Ident, base_pc: &Ident, fname: &str) -> quote::Tokens {
     let desc = format!("Possible values of the field `{}`", fname,);
 
     if let (Some(peripheral), Some(register)) = (&base.peripheral, &base.register) {
@@ -699,6 +710,10 @@ fn derive_from_base(mod_items: &mut Vec<Tokens>, base: &Base, pc: &Ident, base_p
             pub type #pc =
                 crate::#pmod_::#rmod_::#base_pc;
         });
+
+        quote! {
+            crate::#pmod_::#rmod_::#base_pc
+        }
     } else if let Some(register) = &base.register {
         let mod_ = register.to_sanitized_snake_case();
         let mod_ = Ident::from(&*mod_);
@@ -708,11 +723,19 @@ fn derive_from_base(mod_items: &mut Vec<Tokens>, base: &Base, pc: &Ident, base_p
             pub type #pc =
                 super::#mod_::#base_pc;
         });
+
+        quote! {
+            super::#mod_::#base_pc
+        }
     } else {
         mod_items.push(quote! {
             #[doc = #desc]
             pub type #pc = #base_pc;
         });
+
+        quote! {
+            #base_pc
+        }
     }
 }