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

Merge branch 'post-10' into post-11

Browse Source
This commit is contained in:
Philipp Oppermann
2024-05-30 11:00:28 +02:00
parent 9c546d4899 3743997479
commit 39ee714093
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@@ -64,9 +64,9 @@ dependencies = [
[[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]

9
src/interrupts.rs
View File

@@ -85,9 +85,12 @@ extern "x86-interrupt" fn keyboard_interrupt_handler(_stack_frame: InterruptStac
use x86_64::instructions::port::Port; use x86_64::instructions::port::Port;
lazy_static! { lazy_static! {
static ref KEYBOARD: Mutex<Keyboard<layouts::Us104Key, ScancodeSet1>> = Mutex::new( static ref KEYBOARD: Mutex<Keyboard<layouts::Us104Key, ScancodeSet1>> =
Keyboard::new(layouts::Us104Key, ScancodeSet1, HandleControl::Ignore) Mutex::new(Keyboard::new(
); ScancodeSet1::new(),
layouts::Us104Key,
HandleControl::Ignore
));
} }
let mut keyboard = KEYBOARD.lock(); let mut keyboard = KEYBOARD.lock();