diff options
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/initrd.c | 2 | ||||
| -rw-r--r-- | boot/limine/memorymap.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/boot/initrd.c b/boot/initrd.c index 84636c3..e998c08 100644 --- a/boot/initrd.c +++ b/boot/initrd.c @@ -48,7 +48,7 @@ initrd_seek(jove_owned_obj_t *objdir, const char *path) if(obj_gettype(objdir) != JOVE_OBJ_OBJDIR) { reterr(EBADOBJ); } - for(size_t i = 0; i < JOVE_OBJDIR_ENTRIES; i++) { + for(size_t i = 0; i < OBJDIR_ENTRIES; i++) { jove_owned_obj_t *file_obj = objdir_getlocal(objdir, i); if(obj_gettype(file_obj) != JOVE_OBJ_INITRD_FILE) { goto loop_continue; diff --git a/boot/limine/memorymap.c b/boot/limine/memorymap.c index 48f3f33..c558e75 100644 --- a/boot/limine/memorymap.c +++ b/boot/limine/memorymap.c @@ -53,12 +53,12 @@ mem_setup_regions(void) entry->type == LIMINE_MEMMAP_ACPI_RECLAIMABLE || entry->type == LIMINE_MEMMAP_BOOTLOADER_RECLAIMABLE) { - if(region_i > JOVE_OBJDIR_ENTRIES){ + if(region_i > OBJDIR_ENTRIES){ kprintf("%s: Provided memory map exceeds kernel limits. Some memory may not be accessable.", __func__); break; } - klogf("%p : %p %s\n", entry->base, entry->length, limine_mmap_entry_type_str[entry->type]); + klogf("Free %p : %p %s\n", entry->base, entry->length, limine_mmap_entry_type_str[entry->type]); if(entry->base == 0) continue; { @@ -73,14 +73,14 @@ mem_setup_regions(void) { intmax_t hw_pages = entry->length >> 12; uintptr_t base = entry->base; + klogf("HWmem %p : %p %s\n", entry->base, entry->length, limine_mmap_entry_type_str[entry->type]); while(hw_pages > 0) { - if(hwmem_i >= JOVE_OBJDIR_ENTRIES) { + if(hwmem_i >= OBJDIR_ENTRIES) { kprintf("%s: Reserved memory region exceeds indexing limits!\n", __func__); break; } size_t pages = hw_pages > 4095 ? 4095 : hw_pages; - //klogf("%p : %p RESERVED\n", base, ((pages + 1) << 12)); jove_owned_obj_t *hwmem_obj = obj_take(&s_hwmemory_objdir.entries[hwmem_i++]); obj_settype(hwmem_obj, JOVE_OBJ_SHMEMORY); |