Skip to content

Commit 7a4bf8f

Browse files
committed
Removed keyboard driver
Signed-off-by: SlyMarbo <[email protected]>
1 parent ac3c9c4 commit 7a4bf8f

File tree

3 files changed

+1
-40
lines changed

3 files changed

+1
-40
lines changed

kernel/Cargo.lock

Lines changed: 0 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

kernel/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ edition = "2018"
88
bootloader = { version = "=0.9.19", features = ["map_physical_memory"]}
99
lazy_static = { version = "=1.4.0", features = ["spin_no_std"]}
1010
linked_list_allocator = "=0.9.0"
11-
pc-keyboard = "=0.5.0"
1211
pic8259 = "=0.10.1"
1312
spin = "=0.5.2"
1413
uart_16550 = "=0.2.15"

kernel/src/interrupts.rs

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::{gdt, halt_loop, print, println, time};
1+
use crate::{gdt, halt_loop, println, time};
22
use lazy_static::lazy_static;
33
use pic8259::ChainedPics;
44
use x86_64::structures::idt::{InterruptDescriptorTable, InterruptStackFrame, PageFaultErrorCode};
@@ -18,7 +18,6 @@ lazy_static! {
1818
.set_stack_index(gdt::DOUBLE_FAULT_IST_INDEX);
1919
}
2020
idt[InterruptIndex::Timer.as_usize()].set_handler_fn(timer_interrupt_handler);
21-
idt[InterruptIndex::Keyboard.as_usize()].set_handler_fn(keyboard_interrupt_handler);
2221

2322
idt
2423
};
@@ -50,36 +49,6 @@ extern "x86-interrupt" fn double_fault_handler(
5049
panic!("EXCEPTION: DOUBLE FAULT\n{:#?}", stack_frame);
5150
}
5251

53-
extern "x86-interrupt" fn keyboard_interrupt_handler(_stack_frame: InterruptStackFrame) {
54-
use pc_keyboard::{layouts, DecodedKey, HandleControl, Keyboard, ScancodeSet1};
55-
use spin::Mutex;
56-
use x86_64::instructions::port::Port;
57-
58-
lazy_static! {
59-
static ref KEYBOARD: Mutex<Keyboard<layouts::Us104Key, ScancodeSet1>> = Mutex::new(
60-
Keyboard::new(layouts::Us104Key, ScancodeSet1, HandleControl::Ignore)
61-
);
62-
}
63-
64-
let mut keyboard = KEYBOARD.lock();
65-
let mut port = Port::new(0x60);
66-
67-
let scancode: u8 = unsafe { port.read() };
68-
if let Ok(Some(key_event)) = keyboard.add_byte(scancode) {
69-
if let Some(key) = keyboard.process_keyevent(key_event) {
70-
match key {
71-
DecodedKey::Unicode(character) => print!("{}", character),
72-
DecodedKey::RawKey(key) => print!("{:?}", key),
73-
}
74-
}
75-
}
76-
77-
unsafe {
78-
PICS.lock()
79-
.notify_end_of_interrupt(InterruptIndex::Keyboard.as_u8());
80-
}
81-
}
82-
8352
extern "x86-interrupt" fn timer_interrupt_handler(_stack_frame: InterruptStackFrame) {
8453
time::TICKER.tick();
8554

0 commit comments

Comments
 (0)