From 4e1fd187bc3bb514b14b31d192b1aec8d634f7f3 Mon Sep 17 00:00:00 2001 From: starnakin Date: Sat, 7 Sep 2024 14:17:21 +0200 Subject: [PATCH 1/2] fix: makefile : use find instead of wildcard to access to sub sub folder --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5485d44..8351dfd 100644 --- a/Makefile +++ b/Makefile @@ -12,8 +12,8 @@ LD := $(CC) LDFLAGS := -T boot/linker.ld -ffreestanding -O2 -nostdlib LIBS := ./libbozo/build/libbozo.a -lgcc -SSRC := $(wildcard $(SOURCEDIR)/*.s) -CSRC := $(wildcard $(SOURCEDIR)/*.c) +SSRC := $(shell find $(SOURCEDIR) -name '*.s') +CSRC := $(shell find $(SOURCEDIR) -name '*.c') OBJ := $(patsubst $(SOURCEDIR)/%.c,$(OBJECTDIR)/%.o,$(CSRC))\ $(patsubst $(SOURCEDIR)/%.s,$(OBJECTDIR)/%.o,$(SSRC)) From 1685f2d0b9e3e90fd4efe0bea365ef0dfe2ba42e Mon Sep 17 00:00:00 2001 From: starnakin Date: Sat, 7 Sep 2024 14:18:04 +0200 Subject: [PATCH 2/2] add: print keypressed --- libbozo | 2 +- src/kernel.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libbozo b/libbozo index 4fd5ae3..69caa70 160000 --- a/libbozo +++ b/libbozo @@ -1 +1 @@ -Subproject commit 4fd5ae3a6528cbeff4730af4128b4872ef6f66ea +Subproject commit 69caa70c38aac2894265887d61223e35aeed5f27 diff --git a/src/kernel.c b/src/kernel.c index 338468e..447ba7b 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -23,4 +23,6 @@ void kernel_main(void) /* Newline support is left as an exercise. */ kprintf(0, "test %d a %d b %d\n", 10, 2, 3); + while (true) + terminal_getkey(); }