MdeModulePkg: Change use of EFI_D_* to DEBUG_*

[mirror_edk2.git] / MdeModulePkg / Universal / Variable / RuntimeDxe / Variable.c

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
index 41f8ff4ceb6c7d5ece192ef24f425d112e0cad7a..5115bcf81696cddf28776482c6b4226bb513e45a 100644 (file)
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
@@ -281,15 +281,15 @@ RecordVarErrorFlag (
   VAR_ERROR_FLAG            TempFlag;\r
 \r
   DEBUG_CODE (\r
   VAR_ERROR_FLAG            TempFlag;\r
 \r
   DEBUG_CODE (\r

-    DEBUG ((EFI_D_ERROR, "RecordVarErrorFlag (0x%02x) %s:%g - 0x%08x - 0x%x\n", Flag, VariableName, VendorGuid, Attributes, VariableSize));\r
+    DEBUG ((DEBUG_ERROR, "RecordVarErrorFlag (0x%02x) %s:%g - 0x%08x - 0x%x\n", Flag, VariableName, VendorGuid, Attributes, VariableSize));\r

     if (Flag == VAR_ERROR_FLAG_SYSTEM_ERROR) {\r
       if (AtRuntime ()) {\r
     if (Flag == VAR_ERROR_FLAG_SYSTEM_ERROR) {\r
       if (AtRuntime ()) {\r

-        DEBUG ((EFI_D_ERROR, "CommonRuntimeVariableSpace = 0x%x - CommonVariableTotalSize = 0x%x\n", mVariableModuleGlobal->CommonRuntimeVariableSpace, mVariableModuleGlobal->CommonVariableTotalSize));\r
+        DEBUG ((DEBUG_ERROR, "CommonRuntimeVariableSpace = 0x%x - CommonVariableTotalSize = 0x%x\n", mVariableModuleGlobal->CommonRuntimeVariableSpace, mVariableModuleGlobal->CommonVariableTotalSize));\r

       } else {\r
       } else {\r

-        DEBUG ((EFI_D_ERROR, "CommonVariableSpace = 0x%x - CommonVariableTotalSize = 0x%x\n", mVariableModuleGlobal->CommonVariableSpace, mVariableModuleGlobal->CommonVariableTotalSize));\r
+        DEBUG ((DEBUG_ERROR, "CommonVariableSpace = 0x%x - CommonVariableTotalSize = 0x%x\n", mVariableModuleGlobal->CommonVariableSpace, mVariableModuleGlobal->CommonVariableTotalSize));\r

       }\r
     } else {\r
       }\r
     } else {\r

-      DEBUG ((EFI_D_ERROR, "CommonMaxUserVariableSpace = 0x%x - CommonUserVariableTotalSize = 0x%x\n", mVariableModuleGlobal->CommonMaxUserVariableSpace, mVariableModuleGlobal->CommonUserVariableTotalSize));\r
+      DEBUG ((DEBUG_ERROR, "CommonMaxUserVariableSpace = 0x%x - CommonUserVariableTotalSize = 0x%x\n", mVariableModuleGlobal->CommonMaxUserVariableSpace, mVariableModuleGlobal->CommonUserVariableTotalSize));\r

     }\r
   );\r
 \r
     }\r
   );\r
 \r


@@ -369,7 +369,7 @@ InitializeVarErrorFlag (
   }\r
 \r
   Flag = mCurrentBootVarErrFlag;\r
   }\r
 \r
   Flag = mCurrentBootVarErrFlag;\r

-  DEBUG ((EFI_D_INFO, "Initialize variable error flag (%02x)\n", Flag));\r
+  DEBUG ((DEBUG_INFO, "Initialize variable error flag (%02x)\n", Flag));\r

 \r
   Status = FindVariable (\r
              VAR_ERROR_FLAG_NAME,\r
 \r
   Status = FindVariable (\r
              VAR_ERROR_FLAG_NAME,\r


@@ -1532,7 +1532,7 @@ AutoUpdateLangVariable (
                                    ISO_639_2_ENTRY_SIZE + 1, Attributes, 0, 0, &Variable, NULL);\r
         }\r
 \r
                                    ISO_639_2_ENTRY_SIZE + 1, Attributes, 0, 0, &Variable, NULL);\r
         }\r
 \r

-        DEBUG ((EFI_D_INFO, "Variable Driver Auto Update PlatformLang, PlatformLang:%a, Lang:%a Status: %r\n", BestPlatformLang, BestLang, Status));\r
+        DEBUG ((DEBUG_INFO, "Variable Driver Auto Update PlatformLang, PlatformLang:%a, Lang:%a Status: %r\n", BestPlatformLang, BestLang, Status));\r

       }\r
     }\r
 \r
       }\r
     }\r
 \r


