- Minor fixes to IRQ + example to utilize microzig.cpu interface (#327)

Co-authored-by: Hayden Riddiford <[email protected]>
ZigEmbeddedGroup · Dec 20, 2024 · d42c639 · d42c639
1 parent 898e40a
commit d42c639
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 39 deletions.
diff --git a/core/src/cpus/cortex_m.zig b/core/src/cpus/cortex_m.zig
@@ -169,7 +169,7 @@ const cortex_m = std.meta.stringToEnum(Core, microzig.config.cpu_name) orelse
 
 const core = blk: {
     break :blk switch (cortex_m) {
-        .cortex_m0 => @import("cortex_m/m0"),
+        .cortex_m0 => @import("cortex_m/m0.zig"),
         .cortex_m0plus => @import("cortex_m/m0plus.zig"),
         .cortex_m3 => @import("cortex_m/m3.zig"),
         .cortex_m33 => @import("cortex_m/m33.zig"),

diff --git a/examples/raspberrypi/rp2xxx/src/rp2040_only/rtc.zig b/examples/raspberrypi/rp2xxx/src/rp2040_only/rtc.zig
@@ -16,37 +16,6 @@ pub const microzig_options = .{
     },
 };
 
-/// Enables/disables interrupts to prevent data-races with variables
-/// shared between ISRs and normal code
-///
-/// TODO: microzig/core/src/interrupt.zig might provide a more general implementation
-///       for this in the future.
-const CriticalSection = struct {
-    isr_reg_value: usize = 0,
-
-    pub fn enter(self: *CriticalSection) void {
-        var val: usize = undefined;
-        asm volatile (
-            \\mrs   %[val], primask
-            \\movs  r1, #1
-            \\msr   primask, r1
-            : [val] "=r" (val),
-            :
-            : "r1", "cc"
-        );
-        self.isr_reg_value = val;
-    }
-
-    pub fn exit(self: *CriticalSection) void {
-        const val = self.isr_reg_value;
-        asm volatile ("msr   primask, %[val]"
-            :
-            : [val] "r" (val),
-        );
-    }
-};
-var critical_section: CriticalSection = .{};
-
 var _fast_blink: bool = false;
 /// Access underlying _sleep_time via volatile * to prevent reads from being optimized away
 var fast_blink_vp: *volatile bool = &_fast_blink;
@@ -60,15 +29,11 @@ fn rtc_isr() callconv(.C) void {
     rp2xxx.rtc.alarm.enable();
 
     // Every 1 minute, alternate between fast and slow blinking
-    critical_section.enter();
     fast_blink_vp.* = !fast_blink_vp.*;
-    critical_section.exit();
 }
 
-const pins = pin_config.pins();
-
 pub fn main() !void {
-    pin_config.apply();
+    const pins = pin_config.pins();
 
     // Configure initial datetime for RTC
     rp2xxx.rtc.set_datetime(.{
@@ -94,9 +59,9 @@ pub fn main() !void {
     while (true) {
 
         // Disable interrupts during volatile read of fast_blink to prevent data races
-        critical_section.enter();
+        microzig.cpu.disable_interrupts();
         const fast_blink = fast_blink_vp.*;
-        critical_section.exit();
+        microzig.cpu.enable_interrupts();
 
         pins.led.toggle();
         time.sleep_ms(if (fast_blink) 500 else 1000);