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

2 files changed, 30 insertions, 19 deletions

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiDriverLib.h b/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiDriverLib.h
index bd8de3a1cf..c417242552 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiDriverLib.h
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiDriverLib.h
@@ -106,10 +106,8 @@ typedef struct {
   CHAR16  *UnicodeString;

 } EFI_UNICODE_STRING_TABLE;

 #if (EFI_SPECIFICATION_VERSION >= 0x00020000)

-#define LANGUAGE_RFC_3066

 #define LANGUAGE_CODE_ENGLISH    "en-US"

 #else

-#define LANGUAGE_ISO_639_2

 #define LANGUAGE_CODE_ENGLISH    "eng"

 #endif

 

@@ -1179,13 +1177,6 @@ EfiInitializeFwVolDevicepathNode (
 Routine Description:

   Initialize a Firmware Volume (FV) Media Device Path node.

   

-  Tiano extended the EFI 1.10 device path nodes. Tiano does not own this enum

-  so as we move to UEFI 2.0 support we must use a mechanism that conforms with

-  the UEFI 2.0 specification to define the FV device path. An UEFI GUIDed 

-  device path is defined for PIWG extensions of device path. If the code 

-  is compiled to conform with the UEFI 2.0 specification use the new device path

-  else use the old form for backwards compatability.

-

 Arguments:

   FvDevicePathNode   - Pointer to a FV device path node to initialize

   NameGuid           - FV file name to use in FvDevicePathNode

@@ -1202,15 +1193,6 @@ EfiGetNameGuidFromFwVolDevicePathNode (
 Routine Description:

   Check to see if the Firmware Volume (FV) Media Device Path is valid.

   

-  Tiano extended the EFI 1.10 device path nodes. Tiano does not own this enum

-  so as we move to UEFI 2.0 support we must use a mechanism that conforms with

-  the UEFI 2.0 specification to define the FV device path. An UEFI GUIDed 

-  device path is defined for PIWG extensions of device path. If the code 

-  is compiled to conform with the UEFI 2.0 specification use the new device path

-  else use the old form for backwards compatability. The return value to this

-  function points to a location in FvDevicePathNode and it does not allocate

-  new memory for the GUID pointer that is returned.

-

 Arguments:

   FvDevicePathNode   - Pointer to FV device path to check

 

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiUiLib.h b/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiUiLib.h
index 7cfeffe5fb..946742cb17 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiUiLib.h
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiUiLib.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        

@@ -202,4 +202,33 @@ Returns:
 --*/

 ;

 

+EFI_STATUS

+EfiStringToValue (

+  OUT UINT64        *Val,

+  IN  CHAR16        *String,

+  OUT UINT8         *EndIdx OPTIONAL

+  )

+/*++

+

+Routine Description:

+  Parses and converts Unicode string to decimal value.

+  The returned value is 64-bit.

+  The string is expected in decimal format,

+  the string is parsed and format verified.

+

+Arguments:

+  Val    - pointer to the variable to store the value to

+  String - string that contains the value to parse and convert

+  EndIdx - index on which the parsing stopped. It points to the

+           first character that was not part of the returned Val.

+           It's valid only if the function returns success.

+           It's optional and it could be NULL.

+

+Returns:

+  EFI_SUCCESS           - if successful

+  EFI_INVALID_PARAMETER - if String is in unexpected format

+

+--*/

+;

+

 #endif