diff --git a/makefile b/makefile index c6eb216..0e216e4 100644 --- a/makefile +++ b/makefile @@ -7,14 +7,14 @@ ASFLAGS = -f elf SRC_DIR = src KERNEL_DIR = $(SRC_DIR)/kernel LIBC_DIR = $(SRC_DIR)/libc -PROGRAMS_DIR = $(SRC_DIR)/programs +UTILS_DIR = $(SRC_DIR)/utils DRIVERS_DIR = $(SRC_DIR)/drivers INCLUDE_DIR = include FONTS_DIR = $(INCLUDE_DIR)/fonts OBJ_DIR = build -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) +C_SOURCES = $(wildcard $(KERNEL_DIR)/*.c) $(wildcard $(LIBC_DIR)/*.c) $(wildcard $(UTILS_DIR)/*.c) $(wildcard $(DRIVERS_DIR)/*.c) +ASM_SOURCES = $(wildcard $(KERNEL_DIR)/*.s) $(wildcard $(LIBC_DIR)/*.s) $(wildcard $(UTILS_DIR)/*.s) $(wildcard $(DRIVERS_DIR)/*.s) OBJECTS = $(patsubst $(SRC_DIR)/%, $(OBJ_DIR)/%, $(C_SOURCES:.c=.o) $(ASM_SOURCES:.s=.o)) @@ -28,7 +28,7 @@ all: $(OBJ_DIR) kernel.elf $(OBJ_DIR): mkdir -p $(OBJ_DIR) - mkdir -p $(OBJ_DIR)/kernel $(OBJ_DIR)/libc $(OBJ_DIR)/programs $(OBJ_DIR)/drivers $(OBJ_DIR)/fonts + mkdir -p $(OBJ_DIR)/kernel $(OBJ_DIR)/libc $(OBJ_DIR)/utils $(OBJ_DIR)/drivers $(OBJ_DIR)/fonts kernel.elf: $(OBJECTS) $(FONT_OBJ) ld $(LDFLAGS) $(OBJECTS) $(FONT_OBJ) -o kernel.elf diff --git a/src/kernel/kmain.c b/src/kernel/kmain.c index 26b0367..b506a74 100644 --- a/src/kernel/kmain.c +++ b/src/kernel/kmain.c @@ -15,7 +15,7 @@ #include "multiboot2.h" #include "kheap.h" #include "initrd.h" -#include "../programs/programs.h" +#include "../utils/utils.h" #include "../libc/crypto.h" void kmain(multiboot2_info *mb_info) diff --git a/src/kernel/shell.c b/src/kernel/shell.c index 10ec05e..c1e75be 100644 --- a/src/kernel/shell.c +++ b/src/kernel/shell.c @@ -6,7 +6,7 @@ #include "system.h" #include "../libc/stdio.h" #include "../libc/string.h" -#include "../programs/programs.h" +#include "../utils/utils.h" #include "../libc/crypto.h" #include #include "../drivers/rtc.h" diff --git a/src/programs/bf.c b/src/utils/bf.c similarity index 100% rename from src/programs/bf.c rename to src/utils/bf.c diff --git a/src/programs/bmp.c b/src/utils/bmp.c similarity index 100% rename from src/programs/bmp.c rename to src/utils/bmp.c diff --git a/src/programs/ciphers.c b/src/utils/ciphers.c similarity index 100% rename from src/programs/ciphers.c rename to src/utils/ciphers.c diff --git a/src/programs/ciphers.h b/src/utils/ciphers.h similarity index 100% rename from src/programs/ciphers.h rename to src/utils/ciphers.h diff --git a/src/programs/conway.c b/src/utils/conway.c similarity index 100% rename from src/programs/conway.c rename to src/utils/conway.c diff --git a/src/programs/conway.h b/src/utils/conway.h similarity index 100% rename from src/programs/conway.h rename to src/utils/conway.h diff --git a/src/programs/cowsay.c b/src/utils/cowsay.c similarity index 100% rename from src/programs/cowsay.c rename to src/utils/cowsay.c diff --git a/src/programs/fs.c b/src/utils/fs.c similarity index 100% rename from src/programs/fs.c rename to src/utils/fs.c diff --git a/src/programs/math.c b/src/utils/math.c similarity index 100% rename from src/programs/math.c rename to src/utils/math.c diff --git a/src/programs/misc.c b/src/utils/misc.c similarity index 100% rename from src/programs/misc.c rename to src/utils/misc.c diff --git a/src/programs/navalbattle.c b/src/utils/navalbattle.c similarity index 100% rename from src/programs/navalbattle.c rename to src/utils/navalbattle.c diff --git a/src/programs/navalbattle.h b/src/utils/navalbattle.h similarity index 100% rename from src/programs/navalbattle.h rename to src/utils/navalbattle.h diff --git a/src/programs/pi.c b/src/utils/pi.c similarity index 100% rename from src/programs/pi.c rename to src/utils/pi.c diff --git a/src/programs/primes.c b/src/utils/primes.c similarity index 100% rename from src/programs/primes.c rename to src/utils/primes.c diff --git a/src/programs/snake.c b/src/utils/snake.c similarity index 100% rename from src/programs/snake.c rename to src/utils/snake.c diff --git a/src/programs/sysinfo.c b/src/utils/sysinfo.c similarity index 100% rename from src/programs/sysinfo.c rename to src/utils/sysinfo.c diff --git a/src/programs/programs.h b/src/utils/utils.h similarity index 96% rename from src/programs/programs.h rename to src/utils/utils.h index 097900f..80e6e51 100644 --- a/src/programs/programs.h +++ b/src/utils/utils.h @@ -3,8 +3,8 @@ // Licensed under the Unlicense. See the repo below. // https://github.com/xamidev/blankos -#ifndef PROGRAMS_H -#define PROGRAMS_H +#ifndef UTILS_H +#define UTILS_H void program_words(); void program_primes(); diff --git a/src/programs/words.c b/src/utils/words.c similarity index 100% rename from src/programs/words.c rename to src/utils/words.c