aboutsummaryrefslogtreecommitdiffstats
path: root/core/isolinux.asm
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-06-27 12:02:48 -0700
committerH. Peter Anvin <hpa@zytor.com>2010-06-27 12:02:48 -0700
commitb775b0040fe57ef71ec9cd98f9c124a3d116269b (patch)
treeec85cf4b93d4d6ad4e5aa0eeeff0c8db14149a6c /core/isolinux.asm
parent7ccf85b2a873bba3f363ad2df05457dd160c3f6d (diff)
downloadsyslinux-b775b0040fe57ef71ec9cd98f9c124a3d116269b.tar.gz
Export the 64-bit partition offset and use it in chain.c
When used with the "fs" option to chain.c32, we need to know our own filesystem offset. That means knowing if we used the MBR vs GPT partition information, as well as if we ended up using the passed-in information or not. Resolve this by providing an explicit pointer to the current partition offset. Eventually this should be replaced by some kind of statfs() call. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'core/isolinux.asm')
-rw-r--r--core/isolinux.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/core/isolinux.asm b/core/isolinux.asm
index 80607679..d9d630ee 100644
--- a/core/isolinux.asm
+++ b/core/isolinux.asm
@@ -101,7 +101,7 @@ ISOFlags resb 1 ; Flags for ISO directory search
RetryCount resb 1 ; Used for disk access retries
alignb 8
-bsHidden resq 1 ; Used in hybrid mode
+Hidden resq 1 ; Used in hybrid mode
bsSecPerTrack resw 1 ; Used in hybrid mode
bsHeads resw 1 ; Used in hybrid mode
@@ -242,8 +242,8 @@ _start_hybrid:
pop eax
pop ebx
.nooffset:
- mov [cs:bsHidden],eax
- mov [cs:bsHidden+4],ebx
+ mov [cs:Hidden],eax
+ mov [cs:Hidden+4],ebx
mov si,bios_cbios
jcxz _start_common
@@ -779,8 +779,8 @@ getlinsec_ebios:
xor edx,edx
shld edx,eax,2
shl eax,2 ; Convert to HDD sectors
- add eax,[bsHidden]
- adc edx,[bsHidden+4]
+ add eax,[Hidden]
+ adc edx,[Hidden+4]
shl bp,2
.loop:
@@ -852,7 +852,7 @@ getlinsec_ebios:
getlinsec_cbios:
xor edx,edx
shl eax,2 ; Convert to HDD sectors
- add eax,[bsHidden]
+ add eax,[Hidden]
shl bp,2
.loop:
@@ -1165,8 +1165,8 @@ init_fs:
.hybrid:
movzx ebp,word [MaxTransfer]
.common:
- mov ecx,[bsHidden]
- mov ebx,[bsHidden+4]
+ mov ecx,[Hidden]
+ mov ebx,[Hidden+4]
mov si,[bsHeads]
mov di,[bsSecPerTrack]
pm_call fs_init