feat(kernel): console cap gates DebugPutchar, no uart fast path; spawn start arg in a0; delegate returns slot
This commit is contained in:
@@ -39,7 +39,7 @@ extern "C" fn kmain(hart: usize) -> ! {
|
||||
let mut blk =
|
||||
boot::hardware::probe_block_device(&uart).unwrap_or_else(|| halt(&uart, "no block device"));
|
||||
|
||||
let (init, _) = boot::loader::load_init(&uart, &mut blk);
|
||||
let init = boot::loader::load_init(&uart, &mut blk);
|
||||
let storage = boot::loader::load_server(&uart, &mut blk, b"storage.elf", "storage");
|
||||
let display = boot::loader::load_server(&uart, &mut blk, b"display.elf", "display");
|
||||
let input = boot::loader::load_server(&uart, &mut blk, b"input.elf", "input");
|
||||
@@ -50,19 +50,14 @@ extern "C" fn kmain(hart: usize) -> ! {
|
||||
.unwrap_or_else(|_| halt(&uart, "board registration failed"));
|
||||
devices::display_quota(&uart, display.pid);
|
||||
boot::caps::grant_all(&uart, init.pid, storage.pid, display.pid, input.pid);
|
||||
// Last, so the servers' fixed slots stay where they expect them.
|
||||
boot::caps::grant_console(&uart, &[storage, display, input]);
|
||||
// After grant_all: init already relies on those slots.
|
||||
let mut placed = [None; board::BOARD_DEVICES];
|
||||
let system_control = kern_mut()
|
||||
let boot_caps = kern_mut()
|
||||
.grant_boot_authority(init.pid, &board, &mut placed)
|
||||
.unwrap_or_else(|_| halt(&uart, "boot authority failed"));
|
||||
devices::boot_info(
|
||||
&uart,
|
||||
init.pid,
|
||||
&board,
|
||||
&board::kinds(),
|
||||
&placed,
|
||||
system_control,
|
||||
);
|
||||
devices::boot_info(&uart, init.pid, &board, &board::kinds(), &placed, boot_caps);
|
||||
|
||||
start_other_harts(&uart, hart);
|
||||
uart.write_str("k-os: entering userspace\n");
|
||||
|
||||
Reference in New Issue
Block a user