vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Seperate PS/2 keyboard and mouse driver

Browse source
This commit is contained in:
Jeremy Soller 2016-09-19 09:43:30 -06:00
parent 70a2faa0c7
commit 727647dbf1
6 changed files with 49 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

5
arch/x86_64/src/interrupt/irq.rs
View file

@ -4,6 +4,7 @@ use x86::io;
use device::ps2::{PS2_KEYBOARD, PS2_MOUSE};
use device::serial::{COM1, COM2};
pub static ACKS: Mutex<[usize; 16]> = Mutex::new([0; 16]);
pub static COUNTS: Mutex<[usize; 16]> = Mutex::new([0; 16]);
#[inline(always)]
@ -88,10 +89,6 @@ interrupt!(pci3, {
interrupt!(mouse, {
COUNTS.lock()[12] += 1;
if let Some(ref mut mouse) = *PS2_MOUSE.lock() {
mouse.on_irq();
}
slave_ack();
});
interrupt!(fpu, {

3
arch/x86_64/src/lib.rs
View file

@ -73,8 +73,7 @@ pub extern crate x86;
macro_rules! print {
($($arg:tt)*) => ({
use core::fmt::Write;
let mut console = $crate::console::CONSOLE.lock();
let _ = write!(console, $($arg)*);
let _ = write!($crate::console::CONSOLE.lock(), $($arg)*);
});
}