Code Scrub the common includes in MdePkg.

[mirror_edk2.git] / MdePkg / Include / IndustryStandard / Tpm12.h

diff --git a/MdePkg/Include/IndustryStandard/Tpm12.h b/MdePkg/Include/IndustryStandard/Tpm12.h
index 5ba4bb44d8c6604eb0f31e91c4cd05f43b71aa11..11013e7876b9649114a06bf8166fc28ea149e5de 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Tpm12.h
+++ b/MdePkg/Include/IndustryStandard/Tpm12.h
@@ -1,25 +1,18 @@
-/*++\r
-\r
-Copyright (c) 2005 - 2006, Intel Corporation                                                         \r
-All rights reserved. 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
-\r
-Module Name:\r
-\r
-  Tpm12.h\r
-\r
-Abstract:\r
-\r
+/** \r
+       @file   \r
   TPM Specification data structures (TCG TPM Specification Version 1.2 Revision 94)\r
-\r
   See http://trustedcomputinggroup.org for latest specification updates\r
 \r
---*/\r
+  Copyright (c) 2006 - 2007, Intel Corporation\r
+  All rights reserved. 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
+**/\r
+\r
 \r
 #ifndef _TPM12_H_\r
 #define _TPM12_H_\r
@@ -33,8 +26,7 @@ Abstract:
 // Structures are all packed on 1-byte alignment\r
 //\r
 \r
-#pragma pack (push)\r
-#pragma pack (1)\r
+#pragma pack (push, 1)\r
 \r
 //\r
 // Part 2, section 2.2: Basic types & Helper redefinitions\r
@@ -414,13 +406,13 @@ typedef struct tdTPM_KEY_HANDLE_LIST {
 //\r
 // Part 2, section 5.10: TPM_KEY_FLAGS\r
 //\r
-enum tdTPM_KEY_FLAGS {\r
+typedef enum tdTPM_KEY_FLAGS {\r
   redirection                       = 0x00000001,\r
   migratable                        = 0x00000002,\r
   isVolatile                        = 0x00000004,\r
   pcrIgnoredOnRead                  = 0x00000008,\r
   migrateAuthority                  = 0x00000010\r
-};\r
+} TPM_KEY_FLAGS;\r
 \r
 //\r
 // Part 2, section 5.11: TPM_CHANGEAUTH_VALIDATE\r
@@ -1012,9 +1004,6 @@ typedef struct tdTPM_EK_BLOB_AUTH
 } TPM_EK_BLOB_AUTH;\r
 \r
 \r
-// TPM_CHOSENID_HASH = SHA(identityLabel || privacyCA)\r
-typedef TPM_DIGEST                  TPM_CHOSENID_HASH;\r
-\r
 typedef struct tdTPM_IDENTITY_CONTENTS\r
 {\r
     TPM_STRUCT_VER                  ver;\r