[FATxxx BOOTSECTORS]: Whitespace changes mainly (makes easier for diffing). No code changes.

svn path=/trunk/; revision=70428
This commit is contained in:
Hermès Bélusca-Maïto 2015-12-26 20:13:27 +00:00
parent 909f7439d0
commit 6a513178c3
5 changed files with 703 additions and 702 deletions

View file

@ -275,7 +275,7 @@ ReadCluster:
mov cl, byte ptr BP_REL(SectsPerCluster) mov cl, byte ptr BP_REL(SectsPerCluster)
mul cx // Times sectors per cluster mul cx // Times sectors per cluster
add ax, [bp-DataAreaStartLow] // Add start of data area add ax, [bp-DataAreaStartLow] // Add start of data area
adc dx, [bp-DataAreaStartHigh] // Now we have DX:AX with the logical start sector of OSLOADER.SYS adc dx, [bp-DataAreaStartHigh] // Now we have DX:AX with the logical start sector of FREELDR.SYS
xor bx, bx // We will load it to [ES:0000], ES loaded before function call xor bx, bx // We will load it to [ES:0000], ES loaded before function call
// mov cl,BYTE [BYTE bp+SectsPerCluster]// Sectors per cluster still in CX // mov cl,BYTE [BYTE bp+SectsPerCluster]// Sectors per cluster still in CX
// call ReadSectors // call ReadSectors
@ -409,10 +409,11 @@ NoCarryCHS:
msgDiskError: msgDiskError:
.ascii "Disk error", CR, LF, NUL .ascii "Disk error", CR, LF, NUL
msgFreeLdr: msgFreeLdr:
.ascii "ldr not found", CR, LF, NUL .ascii "Ldr not found", CR, LF, NUL
// Sorry, need the space... // Sorry, need the space...
// msgAnyKey: // msgAnyKey:
// .ascii "Press any key to restart", CR, LF, NUL // .ascii "Press any key to restart", CR, LF, NUL
// .ascii "Press a key", CR, LF, NUL
filename: filename:
.ascii "FREELDR SYS" .ascii "FREELDR SYS"

View file

@ -260,7 +260,7 @@ ReadCluster:
mov cl,BYTE [BYTE bp+SectsPerCluster] mov cl,BYTE [BYTE bp+SectsPerCluster]
mul cx ; Times sectors per cluster mul cx ; Times sectors per cluster
add ax,[BYTE bp-DataAreaStartLow] ; Add start of data area add ax,[BYTE bp-DataAreaStartLow] ; Add start of data area
adc dx,[BYTE bp-DataAreaStartHigh] ; Now we have DX:AX with the logical start sector of OSLOADER.SYS adc dx,[BYTE bp-DataAreaStartHigh] ; Now we have DX:AX with the logical start sector of FREELDR.SYS
xor bx,bx ; We will load it to [ES:0000], ES loaded before function call xor bx,bx ; We will load it to [ES:0000], ES loaded before function call
;mov cl,BYTE [BYTE bp+SectsPerCluster]; Sectors per cluster still in CX ;mov cl,BYTE [BYTE bp+SectsPerCluster]; Sectors per cluster still in CX
;call ReadSectors ;call ReadSectors
@ -391,10 +391,10 @@ NoCarryCHS:
msgDiskError db 'Disk error',0dh,0ah,0 msgDiskError db 'Disk error',0dh,0ah,0
msgFreeLdr db 'ldr not found',0dh,0ah,0 msgFreeLdr db 'Ldr not found',0dh,0ah,0
; Sorry, need the space... ; Sorry, need the space...
;msgAnyKey db 'Press any key to restart',0dh,0ah,0 ;msgAnyKey db 'Press any key to restart',0dh,0ah,0
msgAnyKey db 'Press a key',0dh,0ah,0 ;msgAnyKey db 'Press a key',0dh,0ah,0
filename db 'FREELDR SYS' filename db 'FREELDR SYS'
times 509-($-$$) db 0 ; Pad to 509 bytes times 509-($-$$) db 0 ; Pad to 509 bytes

View file

@ -3,7 +3,7 @@
* PROJECT: ReactOS Bootsector * PROJECT: ReactOS Bootsector
* FILE: boot/freeldr/bootsect/fat32.S * FILE: boot/freeldr/bootsect/fat32.S
* PURPOSE: * PURPOSE:
* PROGRAMMERS: ? * PROGRAMMERS: Brian Palmer
*/ */
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
@ -339,7 +339,7 @@ ContinueSearch:
call ReadCluster // Read the cluster call ReadCluster // Read the cluster
// Now we have to find our way through the root directory to // Now we have to find our way through the root directory to
// The OSLOADER.SYS file // The FREELDR.SYS file
xor bx,bx xor bx,bx
mov bl, byte ptr BP_REL(SectsPerCluster) mov bl, byte ptr BP_REL(SectsPerCluster)
shl bx, 4 // BX = BX * 512 / 32 shl bx, 4 // BX = BX * 512 / 32
@ -493,7 +493,7 @@ FatSectorInCache: // This variable tells us which
// Reads cluster number in EAX into [ES:0000] // Reads cluster number in EAX into [ES:0000]
ReadCluster: ReadCluster:
// StartSector = ((Cluster - 2) * SectorsPerCluster) + ReservedSectors + HiddenSectors// // StartSector = ((Cluster - 2) * SectorsPerCluster) + ReservedSectors + HiddenSectors;
dec eax dec eax
dec eax dec eax

View file

@ -306,7 +306,7 @@ ContinueSearch:
; Now we have to find our way through the root directory to ; Now we have to find our way through the root directory to
; The OSLOADER.SYS file ; The FREELDR.SYS file
xor bx,bx xor bx,bx
mov bl,[BYTE bp+SectsPerCluster] mov bl,[BYTE bp+SectsPerCluster]
shl bx,4 ; BX = BX * 512 / 32 shl bx,4 ; BX = BX * 512 / 32

View file

@ -1,8 +1,8 @@
/* /*
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS Bootsector * PROJECT: ReactOS Bootsector
* FILE: boot/freeldr/bootsect/fatx.S * FILE: boot/freeldr/bootsect/faty.S
* PURPOSE: Combined FAT16 and FAT32 boot sector * PURPOSE: Combined FAT12, FAT16 and FAT32 boot sector
* PROGRAMMERS: Brian Palmer * PROGRAMMERS: Brian Palmer
* Timo Kreuzer * Timo Kreuzer
*/ */