aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2007-02-19 16:26:52 -0800
committerH. Peter Anvin <hpa@zytor.com>2007-02-19 16:26:52 -0800
commitf649639c3b8047514dcad161d781370199b8c560 (patch)
treefcaf7aa1d929055d2f1f08df00fd1934e892a404
parent14df2f8046001f2dc24e1f65bb17c6e31dfbbd09 (diff)
parentc7c51cdcd0a094c2588f8a816542bc57bb4efb34 (diff)
downloadsyslinux-f649639c3b8047514dcad161d781370199b8c560.tar.gz
syslinux-f649639c3b8047514dcad161d781370199b8c560.tar.xz
syslinux-f649639c3b8047514dcad161d781370199b8c560.zip
Merge with syslinux-3.3x
-rw-r--r--comboot.doc2
-rw-r--r--comboot.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/comboot.doc b/comboot.doc
index 0d7af174..add593ac 100644
--- a/comboot.doc
+++ b/comboot.doc
@@ -736,7 +736,7 @@ AX=0018h [3.30] Query custom font
been loaded, AL contains zero.
-AX=0019h [3.35] Read disk [SYSLINUX, ISOLINUX, EXTLINUX]
+AX=0019h [3.xx] Read disk [SYSLINUX, ISOLINUX, EXTLINUX]
Input: AX 0019h
EDX Sector number
ESI Reserved - MUST BE ZERO
diff --git a/comboot.inc b/comboot.inc
index 304accaa..01a18240 100644
--- a/comboot.inc
+++ b/comboot.inc
@@ -786,9 +786,9 @@ comapi_readdisk:
or esi,P_EDI ; are reserved for future expansion
jnz .err
mov eax,P_EDX
- mov bp,P_CX
mov es,P_ES
mov bx,P_BX
+ mov bp,P_CX ; WE CANNOT use P_* after touching bp!
call getlinsec
clc
ret