Skip to content

Commit 269cf1e

Browse files
committed
fix some CI issues
1 parent c4a988b commit 269cf1e

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

core/src/mmio.zig

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ pub fn Mmio(comptime PackedT: type, access_type: MmioAccess(PackedT)) type {
135135
/// A one-field version of modify(), more helpful if `field_name` is comptime calculated.
136136
pub inline fn modify_one(
137137
self: *volatile @This(),
138-
comptime field_name: []const u8,
138+
comptime field_name: [:0]const u8,
139139
value: @FieldType(underlying_type, field_name),
140140
) void {
141141
// Replace with @Struct when migrating to zig 0.16
@@ -154,6 +154,7 @@ pub fn Mmio(comptime PackedT: type, access_type: MmioAccess(PackedT)) type {
154154
/// Set field `Field` of this register to `value`.
155155
/// This is implemented using read-modify-write.
156156
pub inline fn modify(self: *volatile @This(), fields: anytype) void {
157+
@setEvalBranchQuota(10_000);
157158
check_type_has_all_fields(PackedT, fields);
158159
const Fields = @TypeOf(fields);
159160

@@ -186,6 +187,7 @@ pub fn Mmio(comptime PackedT: type, access_type: MmioAccess(PackedT)) type {
186187
}
187188

188189
pub inline fn set_mask(self: *volatile @This(), fields: anytype) void {
190+
@setEvalBranchQuota(10_000);
189191
check_type_has_all_fields(PackedT, fields);
190192
const Fields = @TypeOf(fields);
191193

@@ -208,6 +210,7 @@ pub fn Mmio(comptime PackedT: type, access_type: MmioAccess(PackedT)) type {
208210
}
209211

210212
pub inline fn clear_mask(self: *volatile @This(), fields: anytype) void {
213+
@setEvalBranchQuota(10_000);
211214
check_type_has_all_fields(PackedT, fields);
212215
const Fields = @TypeOf(fields);
213216

port/nordic/nrf5x/src/hal/clocks.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ pub const lfclk = struct {
7272
while (CLOCK.EVENTS_DONE == 0) {}
7373
},
7474
.nrf52 => {
75-
CLOCK.TASKS_CAL.raw(1);
75+
CLOCK.TASKS_CAL.raw = 1;
7676
while (CLOCK.EVENTS_DONE.raw == 0) {}
7777
},
7878
}

port/wch/ch32v/src/cpus/qingkev2-rv32ec.zig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ pub inline fn system_init(comptime chip: anytype) void {
6969
// RCC->CFGR0 &= (uint32_t)0xF8FF0000;
7070
RCC.CFGR0.modify(.{
7171
.SW = 0,
72-
.SWS = 0,
7372
.HPRE = 0,
7473
.ADCPRE = 0,
7574
.MCO = 0,

port/wch/ch32v/src/cpus/qingkev3-rv32imac.zig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ pub inline fn system_init(comptime chip: anytype) void {
102102
// RCC->CFGR0 &= (uint32_t)0xF8FF0000;
103103
RCC.CFGR0.modify(.{
104104
.SW = 0,
105-
.SWS = 0,
106105
.HPRE = 0,
107106
.ADCPRE = 0,
108107
.MCO = 0,

tools/regz/src/gen.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1365,7 +1365,7 @@ fn write_fields_and_access(
13651365
.read_only => "read_only",
13661366
.write_only, .write_once => "write_only",
13671367
};
1368-
try writer.print(".{s} = .{s},\n", .{ data.name, access_str });
1368+
try writer.print(".{f} = .{s},\n", .{ std.zig.fmtId(data.name), access_str });
13691369
},
13701370
.reserved => |num| try writer.print(".reserved{} = .reserved,\n", .{num}),
13711371
.padding => try writer.writeAll(".padding = .reserved,\n"),

0 commit comments

Comments
 (0)