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

Merge branch 'post-11' into post-12

Browse Source
This commit is contained in:
Philipp Oppermann
2024-05-30 11:01:51 +02:00
parent f4592bac7a 39ee714093
commit a2ca911f4e
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@@ -146,9 +146,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
[[package]] [[package]]
name = "pc-keyboard" name = "pc-keyboard"
version = "0.5.1" version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c6f2d937e3b8d63449b01401e2bae4041bc9dd1129c2e3e0d239407cf6635ac" checksum = "ed089a1fbffe3337a1a345501c981f1eb1e47e69de5a40e852433e12953c3174"
[[package]] [[package]]
name = "pic8259" name = "pic8259"

2
Cargo.toml
View File

@@ -19,7 +19,7 @@ spin = "0.5.2"
x86_64 = "0.14.2" x86_64 = "0.14.2"
uart_16550 = "0.2.0" uart_16550 = "0.2.0"
pic8259 = "0.10.1" pic8259 = "0.10.1"
pc-keyboard = "0.5.0" pc-keyboard = "0.7.0"
linked_list_allocator = "0.9.0" linked_list_allocator = "0.9.0"
[dependencies.lazy_static] [dependencies.lazy_static]

6
src/task/keyboard.rs
View File

@@ -68,7 +68,11 @@ impl Stream for ScancodeStream {
pub async fn print_keypresses() { pub async fn print_keypresses() {
let mut scancodes = ScancodeStream::new(); 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 { while let Some(scancode) = scancodes.next().await {
if let Ok(Some(key_event)) = keyboard.add_byte(scancode) { if let Ok(Some(key_event)) = keyboard.add_byte(scancode) {