jack/42-archive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

x86 tss

Browse source
This commit is contained in:
Jack Halford 2018-03-26 15:13:06 +02:00
parent 9d69b7a82a
commit 095c369061
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
kernel-rs/src/interrupts/mod.rs
View file

@ -5,7 +5,8 @@ lazy_static! {
let mut idt = Idt::new(); let mut idt = Idt::new();
idt.breakpoint.set_handler_fn(breakpoint_handler); idt.breakpoint.set_handler_fn(breakpoint_handler);
idt.double_fault.set_handler_fn(double_fault_handler); idt.double_fault.set_handler_fn(double_fault_handler);
idt[0x21].set_handler_fn(::keyboard::kbd_callback); // int #1 is keyboard
idt.interrupts[1].set_handler_fn(::keyboard::kbd_callback);
idt idt
}; };
} }

3
kernel-rs/src/memory/stack_allocator.rs
View file

@ -1,6 +1,5 @@
use x86::*;
use x86::structures::paging::*; use x86::structures::paging::*;
use memory::paging::{self, ActivePageTable}; use memory::paging::{ActivePageTable};
use memory::*; use memory::*;
use core::ops::Range; use core::ops::Range;