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

10 files changed, 84 insertions, 84 deletions

diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/bc.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/bc.c
index 251690205a..0eceddf261 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/bc.c
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/bc.c
@@ -417,8 +417,8 @@ WaitForReceive (
   // Create callback event and set timer

   //

   StatCode = gBS->CreateEvent (

-                    EFI_EVENT_TIMER,

-                    EFI_TPL_CALLBACK,

+                    EVT_TIMER,

+                    TPL_CALLBACK,

                     NULL,

                     NULL,

                     &CallbackEvent

@@ -622,8 +622,8 @@ SendPacket (
   // headersize should be zero if not filled in

   //

   StatCode = gBS->CreateEvent (

-                    EFI_EVENT_TIMER,

-                    EFI_TPL_CALLBACK,

+                    EVT_TIMER,

+                    TPL_CALLBACK,

                     NULL,

                     NULL,

                     &TimeoutEvent

@@ -695,8 +695,8 @@ SendPacket (
   // immediately

   //

   StatCode = gBS->CreateEvent (

-                    EFI_EVENT_TIMER,

-                    EFI_TPL_CALLBACK,

+                    EVT_TIMER,

+                    TPL_CALLBACK,

                     NULL,

                     NULL,

                     &TimeoutEvent

@@ -2009,7 +2009,7 @@ BcSetStationIP (
     StationIpPtr = &PxebcMode->StationIp;

   }

 

-  if (!IS_INADDR_UNICAST (StationIpPtr) || 

+  if (!IS_INADDR_UNICAST (StationIpPtr) ||

       ((StationIpPtr->Addr[0] | SubnetMask) == BROADCAST_IPv4)) {

     //

     // The station IP is not a unicast address.

@@ -2159,10 +2159,10 @@ PxeBcDriverStart (
   //

   // Lock access, just in case

   //

-  EfiInitializeLock (&Private->Lock, EFI_TPL_CALLBACK);

+  EfiInitializeLock (&Private->Lock, TPL_CALLBACK);

   EfiAcquireLock (&Private->Lock);

 

-  EfiInitializeLock (&pLF->Lock, EFI_TPL_CALLBACK);

+  EfiInitializeLock (&pLF->Lock, TPL_CALLBACK);

   EfiAcquireLock (&pLF->Lock);

 

   //

diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_arp.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_arp.c
index b7edbe69a8..747d243f1f 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_arp.c
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_arp.c
@@ -1,13 +1,13 @@
 /*++

 

-Copyright (c) 2006 - 2007, Intel Corporation                                                         

-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.             

+Copyright (c) 2006 - 2007, Intel Corporation

+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.

 

 Module Name:

   pxe_bc_arp.c

@@ -405,7 +405,7 @@ Returns:
 // not how it would be done in a full system

 //

 #define ARP_REQUEST_TIMEOUT_MS  500 // try for half a second

-  

+

   ////////////////////////////////////////////////////////////

 //

 //  BC Arp Routine

@@ -543,8 +543,8 @@ Returns:
   //

   //

   StatCode = gBS->CreateEvent (

-                    EFI_EVENT_TIMER,

-                    EFI_TPL_CALLBACK,

+                    EVT_TIMER,

+                    TPL_CALLBACK,

                     NULL,

                     NULL,

                     &TimeoutEvent

diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c
index a1f4715cd0..b557f4cae3 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c
@@ -587,8 +587,8 @@ SetStationIP (
   }

 

   EfiStatus = gBS->CreateEvent (

-                    EFI_EVENT_TIMER,

-                    EFI_TPL_CALLBACK,

+                    EVT_TIMER,

+                    TPL_CALLBACK,

                     NULL,

                     NULL,

                     &Private->Igmpv1TimeoutEvent

@@ -1283,8 +1283,8 @@ GetOffers (
   //

   Private->GotProxy[DHCP_ONLY_IX] = 1;

   StatCode = gBS->CreateEvent (

-                    EFI_EVENT_TIMER,

-                    EFI_TPL_CALLBACK,

+                    EVT_TIMER,

+                    TPL_CALLBACK,

                     NULL,

                     NULL,

                     &TimeoutEvent

@@ -1522,8 +1522,8 @@ GetBINLAck (
   //

   //

   StatCode = gBS->CreateEvent (

-                    EFI_EVENT_TIMER,

-                    EFI_TPL_CALLBACK,

+                    EVT_TIMER,

+                    TPL_CALLBACK,

                     NULL,

                     NULL,

                     &TimeoutEvent

@@ -1770,8 +1770,8 @@ TryFinishDORA (
   //

   //

   StatCode = gBS->CreateEvent (

-                    EFI_EVENT_TIMER,

-                    EFI_TPL_CALLBACK,

+                    EVT_TIMER,

+                    TPL_CALLBACK,

                     NULL,

                     NULL,

                     &TimeoutEvent

@@ -2599,8 +2599,8 @@ Returns:
     //

     //

     StatCode = gBS->CreateEvent (

-                      EFI_EVENT_TIMER,

-                      EFI_TPL_CALLBACK,

+                      EVT_TIMER,

+                      TPL_CALLBACK,

                       NULL,

                       NULL,

                       &TimeoutEvent

diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_igmp.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_igmp.c
index 83ca20b292..22dcf25524 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_igmp.c
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_igmp.c
@@ -83,8 +83,8 @@ Returns:
   }

 

   EfiStatus = gBS->CreateEvent (

-                    EFI_EVENT_TIMER,

-                    EFI_TPL_CALLBACK,

+                    EVT_TIMER,

+                    TPL_CALLBACK,

                     NULL,

                     NULL,

                     &Private->IgmpGroupEvent[TimerId]

@@ -405,8 +405,8 @@ Returns:
       }

 

       EfiStatus = gBS->CreateEvent (

-                        EFI_EVENT_TIMER,

-                        EFI_TPL_CALLBACK,

+                        EVT_TIMER,

+                        TPL_CALLBACK,

                         NULL,

                         NULL,

                         &Private->Igmpv1TimeoutEvent

diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_mtftp.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_mtftp.c
index 941076aed0..e2afbffa89 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_mtftp.c
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_mtftp.c
@@ -117,8 +117,8 @@ Returns:
   //

   //

   Status = gBS->CreateEvent (

-                  EFI_EVENT_TIMER,

-                  EFI_TPL_CALLBACK,

+                  EVT_TIMER,

+                  TPL_CALLBACK,

                   NULL,

                   NULL,

                   &TimeoutEvent

diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_loadfile.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_loadfile.c
index 85bb8bb2bf..20ae95d981 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_loadfile.c
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_loadfile.c
@@ -1,17 +1,17 @@
 /*++

 

-Copyright (c) 2006 - 2007, Intel Corporation                                                         

-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.             

+Copyright (c) 2006 - 2007, Intel Corporation

+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.

 

 Module Name:

   pxe_loadfile.c

-  

+

 Abstract:

   An implementation of the load file protocol for network devices.

 

@@ -65,9 +65,9 @@ Arguments:
 

 Returns:

 

-  EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE - 

+  EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE -

   EFI_PXE_BASE_CODE_CALLBACK_STATUS_ABORT -

-  

+

 --*/

 {

   STATIC UINTN  Propeller;

@@ -173,7 +173,7 @@ Arguments:
 Returns:

 

   None

-  

+

 --*/

 {

   if (Ptr != NULL) {

@@ -199,7 +199,7 @@ Arguments:
 Returns:

 

   None

-  

+

 --*/

 {

   EFI_PXE_BASE_CODE_MODE  *PxeBcMode;

@@ -276,11 +276,11 @@ Arguments:
 

 Returns:

 

-  AUTO_SELECT - 

+  AUTO_SELECT -

   DO_MENU -

-  NO_MENU - 

-  LOCAL_BOOT - 

-  

+  NO_MENU -

+  LOCAL_BOOT -

+

 --*/

 {

   EFI_STATUS  Status;

@@ -307,8 +307,8 @@ Returns:
   //

   //

   Status = gBS->CreateEvent (

-                  EFI_EVENT_TIMER,

-                  EFI_TPL_CALLBACK,

+                  EVT_TIMER,

+                  TPL_CALLBACK,

                   NULL,

                   NULL,

                   &TimeoutEvent

@@ -332,8 +332,8 @@ Returns:
   //

   //

   Status = gBS->CreateEvent (

-                  EFI_EVENT_TIMER,

-                  EFI_TPL_CALLBACK,

+                  EVT_TIMER,

+                  TPL_CALLBACK,

                   NULL,

                   NULL,

                   &SecondsEvent

@@ -375,7 +375,7 @@ Returns:
 

   gST->ConOut->SetCursorPosition (gST->ConOut, SecColumn, SecRow);

   AsciiPrint ("(%d) ", SecsLeft);

-  

+

   //

   // set the default action to be AUTO_SELECT

   //

@@ -507,9 +507,9 @@ Arguments:
 

 Returns:

 

-  NO_MENU - 

-  LOCAL_BOOT - 

-  

+  NO_MENU -

+  LOCAL_BOOT -

+

 --*/

 {

   PXE_OP_DISCOVERY_CONTROL  *DiscoveryControlPtr;

@@ -804,7 +804,7 @@ Arguments:
 Returns:

 

   Value from DHCP option

-  

+

 --*/

 {

   if (OpPtr->Header.Length == 1) {

@@ -836,7 +836,7 @@ Arguments:
 Returns:

 

   Pointer to opcode, may be NULL

-  

+

 --*/

 {

   if (BufferPtr == NULL) {

@@ -889,7 +889,7 @@ Arguments:
 Returns:

 

   Pointer to option in packet

-  

+

 --*/

 {

   UINTN PacketLen;

@@ -1234,9 +1234,9 @@ Arguments:
 

 Returns:

 

-  EFI_SUCCESS - 

-  EFI_NOT_READY - 

-  

+  EFI_SUCCESS -

+  EFI_NOT_READY -

+

 --*/

 {

   EFI_PXE_BASE_CODE_MODE      *PxeBcMode;

@@ -1363,7 +1363,7 @@ Arguments:
   This -  Pointer to Loadfile interface

   FilePath - Not used and not checked

   BootPolicy - Must be TRUE

-  BufferSize - Pointer to buffer size 

+  BufferSize - Pointer to buffer size

   Buffer - Pointer to download buffer or NULL

 

 Returns:

diff --git a/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/support.c b/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/support.c
index 503d5a6038..b6667ca4ed 100644
--- a/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/support.c
+++ b/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/support.c
@@ -558,8 +558,8 @@ Returns:
   // Setup timeout event and start timer.

   //

   efi_status = gBS->CreateEvent (

-                      EFI_EVENT_TIMER | EFI_EVENT_NOTIFY_SIGNAL,

-                      EFI_TPL_NOTIFY,

+                      EVT_TIMER | EVT_NOTIFY_SIGNAL,

+                      TPL_NOTIFY,

                       &timeout_notify,

                       Private,

                       &Private->TimeoutEvent

@@ -588,8 +588,8 @@ Returns:
   // Setup periodic event for callbacks

   //

   efi_status = gBS->CreateEvent (

-                      EFI_EVENT_TIMER | EFI_EVENT_NOTIFY_SIGNAL,

-                      EFI_TPL_NOTIFY,

+                      EVT_TIMER | EVT_NOTIFY_SIGNAL,

+                      TPL_NOTIFY,

                       &periodic_notify,

                       Private,

                       &Private->PeriodicEvent

diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/callback.c b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/callback.c
index 2821e650f0..6f6ac81d59 100644
--- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/callback.c
+++ b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/callback.c
@@ -112,7 +112,7 @@ Returns:
   // created at a lower level (TPL_CALLBACK) it gives an assert!

   //

   if (mInitializeLock) {

-    EfiInitializeLock (&mLock, EFI_TPL_NOTIFY);

+    EfiInitializeLock (&mLock, TPL_NOTIFY);

     mInitializeLock = FALSE;

   }

 

diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/initialize.c b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/initialize.c
index 80e6033ff7..9e0ecca709 100644
--- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/initialize.c
+++ b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/initialize.c
@@ -1,12 +1,12 @@
 /*++

-Copyright (c) 2006, Intel Corporation                                                         

-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.             

+Copyright (c) 2006, Intel Corporation

+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.

 

 Module name:

   initialize.c

@@ -190,8 +190,8 @@ Returns:
   //

   //

   EfiStatus = gBS->CreateEvent (

-                    EFI_EVENT_NOTIFY_WAIT,

-                    EFI_TPL_NOTIFY,

+                    EVT_NOTIFY_WAIT,

+                    TPL_NOTIFY,

                     &SnpWaitForPacketNotify,

                     snp,

                     &snp->snp.WaitForPacket

diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/snp.c b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/snp.c
index a32812a01a..4b8d6f8107 100644
--- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/snp.c
+++ b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/snp.c
@@ -453,7 +453,7 @@ Arguments:
 

   snp->Signature  = SNP_DRIVER_SIGNATURE;

 

-  EfiInitializeLock (&snp->lock, EFI_TPL_NOTIFY);

+  EfiInitializeLock (&snp->lock, TPL_NOTIFY);

 

   snp->snp.Revision       = EFI_SIMPLE_NETWORK_PROTOCOL_REVISION;

   snp->snp.Start          = snp_undi32_start;