summaryrefslogtreecommitdiff
path: root/src/kernel.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/kernel.rs')
-rw-r--r--src/kernel.rs38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/kernel.rs b/src/kernel.rs
index 42de2be..c040a4b 100644
--- a/src/kernel.rs
+++ b/src/kernel.rs
@@ -13,9 +13,9 @@ mod serial;
mod sync;
mod tests;
mod vga;
+use core::panic::PanicInfo;
use serial::*;
use vga::*;
-use core::panic::PanicInfo;
#[cfg(test)]
mod qemu;
@@ -28,42 +28,42 @@ use tests::*;
#[cfg(test)]
#[panic_handler]
fn panic(info: &PanicInfo) -> ! {
- serial_println!("[failed]\n");
- serial_println!("Error: {}\n", info);
- exit_qemu(QemuExitCode::Failed);
- loop {}
+ serial_println!("[failed]\n");
+ serial_println!("Error: {}\n", info);
+ exit_qemu(QemuExitCode::Failed);
+ loop {}
}
/// This function is called on panic.
#[cfg(not(test))]
#[panic_handler]
fn panic(info: &PanicInfo) -> ! {
- println!("{}", info);
- loop {}
+ println!("{}", info);
+ loop {}
}
/// # Initialization
///
/// Provides serial and VGA initialization.
fn kernel_init() {
- WRITER.init();
- SERIAL1.init();
+ WRITER.init();
+ SERIAL1.init();
}
/// # x86_64 Kernel
#[no_mangle]
pub extern "C" fn _start() -> ! {
- kernel_init();
+ kernel_init();
- #[cfg(not(test))]
- {
- WRITER.write_string("Hello World!");
- WRITER.write_string("\n\nHi\n");
- println!("{}", 5);
- }
+ #[cfg(not(test))]
+ {
+ WRITER.write_string("Hello World!");
+ WRITER.write_string("\n\nHi\n");
+ println!("{}", 5);
+ }
- #[cfg(test)]
- test_main();
+ #[cfg(test)]
+ test_main();
- loop {}
+ loop {}
}