Remove the work-around in DevicePathLib to judge the end of device path node type.

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

diff --git a/MdePkg/Include/Library/PrintLib.h b/MdePkg/Include/Library/PrintLib.h
index 258324a93b0470e63b9839c8bc4a002112cfb189..5395c13e67195df9a269435f7a28b7e4d1675d7d 100644 (file)
--- a/MdePkg/Include/Library/PrintLib.h
+++ b/MdePkg/Include/Library/PrintLib.h
@@ -170,12 +170,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 ///\r
 /// Define the maximum number of characters that are required to\r
 \r
 ///\r
 /// Define the maximum number of characters that are required to\r

-/// encode a decimal, hexidecimal, GUID, or TIME value with a NULL \r
+/// encode a decimal, hexadecimal, GUID, or TIME value with a NULL \r

 /// terminator.\r
 ///  \r
 ///  Maximum Length Decimal String     = 28\r
 ///    "-9,223,372,036,854,775,808"\r
 /// terminator.\r
 ///  \r
 ///  Maximum Length Decimal String     = 28\r
 ///    "-9,223,372,036,854,775,808"\r

-///  Maximum Length Hexidecimal String = 17\r
+///  Maximum Length Hexadecimal String = 17\r

 ///    "FFFFFFFFFFFFFFFF"\r
 ///  Maximum Length GUID               = 37\r
 ///    "00000000-0000-0000-0000-000000000000"\r
 ///    "FFFFFFFFFFFFFFFF"\r
 ///  Maximum Length GUID               = 37\r
 ///    "00000000-0000-0000-0000-000000000000"\r

diff --git a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.c b/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.c
index 15b16a237adabb3323da54f06ff95955abd4a79f..46c5c058f31e3e7edfca1652064b7a92acedb9fb 100644 (file)
--- a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.c
+++ b/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.c
@@ -153,7 +153,7 @@ IsDevicePathEndType (
   )\r
 {\r
   ASSERT (Node != NULL);\r
   )\r
 {\r
   ASSERT (Node != NULL);\r

-  return (BOOLEAN) ((DevicePathType (Node) & 0x7f) == END_DEVICE_PATH_TYPE);\r
+  return (BOOLEAN) (DevicePathType (Node) == END_DEVICE_PATH_TYPE);\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

diff --git a/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLib.c b/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLib.c
index 5dd0998762da75a3e9db8c208de453b270428e12..25fcc8293c12712dc2b7def8ec566f6bcfce67c0 100644 (file)
--- a/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLib.c
+++ b/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLib.c
@@ -182,7 +182,7 @@ IsDevicePathEndType (
   )\r
 {\r
   ASSERT (Node != NULL);\r
   )\r
 {\r
   ASSERT (Node != NULL);\r

-  return (BOOLEAN) ((DevicePathType (Node) & 0x7f) == END_DEVICE_PATH_TYPE);\r
+  return (BOOLEAN) (DevicePathType (Node)) == END_DEVICE_PATH_TYPE);\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

diff --git a/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c b/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c
index 707ec5d050ad30f036efb4d7e1e7c63db054ef00..592663a8651f82b4353b0eee6c8ebf065e5a1c76 100644 (file)
--- a/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c
+++ b/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c
@@ -22,7 +22,7 @@ EFI_EVENT              mEfiVirtualNotifyEvent;
 EFI_EVENT              mEfiExitBootServicesEvent;\r
 BOOLEAN                mEfiGoneVirtual         = FALSE;\r
 BOOLEAN                mEfiAtRuntime           = FALSE;\r
 EFI_EVENT              mEfiExitBootServicesEvent;\r
 BOOLEAN                mEfiGoneVirtual         = FALSE;\r
 BOOLEAN                mEfiAtRuntime           = FALSE;\r

-EFI_RUNTIME_SERVICES          *mRT;\r
+EFI_RUNTIME_SERVICES   *mRT;\r

 \r
 /**\r
   Set AtRuntime flag as TRUE after ExitBootServices.\r
 \r
 /**\r
   Set AtRuntime flag as TRUE after ExitBootServices.\r


@@ -69,7 +69,7 @@ RuntimeLibVirtualNotifyEvent (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Intialize runtime Driver Lib if it has not yet been initialized.\r
+  Initialize runtime Driver Lib if it has not yet been initialized.\r

   It will ASSERT() if gRT is NULL or gBS is NULL.\r
   It will ASSERT() if that operation fails.\r
 \r
   It will ASSERT() if gRT is NULL or gBS is NULL.\r
   It will ASSERT() if that operation fails.\r
 \r