diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2006-09-22 23:24:45 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2006-09-22 23:24:45 -0700 |
| commit | ce38624d82626553018b85d210beb8ea34bd7eab (patch) | |
| tree | dbdc3387cdfc596015a48b3f494e26476a04e7d1 /isolinux.asm | |
| parent | a584b423450923389f4dc25480e30472c8641d38 (diff) | |
| download | syslinux-ce38624d82626553018b85d210beb8ea34bd7eab.tar.gz | |
Add support for forcing the filetype, and loading a secondary config file.
Add support for forcing the filetype, and loading a secondary config file.
Also bump the version number to version 3.40.
Diffstat (limited to 'isolinux.asm')
| -rw-r--r-- | isolinux.asm | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/isolinux.asm b/isolinux.asm index fd7cb75a..91746260 100644 --- a/isolinux.asm +++ b/isolinux.asm @@ -56,6 +56,7 @@ SECTOR_SIZE equ (1 << SECTOR_SHIFT) vk_vname: resb FILENAME_MAX ; Virtual name **MUST BE FIRST!** vk_rname: resb FILENAME_MAX ; Real name vk_appendlen: resw 1 +vk_type: resb 1 ; Type of file alignb 4 vk_append: resb max_cmd_len+1 ; Command line alignb 4 @@ -825,17 +826,16 @@ rl_checkpt_off equ ($-$$) ; ---------------------------------------------------------------------------- all_read: + +; Test tracers + TRACER 'T' + TRACER '>' + ; -; Initialize screen (if we're using one) +; Common initialization code ; - ; Now set up screen parameters - call adjust_screen - - ; Wipe the F-key area - mov al,NULLFILE - mov di,FKeyName - mov cx,10*(1 << FILENAME_MAX_LG2) - rep stosb +%include "init.inc" +%include "cpuinit.inc" ; Patch the writechr routine to point to the full code mov word [writechr+1], writechr_full-(writechr+3) @@ -846,16 +846,6 @@ all_read: call writestr %endif -; Test tracers - TRACER 'T' - TRACER '>' - -; -; Common initialization code -; -%include "init.inc" -%include "cpuinit.inc" - ; ; Now we're all set to start with our *real* business. First load the ; configuration file (if any) and parse it. @@ -1476,6 +1466,7 @@ getfssec: %include "getc.inc" ; getc et al %include "conio.inc" ; Console I/O +%include "configinit.inc" ; Initialize configuration %include "parseconfig.inc" ; High-level config file handling %include "parsecmd.inc" ; Low-level config file handling %include "bcopy32.inc" ; 32-bit bcopy @@ -1514,7 +1505,6 @@ err_oldkernel db 'Cannot load a ramdisk with an old kernel image.' db CR, LF, 0 err_notdos db ': attempted DOS system call', CR, LF, 0 err_comlarge db 'COMBOOT image too large.', CR, LF, 0 -err_bssimage db 'BSS images not supported.', CR, LF, 0 err_a20 db CR, LF, 'A20 gate not responding!', CR, LF, 0 notfound_msg db 'not found', CR, LF, 0 localboot_msg db 'Booting from local disk...', CR, LF, 0 |