From 5f597758e20f046a7a76e728370b99308cf2c8a0 Mon Sep 17 00:00:00 2001 From: lgao4 Date: Tue, 8 Jul 2008 13:29:42 +0000 Subject: Code scrube for MdeModule Definitions. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5428 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Core/Dxe/DxeMain.h | 2 - MdeModulePkg/Core/Dxe/DxeMain.inf | 2 - MdeModulePkg/Core/DxeIplPeim/DxeIpl.h | 3 - MdeModulePkg/Include/Guid/AlternateFvBlock.h | 3 +- MdeModulePkg/Include/Guid/Bmp.h | 2 +- MdeModulePkg/Include/Guid/CapsuleVendor.h | 5 +- MdeModulePkg/Include/Guid/ConsoleInDevice.h | 16 +- MdeModulePkg/Include/Guid/ConsoleOutDevice.h | 16 +- .../Include/Guid/GenericPlatformVariable.h | 7 +- MdeModulePkg/Include/Guid/HotPlugDevice.h | 16 +- MdeModulePkg/Include/Guid/MemoryTypeInformation.h | 3 +- MdeModulePkg/Include/Guid/OverrideVariable.h | 13 +- MdeModulePkg/Include/Guid/PeiPeCoffLoader.h | 6 +- MdeModulePkg/Include/Guid/PeiPerformanceHob.h | 3 +- MdeModulePkg/Include/Guid/PrimaryConsoleInDevice.h | 15 +- .../Include/Guid/PrimaryConsoleOutDevice.h | 14 +- .../Include/Guid/PrimaryStandardErrorDevice.h | 14 +- MdeModulePkg/Include/Guid/StandardErrorDevice.h | 16 +- MdeModulePkg/Include/Guid/SystemNvDataGuid.h | 5 +- MdeModulePkg/Include/Guid/VariableInfo.h | 3 +- MdeModulePkg/Include/Library/ExtendedHiiLib.h | 4 +- .../Include/Library/ExtendedIfrSupportLib.h | 6 +- MdeModulePkg/Include/Library/GenericBdsLib.h | 146 ++++++--- MdeModulePkg/Include/Library/IpIoLib.h | 13 +- MdeModulePkg/Include/Library/NetLib.h | 70 ++--- MdeModulePkg/Include/Library/PlatDriOverLib.h | 339 +++++++++------------ MdeModulePkg/Include/Library/PlatformBdsLib.h | 5 - MdeModulePkg/Include/Library/UdpIoLib.h | 22 +- MdeModulePkg/Include/MdeModuleHii.h | 4 +- MdeModulePkg/Include/Ppi/BaseMemoryTest.h | 19 +- MdeModulePkg/Include/Ppi/FlashMap.h | 2 +- MdeModulePkg/Include/Ppi/OperatorPresence.h | 2 +- MdeModulePkg/Include/Protocol/Capsule.h | 3 +- MdeModulePkg/Include/Protocol/ConsoleControl.h | 92 +++--- .../Protocol/Crc32GuidedSectionExtraction.h | 14 +- .../Include/Protocol/CustomizedDecompress.h | 121 -------- MdeModulePkg/Include/Protocol/Dpc.h | 18 +- MdeModulePkg/Include/Protocol/EdkDecompress.h | 121 -------- .../Include/Protocol/FaultTolerantWriteLite.h | 15 +- .../Include/Protocol/FirmwareVolumeDispatch.h | 5 +- MdeModulePkg/Include/Protocol/FvbExtension.h | 35 +-- MdeModulePkg/Include/Protocol/GenericMemoryTest.h | 13 +- MdeModulePkg/Include/Protocol/LoadPe32Image.h | 3 +- MdeModulePkg/Include/Protocol/NicIp4Config.h | 17 +- MdeModulePkg/Include/Protocol/OEMBadging.h | 19 +- MdeModulePkg/Include/Protocol/Print.h | 3 +- MdeModulePkg/Include/Protocol/PxeDhcp4.h | 71 ++--- MdeModulePkg/Include/Protocol/PxeDhcp4CallBack.h | 17 +- MdeModulePkg/Include/Protocol/Tcp.h | 24 +- MdeModulePkg/Include/Protocol/UsbAtapi.h | 83 ----- MdeModulePkg/Include/VariableFormat.h | 6 +- MdeModulePkg/Include/WorkingBlockHeader.h | 2 - MdeModulePkg/MdeModulePkg.dec | 4 - .../Universal/BdsDxe/BootMaint/BBSsupport.c | 8 +- .../Universal/BdsDxe/BootMaint/UpdatePage.c | 2 +- MdeModulePkg/Universal/BdsDxe/BootMaint/Variable.c | 4 +- 56 files changed, 556 insertions(+), 940 deletions(-) delete mode 100644 MdeModulePkg/Include/Protocol/CustomizedDecompress.h delete mode 100644 MdeModulePkg/Include/Protocol/EdkDecompress.h delete mode 100644 MdeModulePkg/Include/Protocol/UsbAtapi.h diff --git a/MdeModulePkg/Core/Dxe/DxeMain.h b/MdeModulePkg/Core/Dxe/DxeMain.h index 3bddae8..ff43fac 100644 --- a/MdeModulePkg/Core/Dxe/DxeMain.h +++ b/MdeModulePkg/Core/Dxe/DxeMain.h @@ -45,7 +45,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include -#include #include #include #include @@ -53,7 +52,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include -#include #include #include #include diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeMain.inf index 117d4ba..84dc28a 100644 --- a/MdeModulePkg/Core/Dxe/DxeMain.inf +++ b/MdeModulePkg/Core/Dxe/DxeMain.inf @@ -106,8 +106,6 @@ [Protocols] gEfiStatusCodeRuntimeProtocolGuid # PROTOCOL SOMETIMES_CONSUMED gEfiCapsuleArchProtocolGuid # PROTOCOL ALWAYS_CONSUMED - gEfiTianoDecompressProtocolGuid # PROTOCOL ALWAYS_CONSUMED - gEfiCustomizedDecompressProtocolGuid # PROTOCOL ALWAYS_CONSUMED gEfiDecompressProtocolGuid # PROTOCOL ALWAYS_CONSUMED gEfiLoadPeImageProtocolGuid # PROTOCOL ALWAYS_PRODUCED gEfiSimpleFileSystemProtocolGuid # PROTOCOL ALWAYS_CONSUMED diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h index 57233e3..b046f39 100644 --- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h +++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h @@ -18,10 +18,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include -#include #include -#include -#include #include #include #include diff --git a/MdeModulePkg/Include/Guid/AlternateFvBlock.h b/MdeModulePkg/Include/Guid/AlternateFvBlock.h index 4ea8a21..8731fe8 100644 --- a/MdeModulePkg/Include/Guid/AlternateFvBlock.h +++ b/MdeModulePkg/Include/Guid/AlternateFvBlock.h @@ -1,6 +1,7 @@ /** @file - Tiano Guid used to define the Alternate Firmware Volume Block Guid. + This file defines the Alternate Firmware Volume Block Guid, which is + used to specify that the additional FVB protocol is installed into FVB handle. Copyright (c) 2006 - 2008, Intel Corporation All rights reserved. This program and the accompanying materials diff --git a/MdeModulePkg/Include/Guid/Bmp.h b/MdeModulePkg/Include/Guid/Bmp.h index 3f9c399..8a081d8 100644 --- a/MdeModulePkg/Include/Guid/Bmp.h +++ b/MdeModulePkg/Include/Guid/Bmp.h @@ -1,6 +1,6 @@ /** @file This file defines header data structures for BMP file and default - BMP file GUID. + GUID for BMP logo file. Copyright (c) 2006 - 2008, Intel Corporation.
All rights reserved. This program and the accompanying materials diff --git a/MdeModulePkg/Include/Guid/CapsuleVendor.h b/MdeModulePkg/Include/Guid/CapsuleVendor.h index 118e08b..6e7d8d1 100644 --- a/MdeModulePkg/Include/Guid/CapsuleVendor.h +++ b/MdeModulePkg/Include/Guid/CapsuleVendor.h @@ -1,6 +1,7 @@ /** @file - Capsule update Guid definitions for capsule varialbe and capsule hob. + This file defines capsule update guid, capsule variable name and + capsule guid hob data strucutre, which are required by capsule update feature. Copyright (c) 2006 - 2008, Intel Corporation All rights reserved. This program and the accompanying materials @@ -17,7 +18,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #define __EFI_CAPSULE_VENDOR_GUID_H__ // -// Note -- This guid is used as a vendor GUID (depending on implementation) +// Note -- This guid is used as a variable GUID (depending on implementation) // for the capsule variable if the capsule pointer is passes through reset // via a variable. // diff --git a/MdeModulePkg/Include/Guid/ConsoleInDevice.h b/MdeModulePkg/Include/Guid/ConsoleInDevice.h index 85e487d..34ee24d 100644 --- a/MdeModulePkg/Include/Guid/ConsoleInDevice.h +++ b/MdeModulePkg/Include/Guid/ConsoleInDevice.h @@ -1,6 +1,9 @@ -/*++ +/** @file + This guid is used to specifiy the device is the console in device. + If the device is the console in device, this guid as the protocol guid + will be installed into this device handle. -Copyright (c) 2006 - 2007, Intel Corporation +Copyright (c) 2006 - 2008, 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 @@ -9,14 +12,7 @@ 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: - - ConsoleInDevice.h - -Abstract: - - ---*/ +**/ #ifndef __CONSOLE_IN_DEVICE_H__ #define __CONSOLE_IN_DEVICE_H__ diff --git a/MdeModulePkg/Include/Guid/ConsoleOutDevice.h b/MdeModulePkg/Include/Guid/ConsoleOutDevice.h index d2103c0..42dccd7 100644 --- a/MdeModulePkg/Include/Guid/ConsoleOutDevice.h +++ b/MdeModulePkg/Include/Guid/ConsoleOutDevice.h @@ -1,6 +1,9 @@ -/*++ +/** @file + This guid is used to specifiy the device is the console out device. + If the device is the console out device, this guid as the protocol guid + will be installed into this device handle. -Copyright (c) 2006 - 2007, Intel Corporation +Copyright (c) 2006 - 2008, 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 @@ -9,14 +12,7 @@ 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: - - ConsoleOutDevice.h - -Abstract: - - ---*/ +**/ #ifndef __CONSOLE_OUT_DEVICE_H__ #define __CONSOLE_OUT_DEVICE_H__ diff --git a/MdeModulePkg/Include/Guid/GenericPlatformVariable.h b/MdeModulePkg/Include/Guid/GenericPlatformVariable.h index cd1e66f..92c7323 100644 --- a/MdeModulePkg/Include/Guid/GenericPlatformVariable.h +++ b/MdeModulePkg/Include/Guid/GenericPlatformVariable.h @@ -1,5 +1,7 @@ /** @file - The variable space Guid to pair with a Unicode string name to tag an EFI variable. + This file defines the genenic platform guid for EFI variable. + Common drivers can use this generic guid with its variable name to specify + its EFI variable without defining another new guid. Copyright (c) 2006 - 2008, Intel Corporation.
All rights reserved. This program and the accompanying materials @@ -15,6 +17,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #ifndef __GENERIC_PLATFORM_VARIABLE_H__ #define __GENERIC_PLATFORM_VARIABLE_H__ +#define EFI_GENERIC_PLATFORM_VARIABLE_GUID \ + { 0x59d1c24f, 0x50f1, 0x401a, { 0xb1, 0x01, 0xf3, 0x3e, 0x0d, 0xae, 0xd4, 0x43 }} + extern EFI_GUID gEfiGenericPlatformVariableGuid; #endif diff --git a/MdeModulePkg/Include/Guid/HotPlugDevice.h b/MdeModulePkg/Include/Guid/HotPlugDevice.h index b15dc89..2a18ad6 100644 --- a/MdeModulePkg/Include/Guid/HotPlugDevice.h +++ b/MdeModulePkg/Include/Guid/HotPlugDevice.h @@ -1,6 +1,9 @@ -/*++ +/** @file + This guid is used to specifiy the device is the hot plug device. + If the device is the hot plug device, this guid as the protocol guid + will be installed into this device handle. -Copyright (c) 2006, Intel Corporation +Copyright (c) 2006 - 2008, 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 @@ -9,14 +12,7 @@ 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: - - HotPlugDevice.h - -Abstract: - - ---*/ +**/ #ifndef __HOT_PLUG_DEVICE_H__ #define __HOT_PLUG_DEVICE_H__ diff --git a/MdeModulePkg/Include/Guid/MemoryTypeInformation.h b/MdeModulePkg/Include/Guid/MemoryTypeInformation.h index 02794ca..7d88d62 100644 --- a/MdeModulePkg/Include/Guid/MemoryTypeInformation.h +++ b/MdeModulePkg/Include/Guid/MemoryTypeInformation.h @@ -1,5 +1,6 @@ /** @file - GUID used for Memory Type Information entries in the HOB list. + This file defines the memory type information guid, variable name and guid hob structure. + This guid is used for Memory Type Information entries in the HOB list and EFI variable. Copyright (c) 2006 - 2008, Intel Corporation.
All rights reserved. This program and the accompanying materials diff --git a/MdeModulePkg/Include/Guid/OverrideVariable.h b/MdeModulePkg/Include/Guid/OverrideVariable.h index 673813a..ecfd94f 100644 --- a/MdeModulePkg/Include/Guid/OverrideVariable.h +++ b/MdeModulePkg/Include/Guid/OverrideVariable.h @@ -1,4 +1,5 @@ -/*++ +/** @file + This guid is used for Platform Override Variable named L"PlatDriOver". Copyright (c) 2008, Intel Corporation All rights reserved. This program and the accompanying materials @@ -9,15 +10,7 @@ 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: - - OverrideVariable.h - -Abstract: - - Platform Override Variable Guid definitions - ---*/ +**/ #ifndef __EFI_OVERRIDE_VARIABLE_GUID_H__ #define __EFI_OVERRIDE_VARIABLE_GUID_H__ diff --git a/MdeModulePkg/Include/Guid/PeiPeCoffLoader.h b/MdeModulePkg/Include/Guid/PeiPeCoffLoader.h index eaca8e6..22567d0 100644 --- a/MdeModulePkg/Include/Guid/PeiPeCoffLoader.h +++ b/MdeModulePkg/Include/Guid/PeiPeCoffLoader.h @@ -1,6 +1,6 @@ /** @file - - GUID for the PE/COFF Loader APIs shared between SEC, PEI and DXE + This file defines PeCoffLoader guid for PeCoffLoader entry in the HOB list. + It also defines PE/COFF Loader APIs in PeCoffLoader Hob entry shared between SEC, PEI and DXE Copyright (c) 2006 - 2008, Intel Corporation All rights reserved. This program and the accompanying materials @@ -128,7 +128,7 @@ RETURN_STATUS typedef RETURN_STATUS (EFIAPI *EFI_PEI_PE_COFF_LOADER_UNLOAD_IMAGE) ( - IN EFI_PEI_PE_COFF_LOADER_PROTOCOL *This, + IN EFI_PEI_PE_COFF_LOADER_PROTOCOL *This, IN PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext ); diff --git a/MdeModulePkg/Include/Guid/PeiPerformanceHob.h b/MdeModulePkg/Include/Guid/PeiPerformanceHob.h index b072127..4cc82e8 100644 --- a/MdeModulePkg/Include/Guid/PeiPerformanceHob.h +++ b/MdeModulePkg/Include/Guid/PeiPerformanceHob.h @@ -1,5 +1,6 @@ /** @file - GUIDs used for PEI Performance HOB data structures + This file defines performance guid for the performance entry in the HOB list, + and define the PEI Performance HOB data structures. Copyright (c) 2006 - 2008, Intel Corporation.
All rights reserved. This program and the accompanying materials diff --git a/MdeModulePkg/Include/Guid/PrimaryConsoleInDevice.h b/MdeModulePkg/Include/Guid/PrimaryConsoleInDevice.h index 686ffa3..1471a53 100644 --- a/MdeModulePkg/Include/Guid/PrimaryConsoleInDevice.h +++ b/MdeModulePkg/Include/Guid/PrimaryConsoleInDevice.h @@ -1,6 +1,8 @@ -/*++ +/** @file + This guid is used to specify the primary console in device. + It will be installed into the virtual device handle for ConIn Splitter. -Copyright (c) 2006, Intel Corporation +Copyright (c) 2006 - 2008, 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 @@ -9,14 +11,7 @@ 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: - - PrimaryConsoleInDevice.h - -Abstract: - - ---*/ +**/ #ifndef __PRIMARY_CONSOLE_IN_DEVICE_H__ #define __PRIMARY_CONSOLE_IN_DEVICE_H__ diff --git a/MdeModulePkg/Include/Guid/PrimaryConsoleOutDevice.h b/MdeModulePkg/Include/Guid/PrimaryConsoleOutDevice.h index 34195b5..67be727 100644 --- a/MdeModulePkg/Include/Guid/PrimaryConsoleOutDevice.h +++ b/MdeModulePkg/Include/Guid/PrimaryConsoleOutDevice.h @@ -1,6 +1,8 @@ -/*++ +/** @file + This guid is used to specify the primary console out device. + It will be installed into the virtual device handle for ConOut Splitter. -Copyright (c) 2006, Intel Corporation +Copyright (c) 2006 - 2008, 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 @@ -9,13 +11,7 @@ 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: - - PrimaryConsoleOutDevice.h - -Abstract: - ---*/ +**/ #ifndef __PRIMARY_CONSOLE_OUT_DEVICE_H__ #define __PRIMARY_CONSOLE_OUT_DEVICE_H__ diff --git a/MdeModulePkg/Include/Guid/PrimaryStandardErrorDevice.h b/MdeModulePkg/Include/Guid/PrimaryStandardErrorDevice.h index 9523d97..5003153 100644 --- a/MdeModulePkg/Include/Guid/PrimaryStandardErrorDevice.h +++ b/MdeModulePkg/Include/Guid/PrimaryStandardErrorDevice.h @@ -1,6 +1,8 @@ -/*++ +/** @file + This guid is used to specify the primary StdErr device. + It will be installed into the virtual device handle for StdErr Splitter. -Copyright (c) 2006, Intel Corporation +Copyright (c) 2006 - 2008, 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 @@ -9,13 +11,7 @@ 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: - - PrimaryStandardErrorDevice.h - -Abstract: - ---*/ +**/ #ifndef __PRIMARY_STANDARD_ERROR_DEVICE_H__ #define __PRIMARY_STANDARD_ERROR_DEVICE_H__ diff --git a/MdeModulePkg/Include/Guid/StandardErrorDevice.h b/MdeModulePkg/Include/Guid/StandardErrorDevice.h index 7806f55..bacfefe 100644 --- a/MdeModulePkg/Include/Guid/StandardErrorDevice.h +++ b/MdeModulePkg/Include/Guid/StandardErrorDevice.h @@ -1,6 +1,9 @@ -/*++ +/** @file + This guid is used to specifiy the device is the StdErr device. + If the device is the StdErr device, this guid as the protocol guid + will be installed into this device handle. -Copyright (c) 2006, Intel Corporation +Copyright (c) 2006 - 2008, 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 @@ -9,14 +12,7 @@ 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: - - StandardErrorDevice.h - -Abstract: - - ---*/ +**/ #ifndef __STANDARD_ERROR_DEVICE_H__ #define __STANDARD_ERROR_DEVICE_H__ diff --git a/MdeModulePkg/Include/Guid/SystemNvDataGuid.h b/MdeModulePkg/Include/Guid/SystemNvDataGuid.h index fd807f9..137ed23 100644 --- a/MdeModulePkg/Include/Guid/SystemNvDataGuid.h +++ b/MdeModulePkg/Include/Guid/SystemNvDataGuid.h @@ -1,7 +1,6 @@ /** @file - - GUIDs used for System Non Volatile HOB entries in the in the HOB list and FV Guids carrying - the System specific information. + This file defines GUIDs used for System Non Volatile HOB entries in the HOB list, + and FV Guids that carrying the System specific information. Copyright (c) 2006 - 2008, Intel Corporation All rights reserved. This program and the accompanying materials diff --git a/MdeModulePkg/Include/Guid/VariableInfo.h b/MdeModulePkg/Include/Guid/VariableInfo.h index a7e624d..e63224f 100644 --- a/MdeModulePkg/Include/Guid/VariableInfo.h +++ b/MdeModulePkg/Include/Guid/VariableInfo.h @@ -1,6 +1,5 @@ /** @file - - GUIDs used for variable list entries put in the EFI system table. + This file defines GUIDs used for variable list entries put in the EFI system table. Copyright (c) 2006 - 2008, Intel Corporation All rights reserved. This program and the accompanying materials diff --git a/MdeModulePkg/Include/Library/ExtendedHiiLib.h b/MdeModulePkg/Include/Library/ExtendedHiiLib.h index 50ab9c7..2b7003f 100644 --- a/MdeModulePkg/Include/Library/ExtendedHiiLib.h +++ b/MdeModulePkg/Include/Library/ExtendedHiiLib.h @@ -1,6 +1,6 @@ /** @file - This library includes the APIs that is specific to EDK II's implementation. - It extended the UEFI Specification to define GUIDed device path. + This library includes two extended HII functions to + create and destory Hii Package by create the virtual Driver Handle. Copyright (c) 2008, Intel Corporation.
All rights reserved. This program and the accompanying materials diff --git a/MdeModulePkg/Include/Library/ExtendedIfrSupportLib.h b/MdeModulePkg/Include/Library/ExtendedIfrSupportLib.h index 5f36f34..4bef9bb 100644 --- a/MdeModulePkg/Include/Library/ExtendedIfrSupportLib.h +++ b/MdeModulePkg/Include/Library/ExtendedIfrSupportLib.h @@ -31,6 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ EFI_STATUS +EFIAPI CreateBannerOpCode ( IN EFI_STRING_ID Title, IN UINT16 LineNumber, @@ -62,6 +63,7 @@ CreateBannerOpCode ( **/ EFI_STATUS +EFIAPI IfrLibUpdateForm ( IN EFI_HII_HANDLE Handle, IN EFI_GUID *FormSetGuid, OPTIONAL @@ -92,6 +94,7 @@ IfrLibUpdateForm ( **/ EFI_STATUS +EFIAPI IfrLibExtractClassFromHiiHandle ( IN EFI_HII_HANDLE Handle, OUT UINT16 *Class, @@ -106,7 +109,8 @@ IfrLibExtractClassFromHiiHandle ( @param Buffer the start address of buffer. @param BufferSize the size of buffer. - @param Number the number of the strings. + @param Number the number of the ConfigBody strings. + @param ... the ConfigBody strings @retval EFI_BUFFER_TOO_SMALL the BufferSize is too small to operate. @retval EFI_INVALID_PARAMETER Buffer is NULL or BufferSize is 0. diff --git a/MdeModulePkg/Include/Library/GenericBdsLib.h b/MdeModulePkg/Include/Library/GenericBdsLib.h index aca0ee5..8816e5f 100644 --- a/MdeModulePkg/Include/Library/GenericBdsLib.h +++ b/MdeModulePkg/Include/Library/GenericBdsLib.h @@ -1,5 +1,5 @@ /** @file - Generic BDS library definition, include the file and data structure + Generic BDS library definition, include the data structure and function. Copyright (c) 2004 - 2008, Intel Corporation.
All rights reserved. This program and the accompanying materials @@ -25,7 +25,7 @@ extern EFI_HANDLE mBdsImageHandle; // // Constants which are variable names used to access variables // -#define VarLegacyDevOrder L"LegacyDevOrder" +#define VAR_LEGACY_DEV_ORDER L"LegacyDevOrder" // // Data structures and defines @@ -105,10 +105,10 @@ typedef struct { // // -// Bds boot relate lib functions +// Bds boot related lib functions // /** - Boot from the EFI1.1 spec defined "BootNext" variable + Boot from the UEFI spec defined "BootNext" variable. **/ VOID @@ -118,17 +118,17 @@ BdsLibBootNext ( ); /** - Process the boot option follow the EFI 1.1 specification and + Process the boot option follow the UEFI specification and special treat the legacy boot option with BBS_DEVICE_PATH. @param Option The boot option need to be processed @param DevicePath The device path which describe where to load the boot image or the legcy BBS device path to boot the legacy OS - @param ExitDataSize Returned directly from gBS->StartImage () - @param ExitData Returned directly from gBS->StartImage () + @param ExitDataSize The size of exit data. + @param ExitData Data returned when Boot image failed. - @retval EFI_SUCCESS Status from gBS->StartImage () + @retval EFI_SUCCESS Boot from the input boot option successfully. @retval EFI_NOT_FOUND If the Device Path is not found in the system **/ @@ -166,8 +166,7 @@ BdsLibEnumerateAllBootOption ( boot option @param BdsBootOptionList The header of the link list which indexed all current boot options - - @return VOID + @param String The description of the boot option. **/ VOID @@ -180,15 +179,13 @@ BdsLibBuildOptionFromHandle ( /** - Build the on flash shell boot option with the handle parsed in + Build the on flash shell boot option with the handle parsed in. @param Handle The handle which present the device path to create on flash shell boot option @param BdsBootOptionList The header of the link list which indexed all current boot options - @return None - **/ VOID EFIAPI @@ -270,8 +267,8 @@ BdsLibBuildOptionFromVar ( @param VendorGuid GUID part of EFI variable name @param VariableSize Returns the size of the EFI variable that was read - @return Dynamically allocated memory that contains a copy of the EFI variable. - @return Caller is responsible freeing the buffer. + @return Dynamically allocated memory that contains a copy of the EFI variable + Caller is responsible freeing the buffer. @retval NULL Variable was not read **/ @@ -304,7 +301,7 @@ BdsLibOutputStrings ( /** Build the boot#### or driver#### option from the VariableName, the - build boot#### or driver#### will also be linked to BdsCommonOptionList + build boot#### or driver#### will also be linked to BdsCommonOptionList. @param BdsCommonOptionList The header of the boot#### or driver#### option link list @@ -430,7 +427,7 @@ BdsLibDisconnectAllEfi ( ); // -// Bds console relate lib functions +// Bds console related lib functions // /** This function will search every simpletxt devive in current system, @@ -450,8 +447,7 @@ BdsLibConnectAllConsoles ( @retval EFI_SUCCESS At least one of the ConIn and ConOut device have been connected success. - @retval EFI_STATUS Return the status of - BdsLibConnectConsoleVariable (). + @retval EFI_STATUS Return the status of BdsLibConnectConsoleVariable (). **/ EFI_STATUS @@ -473,7 +469,7 @@ BdsLibConnectAllDefaultConsoles ( from the console variable ConVarName, this parameter can not be multi-instance. - @retval EFI_UNSUPPORTED Add or remove the same device path. + @retval EFI_UNSUPPORTED The added device path is same to the removed one. @retval EFI_SUCCESS Success add or remove the device path from the console variable. @@ -508,7 +504,7 @@ BdsLibConnectConsoleVariable ( ); // -// Bds device path relate lib functions +// Bds device path related lib functions // /** Function unpacks a device path data structure so that all the nodes @@ -555,8 +551,8 @@ BdsLibDelPartMatchInstance ( @param Single A pointer to a single-instance device path data structure. - @retval TRUE If the Single is contained within Multi - @retval FALSE The Single is not match within Multi + @retval TRUE If the Single device path is contained within Multi device path. + @retval FALSE The Single device path is not match within Multi device path. **/ BOOLEAN @@ -622,12 +618,20 @@ typedef struct { // #if defined (MDE_CPU_IPF) #define EFI64_SHADOW_ALL_LEGACY_ROM() ShadowAllOptionRom (); -VOID -ShadowAllOptionRom(); #else #define EFI64_SHADOW_ALL_LEGACY_ROM() #endif +/** + Shadow all Legacy OptionRom. + +**/ +VOID +EFIAPI +ShadowAllOptionRom ( + VOID + ); + // // BBS support macros and functions // @@ -641,27 +645,76 @@ ShadowAllOptionRom(); #define REFRESH_LEGACY_BOOT_OPTIONS #endif +/** + Delete all the invalid legacy boot options. + + @retval EFI_SUCCESS All invalide legacy boot options are deleted. + @retval EFI_OUT_OF_RESOURCES Fail to allocate necessary memory. + @retval EFI_NOT_FOUND Fail to retrive variable of boot order. + +**/ EFI_STATUS +EFIAPI BdsDeleteAllInvalidLegacyBootOptions ( VOID ); +/** + + Add the legacy boot options from BBS table if they do not exist. + + @retval EFI_SUCCESS The boot options are added successfully + or they are already in boot options. + +**/ EFI_STATUS +EFIAPI BdsAddNonExistingLegacyBootOptions ( VOID ); +/** + + Add the legacy boot devices from BBS table into + the legacy device boot order. + + @retval EFI_SUCCESS The boot devices are added successfully. + +**/ EFI_STATUS +EFIAPI BdsUpdateLegacyDevOrder ( VOID ); +/** + + Set the boot priority for BBS entries based on boot option entry and boot order. + + @param Entry The boot option is to be checked for refresh BBS table. + + @retval EFI_SUCCESS The boot priority for BBS entries is refreshed successfully. + +**/ EFI_STATUS +EFIAPI BdsRefreshBbsTableForBoot ( IN BDS_COMMON_OPTION *Entry ); +/** + + Delete boot option specified by OptionNumber and adjust the boot order. + + @param OptionNumber The boot option to be deleted. + @param BootOrder Boot order list to be adjusted by remove this boot option. + @param BootOrderSize The size of Boot order list will be modified. + + @retval EFI_SUCCESS The boot option is deleted successfully. + +**/ EFI_STATUS +EFIAPI BdsDeleteBootOption ( IN UINTN OptionNumber, IN OUT UINT16 *BootOrder, @@ -755,8 +808,7 @@ SetupResetReminder ( @param Device SimpleFileSystem device handle @param FileName File name for the image @param DosHeader Pointer to dos header - @param ImageHeader Pointer to image header - @param OptionalHeader Pointer to optional header + @param Hdr The buffer in which to return the PE32, PE32+, or TE header. @retval EFI_SUCCESS Successfully get the machine type. @retval EFI_NOT_FOUND The file is not found. @@ -818,8 +870,8 @@ BdsLibGetImageHeader ( @param HardDriveDevicePath A device path which starts with a hard drive media device path. - @retval TRUE There is a matched device path instance FALSE - -There is no matched device path instance + @retval TRUE There is a matched device path instance. + @retval FALSE There is no matched device path instance. **/ BOOLEAN @@ -858,7 +910,6 @@ BdsExpandPartitionPartialDevicePathToFull ( @param DevicePath Device Path to a bootable device - @retval NULL The device path points to an EFI bootable Media @retval NULL The media on the DevicePath is not bootable **/ @@ -873,11 +924,11 @@ BdsLibGetBootableHandle ( Check whether the Device path in a boot option point to a valide bootable device, And if CheckMedia is true, check the device is ready to boot now. - DevPath -- the Device path in a boot option - CheckMedia -- if true, check the device is ready to boot now. + @param DevPath the Device path in a boot option + @param CheckMedia if true, check the device is ready to boot now. - @return TRUE -- the Device path is valide - @return FALSE -- the Device path is invalide . + @retval TRUE the Device path is valide + @retval FALSE the Device path is invalide . **/ BOOLEAN @@ -888,7 +939,7 @@ BdsLibIsValidEFIBootOptDevicePath ( ); /** - For a bootable Device path, return its boot type + For a bootable Device path, return its boot type. @param DevicePath The bootable device Path to check @@ -919,8 +970,8 @@ BdsGetBootTypeFromDevicePath ( /** - This routine register a function to adjust the different type memory page number just before booting - and save the updated info into the variable for next boot to use + This routine register a function to adjust the different type memory page number + just before booting and save the updated info into the variable for next boot to use. **/ VOID @@ -965,12 +1016,13 @@ BdsLibUpdateFvFileDevicePath ( @param HostControllerPI Uhci (0x00) or Ehci (0x20) or Both uhci and ehci (0xFF) @param RemainingDevicePath a short-form device path that starts with the first - element being a USB WWID or a USB Class device + element being a USB WWID or a USB Class device path - @return EFI_INVALID_PARAMETER - @return EFI_SUCCESS - @return EFI_NOT_FOUND + @retval EFI_SUCCESS The specific Usb device is connected successfully. + @retval EFI_INVALID_PARAMETER Invalid HostControllerPi (not 0x00, 0x20 or 0xFF) + or RemainingDevicePath is not the USB class device path. + @retval EFI_NOT_FOUND The device specified by device path is not found. **/ EFI_STATUS @@ -985,13 +1037,11 @@ BdsLibConnectUsbDevByShortFormDP( // The implementation of this function is provided by Platform code. // /** - Convert Vendor device path to device name + Convert Vendor device path to device name. @param Str The buffer store device name @param DevPath Pointer to vendor device path - @return When it return, the device name have been stored in *Str. - **/ VOID EFIAPI @@ -1005,13 +1055,13 @@ DevPathVendor ( Concatenates a formatted unicode string to allocated pool. The caller must free the resulting buffer. - @param Str Tracks the allocated pool, size in use, and amount of pool - allocated. + @param Str Tracks the allocated pool, size in use, and amount of pool allocated. @param fmt The format string + @param ... The data will be printed. @return Allocated buffer with the formatted string printed in it. - @return The caller must free the allocated buffer. The buffer - @return allocation is not packed. + The caller must free the allocated buffer. + The buffer allocation is not packed. **/ CHAR16 * diff --git a/MdeModulePkg/Include/Library/IpIoLib.h b/MdeModulePkg/Include/Library/IpIoLib.h index acee69f..640e5f7 100644 --- a/MdeModulePkg/Include/Library/IpIoLib.h +++ b/MdeModulePkg/Include/Library/IpIoLib.h @@ -242,7 +242,8 @@ IpIoOpen ( packet. @param Pkt Pointer to the IP packet to be sent. @param Sender The IP protocol instance used for sending. - @param NotifyData + @param Context + @param NotifyData @param Dest The destination IP address to send this packet to. @param OverrideData The data to override some configuration of the IP instance used for sending. @@ -265,13 +266,11 @@ IpIoSend ( ); /** - Add a new IP instance for sending data. - - @param IpIo Pointer to a IP_IO instance to add a new IP - instance for sending purpose. - - @return Pointer to the created IP_IO_IP_INFO structure, NULL is failed. + Cancel the IP transmit token which wraps this Packet. + @param IpIo Pointer to the IP_IO instance. + @param Packet Pointer to the packet to cancel. + **/ VOID EFIAPI diff --git a/MdeModulePkg/Include/Library/NetLib.h b/MdeModulePkg/Include/Library/NetLib.h index c3695b5..ba352de 100644 --- a/MdeModulePkg/Include/Library/NetLib.h +++ b/MdeModulePkg/Include/Library/NetLib.h @@ -28,7 +28,7 @@ typedef UINT32 IP4_ADDR; typedef UINT32 TCP_SEQNO; typedef UINT16 TCP_PORTNO; -enum { +typedef enum { NET_ETHER_ADDR_LEN = 6, NET_IFTYPE_ETHERNET = 0x01, @@ -46,7 +46,7 @@ enum { IP4_ADDR_CLASSE, IP4_MASK_NUM = 33 -}; +} IP4_CLASS_TYPE; #pragma pack(1) @@ -340,7 +340,7 @@ NetListRemoveTail ( ); /** - Insert the NewEntry after the PrevEntry + Insert the NewEntry after the PrevEntry. @param PrevEntry The previous entry to insert after @param NewEntry The new entry to insert @@ -356,7 +356,7 @@ NetListInsertAfter ( ); /** - Insert the NewEntry before the PostEntry + Insert the NewEntry before the PostEntry. @param PostEntry The entry to insert before @param NewEntry The new entry to insert @@ -519,7 +519,7 @@ NetMapRemoveItem ( ); /** - Remove the first entry on the netmap + Remove the first entry on the netmap. @param Map The netmap to remove the head from @param Value The variable to receive the value if not NULL @@ -535,7 +535,7 @@ NetMapRemoveHead ( ); /** - Remove the last entry on the netmap + Remove the last entry on the netmap. @param Map The netmap to remove the tail from @param Value The variable to receive the value if not NULL @@ -586,8 +586,8 @@ NetMapIterate ( /** Create a child of the service that is identified by ServiceBindingGuid. - @param Controller The controller which has the service installed. - @param Image The image handle used to open service. + @param ControllerHandle The controller which has the service installed. + @param ImageHandle The image handle used to open service. @param ServiceBindingGuid The service's Guid. @param ChildHandle The handle to receive the create child @@ -607,8 +607,8 @@ NetLibCreateServiceChild ( /** Destory a child of the service that is identified by ServiceBindingGuid. - @param Controller The controller which has the service installed. - @param Image The image handle used to open service. + @param ControllerHandle The controller which has the service installed. + @param ImageHandle The image handle used to open service. @param ServiceBindingGuid The service's Guid. @param ChildHandle The child to destory @@ -702,10 +702,10 @@ NetLibGetNicHandle ( /** Add a Deferred Procedure Call to the end of the DPC queue. - @DpcTpl The EFI_TPL that the DPC should be invoked. - @DpcProcedure Pointer to the DPC's function. - @DpcContext Pointer to the DPC's context. Passed to DpcProcedure - when DpcProcedure is invoked. + @param DpcTpl The EFI_TPL that the DPC should be invoked. + @param DpcProcedure Pointer to the DPC's function. + @param DpcContext Pointer to the DPC's context. Passed to DpcProcedure + when DpcProcedure is invoked. @retval EFI_SUCCESS The DPC was queued. @retval EFI_INVALID_PARAMETER DpcTpl is not a valid EFI_TPL. @@ -735,17 +735,14 @@ NetLibDispatchDpc ( VOID ); -/** - The constructor function caches the pointer to DPC protocol. - - The constructor function locates DPC protocol from protocol database. - It will ASSERT() if that operation fails and it will always return EFI_SUCCESS. - - @param ImageHandle The firmware allocated handle for the EFI image. - @param SystemTable A pointer to the EFI System Table. - - @retval EFI_SUCCESS The constructor always returns EFI_SUCCESS. - +/** + This is the default unload handle for all the network drivers. + + @param ImageHandle The drivers' driver image. + + @retval EFI_SUCCESS The image is unloaded. + @retval Others Failed to unload the image. + **/ EFI_STATUS EFIAPI @@ -753,7 +750,7 @@ NetLibDefaultUnload ( IN EFI_HANDLE ImageHandle ); -enum { +typedef enum { // //Various signatures // @@ -766,7 +763,7 @@ enum { NET_BUF_HEAD = 1, // Trim or allocate space from head NET_BUF_TAIL = 0, // Trim or allocate space from tail NET_VECTOR_OWN_FIRST = 0x01 // We allocated the 1st block in the vector -}; +} NET_SIGNATURE_TYPE; #define NET_CHECK_SIGNATURE(PData, SIGNATURE) \ ASSERT (((PData) != NULL) && ((PData)->Signature == (SIGNATURE))) @@ -1269,16 +1266,15 @@ NetbufQueCopy ( IN UINT8 *Dest ); -/** - Copy some data from the buffer queue to the destination. - - @param NbufQue Pointer to the net buffer queue. - @param Offset The sequence number of the first byte to copy. - @param Len Length of the data to copy. - @param Dest The destination of the data to copy to. - - @retval UINTN The length of the copied data. - +/** + Trim some data from the queue header, release the buffer if + whole buffer is trimmed. + + @param NbufQue Pointer to the net buffer queue. + @param Len Length of the data to trim. + + @retval UINTN The length of the data trimmed. + **/ UINT32 EFIAPI diff --git a/MdeModulePkg/Include/Library/PlatDriOverLib.h b/MdeModulePkg/Include/Library/PlatDriOverLib.h index e6a6faf..43d48a4 100644 --- a/MdeModulePkg/Include/Library/PlatDriOverLib.h +++ b/MdeModulePkg/Include/Library/PlatDriOverLib.h @@ -1,34 +1,29 @@ -/** @file - -Copyright (c) 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. - -Module Name: - - PlatDriOverLib.h - -Abstract: - - -**/ - -#ifndef _PLAT_DRI_OVER_LIB_H_ -#define _PLAT_DRI_OVER_LIB_H_ - -#include -#include -#include -#include -#include - -#include - +/** @file + + This library provides basic platform driver override functions. + +Copyright (c) 2007 - 2008, 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. + +**/ + +#ifndef _PLAT_DRI_OVER_LIB_H_ +#define _PLAT_DRI_OVER_LIB_H_ + +#include +#include +#include +#include +#include + +#include + /** Install the Platform Driver Override Protocol, and ensure there is only one Platform Driver Override Protocol in the system. @@ -38,111 +33,67 @@ Abstract: @retval EFI_ALREADY_STARTED There has been a Platform Driver Override Protocol in the system, cannot install it again. - @retval Other Returned by InstallProtocolInterface - -**/ -EFI_STATUS -EFIAPI -InstallPlatformDriverOverrideProtocol ( - EFI_PLATFORM_DRIVER_OVERRIDE_PROTOCOL *gPlatformDriverOverride - ); - + @retval EFI_SUCCESS The protocol is installed successfully. + +**/ +EFI_STATUS +EFIAPI +InstallPlatformDriverOverrideProtocol ( + EFI_PLATFORM_DRIVER_OVERRIDE_PROTOCOL *gPlatformDriverOverride + ); + /** - Free all the mapping database memory resource and initialize the mapping list entry + Free all the mapping database memory resource and initialize the mapping list entry. @param MappingDataBase Mapping database list entry pointer @retval EFI_INVALID_PARAMETER mapping database list entry is NULL @retval EFI_SUCCESS Free success -**/ -EFI_STATUS -EFIAPI -FreeMappingDatabase ( - IN OUT LIST_ENTRY *MappingDataBase - ); - +**/ +EFI_STATUS +EFIAPI +FreeMappingDatabase ( + IN OUT LIST_ENTRY *MappingDataBase + ); + /** Read the environment variable(s) that contain the override mappings from Controller Device Path to a set of Driver Device Paths, and create the mapping database in memory with those variable info. - VariableLayout{ - // - // NotEnd indicate whether the variable is the last one, and has no subsequent variable need to load. - // Each variable has MaximumVariableSize limitation, so we maybe need multi variables to store - // large mapping infos. - // The variable(s) name rule is PlatDriOver, PlatDriOver1, PlatDriOver2, .... - // - UINT32 NotEnd; - // - // The entry which contains the mapping that Controller Device Path to a set of Driver Device Paths - // There are often multi mapping entries in a variable. - // - UINT32 SIGNATURE; //EFI_SIGNATURE_32('p','d','o','i') - UINT32 DriverNum; - EFI_DEVICE_PATH_PROTOCOL ControllerDevicePath[]; - EFI_DEVICE_PATH_PROTOCOL DriverDevicePath[]; - EFI_DEVICE_PATH_PROTOCOL DriverDevicePath[]; - EFI_DEVICE_PATH_PROTOCOL DriverDevicePath[]; - ...... - UINT32 SIGNATURE; - UINT32 DriverNum; - EFI_DEVICE_PATH_PROTOCOL ControllerDevicePath[]; - EFI_DEVICE_PATH_PROTOCOL DriverDevicePath[]; - EFI_DEVICE_PATH_PROTOCOL DriverDevicePath[]; - EFI_DEVICE_PATH_PROTOCOL DriverDevicePath[]; - ...... - } - typedef struct _PLATFORM_OVERRIDE_ITEM{ - UINTN Signature; //EFI_SIGNATURE_32('p','d','o','i') - LIST_ENTRY Link; - UINT32 DriverInfoNum; - EFI_DEVICE_PATH_PROTOCOL *ControllerDevicePath; - LIST_ENTRY DriverInfoList; //DRIVER_IMAGE_INFO List - } PLATFORM_OVERRIDE_ITEM; - typedef struct _DRIVER_IMAGE_INFO{ - UINTN Signature; //EFI_SIGNATURE_32('p','d','i','i') - LIST_ENTRY Link; - EFI_HANDLE ImageHandle; - EFI_DEVICE_PATH_PROTOCOL *DriverImagePath; - BOOLEAN UnLoadable; - BOOLEAN UnStartable; - } DRIVER_IMAGE_INFO; @param MappingDataBase Mapping database list entry pointer @retval EFI_INVALID_PARAMETER MappingDataBase pointer is null @retval EFI_NOT_FOUND Cannot find the 'PlatDriOver' NV variable @retval EFI_VOLUME_CORRUPTED The found NV variable is corrupted - @retval EFI_SUCCESS Create the mapping database in memory - successfully - -**/ -EFI_STATUS -EFIAPI -InitOverridesMapping ( - OUT LIST_ENTRY *MappingDataBase - ); - + @retval EFI_SUCCESS Create the mapping database in memory successfully + +**/ +EFI_STATUS +EFIAPI +InitOverridesMapping ( + OUT LIST_ENTRY *MappingDataBase + ); + /** - Save the memory mapping database into NV environment variable(s) + Save the memory mapping database into NV environment variable(s). @param MappingDataBase Mapping database list entry pointer @retval EFI_INVALID_PARAMETER MappingDataBase pointer is null @retval EFI_SUCCESS Save memory mapping database successfully -**/ -EFI_STATUS -EFIAPI -SaveOverridesMapping ( - IN LIST_ENTRY *MappingDataBase - ); - +**/ +EFI_STATUS +EFIAPI +SaveOverridesMapping ( + IN LIST_ENTRY *MappingDataBase + ); + /** Retrieves the image handle of the platform override driver for a controller in the system from the memory mapping database. - @param This A pointer to the - EFI_PLATFORM_DRIVER_OVERRIDE_PROTOCOL instance. + @param This A pointer to the EFI_PLATFORM_DRIVER_OVERRIDE_PROTOCOL instance. @param ControllerHandle The device handle of the controller to check if a driver override exists. @param DriverImageHandle On output, a pointer to the next driver handle. @@ -163,50 +114,56 @@ SaveOverridesMapping ( @retval EFI_SUCCESS The driver override for ControllerHandle was returned in DriverImagePath. -**/ -EFI_STATUS -EFIAPI -GetDriverFromMapping ( - IN EFI_PLATFORM_DRIVER_OVERRIDE_PROTOCOL * This, - IN EFI_HANDLE ControllerHandle, - IN OUT EFI_HANDLE * DriverImageHandle, - IN LIST_ENTRY * MappingDataBase, - IN EFI_HANDLE CallerImageHandle - ); - -EFI_STATUS -EFIAPI -DeleteOverridesVariables ( - VOID - ); - +**/ +EFI_STATUS +EFIAPI +GetDriverFromMapping ( + IN EFI_PLATFORM_DRIVER_OVERRIDE_PROTOCOL * This, + IN EFI_HANDLE ControllerHandle, + IN OUT EFI_HANDLE * DriverImageHandle, + IN LIST_ENTRY * MappingDataBase, + IN EFI_HANDLE CallerImageHandle + ); + +/** + Deletes all environment variable(s) that contain the override mappings from Controller Device Path to + a set of Driver Device Paths. + + @retval EFI_SUCCESS Delete all variable(s) successfully. +**/ +EFI_STATUS +EFIAPI +DeleteOverridesVariables ( + VOID + ); + /** Check mapping database whether already has the mapping info which records the input Controller to input DriverImage. - If has, the controller's total override driver number and input DriverImage's order number is return. - @param ControllerDevicePath The controller device path need to add a - override driver image item - @param DriverImageDevicePath The driver image device path need to be insert + @param ControllerDevicePath The controller device path is to be check. + @param DriverImageDevicePath The driver image device path is to be check. @param MappingDataBase Mapping database list entry pointer @param DriverInfoNum the controller's total override driver number - @param DriverImageNO The inserted order number - - @return EFI_INVALID_PARAMETER - @return EFI_NOT_FOUND - @return EFI_SUCCESS - -**/ -EFI_STATUS -EFIAPI -CheckMapping ( - IN EFI_DEVICE_PATH_PROTOCOL *ControllerDevicePath, - IN EFI_DEVICE_PATH_PROTOCOL *DriverImageDevicePath, - IN LIST_ENTRY * MappingDataBase, - OUT UINT32 *DriverInfoNum, - OUT UINT32 *DriverImageNO - ); - + @param DriverImageNO The driver order number for the input DriverImage. + If the DriverImageDevicePath is NULL, DriverImageNO is not set. + + @retval EFI_INVALID_PARAMETER ControllerDevicePath or MappingDataBase is NULL. + @retval EFI_NOT_FOUND ControllerDevicePath is not found in MappingDataBase or + DriverImageDevicePath is not found in the found DriverImage Info list. + @retval EFI_SUCCESS The controller's total override driver number and + input DriverImage's order number is correctly return. +**/ +EFI_STATUS +EFIAPI +CheckMapping ( + IN EFI_DEVICE_PATH_PROTOCOL *ControllerDevicePath, + IN EFI_DEVICE_PATH_PROTOCOL *DriverImageDevicePath, + IN LIST_ENTRY * MappingDataBase, + OUT UINT32 *DriverInfoNum, + OUT UINT32 *DriverImageNO + ); + /** Insert a driver image as a controller's override driver into the mapping database. The driver image's order number is indicated by DriverImageNO. @@ -215,50 +172,58 @@ CheckMapping ( override driver image item @param DriverImageDevicePath The driver image device path need to be insert @param MappingDataBase Mapping database list entry pointer - @param DriverImageNO The inserted order number - - @return EFI_INVALID_PARAMETER - @return EFI_ALREADY_STARTED - @return EFI_SUCCESS - -**/ -EFI_STATUS -EFIAPI -InsertDriverImage ( - IN EFI_DEVICE_PATH_PROTOCOL *ControllerDevicePath, - IN EFI_DEVICE_PATH_PROTOCOL *DriverImageDevicePath, - IN LIST_ENTRY *MappingDataBase, - IN UINT32 DriverImageNO - ); - + @param DriverImageNO The inserted order number. If this number is taken, + the larger available number will be used. + + @retval EFI_INVALID_PARAMETER ControllerDevicePath is NULL, or DriverImageDevicePath is NULL + or MappingDataBase is NULL + @retval EFI_ALREADY_STARTED The input Controller to input DriverImage has been + recorded into the mapping database. + @retval EFI_SUCCESS The Controller and DriverImage are inserted into + the mapping database successfully. + +**/ +EFI_STATUS +EFIAPI +InsertDriverImage ( + IN EFI_DEVICE_PATH_PROTOCOL *ControllerDevicePath, + IN EFI_DEVICE_PATH_PROTOCOL *DriverImageDevicePath, + IN LIST_ENTRY *MappingDataBase, + IN UINT32 DriverImageNO + ); + /** Delete a controller's override driver from the mapping database. - @param ControllerDevicePath The controller device path need to add a - override driver image item - @param DriverImageDevicePath The driver image device path need to be insert + @param ControllerDevicePath The controller device path will be deleted + when all drivers images on it are removed. + @param DriverImageDevicePath The driver image device path will be delete. + If NULL, all driver image will be delete. @param MappingDataBase Mapping database list entry pointer - @param DriverImageNO The inserted order number - - @return EFI_INVALID_PARAMETER - @return EFI_NOT_FOUND - @return EFI_SUCCESS - -**/ -EFI_STATUS -EFIAPI -DeleteDriverImage ( - IN EFI_DEVICE_PATH_PROTOCOL *ControllerDevicePath, - IN EFI_DEVICE_PATH_PROTOCOL *DriverImageDevicePath, - IN LIST_ENTRY *MappingDataBase - ); - + + @retval EFI_INVALID_PARAMETER ControllerDevicePath is NULL, or MappingDataBase is NULL + @retval EFI_NOT_FOUND ControllerDevicePath is not found in MappingDataBase or + DriverImageDevicePath is not found in the found DriverImage Info list. + @retval EFI_SUCCESS Delete the specified driver successfully. + +**/ +EFI_STATUS +EFIAPI +DeleteDriverImage ( + IN EFI_DEVICE_PATH_PROTOCOL *ControllerDevicePath, + IN EFI_DEVICE_PATH_PROTOCOL *DriverImageDevicePath, + IN LIST_ENTRY *MappingDataBase + ); + /** Get the first Binding protocol which has the specific image handle - @param Image Image handle + @param ImageHandle The Image handle + @param BindingHandle The BindingHandle of the found Driver Binding protocol. + If Binding protocol is not found, it is set to NULL. - @return Pointer into the Binding Protocol interface + @return Pointer into the Binding Protocol interface + @retval NULL The paramter is not valid or the binding protocol is not found. **/ EFI_DRIVER_BINDING_PROTOCOL * @@ -266,6 +231,6 @@ EFIAPI GetBindingProtocolFromImageHandle ( IN EFI_HANDLE ImageHandle, OUT EFI_HANDLE *BindingHandle - ); - -#endif + ); + +#endif diff --git a/MdeModulePkg/Include/Library/PlatformBdsLib.h b/MdeModulePkg/Include/Library/PlatformBdsLib.h index c24e29a..a10789b 100644 --- a/MdeModulePkg/Include/Library/PlatformBdsLib.h +++ b/MdeModulePkg/Include/Library/PlatformBdsLib.h @@ -54,8 +54,6 @@ struct _EFI_BDS_ARCH_PROTOCOL_INSTANCE { @param PrivateData The EFI_BDS_ARCH_PROTOCOL_INSTANCE instance - @return None. - **/ VOID EFIAPI @@ -91,8 +89,6 @@ PlatformBdsPolicyBehavior ( @param ExitData Exit data returned from failed boot. @param ExitDataSize Exit data size returned from failed boot. - @return None. - **/ VOID EFIAPI @@ -126,7 +122,6 @@ PlatformBdsBootSuccess ( The flash layout is platform specific. @retval EFI_SUCCESS The non-updatable flash areas. - @retval Others Some error occurs when locking non-updatable flash areas. **/ EFI_STATUS EFIAPI diff --git a/MdeModulePkg/Include/Library/UdpIoLib.h b/MdeModulePkg/Include/Library/UdpIoLib.h index 05c1217..ef64e94 100644 --- a/MdeModulePkg/Include/Library/UdpIoLib.h +++ b/MdeModulePkg/Include/Library/UdpIoLib.h @@ -25,11 +25,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. typedef struct _UDP_IO_PORT UDP_IO_PORT; -enum { +typedef enum { UDP_IO_RX_SIGNATURE = EFI_SIGNATURE_32 ('U', 'D', 'P', 'R'), UDP_IO_TX_SIGNATURE = EFI_SIGNATURE_32 ('U', 'D', 'P', 'T'), UDP_IO_SIGNATURE = EFI_SIGNATURE_32 ('U', 'D', 'P', 'I') -}; +} UDP_IO_SIGNATURE_TYPE; typedef struct { IP4_ADDR LocalAddr; @@ -130,7 +130,7 @@ BOOLEAN @param Controller The controller that has the UDP service binding protocol installed. - @param Image The image handle for the driver. + @param ImageHandle The image handle for the driver. @param Configure The function to configure the created UDP child @param Context The opaque parameter for the Configure funtion. @@ -204,14 +204,14 @@ UdpIoSendDatagram ( IN VOID *Context ); -/** - The selection function to cancel a single sent datagram. - - @param Token The UDP TX token to test againist. - @param Context The context - - @return TRUE if the packet is to be cancelled, otherwise FALSE. - +/** + Cancel a single sent datagram. + + @param UdpIo The UDP IO port to cancel the packet from + @param Packet The packet to cancel + + @return None + **/ VOID EFIAPI diff --git a/MdeModulePkg/Include/MdeModuleHii.h b/MdeModulePkg/Include/MdeModuleHii.h index 07ce80b..8d9cc5c 100644 --- a/MdeModulePkg/Include/MdeModuleHii.h +++ b/MdeModulePkg/Include/MdeModuleHii.h @@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ -#ifndef _MDEMODULE_HII_H -#define _MDEMODULE_HII_H +#ifndef __MDEMODULE_HII_H__ +#define __MDEMODULE_HII_H__ #define NARROW_CHAR 0xFFF0 #define WIDE_CHAR 0xFFF1 diff --git a/MdeModulePkg/Include/Ppi/BaseMemoryTest.h b/MdeModulePkg/Include/Ppi/BaseMemoryTest.h index e769a99..5e069a6 100644 --- a/MdeModulePkg/Include/Ppi/BaseMemoryTest.h +++ b/MdeModulePkg/Include/Ppi/BaseMemoryTest.h @@ -1,5 +1,5 @@ /** @file - Pei memory test PPI used to Perform memory test in PEI phase. + This file defines Pei memory test PPI used to Perform memory test in PEI phase. Copyright (c) 2006 - 2008, Intel Corporation.
All rights reserved. This program and the accompanying materials @@ -20,6 +20,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. typedef struct _PEI_BASE_MEMORY_TEST_PPI PEI_BASE_MEMORY_TEST_PPI; +// +// 4 different test operations +// Ignore op not test memory, Quick and Sparse op test memory quickly, Extensive op test memory detailedly. +// typedef enum { Ignore, Quick, @@ -27,6 +31,19 @@ typedef enum { Extensive } PEI_MEMORY_TEST_OP; +/** + Test a range memory space is ready to read and write. + + @param PeiServices An indirect pointer to the PEI Services Table published by the PEI Foundation. + @param This Pointer to Pei memory test PPI instance. + @param BeginAddress Beginning of the memory address to be checked. + @param MemoryLength Bytes of memory range to be checked. + @param Operation Type of memory check operation to be performed. + @param ErrorAddress Address which has error when checked. + + @retval EFI_SUCCESS Memory range pass basic read and write test. + @retval EFI_DEVICE_ERROR Memory is not ready to access. +**/ typedef EFI_STATUS (EFIAPI *PEI_BASE_MEMORY_TEST) ( diff --git a/MdeModulePkg/Include/Ppi/FlashMap.h b/MdeModulePkg/Include/Ppi/FlashMap.h index f562f88..fba9a53 100644 --- a/MdeModulePkg/Include/Ppi/FlashMap.h +++ b/MdeModulePkg/Include/Ppi/FlashMap.h @@ -43,7 +43,7 @@ typedef EFI_STATUS (EFIAPI *PEI_GET_FLASH_AREA_INFO) ( IN EFI_PEI_SERVICES **PeiServices, - IN PEI_FLASH_MAP_PPI *This, + IN PEI_FLASH_MAP_PPI *This, IN EFI_FLASH_AREA_TYPE AreaType, IN EFI_GUID *AreaTypeGuid, OUT UINT32 *NumEntries, diff --git a/MdeModulePkg/Include/Ppi/OperatorPresence.h b/MdeModulePkg/Include/Ppi/OperatorPresence.h index a6dcf31..b5221a1 100644 --- a/MdeModulePkg/Include/Ppi/OperatorPresence.h +++ b/MdeModulePkg/Include/Ppi/OperatorPresence.h @@ -1,5 +1,5 @@ /** @file - PPI published by the PEIM that is responsible for detecting operator presence. + This file defines OperatorPresent PPI responsible for detecting TPM operator presence. Copyright (c) 2006 - 2008, Intel Corporation.
All rights reserved. This program and the accompanying materials diff --git a/MdeModulePkg/Include/Protocol/Capsule.h b/MdeModulePkg/Include/Protocol/Capsule.h index 32b09ea..7c8e258 100644 --- a/MdeModulePkg/Include/Protocol/Capsule.h +++ b/MdeModulePkg/Include/Protocol/Capsule.h @@ -1,6 +1,7 @@ /** @file - Capsule Architectural Protocol is added to produce UEFI2.0 capsule runtime services. + Capsule Architectural Protocol is responsible to tag UEFI2.0 capsule runtime services + are ready in EFI_RUNTIME_SERVICES. Copyright (c) 2006 - 2008, Intel Corporation All rights reserved. This program and the accompanying materials diff --git a/MdeModulePkg/Include/Protocol/ConsoleControl.h b/MdeModulePkg/Include/Protocol/ConsoleControl.h index 75de391..5b3eb0d 100644 --- a/MdeModulePkg/Include/Protocol/ConsoleControl.h +++ b/MdeModulePkg/Include/Protocol/ConsoleControl.h @@ -1,6 +1,8 @@ -/*++ +/** @file -Copyright (c) 2006 - 2007, Intel Corporation + This protocol provides the interfaces to Get/Set the current video mode for GOP/UGA screen + +Copyright (c) 2006 - 2008, 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 @@ -9,15 +11,7 @@ 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: - - ConsoleControl.h - -Abstract: - - Abstraction of a Text mode or GOP/UGA screen - ---*/ +**/ #ifndef __CONSOLE_CONTROL_H__ #define __CONSOLE_CONTROL_H__ @@ -34,7 +28,20 @@ typedef enum { EfiConsoleControlScreenMaxValue } EFI_CONSOLE_CONTROL_SCREEN_MODE; +/** + Return the current video mode information. Also returns info about existence + of Graphics Output devices or UGA Draw devices in system, and if the Std In device is locked. All the + arguments are optional and only returned if a non NULL pointer is passed in. + + @param This Protocol instance pointer. + @param Mode Are we in text of grahics mode. + @param GopExists TRUE if GOP Spliter has found a GOP/UGA device + @param StdInLocked TRUE if StdIn device is keyboard locked + @retval EFI_SUCCESS Video mode information is returned. + @retval EFI_INVALID_PARAMETER Invalid parameters if Mode == NULL. + +**/ typedef EFI_STATUS (EFIAPI *EFI_CONSOLE_CONTROL_PROTOCOL_GET_MODE) ( @@ -43,74 +50,43 @@ EFI_STATUS OUT BOOLEAN *GopUgaExists, OPTIONAL OUT BOOLEAN *StdInLocked OPTIONAL ) -/*++ - - Routine Description: - Return the current video mode information. Also returns info about existence - of Graphics Output devices or UGA Draw devices in system, and if the Std In - device is locked. All the arguments are optional and only returned if a non - NULL pointer is passed in. - - Arguments: - This - Protocol instance pointer. - Mode - Are we in text of grahics mode. - GopUgaExists - TRUE if Console Spliter has found a GOP or UGA device - StdInLocked - TRUE if StdIn device is keyboard locked +; - Returns: - EFI_SUCCESS - Mode information returned. +/** + Set the current video mode to either text or graphics. ---*/ -; + @param This Protocol instance pointer. + @param Mode Mode is to be set. + @retval EFI_SUCCESS Mode is set. + @retval EFI_INVALID_PARAMETER Mode is not the valid mode value. + @retval EFI_UNSUPPORTED Mode is unsupported by console device. +**/ typedef EFI_STATUS (EFIAPI *EFI_CONSOLE_CONTROL_PROTOCOL_SET_MODE) ( IN EFI_CONSOLE_CONTROL_PROTOCOL *This, OUT EFI_CONSOLE_CONTROL_SCREEN_MODE Mode ) -/*++ - - Routine Description: - Set the current mode to either text or graphics. Graphics is - for Quiet Boot. - - Arguments: - This - Protocol instance pointer. - Mode - Mode to set the - - Returns: - EFI_SUCCESS - Mode information returned. - ---*/ ; +/** + Copy the Password and enable state variable and then arm the periodic timer + + @retval EFI_SUCCESS Lock the StdIn device + @retval EFI_INVALID_PARAMETER Password is NULL + @retval EFI_OUT_OF_RESOURCES Buffer allocation to store the big password fails +**/ typedef EFI_STATUS (EFIAPI *EFI_CONSOLE_CONTROL_PROTOCOL_LOCK_STD_IN) ( IN EFI_CONSOLE_CONTROL_PROTOCOL *This, IN CHAR16 *Password ) -/*++ - - Routine Description: - Lock Std In devices until Password is typed. - - Arguments: - This - Protocol instance pointer. - Password - Password needed to unlock screen. NULL means unlock keyboard - - Returns: - EFI_SUCCESS - Mode information returned. - EFI_DEVICE_ERROR - Std In not locked - ---*/ ; - - struct _EFI_CONSOLE_CONTROL_PROTOCOL { EFI_CONSOLE_CONTROL_PROTOCOL_GET_MODE GetMode; EFI_CONSOLE_CONTROL_PROTOCOL_SET_MODE SetMode; diff --git a/MdeModulePkg/Include/Protocol/Crc32GuidedSectionExtraction.h b/MdeModulePkg/Include/Protocol/Crc32GuidedSectionExtraction.h index 6ef3b22..389d53c 100644 --- a/MdeModulePkg/Include/Protocol/Crc32GuidedSectionExtraction.h +++ b/MdeModulePkg/Include/Protocol/Crc32GuidedSectionExtraction.h @@ -1,10 +1,11 @@ /** @file - This protocol implements a FV section extraction using a CRC32 encapsulation. - The GUID defins the encapsulation scheme and the data structures come from - the SectionExtraction protocol definition. + This file can define the different guids to specify the different + encapsulation scheme for the guided section. + Now, only one guid is defined for CRC32 encapsulation scheme. + The related data structures come from the SectionExtraction protocol definition. - Copyright (c) 2006, Intel Corporation + Copyright (c) 2006 - 2008, 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 @@ -28,11 +29,6 @@ { 0xFC1BCDB0, 0x7D31, 0x49aa, {0x93, 0x6A, 0xA4, 0x60, 0x0D, 0x9D, 0xD0, 0x83 } } // -// Forward reference for pure ANSI compatability -// -typedef struct _EFI_CRC32_GUIDED_SECTION_EXTRACTION_PROTOCOL EFI_CRC32_GUID_SECTION_EXTRACTION_PROTOCOL; - -// // The data structures are the same as GuidedSectionExtraction protocol only the GUID's are different // #include diff --git a/MdeModulePkg/Include/Protocol/CustomizedDecompress.h b/MdeModulePkg/Include/Protocol/CustomizedDecompress.h deleted file mode 100644 index ca54c67..0000000 --- a/MdeModulePkg/Include/Protocol/CustomizedDecompress.h +++ /dev/null @@ -1,121 +0,0 @@ -/** @file - - The user Customized Decompress Protocol Interface - -Copyright (c) 2006 - 2008, 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. - -**/ - -#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; - -/** - - 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. - - @param This The protocol instance pointer - @param Source The source buffer containing the compressed data. - @param SourceSize The size, in bytes, of source buffer. - @param 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. - @param 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. - - @retval EFI_SUCCESS The size of the uncompressed data was returned in DestinationSize - and the size of the scratch buffer was returned in ScratchSize. - @retval 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_GET_INFO) ( - IN EFI_CUSTOMIZED_DECOMPRESS_PROTOCOL *This, - IN VOID *Source, - IN UINT32 SourceSize, - OUT UINT32 *DestinationSize, - OUT UINT32 *ScratchSize - ); - -/** - - 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. - - @param This The protocol instance pointer - @param Source The source buffer containing the compressed data. - @param SourceSize The size of source data. - @param Destination On output, the destination buffer that contains - the uncompressed data. - @param DestinationSize The size of destination buffer. The size of destination - buffer needed is obtained from GetInfo(). - @param Scratch A temporary scratch buffer that is used to perform the - decompression. - @param ScratchSize The size of scratch buffer. The size of scratch buffer needed - is obtained from GetInfo(). - - @retval EFI_SUCCESS Decompression completed successfully, and the uncompressed - buffer is returned in Destination. - @retval EFI_INVALID_PARAMETER - The source buffer specified by Source and SourceSize is - corrupted (not in a valid compressed format). -**/ -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 - ); - -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/Dpc.h b/MdeModulePkg/Include/Protocol/Dpc.h index e095f84..a93ac24 100644 --- a/MdeModulePkg/Include/Protocol/Dpc.h +++ b/MdeModulePkg/Include/Protocol/Dpc.h @@ -1,6 +1,8 @@ -/*++ +/** @file -Copyright (c) 2007, Intel Corporation + EFI Deferred Procedure Call Protocol + +Copyright (c) 2007 - 2008, 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 @@ -9,17 +11,7 @@ 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: - - Dpc.h - -Abstract: - - EFI Deferred Procedure Call Protocol - -Revision History - ---*/ +**/ #ifndef __DPC_H__ diff --git a/MdeModulePkg/Include/Protocol/EdkDecompress.h b/MdeModulePkg/Include/Protocol/EdkDecompress.h deleted file mode 100644 index fff1e31..0000000 --- a/MdeModulePkg/Include/Protocol/EdkDecompress.h +++ /dev/null @@ -1,121 +0,0 @@ -/** @file - - The Tiano Decompress Protocol Interface - -Copyright (c) 2006 - 2008, 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. - -**/ - -#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; - -/** - - 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. - - @param This The protocol instance pointer - @param Source The source buffer containing the compressed data. - @param SourceSize The size, in bytes, of source buffer. - @param 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. - @param 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. - - @retval EFI_SUCCESS The size of the uncompressed data was returned in DestinationSize - and the size of the scratch buffer was returned in ScratchSize. - @retval 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_GET_INFO) ( - IN EFI_TIANO_DECOMPRESS_PROTOCOL *This, - IN VOID *Source, - IN UINT32 SourceSize, - OUT UINT32 *DestinationSize, - OUT UINT32 *ScratchSize - ); - -/** - - 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. - - @param This The protocol instance pointer - @param Source The source buffer containing the compressed data. - @param SourceSize The size of source data. - @param Destination On output, the destination buffer that contains - the uncompressed data. - @param DestinationSize The size of destination buffer. The size of destination - buffer needed is obtained from GetInfo(). - @param Scratch A temporary scratch buffer that is used to perform the - decompression. - @param ScratchSize The size of scratch buffer. The size of scratch buffer needed - is obtained from GetInfo(). - - @retval EFI_SUCCESS Decompression completed successfully, and the uncompressed - buffer is returned in Destination. - @retval EFI_INVALID_PARAMETER - The source buffer specified by Source and SourceSize is - corrupted (not in a valid compressed format). -**/ -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 - ); - -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/FaultTolerantWriteLite.h b/MdeModulePkg/Include/Protocol/FaultTolerantWriteLite.h index 7eb83e8..97b9b81 100644 --- a/MdeModulePkg/Include/Protocol/FaultTolerantWriteLite.h +++ b/MdeModulePkg/Include/Protocol/FaultTolerantWriteLite.h @@ -1,6 +1,6 @@ /** @file - This is a simple fault tolerant write driver, based on PlatformFd library. - And it only supports write BufferSize <= SpareAreaLength. + Fault tolerant write lite protocol defines only one interface to write + the buffer to the fault tolerant storage. Copyright (c) 2006 - 2008, Intel Corporation.
All rights reserved. This program and the accompanying materials @@ -33,7 +33,7 @@ typedef struct _EFI_FTW_LITE_PROTOCOL EFI_FTW_LITE_PROTOCOL; manner, ensuring at all times that either the original contents or the modified contents are available. - @param This Calling context + @param This The pointer to this protocol instance. @param FvBlockHandle The handle of FVB protocol that provides services for reading, writing, and erasing the target block. @@ -45,12 +45,11 @@ typedef struct _EFI_FTW_LITE_PROTOCOL EFI_FTW_LITE_PROTOCOL; @retval EFI_SUCCESS The function completed successfully @retval EFI_ABORTED The function could not complete successfully. - @retval EFI_BAD_BUFFER_SIZE The write would span a block boundary, which is - not a valid action. + @retval EFI_BAD_BUFFER_SIZE The input data can't fit within the target block. @retval EFI_ACCESS_DENIED No writes have been allocated. - @retval EFI_NOT_READY The last write has not been completed. Restart () - must be called to complete it. - + @retval EFI_OUT_OF_RESOURCES Cannot allocate enough memory resource. + @retval EFI_NOT_FOUND Cannot find FVB protocol by handle. + **/ typedef EFI_STATUS diff --git a/MdeModulePkg/Include/Protocol/FirmwareVolumeDispatch.h b/MdeModulePkg/Include/Protocol/FirmwareVolumeDispatch.h index d8c1e76..4f0952b 100644 --- a/MdeModulePkg/Include/Protocol/FirmwareVolumeDispatch.h +++ b/MdeModulePkg/Include/Protocol/FirmwareVolumeDispatch.h @@ -1,10 +1,9 @@ /** @file This file declares Firmware Volume Dispatch protocol. - Presence of this protocol tells the dispatch to dispatch from this Firmware - Volume + Presence of this protocol tells the core dispatcher to dispatch this Firmware Volume. - Copyright (c) 2006, Intel Corporation + Copyright (c) 2006 - 2008, 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 diff --git a/MdeModulePkg/Include/Protocol/FvbExtension.h b/MdeModulePkg/Include/Protocol/FvbExtension.h index e961057..21b5d0c 100644 --- a/MdeModulePkg/Include/Protocol/FvbExtension.h +++ b/MdeModulePkg/Include/Protocol/FvbExtension.h @@ -24,29 +24,30 @@ typedef struct _EFI_FVB_EXTENSION_PROTOCOL EFI_FVB_EXTENSION_PROTOCOL; // // FVB Extension Function Prototypes // -/** - Erases and initializes a specified range of a firmware volume - - @param[in] This Pointer to the FVB Extension protocol instance - @param[in] StartLba The starting logical block index to be erased +/** + Erases and initializes a specified range of a firmware volume block + + @param[in] This Pointer to the FVB Extension protocol instance + @param[in] StartLba The starting logical block index to be erased @param[in] OffsetStartLba Offset into the starting block at which to - begin erasing - @param[in] LastLba The last logical block index to be erased - @param[in] OffsetLastLba Offset into the last block at which to end erasing - - @retval EFI_EFI_SUCCESS Range was erased - @retval EFI_INVALID_PARAMETER invalid parameter - @retval EFI_UNSUPPORTED Range can not be erased - + begin erasing + @param[in] LastLba The last logical block index to be erased + @param[in] OffsetLastLba Offset into the last block at which to end erasing + + @retval EFI_SUCCESS The specified range was erased successfully + @retval EFI_ACCESS_DENIED The firmware volume block is in the WriteDisabled state + @retval EFI_DEVICE_ERROR The block device is not functioning correctly and + could not be written. Firmware device may have been + partially erased **/ typedef EFI_STATUS (EFIAPI * EFI_FV_ERASE_CUSTOM_BLOCK) ( IN EFI_FVB_EXTENSION_PROTOCOL *This, - IN EFI_LBA StartLba, - IN UINTN OffsetStartLba, - IN EFI_LBA LastLba, - IN UINTN OffsetLastLba + IN EFI_LBA StartLba, + IN UINTN OffsetStartLba, + IN EFI_LBA LastLba, + IN UINTN OffsetLastLba ); // diff --git a/MdeModulePkg/Include/Protocol/GenericMemoryTest.h b/MdeModulePkg/Include/Protocol/GenericMemoryTest.h index 9fcdffa..c5c4f24 100644 --- a/MdeModulePkg/Include/Protocol/GenericMemoryTest.h +++ b/MdeModulePkg/Include/Protocol/GenericMemoryTest.h @@ -1,6 +1,5 @@ /** @file - The EFI generic memory test protocol interface. - For more information please look at EfiMemoryTest.doc + This protocol defines the EFI generic memory test interfaces in Dxe phase. Copyright (c) 2006 - 2008, Intel Corporation.
All rights reserved. This program and the accompanying materials @@ -47,7 +46,7 @@ typedef enum { typedef EFI_STATUS (EFIAPI *EFI_MEMORY_TEST_INIT) ( - IN EFI_GENERIC_MEMORY_TEST_PROTOCOL *This, + IN EFI_GENERIC_MEMORY_TEST_PROTOCOL *This, IN EXTENDMEM_COVERAGE_LEVEL Level, OUT BOOLEAN *RequireSoftECCInit ) @@ -71,6 +70,7 @@ EFI_STATUS internally. @retval EFI_NOT_FOUND Indicate all the non-tested memory blocks have already go through. + @retval EFI_DEVICE_ERROR Mis-compare error, and no agent can handle it **/ typedef @@ -110,15 +110,14 @@ EFI_STATUS @param StartAddress The start address of the memory range. @param Length The memory range's length. - @retval EFI_SUCCESS The compatible memory range pass the memory test. - @retval EFI_DEVICE_ERROR The compatible memory range test find memory error - and also return return the error address. + @retval EFI_SUCCESS The compatible memory range pass the memory test. + @retval EFI_INVALID_PARAMETER The compatible memory range must be below 16M. **/ typedef EFI_STATUS (EFIAPI *EFI_MEMORY_TEST_COMPATIBLE_RANGE) ( - IN EFI_GENERIC_MEMORY_TEST_PROTOCOL *This, + IN EFI_GENERIC_MEMORY_TEST_PROTOCOL *This, IN EFI_PHYSICAL_ADDRESS StartAddress, IN UINT64 Length ) diff --git a/MdeModulePkg/Include/Protocol/LoadPe32Image.h b/MdeModulePkg/Include/Protocol/LoadPe32Image.h index 8cf58ec..8415872 100644 --- a/MdeModulePkg/Include/Protocol/LoadPe32Image.h +++ b/MdeModulePkg/Include/Protocol/LoadPe32Image.h @@ -1,6 +1,7 @@ /** @file - Load File protocol. + Load File protocol provides capability to load and unload EFI image into + memory and execute it. 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. diff --git a/MdeModulePkg/Include/Protocol/NicIp4Config.h b/MdeModulePkg/Include/Protocol/NicIp4Config.h index 2272d98..2bf20c0 100644 --- a/MdeModulePkg/Include/Protocol/NicIp4Config.h +++ b/MdeModulePkg/Include/Protocol/NicIp4Config.h @@ -1,6 +1,7 @@ -/*++ +/** @file + This file defines NicIp4Config Protocol. -Copyright (c) 2006, Intel Corporation +Copyright (c) 2006 - 2008, 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 @@ -9,13 +10,7 @@ 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: - - NicIp4Config.h - -Abstract: - ---*/ +**/ #ifndef __NIC_IP4_CONFIG_H__ #define __NIC_IP4_CONFIG_H__ @@ -38,7 +33,7 @@ Abstract: typedef struct _EFI_NIC_IP4_CONFIG_PROTOCOL EFI_NIC_IP4_CONFIG_PROTOCOL; -enum { +typedef enum { // // Config source: dhcp or static // @@ -48,7 +43,7 @@ enum { IP4_NIC_NAME_LENGTH = 64, MAX_IP4_CONFIG_IN_VARIABLE = 16 -}; +} IP4_CONFIG_TYPE; // // The following structures are used by drivers/applications other diff --git a/MdeModulePkg/Include/Protocol/OEMBadging.h b/MdeModulePkg/Include/Protocol/OEMBadging.h index 3154c14..0d701a8 100644 --- a/MdeModulePkg/Include/Protocol/OEMBadging.h +++ b/MdeModulePkg/Include/Protocol/OEMBadging.h @@ -1,5 +1,6 @@ /** @file - EFI OEM Badging Protocol definition header file + EFI OEM Badging Protocol defines the interface to get the OEM badging + image with the dispaly attribute. This protocol can be produced based on OEM images. Copyright (c) 2006 - 2008, Intel Corporation.
All rights reserved. This program and the accompanying materials @@ -45,7 +46,23 @@ typedef enum { EfiBadgingDisplayAttributeCustomized } EFI_BADGING_DISPLAY_ATTRIBUTE; +/** + Load an OEM image and return its data as well as attributes. + + @param This Pointer to this protocol instance. + @param Instance The visiable image instance is founded and returned from the input instance. + @param Format Format of the image such as BMP,JPEG,etc. + @param ImageData Image data returned. + @param ImageSize Size of the image returned. + @param Attribute Display attributes of the image returned. + @param CoordinateX X coordinate of the image. + @param CoordinateY Y coordinate of the image. + + @retval EFI_SUCCESS Image has been fetched successfully. + @retval EFI_NOT_FOUND The specified image could not be found. + +**/ typedef EFI_STATUS (EFIAPI *EFI_BADGING_GET_IMAGE) ( diff --git a/MdeModulePkg/Include/Protocol/Print.h b/MdeModulePkg/Include/Protocol/Print.h index 4a356f3..22d6a60 100644 --- a/MdeModulePkg/Include/Protocol/Print.h +++ b/MdeModulePkg/Include/Protocol/Print.h @@ -1,6 +1,7 @@ /** @file - This file defines the Print protocol. + This print protocol defines six basic print functions to + print the format unicode and ascii string. Copyright (c) 2006 - 2008, Intel Corporation All rights reserved. This program and the accompanying materials diff --git a/MdeModulePkg/Include/Protocol/PxeDhcp4.h b/MdeModulePkg/Include/Protocol/PxeDhcp4.h index 53fe743..c52aa1e 100644 --- a/MdeModulePkg/Include/Protocol/PxeDhcp4.h +++ b/MdeModulePkg/Include/Protocol/PxeDhcp4.h @@ -1,6 +1,7 @@ -/*++ +/** @file + EFI PXE DHCPv4 protocol definition -Copyright (c) 2006, Intel Corporation +Copyright (c) 2006 - 2008, 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 @@ -9,13 +10,7 @@ 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: - PxeDhcp4.h - -Abstract: - EFI PXE DHCPv4 protocol definition - ---*/ +**/ #ifndef _PXEDHCP4_H_ #define _PXEDHCP4_H_ @@ -168,23 +163,23 @@ typedef union _DHCP4_PACKET { #define DHCP4_NIS_SERVERS 41 #define DHCP4_NTP_SERVERS 42 #define DHCP4_VENDOR_SPECIFIC 43 -# define PXE_MTFTP_IP 1 -# define PXE_MTFTP_CPORT 2 -# define PXE_MTFTP_SPORT 3 -# define PXE_MTFTP_TMOUT 4 -# define PXE_MTFTP_DELAY 5 -# define PXE_DISCOVERY_CONTROL 6 -# define PXE_DISABLE_BROADCAST_DISCOVERY 0x01 -# define PXE_DISABLE_MULTICAST_DISCOVERY 0x02 -# define PXE_ACCEPT_ONLY_PXE_BOOT_SERVERS 0x04 -# define PXE_DO_NOT_PROMPT 0x08 -# define PXE_DISCOVERY_MCAST_ADDR 7 -# define PXE_BOOT_SERVERS 8 -# define PXE_BOOT_MENU 9 -# define PXE_BOOT_PROMPT 10 -# define PXE_MCAST_ADDRS_ALLOC 11 -# define PXE_CREDENTIAL_TYPES 12 -# define PXE_BOOT_ITEM 71 +#define PXE_MTFTP_IP 1 +#define PXE_MTFTP_CPORT 2 +#define PXE_MTFTP_SPORT 3 +#define PXE_MTFTP_TMOUT 4 +#define PXE_MTFTP_DELAY 5 +#define PXE_DISCOVERY_CONTROL 6 +#define PXE_DISABLE_BROADCAST_DISCOVERY 0x01 +#define PXE_DISABLE_MULTICAST_DISCOVERY 0x02 +#define PXE_ACCEPT_ONLY_PXE_BOOT_SERVERS 0x04 +#define PXE_DO_NOT_PROMPT 0x08 +#define PXE_DISCOVERY_MCAST_ADDR 7 +#define PXE_BOOT_SERVERS 8 +#define PXE_BOOT_MENU 9 +#define PXE_BOOT_PROMPT 10 +#define PXE_MCAST_ADDRS_ALLOC 11 +#define PXE_CREDENTIAL_TYPES 12 +#define PXE_BOOT_ITEM 71 #define DHCP4_NBNS_SERVERS 44 #define DHCP4_NBDD_SERVERS 45 #define DHCP4_NETBIOS_NODE_TYPE 46 @@ -194,23 +189,23 @@ typedef union _DHCP4_PACKET { #define DHCP4_REQUESTED_IP_ADDRESS 50 #define DHCP4_LEASE_TIME 51 #define DHCP4_OPTION_OVERLOAD 52 -# define DHCP4_OVERLOAD_FNAME 1 -# define DHCP4_OVERLOAD_SNAME 2 -# define DHCP4_OVERLOAD_FNAME_AND_SNAME 3 +#define DHCP4_OVERLOAD_FNAME 1 +#define DHCP4_OVERLOAD_SNAME 2 +#define DHCP4_OVERLOAD_FNAME_AND_SNAME 3 #define DHCP4_MESSAGE_TYPE 53 -# define DHCP4_MESSAGE_TYPE_DISCOVER 1 -# define DHCP4_MESSAGE_TYPE_OFFER 2 -# define DHCP4_MESSAGE_TYPE_REQUEST 3 -# define DHCP4_MESSAGE_TYPE_DECLINE 4 -# define DHCP4_MESSAGE_TYPE_ACK 5 -# define DHCP4_MESSAGE_TYPE_NAK 6 -# define DHCP4_MESSAGE_TYPE_RELEASE 7 -# define DHCP4_MESSAGE_TYPE_INFORM 8 +#define DHCP4_MESSAGE_TYPE_DISCOVER 1 +#define DHCP4_MESSAGE_TYPE_OFFER 2 +#define DHCP4_MESSAGE_TYPE_REQUEST 3 +#define DHCP4_MESSAGE_TYPE_DECLINE 4 +#define DHCP4_MESSAGE_TYPE_ACK 5 +#define DHCP4_MESSAGE_TYPE_NAK 6 +#define DHCP4_MESSAGE_TYPE_RELEASE 7 +#define DHCP4_MESSAGE_TYPE_INFORM 8 #define DHCP4_SERVER_IDENTIFIER 54 #define DHCP4_PARAMETER_REQUEST_LIST 55 #define DHCP4_ERROR_MESSAGE 56 #define DHCP4_MAX_MESSAGE_SIZE 57 -# define DHCP4_DEFAULT_MAX_MESSAGE_SIZE 576 +#define DHCP4_DEFAULT_MAX_MESSAGE_SIZE 576 #define DHCP4_RENEWAL_TIME 58 #define DHCP4_REBINDING_TIME 59 #define DHCP4_CLASS_IDENTIFIER 60 diff --git a/MdeModulePkg/Include/Protocol/PxeDhcp4CallBack.h b/MdeModulePkg/Include/Protocol/PxeDhcp4CallBack.h index cfba380..7f39723 100644 --- a/MdeModulePkg/Include/Protocol/PxeDhcp4CallBack.h +++ b/MdeModulePkg/Include/Protocol/PxeDhcp4CallBack.h @@ -1,6 +1,7 @@ -/*++ +/** @file + EFI PXE DHCP4 Callback protocol definition. -Copyright (c) 2006, Intel Corporation +Copyright (c) 2006 - 2008, 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 @@ -9,16 +10,10 @@ 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: - PxeDhcp4Callback.h - -Abstract: - EFI PXE DHCP4 Callback protocol definition. - ---*/ +**/ -#ifndef _PXE_DHCP4CALLBACK_H -#define _PXE_DHCP4CALLBACK_H +#ifndef __PXE_DHCP4CALLBACK_H__ +#define __PXE_DHCP4CALLBACK_H__ #include // diff --git a/MdeModulePkg/Include/Protocol/Tcp.h b/MdeModulePkg/Include/Protocol/Tcp.h index f49915c..ca6416e 100644 --- a/MdeModulePkg/Include/Protocol/Tcp.h +++ b/MdeModulePkg/Include/Protocol/Tcp.h @@ -1,6 +1,8 @@ -/*++ +/** @file -Copyright (c) 2004, Intel Corporation + This file defines EFI Transmission Control Protocol. + +Copyright (c) 2004 - 2008, 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 @@ -9,23 +11,11 @@ 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: - - tcp.h - -Abstract: - - EFI Transmission Control Protocol - - - -Revision History - ---*/ +**/ -#ifndef _EFITCP_H -#define _EFITCP_H +#ifndef __EFI_TCP_H__ +#define __EFI_TCP_H__ #include diff --git a/MdeModulePkg/Include/Protocol/UsbAtapi.h b/MdeModulePkg/Include/Protocol/UsbAtapi.h deleted file mode 100644 index daa0529..0000000 --- a/MdeModulePkg/Include/Protocol/UsbAtapi.h +++ /dev/null @@ -1,83 +0,0 @@ -/*++ - -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. - -Module Name: - - UsbAtapi.h - -Abstract: - - EFI Atapi Protocol definition. - -Revision History - ---*/ - -#ifndef __EFI_USB_ATAPI_H__ -#define __EFI_USB_ATAPI_H__ - -// -// Transfer protocol types -// -#define BOT 0x50 -#define CBI0 0x00 -#define CBI1 0x01 - -// -// SubClass Code (defines command set) -// -#define EFI_USB_SUBCLASS_RBC 0x01 -#define EFI_USB_SUBCLASS_ATAPI 0x02 -#define EFI_USB_SUBCLASS_QIC_157 0x03 -#define EFI_USB_SUBCLASS_UFI 0x04 -#define EFI_USB_SUBCLASS_SFF_8070i 0x05 -#define EFI_USB_SUBCLASS_SCSI 0x06 -#define EFI_USB_SUBCLASS_RESERVED_LOW 0x07 -#define EFI_USB_SUBCLASS_RESERVED_HIGH 0xff -// -// Global GUID for transfer protocol interface -// -#define EFI_USB_ATAPI_PROTOCOL_GUID \ - { 0x2B2F68DA, 0x0CD2, 0x44cf, {0x8E, 0x8B, 0xBB, 0xA2, 0x0B, 0x1B, 0x5B, 0x75 } } - -typedef struct _EFI_USB_ATAPI_PROTOCOL EFI_USB_ATAPI_PROTOCOL; - -typedef -EFI_STATUS -(EFIAPI *EFI_USB_ATAPI_PACKET_CMD) ( - IN EFI_USB_ATAPI_PROTOCOL *This, - IN VOID *Command, - IN UINT8 CommandSize, - IN VOID *DataBuffer, - IN UINT32 BufferLength, - IN EFI_USB_DATA_DIRECTION Direction, - IN UINT16 TimeOutInMilliSeconds -); - -typedef -EFI_STATUS -(EFIAPI *EFI_USB_MASS_STORAGE_RESET) ( - IN EFI_USB_ATAPI_PROTOCOL *This, - IN BOOLEAN ExtendedVerification -); - -// -// Protocol Interface Structure -// -struct _EFI_USB_ATAPI_PROTOCOL { - EFI_USB_ATAPI_PACKET_CMD UsbAtapiPacketCmd; - EFI_USB_MASS_STORAGE_RESET UsbAtapiReset; - UINT32 CommandProtocol; -}; - -extern EFI_GUID gEfiUsbAtapiProtocolGuid; - -#endif diff --git a/MdeModulePkg/Include/VariableFormat.h b/MdeModulePkg/Include/VariableFormat.h index 15b48eb..798bc41 100644 --- a/MdeModulePkg/Include/VariableFormat.h +++ b/MdeModulePkg/Include/VariableFormat.h @@ -1,7 +1,7 @@ -/**@file - Header file for EFI Variable Services. +/** @file + EDK II specific implementation of UEFI variable depend on data structure. - Copyright (c) 2006 - 2007 Intel Corporation.
+ Copyright (c) 2006 - 2008 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 diff --git a/MdeModulePkg/Include/WorkingBlockHeader.h b/MdeModulePkg/Include/WorkingBlockHeader.h index 3946b45..e5a4e20 100644 --- a/MdeModulePkg/Include/WorkingBlockHeader.h +++ b/MdeModulePkg/Include/WorkingBlockHeader.h @@ -1,7 +1,5 @@ /** @file - Defines data structure that is the headers found at the runtime - updatable firmware volumes. The header structure of FTW working block region. Copyright (c) 2006 - 2008, Intel Corporation diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index 8e9bb04..dfd2515 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -84,14 +84,10 @@ gEfiFaultTolerantWriteLiteProtocolGuid = { 0x3F557189, 0x8DAE, 0x45AE, { 0xA0, 0xB3, 0x2B, 0x99, 0xCA, 0x7A, 0xA7, 0xA0 }} gEfiConsoleControlProtocolGuid = { 0xF42F7782, 0x012E, 0x4C12, { 0x99, 0x56, 0x49, 0xF9, 0x43, 0x04, 0xF7, 0x21 }} gEfiOEMBadgingProtocolGuid = { 0x170E13C0, 0xBF1B, 0x4218, { 0x87, 0x1D, 0x2A, 0xBD, 0xC6, 0xF8, 0x87, 0xBC }} - gEfiUsbAtapiProtocolGuid = { 0x2B2F68DA, 0x0CD2, 0x44CF, { 0x8E, 0x8B, 0xBB, 0xA2, 0x0B, 0x1B, 0x5B, 0x75 }} gPerformanceProtocolGuid = { 0x76B6BDFA, 0x2ACD, 0x4462, { 0x9E, 0x3F, 0xCB, 0x58, 0xC9, 0x69, 0xD9, 0x37 }} gEfiCrc32GuidedSectionExtractionProtocolGuid = { 0xFC1BCDB0, 0x7D31, 0x49aa, {0x93, 0x6A, 0xA4, 0x60, 0x0D, 0x9D, 0xD0, 0x83 } } gEfiFirmwareVolumeDispatchProtocolGuid = { 0x7AA35A69, 0x506C, 0x444F, { 0xA7, 0xAF, 0x69, 0x4B, 0xF5, 0x6F, 0x71, 0xC8 }} - gEfiTianoDecompressProtocolGuid = { 0xE84CF29C, 0x191F, 0x4EAE, { 0x96, 0xE1, 0xF4, 0x6A, 0xEC, 0xEA, 0xEA, 0x0B }} - gEfiCustomizedDecompressProtocolGuid = { 0x9A44198E, 0xA4A2, 0x44E6, { 0x8A, 0x1F, 0x39, 0xBE, 0xFD, 0xAC, 0x89, 0x6F }} - gEfiNicIp4ConfigProtocolGuid = {0xdca3d4d, 0x12da, 0x4728, { 0xbf, 0x7e, 0x86, 0xce, 0xb9, 0x28, 0xd0, 0x67 }} gEfiNicIp4ConfigVariableGuid = {0xd8944553, 0xc4dd, 0x41f4, { 0x9b, 0x30, 0xe1, 0x39, 0x7c, 0xfb, 0x26, 0x7b }} gEfiTcpProtocolGuid = {0x02b3d5f2, 0xac28, 0x11d3, { 0x9a, 0x2d, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d }} diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c b/MdeModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c index 24c9342..853bede 100644 --- a/MdeModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c +++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c @@ -1017,7 +1017,7 @@ BdsCreateDevOrder ( } Status = gRT->SetVariable ( - VarLegacyDevOrder, + VAR_LEGACY_DEV_ORDER, &EfiLegacyDevOrderGuid, VAR_FLAG, TotalSize, @@ -1107,7 +1107,7 @@ BdsUpdateLegacyDevOrder ( ); DevOrder = (UINT8 *) BdsLibGetVariableAndSize ( - VarLegacyDevOrder, + VAR_LEGACY_DEV_ORDER, &EfiLegacyDevOrderGuid, &DevOrderSize ); @@ -1456,7 +1456,7 @@ BdsUpdateLegacyDevOrder ( SafeFreePool (DevOrder); Status = gRT->SetVariable ( - VarLegacyDevOrder, + VAR_LEGACY_DEV_ORDER, &EfiLegacyDevOrderGuid, VAR_FLAG, TotalSize, @@ -1493,7 +1493,7 @@ BdsSetBootPriority4SameTypeDev ( UINTN Index; DevOrder = BdsLibGetVariableAndSize ( - VarLegacyDevOrder, + VAR_LEGACY_DEV_ORDER, &EfiLegacyDevOrderGuid, &DevOrderSize ); diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c b/MdeModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c index 3dd5df7..ac551ab 100644 --- a/MdeModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c +++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c @@ -1236,7 +1236,7 @@ UpdateSetLegacyDeviceOrderPage ( // Get Device Order from variable // VarData = BdsLibGetVariableAndSize ( - VarLegacyDevOrder, + VAR_LEGACY_DEV_ORDER, &EfiLegacyDevOrderGuid, &VarSize ); diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/Variable.c b/MdeModulePkg/Universal/BdsDxe/BootMaint/Variable.c index 6479cd0..a5e575f 100644 --- a/MdeModulePkg/Universal/BdsDxe/BootMaint/Variable.c +++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/Variable.c @@ -1151,7 +1151,7 @@ Var_UpdateBBSOption ( // Update the Variable "LegacyDevOrder" // VarData = (UINT8 *) BdsLibGetVariableAndSize ( - VarLegacyDevOrder, + VAR_LEGACY_DEV_ORDER, &EfiLegacyDevOrderGuid, &VarSize ); @@ -1216,7 +1216,7 @@ Var_UpdateBBSOption ( SafeFreePool (NewOrder); Status = gRT->SetVariable ( - VarLegacyDevOrder, + VAR_LEGACY_DEV_ORDER, &EfiLegacyDevOrderGuid, VAR_FLAG, VarSize, -- cgit v1.1