@@ -1581,7 +1581,7 @@ AutoUpdateLangVariable (
                                    AsciiStrSize (BestPlatformLang), Attributes, 0, 0, &Variable, NULL);\r
         }\r
 \r
                                    AsciiStrSize (BestPlatformLang), Attributes, 0, 0, &Variable, NULL);\r
         }\r
 \r

-        DEBUG ((EFI_D_INFO, "Variable Driver Auto Update Lang, Lang:%a, PlatformLang:%a Status: %r\n", BestLang, BestPlatformLang, Status));\r
+        DEBUG ((DEBUG_INFO, "Variable Driver Auto Update Lang, Lang:%a, PlatformLang:%a Status: %r\n", BestLang, BestPlatformLang, Status));\r

       }\r
     }\r
   }\r
       }\r
     }\r
   }\r


@@ -1659,14 +1659,14 @@ UpdateVariable (
       //\r
       // Trying to update NV variable prior to the installation of EFI_VARIABLE_WRITE_ARCH_PROTOCOL\r
       //\r
       //\r
       // Trying to update NV variable prior to the installation of EFI_VARIABLE_WRITE_ARCH_PROTOCOL\r
       //\r

-      DEBUG ((EFI_D_ERROR, "Update NV variable before EFI_VARIABLE_WRITE_ARCH_PROTOCOL ready - %r\n", EFI_NOT_AVAILABLE_YET));\r
+      DEBUG ((DEBUG_ERROR, "Update NV variable before EFI_VARIABLE_WRITE_ARCH_PROTOCOL ready - %r\n", EFI_NOT_AVAILABLE_YET));\r

       return EFI_NOT_AVAILABLE_YET;\r
     } else if ((Attributes & VARIABLE_ATTRIBUTE_AT_AW) != 0) {\r
       //\r
       // Trying to update volatile authenticated variable prior to the installation of EFI_VARIABLE_WRITE_ARCH_PROTOCOL\r
       // The authenticated variable perhaps is not initialized, just return here.\r
       //\r
       return EFI_NOT_AVAILABLE_YET;\r
     } else if ((Attributes & VARIABLE_ATTRIBUTE_AT_AW) != 0) {\r
       //\r
       // Trying to update volatile authenticated variable prior to the installation of EFI_VARIABLE_WRITE_ARCH_PROTOCOL\r
       // The authenticated variable perhaps is not initialized, just return here.\r
       //\r

-      DEBUG ((EFI_D_ERROR, "Update AUTH variable before EFI_VARIABLE_WRITE_ARCH_PROTOCOL ready - %r\n", EFI_NOT_AVAILABLE_YET));\r
+      DEBUG ((DEBUG_ERROR, "Update AUTH variable before EFI_VARIABLE_WRITE_ARCH_PROTOCOL ready - %r\n", EFI_NOT_AVAILABLE_YET));\r

       return EFI_NOT_AVAILABLE_YET;\r
     }\r
   }\r
       return EFI_NOT_AVAILABLE_YET;\r
     }\r
   }\r


@@ -2764,7 +2764,7 @@ VariableServiceSetVariable (
       // 2. The only attribute differing is EFI_VARIABLE_APPEND_WRITE\r
       //\r
       Status = EFI_INVALID_PARAMETER;\r
       // 2. The only attribute differing is EFI_VARIABLE_APPEND_WRITE\r
       //\r
       Status = EFI_INVALID_PARAMETER;\r

-      DEBUG ((EFI_D_INFO, "[Variable]: Rewritten a preexisting variable(0x%08x) with different attributes(0x%08x) - %g:%s\n", Variable.CurrPtr->Attributes, Attributes, VendorGuid, VariableName));\r
+      DEBUG ((DEBUG_INFO, "[Variable]: Rewritten a preexisting variable(0x%08x) with different attributes(0x%08x) - %g:%s\n", Variable.CurrPtr->Attributes, Attributes, VendorGuid, VariableName));\r

       goto Done;\r
     }\r
   }\r
       goto Done;\r
     }\r
   }\r


