Skip to content

rp2xxx: pio: Fix some exported types #577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 31, 2025
Merged

rp2xxx: pio: Fix some exported types #577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion port/raspberrypi/rp2xxx/src/hal/gpio.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ pub const Mask =

pub fn read(self: Mask) u48 {
const lower_mask = self.lower_32_mask();
const lower_val: u32 = SIO.GPIO_IN & lower_mask;
const lower_val: u32 = SIO.GPIO_IN.raw & lower_mask;
const upper_mask = self.upper_16_mask();
const upper_val: u16 = @truncate(SIO.GPIO_HI_IN.raw & upper_mask);
return (@as(u48, upper_val) << 32) | @as(u48, lower_val);
Expand Down
6 changes: 3 additions & 3 deletions port/raspberrypi/rp2xxx/src/hal/pio.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ pub const StateMachine = common.StateMachine;
pub const Instruction = common.Instruction(chip);
pub const PinMapping = common.PinMapping;
pub const PinMappingOptions = common.PinMappingOptions;
pub const StateMachineInitOptions = chip_specific.StateMachineInitOptions;
pub const LoadAndStartProgramOptions = chip_specific.LoadAndStartProgramOptions;
pub const StateMachineInitOptions = common.StateMachineInitOptions(chip);
pub const LoadAndStartProgramOptions = common.LoadAndStartProgramOptions(chip);
pub const ClkDivOptions = common.ClkDivOptions;
pub const ShiftOptions = chip_specific.ShiftOptions;
pub const ShiftOptions = common.ShiftOptions(chip);

pub const assembler = @import("pio/assembler.zig");
const encoder = @import("pio/assembler/encoder.zig");
Expand Down
2 changes: 1 addition & 1 deletion port/raspberrypi/rp2xxx/src/hal/pio/common.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,7 @@ pub fn StateMachineInitOptions(chip: Chip) type {

pub fn LoadAndStartProgramOptions(chip: Chip) type {
return struct {
clkdiv: ClkDivOptions,
clkdiv: ClkDivOptions = .{},
shift: ShiftOptions(chip) = .{},
pin_mappings: PinMappingOptions = .{},
exec: ExecOptions = .{},
Expand Down
Loading