xamidev/blankos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

Driver section separation

Browse Source
This commit is contained in:
xamidev
2024-08-05 19:33:16 +02:00
parent 4b6beb5ba9
commit f05347f73b
7 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
iso/boot/kernel.elf
View File

Binary file not shown.

7
makefile
View File

@@ -8,10 +8,11 @@ SRC_DIR = src
KERNEL_DIR = $(SRC_DIR)/kernel
LIBC_DIR = $(SRC_DIR)/libc
PROGRAMS_DIR = $(SRC_DIR)/programs
DRIVERS_DIR = $(SRC_DIR)/drivers
OBJ_DIR = build
C_SOURCES = $(wildcard $(KERNEL_DIR)/*.c) $(wildcard $(LIBC_DIR)/*.c) $(wildcard $(PROGRAMS_DIR)/*.c)
ASM_SOURCES = $(wildcard $(KERNEL_DIR)/*.s) $(wildcard $(LIBC_DIR)/*.s) $(wildcard $(PROGRAMS_DIR)/*.s)
C_SOURCES = $(wildcard $(KERNEL_DIR)/*.c) $(wildcard $(LIBC_DIR)/*.c) $(wildcard $(PROGRAMS_DIR)/*.c) $(wildcard $(DRIVERS_DIR)/*.c)
ASM_SOURCES = $(wildcard $(KERNEL_DIR)/*.s) $(wildcard $(LIBC_DIR)/*.s) $(wildcard $(PROGRAMS_DIR)/*.s) $(wildcard $(DRIVERS_DIR)/*.s)
OBJECTS = $(patsubst $(SRC_DIR)/%, $(OBJ_DIR)/%, $(C_SOURCES:.c=.o) $(ASM_SOURCES:.s=.o))
@@ -19,7 +20,7 @@ all: $(OBJ_DIR) kernel.elf
$(OBJ_DIR):
mkdir -p $(OBJ_DIR)
mkdir -p $(OBJ_DIR)/kernel $(OBJ_DIR)/libc $(OBJ_DIR)/programs
mkdir -p $(OBJ_DIR)/kernel $(OBJ_DIR)/libc $(OBJ_DIR)/programs $(OBJ_DIR)/drivers
kernel.elf: $(OBJECTS)
ld $(LDFLAGS) $(OBJECTS) -o kernel.elf

4
src/kernel/kb.c → src/drivers/kb.c
View File

@@ -1,6 +1,6 @@
#include "io.h"
#include "../kernel/io.h"
#include "../libc/stdio.h"
#include "system.h"
#include "../kernel/system.h"
#define KEYBOARD_BUFFER_SIZE 256

2
src/kernel/serial.c → src/drivers/serial.c
View File

@@ -1,4 +1,4 @@
#include "io.h"
#include "../kernel/io.h"
#include "serial.h"
int init_serial()

0
src/kernel/serial.h → src/drivers/serial.h
View File

2
src/kernel/timer.c → src/drivers/timer.c
View File

@@ -1,4 +1,4 @@
#include "system.h"
#include "../kernel/system.h"
#include "../libc/stdio.h"
volatile unsigned long global_ticks = 0;

4
src/kernel/kmain.c
View File

@@ -1,5 +1,5 @@
#include "../libc/stdio.h"
#include "serial.h"
#include "../drivers/serial.h"
#include "gdt.h"
#include "idt.h"
#include "system.h"
@@ -33,7 +33,7 @@ int kmain(int retvalue)
clear();
colorputs(ascii_title, 10);
colorputs(" by @xamidev - star the repo for a cookie!\n\n", 11);
colorputs(" by @xamidev - star the repo for a cookie!\n\n", 14);
// TODO: Grub modules to load programs