@@ -3264,7 +3264,7 @@ FlushHobVariableToFlash (
       //\r
       // All HOB variables have been flushed in flash.\r
       //\r
       //\r
       // All HOB variables have been flushed in flash.\r
       //\r

-      DEBUG ((EFI_D_INFO, "Variable driver: all HOB variables have been flushed in flash.\n"));\r
+      DEBUG ((DEBUG_INFO, "Variable driver: all HOB variables have been flushed in flash.\n"));\r

       if (mVariableModuleGlobal->VariableGlobal.VariableRuntimeCacheContext.HobFlushComplete != NULL) {\r
         *(mVariableModuleGlobal->VariableGlobal.VariableRuntimeCacheContext.HobFlushComplete) = TRUE;\r
       }\r
       if (mVariableModuleGlobal->VariableGlobal.VariableRuntimeCacheContext.HobFlushComplete != NULL) {\r
         *(mVariableModuleGlobal->VariableGlobal.VariableRuntimeCacheContext.HobFlushComplete) = TRUE;\r
       }\r


@@ -3333,7 +3333,7 @@ VariableWriteServiceInitialize (
                                             GetVariableHeaderSize (mVariableModuleGlobal->VariableGlobal.AuthFormat);\r
     Status = AuthVariableLibInitialize (&mAuthContextIn, &mAuthContextOut);\r
     if (!EFI_ERROR (Status)) {\r
                                             GetVariableHeaderSize (mVariableModuleGlobal->VariableGlobal.AuthFormat);\r
     Status = AuthVariableLibInitialize (&mAuthContextIn, &mAuthContextOut);\r
     if (!EFI_ERROR (Status)) {\r

-      DEBUG ((EFI_D_INFO, "Variable driver will work with auth variable support!\n"));\r
+      DEBUG ((DEBUG_INFO, "Variable driver will work with auth variable support!\n"));\r

       mVariableModuleGlobal->VariableGlobal.AuthSupport = TRUE;\r
       if (mAuthContextOut.AuthVarEntry != NULL) {\r
         for (Index = 0; Index < mAuthContextOut.AuthVarEntryCount; Index++) {\r
       mVariableModuleGlobal->VariableGlobal.AuthSupport = TRUE;\r
       if (mAuthContextOut.AuthVarEntry != NULL) {\r
         for (Index = 0; Index < mAuthContextOut.AuthVarEntryCount; Index++) {\r


@@ -3347,8 +3347,8 @@ VariableWriteServiceInitialize (
         }\r
       }\r
     } else if (Status == EFI_UNSUPPORTED) {\r
         }\r
       }\r
     } else if (Status == EFI_UNSUPPORTED) {\r

-      DEBUG ((EFI_D_INFO, "NOTICE - AuthVariableLibInitialize() returns %r!\n", Status));\r
-      DEBUG ((EFI_D_INFO, "Variable driver will continue to work without auth variable support!\n"));\r
+      DEBUG ((DEBUG_INFO, "NOTICE - AuthVariableLibInitialize() returns %r!\n", Status));\r
+      DEBUG ((DEBUG_INFO, "Variable driver will continue to work without auth variable support!\n"));\r

       mVariableModuleGlobal->VariableGlobal.AuthSupport = FALSE;\r
       Status = EFI_SUCCESS;\r
     }\r
       mVariableModuleGlobal->VariableGlobal.AuthSupport = FALSE;\r
       Status = EFI_SUCCESS;\r
     }\r


@@ -3550,7 +3550,7 @@ GetHobVariableStore (
         return EFI_OUT_OF_RESOURCES;\r
       }\r
     } else {\r
         return EFI_OUT_OF_RESOURCES;\r
       }\r
     } else {\r

-      DEBUG ((EFI_D_ERROR, "HOB Variable Store header is corrupted!\n"));\r
+      DEBUG ((DEBUG_ERROR, "HOB Variable Store header is corrupted!\n"));\r

     }\r
   }\r
 \r
     }\r
   }\r
 \r


@@ -3598,14 +3598,14 @@ VariableCommonInitialize (
   // has been initialized in InitNonVolatileVariableStore().\r
   //\r
   if (mVariableModuleGlobal->VariableGlobal.AuthFormat) {\r
   // has been initialized in InitNonVolatileVariableStore().\r
   //\r
   if (mVariableModuleGlobal->VariableGlobal.AuthFormat) {\r

-    DEBUG ((EFI_D_INFO, "Variable driver will work with auth variable format!\n"));\r
+    DEBUG ((DEBUG_INFO, "Variable driver will work with auth variable format!\n"));\r

     //\r
     // Set AuthSupport to FALSE first, VariableWriteServiceInitialize() will initialize it.\r
     //\r
     mVariableModuleGlobal->VariableGlobal.AuthSupport = FALSE;\r
     VariableGuid = &gEfiAuthenticatedVariableGuid;\r
   } else {\r
     //\r
     // Set AuthSupport to FALSE first, VariableWriteServiceInitialize() will initialize it.\r
     //\r
     mVariableModuleGlobal->VariableGlobal.AuthSupport = FALSE;\r
     VariableGuid = &gEfiAuthenticatedVariableGuid;\r
   } else {\r

-    DEBUG ((EFI_D_INFO, "Variable driver will work without auth variable support!\n"));\r
+    DEBUG ((DEBUG_INFO, "Variable driver will work without auth variable support!\n"));\r

     mVariableModuleGlobal->VariableGlobal.AuthSupport = FALSE;\r
     VariableGuid = &gEfiVariableGuid;\r
   }\r
     mVariableModuleGlobal->VariableGlobal.AuthSupport = FALSE;\r
     VariableGuid = &gEfiVariableGuid;\r
   }\r


@@ -3750,4 +3750,3 @@ GetFvbInfoByAddress (
 \r
   return Status;\r
 }\r
 \r
   return Status;\r
 }\r

-\r