GitHub-Mirror/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos synced 2025-10-06 00:12:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FREELDR] disk/fs: Improve some TRACEs and comments (#8400)

Browse Source 
- Enhance some TRACEs.
- Improve printf formatters.
- Checking for success is part of the operation, no need to comment on that.
This commit is contained in:
Hermès Bélusca-Maïto
2025-09-22 23:04:34 +02:00
parent 5f243e66b6
commit 4ffe8e86f0
7 changed files with 51 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
boot/freeldr/freeldr/arch/i386/pc/pcdisk.c
View File

@@ -171,7 +171,6 @@ static VOID DiskError(PCSTR ErrorString, ULONG ErrorCode)
ErrorString, ErrorCode, DiskGetErrorCodeString(ErrorCode)); ErrorString, ErrorCode, DiskGetErrorCodeString(ErrorCode));
ERR("%s\n", ErrorCodeString); ERR("%s\n", ErrorCodeString);
UiMessageBox(ErrorCodeString); UiMessageBox(ErrorCodeString);
} }
@@ -276,14 +275,18 @@ DiskInt13ExtensionsSupported(IN UCHAR DriveNumber)
return FALSE; return FALSE;
} }
#if DBG
TRACE("Drive 0x%x: INT 13h Extended version: 0x%02x, API bitmap: 0x%04x\n",
DriveNumber, RegsOut.b.ah, RegsOut.w.cx);
#endif
if (!(RegsOut.w.cx & 0x0001)) if (!(RegsOut.w.cx & 0x0001))
{ {
/* /*
* CX = API subset support bitmap. * CX = API subset support bitmap.
* Bit 0, extended disk access functions (AH=42h-44h,47h,48h) supported. * Bit 0, extended disk access functions (AH=42h-44h,47h,48h) supported.
*/ */
WARN("Suspicious API subset support bitmap 0x%x on device 0x%lx\n", WARN("Drive 0x%x: Suspicious API subset support bitmap 0x%04x\n",
RegsOut.w.cx, DriveNumber); DriveNumber, RegsOut.w.cx);
return FALSE; return FALSE;
} }
@@ -333,13 +336,13 @@ DiskGetExtendedDriveParameters(
RtlCopyMemory(Buffer, Ptr, BufferSize); RtlCopyMemory(Buffer, Ptr, BufferSize);
#if DBG #if DBG
TRACE("size of buffer: %x\n", Ptr[0]); TRACE("Size of buffer: 0x%x\n", Ptr[0]);
TRACE("information flags: %x\n", Ptr[1]); TRACE("Information flags: 0x%x\n", Ptr[1]);
TRACE("number of physical cylinders on drive: %u\n", *(PULONG)&Ptr[2]); TRACE("Number of physical cylinders on drive: %u\n", *(PULONG)&Ptr[2]);
TRACE("number of physical heads on drive: %u\n", *(PULONG)&Ptr[4]); TRACE("Number of physical heads on drive: %u\n", *(PULONG)&Ptr[4]);
TRACE("number of physical sectors per track: %u\n", *(PULONG)&Ptr[6]); TRACE("Number of physical sectors per track: %u\n", *(PULONG)&Ptr[6]);
TRACE("total number of sectors on drive: %I64u\n", *(PULONGLONG)&Ptr[8]); TRACE("Total number of sectors on drive: %I64u\n", *(PULONGLONG)&Ptr[8]);
TRACE("bytes per sector: %u\n", Ptr[12]); TRACE("Bytes per sector: %u\n", Ptr[12]);
if (Ptr[0] >= 0x1e) if (Ptr[0] >= 0x1e)
{ {
// Ptr[13]: offset, Ptr[14]: segment // Ptr[13]: offset, Ptr[14]: segment
@@ -347,23 +350,23 @@ DiskGetExtendedDriveParameters(
if (Ptr[13] != 0xffff && Ptr[14] != 0xffff) if (Ptr[13] != 0xffff && Ptr[14] != 0xffff)
{ {
PUCHAR SpecPtr = (PUCHAR)(ULONG_PTR)((Ptr[14] << 4) + Ptr[13]); PUCHAR SpecPtr = (PUCHAR)(ULONG_PTR)((Ptr[14] << 4) + Ptr[13]);
TRACE("SpecPtr: %x\n", SpecPtr); TRACE("SpecPtr: 0x%x\n", SpecPtr);
TRACE("physical I/O port base address: %x\n", *(PUSHORT)&SpecPtr[0]); TRACE("Physical I/O port base address: 0x%x\n", *(PUSHORT)&SpecPtr[0]);
TRACE("disk-drive control port address: %x\n", *(PUSHORT)&SpecPtr[2]); TRACE("Disk-drive control port address: 0x%x\n", *(PUSHORT)&SpecPtr[2]);
TRACE("drive flags: %x\n", SpecPtr[4]); TRACE("Head register upper nibble: 0x%x\n", SpecPtr[4]);
TRACE("proprietary information: %x\n", SpecPtr[5]); TRACE("BIOS Vendor-specific: 0x%x\n", SpecPtr[5]);
TRACE("IRQ for drive: %u\n", SpecPtr[6]); TRACE("IRQ for drive: %u\n", SpecPtr[6]);
TRACE("sector count for multi-sector transfers: %u\n", SpecPtr[7]); TRACE("Sector count for multi-sector transfers: %u\n", SpecPtr[7]);
TRACE("DMA control: %x\n", SpecPtr[8]); TRACE("DMA control: 0x%x\n", SpecPtr[8]);
TRACE("programmed I/O control: %x\n", SpecPtr[9]); TRACE("Programmed I/O control: 0x%x\n", SpecPtr[9]);
TRACE("drive options: %x\n", *(PUSHORT)&SpecPtr[10]); TRACE("Drive options: 0x%x\n", *(PUSHORT)&SpecPtr[10]);
} }
} }
if (Ptr[0] >= 0x42) if (Ptr[0] >= 0x42)
{ {
TRACE("signature: %x\n", Ptr[15]); TRACE("Signature: 0x%x\n", Ptr[15]);
} }
#endif #endif // DBG
return TRUE; return TRUE;
} }
@@ -393,11 +396,13 @@ InitDriveGeometry(
"Cylinders : 0x%x\n" "Cylinders : 0x%x\n"
"Heads : 0x%x\n" "Heads : 0x%x\n"
"Sects/Track: 0x%x\n" "Sects/Track: 0x%x\n"
"Total Sects: 0x%llx\n"
"Bytes/Sect : 0x%x\n", "Bytes/Sect : 0x%x\n",
DriveNumber, DriveNumber,
DiskDrive->ExtGeometry.Cylinders, DiskDrive->ExtGeometry.Cylinders,
DiskDrive->ExtGeometry.Heads, DiskDrive->ExtGeometry.Heads,
DiskDrive->ExtGeometry.SectorsPerTrack, DiskDrive->ExtGeometry.SectorsPerTrack,
DiskDrive->ExtGeometry.Sectors,
DiskDrive->ExtGeometry.BytesPerSector); DiskDrive->ExtGeometry.BytesPerSector);
} }
@@ -444,7 +449,7 @@ InitDriveGeometry(
DiskDrive->Geometry.Cylinders = Cylinders; DiskDrive->Geometry.Cylinders = Cylinders;
DiskDrive->Geometry.Heads = RegsOut.b.dh + 1; DiskDrive->Geometry.Heads = RegsOut.b.dh + 1;
DiskDrive->Geometry.SectorsPerTrack = RegsOut.b.cl & 0x3F; DiskDrive->Geometry.SectorsPerTrack = RegsOut.b.cl & 0x3F;
DiskDrive->Geometry.BytesPerSector = 512; /* Just assume 512 bytes per sector */ DiskDrive->Geometry.BytesPerSector = 512; /* Just assume 512 bytes per sector */
DiskDrive->Geometry.Sectors = (ULONGLONG)DiskDrive->Geometry.Cylinders * DiskDrive->Geometry.Sectors = (ULONGLONG)DiskDrive->Geometry.Cylinders *
DiskDrive->Geometry.Heads * DiskDrive->Geometry.Heads *
@@ -453,12 +458,14 @@ InitDriveGeometry(
TRACE("Regular Int13h(0x%x) returned:\n" TRACE("Regular Int13h(0x%x) returned:\n"
"Cylinders : 0x%x\n" "Cylinders : 0x%x\n"
"Heads : 0x%x\n" "Heads : 0x%x\n"
"Sects/Track: 0x%x (original 0x%x)\n" "Sects/Track: 0x%x\n"
"Total Sects: 0x%llx\n"
"Bytes/Sect : 0x%x\n", "Bytes/Sect : 0x%x\n",
DriveNumber, DriveNumber,
DiskDrive->Geometry.Cylinders, DiskDrive->Geometry.Cylinders,
DiskDrive->Geometry.Heads, DiskDrive->Geometry.Heads,
DiskDrive->Geometry.SectorsPerTrack, RegsOut.b.cl, DiskDrive->Geometry.SectorsPerTrack,
DiskDrive->Geometry.Sectors,
DiskDrive->Geometry.BytesPerSector); DiskDrive->Geometry.BytesPerSector);
return Success; return Success;
@@ -616,7 +623,7 @@ PcDiskReadLogicalSectorsLBA(
/* If we get here then the read failed */ /* If we get here then the read failed */
DiskError("Disk Read Failed in LBA mode", RegsOut.b.ah); DiskError("Disk Read Failed in LBA mode", RegsOut.b.ah);
ERR("Disk Read Failed in LBA mode: %x (%s) (DriveNumber: 0x%x SectorNumber: %I64d SectorCount: %d)\n", ERR("Disk Read Failed in LBA mode: %x (%s) (DriveNumber: 0x%x SectorNumber: %I64u SectorCount: %u)\n",
RegsOut.b.ah, DiskGetErrorCodeString(RegsOut.b.ah), RegsOut.b.ah, DiskGetErrorCodeString(RegsOut.b.ah),
DriveNumber, SectorNumber, SectorCount); DriveNumber, SectorNumber, SectorCount);
@@ -719,7 +726,7 @@ PcDiskReadLogicalSectorsCHS(
if (RetryCount >= 3) if (RetryCount >= 3)
{ {
DiskError("Disk Read Failed in CHS mode, after retrying 3 times", RegsOut.b.ah); DiskError("Disk Read Failed in CHS mode, after retrying 3 times", RegsOut.b.ah);
ERR("Disk Read Failed in CHS mode, after retrying 3 times: %x (%s) (DriveNumber: 0x%x SectorNumber: %I64d SectorCount: %d)\n", ERR("Disk Read Failed in CHS mode, after retrying 3 times: %x (%s) (DriveNumber: 0x%x SectorNumber: %I64u SectorCount: %u)\n",
RegsOut.b.ah, DiskGetErrorCodeString(RegsOut.b.ah), RegsOut.b.ah, DiskGetErrorCodeString(RegsOut.b.ah),
DriveNumber, SectorNumber, SectorCount); DriveNumber, SectorNumber, SectorCount);
return FALSE; return FALSE;
@@ -750,7 +757,7 @@ PcDiskReadLogicalSectors(
{ {
PPC_DISK_DRIVE DiskDrive; PPC_DISK_DRIVE DiskDrive;
TRACE("PcDiskReadLogicalSectors() DriveNumber: 0x%x SectorNumber: %I64d SectorCount: %d Buffer: 0x%x\n", TRACE("PcDiskReadLogicalSectors() DriveNumber: 0x%x SectorNumber: %I64u SectorCount: %u Buffer: 0x%x\n",
DriveNumber, SectorNumber, SectorCount, Buffer); DriveNumber, SectorNumber, SectorCount, Buffer);
/* 16-bit BIOS addressing limitation */ /* 16-bit BIOS addressing limitation */

14
boot/freeldr/freeldr/arch/i386/pc98/pc98disk.c
View File

@@ -226,7 +226,7 @@ Pc98DiskReadLogicalSectorsLBA(
/* If we get here then the read failed */ /* If we get here then the read failed */
DiskError("Disk Read Failed in LBA mode", RegsOut.b.ah); DiskError("Disk Read Failed in LBA mode", RegsOut.b.ah);
ERR("Disk Read Failed in LBA mode: %x (%s) (DriveNumber: 0x%x SectorNumber: %I64d SectorCount: %d)\n", ERR("Disk Read Failed in LBA mode: %x (%s) (DriveNumber: 0x%x SectorNumber: %I64u SectorCount: %u)\n",
RegsOut.b.ah, DiskGetErrorCodeString(RegsOut.b.ah), RegsOut.b.ah, DiskGetErrorCodeString(RegsOut.b.ah),
DiskDrive->DaUa, SectorNumber, SectorCount); DiskDrive->DaUa, SectorNumber, SectorCount);
@@ -367,7 +367,7 @@ Pc98DiskReadLogicalSectorsCHS(
if (RetryCount >= 3) if (RetryCount >= 3)
{ {
DiskError("Disk Read Failed in CHS mode, after retrying 3 times", RegsOut.b.ah); DiskError("Disk Read Failed in CHS mode, after retrying 3 times", RegsOut.b.ah);
ERR("Disk Read Failed in CHS mode, after retrying 3 times: %x (%s) (DriveNumber: 0x%x SectorNumber: %I64d SectorCount: %d)\n", ERR("Disk Read Failed in CHS mode, after retrying 3 times: %x (%s) (DriveNumber: 0x%x SectorNumber: %I64u SectorCount: %u)\n",
RegsOut.b.ah, DiskGetErrorCodeString(RegsOut.b.ah), RegsOut.b.ah, DiskGetErrorCodeString(RegsOut.b.ah),
DiskDrive->DaUa, SectorNumber, SectorCount); DiskDrive->DaUa, SectorNumber, SectorCount);
return FALSE; return FALSE;
@@ -476,11 +476,13 @@ InitScsiDrive(
"Cylinders : 0x%x\n" "Cylinders : 0x%x\n"
"Heads : 0x%x\n" "Heads : 0x%x\n"
"Sects/Track: 0x%x\n" "Sects/Track: 0x%x\n"
"Total Sects: 0x%llx\n"
"Bytes/Sect : 0x%x\n", "Bytes/Sect : 0x%x\n",
DaUa, DaUa,
DiskDrive->Geometry.Cylinders, DiskDrive->Geometry.Cylinders,
DiskDrive->Geometry.Heads, DiskDrive->Geometry.Heads,
DiskDrive->Geometry.SectorsPerTrack, DiskDrive->Geometry.SectorsPerTrack,
DiskDrive->Geometry.Sectors,
DiskDrive->Geometry.BytesPerSector); DiskDrive->Geometry.BytesPerSector);
return TRUE; return TRUE;
@@ -513,11 +515,13 @@ InitIdeDrive(
"Cylinders : 0x%x\n" "Cylinders : 0x%x\n"
"Heads : 0x%x\n" "Heads : 0x%x\n"
"Sects/Track: 0x%x\n" "Sects/Track: 0x%x\n"
"Total Sects: 0x%llx\n"
"Bytes/Sect : 0x%x\n", "Bytes/Sect : 0x%x\n",
UnitNumber, UnitNumber,
DiskDrive->Geometry.Cylinders, DiskDrive->Geometry.Cylinders,
DiskDrive->Geometry.Heads, DiskDrive->Geometry.Heads,
DiskDrive->Geometry.SectorsPerTrack, DiskDrive->Geometry.SectorsPerTrack,
DiskDrive->Geometry.Sectors,
DiskDrive->Geometry.BytesPerSector); DiskDrive->Geometry.BytesPerSector);
return TRUE; return TRUE;
@@ -586,11 +590,13 @@ InitHardDrive(
"Cylinders : 0x%x\n" "Cylinders : 0x%x\n"
"Heads : 0x%x\n" "Heads : 0x%x\n"
"Sects/Track: 0x%x\n" "Sects/Track: 0x%x\n"
"Total Sects: 0x%llx\n"
"Bytes/Sect : 0x%x\n", "Bytes/Sect : 0x%x\n",
DaUa, DaUa,
DiskDrive->Geometry.Cylinders, DiskDrive->Geometry.Cylinders,
DiskDrive->Geometry.Heads, DiskDrive->Geometry.Heads,
DiskDrive->Geometry.SectorsPerTrack, DiskDrive->Geometry.SectorsPerTrack,
DiskDrive->Geometry.Sectors,
DiskDrive->Geometry.BytesPerSector); DiskDrive->Geometry.BytesPerSector);
return TRUE; return TRUE;
@@ -701,11 +707,13 @@ InitFloppyDrive(
"Cylinders : 0x%x\n" "Cylinders : 0x%x\n"
"Heads : 0x%x\n" "Heads : 0x%x\n"
"Sects/Track: 0x%x\n" "Sects/Track: 0x%x\n"
"Total Sects: 0x%llx\n"
"Bytes/Sect : 0x%x\n", "Bytes/Sect : 0x%x\n",
DaUa, DaUa,
DiskDrive->Geometry.Cylinders, DiskDrive->Geometry.Cylinders,
DiskDrive->Geometry.Heads, DiskDrive->Geometry.Heads,
DiskDrive->Geometry.SectorsPerTrack, DiskDrive->Geometry.SectorsPerTrack,
DiskDrive->Geometry.Sectors,
DiskDrive->Geometry.BytesPerSector); DiskDrive->Geometry.BytesPerSector);
return TRUE; return TRUE;
@@ -838,7 +846,7 @@ Pc98DiskReadLogicalSectors(
{ {
PPC98_DISK_DRIVE DiskDrive; PPC98_DISK_DRIVE DiskDrive;
TRACE("Pc98DiskReadLogicalSectors() DriveNumber: 0x%x SectorNumber: %I64d SectorCount: %d Buffer: 0x%x\n", TRACE("Pc98DiskReadLogicalSectors() DriveNumber: 0x%x SectorNumber: %I64u SectorCount: %u Buffer: 0x%x\n",
DriveNumber, SectorNumber, SectorCount, Buffer); DriveNumber, SectorNumber, SectorCount, Buffer);
/* 16-bit BIOS addressing limitation */ /* 16-bit BIOS addressing limitation */

2
boot/freeldr/freeldr/arch/i386/xbox/xboxdisk.c
View File

@@ -86,7 +86,7 @@ XboxDiskReadLogicalSectors(
{ {
PDEVICE_UNIT DeviceUnit; PDEVICE_UNIT DeviceUnit;
TRACE("XboxDiskReadLogicalSectors() DriveNumber: 0x%x SectorNumber: %I64d SectorCount: %d Buffer: 0x%x\n", TRACE("XboxDiskReadLogicalSectors() DriveNumber: 0x%x SectorNumber: %I64u SectorCount: %u Buffer: 0x%x\n",
DriveNumber, SectorNumber, SectorCount, Buffer); DriveNumber, SectorNumber, SectorCount, Buffer);
DeviceUnit = XboxDiskDriveNumberToDeviceUnit(DriveNumber); DeviceUnit = XboxDiskDriveNumberToDeviceUnit(DriveNumber);

2
boot/freeldr/freeldr/lib/cache/cache.c vendored
View File

@@ -121,7 +121,7 @@ BOOLEAN CacheReadDiskSectors(UCHAR DiskNumber, ULONGLONG StartSector, ULONG Sect
ULONG BlockCount; ULONG BlockCount;
ULONG Idx; ULONG Idx;
TRACE("CacheReadDiskSectors() DiskNumber: 0x%x StartSector: %I64d SectorCount: %d Buffer: 0x%x\n", DiskNumber, StartSector, SectorCount, Buffer); TRACE("CacheReadDiskSectors() DiskNumber: 0x%x StartSector: %I64u SectorCount: %u Buffer: 0x%x\n", DiskNumber, StartSector, SectorCount, Buffer);
// If we aren't initialized yet then they can't do this // If we aren't initialized yet then they can't do this
if (CacheManagerInitialized == FALSE) if (CacheManagerInitialized == FALSE)

8
boot/freeldr/freeldr/lib/fs/ext.c
View File

@@ -1328,15 +1328,9 @@ ARC_STATUS ExtRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count)
ULONGLONG BytesReadBig; ULONGLONG BytesReadBig;
BOOLEAN Success; BOOLEAN Success;
// /* Read data */
// Read data
//
Success = ExtReadFileBig(FileHandle, N, &BytesReadBig, Buffer); Success = ExtReadFileBig(FileHandle, N, &BytesReadBig, Buffer);
*Count = (ULONG)BytesReadBig; *Count = (ULONG)BytesReadBig;
//
// Check for success
//
if (Success) if (Success)
return ESUCCESS; return ESUCCESS;
else else

8
boot/freeldr/freeldr/lib/fs/fat.c
View File

@@ -1464,14 +1464,8 @@ ARC_STATUS FatRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count)
PFAT_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); PFAT_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId);
BOOLEAN Success; BOOLEAN Success;
// /* Call old read method */
// Call old read method
//
Success = FatReadFile(FileHandle, N, Count, Buffer); Success = FatReadFile(FileHandle, N, Count, Buffer);
//
// Check for success
//
if (Success) if (Success)
return ESUCCESS; return ESUCCESS;
else else

10
boot/freeldr/freeldr/lib/fs/ntfs.c
View File

@@ -149,7 +149,7 @@ static BOOLEAN NtfsDiskRead(PNTFS_VOLUME_INFO Volume, ULONGLONG Offset, ULONGLON
ULONG ReadLength; ULONG ReadLength;
ARC_STATUS Status; ARC_STATUS Status;
TRACE("NtfsDiskRead - Offset: %I64d Length: %I64d\n", Offset, Length); TRACE("NtfsDiskRead - Offset: %I64u Length: %I64u\n", Offset, Length);
// //
// I. Read partial first sector if needed // I. Read partial first sector if needed
@@ -831,16 +831,10 @@ ARC_STATUS NtfsRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count)
PNTFS_FILE_HANDLE FileHandle = FsGetDeviceSpecific(FileId); PNTFS_FILE_HANDLE FileHandle = FsGetDeviceSpecific(FileId);
ULONGLONG BytesRead64; ULONGLONG BytesRead64;
// /* Read data */
// Read file
//
BytesRead64 = NtfsReadAttribute(FileHandle->Volume, FileHandle->DataContext, FileHandle->Offset, Buffer, N); BytesRead64 = NtfsReadAttribute(FileHandle->Volume, FileHandle->DataContext, FileHandle->Offset, Buffer, N);
FileHandle->Offset += BytesRead64; FileHandle->Offset += BytesRead64;
*Count = (ULONG)BytesRead64; *Count = (ULONG)BytesRead64;
//
// Check for success
//
if (BytesRead64 > 0) if (BytesRead64 > 0)
return ESUCCESS; return ESUCCESS;
else else