From cc23ea5a4b38807e79aceb23e6f43e965926618f Mon Sep 17 00:00:00 2001 From: Jon Santmyer Date: Fri, 9 Oct 2026 10:24:41 -0400 Subject: add basic scheduler logic. rename init rootdir indexes --- boot/initrd.c | 3 ++- boot/limine/framebuffer.c | 3 ++- boot/limine/memorymap.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'boot') diff --git a/boot/initrd.c b/boot/initrd.c index f9bf47e..84636c3 100644 --- a/boot/initrd.c +++ b/boot/initrd.c @@ -7,6 +7,7 @@ #include "lib/string.h" #include "hal/obj.h" #include "hal/memory.h" +#include "sys/objdir.h" extern uintptr_t _initrd_module; @@ -71,7 +72,7 @@ void initrd_setup(void) { kprintf("Loading initrd from bootloader:\n"); { - jove_owned_obj_t *initrd_objdir_obj = objdir_getlocal(_rootdir_obj, ROOTDIR_INITRD_I); + jove_owned_obj_t *initrd_objdir_obj = objdir_getlocal(_rootdir_obj, INIT_ROOTDIR_INITRD_I); obj_settype(initrd_objdir_obj, JOVE_OBJ_OBJDIR); obj_setvalue(initrd_objdir_obj, (uintmax_t)&s_initrd_objdir); diff --git a/boot/limine/framebuffer.c b/boot/limine/framebuffer.c index 87b124a..a7ee04c 100644 --- a/boot/limine/framebuffer.c +++ b/boot/limine/framebuffer.c @@ -3,6 +3,7 @@ #include "lib/printf.h" #include "limine.h" #include "proc/init.h" +#include "sys/objdir.h" #include "hal/framebuffer.h" extern struct limine_framebuffer_response *_limine_framebuffers; @@ -73,7 +74,7 @@ fb_init() fb->address = fb_virt; { - jove_owned_obj_t *fb_obj = objdir_getlocal(_rootdir_obj, ROOTDIR_FRAMEBUFFER_I); + jove_owned_obj_t *fb_obj = objdir_getlocal(_rootdir_obj, INIT_ROOTDIR_FRAMEBUFFER_I); obj_settype(fb_obj, JOVE_OBJ_FRAMEBUFFER); obj_setvalue(fb_obj, (uintptr_t)fb); obj_release(fb_obj); diff --git a/boot/limine/memorymap.c b/boot/limine/memorymap.c index e470e14..48f3f33 100644 --- a/boot/limine/memorymap.c +++ b/boot/limine/memorymap.c @@ -31,7 +31,7 @@ void mem_setup_regions(void) { { - jove_owned_obj_t *region_objdir_obj = objdir_getlocal(_rootdir_obj, ROOTDIR_FREEMEMORY_I); + jove_owned_obj_t *region_objdir_obj = objdir_getlocal(_rootdir_obj, INIT_ROOTDIR_FREEMEMORY_I); obj_settype(region_objdir_obj, JOVE_OBJ_OBJDIR); obj_setvalue(region_objdir_obj, (uintptr_t)&s_region_objdir); obj_release(region_objdir_obj); -- cgit v1.2.3