1. Clean up MdePkg internal header files

The header files in MdePkg/Include/Ia32, X64, Ipf, Ebc, Pi, Uefi directories are the internal header files, which should not be directly included by the modules.

This patch cleans these internal header files to remove the uncessary ProcessorBind.h file.

2. Clean up MdePkg public header files to remove the uncessary internal header files.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8324 6f19259b-4bc3-4df7-8a09-765794883524

8 files changed, 118 insertions, 109 deletions

diff --git a/MdePkg/Include/Pi/PiBootMode.h b/MdePkg/Include/Pi/PiBootMode.h
index e3c45a2d00..d15733142d 100644
--- a/MdePkg/Include/Pi/PiBootMode.h
+++ b/MdePkg/Include/Pi/PiBootMode.h
@@ -1,7 +1,7 @@
 /** @file

   Present the boot mode values in PI.

 

-  Copyright (c) 2006 - 2008, Intel Corporation                                                         

+  Copyright (c) 2006 - 2009, Intel Corporation                                                         

   All rights reserved. This program and the accompanying materials                          

   are licensed and made available under the terms and conditions of the BSD License         

   which accompanies this distribution.  The full text of the license may be found at        

@@ -18,8 +18,6 @@
 #ifndef __PI_BOOT_MODE_H__

 #define __PI_BOOT_MODE_H__

 

-#include <ProcessorBind.h>

-

 ///

 /// EFI boot mode

 /// 

diff --git a/MdePkg/Include/Pi/PiDxeCis.h b/MdePkg/Include/Pi/PiDxeCis.h
index 72f0f4088a..9ed4da661a 100644
--- a/MdePkg/Include/Pi/PiDxeCis.h
+++ b/MdePkg/Include/Pi/PiDxeCis.h
@@ -1,7 +1,7 @@
 /** @file

   Include file matches things in PI.

 

-  Copyright (c) 2006 - 2008, Intel Corporation                                                         

+  Copyright (c) 2006 - 2009, Intel Corporation                                                         

   All rights reserved. This program and the accompanying materials                          

   are licensed and made available under the terms and conditions of the BSD License         

   which accompanies this distribution.  The full text of the license may be found at        

@@ -18,6 +18,7 @@
 #ifndef __PI_DXECIS_H__

 #define __PI_DXECIS_H__

 

+#include <Uefi/UefiMultiPhase.h>

 #include <Pi/PiMultiPhase.h>

 

 ///

diff --git a/MdePkg/Include/Pi/PiFirmwareFile.h b/MdePkg/Include/Pi/PiFirmwareFile.h
index 8d5dd336f9..b39648b545 100644
--- a/MdePkg/Include/Pi/PiFirmwareFile.h
+++ b/MdePkg/Include/Pi/PiFirmwareFile.h
@@ -1,7 +1,7 @@
 /** @file

   The firmware file related definitions in PI.

 

-  Copyright (c) 2006 - 2008, Intel Corporation                                                         

+  Copyright (c) 2006 - 2009, Intel Corporation                                                         

   All rights reserved. This program and the accompanying materials                          

   are licensed and made available under the terms and conditions of the BSD License         

   which accompanies this distribution.  The full text of the license may be found at        

@@ -19,8 +19,6 @@
 #ifndef __PI_FIRMWARE_FILE_H__

 #define __PI_FIRMWARE_FILE_H__

 

-#include <ProcessorBind.h>

-

 #pragma pack(1)

 ///

 /// Used to verify the integrity of the file.

diff --git a/MdePkg/Include/Pi/PiFirmwareVolume.h b/MdePkg/Include/Pi/PiFirmwareVolume.h
index d6d69f40e7..f5c1026ea2 100644
--- a/MdePkg/Include/Pi/PiFirmwareVolume.h
+++ b/MdePkg/Include/Pi/PiFirmwareVolume.h
@@ -1,7 +1,7 @@
 /** @file

   The firmware volume related definitions in PI.

 

-  Copyright (c) 2006 - 2008, Intel Corporation                                                         

+  Copyright (c) 2006 - 2009, Intel Corporation                                                         

   All rights reserved. This program and the accompanying materials                          

   are licensed and made available under the terms and conditions of the BSD License         

   which accompanies this distribution.  The full text of the license may be found at        

@@ -18,8 +18,6 @@
 #ifndef __PI_FIRMWAREVOLUME_H__

 #define __PI_FIRMWAREVOLUME_H__

 

-#include <ProcessorBind.h>

-

 ///

 /// EFI_FV_FILE_ATTRIBUTES

 ///

diff --git a/MdePkg/Include/Pi/PiHob.h b/MdePkg/Include/Pi/PiHob.h
index 7f4bf8a927..0c51f8e01c 100644
--- a/MdePkg/Include/Pi/PiHob.h
+++ b/MdePkg/Include/Pi/PiHob.h
@@ -1,7 +1,7 @@
 /** @file

   HOB related definitions in PI.

 

-  Copyright (c) 2006 - 2008, Intel Corporation                                                         

+  Copyright (c) 2006 - 2009, Intel Corporation                                                         

   All rights reserved. This program and the accompanying materials                          

   are licensed and made available under the terms and conditions of the BSD License         

   which accompanies this distribution.  The full text of the license may be found at        

@@ -18,11 +18,6 @@
 #ifndef __PI_HOB_H__

 #define __PI_HOB_H__

 

-#include <ProcessorBind.h>

-#include <Pi/PiBootMode.h>

-#include <Uefi/UefiBaseType.h>

-#include <Uefi/UefiMultiPhase.h>

-

 //

 // HobType of EFI_HOB_GENERIC_HEADER.

 // 

diff --git a/MdePkg/Include/Pi/PiMultiPhase.h b/MdePkg/Include/Pi/PiMultiPhase.h
index e31d986e96..5791a92281 100644
--- a/MdePkg/Include/Pi/PiMultiPhase.h
+++ b/MdePkg/Include/Pi/PiMultiPhase.h
@@ -1,7 +1,7 @@
 /** @file

   Include file matches things in PI for multiple module types.

 

-  Copyright (c) 2006 - 2008, Intel Corporation                                                         

+  Copyright (c) 2006 - 2009, Intel Corporation                                                         

   All rights reserved. This program and the accompanying materials                          

   are licensed and made available under the terms and conditions of the BSD License         

   which accompanies this distribution.  The full text of the license may be found at        

@@ -18,103 +18,13 @@
 #ifndef __PI_MULTIPHASE_H__

 #define __PI_MULTIPHASE_H__

 

-#include <Uefi/UefiMultiPhase.h>

-

 #include <Pi/PiFirmwareVolume.h>

 #include <Pi/PiFirmwareFile.h>

 #include <Pi/PiBootMode.h>

-

 #include <Pi/PiHob.h>

 #include <Pi/PiDependency.h>

-

+#include <Pi/PiStatusCode.h>

 

 #define EFI_NOT_AVAILABLE_YET   EFIERR (32)

 

-///

-/// Status Code Type Definition

-///

-typedef UINT32  EFI_STATUS_CODE_TYPE;

-

-//

-// A Status Code Type is made up of the code type and severity

-// All values masked by EFI_STATUS_CODE_RESERVED_MASK are

-// reserved for use by this specification.

-//

-#define EFI_STATUS_CODE_TYPE_MASK     0x000000FF

-#define EFI_STATUS_CODE_SEVERITY_MASK 0xFF000000

-#define EFI_STATUS_CODE_RESERVED_MASK 0x00FFFF00

-

-//

-// Definition of code types, all other values masked by

-// EFI_STATUS_CODE_TYPE_MASK are reserved for use by

-// this specification.

-//

-#define EFI_PROGRESS_CODE             0x00000001

-#define EFI_ERROR_CODE                0x00000002

-#define EFI_DEBUG_CODE                0x00000003

-

-//

-// Definitions of severities, all other values masked by

-// EFI_STATUS_CODE_SEVERITY_MASK are reserved for use by

-// this specification.

-// Uncontained errors are major errors that could not contained

-// to the specific component that is reporting the error

-// For example, if a memory error was not detected early enough,

-// the bad data could be consumed by other drivers.

-//

-#define EFI_ERROR_MINOR               0x40000000

-#define EFI_ERROR_MAJOR               0x80000000

-#define EFI_ERROR_UNRECOVERED         0x90000000

-#define EFI_ERROR_UNCONTAINED         0xa0000000

-

-///

-/// Status Code Value Definition

-///

-typedef UINT32 EFI_STATUS_CODE_VALUE;

-

-//

-// A Status Code Value is made up of the class, subclass, and

-// an operation.

-//

-#define EFI_STATUS_CODE_CLASS_MASK      0xFF000000

-#define EFI_STATUS_CODE_SUBCLASS_MASK   0x00FF0000

-#define EFI_STATUS_CODE_OPERATION_MASK  0x0000FFFF

-

-///

-/// Definition of Status Code extended data header.

-/// The data will follow HeaderSize bytes from the beginning of

-/// the structure and is Size bytes long.

-///

-typedef struct {

-  ///

-  /// The size of the structure. This is specified to enable future expansion.

-  ///

-  UINT16    HeaderSize;

-  ///

-  /// The size of the data in bytes. This does not include the size of the header structure.

-  ///

-  UINT16    Size;

-  ///

-  /// The GUID defining the type of the data.

-  ///

-  EFI_GUID  Type;

-} EFI_STATUS_CODE_DATA;

-

-

-///

-/// Bit values for Authentication Status

-///

-/// xx00 Image was not signed.

-/// xxx1 Platform security policy override. Assumes same meaning as 0010 (the image was signed, the

-///      signature was tested, and the signature passed authentication test).

-/// 0010 Image was signed, the signature was tested, and the signature passed authentication test.

-/// 0110 Image was signed and the signature was not tested.

-/// 1010 Image was signed, the signature was tested, and the signature failed the authentication test.

-///

-#define EFI_AUTH_STATUS_PLATFORM_OVERRIDE   0x01

-#define EFI_AUTH_STATUS_IMAGE_SIGNED        0x02

-#define EFI_AUTH_STATUS_NOT_TESTED          0x04

-#define EFI_AUTH_STATUS_TEST_FAILED         0x08

-#define EFI_AUTH_STATUS_ALL                 0x0f

-

 #endif

diff --git a/MdePkg/Include/Pi/PiPeiCis.h b/MdePkg/Include/Pi/PiPeiCis.h
index 89ab2dde33..1d0754db34 100644
--- a/MdePkg/Include/Pi/PiPeiCis.h
+++ b/MdePkg/Include/Pi/PiPeiCis.h
@@ -1,7 +1,7 @@
 /** @file

   PI PEI master include file. This file should match the PI spec.

 

-  Copyright (c) 2006 - 2008, Intel Corporation                                                         

+  Copyright (c) 2006 - 2009, Intel Corporation                                                         

   All rights reserved. This program and the accompanying materials                          

   are licensed and made available under the terms and conditions of the BSD License         

   which accompanies this distribution.  The full text of the license may be found at        

@@ -18,6 +18,7 @@
 #ifndef __PI_PEICIS_H__

 #define __PI_PEICIS_H__

 

+#include <Uefi/UefiMultiPhase.h>

 #include <Pi/PiMultiPhase.h>

 

 ///

diff --git a/MdePkg/Include/Pi/PiStatusCode.h b/MdePkg/Include/Pi/PiStatusCode.h
new file mode 100644
index 0000000000..dc4b46176a
--- /dev/null
+++ b/MdePkg/Include/Pi/PiStatusCode.h
@@ -0,0 +1,108 @@
+/** @file

+  StatusCode related definitions in PI.

+

+  Copyright (c) 2009, Intel Corporation                                                         

+  All rights reserved. This program and the accompanying materials                          

+  are licensed and made available under the terms and conditions of the BSD License         

+  which accompanies this distribution.  The full text of the license may be found at        

+  http://opensource.org/licenses/bsd-license.php                                            

+

+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+

+  @par Revision Reference:

+  PI Version 1.0

+

+**/

