Sync all bug fixes between EDK1.04 and EDK1.06 into EdkCompatibilityPkg.

[mirror_edk2.git] / EdkCompatibilityPkg / Foundation / Efi / Include / EfiHii.h

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Include/EfiHii.h b/EdkCompatibilityPkg/Foundation/Efi/Include/EfiHii.h
index 30e001963c43cbf9b7d627e07a0bd066f9bf33f5..fd15d4f179947e22f52914d86e0d96fe49da8744 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Efi/Include/EfiHii.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Include/EfiHii.h
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -59,13 +59,13 @@ typedef struct {
 \r
 #define EFI_HII_PACKAGE_TYPE_ALL             0x00\r
 #define EFI_HII_PACKAGE_TYPE_GUID            0x01\r
-#define EFI_HII_PACKAGE_FORM                 0x02\r
-#define EFI_HII_PACKAGE_KEYBOARD_LAYOUT      0x03\r
+#define EFI_HII_PACKAGE_FORMS                0x02\r
 #define EFI_HII_PACKAGE_STRINGS              0x04\r
 #define EFI_HII_PACKAGE_FONTS                0x05\r
 #define EFI_HII_PACKAGE_IMAGES               0x06\r
 #define EFI_HII_PACKAGE_SIMPLE_FONTS         0x07\r
 #define EFI_HII_PACKAGE_DEVICE_PATH          0x08\r
+#define EFI_HII_PACKAGE_KEYBOARD_LAYOUT      0x09\r
 #define EFI_HII_PACKAGE_END                  0xDF\r
 #define EFI_HII_PACKAGE_TYPE_SYSTEM_BEGIN    0xE0\r
 #define EFI_HII_PACKAGE_TYPE_SYSTEM_END      0xFF\r
@@ -108,6 +108,7 @@ typedef struct _EFI_HII_SIMPLE_FONT_PACKAGE_HDR {
 // Font Package\r
 //\r
 \r
+#define EFI_HII_FONT_STYLE_NORMAL            0x00000000\r
 #define EFI_HII_FONT_STYLE_BOLD              0x00000001\r
 #define EFI_HII_FONT_STYLE_ITALIC            0x00000002\r
 #define EFI_HII_FONT_STYLE_EMBOSS            0x00010000\r
@@ -237,8 +238,8 @@ typedef struct _EFI_HII_GUID_PACKAGE_HDR {
 // String Package\r
 //\r
 \r
-#define UEFI_CONFIG_LANG  L"x-UEFI"\r
-#define UEFI_CONFIG_LANG2 L"x-i-UEFI"     // BUGBUG, spec need to be updated.\r
+#define UEFI_CONFIG_LANG   "x-UEFI"\r
+#define UEFI_CONFIG_LANG_2 "x-i-UEFI"\r
 \r
 typedef struct _EFI_HII_STRING_PACKAGE_HDR {\r
   EFI_HII_PACKAGE_HEADER  Header;\r
@@ -697,14 +698,14 @@ typedef struct _EFI_IFR_VARSTORE {
 \r
 typedef struct _EFI_IFR_VARSTORE_EFI {\r
   EFI_IFR_OP_HEADER        Header;\r
-  UINT16                   VarStoreId;\r
+  EFI_VARSTORE_ID          VarStoreId;\r
   EFI_GUID                 Guid;\r
   UINT32                   Attributes;\r
 } EFI_IFR_VARSTORE_EFI;\r
 \r
 typedef struct _EFI_IFR_VARSTORE_NAME_VALUE {\r
   EFI_IFR_OP_HEADER        Header;\r
-  UINT16                   VarStoreId;\r
+  EFI_VARSTORE_ID          VarStoreId;\r
   EFI_GUID                 Guid;\r
 } EFI_IFR_VARSTORE_NAME_VALUE;\r
 \r
@@ -713,8 +714,13 @@ typedef struct _EFI_IFR_FORM_SET {
   EFI_GUID                 Guid;\r
   EFI_STRING_ID            FormSetTitle;\r
   EFI_STRING_ID            Help;\r
+  UINT8                    Flags;\r
+  EFI_GUID                 ClassGuid[1];\r
 } EFI_IFR_FORM_SET;\r
 \r
+#define EFI_HII_PLATFORM_SETUP_FORMSET_GUID \\r
+  { 0x93039971, 0x8545, 0x4b04, { 0xb4, 0x5e, 0x32, 0xeb, 0x83, 0x26, 0x4, 0xe } }\r
+\r
 typedef struct _EFI_IFR_END {\r
   EFI_IFR_OP_HEADER        Header;\r
 } EFI_IFR_END;\r
@@ -805,7 +811,7 @@ typedef struct _EFI_IFR_REF4 {
 \r
 typedef struct _EFI_IFR_RESET_BUTTON {\r
   EFI_IFR_OP_HEADER        Header;\r
-  EFI_IFR_QUESTION_HEADER  Question;\r
+  EFI_IFR_STATEMENT_HEADER Statement;\r
   EFI_DEFAULT_ID           DefaultId;\r
 } EFI_IFR_RESET_BUTTON;\r
 \r
@@ -1273,7 +1279,7 @@ typedef enum {
   EfiKeyB8,\r
   EfiKeyB9,\r
   EfiKeyB10,\r
-  EfiKeyRshift,\r
+  EfiKeyRShift,\r
   EfiKeyUpArrow,\r
   EfiKeyOne,\r
   EfiKeyTwo,\r
@@ -1396,16 +1402,16 @@ typedef struct {
   // EFI_HII_KEYBOARD_LAYOUT Layout[];\r
 } EFI_HII_KEYBOARD_PACKAGE_HDR;\r
 \r
-typedef struct {\r
-  CHAR16                  Language[3];\r
-  CHAR16                  Space;\r
-  CHAR16                  DescriptionString[1];\r
-} EFI_DESCRIPTION_STRING;\r
+//typedef struct {\r
+//  CHAR16                  Language[];           // RFC4646 Language Code\r
+//  CHAR16                  Space;\r
+//  CHAR16                  DescriptionString[];\r
+//} EFI_DESCRIPTION_STRING;\r
 \r
-typedef struct {\r
-  UINT16                  DescriptionCount;\r
-  EFI_DESCRIPTION_STRING  DescriptionString[1];\r
-} EFI_DESCRIPTION_STRING_BUNDLE;\r
+//typedef struct {\r
+//  UINT16                  DescriptionCount;\r
+//  EFI_DESCRIPTION_STRING  DescriptionString[];\r
+//} EFI_DESCRIPTION_STRING_BUNDLE;\r
 \r
 //\r
 // Modifier values\r
@@ -1425,7 +1431,7 @@ typedef struct {
 #define EFI_LEFT_SHIFT_MODIFIER          0x000C\r
 #define EFI_RIGHT_SHIFT_MODIFIER         0x000D\r
 #define EFI_CAPS_LOCK_MODIFIER           0x000E\r
-#define EFI_NUM_LOCK _MODIFIER           0x000F\r
+#define EFI_NUM_LOCK_MODIFIER            0x000F\r
 #define EFI_LEFT_ARROW_MODIFIER          0x0010\r
 #define EFI_RIGHT_ARROW_MODIFIER         0x0011\r
 #define EFI_DOWN_ARROW_MODIFIER          0x0012\r
@@ -1458,6 +1464,10 @@ typedef struct {
 #define EFI_PAUSE_MODIFIER               0x0025\r
 #define EFI_BREAK_MODIFIER               0x0026\r
 \r
+#define EFI_LEFT_LOGO_MODIFIER           0x0027\r
+#define EFI_RIGHT_LOGO_MODIFIER          0x0028\r
+#define EFI_MENU_MODIFIER                0x0029\r
+\r
 #pragma pack()\r
 \r
 #endif\r