1 files changed, 117 insertions, 1 deletions
diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h
index b9141fa44b..6f2ca50922 100644
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h
@@ -1,7 +1,7 @@
 /** @file
   Provides interface to advanced shell functionality for parsing both handle and protocol database.
 
-  (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
+  (C) Copyright 2013-2016 Hewlett-Packard Development Company, L.P.<BR>
   Copyright (c) 2011 - 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
@@ -152,6 +152,122 @@
 #include <Library/ShellLib.h>
 #include <Library/SortLib.h>
 
+#define   EFI_FIRMWARE_IMAGE_DESCRIPTOR_VERSION_V1   1
+#define   EFI_FIRMWARE_IMAGE_DESCRIPTOR_VERSION_V2   2
+
+///
+/// EFI_FIRMWARE_IMAGE_DESCRIPTOR in UEFI spec < 2.4a
+///
+typedef struct {
+  /// 
+  /// A unique number identifying the firmware image within the device.  The number is 
+  /// between 1 and DescriptorCount.
+  /// 
+  UINT8                            ImageIndex;
+  ///
+  /// A unique number identifying the firmware image type.  
+  /// 
+  EFI_GUID                         ImageTypeId;
+  /// 
+  /// A unique number identifying the firmware image. 
+  /// 
+  UINT64                           ImageId;
+  /// 
+  /// 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 
+  /// 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.
+  /// 
+  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 
+  /// AttributesSetting is meaningless.
+  /// 
+  UINT64                           AttributesSupported;
+  /// 
+  /// Image attributes.  See 'Image Attribute Definitions' for possible returned values of 
+  /// this parameter.
+  /// 
+  UINT64                           AttributesSetting;
+  /// 
+  /// Image compatibilities.  See 'Image Compatibility Definitions' for possible returned 
+  /// values of this parameter.
+  /// 
+  UINT64                           Compatibilities;
+} EFI_FIRMWARE_IMAGE_DESCRIPTOR_V1;
+
+
+///
+/// EFI_FIRMWARE_IMAGE_DESCRIPTOR in UEFI spec > 2.4a and < 2.5
+///
+typedef struct {
+  /// 
+  /// A unique number identifying the firmware image within the device.  The number is 
+  /// between 1 and DescriptorCount.
+  /// 
+  UINT8                            ImageIndex;
+  ///
+  /// A unique number identifying the firmware image type.  
+  /// 
+  EFI_GUID                         ImageTypeId;
+  /// 
+  /// A unique number identifying the firmware image. 
+  /// 
+  UINT64                           ImageId;
+  /// 
+  /// 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 
+  /// 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.
+  /// 
+  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 
+  /// AttributesSetting is meaningless.
+  /// 
+  UINT64                           AttributesSupported;
+  /// 
+  /// Image attributes.  See 'Image Attribute Definitions' for possible returned values of 
+  /// this parameter.
+  /// 
+  UINT64                           AttributesSetting;
+  /// 
+  /// 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;
+} EFI_FIRMWARE_IMAGE_DESCRIPTOR_V2;
+
 typedef struct {
   LIST_ENTRY  Link;
   EFI_HANDLE  TheHandle;