https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8c55fdd17caf0c243b1eab...
commit 8c55fdd17caf0c243b1eab06781e34d9ef7c9657 Author: Stanislav Motylkov x86corez@gmail.com AuthorDate: Mon Jul 15 22:40:10 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO hermes.belusca-maito@reactos.org CommitDate: Thu Jul 18 22:49:51 2019 +0200
[FREELDR] Whitespace improvements - no code changes --- boot/freeldr/freeldr/arch/i386/xboxdisk.c | 12 ++-- boot/freeldr/freeldr/arch/i386/xboxmem.c | 105 +++++++++++++++--------------- 2 files changed, 59 insertions(+), 58 deletions(-)
diff --git a/boot/freeldr/freeldr/arch/i386/xboxdisk.c b/boot/freeldr/freeldr/arch/i386/xboxdisk.c index dcdf3199092..c63f066551c 100644 --- a/boot/freeldr/freeldr/arch/i386/xboxdisk.c +++ b/boot/freeldr/freeldr/arch/i386/xboxdisk.c @@ -433,21 +433,21 @@ XboxDiskReadLogicalSectors(UCHAR DriveNumber, ULONGLONG SectorNumber, ULONG Sect ULONG StartSector; UCHAR Count;
- if (DriveNumber < 0x80 || 2 <= (DriveNumber & 0x0f)) + if (DriveNumber < 0x80 || (DriveNumber & 0x0f) >= 2) { /* Xbox has only 1 IDE controller and no floppy */ WARN("Invalid drive number\n"); return FALSE; }
- if (UINT64_C(0) != ((SectorNumber + SectorCount) & UINT64_C(0xfffffffff0000000))) + if (((SectorNumber + SectorCount) & UINT64_C(0xfffffffff0000000)) != UINT64_C(0)) { FIXME("48bit LBA required but not implemented\n"); return FALSE; }
StartSector = (ULONG) SectorNumber; - while (0 < SectorCount) + while (SectorCount > 0) { Count = (SectorCount <= 255 ? (UCHAR)SectorCount : 255); if (!XboxDiskPolledRead(XBOX_IDE_COMMAND_PORT, @@ -457,7 +457,7 @@ XboxDiskReadLogicalSectors(UCHAR DriveNumber, ULONGLONG SectorNumber, ULONG Sect (StartSector >> 8) & 0xff, (StartSector >> 16) & 0xff, ((StartSector >> 24) & 0x0f) | IDE_DH_LBA | - (0 == (DriveNumber & 0x0f) ? IDE_DH_DRV0 : IDE_DH_DRV1), + ((DriveNumber & 0x0f) == 0 ? IDE_DH_DRV0 : IDE_DH_DRV1), IDE_CMD_READ, Buffer)) { @@ -512,7 +512,7 @@ XboxDiskGetDriveGeometry(UCHAR DriveNumber, PGEOMETRY Geometry) 0, 0, 0, - (0 == (DriveNumber & 0x0f) ? IDE_DH_DRV0 : IDE_DH_DRV1), + ((DriveNumber & 0x0f) == 0 ? IDE_DH_DRV0 : IDE_DH_DRV1), (Atapi ? IDE_CMD_IDENT_ATAPI_DRV : IDE_CMD_IDENT_ATA_DRV), (PUCHAR) &DrvParms)) { @@ -524,7 +524,7 @@ XboxDiskGetDriveGeometry(UCHAR DriveNumber, PGEOMETRY Geometry) Geometry->Heads = DrvParms.LogicalHeads; Geometry->Sectors = DrvParms.SectorsPerTrack;
- if (! Atapi && 0 != (DrvParms.Capabilities & IDE_DRID_LBA_SUPPORTED)) + if (!Atapi && (DrvParms.Capabilities & IDE_DRID_LBA_SUPPORTED) != 0) { /* LBA ATA drives always have a sector size of 512 */ Geometry->BytesPerSector = 512; diff --git a/boot/freeldr/freeldr/arch/i386/xboxmem.c b/boot/freeldr/freeldr/arch/i386/xboxmem.c index 36c2f0bf108..2e763bb0b8c 100644 --- a/boot/freeldr/freeldr/arch/i386/xboxmem.c +++ b/boot/freeldr/freeldr/arch/i386/xboxmem.c @@ -15,8 +15,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Note: much of this code was based on knowledge and/or code developed - * by the Xbox Linux group: http://www.xbox-linux.org + * Note: much of this code was based on knowledge and/or code developed + * by the Xbox Linux group: http://www.xbox-linux.org */
#include <freeldr.h> @@ -25,53 +25,53 @@ static ULONG InstalledMemoryMb = 0; static ULONG AvailableMemoryMb = 0;
#define TEST_SIZE 0x200 -#define TEST_PATTERN1 0xaa +#define TEST_PATTERN1 0xAA #define TEST_PATTERN2 0x55
VOID XboxMemInit(VOID) { - UCHAR ControlRegion[TEST_SIZE]; - PVOID MembaseTop = (PVOID)(64 * 1024 * 1024); - PVOID MembaseLow = (PVOID)0; + UCHAR ControlRegion[TEST_SIZE]; + PVOID MembaseTop = (PVOID)(64 * 1024 * 1024); + PVOID MembaseLow = (PVOID)0;
- (*(PULONG)(0xfd000000 + 0x100200)) = 0x03070103 ; - (*(PULONG)(0xfd000000 + 0x100204)) = 0x11448000 ; + (*(PULONG)(0xfd000000 + 0x100200)) = 0x03070103; + (*(PULONG)(0xfd000000 + 0x100204)) = 0x11448000;
- WRITE_PORT_ULONG((ULONG*) 0xcf8, CONFIG_CMD(0, 0, 0x84)); - WRITE_PORT_ULONG((ULONG*) 0xcfc, 0x7ffffff); /* Prep hardware for 128 Mb */ + WRITE_PORT_ULONG((ULONG*) 0xcf8, CONFIG_CMD(0, 0, 0x84)); + WRITE_PORT_ULONG((ULONG*) 0xcfc, 0x7ffffff); /* Prep hardware for 128 Mb */
- InstalledMemoryMb = 64; - memset(ControlRegion, TEST_PATTERN1, TEST_SIZE); - memset(MembaseTop, TEST_PATTERN1, TEST_SIZE); - __wbinvd(); + InstalledMemoryMb = 64; + memset(ControlRegion, TEST_PATTERN1, TEST_SIZE); + memset(MembaseTop, TEST_PATTERN1, TEST_SIZE); + __wbinvd();
- if (0 == memcmp(MembaseTop, ControlRegion, TEST_SIZE)) + if (memcmp(MembaseTop, ControlRegion, TEST_SIZE) == 0) { - /* Looks like there is memory .. maybe a 128MB box */ - memset(ControlRegion, TEST_PATTERN2, TEST_SIZE); - memset(MembaseTop, TEST_PATTERN2, TEST_SIZE); - __wbinvd(); - if (0 == memcmp(MembaseTop, ControlRegion, TEST_SIZE)) + /* Looks like there is memory .. maybe a 128MB box */ + memset(ControlRegion, TEST_PATTERN2, TEST_SIZE); + memset(MembaseTop, TEST_PATTERN2, TEST_SIZE); + __wbinvd(); + if (memcmp(MembaseTop, ControlRegion, TEST_SIZE) == 0) { - /* Definitely looks like there is memory */ - if (0 == memcmp(MembaseLow, ControlRegion, TEST_SIZE)) + /* Definitely looks like there is memory */ + if (memcmp(MembaseLow, ControlRegion, TEST_SIZE) == 0) { - /* Hell, we find the Test-string at 0x0 too ! */ - InstalledMemoryMb = 64; + /* Hell, we find the Test-string at 0x0 too! */ + InstalledMemoryMb = 64; } - else + else { - InstalledMemoryMb = 128; + InstalledMemoryMb = 128; } } }
- /* Set hardware for amount of memory detected */ - WRITE_PORT_ULONG((ULONG*) 0xcf8, CONFIG_CMD(0, 0, 0x84)); - WRITE_PORT_ULONG((ULONG*) 0xcfc, InstalledMemoryMb * 1024 * 1024 - 1); + /* Set hardware for amount of memory detected */ + WRITE_PORT_ULONG((ULONG*) 0xcf8, CONFIG_CMD(0, 0, 0x84)); + WRITE_PORT_ULONG((ULONG*) 0xcfc, InstalledMemoryMb * 1024 * 1024 - 1);
- AvailableMemoryMb = InstalledMemoryMb; + AvailableMemoryMb = InstalledMemoryMb; }
FREELDR_MEMORY_DESCRIPTOR XboxMemoryMap[2]; @@ -79,40 +79,41 @@ FREELDR_MEMORY_DESCRIPTOR XboxMemoryMap[2]; PFREELDR_MEMORY_DESCRIPTOR XboxMemGetMemoryMap(ULONG *MemoryMapSize) { - /* Synthesize memory map */ - /* Available RAM block */ - XboxMemoryMap[0].BasePage = 0; - XboxMemoryMap[0].PageCount = AvailableMemoryMb * 1024 * 1024 / MM_PAGE_SIZE; - XboxMemoryMap[0].MemoryType = LoaderFree; - - /* Video memory */ - XboxMemoryMap[1].BasePage = AvailableMemoryMb * 1024 * 1024 / MM_PAGE_SIZE; - XboxMemoryMap[1].PageCount = (InstalledMemoryMb - AvailableMemoryMb) * 1024 * 1024 / MM_PAGE_SIZE; - XboxMemoryMap[1].MemoryType = LoaderFirmwarePermanent; - - *MemoryMapSize = 2; - return XboxMemoryMap; + /* Synthesize memory map */ + + /* Available RAM block */ + XboxMemoryMap[0].BasePage = 0; + XboxMemoryMap[0].PageCount = AvailableMemoryMb * 1024 * 1024 / MM_PAGE_SIZE; + XboxMemoryMap[0].MemoryType = LoaderFree; + + /* Video memory */ + XboxMemoryMap[1].BasePage = AvailableMemoryMb * 1024 * 1024 / MM_PAGE_SIZE; + XboxMemoryMap[1].PageCount = (InstalledMemoryMb - AvailableMemoryMb) * 1024 * 1024 / MM_PAGE_SIZE; + XboxMemoryMap[1].MemoryType = LoaderFirmwarePermanent; + + *MemoryMapSize = 2; + return XboxMemoryMap; }
PVOID XboxMemReserveMemory(ULONG MbToReserve) { - if (0 == InstalledMemoryMb) + if (InstalledMemoryMb == 0) { - /* Hmm, seems we're not initialized yet */ - XboxMemInit(); + /* Hmm, seems we're not initialized yet */ + XboxMemInit(); }
- if (AvailableMemoryMb < MbToReserve) + if (MbToReserve > AvailableMemoryMb) { - /* Can't satisfy the request */ - return NULL; + /* Can't satisfy the request */ + return NULL; }
- AvailableMemoryMb -= MbToReserve; + AvailableMemoryMb -= MbToReserve;
- /* Top of available memory points to the space just reserved */ - return (PVOID) (AvailableMemoryMb * 1024 * 1024); + /* Top of available memory points to the space just reserved */ + return (PVOID)(AvailableMemoryMb * 1024 * 1024); }
/* EOF */
-
Stanislav Motylkov