diff options
author | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-02-26 09:27:59 +0000 |
---|---|---|
committer | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-02-26 09:27:59 +0000 |
commit | a1e98f78bec6f64c514ebf94bef68a8a5b87e3b4 (patch) | |
tree | 1fe0bdab97bb464e5d8c2d12d0b3172738a9de84 /MdePkg/Include/Protocol | |
parent | 64ca68027bf23acc61f31e520b38b5c63ec36c45 (diff) | |
download | edk2-a1e98f78bec6f64c514ebf94bef68a8a5b87e3b4.tar.gz edk2-a1e98f78bec6f64c514ebf94bef68a8a5b87e3b4.tar.bz2 edk2-a1e98f78bec6f64c514ebf94bef68a8a5b87e3b4.zip |
According to the latest UEFI 2.3 errata B, the following changes are made:
1.EFI_IMAGE_EXECUTION_INFO structure.Signature field.
2.HiiConfigAccess.ExtractConfig function comments
3.HiiConfigRouting.ExtractConfig, BlockToConfig and GetAltConfig function comments.
4.Remove not in public UEFI spec comments.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10113 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdePkg/Include/Protocol')
-rw-r--r-- | MdePkg/Include/Protocol/AcpiSystemDescriptionTable.h | 5 | ||||
-rw-r--r-- | MdePkg/Include/Protocol/HiiConfigAccess.h | 19 | ||||
-rw-r--r-- | MdePkg/Include/Protocol/HiiConfigRouting.h | 21 |
3 files changed, 19 insertions, 26 deletions
diff --git a/MdePkg/Include/Protocol/AcpiSystemDescriptionTable.h b/MdePkg/Include/Protocol/AcpiSystemDescriptionTable.h index fce45c0fe6..fe209877b9 100644 --- a/MdePkg/Include/Protocol/AcpiSystemDescriptionTable.h +++ b/MdePkg/Include/Protocol/AcpiSystemDescriptionTable.h @@ -1,7 +1,7 @@ /** @file
This protocol provides services for creating ACPI system description tables.
- Copyright (c) 2006 - 2008, Intel Corporation
+ Copyright (c) 2006 - 2010, 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
@@ -246,9 +246,6 @@ typedef struct _EFI_ACPI_SDT_PROTOCOL { /// Specifies the ACPI version supported by this protocol.
///
EFI_ACPI_TABLE_VERSION AcpiVersion;
- //
- // EFI_ACPI_GET_ACPI_TABLE2 not in public UEFI specification.
- //
EFI_ACPI_GET_ACPI_TABLE2 GetAcpiTable;
EFI_ACPI_REGISTER_NOTIFY RegisterNotify;
EFI_ACPI_OPEN Open;
diff --git a/MdePkg/Include/Protocol/HiiConfigAccess.h b/MdePkg/Include/Protocol/HiiConfigAccess.h index 28bacdeb0f..1b6c5473b8 100644 --- a/MdePkg/Include/Protocol/HiiConfigAccess.h +++ b/MdePkg/Include/Protocol/HiiConfigAccess.h @@ -5,7 +5,7 @@ This protocol is published by drivers providing and requesting
configuration data from HII. It may only be invoked by HII.
- Copyright (c) 2006 - 2009, Intel Corporation
+ Copyright (c) 2006 - 2010, 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
@@ -57,7 +57,13 @@ typedef UINTN EFI_BROWSER_ACTION; includes the routing information as well as
the configurable name / value pairs. It is
invalid for this string to be in
- <MultiConfigRequest> format.
+ <MultiConfigRequest> format.
+ If a NULL is passed in for the Request field,
+ all of the settings being abstracted by this function
+ will be returned in the Results field. In addition,
+ if a ConfigHdr is passed in with no request elements,
+ all of the settings being abstracted for that particular
+ ConfigHdr reference will be returned in the Results Field.
@param Progress On return, points to a character in the
Request string. Points to the string's null
@@ -69,7 +75,7 @@ typedef UINTN EFI_BROWSER_ACTION; successful
@param Results A null-terminated Unicode string in
- <ConfigAltResp> format which has all values
+ <MultiConfigAltResp> format which has all values
filled in for the names in the Request string.
String to be allocated by the called function.
@@ -82,13 +88,6 @@ typedef UINTN EFI_BROWSER_ACTION; stored awaiting possible future
protocols.
- @retval EFI_INVALID_PARAMETER For example, passing in a NULL
- for the Request parameter
- would result in this type of
- error. In this case, the
- Progress parameter would be
- set to NULL.
-
@retval EFI_NOT_FOUND Routing data doesn't match any
known driver. Progress set to the
first character in the routing header.
diff --git a/MdePkg/Include/Protocol/HiiConfigRouting.h b/MdePkg/Include/Protocol/HiiConfigRouting.h index 09fb182442..393129952c 100644 --- a/MdePkg/Include/Protocol/HiiConfigRouting.h +++ b/MdePkg/Include/Protocol/HiiConfigRouting.h @@ -5,7 +5,7 @@ information from configuration applications, routing the
results to the appropriate drivers.
- Copyright (c) 2006 - 2009, Intel Corporation
+ Copyright (c) 2006 - 2010, 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
@@ -56,10 +56,7 @@ typedef struct _EFI_HII_CONFIG_ROUTING_PROTOCOL EFI_HII_CONFIG_ROUTING_PROTOCOL; @param This Points to the EFI_HII_CONFIG_ROUTING_PROTOCOL
instance.
- @param Request A null-terminated string in <MultiConfigRequest>
- format. If a NULL is passed in for the Request field,
- all of the settings being abstracted by this function
- will be returned in the Results field.
+ @param Request A null-terminated string in <MultiConfigRequest> format.
@param Progress On return, points to a character in the
Request string. Points to the string's null
@@ -70,11 +67,9 @@ typedef struct _EFI_HII_CONFIG_ROUTING_PROTOCOL EFI_HII_CONFIG_ROUTING_PROTOCOL; name / value pair) if the request was not
successful
- @param Results A null-terminated string in <ConfigAltResp> format
+ @param Results A null-terminated string in <MultiConfigAltResp> format
which has all values filled in for the names in the
- Request string. If the Request string was NULL, the data
- returned is in <MultiConfigAltResp> format. String to be
- allocated by the called function.
+ Request string.
@retval EFI_SUCCESS The Results string is filled with the
values corresponding to all requested
@@ -228,7 +223,8 @@ EFI_STATUS @param Config Filled-in configuration string. String
allocated by the function. Returned only if
- call is successful.
+ call is successful. The null-terminated string
+ will be <ConfigResp> format.
@param Progress A pointer to a string filled in with the
offset of the most recent '&' before the
@@ -349,7 +345,7 @@ EFI_STATUS a larger configuration string.
@param This A pointer to the EFI_HII_CONFIG_ROUTING_PROTOCOL instance.
- @param Configuration A null-terminated string in <MultiConfigAltResp> format.
+ @param ConfigResp A null-terminated string in <ConfigAltResp> format.
@param Guid A pointer to the GUID value to search for in the
routing portion of the ConfigResp string when retrieving
the requested data. If Guid is NULL, then all GUID
@@ -369,6 +365,7 @@ EFI_STATUS @param AltCfgResp A pointer to a buffer which will be allocated by the
function which contains the retrieved string as requested.
This buffer is only allocated if the call was successful.
+ The null-terminated string will be <ConfigResp> format.
@retval EFI_SUCCESS The request succeeded. The requested data was extracted
and placed in the newly allocated AltCfgResp buffer.
@@ -380,7 +377,7 @@ typedef EFI_STATUS
(EFIAPI * EFI_HII_GET_ALT_CFG)(
IN CONST EFI_HII_CONFIG_ROUTING_PROTOCOL *This,
- IN CONST EFI_STRING Configuration,
+ IN CONST EFI_STRING ConfigResp,
IN CONST EFI_GUID *Guid,
IN CONST EFI_STRING Name,
IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath,
|