1. Add PeiDxeDebugLibReportStatusCode.inf and UefiLibFramework/UefiLib.inf

[mirror_edk2.git] / IntelFrameworkPkg / Library / UefiLibFramework / UefiNotTiano.c

diff --git a/IntelFrameworkPkg/Library/UefiLibFramework/UefiNotTiano.c b/IntelFrameworkPkg/Library/UefiLibFramework/UefiNotTiano.c
index 35539936ed842053532dea88e5bce0f6b079351e..59c533d8ba2b9d76c2d436cc857f2f43d2dc76e8 100644 (file)
--- a/IntelFrameworkPkg/Library/UefiLibFramework/UefiNotTiano.c
+++ b/IntelFrameworkPkg/Library/UefiLibFramework/UefiNotTiano.c
@@ -60,7 +60,7 @@ EfiCreateEventLegacyBoot (
   )\r
 {\r
   return EfiCreateEventLegacyBootEx (\r
-           EFI_TPL_CALLBACK,\r
+           TPL_CALLBACK,\r
            InternalEmptyFuntion,\r
            NULL,\r
            LegacyBootEvent\r
@@ -104,7 +104,7 @@ EfiCreateEventLegacyBootEx (
     // 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
+                    EFI_EVENT_SIGNAL_LEGACY_BOOT | EVT_NOTIFY_SIGNAL,\r
                     NotifyTpl,\r
                     NotifyFunction,\r
                     NotifyContext,\r
@@ -115,7 +115,7 @@ EfiCreateEventLegacyBootEx (
     // 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
@@ -150,7 +150,7 @@ EfiCreateEventReadyToBoot (
   )\r
 {\r
   return EfiCreateEventReadyToBootEx (\r
-           EFI_TPL_CALLBACK,\r
+           TPL_CALLBACK,\r
            InternalEmptyFuntion,\r
            NULL,\r
            ReadyToBootEvent\r
@@ -205,7 +205,7 @@ EfiCreateEventReadyToBootEx (
     // 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
@@ -289,16 +289,19 @@ EfiGetNameGuidFromFwVolDevicePathNode (
   IN CONST MEDIA_FW_VOL_FILEPATH_DEVICE_PATH  *FvDevicePathNode\r
   )\r
 {\r
+  FRAMEWORK_MEDIA_FW_VOL_FILEPATH_DEVICE_PATH  *FrameworkFvDevicePathNode;\r
+\r
   ASSERT (FvDevicePathNode != NULL);\r
 \r
+  FrameworkFvDevicePathNode = (FRAMEWORK_MEDIA_FW_VOL_FILEPATH_DEVICE_PATH  *) FvDevicePathNode;\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
+  if (FrameworkFvDevicePathNode->Tiano.Header.Type == MEDIA_DEVICE_PATH ||\r
+      FrameworkFvDevicePathNode->Tiano.Header.SubType == MEDIA_VENDOR_DP) {\r
+    if (CompareGuid (&gEfiFrameworkDevicePathGuid, &FrameworkFvDevicePathNode->Tiano.TianoSpecificDevicePath)) {\r
+      if (FrameworkFvDevicePathNode->Tiano.Type == TIANO_MEDIA_FW_VOL_FILEPATH_DEVICE_PATH_TYPE) {\r
+        return (EFI_GUID *) &FrameworkFvDevicePathNode->NameGuid;\r
       }\r
     }\r
   }\r
@@ -325,29 +328,33 @@ VOID
 EFIAPI\r
 EfiInitializeFwVolDevicepathNode (\r
   IN OUT MEDIA_FW_VOL_FILEPATH_DEVICE_PATH  *FvDevicePathNode,\r
-  IN CONST EFI_GUID                         *NameGuid\r
+  IN CONST EFI_GUID                                   *NameGuid\r
   )\r
 {\r
+  FRAMEWORK_MEDIA_FW_VOL_FILEPATH_DEVICE_PATH  *FrameworkFvDevicePathNode;\r
+\r
   ASSERT (FvDevicePathNode  != NULL);\r
   ASSERT (NameGuid          != NULL);\r
 \r
+  FrameworkFvDevicePathNode = (FRAMEWORK_MEDIA_FW_VOL_FILEPATH_DEVICE_PATH  *) FvDevicePathNode;\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
+  FrameworkFvDevicePathNode->Tiano.Header.Type     = MEDIA_DEVICE_PATH;\r
+  FrameworkFvDevicePathNode->Tiano.Header.SubType  = MEDIA_VENDOR_DP;\r
+  SetDevicePathNodeLength (&FrameworkFvDevicePathNode->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
+  CopyGuid (&FrameworkFvDevicePathNode->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
+  FrameworkFvDevicePathNode->Tiano.Type = TIANO_MEDIA_FW_VOL_FILEPATH_DEVICE_PATH_TYPE;\r
 \r
-  CopyGuid (&FvDevicePathNode->NameGuid, NameGuid);\r
+  CopyGuid (&FrameworkFvDevicePathNode->NameGuid, NameGuid);\r
 }\r
 \r