Tateisi/rcore-tutorial
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

in gui app, can recv keyboard and mouse info

Browse source
This commit is contained in:
Yu Chen 2022-06-20 23:57:11 +08:00
parent 2658b4bfb0
commit 7c2d1efee3
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
os/src/boards/qemu.rs
View file

@ -16,6 +16,7 @@ pub const VIRT_UART: usize = 0x1000_0000;
use crate::drivers::block::BLOCK_DEVICE; use crate::drivers::block::BLOCK_DEVICE;
use crate::drivers::chardev::{CharDevice, UART}; use crate::drivers::chardev::{CharDevice, UART};
use crate::drivers::plic::{IntrTargetPriority, PLIC}; use crate::drivers::plic::{IntrTargetPriority, PLIC};
use crate::drivers::{KEYBOARD_DEVICE, MOUSE_DEVICE};
pub fn device_init() { pub fn device_init() {
use riscv::register::sie; use riscv::register::sie;
@ -25,7 +26,8 @@ pub fn device_init() {
let machine = IntrTargetPriority::Machine; let machine = IntrTargetPriority::Machine;
plic.set_threshold(hart_id, supervisor, 0); plic.set_threshold(hart_id, supervisor, 0);
plic.set_threshold(hart_id, machine, 1); plic.set_threshold(hart_id, machine, 1);
for intr_src_id in [8usize, 10] { //irq nums: 5 keyboard, 6 mouse, 8 block, 10 uart
for intr_src_id in [5usize, 6, 8 , 10] {
plic.enable(hart_id, supervisor, intr_src_id); plic.enable(hart_id, supervisor, intr_src_id);
plic.set_priority(intr_src_id, 1); plic.set_priority(intr_src_id, 1);
} }
@ -38,6 +40,8 @@ pub fn irq_handler() {
let mut plic = unsafe { PLIC::new(VIRT_PLIC) }; let mut plic = unsafe { PLIC::new(VIRT_PLIC) };
let intr_src_id = plic.claim(0, IntrTargetPriority::Supervisor); let intr_src_id = plic.claim(0, IntrTargetPriority::Supervisor);
match intr_src_id { match intr_src_id {
5 => KEYBOARD_DEVICE.handle_irq(),
6 => MOUSE_DEVICE.handle_irq(),
8 => BLOCK_DEVICE.handle_irq(), 8 => BLOCK_DEVICE.handle_irq(),
10 => UART.handle_irq(), 10 => UART.handle_irq(),
_ => panic!("unsupported IRQ {}", intr_src_id), _ => panic!("unsupported IRQ {}", intr_src_id),

4
os/src/drivers/input/mod.rs
View file

@ -21,7 +21,7 @@ const VIRTIO6: usize = 0x10006000;
struct VirtIOINPUT(UPIntrFreeCell<VirtIOInput<'static>>); struct VirtIOINPUT(UPIntrFreeCell<VirtIOInput<'static>>);
pub trait INPUTDevice: Send + Sync + Any { pub trait INPUTDevice: Send + Sync + Any {
fn handler_interrupt(&self); fn handle_irq(&self);
} }
lazy_static::lazy_static!( lazy_static::lazy_static!(
@ -38,7 +38,7 @@ impl VirtIOINPUT {
} }
impl INPUTDevice for VirtIOINPUT { impl INPUTDevice for VirtIOINPUT {
fn handler_interrupt(&self) { fn handle_irq(&self) {
let mut input = self.0.exclusive_access(); let mut input = self.0.exclusive_access();
input.ack_interrupt(); input.ack_interrupt();
let event = input.pop_pending_event().unwrap(); let event = input.pop_pending_event().unwrap();