From 29aee14fd24e50f9f526d19bfdeb643a7665b509 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Quei=C3=9Fner?= Date: Fri, 30 Sep 2022 15:47:46 +0200 Subject: [PATCH] Update to latest master. (#13) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Felix "xq" Queißner --- deps/microzig | 2 +- examples/uart.zig | 2 +- src/hal/pins.zig | 2 +- src/hal/resets.zig | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deps/microzig b/deps/microzig index 4159581..681b3b0 160000 --- a/deps/microzig +++ b/deps/microzig @@ -1 +1 @@ -Subproject commit 4159581b4848bfb8bbdf91dabdebd15ecd503427 +Subproject commit 681b3b0d7a6b2fc5d0f8918c583c790c646a31f1 diff --git a/examples/uart.zig b/examples/uart.zig index ed29280..7ccbe69 100644 --- a/examples/uart.zig +++ b/examples/uart.zig @@ -12,7 +12,7 @@ const baud_rate = 115200; const uart_tx_pin = 0; const uart_rx_pin = 1; -pub fn panic(message: []const u8, _: ?*std.builtin.StackTrace) noreturn { +pub fn panic(message: []const u8, _: ?*std.builtin.StackTrace, _: ?usize) noreturn { std.log.err("panic: {s}", .{message}); @breakpoint(); while (true) {} diff --git a/src/hal/pins.zig b/src/hal/pins.zig index ed07594..baa2479 100644 --- a/src/hal/pins.zig +++ b/src/hal/pins.zig @@ -5,7 +5,7 @@ const regs = @import("microzig").chip.registers; const assert = std.debug.assert; const comptimePrint = std.fmt.comptimePrint; -const StructField = std.builtin.TypeInfo.StructField; +const StructField = std.builtin.Type.StructField; pub const Pin = enum { GPIO0, diff --git a/src/hal/resets.zig b/src/hal/resets.zig index 0e0ea2b..5dbd81e 100644 --- a/src/hal/resets.zig +++ b/src/hal/resets.zig @@ -2,7 +2,7 @@ const std = @import("std"); const microzig = @import("microzig"); const regs = microzig.chip.registers; -const EnumField = std.builtin.TypeInfo.EnumField; +const EnumField = std.builtin.Type.EnumField; const Mask = @typeInfo(@TypeOf(regs.RESETS.RESET)).Pointer.child.underlying_type; pub const Module = enum {