Merge branch 'main' into update-master

ZigEmbeddedGroup · Jun 25, 2023 · cb3e7db · cb3e7db
2 parents 945b354 + a49fad9
commit cb3e7db
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml
@@ -36,7 +36,7 @@ jobs:
         echo "DESCRIPTION=$(git log -1 --pretty=%B | head -n 1)" >> $GITHUB_OUTPUT
 
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v4.2.3
+      uses: peter-evans/create-pull-request@v5.0.1
       with:
         token: ${{ secrets.PR_TOKEN }}
         branch: downstream/update-microzig

diff --git a/src/modules/cpus/avr5.zig b/src/modules/cpus/avr5.zig
@@ -91,7 +91,7 @@ fn make_isr_handler(comptime name: []const u8, comptime func: anytype) type {
         pub const exported_name = "microzig_isr_" ++ name;
 
         pub fn isr_vector() callconv(.Signal) void {
-            @call(.{ .modifier = .always_inline }, func, .{});
+            @call(.always_inline, func, .{});
         }
 
         comptime {

diff --git a/src/modules/cpus/cortex-m.zig b/src/modules/cpus/cortex-m.zig
@@ -80,19 +80,19 @@ pub const startup_logic = struct {
 
         // fill .bss with zeroes
         {
-            const bss_start = @as([*]u8, @ptrCast(&microzig_bss_start));
-            const bss_end = @as([*]u8, @ptrCast(&microzig_bss_end));
+            const bss_start: [*]u8 = @ptrCast(&microzig_bss_start);
+            const bss_end: [*]u8 = @ptrCast(&microzig_bss_end);
             const bss_len = @intFromPtr(bss_end) - @intFromPtr(bss_start);
 
             @memset(bss_start[0..bss_len], 0);
         }
 
         // load .data from flash
         {
-            const data_start = @as([*]u8, @ptrCast(&microzig_data_start));
-            const data_end = @as([*]u8, @ptrCast(&microzig_data_end));
+            const data_start: [*]u8 = @ptrCast(&microzig_data_start);
+            const data_end: [*]u8 = @ptrCast(&microzig_data_end);
             const data_len = @intFromPtr(data_end) - @intFromPtr(data_start);
-            const data_src = @as([*]const u8, @ptrCast(&microzig_data_load_start));
+            const data_src: [*]const u8 = @ptrCast(&microzig_data_load_start);
 
             @memcpy(data_start[0..data_len], data_src[0..data_len]);
         }

diff --git a/src/modules/cpus/riscv32.zig b/src/modules/cpus/riscv32.zig
@@ -57,19 +57,19 @@ pub const startup_logic = struct {
 
         // fill .bss with zeroes
         {
-            const bss_start = @as([*]u8, @ptrCast(&microzig_bss_start));
-            const bss_end = @as([*]u8, @ptrCast(&microzig_bss_end));
+            const bss_start: [*]u8 = @ptrCast(&microzig_bss_start);
+            const bss_end: [*]u8 = @ptrCast(&microzig_bss_end);
             const bss_len = @intFromPtr(bss_end) - @intFromPtr(bss_start);
 
             @memset(bss_start[0..bss_len], 0);
         }
 
         // load .data from flash
         {
-            const data_start = @as([*]u8, @ptrCast(&microzig_data_start));
-            const data_end = @as([*]u8, @ptrCast(&microzig_data_end));
+            const data_start: [*]u8 = @ptrCast(&microzig_data_start);
+            const data_end: [*]u8 = @ptrCast(&microzig_data_end);
             const data_len = @intFromPtr(data_end) - @intFromPtr(data_start);
-            const data_src = @as([*]const u8, @ptrCast(&microzig_data_load_start));
+            const data_src: [*]const u8 = @ptrCast(&microzig_data_load_start);
 
             @memcpy(data_start[0..data_len], data_src[0..data_len]);
         }