From f0be41ec49fa3ac45fe0f33415d3ca6948288e49 Mon Sep 17 00:00:00 2001 From: JohnyTheCarrot Date: Sat, 15 Jul 2023 15:04:53 +0200 Subject: [PATCH] make requested changes --- kernel/src/arch/aarch64/mod.rs | 2 +- kernel/src/arch/riscv64/mod.rs | 2 +- kernel/src/kmain.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/src/arch/aarch64/mod.rs b/kernel/src/arch/aarch64/mod.rs index 3c937d2..05f1d86 100644 --- a/kernel/src/arch/aarch64/mod.rs +++ b/kernel/src/arch/aarch64/mod.rs @@ -11,7 +11,7 @@ pub fn log(_args: core::fmt::Arguments<'_>) -> core::fmt::Result { panic!() } -pub fn sloop() -> ! { +pub fn spin_loop() -> ! { loop {} } pub fn hardware_random_u64() -> u64 { diff --git a/kernel/src/arch/riscv64/mod.rs b/kernel/src/arch/riscv64/mod.rs index 8ef40da..0c7e966 100644 --- a/kernel/src/arch/riscv64/mod.rs +++ b/kernel/src/arch/riscv64/mod.rs @@ -79,7 +79,7 @@ unsafe extern fn _kernel_start() -> ! { } /// Spin loop -pub fn sloop() -> ! { +pub fn spin_loop() -> ! { loop { unsafe { asm!("wfi") } } diff --git a/kernel/src/kmain.rs b/kernel/src/kmain.rs index 0c9fded..5e3d8cb 100644 --- a/kernel/src/kmain.rs +++ b/kernel/src/kmain.rs @@ -46,7 +46,7 @@ pub fn kmain(cmdline: &str, boot_modules: BootModules) -> ! { sched.new_process(boot_modules[1].bytes.clone()); sched.run(); - // sloop(); + // spin_loop(); } pub static DEVICE_TREE: Lazy> = Lazy::new(|| {