diff options
| author | Paulo Alcantara <pcacjr@zytor.com> | 2012-04-11 20:39:05 -0300 |
|---|---|---|
| committer | Paulo Alcantara <pcacjr@zytor.com> | 2012-04-11 21:25:33 -0300 |
| commit | 81eccba80e68d637197816d15659bd30425b5f13 (patch) | |
| tree | b579fe31707671915a9c1899cc707dd33deea6d6 /core/isolinux.asm | |
| parent | b0098b1dc0fde65e46a673656e97b18fbdfefc3b (diff) | |
| download | syslinux-81eccba80e68d637197816d15659bd30425b5f13.tar.gz | |
Remove core/ui.inc completely from Syslinux
The old UI used by Syslinux is no longer supported. The 32-bit environment
already provides us an awesome prompt.
All Syslinux variants do not depend on it anymore, thus they were
modified in order to support the new prompt provided by the ELF module
ldlinux.c32.
Signed-off-by: Paulo Alcantara <pcacjr@zytor.com>
Diffstat (limited to 'core/isolinux.asm')
| -rw-r--r-- | core/isolinux.asm | 55 |
1 files changed, 52 insertions, 3 deletions
diff --git a/core/isolinux.asm b/core/isolinux.asm index bc6878ba..5a50ff53 100644 --- a/core/isolinux.asm +++ b/core/isolinux.asm @@ -1168,6 +1168,10 @@ init_fs: mov di,[bsSecPerTrack] pm_call fs_init pm_call load_env32 +enter_command: +auto_boot: + jmp kaboom ; load_env32() should never return. If + ; it does, then kaboom! popad section .rodata @@ -1195,11 +1199,56 @@ debug_tracer: pushad ret %endif ; DEBUG_TRACERS + section .bss16 + global CmdOptPtr, KbdMap + alignb 4 +ThisKbdTo resd 1 ; Temporary holder for KbdTimeout +ThisTotalTo resd 1 ; Temporary holder for TotalTimeout +KernelExtPtr resw 1 ; During search, final null pointer +CmdOptPtr resw 1 ; Pointer to first option on cmd line +KbdFlags resb 1 ; Check for keyboard escapes +FuncFlag resb 1 ; Escape sequences received from keyboard +KernelType resb 1 ; Kernel type, from vkernel, if known +KbdMap resb 256 ; Keyboard map + global KernelName +KernelName resb FILENAME_MAX ; Mangled name for kernel + section .config + global PXERetry +PXERetry dw 0 ; Extra PXE retries + section .data16 + global SerialNotice +SerialNotice db 1 ; Only print this once +%if IS_PXELINUX + extern IPOption + global IPAppends, numIPAppends + alignz 2 +IPAppends dw IPOption +numIPAppends equ ($-IPAppends)/2 +%else +IPAppends equ 0 +numIPAppends equ 0 +%endif + + section .text16 +; +; COMBOOT-loading code +; +%include "comboot.inc" +%include "com32.inc" + +; +; Boot sector loading code +; + ; -; Now we have the config file open. Parse the config file and -; run the user interface. +; Abort loading code ; -%include "ui.inc" + +; +; Hardware cleanup common code +; + +%include "localboot.inc" ; ----------------------------------------------------------------------------- ; Common modules |