From bede2c62e62770beea2656dac6b54d847c23b760 Mon Sep 17 00:00:00 2001 From: heavyiron Date: Tue, 19 Sep 2006 10:39:40 +0000 Subject: [PATCH] Scripts now deletes lang.inc after compiling kernel. Removed tabs from code (preboot.inc) git-svn-id: svn://kolibrios.org@152 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/branches/gfx_kernel/build_en.bat | 1 + kernel/branches/gfx_kernel/build_ru.bat | 1 + kernel/trunk/boot/preboot.inc | 38 ++++++++++++------------- kernel/trunk/build_en.bat | 1 + kernel/trunk/build_ge.bat | 1 + kernel/trunk/build_ru.bat | 1 + 6 files changed, 24 insertions(+), 19 deletions(-) diff --git a/kernel/branches/gfx_kernel/build_en.bat b/kernel/branches/gfx_kernel/build_en.bat index 2a911504f5..ff112543e3 100644 --- a/kernel/branches/gfx_kernel/build_en.bat +++ b/kernel/branches/gfx_kernel/build_en.bat @@ -1,4 +1,5 @@ @erase lang.inc @echo lang fix en >lang.inc @fasm kernel.asm kernel.mnt +@erase lang.inc @pause \ No newline at end of file diff --git a/kernel/branches/gfx_kernel/build_ru.bat b/kernel/branches/gfx_kernel/build_ru.bat index fdea9bebf6..a8cd530f0c 100644 --- a/kernel/branches/gfx_kernel/build_ru.bat +++ b/kernel/branches/gfx_kernel/build_ru.bat @@ -1,4 +1,5 @@ @erase lang.inc @echo lang fix ru >lang.inc @fasm kernel.asm kernel.mnt +@erase lang.inc @pause \ No newline at end of file diff --git a/kernel/trunk/boot/preboot.inc b/kernel/trunk/boot/preboot.inc index 1f730e9b1e..dbff4a3299 100644 --- a/kernel/trunk/boot/preboot.inc +++ b/kernel/trunk/boot/preboot.inc @@ -1,23 +1,23 @@ -display_modechg db 0 ; display mode change for text, yes/no (0 or 2) - ; - ; !! Important note !! - ; - ; Must be set to 2, to avoid two screenmode - ; changes within a very short period of time. +display_modechg db 0 ; display mode change for text, yes/no (0 or 2) + ; + ; !! Important note !! + ; + ; Must be set to 2, to avoid two screenmode + ; changes within a very short period of time. -display_atboot db 0 ; show boot screen messages ( 2-no ) +display_atboot db 0 ; show boot screen messages ( 2-no ) -preboot_graph db 0 ; graph mode -preboot_gprobe db 0 ; probe vesa3 videomodes (1-no, 2-yes) -preboot_vrrm db 0 ; use VRR_M (1-yes, 2- no) -preboot_mtrr db 0 ; mtrr acceleration (1-yes, 2-no) -preboot_device db 0 ; boot device - ; (1-floppy 2-harddisk 3-kernel restart) - ; !!!! 0 - autodetect !!!! -preboot_blogesc db 1 ; start immediately after bootlog +preboot_graph db 0 ; graph mode +preboot_gprobe db 0 ; probe vesa3 videomodes (1-no, 2-yes) +preboot_vrrm db 0 ; use VRR_M (1-yes, 2- no) +preboot_mtrr db 0 ; mtrr acceleration (1-yes, 2-no) +preboot_device db 0 ; boot device + ; (1-floppy 2-harddisk 3-kernel restart) + ;!!!! 0 - autodetect !!!! +preboot_blogesc db 1 ; start immediately after bootlog - if $>10200h + if $>10200h ERROR: prebooting parameters must fit in first sector!!! - end if -hdsysimage db 'MENUET IMG' ; load from -image_save db 'MENUET IMG' ; save to + end if +hdsysimage db 'MENUET IMG' ; load from +image_save db 'MENUET IMG' ; save to diff --git a/kernel/trunk/build_en.bat b/kernel/trunk/build_en.bat index 2a911504f5..ff112543e3 100644 --- a/kernel/trunk/build_en.bat +++ b/kernel/trunk/build_en.bat @@ -1,4 +1,5 @@ @erase lang.inc @echo lang fix en >lang.inc @fasm kernel.asm kernel.mnt +@erase lang.inc @pause \ No newline at end of file diff --git a/kernel/trunk/build_ge.bat b/kernel/trunk/build_ge.bat index 15951e4d4d..1b9fcc3c23 100644 --- a/kernel/trunk/build_ge.bat +++ b/kernel/trunk/build_ge.bat @@ -1,4 +1,5 @@ @erase lang.inc @echo lang fix ge >lang.inc @fasm kernel.asm kernel.mnt +@erase lang.inc @pause \ No newline at end of file diff --git a/kernel/trunk/build_ru.bat b/kernel/trunk/build_ru.bat index fdea9bebf6..a8cd530f0c 100644 --- a/kernel/trunk/build_ru.bat +++ b/kernel/trunk/build_ru.bat @@ -1,4 +1,5 @@ @erase lang.inc @echo lang fix ru >lang.inc @fasm kernel.asm kernel.mnt +@erase lang.inc @pause \ No newline at end of file