remove some internal definitions.

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

diff --git a/MdePkg/Include/Guid/Acpi.h b/MdePkg/Include/Guid/Acpi.h
index a7d0a11aafdcc8736673f546a01d07d728afb2de..66c6e6d42df0dc256495017074059a91bffea194 100644 (file)
--- a/MdePkg/Include/Guid/Acpi.h
+++ b/MdePkg/Include/Guid/Acpi.h
@@ -5,7 +5,7 @@
   ACPI 2.0 specification defines the ACPI 2.0 GUID. UEFI 2.0 defines the \r
   ACPI 2.0 Table GUID and ACPI Table GUID.\r
 \r
-  Copyright (c) 2006 - 2008, Intel Corporation                                                         \r
+  Copyright (c) 2006 - 2009, Intel Corporation                                                         \r
   All rights reserved. This program and the accompanying materials                          \r
   are licensed and made available under the terms and conditions of the BSD License         \r
   which accompanies this distribution.  The full text of the license may be found at        \r
@@ -22,7 +22,7 @@
 #ifndef __ACPI_GUID_H__\r
 #define __ACPI_GUID_H__\r
 \r
-#define EFI_ACPI_10_TABLE_GUID \\r
+#define ACPI_TABLE_GUID \\r
   { \\r
     0xeb9d2d30, 0x2d88, 0x11d3, {0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \\r
   }\r
@@ -32,7 +32,8 @@
     0x8868e871, 0xe4f1, 0x11d3, {0xbc, 0x22, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81 } \\r
   }\r
 \r
-#define ACPI_10_TABLE_GUID     EFI_ACPI_10_TABLE_GUID\r
+#define ACPI_10_TABLE_GUID     ACPI_TABLE_GUID\r
+\r
 //\r
 // ACPI 2.0 or newer tables should use EFI_ACPI_TABLE_GUID.\r
 //\r

