Merge remote-tracking branch 'origin/main' into james/impl-clocks

3 files changed, 27 insertions, 26 deletions

diff --git a/src/lib.rs b/src/lib.rs
index ec2cb31e7..1bf54a98b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -59,29 +59,29 @@ pub fn init(cfg: crate::config::Config) -> Peripherals {
     peripherals
 }
 
-/// Optional hook called by cortex-m-rt before RAM init.
-/// We proactively mask and clear all NVIC IRQs to avoid wedges from stale state
-/// left by soft resets/debug sessions.
-///
-/// NOTE: Manual VTOR setup is required for RAM execution. The cortex-m-rt 'set-vtor'
-/// feature is incompatible with our setup because it expects __vector_table to be
-/// defined differently than how our RAM-based linker script arranges it.
-#[no_mangle]
-pub unsafe extern "C" fn __pre_init() {
-    // Set the VTOR to point to the interrupt vector table in RAM
-    // This is required since code runs from RAM on this MCU
-    crate::interrupt::vtor_set_ram_vector_base(0x2000_0000 as *const u32);
+// /// Optional hook called by cortex-m-rt before RAM init.
+// /// We proactively mask and clear all NVIC IRQs to avoid wedges from stale state
+// /// left by soft resets/debug sessions.
+// ///
+// /// NOTE: Manual VTOR setup is required for RAM execution. The cortex-m-rt 'set-vtor'
+// /// feature is incompatible with our setup because it expects __vector_table to be
+// /// defined differently than how our RAM-based linker script arranges it.
+// #[no_mangle]
+// pub unsafe extern "C" fn __pre_init() {
+//     // Set the VTOR to point to the interrupt vector table in RAM
+//     // This is required since code runs from RAM on this MCU
+//     crate::interrupt::vtor_set_ram_vector_base(0x2000_0000 as *const u32);
 
-    // Mask and clear pending for all NVIC lines (0..127) to avoid stale state across runs.
-    let nvic = &*cortex_m::peripheral::NVIC::PTR;
-    for i in 0..4 {
-        // 4 words x 32 = 128 IRQs
-        nvic.icer[i].write(0xFFFF_FFFF);
-        nvic.icpr[i].write(0xFFFF_FFFF);
-    }
-    // Do NOT touch peripheral registers here: clocks may be off and accesses can fault.
-    crate::interrupt::clear_default_handler_snapshot();
-}
+//     // Mask and clear pending for all NVIC lines (0..127) to avoid stale state across runs.
+//     let nvic = &*cortex_m::peripheral::NVIC::PTR;
+//     for i in 0..4 {
+//         // 4 words x 32 = 128 IRQs
+//         nvic.icer[i].write(0xFFFF_FFFF);
+//         nvic.icpr[i].write(0xFFFF_FFFF);
+//     }
+//     // Do NOT touch peripheral registers here: clocks may be off and accesses can fault.
+//     crate::interrupt::clear_default_handler_snapshot();
+// }
 
 /// Internal helper to dispatch a type-level interrupt handler.
 #[inline(always)]
diff --git a/src/ostimer.rs b/src/ostimer.rs
index ebdf7d45d..cd5451b53 100644
--- a/src/ostimer.rs
+++ b/src/ostimer.rs
@@ -534,7 +534,10 @@ pub mod time_driver {
         bin_to_gray, now_ticks_read, Regs, ALARM_ACTIVE, ALARM_CALLBACK, ALARM_FLAG, ALARM_TARGET_TIME,
         EVTIMER_HI_MASK, EVTIMER_HI_SHIFT, LOW_32_BIT_MASK,
     };
-    use crate::{clocks::{enable_and_reset, periph_helpers::{OsTimerConfig, OstimerClockSel}, PoweredClock}, pac, peripherals::OSTIMER0};
+    use crate::clocks::periph_helpers::{OsTimerConfig, OstimerClockSel};
+    use crate::clocks::{enable_and_reset, PoweredClock};
+    use crate::pac;
+    use crate::peripherals::OSTIMER0;
     pub struct Driver;
     static TIMER_WAKER: AtomicWaker = AtomicWaker::new();
 
diff --git a/src/rtc.rs b/src/rtc.rs
index f526e82ac..b750a97ea 100644
--- a/src/rtc.rs
+++ b/src/rtc.rs
@@ -163,9 +163,7 @@ impl<'a, I: Instance> Rtc<'a, I> {
 
         // The RTC is NOT gated by the MRCC, but we DO need to make sure the 16k clock
         // on the vsys domain is active
-        let clocks = with_clocks(|c| {
-            c.clk_16k_vsys.clone()
-        });
+        let clocks = with_clocks(|c| c.clk_16k_vsys.clone());
         match clocks {
             None => panic!("Clocks have not been initialized"),
             Some(None) => panic!("Clocks initialized, but clk_16k_vsys not active"),