Refactor and enhance driver framework and device support

.clang-format

@@ -3,9 +3,9 @@ Language:        Cpp
 # BasedOnStyle:  LLVM
 AlignAfterOpenBracket: AlwaysBreak
 AlignArrayOfStructures: Right
-AlignConsecutiveAssignments: true
+AlignConsecutiveAssignments: AcrossComments
 AlignConsecutiveBitFields: true
-AlignConsecutiveDeclarations: true
+AlignConsecutiveDeclarations: AcrossComments
 AlignConsecutiveMacros: true
 AlignEscapedNewlines: Left
 AlignOperands:   AlignAfterOperator
@@ -92,11 +92,12 @@ PenaltyBreakComment: 300
 PenaltyBreakFirstLessLess: 120
 PenaltyBreakString: 1000
 PenaltyBreakTemplateDeclaration: 10
-PenaltyExcessCharacter: 1000000
+PenaltyExcessCharacter: 1000
 PenaltyReturnTypeOnItsOwnLine: 1000
 PenaltyIndentedWhitespace: 0
 PointerAlignment: Right
 PPIndentWidth:   -1
+QualifierAlignment: Left
 ReferenceAlignment: Pointer
 ReflowComments:  true
 SortIncludes:    true

.gitignore

@@ -52,14 +52,25 @@ Module.symvers
 Mkfile.old
 dkms.conf
 compile_commands.json
+build/
+
+# Cache
+__pycache__/
+*.pyc
+.cache/
+
+# Rubbish
+.DS_Store
 
 # Others
-disk/
+/disk/
 tools/bin/
 tools/imagetool/target/
-core
 fixdep
 *.img
 *.log
 *.dat
 *.idx
+dump.pcap
+target/
+.stfolder/

.vscode/launch.json

@@ -9,7 +9,7 @@
             "type": "cppdbg",
             "request": "launch",
             "miDebuggerServerAddress": "127.0.0.1:1234",
-            "program": "${workspaceFolder}/src/kernel.elf",
+            "program": "${workspaceFolder}/src/build/kernel.elf",
             "args": [],
             "stopAtEntry": false,
             "cwd": "${workspaceFolder}",

.vscode/settings.json

@@ -44,27 +44,6 @@
         "utility": "c",
         "cstdlib": "c"
     },
