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

[mirror_edk2.git] / EdkCompatibilityPkg / Foundation / Library / Dxe / Include / EfiDriverLib.h

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiDriverLib.h b/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiDriverLib.h
index bd8de3a1cfb9465dea1e7b75584208627df035c6..c417242552662a9a451d3b9abbac96ab3f467256 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiDriverLib.h
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiDriverLib.h
@@ -106,10 +106,8 @@ typedef struct {
   CHAR16  *UnicodeString;\r
 } EFI_UNICODE_STRING_TABLE;\r
 #if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
-#define LANGUAGE_RFC_3066\r
 #define LANGUAGE_CODE_ENGLISH    "en-US"\r
 #else\r
-#define LANGUAGE_ISO_639_2\r
 #define LANGUAGE_CODE_ENGLISH    "eng"\r
 #endif\r
 \r
@@ -1179,13 +1177,6 @@ EfiInitializeFwVolDevicepathNode (
 Routine Description:\r
   Initialize a Firmware Volume (FV) Media Device Path node.\r
   \r
-  Tiano extended the EFI 1.10 device path nodes. Tiano does not own this enum\r
-  so as we move to UEFI 2.0 support we must use a mechanism that conforms with\r
-  the UEFI 2.0 specification to define the FV device path. An UEFI GUIDed \r
-  device path is defined for PIWG extensions of device path. If the code \r
-  is compiled to conform with the UEFI 2.0 specification use the new device path\r
-  else use the old form for backwards compatability.\r
-\r
 Arguments:\r
   FvDevicePathNode   - Pointer to a FV device path node to initialize\r
   NameGuid           - FV file name to use in FvDevicePathNode\r
@@ -1202,15 +1193,6 @@ EfiGetNameGuidFromFwVolDevicePathNode (
 Routine Description:\r
   Check to see if the Firmware Volume (FV) Media Device Path is valid.\r
   \r
-  Tiano extended the EFI 1.10 device path nodes. Tiano does not own this enum\r
-  so as we move to UEFI 2.0 support we must use a mechanism that conforms with\r
-  the UEFI 2.0 specification to define the FV device path. An UEFI GUIDed \r
-  device path is defined for PIWG extensions of device path. If the code \r
-  is compiled to conform with the UEFI 2.0 specification use the new device path\r
-  else use the old form for backwards compatability. The return value to this\r
-  function points to a location in FvDevicePathNode and it does not allocate\r
-  new memory for the GUID pointer that is returned.\r
-\r
 Arguments:\r
   FvDevicePathNode   - Pointer to FV device path to check\r
 \r