1
1
use crate :: { gdt, hlt_loop, kprint, kprintln} ;
2
2
use lazy_static:: lazy_static;
3
- use pic8259_simple :: ChainedPics ;
3
+ use pic8259 :: ChainedPics ;
4
4
use x86_64:: structures:: idt:: { InterruptDescriptorTable , InterruptStackFrame , PageFaultErrorCode } ;
5
5
6
6
pub const PIC_1_OFFSET : u8 = 32 ;
@@ -29,7 +29,7 @@ lazy_static! {
29
29
}
30
30
31
31
extern "x86-interrupt" fn page_fault_handler (
32
- stack_frame : & mut InterruptStackFrame ,
32
+ stack_frame : InterruptStackFrame ,
33
33
error_code : PageFaultErrorCode ,
34
34
) {
35
35
use x86_64:: registers:: control:: Cr2 ;
@@ -41,7 +41,7 @@ extern "x86-interrupt" fn page_fault_handler(
41
41
hlt_loop ( ) ;
42
42
}
43
43
44
- extern "x86-interrupt" fn keyboard_interrupt_handler ( _stack_frame : & mut InterruptStackFrame ) {
44
+ extern "x86-interrupt" fn keyboard_interrupt_handler ( _stack_frame : InterruptStackFrame ) {
45
45
use pc_keyboard:: { layouts, DecodedKey , HandleControl , Keyboard , ScancodeSet1 } ;
46
46
use spin:: Mutex ;
47
47
use x86_64:: instructions:: port:: Port ;
@@ -72,7 +72,7 @@ extern "x86-interrupt" fn keyboard_interrupt_handler(_stack_frame: &mut Interrup
72
72
}
73
73
}
74
74
75
- extern "x86-interrupt" fn timer_interrupt_handler ( _stack_frame : & mut InterruptStackFrame ) {
75
+ extern "x86-interrupt" fn timer_interrupt_handler ( _stack_frame : InterruptStackFrame ) {
76
76
kprint ! ( "." ) ;
77
77
unsafe {
78
78
PICS . lock ( )
@@ -106,13 +106,13 @@ pub fn init_idt() {
106
106
IDT . load ( ) ;
107
107
}
108
108
109
- extern "x86-interrupt" fn breakpoint_handler ( stack_frame : & mut InterruptStackFrame ) {
109
+ extern "x86-interrupt" fn breakpoint_handler ( stack_frame : InterruptStackFrame ) {
110
110
kprintln ! ( "EXCEPTION: BREAKPOINT\n {:#?}" , stack_frame) ;
111
111
}
112
112
113
113
// TODO: This is diverging?
114
114
extern "x86-interrupt" fn double_fault_handler (
115
- stack_frame : & mut InterruptStackFrame ,
115
+ stack_frame : InterruptStackFrame ,
116
116
_error_code : u64 ,
117
117
) -> ! {
118
118
panic ! ( "EXCEPTION: DOUBLE FAULT\n {:#?}" , stack_frame) ;
0 commit comments