aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGene Cumm <gene.cumm@gmail.com>2010-11-13 11:29:08 -0500
committerGene Cumm <gene.cumm@gmail.com>2010-11-13 11:29:08 -0500
commit5a8a7bf7cb8b312b9d5bf28cc17ecb4c410be2c6 (patch)
tree9160e7885649d3f1fc13b2806c2de5f6bbf9c1d4
parent3341e22cf54e2d2da856c82c6f09e8d06b72be72 (diff)
downloadsyslinux-5a8a7bf7cb8b312b9d5bf28cc17ecb4c410be2c6.tar.gz
syslinux-5a8a7bf7cb8b312b9d5bf28cc17ecb4c410be2c6.tar.xz
syslinux-5a8a7bf7cb8b312b9d5bf28cc17ecb4c410be2c6.zip
PXELINUX: shorten code in pxenv call
Now that both scenarios are clear (do/do not call timer_cleanup/ timer_init), shorten it to eliminate a needless jmp.
-rw-r--r--core/pxelinux.asm6
1 files changed, 2 insertions, 4 deletions
diff --git a/core/pxelinux.asm b/core/pxelinux.asm
index 31741a93..e8818a6c 100644
--- a/core/pxelinux.asm
+++ b/core/pxelinux.asm
@@ -369,8 +369,7 @@ pxenv:
cmp bx,0073h ; PXENV_RESTART_TFTP
jz .disable_timer
cmp bx,00E5h ; gPXE PXENV_FILE_EXEC
- jz .disable_timer
- jmp .store_stack
+ jnz .store_stack
.disable_timer:
call timer_cleanup
@@ -407,8 +406,7 @@ pxenv:
cmp bx,0073h
jz .enable_timer
cmp bx,00E5h
- jz .enable_timer
- jmp .pop_flags
+ jnz .pop_flags
.enable_timer:
call timer_init