Fix doxygen issue:

[mirror_edk2.git] / MdePkg / Include / Protocol / DevicePath.h

diff --git a/MdePkg/Include/Protocol/DevicePath.h b/MdePkg/Include/Protocol/DevicePath.h
index 9b40530c3895de27b5f3289f5affea487ce7a588..c7653a4b99cde068a0d9a5b7b9e39c49389609b6 100644 (file)
--- a/MdePkg/Include/Protocol/DevicePath.h
+++ b/MdePkg/Include/Protocol/DevicePath.h
@@ -1,5 +1,5 @@
 /** @file\r
-  The device path protocol as defined in EFI 1.0.\r
+  The device path protocol as defined in UEFI 2.0.\r
 \r
   The device path represents a programatic path to a device. It's the view\r
   from a software point of view. It also must persist from boot to boot, so \r
@@ -121,7 +121,7 @@ typedef struct {
 //    Compressed ASCII is 5 bits per character 0b00001 = 'A' 0b11010 = 'Z'\r
 //\r
 #define PNP_EISA_ID_CONST         0x41d0\r
-#define EISA_ID(_Name, _Num)      ((UINT32) ((_Name) | (_Num) << 16))\r
+#define EISA_ID(_Name, _Num)      ((UINT32)((_Name) | (_Num) << 16))\r
 #define EISA_PNP_ID(_PNPId)       (EISA_ID(PNP_EISA_ID_CONST, (_PNPId)))\r
 #define EFI_PNP_ID(_PNPId)        (EISA_ID(PNP_EISA_ID_CONST, (_PNPId)))\r
 \r
@@ -135,6 +135,21 @@ typedef struct {
   UINT32                          ADR;\r
 } ACPI_ADR_DEVICE_PATH;\r
 \r
+#define ACPI_ADR_DISPLAY_TYPE_OTHER             0\r
+#define ACPI_ADR_DISPLAY_TYPE_VGA               1\r
+#define ACPI_ADR_DISPLAY_TYPE_TV                2\r
+#define ACPI_ADR_DISPLAY_TYPE_EXTERNAL_DIGITAL  3\r
+#define ACPI_ADR_DISPLAY_TYPE_INTERNAL_DIGITAL  4\r
+\r
+#define ACPI_DISPLAY_ADR(_DeviceIdScheme, _HeadId, _NonVgaOutput, _BiosCanDetect, _VendorInfo, _Type, _Port, _Index) \\r
+          ((UINT32)( (((_DeviceIdScheme) & 0x1) << 31) |  \\r
+                      (((_HeadId)         & 0x7) << 18) |  \\r
+                      (((_NonVgaOutput)   & 0x1) << 17) |  \\r
+                      (((_BiosCanDetect)  & 0x1) << 16) |  \\r
+                      (((_VendorInfo)     & 0xf) << 12) |  \\r
+                      (((_Type)           & 0xf) << 8)  |  \\r
+                      (((_Port)           & 0xf) << 4)  |  \\r
+                       ((_Index)          & 0xf) ))\r
 \r
 //\r
 // Messaging Device Paths\r
@@ -207,9 +222,9 @@ typedef struct {
 #define MSG_SATA_DP               0x12\r
 typedef struct {\r
   EFI_DEVICE_PATH_PROTOCOL        Header;\r
-  UINT16                          HbaPortNumber;\r
-  UINT16                          PortMultiplierPort;\r
-  UINT16                          LogicalUnitNumber;\r
+  UINT16                          HBAPortNumber;\r
+  UINT16                          PortMultiplierPortNumber;\r
+  UINT16                          Lun;\r
 } SATA_DEVICE_PATH;\r
 \r
 #define MSG_I2O_DP                0x06\r
@@ -309,9 +324,8 @@ typedef struct {
   EFI_DEVICE_PATH_PROTOCOL        Header;\r
   UINT16                          NetworkProtocol;\r
   UINT16                          LoginOption;\r
-  UINT16                          Reserved;\r
+  UINT64                          Lun;\r
   UINT16                          TargetPortalGroupTag;\r
-  UINT64                          LUN;\r
   // CHAR8                        iSCSI Target Name\r
 } ISCSI_DEVICE_PATH;\r
 \r
@@ -374,14 +388,14 @@ typedef struct {
 } MEDIA_PROTOCOL_DEVICE_PATH;\r
 \r
 \r
-#define MEDIA_PIWG_FW_VOL_DP      0x6\r
+#define MEDIA_PIWG_FW_VOL_DP      0x7\r
 typedef struct {\r
   EFI_DEVICE_PATH_PROTOCOL        Header;\r
   EFI_GUID                        FvName;\r
 } MEDIA_FW_VOL_DEVICE_PATH;\r
 \r
 \r
-#define MEDIA_PIWG_FW_FILE_DP     0x7\r
+#define MEDIA_PIWG_FW_FILE_DP     0x6\r
 typedef struct {\r
   EFI_DEVICE_PATH_PROTOCOL        Header;\r
   EFI_GUID                        FvFileName;\r
@@ -428,6 +442,7 @@ typedef union {
 \r
   ATAPI_DEVICE_PATH                    Atapi;\r
   SCSI_DEVICE_PATH                     Scsi;\r
+  ISCSI_DEVICE_PATH                    Iscsi;\r
   FIBRECHANNEL_DEVICE_PATH             FibreChannel;\r
 \r
   F1394_DEVICE_PATH                    F1394;\r