Update microzig (#24)

* update microzig

* update paths and for loops

---------

Co-authored-by: mattnite <mattnite@users.noreply.github.com>
wch-ch32v003
Matt Knight 2 years ago committed by GitHub
parent 026af75f81
commit 58d73abc08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -3,7 +3,7 @@ const Builder = std.build.Builder;
const Pkg = std.build.Pkg; const Pkg = std.build.Pkg;
const comptimePrint = std.fmt.comptimePrint; const comptimePrint = std.fmt.comptimePrint;
pub const microzig = @import("deps/microzig/src/main.zig"); pub const microzig = @import("deps/microzig/build.zig");
const chips = @import("src/chips.zig"); const chips = @import("src/chips.zig");
const boards = @import("src/boards.zig"); const boards = @import("src/boards.zig");

2
deps/microzig vendored

@ -1 +1 @@
Subproject commit 4bb65617a47dc30282ffe340cc45d202b973650b Subproject commit 11214ed8ba05e380a516beef3f3f594571a1c732

@ -1,5 +1,5 @@
const std = @import("std"); const std = @import("std");
const microzig = @import("../deps/microzig/src/main.zig"); const microzig = @import("../deps/microzig/build.zig");
const chips = @import("chips.zig"); const chips = @import("chips.zig");
fn root_dir() []const u8 { fn root_dir() []const u8 {

@ -1,5 +1,5 @@
const std = @import("std"); const std = @import("std");
const microzig = @import("../deps/microzig/src/main.zig"); const microzig = @import("../deps/microzig/build.zig");
fn root_dir() []const u8 { fn root_dir() []const u8 {
return std.fs.path.dirname(@src().file) orelse "."; return std.fs.path.dirname(@src().file) orelse ".";

@ -83,8 +83,8 @@ pub const InputMask = InputMask: {
var fields: [enum_fields.len]std.builtin.Type.StructField = undefined; var fields: [enum_fields.len]std.builtin.Type.StructField = undefined;
const default_value: u1 = 0; const default_value: u1 = 0;
for (enum_fields) |enum_field, i| for (enum_fields, &fields) |enum_field, *field|
fields[i] = std.builtin.Type.StructField{ field = std.builtin.Type.StructField{
.name = enum_field.name, .name = enum_field.name,
.field_type = u1, .field_type = u1,
.default_value = &default_value, .default_value = &default_value,

@ -237,7 +237,7 @@ pub const Function = enum {
fn all() [30]u1 { fn all() [30]u1 {
var ret: [30]u1 = undefined; var ret: [30]u1 = undefined;
for (ret) |*elem| for (&ret) |*elem|
elem.* = 1; elem.* = 1;
return ret; return ret;

Loading…
Cancel
Save