PXELINUX: shorten code in pxenv call
authorGene Cumm <gene.cumm@gmail.com>
Sat, 13 Nov 2010 16:29:08 +0000 (11:29 -0500)
committerGene Cumm <gene.cumm@gmail.com>
Sat, 13 Nov 2010 16:29:08 +0000 (11:29 -0500)
Now that both scenarios are clear (do/do not call timer_cleanup/
timer_init), shorten it to eliminate a needless jmp.

core/pxelinux.asm

index 31741a9..e8818a6 100644 (file)
@@ -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