From 54376c69d5d71372c5252842c6e31fb748be8a63 Mon Sep 17 00:00:00 2001 From: "Marat Zakiyanov (Mario79)" Date: Mon, 8 Jul 2013 05:45:58 +0000 Subject: [PATCH] Correction width of the boot messages and correction position of the BOOT_DEBUG_PRINT (addition to the revision of 3777). git-svn-id: svn://kolibrios.org@3778 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/data32.inc | 4 ++-- kernel/trunk/data32sp.inc | 2 +- kernel/trunk/kernel.asm | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kernel/trunk/data32.inc b/kernel/trunk/data32.inc index 1eea5c6c90..1450293da4 100644 --- a/kernel/trunk/data32.inc +++ b/kernel/trunk/data32.inc @@ -57,7 +57,7 @@ if lang eq ru boot_enableirq: cp866 'Включить прерывания 2, 13',0 boot_disabling_ide:cp866 'Запрещение прерываний в контроллере IDE',0 boot_enabling_ide:cp866 'Разрешение прерываний в контроллере IDE',0 - boot_set_int_IDE: cp866 'Установка обработчиков прерываний для контроллера IDE',0 + boot_set_int_IDE: cp866 'Установка обработчиков прерываний IDE',0 boot_detectfloppy:cp866 'Поиск floppy дисководов',0 boot_detecthdcd: cp866 'Поиск жестких дисков и ATAPI приводов',0 boot_getcache: cp866 'Получение памяти для кэша',0 @@ -100,7 +100,7 @@ else boot_enableirq db 'Enable interrupts 2, 13',0 boot_disabling_ide db 'Disable interrupts in IDE controller',0 boot_enabling_ide db 'Enable interrupts in IDE controller',0 - boot_set_int_IDE db 'Set handler of interrupts for IDE controller',0 + boot_set_int_IDE db 'Set handler of interrupts for IDE',0 boot_detectfloppy db 'Search floppy drives',0 boot_detecthdcd db 'Search hard drives and ATAPI drives',0 boot_getcache db 'Get memory for cache',0 diff --git a/kernel/trunk/data32sp.inc b/kernel/trunk/data32sp.inc index b269c23c05..3f36a0bd52 100644 --- a/kernel/trunk/data32sp.inc +++ b/kernel/trunk/data32sp.inc @@ -6,7 +6,7 @@ boot_enableirq: cp850 'Habilitar interrupciones 2, 13',0 boot_disabling_ide:cp850 'Habiliar interrupciones en controladores IDE',0 boot_enabling_ide:cp850 'Habilitar interrupciones en controladores IDE',0 - boot_set_int_IDE: cp850 'Configuración del controlador de interrupciones para el controlador IDE',0 + boot_set_int_IDE: cp850 'Configuración del controlador de interrupciones para el IDE',0 boot_detectfloppy:cp850 'Buscar unidades de disquete',0 boot_detecthdcd: cp850 'Buscar discos duros y unidades ATAPI',0 boot_getcache: cp850 'Tomar memoria para caché',0 diff --git a/kernel/trunk/kernel.asm b/kernel/trunk/kernel.asm index 2b9853ca41..0e32e2400d 100644 --- a/kernel/trunk/kernel.asm +++ b/kernel/trunk/kernel.asm @@ -970,7 +970,7 @@ end if ; LOAD FIRST APPLICATION cmp byte [launcher_start], 1 ; Check if starting LAUNCHER is selected on blue screen (1 = yes) - jnz @f + jnz first_app_found cli mov ebp, firstapp @@ -4878,7 +4878,7 @@ end if jnz @f pusha iglobal -msg_board_pos dd 234*65536+10 ; for printing debug output on the screen +msg_board_pos dd (42*6)*65536+10 ; for printing debug output on the screen endg lea edx, [msg_board_data+ecx] mov ecx, 0x40FFFFFF @@ -4890,7 +4890,7 @@ endg add word [msg_board_pos+2], 6 cmp bl, 10 jnz @f - mov word [msg_board_pos+2], 234 + mov word [msg_board_pos+2], (42*6) add word [msg_board_pos], 10 mov ax, word [Screen_Max_Y] cmp word [msg_board_pos], ax