Use Device Path Macros to get Device Path Type/SubType. (Some extensions might use...

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

diff --git a/IntelFrameworkPkg/Library/UefiLibFramework/UefiNotTiano.c b/IntelFrameworkPkg/Library/UefiLibFramework/UefiNotTiano.c
index d3c832ff7e0d321ca6077ae7820ff7ce770d2d36..b920db01e1b0996edb5e089c6bfb9ca99ab2fc23 100644 (file)
--- a/IntelFrameworkPkg/Library/UefiLibFramework/UefiNotTiano.c
+++ b/IntelFrameworkPkg/Library/UefiLibFramework/UefiNotTiano.c
@@ -297,8 +297,8 @@ EfiGetNameGuidFromFwVolDevicePathNode (
   //\r
   // Use the new Device path that does not conflict with the UEFI\r
   //\r
-  if (FrameworkFvDevicePathNode->Tiano.Header.Type == MEDIA_DEVICE_PATH &&\r
-      FrameworkFvDevicePathNode->Tiano.Header.SubType == MEDIA_VENDOR_DP) {\r
+  if (DevicePathType (&FrameworkFvDevicePathNode->Tiano.Header) == MEDIA_DEVICE_PATH &&\r
+      DevicePathSubType (&FrameworkFvDevicePathNode->Tiano.Header) == MEDIA_VENDOR_DP) {\r
     if (CompareGuid (&gEfiFrameworkDevicePathGuid, &FrameworkFvDevicePathNode->Tiano.TianoSpecificDevicePath)) {\r
       if (FrameworkFvDevicePathNode->Tiano.Type == TIANO_MEDIA_FW_VOL_FILEPATH_DEVICE_PATH_TYPE) {\r
         return (EFI_GUID *) &FrameworkFvDevicePathNode->NameGuid;\r
@@ -328,7 +328,7 @@ VOID
 EFIAPI\r
 EfiInitializeFwVolDevicepathNode (\r
   IN OUT MEDIA_FW_VOL_FILEPATH_DEVICE_PATH  *FvDevicePathNode,\r
-  IN CONST EFI_GUID                                   *NameGuid\r
+  IN CONST EFI_GUID                         *NameGuid\r
   )\r
 {\r
   FRAMEWORK_MEDIA_FW_VOL_FILEPATH_DEVICE_PATH  *FrameworkFvDevicePathNode;\r

diff --git a/MdePkg/Library/UefiLib/UefiNotTiano.c b/MdePkg/Library/UefiLib/UefiNotTiano.c
index 19a7a19a22f936028ec5a4bf3692be0411199801..b621963fbc7430c672f29c81c158ddb7429f5a6a 100644 (file)
--- a/MdePkg/Library/UefiLib/UefiNotTiano.c
+++ b/MdePkg/Library/UefiLib/UefiNotTiano.c
@@ -283,9 +283,8 @@ EfiGetNameGuidFromFwVolDevicePathNode (
 {\r
   ASSERT (FvFileDevicePathNode != NULL);\r
 \r
-  if (FvFileDevicePathNode->Header.Type == MEDIA_DEVICE_PATH &&\r
-      FvFileDevicePathNode->Header.SubType == MEDIA_PIWG_FW_FILE_DP\r
-     ) {\r
+  if (DevicePathType (&FvFileDevicePathNode->Header) == MEDIA_DEVICE_PATH &&\r
+      DevicePathSubType (&FvFileDevicePathNode->Header) == MEDIA_PIWG_FW_FILE_DP) {\r
     return (EFI_GUID *) &FvFileDevicePathNode->FvFileName;\r
   }\r
 \r