From 62d631f1b4c768873ca730c81f17a80aa3592730 Mon Sep 17 00:00:00 2001 From: apio Date: Sat, 15 Oct 2022 12:56:48 +0200 Subject: [PATCH] Kernel: Rename assert.h to kassert.h so IDEs pickup the kernel header instead of the userspace one --- kernel/include/{assert.h => kassert.h} | 0 kernel/src/gdt/GDT.cpp | 2 +- kernel/src/init/Init.cpp | 2 +- kernel/src/interrupts/Entry.cpp | 2 +- kernel/src/interrupts/IDT.cpp | 2 +- kernel/src/main.cpp | 2 +- kernel/src/memory/MemoryManager.cpp | 2 +- kernel/src/memory/PMM.cpp | 2 +- kernel/src/memory/VMM.cpp | 2 +- kernel/src/rand/Mersenne.cpp | 2 +- kernel/src/sys/elf/ELFLoader.cpp | 2 +- kernel/src/sys/exec.cpp | 2 +- kernel/src/thread/Scheduler.cpp | 2 +- 13 files changed, 12 insertions(+), 12 deletions(-) rename kernel/include/{assert.h => kassert.h} (100%) diff --git a/kernel/include/assert.h b/kernel/include/kassert.h similarity index 100% rename from kernel/include/assert.h rename to kernel/include/kassert.h diff --git a/kernel/src/gdt/GDT.cpp b/kernel/src/gdt/GDT.cpp index 5c94154e..d6b5e48c 100644 --- a/kernel/src/gdt/GDT.cpp +++ b/kernel/src/gdt/GDT.cpp @@ -1,7 +1,7 @@ #define MODULE "gdt" #include "gdt/GDT.h" -#include "assert.h" +#include "kassert.h" #include "log/Log.h" #include "memory/MemoryManager.h" #include "std/string.h" diff --git a/kernel/src/init/Init.cpp b/kernel/src/init/Init.cpp index bb33881d..c2653599 100644 --- a/kernel/src/init/Init.cpp +++ b/kernel/src/init/Init.cpp @@ -1,12 +1,12 @@ #define MODULE "init" #include "init/Init.h" -#include "assert.h" #include "bootboot.h" #include "cpu/CPU.h" #include "init/InitRD.h" #include "interrupts/Interrupts.h" #include "io/Serial.h" +#include "kassert.h" #include "log/Log.h" #include "memory/MemoryManager.h" #include "memory/PMM.h" diff --git a/kernel/src/interrupts/Entry.cpp b/kernel/src/interrupts/Entry.cpp index 72ef07f3..f6562ae4 100644 --- a/kernel/src/interrupts/Entry.cpp +++ b/kernel/src/interrupts/Entry.cpp @@ -1,10 +1,10 @@ #define MODULE "isr" -#include "assert.h" #include "interrupts/Context.h" #include "interrupts/IRQ.h" #include "interrupts/Interrupts.h" #include "io/Serial.h" +#include "kassert.h" #include "log/Log.h" #include "misc/hang.h" #include "panic/Panic.h" diff --git a/kernel/src/interrupts/IDT.cpp b/kernel/src/interrupts/IDT.cpp index c22f890c..32753619 100644 --- a/kernel/src/interrupts/IDT.cpp +++ b/kernel/src/interrupts/IDT.cpp @@ -1,7 +1,7 @@ #define MODULE "idt" #include "interrupts/IDT.h" -#include "assert.h" +#include "kassert.h" #include "log/Log.h" struct IDTEntry diff --git a/kernel/src/main.cpp b/kernel/src/main.cpp index 69dbb1b4..f0b36b63 100644 --- a/kernel/src/main.cpp +++ b/kernel/src/main.cpp @@ -1,7 +1,6 @@ #define MODULE "main" #include "acpi/RSDT.h" -#include "assert.h" #include "config.h" #include "cpu/CPU.h" #include "fs/VFS.h" @@ -15,6 +14,7 @@ #include "io/PCI.h" #include "io/PIC.h" #include "io/Serial.h" +#include "kassert.h" #include "log/Log.h" #include "memory/AddressSpace.h" #include "memory/Memory.h" diff --git a/kernel/src/memory/MemoryManager.cpp b/kernel/src/memory/MemoryManager.cpp index b6b4743b..3b5a11f7 100644 --- a/kernel/src/memory/MemoryManager.cpp +++ b/kernel/src/memory/MemoryManager.cpp @@ -3,7 +3,7 @@ #include "log/Log.h" #endif -#include "assert.h" +#include "kassert.h" #include "memory/KernelHeap.h" #include "memory/MemoryManager.h" #include "memory/PMM.h" diff --git a/kernel/src/memory/PMM.cpp b/kernel/src/memory/PMM.cpp index 94f35373..17a2ac32 100644 --- a/kernel/src/memory/PMM.cpp +++ b/kernel/src/memory/PMM.cpp @@ -1,8 +1,8 @@ #define MODULE "mem" #include "memory/PMM.h" -#include "assert.h" #include "bootboot.h" +#include "kassert.h" #include "memory/Memory.h" #include "memory/MemoryManager.h" #include "misc/utils.h" diff --git a/kernel/src/memory/VMM.cpp b/kernel/src/memory/VMM.cpp index 94192275..3932a742 100644 --- a/kernel/src/memory/VMM.cpp +++ b/kernel/src/memory/VMM.cpp @@ -1,7 +1,7 @@ #define MODULE "vmm" #include "memory/VMM.h" -#include "assert.h" +#include "kassert.h" #include "log/Log.h" #include "memory/PMM.h" #include "misc/utils.h" diff --git a/kernel/src/rand/Mersenne.cpp b/kernel/src/rand/Mersenne.cpp index fa3044b7..d02665cf 100644 --- a/kernel/src/rand/Mersenne.cpp +++ b/kernel/src/rand/Mersenne.cpp @@ -1,7 +1,7 @@ #define MODULE "rand" #include "rand/Mersenne.h" -#include "assert.h" +#include "kassert.h" #include typedef uint64_t word_t; diff --git a/kernel/src/sys/elf/ELFLoader.cpp b/kernel/src/sys/elf/ELFLoader.cpp index 647f1586..0dd659ae 100644 --- a/kernel/src/sys/elf/ELFLoader.cpp +++ b/kernel/src/sys/elf/ELFLoader.cpp @@ -1,10 +1,10 @@ #define MODULE "elf" #include "sys/elf/ELFLoader.h" -#include "assert.h" #include "errno.h" #include "fs/VFS.h" #include "init/InitRD.h" +#include "kassert.h" #include "log/Log.h" #include "memory/Memory.h" #include "memory/MemoryManager.h" diff --git a/kernel/src/sys/exec.cpp b/kernel/src/sys/exec.cpp index e38dfbef..b4d2335d 100644 --- a/kernel/src/sys/exec.cpp +++ b/kernel/src/sys/exec.cpp @@ -1,8 +1,8 @@ #define MODULE "exec" -#include "assert.h" #include "errno.h" #include "interrupts/Interrupts.h" +#include "kassert.h" #include "memory/MemoryManager.h" #include "memory/PMM.h" #include "memory/VMM.h" diff --git a/kernel/src/thread/Scheduler.cpp b/kernel/src/thread/Scheduler.cpp index 3f3df15f..3544bb9d 100644 --- a/kernel/src/thread/Scheduler.cpp +++ b/kernel/src/thread/Scheduler.cpp @@ -1,8 +1,8 @@ #define MODULE "sched" #include "thread/Scheduler.h" -#include "assert.h" #include "interrupts/Interrupts.h" +#include "kassert.h" #include "log/Log.h" #include "memory/MemoryManager.h" #include "memory/VMM.h"