Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion kernel/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions kernel/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,4 @@ futures-util = { version = "0.3.31", default-features = false, features = [
"async-await-macro",
"futures-macro",
] }
ps2 = "0.2.0"
5 changes: 2 additions & 3 deletions kernel/limage_config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ base_args = [

# Graphics
"-vga", "std",

"-serial", "stdio",
# Debugging traces
# USB
# "-trace", "usb*",
Expand All @@ -44,7 +44,7 @@ base_args = [

[modes]
terminal = { args = ["-nographic"] }
gui = { args = [] }
gui = { args = ["-serial", "stdio"] }
gdb-terminal = { args = ["-nographic", "-s", "-S"] }
gdb-gui = { args = ["-s", "-S"] }

Expand All @@ -54,6 +54,5 @@ success_exit_code = 33
no_reboot = true
extra_args = [
"-device", "isa-debug-exit,iobase=0xf4,iosize=0x04",
"-serial", "stdio",
"-display", "none"
]
3 changes: 3 additions & 0 deletions kernel/src/constants/syscalls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ pub const SYSCALL_MPROTECT: u32 = 10;
pub const SYSCALL_MUNMAP: u32 = 11;
pub const SYSCALL_FORK: u32 = 5;
pub const SYSCALL_WAIT: u32 = 6;
pub const SYSCALL_READ: u32 = 0;
pub const SYSCALL_WRITE: u32 = 1;
pub const SYSCALL_EXECVE: u32 = 59;

// Mmap
pub const START_MMAP_ADDRESS: u64 = 0x0900_0000_0000;
6 changes: 2 additions & 4 deletions kernel/src/devices/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ use sd_card::{find_sd_card, initalize_sd_card};
use xhci::{find_xhci_inferface, initalize_xhci_hub};
pub mod graphics;
use graphics::framebuffer::{self, colors};
pub mod keyboard;
pub mod mmio;
pub mod mouse;
pub mod pci;
pub mod ps2_dev;
pub mod sd_card;
pub mod serial;
pub mod xhci;
Expand Down Expand Up @@ -74,7 +73,6 @@ pub fn init(cpu_id: u32) {
find_xhci_inferface(&devices).expect("Build system currently sets up xhci device");
initalize_xhci_hub(&xhci_device).unwrap();

keyboard::init().expect("Failed to initialize keyboard");
mouse::init().expect("Failed to initialize mouse");
ps2_dev::init();
}
}
Loading