aboutsummaryrefslogtreecommitdiff
path: root/src/kernel/boot.asm
diff options
context:
space:
mode:
authorMarvin Borner2019-10-03 16:33:05 +0200
committerMarvin Borner2019-10-03 16:33:05 +0200
commit2f6c52b6e1f92339f97c25f7da8ab7ec2bee8273 (patch)
treeb02bc2f991d3a2756a399aa76a23268d099416bb /src/kernel/boot.asm
parentdc7f3bccef43d1483a8a234df85f67f6869e75ba (diff)
Improved some things
Diffstat (limited to 'src/kernel/boot.asm')
-rw-r--r--src/kernel/boot.asm10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/kernel/boot.asm b/src/kernel/boot.asm
index 9fc06ed..d7d78fd 100644
--- a/src/kernel/boot.asm
+++ b/src/kernel/boot.asm
@@ -11,9 +11,9 @@ mboot:
; Multiboot macros
MULTIBOOT_PAGE_ALIGN equ 1<<0
MULTIBOOT_MEMORY_INFO equ 1<<1
- MULTIBOOT_AOUT_KLUDGE equ 1<<16
+ MULTIBOOT_VIDEO_MODE equ 1<<2
MULTIBOOT_HEADER_MAGIC equ 0x1BADB002
- MULTIBOOT_HEADER_FLAGS equ MULTIBOOT_PAGE_ALIGN | MULTIBOOT_MEMORY_INFO | MULTIBOOT_AOUT_KLUDGE
+ MULTIBOOT_HEADER_FLAGS equ MULTIBOOT_PAGE_ALIGN | MULTIBOOT_MEMORY_INFO | MULTIBOOT_VIDEO_MODE
MULTIBOOT_CHECKSUM equ -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS)
EXTERN code, bss, end
@@ -29,6 +29,12 @@ mboot:
dd end
dd start
+ ; Request linear graphics mode
+ dd 0
+ dd 640 ; width
+ dd 480 ; height
+ dd 32 ; bpp
+
; Endless loop
stublet:
extern kernel_main