Skip to content
This repository was archived by the owner on Jul 13, 2023. It is now read-only.

Commit 7f303c9

Browse files
committed
chore: bump dependencies to compile with new nightly
A few dependencies had to be updated to conform with breaking changes in the newest nightly toolchain. See phil-opp/blog_os#990 for more details.
1 parent 9db3d01 commit 7f303c9

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ harness = false
3232
bootloader = { version = "0.9.11", features = ["map_physical_memory"] }
3333
volatile = "0.2.6"
3434
spin = "0.5.2"
35-
x86_64 = "0.13.2"
35+
x86_64 = "0.14.2"
3636
uart_16550 = "0.2.0"
37-
pic8259_simple = "0.2.0"
37+
pic8259 = "0.10.1"
3838
pc-keyboard = "0.5.0"
39-
linked_list_allocator = "0.8.0"
39+
linked_list_allocator = "0.9.0"
4040

4141
[dependencies.lazy_static]
4242
version = "1.0"

kernel/interrupts.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::{gdt, hlt_loop, kprint, kprintln};
22
use lazy_static::lazy_static;
3-
use pic8259_simple::ChainedPics;
3+
use pic8259::ChainedPics;
44
use x86_64::structures::idt::{InterruptDescriptorTable, InterruptStackFrame, PageFaultErrorCode};
55

66
pub const PIC_1_OFFSET: u8 = 32;
@@ -29,7 +29,7 @@ lazy_static! {
2929
}
3030

3131
extern "x86-interrupt" fn page_fault_handler(
32-
stack_frame: &mut InterruptStackFrame,
32+
stack_frame: InterruptStackFrame,
3333
error_code: PageFaultErrorCode,
3434
) {
3535
use x86_64::registers::control::Cr2;
@@ -41,7 +41,7 @@ extern "x86-interrupt" fn page_fault_handler(
4141
hlt_loop();
4242
}
4343

44-
extern "x86-interrupt" fn keyboard_interrupt_handler(_stack_frame: &mut InterruptStackFrame) {
44+
extern "x86-interrupt" fn keyboard_interrupt_handler(_stack_frame: InterruptStackFrame) {
4545
use pc_keyboard::{layouts, DecodedKey, HandleControl, Keyboard, ScancodeSet1};
4646
use spin::Mutex;
4747
use x86_64::instructions::port::Port;
@@ -72,7 +72,7 @@ extern "x86-interrupt" fn keyboard_interrupt_handler(_stack_frame: &mut Interrup
7272
}
7373
}
7474

75-
extern "x86-interrupt" fn timer_interrupt_handler(_stack_frame: &mut InterruptStackFrame) {
75+
extern "x86-interrupt" fn timer_interrupt_handler(_stack_frame: InterruptStackFrame) {
7676
kprint!(".");
7777
unsafe {
7878
PICS.lock()
@@ -106,13 +106,13 @@ pub fn init_idt() {
106106
IDT.load();
107107
}
108108

109-
extern "x86-interrupt" fn breakpoint_handler(stack_frame: &mut InterruptStackFrame) {
109+
extern "x86-interrupt" fn breakpoint_handler(stack_frame: InterruptStackFrame) {
110110
kprintln!("EXCEPTION: BREAKPOINT\n{:#?}", stack_frame);
111111
}
112112

113113
// TODO: This is diverging?
114114
extern "x86-interrupt" fn double_fault_handler(
115-
stack_frame: &mut InterruptStackFrame,
115+
stack_frame: InterruptStackFrame,
116116
_error_code: u64,
117117
) -> ! {
118118
panic!("EXCEPTION: DOUBLE FAULT\n{:#?}", stack_frame);

0 commit comments

Comments
 (0)