From 0c3293fe36167ea9ea1a9d5a0554a6da38d3aac1 Mon Sep 17 00:00:00 2001 From: Matthias <19734415+MatthiasPortzel@users.noreply.github.com> Date: Mon, 24 Jun 2024 02:45:09 -0400 Subject: [PATCH] Fix RP2040 multicore HAL and re-enable example (#207) --- bsp/raspberrypi/rp2040/src/hal/multicore.zig | 4 ++-- examples/raspberrypi/rp2040/build.zig | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bsp/raspberrypi/rp2040/src/hal/multicore.zig b/bsp/raspberrypi/rp2040/src/hal/multicore.zig index 1ca3ebb..11baf95 100644 --- a/bsp/raspberrypi/rp2040/src/hal/multicore.zig +++ b/bsp/raspberrypi/rp2040/src/hal/multicore.zig @@ -5,7 +5,7 @@ const microzig = @import("microzig"); const peripherals = microzig.chip.peripherals; const SIO = peripherals.SIO; const PSM = peripherals.PSM; -const SCB = peripherals.SCB; +const PPB = peripherals.PPB; pub const fifo = struct { /// Check if the FIFO has valid data for reading. @@ -92,7 +92,7 @@ pub fn launch_core1_with_stack(entrypoint: *const fn () void, stack: []u32) void 0, 0, 1, - SCB.VTOR.raw, + PPB.VTOR.raw, stack_ptr, @intFromPtr(wrapper), }; diff --git a/examples/raspberrypi/rp2040/build.zig b/examples/raspberrypi/rp2040/build.zig index 2777e30..8ec7beb 100644 --- a/examples/raspberrypi/rp2040/build.zig +++ b/examples/raspberrypi/rp2040/build.zig @@ -18,7 +18,7 @@ const available_examples = [_]Example{ .{ .target = rp2040.boards.raspberrypi.pico, .name = "pico_usb-device", .file = "src/usb_device.zig" }, .{ .target = rp2040.boards.raspberrypi.pico, .name = "pico_usb-hid", .file = "src/usb_hid.zig" }, .{ .target = rp2040.boards.raspberrypi.pico, .name = "pico_ws2812", .file = "src/ws2812.zig" }, - // TODO: Fix multicore hal! .{ .target = "board:raspberry_pi/pico", .name = "pico_multicore" , .file = "src/blinky_core1.zig" }, + .{ .target = rp2040.boards.raspberrypi.pico, .name = "pico_multicore" , .file = "src/blinky_core1.zig" }, // WaveShare Boards: .{ .target = rp2040.boards.waveshare.rp2040_matrix, .name = "rp2040-matrix_tiles", .file = "src/tiles.zig" },