From a64c3d7c2f2145bbb7abd6fd8832219ffade4118 Mon Sep 17 00:00:00 2001 From: rami Date: Thu, 27 Jun 2024 22:31:22 -0400 Subject: [PATCH] added video to multiboot flags --- kernel/init.asm | 15 ++++++++++++++- kernel/kernel.c | 1 + 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/kernel/init.asm b/kernel/init.asm index 798f6c2..2ecaade 100644 --- a/kernel/init.asm +++ b/kernel/init.asm @@ -1,11 +1,24 @@ %define MAGIC 0x1BADB002 -%define FLAGS 0x0 +%define ALIGN 1<<0 +%define MMAP 1<<1 +%define VID 1<<2 +%define FLAGS (ALIGN | MMAP | VID) section .multiboot dd MAGIC dd FLAGS dd -(MAGIC + FLAGS) +dd 0 ; header_addr +dd 0 ; load_addr +dd 0 ; load_end_addr +dd 0 ; bss_end_addr +dd 0 ; entry_addr +dd 1 ; mode_type +dd 80 ; width +dd 25 ; height +dd 0 ; depth + section .text global _start _start: diff --git a/kernel/kernel.c b/kernel/kernel.c index 363d192..aec5a06 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -6,6 +6,7 @@ kernel_ctx_t ctx = {0}; void kernel(multiboot_info_t *info) { if (!(info->flags & (1<<6))) goto halt; + if (!(info->flags & (1<<12))) goto halt; ctx.mem_map = (multiboot_memory_map_t *)info->memmapaddress; ctx.mem_map_len = info->memmaplength;