feat: simple drawing board GUI

Author: wyfcyx

.gitignore

@@ -9,5 +9,6 @@ os/src/link_app.S
 os/src/linker.ld
 os/last-*
 os/.gdb_history
+os/virt.out
 tools/
 pushall.sh

os/Cargo.toml

@@ -19,5 +19,6 @@ virtio-input-decoder = "0.1.4"
 embedded-graphics = "0.7.1"
 tinybmp = "0.3.1"
 
+
 [profile.release]
 debug = true

os/Makefile

@@ -12,6 +12,12 @@ BOARD := qemu
 SBI ?= rustsbi
 BOOTLOADER := ../bootloader/$(SBI)-$(BOARD).bin
 
+# GUI
+GUI ?= off
+ifeq ($(GUI), off)
+	GUI_OPTION := -display none
+endif
+
 # Building mode argument
 ifeq ($(MODE), release)
 	MODE_ARG := --release
@@ -67,27 +73,12 @@ disasm-vim: kernel
 
 run: run-inner
 
-gui: build
-ifeq ($(BOARD),qemu)
-	@qemu-system-riscv64 \
-		-M 128m \
-		-machine virt \
-		-bios $(BOOTLOADER) \
-		-device loader,file=$(KERNEL_BIN),addr=$(KERNEL_ENTRY_PA) \
-		-drive file=$(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 
-endif
-
 run-inner: build
 	@qemu-system-riscv64 \
 		-M 128m \
 		-machine virt \
 		-bios $(BOOTLOADER) \
-		-display none \
+		$(GUI_OPTION) \
 		-device loader,file=$(KERNEL_BIN),addr=$(KERNEL_ENTRY_PA) \
 		-drive file=$(FS_IMG),if=none,format=raw,id=x0 \
         -device virtio-blk-device,drive=x0 \
@@ -96,6 +87,10 @@ run-inner: build
 		-device virtio-mouse-device \
 		-serial stdio
 
+fdt:
+	@qemu-system-riscv64 -M 128m -machine virt,dumpdtb=virt.out
+	fdtdump virt.out
+
 debug: build
 	@tmux new-session -d \
 		"qemu-system-riscv64 -machine virt -nographic -bios $(BOOTLOADER) -device loader,file=$(KERNEL_BIN),addr=$(KERNEL_ENTRY_PA) -s -S" && \
@@ -109,4 +104,4 @@ gdbserver: build
 gdbclient:
 	@riscv64-unknown-elf-gdb -ex 'file $(KERNEL_ELF)' -ex 'set arch riscv:rv64' -ex 'target remote localhost:1234'
 
-.PHONY: build env kernel clean disasm disasm-vim run-inner fs-img gdbserver gdbclient
+.PHONY: build env kernel clean disasm disasm-vim run-inner fs-img gdbserver gdbclient fdt

os/run-fdt.sh

@@ -14,6 +14,7 @@ pub const VIRT_PLIC: usize = 0xC00_0000;
 pub const VIRT_UART: usize = 0x1000_0000;
 
 pub const VIRTGPU_XRES: u32 = 1280;
+#[allow(unused)]
 pub const VIRTGPU_YRES: u32 = 800;
 
 use crate::drivers::block::BLOCK_DEVICE;
@@ -30,7 +31,7 @@ pub fn device_init() {
     plic.set_threshold(hart_id, supervisor, 0);
     plic.set_threshold(hart_id, machine, 1);
     //irq nums: 5 keyboard, 6 mouse, 8 block, 10 uart
-    for intr_src_id in [5usize, 6, 8 , 10] {
+    for intr_src_id in [5usize, 6, 8, 10] {
         plic.enable(hart_id, supervisor, intr_src_id);
         plic.set_priority(intr_src_id, 1);
     }

os/run-nodisp.sh

@@ -1,10 +1,10 @@
 use super::BlockDevice;
+use crate::drivers::bus::virtio::VirtioHal;
 use crate::sync::{Condvar, UPIntrFreeCell};
 use crate::task::schedule;
 use crate::DEV_NON_BLOCKING_ACCESS;
 use alloc::collections::BTreeMap;
 use virtio_drivers::{BlkResp, RespStatus, VirtIOBlk, VirtIOHeader};
-use crate::drivers::bus::virtio::VirtioHal;
 
 #[allow(unused)]
 const VIRTIO0: usize = 0x10008000;
@@ -69,7 +69,9 @@ impl BlockDevice for VirtIOBlock {
 impl VirtIOBlock {
     pub fn new() -> Self {
         let virtio_blk = unsafe {
-            UPIntrFreeCell::new(VirtIOBlk::<VirtioHal>::new(&mut *(VIRTIO0 as *mut VirtIOHeader)).unwrap())
+            UPIntrFreeCell::new(
+                VirtIOBlk::<VirtioHal>::new(&mut *(VIRTIO0 as *mut VirtIOHeader)).unwrap(),
+            )
         };
         let mut condvars = BTreeMap::new();
         let channels = virtio_blk.exclusive_access().virt_queue_size();
@@ -83,4 +85,3 @@ impl VirtIOBlock {
         }
     }
 }
-

os/run.sh

@@ -1 +1 @@
-pub mod virtio;
+pub mod virtio;

os/src/boards/qemu.rs

@@ -1,9 +1,9 @@
-use alloc::vec::Vec;
 use crate::mm::{
     frame_alloc, frame_dealloc, kernel_token, FrameTracker, PageTable, PhysAddr, PhysPageNum,
     StepByOne, VirtAddr,
 };
 use crate::sync::UPIntrFreeCell;
+use alloc::vec::Vec;
 use lazy_static::*;
 use virtio_drivers::Hal;
 
@@ -49,4 +49,4 @@ impl Hal for VirtioHal {
             .unwrap()
             .0
     }
-}
+}