diff options
Diffstat (limited to 'dev/kernel')
| -rw-r--r-- | dev/kernel/HALKit/AMD64/HalKernelMain.cc | 4 | ||||
| -rw-r--r-- | dev/kernel/NewKit/Macros.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/dev/kernel/HALKit/AMD64/HalKernelMain.cc b/dev/kernel/HALKit/AMD64/HalKernelMain.cc index 1d2689eb..7f3d4137 100644 --- a/dev/kernel/HALKit/AMD64/HalKernelMain.cc +++ b/dev/kernel/HALKit/AMD64/HalKernelMain.cc @@ -14,7 +14,7 @@ #include <CFKit/Property.h> #include <modules/CoreGfx/TextGfx.h> #include <KernelKit/Timer.h> - +#include <modules/CoreGfx/CoreWindow.h> #include <FirmwareKit/EFI/API.h> #include <FirmwareKit/EFI/EFI.h> @@ -45,8 +45,6 @@ EXTERN_C Int32 hal_init_platform( FB::fb_clear_video(); - (Void)(Kernel::kout << "Welcome to NeKernel.\r"); - fw_init_efi((EfiSystemTable*)handover_hdr->f_FirmwareCustomTables[1]); Boot::ExitBootServices(handover_hdr->f_HardwareTables.f_ImageKey, handover_hdr->f_HardwareTables.f_ImageHandle); diff --git a/dev/kernel/NewKit/Macros.h b/dev/kernel/NewKit/Macros.h index eda454f9..83dbc7b5 100644 --- a/dev/kernel/NewKit/Macros.h +++ b/dev/kernel/NewKit/Macros.h @@ -122,7 +122,7 @@ #define NE_UNUSED(X) ((Kernel::Void)X) #ifndef RGB -#define RGB(R, G, B) (Kernel::UInt32)(R | G << 0x8 | B << 0x10) +#define RGB(R, G, B) ((Kernel::UInt32)((0xFF << 24) | ((R) << 16) | ((G) << 8) | (B))) #endif // !RGB #ifdef __NE_AMD64__ |