Removed CommonHeader.h generated file from the MdePkg.

[mirror_edk2.git] / MdePkg / Library / UefiLib / UefiNotTiano.c

diff --git a/MdePkg/Library/UefiLib/UefiNotTiano.c b/MdePkg/Library/UefiLib/UefiNotTiano.c
index b00cc22d8231c80b07e75c97c19b0a9269847b88..f51a16cb7e7a2a648bddd7c557c97f24b2a9f880 100644 (file)
--- a/MdePkg/Library/UefiLib/UefiNotTiano.c
+++ b/MdePkg/Library/UefiLib/UefiNotTiano.c
@@ -21,7 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //\r
 // Include common header file for this module.\r
 //\r
-#include "CommonHeader.h"\r
+#include "UefiLibInternal.h"\r
 \r
 /**\r
   An empty function to pass error checking of CreateEventEx ().\r
@@ -103,7 +103,10 @@ EfiCreateEventLegacyBootEx (
 \r
   ASSERT (LegacyBootEvent != NULL);\r
 \r
-  if (gST->Hdr.Revision < 0x00020000) {\r
+  if (gST->Hdr.Revision < EFI_2_00_SYSTEM_TABLE_REVISION) {\r
+    DEBUG ((EFI_D_ERROR, "EFI1.1 can't support LegacyBootEvent!"));\r
+    ASSERT (FALSE);\r
+\r
     return EFI_UNSUPPORTED;\r
   } else {\r
     //\r
@@ -145,7 +148,7 @@ EfiCreateEventReadyToBoot (
   )\r
 {\r
   return EfiCreateEventReadyToBootEx (\r
-           TPL_CALLBACK ,\r
+           TPL_CALLBACK,\r
            InternalEmptyFuntion,\r
            NULL,\r
            ReadyToBootEvent\r
@@ -184,7 +187,10 @@ EfiCreateEventReadyToBootEx (
 \r
   ASSERT (ReadyToBootEvent != NULL);\r
 \r
-  if (gST->Hdr.Revision < 0x00020000) {\r
+  if (gST->Hdr.Revision < EFI_2_00_SYSTEM_TABLE_REVISION) {\r
+    DEBUG ((EFI_D_ERROR, "EFI1.1 can't support ReadyToBootEvent!"));\r
+    ASSERT (FALSE);\r
+\r
     return EFI_UNSUPPORTED;\r
   } else {\r
     //\r
@@ -269,16 +275,20 @@ EfiSignalEventLegacyBoot (
   @retval Other             FvDevicePathNode is valid and pointer to NameGuid was returned.\r
 \r
 **/\r
-EFI_GUID *\r
+EFI_GUID*\r
 EFIAPI\r
 EfiGetNameGuidFromFwVolDevicePathNode (\r
-  IN CONST MEDIA_FW_VOL_FILEPATH_DEVICE_PATH  *FvDevicePathNode\r
+  IN CONST MEDIA_FW_VOL_FILEPATH_DEVICE_PATH  *FvFileDevicePathNode\r
   )\r
 {\r
-  ASSERT (FvDevicePathNode != NULL);\r
-  //\r
-  //  bugbug:Need to implement ...\r
-  //\r
+  ASSERT (FvFileDevicePathNode != NULL);\r
+\r
+  if (FvFileDevicePathNode->Header.Type == MEDIA_DEVICE_PATH &&\r
+      FvFileDevicePathNode->Header.SubType == MEDIA_PIWG_FW_FILE_DP\r
+     ) {\r
+    return (EFI_GUID *) &FvFileDevicePathNode->FvFileName;\r
+  }\r
+\r
   return NULL;\r
 }\r
 \r
@@ -300,14 +310,20 @@ EfiGetNameGuidFromFwVolDevicePathNode (
 VOID\r
 EFIAPI\r
 EfiInitializeFwVolDevicepathNode (\r
-  IN OUT MEDIA_FW_VOL_FILEPATH_DEVICE_PATH  *FvDevicePathNode,\r
-  IN CONST EFI_GUID                         *NameGuid\r
+  IN OUT    MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *FvFileDevicePathNode,\r
+  IN CONST  EFI_GUID                          *NameGuid\r
   )\r
 {\r
-  ASSERT (FvDevicePathNode  != NULL);\r
+  ASSERT (FvFileDevicePathNode  != NULL);\r
   ASSERT (NameGuid          != NULL);\r
+\r
   //\r
-  //  bugbug:Need to implement ...\r
+  // Use the new Device path that does not conflict with the UEFI\r
   //\r
+  FvFileDevicePathNode->Header.Type     = MEDIA_DEVICE_PATH;\r
+  FvFileDevicePathNode->Header.SubType  = MEDIA_PIWG_FW_FILE_DP;\r
+  SetDevicePathNodeLength (&FvFileDevicePathNode->Header, sizeof (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH));\r
+\r
+  CopyGuid (&FvFileDevicePathNode->FvFileName, NameGuid);\r
 }\r
 \r