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 33a14522a9edc933cc1b073ab3367240447fae2c..f51a16cb7e7a2a648bddd7c557c97f24b2a9f880 100644 (file)
--- a/MdePkg/Library/UefiLib/UefiNotTiano.c
+++ b/MdePkg/Library/UefiLib/UefiNotTiano.c
@@ -18,6 +18,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/\r
 \r
 \r
+//\r
+// Include common header file for this module.\r
+//\r
+#include "UefiLibInternal.h"\r
+\r
 /**\r
   An empty function to pass error checking of CreateEventEx ().\r
 \r
@@ -59,7 +64,7 @@ EfiCreateEventLegacyBoot (
   )\r
 {\r
   return EfiCreateEventLegacyBootEx (\r
-           EFI_TPL_CALLBACK,\r
+           TPL_CALLBACK,\r
            InternalEmptyFuntion,\r
            NULL,\r
            LegacyBootEvent\r
@@ -98,34 +103,23 @@ EfiCreateEventLegacyBootEx (
 \r
   ASSERT (LegacyBootEvent != NULL);\r
 \r
-  if (gST->Hdr.Revision < 0x00020000) {\r
-    //\r
-    // prior to UEFI 2.0 use Tiano extension to EFI\r
-    //\r
-    Status = gBS->CreateEvent (\r
-                    EFI_EVENT_SIGNAL_LEGACY_BOOT | EFI_EVENT_NOTIFY_SIGNAL_ALL,\r
-                    NotifyTpl,\r
-                    NotifyFunction,\r
-                    NotifyContext,\r
-                    LegacyBootEvent\r
-                    );\r
-  } else 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
     // For UEFI 2.0 and the future use an Event Group\r
     //\r
     Status = gBS->CreateEventEx (\r
-                    EVENT_NOTIFY_SIGNAL,\r
+                    EVT_NOTIFY_SIGNAL,\r
                     NotifyTpl,\r
                     NotifyFunction,\r
                     NotifyContext,\r
                     &gEfiEventLegacyBootGuid,\r
                     LegacyBootEvent\r
                     );\r
-  } else {\r
-    //\r
-    // For EFI 1.10 with no Tiano extensions return unsupported\r
-    //\r
-    Status = EFI_UNSUPPORTED;\r
   }\r
 \r
   return Status;\r
@@ -154,7 +148,7 @@ EfiCreateEventReadyToBoot (
   )\r
 {\r
   return EfiCreateEventReadyToBootEx (\r
-           EFI_TPL_CALLBACK,\r
+           TPL_CALLBACK,\r
            InternalEmptyFuntion,\r
            NULL,\r
            ReadyToBootEvent\r
@@ -193,34 +187,23 @@ EfiCreateEventReadyToBootEx (
 \r
   ASSERT (ReadyToBootEvent != NULL);\r
 \r
-  if (gST->Hdr.Revision < 0x00020000) {\r
-    //\r
-    // prior to UEFI 2.0 use Tiano extension to EFI\r
-    //\r
-    Status = gBS->CreateEvent (\r
-                    EFI_EVENT_SIGNAL_READY_TO_BOOT | EFI_EVENT_NOTIFY_SIGNAL_ALL,\r
-                    NotifyTpl,\r
-                    NotifyFunction,\r
-                    NotifyContext,\r
-                    ReadyToBootEvent\r
-                    );\r
-  } else 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
     // For UEFI 2.0 and the future use an Event Group\r
     //\r
     Status = gBS->CreateEventEx (\r
-                    EVENT_NOTIFY_SIGNAL,\r
+                    EVT_NOTIFY_SIGNAL,\r
                     NotifyTpl,\r
                     NotifyFunction,\r
                     NotifyContext,\r
                     &gEfiEventReadyToBootGuid,\r
                     ReadyToBootEvent\r
                     );\r
-  } else {\r
-    //\r
-    // For EFI 1.10 with no Tiano extensions return unsupported\r
-    //\r
-    Status = EFI_UNSUPPORTED;\r
   }\r
 \r
   return Status;\r
@@ -292,24 +275,18 @@ 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
+  ASSERT (FvFileDevicePathNode != NULL);\r
 \r
-  //\r
-  // Use the new Device path that does not conflict with the UEFI\r
-  //\r
-  if (FvDevicePathNode->Tiano.Header.Type == MEDIA_DEVICE_PATH ||\r
-      FvDevicePathNode->Tiano.Header.SubType == MEDIA_VENDOR_DP) {\r
-    if (CompareGuid (&gEfiFrameworkDevicePathGuid, &FvDevicePathNode->Tiano.TianoSpecificDevicePath)) {\r
-      if (FvDevicePathNode->Tiano.Type == TIANO_MEDIA_FW_VOL_FILEPATH_DEVICE_PATH_TYPE) {\r
-        return (EFI_GUID *) &FvDevicePathNode->NameGuid;\r
-      }\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
@@ -333,30 +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
   // Use the new Device path that does not conflict with the UEFI\r
   //\r
-  FvDevicePathNode->Tiano.Header.Type     = MEDIA_DEVICE_PATH;\r
-  FvDevicePathNode->Tiano.Header.SubType  = MEDIA_VENDOR_DP;\r
-  SetDevicePathNodeLength (&FvDevicePathNode->Tiano.Header, sizeof (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH));\r
-\r
-  //\r
-  // Add the GUID for generic Tiano device paths\r
-  //\r
-  CopyGuid (&FvDevicePathNode->Tiano.TianoSpecificDevicePath, &gEfiFrameworkDevicePathGuid);\r
-\r
-  //\r
-  // Add in the FW Vol File Path Tiano defined information\r
-  //\r
-  FvDevicePathNode->Tiano.Type = TIANO_MEDIA_FW_VOL_FILEPATH_DEVICE_PATH_TYPE;\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 (&FvDevicePathNode->NameGuid, NameGuid);\r
+  CopyGuid (&FvFileDevicePathNode->FvFileName, NameGuid);\r
 }\r
 \r