tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FatPkg: Change use of EFI_D_* to DEBUG_* 

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3739

Update all use of EFI_D_* defines in DEBUG() macros to DEBUG_* defines.

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael Kubacki <michael.kubacki@microsoft.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
This commit is contained in:
Michael D Kinney 2021-11-16 19:21:22 -08:00 committed by mergify[bot]
parent 9c7da8d804
commit 917e98f3e5
6 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
FatPkg/EnhancedFatDxe/DirectoryManage.c
View File

@ -1064,7 +1064,7 @@ FatCreateDirEnt (
FatAddDirEnt (ODir, DirEnt); FatAddDirEnt (ODir, DirEnt);
DirEnt->Entry.Attributes = Attributes; DirEnt->Entry.Attributes = Attributes;
*PtrDirEnt = DirEnt; *PtrDirEnt = DirEnt;
DEBUG ((EFI_D_INFO, "FSOpen: Created new directory entry '%S'\n", DirEnt->FileString)); DEBUG ((DEBUG_INFO, "FSOpen: Created new directory entry '%S'\n", DirEnt->FileString));
return FatStoreDirEnt (OFile, DirEnt); return FatStoreDirEnt (OFile, DirEnt);
Done: Done:
@ -1388,4 +1388,3 @@ FatLocateOFile (
*PtrOFile = OFile; *PtrOFile = OFile;
return EFI_SUCCESS; return EFI_SUCCESS;
} }

2
FatPkg/EnhancedFatDxe/DiskCache.c
View File

@ -125,7 +125,7 @@ FatExchangeCachePage (
RealSize = (UINTN)1 << PageAlignment; RealSize = (UINTN)1 << PageAlignment;
MaxSize = DiskCache->LimitAddress - EntryPos; MaxSize = DiskCache->LimitAddress - EntryPos;
if (MaxSize < RealSize) { if (MaxSize < RealSize) {
DEBUG ((EFI_D_INFO, "FatDiskIo: Cache Page OutBound occurred! \n")); DEBUG ((DEBUG_INFO, "FatDiskIo: Cache Page OutBound occurred! \n"));
RealSize = (UINTN) MaxSize; RealSize = (UINTN) MaxSize;
} }
} }

12
FatPkg/EnhancedFatDxe/FileSpace.c
View File

