aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHimbeer <himbeer@disroot.org>2024-07-27 23:23:08 +0200
committerHimbeer <himbeer@disroot.org>2024-07-27 23:23:08 +0200
commitab32e15ed70d1fa856164156ccbf58eae282c75b (patch)
tree81342c9ab36aa2521d293e66300e8aed90fd1435
parentd7c7692585afb89c8f403d764b65931c42639224 (diff)
Remove unnecessary explicit enum values
-rw-r--r--src/lib/interrupts.zig28
-rw-r--r--src/lib/paging.zig4
-rw-r--r--src/lib/riscv.zig16
-rw-r--r--src/lib/sbi.zig32
-rw-r--r--src/lib/sbi/debug_console.zig6
-rw-r--r--src/lib/sbi/legacy.zig18
-rw-r--r--src/lib/sbi/sys_reset.zig12
-rw-r--r--src/lib/sbi/time.zig2
8 files changed, 59 insertions, 59 deletions
diff --git a/src/lib/interrupts.zig b/src/lib/interrupts.zig
index e8fd219..1a6bc65 100644
--- a/src/lib/interrupts.zig
+++ b/src/lib/interrupts.zig
@@ -16,8 +16,8 @@ pub var trap_frame: TrapFrame = undefined;
pub const SupervisorTrapVector = packed struct(usize) {
pub const Mode = enum(u2) {
- direct = 0,
- vectored = 1,
+ direct,
+ vectored,
};
mode: u2,
@@ -63,26 +63,26 @@ pub const Cause = packed struct(usize) {
};
pub const AsyncCause = enum(u63) {
- user_software = 0,
- supervisor_software = 1,
+ user_software,
+ supervisor_software,
user_timer = 4,
- supervisor_timer = 5,
+ supervisor_timer,
user_external = 8,
- supervisor_external = 9,
+ supervisor_external,
_,
};
pub const SyncCause = enum(u63) {
- instruction_address_misaligned = 0,
- instruction_access_fault = 1,
- illegal_instruction = 2,
- breakpoint = 3,
+ instruction_address_misaligned,
+ instruction_access_fault,
+ illegal_instruction,
+ breakpoint,
load_access_fault = 5,
- amo_address_misaligned = 6,
- store_or_amo_access_fault = 7,
- ecall = 8,
+ amo_address_misaligned,
+ store_or_amo_access_fault,
+ ecall,
instruction_page_fault = 12,
- load_page_fault = 13,
+ load_page_fault,
store_or_amo_page_fault = 15,
_,
};
diff --git a/src/lib/paging.zig b/src/lib/paging.zig
index b6dbfe3..060bcc3 100644
--- a/src/lib/paging.zig
+++ b/src/lib/paging.zig
@@ -52,9 +52,9 @@ pub const TableError = error{
};
pub const Mode = enum(u4) {
- bare = 0,
+ bare,
sv39 = 8,
- sv48 = 9,
+ sv48,
};
// SATP register, configures and enables the MMU (and thus paging).
diff --git a/src/lib/riscv.zig b/src/lib/riscv.zig
index 8c5a4ee..e68b3fb 100644
--- a/src/lib/riscv.zig
+++ b/src/lib/riscv.zig
@@ -7,21 +7,21 @@ const interrupts = @import("interrupts.zig");
const paging = @import("paging.zig");
pub const Privilege = enum(u1) {
- user = 0,
- supervisor = 1,
+ user,
+ supervisor,
};
pub const ExtensionState = enum(u2) {
- off = 0,
- initial = 1,
- clean = 2,
- dirty = 3,
+ off,
+ initial,
+ clean,
+ dirty,
};
pub const Xlen = enum(u2) {
rv32 = 1,
- rv64 = 2,
- rv128 = 3,
+ rv64,
+ rv128,
};
pub const Sstatus = packed struct(usize) {
diff --git a/src/lib/sbi.zig b/src/lib/sbi.zig
index 2b0506c..fc8afde 100644
--- a/src/lib/sbi.zig
+++ b/src/lib/sbi.zig
@@ -41,25 +41,25 @@ pub fn errorFromCode(code: isize) Error {
const BaseExtId: usize = 0x10;
const BaseFnId = enum(usize) {
- GetSpecVer = 0,
- GetImpId = 1,
- GetImpVer = 2,
- ProbeExt = 3,
- GetMVendorId = 4,
- GetMArchId = 5,
- GetMImpId = 6,
+ GetSpecVer,
+ GetImpId,
+ GetImpVer,
+ ProbeExt,
+ GetMVendorId,
+ GetMArchId,
+ GetMImpId,
};
pub const ImpId = enum(isize) {
- Bbl = 0,
- OpenSbi = 1,
- Xvisor = 2,
- Kvm = 3,
- RustSbi = 4,
- Diosix = 5,
- Coffer = 6,
- Xen = 7,
- PolarFire = 8,
+ Bbl,
+ OpenSbi,
+ Xvisor,
+ Kvm,
+ RustSbi,
+ Diosix,
+ Coffer,
+ Xen,
+ PolarFire,
_,
};
diff --git a/src/lib/sbi/debug_console.zig b/src/lib/sbi/debug_console.zig
index 6c638e7..2bcc097 100644
--- a/src/lib/sbi/debug_console.zig
+++ b/src/lib/sbi/debug_console.zig
@@ -9,9 +9,9 @@ const sbi = @import("../sbi.zig");
const ExtId: usize = 0x4442434E;
const FnId = enum(usize) {
- Write = 0,
- Read = 1,
- WriteByte = 2,
+ Write,
+ Read,
+ WriteByte,
};
pub const Writer = std.io.Writer(void, sbi.Error, write);
diff --git a/src/lib/sbi/legacy.zig b/src/lib/sbi/legacy.zig
index 517ccef..858899c 100644
--- a/src/lib/sbi/legacy.zig
+++ b/src/lib/sbi/legacy.zig
@@ -7,15 +7,15 @@ const riscv = @import("../riscv.zig");
const sbi = @import("../sbi.zig");
const ExtId = enum(usize) {
- SetTimer = 0x00,
- ConsolePutchar = 0x01,
- ConsoleGetchar = 0x02,
- ClearIpi = 0x03,
- SendIpi = 0x04,
- RemoteFenceI = 0x05,
- RemoteSFenceVma = 0x06,
- RemoteSFenceVmaAsid = 0x07,
- Shutdown = 0x08,
+ SetTimer,
+ ConsolePutchar,
+ ConsoleGetchar,
+ ClearIpi,
+ SendIpi,
+ RemoteFenceI,
+ RemoteSFenceVma,
+ RemoteSFenceVmaAsid,
+ Shutdown,
};
pub const Writer = std.io.Writer(void, sbi.Error, write);
diff --git a/src/lib/sbi/sys_reset.zig b/src/lib/sbi/sys_reset.zig
index a1571fd..653e1e6 100644
--- a/src/lib/sbi/sys_reset.zig
+++ b/src/lib/sbi/sys_reset.zig
@@ -8,18 +8,18 @@ const sbi = @import("../sbi.zig");
const ExtId: usize = 0x53525354;
const FnId = enum(usize) {
- Reset = 0,
+ Reset,
};
pub const Type = enum(u32) {
- Shutdown = 0,
- ColdReboot = 1,
- WarmReboot = 2,
+ Shutdown,
+ ColdReboot,
+ WarmReboot,
};
pub const Reason = enum(u32) {
- None = 0,
- SysErr = 1,
+ None,
+ SysErr,
};
pub fn reset(@"type": Type, reset_reason: Reason) !void {
diff --git a/src/lib/sbi/time.zig b/src/lib/sbi/time.zig
index 2f1f6a2..6abdd4e 100644
--- a/src/lib/sbi/time.zig
+++ b/src/lib/sbi/time.zig
@@ -10,7 +10,7 @@ const sbi = @import("../sbi.zig");
const ExtId: usize = 0x54494d45;
const FnId = enum(usize) {
- SetTimer = 0,
+ SetTimer,
};
pub const Error = error{