1) Add Include/Framework/BootScript.h that contains defines shared between Boot Script Executer PPI and Boot Script Save Protocol. Remove those safe defines from Include/Ppi/BootScriptExecuter.h

2) Remove Include/Framework/DataHubRecords.h and merge its content into Include/Guid/DataHubRecords.h
3) Remove Include/Framework/Legacy16.h and merge its contents into Include/Protocol/LegacyBios.h
4) Update FrameworkDxe.h to no longer include all the Legacy16.h and DataHubRecords.h contents.  This reduces the number of include file and definitions pulled in when a module include FrameworkDxe.h.  The Legacy16.h contents can now be included by a module through Protocol/LegacyBios.h and the DataHubRecords.h contents can be included by a module through Guid/DataHubRecords.h
5) Update Include/Guid/StatusCodeDataTypeId.h so it can be safely included by both PEIMs and DXE Modules since both the PEI and DXE phases support status codes
6) Remove extra #includes where possible to reduce number of files included during a build.
7) Update Include/Protocol/LegacyBiosPlatform.h to #include Include/Protocol/LegacyBios.h since it depends on HDD_INFO and COMPATIBILITY16 strictures carried by LegacyBios.h



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

1 files changed, 9 insertions, 21 deletions

diff --git a/IntelFrameworkPkg/Include/Protocol/BootScriptSave.h b/IntelFrameworkPkg/Include/Protocol/BootScriptSave.h
index a81a0ad26f..62ea4cbd54 100644
--- a/IntelFrameworkPkg/Include/Protocol/BootScriptSave.h
+++ b/IntelFrameworkPkg/Include/Protocol/BootScriptSave.h
@@ -19,14 +19,9 @@
 #ifndef _BOOT_SCRIPT_SAVE_PROTOCOL_H_

 #define _BOOT_SCRIPT_SAVE_PROTOCOL_H_

 

-//

-// To get the multiple phase definitions defined in Boot Script Specification

-//

-#include <Ppi/BootScriptExecuter.h>

-

-//

-// S3 Save Protocol GUID

-//

+///

+/// S3 Save Protocol GUID

+///

 #define EFI_BOOT_SCRIPT_SAVE_PROTOCOL_GUID \

   { \

     0x470e1529, 0xb79e, 0x4e32, {0xa0, 0xfe, 0x6a, 0x15, 0x6d, 0x29, 0xf9, 0xb2 } \

@@ -34,9 +29,6 @@
 

 typedef struct _EFI_BOOT_SCRIPT_SAVE_PROTOCOL EFI_BOOT_SCRIPT_SAVE_PROTOCOL;

 

-//

-// Protocol Member_Function

-//

 /**

   Adds a record into a specified Framework boot script table.

 

@@ -80,19 +72,15 @@ EFI_STATUS
   OUT EFI_PHYSICAL_ADDRESS                    *Address

   );

 

-//

-// S3 Save Protocol data structure

-//

-/**

-  The EFI_BOOT_SCRIPT_SAVE_PROTOCOL publishes the Framework boot script abstractions

-  to store or record various boot scripts into boot script tables.

-**/

+///

+/// The EFI_BOOT_SCRIPT_SAVE_PROTOCOL publishes the Framework boot script abstractions

+/// to store or record various boot scripts into boot script tables.

+///

 struct _EFI_BOOT_SCRIPT_SAVE_PROTOCOL {

-  EFI_BOOT_SCRIPT_WRITE       Write;      ///< Writes various boot scripts to a boot script table.

-  EFI_BOOT_SCRIPT_CLOSE_TABLE CloseTable; ///< Retrieves and closes a script table.

+  EFI_BOOT_SCRIPT_WRITE        Write;      ///< Writes various boot scripts to a boot script table.

+  EFI_BOOT_SCRIPT_CLOSE_TABLE  CloseTable; ///< Retrieves and closes a script table.

 };

 

 extern EFI_GUID gEfiBootScriptSaveProtocolGuid;

 

 #endif

-