diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2007-02-10 13:22:40 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2007-02-10 13:22:40 -0800 |
| commit | 14df2f8046001f2dc24e1f65bb17c6e31dfbbd09 (patch) | |
| tree | e1aa9c709cd2e3ff208d2160157bac9f3acff61c /ldlinux.asm | |
| parent | 1970446f95df5ac0a0d3b2b0e90b72e0dd353699 (diff) | |
| parent | d48bb2b249d996587cfe6e39e810a9805d013abe (diff) | |
| download | syslinux-3.40-pre5.tar.gz | |
Merge with git+ssh://master.kernel.org/pub/scm/boot/syslinux/syslinux.git#syslinux-3.3xsyslinux-3.40-pre5
Diffstat (limited to 'ldlinux.asm')
| -rw-r--r-- | ldlinux.asm | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/ldlinux.asm b/ldlinux.asm index d1c0c65a..69259247 100644 --- a/ldlinux.asm +++ b/ldlinux.asm @@ -123,7 +123,6 @@ RootDir resd 1 ; Location of root directory proper DataArea resd 1 ; Location of data area RootDirSize resd 1 ; Root dir size in sectors TotalSectors resd 1 ; Total number of sectors -EndSector resd 1 ; Location of filesystem end ClustSize resd 1 ; Bytes/cluster ClustMask resd 1 ; Sectors/cluster - 1 CopySuper resb 1 ; Distinguish .bs versus .bss @@ -795,9 +794,6 @@ genfatinfo: .have_secs: mov [TotalSectors],edx - add edx,eax - mov [EndSector],edx - mov eax,[bxResSectors] mov [FAT],eax ; Beginning of FAT mov edx,[bxFATsecs] @@ -835,7 +831,7 @@ genfatinfo: ; FAT12, FAT16 or FAT28^H^H32? This computation is fscking ridiculous. ; getfattype: - mov eax,[EndSector] + mov eax,[TotalSectors] sub eax,[DataArea] shr eax,cl ; cl == ClustShift mov cl,nextcluster_fat12-(nextcluster+2) @@ -1605,11 +1601,11 @@ initrd_cmd_len equ 7 ; ; Extensions to search for (in *forward* order). ; -exten_table: db 'CBT',0 ; COMBOOT (specific) - db 'BSS',0 ; Boot Sector (add superblock) - db 'BS ',0 ; Boot Sector - db 'COM',0 ; COMBOOT (same as DOS) - db 'C32',0 ; COM32 +exten_table: db '.cbt' ; COMBOOT (specific) + db '.bss' ; Boot Sector (add superblock) + db '.bs', 0 ; Boot Sector + db '.com' ; COMBOOT (same as DOS) + db '.c32' ; COM32 exten_table_end: dd 0, 0 ; Need 8 null bytes here |