From eade1f9f90f9d0af4cc4166192ca7b4544d28004 Mon Sep 17 00:00:00 2001 From: "Marat Zakiyanov (Mario79)" Date: Tue, 4 Oct 2011 22:00:04 +0000 Subject: [PATCH] Many fixes for blue boot screen git-svn-id: svn://kolibrios.org@2261 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/boot/bootcode.inc | 48 ++++++++--------- kernel/trunk/boot/booteng.inc | 45 +++++----------- kernel/trunk/boot/bootet.inc | 96 +++++++++++++--------------------- kernel/trunk/boot/bootge.inc | 95 ++++++++++++--------------------- kernel/trunk/boot/bootru.inc | 30 +++++------ kernel/trunk/boot/parsers.inc | 20 +++---- kernel/trunk/boot/preboot.inc | 2 +- kernel/trunk/data16.inc | 2 +- 8 files changed, 129 insertions(+), 209 deletions(-) diff --git a/kernel/trunk/boot/bootcode.inc b/kernel/trunk/boot/bootcode.inc index 7b5ad14f9d..fb310eb3ac 100644 --- a/kernel/trunk/boot/bootcode.inc +++ b/kernel/trunk/boot/bootcode.inc @@ -552,11 +552,11 @@ end if adc byte [di+preboot_dma-preboot_device], 0 cmp byte [di+preboot_biosdisk-preboot_device], 1 adc byte [di+preboot_biosdisk-preboot_device], 0 -; default value for VRR is OFF - cmp byte [di+preboot_vrrm-preboot_device], 0 - jnz @f - mov byte [di+preboot_vrrm-preboot_device], 2 -@@: +;; default value for VRR is OFF +; cmp byte [di+preboot_vrrm-preboot_device], 0 +; jnz @f +; mov byte [di+preboot_vrrm-preboot_device], 2 +;@@: ; notify user _setcursor 5,2 @@ -584,9 +584,9 @@ end if mov si, usebd_msg cmp [preboot_biosdisk], 1 call .say_on_off - mov si, vrrm_msg - cmp [preboot_vrrm], 1 - call .say_on_off +; mov si, vrrm_msg +; cmp [preboot_vrrm], 1 +; call .say_on_off mov si, preboot_device_msg call print mov al, [preboot_device] @@ -674,9 +674,9 @@ end if jz .change_a cmp al, 'b' jz .change_b - cmp al, 'c' - jz .change_c - cmp al, 'd' +; cmp al, 'c' +; jz .change_c + cmp al, 'c' ; 'd' jnz .show_remarks _setcursor 15,0 mov si, bdev @@ -784,15 +784,15 @@ end if mov [preboot_biosdisk], al _setcursor 11,0 jmp .d -.change_c: - _setcursor 15,0 - mov si, vrrmprint - call print - mov bx, '12' - call getkey - mov [preboot_vrrm], al - _setcursor 12,0 - jmp .d +;.change_c: +; _setcursor 15,0 +; mov si, vrrmprint +; call print +; mov bx, '12' +; call getkey +; mov [preboot_vrrm], al +; _setcursor 12,0 +; jmp .d ;;;;;;;;;;;;;;;;;;;;;;;;;;;; .say_on_off: pushf @@ -947,10 +947,10 @@ end if mov al, [preboot_dma] mov [es:0x901F], al -; VRR_M USE - - mov al,[preboot_vrrm] - mov [es:0x9030], al +;; VRR_M USE +; +; mov al,[preboot_vrrm] +; mov [es:0x9030], al mov [es:0x901E], byte 1 ; BOOT DEVICE diff --git a/kernel/trunk/boot/booteng.inc b/kernel/trunk/boot/booteng.inc index 833cdacdda..ba7184f778 100644 --- a/kernel/trunk/boot/booteng.inc +++ b/kernel/trunk/boot/booteng.inc @@ -23,43 +23,27 @@ d80x25_bottom: d80x25_bottom_num = 3 msg_apm db " APM x.x ", 0 -vervesa db "Version of Vesa: Vesa x.x",13,10,0 novesa db "Display: EGA/CGA",13,10,0 s_vesa db "Version of VESA: " .ver db "?.?",13,10,0 gr_mode db "Select a videomode: ",13,10,0 -;s_bpp db 13,10,186," Глубина цвета: " -; .bpp dw "??" -; db 13,10,0 - -vrrmprint db "Apply VRR? (picture frequency greater than 60Hz" - db " only for transfers:",13,10 - db 186," 1024*768->800*600 and 800*600->640*480) [1-yes,2-no]:",0 - ask_bd db "Add disks visible by BIOS emulated in V86-mode? [1-yes, 2-no]: ",0 if defined extended_primary_loader +bdev db "Load ramdisk from [1-floppy; 2-kolibri.img]: ",0 +else bdev db "Load ramdisk from [1-floppy; 2-C:\kolibri.img (FAT32);" db 13,10,186," " db "3-use preloaded ram-image from kernel restart;" db 13,10,186," " db "4-create blank image]: ",0 -else -bdev db "Load ramdisk from [1-floppy; 2-kolibri.img]: ",0 end if -probetext db 13,10,13,10,186," Use standart graphics mode? [1-yes, " - db "2-probe bios (Vesa 3.0)]: ",0 -;memokz256 db 13,10,186," RAM 256 Mb",0 -;memokz128 db 13,10,186," RAM 128 Mb",0 -;memokz64 db 13,10,186," RAM 64 Mb",0 -;memokz32 db 13,10,186," RAM 32 Mb",0 -;memokz16 db 13,10,186," RAM 16 Mb",0 + prnotfnd db "Fatal - Videomode not found.",0 -;modena db "Fatal - VBE 0x112+ required.",0 + not386 db "Fatal - CPU 386+ required.",0 -btns db "Fatal - Can't determine color depth.",0 fatalsel db "Fatal - Graphics mode not supported by hardware.",0 pres_key db "Press any key to choose a new videomode.",0 badsect db 13,10,186," Fatal - Bad sector. Replace floppy.",0 @@ -77,21 +61,15 @@ time_str db " 5 seconds" current_cfg_msg db "Current settings:",13,10,0 curvideo_msg db " [a] Videomode: ",0 -;modes_msg dw mode4,mode1,mode2,mode3 -;modevesa20 db " with LFB",0 -;modevesa12 db ", VESA 1.2 Bnk",0 mode0 db "320x200, EGA/CGA 256 colors",13,10,0 mode9 db "640x480, VGA 16 colors",13,10,0 -;probeno_msg db " (standard mode)",0 -;probeok_msg db " (check nonstandard modes)",0 -;dma_msg db " [b] Use DMA for HDD access:",0 usebd_msg db " [b] Add disks visible by BIOS:",0 on_msg db " on",13,10,0 off_msg db " off",13,10,0 -;readonly_msg db " only for reading",13,10,0 -vrrm_msg db " [c] Use VRR:",0 -preboot_device_msg db " [d] Floppy image: ",0 + +preboot_device_msg db " [c] Floppy image: ",0 + if defined extended_primary_loader preboot_device_msgs dw 0,pdm1,pdm2,0 pdm1 db "real floppy",13,10,0 @@ -103,7 +81,9 @@ pdm2 db "C:\kolibri.img (FAT32)",13,10,0 pdm3 db "use already loaded image",13,10,0 pdm4 db "create blank image",13,10,0 end if + loading_msg db "Loading KolibriOS...",0 + if ~ defined extended_primary_loader save_quest db "Remember current settings? [y/n]: ",0 loader_block_error db "Bootloader data invalid, I cannot continue. Stopped.",0 @@ -116,7 +96,6 @@ _rs db 186,' _bt db 186,' └───────────────────────────────┴─┘',13,10,0 remark1 db "Default values were selected to match most of configurations, but not all.",0 -remark2 db "If you have CRT-monitor, enable VRR in the item [c].",0 -remark3 db "If the system does not boot, try to disable the item [b].",0 -remarks dw remark1, remark2, remark3 -num_remarks = 3 +remark2 db "If the system does not boot, try to disable the item [b].",0 +remarks dw remark1, remark2 +num_remarks = 2 diff --git a/kernel/trunk/boot/bootet.inc b/kernel/trunk/boot/bootet.inc index 532b6841b2..51c6bbcc37 100644 --- a/kernel/trunk/boot/bootet.inc +++ b/kernel/trunk/boot/bootet.inc @@ -13,43 +13,24 @@ $Revision$ - + d80x25_bottom: - db 186,' KolibriOS based on MenuetOS and comes with ABSOLUTELY ' - db 'NO WARRANTY ',186 - db 186,' See file COPYING for details ' + db 186,' KolibriOS pohineb MenuetOS ja kaasas IGASUGUSE GARANTI' + db 'ITA ',186 + db 186,' Naha faili COPYING detailid ' db ' ',186 line_full_bottom d80x25_bottom_num = 3 -novesa db "Ekraan: EGA/CGA",13,10,0 -vervesa db "Vesa versioon: Vesa x.x",13,10,0 -vervesa_off=20 msg_apm db " APM x.x ", 0 -gr_mode db 186," Vesa 2.0+ 16 M LFB: [1] 640x480, [2] 800x600, " - db "[3] 1024x768, [4] 1280x1024",13,10 - db 186," Vesa 1.2 16 M Bnk: [5] 640x480, [6] 800x600, " - db "[7] 1024x768, [8] 1280x1024",13,10 - db 186," EGA/CGA 256 vфrvi: [9] 320x200, " - db "VGA 16 vфrvi: [0] 640x480",13,10 - db 186," Vali reziim: ",0 -bt24 db "Bitti pikseli kohta: 24",13,10,0 -bt32 db "Bitti pikseli kohta: 32",13,10,0 -vrrmprint db "Kinnita VRR? (ekraani sagedus suurem kui 60Hz" - db " ainult:",13,10 - db 186," 1024*768->800*600 ja 800*600->640*480) [1-jah,2-ei]:",0 -;askmouse db " Hiir:" -; db " [1] PS/2 (USB), [2] Com1, [3] Com2." -; db " Vali port [1-3]: ",0 -;no_com1 db 13,10,186, " No COM1 mouse",0 -;no_com2 db 13,10,186, " No COM2 mouse",0 -;ask_dma db "Use DMA for HDD access? [1-yes, 2-only for reading, 3-no]: ",0 -ask_bd db "Add disks visible by BIOS emulated in V86-mode? [1-yes, 2-no]: ",0 -;gr_direct db 186," Use direct LFB writing? " -; db "[1-yes/2-no] ? ",0 -;mem_model db 13,10,186," Motherboard memory [1-16 Mb / 2-32 Mb / " -; db "3-64Mb / 4-128 Mb / 5-256 Mb] ? ",0 -;bootlog db 13,10,186," After bootlog display [1-continue/2-pause] ? ",0 +novesa db "Ekraan: EGA/CGA",13,10,0 +s_vesa db "Vesa versioon: " + .ver db "?.?",13,10,0 + +gr_mode db "Vali videomode: ",13,10,0 + +ask_bd db "Lisa kettad nahtavaks BIOS reziim V86? [1-jah, 2-no]: ",0 + if defined extended_primary_loader bdev db "Paigalda mфluketas [1-diskett; 2-kolibri.img]: ",0 else @@ -59,18 +40,12 @@ bdev db "Paigalda m db 13,10,186," " db "4-loo t№hi pilt]: ",0 end if -probetext db 13,10,13,10,186," Kasuta standartset graafika reziimi? [1-jah, " - db "2-leia biosist (Vesa 3.0)]: ",0 -;memokz256 db 13,10,186," RAM 256 Mb",0 -;memokz128 db 13,10,186," RAM 128 Mb",0 -;memokz64 db 13,10,186," RAM 64 Mb",0 -;memokz32 db 13,10,186," RAM 32 Mb",0 -;memokz16 db 13,10,186," RAM 16 Mb",0 + prnotfnd db "Fataalne - Videoreziimi ei leitud.",0 -;modena db "Fataalne - VBE 0x112+ on vajalik.",0 + not386 db "Fataalne - CPU 386+ on vajalik.",0 -btns db "Fataalne - Ei suuda vфrvis№gavust mффratleda.",0 fatalsel db "Fataalne - Graafilist reziimi riistvara ei toeta.",0 +pres_key db "Vajutage suvalist klahvi, et valida uus videomode.",0 badsect db 13,10,186," Fataalne - Vigane sektor. Asenda diskett.",0 memmovefailed db 13,10,186," Fataalne - Int 0x15 liigutamine ebaїnnestus.",0 okt db " ... OK" @@ -85,24 +60,16 @@ time_str db " 5 sekundit" db " automaatseks jфtkamiseks",13,10,0 current_cfg_msg db "Praegused seaded:",13,10,0 curvideo_msg db " [a] Videoreziim: ",0 -mode1 db "640x480",0 -mode2 db "800x600",0 -mode3 db "1024x768",0 -mode4 db "1280x1024",0 -modes_msg dw mode4,mode1,mode2,mode3 -modevesa20 db " koos LFB",0 -modevesa12 db ", VESA 1.2 Bnk",0 -mode9 db "320x200, EGA/CGA 256 vфrvi",0 -mode10 db "640x480, VGA 16 vфrvi",0 -probeno_msg db " (standard reziim)",0 -probeok_msg db " (kontrolli ebastandardseid reziime)",0 -;dma_msg db " [b] Kasuta DMA'd HDD juurdepффsuks:",0 -usebd_msg db " [b] Add disks visible by BIOS:",0 + +mode0 db "320x200, EGA/CGA 256 vфrvi",0 +mode9 db "640x480, VGA 16 vфrvi",0 + +usebd_msg db " [b] Lisa kettad nahtavaks BIOS:",0 on_msg db " sees",13,10,0 off_msg db " vфljas",13,10,0 -;readonly_msg db " ainult lugemiseks",13,10,0 -vrrm_msg db " [c] Kasuta VRR:",0 -preboot_device_msg db " [d] Disketi kujutis: ",0 + +preboot_device_msg db " [c] Disketi kujutis: ",0 + if defined extended_primary_loader preboot_device_msgs dw 0,pdm1,pdm2,0 pdm1 db "reaalne diskett",13,10,0 @@ -114,14 +81,21 @@ pdm2 db "C:\kolibri.img (FAT32)",13,10,0 pdm3 db "kasuta juba laaditud kujutist",13,10,0 pdm4 db "loo t№hi pilt",13,10,0 end if + loading_msg db "Laadin KolibriOS...",0 + if ~ defined extended_primary_loader save_quest db "Jфta meelde praegused seaded? [y/n]: ",0 loader_block_error db "Alglaaduri andmed vigased, ei saa jфtkata. Peatatud.",0 end if -remark1 db "Default values were selected to match most of configurations, but not all.",0 -remark2 db "If you have CRT-monitor, enable VRR in the item [c].",0 -remark3 db "If the system does not boot, try to disable the item [b].",0 -remarks dw remark1, remark2, remark3 -num_remarks = 3 +_st db 186,' ┌───────────────────────────────┬─┐',13,10,0 +_r1 db 186,' │ 320x200 EGA/CGA 256 colors │ │',13,10,0 +_r2 db 186,' │ 640x480 VGA 16 colors │ │',13,10,0 +_rs db 186,' │ ????x????@?? SVGA VESA │ │',13,10,0 +_bt db 186,' └───────────────────────────────┴─┘',13,10,0 + +remark1 db "Vaikimisi maaratud vaartused on valitud mugavuse enamikes, kuid mitte koik.",0 +remark2 db "Kui susteem ei kaivitu, proovige lulitada kirje [b].",0 +remarks dw remark1, remark2 +num_remarks = 2 diff --git a/kernel/trunk/boot/bootge.inc b/kernel/trunk/boot/bootge.inc index 93d24f0f13..9db178f058 100644 --- a/kernel/trunk/boot/bootge.inc +++ b/kernel/trunk/boot/bootge.inc @@ -15,11 +15,6 @@ $Revision$ d80x25_bottom: -; db 186,' KolibriOS based on MenuetOS and comes with ABSOLUTELY ' -; db 'NO WARRANTY ',186 -; db 186,' See file COPYING for details ' -; db ' ',186 - db 186,' KolibriOS basiert auf MenuetOS und wird ohne jegliche ' db ' Garantie vertrieben ',186 db 186,' Details stehen in der Datei COPYING ' @@ -27,34 +22,15 @@ d80x25_bottom: line_full_bottom d80x25_bottom_num = 3 -novesa db "Anzeige: EGA/CGA ",13,10,0 -vervesa db "Vesa-Version: Vesa ",13,10,0 -vervesa_off=22 msg_apm db " APM x.x ", 0 -gr_mode db 186," Vesa 2.0+ 16 M LFB: [1] 640x480, [2] 800x600, " - db "[3] 1024x768, [4] 1280x1024",13,10 - db 186," Vesa 1.2 16 M Bnk: [5] 640x480, [6] 800x600, " - db "[7] 1024x768, [8] 1280x1024",13,10 - db 186," EGA/CGA 256 Farben: [9] 320x200, " - db "VGA 16 Farben: [0] 640x480",13,10 - db 186," Waehle Modus: ",0 -bt24 db "Bits Per Pixel: 24",13,10,0 -bt32 db "Bits Per Pixel: 32",13,10,0 -vrrmprint db "VRR verwenden? (Monitorfrequenz groesser als 60Hz" - db " only for transfers:",13,10 - db 186," 1024*768->800*600 und 800*600->640*480) [1-ja,2-nein]:",0 -;askmouse db " Maus angeschlossen an:" -; db " [1] PS/2 (USB), [2] Com1, [3] Com2." -; db " Waehle Port [1-3]: ",0 -;no_com1 db 13,10,186, " Keine COM1 Maus",0 -;no_com2 db 13,10,186, " Keine COM2 Maus",0 -;ask_dma db "Nutze DMA zum HDD Zugriff? [1-ja, 2-allein fur Lesen, 3-nein]: ",0 -ask_bd db "Add disks visible by BIOS emulated in V86-mode? [1-yes, 2-no]: ",0 -;gr_direct db 186," Benutze direct LFB? " -; db "[1-ja/2-nein] ? ",0 -;mem_model db 13,10,186," Hauptspeicher [1-16 Mb / 2-32 Mb / " -; db "3-64Mb / 4-128 Mb / 5-256 Mb] ? ",0 -;bootlog db 13,10,186," After bootlog display [1-continue/2-pause] ? ",0 +novesa db "Anzeige: EGA/CGA ",13,10,0 +s_vesa db "Vesa-Version: " + .ver db "?.?",13,10,0 + +gr_mode db "Wahlen Sie einen videomode: ",13,10,0 + +ask_bd db "Add-Festplatten sichtbar BIOS in V86-Modus emuliert? [1-ja, 2 nein]: ",0 + if defined extended_primary_loader bdev db "Lade die Ramdisk von [1-Diskette; 2-kolibri.img]: ",0 else @@ -64,18 +40,12 @@ bdev db "Lade die Ramdisk von [1-Diskette; 2-C:\kolibri.img (FAT32);" db 13,10,186," " db "4-create blank image]: ",0 end if -probetext db 13,10,13,10,186," Nutze Standardgrafikmodi? [1-ja, " - db "2-BIOS Test (Vesa 3.0)]: ",0 -;memokz256 db 13,10,186," RAM 256 Mb",0 -;memokz128 db 13,10,186," RAM 128 Mb",0 -;memokz64 db 13,10,186," RAM 64 Mb",0 -;memokz32 db 13,10,186," RAM 32 Mb",0 -;memokz16 db 13,10,186," RAM 16 Mb",0 + prnotfnd db "Fatal - Videomodus nicht gefunden.",0 -;modena db "Fatal - VBE 0x112+ required.",0 + not386 db "Fatal - CPU 386+ benoetigt.",0 -btns db "Fatal - konnte Farbtiefe nicht erkennen.",0 fatalsel db "Fatal - Grafikmodus nicht unterstuetzt.",0 +pres_key db "Drucken Sie eine beliebige Taste, um eine neue videomode wahlen.",0 badsect db 13,10,186," Fatal - Sektorfehler, Andere Diskette neutzen.",0 memmovefailed db 13,10,186," Fatal - Int 0x15 Fehler.",0 okt db " ... OK" @@ -84,30 +54,22 @@ diskload db "Lade Diskette: 00 %",8,8,8,8,0 pros db "00" backspace2 db 8,8,0 boot_dev db 0 ; 0=floppy, 1=hd -start_msg db "Druecke [abcd], um die Einstellungen zu aendern , druecke [Enter] zum starten",13,10,0 +start_msg db "Druecke [abcd], um die Einstellungen zu aendern, druecke [Enter] zum starten",13,10,0 time_msg db " oder warte " time_str db " 5 Sekunden" db " bis zum automatischen Start",13,10,0 current_cfg_msg db "Aktuelle Einstellungen:",13,10,0 curvideo_msg db " [a] Videomodus: ",0 -mode1 db "640x480",0 -mode2 db "800x600",0 -mode3 db "1024x768",0 -mode4 db "1280x1024",0 -modes_msg dw mode4,mode1,mode2,mode3 -modevesa20 db " mit LFB",0 -modevesa12 db ", VESA 1.2 Bnk",0 -mode9 db "320x200, EGA/CGA 256 colors",0 -mode10 db "640x480, VGA 16 colors",0 -probeno_msg db " (Standard Modus)",0 -probeok_msg db " (teste nicht-standard Modi)",0 -;dma_msg db " [b] Nutze DMA zum HDD Aufschreiben:",0 -usebd_msg db " [b] Add disks visible by BIOS:",0 + +mode0 db "320x200, EGA/CGA 256 colors",13,10,0 +mode9 db "640x480, VGA 16 colors",13,10,0 + +usebd_msg db " [b] Add-Festplatten sichtbar durch das BIOS:",0 on_msg db " an",13,10,0 off_msg db " aus",13,10,0 -;readonly_msg db " fur Lesen",13,10,0 -vrrm_msg db " [c] Nutze VRR:",0 -preboot_device_msg db " [d] Diskettenimage: ",0 + +preboot_device_msg db " [c] Diskettenimage: ",0 + if defined extended_primary_loader preboot_device_msgs dw 0,pdm1,pdm2,0 pdm1 db "Echte Diskette",13,10,0 @@ -119,14 +81,21 @@ pdm2 db "C:\kolibri.img (FAT32)",13,10,0 pdm3 db "Nutze bereits geladenes Image",13,10,0 pdm4 db "create blank image",13,10,0 end if + loading_msg db "Lade KolibriOS...",0 + if ~ defined extended_primary_loader save_quest db "Aktuelle Einstellungen speichern? [y/n]: ",0 loader_block_error db "Bootloader Daten ungueltig, Kann nicht fortfahren. Angehalten.",0 end if -remark1 db "Default values were selected to match most of configurations, but not all.",0 -remark2 db "If you have CRT-monitor, enable VRR in the item [c].",0 -remark3 db "If the system does not boot, try to disable the item [b].",0 -remarks dw remark1, remark2, remark3 -num_remarks = 3 +_st db 186,' ┌───────────────────────────────┬─┐',13,10,0 +_r1 db 186,' │ 320x200 EGA/CGA 256 colors │ │',13,10,0 +_r2 db 186,' │ 640x480 VGA 16 colors │ │',13,10,0 +_rs db 186,' │ ????x????@?? SVGA VESA │ │',13,10,0 +_bt db 186,' └───────────────────────────────┴─┘',13,10,0 + +remark1 db "Die Standardwerte sind fur die meisten gewahlt, aber nicht fur jedermann.",0 +remark2 db "Wenn das System nicht bootet, versuchen, das Element [b] deaktivieren.",0 +remarks dw remark1, remark2 +num_remarks = 2 diff --git a/kernel/trunk/boot/bootru.inc b/kernel/trunk/boot/bootru.inc index 548a71912e..03203c29ee 100644 --- a/kernel/trunk/boot/bootru.inc +++ b/kernel/trunk/boot/bootru.inc @@ -15,8 +15,8 @@ $Revision$ d80x25_bottom: - db 186,' Kolibri OS основана на Menuet OS и не предоставляет ' - db 'никаких гарaнтий. ',186 + db 186,' KolibriOS основана на MenuetOS и НЕ ПРЕДОСТАВЛЯЕТ НИ' + db 'КАКИХ ГАРAНТИЙ. ',186 db 186,' Подробнее смотрите в файле COPYING.TXT ' db ' ',186 line_full_bottom @@ -28,11 +28,9 @@ s_vesa db " .ver db "?.?",13,10,0 gr_mode db "Выберите видеорежим: ",13,10,0 -vrrmprint db "Использовать VRR? (частота кадров выше 60 Гц" - db " только для переходов:",13,10 - db 186," 1024*768>800*600 и 800*600>640*480) [1-да, 2-нет]: ",0 -;ask_dma db "Использовать DMA для доступа к HDD? [1-да, 2-только чтение, 3-нет]: ",0 + ask_bd db "Добавить диски, видимые через BIOS в режиме V86? [1-да, 2-нет]: ",0 + if defined extended_primary_loader bdev db "Загрузить образ из [1-дискета; 2-kolibri.img из папки загрузки]: ",0 else @@ -42,7 +40,9 @@ bdev db " db 13,10,186," " db "4-создать чистый образ]: ",0 end if + prnotfnd db "Ошибка - Видеорежим не найден.",0 + not386 db "Ошибка - Требуется процессор 386+.",0 fatalsel db "Ошибка - Выбранный видеорежим не поддерживается.",0 pres_key db "Нажимите любую клавишу, для перехода в выбор режимов.",0 @@ -61,16 +61,15 @@ time_str db " 5 секунд " current_cfg_msg db "Текущие настройки:",13,10,0 curvideo_msg db " [a] Видеорежим: ",0 - mode0 db "320x200, EGA/CGA 256 цветов",13,10,0 mode9 db "640x480, VGA 16 цветов",13,10,0 usebd_msg db " [b] Добавить диски, видимые через BIOS:",0 on_msg db " вкл",13,10,0 off_msg db " выкл",13,10,0 -readonly_msg db " только чтение",13,10,0 -vrrm_msg db " [c] Использование VRR:",0 -preboot_device_msg db " [d] Образ дискеты: ",0 + +preboot_device_msg db " [c] Образ дискеты: ",0 + if defined extended_primary_loader preboot_device_msgs dw 0,pdm1,pdm2,0 pdm1 db "настоящая дискета",13,10,0 @@ -82,22 +81,21 @@ pdm2 db "C:\kolibri.img (FAT32)",13,10,0 pdm3 db "использовать уже загруженный образ",13,10,0 pdm4 db "создать чистый образ",13,10,0 end if + loading_msg db "Идёт загрузка KolibriOS...",0 + if ~ defined extended_primary_loader ; saving not supported in this case save_quest db "Запомнить текущие настройки? [y/n]: ",0 loader_block_error db "Ошибка в данных начального загрузчика, продолжение невозможно.",0 end if - _st db 186,' ┌───────────────────────────────┬─┐ ',13,10,0 _r1 db 186,' │ 320x200 EGA/CGA 256 цветов │ │ ',13,10,0 _r2 db 186,' │ 640x480 VGA 16 цветов │ │ ',13,10,0 _rs db 186,' │ ????x????@?? SVGA VESA │ │ ',13,10,0 _bt db 186,' └───────────────────────────────┴─┘ ',13,10,0 - remark1 db "Значения по умолчанию выбраны для удобства большинства, но не всех.",0 -remark2 db "Если у Вас ЭЛТ-монитор, включите VRR в пункте [c].",0 -remark3 db "Если у Вас не грузится система, попробуйте отключить пункт [b].",0 -remarks dw remark1, remark2, remark3 -num_remarks = 3 +remark2 db "Если у Вас не грузится система, попробуйте отключить пункт [b].",0 +remarks dw remark1, remark2 +num_remarks = 2 diff --git a/kernel/trunk/boot/parsers.inc b/kernel/trunk/boot/parsers.inc index d1ac97f364..2ce8f179ac 100644 --- a/kernel/trunk/boot/parsers.inc +++ b/kernel/trunk/boot/parsers.inc @@ -57,16 +57,16 @@ parse_vbemode: .nothing: ret -parse_vrr: -; vrr is a boolean setting - call parse_bool - jc .nothing -; convert 0 to 2, 1 to 1 - inc ax - xor al, 3 - mov [es:preboot_vrrm], al -.nothing: - ret +;parse_vrr: +;; vrr is a boolean setting +; call parse_bool +; jc .nothing +;; convert 0 to 2, 1 to 1 +; inc ax +; xor al, 3 +; mov [es:preboot_vrrm], al +;.nothing: +; ret parse_biosdisks: ; using biosdisks is a boolean setting diff --git a/kernel/trunk/boot/preboot.inc b/kernel/trunk/boot/preboot.inc index 04b3d2da8a..b04ea1e364 100644 --- a/kernel/trunk/boot/preboot.inc +++ b/kernel/trunk/boot/preboot.inc @@ -23,7 +23,7 @@ y_save dw 0 ; y number_vm dw 0 ; ;pixel_save dw 0 ; per to pixel preboot_gprobe db 0 ; probe vesa3 videomodes (1-no, 2-yes) -preboot_vrrm db 0 ; use VRR_M (1-yes, 2- no) +;preboot_vrrm db 0 ; use VRR_M (1-yes, 2- no) preboot_dma db 0 ; use DMA for access to HDD (1-always, 2-only for read, 3-never) preboot_device db 0 ; boot device ; (1-floppy 2-harddisk 3-kernel restart 4-format ram disk) diff --git a/kernel/trunk/data16.inc b/kernel/trunk/data16.inc index 4fbed262ea..b81d8fbee5 100644 --- a/kernel/trunk/data16.inc +++ b/kernel/trunk/data16.inc @@ -78,7 +78,7 @@ config_file_variables: config_variable 'timeout', parse_timeout config_variable 'resolution', parse_resolution config_variable 'vbemode', parse_vbemode - config_variable 'vrr', parse_vrr +; config_variable 'vrr', parse_vrr config_variable 'biosdisks', parse_biosdisks config_variable 'imgfrom', parse_imgfrom dw 0