diff options
| author | Michael D Kinney <michael.d.kinney@intel.com> | 2021-11-16 19:21:22 -0800 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2021-12-07 17:24:28 +0000 |
| commit | 917e98f3e5268c3754d472f7b20eb9bf8eba169d (patch) | |
| tree | 1c9b0afd9888d2923a774e54a9916e82746b88b9 /FatPkg | |
| parent | 9c7da8d8041db4c2406476a72c960ac4c0e327d5 (diff) | |
| download | edk2-917e98f3e5268c3754d472f7b20eb9bf8eba169d.tar.gz edk2-917e98f3e5268c3754d472f7b20eb9bf8eba169d.tar.bz2 edk2-917e98f3e5268c3754d472f7b20eb9bf8eba169d.zip | |
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>
Diffstat (limited to 'FatPkg')
| -rw-r--r-- | FatPkg/EnhancedFatDxe/DirectoryManage.c | 3 | ||||
| -rw-r--r-- | FatPkg/EnhancedFatDxe/DiskCache.c | 2 | ||||
| -rw-r--r-- | FatPkg/EnhancedFatDxe/FileSpace.c | 12 | ||||
| -rw-r--r-- | FatPkg/EnhancedFatDxe/Init.c | 4 | ||||
| -rw-r--r-- | FatPkg/EnhancedFatDxe/Misc.c | 2 | ||||
| -rw-r--r-- | FatPkg/EnhancedFatDxe/Open.c | 2 |
6 files changed, 12 insertions, 13 deletions
diff --git a/FatPkg/EnhancedFatDxe/DirectoryManage.c b/FatPkg/EnhancedFatDxe/DirectoryManage.c index 90c01b3baa..23871a4cdc 100644 --- a/FatPkg/EnhancedFatDxe/DirectoryManage.c +++ b/FatPkg/EnhancedFatDxe/DirectoryManage.c @@ -1064,7 +1064,7 @@ FatCreateDirEnt ( FatAddDirEnt (ODir, DirEnt);
DirEnt->Entry.Attributes = Attributes;
*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);
Done:
@@ -1388,4 +1388,3 @@ FatLocateOFile ( *PtrOFile = OFile;
return EFI_SUCCESS;
}
-
diff --git a/FatPkg/EnhancedFatDxe/DiskCache.c b/FatPkg/EnhancedFatDxe/DiskCache.c index df587810fb..a488cd437d 100644 --- a/FatPkg/EnhancedFatDxe/DiskCache.c +++ b/FatPkg/EnhancedFatDxe/DiskCache.c @@ -125,7 +125,7 @@ FatExchangeCachePage ( RealSize = (UINTN)1 << PageAlignment;
MaxSize = DiskCache->LimitAddress - EntryPos;
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;
}
}
diff --git a/FatPkg/EnhancedFatDxe/FileSpace.c b/FatPkg/EnhancedFatDxe/FileSpace.c index f57e44e368..7dd220f837 100644 --- a/FatPkg/EnhancedFatDxe/FileSpace.c +++ b/FatPkg/EnhancedFatDxe/FileSpace.c @@ -244,7 +244,7 @@ FatFreeClusters ( while (!FAT_END_OF_FAT_CHAIN (Cluster)) {
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;
}
@@ -374,7 +374,7 @@ FatShrinkEof ( for (CurSize = 0; CurSize < NewSize; CurSize++) {
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;
}
@@ -464,7 +464,7 @@ FatGrowEof ( if (Cluster < FAT_MIN_CLUSTER || Cluster > Volume->MaxCluster + 1) {
DEBUG (
- (EFI_D_INIT | EFI_D_ERROR,
+ (DEBUG_INIT | DEBUG_ERROR,
"FatGrowEof: cluster chain corrupt\n")
);
Status = EFI_VOLUME_CORRUPTED;
@@ -478,7 +478,7 @@ FatGrowEof ( if (ClusterCount != CurSize) {
DEBUG (
- (EFI_D_INIT | EFI_D_ERROR,
+ (DEBUG_INIT | DEBUG_ERROR,
"FatGrowEof: cluster chain size does not match file size\n")
);
Status = EFI_VOLUME_CORRUPTED;
@@ -604,7 +604,7 @@ FatOFilePosition ( while (StartPos + ClusterSize <= Position) {
StartPos += ClusterSize;
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;
}
@@ -668,7 +668,7 @@ FatPhysicalDirSize ( while (!FAT_END_OF_FAT_CHAIN (Cluster)) {
if (Cluster == FAT_CLUSTER_FREE || Cluster >= FAT_CLUSTER_SPECIAL) {
DEBUG (
- (EFI_D_INIT | EFI_D_ERROR,
+ (DEBUG_INIT | DEBUG_ERROR,
"FATDirSize: cluster chain corrupt\n")
);
return 0;
diff --git a/FatPkg/EnhancedFatDxe/Init.c b/FatPkg/EnhancedFatDxe/Init.c index 4e6bd9d0fd..fb62dc2332 100644 --- a/FatPkg/EnhancedFatDxe/Init.c +++ b/FatPkg/EnhancedFatDxe/Init.c @@ -90,7 +90,7 @@ FatAllocateVolume ( //
// 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;
Done:
@@ -217,7 +217,7 @@ FatOpenDevice ( Status = DiskIo->ReadDisk (DiskIo, Volume->MediaId, 0, sizeof (FatBs), &FatBs);
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;
}
diff --git a/FatPkg/EnhancedFatDxe/Misc.c b/FatPkg/EnhancedFatDxe/Misc.c index a005036d46..d488a6e9a6 100644 --- a/FatPkg/EnhancedFatDxe/Misc.c +++ b/FatPkg/EnhancedFatDxe/Misc.c @@ -377,7 +377,7 @@ FatDiskIo ( if (EFI_ERROR (Status)) {
Volume->DiskError = TRUE;
- DEBUG ((EFI_D_ERROR, "FatDiskIo: error %r\n", Status));
+ DEBUG ((DEBUG_ERROR, "FatDiskIo: error %r\n", Status));
}
return Status;
diff --git a/FatPkg/EnhancedFatDxe/Open.c b/FatPkg/EnhancedFatDxe/Open.c index 1b716e0cdf..6ec7d8e541 100644 --- a/FatPkg/EnhancedFatDxe/Open.c +++ b/FatPkg/EnhancedFatDxe/Open.c @@ -168,7 +168,7 @@ FatOFileOpen ( (*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);
}
|