aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhpa <hpa>1999-09-06 03:39:16 +0000
committerhpa <hpa>1999-09-06 03:39:16 +0000
commit830548566cfd6c922a64c9a98b1e7e14a09cdfe9 (patch)
tree25437226fdd9bca3d59e520a1c20ec4ee2153d8f
parent745e3294e9bb5a342eaabfa9840303956e3ec231 (diff)
downloadsyslinux.git-830548566cfd6c922a64c9a98b1e7e14a09cdfe9.tar.gz
syslinux.git-830548566cfd6c922a64c9a98b1e7e14a09cdfe9.tar.xz
syslinux.git-830548566cfd6c922a64c9a98b1e7e14a09cdfe9.zip
* !PXE pointer is offset 26h, not 26, in PXENV+ structure
* We're now working on version 1.46.
-rw-r--r--pxelinux.asm6
-rw-r--r--version2
2 files changed, 6 insertions, 2 deletions
diff --git a/pxelinux.asm b/pxelinux.asm
index f726831a..6a6dd903 100644
--- a/pxelinux.asm
+++ b/pxelinux.asm
@@ -332,6 +332,9 @@ _start1:
cmp ax,564Eh
jne no_pxe
+ mov si,found_pxenv
+ call writestr
+
; Okay, that gave us the PXENV+ structure, find !PXE
; structure from that
cmp dword [es:bx], 'PXEN'
@@ -340,7 +343,7 @@ _start1:
jne no_pxe
cmp word [es:bx+6], 0201h ; API version 2.1 or higher
jb no_pxe
- les bx,[es:bx+26] ; !PXE structure pointer
+ les bx,[es:bx+26h] ; !PXE structure pointer
cmp dword [es:bx],'!PXE'
je have_pxe
@@ -2923,6 +2926,7 @@ err_bootfailed db 0Dh, 0Ah, 'Boot failed: please change disks and press '
db 'a key to continue.', 0Dh, 0Ah, 0
bailmsg equ err_bootfailed
err_nopxe db 'Cannot find !PXE structure, I want my mommy!' ,0Dh, 0Ah, 0
+found_pxenv db 'Found PXENV+ structure', 0Dh, 0Ah, 0
loading_msg db 'Loading ', 0
dotdot_msg db '.'
dot_msg db '.', 0
diff --git a/version b/version
index 24c87c51..7ab887e2 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.45
+1.46