Merge branch 'main' into rp2350_uart

Grazfather · web-flow · commit ae46a2fe0bfc · 2025-03-09T11:15:51.000-04:00
diff --git a/examples/microchip/avr/build.zig b/examples/microchip/avr/build.zig
@@ -13,7 +13,7 @@ pub fn build(b: *std.Build) void {
 
     const available_examples = [_]Example{
         .{ .target = mb.ports.avr.boards.arduino.nano, .name = "arduino-nano_blinky", .file = "src/blinky.zig" },
-        .{ .target = mb.ports.avr.boards.arduino.uno_rev3, .name = "arduino-nano_blinky", .file = "src/blinky.zig" },
+        .{ .target = mb.ports.avr.boards.arduino.uno_rev3, .name = "arduino-uno_blinky", .file = "src/blinky.zig" },
     };
 
     for (available_examples) |example| {
diff --git a/examples/microchip/avr/src/blinky.zig b/examples/microchip/avr/src/blinky.zig
@@ -1,15 +1,17 @@
 const std = @import("std");
 const microzig = @import("microzig");
 
-// LED is PB5
-const port = microzig.chip.peripherals.PORTB;
+const led_pin = microzig.core.experimental.Pin("PB5");
 
 pub fn main() void {
-    port.DDRB |= (1 << 5);
-    port.PORTB |= 0x00;
+    const led = microzig.core.experimental.gpio.Gpio(led_pin, .{
+        .mode = .output,
+        .initial_state = .low,
+    });
+    led.init();
 
     while (true) {
-        microzig.core.experimental.debug.busy_sleep(1_000);
-        port.PINB |= (1 << 5);
+        microzig.core.experimental.debug.busy_sleep(20_000);
+        led.toggle();
     }
 }
diff --git a/port/microchip/avr/src/hals/ATmega328P.zig b/port/microchip/avr/src/hals/ATmega328P.zig
@@ -16,7 +16,7 @@ pub const clock = struct {
     };
 };
 
-pub fn parsePin(comptime spec: []const u8) type {
+pub fn parse_pin(comptime spec: []const u8) type {
     const invalid_format_msg = "The given pin '" ++ spec ++ "' has an invalid format. Pins must follow the format \"P{Port}{Pin}\" scheme.";
 
     if (spec.len != 3)
@@ -53,18 +53,17 @@ pub const gpio = struct {
         cpu.cbi(regs(pin).dir_addr, pin.pin);
     }
 
-    pub fn read(comptime pin: type) micro.gpio.State {
+    pub fn read(comptime pin: type) micro.core.experimental.gpio.State {
         return if ((regs(pin).pin.* & (1 << pin.pin)) != 0)
             .high
         else
             .low;
     }
 
-    pub fn write(comptime pin: type, state: micro.gpio.State) void {
-        if (state == .high) {
-            cpu.sbi(regs(pin).port_addr, pin.pin);
-        } else {
-            cpu.cbi(regs(pin).port_addr, pin.pin);
+    pub fn write(comptime pin: type, state: micro.core.experimental.gpio.State) void {
+        switch (state) {
+            .high => cpu.sbi(regs(pin).port_addr, pin.pin),
+            .low => cpu.cbi(regs(pin).port_addr, pin.pin),
         }
     }
 
diff --git a/port/microchip/avr/src/hals/ATmega32U4.zig b/port/microchip/avr/src/hals/ATmega32U4.zig
@@ -19,7 +19,7 @@ pub const clock = struct {
     };
 };
 
-pub fn parsePin(comptime spec: []const u8) type {
+pub fn parse_pin(comptime spec: []const u8) type {
     const invalid_format_msg = "The given pin '" ++ spec ++ "' has an invalid format. Pins must follow the format \"P{Port}{Pin}\" scheme.";
 
     if (spec.len != 3)
@@ -63,18 +63,17 @@ pub const gpio = struct {
         cpu.cbi(regs(pin).dir_addr, pin.pin);
     }
 
-    pub fn read(comptime pin: type) micro.gpio.State {
+    pub fn read(comptime pin: type) micro.core.experimental.gpio.State {
         return if ((regs(pin).pin.* & (1 << pin.pin)) != 0)
             .high
         else
             .low;
     }
 
-    pub fn write(comptime pin: type, state: micro.gpio.State) void {
-        if (state == .high) {
-            cpu.sbi(regs(pin).port_addr, pin.pin);
-        } else {
-            cpu.cbi(regs(pin).port_addr, pin.pin);
+    pub fn write(comptime pin: type, state: micro.core.experimental.gpio.State) void {
+        switch (state) {
+            .high => cpu.sbi(regs(pin).port_addr, pin.pin),
+            .low => cpu.cbi(regs(pin).port_addr, pin.pin),
         }
     }
 
diff --git a/tools/regz/src/Database.zig b/tools/regz/src/Database.zig
@@ -1347,7 +1347,42 @@ pub fn get_enum_by_name(
     return db.one_alloc(Enum, allocator, query, .{
         .struct_id = struct_id,
         .name = name,
+    }) catch |err| switch (err) {
+        error.MissingEntity => {
+            // lookup the enum among the parents
+            var parent_id = struct_id;
+            var i: u8 = 0;
+            const max_depth = 10;
+            while (i <= max_depth) : (i += 1) {
+                parent_id = db.get_parent_struct_id(parent_id) catch {
+                    return err;
+                };
+
+                log.debug("get_enum_by_name: parent_id={} name='{s}'", .{ parent_id, name });
+                return db.one_alloc(Enum, allocator, query, .{
+                    .struct_id = parent_id,
+                    .name = name,
+                }) catch {
+                    continue;
+                };
+            }
+            return err;
+        },
+        else => {
+            return err;
+        },
+    };
+}
+
+fn get_parent_struct_id(db: *Database, struct_id: StructID) !StructID {
+    var stmt = try db.sql.prepare("SELECT parent_id FROM struct_decls WHERE struct_id = ?");
+    defer stmt.deinit();
+
+    const row = try stmt.one(StructID, .{}, .{
+        .struct_id = struct_id,
     });
+
+    return if (row) |parent_id| parent_id else error.MissingEntity;
 }
 
 fn one_alloc(
diff --git a/tools/regz/src/atdf.zig b/tools/regz/src/atdf.zig
@@ -676,7 +676,10 @@ fn load_field(ctx: *Context, node: xml.Node, peripheral_struct_id: StructID, par
                     .size_bits = 1,
                     .offset_bits = i,
                     .enum_id = if (node.get_attribute("values")) |values| blk: {
-                        const e = try db.get_enum_by_name(arena, peripheral_struct_id, values);
+                        const e = db.get_enum_by_name(arena, peripheral_struct_id, values) catch |err| {
+                            log.warn("{s} failed to get_enum_by_name: {s}", .{ name, values });
+                            return err;
+                        };
                         break :blk e.id;
                     } else null,
                 });
@@ -722,7 +725,10 @@ fn load_field(ctx: *Context, node: xml.Node, peripheral_struct_id: StructID, par
             .size_bits = width,
             .offset_bits = offset,
             .enum_id = if (node.get_attribute("values")) |values| blk: {
-                const e = try db.get_enum_by_name(arena, peripheral_struct_id, values);
+                const e = db.get_enum_by_name(arena, peripheral_struct_id, values) catch |err| {
+                    log.warn("{s} failed to get_enum_by_name: {s}", .{ name, values });
+                    return err;
+                };
                 break :blk e.id;
             } else null,
         });
