From 8ed01ff721e52c83456a3da426d36e023e64eae4 Mon Sep 17 00:00:00 2001 From: Yogev Ezra Date: Wed, 10 Jul 2013 01:05:54 +0000 Subject: [PATCH] Correct English, Spanish and German messages string length in blue screen to fit into one line. Add some comments to bootcode.inc git-svn-id: svn://kolibrios.org@3796 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/boot/bootcode.inc | 36 +++++++++++++++++----------------- kernel/trunk/boot/booten.inc | 2 +- kernel/trunk/boot/bootge.inc | 2 +- kernel/trunk/boot/bootsp.inc | 2 +- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/kernel/trunk/boot/bootcode.inc b/kernel/trunk/boot/bootcode.inc index 0aaceda0e4..2381d55273 100644 --- a/kernel/trunk/boot/bootcode.inc +++ b/kernel/trunk/boot/bootcode.inc @@ -47,21 +47,21 @@ printplain: popa ret -getkey: +getkey: ; Use BIOS INT 16h to read a key from the keyboard ; get number in range [bl,bh] (bl,bh in ['0'..'9']) ; in: bx=range ; out: ax=digit (1..9, 10 for 0) - mov ah, 0 - int 16h - cmp al, bl - jb getkey - cmp al, bh + mov ah, 0 ; If 'int 16h' is called with 'ah' equal to zero, the BIOS will not return control + int 16h ; to the caller until a key is available in the system type ahead buffer. On return, + cmp al, bl ; 'al' contains the ASCII code for the key read from the buffer and 'ah' contains + jb getkey ; the keyboard scan code. Here we compare 'al' with the range of accepted characters. + cmp al, bh ; If the key pressed is not in the range, continue waiting for another key. ja getkey - push ax + push ax ; If the pressed key is in the accepted range, save it on the stack and echo to screen. call putchar pop ax - and ax, 0Fh - jnz @f + and ax, 0Fh ; ASCII code for '0' is 48 (110000b). 0F4=1111b. (110000b AND 1111b) = 0 + jnz @f ; So if key '0' was entered, return 10 in 'ax' mov al, 10 @@: ret @@ -779,9 +779,9 @@ end if mov si, bdev call print if defined extended_primary_loader - mov bx, '12' + mov bx, '12' ; range accepted for answer: 1-2 else - mov bx, '14' + mov bx, '14' ; range accepted for answer: 1-4 end if call getkey mov [preboot_device], al @@ -875,12 +875,12 @@ end if _setcursor 16,0 ; mov si, ask_dma // (earlier was: preboot_dma = use DMA access?) ; call print -; mov bx, '13' +; mov bx, '13' ; range accepted for answer: 1-3 ; call getkey ; mov [preboot_dma], al mov si, ask_bd call print - mov bx, '12' + mov bx, '12' ; range accepted for answer: 1-2 call getkey mov [preboot_biosdisk], al _setcursor 11,0 @@ -889,25 +889,25 @@ end if ; _setcursor 16,0 ; mov si, vrrmprint ; call print -; mov bx, '12' +; mov bx, '12' ; range accepted for answer: 1-2 ; call getkey ; mov [preboot_vrrm], al ; _setcursor 12,0 ; jmp .d -.change_c: ; c) preboot_debug = duplicates kernel debug output to the screen +.change_c: ; c) preboot_debug = duplicates kernel debug output to the screen _setcursor 16,0 mov si, ask_debug call print - mov bx, '12' + mov bx, '12' ; range accepted for answer: 1-2 call getkey mov [preboot_debug], al _setcursor 12,0 jmp .d -.change_d: ; d) preboot_launcher = start the first app (right now it's LAUNCHER) after kernel is loaded? +.change_d: ; d) preboot_launcher = start the first app (right now it's LAUNCHER) after kernel is loaded? _setcursor 16,0 mov si, ask_launcher call print - mov bx, '12' + mov bx, '12' ; range accepted for answer: 1-2 call getkey mov [preboot_launcher], al _setcursor 13,0 diff --git a/kernel/trunk/boot/booten.inc b/kernel/trunk/boot/booten.inc index 52caa046db..cdb07212e2 100644 --- a/kernel/trunk/boot/booten.inc +++ b/kernel/trunk/boot/booten.inc @@ -70,7 +70,7 @@ debug_mode_msg db " [c] Duplicate debug output to the screen:",0 ask_debug db "Duplicate debug output to the screen? [1-yes, 2-no]: ",0 launcher_msg db " [d] Start LAUNCHER after kernel is loaded:",0 -ask_launcher db "Start first app (LAUNCHER) after kernel is loaded? [1-yes, 2-no]: ",0 +ask_launcher db "Start first application (LAUNCHER) after kernel is loaded? [1-yes, 2-no]: ",0 preboot_device_msg db " [e] Floppy image: ",0 diff --git a/kernel/trunk/boot/bootge.inc b/kernel/trunk/boot/bootge.inc index 0aeebec46c..20b9589e82 100644 --- a/kernel/trunk/boot/bootge.inc +++ b/kernel/trunk/boot/bootge.inc @@ -72,7 +72,7 @@ debug_mode_msg db " [c] Duplizieren debuggen Ausgabe auf dem Bildschirm:",0 ask_debug db "Duplizieren debuggen Ausgabe auf dem Bildschirm? [1-ja, 2 nein]: ",0 launcher_msg db " [d] Start LAUNCHER nach Kernel geladen wird:",0 -ask_launcher db "Starten sie die erste App (LAUNCHER) nach Kernel geladen wird? [1-ja, 2 nein]: ",0 +ask_launcher db "Starten erste Anwendung nach Kernel geladen wird? [1-ja, 2 nein]: ",0 preboot_device_msg db " [e] Diskettenimage: ",0 diff --git a/kernel/trunk/boot/bootsp.inc b/kernel/trunk/boot/bootsp.inc index 1f6e6345aa..e57854f6c4 100644 --- a/kernel/trunk/boot/bootsp.inc +++ b/kernel/trunk/boot/bootsp.inc @@ -74,7 +74,7 @@ debug_mode_msg: cp850 " [c] Duplicar depurar salida a la pantalla:",0 ask_debug: cp850 "¿Duplicar depurar la salida a la pantalla? [1-si, 2-no]: ",0 launcher_msg: cp850 " [d] Iniciar LAUNCHER después de cargar kernel:",0 -ask_launcher: cp850 "¿Inicie la primera aplicación (LAUNCHER) después de cargar el kernel? [1-si, 2-no]: ",0 +ask_launcher: cp850 "¿Inicie la primera aplicación después de cargar el kernel? [1-si, 2-no]: ",0 preboot_device_msg:cp850 " [e] Imagen de disquete: ",0