+

+#ifndef __PI_STATUS_CODE_H__

+#define __PI_STATUS_CODE_H__

+

+///

+/// Status Code Type Definition

+///

+typedef UINT32  EFI_STATUS_CODE_TYPE;

+

+//

+// A Status Code Type is made up of the code type and severity

+// All values masked by EFI_STATUS_CODE_RESERVED_MASK are

+// reserved for use by this specification.

+//

+#define EFI_STATUS_CODE_TYPE_MASK     0x000000FF

+#define EFI_STATUS_CODE_SEVERITY_MASK 0xFF000000

+#define EFI_STATUS_CODE_RESERVED_MASK 0x00FFFF00

+

+//

+// Definition of code types, all other values masked by

+// EFI_STATUS_CODE_TYPE_MASK are reserved for use by

+// this specification.

+//

+#define EFI_PROGRESS_CODE             0x00000001

+#define EFI_ERROR_CODE                0x00000002

+#define EFI_DEBUG_CODE                0x00000003

+

+//

+// Definitions of severities, all other values masked by

+// EFI_STATUS_CODE_SEVERITY_MASK are reserved for use by

+// this specification.

+// Uncontained errors are major errors that could not contained

+// to the specific component that is reporting the error

+// For example, if a memory error was not detected early enough,

+// the bad data could be consumed by other drivers.

