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

Remove some temporary variables

Browse Source
This commit is contained in:
Philipp Oppermann
2018-10-20 17:02:52 +02:00
parent 16a727b3cc
commit 4583936f0b
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
blog/content/second-edition/posts/08-hardware-interrupts/index.md
View File

@@ -183,8 +183,8 @@ lazy_static! {
let mut idt = InterruptDescriptorTable::new(); let mut idt = InterruptDescriptorTable::new();
idt.breakpoint.set_handler_fn(breakpoint_handler); idt.breakpoint.set_handler_fn(breakpoint_handler);
[…] […]
let timer_interrupt_id = usize::from(TIMER_INTERRUPT_ID); // new idt[usize::from(TIMER_INTERRUPT_ID)]
idt[timer_interrupt_id].set_handler_fn(timer_interrupt_handler); // new .set_handler_fn(timer_interrupt_handler); // new
idt idt
}; };
@@ -432,8 +432,8 @@ lazy_static! {
idt.breakpoint.set_handler_fn(breakpoint_handler); idt.breakpoint.set_handler_fn(breakpoint_handler);
[…] […]
// new // new
let keyboard_interrupt_id = usize::from(KEYBOARD_INTERRUPT_ID); idt[usize::from(KEYBOARD_INTERRUPT_ID)]
idt[keyboard_interrupt_id].set_handler_fn(keyboard_interrupt_handler); .set_handler_fn(keyboard_interrupt_handler);
idt idt
}; };

6
src/interrupts.rs
View File

@@ -23,10 +23,8 @@ lazy_static! {
.set_stack_index(gdt::DOUBLE_FAULT_IST_INDEX); .set_stack_index(gdt::DOUBLE_FAULT_IST_INDEX);
} }
let timer_interrupt_id = usize::from(TIMER_INTERRUPT_ID); idt[usize::from(TIMER_INTERRUPT_ID)].set_handler_fn(timer_interrupt_handler);
idt[timer_interrupt_id].set_handler_fn(timer_interrupt_handler); idt[usize::from(KEYBOARD_INTERRUPT_ID)].set_handler_fn(keyboard_interrupt_handler);
let keyboard_interrupt_id = usize::from(KEYBOARD_INTERRUPT_ID);
idt[keyboard_interrupt_id].set_handler_fn(keyboard_interrupt_handler);
idt idt
}; };