Revision: 17114
http://sourceforge.net/p/edk2/code/17114
Author: hwu1225
Date: 2015-04-03 05:23:13 +0000 (Fri, 03 Apr 2015)
Log Message:
-----------
Rollback r17113.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <[email protected]>
Revision Links:
--------------
http://sourceforge.net/p/edk2/code/17113
Modified Paths:
--------------
trunk/edk2/MdePkg/Include/Guid/FmpCapsule.h
trunk/edk2/MdePkg/Include/Protocol/FirmwareManagement.h
trunk/edk2/MdePkg/MdePkg.dec
Removed Paths:
-------------
trunk/edk2/MdePkg/Include/Guid/SystemResourceTable.h
Modified: trunk/edk2/MdePkg/Include/Guid/FmpCapsule.h
===================================================================
--- trunk/edk2/MdePkg/Include/Guid/FmpCapsule.h 2015-04-03 03:48:41 UTC (rev
17113)
+++ trunk/edk2/MdePkg/Include/Guid/FmpCapsule.h 2015-04-03 05:23:13 UTC (rev
17114)
@@ -2,14 +2,14 @@
Guid & data structure used for Delivering Capsules Containing Updates to
Firmware
Management Protocol
- Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>
- 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
+ Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+ 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.
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
IMPLIED.
@par Revision Reference:
GUIDs defined in UEFI 2.4 spec.
@@ -35,7 +35,7 @@
///
/// The number of drivers included in the capsule and the number of
corresponding
- /// offsets stored in ItemOffsetList array.
+ /// offsets stored in ItemOffsetList array.
///
UINT16 EmbeddedDriverCount;
@@ -56,7 +56,7 @@
UINT32 Version;
///
- /// Used to identify device firmware targeted by this update. This guid is
matched by
+ /// Used to identifiy device firmware targeted by this update. This guid is
matched by
/// system firmware against ImageTypeId field within a
EFI_FIRMWARE_IMAGE_DESCRIPTOR
///
EFI_GUID UpdateImageTypeId;
@@ -73,25 +73,16 @@
UINT32 UpdateImageSize;
///
- /// Size of the VendorCode bytes which optionally immediately follow binary
update image in the capsule
+ ///Size of the VendorCode bytes which optionally immediately follow binary
update image in the capsule
///
UINT32 UpdateVendorCodeSize;
-
- ///
- /// The HardwareInstance to target with this update. If value is zero it
means match all
- /// HardwareInstances. This field allows update software to target only a
single device in
- /// cases where there are more than one device with the same ImageTypeId
GUID.
- /// This header is outside the signed data of the Authentication Info
structure and
- /// therefore can be modified without changing the Auth data.
- ///
- UINT64 UpdateHardwareInstance;
} EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER;
#pragma pack()
-#define EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER_INIT_VERSION 0x00000001
-#define EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER_INIT_VERSION 0x00000002
+#define EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER_INIT_VERSION 0x00000001
+#define EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER_INIT_VERSION 0x00000001
extern EFI_GUID gEfiFmpCapsuleGuid;
Deleted: trunk/edk2/MdePkg/Include/Guid/SystemResourceTable.h
===================================================================
--- trunk/edk2/MdePkg/Include/Guid/SystemResourceTable.h 2015-04-03
03:48:41 UTC (rev 17113)
+++ trunk/edk2/MdePkg/Include/Guid/SystemResourceTable.h 2015-04-03
05:23:13 UTC (rev 17114)
@@ -1,125 +0,0 @@
-/** @file
- Guid & data structure used for EFI System Resource Table (ESRT)
-
- Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD
License
- which accompanies this distribution. The full text of the license may be
found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
- @par Revision Reference:
- GUIDs defined in UEFI 2.5 spec.
-
-**/
-
-
-#ifndef _SYSTEM_RESOURCE_TABLE_H__
-#define _SYSTEM_RESOURCE_TABLE_H__
-
-#define EFI_SYSTEM_RESOURCE_TABLE_GUID \
- { \
- 0xb122a263, 0x3661, 0x4f68, {0x99, 0x29, 0x78, 0xf8, 0xb0, 0xd6, 0x21,
0x80 } \
- }
-
-///
-/// Current Entry Version
-///
-#define EFI_SYSTEM_RESOURCE_TABLE_FIRMWARE_RESOURCE_VERSION 1
-
-///
-/// Firmware Type Definitions
-///
-#define ESRT_FW_TYPE_UNKNOWN 0x00000000
-#define ESRT_FW_TYPE_SYSTEMFIRMWARE 0x00000001
-#define ESRT_FW_TYPE_DEVICEFIRMWARE 0x00000002
-#define ESRT_FW_TYPE_UEFIDRIVER 0x00000003
-
-///
-/// Last Attempt Status Values
-///
-#define LAST_ATTEMPT_STATUS_SUCCESS 0x00000000
-#define LAST_ATTEMPT_STATUS_ERROR_UNSUCCESSFUL 0x00000001
-#define LAST_ATTEMPT_STATUS_ERROR_INSUFFICIENT_RESOURCES 0x00000002
-#define LAST_ATTEMPT_STATUS_ERROR_INCORRECT_VERSION 0x00000003
-#define LAST_ATTEMPT_STATUS_ERROR_INVALID_FORMAT 0x00000004
-#define LAST_ATTEMPT_STATUS_ERROR_AUTH_ERROR 0x00000005
-#define LAST_ATTEMPT_STATUS_ERROR_PWR_EVT_AC 0x00000006
-#define LAST_ATTEMPT_STATUS_ERROR_PWR_EVT_BATT 0x00000007
-
-typedef struct {
- ///
- /// The firmware class field contains a GUID that identifies a firmware
component
- /// that can be updated via UpdateCapsule(). This GUID must be unique within
all
- /// entries of the ESRT.
- ///
- EFI_GUID FwClass;
- ///
- /// Identifies the type of firmware resource.
- ///
- UINT32 FwType;
- ///
- /// The firmware version field represents the current version of the firmware
- /// resource, value must always increase as a larger number represents a
newer
- /// version.
- ///
- UINT32 FwVersion;
- ///
- /// The lowest firmware resource version to which a firmware resource can be
- /// rolled back for the given system/device. Generally this is used to
protect
- /// against known and fixed security issues.
- ///
- UINT32 LowestSupportedFwVersion;
- ///
- /// The capsule flags field contains the CapsuleGuid flags (bits 0- 15) as
defined
- /// in the EFI_CAPSULE_HEADER that will be set in the capsule header.
- ///
- UINT32 CapsuleFlags;
- ///
- /// The last attempt version field describes the last firmware version for
which
- /// an update was attempted (uses the same format as Firmware Version).
- /// Last Attempt Version is updated each time an UpdateCapsule() is
attempted for
- /// an ESRT entry and is preserved across reboots (non-volatile). However, in
- /// cases where the attempt version is not recorded due to limitations in the
- /// update process, the field shall set to zero after a failed update.
Similarly,
- /// in the case of a removable device, this value is set to 0 in cases where
the
- /// device has not been updated since being added to the system.
- ///
- UINT32 LastAttemptVersion;
- ///
- /// The last attempt status field describes the result of the last firmware
update
- /// attempt for the firmware resource entry.
- /// LastAttemptStatus is updated each time an UpdateCapsule() is attempted
for an
- /// ESRT entry and is preserved across reboots (non-volatile).
- /// If a firmware update has never been attempted or is unknown, for example
after
- /// fresh insertion of a removable device, LastAttemptStatus must be set to
Success.
- ///
- UINT32 LastAttemptStatus;
-} EFI_SYSTEM_RESOURCE_ENTRY;
-
-typedef struct {
- ///
- /// The number of firmware resources in the table, must not be zero.
- ///
- UINT32 FwResourceCount;
- ///
- /// The maximum number of resource array entries that can be within the table
- /// without reallocating the table, must not be zero.
- ///
- UINT32 FwResourceCountMax;
- ///
- /// The version of the EFI_SYSTEM_RESOURCE_ENTRY entities used in this table.
- /// This field should be set to 1.
- ///
- UINT64 FwResourceVersion;
- ///
- /// Array of EFI_SYSTEM_RESOURCE_ENTRY
- ///
- //EFI_SYSTEM_RESOURCE_ENTRY Entries[];
-} EFI_SYSTEM_RESOURCE_TABLE;
-
-extern EFI_GUID gEfiSystemResourceTableGuid;
-
-#endif
Modified: trunk/edk2/MdePkg/Include/Protocol/FirmwareManagement.h
===================================================================
--- trunk/edk2/MdePkg/Include/Protocol/FirmwareManagement.h 2015-04-03
03:48:41 UTC (rev 17113)
+++ trunk/edk2/MdePkg/Include/Protocol/FirmwareManagement.h 2015-04-03
05:23:13 UTC (rev 17114)
@@ -1,26 +1,26 @@
/** @file
UEFI Firmware Management Protocol definition
- Firmware Management Protocol provides an abstraction for device to provide
firmware
- management support. The base requirements for managing device firmware
images include
+ Firmware Management Protocol provides an abstraction for device to provide
firmware
+ management support. The base requirements for managing device firmware
images include
identifying firmware image revision level and programming the image into the
device.
- GetImageInfo() is the only required function. GetImage(), SetImage(),
- CheckImage(), GetPackageInfo(), and SetPackageInfo() shall return
+ GetImageInfo() is the only required function. GetImage(), SetImage(),
+ CheckImage(), GetPackageInfo(), and SetPackageInfo() shall return
EFI_UNSUPPORTED if not supported by the driver.
+
+ Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2013 - 2014, Hewlett-Packard Development Company, L.P.<BR>
+ 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
- Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>
- Copyright (c) 2013 - 2014, Hewlett-Packard Development Company, L.P.<BR>
- 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.
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ @par Revision Reference:
+ This Protocol is introduced in UEFI Specification 2.3
- @par Revision Reference:
- This Protocol is introduced in UEFI Specification 2.3
-
**/
#ifndef __EFI_FIRMWARE_MANAGEMENT_PROTOCOL_H__
@@ -38,85 +38,59 @@
/// EFI_FIRMWARE_IMAGE_DESCRIPTOR
///
typedef struct {
- ///
- /// A unique number identifying the firmware image within the device. The
number is
+ ///
+ /// A unique number identifying the firmware image within the device. The
number is
/// between 1 and DescriptorCount.
- ///
+ ///
UINT8 ImageIndex;
///
- /// A unique GUID identifying the firmware image type.
- ///
+ /// A unique number identifying the firmware image type.
+ ///
EFI_GUID ImageTypeId;
- ///
- /// A unique number identifying the firmware image.
- ///
+ ///
+ /// A unique number identifying the firmware image.
+ ///
UINT64 ImageId;
- ///
- /// A pointer to a null-terminated string representing the firmware image
name.
- ///
+ ///
+ /// A pointer to a null-terminated string representing the firmware image
name.
+ ///
CHAR16 *ImageIdName;
- ///
- /// Identifies the version of the device firmware. The format is vendor
specific and new
+ ///
+ /// Identifies the version of the device firmware. The format is vendor
specific and new
/// version must have a greater value than an old version.
- ///
+ ///
UINT32 Version;
- ///
+ ///
/// A pointer to a null-terminated string representing the firmware image
version name.
- ///
+ ///
CHAR16 *VersionName;
- ///
- /// Size of the image in bytes. If size=0, then only ImageIndex and
ImageTypeId are valid.
- ///
+ ///
+ /// Size of the image in bytes. If size=0, then only ImageIndex and
ImageTypeId are valid.
+ ///
UINTN Size;
- ///
- /// Image attributes that are supported by this device. See 'Image Attribute
Definitions'
- /// for possible returned values of this parameter. A value of 1 indicates
the attribute is
- /// supported and the current setting value is indicated in
AttributesSetting. A
- /// value of 0 indicates the attribute is not supported and the current
setting value in
+ ///
+ /// Image attributes that are supported by this device. See 'Image
Attribute Definitions'
+ /// for possible returned values of this parameter. A value of 1 indicates
the attribute is
+ /// supported and the current setting value is indicated in
AttributesSetting. A
+ /// value of 0 indicates the attribute is not supported and the current
setting value in
/// AttributesSetting is meaningless.
- ///
+ ///
UINT64 AttributesSupported;
- ///
- /// Image attributes. See 'Image Attribute Definitions' for possible
returned values of
+ ///
+ /// Image attributes. See 'Image Attribute Definitions' for possible
returned values of
/// this parameter.
- ///
+ ///
UINT64 AttributesSetting;
- ///
- /// Image compatibilities. See 'Image Compatibility Definitions' for
possible returned
+ ///
+ /// Image compatibilities. See 'Image Compatibility Definitions' for
possible returned
/// values of this parameter.
- ///
+ ///
UINT64 Compatibilities;
///
/// Describes the lowest ImageDescriptor version that the device will
accept. Only
/// present in version 2 or higher.
///
UINT32 LowestSupportedImageVersion;
- ///
- /// Describes the version that was last attempted to update. If no update
attempted the
- /// value will be 0. If the update attempted was improperly formatted and no
version
- /// number was available then the value will be zero. Only present in
version 3 or higher.
- UINT32 LastAttemptVersion;
- ///
- /// Describes the status that was last attempted to update. If no update has
been attempted
- /// the value will be LAST_ATTEMPT_STATUS_SUCCESS. Only present in version 3
or higher.
- ///
- UINT32 LastAttemptStatus;
- ///
- /// An optional number to identify the unique hardware instance within the
system for
- /// devices that may have multiple instances (Example: a plug in pci network
card). This
- /// number must be unique within the namespace of the ImageTypeId GUID and
- /// ImageIndex. For FMP instances that have multiple descriptors for a single
- /// hardware instance, all descriptors must have the same HardwareInstance
value.
- /// This number must be consistent between boots and should be based on some
sort of
- /// hardware identified unique id (serial number, etc) whenever possible. If
a hardware
- /// based number is not available the FMP provider may use some other
characteristic
- /// such as device path, bus/dev/function, slot num, etc for generating the
- /// HardwareInstance. For implementations that will never have more than one
- /// instance a zero can be used. A zero means the FMP provider is not able
to determine a
- /// unique hardware instance number or a hardware instance number is not
needed. Only
- /// present in version 3 or higher.
- ///
- UINT64 HardwareInstance;
} EFI_FIRMWARE_IMAGE_DESCRIPTOR;
@@ -124,26 +98,26 @@
// Image Attribute Definitions
//
///
-/// The attribute IMAGE_ATTRIBUTE_IMAGE_UPDATABLE indicates this device
supports firmware
+/// The attribute IMAGE_ATTRIBUTE_IMAGE_UPDATABLE indicates this device
supports firmware
/// image update.
///
#define IMAGE_ATTRIBUTE_IMAGE_UPDATABLE 0x0000000000000001
///
-/// The attribute IMAGE_ATTRIBUTE_RESET_REQUIRED indicates a reset of the
device is required
-/// for the new firmware image to take effect after a firmware update. The
device is the device hosting
+/// The attribute IMAGE_ATTRIBUTE_RESET_REQUIRED indicates a reset of the
device is required
+/// for the new firmware image to take effect after a firmware update. The
device is the device hosting
/// the firmware image.
-///
+///
#define IMAGE_ATTRIBUTE_RESET_REQUIRED 0x0000000000000002
///
-/// The attribute IMAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED indicates
authentication is
-/// required to perform the following image operations: GetImage(),
SetImage(), and
+/// The attribute IMAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED indicates
authentication is
+/// required to perform the following image operations: GetImage(),
SetImage(), and
/// CheckImage(). See 'Image Attribute - Authentication'.
-///
+///
#define IMAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED 0x0000000000000004
///
-/// The attribute IMAGE_ATTRIBUTE_IN_USE indicates the current state of the
firmware image.
-/// This distinguishes firmware images in a device that supports redundant
images.
-///
+/// The attribute IMAGE_ATTRIBUTE_IN_USE indicates the current state of the
firmware image.
+/// This distinguishes firmware images in a device that supports redundant
images.
+///
#define IMAGE_ATTRIBUTE_IN_USE 0x0000000000000008
///
/// The attribute IMAGE_ATTRIBUTE_UEFI_IMAGE indicates that this image is an
EFI compatible image.
@@ -155,7 +129,7 @@
// Image Compatibility Definitions
//
/// Values from 0x0000000000000002 thru 0x000000000000FFFF are reserved for
future assignments.
-/// Values from 0x0000000000010000 thru 0xFFFFFFFFFFFFFFFF are used by
firmware vendor for
+/// Values from 0x0000000000010000 thru 0xFFFFFFFFFFFFFFFF are used by
firmware vendor for
/// compatibility check.
///
#define IMAGE_COMPATIBILITY_CHECK_SUPPORTED 0x0000000000000001
@@ -163,7 +137,7 @@
///
/// Descriptor Version exposed by GetImageInfo() function
///
-#define EFI_FIRMWARE_IMAGE_DESCRIPTOR_VERSION 3
+#define EFI_FIRMWARE_IMAGE_DESCRIPTOR_VERSION 2
///
@@ -171,14 +145,14 @@
///
typedef struct {
///
- /// It is included in the signature of AuthInfo. It is used to ensure
freshness/no replay.
- /// It is incremented during each firmware image operation.
- ///
+ /// It is included in the signature of AuthInfo. It is used to ensure
freshness/no replay.
+ /// It is incremented during each firmware image operation.
+ ///
UINT64 MonotonicCount;
///
- /// Provides the authorization for the firmware image operations. It is a
signature across
- /// the image data and the Monotonic Count value. Caller uses the private
key that is
- /// associated with a public key that has been provisioned via the key
exchange.
+ /// Provides the authorization for the firmware image operations. It is a
signature across
+ /// the image data and the Monotonic Count value. Caller uses the private
key that is
+ /// associated with a public key that has been provisioned via the key
exchange.
/// Because this is defined as a signature,
WIN_CERTIFICATE_UEFI_GUID.CertType must
/// be EFI_CERT_TYPE_PKCS7_GUID.
///
@@ -190,24 +164,24 @@
// ImageUpdatable Definitions
//
///
-/// IMAGE_UPDATABLE_VALID indicates SetImage() will accept the new image and
update the
+/// IMAGE_UPDATABLE_VALID indicates SetImage() will accept the new image and
update the
/// device with the new image.
///
#define IMAGE_UPDATABLE_VALID 0x0000000000000001
///
-/// IMAGE_UPDATABLE_INVALID indicates SetImage() will reject the new image. No
additional
+/// IMAGE_UPDATABLE_INVALID indicates SetImage() will reject the new image. No
additional
/// information is provided for the rejection.
///
#define IMAGE_UPDATABLE_INVALID 0x0000000000000002
///
-/// IMAGE_UPDATABLE_INVALID_TYPE indicates SetImage() will reject the new
image. The
+/// IMAGE_UPDATABLE_INVALID_TYPE indicates SetImage() will reject the new
image. The
/// rejection is due to the new image is not a firmware image recognized for
this device.
///
#define IMAGE_UPDATABLE_INVALID_TYPE 0x0000000000000004
///
-/// IMAGE_UPDATABLE_INVALID_OLD indicates SetImage() will reject the new
image. The
+/// IMAGE_UPDATABLE_INVALID_OLD indicates SetImage() will reject the new
image. The
/// rejection is due to the new image version is older than the current
firmware image
-/// version in the device. The device firmware update policy does not support
firmware
+/// version in the device. The device firmware update policy does not support
firmware
/// version downgrade.
///
#define IMAGE_UPDATABLE_INVALID_OLD 0x0000000000000008
@@ -217,26 +191,26 @@
// Package Attribute Definitions
//
///
-/// The attribute PACKAGE_ATTRIBUTE_VERSION_UPDATABLE indicates this device
supports the
+/// The attribute PACKAGE_ATTRIBUTE_VERSION_UPDATABLE indicates this device
supports the
/// update of the firmware package version.
///
#define PACKAGE_ATTRIBUTE_VERSION_UPDATABLE 0x0000000000000001
///
-/// The attribute PACKAGE_ATTRIBUTE_RESET_REQUIRED indicates a reset of the
device is
+/// The attribute PACKAGE_ATTRIBUTE_RESET_REQUIRED indicates a reset of the
device is
/// required for the new package info to take effect after an update.
///
#define PACKAGE_ATTRIBUTE_RESET_REQUIRED 0x0000000000000002
///
-/// The attribute PACKAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED indicates
authentication
+/// The attribute PACKAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED indicates
authentication
/// is required to update the package info.
///
#define PACKAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED 0x0000000000000004
-/**
+/**
Callback funtion to report the process of the firmware updating.
@param[in] Completion A value between 1 and 100 indicating the current
completion
- progress of the firmware update. Completion
progress is
+ progress of the firmware update. Completion
progress is
reported as from 1 to 100 percent. A value of 0 is
used by
the driver to indicate that progress reporting is
not supported.
@@ -258,15 +232,15 @@
The saved copy could later been used, for example, in firmware image
recovery or rollback.
@param[in] This A pointer to the
EFI_FIRMWARE_MANAGEMENT_PROTOCOL instance.
- @param[in, out] ImageInfoSize A pointer to the size, in bytes, of the
ImageInfo buffer.
+ @param[in, out] ImageInfoSize A pointer to the size, in bytes, of the
ImageInfo buffer.
On input, this is the size of the buffer
allocated by the caller.
- On output, it is the size of the buffer
returned by the firmware
+ On output, it is the size of the buffer
returned by the firmware
if the buffer was large enough, or the
size of the buffer needed
to contain the image(s) information if
the buffer was too small.
@param[in, out] ImageInfo A pointer to the buffer in which firmware
places the current image(s)
information. The information is an array
of EFI_FIRMWARE_IMAGE_DESCRIPTORs.
@param[out] DescriptorVersion A pointer to the location in which
firmware returns the version number
- associated with the
EFI_FIRMWARE_IMAGE_DESCRIPTOR.
+ associated with the
EFI_FIRMWARE_IMAGE_DESCRIPTOR.
@param[out] DescriptorCount A pointer to the location in which
firmware returns the number of
descriptors or firmware images within
this device.
@param[out] DescriptorSize A pointer to the location in which
firmware returns the size, in bytes,
@@ -278,17 +252,17 @@
is to be performed using
PackageVersionName. A value of 0xFFFFFFFD indicates
that package version update is in
progress.
@param[out] PackageVersionName A pointer to a pointer to a
null-terminated string representing the
- package version name. The buffer is
allocated by this function with
+ package version name. The buffer is
allocated by this function with
AllocatePool(), and it is the caller's
responsibility to free it with a call
to FreePool().
@retval EFI_SUCCESS The device was successfully updated with
the new image.
- @retval EFI_BUFFER_TOO_SMALL The ImageInfo buffer was too small. The
current buffer size
- needed to hold the image(s) information
is returned in ImageInfoSize.
+ @retval EFI_BUFFER_TOO_SMALL The ImageInfo buffer was too small. The
current buffer size
+ needed to hold the image(s) information
is returned in ImageInfoSize.
@retval EFI_INVALID_PARAMETER ImageInfoSize is NULL.
@retval EFI_DEVICE_ERROR Valid information could not be returned.
Possible corrupted image.
-**/
+**/
typedef
EFI_STATUS
(EFIAPI *EFI_FIRMWARE_MANAGEMENT_PROTOCOL_GET_IMAGE_INFO)(
@@ -303,7 +277,7 @@
);
/**
- Retrieves a copy of the current firmware image of the device.
+ Retrieves a copy of the current firmware image of the device.
This function allows a copy of the current firmware image to be created and
saved.
The saved copy could later been used, for example, in firmware image
recovery or rollback.
@@ -316,15 +290,15 @@
On return, points to the length of the image,
in bytes.
@retval EFI_SUCCESS The device was successfully updated with the
new image.
- @retval EFI_BUFFER_TOO_SMALL The buffer specified by ImageSize is too
small to hold the
- image. The current buffer size needed to hold
the image is returned
+ @retval EFI_BUFFER_TOO_SMALL The buffer specified by ImageSize is too
small to hold the
+ image. The current buffer size needed to hold
the image is returned
in ImageSize.
@retval EFI_INVALID_PARAMETER The Image was NULL.
@retval EFI_NOT_FOUND The current image is not copied to the buffer.
@retval EFI_UNSUPPORTED The operation is not supported.
@retval EFI_SECURITY_VIOLATIO The operation could not be performed due to
an authentication failure.
-**/
+**/
typedef
EFI_STATUS
(EFIAPI *EFI_FIRMWARE_MANAGEMENT_PROTOCOL_GET_IMAGE)(
@@ -341,20 +315,20 @@
This function returns EFI_UNSUPPORTED if the firmware image is not updatable.
If the firmware image is updatable, the function should perform the
following minimal validations
before proceeding to do the firmware image update.
- - Validate the image authentication if image has attribute
- IMAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED. The function returns
+ - Validate the image authentication if image has attribute
+ IMAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED. The function returns
EFI_SECURITY_VIOLATION if the validation fails.
- - Validate the image is a supported image for this device. The function
returns EFI_ABORTED if
- the image is unsupported. The function can optionally provide more
detailed information on
+ - Validate the image is a supported image for this device. The function
returns EFI_ABORTED if
+ the image is unsupported. The function can optionally provide more
detailed information on
why the image is not a supported image.
- - Validate the data from VendorCode if not null. Image validation must be
performed before
- VendorCode data validation. VendorCode data is ignored or considered
invalid if image
- validation failed. The function returns EFI_ABORTED if the data is invalid.
-
- VendorCode enables vendor to implement vendor-specific firmware image update
policy. Null if
- the caller did not specify the policy or use the default policy. As an
example, vendor can implement
- a policy to allow an option to force a firmware image update when the abort
reason is due to the new
- firmware image version is older than the current firmware image version or
bad image checksum.
+ - Validate the data from VendorCode if not null. Image validation must be
performed before
+ VendorCode data validation. VendorCode data is ignored or considered
invalid if image
+ validation failed. The function returns EFI_ABORTED if the data is
invalid.
+
+ VendorCode enables vendor to implement vendor-specific firmware image update
policy. Null if
+ the caller did not specify the policy or use the default policy. As an
example, vendor can implement
+ a policy to allow an option to force a firmware image update when the abort
reason is due to the new
+ firmware image version is older than the current firmware image version or
bad image checksum.
Sensitive operations such as those wiping the entire firmware image and
render the device to be
non-functional should be encoded in the image itself rather than passed with
the VendorCode.
AbortReason enables vendor to have the option to provide a more detailed
description of the abort
@@ -365,11 +339,11 @@
The number is between 1 and DescriptorCount.
@param[in] Image Points to the new image.
@param[in] ImageSize Size of the new image in bytes.
- @param[in] VendorCode This enables vendor to implement
vendor-specific firmware image update policy.
+ @param[in] VendorCode This enables vendor to implement
vendor-specific firmware image update policy.
Null indicates the caller did not specify the
policy or use the default policy.
@param[in] Progress A function used by the driver to report the
progress of the firmware update.
@param[out] AbortReason A pointer to a pointer to a null-terminated
string providing more
- details for the aborted operation. The buffer
is allocated by this function
+ details for the aborted operation. The buffer
is allocated by this function
with AllocatePool(), and it is the caller's
responsibility to free it with a
call to FreePool().
@@ -379,7 +353,7 @@
@retval EFI_UNSUPPORTED The operation is not supported.
@retval EFI_SECURITY_VIOLATIO The operation could not be performed due to
an authentication failure.
-**/
+**/
typedef
EFI_STATUS
(EFIAPI *EFI_FIRMWARE_MANAGEMENT_PROTOCOL_SET_IMAGE)(
@@ -395,7 +369,7 @@
/**
Checks if the firmware image is valid for the device.
- This function allows firmware update application to validate the firmware
image without
+ This function allows firmware update application to validate the firmware
image without
invoking the SetImage() first.
@param[in] This A pointer to the
EFI_FIRMWARE_MANAGEMENT_PROTOCOL instance.
@@ -404,14 +378,14 @@
@param[in] Image Points to the new image.
@param[in] ImageSize Size of the new image in bytes.
@param[out] ImageUpdatable Indicates if the new image is valid for
update. It also provides,
- if available, additional information if the
image is invalid.
+ if available, additional information if the
image is invalid.
@retval EFI_SUCCESS The image was successfully checked.
@retval EFI_INVALID_PARAMETER The Image was NULL.
@retval EFI_UNSUPPORTED The operation is not supported.
@retval EFI_SECURITY_VIOLATIO The operation could not be performed due to
an authentication failure.
-**/
+**/
typedef
EFI_STATUS
(EFIAPI *EFI_FIRMWARE_MANAGEMENT_PROTOCOL_CHECK_IMAGE)(
@@ -423,7 +397,7 @@
);
/**
- Returns information about the firmware package.
+ Returns information about the firmware package.
This function returns package information.
@@ -442,8 +416,8 @@
package version name. A value of 0
indicates the device does not support
update of package version name. Length
is the number of Unicode characters,
including the terminating null
character.
- @param[out] AttributesSupported Package attributes that are supported
by this device. See 'Package Attribute
- Definitions' for possible returned
values of this parameter. A value of 1
+ @param[out] AttributesSupported Package attributes that are supported
by this device. See 'Package Attribute
+ Definitions' for possible returned
values of this parameter. A value of 1
indicates the attribute is supported
and the current setting value is
indicated in AttributesSetting. A value
of 0 indicates the attribute is not
supported and the current setting value
in AttributesSetting is meaningless.
@@ -479,18 +453,18 @@
@param[in] ImageSize Size of the authentication image in bytes.
0 if authentication is not required.
@param[in] VendorCode This enables vendor to implement
vendor-specific firmware
- image update policy.
+ image update policy.
Null indicates the caller did not specify
this policy or use
the default policy.
@param[in] PackageVersion The new package version.
@param[in] PackageVersionName A pointer to the new null-terminated Unicode
string representing
- the package version name.
- The string length is equal to or less than
the value returned in
+ the package version name.
+ The string length is equal to or less than
the value returned in
PackageVersionNameMaxLen.
@retval EFI_SUCCESS The device was successfully updated with the
new package
information.
- @retval EFI_INVALID_PARAMETER The PackageVersionName length is longer than
the value
+ @retval EFI_INVALID_PARAMETER The PackageVersionName length is longer than
the value
returned in PackageVersionNameMaxLen.
@retval EFI_UNSUPPORTED The operation is not supported.
@retval EFI_SECURITY_VIOLATIO The operation could not be performed due to
an authentication failure.
@@ -511,7 +485,7 @@
/// EFI_FIRMWARE_MANAGEMENT_PROTOCOL
/// The protocol for managing firmware provides the following services.
/// - Get the attributes of the current firmware image. Attributes include
revision level.
-/// - Get a copy of the current firmware image. As an example, this service
could be used by a
+/// - Get a copy of the current firmware image. As an example, this service
could be used by a
/// management application to facilitate a firmware roll-back.
/// - Program the device with a firmware image supplied by the user.
/// - Label all the firmware images within a device with a single version.
Modified: trunk/edk2/MdePkg/MdePkg.dec
===================================================================
--- trunk/edk2/MdePkg/MdePkg.dec 2015-04-03 03:48:41 UTC (rev 17113)
+++ trunk/edk2/MdePkg/MdePkg.dec 2015-04-03 05:23:13 UTC (rev 17114)
@@ -555,12 +555,6 @@
gEfiAdapterInfoSanMacAddressGuid = { 0x114da5ef, 0x2cf1, 0x4e12, {0x9b,
0xbb, 0xc4, 0x70, 0xb5, 0x52, 0x5, 0xd9 }}
#
- # GUIDs defined in UEFI2.5
- #
- ## Include/Guid/SystemResourceTable.h
- gEfiSystemResourceTableGuid = { 0xb122a263, 0x3661, 0x4f68, {0x99, 0x29,
0x78, 0xf8, 0xb0, 0xd6, 0x21, 0x80 }}
-
- #
# GUID defined in PI1.0
#
## Include/Guid/AprioriFileName.h
------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
