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 ba1d3b3dde4c8772cbf365ad3e16ae93019c18db..894a02d0354f84c04ab731d79e92700caeb5f543 100644 (file)
--- a/MdePkg/Include/Uefi/UefiInternalFormRepresentation.h
+++ b/MdePkg/Include/Uefi/UefiInternalFormRepresentation.h
@@ -1427,17 +1427,6 @@ typedef struct {
   // EFI_HII_KEYBOARD_LAYOUT Layout[];\r
 } EFI_HII_KEYBOARD_PACKAGE_HDR;\r
 \r
-//typedef struct {\r
-//  CHAR16                  Language[];           // RFC4646 Language Code\r
-//  CHAR16                  Space;\r
-//  CHAR16                  DescriptionString[];\r
-//} EFI_DESCRIPTION_STRING;\r
-\r
-//typedef struct {\r
-//  UINT16                  DescriptionCount;\r
-//  EFI_DESCRIPTION_STRING  DescriptionString[];\r
-//} EFI_DESCRIPTION_STRING_BUNDLE;\r
-\r
 //\r
 // Modifier values\r
 //\r

diff --git a/MdePkg/Include/Uefi/UefiSpec.h b/MdePkg/Include/Uefi/UefiSpec.h
index 122e239f4f66a10ada3c7c8d0656f5bbc8cfcc95..40e38d58d27e6ec91cff399e89a97faf2f55c80f 100644 (file)
--- a/MdePkg/Include/Uefi/UefiSpec.h
+++ b/MdePkg/Include/Uefi/UefiSpec.h
@@ -323,22 +323,12 @@ EFI_STATUS
 // EVT_NOTIFY_SIGNAL.\r
 //\r
 #define EVT_TIMER                         0x80000000\r
-#define EFI_EVENT_TIMER                   EVT_TIMER\r
-\r
 #define EVT_RUNTIME                       0x40000000\r
-#define EFI_EVENT_RUNTIME                 EVT_RUNTIME\r
-\r
 #define EVT_NOTIFY_WAIT                   0x00000100\r
-#define EFI_EVENT_NOTIFY_WAIT             EVT_NOTIFY_WAIT\r
-\r
 #define EVT_NOTIFY_SIGNAL                 0x00000200\r
-#define EFI_EVENT_NOTIFY_SIGNAL           EVT_NOTIFY_SIGNAL\r
 \r
 #define EVT_SIGNAL_EXIT_BOOT_SERVICES     0x00000201\r
-#define EFI_EVENT_SIGNAL_EXIT_BOOT_SERVICES         EVT_SIGNAL_EXIT_BOOT_SERVICES\r
-\r
 #define EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE 0x60000202\r
-#define EFI_EVENT_SIGNAL_VIRTUAL_ADDRESS_CHANGE     EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE\r
 \r
 //\r
 // The event's NotifyContext pointer points to a runtime memory\r

diff --git a/MdePkg/Library/UefiLib/UefiNotTiano.c b/MdePkg/Library/UefiLib/UefiNotTiano.c
index 522367993cec4660b288e712c481e0bbb67746ea..0121481a606349af976e4138832c3070b3aba5cb 100644 (file)
--- 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.
 /**\r
   An empty function to pass error checking of CreateEventEx ().\r
 \r
-  This empty function ensures that EFI_EVENT_NOTIFY_SIGNAL_ALL is error\r
+  This empty function ensures that EVT_NOTIFY_SIGNAL_ALL is error\r
   checked correctly since it is now mapped into CreateEventEx() in UEFI 2.0.\r
  \r
   @param  Event                 Event whose notification function is being invoked.\r