remove some internal definitions.

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

8 files changed, 18 insertions, 26 deletions

diff --git a/MdePkg/Include/Guid/Acpi.h b/MdePkg/Include/Guid/Acpi.h
index a7d0a11aaf..66c6e6d42d 100644
--- 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 

   ACPI 2.0 Table GUID and ACPI Table GUID.

 

-  Copyright (c) 2006 - 2008, Intel Corporation                                                         

+  Copyright (c) 2006 - 2009, 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        

@@ -22,7 +22,7 @@
 #ifndef __ACPI_GUID_H__

 #define __ACPI_GUID_H__

 

-#define EFI_ACPI_10_TABLE_GUID \

+#define ACPI_TABLE_GUID \

   { \

     0xeb9d2d30, 0x2d88, 0x11d3, {0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \

   }

@@ -32,7 +32,8 @@
     0x8868e871, 0xe4f1, 0x11d3, {0xbc, 0x22, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81 } \

   }

 

-#define ACPI_10_TABLE_GUID     EFI_ACPI_10_TABLE_GUID

+#define ACPI_10_TABLE_GUID     ACPI_TABLE_GUID

+

 //

 // ACPI 2.0 or newer tables should use EFI_ACPI_TABLE_GUID.

 //

diff --git a/MdePkg/Include/Guid/DxeServices.h b/MdePkg/Include/Guid/DxeServices.h
index b5d2fb9b26..d399dd6246 100644
--- a/MdePkg/Include/Guid/DxeServices.h
+++ b/MdePkg/Include/Guid/DxeServices.h
@@ -1,7 +1,7 @@
 /** @file

   GUID used to identify the DXE Services Table

 

-  Copyright (c) 2006 - 2008, Intel Corporation                                                         

+  Copyright (c) 2006 - 2009, 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        

@@ -18,7 +18,7 @@
 #ifndef __DXE_SERVICES_GUID_H__

 #define __DXE_SERVICES_GUID_H__

 

-#define EFI_DXE_SERVICES_TABLE_GUID \

+#define DXE_SERVICES_TABLE_GUID \

   { \

     0x5ad34ba, 0x6f02, 0x4214, {0x95, 0x2e, 0x4d, 0xa0, 0x39, 0x8e, 0x2b, 0xb9 } \

   }

diff --git a/MdePkg/Include/Guid/GlobalVariable.h b/MdePkg/Include/Guid/GlobalVariable.h
index 722fe2b1eb..ce60ee632b 100644
--- a/MdePkg/Include/Guid/GlobalVariable.h
+++ b/MdePkg/Include/Guid/GlobalVariable.h
@@ -1,7 +1,7 @@
 /** @file

   GUID for EFI (NVRAM) Variables.

 

-  Copyright (c) 2006 - 2007, Intel Corporation

+  Copyright (c) 2006 - 2009, 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        

@@ -17,13 +17,11 @@
 #ifndef __GLOBAL_VARIABLE_GUID_H__

 #define __GLOBAL_VARIABLE_GUID_H__

 

-#define EFI_GLOBAL_VARIABLE_GUID \

+#define EFI_GLOBAL_VARIABLE \

   { \

     0x8BE4DF61, 0x93CA, 0x11d2, {0xAA, 0x0D, 0x00, 0xE0, 0x98, 0x03, 0x2B, 0x8C } \

   }

 

-#define EFI_GLOBAL_VARIABLE EFI_GLOBAL_VARIABLE_GUID

-

 extern EFI_GUID gEfiGlobalVariableGuid;

 

 #endif

diff --git a/MdePkg/Include/Guid/HardwareErrorVariable.h b/MdePkg/Include/Guid/HardwareErrorVariable.h
index afae5ec1e5..83868fcaee 100644
--- a/MdePkg/Include/Guid/HardwareErrorVariable.h
+++ b/MdePkg/Include/Guid/HardwareErrorVariable.h
@@ -1,7 +1,7 @@
 /** @file

   GUID for hardware error record variables.

 

-  Copyright (c) 2007, Intel Corporation

+  Copyright (c) 2007 - 2009, 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

@@ -20,7 +20,7 @@
 #ifndef _HARDWARE_ERROR_VARIABLE_GUID_H_

 #define _HARDWARE_ERROR_VARIABLE_GUID_H_

 

-#define EFI_HARDWARE_ERROR_VARIABLE_GUID \

+#define EFI_HARDWARE_ERROR_VARIABLE \

   { \

     0x414E6BDD, 0xE47B, 0x47cc, {0xB2, 0x44, 0xBB, 0x61, 0x02, 0x0C, 0xF5, 0x16} \

   }

diff --git a/MdePkg/Include/Guid/HobList.h b/MdePkg/Include/Guid/HobList.h
index bbe6235f39..73f3ac5f54 100644
--- a/MdePkg/Include/Guid/HobList.h
+++ b/MdePkg/Include/Guid/HobList.h
@@ -3,7 +3,7 @@
 

   These GUIDs point the HOB List passed from PEI to DXE.

 

-  Copyright (c) 2006 - 2008, Intel Corporation                                                         

+  Copyright (c) 2006 - 2009, 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        

@@ -20,7 +20,7 @@
 #ifndef __HOB_LIST_GUID_H__

 #define __HOB_LIST_GUID_H__

 

-#define EFI_HOB_LIST_GUID \

+#define HOB_LIST_GUID \

   { \

     0x7739f24c, 0x93d7, 0x11d4, {0x9a, 0x3a, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \

   }

diff --git a/MdePkg/Include/Guid/PcAnsi.h b/MdePkg/Include/Guid/PcAnsi.h
index 0140201b54..9f3387c2b2 100644
--- a/MdePkg/Include/Guid/PcAnsi.h
+++ b/MdePkg/Include/Guid/PcAnsi.h
@@ -1,7 +1,7 @@
 /** @file

   Terminal Device Path Vendor Guid.

 

-  Copyright (c) 2006, Intel Corporation                                                         

+  Copyright (c) 2006 - 2009, 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        

@@ -38,7 +38,7 @@
     0xad15a0d6, 0x8bec, 0x4acf, {0xa0, 0x73, 0xd0, 0x1d, 0xe7, 0x7e, 0x2d, 0x88 } \

   }

 

-#define EFI_UART_DEVICE_PATH_GUID \

+#define DEVICE_PATH_MESSAGING_UART_FLOW_CONTROL \

   { \

     0x37499a9d, 0x542f, 0x4c89, {0xa0, 0x26, 0x35, 0xda, 0x14, 0x20, 0x94, 0xe4 } \

   }

diff --git a/MdePkg/Include/Guid/SalSystemTable.h b/MdePkg/Include/Guid/SalSystemTable.h
index 96b6ce76af..9b859c3090 100644
--- 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

   the system.

 

-  Copyright (c) 2006, Intel Corporation                                                         

+  Copyright (c) 2006 - 2009, 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        

@@ -21,16 +21,11 @@
 #ifndef __SAL_SYSTEM_TABLE_GUID_H__

 #define __SAL_SYSTEM_TABLE_GUID_H__

 

-#define EFI_SAL_SYSTEM_TABLE_GUID \

+#define SAL_SYSTEM_TABLE_GUID \

   { \

     0xeb9d2d32, 0x2d88, 0x11d3, {0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \

   }

 

-//

-// GUID name defined in spec.

-//

-#define SAL_SYSTEM_TABLE_GUID EFI_SAL_SYSTEM_TABLE_GUID

-

 extern EFI_GUID gEfiSalSystemTableGuid;

 

 #endif

diff --git a/MdePkg/Include/Guid/SmBios.h b/MdePkg/Include/Guid/SmBios.h
index 98cd4ed22f..034d670db0 100644
--- 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

   tables.

 

-  Copyright (c) 2006, Intel Corporation                                                         

+  Copyright (c) 2006 - 2009, 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        

@@ -22,13 +22,11 @@
 #ifndef __SMBIOS_GUID_H__

 #define __SMBIOS_GUID_H__

 

-#define EFI_SMBIOS_TABLE_GUID \

+#define SMBIOS_TABLE_GUID \

   { \

     0xeb9d2d31, 0x2d88, 0x11d3, {0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \

   }

 

-#define SMBIOS_TABLE_GUID EFI_SMBIOS_TABLE_GUID

-

 extern EFI_GUID       gEfiSmbiosTableGuid;

 

 #endif