add those missing device path nodes into the union structure of EFI_DEV_PATH and EFI_DEV_PTR

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

1 files changed, 89 insertions, 71 deletions

diff --git a/MdePkg/Include/Protocol/DevicePath.h b/MdePkg/Include/Protocol/DevicePath.h
index 41608ac17f..47518961f8 100644
--- a/MdePkg/Include/Protocol/DevicePath.h
+++ b/MdePkg/Include/Protocol/DevicePath.h
@@ -5,7 +5,7 @@
   from a software point of view. The path must persist from boot to boot, so 

   it can not contain things like PCI bus numbers that change from boot to boot.

 

-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials are licensed and made available under 

 the terms and conditions of the BSD License that accompanies this distribution.  

 The full text of the license may be found at

@@ -690,9 +690,9 @@ typedef struct {
 #define UART_FLOW_CONTROL_HARDWARE         0x00000001

 #define UART_FLOW_CONTROL_XON_XOFF         0x00000010

 

-#define DEVICE_PATH_MESSAGING_SAS                 EFI_SAS_DEVICE_PATH_GUID

+#define DEVICE_PATH_MESSAGING_SAS          EFI_SAS_DEVICE_PATH_GUID

 ///

-/// Serial Attached SCSI (SAS) devices.

+/// Serial Attached SCSI (SAS) Device Path.

 ///

 typedef struct {

   EFI_DEVICE_PATH_PROTOCOL        Header;

@@ -895,7 +895,7 @@ typedef struct {
 } MEDIA_PROTOCOL_DEVICE_PATH;

 

 ///

-/// PIWG Firmware Volume Device Path SubType.

+/// PIWG Firmware File SubType.

 ///

 #define MEDIA_PIWG_FW_FILE_DP     0x06

 

@@ -987,78 +987,96 @@ typedef struct {
 /// Union of all possible Device Paths and pointers to Device Paths.

 ///

 typedef union {

-  EFI_DEVICE_PATH_PROTOCOL             DevPath;

-  PCI_DEVICE_PATH                      Pci;

-  PCCARD_DEVICE_PATH                   PcCard;

-  MEMMAP_DEVICE_PATH                   MemMap;

-  VENDOR_DEVICE_PATH                   Vendor;

-

-  CONTROLLER_DEVICE_PATH               Controller;

-  ACPI_HID_DEVICE_PATH                 Acpi;

-

-  ATAPI_DEVICE_PATH                    Atapi;

-  SCSI_DEVICE_PATH                     Scsi;

-  ISCSI_DEVICE_PATH                    Iscsi;

-  FIBRECHANNEL_DEVICE_PATH             FibreChannel;

-

-  F1394_DEVICE_PATH                    F1394;

-  USB_DEVICE_PATH                      Usb;

-  SATA_DEVICE_PATH                     Sata;

-  USB_CLASS_DEVICE_PATH                UsbClass;

-  I2O_DEVICE_PATH                      I2O;

-  MAC_ADDR_DEVICE_PATH                 MacAddr;

-  IPv4_DEVICE_PATH                     Ipv4;

-  IPv6_DEVICE_PATH                     Ipv6;

-  INFINIBAND_DEVICE_PATH               InfiniBand;

-  UART_DEVICE_PATH                     Uart;

-

-  HARDDRIVE_DEVICE_PATH                HardDrive;

-  CDROM_DEVICE_PATH                    CD;

-

-  FILEPATH_DEVICE_PATH                 FilePath;

-  MEDIA_PROTOCOL_DEVICE_PATH           MediaProtocol;

-  MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH Offset;

-

-  BBS_BBS_DEVICE_PATH                  Bbs;

+  EFI_DEVICE_PATH_PROTOCOL                   DevPath;

+  PCI_DEVICE_PATH                            Pci;

+  PCCARD_DEVICE_PATH                         PcCard;

+  MEMMAP_DEVICE_PATH                         MemMap;

+  VENDOR_DEVICE_PATH                         Vendor;

+

+  CONTROLLER_DEVICE_PATH                     Controller;

+  ACPI_HID_DEVICE_PATH                       Acpi;

+  ACPI_EXTENDED_HID_DEVICE_PATH              ExtendedAcpi;

+  ACPI_ADR_DEVICE_PATH                       AcpiAdr;

+

+  ATAPI_DEVICE_PATH                          Atapi;

+  SCSI_DEVICE_PATH                           Scsi;

+  ISCSI_DEVICE_PATH                          Iscsi;

+  FIBRECHANNEL_DEVICE_PATH                   FibreChannel;

+

+  F1394_DEVICE_PATH                          F1394;

+  USB_DEVICE_PATH                            Usb;

+  SATA_DEVICE_PATH                           Sata;

+  USB_CLASS_DEVICE_PATH                      UsbClass;

+  USB_WWID_DEVICE_PATH                       UsbWwid;

+  DEVICE_LOGICAL_UNIT_DEVICE_PATH            LogicUnit;

+  I2O_DEVICE_PATH                            I2O;

+  MAC_ADDR_DEVICE_PATH                       MacAddr;

+  IPv4_DEVICE_PATH                           Ipv4;

+  IPv6_DEVICE_PATH                           Ipv6;

+  VLAN_DEVICE_PATH                           Vlan;

+  INFINIBAND_DEVICE_PATH                     InfiniBand;

+  UART_DEVICE_PATH                           Uart;

+  UART_FLOW_CONTROL_DEVICE_PATH              UartFlowControl;

+  SAS_DEVICE_PATH                            Sas;

+  HARDDRIVE_DEVICE_PATH                      HardDrive;

+  CDROM_DEVICE_PATH                          CD;

+

+  FILEPATH_DEVICE_PATH                       FilePath;

+  MEDIA_PROTOCOL_DEVICE_PATH                 MediaProtocol;

+

+  MEDIA_FW_VOL_DEVICE_PATH                   FirmwareVolume;

+  MEDIA_FW_VOL_FILEPATH_DEVICE_PATH          FirmwareFile;

+  MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH    Offset;

+

+  BBS_BBS_DEVICE_PATH                        Bbs;

 } EFI_DEV_PATH;

 

 

 

 typedef union {

-  EFI_DEVICE_PATH_PROTOCOL             *DevPath;

-  PCI_DEVICE_PATH                      *Pci;

-  PCCARD_DEVICE_PATH                   *PcCard;

-  MEMMAP_DEVICE_PATH                   *MemMap;

-  VENDOR_DEVICE_PATH                   *Vendor;

-

-  CONTROLLER_DEVICE_PATH               *Controller;

-  ACPI_HID_DEVICE_PATH                 *Acpi;

-  ACPI_EXTENDED_HID_DEVICE_PATH        *ExtendedAcpi;

-

-  ATAPI_DEVICE_PATH                    *Atapi;

-  SCSI_DEVICE_PATH                     *Scsi;

-  FIBRECHANNEL_DEVICE_PATH             *FibreChannel;

-

-  F1394_DEVICE_PATH                    *F1394;

-  USB_DEVICE_PATH                      *Usb;

-  SATA_DEVICE_PATH                     *Sata;

-  USB_CLASS_DEVICE_PATH                *UsbClass;

-  I2O_DEVICE_PATH                      *I2O;

-  MAC_ADDR_DEVICE_PATH                 *MacAddr;

-  IPv4_DEVICE_PATH                     *Ipv4;

-  IPv6_DEVICE_PATH                     *Ipv6;

-  INFINIBAND_DEVICE_PATH               *InfiniBand;

-  UART_DEVICE_PATH                     *Uart;

-

-  HARDDRIVE_DEVICE_PATH                *HardDrive;

-  CDROM_DEVICE_PATH                    *CD;

-

-  FILEPATH_DEVICE_PATH                 *FilePath;

-  MEDIA_PROTOCOL_DEVICE_PATH           *MediaProtocol;

-  MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH *Offset;

-

-  BBS_BBS_DEVICE_PATH                  *Bbs;

-  UINT8                                *Raw;

+  EFI_DEVICE_PATH_PROTOCOL                   *DevPath;

+  PCI_DEVICE_PATH                            *Pci;

+  PCCARD_DEVICE_PATH                         *PcCard;

+  MEMMAP_DEVICE_PATH                         *MemMap;

+  VENDOR_DEVICE_PATH                         *Vendor;

+

+  CONTROLLER_DEVICE_PATH                     *Controller;

+  ACPI_HID_DEVICE_PATH                       *Acpi;

+  ACPI_EXTENDED_HID_DEVICE_PATH              *ExtendedAcpi;

+  ACPI_ADR_DEVICE_PATH                       *AcpiAdr;

+

+  ATAPI_DEVICE_PATH                          *Atapi;

+  SCSI_DEVICE_PATH                           *Scsi;

+  ISCSI_DEVICE_PATH                          *Iscsi;

+  FIBRECHANNEL_DEVICE_PATH                   *FibreChannel;

+

+  F1394_DEVICE_PATH                          *F1394;

+  USB_DEVICE_PATH                            *Usb;

+  SATA_DEVICE_PATH                           *Sata;

+  USB_CLASS_DEVICE_PATH                      *UsbClass;

+  USB_WWID_DEVICE_PATH                       *UsbWwid;

+  DEVICE_LOGICAL_UNIT_DEVICE_PATH            *LogicUnit;

+  I2O_DEVICE_PATH                            *I2O;

+  MAC_ADDR_DEVICE_PATH                       *MacAddr;

+  IPv4_DEVICE_PATH                           *Ipv4;

+  IPv6_DEVICE_PATH                           *Ipv6;

+  VLAN_DEVICE_PATH                           *Vlan;

+  INFINIBAND_DEVICE_PATH                     *InfiniBand;

+  UART_DEVICE_PATH                           *Uart;

+  UART_FLOW_CONTROL_DEVICE_PATH              *UartFlowControl;

+  SAS_DEVICE_PATH                            *Sas;

+  HARDDRIVE_DEVICE_PATH                      *HardDrive;

+  CDROM_DEVICE_PATH                          *CD;

+

+  FILEPATH_DEVICE_PATH                       *FilePath;

+  MEDIA_PROTOCOL_DEVICE_PATH                 *MediaProtocol;

+

+  MEDIA_FW_VOL_DEVICE_PATH                   *FirmwareVolume;

+  MEDIA_FW_VOL_FILEPATH_DEVICE_PATH          *FirmwareFile;

+  MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH    *Offset;

+

+  BBS_BBS_DEVICE_PATH                        *Bbs;

+  UINT8                                      *Raw;

 } EFI_DEV_PATH_PTR;

 

 #pragma pack()