diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2007-02-10 13:22:40 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2007-02-10 13:22:40 -0800 |
| commit | 14df2f8046001f2dc24e1f65bb17c6e31dfbbd09 (patch) | |
| tree | e1aa9c709cd2e3ff208d2160157bac9f3acff61c /ui.inc | |
| parent | 1970446f95df5ac0a0d3b2b0e90b72e0dd353699 (diff) | |
| parent | d48bb2b249d996587cfe6e39e810a9805d013abe (diff) | |
| download | syslinux-3.40-pre5.tar.gz | |
Merge with git+ssh://master.kernel.org/pub/scm/boot/syslinux/syslinux.git#syslinux-3.3xsyslinux-3.40-pre5
Diffstat (limited to 'ui.inc')
| -rw-r--r-- | ui.inc | 22 |
1 files changed, 1 insertions, 21 deletions
@@ -324,10 +324,6 @@ vk_check: ; 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... - mov eax,[KernelName+8] ; Save initial extension - mov [exten_table_end],eax ; Last case == initial ext. -%else mov di,KernelName+4*IS_PXELINUX xor al,al mov cx,FILENAME_MAX-5 ; Need 4 chars + null @@ -335,7 +331,6 @@ get_kernel: mov byte [KernelName+FILENAME_MAX],0 ; Zero-terminate filename/e jne .no_skip dec di ; Point to final null .no_skip: mov [KernelExtPtr],di -%endif mov bx,exten_table .search_loop: push bx mov di,KernelName ; Search on disk @@ -343,13 +338,9 @@ get_kernel: mov byte [KernelName+FILENAME_MAX],0 ; Zero-terminate filename/e pop bx jnz kernel_good mov eax,[bx] ; Try a different extension -%if IS_SYSLINUX || IS_MDSLINUX - mov [KernelName+8],eax -%else mov si,[KernelExtPtr] mov [si],eax mov byte [si+4],0 -%endif add bx,byte 4 cmp bx,exten_table_end jna .search_loop ; allow == case (final case) @@ -493,10 +484,6 @@ kernel_good: mov [KernelCNameLen],di popa -%if IS_SYSLINUX || IS_MDSLINUX - mov ecx,[KernelName+7] - mov cl,'.' -%else push di push ax mov di,KernelName+4*IS_PXELINUX @@ -508,7 +495,6 @@ kernel_good: .one_step: mov ecx,[di-4] ; 4 bytes before end pop ax pop di -%endif ; ; At this point, DX:AX contains the size of the kernel, SI contains @@ -535,19 +521,13 @@ is_unknown_filetype: je is_bss_sector cmp ecx,'.bin' je is_bootsector -%if IS_SYSLINUX || IS_MDSLINUX - cmp ecx,'.bs ' - je is_bootsector - cmp ecx,'.0 ' - je is_bootsector -%else shr ecx,8 cmp ecx,'.bs' je is_bootsector shr ecx,8 cmp cx,'.0' je is_bootsector -%endif + ; Otherwise Linux kernel jmp is_linux_kernel |