-    "C_Cpp.codeAnalysis.clangTidy.checks.disabled": [
-        "clang-diagnostic-int-to-void-pointer-cast",
-        "clang-diagnostic-int-to-pointer-cast",
-        "clang-diagnostic-void-pointer-to-int-cast",
-        "clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling",
-        "clang-diagnostic-pointer-to-int-cast",
-        "clang-diagnostic-visibility",
-        "clang-analyzer-security.insecureAPI.strcpy",
-        "clang-diagnostic-incompatible-library-redeclaration",
-        "clang-diagnostic-implicit-function-declaration",
-        "clang-analyzer-deadcode.DeadStores",
-        "clang-diagnostic-error"
-    ],
-    "C_Cpp.errorSquiggles": "Disabled",
-    "makefile.launchConfigurations": [
-        {
-            "cwd": "/home/ryan/Desktop/horizon/src",
-            "binaryPath": "/home/ryan/Desktop/horizon/src/kernel.elf",
-            "binaryArgs": []
-        }
-    ],
     "C_Cpp.clang_format_style": "file",
     "C_Cpp.clang_format_fallbackStyle": "LLVM",
     "clangd.fallbackFlags": [

Makefile

@@ -1,3 +1,5 @@
+UNAME_S := $(shell uname -s)
+
 DD			=	dd
 CP			=	cp
 GRUB_MKIMG	=	grub-mkimage
@@ -13,6 +15,14 @@ ifeq ($(ARCH), x86)
 	TARGET_PLATFORM	=	i386-pc
 endif
 
+ifeq ($(UNAME_S),Linux)
+    QEMU_CFG = qemu-linux.cfg
+else ifeq ($(UNAME_S),Darwin)
+    QEMU_CFG = qemu-macos.cfg
+else ifeq ($(OS),Windows_NT)
+    QEMU_CFG = qemu-windows.cfg
+endif
+
 FD_IMG		=	./horizon.img
 HD_IMG		=	./hd0.img
 HD_SIZE		=	64M
@@ -30,6 +40,8 @@ FS_DIR		=	$(KERNEL_DIR)/fs
 LIB_DIR		=	$(KERNEL_SRC)/lib
 DISK_DIR	=	disk
 
+KERNEL_OUTPUT_DIR = $(KERNEL_SRC)/build
+
 LOADER_OFF	=	2
 LOADER_CNTS	=	8
 
@@ -38,9 +50,12 @@ KERNEL_CNTS	=	600
 
 BOOT_BIN	=	$(BOOT_DIR)/boot.bin
 LOADER_BIN	=	$(BOOT_DIR)/loader.bin
-KERNEL_ELF	=	$(KERNEL_SRC)/kernel.elf
+KERNEL_ELF	=	$(KERNEL_OUTPUT_DIR)/kernel.elf
 
 IMAGETOOL	=	$(TOOL_SRC)/bin/imagetool
+CONFIGURATOR	=	$(TOOL_SRC)/bin/configurator
+
+INSTALL_GRUB_SCRIPT =	$(TOOL_SRC)/grub/install_grub.py
 
 .PHONY: cld
 
@@ -51,17 +66,18 @@ run: kernel libs qemu
 run_dbg: kernel libs qemu_dbg
 
 hd: tool
-	$(PYTHON) ./install_grub.py \
+	$(PYTHON) $(INSTALL_GRUB_SCRIPT) \
 		--image $(HD_IMG) \
 		--fs fat32 \
 		--platform $(TARGET_PLATFORM)
 
 app:
 	$(MAKE) -s -C $(APP_SRC)
 
-kernel:
+kernel: tool
 	$(MAKE) -s -C $(BOOT_DIR)
-	$(MAKE) -s -C $(KERNEL_SRC)
+	$(CONFIGURATOR) --work-dir . --out-dir $(KERNEL_OUTPUT_DIR)
+	$(MAKE) -s -C $(KERNEL_OUTPUT_DIR)
 	$(IMAGETOOL) $(HD_IMG) copy $(KERNEL_ELF) /p0/kernel.elf
 
 tool:
@@ -89,28 +105,33 @@ writehd: $(HD_IMG)
 # qemu 7.1后取消了-soundhw，改用-audio
 qemu_dbg:
 	$(QEMU) \
+	-no-reboot \
 	-s -S \
-	-monitor stdio \
+	-serial stdio \
 	-m 1024 \
-	-hda $(HD_IMG) \
+	-drive file=$(HD_IMG),if=ide,format=raw \
 	-usb \
+	-device piix3-usb-uhci \
 	-device usb-kbd \
 	-device usb-mouse \
-	-audio pa,model=sb16 \
 	-device rtl8139,netdev=nc1 \
 	-netdev user,id=nc1,hostfwd=tcp::5555-:80 \
-	-object filter-dump,id=f1,netdev=nc1,file=dump.dat \
+	-object filter-dump,id=f1,netdev=nc1,file=dump.pcap \
+	-readconfig $(QEMU_CFG) \
 	-boot c
 
 qemu:
 	$(QEMU) \
-	-monitor stdio \
+	-no-reboot \
+	-serial stdio \
 	-m 1024 \
-	-hda $(HD_IMG) \
+	-drive file=$(HD_IMG),if=ide,format=raw \
 	-usb \
+	-device piix3-usb-uhci \
+	-device usb-kbd \
 	-device usb-mouse \
-	-audio pa,model=sb16 \
 	-device rtl8139,netdev=nc1 \
 	-netdev user,id=nc1,hostfwd=tcp::5555-:80 \
-	-object filter-dump,id=f1,netdev=nc1,file=dump.dat \
+	-object filter-dump,id=f1,netdev=nc1,file=dump.pcap \
+	-readconfig $(QEMU_CFG) \
 	-boot c

README.md

@@ -13,6 +13,8 @@
 	是个半成品。。。
 </p>
 
+真正的主分支：[master](https://github.com/Ryan1202/Horizon-Operating-System/tree/master)
+
 ## 环境
 
 建议使用```VSCode```开发
@@ -29,6 +31,28 @@
 - python(3.12.3)
 - rust：[Install Rust - Rust Programming Language(rust-lang.org)](https://www.rust-lang.org/tools/install)
 
+### Grub
+
+在虚拟机中运行使用grub引导，所以需要先安装grub
+
+#### Windows
+
+使用Windows需要先下载 [Grub for Windows (2.12)](https://ftp.gnu.org/gnu/grub/grub-2.12-for-windows.zip) 并解压，在执行安装脚本时会提示输入grub路径
+
+#### macOS
+
+使用macOS需要使用homebrew安装i686-elf-grub
+
+```
+brew install i686-elf-grub
+```
+
+#### Linux
+
+大多数Linux发行版默认使用grub引导，`install_grub.py`脚本可以自动从`/usr/lib/grub`找到模块目录
+
+如果不是或者使用的并非x86 pc，需要自行安装grub
+
 ### VSCode
 
 需要安装的插件：
@@ -42,7 +66,7 @@
 > 
 > qemu 7.1开始不再支持-soundhw，</font> 
 > 
-> qemu 7.1之前的版本要把Makefile中的
+> qemu 7.1之前的版本要把
 > ```
 > -audio pa,model=sb16
 > ```

config.toml

@@ -0,0 +1,31 @@
+arch = "x86"
+
+[tools]
+cc = "x86_64-elf-gcc"
+as = "nasm"
+ld = "x86_64-elf-ld"
+cflags = [
+    "-march=i486",
+    "-std=gnu11",
+    "-nostdinc",
+    "-nostdlib",
+    "-O0",
+    "-m32",
+    "-g",
+    "-ffreestanding",
+    "-fno-pie",
+    "-fno-stack-protector",
+    "-fno-strict-aliasing",
+    "-fno-builtin",
+    "-Wall",
+    "-Wunused",
+]
+asflags = ["-g", "-f", "elf32"]
+ldflags = ["-m", "elf_i386", "-nostdlib"]
+rust_target = "src/arch/x86/i686-none.json"
+rustflags = ["-C", "relocation-model=static", "--emit", "obj"]
+
+[debug]
+level = "all"
+cflags = ["-O0", "-g"]
+asflags = ["-g"]