diff options
| author | Amlal El Mahrouss <amlal.elmahrouss@icloud.com> | 2025-01-31 19:05:36 +0100 |
|---|---|---|
| committer | Amlal El Mahrouss <amlal.elmahrouss@icloud.com> | 2025-01-31 19:05:36 +0100 |
| commit | d0c7a3e05a1bb5c9cffd1a0946e403d3a8e37e63 (patch) | |
| tree | 686f7f3c99a08a7bebfc925839f0f9d882177c54 /dev/Boot/src/HEL | |
| parent | 9c1e80e1bb3a8d549a9053f0d7bf4afb0c806f80 (diff) | |
Match the changes in OpenNE, (without reusing it)
Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Diffstat (limited to 'dev/Boot/src/HEL')
| -rw-r--r-- | dev/Boot/src/HEL/AMD64/EFIBootStartup.cc | 8 | ||||
| -rw-r--r-- | dev/Boot/src/HEL/ARM64/CoreBootStartup.S | 4 | ||||
| -rw-r--r-- | dev/Boot/src/HEL/ARM64/EFIBootStartup.cc | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/dev/Boot/src/HEL/AMD64/EFIBootStartup.cc b/dev/Boot/src/HEL/AMD64/EFIBootStartup.cc index 3243e482..f8aa38d9 100644 --- a/dev/Boot/src/HEL/AMD64/EFIBootStartup.cc +++ b/dev/Boot/src/HEL/AMD64/EFIBootStartup.cc @@ -145,7 +145,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr image_handle, FB::fb_clear_video(); - FBDrawBitMapInRegion(zka_disk, ZKA_DISK_WIDTH, ZKA_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - ZKA_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - ZKA_DISK_HEIGHT) / 2); + FBDrawBitMapInRegion(zka_disk, NE_DISK_WIDTH, NE_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - NE_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - NE_DISK_HEIGHT) / 2); fb_clear(); @@ -186,7 +186,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr image_handle, for (; struct_ptr[lookup_index].Kind != EfiMemoryType::EfiConventionalMemory; ++lookup_index) { - ZKA_UNUSED(0); + NE_UNUSED(0); } kDefaultMemoryMap = lookup_index; @@ -247,7 +247,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr image_handle, FB::fb_clear_video(); - FBDrawBitMapInRegion(zka_has_disk, ZKA_HAS_DISK_WIDTH, ZKA_HAS_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - ZKA_HAS_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - ZKA_HAS_DISK_HEIGHT) / 2); + FBDrawBitMapInRegion(zka_has_disk, NE_HAS_DISK_WIDTH, NE_HAS_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - NE_HAS_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - NE_HAS_DISK_HEIGHT) / 2); fb_clear(); } @@ -306,7 +306,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr image_handle, else { fb_init(); - FBDrawBitMapInRegion(zka_no_disk, ZKA_NO_DISK_WIDTH, ZKA_NO_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - ZKA_NO_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - ZKA_NO_DISK_HEIGHT) / 2); + FBDrawBitMapInRegion(zka_no_disk, NE_NO_DISK_WIDTH, NE_NO_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - NE_NO_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - NE_NO_DISK_HEIGHT) / 2); EFI::Stop(); } diff --git a/dev/Boot/src/HEL/ARM64/CoreBootStartup.S b/dev/Boot/src/HEL/ARM64/CoreBootStartup.S index 71777528..f7e9d9bc 100644 --- a/dev/Boot/src/HEL/ARM64/CoreBootStartup.S +++ b/dev/Boot/src/HEL/ARM64/CoreBootStartup.S @@ -4,7 +4,7 @@ ------------------------------------------- */ -#ifdef __ZKA_COREBOOT__ +#ifdef __NE_COREBOOT__ .section .boot_hdr .align 4 @@ -37,4 +37,4 @@ bootloader_start: bl bootloader_main ret -#endif // __ZKA_COREBOOT__
\ No newline at end of file +#endif // __NE_COREBOOT__
\ No newline at end of file diff --git a/dev/Boot/src/HEL/ARM64/EFIBootStartup.cc b/dev/Boot/src/HEL/ARM64/EFIBootStartup.cc index 0e53c99d..adc5cf40 100644 --- a/dev/Boot/src/HEL/ARM64/EFIBootStartup.cc +++ b/dev/Boot/src/HEL/ARM64/EFIBootStartup.cc @@ -142,7 +142,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr image_handle, FB::fb_clear_video(); - FBDrawBitMapInRegion(zka_disk, ZKA_DISK_WIDTH, ZKA_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - ZKA_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - ZKA_DISK_HEIGHT) / 2); + FBDrawBitMapInRegion(zka_disk, NE_DISK_WIDTH, NE_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - NE_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - NE_DISK_HEIGHT) / 2); fb_clear(); |