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

Rename 'our_type' to 'zeal_mem_type' in zealbooter.c

Browse source
This commit is contained in:
TomAwezome 2022-11-03 16:42:47 -04:00
parent e7e095ca89
commit 902364227f
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
zealbooter/zealbooter.c
View file

@ -271,38 +271,38 @@ void _start(void) {
size_t mem_count = memmap_request.response->entry_count; // MEM_E820_ENTRIES_NUM now == 256, which is also Limine's memmap entry count max size_t mem_count = memmap_request.response->entry_count; // MEM_E820_ENTRIES_NUM now == 256, which is also Limine's memmap entry count max
for (size_t i = 0; i < mem_count; i++) { for (size_t i = 0; i < mem_count; i++) {
struct limine_memmap_entry *entry = memmap_request.response->entries[i]; struct limine_memmap_entry *entry = memmap_request.response->entries[i];
int our_type; int zeal_mem_type;
printf(" "); printf(" ");
switch (entry->type) { switch (entry->type) {
case LIMINE_MEMMAP_BOOTLOADER_RECLAIMABLE: case LIMINE_MEMMAP_BOOTLOADER_RECLAIMABLE:
case LIMINE_MEMMAP_KERNEL_AND_MODULES: case LIMINE_MEMMAP_KERNEL_AND_MODULES:
case LIMINE_MEMMAP_USABLE: case LIMINE_MEMMAP_USABLE:
our_type = MEM_E820T_USABLE; zeal_mem_type = MEM_E820T_USABLE;
printf(" USABLE: "); printf(" USABLE: ");
break; break;
case LIMINE_MEMMAP_ACPI_RECLAIMABLE: case LIMINE_MEMMAP_ACPI_RECLAIMABLE:
our_type = MEM_E820T_ACPI; zeal_mem_type = MEM_E820T_ACPI;
printf(" ACPI: "); printf(" ACPI: ");
break; break;
case LIMINE_MEMMAP_ACPI_NVS: case LIMINE_MEMMAP_ACPI_NVS:
our_type = MEM_E820T_ACPI_NVS; zeal_mem_type = MEM_E820T_ACPI_NVS;
printf(" NVS: "); printf(" NVS: ");
break; break;
case LIMINE_MEMMAP_BAD_MEMORY: case LIMINE_MEMMAP_BAD_MEMORY:
our_type = MEM_E820T_BAD_MEM; zeal_mem_type = MEM_E820T_BAD_MEM;
printf(" BAD: "); printf(" BAD: ");
break; break;
case LIMINE_MEMMAP_RESERVED: case LIMINE_MEMMAP_RESERVED:
default: default:
our_type = MEM_E820T_RESERVED; zeal_mem_type = MEM_E820T_RESERVED;
printf("RESERVED: "); printf("RESERVED: ");
break; break;
} }
kernel->mem_E820[i].base = (void *)entry->base; kernel->mem_E820[i].base = (void *)entry->base;
kernel->mem_E820[i].len = entry->length; kernel->mem_E820[i].len = entry->length;
kernel->mem_E820[i].type = our_type; kernel->mem_E820[i].type = zeal_mem_type;
if (kernel->mem_physical_space < entry->base + entry->length) { if (kernel->mem_physical_space < entry->base + entry->length) {
kernel->mem_physical_space = entry->base + entry->length; kernel->mem_physical_space = entry->base + entry->length;