kernel: Add mouse

cilibc: Extend stdint. Extend stdlib

Author: chronium

_todo.md

@@ -2,3 +2,12 @@ command structure for kernel access, not reliant on fio
 command buffer
 fire and block
 fire and forget
+
+no idea what those are ^
+
+message passing
+expose kernel font somehow (broadcast message and kernel replies?)
+^ done-ish temp file that gives the font when read
+
+sleeping
+wait queue, sleep until time is met? maybe that works!

circinus.code-workspace

@@ -16,6 +16,9 @@
     "editor.tabSize": 2,
     "editor.insertSpaces": true,
     "C_Cpp.clang_format_style": "LLVM",
-    "C_Cpp.enhancedColorization": "enabled"
+    "C_Cpp.enhancedColorization": "enabled",
+    "rust-analyzer.cargo.cfgs": {
+      "target_arch": "x86_64",
+    }
   }
 }

environment/Cargo.toml

@@ -12,13 +12,18 @@ path = "lib.rs"
 [dependencies]
 log = "0.4.17"
 x86 = "0.52.0"
-vte = "0.11.0"
+vte = "0.13.0"
 spin = "0.9.3"
 cfg-if = "1.0.0"
-bitflags = "1.3.2"
+bitflags = "2.4.2"
 atomic_refcell = "0.1.8"
-pc-keyboard = "0.6.0"
-lazy_static = { version = "1.4.0", default-features = false, features = ["spin_no_std"] }
+
+pc-keyboard = "0.7.0"
+ps2-mouse = "0.1.4"
+
+lazy_static = { version = "1.4.0", default-features = false, features = [
+  "spin_no_std",
+] }
 
 buddy_system_allocator = { version = "0.8.0", features = ["const_fn"] }
 arrayvec = { version = "0.7.2", default-features = false }

environment/lib.rs

@@ -7,103 +7,109 @@ extern crate alloc;
 #[macro_use]
 extern crate log;
 use address::UserVAddr;
+use ps2_mouse::MouseState;
 use utils::static_cell::StaticCell;
 
 #[macro_use]
 pub mod print;
 
 pub trait System: Sync {
-	fn on_console_rx(&self, char: u8);
-	fn on_irq(&self, irq: u8);
-	fn on_timer_irq(&self);
-	fn on_page_fault(
-		&self,
-		unaligned_vaddr: Option<UserVAddr>,
-		ip: usize,
-		_reason: arch::PageFaultReason,
-	);
-
-	#[allow(clippy::too_many_arguments)]
-	fn on_syscall(
-		&self,
-		a1: usize,
-		a2: usize,
-		a3: usize,
-		a4: usize,
-		a5: usize,
-		a6: usize,
-		n: usize,
-		frame: *mut arch::PtRegs,
-	) -> isize;
-
-	#[cfg(debug_assertions)]
-	fn usercopy_hook(&self);
+  fn on_console_rx(&self, char: u8);
+  #[cfg(target_arch = "x86_64")]
+  fn on_mouse_event(&self, mouse_state: MouseState);
+  fn on_irq(&self, irq: u8);
+  fn on_timer_irq(&self);
+  fn on_page_fault(
+    &self,
+    unaligned_vaddr: Option<UserVAddr>,
+    ip: usize,
+    _reason: arch::PageFaultReason,
+  );
+
+  #[allow(clippy::too_many_arguments)]
+  fn on_syscall(
+    &self,
+    a1: usize,
+    a2: usize,
+    a3: usize,
+    a4: usize,
+    a5: usize,
+    a6: usize,
+    n: usize,
+    frame: *mut arch::PtRegs,
+  ) -> isize;
+
+  #[cfg(debug_assertions)]
+  fn usercopy_hook(&self);
 }
 
 static SYSTEM: StaticCell<&dyn System> = StaticCell::new(&NopSystem);
 struct NopSystem;
 
 impl System for NopSystem {
-	fn on_console_rx(&self, _char: u8) {}
-
-	fn on_irq(&self, _irq: u8) {}
-
-	fn on_timer_irq(&self) {}
-
-	fn on_page_fault(
-		&self,
-		_unaligned_vaddr: Option<UserVAddr>,
-		_ip: usize,
-		_reason: arch::PageFaultReason,
-	) {
-	}
-
-	fn on_syscall(
-		&self,
-		_a1: usize,
-		_a2: usize,
-		_a3: usize,
-		_a4: usize,
-		_a5: usize,
-		_a6: usize,
-		_n: usize,
-		_frame: *mut arch::PtRegs,
-	) -> isize {
-		0
-	}
-
-	#[cfg(debug_assertions)]
-	fn usercopy_hook(&self) {}
+  fn on_console_rx(&self, _char: u8) {}
+
+  #[cfg(target_arch = "x86_64")]
+  fn on_mouse_event(&self, _mouse_state: MouseState) {}
+
+  fn on_irq(&self, _irq: u8) {}
+
+  fn on_timer_irq(&self) {}
+
+  fn on_page_fault(
+    &self,
+    _unaligned_vaddr: Option<UserVAddr>,
+    _ip: usize,
+    _reason: arch::PageFaultReason,
+  ) {
+  }
+
+  fn on_syscall(
+    &self,
+    _a1: usize,
+    _a2: usize,
+    _a3: usize,
+    _a4: usize,
+    _a5: usize,
+    _a6: usize,
+    _n: usize,
+    _frame: *mut arch::PtRegs,
+  ) -> isize {
+    0
+  }
+
+  #[cfg(debug_assertions)]
+  fn usercopy_hook(&self) {}
 }
 
 fn system() -> &'static dyn System {
