tristan/ZealOS
1
0
Fork 0
mirror of https://github.com/Zeal-Operating-System/ZealOS.git synced 2024-12-25 23:10:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor ZealBooter disk UUID code.

Browse source
This commit is contained in:
TomAwezome 2022-10-12 20:50:31 -04:00
parent 5169661ef5
commit 637758a13b
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
zealbooter/zealbooter.c
View file

@ -110,10 +110,7 @@ struct CKernel {
uint64_t sys_framebuffer_pitch; uint64_t sys_framebuffer_pitch;
uint8_t sys_framebuffer_bpp; uint8_t sys_framebuffer_bpp;
uint64_t sys_smbios_entry; uint64_t sys_smbios_entry;
uint32_t sys_disk_uuid_a; uint64_t sys_disk_uuid[2];
uint16_t sys_disk_uuid_b;
uint16_t sys_disk_uuid_c;
uint8_t sys_disk_uuid_d[8];
uint32_t sys_boot_stack; uint32_t sys_boot_stack;
uint8_t sys_is_uefi_booted; uint8_t sys_is_uefi_booted;
} __attribute__((packed)); } __attribute__((packed));
@ -312,10 +309,7 @@ void _start(void) {
kernel->sys_smbios_entry = (uintptr_t)sys_smbios_entry - hhdm_request.response->offset; kernel->sys_smbios_entry = (uintptr_t)sys_smbios_entry - hhdm_request.response->offset;
} }
kernel->sys_disk_uuid_a = module_kernel->gpt_disk_uuid.a; memcpy(kernel->sys_disk_uuid, &module_kernel->gpt_disk_uuid, sizeof(kernel->sys_disk_uuid));
kernel->sys_disk_uuid_b = module_kernel->gpt_disk_uuid.b;
kernel->sys_disk_uuid_c = module_kernel->gpt_disk_uuid.c;
memcpy(kernel->sys_disk_uuid_d, module_kernel->gpt_disk_uuid.d, 8);
void *const trampoline_phys = (void *)final_address + module_kernel->size; void *const trampoline_phys = (void *)final_address + module_kernel->size;