andrey/osblog
1
0
Fork 0
mirror of https://github.com/sgmarz/osblog.git synced 2024-11-23 18:06:20 +04:00
Code Issues Projects Releases Wiki Activity

Move console::init until after heap init

Browse Source
This commit is contained in:
Stephen Marz 2020-06-05 08:09:56 -04:00
parent ed408d4d3c
commit 8e39f926eb
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
risc_v/src/main.rs
View File

@ -109,8 +109,11 @@ extern "C" fn kinit() {
} }
// Set up virtio. This requires a working heap and page-grained allocator. // Set up virtio. This requires a working heap and page-grained allocator.
virtio::probe(); virtio::probe();
// Test the block driver!
console::init();
process::add_kernel_process(test::test); process::add_kernel_process(test::test);
process::add_kernel_process(console::console_read_proc);
process::add_kernel_process(console::console_write_proc);
// Get the GPU going // Get the GPU going
gpu::init(6); gpu::init(6);
// We schedule the next context switch using a multiplier of 1 // We schedule the next context switch using a multiplier of 1
@ -132,6 +135,7 @@ extern "C" fn kinit_hart(_hartid: usize) {
pub mod assembly; pub mod assembly;
pub mod block; pub mod block;
pub mod buffer; pub mod buffer;
pub mod console;
pub mod cpu; pub mod cpu;
pub mod elf; pub mod elf;
pub mod fs; pub mod fs;
@ -147,6 +151,7 @@ pub mod sched;
pub mod syscall; pub mod syscall;
pub mod trap; pub mod trap;
pub mod uart; pub mod uart;
pub mod vfs;
pub mod virtio; pub mod virtio;
pub mod test; pub mod test;