Skip to content

Commit 49441cc

Browse files
committed
Merge with main:
2 parents 043083d + 2cb9c69 commit 49441cc

File tree

23 files changed

+2276
-88
lines changed

23 files changed

+2276
-88
lines changed

kernel/Cargo.lock

Lines changed: 54 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

kernel/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,6 @@ crossbeam-queue = { version = "0.3.12", default-features = false, features = ["a
2525
arrayvec = { version = "0.7.6", default-features = false }
2626
log = { version = "0.4.25", default-features = false }
2727
async-trait = "0.1.86"
28+
fontdue = { version = "0.9.3", default-features = false, features = ["hashbrown"] }
29+
pc-keyboard = "0.8.0"
30+
futures-util = { version = "0.3.31", default-features = false, features = ["alloc", "async-await", "async-await-macro", "futures-macro"] }

kernel/src/constants/idt.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,7 @@
33
/// Vector number assigned to the timer interrupt.
44
pub const TIMER_VECTOR: u8 = 32;
55
pub const SYSCALL_HANDLER: u8 = 0x80;
6+
pub const KEYBOARD_VECTOR: u8 = 33;
7+
pub const MOUSE_VECTOR: u8 = 44;
68

79
pub const TLB_SHOOTDOWN_VECTOR: u8 = 33;

kernel/src/constants/processes.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ pub const TEST_EXIT_CODE: &[u8] = include_bytes!("../processes/test_binaries/tes
3232
pub const TEST_PRINT_EXIT: &[u8] = include_bytes!("../processes/test_binaries/test_print_exit");
3333
pub const TEST_WAIT: &[u8] = include_bytes!("../processes/test_binaries/test_wait");
3434
pub const TEST_FORK_COW: &[u8] = include_bytes!("../processes/test_binaries/test_fork_cow");
35-
pub const TEST_MMAP_ANON_SHARED: &[u8] = include_bytes!("../processes/test_binaries/test_mmap_anon_shared");
35+
pub const TEST_MMAP_ANON_SHARED: &[u8] =
36+
include_bytes!("../processes/test_binaries/test_mmap_anon_shared");
3637

3738
pub const STACK_START: u64 = 0x7000_0000_0000;
3839
// if this number is big clone fails

0 commit comments

Comments
 (0)