diff --git a/arch/x86_64/src/interrupt/irq.rs b/arch/x86_64/src/interrupt/irq.rs index ec65a20..fdc38f6 100644 --- a/arch/x86_64/src/interrupt/irq.rs +++ b/arch/x86_64/src/interrupt/irq.rs @@ -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, { diff --git a/arch/x86_64/src/lib.rs b/arch/x86_64/src/lib.rs index 870bf73..21d4ceb 100644 --- a/arch/x86_64/src/lib.rs +++ b/arch/x86_64/src/lib.rs @@ -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)*); }); } diff --git a/drivers/ps2d/src/main.rs b/drivers/ps2d/src/main.rs index 9f45412..95345ae 100644 --- a/drivers/ps2d/src/main.rs +++ b/drivers/ps2d/src/main.rs @@ -4,12 +4,15 @@ extern crate syscall; use std::fs::File; use std::io::{Read, Write}; +use std::mem; use std::thread; use syscall::iopl; fn main() { - if true { + println!("PS/2 driver launching"); + + thread::spawn(|| { unsafe { iopl(3).expect("pskbd: failed to get I/O permission"); asm!("cli" :::: "intel", "volatile"); @@ -21,18 +24,22 @@ fn main() { loop { let mut irqs = [0; 8]; - file.read(&mut irqs).expect("pskbd: failed to read irq:1"); + if file.read(&mut irqs).expect("pskbd: failed to read irq:1") >= mem::size_of::() { + let data: u8; + unsafe { + asm!("in al, dx" : "={al}"(data) : "{dx}"(0x60) : : "intel", "volatile"); + } - let data: u8; - unsafe { - asm!("in al, dx" : "={al}"(data) : "{dx}"(0x60) : : "intel", "volatile"); + println!("pskbd: IRQ {}: {:X}", unsafe { *(irqs.as_ptr() as *const usize) }, data); + + file.write(&irqs).expect("pskbd: failed to write irq:1"); + } else { + thread::yield_now(); } - - println!("pskbd: IRQ {}: {:X}", unsafe { *(irqs.as_ptr() as *const usize) }, data); - - file.write(&irqs).expect("pskbd: failed to write irq:1"); } - } else { + }); + + thread::spawn(|| { unsafe { iopl(3).expect("psmsd: failed to get I/O permission"); asm!("cli" :::: "intel", "volatile"); @@ -43,17 +50,21 @@ fn main() { println!("psmsd: Reading mouse IRQs"); loop { - let mut count = [0; 8]; - file.read(&mut count).expect("psmsd: failed to read irq:12"); + let mut irqs = [0; 8]; + if file.read(&mut irqs).expect("psmsd: failed to read irq:12") >= mem::size_of::() { + let data: u8; + unsafe { + asm!("in al, dx" : "={al}"(data) : "{dx}"(0x60) : : "intel", "volatile"); + } - let data: u8; - unsafe { - asm!("in al, dx" : "={al}"(data) : "{dx}"(0x60) : : "intel", "volatile"); + println!("psmsd: IRQ {}: {:X}", unsafe { *(irqs.as_ptr() as *const usize) }, data); + + file.write(&irqs).expect("psmsd: failed to write irq:12"); + } else { + thread::yield_now(); } - - println!("psmsd: IRQ: {:X}", data); - - file.write(&count).expect("psmsd: failed to write irq:12"); } - } + }); + + println!("PS/2 driver running in background"); } diff --git a/kernel/context/switch.rs b/kernel/context/switch.rs index 49902d2..2e16727 100644 --- a/kernel/context/switch.rs +++ b/kernel/context/switch.rs @@ -54,6 +54,8 @@ pub unsafe fn switch() { return; } + //println!("Switch {} to {}", (&*from_ptr).id, (&*to_ptr).id); + (&mut *from_ptr).running = false; (&mut *to_ptr).running = true; if let Some(ref stack) = (*to_ptr).kstack { diff --git a/kernel/scheme/initfs.rs b/kernel/scheme/initfs.rs index aa5e7ff..0a33ce7 100644 --- a/kernel/scheme/initfs.rs +++ b/kernel/scheme/initfs.rs @@ -22,7 +22,7 @@ impl InitFsScheme { files.insert(b"bin/ion", include_bytes!("../../build/userspace/ion")); files.insert(b"bin/pcid", include_bytes!("../../build/userspace/pcid")); files.insert(b"bin/ps2d", include_bytes!("../../build/userspace/ps2d")); - files.insert(b"etc/init.rc", b"echo testing\n#initfs:bin/pcid\ninitfs:bin/ps2d\n#initfs:bin/ion"); + files.insert(b"etc/init.rc", b"#initfs:bin/pcid\ninitfs:bin/ps2d\n#initfs:bin/ion"); InitFsScheme { next_id: 0, diff --git a/kernel/scheme/irq.rs b/kernel/scheme/irq.rs index 8eee59d..fb68e11 100644 --- a/kernel/scheme/irq.rs +++ b/kernel/scheme/irq.rs @@ -1,6 +1,6 @@ use core::{mem, str}; -use arch::interrupt::irq::{COUNTS, acknowledge}; +use arch::interrupt::irq::{ACKS, COUNTS, acknowledge}; use context; use syscall::{Error, Result}; use super::Scheme; @@ -27,20 +27,15 @@ impl Scheme for IrqScheme { fn read(&mut self, file: usize, buffer: &mut [u8]) -> Result { // Ensures that the length of the buffer is larger than the size of a usize if buffer.len() >= mem::size_of::() { - let prev = { COUNTS.lock()[file] }; - loop { - { - let current = COUNTS.lock()[file]; - if prev != current { - // Safe if the length of the buffer is larger than the size of a usize - assert!(buffer.len() >= mem::size_of::()); - unsafe { *(buffer.as_mut_ptr() as *mut usize) = current; } - return Ok(mem::size_of::()); - } - } - - // Safe if all locks have been dropped - unsafe { context::switch(); } + let ack = ACKS.lock()[file]; + let current = COUNTS.lock()[file]; + if ack != current { + // Safe if the length of the buffer is larger than the size of a usize + assert!(buffer.len() >= mem::size_of::()); + unsafe { *(buffer.as_mut_ptr() as *mut usize) = current; } + return Ok(mem::size_of::()); + } else { + return Ok(0); } } else { Err(Error::InvalidValue) @@ -50,9 +45,10 @@ impl Scheme for IrqScheme { fn write(&mut self, file: usize, buffer: &[u8]) -> Result { if buffer.len() >= mem::size_of::() { assert!(buffer.len() >= mem::size_of::()); - let prev = unsafe { *(buffer.as_ptr() as *const usize) }; + let ack = unsafe { *(buffer.as_ptr() as *const usize) }; let current = COUNTS.lock()[file]; - if prev == current { + if ack == current { + ACKS.lock()[file] = ack; unsafe { acknowledge(file); } return Ok(mem::size_of::()); } else {