Tateisi/rcore-tutorial
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

can run virtio gpu/block

Browse source
This commit is contained in:
Yu Chen 2022-06-18 17:50:50 +08:00
parent 07029a2e5f
commit 093db48d04
5 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
bootloader/rustsbi-qemu.bin
View file

Binary file not shown.

9
os/run.sh Executable file
View file

@ -0,0 +1,9 @@
qemu-system-riscv64 -M 128m -machine virt \
-bios ../bootloader/rustsbi-qemu.bin \
-device loader,file=target/riscv64gc-unknown-none-elf/release/os.bin,addr=0x80200000 \
-drive file=../user/target/riscv64gc-unknown-none-elf/release/fs.img,if=none,format=raw,id=x0 \
-device virtio-blk-device,drive=x0 \
-device virtio-gpu-device \
-device virtio-keyboard-device \
-device virtio-mouse-device \
-serial stdio

4
os/src/boards/qemu.rs
View file

@ -1,8 +1,8 @@
pub const CLOCK_FREQ: usize = 12500000; pub const CLOCK_FREQ: usize = 12500000;
pub const MMIO: &[(usize, usize)] = &[ pub const MMIO: &[(usize, usize)] = &[
(0x1000_0000, 0x1000), // VIRT_UART0 in virt machine (0x1000_0000, 0xa000), // VIRT_UART0 in virt machine
(0x1000_1000, 0x1000), // VIRT_VIRTIO in virt machine // (0x1000_1000, 0x9000), // VIRT_VIRTIO with GPU in virt machine
(0x0C00_0000, 0x40_0000), // VIRT_PLIC in virt machine (0x0C00_0000, 0x40_0000), // VIRT_PLIC in virt machine
(0x0010_0000, 0x00_2000), // VIRT_TEST/RTC in virt machine (0x0010_0000, 0x00_2000), // VIRT_TEST/RTC in virt machine
]; ];

2
os/src/drivers/block/virtio_blk.rs
View file

@ -12,7 +12,7 @@ use lazy_static::*;
use virtio_drivers::{BlkResp, RespStatus, VirtIOBlk, VirtIOHeader}; use virtio_drivers::{BlkResp, RespStatus, VirtIOBlk, VirtIOHeader};
#[allow(unused)] #[allow(unused)]
const VIRTIO0: usize = 0x10001000; const VIRTIO0: usize = 0x10008000;
pub struct VirtIOBlock { pub struct VirtIOBlock {
virtio_blk: UPIntrFreeCell<VirtIOBlk<'static>>, virtio_blk: UPIntrFreeCell<VirtIOBlk<'static>>,

6
os/src/main.rs
View file

@ -22,6 +22,7 @@ mod console;
mod config; mod config;
mod drivers; mod drivers;
mod fs; mod fs;
mod gui;
mod lang_items; mod lang_items;
mod mm; mod mm;
mod sbi; mod sbi;
@ -30,7 +31,6 @@ mod syscall;
mod task; mod task;
mod timer; mod timer;
mod trap; mod trap;
mod gui;
core::arch::global_asm!(include_str!("entry.asm")); core::arch::global_asm!(include_str!("entry.asm"));
@ -57,9 +57,13 @@ lazy_static! {
pub fn rust_main() -> ! { pub fn rust_main() -> ! {
clear_bss(); clear_bss();
mm::init(); mm::init();
println!("KERN: init gpu");
GPU_DEVICE.clone(); GPU_DEVICE.clone();
println!("KERN: init keyboard");
KEYBOARD_DEVICE.clone(); KEYBOARD_DEVICE.clone();
println!("KERN: init mouse");
MOUSE_DEVICE.clone(); MOUSE_DEVICE.clone();
println!("KERN: init trap");
trap::init(); trap::init();
trap::enable_timer_interrupt(); trap::enable_timer_interrupt();
timer::set_next_trigger(); timer::set_next_trigger();