michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 14:27:49 +00:00
Code Issues Projects Releases Wiki Activity

Update post-08 code for changes in x86_64 0.5.0

Browse Source
This commit is contained in:
Philipp Oppermann
2019-03-09 12:37:45 +01:00
parent 81e4eec055
commit 09dd68a1a2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/test-exception-double-fault-stack-overflow.rs
View File

@@ -65,7 +65,7 @@ pub fn init_test_idt() {
} }
extern "x86-interrupt" fn double_fault_handler( extern "x86-interrupt" fn double_fault_handler(
_stack_frame: &mut ExceptionStackFrame, _stack_frame: &mut InterruptStackFrame,
_error_code: u64, _error_code: u64,
) { ) {
serial_println!("ok"); serial_println!("ok");

4
src/interrupts.rs
View File

@@ -64,7 +64,7 @@ extern "x86-interrupt" fn double_fault_handler(
hlt_loop(); hlt_loop();
} }
extern "x86-interrupt" fn timer_interrupt_handler(_stack_frame: &mut ExceptionStackFrame) { extern "x86-interrupt" fn timer_interrupt_handler(_stack_frame: &mut InterruptStackFrame) {
print!("."); print!(".");
unsafe { unsafe {
PICS.lock() PICS.lock()
@@ -72,7 +72,7 @@ extern "x86-interrupt" fn timer_interrupt_handler(_stack_frame: &mut ExceptionSt
} }
} }
extern "x86-interrupt" fn keyboard_interrupt_handler(_stack_frame: &mut ExceptionStackFrame) { extern "x86-interrupt" fn keyboard_interrupt_handler(_stack_frame: &mut InterruptStackFrame) {
use pc_keyboard::{layouts, DecodedKey, Keyboard, ScancodeSet1}; use pc_keyboard::{layouts, DecodedKey, Keyboard, ScancodeSet1};
use spin::Mutex; use spin::Mutex;
use x86_64::instructions::port::Port; use x86_64::instructions::port::Port;