-	SYSTEM.load()
+  SYSTEM.load()
 }
 
 pub fn set_system(system: &'static dyn System) {
-	SYSTEM.store(system);
+  SYSTEM.store(system);
 }
 
 mod x64;
 
 pub mod arch {
-	pub use crate::x64::{
-		backtrace::Backtrace,
-		cpu_local::cpu_local_head,
-		idle::{halt, idle},
-		interrupt::SavedInterruptStatus,
-		ioapic::enable_irq,
-		paging::PageTable,
-		profile::read_clock_counter,
-		serial::SERIAL0,
-		syscall::PtRegs,
-		tss::TSS,
-		PageFaultReason, KERNEL_BASE_ADDR, KERNEL_STRAIGHT_MAP_PADDR_END, PAGE_SIZE, TICK_HZ,
-	};
-
-	pub mod x64 {
-		pub use crate::x64::gdt::{USER_CS64, USER_DS, USER_RPL};
-	}
+  pub use crate::x64::{
+    backtrace::Backtrace,
+    cpu_local::cpu_local_head,
+    idle::{halt, idle},
+    interrupt::SavedInterruptStatus,
+    ioapic::enable_irq,
+    paging::PageTable,
+    profile::read_clock_counter,
+    serial::SERIAL0,
+    syscall::PtRegs,
+    tss::TSS,
+    PageFaultReason, KERNEL_BASE_ADDR, KERNEL_STRAIGHT_MAP_PADDR_END, PAGE_SIZE, TICK_HZ,
+  };
+
+  pub mod x64 {
+    pub use crate::x64::gdt::{USER_CS64, USER_DS, USER_RPL};
+  }
 }
 
 pub mod address;

environment/x64/boot.rs

