diff --git a/src/main.rs b/src/main.rs index 5a7136d..d6915d2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -12,7 +12,6 @@ mod program; mod util; use core::panic::PanicInfo; -use program::shell; use bootloader::{entry_point, BootInfo}; use dev::memory; @@ -25,7 +24,8 @@ fn kernel_main(boot_info: &'static BootInfo) -> ! { int::init(); memory::init(boot_info.physical_memory_offset, &boot_info.memory_map); println!("Finished initializations."); - shell::main(); + program::shell::main(); + // program::hello_world::main(); panic!("Exiting.") } diff --git a/src/program/hello_world.rs b/src/program/hello_world.rs new file mode 100644 index 0000000..abb1279 --- /dev/null +++ b/src/program/hello_world.rs @@ -0,0 +1,6 @@ +use crate::{print, println, util::spin}; + +pub fn main() -> ! { + println!("Hello World !"); + spin() +} diff --git a/src/program/mod.rs b/src/program/mod.rs index 327cf1b..dc4ab79 100644 --- a/src/program/mod.rs +++ b/src/program/mod.rs @@ -1 +1,2 @@ +pub mod hello_world; pub mod shell;