@ -244,7 +244,7 @@ FatFreeClusters (
while (!FAT_END_OF_FAT_CHAIN (Cluster)) { while (!FAT_END_OF_FAT_CHAIN (Cluster)) {
if (Cluster == FAT_CLUSTER_FREE || Cluster >= FAT_CLUSTER_SPECIAL) { if (Cluster == FAT_CLUSTER_FREE || Cluster >= FAT_CLUSTER_SPECIAL) {
DEBUG ((EFI_D_INIT | EFI_D_ERROR, "FatShrinkEof: cluster chain corrupt\n")); DEBUG ((DEBUG_INIT | DEBUG_ERROR, "FatShrinkEof: cluster chain corrupt\n"));
return EFI_VOLUME_CORRUPTED; return EFI_VOLUME_CORRUPTED;
} }
@ -374,7 +374,7 @@ FatShrinkEof (
for (CurSize = 0; CurSize < NewSize; CurSize++) { for (CurSize = 0; CurSize < NewSize; CurSize++) {
if (Cluster == FAT_CLUSTER_FREE || Cluster >= FAT_CLUSTER_SPECIAL) { if (Cluster == FAT_CLUSTER_FREE || Cluster >= FAT_CLUSTER_SPECIAL) {
DEBUG ((EFI_D_INIT | EFI_D_ERROR, "FatShrinkEof: cluster chain corrupt\n")); DEBUG ((DEBUG_INIT | DEBUG_ERROR, "FatShrinkEof: cluster chain corrupt\n"));
return EFI_VOLUME_CORRUPTED; return EFI_VOLUME_CORRUPTED;
} }
@ -464,7 +464,7 @@ FatGrowEof (
if (Cluster < FAT_MIN_CLUSTER || Cluster > Volume->MaxCluster + 1) { if (Cluster < FAT_MIN_CLUSTER || Cluster > Volume->MaxCluster + 1) {
DEBUG ( DEBUG (
(EFI_D_INIT | EFI_D_ERROR, (DEBUG_INIT | DEBUG_ERROR,
"FatGrowEof: cluster chain corrupt\n") "FatGrowEof: cluster chain corrupt\n")
); );
Status = EFI_VOLUME_CORRUPTED; Status = EFI_VOLUME_CORRUPTED;
@ -478,7 +478,7 @@ FatGrowEof (
if (ClusterCount != CurSize) { if (ClusterCount != CurSize) {
DEBUG ( DEBUG (
(EFI_D_INIT | EFI_D_ERROR, (DEBUG_INIT | DEBUG_ERROR,
"FatGrowEof: cluster chain size does not match file size\n") "FatGrowEof: cluster chain size does not match file size\n")
); );
Status = EFI_VOLUME_CORRUPTED; Status = EFI_VOLUME_CORRUPTED;
@ -604,7 +604,7 @@ FatOFilePosition (
while (StartPos + ClusterSize <= Position) { while (StartPos + ClusterSize <= Position) {
StartPos += ClusterSize; StartPos += ClusterSize;
if (Cluster == FAT_CLUSTER_FREE || (Cluster >= FAT_CLUSTER_SPECIAL)) { if (Cluster == FAT_CLUSTER_FREE || (Cluster >= FAT_CLUSTER_SPECIAL)) {
DEBUG ((EFI_D_INIT | EFI_D_ERROR, "FatOFilePosition:"" cluster chain corrupt\n")); DEBUG ((DEBUG_INIT | DEBUG_ERROR, "FatOFilePosition:"" cluster chain corrupt\n"));
return EFI_VOLUME_CORRUPTED; return EFI_VOLUME_CORRUPTED;
} }
@ -668,7 +668,7 @@ FatPhysicalDirSize (
while (!FAT_END_OF_FAT_CHAIN (Cluster)) { while (!FAT_END_OF_FAT_CHAIN (Cluster)) {
if (Cluster == FAT_CLUSTER_FREE || Cluster >= FAT_CLUSTER_SPECIAL) { if (Cluster == FAT_CLUSTER_FREE || Cluster >= FAT_CLUSTER_SPECIAL) {
DEBUG ( DEBUG (
(EFI_D_INIT | EFI_D_ERROR, (DEBUG_INIT | DEBUG_ERROR,
"FATDirSize: cluster chain corrupt\n") "FATDirSize: cluster chain corrupt\n")
); );
return 0; return 0;

4
FatPkg/EnhancedFatDxe/Init.c
View File

@ -90,7 +90,7 @@ FatAllocateVolume (
// //
// Volume installed // Volume installed
// //
DEBUG ((EFI_D_INIT, "Installed Fat filesystem on %p\n", Handle)); DEBUG ((DEBUG_INIT, "Installed Fat filesystem on %p\n", Handle));
Volume->Valid = TRUE; Volume->Valid = TRUE;
Done: Done:
@ -217,7 +217,7 @@ FatOpenDevice (
Status = DiskIo->ReadDisk (DiskIo, Volume->MediaId, 0, sizeof (FatBs), &FatBs); Status = DiskIo->ReadDisk (DiskIo, Volume->MediaId, 0, sizeof (FatBs), &FatBs);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_INIT, "FatOpenDevice: read of part_lba failed %r\n", Status)); DEBUG ((DEBUG_INIT, "FatOpenDevice: read of part_lba failed %r\n", Status));
return Status; return Status;
} }

2
FatPkg/EnhancedFatDxe/Misc.c
View File

@ -377,7 +377,7 @@ FatDiskIo (
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
Volume->DiskError = TRUE; Volume->DiskError = TRUE;
DEBUG ((EFI_D_ERROR, "FatDiskIo: error %r\n", Status)); DEBUG ((DEBUG_ERROR, "FatDiskIo: error %r\n", Status));
} }
return Status; return Status;

2
FatPkg/EnhancedFatDxe/Open.c
View File

@ -168,7 +168,7 @@ FatOFileOpen (
(*NewIFile)->ReadOnly = (BOOLEAN)!WriteMode; (*NewIFile)->ReadOnly = (BOOLEAN)!WriteMode;
DEBUG ((EFI_D_INFO, "FSOpen: Open '%S' %r\n", FileName, Status)); DEBUG ((DEBUG_INFO, "FSOpen: Open '%S' %r\n", FileName, Status));
return FatOFileFlush (OFile); return FatOFileFlush (OFile);
} }