BaseTools: Add HII definitions from UEFI 2.6

Add HII definitions from UEFI 2.6 for HII Image Variability and PNG
Blocks

Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Samer El-Haj-Mahmoud <elhaj@hpe.com>
Reviewed-by: Dandan Bi <dandan.bi@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
(cherry picked from commit 7b1fe7acdca15be49a9421156b799ed7394f7bac)

1 files changed, 19 insertions, 3 deletions

diff --git a/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h b/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h
index 8c2edf20f3..c41120fd30 100644
--- a/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h
+++ b/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h
@@ -3,10 +3,8 @@
   IFR is primarily consumed by the EFI presentation engine, and produced by EFI

   internal application and drivers as well as all add-in card option-ROM drivers

 

-  @par Revision Reference:

-  These definitions are from UEFI2.1.

-

   Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>

+ (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>

 

   This program and the accompanying materials are licensed and made available

   under the terms and conditions of the BSD License which accompanies this

@@ -16,6 +14,9 @@
   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:

+  These definitions are from UEFI 2.6

+

 **/

 

 #ifndef __UEFI_INTERNAL_FORMREPRESENTATION_H__

@@ -167,6 +168,7 @@ typedef struct _EFI_HII_FONT_PACKAGE_HDR {
 #define EFI_HII_GIBT_GLYPHS               0x11

 #define EFI_HII_GIBT_GLYPH_DEFAULT        0x12

 #define EFI_HII_GIBT_GLYPHS_DEFAULT       0x13

+#define EFI_HII_GIBT_GLYPH_VARIABILITY    0x14

 #define EFI_HII_GIBT_DUPLICATE            0x20

 #define EFI_HII_GIBT_SKIP2                0x21

 #define EFI_HII_GIBT_SKIP1                0x22

@@ -235,6 +237,13 @@ typedef struct _EFI_HII_GIBT_GLYPHS_DEFAULT_BLOCK {
   UINT8                  BitmapData[1]; // the number of bytes per bitmap can be calculated by ((Global.Cell.Width+7)/8)*Global.Cell.Height

 } EFI_HII_GIBT_GLYPHS_DEFAULT_BLOCK;

 

+typedef struct _EFI_HII_GIBT_VARIABILITY_BLOCK {

+  EFI_HII_GLYPH_BLOCK    Header;

+  EFI_HII_GLYPH_INFO     Cell;

+  UINT8                  GlyphPackInBits;

+  UINT8                  BitmapData [1];

+} EFI_HII_GIBT_VARIABILITY_BLOCK;

+

 typedef struct _EFI_HII_GIBT_SKIP1_BLOCK {

   EFI_HII_GLYPH_BLOCK    Header;

   UINT8                  SkipCount;

@@ -416,6 +425,7 @@ typedef struct _EFI_HII_IMAGE_BLOCK {
 #define EFI_HII_IIBT_IMAGE_24BIT       0x16

 #define EFI_HII_IIBT_IMAGE_24BIT_TRANS 0x17

 #define EFI_HII_IIBT_IMAGE_JPEG        0x18

+#define EFI_HII_IIBT_IMAGE_PNG         0x19

 #define EFI_HII_IIBT_DUPLICATE         0x20

 #define EFI_HII_IIBT_SKIP2             0x21

 #define EFI_HII_IIBT_SKIP1             0x22

@@ -532,6 +542,12 @@ typedef struct _EFI_HII_IIBT_JPEG_BLOCK {
   UINT8                        Data[1];

 } EFI_HII_IIBT_JPEG_BLOCK;

 

+typedef struct _EFI_HII_IIBT_PNG_BLOCK {

+  EFI_HII_IMAGE_BLOCK          Header;

+  UINT32                       Size;

+  UINT8                        Data[1];

+} EFI_HII_IIBT_PNG_BLOCK;

+

 typedef struct _EFI_HII_IIBT_SKIP1_BLOCK {

   EFI_HII_IMAGE_BLOCK          Header;

   UINT8                        SkipCount;