diff --git a/Cargo.lock b/Cargo.lock index 6c7236755..356aa7176 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -45,9 +45,9 @@ dependencies = [ [[package]] name = "pc-keyboard" -version = "0.5.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6f2d937e3b8d63449b01401e2bae4041bc9dd1129c2e3e0d239407cf6635ac" +checksum = "ed089a1fbffe3337a1a345501c981f1eb1e47e69de5a40e852433e12953c3174" [[package]] name = "pic8259" diff --git a/Cargo.toml b/Cargo.toml index 0e08ddae1..406b8e251 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ spin = "0.5.2" x86_64 = "0.14.2" uart_16550 = "0.2.0" pic8259 = "0.10.1" -pc-keyboard = "0.5.0" +pc-keyboard = "0.7.0" [dependencies.lazy_static] version = "1.0" diff --git a/src/interrupts.rs b/src/interrupts.rs index f937f50d9..aa7c2d9ce 100644 --- a/src/interrupts.rs +++ b/src/interrupts.rs @@ -85,9 +85,12 @@ extern "x86-interrupt" fn keyboard_interrupt_handler(_stack_frame: InterruptStac use x86_64::instructions::port::Port; lazy_static! { - static ref KEYBOARD: Mutex> = Mutex::new( - Keyboard::new(layouts::Us104Key, ScancodeSet1, HandleControl::Ignore) - ); + static ref KEYBOARD: Mutex> = + Mutex::new(Keyboard::new( + ScancodeSet1::new(), + layouts::Us104Key, + HandleControl::Ignore + )); } let mut keyboard = KEYBOARD.lock();