Re: [edk2] [PATCH] BaseTools: Add HII definitions from UEFI 2.6

2016-05-15 Thread Zhu, Yonghong 
Hi Samer,

I will remove the Trailing whitespace and push this patch.

Best Regards,
Zhu Yonghong


-Original Message-
From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Bi, 
Dandan
Sent: Thursday, May 12, 2016 11:27 AM
To: Samer El-Haj-Mahmoud <samer.el-haj-mahm...@hpe.com>; edk2-devel@lists.01.org
Cc: Samer El-Haj-Mahmoud <el...@hpe.com>; Gao, Liming <liming@intel.com>
Subject: Re: [edk2] [PATCH] BaseTools: Add HII definitions from UEFI 2.6

A minor comment:
There are some whitespace in the line " typedef struct _EFI_HII_IIBT_PNG_BLOCK 
{  " and the line below " (C) Copyright 2016 Hewlett Packard Enterprise 
Development LP ".
Please remove them when commit the patch. You can use the patch check tool 
(BaseTools\Scripts\PatchCheck.py) to check the patch.

Others are good to me.
Reviewed-by: Dandan Bi <dandan...@intel.com>

Thanks,
Dandan

-Original Message-
From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Samer 
El-Haj-Mahmoud
Sent: Thursday, May 12, 2016 4:29 AM
To: edk2-devel@lists.01.org
Cc: Samer El-Haj-Mahmoud <el...@hpe.com>; Gao, Liming <liming....@intel.com>
Subject: [edk2] [PATCH] 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@intel.com>
Cc: Liming Gao <liming@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Samer El-Haj-Mahmoud <el...@hpe.com>
---
 .../Common/UefiInternalFormRepresentation.h| 24 ++
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h 
b/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h
index 8c2edf2..4b585fd 100644
--- a/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h
+++ b/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h
@@ -3,11 +3,9 @@
   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.
-
+ (C) Copyright 2016 Hewlett Packard Enterprise Development LP
+ 
   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 @@ -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_DEFAULT0x12
 #define EFI_HII_GIBT_GLYPHS_DEFAULT   0x13
+#define EFI_HII_GIBT_GLYPH_VARIABILITY0x14
 #define EFI_HII_GIBT_DUPLICATE0x20
 #define EFI_HII_GIBT_SKIP20x21
 #define EFI_HII_GIBT_SKIP10x22
@@ -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_BLOCKHeader;
+  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_BLOCKHeader;
   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_JPEG0x18
+#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 {
   UINT8Data[1];
 } EFI_HII_IIBT_JPEG_BLOCK;
 
+typedef struct _EFI_HII_IIBT_PNG_BLOCK {
+  EFI_HII_IMAGE_BLOCK  Header;
+  UINT32   Size;
+  UINT8Data[1];
+} EFI_HII_IIBT_PNG_BLOCK;
+
 typedef struct _EFI_HII_IIBT_SKIP1_BLOCK {
   EFI_HII_IMAGE_BLOCK  Header;
   UINT8SkipCount;
--
2.6.3.windows.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
___
edk2-devel m

Re: [edk2] [PATCH] BaseTools: Add HII definitions from UEFI 2.6

2016-05-11 Thread Bi, Dandan 
A minor comment:
There are some whitespace in the line " typedef struct _EFI_HII_IIBT_PNG_BLOCK 
{  " and the line below " (C) Copyright 2016 Hewlett Packard Enterprise 
Development LP ".
Please remove them when commit the patch. You can use the patch check tool 
(BaseTools\Scripts\PatchCheck.py) to check the patch.

Others are good to me.
Reviewed-by: Dandan Bi <dandan...@intel.com>

Thanks,
Dandan

-Original Message-
From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Samer 
El-Haj-Mahmoud
Sent: Thursday, May 12, 2016 4:29 AM
To: edk2-devel@lists.01.org
Cc: Samer El-Haj-Mahmoud <el...@hpe.com>; Gao, Liming <liming....@intel.com>
Subject: [edk2] [PATCH] 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@intel.com>
Cc: Liming Gao <liming@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Samer El-Haj-Mahmoud <el...@hpe.com>
---
 .../Common/UefiInternalFormRepresentation.h| 24 ++
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h 
b/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h
index 8c2edf2..4b585fd 100644
--- a/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h
+++ b/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h
@@ -3,11 +3,9 @@
   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.
-
+ (C) Copyright 2016 Hewlett Packard Enterprise Development LP
+ 
   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 @@ -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_DEFAULT0x12
 #define EFI_HII_GIBT_GLYPHS_DEFAULT   0x13
+#define EFI_HII_GIBT_GLYPH_VARIABILITY0x14
 #define EFI_HII_GIBT_DUPLICATE0x20
 #define EFI_HII_GIBT_SKIP20x21
 #define EFI_HII_GIBT_SKIP10x22
@@ -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_BLOCKHeader;
+  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_BLOCKHeader;
   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_JPEG0x18
+#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 {
   UINT8Data[1];
 } EFI_HII_IIBT_JPEG_BLOCK;
 
+typedef struct _EFI_HII_IIBT_PNG_BLOCK {
+  EFI_HII_IMAGE_BLOCK  Header;
+  UINT32   Size;
+  UINT8Data[1];
+} EFI_HII_IIBT_PNG_BLOCK;
+
 typedef struct _EFI_HII_IIBT_SKIP1_BLOCK {
   EFI_HII_IMAGE_BLOCK  Header;
   UINT8SkipCount;
--
2.6.3.windows.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [PATCH] BaseTools: Add HII definitions from UEFI 2.6

2016-05-11 Thread Samer El-Haj-Mahmoud 
Add HII definitions from UEFI 2.6 for HII Image Variability and PNG
Blocks

Cc: Yonghong Zhu 
Cc: Liming Gao 
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Samer El-Haj-Mahmoud 
---
 .../Common/UefiInternalFormRepresentation.h| 24 ++
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h 
b/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h
index 8c2edf2..4b585fd 100644
--- a/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h
+++ b/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h
@@ -3,11 +3,9 @@
   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.
-
+ (C) Copyright 2016 Hewlett Packard Enterprise Development LP
+ 
   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
@@ -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_DEFAULT0x12
 #define EFI_HII_GIBT_GLYPHS_DEFAULT   0x13
+#define EFI_HII_GIBT_GLYPH_VARIABILITY0x14
 #define EFI_HII_GIBT_DUPLICATE0x20
 #define EFI_HII_GIBT_SKIP20x21
 #define EFI_HII_GIBT_SKIP10x22
@@ -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_BLOCKHeader;
+  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_BLOCKHeader;
   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_JPEG0x18
+#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 {
   UINT8Data[1];
 } EFI_HII_IIBT_JPEG_BLOCK;
 
+typedef struct _EFI_HII_IIBT_PNG_BLOCK {
+  EFI_HII_IMAGE_BLOCK  Header;
+  UINT32   Size;
+  UINT8Data[1];
+} EFI_HII_IIBT_PNG_BLOCK;
+
 typedef struct _EFI_HII_IIBT_SKIP1_BLOCK {
   EFI_HII_IMAGE_BLOCK  Header;
   UINT8SkipCount;
-- 
2.6.3.windows.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel