Move FileInfo.h, FileSystemInfo.h, FileSystemVolumeLabelInfo.h from protocol director...

[mirror_edk2.git] / MdePkg / Include / Uefi / UefiSpec.h

diff --git a/MdePkg/Include/Uefi/UefiSpec.h b/MdePkg/Include/Uefi/UefiSpec.h
index 9993cd44e7d2aea7afb9e35290902bddf7d25dca..53d601bbf0041eb15507b6184c0ca17052832987 100644 (file)
--- a/MdePkg/Include/Uefi/UefiSpec.h
+++ b/MdePkg/Include/Uefi/UefiSpec.h
@@ -1839,11 +1839,7 @@ typedef struct {
 #define HW_CONTROLLER_DP          0x05\r
 typedef struct {\r
   EFI_DEVICE_PATH_PROTOCOL        Header;\r
-#if EDK_RELEASE_VERSION >= 0x00020000\r
   UINT32                          ControllerNumber;\r
-#else\r
-  UINT32                          Controller;\r
-#endif\r
 } CONTROLLER_DEVICE_PATH;\r
 \r
 //\r
@@ -1945,6 +1941,7 @@ typedef struct {
     UINT8                         DeviceProtocol;\r
 } USB_CLASS_DEVICE_PATH;\r
 \r
+#if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
 #define MSG_USB_WWID_DP           0x10\r
 typedef struct {\r
     EFI_DEVICE_PATH_PROTOCOL      Header;\r
@@ -1957,8 +1954,9 @@ typedef struct {
 #define MSG_DEVICE_LOGICAL_UNIT_DP  0x11\r
 typedef struct {\r
     EFI_DEVICE_PATH_PROTOCOL      Header;\r
-    UINT8                         LUN;\r
+    UINT8                         Lun;\r
 } DEVICE_LOGICAL_UNIT_DEVICE_PATH;\r
+#endif\r
 \r
 #define MSG_I2O_DP                0x06\r
 typedef struct {\r
@@ -2030,8 +2028,27 @@ typedef struct {
 #define DEVICE_PATH_MESSAGING_VT_100      EFI_VT_100_GUID\r
 #define DEVICE_PATH_MESSAGING_VT_100_PLUS EFI_VT_100_PLUS_GUID\r
 #define DEVICE_PATH_MESSAGING_VT_UTF8     EFI_VT_UTF8_GUID\r
-#define DEVICE_PATH_MESSAGING_SAS         EFI_SAS_DEVICE_PATH_GUID\r
 \r
+#if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
+\r
+#define DEVICE_PATH_MESSAGING_UART_FLOW_CONTROL   EFI_UART_DEVICE_PATH_GUID\r
+#define DEVICE_PATH_MESSAGING_SAS                 EFI_SAS_DEVICE_PATH_GUID\r
+\r
+typedef struct {\r
+  EFI_DEVICE_PATH_PROTOCOL        Header;\r
+  EFI_GUID                        Guid;\r
+  UINT32                          FlowControlMap;\r
+} UART_FLOW_CONTROL_DEVICE_PATH;\r
+\r
+typedef struct {\r
+  EFI_DEVICE_PATH_PROTOCOL        Header;\r
+  EFI_GUID                        Guid;\r
+  UINT32                          Reserved;\r
+  UINT64                          SasAddress;\r
+  UINT64                          Lun;\r
+  UINT16                          DeviceTopology;\r
+  UINT16                          RelativeTargetPort;\r
+} SAS_DEVICE_PATH;\r
 \r
 #define MSG_ISCSI_DP              0x13\r
 typedef struct {\r
@@ -2053,6 +2070,7 @@ typedef struct {
 #define ISCSI_LOGIN_OPTION_CHAP_BI                      0x0000\r
 #define ISCSI_LOGIN_OPTION_CHAP_UNI                     0x2000\r
 \r
+#endif\r
 \r
 //\r
 // Media Device Path\r
@@ -2119,22 +2137,22 @@ typedef struct {
 \r
 typedef struct {\r
   EFI_DEVICE_PATH_PROTOCOL  Header;\r
-  EFI_GUID                  PiwgSpecificDevicePath;\r
+  EFI_GUID                  TianoSpecificDevicePath;\r
   UINT32                    Type;\r
-} PIWG_DEVICE_PATH;\r
+} TIANO_DEVICE_PATH;\r
 \r
-#define PIWG_MEDIA_FW_VOL_FILEPATH_DEVICE_PATH_TYPE         0x01\r
+#define TIANO_MEDIA_FW_VOL_FILEPATH_DEVICE_PATH_TYPE         0x01\r
 typedef struct {\r
-  PIWG_DEVICE_PATH      Piwg;\r
+  TIANO_DEVICE_PATH     Tiano;\r
   EFI_GUID              NameGuid;\r
 } MEDIA_FW_VOL_FILEPATH_DEVICE_PATH;\r
 \r
 //\r
 // Place holder for a future extension\r
 //\r
-#define PIWG_MEDIAFW_VOL_DEVICE_PATH_TYPE                   0x02\r
+#define TIANO_MEDIAFW_VOL_DEVICE_PATH_TYPE                   0x02\r
 typedef struct {\r
-  PIWG_DEVICE_PATH      Piwg;\r
+  TIANO_DEVICE_PATH     Tiano;\r
   EFI_GUID              VolumeGuid;\r
 } MEDIA_FW_VOL_DEVICE_PATH;\r
 \r
@@ -2357,9 +2375,6 @@ typedef enum {
 #include <Protocol/DriverDiagnostics.h>\r
 #include <Protocol/Ebc.h>\r
 #include <Protocol/EfiNetworkInterfaceIdentifier.h>\r
-#include <Protocol/FileInfo.h>\r
-#include <Protocol/FileSystemInfo.h>\r
-#include <Protocol/FileSystemVolumeLabelInfo.h>\r
 #include <Protocol/PciIo.h>\r
 #include <Protocol/PciRootBridgeIo.h>\r
 #include <Protocol/PlatformDriverOverride.h>\r
@@ -2379,7 +2394,9 @@ typedef enum {
 #include <Guid/PcAnsi.h>\r
 #include <Guid/SmBios.h>\r
 #include <Guid/SalSystemTable.h>\r
-\r
+#include <Guid/FileInfo.h>\r
+#include <Guid/FileSystemInfo.h>\r
+#include <Guid/FileSystemVolumeLabelInfo.h>\r
 \r
 #if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
 //\r