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

Correctly set sys_boot_src in zealbooter based on media type.

Browse source
This commit is contained in:
TomAwezome 2022-08-27 16:44:01 -04:00
parent 94eea62a5c
commit 017025fae2
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
zealbooter/zealbooter.c
View file

@ -139,6 +139,8 @@ struct CKernel {
} __attribute__((packed)); } __attribute__((packed));
#define BOOT_SRC_RAM 2 #define BOOT_SRC_RAM 2
#define BOOT_SRC_HDD 3
#define BOOT_SRC_DVD 4
#define RLF_16BIT 0b01 #define RLF_16BIT 0b01
#define RLF_VESA 0b10 #define RLF_VESA 0b10
@ -222,7 +224,12 @@ void _start(void) {
CORE0_32BIT_INIT -= (uintptr_t)kernel->address; CORE0_32BIT_INIT -= (uintptr_t)kernel->address;
CORE0_32BIT_INIT += final_address; CORE0_32BIT_INIT += final_address;
CKernel->boot_src = BOOT_SRC_RAM; if (kernel->media_type == LIMINE_MEDIA_TYPE_OPTICAL)
CKernel->boot_src = BOOT_SRC_DVD;
else if (kernel->media_type == LIMINE_MEDIA_TYPE_GENERIC)
CKernel->boot_src = BOOT_SRC_HDD;
else
CKernel->boot_src = BOOT_SRC_RAM;
CKernel->boot_blk = 0; CKernel->boot_blk = 0;
CKernel->boot_patch_table_base = (uintptr_t)CKernel + CKernel->h.patch_table_offset; CKernel->boot_patch_table_base = (uintptr_t)CKernel + CKernel->h.patch_table_offset;
CKernel->boot_patch_table_base -= (uintptr_t)kernel->address; CKernel->boot_patch_table_base -= (uintptr_t)kernel->address;