+//

+#define EFI_ERROR_MINOR               0x40000000

+#define EFI_ERROR_MAJOR               0x80000000

+#define EFI_ERROR_UNRECOVERED         0x90000000

+#define EFI_ERROR_UNCONTAINED         0xa0000000

+

+///

+/// Status Code Value Definition

+///

+typedef UINT32 EFI_STATUS_CODE_VALUE;

+

+//

+// A Status Code Value is made up of the class, subclass, and

+// an operation.

+//

+#define EFI_STATUS_CODE_CLASS_MASK      0xFF000000

+#define EFI_STATUS_CODE_SUBCLASS_MASK   0x00FF0000

+#define EFI_STATUS_CODE_OPERATION_MASK  0x0000FFFF

+

+///

+/// Definition of Status Code extended data header.

+/// The data will follow HeaderSize bytes from the beginning of

+/// the structure and is Size bytes long.

+///

+typedef struct {

+  ///

+  /// The size of the structure. This is specified to enable future expansion.

+  ///

+  UINT16    HeaderSize;

+  ///

+  /// The size of the data in bytes. This does not include the size of the header structure.

+  ///

+  UINT16    Size;

+  ///

+  /// The GUID defining the type of the data.

+  ///

+  EFI_GUID  Type;

+} EFI_STATUS_CODE_DATA;

+

+

+///

+/// Bit values for Authentication Status

+///

+/// xx00 Image was not signed.

+/// xxx1 Platform security policy override. Assumes same meaning as 0010 (the image was signed, the

+///      signature was tested, and the signature passed authentication test).

+/// 0010 Image was signed, the signature was tested, and the signature passed authentication test.

+/// 0110 Image was signed and the signature was not tested.

+/// 1010 Image was signed, the signature was tested, and the signature failed the authentication test.

+///

+#define EFI_AUTH_STATUS_PLATFORM_OVERRIDE   0x01

+#define EFI_AUTH_STATUS_IMAGE_SIGNED        0x02

+#define EFI_AUTH_STATUS_NOT_TESTED          0x04

+#define EFI_AUTH_STATUS_TEST_FAILED         0x08

+#define EFI_AUTH_STATUS_ALL                 0x0f

+

+#endif