Merge pull request #83 from bassaer/mouse

PCI devices
bassaer · Mar 18, 2022 · 4013e27 · 4013e27
2 parents f7ffc97 + 805ffb2
commit 4013e27
Show file tree

Hide file tree

Showing 12 changed files with 223 additions and 340 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## ver 2.1.0
+- find PCI devices
+
 ## ver 2.0.2
 - fix qemu option
 - fix dir name

diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ all: package
 prepare:
 	sudo apt install -y mtools qemu gcc-mingw-w64-x86-64 ovmf qemu-system-x86
 
-kernel/vmmyos: graphics
+kernel/vmmyos: graphics drivers
 	@$(MAKE) build -C kernel
 
 arch/x86/BOOTX64.EFI: lib
@@ -30,6 +30,9 @@ lib:
 graphics:
 	@$(MAKE) -c graphics
 
+drivers:
+	@$(MAKE) -c drivers
+
 run: img
 	qemu-system-x86_64 -name myos \
                      -monitor stdio \
@@ -61,3 +64,4 @@ clean:
 	@$(MAKE) clean -C kernel
 	@$(MAKE) clean -C lib
 	@$(MAKE) clean -C graphics
+	@$(MAKE) clean -C drivers
diff --git a/drivers/Makefile b/drivers/Makefile
@@ -0,0 +1,15 @@
+CC        = gcc
+INCLUDE   = -I../include -I../include/drivers
+CFLAGS    = -c -Wall -Wextra $(INCLUDE) -nostdlib -fno-builtin -fPIE
+
+WIN_OBJ   = xhci.o
+
+.PHONY: build clean
+
+build: $(WIN_OBJ)
+
+%.o: %.c
+	${CC} $(CFLAGS) -o $@ $*.c
+
+clean:
+	rm -rf *.o
diff --git a/drivers/cursor.c b/drivers/cursor.c
diff --git a/drivers/palette.c b/drivers/palette.c
diff --git a/drivers/screen.c b/drivers/screen.c
diff --git a/drivers/vram.s b/drivers/vram.s