From 9fcfcbbf16d05d294aadb9b88db0f004ba802bea Mon Sep 17 00:00:00 2001 From: NatrixAeria Date: Thu, 15 Apr 2021 22:52:47 +0200 Subject: Rewrite a memory safe vga text buffer --- kernel/src/main.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'kernel/src/main.rs') diff --git a/kernel/src/main.rs b/kernel/src/main.rs index 50b281f..c55826a 100644 --- a/kernel/src/main.rs +++ b/kernel/src/main.rs @@ -3,15 +3,17 @@ #![feature(abi_x86_interrupt)] #![feature(panic_info_message)] #![feature(asm)] +#![feature(core_intrinsics)] +#![feature(array_map)] #![test_runner(crate::testing::test_runner)] #![no_std] pub mod interrupts; +#[macro_use] pub mod io; pub mod testing; pub use io::qemu::{exit_qemu, QemuExitCode}; -pub use io::vga_text::OStream; pub use io::{qemu, serial, vga_text}; #[no_mangle] @@ -29,8 +31,8 @@ extern "C" fn _start() -> ! { x86_64::instructions::interrupts::enable(); - let mut stdout = OStream::new(); - stdout.print(b"apic initialisation complete\n"); + vga_println!("apic initialisation complete"); + x86_64::instructions::interrupts::int3(); if cfg!(test) { -- cgit v1.2.3-54-g00ecf