diff options
Diffstat (limited to 'dev/Boot')
| -rw-r--r-- | dev/Boot/BootKit/BootKit.h | 2 | ||||
| -rw-r--r-- | dev/Boot/Mod/NetBoot/NetBoot.h | 6 | ||||
| -rw-r--r-- | dev/Boot/src/BootThread.cc | 2 | ||||
| -rw-r--r-- | dev/Boot/src/HEL/ARM64/EFIBootStartup.cc | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/dev/Boot/BootKit/BootKit.h b/dev/Boot/BootKit/BootKit.h index 2d39265a..0460ed00 100644 --- a/dev/Boot/BootKit/BootKit.h +++ b/dev/Boot/BootKit/BootKit.h @@ -377,7 +377,7 @@ namespace Boot epm_boot.FsVersion = kNeFSVersionInteger; epm_boot.LbaStart = kNeFSRootCatalogStartAddress; - epm_boot.LbaEnd = fDiskDev.GetDiskSize(); + epm_boot.LbaEnd = fDiskDev.GetDiskSize(); epm_boot.SectorSz = part.SectorSize; epm_boot.Kind = kEPMZkaOS; epm_boot.NumBlocks = part.CatalogCount; diff --git a/dev/Boot/Mod/NetBoot/NetBoot.h b/dev/Boot/Mod/NetBoot/NetBoot.h index 00f15aad..284ea5d5 100644 --- a/dev/Boot/Mod/NetBoot/NetBoot.h +++ b/dev/Boot/Mod/NetBoot/NetBoot.h @@ -11,7 +11,7 @@ #include <NewKit/Defines.h> -#define kNetBootINetMagic "NETB" +#define kNetBootINetMagic "NETB" #define kNetBootINetMagicLength 4 /// @brief the internet header is used to download updates OTA. @@ -26,6 +26,6 @@ typedef struct NetBootInternetHeader Kernel::Int32 PatchLength; /// the patch length. Kernel::Char PatchTarget[255]; /// the target file. Kernel::Boolean ImpliesROM; /// does it imply an EEPROM reprogram? - Kernel::Boolean Preflight; /// is it a preflight packet. - Kernel::Char Data[]; /// non preflight packet has a patch blob for a **PatchTarget** + Kernel::Boolean Preflight; /// is it a preflight packet. + Kernel::Char Data[]; /// non preflight packet has a patch blob for a **PatchTarget** } NetBootInternetHeader; diff --git a/dev/Boot/src/BootThread.cc b/dev/Boot/src/BootThread.cc index cf58e26e..cd3f0bac 100644 --- a/dev/Boot/src/BootThread.cc +++ b/dev/Boot/src/BootThread.cc @@ -191,7 +191,7 @@ namespace Boot { if (fStack) delete[] fStack; - + fStack = nullptr; return reinterpret_cast<HEL::HandoverProc>(fStartAddress)(fHandover); diff --git a/dev/Boot/src/HEL/ARM64/EFIBootStartup.cc b/dev/Boot/src/HEL/ARM64/EFIBootStartup.cc index 179e582b..5c02f7f8 100644 --- a/dev/Boot/src/HEL/ARM64/EFIBootStartup.cc +++ b/dev/Boot/src/HEL/ARM64/EFIBootStartup.cc @@ -203,16 +203,16 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr image_handle, // ------------------------------------------ // // If we succeed in reading the blob, then execute it. // ------------------------------------------ // - + if (reader_kernel.Blob()) { auto kernel_thread = Boot::BootThread(reader_kernel.Blob()); kernel_thread.SetName("BootZ: MicroKernel."); handover_hdr->f_KernelImage = reader_kernel.Blob(); - + EFI::ExitBootServices(map_key, image_handle); - + kernel_thread.Start(handover_hdr, YES); } |