diff --git a/Kernel/Assertions.h b/Kernel/Assertions.h index e40b26deb6..df8331de6f 100644 --- a/Kernel/Assertions.h +++ b/Kernel/Assertions.h @@ -1,7 +1,7 @@ #pragma once -#include "kprintf.h" -#include "i386.h" +#include +#include [[noreturn]] void __assertion_failed(const char* msg, const char* file, unsigned line, const char* func); diff --git a/Kernel/Console.cpp b/Kernel/Console.cpp index 74e6c19c88..267926280e 100644 --- a/Kernel/Console.cpp +++ b/Kernel/Console.cpp @@ -1,6 +1,6 @@ -#include "Console.h" -#include "IO.h" -#include "kprintf.h" +#include +#include +#include // Bytes output to 0xE9 end up on the Bochs console. It's very handy. #define CONSOLE_OUT_TO_E9 diff --git a/Kernel/i386.h b/Kernel/i386.h index abbecd961e..379fac0d71 100644 --- a/Kernel/i386.h +++ b/Kernel/i386.h @@ -1,6 +1,6 @@ #pragma once -#include "kprintf.h" +#include #include #define PAGE_SIZE 4096 diff --git a/Kernel/kprintf.cpp b/Kernel/kprintf.cpp index cdcc67c7b4..fd9037a9ac 100644 --- a/Kernel/kprintf.cpp +++ b/Kernel/kprintf.cpp @@ -1,8 +1,8 @@ -#include "kprintf.h" -#include "Console.h" -#include "IO.h" +#include +#include +#include #include -#include "Process.h" +#include #include #include diff --git a/Kernel/kprintf.h b/Kernel/kprintf.h deleted file mode 100644 index 29c2d15bd4..0000000000 --- a/Kernel/kprintf.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -extern "C" { -int dbgprintf(const char *fmt, ...); -int kprintf(const char *fmt, ...); -int ksprintf(char* buf, const char *fmt, ...); -} diff --git a/Kernel/kstdio.h b/Kernel/kstdio.h index b69a2746d9..d44d215f64 100644 --- a/Kernel/kstdio.h +++ b/Kernel/kstdio.h @@ -1,6 +1,10 @@ #pragma once -#include "kprintf.h" +extern "C" { +int dbgprintf(const char *fmt, ...); +int kprintf(const char *fmt, ...); +int ksprintf(char* buf, const char *fmt, ...); +} #ifndef USERLAND #define printf dbgprintf diff --git a/Kernel/ktime.h b/Kernel/ktime.h deleted file mode 100644 index d45ab2e48d..0000000000 --- a/Kernel/ktime.h +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once - -struct tm { - int tm_sec; /* Seconds (0-60) */ - int tm_min; /* Minutes (0-59) */ - int tm_hour; /* Hours (0-23) */ - int tm_mday; /* Day of the month (1-31) */ - int tm_mon; /* Month (0-11) */ - int tm_year; /* Year - 1900 */ - int tm_wday; /* Day of the week (0-6, Sunday = 0) */ - int tm_yday; /* Day in the year (0-365, 1 Jan = 0) */ - int tm_isdst; /* Daylight saving time */ -}; - -inline time_t ktime(time_t* tloc) -{ - if (tloc) - *tloc = 123; - return 123; -} - -inline tm* klocaltime(time_t*) -{ - static tm timmy; - return &timmy; -}