Sync computers
This commit is contained in:
11
src/main.rs
11
src/main.rs
@@ -6,7 +6,11 @@
|
||||
#![no_main]
|
||||
// #![warn(clippy::pedantic)]
|
||||
#![allow(static_mut_refs)]
|
||||
#![feature(riscv_ext_intrinsics, str_from_raw_parts, arbitrary_self_types_pointers)]
|
||||
#![feature(
|
||||
riscv_ext_intrinsics,
|
||||
str_from_raw_parts,
|
||||
arbitrary_self_types_pointers
|
||||
)]
|
||||
|
||||
use core::sync::atomic::AtomicBool;
|
||||
|
||||
@@ -16,7 +20,7 @@ use log::info;
|
||||
|
||||
use crate::{
|
||||
io::init_log,
|
||||
pci::{PciDeviceIterator, scan_pci_for_virtio_keyboard, scan_pci_for_virtio_keyboard2},
|
||||
pci::{PciDeviceIterator, scan_pci_for_virtio_keyboard},
|
||||
riscv::enable_supervisor_interrupt,
|
||||
scheduler::{SCHEDULER, idle},
|
||||
user::{proc2, test},
|
||||
@@ -29,7 +33,6 @@ use crate::{
|
||||
};
|
||||
|
||||
extern crate alloc;
|
||||
mod volatile;
|
||||
mod boot;
|
||||
mod critical_section;
|
||||
mod draw;
|
||||
@@ -51,6 +54,7 @@ mod vga;
|
||||
mod virtio;
|
||||
mod virtual_console;
|
||||
mod virtual_fs;
|
||||
mod volatile;
|
||||
|
||||
pub const HEAP_SIZE: usize = 1024 * 1024 * 32; // 32Mo RAM
|
||||
#[global_allocator]
|
||||
@@ -96,7 +100,6 @@ pub extern "C" fn supervisor_mode_entry() {
|
||||
}
|
||||
|
||||
unsafe {
|
||||
scan_pci_for_virtio_keyboard2();
|
||||
let pci_info = scan_pci_for_virtio_keyboard().unwrap();
|
||||
KBD_DRIVER = Some(VirtioPciDriver::new(
|
||||
pci_info.common_cfg,
|
||||
|
||||
Reference in New Issue
Block a user