EFI Specification extension on Media Device Path. MEDIA_FW_VOL_FILEPATH_DEVICE_PATH...

[mirror_edk2.git] / EdkCompatibilityPkg / Foundation / Library / RuntimeDxe / EfiRuntimeLib / RtDevicePath.c

diff --git a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/RtDevicePath.c b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/RtDevicePath.c
index ac777802d740dfd3bea02d8f6d8686f65ac76aa1..77d232be24c11e71e2ca467b599365e25ba16260 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/RtDevicePath.c
+++ b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/RtDevicePath.c
@@ -617,33 +617,15 @@ Returns:
 \r
 --*/\r
 {\r
-#if (EFI_SPECIFICATION_VERSION != 0x00020000)\r
   //\r
-  // Use old Device Path\r
+  // EFI Specification extension on Media Device Path. MEDIA_FW_VOL_FILEPATH_DEVICE_PATH is adopted by UEFI later and added in UEFI2.10. \r
+  // In EdkCompatibility Package, we only support MEDIA_FW_VOL_FILEPATH_DEVICE_PATH that complies with\r
+  // EFI 1.10 and UEFI 2.10.\r
   //\r
   FvDevicePathNode->Header.Type     = MEDIA_DEVICE_PATH;\r
   FvDevicePathNode->Header.SubType  = MEDIA_FV_FILEPATH_DP;\r
   SetDevicePathNodeLength (&FvDevicePathNode->Header, sizeof (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH));\r
 \r
-#else\r
-  //\r
-  // Use the new Device path that does not conflict with the UEFI 2.0\r
-  //\r
-  FvDevicePathNode->Piwg.Header.Type     = MEDIA_DEVICE_PATH;\r
-  FvDevicePathNode->Piwg.Header.SubType  = MEDIA_VENDOR_DP;\r
-  SetDevicePathNodeLength (&FvDevicePathNode->Piwg.Header, sizeof (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH));\r
-\r
-  //\r
-  // Add the GUID for generic PIWG device paths\r
-  //\r
-  EfiCopyMem (&FvDevicePathNode->Piwg.PiwgSpecificDevicePath, &gEfiFrameworkDevicePathGuid, sizeof(EFI_GUID));\r
-\r
-  //\r
-  // Add in the FW Vol File Path PIWG defined inforation\r
-  //\r
-  FvDevicePathNode->Piwg.Type = PIWG_MEDIA_FW_VOL_FILEPATH_DEVICE_PATH_TYPE;\r
-\r
-#endif\r
   EfiCopyMem (&FvDevicePathNode->NameGuid, NameGuid, sizeof(EFI_GUID));\r
 }\r
 \r
@@ -678,28 +660,16 @@ Returns:
 \r
 --*/\r
 {\r
-#if (EFI_SPECIFICATION_VERSION != 0x00020000)\r
   //\r
-  // Use old Device Path\r
+  // EFI Specification extension on Media Device Path. MEDIA_FW_VOL_FILEPATH_DEVICE_PATH is adopted by UEFI later and added in UEFI2.10. \r
+  // In EdkCompatibility Package, we only support MEDIA_FW_VOL_FILEPATH_DEVICE_PATH that complies with\r
+  // EFI 1.10 and UEFI 2.10.\r
   //\r
   if (DevicePathType (&FvDevicePathNode->Header) == MEDIA_DEVICE_PATH &&\r
       DevicePathSubType (&FvDevicePathNode->Header) == MEDIA_FV_FILEPATH_DP) {\r
     return &FvDevicePathNode->NameGuid;\r
   }\r
 \r
-#else\r
-  //\r
-  // Use the new Device path that does not conflict with the UEFI 2.0\r
-  //\r
-  if (DevicePathType (&FvDevicePathNode->Piwg.Header) == MEDIA_DEVICE_PATH &&\r
-      DevicePathSubType (&FvDevicePathNode->Piwg.Header) == MEDIA_VENDOR_DP) {\r
-    if (EfiCompareGuid (&gEfiFrameworkDevicePathGuid, &FvDevicePathNode->Piwg.PiwgSpecificDevicePath)) {\r
-      if (FvDevicePathNode->Piwg.Type == PIWG_MEDIA_FW_VOL_FILEPATH_DEVICE_PATH_TYPE) {\r
-        return &FvDevicePathNode->NameGuid;\r
-      }\r
-    }\r
-  }\r
-#endif  \r
-  return NULL;\r
+   return NULL;\r
 }\r
 \r