Sync all bug fixes between EDK1.04 and EDK1.06 into EdkCompatibilityPkg.

[mirror_edk2.git] / EdkCompatibilityPkg / Foundation / Framework / Include / TianoSpecDevicePath.h

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Include/TianoSpecDevicePath.h b/EdkCompatibilityPkg/Foundation/Framework/Include/TianoSpecDevicePath.h
index a2f45a4a540903f76af6dfd70ea58694d08494fc..4f6cb395d68f439540ae021d40b591b37cebc52c 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Include/TianoSpecDevicePath.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Include/TianoSpecDevicePath.h
@@ -1,7 +1,7 @@
 /*++\r
  \r
-Copyright (c) 2004 - 2007, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
 http://opensource.org/licenses/bsd-license.php                                            \r
@@ -22,52 +22,11 @@ Abstract:
 #ifndef _TIANO_SPEC_DEVICE_PATH_H\r
 #define _TIANO_SPEC_DEVICE_PATH_H\r
 \r
-#pragma pack(1)\r
+#include "EfiDevicePath.h"\r
 \r
-#if (EFI_SPECIFICATION_VERSION < 0x00020000)\r
 //\r
-// EFI Specification extension on Media Device Path\r
+// MEDIA_FW_VOL_FILEPATH_DEVICE_PATH and MEDIA_FW_VOL_DEVICE_PATH are defined in \r
+// EfiDevicePath.h\r
 //\r
-#define MEDIA_FV_FILEPATH_DP  0x06\r
-typedef struct {\r
-  EFI_DEVICE_PATH_PROTOCOL  Header;\r
-  EFI_GUID                  NameGuid;\r
-} MEDIA_FW_VOL_FILEPATH_DEVICE_PATH;\r
-#endif\r
-\r
-\r
-#if (EFI_SPECIFICATION_VERSION == 0x00020000)\r
-//\r
-// For UEFI 2.0, use GUIDed PIWG device path to work-around EFI Specification extension on Media Device Path\r
-//\r
-typedef struct {\r
-  EFI_DEVICE_PATH_PROTOCOL  Header;\r
-  EFI_GUID                  PiwgSpecificDevicePath;\r
-  UINT32                    Type;\r
-} PIWG_DEVICE_PATH;\r
-\r
-#define PIWG_MEDIA_FW_VOL_FILEPATH_DEVICE_PATH_TYPE         0x01\r
-typedef struct {\r
-  PIWG_DEVICE_PATH      Piwg;\r
-  EFI_GUID              NameGuid;\r
-} MEDIA_FW_VOL_FILEPATH_DEVICE_PATH;\r
-\r
-//\r
-// Place holder for a future extension\r
-//\r
-#define PIWG_MEDIA_FW_VOL_DEVICE_PATH_TYPE                  0x02\r
-typedef struct {\r
-  PIWG_DEVICE_PATH      Piwg;\r
-  EFI_GUID              VolumeGuid;\r
-} MEDIA_FW_VOL_DEVICE_PATH;\r
-#endif\r
-\r
-#if (EFI_SPECIFICATION_VERSION > 0x00020000)\r
-//\r
-// EFI Specification extension on Media Device Path was added to UEFI 2.1 specification,\r
-// so the definition is moved to EfiDevicePath.h\r
-//\r
-#endif\r
 \r
-#pragma pack()\r
 #endif\r