Fix: Port needs to be mutable when reading from it

Required because of the update to x86_64 0.7.0 (#606).
This commit is contained in:
Philipp Oppermann
2019-05-09 15:40:33 +02:00
parent f845b608c2
commit a770d09c0a

View File

@@ -589,7 +589,7 @@ extern "x86-interrupt" fn keyboard_interrupt_handler(
{ {
use x86_64::instructions::port::Port; use x86_64::instructions::port::Port;
let port = Port::new(0x60); let mut port = Port::new(0x60);
let scancode: u8 = unsafe { port.read() }; let scancode: u8 = unsafe { port.read() };
print!("{}", scancode); print!("{}", scancode);
@@ -630,7 +630,7 @@ extern "x86-interrupt" fn keyboard_interrupt_handler(
{ {
use x86_64::instructions::port::Port; use x86_64::instructions::port::Port;
let port = Port::new(0x60); let mut port = Port::new(0x60);
let scancode: u8 = unsafe { port.read() }; let scancode: u8 = unsafe { port.read() };
// new // new
@@ -697,7 +697,7 @@ extern "x86-interrupt" fn keyboard_interrupt_handler(
} }
let mut keyboard = KEYBOARD.lock(); let mut keyboard = KEYBOARD.lock();
let port = Port::new(0x60); let mut port = Port::new(0x60);
let scancode: u8 = unsafe { port.read() }; let scancode: u8 = unsafe { port.read() };
if let Ok(Some(key_event)) = keyboard.add_byte(scancode) { if let Ok(Some(key_event)) = keyboard.add_byte(scancode) {