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/ui.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/ui.inc')
| -rw-r--r-- | core/ui.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/ui.inc b/core/ui.inc index 5ac8d8c2..4a97e7d3 100644 --- a/core/ui.inc +++ b/core/ui.inc @@ -526,7 +526,7 @@ kernel_corrupt: mov si,err_notkernel ; getchar_timeout: call vgashowcursor - RESET_IDLE + call reset_idle .loop: push word [BIOS_timer] @@ -535,7 +535,7 @@ getchar_timeout: pop ax cmp ax,[BIOS_timer] ; Has the timer advanced? je .loop - DO_IDLE + call do_idle dec dword [ThisKbdTo] jz .timeout |