MdeModulePkg: Replace BSD License with BSD+Patent License

[mirror_edk2.git] / MdeModulePkg / Library / VarCheckHiiLib / VarCheckHiiGenFromFv.c

diff --git a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromFv.c b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromFv.c
index 21fc80e89c1ad8242b463a2cf81db165584bc1e9..f32499e34bb74534b5c56e378dce497a55f4e0f2 100644 (file)
--- a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromFv.c
+++ b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromFv.c
@@ -1,14 +1,8 @@
 /** @file\r
   Var Check Hii generation from FV.\r
 \r
-Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -219,8 +213,8 @@ ParseFfs (
                         &AuthenticationStatus\r
                         );\r
         if (!EFI_ERROR (Status)) {\r
-          DEBUG ((EFI_D_INFO, "FfsNameGuid - %g\n", DriverGuid));\r
-          DEBUG ((EFI_D_INFO, "NumberofMatchingVfrBin - 0x%02x\n", NumberofMatchingVfrBin));\r
+          DEBUG ((DEBUG_INFO , "FfsNameGuid - %g\n", DriverGuid));\r
+          DEBUG ((DEBUG_INFO , "NumberofMatchingVfrBin - 0x%02x\n", NumberofMatchingVfrBin));\r
 \r
           for (VfrBinIndex = 0; VfrBinIndex < NumberofMatchingVfrBin; VfrBinIndex++) {\r
 #ifdef DUMP_HII_DATA\r
@@ -284,7 +278,7 @@ ParseFv (
   // Search all FVs\r
   //\r
   for (Index = 0; Index < HandleCount; Index++) {\r
-    DEBUG ((EFI_D_INFO, "FvIndex - %x\n", Index));\r
+    DEBUG ((DEBUG_INFO , "FvIndex - %x\n", Index));\r
     Status = gBS->HandleProtocol (\r
                     HandleBuffer[Index],\r
                     &gEfiFirmwareVolume2ProtocolGuid,\r
@@ -305,9 +299,9 @@ ParseFv (
       ASSERT_EFI_ERROR (Status);\r
       Status = Fvb2->GetPhysicalAddress (Fvb2, &FvAddress);\r
       if (!EFI_ERROR (Status)) {\r
-        DEBUG ((EFI_D_INFO, "FvAddress - 0x%08x\n", FvAddress));\r
+        DEBUG ((DEBUG_INFO , "FvAddress - 0x%08x\n", FvAddress));\r
         FvSize = ((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) FvAddress)->FvLength;\r
-        DEBUG ((EFI_D_INFO, "FvSize    - 0x%08x\n", FvSize));\r
+        DEBUG ((DEBUG_INFO , "FvSize    - 0x%08x\n", FvSize));\r
       }\r
     );\r
 \r
@@ -372,8 +366,8 @@ CreateVfrDriverList (
   UINTN                         Index;\r
   VAR_CHECK_VFR_DRIVER_INFO     *VfrDriverInfo;\r
 \r
-  for (Index = 0; !CompareGuid (&DriverGuidArray[Index], &gZeroGuid); Index++) {\r
-     DEBUG ((EFI_D_INFO, "CreateVfrDriverList: %g\n", &DriverGuidArray[Index]));\r
+  for (Index = 0; !IsZeroGuid (&DriverGuidArray[Index]); Index++) {\r
+     DEBUG ((DEBUG_INFO , "CreateVfrDriverList: %g\n", &DriverGuidArray[Index]));\r
      VfrDriverInfo = InternalVarCheckAllocateZeroPool (sizeof (*VfrDriverInfo));\r
      ASSERT (VfrDriverInfo != NULL);\r
      VfrDriverInfo->Signature = VAR_CHECK_VFR_DRIVER_INFO_SIGNATURE;\r
@@ -414,14 +408,14 @@ VarCheckHiiGenFromFv (
   EFI_GUID      *DriverGuidArray;\r
   BOOLEAN       ScanAll;\r
 \r
-  DEBUG ((EFI_D_INFO, "VarCheckHiiGenDxeFromFv\n"));\r
+  DEBUG ((DEBUG_INFO , "VarCheckHiiGenDxeFromFv\n"));\r
 \r
   //\r
   // Get vfr driver guid array from PCD.\r
   //\r
   DriverGuidArray = (EFI_GUID *) PcdGetPtr (PcdVarCheckVfrDriverGuidArray);\r
 \r
-  if (CompareGuid (&DriverGuidArray[0], &gZeroGuid)) {\r
+  if (IsZeroGuid (&DriverGuidArray[0])) {\r
     //\r
     // No VFR driver will be parsed from FVs.\r
     //\r