1. Fix a UEFI errata to add UINT32 Reserved field in MEDIA_RELATIVE_OFFSET_RANGE_DEVI...

2. Swap the order of MEDIA_FW_VOL_FILEPATH_DEVICE_PATH and MEDIA_FW_VOL_DEVICE_PATH with the UEFI spec update.

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

diff --git a/MdePkg/Include/Protocol/DevicePath.h b/MdePkg/Include/Protocol/DevicePath.h
index 8a6f339c162faa344c16db0f0580ca85e2e13073..e10f5ba2a53b665783c1d967ce179c5af7f7b7c9 100644 (file)
--- a/MdePkg/Include/Protocol/DevicePath.h
+++ b/MdePkg/Include/Protocol/DevicePath.h
@@ -879,34 +879,34 @@ typedef struct {
 ///\r
 /// PIWG Firmware Volume Device Path SubType\r
 ///\r
-#define MEDIA_PIWG_FW_VOL_DP      0x7\r
+#define MEDIA_PIWG_FW_FILE_DP     0x06\r
 \r
 ///\r
-/// This device path is used by systems implementing the UEFI PI Specification 1.0 to describe a firmware volume.\r
+/// This device path is used by systems implementing the UEFI PI Specification 1.0 to describe a firmware file.\r
 ///\r
 typedef struct {\r
   EFI_DEVICE_PATH_PROTOCOL        Header;\r
   ///\r
-  /// Firmware volume name.\r
+  /// Firmware file name\r
   ///\r
-  EFI_GUID                        FvName;\r
-} MEDIA_FW_VOL_DEVICE_PATH;\r
+  EFI_GUID                        FvFileName;\r
+} MEDIA_FW_VOL_FILEPATH_DEVICE_PATH;\r
 \r
 ///\r
 /// PIWG Firmware Volume Device Path SubType\r
 ///\r
-#define MEDIA_PIWG_FW_FILE_DP     0x6\r
+#define MEDIA_PIWG_FW_VOL_DP      0x07\r
 \r
 ///\r
-/// This device path is used by systems implementing the UEFI PI Specification 1.0 to describe a firmware file.\r
+/// This device path is used by systems implementing the UEFI PI Specification 1.0 to describe a firmware volume.\r
 ///\r
 typedef struct {\r
   EFI_DEVICE_PATH_PROTOCOL        Header;\r
   ///\r
-  /// Firmware file name\r
+  /// Firmware volume name.\r
   ///\r
-  EFI_GUID                        FvFileName;\r
-} MEDIA_FW_VOL_FILEPATH_DEVICE_PATH;\r
+  EFI_GUID                        FvName;\r
+} MEDIA_FW_VOL_DEVICE_PATH;\r
 \r
 ///\r
 /// Media relative offset range device path\r
@@ -918,6 +918,7 @@ typedef struct {
 ///\r
 typedef struct {\r
   EFI_DEVICE_PATH_PROTOCOL  Header;\r
+  UINT32                    Reserved;\r
   UINT64                    StartingOffset;\r
   UINT64                    EndingOffset;\r
 } MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH;\r