From 6a27a4ebd0668054382ea9c7fd861743cbfa276e Mon Sep 17 00:00:00 2001 From: jji4 Date: Wed, 4 Feb 2009 01:29:55 +0000 Subject: [PATCH] use the GUIDed versions of events: EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE and EVT_SIGNAL_EXIT_BOOT_SERVICES git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7424 6f19259b-4bc3-4df7-8a09-765794883524 --- IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.c | 5 +++-- IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h | 2 ++ .../Bus/Pci/IdeBusDxe/IdeBusDxe.inf | 1 + .../ReportStatusCodeLibInternal.h | 1 + .../SmmRuntimeDxeReportStatusCodeLibFramework.inf | 2 ++ .../SmmRuntimeDxeSupport.c | 10 ++++++---- .../Universal/StatusCode/Dxe/DxeStatusCode.h | 1 + .../Universal/StatusCode/Dxe/DxeStatusCode.inf | 1 + .../Universal/StatusCode/Dxe/DxeStatusCodeCommon.c | 5 +++-- 9 files changed, 20 insertions(+), 8 deletions(-) diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.c index 3d54691514..fb86e55480 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.c +++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.c @@ -730,11 +730,12 @@ IDEBusDriverBindingStart ( // // Create event to clear pending IDE interrupt // - Status = gBS->CreateEvent ( - EVT_SIGNAL_EXIT_BOOT_SERVICES, + Status = gBS->CreateEventEx ( + EVT_NOTIFY_SIGNAL, TPL_NOTIFY, ClearInterrupt, IdeBlkIoDevicePtr, + &gEfiEventExitBootServicesGuid, &IdeBlkIoDevicePtr->ExitBootServiceEvent ); diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h index 9b5a5d6b7e..0fdacfed82 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h +++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h @@ -37,6 +37,8 @@ #include #include +#include + #include #include "IdeData.h" diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf index a3f466a080..b91fc59fbe 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf +++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf @@ -74,6 +74,7 @@ [Guids] gEfiDiskInfoIdeInterfaceGuid # SOMETIMES_CONSUMED + gEfiEventExitBootServicesGuid [Protocols] diff --git a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h index 636f034fb3..2bc73ba190 100644 --- a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h +++ b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h @@ -27,6 +27,7 @@ #include #include +#include #include #include diff --git a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf index 6d3e3cac5f..4e335f4008 100644 --- a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf +++ b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf @@ -56,6 +56,8 @@ [Guids] gEfiStatusCodeSpecificDataGuid # ALWAYS_CONSUMED gEfiStatusCodeDataTypeDebugGuid # ALWAYS_CONSUMED + gEfiEventExitBootServicesGuid + gEfiEventVirtualAddressChangeGuid [Protocols] diff --git a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeSupport.c b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeSupport.c index 8ecf6618ef..c680160831 100644 --- a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeSupport.c +++ b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeSupport.c @@ -158,11 +158,12 @@ ReportStatusCodeLibConstruct ( // // Register the call back of virtual address change // - Status = gBS->CreateEvent ( - EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE, + Status = gBS->CreateEventEx ( + EVT_NOTIFY_SIGNAL, TPL_NOTIFY, ReportStatusCodeLibVirtualAddressChange, NULL, + &gEfiEventVirtualAddressChangeGuid, &mVirtualAddressChangeEvent ); ASSERT_EFI_ERROR (Status); @@ -171,11 +172,12 @@ ReportStatusCodeLibConstruct ( // // Register the call back of virtual address change // - Status = gBS->CreateEvent ( - EVT_SIGNAL_EXIT_BOOT_SERVICES, + Status = gBS->CreateEventEx ( + EVT_NOTIFY_SIGNAL, TPL_NOTIFY, ReportStatusCodeLibExitBootServices, NULL, + &gEfiEventExitBootServicesGuid, &mExitBootServicesEvent ); ASSERT_EFI_ERROR (Status); diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h index 38c03298c1..fdac8730fa 100644 --- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h +++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h @@ -23,6 +23,7 @@ #include #include #include +#include #include #include diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf index b19ce90823..946f811263 100644 --- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf +++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf @@ -80,6 +80,7 @@ gEfiDataHubStatusCodeRecordGuid # SOMETIMES_CONSUMED gMemoryStatusCodeRecordGuid # SOMETIMES_CONSUMED gEfiStatusCodeDataTypeDebugGuid # PROTOCOL ALWAYS_CONSUMED + gEfiEventExitBootServicesGuid [Protocols] gEfiStatusCodeRuntimeProtocolGuid # PROTOCOL ALWAYS_CONSUMED diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCodeCommon.c b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCodeCommon.c index b1f5ebff09..558e7f5da6 100644 --- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCodeCommon.c +++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCodeCommon.c @@ -110,11 +110,12 @@ DxeStatusCodeDriverEntry ( ); ASSERT_EFI_ERROR (Status); - Status = gBS->CreateEvent ( - EVT_SIGNAL_EXIT_BOOT_SERVICES, + Status = gBS->CreateEventEx ( + EVT_NOTIFY_SIGNAL, TPL_NOTIFY, VirtualAddressChangeCallBack, NULL, + &gEfiEventExitBootServicesGuid, &mExitBootServicesEvent ); ASSERT_EFI_ERROR (Status); -- 2.39.2