Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 core/src/cpus/cortex_m.zig
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ pub const InterruptOptions = microzig.utilities.GenerateInterruptOptions(&.{
});

/// Allowable `platform` options for microzig.options.
pub const CPUOptions = core.CPUOptions;
pub const CPU_Options = core.CPU_Options;

/// External Interrupts
/// These are the interrupts generated by the NVIC.
Expand Down
2 changes: 1 addition & 1 deletion core/src/cpus/cortex_m/m0.zig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const microzig = @import("microzig");
const mmio = microzig.mmio;

pub const CPUOptions = struct {};
pub const CPU_Options = struct {};

pub const scb_base_offset = 0x0d00;

Expand Down
2 changes: 1 addition & 1 deletion core/src/cpus/cortex_m/m0plus.zig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const microzig = @import("microzig");
const mmio = microzig.mmio;

pub const CPUOptions = struct {
pub const CPU_Options = struct {
/// When true, interrupt vectors are moved to RAM so handlers can be set at runtime.
ram_vectors: bool = false,
/// When true, the RAM vectors are placed in section `ram_vectors`.
Expand Down
2 changes: 1 addition & 1 deletion core/src/cpus/cortex_m/m3.zig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const microzig = @import("microzig");
const mmio = microzig.mmio;

pub const CPUOptions = struct {
pub const CPU_Options = struct {
/// When true, interrupt vectors are moved to RAM so handlers can be set at runtime.
ram_vectors: bool = false,
/// When true, the RAM vectors are placed in section `ram_vectors`.
Expand Down
2 changes: 1 addition & 1 deletion core/src/cpus/cortex_m/m33.zig
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const microzig = @import("microzig");
const mmio = microzig.mmio;

pub const CPUOptions = struct {
pub const CPU_Options = struct {
/// When true, interrupt vectors are moved to RAM so handlers can be set at runtime.
ram_vectors: bool = false,
/// When true, the RAM vectors are placed in section `ram_vectors`.
Expand Down
2 changes: 1 addition & 1 deletion core/src/cpus/cortex_m/m4.zig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const microzig = @import("microzig");
const mmio = microzig.mmio;

pub const CPUOptions = struct {
pub const CPU_Options = struct {
/// When true, interrupt vectors are moved to RAM so handlers can be set at runtime.
ram_vectors: bool = false,
/// When true, the RAM vectors are placed in section `ram_vectors`.
Expand Down
2 changes: 1 addition & 1 deletion core/src/cpus/cortex_m/m55.zig
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const microzig = @import("microzig");
const mmio = microzig.mmio;

pub const CPUOptions = struct {
pub const CPU_Options = struct {
/// When true, interrupt vectors are moved to RAM so handlers can be set at runtime.
ram_vectors: bool = false,
/// When true, the RAM vectors are placed in section `ram_vectors`.
Expand Down
2 changes: 1 addition & 1 deletion core/src/cpus/cortex_m/m7.zig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const microzig = @import("microzig");
const mmio = microzig.mmio;

pub const CPUOptions = struct {
pub const CPU_Options = struct {
/// When true, interrupt vectors are moved to RAM so handlers can be set at runtime.
ram_vectors: bool = false,
/// When true, the RAM vectors are placed in section `ram_vectors`.
Expand Down
4 changes: 2 additions & 2 deletions core/src/microzig.zig
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ pub fn panic(message: []const u8, _: ?*std.builtin.StackTrace, _: ?usize) noretu

pub const InterruptOptions = if (@hasDecl(cpu, "InterruptOptions")) cpu.InterruptOptions else struct {};

pub const CPUOptions = if (@hasDecl(cpu, "CPUOptions")) cpu.CPUOptions else struct {};
pub const CPU_Options = if (@hasDecl(cpu, "CPU_Options")) cpu.CPU_Options else struct {};

pub const Options = struct {
log_level: std.log.Level = std.log.default_level,
Expand All @@ -87,7 +87,7 @@ pub const Options = struct {
}
}.log,
interrupts: InterruptOptions = .{},
cpu: CPUOptions = .{},
cpu: CPU_Options = .{},
};

/// Hangs the processor and will stop doing anything useful. Use with caution!
Expand Down
2 changes: 1 addition & 1 deletion port/raspberrypi/rp2xxx/src/cpus/hazard3.zig
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const microzig_options = root.microzig_options;
const microzig = @import("microzig");
const riscv32_common = @import("riscv32-common");

pub const CPUOptions = struct {
pub const CPU_Options = struct {
ram_vectors: bool = true,
has_ram_vectors_section: bool = false,
};
Expand Down
Loading