From e5d49b5269a20e148bfd91fa49088e114e98b330 Mon Sep 17 00:00:00 2001 From: "Evgeny Grechnikov (Diamond)" Date: Sun, 2 Mar 2008 12:59:09 +0000 Subject: [PATCH] Restored text "All set - press ESC to start" because it is useful for debugging (when one needs to view log) git-svn-id: svn://kolibrios.org@767 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/boot/preboot.inc | 1 + kernel/trunk/data32.inc | 3 +++ kernel/trunk/kernel.asm | 8 ++++++++ 3 files changed, 12 insertions(+) diff --git a/kernel/trunk/boot/preboot.inc b/kernel/trunk/boot/preboot.inc index 269e60270b..036ba51c18 100644 --- a/kernel/trunk/boot/preboot.inc +++ b/kernel/trunk/boot/preboot.inc @@ -28,6 +28,7 @@ preboot_dma db 0 ; use DMA for access to HDD (1-always, 2-only for read, 3-n preboot_device db 0 ; boot device ; (1-floppy 2-harddisk 3-kernel restart 4-format ram disk) ;!!!! 0 - autodetect !!!! +preboot_blogesc = 0 ; start immediately after bootlog preboot_biosdisk db 0 ; use V86 to access disks through BIOS (1-yes, 2-no) if $>0x200 diff --git a/kernel/trunk/data32.inc b/kernel/trunk/data32.inc index f7e155f43e..878ade7935 100644 --- a/kernel/trunk/data32.inc +++ b/kernel/trunk/data32.inc @@ -67,6 +67,9 @@ keymap_alt: boot_pal_vga db 'Setting VGA 640x480 palette',0 boot_failed db 'Failed to start first app',0 boot_mtrr db 'Setting MTRR',0 +if preboot_blogesc + boot_tasking db 'All set - press ESC to start',0 +end if new_process_loading db 'K : New Process - loading',13,10,0 new_process_running db 'K : New Process - done',13,10,0 diff --git a/kernel/trunk/kernel.asm b/kernel/trunk/kernel.asm index ce06d21cc8..c1fb81bd8d 100644 --- a/kernel/trunk/kernel.asm +++ b/kernel/trunk/kernel.asm @@ -853,6 +853,14 @@ first_app_found: ; START MULTITASKING +if preboot_blogesc + mov esi, boot_tasking + call boot_log +.bll1: in al, 0x60 ; wait for ESC key press + cmp al, 129 + jne .bll1 +end if + ; mov [ENABLE_TASKSWITCH],byte 1 ; multitasking enabled ; UNMASK ALL IRQ'S