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>

diff --git a/FatPkg/EnhancedFatDxe/DirectoryManage.c b/FatPkg/EnhancedFatDxe/DirectoryManage.c
index 90c01b3baa1c212343499fef4f2f67402a69901c..23871a4cdc3a97f7169c9aaff46382b70cdbda82 100644 (file)
--- a/FatPkg/EnhancedFatDxe/DirectoryManage.c
+++ b/FatPkg/EnhancedFatDxe/DirectoryManage.c
@@ -1064,7 +1064,7 @@ FatCreateDirEnt (
   FatAddDirEnt (ODir, DirEnt);\r
   DirEnt->Entry.Attributes = Attributes;\r
   *PtrDirEnt               = DirEnt;\r
-  DEBUG ((EFI_D_INFO, "FSOpen: Created new directory entry '%S'\n", DirEnt->FileString));\r
+  DEBUG ((DEBUG_INFO, "FSOpen: Created new directory entry '%S'\n", DirEnt->FileString));\r
   return FatStoreDirEnt (OFile, DirEnt);\r
 \r
 Done:\r
@@ -1388,4 +1388,3 @@ FatLocateOFile (
   *PtrOFile = OFile;\r
   return EFI_SUCCESS;\r
 }\r
-\r

diff --git a/FatPkg/EnhancedFatDxe/DiskCache.c b/FatPkg/EnhancedFatDxe/DiskCache.c
index df587810fbb1deb5bb06e800259d5bdc05372a43..a488cd437deeeb12773024c6e4fcc8448615c9f9 100644 (file)
--- a/FatPkg/EnhancedFatDxe/DiskCache.c
+++ b/FatPkg/EnhancedFatDxe/DiskCache.c
@@ -125,7 +125,7 @@ FatExchangeCachePage (
     RealSize  = (UINTN)1 << PageAlignment;\r
     MaxSize   = DiskCache->LimitAddress - EntryPos;\r
     if (MaxSize < RealSize) {\r
-      DEBUG ((EFI_D_INFO, "FatDiskIo: Cache Page OutBound occurred! \n"));\r
+      DEBUG ((DEBUG_INFO, "FatDiskIo: Cache Page OutBound occurred! \n"));\r
       RealSize = (UINTN) MaxSize;\r
     }\r
   }\r

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

diff --git a/FatPkg/EnhancedFatDxe/Init.c b/FatPkg/EnhancedFatDxe/Init.c
index 4e6bd9d0fdc1e58cdd1919932ac1ce3de0131dfb..fb62dc23323c1c57d94888ddc0f509bed412e912 100644 (file)
--- a/FatPkg/EnhancedFatDxe/Init.c
+++ b/FatPkg/EnhancedFatDxe/Init.c
@@ -90,7 +90,7 @@ FatAllocateVolume (
   //\r
   // Volume installed\r
   //\r
-  DEBUG ((EFI_D_INIT, "Installed Fat filesystem on %p\n", Handle));\r
+  DEBUG ((DEBUG_INIT, "Installed Fat filesystem on %p\n", Handle));\r
   Volume->Valid = TRUE;\r
 \r
 Done:\r
@@ -217,7 +217,7 @@ FatOpenDevice (
   Status  = DiskIo->ReadDisk (DiskIo, Volume->MediaId, 0, sizeof (FatBs), &FatBs);\r
 \r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_INIT, "FatOpenDevice: read of part_lba failed %r\n", Status));\r
+    DEBUG ((DEBUG_INIT, "FatOpenDevice: read of part_lba failed %r\n", Status));\r
     return Status;\r
   }\r
 \r

diff --git a/FatPkg/EnhancedFatDxe/Misc.c b/FatPkg/EnhancedFatDxe/Misc.c
index a005036d4617e46a567f6f82980e96583b9de823..d488a6e9a6271b1d983b228170f98ad0fbcecbd8 100644 (file)
--- a/FatPkg/EnhancedFatDxe/Misc.c
+++ b/FatPkg/EnhancedFatDxe/Misc.c
@@ -377,7 +377,7 @@ FatDiskIo (
 \r
   if (EFI_ERROR (Status)) {\r
     Volume->DiskError = TRUE;\r
-    DEBUG ((EFI_D_ERROR, "FatDiskIo: error %r\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "FatDiskIo: error %r\n", Status));\r
   }\r
 \r
   return Status;\r

diff --git a/FatPkg/EnhancedFatDxe/Open.c b/FatPkg/EnhancedFatDxe/Open.c
index 1b716e0cdfff16c2dd62e1f6e1fd2954d924cd86..6ec7d8e54101aba7b8c9790977591211e8c9d3e0 100644 (file)
--- a/FatPkg/EnhancedFatDxe/Open.c
+++ b/FatPkg/EnhancedFatDxe/Open.c
@@ -168,7 +168,7 @@ FatOFileOpen (
 \r
   (*NewIFile)->ReadOnly = (BOOLEAN)!WriteMode;\r
 \r
-  DEBUG ((EFI_D_INFO, "FSOpen: Open '%S' %r\n", FileName, Status));\r
+  DEBUG ((DEBUG_INFO, "FSOpen: Open '%S' %r\n", FileName, Status));\r
   return FatOFileFlush (OFile);\r
 }\r
 \r