oops

boot/limine/entry.c

@@ -1,4 +1,5 @@
 #include <zinnia/alloc.h>
+#include <zinnia/assert.h>
 #include <zinnia/cmdline.h>
 #include <zinnia/init.h>
 #include <zinnia/print.h>
@@ -41,10 +42,15 @@ void kernel_entry() {
 
     struct boot_info info = {};
 
-    struct limine_memmap_response* mm_res = memmap_request.response;
-    struct limine_module_response* module_res = module_request.response;
-    struct limine_executable_address_response* exec_res = executable_address_request.response;
-    struct limine_executable_file_response* exec_file_res = executable_file_request.response;
+    const struct limine_memmap_response* mm_res = memmap_request.response;
+    const struct limine_hhdm_response* hhdm_res = hhdm_request.response;
+    const struct limine_module_response* module_res = module_request.response;
+    const struct limine_executable_address_response* exec_res = executable_address_request.response;
+    const struct limine_executable_file_response* exec_file_res = executable_file_request.response;
+    const struct limine_rsdp_response* rsdp_res = rsdp_request.response;
+
+    assert(mm_res, "memmap_request returned no response!");
+    assert(hhdm_res, "hhdm_request returned no response!");
 
     info.cmdline = exec_file_res->executable_file->string;
 
@@ -74,7 +80,7 @@ void kernel_entry() {
         info.files = files;
         info.num_files = MIN(ARRAY_SIZE(files), module_res->module_count);
         for (size_t i = 0; i < info.num_files; i++) {
-            files[i].data = (phys_t)module_res->modules[i]->address - hhdm_request.response->offset;
+            files[i].data = (phys_t)module_res->modules[i]->address - hhdm_res->offset;
             files[i].length = module_res->modules[i]->size;
             strncpy(files[i].path, module_res->modules[i]->path, sizeof(files[i].path) - 1);
             files[i].path[sizeof(files[i].path) - 1] = 0;
@@ -84,7 +90,29 @@ void kernel_entry() {
     info.mem_map = mem;
     info.phys_base = (phys_t)exec_res->physical_base;
     info.virt_base = (uintptr_t)exec_res->virtual_base;
-    info.hhdm_base = (uintptr_t)hhdm_request.response->offset;
+    info.hhdm_base = (uintptr_t)hhdm_res->offset;
+
+    const struct limine_framebuffer_response* fb_res = framebuffer_request.response;
+    if (fb_res) {
+        // Only use the first framebuffer.
+        if (fb_res->framebuffer_count >= 1) {
+            const struct limine_framebuffer* fb = framebuffer_request.response->framebuffers[0];
+            info.fb.base = (phys_t)((uintptr_t)fb->address - hhdm_res->offset);
+            info.fb.width = fb->width;
+            info.fb.height = fb->height;
+            info.fb.pitch = fb->pitch;
+            info.fb.bytes_per_pixel = fb->bpp / 8;
+
+            info.fb.red.shift = fb->red_mask_shift;
+            info.fb.red.size = fb->red_mask_size;
+
+            info.fb.green.shift = fb->green_mask_shift;
+            info.fb.green.size = fb->green_mask_size;
+
+            info.fb.blue.shift = fb->blue_mask_shift;
+            info.fb.blue.size = fb->blue_mask_size;
+        }
+    }
 
 #if CONFIG_ACPI
     if (rsdp_request.response) {

boot/main.c

@@ -25,6 +25,7 @@ static const char zinnia_banner[] = "Zinnia " ZINNIA_VERSION " " CONFIG_KERNEL_F
                                     ", " ZINNIA_COMPILER_ID ", " ZINNIA_LINKER_ID ")";
 
 static void kernel_main_task(uintptr_t arg0) {
+    errno_t status = 0;
     struct boot_info* info = (struct boot_info*)arg0;
 
     log("main: Hello from main task!\n");
@@ -38,8 +39,12 @@ static void kernel_main_task(uintptr_t arg0) {
     assert(vma_new(&init_space) == EOK, "");
 
     struct boot_file* file_data = &info->files[0];
+    struct task* init_task = nullptr;
+
     struct paged_vmo* init_file;
-    assert(vmo_new_phys(&init_file) == EOK, "");
+    status = vmo_new_phys(&init_file);
+    assert(status == EOK, "Failed to allocate a memory object");
+
     vmo_write(&init_file->object, 0, HHDM_PTR(file_data->data), file_data->length, nullptr);
 
     // Load init.
@@ -53,11 +58,10 @@ static void kernel_main_task(uintptr_t arg0) {
         .envp = init_envp,
     };
 
-    struct task* init_task = nullptr;
-    errno_t status = elf_load(&exec, &init_task);
+    status = elf_load(&exec, &init_task);
     vmo_unref(&init_file->object);
 
-    assert(status == 0, "Failed to load init process (%i)\n", status);
+    assert(status == 0, "Failed to load init process (%i)", status);
     sched_add_task(&percpu_get()->sched, init_task);
 
     while (true) {