diff --git a/x86/startup-x86_64.asm b/x86/startup-x86_64.asm index 8dd738de0047682f0a8172a57dfe109495087240..05b70215dc1b70874067aafc267b85d0495e848f 100644 --- a/x86/startup-x86_64.asm +++ b/x86/startup-x86_64.asm @@ -67,21 +67,13 @@ long_mode: mov gs, rax mov ss, rax - ; load long mode IDT - lidt [idtr] - mov rsp, 0x800000 - 128 - mov rax, gdt.tss - ltr ax - ;rust init + xor rax, rax mov eax, [kernel_base + 0x18] - mov [interrupts.handler], rax - mov rax, gdtr - mov rbx, idtr - mov rcx, tss - int 0xFF + mov rbx, gdtr + jmp rax .lp: sti hlt diff --git a/x86/vesa.asm b/x86/vesa.asm index 8dadf2af74d6ca069c277941bbc6e9979fbe895a..cb22221cd89aa3da30268f950c1daf4cdcac7e79 100644 --- a/x86/vesa.asm +++ b/x86/vesa.asm @@ -183,8 +183,8 @@ vesa: .minx dw 640 .miny dw 480 .required: -.requiredx dw 0 ;1024 ;USE THESE WITH CAUTION -.requiredy dw 0 ;768 +.requiredx dw 1024 ;USE THESE WITH CAUTION +.requiredy dw 768 .requiredmode dw 0 .noedidmsg db "EDID not supported.",10,13,0