SignedCapsulePkg: Replace BSD License with BSD+Patent License

[mirror_edk2.git] / SignedCapsulePkg / Universal / SystemFirmwareUpdate / SystemFirmwareCommonDxe.c

diff --git a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareCommonDxe.c b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareCommonDxe.c
index 642a99d52628aec38364129e82a10e04d6685c6e..d377a8d056655a22874e65a2a2c144073ced1ede 100644 (file)
--- a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareCommonDxe.c
+++ b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareCommonDxe.c
@@ -1,14 +1,8 @@
 /** @file\r
   Produce FMP instance for system firmware.\r
 \r
-  Copyright (c) 2016, 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) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -166,7 +160,7 @@ FmpGetImageInfo (
   @retval EFI_INVALID_PARAMETER  The Image was NULL.\r
   @retval EFI_NOT_FOUND          The current image is not copied to the buffer.\r
   @retval EFI_UNSUPPORTED        The operation is not supported.\r
-  @retval EFI_SECURITY_VIOLATIO  The operation could not be performed due to an authentication failure.\r
+  @retval EFI_SECURITY_VIOLATION The operation could not be performed due to an authentication failure.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -178,18 +172,6 @@ FmpGetImage (
   IN  OUT  UINTN                        *ImageSize\r
   )\r
 {\r
-  SYSTEM_FMP_PRIVATE_DATA *SystemFmpPrivate;\r
-\r
-  if (Image == NULL || ImageSize == NULL) {\r
-    return EFI_INVALID_PARAMETER;\r
-  }\r
-\r
-  SystemFmpPrivate = SYSTEM_FMP_PRIVATE_DATA_FROM_FMP(This);\r
-\r
-  if (ImageIndex == 0 || ImageIndex > SystemFmpPrivate->DescriptorCount || ImageSize == NULL || Image == NULL) {\r
-    return EFI_INVALID_PARAMETER;\r
-  }\r
-\r
   return EFI_UNSUPPORTED;\r
 }\r
 \r
@@ -210,7 +192,7 @@ FmpGetImage (
   @retval EFI_SUCCESS            The image was successfully checked.\r
   @retval EFI_INVALID_PARAMETER  The Image was NULL.\r
   @retval EFI_UNSUPPORTED        The operation is not supported.\r
-  @retval EFI_SECURITY_VIOLATIO  The operation could not be performed due to an authentication failure.\r
+  @retval EFI_SECURITY_VIOLATION The operation could not be performed due to an authentication failure.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -300,7 +282,7 @@ FmpGetPackageInfo (
   @retval EFI_INVALID_PARAMETER  The PackageVersionName length is longer than the value\r
                                  returned in PackageVersionNameMaxLen.\r
   @retval EFI_UNSUPPORTED        The operation is not supported.\r
-  @retval EFI_SECURITY_VIOLATIO  The operation could not be performed due to an authentication failure.\r
+  @retval EFI_SECURITY_VIOLATION The operation could not be performed due to an authentication failure.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -355,31 +337,4 @@ InitializePrivateData (
   return EFI_SUCCESS;\r
 }\r
 \r
-/**\r
-  Return if this FMP is a system FMP or a device FMP, based upon FmpImageInfo.\r
-\r
-  @param[in] FmpImageInfo A pointer to EFI_FIRMWARE_IMAGE_DESCRIPTOR\r
-\r
-  @retval TRUE  It is a system FMP.\r
-  @retval FALSE It is a device FMP.\r
-**/\r
-BOOLEAN\r
-IsSystemFmp (\r
-  IN EFI_FIRMWARE_IMAGE_DESCRIPTOR   *FmpImageInfo\r
-  )\r
-{\r
-  GUID      *Guid;\r
-  UINTN     Count;\r
-  UINTN     Index;\r
-\r
-  Guid = PcdGetPtr(PcdSystemFmpCapsuleImageTypeIdGuid);\r
-  Count = PcdGetSize(PcdSystemFmpCapsuleImageTypeIdGuid) / sizeof(GUID);\r
 \r
-  for (Index = 0; Index < Count; Index++, Guid++) {\r
-    if (CompareGuid(&FmpImageInfo->ImageTypeId, Guid)) {\r
-      return TRUE;\r
-    }\r
-  }\r
-\r
-  return FALSE;\r
-}\r