diff options
Diffstat (limited to 'Kernel')
| -rw-r--r-- | Kernel/FirmwareKit/EFI/EFI.hxx | 1 | ||||
| -rw-r--r-- | Kernel/FirmwareKit/Handover.hxx | 2 | ||||
| -rw-r--r-- | Kernel/KernelRsrc.rsrc | 6 | ||||
| -rw-r--r-- | Kernel/NewKit/Macros.hpp | 16 |
4 files changed, 21 insertions, 4 deletions
diff --git a/Kernel/FirmwareKit/EFI/EFI.hxx b/Kernel/FirmwareKit/EFI/EFI.hxx index 922044d4..5f0f2ea2 100644 --- a/Kernel/FirmwareKit/EFI/EFI.hxx +++ b/Kernel/FirmwareKit/EFI/EFI.hxx @@ -594,6 +594,7 @@ typedef struct EfiSystemTable #define kEfiOk 0 #define kEfiFail -1 +#define kBufferTooSmall 5 #define EFI_EXTERN_C extern "C" diff --git a/Kernel/FirmwareKit/Handover.hxx b/Kernel/FirmwareKit/Handover.hxx index 02e5fb21..0d03b075 100644 --- a/Kernel/FirmwareKit/Handover.hxx +++ b/Kernel/FirmwareKit/Handover.hxx @@ -100,7 +100,7 @@ it tells us more about it and IS format independent. }; /// @brief Bootloader main type. - typedef void (*BootMainKind)(Kernel::HEL::HandoverInformationHeader* handoverInfo); + typedef void (*BootMainKind)(HandoverInformationHeader* handoverInfo); /// @brief Alias of bootloader main type. typedef void (*HandoverProc)(HandoverInformationHeader* handoverInfo); diff --git a/Kernel/KernelRsrc.rsrc b/Kernel/KernelRsrc.rsrc index c16b4ba0..a28cc11b 100644 --- a/Kernel/KernelRsrc.rsrc +++ b/Kernel/KernelRsrc.rsrc @@ -1,4 +1,4 @@ -1 ICON "../Icons/kernel-logo.ico" +1 ICON "../Icons/app-logo.ico" #include "CompilerKit/Version.hxx" @@ -13,10 +13,10 @@ BEGIN VALUE "CompanyName", "Zeta Electronics Corporation" VALUE "FileDescription", "NewOS Kernel." VALUE "FileVersion", KERNEL_VERSION - VALUE "InternalName", "HCore" + VALUE "InternalName", "newoskrnl" VALUE "LegalCopyright", "Zeta Electronics Corporation" VALUE "OriginalFilename", "newoskrnl.exe" - VALUE "ProductName", "NewOSKrnl" + VALUE "ProductName", "newoskrnl" VALUE "ProductVersion", KERNEL_VERSION END END diff --git a/Kernel/NewKit/Macros.hpp b/Kernel/NewKit/Macros.hpp index 1f121a37..b15cda51 100644 --- a/Kernel/NewKit/Macros.hpp +++ b/Kernel/NewKit/Macros.hpp @@ -10,18 +10,34 @@ #define KIB(X) ((X) / 1024) #endif +#ifndef kib_cast +#define kib_cast(X) ((X) * 1024) +#endif + #ifndef MIB #define MIB(X) ((UInt64)KIB(X) / 1024) #endif +#ifndef mib_cast +#define mib_cast(X) ((UInt64)kib_cast(X) * 1024) +#endif + #ifndef GIB #define GIB(X) ((UInt64)MIB(X) / 1024) #endif +#ifndef gib_cast +#define gib_cast(X) ((UInt64)mib_cast(X) * 1024) +#endif + #ifndef TIB #define TIB(X) ((UInt64)GIB(X) / 1024) #endif +#ifndef tib_cast +#define tib_cast(X) ((UInt64)gib_cast(X) * 1024) +#endif + #ifndef ARRAY_SIZE #define ARRAY_SIZE(a) \ (((sizeof(a) / sizeof(*(a))) / \ |