@@ -1,93 +1,94 @@
 use x86::{
-	controlregs::{self, Cr4, Xcr0},
-	cpuid::CpuId,
-	io::outb,
+  controlregs::{self, Cr4, Xcr0},
+  cpuid::CpuId,
+  io::outb,
 };
 
 use super::{apic, bootinfo, cpu_local, gdt, idt, ioapic, pit, serial, syscall, tss, vga};
 use crate::{
-	address::{PAddr, VAddr},
-	bootinfo::BootInfo,
-	logger, page_allocator,
-	x64::pc8042,
+  address::{PAddr, VAddr},
+  bootinfo::BootInfo,
+  logger, page_allocator,
+  x64::{mouse, pc8042},
 };
 
 fn check_cpuid_feature(name: &str, supported: bool) {
-	if !supported {
-		panic!("{} is not supprted on this machine", name);
-	}
+  if !supported {
+    panic!("{} is not supprted on this machine", name);
+  }
 }
 
 /// Enables some CPU features.
 unsafe fn common_setup(cpu_local_area: VAddr) {
-	let feats = CpuId::new().get_feature_info().unwrap();
-	let ex_feats = CpuId::new().get_extended_feature_info().unwrap();
-	check_cpuid_feature("XSAVE", feats.has_xsave());
-	check_cpuid_feature("FSGSBASE", ex_feats.has_fsgsbase());
-
-	let mut cr4 = controlregs::cr4();
-	cr4 |= Cr4::CR4_ENABLE_FSGSBASE
-		| Cr4::CR4_ENABLE_OS_XSAVE
-		| Cr4::CR4_ENABLE_SSE
-		| Cr4::CR4_UNMASKED_SSE;
-	controlregs::cr4_write(cr4);
-
-	let mut xcr0 = controlregs::xcr0();
-	xcr0 |= Xcr0::XCR0_SSE_STATE | Xcr0::XCR0_AVX_STATE;
-	controlregs::xcr0_write(xcr0);
-
-	cpu_local::init(cpu_local_area);
-	apic::init();
-	ioapic::init();
-	gdt::init();
-	tss::init();
-	idt::init();
-	pit::init();
-	syscall::init();
+  let feats = CpuId::new().get_feature_info().unwrap();
+  let ex_feats = CpuId::new().get_extended_feature_info().unwrap();
+  check_cpuid_feature("XSAVE", feats.has_xsave());
+  check_cpuid_feature("FSGSBASE", ex_feats.has_fsgsbase());
+
+  let mut cr4 = controlregs::cr4();
+  cr4 |= Cr4::CR4_ENABLE_FSGSBASE
+    | Cr4::CR4_ENABLE_OS_XSAVE
+    | Cr4::CR4_ENABLE_SSE
+    | Cr4::CR4_UNMASKED_SSE;
+  controlregs::cr4_write(cr4);
+
+  let mut xcr0 = controlregs::xcr0();
+  xcr0 |= Xcr0::XCR0_SSE_STATE | Xcr0::XCR0_AVX_STATE;
+  controlregs::xcr0_write(xcr0);
+
+  cpu_local::init(cpu_local_area);
+  apic::init();
+  ioapic::init();
+  gdt::init();
+  tss::init();
+  idt::init();
+  pit::init();
+  syscall::init();
 }
 
 /// Disables PIC. We use APIC instead.
 unsafe fn init_pic() {
-	outb(0xa1, 0xff);
-	outb(0x21, 0xff);
-
-	outb(0x20, 0x11);
-	outb(0xa0, 0x11);
-	outb(0x21, 0x20);
-	outb(0xa1, 0x28);
-	outb(0x21, 0x04);
-	outb(0xa1, 0x02);
-	outb(0x21, 0x01);
-	outb(0xa1, 0x01);
-
-	outb(0xa1, 0xff);
-	outb(0x21, 0xff);
+  outb(0xa1, 0xff);
+  outb(0x21, 0xff);
+
+  outb(0x20, 0x11);
+  outb(0xa0, 0x11);
+  outb(0x21, 0x20);
+  outb(0xa1, 0x28);
+  outb(0x21, 0x04);
+  outb(0xa1, 0x02);
+  outb(0x21, 0x01);
+  outb(0xa1, 0x01);
+
+  outb(0xa1, 0xff);
+  outb(0x21, 0xff);
 }
 
 extern "Rust" {
-	fn boot_kernel(bootinfo: &BootInfo) -> !;
+  fn boot_kernel(bootinfo: &BootInfo) -> !;
 }
 
 #[no_mangle]
 unsafe extern "C" fn bsp_early_init(boot_magic: u32, boot_params: u64) -> ! {
-	extern "C" {
-		static __bsp_cpu_local: u8;
-	}
+  extern "C" {
+    static __bsp_cpu_local: u8;
+  }
 
-	serial::early_init();
-	vga::init();
-	logger::init();
+  serial::early_init();
+  vga::init();
+  logger::init();
 
-	pc8042::init();
+  pc8042::init();
+  mouse::init();
 
-	let boot_info = bootinfo::parse(boot_magic, PAddr::new(boot_params as usize));
-	page_allocator::init(&boot_info.ram_areas);
+  let boot_info = bootinfo::parse(boot_magic, PAddr::new(boot_params as usize));
+  page_allocator::init(&boot_info.ram_areas);
 
-	logger::set_log_filter(&boot_info.log_filter);
+  logger::set_log_filter(&boot_info.log_filter);
 
-	serial::init(boot_info.use_second_serialport);
-	init_pic();
-	common_setup(VAddr::new(&__bsp_cpu_local as *const _ as usize));
+  serial::init(boot_info.use_second_serialport);
+  init_pic();
+  common_setup(VAddr::new(&__bsp_cpu_local as *const _ as usize));
 
-	boot_kernel(&boot_info);
+  boot_kernel(&boot_info);
 }