summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
authorMiguel <m.i@gmx.at>2018-08-19 03:15:50 +0200
committerMiguel <m.i@gmx.at>2018-08-19 03:15:50 +0200
commit9b13ca03dacb6a385461dccad319010537add5cf (patch)
tree4397fdff0d1566b7bec761031ce2077e88cd5379 /asm
parenta2bd733e517364b6c9ddd26706d85fac09656854 (diff)
get vesa working in vmem.
Diffstat (limited to 'asm')
-rw-r--r--asm/multiboot.s9
1 files changed, 4 insertions, 5 deletions
diff --git a/asm/multiboot.s b/asm/multiboot.s
index 22be3d1..1d808a3 100644
--- a/asm/multiboot.s
+++ b/asm/multiboot.s
@@ -27,10 +27,10 @@
.long 0
.long 0
-.long 1 #gfx_stuff
-.long 800
-.long 600
-.long 24
+.long 0 #gfx_stuff 0=enable!
+.long 1280
+.long 1024
+.long 32
# Currently the stack pointer register (esp) points at anything and using it may
# cause massive harm. Instead, we'll provide our own stack. We will allocate
@@ -58,7 +58,6 @@ _start:
push %ebx #pass address of the multiboot information data structure
push %eax #pass eax, so kernel can check for magic number
-
call kernel_main