SecurityPkg: Replace BSD License with BSD+Patent License

[mirror_edk2.git] / SecurityPkg / Tcg / TcgSmm / TcgSmm.h

diff --git a/SecurityPkg/Tcg/TcgSmm/TcgSmm.h b/SecurityPkg/Tcg/TcgSmm/TcgSmm.h
index b03e49d6c9996c79259f55cba5a81dd24d7122e0..443f5871bfb5d469919f8c33cd05265859a223eb 100644 (file)
--- a/SecurityPkg/Tcg/TcgSmm/TcgSmm.h
+++ b/SecurityPkg/Tcg/TcgSmm/TcgSmm.h
@@ -1,14 +1,8 @@
 /** @file\r
   The header file for TCG SMM driver.\r
-  \r
-Copyright (c) 2012, 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) 2012 - 2018, Intel Corporation. All rights reserved.<BR>\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -21,6 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include <Guid/PhysicalPresenceData.h>\r
 #include <Guid/MemoryOverwriteControl.h>\r
+#include <Guid/TpmInstance.h>\r
 \r
 #include <Protocol/SmmSwDispatch2.h>\r
 #include <Protocol/AcpiTable.h>\r
@@ -34,6 +29,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/DxeServicesLib.h>\r
 #include <Library/TpmMeasurementLib.h>\r
+#include <Library/PcdLib.h>\r
+#include <Library/TcgPpVendorLib.h>\r
 \r
 #pragma pack(1)\r
 typedef struct {\r
@@ -55,6 +52,7 @@ typedef struct {
 typedef struct {\r
   PHYSICAL_PRESENCE_NVS  PhysicalPresence;\r
   MEMORY_CLEAR_NVS       MemoryClear;\r
+  UINT32                 PPRequestUserConfirm;\r
 } TCG_NVS;\r
 \r
 typedef struct {\r
@@ -81,23 +79,10 @@ typedef struct {
 #define ACPI_FUNCTION_GET_USER_CONFIRMATION_STATUS_FOR_REQUEST     8\r
 \r
 //\r
-// The return code for Get User Confirmation Status for Operation\r
+// The return code for Return TPM Operation Response to OS Environment\r
 //\r
-#define PP_REQUEST_NOT_IMPLEMENTED                                 0\r
-#define PP_REQUEST_BIOS_ONLY                                       1\r
-#define PP_REQUEST_BLOCKED                                         2\r
-#define PP_REQUEST_ALLOWED_AND_PPUSER_REQUIRED                     3\r
-#define PP_REQUEST_ALLOWED_AND_PPUSER_NOT_REQUIRED                 4\r
-\r
-//\r
-// The return code for Sumbit TPM Request to Pre-OS Environment\r
-// and Sumbit TPM Request to Pre-OS Environment 2\r
-//\r
-#define PP_SUBMIT_REQUEST_SUCCESS                                  0\r
-#define PP_SUBMIT_REQUEST_NOT_IMPLEMENTED                          1\r
-#define PP_SUBMIT_REQUEST_GENERAL_FAILURE                          2\r
-#define PP_SUBMIT_REQUEST_BLOCKED_BY_BIOS_SETTINGS                 3\r
-\r
+#define PP_RETURN_TPM_OPERATION_RESPONSE_SUCCESS                   0\r
+#define PP_RETURN_TPM_OPERATION_RESPONSE_FAILURE                   1\r
 \r
 //\r
 // The definition for TCG MOR\r