[MOD] created kernel modules for (static) compilation of modules

Author: di

Makefile

@@ -11,20 +11,23 @@ endif
 
 .PHONY: all shared user kernel clean raspi virt run debug dump prepare-fs help install
 
-all: kshared kernel shared user utils bins
+all: kshared modules kernel shared user utils bins
 	@echo "Build complete."
 	./createfs
 
 kshared:
 	$(MAKE) -C shared SH_FLAGS=-DKERNEL BUILD_DIR=./kbuild TARGET=klibshared.a
+	
+modules: kshared
+	$(MAKE) -C modules
 
 shared: 
 	$(MAKE) -C shared BUILD_DIR=./build
 
 user: shared prepare-fs
 	$(MAKE) -C user
 
-kernel: kshared
+kernel: kshared modules
 	$(MAKE) -C kernel LOAD_ADDR=$(LOAD_ADDR) XHCI_CTX_SIZE=$(XHCI_CTX_SIZE) QEMU=$(QEMU) TEST=$(TEST)
 
 utils: shared prepare-fs
@@ -43,6 +46,7 @@ clean:
 	$(MAKE) -C kernel $@
 	$(MAKE) -C utils  $@
 	$(MAKE) -C bin  $@
+	$(MAKE) -C modules $@
 	@echo "removing fs dirs"
 	$(RM) -r $(FS_DIRS)
 	@echo "removing images"

kernel/Makefile

@@ -5,6 +5,8 @@ include ../common.mk
 
 CPPFLAGS := -I. -I../shared -I../user -DXHCI_CTX_SIZE=$(XHCI_CTX_SIZE)
 
+MODULES := $(wildcard ../modules/*.a)
+
 ifeq ($(QEMU),true)
   CPPFLAGS += -DQEMU
 endif
@@ -36,8 +38,8 @@ prepare:
 	mkdir -p $(BUILD_DIR)
 
 $(TARGET): ../shared/klibshared.a prepare $(OBJ)
-	echo $(LDFLAGS)
-	$(VLD) $(LDFLAGS) -o $(ELF) $(OBJL) ../shared/klibshared.a $(BUILD_DIR)/boot.o
+	echo $(LIBMODULES)
+	$(VLD) $(LDFLAGS) -o $(ELF) $(OBJL) ../shared/klibshared.a $(MODULES) $(BUILD_DIR)/boot.o
 	$(OBJCOPY) -O binary $(ELF) $@
 	cp $(ELF) ../fs/kernel.elf
 

kernel/graph/graphics.h

@@ -29,6 +29,9 @@ void gpu_setup_cursor(gpu_point initial_loc);
 void gpu_update_cursor(gpu_point new_loc, bool full);
 void gpu_set_cursor_pressed(bool pressed);
 
+void gpu_create_window(uint32_t x, uint32_t y, uint32_t width, uint32_t height, draw_ctx *ctx);
+void gpu_resize_window(uint32_t width, uint32_t height, draw_ctx *win_ctx);
+
 extern system_module graphics_module;
 
 #ifdef __cplusplus

kernel/graph/tres.cpp

@@ -1,12 +1,12 @@
 #include "tres.h"
-#include "drivers/gpu_driver.hpp"
 #include "std/memory.h"
 #include "process/scheduler.h"
 #include "filesystem/filesystem.h"
 #include "syscalls/syscalls.h"
 #include "kernel_processes/windows/launcher.h"
 #include "console/kio.h"
 #include "sysregs.h"
+#include "graphics.h"
 #include "ui/graphic_types.h"
 
 clinkedlist_t *window_list;
@@ -23,11 +23,8 @@ typedef struct window_tab {
     uint16_t pid;
 } window_tab;
 
-GPUDriver *main_gpu_driver;
-
 void init_window_manager(uintptr_t gpu_driver){
     window_list = clinkedlist_create();
-    main_gpu_driver = (GPUDriver*)gpu_driver;
 }
 
 int find_window(void *node, void *key){
@@ -64,7 +61,7 @@ extern "C" void create_window(int32_t x, int32_t y, uint32_t width, uint32_t hei
     frame->x = x;
     frame->y = y;
     clinkedlist_push_front(window_list, PHYS_TO_VIRT_P(frame));
-    main_gpu_driver->create_window(x,y, width, height, &frame->win_ctx);
+    gpu_create_window(x,y, width, height, &frame->win_ctx);
     process_t *p = launch_launcher();
     p->win_id = frame->win_id;
     frame->pid = p->id;
@@ -76,7 +73,7 @@ void resize_window(uint32_t width, uint32_t height){
     clinkedlist_node_t *node = clinkedlist_find(window_list, PHYS_TO_VIRT_P(&p->win_id), (typeof(find_window)*)PHYS_TO_VIRT_P(find_window));
     if (node && node->data){
         window_frame* frame = (window_frame*)node->data;
-        main_gpu_driver->resize_window(width, height, &frame->win_ctx);
+        gpu_resize_window(width, height, &frame->win_ctx);
         frame->width = width;
         frame->height = height;
         dirty_windows = true;
@@ -104,7 +101,7 @@ void commit_frame(draw_ctx* frame_ctx, window_frame* frame){
     }
 
     draw_ctx win_ctx = frame->win_ctx;
-    draw_ctx *screen_ctx = main_gpu_driver->get_ctx();
+    draw_ctx *screen_ctx = gpu_get_ctx();
 
     int32_t sx = global_win_offset.x + frame->x;
     int32_t sy = global_win_offset.y + frame->y;

modules/Makefile

@@ -0,0 +1,18 @@
+include ../common.mk
+
+SUBDIRS := $(wildcard */.)
+SUBCLEAN = $(addsuffix .clean,$(SUBDIRS))
+
+all: $(SUBDIRS)
+
+$(SUBDIRS):
+	$(MAKE) -C $@
+
+clean: $(SUBCLEAN)
+
+$(SUBCLEAN): %.clean:
+		$(MAKE) -C $* clean
+
+clean: $(SUBCLEAN)
+
+.PHONY: all $(SUBDIRS)

