aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhpa <hpa>2003-05-20 00:56:41 +0000
committerhpa <hpa>2003-05-20 00:56:41 +0000
commit2b32fdf7846a8b80366320ea03f438761734d49f (patch)
tree8400534804800d4ba7162e55d641d77e4a89c7ab
parent05b031712688ef9cb724784ec246fa54813c0f7c (diff)
downloadsyslinux-elf-syslinux-2.05-pre1.tar.gz
syslinux-elf-syslinux-2.05-pre1.tar.xz
syslinux-elf-syslinux-2.05-pre1.zip
Formatting changes; comboot bug fix(?)syslinux-2.05-pre1
-rw-r--r--comboot.inc7
-rw-r--r--ui.inc4
2 files changed, 8 insertions, 3 deletions
diff --git a/comboot.inc b/comboot.inc
index d358147d..2e768ea4 100644
--- a/comboot.inc
+++ b/comboot.inc
@@ -98,6 +98,11 @@ is_comboot_image:
shl ax,6 ; Kilobytes -> paragraphs
mov word [es:02h],ax
+%ifndef DEPEND
+%if real_mode_seg != comboot_seg
+%error "This code assumes real_mode_seg == comboot_seg"
+%endif
+%endif
; Copy the command line from high memory
mov cx,125 ; Max cmdline len (minus space and CR)
mov si,[CmdOptPtr]
@@ -105,7 +110,7 @@ is_comboot_image:
mov al,' ' ; DOS command lines begin with a space
stosb
-comboot_cmd_cp: lodsb
+comboot_cmd_cp: es lodsb
and al,al
jz comboot_end_cmd
stosb
diff --git a/ui.inc b/ui.inc
index 57114395..e3563e7f 100644
--- a/ui.inc
+++ b/ui.inc
@@ -23,7 +23,7 @@ check_for_key:
cmp word [ForcePrompt],byte 0 ; Force prompt?
jnz enter_command
test byte [KbdFlags],5Bh ; Caps, Scroll, Shift, Alt
- jz auto_boot ; If neither, default boot
+ jz auto_boot ; If neither, default boot
enter_command:
mov si,boot_prompt
@@ -240,7 +240,7 @@ not_vk: pop ds
; Find the kernel on disk
;
get_kernel: mov byte [KernelName+FILENAME_MAX],0 ; Zero-terminate filename/extension
-%if IS_SYSLINUX || IS_MDSLINUX ; SYSLINUX has to deal with DOS mangled names...
+%if IS_SYSLINUX || IS_MDSLINUX ; SYSLINUX has to deal with DOS mangled names...
mov eax,[KernelName+8] ; Save initial extension
mov [exten_table_end],eax ; Last case == initial ext.
%else