diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-05-18 14:32:57 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-05-18 14:32:57 -0700 |
| commit | 12ae69d843447d3a973b0d9087f4f34f18e96ae8 (patch) | |
| tree | 4e301fda2cf201bddda9e9ed445958308e8e3e24 /core/comboot.inc | |
| parent | b59d70ca4c0140550d9be8d029dc79e605fa3954 (diff) | |
| parent | 4826c90afd85d3bc8ee963de0bf1438340db865a (diff) | |
| download | syslinux-12ae69d843447d3a973b0d9087f4f34f18e96ae8.tar.gz | |
Merge branch 'master' into core32
Conflicts:
core/extlinux.asm
core/isolinux.asm
core/ldlinux.asm
core/pxeidle.inc
core/pxelinux.asm
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'core/comboot.inc')
| -rw-r--r-- | core/comboot.inc | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/core/comboot.inc b/core/comboot.inc index b1048bb5..57e631ef 100644 --- a/core/comboot.inc +++ b/core/comboot.inc @@ -391,24 +391,11 @@ comboot_getchar: ; ; INT 28h - DOS idle ; -%ifdef HAVE_IDLE comboot_int28: cli cld - pushad - xor ax,ax - push ds - push es - mov ds,ax - mov es,ax - DO_IDLE - pop es - pop ds - popad + call do_idle iret -%else -comboot_int28 equ comboot_iret -%endif ; ; INT 29h - DOS fast write character @@ -724,22 +711,11 @@ comapi_dnsresolv equ comapi_err ; ; INT 22h AX=0013h Idle call ; -; -; *** FIX THIS *** -; The idle call seems to have detrimental effects on some machines when -; called from a COM32 context (WHY?) -- disable it for now. -; *** IS THIS STILL TRUE? *** -; -%ifdef HAVE_IDLE comapi_idle: - DO_IDLE + call do_idle clc ret -%else -comapi_idle equ comapi_err -%endif - ; ; INT 22h AX=0014h Local boot ; @@ -1067,7 +1043,7 @@ zero_string db 0 ; Empty, null-terminated string ; in pxe_detect_nic_type ; feature_flags: - db 3 ; Have local boot, idle is noop + db 1 ; Have local boot, idle is not noop feature_flags_len equ ($-feature_flags) err_notdos db ': attempted DOS system call INT ',0 |