modules/graph/Makefile

@@ -0,0 +1,46 @@
+include ../../common.mk
+
+CPPFLAGS := -I. -I../../kernel -I../../shared
+CFLAGS   := $(CFLAGS_BASE) $(CPPFLAGS)
+CXXFLAGS := $(CXXFLAGS_BASE) $(CPPFLAGS)
+
+CLEAN_OBJS := $(shell find . -name "*.o")
+CLEAN_DEPS := $(shell find . -name "*.d")
+C_SRC   := $(shell find . -name "*.c")
+CPP_SRC := $(shell find . -name "*.cpp")
+ASM_SRC := $(shell find . -name "*.S")
+OBJ     := $(C_SRC:%.c=$(BUILD_DIR)/%.o) $(ASM_SRC:%.S=$(BUILD_DIR)/%.o) $(CPP_SRC:%.cpp=$(BUILD_DIR)/%.o)
+DEP     := $(C_SRC:%.c=$(BUILD_DIR)/%.d) $(ASM_SRC:%.S=$(BUILD_DIR)/%.d) $(CPP_SRC:%.cpp=$(BUILD_DIR)/%.d)
+
+TARGET  := $(shell echo "../lib$(notdir $(CURDIR)).a")
+
+.PHONY: all clean prepare
+
+all: prepare $(TARGET)
+
+prepare:
+	mkdir -p $(BUILD_DIR)
+
+$(TARGET): $(OBJ)
+	@echo "Finishing build $(ARCH)"
+	echo $(addprefix $(BUILD_DIR)/,$(notdir $(OBJ)))
+	$(VAR) rcs $@ $(OBJ)
+
+$(BUILD_DIR)/%.o: %.S
+	@mkdir -p $(dir $@)
+	$(VAS) $(CFLAGS) $(SH_FLAGS) -c $< -o $@
+
+$(BUILD_DIR)/%.o: %.c
+	@mkdir -p $(dir $@)
+	$(VCC) $(CFLAGS) $(SH_FLAGS) -c -MMD -MP $< -o $@
+
+$(BUILD_DIR)/%.o: %.cpp
+	@mkdir -p $(dir $@)
+	$(VCXX) $(CXXFLAGS) $(SH_FLAGS) -c -MMD -MP $< -o $@
+
+clean:
+	$(RM) $(CLEAN_OBJS) $(CLEAN_DEPS) $(TARGET)
+	$(RM) -r $(BUILD_DIR)
+
+-include $(DEP)
+