From 2701fe07b4c8c9b6a36112c98fbfc900acbd6cf3 Mon Sep 17 00:00:00 2001 From: Dennis Kobert Date: Wed, 27 Nov 2019 01:46:33 +0100 Subject: Implement proto Keyboard handling --- kernel/src/testing/panic.rs | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'kernel/src/testing/panic.rs') diff --git a/kernel/src/testing/panic.rs b/kernel/src/testing/panic.rs index 729a45f..de07ba8 100644 --- a/kernel/src/testing/panic.rs +++ b/kernel/src/testing/panic.rs @@ -4,8 +4,10 @@ use core::panic::PanicInfo; use qemu::{exit_qemu, QemuExitCode}; use serial::SerialStream; use vga_text::OStream; +use x86_64::instructions::interrupts; pub fn serial_should_panic(info: &PanicInfo) -> ! { + interrupts::disable(); let mut stdout = SerialStream::new(); write!(stdout, "\nOK\nsuccessfully panicked\n").unwrap(); exit_qemu(QemuExitCode::Success); @@ -13,6 +15,7 @@ pub fn serial_should_panic(info: &PanicInfo) -> ! { } pub fn serial_panic(info: &PanicInfo) -> ! { + interrupts::disable(); crate::io::panic_screen::show(info.message()); let mut stdout = SerialStream::new(); write!( @@ -26,11 +29,13 @@ pub fn serial_panic(info: &PanicInfo) -> ! { } pub fn should_panic(_info: &PanicInfo) -> ! { + interrupts::disable(); exit_qemu(QemuExitCode::Success); loop {} } pub fn panic(info: &PanicInfo) -> ! { + interrupts::disable(); crate::io::panic_screen::show(info.message()); loop {} } -- cgit v1.2.3-54-g00ecf