diff --git a/lib/mammoth/file/file.cpp b/lib/mammoth/file/file.cpp index 60ac3e4..7d2a9a7 100644 --- a/lib/mammoth/file/file.cpp +++ b/lib/mammoth/file/file.cpp @@ -1,10 +1,10 @@ #include "file/file.h" #include +#include #include #include #include -#include #include "util/debug.h" diff --git a/lib/mammoth/input/keyboard.cpp b/lib/mammoth/input/keyboard.cpp index 4ddc336..77b4858 100644 --- a/lib/mammoth/input/keyboard.cpp +++ b/lib/mammoth/input/keyboard.cpp @@ -1,8 +1,8 @@ #include "input/keyboard.h" +#include #include #include -#include #include "util/debug.h" diff --git a/lib/mammoth/util/init.h b/lib/mammoth/util/init.h index 40d1c4a..8b952fa 100644 --- a/lib/mammoth/util/init.h +++ b/lib/mammoth/util/init.h @@ -1,7 +1,16 @@ #pragma once #include -#include #include +extern uint64_t gSelfProcCap; +extern uint64_t gSelfVmasCap; + +extern uint64_t gInitEndpointCap; + +extern uint64_t gBootDenaliVmmoCap; +extern uint64_t gBootVictoriaFallsVmmoCap; +extern uint64_t gBootPciVmmoCap; +extern uint64_t gBootFramebufferVmmoCap; + z_err_t ParseInitPort(uint64_t init_port_cap); diff --git a/lib/mammoth/util/new.cpp b/lib/mammoth/util/new.cpp index ec63b6f..9e9c2a5 100644 --- a/lib/mammoth/util/new.cpp +++ b/lib/mammoth/util/new.cpp @@ -1,8 +1,8 @@ #include #include +#include #include #include -#include #include "util/debug.h" diff --git a/sys/teton/terminal.cpp b/sys/teton/terminal.cpp index 992d0ad..b436093 100644 --- a/sys/teton/terminal.cpp +++ b/sys/teton/terminal.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include void Terminal::HandleCharacter(char c) { console_.WriteChar(c); diff --git a/sys/yellowstone/hw/gpt.cpp b/sys/yellowstone/hw/gpt.cpp index ae44cbe..b4eddc7 100644 --- a/sys/yellowstone/hw/gpt.cpp +++ b/sys/yellowstone/hw/gpt.cpp @@ -5,7 +5,6 @@ #include #include #include -#include #define GPT_DEBUG 0 diff --git a/zion/include/zglobal.h b/zion/include/zglobal.h deleted file mode 100644 index d5168df..0000000 --- a/zion/include/zglobal.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include - -extern uint64_t gSelfProcCap; -extern uint64_t gSelfVmasCap; - -extern uint64_t gInitEndpointCap; - -extern uint64_t gBootDenaliVmmoCap; -extern uint64_t gBootVictoriaFallsVmmoCap; -extern uint64_t gBootPciVmmoCap; -extern uint64_t gBootFramebufferVmmoCap;