From 5b653572426c440c10ee71731e7148fa8ba6a3f8 Mon Sep 17 00:00:00 2001 From: Ivan Baravy Date: Wed, 11 Nov 2020 22:27:30 +0000 Subject: [PATCH] extended_primary_loader: Fix handling of 'resolution' option. git-svn-id: svn://kolibrios.org@8175 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/boot/bootvesa.inc | 2 ++ kernel/trunk/bootloader/extended_primary_loader/config.ini | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/trunk/boot/bootvesa.inc b/kernel/trunk/boot/bootvesa.inc index 181a33887a..39a60fe646 100644 --- a/kernel/trunk/boot/bootvesa.inc +++ b/kernel/trunk/boot/bootvesa.inc @@ -481,8 +481,10 @@ end if jne .next cmp bx, word [es:si+2] jne .next + jcxz @f cmp cx, word [es:si+8] jne .next +@@: xor ax, ax ret .next: diff --git a/kernel/trunk/bootloader/extended_primary_loader/config.ini b/kernel/trunk/bootloader/extended_primary_loader/config.ini index f39fc14e10..1db4d25faf 100644 --- a/kernel/trunk/bootloader/extended_primary_loader/config.ini +++ b/kernel/trunk/bootloader/extended_primary_loader/config.ini @@ -4,7 +4,7 @@ timeout=5 ; width*height -resolution=1024*768 +;resolution=1024*768 ; where to load ramdisk from ; 2 - /hd0/1/kolibri.img