From d8a43975d902b901ecccc32cda1160c47c804bd8 Mon Sep 17 00:00:00 2001 From: vanjeff Date: Wed, 27 Jun 2007 06:15:36 +0000 Subject: [PATCH] added PPI and Protocol definitions needed by porting modules git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2778 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Include/Ppi/FindFv.h | 71 +++++++++ .../Include/Protocol/CustomizedDecompress.h | 137 ++++++++++++++++++ MdeModulePkg/Include/Protocol/EdkDecompress.h | 137 ++++++++++++++++++ MdeModulePkg/Include/Protocol/LoadPe32Image.h | 68 +++++++++ MdeModulePkg/MdeModulePkg.dec | 4 + MdeModulePkg/MdeModulePkg.nspd | 20 +++ .../Universal/Disk/DiskIo/Dxe/ComponentName.c | 5 + .../Universal/Disk/DiskIo/Dxe/DiskIo.h | 5 + .../Universal/Disk/DiskIo/Dxe/DiskIo.inf | 25 +--- .../Universal/Disk/DiskIo/Dxe/diskio.c | 5 + .../Disk/Partition/Dxe/ComponentName.c | 5 + .../Universal/Disk/Partition/Dxe/ElTorito.c | 5 + .../Universal/Disk/Partition/Dxe/Gpt.c | 5 + .../Universal/Disk/Partition/Dxe/Mbr.c | 5 + .../Universal/Disk/Partition/Dxe/Partition.c | 5 + .../Universal/Disk/Partition/Dxe/Partition.h | 5 + .../Disk/Partition/Dxe/Partition.inf | 16 +- .../Security/SecurityStub/Dxe/SecurityStub.c | 5 + .../Security/SecurityStub/Dxe/SecurityStub.h | 5 + .../SecurityStub/Dxe/SecurityStub.inf | 19 +-- 20 files changed, 508 insertions(+), 44 deletions(-) create mode 100644 MdeModulePkg/Include/Ppi/FindFv.h create mode 100644 MdeModulePkg/Include/Protocol/CustomizedDecompress.h create mode 100644 MdeModulePkg/Include/Protocol/EdkDecompress.h create mode 100644 MdeModulePkg/Include/Protocol/LoadPe32Image.h diff --git a/MdeModulePkg/Include/Ppi/FindFv.h b/MdeModulePkg/Include/Ppi/FindFv.h new file mode 100644 index 0000000000..9a3e173742 --- /dev/null +++ b/MdeModulePkg/Include/Ppi/FindFv.h @@ -0,0 +1,71 @@ +/** @file + This file declares FindFv PPI used to locate FVs that contain PEIMs in PEI + + Copyright (c) 2006, 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. + + Module Name: FindFv.h + + @par Revision Reference: + This PPI is defined in PEI CIS + Version 0.91 + +**/ + +#ifndef __FIND_FV_H__ +#define __FIND_FV_H__ + +#define EFI_PEI_FIND_FV_PPI_GUID \ + { \ + 0x36164812, 0xa023, 0x44e5, {0xbd, 0x85, 0x5, 0xbf, 0x3c, 0x77, 0x0, 0xaa } \ + } + +typedef struct _EFI_PEI_FIND_FV_PPI EFI_PEI_FIND_FV_PPI; + +/** + This interface returns the base address of the firmware volume whose index + was passed in FvNumber.Once this function reports a firmware volume + index/base address pair, that index/address pairing must continue throughout PEI. + + @param PeiServices Pointer to the PEI Services Table. + @param This Interface pointer that implements the Find FV service. + @param FvNumber The index of the firmware volume to locate. + @param FvAddress The address of the volume to discover. + + @retval EFI_SUCCESS An additional firmware volume was found. + @retval EFI_OUT_OF_RESOURCES There are no firmware volumes for the given FvNumber. + @retval EFI_INVALID_PARAMETER *FvAddress is NULL. + +**/ +typedef +EFI_STATUS +(EFIAPI *EFI_PEI_FIND_FV_FINDFV) ( + IN EFI_PEI_FIND_FV_PPI *This, + IN EFI_PEI_SERVICES **PeiServices, + UINT8 *FvNumber, + EFI_FIRMWARE_VOLUME_HEADER **FVAddress + ); + +/** + @par Ppi Description: + Hardware mechanisms for locating FVs in a platform vary widely. + EFI_PEI_FIND_FV_PPI serves to abstract this variation so that the + PEI Foundation can remain standard across a wide variety of platforms. + + @param FindFv + Service that abstracts the location of additional firmware volumes. + +**/ +struct _EFI_PEI_FIND_FV_PPI { + EFI_PEI_FIND_FV_FINDFV FindFv; +}; + +extern EFI_GUID gEfiFindFvPpiGuid; + +#endif diff --git a/MdeModulePkg/Include/Protocol/CustomizedDecompress.h b/MdeModulePkg/Include/Protocol/CustomizedDecompress.h new file mode 100644 index 0000000000..bff8d46e88 --- /dev/null +++ b/MdeModulePkg/Include/Protocol/CustomizedDecompress.h @@ -0,0 +1,137 @@ +/*++ + +Copyright (c) 2006, 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. + +Module Name: + CustomizedDecompress.h + +Abstract: + The user Customized Decompress Protocol Interface + +--*/ + +#ifndef __CUSTOMIZED_DECOMPRESS_H__ +#define __CUSTOMIZED_DECOMPRESS_H__ + +#define EFI_CUSTOMIZED_DECOMPRESS_PROTOCOL_GUID \ + { 0x9a44198e, 0xa4a2, 0x44e6, {0x8a, 0x1f, 0x39, 0xbe, 0xfd, 0xac, 0x89, 0x6f } } + +typedef struct _EFI_CUSTOMIZED_DECOMPRESS_PROTOCOL EFI_CUSTOMIZED_DECOMPRESS_PROTOCOL; + +typedef +EFI_STATUS +(EFIAPI *EFI_CUSTOMIZED_DECOMPRESS_GET_INFO) ( + IN EFI_CUSTOMIZED_DECOMPRESS_PROTOCOL *This, + IN VOID *Source, + IN UINT32 SourceSize, + OUT UINT32 *DestinationSize, + OUT UINT32 *ScratchSize + ); +/*++ + +Routine Description: + + The GetInfo() function retrieves the size of the uncompressed buffer + and the temporary scratch buffer required to decompress the buffer + specified by Source and SourceSize. If the size of the uncompressed + buffer or the size of the scratch buffer cannot be determined from + the compressed data specified by Source and SourceData, then + EFI_INVALID_PARAMETER is returned. Otherwise, the size of the uncompressed + buffer is returned in DestinationSize, the size of the scratch buffer is + returned in ScratchSize, and EFI_SUCCESS is returned. + + The GetInfo() function does not have scratch buffer available to perform + a thorough checking of the validity of the source data. It just retrieves + the 'Original Size' field from the beginning bytes of the source data and + output it as DestinationSize. And ScratchSize is specific to the decompression + implementation. + +Arguments: + + This - The protocol instance pointer + Source - The source buffer containing the compressed data. + SourceSize - The size, in bytes, of source buffer. + DestinationSize - A pointer to the size, in bytes, of the uncompressed buffer + that will be generated when the compressed buffer specified + by Source and SourceSize is decompressed. + ScratchSize - A pointer to the size, in bytes, of the scratch buffer that + is required to decompress the compressed buffer specified by + Source and SourceSize. + +Returns: + EFI_SUCCESS - The size of the uncompressed data was returned in DestinationSize + and the size of the scratch buffer was returned in ScratchSize. + EFI_INVALID_PARAMETER - The size of the uncompressed data or the size of the scratch + buffer cannot be determined from the compressed data specified by + Source and SourceData. + +--*/ + + +typedef +EFI_STATUS +(EFIAPI *EFI_CUSTOMIZED_DECOMPRESS_DECOMPRESS) ( + IN EFI_CUSTOMIZED_DECOMPRESS_PROTOCOL *This, + IN VOID* Source, + IN UINT32 SourceSize, + IN OUT VOID* Destination, + IN UINT32 DestinationSize, + IN OUT VOID* Scratch, + IN UINT32 ScratchSize + ); +/*++ + +Routine Description: + + The Decompress() function extracts decompressed data to its original form. + + This protocol is designed so that the decompression algorithm can be + implemented without using any memory services. As a result, the + Decompress() function is not allowed to call AllocatePool() or + AllocatePages() in its implementation. It is the caller's responsibility + to allocate and free the Destination and Scratch buffers. + + If the compressed source data specified by Source and SourceSize is + sucessfully decompressed into Destination, then EFI_SUCCESS is returned. + If the compressed source data specified by Source and SourceSize is not in + a valid compressed data format, then EFI_INVALID_PARAMETER is returned. + +Arguments: + + This - The protocol instance pointer + Source - The source buffer containing the compressed data. + SourceSize - The size of source data. + Destination - On output, the destination buffer that contains + the uncompressed data. + DestinationSize - The size of destination buffer. The size of destination + buffer needed is obtained from GetInfo(). + Scratch - A temporary scratch buffer that is used to perform the + decompression. + ScratchSize - The size of scratch buffer. The size of scratch buffer needed + is obtained from GetInfo(). + +Returns: + + EFI_SUCCESS - Decompression completed successfully, and the uncompressed + buffer is returned in Destination. + EFI_INVALID_PARAMETER + - The source buffer specified by Source and SourceSize is + corrupted (not in a valid compressed format). + +--*/ + +struct _EFI_CUSTOMIZED_DECOMPRESS_PROTOCOL { + EFI_CUSTOMIZED_DECOMPRESS_GET_INFO GetInfo; + EFI_CUSTOMIZED_DECOMPRESS_DECOMPRESS Decompress; +}; + +extern EFI_GUID gEfiCustomizedDecompressProtocolGuid; + +#endif diff --git a/MdeModulePkg/Include/Protocol/EdkDecompress.h b/MdeModulePkg/Include/Protocol/EdkDecompress.h new file mode 100644 index 0000000000..ab9b840cf2 --- /dev/null +++ b/MdeModulePkg/Include/Protocol/EdkDecompress.h @@ -0,0 +1,137 @@ +/*++ + +Copyright (c) 2006, 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. + +Module Name: + EdkDecompress.h + +Abstract: + The Tiano Decompress Protocol Interface + +--*/ + +#ifndef __EDK_DECOMPRESS_H__ +#define __EDK_DECOMPRESS_H__ + +#define EFI_TIANO_DECOMPRESS_PROTOCOL_GUID \ + { 0xe84cf29c, 0x191f, 0x4eae, {0x96, 0xe1, 0xf4, 0x6a, 0xec, 0xea, 0xea, 0x0b } } + +typedef struct _EFI_TIANO_DECOMPRESS_PROTOCOL EFI_TIANO_DECOMPRESS_PROTOCOL; + +typedef +EFI_STATUS +(EFIAPI *EFI_TIANO_DECOMPRESS_GET_INFO) ( + IN EFI_TIANO_DECOMPRESS_PROTOCOL *This, + IN VOID *Source, + IN UINT32 SourceSize, + OUT UINT32 *DestinationSize, + OUT UINT32 *ScratchSize + ); +/*++ + +Routine Description: + + The GetInfo() function retrieves the size of the uncompressed buffer + and the temporary scratch buffer required to decompress the buffer + specified by Source and SourceSize. If the size of the uncompressed + buffer or the size of the scratch buffer cannot be determined from + the compressed data specified by Source and SourceData, then + EFI_INVALID_PARAMETER is returned. Otherwise, the size of the uncompressed + buffer is returned in DestinationSize, the size of the scratch buffer is + returned in ScratchSize, and EFI_SUCCESS is returned. + + The GetInfo() function does not have scratch buffer available to perform + a thorough checking of the validity of the source data. It just retrieves + the 'Original Size' field from the beginning bytes of the source data and + output it as DestinationSize. And ScratchSize is specific to the decompression + implementation. + +Arguments: + + This - The protocol instance pointer + Source - The source buffer containing the compressed data. + SourceSize - The size, in bytes, of source buffer. + DestinationSize - A pointer to the size, in bytes, of the uncompressed buffer + that will be generated when the compressed buffer specified + by Source and SourceSize is decompressed. + ScratchSize - A pointer to the size, in bytes, of the scratch buffer that + is required to decompress the compressed buffer specified by + Source and SourceSize. + +Returns: + EFI_SUCCESS - The size of the uncompressed data was returned in DestinationSize + and the size of the scratch buffer was returned in ScratchSize. + EFI_INVALID_PARAMETER - The size of the uncompressed data or the size of the scratch + buffer cannot be determined from the compressed data specified by + Source and SourceData. + +--*/ + + +typedef +EFI_STATUS +(EFIAPI *EFI_TIANO_DECOMPRESS_DECOMPRESS) ( + IN EFI_TIANO_DECOMPRESS_PROTOCOL *This, + IN VOID* Source, + IN UINT32 SourceSize, + IN OUT VOID* Destination, + IN UINT32 DestinationSize, + IN OUT VOID* Scratch, + IN UINT32 ScratchSize + ); +/*++ + +Routine Description: + + The Decompress() function extracts decompressed data to its original form. + + This protocol is designed so that the decompression algorithm can be + implemented without using any memory services. As a result, the + Decompress() function is not allowed to call AllocatePool() or + AllocatePages() in its implementation. It is the caller's responsibility + to allocate and free the Destination and Scratch buffers. + + If the compressed source data specified by Source and SourceSize is + sucessfully decompressed into Destination, then EFI_SUCCESS is returned. + If the compressed source data specified by Source and SourceSize is not in + a valid compressed data format, then EFI_INVALID_PARAMETER is returned. + +Arguments: + + This - The protocol instance pointer + Source - The source buffer containing the compressed data. + SourceSize - The size of source data. + Destination - On output, the destination buffer that contains + the uncompressed data. + DestinationSize - The size of destination buffer. The size of destination + buffer needed is obtained from GetInfo(). + Scratch - A temporary scratch buffer that is used to perform the + decompression. + ScratchSize - The size of scratch buffer. The size of scratch buffer needed + is obtained from GetInfo(). + +Returns: + + EFI_SUCCESS - Decompression completed successfully, and the uncompressed + buffer is returned in Destination. + EFI_INVALID_PARAMETER + - The source buffer specified by Source and SourceSize is + corrupted (not in a valid compressed format). + +--*/ + +struct _EFI_TIANO_DECOMPRESS_PROTOCOL { + EFI_TIANO_DECOMPRESS_GET_INFO GetInfo; + EFI_TIANO_DECOMPRESS_DECOMPRESS Decompress; +}; + +extern EFI_GUID gEfiTianoDecompressProtocolGuid; + +#endif diff --git a/MdeModulePkg/Include/Protocol/LoadPe32Image.h b/MdeModulePkg/Include/Protocol/LoadPe32Image.h new file mode 100644 index 0000000000..1ea29896b8 --- /dev/null +++ b/MdeModulePkg/Include/Protocol/LoadPe32Image.h @@ -0,0 +1,68 @@ +/*++ + +Copyright (c) 2006, 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. + +Module Name: + LoadPe32Image.h + +Abstract: + Load File protocol as defined in the EFI 1.0 specification. + + Load file protocol exists to supports the addition of new boot devices, + and to support booting from devices that do not map well to file system. + Network boot is done via a LoadFile protocol. + + EFI 1.0 can boot from any device that produces a LoadFile protocol. + +--*/ + +#ifndef __LOAD_PE32_IMAGE_H__ +#define __LOAD_PE32_IMAGE_H__ + +#define PE32_IMAGE_PROTOCOL_GUID \ + {0x5cb5c776,0x60d5,0x45ee,{0x88,0x3c,0x45,0x27,0x8,0xcd,0x74,0x3f }} + +#define EFI_LOAD_PE_IMAGE_ATTRIBUTE_NONE 0x00 +#define EFI_LOAD_PE_IMAGE_ATTRIBUTE_RUNTIME_REGISTRATION 0x01 +#define EFI_LOAD_PE_IMAGE_ATTRIBUTE_DEBUG_IMAGE_INFO_TABLE_REGISTRATION 0x02 + +typedef struct _EFI_PE32_IMAGE_PROTOCOL EFI_PE32_IMAGE_PROTOCOL; + +typedef +EFI_STATUS +(EFIAPI *LOAD_PE_IMAGE) ( + IN EFI_PE32_IMAGE_PROTOCOL *This, + IN EFI_HANDLE ParentImageHandle, + IN EFI_DEVICE_PATH_PROTOCOL *FilePath, + IN VOID *SourceBuffer OPTIONAL, + IN UINTN SourceSize, + IN EFI_PHYSICAL_ADDRESS DstBuffer OPTIONAL, + OUT UINTN *NumberOfPages OPTIONAL, + OUT EFI_HANDLE *ImageHandle, + OUT EFI_PHYSICAL_ADDRESS *EntryPoint OPTIONAL, + IN UINT32 Attribute + ); + +typedef +EFI_STATUS +(EFIAPI *UNLOAD_PE_IMAGE) ( + IN EFI_PE32_IMAGE_PROTOCOL *This, + IN EFI_HANDLE ImageHandle + ); + +struct _EFI_PE32_IMAGE_PROTOCOL { + LOAD_PE_IMAGE LoadPeImage; + UNLOAD_PE_IMAGE UnLoadPeImage; +}; + +extern EFI_GUID gEfiLoadPeImageProtocolGuid; + +#endif + diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index b3c87fe0e5..52a209234e 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -37,6 +37,7 @@ # ################################################################################ [Guids.common] + gEfiPeiPeCoffLoaderGuid = { 0xD8117CFF, 0x94A6, 0x11D4, { 0x9A, 0x3A, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }} gEfiGenericPlatformVariableGuid = { 0x59d1c24f, 0x50f1, 0x401a, { 0xb1, 0x01, 0xf3, 0x3e, 0x0d, 0xae, 0xd4, 0x43 }} gPeiPerformanceHobGuid = { 0xEC4DF5AF, 0x4395, 0x4CC9, { 0x94, 0xDE, 0x77, 0x50, 0x6D, 0x12, 0xC7, 0xB8 }} gEfiCapsuleVendorGuid = { 0x711C703F, 0xC285, 0x4B10, { 0xA3, 0xB0, 0x36, 0xEC, 0xBD, 0x3C, 0x8B, 0xE2 }} @@ -75,6 +76,7 @@ # ################################################################################ [Protocols.common] + gEfiFindFvPpiGuid = { 0x36164812, 0xA023, 0x44E5, { 0xBD, 0x85, 0x05, 0xBF, 0x3C, 0x77, 0x00, 0xAA }} gEfiScsiIoProtocolGuid = { 0x403CD195, 0xF233, 0x48EC, { 0x84, 0x55, 0xB2, 0xE5, 0x2F, 0x1D, 0x9E, 0x02 }} gPerformanceProtocolGuid = { 0x76B6BDFA, 0x2ACD, 0x4462, { 0x9E, 0x3F, 0xCB, 0x58, 0xC9, 0x69, 0xD9, 0x37 }} gEfiUsbAtapiProtocolGuid = { 0x2B2F68DA, 0x0CD2, 0x44CF, { 0x8E, 0x8B, 0xBB, 0xA2, 0x0B, 0x1B, 0x5B, 0x75 }} @@ -86,6 +88,8 @@ gEfiGenericMemTestProtocolGuid = { 0x309DE7F1, 0x7F5E, 0x4ACE, { 0xB4, 0x9C, 0x53, 0x1B, 0xE5, 0xAA, 0x95, 0xEF }} gEfiPrintProtocolGuid = { 0xDF2D868E, 0x32FC, 0x4CF0, { 0x8E, 0x6B, 0xFF, 0xD9, 0x5D, 0x13, 0x43, 0xD0 }} gEfiLoadPeImageProtocolGuid = { 0x5CB5C776, 0x60D5, 0x45EE, { 0x88, 0x3C, 0x45, 0x27, 0x08, 0xCD, 0x74, 0x3F }} + gEfiTianoDecompressProtocolGuid = { 0xE84CF29C, 0x191F, 0x4EAE, { 0x96, 0xE1, 0xF4, 0x6A, 0xEC, 0xEA, 0xEA, 0x0B }} + gEfiCustomizedDecompressProtocolGuid = { 0x9A44198E, 0xA4A2, 0x44E6, { 0x8A, 0x1F, 0x39, 0xBE, 0xFD, 0xAC, 0x89, 0x6F }} gEfiCapsuleArchProtocolGuid = { 0x5053697E, 0x2EBC, 0x4819, { 0x90, 0xD9, 0x05, 0x80, 0xDE, 0xEE, 0x57, 0x54 }} diff --git a/MdeModulePkg/MdeModulePkg.nspd b/MdeModulePkg/MdeModulePkg.nspd index 44214f4661..6302553604 100644 --- a/MdeModulePkg/MdeModulePkg.nspd +++ b/MdeModulePkg/MdeModulePkg.nspd @@ -138,6 +138,11 @@ 59d1c24f-50f1-401a-b101-f33e0daed443 The variable space Guid to pair with a Unicode string name to tag an EFI variable + + gEfiPeiPeCoffLoaderGuid + D8117CFF-94A6-11D4-9A3A-0090273FC14D + + @@ -145,6 +150,16 @@ 5053697E-2EBC-4819-90D9-0580DEEE5754 + + gEfiCustomizedDecompressProtocolGuid + 9A44198E-A4A2-44E6-8A1F-39BEFDAC896F + + + + gEfiTianoDecompressProtocolGuid + E84CF29C-191F-4EAE-96E1-F46AECEAEA0B + + gEfiLoadPeImageProtocolGuid 5CB5C776-60D5-45EE-883C-452708CD743F @@ -200,6 +215,11 @@ 403CD195-F233-48EC-8455-B2E52F1D9E02 + + gEfiFindFvPpiGuid + 36164812-A023-44E5-BD85-05BF3C7700AA + + diff --git a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/ComponentName.c b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/ComponentName.c index bf95be158c..de4bb2e0ef 100644 --- a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/ComponentName.c +++ b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/ComponentName.c @@ -12,6 +12,11 @@ **/ +// +// Include common header file for this module. +// +#include "CommonHeader.h" + #include "DiskIo.h" // diff --git a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.h b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.h index c1a572f846..5df48c61c5 100644 --- a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.h +++ b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.h @@ -16,6 +16,11 @@ #ifndef _DISK_IO_H #define _DISK_IO_H +// +// Include common header file for this module. +// +#include "CommonHeader.h" + #include #include #include diff --git a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.inf b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.inf index ad73679302..3030bda1dd 100644 --- a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.inf +++ b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.inf @@ -1,12 +1,13 @@ #/** @file -# Component description file for DiskIo module. +# Component description file for DiskIo module. +# +# DiskIo driver that layers it's self on every Block IO protocol in the system. +# Copyright (c) 2006 - 2007, Intel Corporation # -# Copyright (c) 2006 - 2007, 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. # @@ -34,8 +35,8 @@ # # VALID_ARCHITECTURES = IA32 X64 IPF EBC # -# DRIVER_BINDING = gDiskIoDriverBinding -# COMPONENT_NAME = gDiskIoComponentName +# DRIVER_BINDING = gDiskIoDriverBinding +# COMPONENT_NAME = gDiskIoComponentName # ################################################################################ @@ -48,6 +49,8 @@ ComponentName.c DiskIo.h diskio.c + CommonHeader.h + EntryPoint.c ################################################################################ @@ -60,18 +63,6 @@ [Includes] $(WORKSPACE)/MdePkg/Include/Library -################################################################################ -# -# Package Dependency Section - list of Package files that are required for -# this module. -# -################################################################################ - -[Packages] - $(WORKSPACE)/MdeModulePkg/MdeModulePkg.dec - $(WORKSPACE)/MdePkg/MdePkg.dec - - ################################################################################ # # Library Class Section - list of Library Classes that are required for diff --git a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/diskio.c b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/diskio.c index 0cb49224ca..d5efd634cf 100644 --- a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/diskio.c +++ b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/diskio.c @@ -20,6 +20,11 @@ **/ +// +// Include common header file for this module. +// +#include "CommonHeader.h" + #include "DiskIo.h" EFI_DRIVER_BINDING_PROTOCOL gDiskIoDriverBinding = { diff --git a/MdeModulePkg/Universal/Disk/Partition/Dxe/ComponentName.c b/MdeModulePkg/Universal/Disk/Partition/Dxe/ComponentName.c index e922cb0f92..8e8153fbc0 100644 --- a/MdeModulePkg/Universal/Disk/Partition/Dxe/ComponentName.c +++ b/MdeModulePkg/Universal/Disk/Partition/Dxe/ComponentName.c @@ -12,6 +12,11 @@ **/ +// +// Include common header file for this module. +// +#include "CommonHeader.h" + #include "Partition.h" // diff --git a/MdeModulePkg/Universal/Disk/Partition/Dxe/ElTorito.c b/MdeModulePkg/Universal/Disk/Partition/Dxe/ElTorito.c index 37ac710ff0..ab93c08931 100644 --- a/MdeModulePkg/Universal/Disk/Partition/Dxe/ElTorito.c +++ b/MdeModulePkg/Universal/Disk/Partition/Dxe/ElTorito.c @@ -13,6 +13,11 @@ **/ +// +// Include common header file for this module. +// +#include "CommonHeader.h" + #include "Partition.h" diff --git a/MdeModulePkg/Universal/Disk/Partition/Dxe/Gpt.c b/MdeModulePkg/Universal/Disk/Partition/Dxe/Gpt.c index 581007e92a..c5978a16be 100644 --- a/MdeModulePkg/Universal/Disk/Partition/Dxe/Gpt.c +++ b/MdeModulePkg/Universal/Disk/Partition/Dxe/Gpt.c @@ -14,6 +14,11 @@ **/ +// +// Include common header file for this module. +// +#include "CommonHeader.h" + #include "Partition.h" diff --git a/MdeModulePkg/Universal/Disk/Partition/Dxe/Mbr.c b/MdeModulePkg/Universal/Disk/Partition/Dxe/Mbr.c index d71698c826..bc08963e54 100644 --- a/MdeModulePkg/Universal/Disk/Partition/Dxe/Mbr.c +++ b/MdeModulePkg/Universal/Disk/Partition/Dxe/Mbr.c @@ -29,6 +29,11 @@ Abstract: --*/ +// +// Include common header file for this module. +// +#include "CommonHeader.h" + #include "Partition.h" STATIC diff --git a/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.c b/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.c index 4d0c76f251..de2c802b7d 100644 --- a/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.c +++ b/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.c @@ -16,6 +16,11 @@ **/ +// +// Include common header file for this module. +// +#include "CommonHeader.h" + #include "Partition.h" // diff --git a/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.h b/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.h index 570d0194b5..289c9a5443 100644 --- a/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.h +++ b/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.h @@ -18,6 +18,11 @@ #ifndef _PARTITION_H #define _PARTITION_H +// +// Include common header file for this module. +// +#include "CommonHeader.h" + #include #include #include diff --git a/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.inf b/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.inf index 1e00fccfd6..2036fa7afb 100644 --- a/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.inf +++ b/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.inf @@ -5,13 +5,12 @@ # that represents the bytes Start to End of the Parent Block IO # device (one partition of physical BlockIo device, # which can be one of GPT, MBR, ElTorito partition). +# Copyright (c) 2006 - 2007, Intel Corporation # -# Copyright (c) 2006 - 2007, 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. # @@ -56,6 +55,8 @@ ElTorito.c Partition.c Partition.h + CommonHeader.h + EntryPoint.c ################################################################################ @@ -68,17 +69,6 @@ [Includes] $(WORKSPACE)/MdePkg/Include/Library -################################################################################ -# -# Package Dependency Section - list of Package files that are required for -# this module. -# -################################################################################ - -[Packages] - MdePkg/MdePkg.dec - - ################################################################################ # # Library Class Section - list of Library Classes that are required for diff --git a/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.c b/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.c index 2eb325ec56..88811f1611 100644 --- a/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.c +++ b/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.c @@ -13,6 +13,11 @@ **/ +// +// Include common header file for this module. +// +#include "CommonHeader.h" + #include "SecurityStub.h" // diff --git a/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.h b/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.h index dedc14afdb..df57d9e9aa 100644 --- a/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.h +++ b/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.h @@ -16,6 +16,11 @@ #define _SECURITY_STUB_ARCH_PROTOCOL_H +// +// Include common header file for this module. +// +#include "CommonHeader.h" + // // Common header files for this module. // diff --git a/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.inf b/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.inf index ec17ceacf8..36504f9860 100644 --- a/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.inf +++ b/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.inf @@ -1,12 +1,13 @@ #/** @file -# Component description file for SecurityStub module +# Component description file for SecurityStub module +# +# This driver supports platform security service. +# Copyright (c) 2006 - 2007, Intel Corporation # -# Copyright (c) 2006 - 2007, 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. # @@ -45,6 +46,7 @@ SecurityStub.c SecurityStub.h SecurityStub.dxs + CommonHeader.h ################################################################################ @@ -57,17 +59,6 @@ [Includes] $(WORKSPACE)/MdePkg/Include/Library -################################################################################ -# -# Package Dependency Section - list of Package files that are required for -# this module. -# -################################################################################ - -[Packages] - MdePkg/MdePkg.dec - - ################################################################################ # # Library Class Section - list of Library Classes that are required for -- 2.39.2