diff --git a/Cargo.lock b/Cargo.lock index 5952f3be..ce9f1139 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -146,9 +146,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" [[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 8b439208..25046b59 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" linked_list_allocator = "0.9.0" [dependencies.lazy_static] diff --git a/src/task/keyboard.rs b/src/task/keyboard.rs index 37203f38..beb16ff0 100644 --- a/src/task/keyboard.rs +++ b/src/task/keyboard.rs @@ -68,7 +68,11 @@ impl Stream for ScancodeStream { pub async fn print_keypresses() { let mut scancodes = ScancodeStream::new(); - let mut keyboard = Keyboard::new(layouts::Us104Key, ScancodeSet1, HandleControl::Ignore); + let mut keyboard = Keyboard::new( + ScancodeSet1::new(), + layouts::Us104Key, + HandleControl::Ignore, + ); while let Some(scancode) = scancodes.next().await { if let Ok(Some(key_event)) = keyboard.add_byte(scancode) {