Add some definitions for efi event in Uefi/UefiSpec.h to follow spec.

Changed old event definitions reference to these new event definitions.

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

5 files changed, 83 insertions, 76 deletions

diff --git a/OldMdePkg/Include/Library/UefiLib.h b/OldMdePkg/Include/Library/UefiLib.h
index 9eaf48cace..03dc5dc9b2 100644
--- a/OldMdePkg/Include/Library/UefiLib.h
+++ b/OldMdePkg/Include/Library/UefiLib.h
@@ -180,7 +180,7 @@ EfiInitializeLock (
 

 **/

 #define EFI_INITIALIZE_LOCK_VARIABLE(Priority) \

-  {Priority, EFI_TPL_APPLICATION, EfiLockReleased }

+  {Priority, TPL_APPLICATION, EfiLockReleased }

 

 

 /**

diff --git a/OldMdePkg/Include/Uefi/UefiSpec.h b/OldMdePkg/Include/Uefi/UefiSpec.h
index 6f34077068..ee1a23a091 100644
--- a/OldMdePkg/Include/Uefi/UefiSpec.h
+++ b/OldMdePkg/Include/Uefi/UefiSpec.h
@@ -341,15 +341,22 @@ EFI_STATUS
 //

 // EFI Event Types (name defined in spec)

 //

-#define EVENT_TIMER                             0x80000000

-#define EVENT_RUNTIME                           0x40000000

-#define EVENT_RUNTIME_CONTEXT                   0x20000000

+#define EVT_TIMER                               0x80000000

+#define EVT_RUNTIME                             0x40000000

+

+#define EVT_NOTIFY_WAIT                         0x00000100

+#define EVT_NOTIFY_SIGNAL                       0x00000200

+#define EVT_SIGNAL_EXIT_BOOT_SERVICES           0x00000201

+#define EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE       0x60000202

 

-#define EVENT_NOTIFY_WAIT                       0x00000100

-#define EVENT_NOTIFY_SIGNAL                     0x00000200

+#define EVENT_TIMER                             EVT_TIMER

+#define EVENT_RUNTIME                           EVT_RUNTIME

+#define EVENT_RUNTIME_CONTEXT                   0x20000000

 

-#define EVENT_SIGNAL_EXIT_BOOT_SERVICES         0x00000201

-#define EVENT_SIGNAL_VIRTUAL_ADDRESS_CHANGE     0x60000202

+#define EVENT_NOTIFY_WAIT                       EVT_NOTIFY_WAIT

+#define EVENT_NOTIFY_SIGNAL                     EVT_NOTIFY_SIGNAL

+#define EVENT_SIGNAL_EXIT_BOOT_SERVICES         EVT_SIGNAL_EXIT_BOOT_SERVICES

+#define EVENT_SIGNAL_VIRTUAL_ADDRESS_CHANGE     EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE

 

 //

 // Prior to UEFI 2.0 Tiano extended these enums. This was replaced by

diff --git a/OldMdePkg/Library/UefiDriverEntryPoint/DriverEntryPoint.c b/OldMdePkg/Library/UefiDriverEntryPoint/DriverEntryPoint.c
index 9ec19e3f4a..5e1a355060 100644
--- a/OldMdePkg/Library/UefiDriverEntryPoint/DriverEntryPoint.c
+++ b/OldMdePkg/Library/UefiDriverEntryPoint/DriverEntryPoint.c
@@ -64,7 +64,7 @@ _DriverUnloadHandler (
 

 

 /**

-  Notification Entry of ExitBootService event. In the entry, all notifications in _gDriverExitBootServicesEvent[] 

+  Notification Entry of ExitBootService event. In the entry, all notifications in _gDriverExitBootServicesEvent[]

   would be invoked.

 

   @param Event   The Event that is being processed.

@@ -127,8 +127,8 @@ _ModuleEntryPoint (
   //

   if (_gDriverExitBootServicesEvent[0] != NULL) {

     Status = gBS->CreateEvent (

-                    EFI_EVENT_SIGNAL_EXIT_BOOT_SERVICES,

-                    EFI_TPL_NOTIFY,

+                    EVT_SIGNAL_EXIT_BOOT_SERVICES,

+                    TPL_NOTIFY,

                     _DriverExitBootServices,

                     NULL,

                     &_mDriverExitBootServicesNotifyEvent

diff --git a/OldMdePkg/Library/UefiLib/UefiLib.c b/OldMdePkg/Library/UefiLib/UefiLib.c
index f03b881d35..72a2eb89d0 100644
--- a/OldMdePkg/Library/UefiLib/UefiLib.c
+++ b/OldMdePkg/Library/UefiLib/UefiLib.c
@@ -2,13 +2,13 @@
   Mde UEFI library functions.

 

   Copyright (c) 2006 - 2007, Intel Corporation<BR>

-  All rights reserved. This program and the accompanying materials                          

-  are licensed and made available under the terms and conditions of the BSD License         

-  which accompanies this distribution.  The full text of the license may be found at        

-  http://opensource.org/licenses/bsd-license.php                                            

+  All rights reserved. This program and the accompanying materials

+  are licensed and made available under the terms and conditions of the BSD License

+  which accompanies this distribution.  The full text of the license may be found at

+  http://opensource.org/licenses/bsd-license.php

 

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

   Module Name:  UefiLib.c

 

@@ -41,9 +41,9 @@ CompareIso639LanguageCode (
 }

 

 /**

-  This function searches the list of configuration tables stored in the EFI System 

-  Table for a table with a GUID that matches TableGuid.  If a match is found, 

-  then a pointer to the configuration table is returned in Table, and EFI_SUCCESS 

+  This function searches the list of configuration tables stored in the EFI System

+  Table for a table with a GUID that matches TableGuid.  If a match is found,

+  then a pointer to the configuration table is returned in Table, and EFI_SUCCESS

   is returned.  If a matching GUID is not found, then EFI_NOT_FOUND is returned.

 

   @param  TableGuid       Pointer to table's GUID type..

@@ -55,7 +55,7 @@ CompareIso639LanguageCode (
 **/

 EFI_STATUS

 EFIAPI

-EfiGetSystemConfigurationTable (  

+EfiGetSystemConfigurationTable (

   IN  EFI_GUID  *TableGuid,

   OUT VOID      **Table

   )

@@ -79,9 +79,9 @@ EfiGetSystemConfigurationTable (
 }

 

 /**

-  This function causes the notification function to be executed for every protocol 

-  of type ProtocolGuid instance that exists in the system when this function is 

-  invoked.  In addition, every time a protocol of type ProtocolGuid instance is 

+  This function causes the notification function to be executed for every protocol

+  of type ProtocolGuid instance that exists in the system when this function is

+  invoked.  In addition, every time a protocol of type ProtocolGuid instance is

   installed or reinstalled, the notification function is also executed.

 

   @param  ProtocolGuid    Supplies GUID of the protocol upon whose installation the event is fired.

@@ -90,7 +90,7 @@ EfiGetSystemConfigurationTable (
   @param  NotifyContext   The context parameter to pass to NotifyFunction.

   @param  Registration    A pointer to a memory location to receive the registration value.

 

-  @return The notification event that was created. 

+  @return The notification event that was created.

 

 **/

 EFI_EVENT

@@ -111,7 +111,7 @@ EfiCreateProtocolNotifyEvent(
   //

 

   Status = gBS->CreateEvent (

-                  EFI_EVENT_NOTIFY_SIGNAL,

+                  EVT_NOTIFY_SIGNAL,

                   NotifyTpl,

                   NotifyFunction,

                   NotifyContext,

@@ -142,13 +142,13 @@ EfiCreateProtocolNotifyEvent(
 

 /**

   This function creates an event using NotifyTpl, NoifyFunction, and NotifyContext.

-  This event is signaled with EfiNamedEventSignal().  This provide the ability for 

+  This event is signaled with EfiNamedEventSignal().  This provide the ability for

   one or more listeners on the same event named by the GUID specified by Name.

 

   @param  Name                  Supplies GUID name of the event.

   @param  NotifyTpl             Supplies the task priority level of the event notifications.

   @param  NotifyFunction        Supplies the function to notify when the event is signaled.

-  @param  NotifyContext         The context parameter to pass to NotifyFunction. 

+  @param  NotifyContext         The context parameter to pass to NotifyFunction.

   @param  Registration          A pointer to a memory location to receive the registration value.

 

   @retval EFI_SUCCESS           A named event was created.

@@ -173,7 +173,7 @@ EfiNamedEventListen (
   // Create event

   //

   Status = gBS->CreateEvent (

-                  EFI_EVENT_NOTIFY_SIGNAL,

+                  EVT_NOTIFY_SIGNAL,

                   NotifyTpl,

                   NotifyFunction,

                   (VOID *) NotifyContext,

@@ -206,7 +206,7 @@ EfiNamedEventListen (
 }

 

 /**

-  This function signals the named event specified by Name.  The named event must 

+  This function signals the named event specified by Name.  The named event must

   have been created with EfiNamedEventListen().

 

   @param  Name                  Supplies GUID name of the event.

@@ -243,13 +243,13 @@ EfiNamedEventSignal (
   return EFI_SUCCESS;

 }

 

-/** 

+/**

   Returns the current TPL.

 

-  This function returns the current TPL.  There is no EFI service to directly 

-  retrieve the current TPL. Instead, the RaiseTPL() function is used to raise 

-  the TPL to TPL_HIGH_LEVEL.  This will return the current TPL.  The TPL level 

-  can then immediately be restored back to the current TPL level with a call 

+  This function returns the current TPL.  There is no EFI service to directly

+  retrieve the current TPL. Instead, the RaiseTPL() function is used to raise

+  the TPL to TPL_HIGH_LEVEL.  This will return the current TPL.  The TPL level

+  can then immediately be restored back to the current TPL level with a call

   to RestoreTPL().

 

   @param  VOID

@@ -265,7 +265,7 @@ EfiGetCurrentTpl (
 {

   EFI_TPL Tpl;

 

-  Tpl = gBS->RaiseTPL (EFI_TPL_HIGH_LEVEL); 

+  Tpl = gBS->RaiseTPL (TPL_HIGH_LEVEL);

   gBS->RestoreTPL (Tpl);

 

   return Tpl;

@@ -273,8 +273,8 @@ EfiGetCurrentTpl (
 

 

 /**

-  This function initializes a basic mutual exclusion lock to the released state 

-  and returns the lock.  Each lock provides mutual exclusion access at its task 

+  This function initializes a basic mutual exclusion lock to the released state

+  and returns the lock.  Each lock provides mutual exclusion access at its task

   priority level.  Since there is no preemption or multiprocessor support in EFI,

   acquiring the lock only consists of raising to the locks TPL.

 

@@ -292,17 +292,17 @@ EfiInitializeLock (
   )

 {

   ASSERT (Lock != NULL);

-  ASSERT (Priority <= EFI_TPL_HIGH_LEVEL);

+  ASSERT (Priority <= TPL_HIGH_LEVEL);

 

   Lock->Tpl       = Priority;

-  Lock->OwnerTpl  = EFI_TPL_APPLICATION;

+  Lock->OwnerTpl  = TPL_APPLICATION;

   Lock->Lock      = EfiLockReleased ;

   return Lock;

 }

 

 /**

-  This function raises the system's current task priority level to the task 

-  priority level of the mutual exclusion lock.  Then, it places the lock in the 

+  This function raises the system's current task priority level to the task

+  priority level of the mutual exclusion lock.  Then, it places the lock in the

   acquired state.

 

   @param  Priority  The task priority level of the lock.

@@ -322,8 +322,8 @@ EfiAcquireLock (
 }

 

 /**

-  This function raises the system's current task priority level to the task 

-  priority level of the mutual exclusion lock.  Then, it attempts to place the 

+  This function raises the system's current task priority level to the task

+  priority level of the mutual exclusion lock.  Then, it attempts to place the

   lock in the acquired state.

 

   @param  Lock              A pointer to the lock to acquire.

@@ -357,8 +357,8 @@ EfiAcquireLockOrFail (
 }

 

 /**

-  This function transitions a mutual exclusion lock from the acquired state to 

-  the released state, and restores the system's task priority level to its 

+  This function transitions a mutual exclusion lock from the acquired state to

+  the released state, and restores the system's task priority level to its

   previous level.

 

   @param  Lock  A pointer to the lock to release.

@@ -376,7 +376,7 @@ EfiReleaseLock (
   ASSERT (Lock->Lock == EfiLockAcquired);

 

   Tpl = Lock->OwnerTpl;

-  

+

   Lock->Lock = EfiLockReleased;

 

   gBS->RestoreTPL (Tpl);

@@ -389,7 +389,7 @@ EfiReleaseLock (
   currently managing the controller specified by ControllerHandle.  This test

   is performed by evaluating if the the protocol specified by ProtocolGuid is

   present on ControllerHandle and is was opened by DriverBindingHandle with an

-  attribute of EFI_OPEN_PROTOCOL_BY_DRIVER. 

+  attribute of EFI_OPEN_PROTOCOL_BY_DRIVER.

   If ProtocolGuid is NULL, then ASSERT().

 
   @param  ControllerHandle     A handle for a controller to test.
@@ -452,10 +452,10 @@ EfiTestManagedDevice (
   ChildHandle with an attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.

   If ProtocolGuid is NULL, then ASSERT().

 
-  @param  ControllerHandle     A handle for a (parent) controller to test. 
+  @param  ControllerHandle     A handle for a (parent) controller to test.
   @param  ChildHandle          A child handle to test.
   @param  ConsumsedGuid        Supplies the protocol that the child controller
-                               opens on its parent controller. 
+                               opens on its parent controller.
 
   @retval EFI_SUCCESS          ChildHandle is a child of the ControllerHandle.
   @retval EFI_UNSUPPORTED      ChildHandle is not a child of the
@@ -502,37 +502,37 @@ EfiTestChildHandle (
       break;

     }

   }

-  

+

   FreePool (OpenInfoBuffer);

   return Status;

 }

 

 /**

-  This function looks up a Unicode string in UnicodeStringTable.  If Language is 

+  This function looks up a Unicode string in UnicodeStringTable.  If Language is

   a member of SupportedLanguages and a Unicode string is found in UnicodeStringTable

-  that matches the language code specified by Language, then it is returned in 

+  that matches the language code specified by Language, then it is returned in

   UnicodeString.

 

-  @param  Language                A pointer to the ISO 639-2 language code for the 

+  @param  Language                A pointer to the ISO 639-2 language code for the

                                   Unicode string to look up and return.

-  @param  SupportedLanguages      A pointer to the set of ISO 639-2 language codes 

-                                  that the Unicode string table supports.  Language 

+  @param  SupportedLanguages      A pointer to the set of ISO 639-2 language codes

+                                  that the Unicode string table supports.  Language

                                   must be a member of this set.

   @param  UnicodeStringTable      A pointer to the table of Unicode strings.

   @param  UnicodeString           A pointer to the Unicode string from UnicodeStringTable

                                   that matches the language specified by Language.

 

-  @retval  EFI_SUCCESS            The Unicode string that matches the language 

+  @retval  EFI_SUCCESS            The Unicode string that matches the language

                                   specified by Language was found

-                                  in the table of Unicoide strings UnicodeStringTable, 

+                                  in the table of Unicoide strings UnicodeStringTable,

                                   and it was returned in UnicodeString.

   @retval  EFI_INVALID_PARAMETER  Language is NULL.

   @retval  EFI_INVALID_PARAMETER  UnicodeString is NULL.

   @retval  EFI_UNSUPPORTED        SupportedLanguages is NULL.

   @retval  EFI_UNSUPPORTED        UnicodeStringTable is NULL.

-  @retval  EFI_UNSUPPORTED        The language specified by Language is not a 

+  @retval  EFI_UNSUPPORTED        The language specified by Language is not a

                                   member of SupportedLanguages.

-  @retval  EFI_UNSUPPORTED        The language specified by Language is not 

+  @retval  EFI_UNSUPPORTED        The language specified by Language is not

                                   supported by UnicodeStringTable.

 

 **/

@@ -593,13 +593,13 @@ LookupUnicodeString (
 

 /**

   This function adds a Unicode string to UnicodeStringTable.

-  If Language is a member of SupportedLanguages then UnicodeString is added to 

-  UnicodeStringTable.  New buffers are allocated for both Language and 

-  UnicodeString.  The contents of Language and UnicodeString are copied into 

-  these new buffers.  These buffers are automatically freed when 

+  If Language is a member of SupportedLanguages then UnicodeString is added to

+  UnicodeStringTable.  New buffers are allocated for both Language and

+  UnicodeString.  The contents of Language and UnicodeString are copied into

+  these new buffers.  These buffers are automatically freed when

   FreeUnicodeStringTable() is called.

 

-  @param  Language                A pointer to the ISO 639-2 language code for the Unicode 

+  @param  Language                A pointer to the ISO 639-2 language code for the Unicode

                                   string to add.

   @param  SupportedLanguages      A pointer to the set of ISO 639-2 language codes

                                   that the Unicode string table supports.

@@ -607,19 +607,19 @@ LookupUnicodeString (
   @param  UnicodeStringTable      A pointer to the table of Unicode strings.

   @param  UnicodeString           A pointer to the Unicode string to add.

 

-  @retval EFI_SUCCESS             The Unicode string that matches the language 

-                                  specified by Language was found in the table of 

-                                  Unicode strings UnicodeStringTable, and it was 

+  @retval EFI_SUCCESS             The Unicode string that matches the language

+                                  specified by Language was found in the table of

+                                  Unicode strings UnicodeStringTable, and it was

                                   returned in UnicodeString.

   @retval EFI_INVALID_PARAMETER   Language is NULL.

   @retval EFI_INVALID_PARAMETER   UnicodeString is NULL.

   @retval EFI_INVALID_PARAMETER   UnicodeString is an empty string.

   @retval EFI_UNSUPPORTED         SupportedLanguages is NULL.

-  @retval EFI_ALREADY_STARTED     A Unicode string with language Language is 

+  @retval EFI_ALREADY_STARTED     A Unicode string with language Language is

                                   already present in UnicodeStringTable.

-  @retval EFI_OUT_OF_RESOURCES    There is not enough memory to add another 

+  @retval EFI_OUT_OF_RESOURCES    There is not enough memory to add another

                                   Unicode string to UnicodeStringTable.

-  @retval EFI_UNSUPPORTED         The language specified by Language is not a 

+  @retval EFI_UNSUPPORTED         The language specified by Language is not a

                                   member of SupportedLanguages.

 

 **/

@@ -760,7 +760,7 @@ AddUnicodeString (
 /**

   This function frees the table of Unicode strings in UnicodeStringTable.

   If UnicodeStringTable is NULL, then EFI_SUCCESS is returned.

-  Otherwise, each language code, and each Unicode string in the Unicode string 

+  Otherwise, each language code, and each Unicode string in the Unicode string

   table are freed, and EFI_SUCCESS is returned.

 

   @param  UnicodeStringTable  A pointer to the table of Unicode strings.

diff --git a/OldMdePkg/Library/UefiLib/UefiNotTiano.c b/OldMdePkg/Library/UefiLib/UefiNotTiano.c
index 081e25439e..d588ecea8e 100644
--- a/OldMdePkg/Library/UefiLib/UefiNotTiano.c
+++ b/OldMdePkg/Library/UefiLib/UefiNotTiano.c
@@ -59,7 +59,7 @@ EfiCreateEventLegacyBoot (
   )

 {

   return EfiCreateEventLegacyBootEx (

-           EFI_TPL_CALLBACK,

+           TPL_CALLBACK,

            InternalEmptyFuntion,

            NULL,

            LegacyBootEvent

@@ -114,7 +114,7 @@ EfiCreateEventLegacyBootEx (
     // For UEFI 2.0 and the future use an Event Group

     //

     Status = gBS->CreateEventEx (

-                    EVENT_NOTIFY_SIGNAL,

+                    EVT_NOTIFY_SIGNAL,

                     NotifyTpl,

                     NotifyFunction,

                     NotifyContext,

@@ -149,7 +149,7 @@ EfiCreateEventReadyToBoot (
   )

 {

   return EfiCreateEventReadyToBootEx (

-           EFI_TPL_CALLBACK,

+           TPL_CALLBACK,

            InternalEmptyFuntion,

            NULL,

            ReadyToBootEvent

@@ -204,7 +204,7 @@ EfiCreateEventReadyToBootEx (
     // For UEFI 2.0 and the future use an Event Group

     //

     Status = gBS->CreateEventEx (

-                    EVENT_NOTIFY_SIGNAL,

+                    EVT_NOTIFY_SIGNAL,

                     NotifyTpl,

                     NotifyFunction,

                     NotifyContext,