rewrite bootru.inc and booteng.inc

git-svn-id: svn://kolibrios.org@715 a494cfbc-eb01-0410-851d-a64ba20cac60

kernel/trunk/boot/booteng.inc

@@ -15,34 +15,24 @@ d80x25_bottom:
           line_full_bottom
 d80x25_bottom_num = 3
 
-novesa    db      "Display: EGA/CGA",13,10,0
-vervesa   db      "Version of Vesa: Vesa x.x",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 Colors:  [9] 320x200, "
-          db      "VGA 16 Colors: [0]  640x480",13,10
-          db      186," Select mode: ",0
-bt24      db      "Bits Per Pixel: 24",13,10,0
-bt32      db      "Bits Per Pixel: 32",13,10,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      "You will choose a video of mode: ",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
-;askmouse  db      " Mouse at:"
-;          db      " [1] PS/2 (USB), [2] Com1, [3] Com2."
-;          db      " Select 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
+
 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;"
@@ -60,6 +50,7 @@ prnotfnd  db      "Fatal - Videomode not found.",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 video of mode.",0
 badsect   db      13,10,186," Fatal - Bad sector. Replace floppy.",0
 memmovefailed db  13,10,186," Fatal - Int 0x15 move failed.",0
 okt       db      " ... OK"
@@ -74,17 +65,15 @@ time_str  db      " 5 seconds"
           db      " before automatical continuation",13,10,0
 current_cfg_msg db "Current settings:",13,10,0
 curvideo_msg db   " [a] Videomode: ",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     " with 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 mode)",0
-probeok_msg db    " (check nonstandard modes)",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

kernel/trunk/boot/bootru.inc

@@ -23,9 +23,9 @@ s_vesa    db      "
 ;vervesa   db      "‚¥àá¨ï VESA:  Vesa x.x",13,10,0
 ;vervesa_off=19
 gr_mode   db      "‚ë¡¥à¨â¥ ¢¨¤¥®à¥¦¨¬: ",13,10,0
-s_bpp     db      13,10,186," <20><>㡨<EFBFBD><E3A1A8> 梥<><E6A2A5>: "
-  .bpp    dw      "??"
-          db      13,10,0
+;s_bpp     db      13,10,186," <20><>㡨<EFBFBD><E3A1A8> 梥<><E6A2A5>: "
+;  .bpp    dw      "??"
+;          db      13,10,0
 vrrmprint db      "ˆá¯®«ì§®¢ âì VRR? (ç áâ®â  ª ¤à®¢ ¢ëè¥ 60 ƒæ"
           db      " ⮫쪮 ¤«ï ¯¥à¥å®¤®¢:",13,10
           db      186," 1024*768>800*600 ¨ 800*600>640*480) [1-¤ , 2-­¥â]: ",0