diff options
| author | Amlal El Mahrouss <amlal@nekernel.org> | 2025-04-18 00:19:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-18 00:19:48 +0200 |
| commit | ee1edba85ea13627871e1ed005931bd502b86ab8 (patch) | |
| tree | 8570cd210aaf11d8cd36aebf3b682e420a497bff /dev/kernel/FirmwareKit | |
| parent | 6b7403efd291f80a06267817afee4c0a4c8da56c (diff) | |
| parent | 7bfa36c2215e13097bb5ddcb15d2a8a476102b55 (diff) | |
Merge pull request #23 from amlel-el-mahrouss/dev
dev, kernel: important patches.
Diffstat (limited to 'dev/kernel/FirmwareKit')
| -rw-r--r-- | dev/kernel/FirmwareKit/GPT.h | 4 | ||||
| -rw-r--r-- | dev/kernel/FirmwareKit/Handover.h | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/dev/kernel/FirmwareKit/GPT.h b/dev/kernel/FirmwareKit/GPT.h index 9a6cffc6..0515af8a 100644 --- a/dev/kernel/FirmwareKit/GPT.h +++ b/dev/kernel/FirmwareKit/GPT.h @@ -9,7 +9,7 @@ #include <NewKit/Defines.h> #include <FirmwareKit/EFI/EFI.h> -#define kSectorAlignGPT_Part (420U) +#define kSectorAlignGPT_PartTbl (420U) #define kSectorAlignGPT_PartEntry (72U) #define kPartNameGPT (8U) @@ -44,7 +44,7 @@ namespace Kernel UInt32 NumPartitionEntries; UInt32 SizeOfEntries; UInt32 CRC32PartEntry; - UInt8 Reserved2[kSectorAlignGPT_Part]; + UInt8 Reserved2[kSectorAlignGPT_PartTbl]; }; struct PACKED GPT_PARTITION_ENTRY diff --git a/dev/kernel/FirmwareKit/Handover.h b/dev/kernel/FirmwareKit/Handover.h index dd529a9e..4ff04e6d 100644 --- a/dev/kernel/FirmwareKit/Handover.h +++ b/dev/kernel/FirmwareKit/Handover.h @@ -71,11 +71,6 @@ namespace Kernel::HEL WideChar f_FirmwareVendorName[32]; SizeT f_FirmwareVendorLen; -#ifdef __NE_AMD64__ - UInt32 f_EFIImageKey; - EfiHandlePtr f_EFIImage; -#endif - VoidPtr f_FirmwareCustomTables[2]; // On EFI 0: BS 1: ST struct @@ -84,6 +79,8 @@ namespace Kernel::HEL VoidPtr f_VendorPtr; VoidPtr f_MpPtr; Bool f_MultiProcessingEnabled; + UInt32 f_ImageKey; + EfiHandlePtr f_ImageHandle; } f_HardwareTables; struct |