use the GUIDed versions of events: EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE and EVT_SIGNAL_E...

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

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.c
index 3d5469151472e2fd6faceb58d336a17b941ce013..fb86e554809e507eb4ef598e051ff174294b5bb5 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.c
@@ -730,11 +730,12 @@ IDEBusDriverBindingStart (
       //\r
       // Create event to clear pending IDE interrupt\r
       //\r
-      Status = gBS->CreateEvent (\r
-                      EVT_SIGNAL_EXIT_BOOT_SERVICES,\r
+      Status = gBS->CreateEventEx (\r
+                      EVT_NOTIFY_SIGNAL,\r
                       TPL_NOTIFY,\r
                       ClearInterrupt,\r
                       IdeBlkIoDevicePtr,\r
+                      &gEfiEventExitBootServicesGuid,\r
                       &IdeBlkIoDevicePtr->ExitBootServiceEvent\r
                       );\r
 \r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h
index 9b5a5d6b7e6ef72bf6ed1cc09a1a7863dba71c7f..0fdacfed829220de447f2bf1378c6ea508a07f1d 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h
@@ -37,6 +37,8 @@
 #include <Library/UefiRuntimeServicesTableLib.h>\r
 #include <Library/DevicePathLib.h>\r
 \r
+#include <Guid/EventGroup.h>\r
+\r
 #include <IndustryStandard/Pci22.h>\r
 #include "IdeData.h"\r
 \r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf
index a3f466a0807f56f5fb4666d471abe34a5d7fd154..b91fc59fbe7926bc03f30cf7cb112e1de5971d99 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf
@@ -74,6 +74,7 @@
 \r
 [Guids]\r
   gEfiDiskInfoIdeInterfaceGuid                  # SOMETIMES_CONSUMED\r
+  gEfiEventExitBootServicesGuid\r
 \r
 \r
 [Protocols]\r

diff --git a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h
index 636f034fb371b0cbfd1aa6a9113569d19d0cc375..2bc73ba19068652970c60f2b95eff832887471d1 100644 (file)
--- a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h
+++ b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h
@@ -27,6 +27,7 @@
 #include <Library/DevicePathLib.h>\r
 \r
 #include <Guid/StatusCodeDataTypeId.h>\r
+#include <Guid/EventGroup.h>\r
 #include <Protocol/StatusCode.h>\r
 \r
 #include <FrameworkModuleBase.h>\r

diff --git a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf
index 6d3e3cac5f8d6f61f17383a0ca06aee105c392b0..4e335f40082f762624f7705df37065fe0abe8767 100644 (file)
--- a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf
+++ b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf
@@ -56,6 +56,8 @@
 [Guids]\r
   gEfiStatusCodeSpecificDataGuid                # ALWAYS_CONSUMED\r
   gEfiStatusCodeDataTypeDebugGuid               # ALWAYS_CONSUMED\r
+  gEfiEventExitBootServicesGuid\r
+  gEfiEventVirtualAddressChangeGuid\r
 \r
 \r
 [Protocols]\r

diff --git a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeSupport.c b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeSupport.c
index 8ecf6618ef128de4d5d8ba2b1e30922e9b65159b..c68016083137bea2a26a27bca4154f8fb0f01993 100644 (file)
--- a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeSupport.c
+++ b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeSupport.c
@@ -158,11 +158,12 @@ ReportStatusCodeLibConstruct (
   //\r
   // Register the call back of virtual address change\r
   // \r
-  Status = gBS->CreateEvent (\r
-                  EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE,\r
+  Status = gBS->CreateEventEx (\r
+                  EVT_NOTIFY_SIGNAL,\r
                   TPL_NOTIFY,\r
                   ReportStatusCodeLibVirtualAddressChange,\r
                   NULL,\r
+                  &gEfiEventVirtualAddressChangeGuid,\r
                   &mVirtualAddressChangeEvent\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
@@ -171,11 +172,12 @@ ReportStatusCodeLibConstruct (
   //\r
   // Register the call back of virtual address change\r
   // \r
-  Status = gBS->CreateEvent (\r
-                  EVT_SIGNAL_EXIT_BOOT_SERVICES,\r
+  Status = gBS->CreateEventEx (\r
+                  EVT_NOTIFY_SIGNAL,\r
                   TPL_NOTIFY,\r
                   ReportStatusCodeLibExitBootServices,\r
                   NULL,\r
+                  &gEfiEventExitBootServicesGuid,\r
                   &mExitBootServicesEvent\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h
index 38c03298c102f7916f959664b80a38355c0aa631..fdac8730fa0d0d768d12fb32b948822ebfc1d8d3 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h
@@ -23,6 +23,7 @@
 #include <Guid/MemoryStatusCodeRecord.h>\r
 #include <Protocol/StatusCode.h>\r
 #include <Guid/StatusCodeDataTypeId.h>\r
+#include <Guid/EventGroup.h>\r
 \r
 #include <Library/BaseLib.h>\r
 #include <Library/SynchronizationLib.h>\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf
index b19ce908238451edc8cd053e05371b5c054bd297..946f8112639cdf2d5903d4a026c89e4f0c1503f1 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf
@@ -80,6 +80,7 @@
   gEfiDataHubStatusCodeRecordGuid               # SOMETIMES_CONSUMED\r
   gMemoryStatusCodeRecordGuid                   # SOMETIMES_CONSUMED\r
   gEfiStatusCodeDataTypeDebugGuid               # PROTOCOL ALWAYS_CONSUMED\r
+  gEfiEventExitBootServicesGuid\r
 \r
 [Protocols]\r
   gEfiStatusCodeRuntimeProtocolGuid             # PROTOCOL ALWAYS_CONSUMED\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCodeCommon.c b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCodeCommon.c
index b1f5ebff090a54801b227dff6d8381c43acf61a3..558e7f5da60907316190a8f5716a8a5157ef6464 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCodeCommon.c
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCodeCommon.c
@@ -110,11 +110,12 @@ DxeStatusCodeDriverEntry (
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  Status = gBS->CreateEvent (\r
-                  EVT_SIGNAL_EXIT_BOOT_SERVICES,\r
+  Status = gBS->CreateEventEx (\r
+                  EVT_NOTIFY_SIGNAL,\r
                   TPL_NOTIFY,\r
                   VirtualAddressChangeCallBack,\r
                   NULL,\r
+                  &gEfiEventExitBootServicesGuid,\r
                   &mExitBootServicesEvent\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r