From 8dd3ddd228076b49948189f6b95b64dcf131631e Mon Sep 17 00:00:00 2001
From: Ulf Lilleengen <ulf.lilleengen@gmail.com>
Date: Thu, 10 Jun 2021 09:52:57 +0200
Subject: [PATCH] Special handling for timers instead

---
 stm32-metapac/gen/src/lib.rs | 68 ++++++++++++++++++------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/stm32-metapac/gen/src/lib.rs b/stm32-metapac/gen/src/lib.rs
index 6db950be..ea06e308 100644
--- a/stm32-metapac/gen/src/lib.rs
+++ b/stm32-metapac/gen/src/lib.rs
@@ -268,42 +268,42 @@ pub fn gen(options: Options) {
                 }
 
                 if let Some(rcc) = &rcc {
-                    // Workaround for clock registers being split on some chip families. Assume fields are
-                    // named after peripheral and look for first field matching and use that register.
-                    //
-                    // Not all peripherals have the clock hint due to insufficient information from
-                    // chip definition. If clock is not specified, the first matching register with the
-                    // expected field will be used.
-                    let en = find_reg_for_field(
-                        &rcc,
-                        p.clock.as_ref().unwrap_or(&String::new()),
-                        &format!("{}EN", name),
-                    );
-                    let rst = find_reg_for_field(
-                        &rcc,
-                        p.clock.as_ref().unwrap_or(&String::new()),
-                        &format!("{}RST", name),
-                    );
+                    let mut generate_rcc_peripheral = |clock_prefix| {
+                        // Workaround for clock registers being split on some chip families. Assume fields are
+                        // named after peripheral and look for first field matching and use that register.
 
-                    match (en, rst) {
-                        (Some((enable_reg, enable_field)), Some((reset_reg, reset_field))) => {
-                            peripheral_rcc_table.push(vec![
-                                name.clone(),
-                                enable_reg.to_ascii_lowercase(),
-                                reset_reg.to_ascii_lowercase(),
-                                format!("set_{}", enable_field.to_ascii_lowercase()),
-                                format!("set_{}", reset_field.to_ascii_lowercase()),
-                            ]);
-                        }
-                        (None, Some(_)) => {
-                            println!("Unable to find enable register for {}", name)
-                        }
-                        (Some(_), None) => {
-                            println!("Unable to find reset register for {}", name)
-                        }
-                        (None, None) => {
-                            println!("Unable to find enable and reset register for {}", name)
+                        let en = find_reg_for_field(&rcc, clock_prefix, &format!("{}EN", name));
+                        let rst = find_reg_for_field(&rcc, clock_prefix, &format!("{}RST", name));
+
+                        match (en, rst) {
+                            (Some((enable_reg, enable_field)), Some((reset_reg, reset_field))) => {
+                                peripheral_rcc_table.push(vec![
+                                    name.clone(),
+                                    enable_reg.to_ascii_lowercase(),
+                                    reset_reg.to_ascii_lowercase(),
+                                    format!("set_{}", enable_field.to_ascii_lowercase()),
+                                    format!("set_{}", reset_field.to_ascii_lowercase()),
+                                ]);
+                            }
+                            (None, Some(_)) => {
+                                println!("Unable to find enable register for {}", name)
+                            }
+                            (Some(_), None) => {
+                                println!("Unable to find reset register for {}", name)
+                            }
+                            (None, None) => {
+                                println!("Unable to find enable and reset register for {}", name)
+                            }
                         }
+                    };
+
+                    if let Some(clock) = &p.clock {
+                        generate_rcc_peripheral(clock);
+                    } else if name.starts_with("TIM") {
+                        // Not all peripherals like timers the clock hint due to insufficient information from
+                        // chip definition. If clock is not specified, the first matching register with the
+                        // expected field will be used.
+                        generate_rcc_peripheral("");
                     }
                 }
             }