From: vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 4 Sep 2008 07:38:10 +0000 (+0000)
Subject: 1. remove EFI_EVENT_ alias, replace them with EVT_
X-Git-Tag: edk2-stable201903~20408
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=9eb7382f73a1b000aca55cd0dc5b61998ec62f52

1. remove EFI_EVENT_ alias, replace them with EVT_
2. remove definitions of EFI_DESCRIPTION_STRING and EFI_DESCRIPTION_STRING_BUNDLE.

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

diff --git a/MdePkg/Include/Uefi/UefiInternalFormRepresentation.h b/MdePkg/Include/Uefi/UefiInternalFormRepresentation.h
index ba1d3b3dde..894a02d035 100644
--- a/MdePkg/Include/Uefi/UefiInternalFormRepresentation.h
+++ b/MdePkg/Include/Uefi/UefiInternalFormRepresentation.h
@@ -1427,17 +1427,6 @@ typedef struct {
   // EFI_HII_KEYBOARD_LAYOUT Layout[];
 } EFI_HII_KEYBOARD_PACKAGE_HDR;
 
-//typedef struct {
-//  CHAR16                  Language[];           // RFC4646 Language Code
-//  CHAR16                  Space;
-//  CHAR16                  DescriptionString[];
-//} EFI_DESCRIPTION_STRING;
-
-//typedef struct {
-//  UINT16                  DescriptionCount;
-//  EFI_DESCRIPTION_STRING  DescriptionString[];
-//} EFI_DESCRIPTION_STRING_BUNDLE;
-
 //
 // Modifier values
 //
diff --git a/MdePkg/Include/Uefi/UefiSpec.h b/MdePkg/Include/Uefi/UefiSpec.h
index 122e239f4f..40e38d58d2 100644
--- a/MdePkg/Include/Uefi/UefiSpec.h
+++ b/MdePkg/Include/Uefi/UefiSpec.h
@@ -323,22 +323,12 @@ EFI_STATUS
 // EVT_NOTIFY_SIGNAL.
 //
 #define EVT_TIMER                         0x80000000
-#define EFI_EVENT_TIMER                   EVT_TIMER
-
 #define EVT_RUNTIME                       0x40000000
-#define EFI_EVENT_RUNTIME                 EVT_RUNTIME
-
 #define EVT_NOTIFY_WAIT                   0x00000100
-#define EFI_EVENT_NOTIFY_WAIT             EVT_NOTIFY_WAIT
-
 #define EVT_NOTIFY_SIGNAL                 0x00000200
-#define EFI_EVENT_NOTIFY_SIGNAL           EVT_NOTIFY_SIGNAL
 
 #define EVT_SIGNAL_EXIT_BOOT_SERVICES     0x00000201
-#define EFI_EVENT_SIGNAL_EXIT_BOOT_SERVICES         EVT_SIGNAL_EXIT_BOOT_SERVICES
-
 #define EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE 0x60000202
-#define EFI_EVENT_SIGNAL_VIRTUAL_ADDRESS_CHANGE     EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE
 
 //
 // The event's NotifyContext pointer points to a runtime memory
diff --git a/MdePkg/Library/UefiLib/UefiNotTiano.c b/MdePkg/Library/UefiLib/UefiNotTiano.c
index 522367993c..0121481a60 100644
--- a/MdePkg/Library/UefiLib/UefiNotTiano.c
+++ b/MdePkg/Library/UefiLib/UefiNotTiano.c
@@ -26,7 +26,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 /**
   An empty function to pass error checking of CreateEventEx ().
 
-  This empty function ensures that EFI_EVENT_NOTIFY_SIGNAL_ALL is error
+  This empty function ensures that EVT_NOTIFY_SIGNAL_ALL is error
   checked correctly since it is now mapped into CreateEventEx() in UEFI 2.0.
  
   @param  Event                 Event whose notification function is being invoked.