Merge pull request #82 from bassaer/fix-qemu

Fix qemu

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## ver 2.0.2
+- fix qemu option
+- fix dir name
+
 ## ver 2.0.1
 - fix paging
 - fix itoa

Makefile

@@ -5,9 +5,9 @@ IMG       = myos-$(VER).img
 all: package
 
 prepare:
-	sudo apt install -y mtools qemu gcc-mingw-w64-x86-64 ovmf
+	sudo apt install -y mtools qemu gcc-mingw-w64-x86-64 ovmf qemu-system-x86
 
-kernel/vmmyos: window
+kernel/vmmyos: graphics
 	@$(MAKE) build -C kernel
 
 arch/x86/BOOTX64.EFI: lib
@@ -27,20 +27,21 @@ font:
 lib:
 	@$(MAKE) -C lib
 
-window:
-	@$(MAKE) -c window
+graphics:
+	@$(MAKE) -c graphics
 
 run: img
 	qemu-system-x86_64 -name myos \
-                     -localtime \
                      -monitor stdio \
                      -bios /usr/share/ovmf/OVMF.fd \
                      -net none \
-                     -usbdevice disk::$(IMG) \
+                     -drive format=raw,file=$(IMG) \
+                     -device nec-usb-xhci,id=xhci \
+                     -device usb-mouse \
+                     -device usb-kbd \
                      -d guest_errors \
                      || true
 
-
 usb: arch/x86/BOOTX64.EFI kernel/vmmyos
 	sudo mount /dev/sda /mnt
 	sudo rm -rf /mnt/EFI
@@ -59,4 +60,4 @@ clean:
 	@$(MAKE) clean -C arch/x86
 	@$(MAKE) clean -C kernel
 	@$(MAKE) clean -C lib
-	@$(MAKE) clean -C window
+	@$(MAKE) clean -C graphics

window/Makefile → graphics/Makefile

@@ -1,5 +1,5 @@
 CC        = gcc
-INCLUDE   = -I../include -I../include/window
+INCLUDE   = -I../include -I../include/graphics
 CFLAGS    = -c -Wall -Wextra $(INCLUDE) -nostdlib -fno-builtin -fPIE
 
 WIN_OBJ   = cursor.o \

window/cursor.c → graphics/cursor.c

@@ -1,5 +1,5 @@
-#include <window/cursor.h>
-#include <window/desktop.h>
+#include <graphics/cursor.h>
+#include <graphics/desktop.h>
 
 #define CURSOR_WIDTH 16
 

window/desktop.c → graphics/desktop.c

@@ -1,6 +1,6 @@
-#include <window/cursor.h>
-#include <window/desktop.h>
-#include <window/font.h>
+#include <graphics/cursor.h>
+#include <graphics/desktop.h>
+#include <graphics/font.h>
 
 #include <stdarg.h>
 #include <lib/string.h>

kernel/Makefile

@@ -1,9 +1,9 @@
 CC        = gcc
-INCLUDE   = -I../include -I../window/include
+INCLUDE   = -I../include -I../graphics/include
 CFLAGS    = -c -Wall -Wextra $(INCLUDE) -nostdlib -fno-builtin -fPIE
 KERN_OBJ  = main.o
-WIN_OBJ   = ../window/desktop.o \
-            ../window/cursor.o
+WIN_OBJ   = ../graphics/desktop.o \
+            ../graphics/cursor.o
 
 LIB_OBJ   = ../lib/string.o
 

kernel/main.c

@@ -8,7 +8,7 @@
 *---------------------------*/
 
 #include <uefi.h>
-#include <window/desktop.h>
+#include <graphics/desktop.h>
 
 void kernel_main(BootInfo *boot) {
   init_desktop(boot);

scripts/changelog.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# This script needs gawk not mawk.
+
 function usage {
   cat <<EOF
 Usage: $(basename "$0") [OPTION]...

scripts/font.py

@@ -75,7 +75,7 @@ def main():
     data = read(args.f).split()
     parsed = parse(data)
     header = build(parsed)
-    write('./include/window/font.h', header)
+    write('./include/graphics/font.h', header)
 
 
 if __name__ == '__main__':