diff --git a/MdePkg/Include/Guid/DxeServices.h b/MdePkg/Include/Guid/DxeServices.h
index b5d2fb9b2615b66265a566e84340917aac980973..d399dd6246b204587d90ce68001255b1ca14a9c2 100644 (file)
--- a/MdePkg/Include/Guid/DxeServices.h
+++ b/MdePkg/Include/Guid/DxeServices.h
@@ -1,7 +1,7 @@
 /** @file\r
   GUID used to identify the DXE Services Table\r
 \r
-  Copyright (c) 2006 - 2008, Intel Corporation                                                         \r
+  Copyright (c) 2006 - 2009, Intel Corporation                                                         \r
   All rights reserved. This program and the accompanying materials                          \r
   are licensed and made available under the terms and conditions of the BSD License         \r
   which accompanies this distribution.  The full text of the license may be found at        \r
@@ -18,7 +18,7 @@
 #ifndef __DXE_SERVICES_GUID_H__\r
 #define __DXE_SERVICES_GUID_H__\r
 \r
-#define EFI_DXE_SERVICES_TABLE_GUID \\r
+#define DXE_SERVICES_TABLE_GUID \\r
   { \\r
     0x5ad34ba, 0x6f02, 0x4214, {0x95, 0x2e, 0x4d, 0xa0, 0x39, 0x8e, 0x2b, 0xb9 } \\r
   }\r

diff --git a/MdePkg/Include/Guid/GlobalVariable.h b/MdePkg/Include/Guid/GlobalVariable.h
index 722fe2b1ebb5189eb7fb68ec1cbd4dc3dc76789d..ce60ee632b7d0f45ca63b8bf94873a5b89f5c658 100644 (file)
--- a/MdePkg/Include/Guid/GlobalVariable.h
+++ b/MdePkg/Include/Guid/GlobalVariable.h
@@ -1,7 +1,7 @@
 /** @file\r
   GUID for EFI (NVRAM) Variables.\r
 \r
-  Copyright (c) 2006 - 2007, Intel Corporation\r
+  Copyright (c) 2006 - 2009, Intel Corporation\r
   All rights reserved. This program and the accompanying materials                          \r
   are licensed and made available under the terms and conditions of the BSD License         \r
   which accompanies this distribution.  The full text of the license may be found at        \r
@@ -17,13 +17,11 @@
 #ifndef __GLOBAL_VARIABLE_GUID_H__\r
 #define __GLOBAL_VARIABLE_GUID_H__\r
 \r
-#define EFI_GLOBAL_VARIABLE_GUID \\r
+#define EFI_GLOBAL_VARIABLE \\r
   { \\r
     0x8BE4DF61, 0x93CA, 0x11d2, {0xAA, 0x0D, 0x00, 0xE0, 0x98, 0x03, 0x2B, 0x8C } \\r
   }\r
 \r
-#define EFI_GLOBAL_VARIABLE EFI_GLOBAL_VARIABLE_GUID\r
-\r
 extern EFI_GUID gEfiGlobalVariableGuid;\r
 \r
 #endif\r

diff --git a/MdePkg/Include/Guid/HardwareErrorVariable.h b/MdePkg/Include/Guid/HardwareErrorVariable.h
index afae5ec1e51b241d336e89029fb4fc7a85e49f34..83868fcaee484ea8a082482866a90a9e696e1430 100644 (file)
--- a/MdePkg/Include/Guid/HardwareErrorVariable.h
+++ b/MdePkg/Include/Guid/HardwareErrorVariable.h
@@ -1,7 +1,7 @@
 /** @file\r
   GUID for hardware error record variables.\r
 \r
-  Copyright (c) 2007, Intel Corporation\r
+  Copyright (c) 2007 - 2009, Intel Corporation\r
   All rights reserved. This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -20,7 +20,7 @@
 #ifndef _HARDWARE_ERROR_VARIABLE_GUID_H_\r
 #define _HARDWARE_ERROR_VARIABLE_GUID_H_\r
 \r
-#define EFI_HARDWARE_ERROR_VARIABLE_GUID \\r
+#define EFI_HARDWARE_ERROR_VARIABLE \\r
   { \\r
     0x414E6BDD, 0xE47B, 0x47cc, {0xB2, 0x44, 0xBB, 0x61, 0x02, 0x0C, 0xF5, 0x16} \\r
   }\r

diff --git a/MdePkg/Include/Guid/HobList.h b/MdePkg/Include/Guid/HobList.h
index bbe6235f3915b26332a56b1c3b479de7ba2aaa8b..73f3ac5f54fee1ed97a260051a4b5ec7e4b95153 100644 (file)
--- a/MdePkg/Include/Guid/HobList.h
+++ b/MdePkg/Include/Guid/HobList.h
@@ -3,7 +3,7 @@
 \r
   These GUIDs point the HOB List passed from PEI to DXE.\r
 \r
-  Copyright (c) 2006 - 2008, Intel Corporation                                                         \r
+  Copyright (c) 2006 - 2009, Intel Corporation                                                         \r
   All rights reserved. This program and the accompanying materials                          \r
   are licensed and made available under the terms and conditions of the BSD License         \r
   which accompanies this distribution.  The full text of the license may be found at        \r
@@ -20,7 +20,7 @@
 #ifndef __HOB_LIST_GUID_H__\r
 #define __HOB_LIST_GUID_H__\r
 \r
-#define EFI_HOB_LIST_GUID \\r
+#define HOB_LIST_GUID \\r
   { \\r
     0x7739f24c, 0x93d7, 0x11d4, {0x9a, 0x3a, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \\r
   }\r

diff --git a/MdePkg/Include/Guid/PcAnsi.h b/MdePkg/Include/Guid/PcAnsi.h
index 0140201b54e20ef0205465b9c9d135c6a2ff4a21..9f3387c2b2998adf90189c8d16faf1bc0ac8f767 100644 (file)
--- a/MdePkg/Include/Guid/PcAnsi.h
+++ b/MdePkg/Include/Guid/PcAnsi.h
@@ -1,7 +1,7 @@
 /** @file\r
   Terminal Device Path Vendor Guid.\r
 \r
-  Copyright (c) 2006, Intel Corporation                                                         \r
+  Copyright (c) 2006 - 2009, Intel Corporation                                                         \r
   All rights reserved. This program and the accompanying materials                          \r
   are licensed and made available under the terms and conditions of the BSD License         \r
   which accompanies this distribution.  The full text of the license may be found at        \r
@@ -38,7 +38,7 @@
     0xad15a0d6, 0x8bec, 0x4acf, {0xa0, 0x73, 0xd0, 0x1d, 0xe7, 0x7e, 0x2d, 0x88 } \\r
   }\r
 \r
-#define EFI_UART_DEVICE_PATH_GUID \\r
+#define DEVICE_PATH_MESSAGING_UART_FLOW_CONTROL \\r
   { \\r
     0x37499a9d, 0x542f, 0x4c89, {0xa0, 0x26, 0x35, 0xda, 0x14, 0x20, 0x94, 0xe4 } \\r
   }\r

diff --git a/MdePkg/Include/Guid/SalSystemTable.h b/MdePkg/Include/Guid/SalSystemTable.h
index 96b6ce76af1cb85809f60c5498c6e48561eed7fe..9b859c30909a13c2eac143fc649a7c05e9d419a1 100644 (file)
--- a/MdePkg/Include/Guid/SalSystemTable.h
+++ b/MdePkg/Include/Guid/SalSystemTable.h
@@ -4,7 +4,7 @@
   SAL System Table contains Itanium-based processor centric information about\r
   the system.\r
 \r
-  Copyright (c) 2006, Intel Corporation                                                         \r
+  Copyright (c) 2006 - 2009, Intel Corporation                                                         \r
   All rights reserved. This program and the accompanying materials                          \r
   are licensed and made available under the terms and conditions of the BSD License         \r
   which accompanies this distribution.  The full text of the license may be found at        \r
@@ -21,16 +21,11 @@
 #ifndef __SAL_SYSTEM_TABLE_GUID_H__\r
 #define __SAL_SYSTEM_TABLE_GUID_H__\r
 \r
-#define EFI_SAL_SYSTEM_TABLE_GUID \\r
+#define SAL_SYSTEM_TABLE_GUID \\r
   { \\r
     0xeb9d2d32, 0x2d88, 0x11d3, {0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \\r
   }\r
 \r
-//\r
-// GUID name defined in spec.\r
-//\r
-#define SAL_SYSTEM_TABLE_GUID EFI_SAL_SYSTEM_TABLE_GUID\r
-\r
 extern EFI_GUID gEfiSalSystemTableGuid;\r
 \r
 #endif\r

diff --git a/MdePkg/Include/Guid/SmBios.h b/MdePkg/Include/Guid/SmBios.h
index 98cd4ed22f05ce79c012cfa9b9e5fe5878be567d..034d670db04698e722300199fad6666d6dba7763 100644 (file)
--- a/MdePkg/Include/Guid/SmBios.h
+++ b/MdePkg/Include/Guid/SmBios.h
@@ -5,7 +5,7 @@
   locate the SMBIOS tables. Do not search the 0xF0000 segment to find SMBIOS\r
   tables.\r
 \r
-  Copyright (c) 2006, Intel Corporation                                                         \r
+  Copyright (c) 2006 - 2009, Intel Corporation                                                         \r
   All rights reserved. This program and the accompanying materials                          \r
   are licensed and made available under the terms and conditions of the BSD License         \r
   which accompanies this distribution.  The full text of the license may be found at        \r
@@ -22,13 +22,11 @@
 #ifndef __SMBIOS_GUID_H__\r
 #define __SMBIOS_GUID_H__\r
 \r
-#define EFI_SMBIOS_TABLE_GUID \\r
+#define SMBIOS_TABLE_GUID \\r
   { \\r
     0xeb9d2d31, 0x2d88, 0x11d3, {0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \\r
   }\r
 \r
-#define SMBIOS_TABLE_GUID EFI_SMBIOS_TABLE_GUID\r
-\r
 extern EFI_GUID       gEfiSmbiosTableGuid;\r
 \r
 #endif\r

diff --git a/MdePkg/Include/Protocol/DevicePath.h b/MdePkg/Include/Protocol/DevicePath.h
index ec6d2cb65d2515df54f629eb009892fbe59a4ea4..fc4c34d9236793b9f88833f7909d07ebdebb66ca 100644 (file)
--- a/MdePkg/Include/Protocol/DevicePath.h
+++ b/MdePkg/Include/Protocol/DevicePath.h
@@ -5,7 +5,7 @@
   from a software point of view. It also must persist from boot to boot, so \r
   it can not contain things like PCI bus numbers that change from boot to boot.\r
 \r
-  Copyright (c) 2006 - 2008, Intel Corporation                                                         \r
+  Copyright (c) 2006 - 2009, Intel Corporation                                                         \r
   All rights reserved. This program and the accompanying materials                          \r
   are licensed and made available under the terms and conditions of the BSD License         \r
   which accompanies this distribution.  The full text of the license may be found at        \r
@@ -663,8 +663,6 @@ typedef VENDOR_DEVICE_PATH        VENDOR_DEFINED_DEVICE_PATH;
 #define DEVICE_PATH_MESSAGING_VT_100_PLUS EFI_VT_100_PLUS_GUID\r
 #define DEVICE_PATH_MESSAGING_VT_UTF8     EFI_VT_UTF8_GUID\r
 \r
-#define DEVICE_PATH_MESSAGING_UART_FLOW_CONTROL   EFI_UART_DEVICE_PATH_GUID\r
-\r
 ///\r
 /// A new device path node is defined to declare flow control characteristics.\r
 /// UART Flow Control Messaging Device Path\r