Skip to content
Snippets Groups Projects
Commit 71b13c21 authored by Eemeli Lehtonen's avatar Eemeli Lehtonen
Browse files

Merge branch 'dev' of github.com:Overpeek/hyperion into dev

parents 31493c16 149dbdf0
No related branches found
No related tags found
No related merge requests found
...@@ -4,15 +4,19 @@ use spin::Once; ...@@ -4,15 +4,19 @@ use spin::Once;
#[cfg(feature = "multiboot1")] #[cfg(feature = "multiboot1")]
#[path = "multiboot1/mod.rs"] #[path = "multiboot1/mod.rs"]
#[allow(clippy::module_inception)]
mod boot; mod boot;
#[cfg(feature = "multiboot2")] #[cfg(feature = "multiboot2")]
#[path = "multiboot2/mod.rs"] #[path = "multiboot2/mod.rs"]
#[allow(clippy::module_inception)]
mod boot; mod boot;
#[cfg(feature = "bootboot")] #[cfg(feature = "bootboot")]
#[path = "bootboot/mod.rs"] #[path = "bootboot/mod.rs"]
#[allow(clippy::module_inception)]
mod boot; mod boot;
#[cfg(feature = "limine")] #[cfg(feature = "limine")]
#[path = "limine/mod.rs"] #[path = "limine/mod.rs"]
#[allow(clippy::module_inception)]
mod boot; mod boot;
// //
......
...@@ -45,6 +45,7 @@ pub static KERNEL_VERS: &str = env!("CARGO_PKG_VERSION"); ...@@ -45,6 +45,7 @@ pub static KERNEL_VERS: &str = env!("CARGO_PKG_VERSION");
// //
// the actual entry exists in [´crate::boot::boot´]
fn kernel_main() -> ! { fn kernel_main() -> ! {
debug!("Entering kernel_main"); debug!("Entering kernel_main");
debug!("Cmdline: {:?}", env::Arguments::get()); debug!("Cmdline: {:?}", env::Arguments::get());
...@@ -61,7 +62,7 @@ fn kernel_main() -> ! { ...@@ -61,7 +62,7 @@ fn kernel_main() -> ! {
#[cfg(test)] #[cfg(test)]
test_main(); test_main();
debug!("{}", arch::rng_seed()); debug!("RNG Seed {}", arch::rng_seed());
smp::init(); smp::init();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment