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

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11094 6f19259b-4bc3-4df7-8a09-765794883524

5 files changed, 82 insertions, 46 deletions

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Include/EfiDevicePath.h b/EdkCompatibilityPkg/Foundation/Efi/Include/EfiDevicePath.h
index ea54c4bc0f..4bde7d2610 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Include/EfiDevicePath.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Include/EfiDevicePath.h
@@ -1,6 +1,6 @@
 /*++

  

-Copyright (c) 2004 - 2009, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2010, 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        

@@ -214,7 +214,6 @@ typedef struct {
   UINT8                           DeviceProtocol;

 } USB_CLASS_DEVICE_PATH;

 

-#if (EFI_SPECIFICATION_VERSION >= 0x00020000)

 #define MSG_USB_WWID_DP           0x10

 typedef struct {

   EFI_DEVICE_PATH_PROTOCOL        Header;

@@ -231,7 +230,6 @@ typedef struct {
   EFI_DEVICE_PATH_PROTOCOL        Header;

   UINT8                           Lun;

 } DEVICE_LOGICAL_UNIT_DEVICE_PATH;

-#endif

 

 #define MSG_SATA_DP               0x12

 typedef struct {

@@ -330,8 +328,6 @@ typedef struct {
   UINT32                          FlowControlMap;

 } UART_FLOW_CONTROL_DEVICE_PATH;

 

-#if (EFI_SPECIFICATION_VERSION >= 0x00020000)

-

 #define DEVICE_PATH_MESSAGING_SAS \

     { 0xd487ddb4, 0x008b, 0x11d9, {0xaf, 0xdc, 0x00, 0x10, 0x83, 0xff, 0xca, 0x4d} }

 

@@ -345,8 +341,6 @@ typedef struct {
   UINT16                          RelativeTargetPort;

 } SAS_DEVICE_PATH;

 

-#endif

-

 #define MSG_ISCSI_DP              0x13

 typedef struct {

   EFI_DEVICE_PATH_PROTOCOL        Header;

@@ -428,8 +422,6 @@ typedef struct {
   EFI_GUID                        Protocol;

 } MEDIA_PROTOCOL_DEVICE_PATH;

 

-#if (EFI_SPECIFICATION_VERSION >= 0x0002000A)

-

 #define MEDIA_FV_DP  0x07

 typedef struct {

   EFI_DEVICE_PATH_PROTOCOL  Header;

@@ -449,7 +441,6 @@ typedef struct {
   UINT64                    StartingOffset;

   UINT64                    EndingOffset;

 } MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH;

-#endif

 

 //

 // BBS Device Path

@@ -509,10 +500,8 @@ typedef union {
   F1394_DEVICE_PATH                    F1394;

   USB_DEVICE_PATH                      Usb;

   USB_CLASS_DEVICE_PATH                UsbClass;

-  #if (EFI_SPECIFICATION_VERSION >= 0x00020000)

   USB_WWID_DEVICE_PATH                 UsbWwid;

   DEVICE_LOGICAL_UNIT_DEVICE_PATH      LogicUnit;

-  #endif

   I2O_DEVICE_PATH                      I2O;

   MAC_ADDR_DEVICE_PATH                 MacAddr;

   IPv4_DEVICE_PATH                     Ipv4;

@@ -520,9 +509,7 @@ typedef union {
   INFINIBAND_DEVICE_PATH               InfiniBand;

   UART_DEVICE_PATH                     Uart;

   UART_FLOW_CONTROL_DEVICE_PATH        UartFlowControl;

-  #if (EFI_SPECIFICATION_VERSION >= 0x00020000)

   SAS_DEVICE_PATH                      Sas;

-  #endif

   ISCSI_DEVICE_PATH                    Iscsi;

   HARDDRIVE_DEVICE_PATH                HardDrive;

   CDROM_DEVICE_PATH                    CD;

@@ -530,12 +517,10 @@ typedef union {
   FILEPATH_DEVICE_PATH                 FilePath;

   MEDIA_PROTOCOL_DEVICE_PATH           MediaProtocol;

 

-  #if (EFI_SPECIFICATION_VERSION >= 0x0002000A)

   MEDIA_FW_VOL_DEVICE_PATH             PiwgFirmwareVolume;

   MEDIA_FW_VOL_FILEPATH_DEVICE_PATH    PiwgFirmwareFile;

   MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH

                                        Offset;

-  #endif

 

   BBS_BBS_DEVICE_PATH                  Bbs;

 } EFI_DEV_PATH;

@@ -563,10 +548,8 @@ typedef union {
   F1394_DEVICE_PATH                    *F1394;

   USB_DEVICE_PATH                      *Usb;

   USB_CLASS_DEVICE_PATH                *UsbClass;

-  #if (EFI_SPECIFICATION_VERSION >= 0x00020000)

   USB_WWID_DEVICE_PATH                 *UsbWwid;

   DEVICE_LOGICAL_UNIT_DEVICE_PATH      *LogicUnit;

-  #endif

   I2O_DEVICE_PATH                      *I2O;

   MAC_ADDR_DEVICE_PATH                 *MacAddr;

   IPv4_DEVICE_PATH                     *Ipv4;

@@ -575,9 +558,7 @@ typedef union {
   UART_DEVICE_PATH                     *Uart;

   UART_FLOW_CONTROL_DEVICE_PATH        *UartFlowControl;

 

-  #if (EFI_SPECIFICATION_VERSION >= 0x00020000)

   SAS_DEVICE_PATH                      *Sas;

-  #endif

   ISCSI_DEVICE_PATH                    *Iscsi;

 

   HARDDRIVE_DEVICE_PATH                *HardDrive;

@@ -586,10 +567,10 @@ typedef union {
   FILEPATH_DEVICE_PATH                 *FilePath;

   MEDIA_PROTOCOL_DEVICE_PATH           *MediaProtocol;

 

-  #if (EFI_SPECIFICATION_VERSION >= 0x0002000A)

   MEDIA_FW_VOL_DEVICE_PATH             *PiwgFirmwareVolume;

   MEDIA_FW_VOL_FILEPATH_DEVICE_PATH    *PiwgFirmwareFile;

-  #endif

+  MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH

+                                       *Offset;

 

   BBS_BBS_DEVICE_PATH                  *Bbs;

   UINT8                                *Raw;

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Include/EfiError.h b/EdkCompatibilityPkg/Foundation/Efi/Include/EfiError.h
index 9ddd1b3568..1db119b298 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Include/EfiError.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Include/EfiError.h
@@ -1,6 +1,6 @@
 /*++

 

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

+Copyright (c) 2004 - 2010, 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        

@@ -58,6 +58,9 @@ Abstract:
 #define EFI_INCOMPATIBLE_VERSION  EFIERR (25)

 #define EFI_SECURITY_VIOLATION    EFIERR (26)

 #define EFI_CRC_ERROR             EFIERR (27)

+#define EFI_END_OF_MEDIA          EFIERR (28)

+#define EFI_END_OF_FILE           EFIERR (31)

+#define EFI_INVALID_LANGUAGE      EFIERR (32)

 

 #define EFI_WARN_UNKNOWN_GLYPH    EFIWARN (1)

 #define EFI_WARN_DELETE_FAILURE   EFIWARN (2)

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Include/EfiHii.h b/EdkCompatibilityPkg/Foundation/Efi/Include/EfiHii.h
index 30e001963c..fd15d4f179 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Include/EfiHii.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Include/EfiHii.h
@@ -1,6 +1,6 @@
 /*++

 

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

+Copyright (c) 2007 - 2010, 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

@@ -59,13 +59,13 @@ typedef struct {
 

 #define EFI_HII_PACKAGE_TYPE_ALL             0x00

 #define EFI_HII_PACKAGE_TYPE_GUID            0x01

-#define EFI_HII_PACKAGE_FORM                 0x02

-#define EFI_HII_PACKAGE_KEYBOARD_LAYOUT      0x03

+#define EFI_HII_PACKAGE_FORMS                0x02

 #define EFI_HII_PACKAGE_STRINGS              0x04

 #define EFI_HII_PACKAGE_FONTS                0x05

 #define EFI_HII_PACKAGE_IMAGES               0x06

 #define EFI_HII_PACKAGE_SIMPLE_FONTS         0x07

 #define EFI_HII_PACKAGE_DEVICE_PATH          0x08

+#define EFI_HII_PACKAGE_KEYBOARD_LAYOUT      0x09

 #define EFI_HII_PACKAGE_END                  0xDF

 #define EFI_HII_PACKAGE_TYPE_SYSTEM_BEGIN    0xE0

 #define EFI_HII_PACKAGE_TYPE_SYSTEM_END      0xFF

@@ -108,6 +108,7 @@ typedef struct _EFI_HII_SIMPLE_FONT_PACKAGE_HDR {
 // Font Package

 //

 

+#define EFI_HII_FONT_STYLE_NORMAL            0x00000000

 #define EFI_HII_FONT_STYLE_BOLD              0x00000001

 #define EFI_HII_FONT_STYLE_ITALIC            0x00000002

 #define EFI_HII_FONT_STYLE_EMBOSS            0x00010000

@@ -237,8 +238,8 @@ typedef struct _EFI_HII_GUID_PACKAGE_HDR {
 // String Package

 //

 

-#define UEFI_CONFIG_LANG  L"x-UEFI"

-#define UEFI_CONFIG_LANG2 L"x-i-UEFI"     // BUGBUG, spec need to be updated.

+#define UEFI_CONFIG_LANG   "x-UEFI"

+#define UEFI_CONFIG_LANG_2 "x-i-UEFI"

 

 typedef struct _EFI_HII_STRING_PACKAGE_HDR {

   EFI_HII_PACKAGE_HEADER  Header;

@@ -697,14 +698,14 @@ typedef struct _EFI_IFR_VARSTORE {
 

 typedef struct _EFI_IFR_VARSTORE_EFI {

   EFI_IFR_OP_HEADER        Header;

-  UINT16                   VarStoreId;

+  EFI_VARSTORE_ID          VarStoreId;

   EFI_GUID                 Guid;

   UINT32                   Attributes;

 } EFI_IFR_VARSTORE_EFI;

 

 typedef struct _EFI_IFR_VARSTORE_NAME_VALUE {

   EFI_IFR_OP_HEADER        Header;

-  UINT16                   VarStoreId;

+  EFI_VARSTORE_ID          VarStoreId;

   EFI_GUID                 Guid;

 } EFI_IFR_VARSTORE_NAME_VALUE;

 

@@ -713,8 +714,13 @@ typedef struct _EFI_IFR_FORM_SET {
   EFI_GUID                 Guid;

   EFI_STRING_ID            FormSetTitle;

   EFI_STRING_ID            Help;

+  UINT8                    Flags;

+  EFI_GUID                 ClassGuid[1];

 } EFI_IFR_FORM_SET;

 

+#define EFI_HII_PLATFORM_SETUP_FORMSET_GUID \

+  { 0x93039971, 0x8545, 0x4b04, { 0xb4, 0x5e, 0x32, 0xeb, 0x83, 0x26, 0x4, 0xe } }

+

 typedef struct _EFI_IFR_END {

   EFI_IFR_OP_HEADER        Header;

 } EFI_IFR_END;

@@ -805,7 +811,7 @@ typedef struct _EFI_IFR_REF4 {
 

 typedef struct _EFI_IFR_RESET_BUTTON {

   EFI_IFR_OP_HEADER        Header;

-  EFI_IFR_QUESTION_HEADER  Question;

+  EFI_IFR_STATEMENT_HEADER Statement;

   EFI_DEFAULT_ID           DefaultId;

 } EFI_IFR_RESET_BUTTON;

 

@@ -1273,7 +1279,7 @@ typedef enum {
   EfiKeyB8,

   EfiKeyB9,

   EfiKeyB10,

-  EfiKeyRshift,

+  EfiKeyRShift,

   EfiKeyUpArrow,

   EfiKeyOne,

   EfiKeyTwo,

@@ -1396,16 +1402,16 @@ typedef struct {
   // EFI_HII_KEYBOARD_LAYOUT Layout[];

 } EFI_HII_KEYBOARD_PACKAGE_HDR;

 

-typedef struct {

-  CHAR16                  Language[3];

-  CHAR16                  Space;

-  CHAR16                  DescriptionString[1];

-} EFI_DESCRIPTION_STRING;

+//typedef struct {

+//  CHAR16                  Language[];           // RFC4646 Language Code

+//  CHAR16                  Space;

+//  CHAR16                  DescriptionString[];

+//} EFI_DESCRIPTION_STRING;

 

-typedef struct {

-  UINT16                  DescriptionCount;

-  EFI_DESCRIPTION_STRING  DescriptionString[1];

-} EFI_DESCRIPTION_STRING_BUNDLE;

+//typedef struct {

+//  UINT16                  DescriptionCount;

+//  EFI_DESCRIPTION_STRING  DescriptionString[];

+//} EFI_DESCRIPTION_STRING_BUNDLE;

 

 //

 // Modifier values

@@ -1425,7 +1431,7 @@ typedef struct {
 #define EFI_LEFT_SHIFT_MODIFIER          0x000C

 #define EFI_RIGHT_SHIFT_MODIFIER         0x000D

 #define EFI_CAPS_LOCK_MODIFIER           0x000E

-#define EFI_NUM_LOCK _MODIFIER           0x000F

+#define EFI_NUM_LOCK_MODIFIER            0x000F

 #define EFI_LEFT_ARROW_MODIFIER          0x0010

 #define EFI_RIGHT_ARROW_MODIFIER         0x0011

 #define EFI_DOWN_ARROW_MODIFIER          0x0012

@@ -1458,6 +1464,10 @@ typedef struct {
 #define EFI_PAUSE_MODIFIER               0x0025

 #define EFI_BREAK_MODIFIER               0x0026

 

+#define EFI_LEFT_LOGO_MODIFIER           0x0027

+#define EFI_RIGHT_LOGO_MODIFIER          0x0028

+#define EFI_MENU_MODIFIER                0x0029

+

 #pragma pack()

 

 #endif

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Include/EfiImage.h b/EdkCompatibilityPkg/Foundation/Efi/Include/EfiImage.h
index fa6dc424c3..90f7b75b47 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Include/EfiImage.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Include/EfiImage.h
@@ -1,6 +1,6 @@
 /*++

 

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

+Copyright (c) 2004 - 2010, 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        

@@ -623,6 +623,48 @@ typedef struct {
 } EFI_IMAGE_DEBUG_CODEVIEW_RSDS_ENTRY;

 

 //

+// Resource Format

+//

+typedef struct {

+  UINT32  Characteristics;

+  UINT32  TimeDateStamp;

+  UINT16  MajorVersion;

+  UINT16  MinorVersion;

+  UINT16  NumberOfNamedEntries;

+  UINT16  NumberOfIdEntries;

+//  EFI_IMAGE_RESOURCE_DIRECTORY_ENTRY DirectoryEntries[];

+} EFI_IMAGE_RESOURCE_DIRECTORY;

+

+typedef struct {

+  union {

+    struct {

+      UINT32  NameOffset:31;

+      UINT32  NameIsString:1;

+    } s;

+    UINT32  Id;

+  } u1;

+  union {

+    UINT32  OffsetToData;

+    struct {

+      UINT32  OffsetToDirectory:31;

+      UINT32  DataIsDirectory:1;

+    } s;

+  } u2;

+} EFI_IMAGE_RESOURCE_DIRECTORY_ENTRY;

+

+typedef struct {

+  UINT16  Length;

+  CHAR16  String[1];

+} EFI_IMAGE_RESOURCE_DIRECTORY_STRING;

+

+typedef struct {

+  UINT32  OffsetToData;

+  UINT32  Size;

+  UINT32  CodePage;

+  UINT32  Reserved;

+} EFI_IMAGE_RESOURCE_DATA_ENTRY;

+

+//

 // Header format for TE images

 //

 typedef struct {

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Include/EfiTypes.h b/EdkCompatibilityPkg/Foundation/Efi/Include/EfiTypes.h
index 3fba60ff5d..5de817e091 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Include/EfiTypes.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Include/EfiTypes.h
@@ -1,6 +1,6 @@
 /*++

 

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

+Copyright (c) 2004 - 2010, 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        

@@ -90,11 +90,11 @@ typedef UINT64 EFI_LBA;
 // EFI Constants. They may exist in other build structures, so #ifndef them.

 //

 #ifndef TRUE

-#define TRUE  ((BOOLEAN) 1 == 1)

+#define TRUE  ((BOOLEAN) (1 == 1))

 #endif

 

 #ifndef FALSE

-#define FALSE ((BOOLEAN) 0 == 1)

+#define FALSE ((BOOLEAN) (0 == 1))

 #endif

 

 #ifndef NULL