Removed CommonHeader.h generated file from the MdePkg.

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

diff --git a/MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf b/MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
index 1a0aa72977b8d1fa899d5d6d3dd108705a7ee496..156fa86c02314b1200c8dc1124fec59f5868d222 100644 (file)
--- a/MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
+++ b/MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
@@ -43,9 +43,6 @@
 #\r
 ################################################################################\r
 \r
 #\r
 ################################################################################\r
 \r

-[Sources.common]\r
-  CommonHeader.h\r
-\r

 [Sources.Ia32]\r
   x86Cache.c\r
 \r
 [Sources.Ia32]\r
   x86Cache.c\r
 \r

diff --git a/MdePkg/Library/BaseCacheMaintenanceLib/CommonHeader.h b/MdePkg/Library/BaseCacheMaintenanceLib/CommonHeader.h
deleted file mode 100644 (file)
index d0df949..0000000
--- a/MdePkg/Library/BaseCacheMaintenanceLib/CommonHeader.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2007 - 2007, 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
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <Base.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/CacheMaintenanceLib.h>\r
-#include <Library/BaseLib.h>\r
-#include <Library/DebugLib.h>\r
-\r
-#endif\r

diff --git a/MdePkg/Library/BaseCacheMaintenanceLib/EbcCache.c b/MdePkg/Library/BaseCacheMaintenanceLib/EbcCache.c
index 45d44db067745692a4cdffaf8dfcdbf811c4eab1..ccb5010fd0e3b53551e544a858ecc91b821bc42c 100644 (file)
--- a/MdePkg/Library/BaseCacheMaintenanceLib/EbcCache.c
+++ b/MdePkg/Library/BaseCacheMaintenanceLib/EbcCache.c
@@ -15,7 +15,8 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include <Base.h>\r
+#include <Library/DebugLib.h>\r

 \r
 /**\r
   Invalidates the entire instruction cache in cache coherency domain of the\r
 \r
 /**\r
   Invalidates the entire instruction cache in cache coherency domain of the\r

diff --git a/MdePkg/Library/BaseCacheMaintenanceLib/IpfCache.c b/MdePkg/Library/BaseCacheMaintenanceLib/IpfCache.c
index e714eae02b592c5e56895bb086f492526cdb642b..8461d68ee28f7ca01a0d56bd150f4935efafef63 100644 (file)
--- a/MdePkg/Library/BaseCacheMaintenanceLib/IpfCache.c
+++ b/MdePkg/Library/BaseCacheMaintenanceLib/IpfCache.c
@@ -16,7 +16,9 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include <Base.h>\r
+#include <Library/BaseLib.h>\r
+#include <Library/DebugLib.h>\r

 \r
 /**\r
   Invalidates the entire instruction cache in cache coherency domain of the\r
 \r
 /**\r
   Invalidates the entire instruction cache in cache coherency domain of the\r

diff --git a/MdePkg/Library/BaseCacheMaintenanceLib/x86Cache.c b/MdePkg/Library/BaseCacheMaintenanceLib/x86Cache.c
index 276e763309472c595751159e1cacf706c807167d..9cb5589297d4eea4dc9ef1dc8a71363c0fbe5eec 100644 (file)
--- a/MdePkg/Library/BaseCacheMaintenanceLib/x86Cache.c
+++ b/MdePkg/Library/BaseCacheMaintenanceLib/x86Cache.c
@@ -17,7 +17,9 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include <Base.h>\r
+#include <Library/BaseLib.h>\r
+#include <Library/DebugLib.h>\r

 \r
 //\r
 // This size must be at or below the smallest cache size possible among all\r
 \r
 //\r
 // This size must be at or below the smallest cache size possible among all\r

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
index 736947e12a758374a398f136fa96371b0dd9c6c9..157cb4986c477153c29e4af8aaa216b9d337e460 100644 (file)
--- a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
+++ b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
@@ -45,7 +45,7 @@
 \r
 [Sources.common]\r
   IoLibMmioBuffer.c\r
 \r
 [Sources.common]\r
   IoLibMmioBuffer.c\r

-  CommonHeader.h\r
+  BaseIoLibIntrinsicInternal.h\r

 \r
 [Sources.Ia32]\r
   IoHighLevel.c\r
 \r
 [Sources.Ia32]\r
   IoHighLevel.c\r

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicInternal.h b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicInternal.h
new file mode 100644 (file)
index 0000000..56858d1
--- /dev/null
+++ b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicInternal.h
@@ -0,0 +1,34 @@
+/**@file\r
+  Common header file shared by all source files.\r
+\r
+  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
+\r
+  Copyright (c) 2007 - 2007, 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
+   http://opensource.org/licenses/bsd-license.php\r
+   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+**/\r
+\r
+#ifndef __COMMON_HEADER_H_\r
+#define __COMMON_HEADER_H_\r
+\r
+\r
+//\r
+// The package level header files this module uses\r
+//\r
+#include <Base.h>\r
+//\r
+// The protocols, PPI and GUID defintions for this module\r
+//\r
+//\r
+// The Library classes this module consumes\r
+//\r
+#include <Library/IoLib.h>\r
+#include <Library/BaseLib.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/PcdLib.h>\r
+\r
+#endif\r

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/CommonHeader.h b/MdePkg/Library/BaseIoLibIntrinsic/CommonHeader.h
deleted file mode 100644 (file)
index 56858d1..0000000
--- a/MdePkg/Library/BaseIoLibIntrinsic/CommonHeader.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2007 - 2007, 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
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <Base.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/IoLib.h>\r
-#include <Library/BaseLib.h>\r
-#include <Library/DebugLib.h>\r
-#include <Library/PcdLib.h>\r
-\r
-#endif\r

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c b/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c
index d9702c9f57f779e81f69a7153539069d5e3eec37..82c2493110d4080039732abd1c089ddeec5fd6c0 100644 (file)
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include "BaseIoLibIntrinsicInternal.h"\r

 \r
 /**\r
   Reads an 8-bit I/O port, performs a bitwise inclusive OR, and writes the\r
 \r
 /**\r
   Reads an 8-bit I/O port, performs a bitwise inclusive OR, and writes the\r

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLib.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLib.c
index bbd12959f651a90397eb63399b64e80810dd399d..1654d3eac4fbe784c3aa32a592a37117d6af24ab 100644 (file)
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLib.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoLib.c
@@ -17,7 +17,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include "BaseIoLibIntrinsicInternal.h"\r

 \r
 /**\r
   Reads a 64-bit I/O port.\r
 \r
 /**\r
   Reads a 64-bit I/O port.\r

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibGcc.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLibGcc.c
index c6cf5f72cc0d3bcbeecc2d541bb15888a1f309ee..3706a4bfe45b083e24a20c4864c7fccfbdf429ff 100644 (file)
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibGcc.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoLibGcc.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include "BaseIoLibIntrinsicInternal.h"\r

 \r
 /**\r
   Reads an 8-bit MMIO register.\r
 \r
 /**\r
   Reads an 8-bit MMIO register.\r

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibIpf.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLibIpf.c
index 27d21c187970279bfd64829ec558195224def93b..fd2264c50dd7240a3e30695991c67b1b26408a7b 100644 (file)
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibIpf.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoLibIpf.c
@@ -17,7 +17,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include "BaseIoLibIntrinsicInternal.h"\r

 \r
 #define MAP_PORT_BASE_TO_MEM(_Port) \\r
     ((((_Port) & 0xfffc) << 10) | ((_Port) & 0x0fff))\r
 \r
 #define MAP_PORT_BASE_TO_MEM(_Port) \\r
     ((((_Port) & 0xfffc) << 10) | ((_Port) & 0x0fff))\r

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibMmioBuffer.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLibMmioBuffer.c
index 8befbf8d17e39938b0d715f0764258527bfb35a0..4569a166e72fb98b01062ebabc0f8e4d4ef343f4 100644 (file)
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibMmioBuffer.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoLibMmioBuffer.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include "BaseIoLibIntrinsicInternal.h"\r

 \r
 /**\r
   Copy data from MMIO region to system memory by using 8-bit access.\r
 \r
 /**\r
   Copy data from MMIO region to system memory by using 8-bit access.\r

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c
index 35854c6ccd9a3eb42753202d9c244ee68a4055a3..4f95b4ef155d5420081eb38efa840c1d74a741ab 100644 (file)
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c
@@ -25,7 +25,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include "BaseIoLibIntrinsicInternal.h"\r

 \r
 //\r
 // Microsoft Visual Studio 7.1 Function Prototypes for I/O Intrinsics\r
 \r
 //\r
 // Microsoft Visual Studio 7.1 Function Prototypes for I/O Intrinsics\r

diff --git a/MdePkg/Library/BaseLib/ARShiftU64.c b/MdePkg/Library/BaseLib/ARShiftU64.c
index d9105c67fb9ed022ad70c127933fb81825ccb521..67e49e8482b733e2c73e23dd6f1439d726ae4cff 100644 (file)
--- a/MdePkg/Library/BaseLib/ARShiftU64.c
+++ b/MdePkg/Library/BaseLib/ARShiftU64.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/BaseLib.inf b/MdePkg/Library/BaseLib/BaseLib.inf
index 57ae81bebd5467304b5a2cafb806d041eec3a39c..23052a50287125db8fc1acc45850a29f6797137c 100644 (file)
--- a/MdePkg/Library/BaseLib/BaseLib.inf
+++ b/MdePkg/Library/BaseLib/BaseLib.inf
@@ -77,7 +77,6 @@
   LinkedList.c\r
   String.c\r
   BaseLibInternals.h\r
   LinkedList.c\r
   String.c\r
   BaseLibInternals.h\r

-  CommonHeader.h\r

 \r
 [Sources.Ia32]\r
   Ia32/Wbinvd.c\r
 \r
 [Sources.Ia32]\r
   Ia32/Wbinvd.c\r

diff --git a/MdePkg/Library/BaseLib/BaseLibInternals.h b/MdePkg/Library/BaseLib/BaseLibInternals.h
index b3952ec16baeac60e043520a48546600f6ae5e78..51f3c96cb8349ac8e2c95db03f323db8d7d0a096 100644 (file)
--- a/MdePkg/Library/BaseLib/BaseLibInternals.h
+++ b/MdePkg/Library/BaseLib/BaseLibInternals.h
@@ -15,10 +15,13 @@
 #ifndef __BASE_LIB_INTERNALS__\r
 #define __BASE_LIB_INTERNALS__\r
 \r
 #ifndef __BASE_LIB_INTERNALS__\r
 #define __BASE_LIB_INTERNALS__\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
+#include <Base.h>\r
+#include <Library/BaseLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/TimerLib.h>\r
+#include <Library/PcdLib.h>\r
+\r

 \r
 #define QUIENT_MAX_UINTN_DIVIDED_BY_10      ((UINTN) -1 / 10)\r
 #define REMINDER_MAX_UINTN_DIVIDED_BY_10    ((UINTN) -1 % 10)\r
 \r
 #define QUIENT_MAX_UINTN_DIVIDED_BY_10      ((UINTN) -1 / 10)\r
 #define REMINDER_MAX_UINTN_DIVIDED_BY_10    ((UINTN) -1 % 10)\r

diff --git a/MdePkg/Library/BaseLib/BitField.c b/MdePkg/Library/BaseLib/BitField.c
index 9c9981e31457b26ebb7cf1350cbc4b165dde6464..2f0e2c3b4fd04baff8584826aa351a2cc80b62d2 100644 (file)
--- a/MdePkg/Library/BaseLib/BitField.c
+++ b/MdePkg/Library/BaseLib/BitField.c
@@ -17,7 +17,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/CheckSum.c b/MdePkg/Library/BaseLib/CheckSum.c
index 61d74a41bb316f01d8b7930234ee9f1db7eb4f36..a902620b56af03fd866964cee8b8f13374ca32d8 100644 (file)
--- a/MdePkg/Library/BaseLib/CheckSum.c
+++ b/MdePkg/Library/BaseLib/CheckSum.c
@@ -18,7 +18,8 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include <BaseLibInternals.h>\r
+\r

 \r
 /**\r
   Calculate the sum of all elements in a buffer in unit of UINT8. \r
 \r
 /**\r
   Calculate the sum of all elements in a buffer in unit of UINT8. \r

diff --git a/MdePkg/Library/BaseLib/CommonHeader.h b/MdePkg/Library/BaseLib/CommonHeader.h
deleted file mode 100644 (file)
index 07c57bd..0000000
--- a/MdePkg/Library/BaseLib/CommonHeader.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2007 - 2007, 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
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <Base.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/BaseLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
-#include <Library/DebugLib.h>\r
-#include <Library/TimerLib.h>\r
-#include <Library/PcdLib.h>\r
-\r
-#endif\r

diff --git a/MdePkg/Library/BaseLib/Cpu.c b/MdePkg/Library/BaseLib/Cpu.c
index d8564c04d42e7b7ff590212fc906e4cf251e61b7..4203afdfb3467e5f918ff3ddfaf02b58b781d8ec 100644 (file)
--- a/MdePkg/Library/BaseLib/Cpu.c
+++ b/MdePkg/Library/BaseLib/Cpu.c
@@ -17,7 +17,8 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include <BaseLibInternals.h>\r
+\r

 \r
 /**\r
   Disables CPU interrupts and returns the interrupt state prior to the disable\r
 \r
 /**\r
   Disables CPU interrupts and returns the interrupt state prior to the disable\r

diff --git a/MdePkg/Library/BaseLib/CpuDeadLoop.c b/MdePkg/Library/BaseLib/CpuDeadLoop.c
index 01810d17132723a77c7f6df4912faa0ffe223ed4..a40a6467e8535436bb3a83fcad6b82a81ec6a5cd 100644 (file)
--- a/MdePkg/Library/BaseLib/CpuDeadLoop.c
+++ b/MdePkg/Library/BaseLib/CpuDeadLoop.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 /**\r
   Executes an infinite loop.\r
 \r
 /**\r
   Executes an infinite loop.\r

diff --git a/MdePkg/Library/BaseLib/DivS64x64Remainder.c b/MdePkg/Library/BaseLib/DivS64x64Remainder.c
index d8e2a81e4c5240cb20d164d359828b439057c2ab..20b6d76084d5fc8945f42f1174d7e9bf35ea0412 100644 (file)
--- a/MdePkg/Library/BaseLib/DivS64x64Remainder.c
+++ b/MdePkg/Library/BaseLib/DivS64x64Remainder.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/DivU64x32.c b/MdePkg/Library/BaseLib/DivU64x32.c
index a599b87816b5f242b8757a0f95c4c6c3a8baa7a3..424b066e32d008151706a5ccf42a295a10a2e347 100644 (file)
--- a/MdePkg/Library/BaseLib/DivU64x32.c
+++ b/MdePkg/Library/BaseLib/DivU64x32.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/DivU64x32Remainder.c b/MdePkg/Library/BaseLib/DivU64x32Remainder.c
index 524a800fdf5060e834893ef13373f7e6bc0a2c29..08785c32e39c79ab127111481a6f72ab140a00e4 100644 (file)
--- a/MdePkg/Library/BaseLib/DivU64x32Remainder.c
+++ b/MdePkg/Library/BaseLib/DivU64x32Remainder.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/DivU64x64Remainder.c b/MdePkg/Library/BaseLib/DivU64x64Remainder.c
index 49e80b4e113b587ddcef005bbd8f91af43d04409..acc2d4861988870856b2ae984af04f837be390c6 100644 (file)
--- a/MdePkg/Library/BaseLib/DivU64x64Remainder.c
+++ b/MdePkg/Library/BaseLib/DivU64x64Remainder.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/GetPowerOfTwo32.c b/MdePkg/Library/BaseLib/GetPowerOfTwo32.c
index dcfdc4bdd45197f1a0cb2aeddbffd270c075088f..19b00dd760a055683aa6152c2bfce379f317e449 100644 (file)
--- a/MdePkg/Library/BaseLib/GetPowerOfTwo32.c
+++ b/MdePkg/Library/BaseLib/GetPowerOfTwo32.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/GetPowerOfTwo64.c b/MdePkg/Library/BaseLib/GetPowerOfTwo64.c
index 57d9c0a00b58059be79fa3035dcb6cee3030f263..3cdcecc0217aeb7a780ac2ff957c8a759edfb796 100644 (file)
--- a/MdePkg/Library/BaseLib/GetPowerOfTwo64.c
+++ b/MdePkg/Library/BaseLib/GetPowerOfTwo64.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/HighBitSet32.c b/MdePkg/Library/BaseLib/HighBitSet32.c
index 46811fb8405d298d9a8f3410bffa1c99e33a1530..af2a1e99f52b3cd1fc76e6180a13f4764dc09a06 100644 (file)
--- a/MdePkg/Library/BaseLib/HighBitSet32.c
+++ b/MdePkg/Library/BaseLib/HighBitSet32.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/HighBitSet64.c b/MdePkg/Library/BaseLib/HighBitSet64.c
index e9319877cb6cd44e03d60cf3e49460470e409857..e4d95d65e16875dc5af67d23aa8933d6b1055cbd 100644 (file)
--- a/MdePkg/Library/BaseLib/HighBitSet64.c
+++ b/MdePkg/Library/BaseLib/HighBitSet64.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/Ia32/ARShiftU64.c b/MdePkg/Library/BaseLib/Ia32/ARShiftU64.c
index 4e1f715ab2d779c030c1076b6dae70c4c766c8ee..fb5f4282bb21fe495893f4af7e3da234227883f3 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ARShiftU64.c
+++ b/MdePkg/Library/BaseLib/Ia32/ARShiftU64.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT64\r
 EFIAPI\r
 \r
 UINT64\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.c b/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.c
index 71bb896c822e55ebbb7b1f035d24df0fdf93ba0a..35d0fc9c2302a9c8aaabc00849804a05859fd6e2 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.c
+++ b/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 //\r
 // Microsoft Visual Studio 7.1 Function Prototypes for I/O Intrinsics\r
 \r
 //\r
 // Microsoft Visual Studio 7.1 Function Prototypes for I/O Intrinsics\r

diff --git a/MdePkg/Library/BaseLib/Ia32/CpuFlushTlb.c b/MdePkg/Library/BaseLib/Ia32/CpuFlushTlb.c
index 2660deb096e129ec29f7625af6335ad1ae495b79..e785095d7ace410bcda213dcd7450ff97b0326db 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/CpuFlushTlb.c
+++ b/MdePkg/Library/BaseLib/Ia32/CpuFlushTlb.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 VOID\r
 EFIAPI\r
 \r
 VOID\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/CpuId.c b/MdePkg/Library/BaseLib/Ia32/CpuId.c
index d1893aebbe85d8e8a1755a893eeb6b29a8f5fbff..73f12bcaeeb1938a79cd2a2cdd0727e0cdc0753b 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/CpuId.c
+++ b/MdePkg/Library/BaseLib/Ia32/CpuId.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT32\r
 EFIAPI\r
 \r
 UINT32\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/CpuIdEx.c b/MdePkg/Library/BaseLib/Ia32/CpuIdEx.c
index 99e2edb428509c82e333f5245435b501310cb7ea..2c1eca670e491b2f7db2b1985ce231d9bf51bb21 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/CpuIdEx.c
+++ b/MdePkg/Library/BaseLib/Ia32/CpuIdEx.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT32\r
 EFIAPI\r
 \r
 UINT32\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/CpuPause.c b/MdePkg/Library/BaseLib/Ia32/CpuPause.c
index 7750ee417e84491b1063964f0849a0c986c2a40b..ee7c96736b344dc32ee9ef602f8b0645a9c1626a 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/CpuPause.c
+++ b/MdePkg/Library/BaseLib/Ia32/CpuPause.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 VOID\r
 EFIAPI\r
 \r
 VOID\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/CpuSleep.c b/MdePkg/Library/BaseLib/Ia32/CpuSleep.c
index 59753747eeabebf7f19da6d208e122ab40184504..690f9b359886d6e75bc7703dba5cac7308014b35 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/CpuSleep.c
+++ b/MdePkg/Library/BaseLib/Ia32/CpuSleep.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 VOID\r
 EFIAPI\r
 \r
 VOID\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/DisableInterrupts.c b/MdePkg/Library/BaseLib/Ia32/DisableInterrupts.c
index f1ef0f17067436f3cd8d56a0cb97469ec06d90fc..60c1169a57d846a0695ad7b4095a78f601a38eb4 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/DisableInterrupts.c
+++ b/MdePkg/Library/BaseLib/Ia32/DisableInterrupts.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 VOID\r
 EFIAPI\r
 \r
 VOID\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/DisablePaging32.c b/MdePkg/Library/BaseLib/Ia32/DisablePaging32.c
index d3c77183ebbc62657c24193996b57509663ac4ec..d462c01ff398ab8268bd6840a523c997c5e4b643 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/DisablePaging32.c
+++ b/MdePkg/Library/BaseLib/Ia32/DisablePaging32.c
@@ -15,7 +15,9 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include <BaseLibInternals.h>\r
+\r
+#if _MSC_EXTENSIONS\r

 \r
 __declspec (naked)\r
 VOID\r
 \r
 __declspec (naked)\r
 VOID\r


@@ -49,3 +51,4 @@ InternalX86DisablePaging32 (
   }\r
 }\r
 \r
   }\r
 }\r
 \r

+#endif\r

diff --git a/MdePkg/Library/BaseLib/Ia32/DivS64x64Remainder.c b/MdePkg/Library/BaseLib/Ia32/DivS64x64Remainder.c
index da3afbf95c706ce09eef6c131acc56c7f91cc65c..5c5f270c4c74c160b43f04d11eefebedcbbd9da1 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/DivS64x64Remainder.c
+++ b/MdePkg/Library/BaseLib/Ia32/DivS64x64Remainder.c
@@ -17,7 +17,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "../BaseLibInternals.h"\r
 \r
 \r
 #include "../BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/Ia32/DivU64x32.c b/MdePkg/Library/BaseLib/Ia32/DivU64x32.c
index d680c29c41039b0580a4dacea7cb2aad15912c28..0ec3c6319bb11995cf13e4efc3907af4c2e4a337 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/DivU64x32.c
+++ b/MdePkg/Library/BaseLib/Ia32/DivU64x32.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT64\r
 EFIAPI\r
 \r
 UINT64\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/DivU64x32Remainder.c b/MdePkg/Library/BaseLib/Ia32/DivU64x32Remainder.c
index a9c54a7e1944ba1c46121881f847d1fa6ff025b0..54da1e9ab0470f1fe11182f5a45034f233455cbc 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/DivU64x32Remainder.c
+++ b/MdePkg/Library/BaseLib/Ia32/DivU64x32Remainder.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT64\r
 EFIAPI\r
 \r
 UINT64\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.c b/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.c
index 29413b25b2afa48931a7407dcd0233aa967d9bf3..46ef12b204e9824e9a627853ca79fbb27466374b 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.c
+++ b/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.c
@@ -16,7 +16,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT64\r
 EFIAPI\r
 \r
 UINT64\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.c b/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.c
index 7194ca25360343fa4b90a510dbe85a9889cd85c0..39118728f0d60b7148393f4e7427848a907c9e75 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.c
+++ b/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 VOID\r
 EFIAPI\r
 \r
 VOID\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/EnableInterrupts.c b/MdePkg/Library/BaseLib/Ia32/EnableInterrupts.c
index ada4100cf62b90c23d2f2ce15dbd2e50936cce7c..cb4ee2e3ad49d2f6f57133597386637bfdd20370 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/EnableInterrupts.c
+++ b/MdePkg/Library/BaseLib/Ia32/EnableInterrupts.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 VOID\r
 EFIAPI\r
 \r
 VOID\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/EnablePaging32.c b/MdePkg/Library/BaseLib/Ia32/EnablePaging32.c
index e4765a7f2864f17a9d0405edccff524a88a6d294..3cb290c516ed1ccfdfd2d5f329c0445a36cca0ab 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/EnablePaging32.c
+++ b/MdePkg/Library/BaseLib/Ia32/EnablePaging32.c
@@ -15,7 +15,9 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include <BaseLibInternals.h>\r
+\r
+#if _MSC_EXTENSIONS\r

 \r
 __declspec (naked)\r
 VOID\r
 \r
 __declspec (naked)\r
 VOID\r


@@ -49,3 +51,4 @@ InternalX86EnablePaging32 (
   }\r
 }\r
 \r
   }\r
 }\r
 \r

+#endif\r

diff --git a/MdePkg/Library/BaseLib/Ia32/EnablePaging64.asm b/MdePkg/Library/BaseLib/Ia32/EnablePaging64.asm
index d54c27e7197dfc48c00deb0105511f95f7234c08..3755c0585b157c0aa72a12fae4a9db3ad4848f97 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/EnablePaging64.asm
+++ b/MdePkg/Library/BaseLib/Ia32/EnablePaging64.asm
@@ -1,7 +1,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 ;------------------------------------------------------------------------------\r
 ;\r
 \r
 ;------------------------------------------------------------------------------\r
 ;\r

diff --git a/MdePkg/Library/BaseLib/Ia32/FlushCacheLine.c b/MdePkg/Library/BaseLib/Ia32/FlushCacheLine.c
index 5071a39bb293b43585ba87a86fbe8b06fe8ac9ff..1c7cc0f33f06cc9ff123dc8c2d2c01c8ee66748e 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/FlushCacheLine.c
+++ b/MdePkg/Library/BaseLib/Ia32/FlushCacheLine.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 VOID *\r
 EFIAPI\r
 \r
 VOID *\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/FxRestore.c b/MdePkg/Library/BaseLib/Ia32/FxRestore.c
index e95fb67b439af3bf9926b9fdf5eb1dbfb2c4528d..1314da4194165bc367a60551ecc048db56e3d5c4 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/FxRestore.c
+++ b/MdePkg/Library/BaseLib/Ia32/FxRestore.c
@@ -15,7 +15,8 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include <BaseLibInternals.h>\r
+\r

 \r
 VOID\r
 EFIAPI\r
 \r
 VOID\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/FxSave.c b/MdePkg/Library/BaseLib/Ia32/FxSave.c
index 721de5368b4a18c43961585cde4585c44d1207f6..44aaee0090690d3add98f31955e06588d406687e 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/FxSave.c
+++ b/MdePkg/Library/BaseLib/Ia32/FxSave.c
@@ -15,7 +15,8 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include <BaseLibInternals.h>\r
+\r

 \r
 VOID\r
 EFIAPI\r
 \r
 VOID\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange32.c b/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange32.c
index d584a900d399414f34fe7dc556e0261538dd8d1f..ec60f973449fcc347598a5193be29642fa7ff215 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange32.c
+++ b/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange32.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT32\r
 EFIAPI\r
 \r
 UINT32\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange64.c b/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange64.c
index a0d0ba89e15cff0b03c4326478e31071b9d28e11..6bdbedad1f05f47a36975e0214259f0be527ccfc 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange64.c
+++ b/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange64.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT64\r
 EFIAPI\r
 \r
 UINT64\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/InterlockedDecrement.c b/MdePkg/Library/BaseLib/Ia32/InterlockedDecrement.c
index afa9a15f60a9da7234371f206c3f205182d28d6c..c7ace7ad5443bf162596729be9743a229f90f295 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/InterlockedDecrement.c
+++ b/MdePkg/Library/BaseLib/Ia32/InterlockedDecrement.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT32\r
 EFIAPI\r
 \r
 UINT32\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/InterlockedIncrement.c b/MdePkg/Library/BaseLib/Ia32/InterlockedIncrement.c
index 82fa86f0cd1da572403766a05b705e994f214c16..f34f4748ebdf618dafc8e9cac193d5fcb139db31 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/InterlockedIncrement.c
+++ b/MdePkg/Library/BaseLib/Ia32/InterlockedIncrement.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT32\r
 EFIAPI\r
 \r
 UINT32\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/InternalSwitchStack.c b/MdePkg/Library/BaseLib/Ia32/InternalSwitchStack.c
index 2fb0710cc672f51aeb773f8c4368bd40dea0d33e..2bd46a0ffbdc5b37b6f063e7d84bdf2051e25125 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/InternalSwitchStack.c
+++ b/MdePkg/Library/BaseLib/Ia32/InternalSwitchStack.c
@@ -17,7 +17,8 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include <BaseLibInternals.h>\r
+\r

 \r
 /**\r
   Transfers control to a function starting with a new stack.\r
 \r
 /**\r
   Transfers control to a function starting with a new stack.\r

diff --git a/MdePkg/Library/BaseLib/Ia32/Invd.c b/MdePkg/Library/BaseLib/Ia32/Invd.c
index 47f651342df84265560014afec7ec66abb8898cb..0206e6d44b1880d4c3add695348752039e9c4bdc 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/Invd.c
+++ b/MdePkg/Library/BaseLib/Ia32/Invd.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 VOID\r
 EFIAPI\r
 \r
 VOID\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/LRotU64.c b/MdePkg/Library/BaseLib/Ia32/LRotU64.c
index 48a6a6bb6899aad801f90834d5de9d8e96e08743..9a5deea70d401435394882fd1120119e71f64790 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/LRotU64.c
+++ b/MdePkg/Library/BaseLib/Ia32/LRotU64.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT64\r
 EFIAPI\r
 \r
 UINT64\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/LShiftU64.c b/MdePkg/Library/BaseLib/Ia32/LShiftU64.c
index 766b33b0976312852b6591f7959844c8a89ba470..4324bfb53b5c8706c80a0989d9ab0810824c7b3c 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/LShiftU64.c
+++ b/MdePkg/Library/BaseLib/Ia32/LShiftU64.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT64\r
 EFIAPI\r
 \r
 UINT64\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/LongJump.c b/MdePkg/Library/BaseLib/Ia32/LongJump.c
index 3186da522f7e2276df81e48b3f22ef903dd141c3..f0408b83fa385b08f09e77bce92aad549b35aea3 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/LongJump.c
+++ b/MdePkg/Library/BaseLib/Ia32/LongJump.c
@@ -15,7 +15,8 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include <BaseLibInternals.h>\r
+\r

 \r
 __declspec (naked)\r
 VOID\r
 \r
 __declspec (naked)\r
 VOID\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ModU64x32.c b/MdePkg/Library/BaseLib/Ia32/ModU64x32.c
index 4337f8cbbb0e51ffe85625411faf3b8587e26505..59ed50433a7d447f22e863a064f70dee8031d1d3 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ModU64x32.c
+++ b/MdePkg/Library/BaseLib/Ia32/ModU64x32.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT32\r
 EFIAPI\r
 \r
 UINT32\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/Monitor.c b/MdePkg/Library/BaseLib/Ia32/Monitor.c
index a1b3f7b2df3c8e02ea7eabbb82e2f3bd634e31f6..469aa6d7fa87005d4d6dfe198d13a2d62bf3829b 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/Monitor.c
+++ b/MdePkg/Library/BaseLib/Ia32/Monitor.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINTN\r
 EFIAPI\r
 \r
 UINTN\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/MultU64x32.c b/MdePkg/Library/BaseLib/Ia32/MultU64x32.c
index 8eecb14b8cfe33c7178c495628fd2b3656410ac6..db911cadb2303cdab05f0860aa8e8a9e841fdd91 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/MultU64x32.c
+++ b/MdePkg/Library/BaseLib/Ia32/MultU64x32.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT64\r
 EFIAPI\r
 \r
 UINT64\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/MultU64x64.c b/MdePkg/Library/BaseLib/Ia32/MultU64x64.c
index 52e553de1a4b817ee7cdb57f0067058db9ef5f20..ddafff47ae56eef0c617454ce8251ece2a3c0e04 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/MultU64x64.c
+++ b/MdePkg/Library/BaseLib/Ia32/MultU64x64.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT64\r
 EFIAPI\r
 \r
 UINT64\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/Mwait.c b/MdePkg/Library/BaseLib/Ia32/Mwait.c
index 9ced4c92978c117804b35f1e7df403cc4f9dd973..0629afe2956ecd337b5e6936a88a94879ac56898 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/Mwait.c
+++ b/MdePkg/Library/BaseLib/Ia32/Mwait.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINTN\r
 EFIAPI\r
 \r
 UINTN\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/Non-existing.c b/MdePkg/Library/BaseLib/Ia32/Non-existing.c
index 0343455b4749a09b1f92d0cf58880afa2c62083c..b1a8dae7383df7b0f0db8addfcdf11b668889067 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/Non-existing.c
+++ b/MdePkg/Library/BaseLib/Ia32/Non-existing.c
@@ -17,7 +17,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "../BaseLibInternals.h"\r
 \r
 \r
 #include "../BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/Ia32/RRotU64.c b/MdePkg/Library/BaseLib/Ia32/RRotU64.c
index 6b48222c574ce659e6043e1cd59a63b26a1422ac..31274aac2c52bab65bb2fa39e9c7ec27a6dbbb26 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/RRotU64.c
+++ b/MdePkg/Library/BaseLib/Ia32/RRotU64.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT64\r
 EFIAPI\r
 \r
 UINT64\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/RShiftU64.c b/MdePkg/Library/BaseLib/Ia32/RShiftU64.c
index 7480ebd63927584046f04061765959d043193f51..a6b957bacc6eaf61fee73c04b839fc8490af8909 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/RShiftU64.c
+++ b/MdePkg/Library/BaseLib/Ia32/RShiftU64.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT64\r
 EFIAPI\r
 \r
 UINT64\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCr0.c b/MdePkg/Library/BaseLib/Ia32/ReadCr0.c
index d220e8ed5d47591b8790c7c7f827bbac7e104d23..8c6ab3527f50b0fad768b19d5ac89056461fa29d 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadCr0.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadCr0.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINTN\r
 EFIAPI\r
 \r
 UINTN\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCr2.c b/MdePkg/Library/BaseLib/Ia32/ReadCr2.c
index 9ef4d44c6ebf428cd57cbbaa7ac08b47f93acdc4..1c682b3899c4e14eb6d215f460d86188bfdcb461 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadCr2.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadCr2.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINTN\r
 EFIAPI\r
 \r
 UINTN\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCr3.c b/MdePkg/Library/BaseLib/Ia32/ReadCr3.c
index 04efb497e62f1f79e01fe946044b5d1cb6b3eac6..39ad5e4f2f58e09dd29ae391997f7630d5a81092 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadCr3.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadCr3.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINTN\r
 EFIAPI\r
 \r
 UINTN\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCr4.c b/MdePkg/Library/BaseLib/Ia32/ReadCr4.c
index 9f24fce50de721e3c13869b988927b78b1dad61c..71ffa9b72dd8422733766c0e1c72213a07b967fb 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadCr4.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadCr4.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINTN\r
 EFIAPI\r
 \r
 UINTN\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCs.c b/MdePkg/Library/BaseLib/Ia32/ReadCs.c
index 52b9a7ffa0a193b4eac7a05ceaa12bf9cbaf5801..cd9bad54e7da64be792253178dedc0332e4ad361 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadCs.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadCs.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT16\r
 EFIAPI\r
 \r
 UINT16\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr0.c b/MdePkg/Library/BaseLib/Ia32/ReadDr0.c
index b8ba6535a26aa24e61401740748395c91e75b197..7c6f0c629a7ef0424faf815ccf9c320902fdb5d3 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr0.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr0.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINTN\r
 EFIAPI\r
 \r
 UINTN\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr1.c b/MdePkg/Library/BaseLib/Ia32/ReadDr1.c
index 8820256e08fecfc5cb4a8139518922b3c80e1dbe..573f658864f151b84243e4ca4b0a5711a763781f 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr1.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr1.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINTN\r
 EFIAPI\r
 \r
 UINTN\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr2.c b/MdePkg/Library/BaseLib/Ia32/ReadDr2.c
index 30f8da6911c9c29a7f604ad6486f76e98d14e72c..6685d775f767bacbbf653f316c79297a20cc76a0 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr2.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr2.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINTN\r
 EFIAPI\r
 \r
 UINTN\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr3.c b/MdePkg/Library/BaseLib/Ia32/ReadDr3.c
index 58584195120f8b98048286ee437b48e33d65a559..e8a4bcc6bb6bf3aaccd29a74cdb6c3887fca8a81 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr3.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr3.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINTN\r
 EFIAPI\r
 \r
 UINTN\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr4.c b/MdePkg/Library/BaseLib/Ia32/ReadDr4.c
index df081aaf655bdbb6ceefdd699458698c3fc4068e..9ec23218d4fd9ecaac099d16af73cc4069bb6ed5 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr4.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr4.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINTN\r
 EFIAPI\r
 \r
 UINTN\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr5.c b/MdePkg/Library/BaseLib/Ia32/ReadDr5.c
index d26d1eab41dec08d54c3f2dfe45ea73d1c990e19..3470524b22549340872e7e0678bd767a49697ca5 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr5.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr5.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINTN\r
 EFIAPI\r
 \r
 UINTN\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr6.c b/MdePkg/Library/BaseLib/Ia32/ReadDr6.c
index 732334d24fa08e8af497b6084253a0afcfa3e373..debeecb24f7c0a80a0baf9240e93d9518def791e 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr6.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr6.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINTN\r
 EFIAPI\r
 \r
 UINTN\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr7.c b/MdePkg/Library/BaseLib/Ia32/ReadDr7.c
index b61d674da2c4112f5fda7c185146d6b984f5c18b..da7a120d705aa46abe1355b9510359b77b6ce2be 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr7.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr7.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINTN\r
 EFIAPI\r
 \r
 UINTN\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDs.c b/MdePkg/Library/BaseLib/Ia32/ReadDs.c
index ce12d0c9406d1adacd0e1f458771df562b4fec42..91294896e01cb2753947a61771881cc08252f759 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadDs.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDs.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT16\r
 EFIAPI\r
 \r
 UINT16\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadEflags.c b/MdePkg/Library/BaseLib/Ia32/ReadEflags.c
index 0600c66b25976fe9fa03da3a6fc5f1cc37eb6992..ca5d19c5ac829c1c656fd5b929a5b98683561756 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadEflags.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadEflags.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINTN\r
 EFIAPI\r
 \r
 UINTN\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadEs.c b/MdePkg/Library/BaseLib/Ia32/ReadEs.c
index d7780b77715ac9a23effce2660e26d60c7766b6e..8f73b99e6b489e5dee9a95f2aa57d945a4d0aa2d 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadEs.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadEs.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT16\r
 EFIAPI\r
 \r
 UINT16\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadFs.c b/MdePkg/Library/BaseLib/Ia32/ReadFs.c
index 193e9078bc830e4126a4965bb424a1e601799cef..848d15581bc41ff9ba1b26c81bed88755d727356 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadFs.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadFs.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT16\r
 EFIAPI\r
 \r
 UINT16\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadGdtr.c b/MdePkg/Library/BaseLib/Ia32/ReadGdtr.c
index 3b35d26297c48ea25cbfe890f557817d694ee216..1bff03c7d6be302ddce25d184480d2e55f515985 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadGdtr.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadGdtr.c
@@ -15,7 +15,8 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include <BaseLibInternals.h>\r
+\r

 \r
 VOID\r
 EFIAPI\r
 \r
 VOID\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadGs.c b/MdePkg/Library/BaseLib/Ia32/ReadGs.c
index 01c191d504192f10ab64865080cd5fc58eea2d2d..df495a0ff9b54806191c59d462b524a7cb5e3e0a 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadGs.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadGs.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT16\r
 EFIAPI\r
 \r
 UINT16\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadIdtr.c b/MdePkg/Library/BaseLib/Ia32/ReadIdtr.c
index 0e3c25ab625c218285f64fa955f50b9e822df235..0cfbd63ff4a4da7be12833e498ca9f9bf1bad2dc 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadIdtr.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadIdtr.c
@@ -15,7 +15,8 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include <BaseLibInternals.h>\r
+\r

 \r
 VOID\r
 EFIAPI\r
 \r
 VOID\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadLdtr.c b/MdePkg/Library/BaseLib/Ia32/ReadLdtr.c
index df9a2b97cff78b73a12e266f9bc710cebb53673e..813c08442e95475b7956af20522b9dcd7c96cf4c 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadLdtr.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadLdtr.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT16\r
 EFIAPI\r
 \r
 UINT16\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm0.c b/MdePkg/Library/BaseLib/Ia32/ReadMm0.c
index 8c74545e2a631516fca8c3fcc91c9336f6e2126b..279e657edf4dd598a9a04189ae1f7f896e834a69 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm0.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm0.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT64\r
 EFIAPI\r
 \r
 UINT64\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm1.c b/MdePkg/Library/BaseLib/Ia32/ReadMm1.c
index c6721c8d356098ec8e1913db0e17cd7ec6c633be..b46a44c8de5ec9fef37f3ac7078b9a0a72a253b2 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm1.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm1.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT64\r
 EFIAPI\r
 \r
 UINT64\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm2.c b/MdePkg/Library/BaseLib/Ia32/ReadMm2.c
index 35c0a2ade126c52af518b4f4b161591cf7898bb2..1e4905f20eb8f4e25d149c3500a1a155e7333a7d 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm2.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm2.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT64\r
 EFIAPI\r
 \r
 UINT64\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm3.c b/MdePkg/Library/BaseLib/Ia32/ReadMm3.c
index fabc524c4bc670ed14ca0af115d8db206b84c3d2..f742a9f6aa671995645d24b25085a445ebb0f5e6 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm3.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm3.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT64\r
 EFIAPI\r
 \r
 UINT64\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm4.c b/MdePkg/Library/BaseLib/Ia32/ReadMm4.c
index 42fa902e007adf65c4c53276910063698b37976e..5b9920bf5b4664a3581206d37aa2405ab0922f6a 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm4.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm4.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT64\r
 EFIAPI\r
 \r
 UINT64\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm5.c b/MdePkg/Library/BaseLib/Ia32/ReadMm5.c
index c6b35f109ec9541589da7a6b077836ada3456a06..6b5d5df5b72a7ded7867847262f7347fefaf90e1 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm5.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm5.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT64\r
 EFIAPI\r
 \r
 UINT64\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm6.c b/MdePkg/Library/BaseLib/Ia32/ReadMm6.c
index 123a0def3d7b7ffe5f706bf7042f2145a779b910..c0b1b511953946a87b44c81f6b20e0f2e4bda277 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm6.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm6.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT64\r
 EFIAPI\r
 \r
 UINT64\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm7.c b/MdePkg/Library/BaseLib/Ia32/ReadMm7.c
index 5c8d87f49bb27433ec1ba5afd571b9f790b0b1a4..af98994636536c38e3788d09226f461e163abcaa 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm7.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm7.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT64\r
 EFIAPI\r
 \r
 UINT64\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMsr64.c b/MdePkg/Library/BaseLib/Ia32/ReadMsr64.c
index 94aa2c8e80f85f155aa47595e36f62e3618d7edd..d93b9cd6e426473c78f7c760b3fdf0f41fc05817 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadMsr64.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMsr64.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT64\r
 EFIAPI\r
 \r
 UINT64\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadPmc.c b/MdePkg/Library/BaseLib/Ia32/ReadPmc.c
index 2bba18815fcff043869cf3805fdd38d732075696..761fa6bf4ed90025188f5dce16306b6fe6bffcda 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadPmc.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadPmc.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT64\r
 EFIAPI\r
 \r
 UINT64\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadSs.c b/MdePkg/Library/BaseLib/Ia32/ReadSs.c
index b65e1acefeb4dec995924f8ee5df39b43b9033d0..002b20cbba162dd0475b1525d36ff79a204b5a42 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadSs.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadSs.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT16\r
 EFIAPI\r
 \r
 UINT16\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadTr.c b/MdePkg/Library/BaseLib/Ia32/ReadTr.c
index ce192bcd3ace485fad710ab2a346b492f4878d93..0069811f46f9e2ae5ab9b56d34562ff1ed158705 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadTr.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadTr.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT16\r
 EFIAPI\r
 \r
 UINT16\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadTsc.c b/MdePkg/Library/BaseLib/Ia32/ReadTsc.c
index 2e169317a168927a0323203a3e2d8a49ffd8b675..3946ffc792117aace938bd286417f4b09661b691 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadTsc.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadTsc.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT64\r
 EFIAPI\r
 \r
 UINT64\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/SetJump.c b/MdePkg/Library/BaseLib/Ia32/SetJump.c
index b96ec3a8ff4e0c190fa81510208a4e441beb7070..5d8692a619cd4e5c4f04b5ffd460ce2abac793ea 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/SetJump.c
+++ b/MdePkg/Library/BaseLib/Ia32/SetJump.c
@@ -15,7 +15,8 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include <BaseLibInternals.h>\r
+\r

 \r
 VOID\r
 EFIAPI\r
 \r
 VOID\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/SwapBytes64.c b/MdePkg/Library/BaseLib/Ia32/SwapBytes64.c
index 9979b684f1cc54c1e1bb0f0ec978065f297913ff..714fd8acdcf64c2d8115f25831caaae96e268ffb 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/SwapBytes64.c
+++ b/MdePkg/Library/BaseLib/Ia32/SwapBytes64.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT64\r
 EFIAPI\r
 \r
 UINT64\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/Thunk16.asm b/MdePkg/Library/BaseLib/Ia32/Thunk16.asm
index 13ff4665500d86e28c26d1e61dd314aefc658251..2a3f21794e2f830c769011a7780704755883c7b6 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/Thunk16.asm
+++ b/MdePkg/Library/BaseLib/Ia32/Thunk16.asm
@@ -1,7 +1,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include <BaseLibInternals.h>\r

 \r
 ;------------------------------------------------------------------------------\r
 ;\r
 \r
 ;------------------------------------------------------------------------------\r
 ;\r

diff --git a/MdePkg/Library/BaseLib/Ia32/Wbinvd.c b/MdePkg/Library/BaseLib/Ia32/Wbinvd.c
index 60e72139f58cfbe907fb41c922c814dd6d2f5f61..fa9c8b13a08562c8f44082b2c25a3a0b16bb4449 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/Wbinvd.c
+++ b/MdePkg/Library/BaseLib/Ia32/Wbinvd.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 VOID\r
 EFIAPI\r
 \r
 VOID\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteCr0.c b/MdePkg/Library/BaseLib/Ia32/WriteCr0.c
index 9993d47de652078891b8867e9f907330c1ec3ccb..4f2406c67eaabffd2e33756394b866d536d4e033 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteCr0.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteCr0.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINTN\r
 EFIAPI\r
 \r
 UINTN\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteCr2.c b/MdePkg/Library/BaseLib/Ia32/WriteCr2.c
index dcbd3458fc83fffc69d4b55227cb2f3de5540adc..8c5d617d539dc15492c009669a312c635fc227be 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteCr2.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteCr2.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINTN\r
 EFIAPI\r
 \r
 UINTN\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteCr3.c b/MdePkg/Library/BaseLib/Ia32/WriteCr3.c
index 0a1d21e100ea3477569c9e0898f7be2b423d46a1..7bcf537a7d6377c34829df368cdc468c48ffcdac 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteCr3.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteCr3.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINTN\r
 EFIAPI\r
 \r
 UINTN\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteCr4.c b/MdePkg/Library/BaseLib/Ia32/WriteCr4.c
index dcd557712e3918282ce31a2c3f55132b588eb9ed..04e7b0049162338e8de6fa9bef00131690c9dd55 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteCr4.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteCr4.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINTN\r
 EFIAPI\r
 \r
 UINTN\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr0.c b/MdePkg/Library/BaseLib/Ia32/WriteDr0.c
index 0de464765a380f4c2535dc378ee338d8addf855d..0e9da73bf811e3cf874e45898b5908f9b237e443 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr0.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr0.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINTN\r
 EFIAPI\r
 \r
 UINTN\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr1.c b/MdePkg/Library/BaseLib/Ia32/WriteDr1.c
index b6634e20b2b3749dd6d2f1b379ae0db22e120fd8..f9d1c2b5fb21d1c3099aafe64fd0671476b60f25 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr1.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr1.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINTN\r
 EFIAPI\r
 \r
 UINTN\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr2.c b/MdePkg/Library/BaseLib/Ia32/WriteDr2.c
index 2d366497f78950fc0acda204058105a0e8b3dacf..61f0979bf12ef7fe3c78f8d3e2c233415eeb5138 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr2.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr2.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINTN\r
 EFIAPI\r
 \r
 UINTN\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr3.c b/MdePkg/Library/BaseLib/Ia32/WriteDr3.c
index ffba939e16cc0dbad95ddadcc0b51d8f9ed58629..b39c7a4f9d1088706b9bbfcd0ad5dc778fa405a0 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr3.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr3.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINTN\r
 EFIAPI\r
 \r
 UINTN\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr4.c b/MdePkg/Library/BaseLib/Ia32/WriteDr4.c
index adc9005eac26552ccc0cf8a50f9dbe8e349f6c53..c2503c26a85ab8d3e24683b10a54e5b6888b7204 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr4.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr4.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINTN\r
 EFIAPI\r
 \r
 UINTN\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr5.c b/MdePkg/Library/BaseLib/Ia32/WriteDr5.c
index 0798d25265e4c274d4dc67794df694c946bbf881..dbc6dc90d6d01f8f72a58c7a6fec2f71d8cde453 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr5.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr5.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINTN\r
 EFIAPI\r
 \r
 UINTN\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr6.c b/MdePkg/Library/BaseLib/Ia32/WriteDr6.c
index dcf5e3a9bf62c5a9d658a9f5d6319e935fc04046..1da2a0fec429414e8b8da4578faeb5cbd7142752 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr6.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr6.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINTN\r
 EFIAPI\r
 \r
 UINTN\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr7.c b/MdePkg/Library/BaseLib/Ia32/WriteDr7.c
index e53eccb3e9b4c2c3aaa5375200d606168512322d..22d28636fab6941c03e31977bdf3b174efdfd3e0 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr7.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr7.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINTN\r
 EFIAPI\r
 \r
 UINTN\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteGdtr.c b/MdePkg/Library/BaseLib/Ia32/WriteGdtr.c
index 0664908e16786fb96089ea8417390e3768766ced..bc599e09454e9ead82de10e214d71c195b4f0573 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteGdtr.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteGdtr.c
@@ -15,7 +15,8 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include <BaseLibInternals.h>\r
+\r

 \r
 VOID\r
 EFIAPI\r
 \r
 VOID\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteIdtr.c b/MdePkg/Library/BaseLib/Ia32/WriteIdtr.c
index f6422412c098cdb777fe76f22a0c4b6394162d1b..b92dfbdfb9781457b90ab2185f67916bb5ac1c56 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteIdtr.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteIdtr.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include <BaseLibInternals.h>\r

 \r
 VOID\r
 EFIAPI\r
 \r
 VOID\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteLdtr.c b/MdePkg/Library/BaseLib/Ia32/WriteLdtr.c
index e8ca5756b602792075d114444f3e09ac52640c0a..600f015b3552e4aaa7bd939779a9839e04c6da3e 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteLdtr.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteLdtr.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 VOID\r
 EFIAPI\r
 \r
 VOID\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm0.c b/MdePkg/Library/BaseLib/Ia32/WriteMm0.c
index b59335e42dce33629d4c624dc6c36f8be627fc4f..c9789315b1ea2c7978fa934b8b926789433ab9bf 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm0.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm0.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 VOID\r
 EFIAPI\r
 \r
 VOID\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm1.c b/MdePkg/Library/BaseLib/Ia32/WriteMm1.c
index 39bfa6d4b975d8be92a817a3ad94568708b7cfde..8a9900bedef6cba0fda7d500f48d9474d74632d4 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm1.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm1.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 VOID\r
 EFIAPI\r
 \r
 VOID\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm2.c b/MdePkg/Library/BaseLib/Ia32/WriteMm2.c
index f9972076b1712f163ba8c6a0cce80c285215e41b..fb2196963ce2f6f3370880f77da2b142139875d2 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm2.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm2.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 VOID\r
 EFIAPI\r
 \r
 VOID\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm3.c b/MdePkg/Library/BaseLib/Ia32/WriteMm3.c
index 39a401fd3baf643916fb107921737be16d9285b8..d788f3be8c5a80dd9d3ef6db19455409436f33c7 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm3.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm3.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 VOID\r
 EFIAPI\r
 \r
 VOID\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm4.c b/MdePkg/Library/BaseLib/Ia32/WriteMm4.c
index 1c31d6beb713cba5f2118f9d0a68d632874d5c4a..7b0160d2a9039bfdb6c711e4e5aca250f7e32a11 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm4.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm4.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 VOID\r
 EFIAPI\r
 \r
 VOID\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm5.c b/MdePkg/Library/BaseLib/Ia32/WriteMm5.c
index 48e2eb29c7dcb79779bb5fff11f9bad2a9f4deb9..0dd02b706f6ae1b694b77953893058fe702bcd2d 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm5.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm5.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 VOID\r
 EFIAPI\r
 \r
 VOID\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm6.c b/MdePkg/Library/BaseLib/Ia32/WriteMm6.c
index 7a038a47dbc0fb551b988f0f982577e09ac28127..de081405e1d7cc2ae1772e0201f9fc84eb471213 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm6.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm6.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 VOID\r
 EFIAPI\r
 \r
 VOID\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm7.c b/MdePkg/Library/BaseLib/Ia32/WriteMm7.c
index 044f68cec1ae628d79925574131121526450cdd1..0bb8d205a9272ba2f6fc4ce5881ab402b5040f20 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm7.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm7.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 VOID\r
 EFIAPI\r
 \r
 VOID\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMsr64.c b/MdePkg/Library/BaseLib/Ia32/WriteMsr64.c
index 1e909d1f727a2fbb9195866ca68055588c3d61e1..06cf910c48fbf80d3e141bd652a16e47de9aa33b 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteMsr64.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMsr64.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 UINT64\r
 EFIAPI\r
 \r
 UINT64\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseLib/LRotU32.c b/MdePkg/Library/BaseLib/LRotU32.c
index ad1714d51e495e66e361455f059cddbd528b5257..2998c83dc687a6e12adb4565344f4a39c2569ac2 100644 (file)
--- a/MdePkg/Library/BaseLib/LRotU32.c
+++ b/MdePkg/Library/BaseLib/LRotU32.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/LRotU64.c b/MdePkg/Library/BaseLib/LRotU64.c
index 65269a973b04a6657ccddfa62728e1638ff76e25..d0ec6588630519abbed4829088e8d35d43a3df7f 100644 (file)
--- a/MdePkg/Library/BaseLib/LRotU64.c
+++ b/MdePkg/Library/BaseLib/LRotU64.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/LShiftU64.c b/MdePkg/Library/BaseLib/LShiftU64.c
index 8142cafe257c79855a68238e321ae8d79753ae4b..9686c2aa98fbb8eda3c3494c41cccbe4d8d2a0cb 100644 (file)
--- a/MdePkg/Library/BaseLib/LShiftU64.c
+++ b/MdePkg/Library/BaseLib/LShiftU64.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/LinkedList.c b/MdePkg/Library/BaseLib/LinkedList.c
index 3cbc0447a0f43e33b29b2770740443b632d6ccaf..7bdff758a34e40d39055a6aed604e9f03a4d16c1 100644 (file)
--- a/MdePkg/Library/BaseLib/LinkedList.c
+++ b/MdePkg/Library/BaseLib/LinkedList.c
@@ -17,7 +17,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/LongJump.c b/MdePkg/Library/BaseLib/LongJump.c
index e39bc32a3cc261cf7abe9ef6e19a0cbafdba2e13..6a819e34cfa64ab0140dc0b058aa7dcfcbbe6668 100644 (file)
--- a/MdePkg/Library/BaseLib/LongJump.c
+++ b/MdePkg/Library/BaseLib/LongJump.c
@@ -17,7 +17,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/LowBitSet32.c b/MdePkg/Library/BaseLib/LowBitSet32.c
index dde3ad1860cf11690fc1a5e0de4c3a7f883ea6e4..a598a1f71f41570ebe4824b5c58f9cce4b0a24a1 100644 (file)
--- a/MdePkg/Library/BaseLib/LowBitSet32.c
+++ b/MdePkg/Library/BaseLib/LowBitSet32.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/LowBitSet64.c b/MdePkg/Library/BaseLib/LowBitSet64.c
index bef8390d74e8727e0ddcf00703e1936d27c511d6..762d94522e061055817a1451c7e5fa6d1c001400 100644 (file)
--- a/MdePkg/Library/BaseLib/LowBitSet64.c
+++ b/MdePkg/Library/BaseLib/LowBitSet64.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/Math64.c b/MdePkg/Library/BaseLib/Math64.c
index 60f363ec1e8c3e6e20683eb16e880e625b923ef9..cd71015161a015accad49548dcf5964232af1019 100644 (file)
--- a/MdePkg/Library/BaseLib/Math64.c
+++ b/MdePkg/Library/BaseLib/Math64.c
@@ -18,7 +18,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/ModU64x32.c b/MdePkg/Library/BaseLib/ModU64x32.c
index e6c05707bed8c05afb13a1cee669be2561835e11..94da1b565a66e3dc13112cd2e3e1ae260aadd21b 100644 (file)
--- a/MdePkg/Library/BaseLib/ModU64x32.c
+++ b/MdePkg/Library/BaseLib/ModU64x32.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/MultS64x64.c b/MdePkg/Library/BaseLib/MultS64x64.c
index 33d2570568b14e71f2b8c2cd1813395e54eebff6..1ccef44a849b3586553ed928368156701b76a7ec 100644 (file)
--- a/MdePkg/Library/BaseLib/MultS64x64.c
+++ b/MdePkg/Library/BaseLib/MultS64x64.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/MultU64x32.c b/MdePkg/Library/BaseLib/MultU64x32.c
index 947d4d227644da19b7ba582523236c1caf852561..28eca84c754c24b4e951e9110b4522a68c275910 100644 (file)
--- a/MdePkg/Library/BaseLib/MultU64x32.c
+++ b/MdePkg/Library/BaseLib/MultU64x32.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/MultU64x64.c b/MdePkg/Library/BaseLib/MultU64x64.c
index 7f6ece12ea2cef7cd3a4449a556877a213fc18b5..0f99892bd8a00666832cf5d5f0ee63a83424ecb7 100644 (file)
--- a/MdePkg/Library/BaseLib/MultU64x64.c
+++ b/MdePkg/Library/BaseLib/MultU64x64.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/RRotU32.c b/MdePkg/Library/BaseLib/RRotU32.c
index ba66b3540c492d93451ca4d1b0750b9628bbaefd..b7acced743bb7c8c084bc5f0c50175587925385e 100644 (file)
--- a/MdePkg/Library/BaseLib/RRotU32.c
+++ b/MdePkg/Library/BaseLib/RRotU32.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/RRotU64.c b/MdePkg/Library/BaseLib/RRotU64.c
index b144c18d4a7ace101dcfc27d8d24073e93576d5e..34b71befbfa720864607b3afc357f67986e20dff 100644 (file)
--- a/MdePkg/Library/BaseLib/RRotU64.c
+++ b/MdePkg/Library/BaseLib/RRotU64.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/RShiftU64.c b/MdePkg/Library/BaseLib/RShiftU64.c
index 3320acf275c217cdd7597e759f57a7943a9052b3..9f433d0fb180302a9db637221e3d1be23795e6ff 100644 (file)
--- a/MdePkg/Library/BaseLib/RShiftU64.c
+++ b/MdePkg/Library/BaseLib/RShiftU64.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/SetJump.c b/MdePkg/Library/BaseLib/SetJump.c
index 92208f60c7f52d7ce428b76c2f4d7d40d4f51704..cdbe9688b727ec9b9949d3411ec30a8d6dac4b20 100644 (file)
--- a/MdePkg/Library/BaseLib/SetJump.c
+++ b/MdePkg/Library/BaseLib/SetJump.c
@@ -17,7 +17,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/String.c b/MdePkg/Library/BaseLib/String.c
index a0d7fac8c39e24aeefcd253684d71c90ef416f6e..1c8fc227ea57ef1d87b724393eeabfda1517aed3 100644 (file)
--- a/MdePkg/Library/BaseLib/String.c
+++ b/MdePkg/Library/BaseLib/String.c
@@ -17,7 +17,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/SwapBytes16.c b/MdePkg/Library/BaseLib/SwapBytes16.c
index 3709f43f38f744218a01f9b1764330f3eecfb8dc..b757d79a44311e8079362b900d8de21c55f619f3 100644 (file)
--- a/MdePkg/Library/BaseLib/SwapBytes16.c
+++ b/MdePkg/Library/BaseLib/SwapBytes16.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/SwapBytes32.c b/MdePkg/Library/BaseLib/SwapBytes32.c
index 1b1fe78fc2f9c4bc61a3040a59ca083be4636b58..ee8a60bb4cdcd1bccb3594810ef1200cb966010e 100644 (file)
--- a/MdePkg/Library/BaseLib/SwapBytes32.c
+++ b/MdePkg/Library/BaseLib/SwapBytes32.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/SwapBytes64.c b/MdePkg/Library/BaseLib/SwapBytes64.c
index eaffbebcc67dd54aeb3deebd8e48d8f2d95bee48..224553af80b4d7ab7c14f1596b296925552a8218 100644 (file)
--- a/MdePkg/Library/BaseLib/SwapBytes64.c
+++ b/MdePkg/Library/BaseLib/SwapBytes64.c
@@ -15,7 +15,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/SwitchStack.c b/MdePkg/Library/BaseLib/SwitchStack.c
index 39aec86391af2846fc35313e4276ad0e5b8f007b..b2df9f9148ff9c4c85b0bf3223ca8035ad592fc3 100644 (file)
--- a/MdePkg/Library/BaseLib/SwitchStack.c
+++ b/MdePkg/Library/BaseLib/SwitchStack.c
@@ -17,7 +17,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include <BaseLibInternals.h>\r
 \r
 \r
 #include <BaseLibInternals.h>\r
 \r

diff --git a/MdePkg/Library/BaseLib/Synchronization.c b/MdePkg/Library/BaseLib/Synchronization.c
index 30dabfbc20edc35e54e31f37b0a9fd83a45a7e69..ffed7f7170e039cd551c8b427193cb66d2ec7764 100644 (file)
--- a/MdePkg/Library/BaseLib/Synchronization.c
+++ b/MdePkg/Library/BaseLib/Synchronization.c
@@ -17,7 +17,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/SynchronizationGcc.c b/MdePkg/Library/BaseLib/SynchronizationGcc.c
index 85a3531967f4d32995d2ba99f78d0c43bd97a9bd..beb41d58d0e11dd829abc0c5ad1b6587451385e1 100644 (file)
--- a/MdePkg/Library/BaseLib/SynchronizationGcc.c
+++ b/MdePkg/Library/BaseLib/SynchronizationGcc.c
@@ -17,7 +17,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/SynchronizationMsc.c b/MdePkg/Library/BaseLib/SynchronizationMsc.c
index 29f1717b4ac771712ee9ede4c59eb0ea8c4df0b1..3621468344c35cf24498fb081a8a19c54db1c753 100644 (file)
--- a/MdePkg/Library/BaseLib/SynchronizationMsc.c
+++ b/MdePkg/Library/BaseLib/SynchronizationMsc.c
@@ -17,7 +17,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/Unaligned.c b/MdePkg/Library/BaseLib/Unaligned.c
index fef8343e94ff7faab24daccbc033812dd8556e0c..935e1693002660de31e464892f99a07650dbccc4 100644 (file)
--- a/MdePkg/Library/BaseLib/Unaligned.c
+++ b/MdePkg/Library/BaseLib/Unaligned.c
@@ -17,7 +17,8 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include <BaseLibInternals.h>\r
+\r

 \r
 /**\r
   Reads a 16-bit value from memory that may be unaligned.\r
 \r
 /**\r
   Reads a 16-bit value from memory that may be unaligned.\r

diff --git a/MdePkg/Library/BaseLib/x86DisablePaging32.c b/MdePkg/Library/BaseLib/x86DisablePaging32.c
index 9e72141de697b6183d96b506de15d54e3979234d..9e5b905d7fa3f4ae07005a9daf15f9b759386849 100644 (file)
--- a/MdePkg/Library/BaseLib/x86DisablePaging32.c
+++ b/MdePkg/Library/BaseLib/x86DisablePaging32.c
@@ -17,7 +17,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/x86DisablePaging64.c b/MdePkg/Library/BaseLib/x86DisablePaging64.c
index 527950e03860a5c7610356a454f22f31b13f6762..12b962847303763de3be5ee3272de87a594f69a3 100644 (file)
--- a/MdePkg/Library/BaseLib/x86DisablePaging64.c
+++ b/MdePkg/Library/BaseLib/x86DisablePaging64.c
@@ -17,7 +17,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/x86EnablePaging32.c b/MdePkg/Library/BaseLib/x86EnablePaging32.c
index 9efacb45e51cf570d462bad4334c055845d80d61..b2b49aa9db0a36760c222c1df4ea7682246094df 100644 (file)
--- a/MdePkg/Library/BaseLib/x86EnablePaging32.c
+++ b/MdePkg/Library/BaseLib/x86EnablePaging32.c
@@ -17,7 +17,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/x86EnablePaging64.c b/MdePkg/Library/BaseLib/x86EnablePaging64.c
index 75647d7d3e6a1a057bf18e4afb3caae17622362d..8f7dc5fa867383f31e176594f64a0434ee0790dd 100644 (file)
--- a/MdePkg/Library/BaseLib/x86EnablePaging64.c
+++ b/MdePkg/Library/BaseLib/x86EnablePaging64.c
@@ -17,7 +17,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/x86FxRestore.c b/MdePkg/Library/BaseLib/x86FxRestore.c
index c3f76d4629247fab5f4687d4fb12e00c30ad0a08..148980831ced3ab6bf0d704e6d0a3f01bec21866 100644 (file)
--- a/MdePkg/Library/BaseLib/x86FxRestore.c
+++ b/MdePkg/Library/BaseLib/x86FxRestore.c
@@ -17,7 +17,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/x86FxSave.c b/MdePkg/Library/BaseLib/x86FxSave.c
index 2ccbe4894b2db65eb14382bfa082fa44756e1de8..2c4f54a9a4c13d8e8bed962d32e55f081aff381f 100644 (file)
--- a/MdePkg/Library/BaseLib/x86FxSave.c
+++ b/MdePkg/Library/BaseLib/x86FxSave.c
@@ -17,7 +17,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/x86GetInterruptState.c b/MdePkg/Library/BaseLib/x86GetInterruptState.c
index fd108e1c8d1d1b4a9ecfea69a530fab724798c99..08efb6755a7b7f05e8dce538cc3c9b404f26c24a 100644 (file)
--- a/MdePkg/Library/BaseLib/x86GetInterruptState.c
+++ b/MdePkg/Library/BaseLib/x86GetInterruptState.c
@@ -17,7 +17,8 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include <BaseLibInternals.h>\r
+\r

 \r
 /**\r
   Retrieves the current CPU interrupt state.\r
 \r
 /**\r
   Retrieves the current CPU interrupt state.\r

diff --git a/MdePkg/Library/BaseLib/x86MemoryFence.c b/MdePkg/Library/BaseLib/x86MemoryFence.c
index 4c824d279415e73769f65efe542ceb4b3fac50cc..e8f06e8f11b8987248142eb356c9c4f1777152da 100644 (file)
--- a/MdePkg/Library/BaseLib/x86MemoryFence.c
+++ b/MdePkg/Library/BaseLib/x86MemoryFence.c
@@ -17,7 +17,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 /**\r
   Used to serialize load and store operations.\r
 \r
 /**\r
   Used to serialize load and store operations.\r

diff --git a/MdePkg/Library/BaseLib/x86Msr.c b/MdePkg/Library/BaseLib/x86Msr.c
index a9ad2425ae62b4183a954c7f6a84f001cf4b5bd7..1af72ba1a3dacedd205a0a2009f6f055f2c9bcbf 100644 (file)
--- a/MdePkg/Library/BaseLib/x86Msr.c
+++ b/MdePkg/Library/BaseLib/x86Msr.c
@@ -17,7 +17,8 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include <BaseLibInternals.h>\r
+\r

 \r
 /**\r
   Returns the lower 32-bits of a Machine Specific Register(MSR).\r
 \r
 /**\r
   Returns the lower 32-bits of a Machine Specific Register(MSR).\r

diff --git a/MdePkg/Library/BaseLib/x86ReadGdtr.c b/MdePkg/Library/BaseLib/x86ReadGdtr.c
index c1b75d1397a96483847181517bd28fa498affe4a..139eeb781df61dac722c3aeaa5d2fcb21c2678b8 100644 (file)
--- a/MdePkg/Library/BaseLib/x86ReadGdtr.c
+++ b/MdePkg/Library/BaseLib/x86ReadGdtr.c
@@ -17,7 +17,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/x86ReadIdtr.c b/MdePkg/Library/BaseLib/x86ReadIdtr.c
index c5a0d652fe3e0cf50ab7e881f1ae83513fabe3f7..3d1bb6cf8972a5f87820d32800341b1eaad67041 100644 (file)
--- a/MdePkg/Library/BaseLib/x86ReadIdtr.c
+++ b/MdePkg/Library/BaseLib/x86ReadIdtr.c
@@ -17,7 +17,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/x86Thunk.c b/MdePkg/Library/BaseLib/x86Thunk.c
index 44b452ceb2fca680d5dc91d5e4418855ecf7bca9..4d8a7bd8aa63b1906e8ad1296a0c259a65ad4fca 100644 (file)
--- a/MdePkg/Library/BaseLib/x86Thunk.c
+++ b/MdePkg/Library/BaseLib/x86Thunk.c
@@ -17,7 +17,8 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include <BaseLibInternals.h>\r
+\r

 \r
 //\r
 // Byte packed structure for a segment descriptor in a GDT/LDT\r
 \r
 //\r
 // Byte packed structure for a segment descriptor in a GDT/LDT\r

diff --git a/MdePkg/Library/BaseLib/x86WriteGdtr.c b/MdePkg/Library/BaseLib/x86WriteGdtr.c
index 20982ae88cef617f3dfed2d66144b886d752dd63..b32f7daf55ce5fe7ae337f0efdfb938b0056c7e2 100644 (file)
--- a/MdePkg/Library/BaseLib/x86WriteGdtr.c
+++ b/MdePkg/Library/BaseLib/x86WriteGdtr.c
@@ -17,7 +17,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseLib/x86WriteIdtr.c b/MdePkg/Library/BaseLib/x86WriteIdtr.c
index 3188aa275f9c38b75bb67c220755b421ad45afea..f673e46a5a3d98907820c3a0cdb6a5825ca7ae98 100644 (file)
--- a/MdePkg/Library/BaseLib/x86WriteIdtr.c
+++ b/MdePkg/Library/BaseLib/x86WriteIdtr.c
@@ -17,7 +17,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf b/MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
index cc2e633c93125208cc15c0598843cf898e48515d..36d22136f917cbe30a4af6d9a6ee8157e82470ff 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
+++ b/MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
@@ -59,7 +59,6 @@
   MemLibGuid.c\r
   CopyMem.c\r
   MemLibInternals.h\r
   MemLibGuid.c\r
   CopyMem.c\r
   MemLibInternals.h\r

-  CommonHeader.h\r

 \r
 \r
 ################################################################################\r
 \r
 \r
 ################################################################################\r

diff --git a/MdePkg/Library/BaseMemoryLib/CommonHeader.h b/MdePkg/Library/BaseMemoryLib/CommonHeader.h
deleted file mode 100644 (file)
index 68b4d94..0000000
--- a/MdePkg/Library/BaseMemoryLib/CommonHeader.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2007, 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
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <Base.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/BaseMemoryLib.h>\r
-#include <Library/BaseLib.h>\r
-#include <Library/DebugLib.h>\r
-\r
-#endif\r

diff --git a/MdePkg/Library/BaseMemoryLib/CompareMemWrapper.c b/MdePkg/Library/BaseMemoryLib/CompareMemWrapper.c
index b816af7489b08ac0fb6c9bfe845cbeeb6f19303e..b6f852cdf122e916920170e27fee8d78f5ac41a2 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/CompareMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/CompareMemWrapper.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLib/CopyMem.c b/MdePkg/Library/BaseMemoryLib/CopyMem.c
index df5258c93ee15cae363cf3516f47da6f9cce51ce..1519ceb37b9ff9ac8cf74b59da9505ec68fcc392 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/CopyMem.c
+++ b/MdePkg/Library/BaseMemoryLib/CopyMem.c
@@ -20,7 +20,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLib/CopyMemWrapper.c b/MdePkg/Library/BaseMemoryLib/CopyMemWrapper.c
index b0449b19b58358767ce9e5795ac58b923ac9543f..f7956e731b81b6d39f1c15aa33779dd8ad9ca4f6 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/CopyMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/CopyMemWrapper.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLib/MemLibGeneric.c b/MdePkg/Library/BaseMemoryLib/MemLibGeneric.c
index 93d5f805e2f89b491774bf4c134f7fcc7cec984c..2c07d93e8b862ea6aca97e1e019e5bec83a69300 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/MemLibGeneric.c
+++ b/MdePkg/Library/BaseMemoryLib/MemLibGeneric.c
@@ -23,7 +23,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLib/MemLibGuid.c b/MdePkg/Library/BaseMemoryLib/MemLibGuid.c
index 6e9682d523818b8a0032c2266c175a711f9b16b3..31db8aa4617c4de54edb40ede15eb60abbe2efda 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/MemLibGuid.c
+++ b/MdePkg/Library/BaseMemoryLib/MemLibGuid.c
@@ -26,7 +26,8 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include <MemLibInternals.h>\r
+\r

 \r
 /**\r
   Copies a source GUID to a destination GUID.\r
 \r
 /**\r
   Copies a source GUID to a destination GUID.\r

diff --git a/MdePkg/Library/BaseMemoryLib/MemLibInternals.h b/MdePkg/Library/BaseMemoryLib/MemLibInternals.h
index e7efe40228933b3397f4ba2cf8ca952bce95c0bb..cd27acb9380db8b89a16d02bc99d7ba8cb83cd12 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/MemLibInternals.h
+++ b/MdePkg/Library/BaseMemoryLib/MemLibInternals.h
@@ -23,10 +23,11 @@
 #ifndef __MEM_LIB_INTERNALS__\r
 #define __MEM_LIB_INTERNALS__\r
 \r
 #ifndef __MEM_LIB_INTERNALS__\r
 #define __MEM_LIB_INTERNALS__\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
+#include <Base.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/BaseLib.h>\r
+#include <Library/DebugLib.h>\r
+\r

 \r
 /**\r
   Copy Length bytes from Source to Destination.\r
 \r
 /**\r
   Copy Length bytes from Source to Destination.\r

diff --git a/MdePkg/Library/BaseMemoryLib/ScanMem16Wrapper.c b/MdePkg/Library/BaseMemoryLib/ScanMem16Wrapper.c
index f0ca471844da42fb838ca0dd8a230d410abf826a..7f58a41810ff35392464db0000fde2b838e1eaee 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/ScanMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/ScanMem16Wrapper.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c b/MdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c
index 7a0ebcd78f6960b4e71f5a3299084b030b4c47ee..cb02d605f23ad5169fd1309bc1a81a94523e536f 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c b/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c
index dd1a82fef28a7ea2a45d0524ba19861731c6b76c..8b125794261a03baafa16f76bb56173117ae2371 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLib/ScanMem8Wrapper.c b/MdePkg/Library/BaseMemoryLib/ScanMem8Wrapper.c
index 685563e3796d9ec61607391f35fcb415c83c0ba1..5393f7bc487622cf0890670f248eda5ac64a3d14 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/ScanMem8Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/ScanMem8Wrapper.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLib/SetMem.c b/MdePkg/Library/BaseMemoryLib/SetMem.c
index 3378a23795dbc5dede9d84cb9d2364a05f3dcdf5..0ad994c104ebd41f8ba8c857129847c5893fd0d3 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/SetMem.c
+++ b/MdePkg/Library/BaseMemoryLib/SetMem.c
@@ -20,7 +20,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c b/MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c
index 5e58eb9f74da7d86c483a8fe43de55bf3bd03912..da5f5c370b55488746e979a717ef73f7911344c9 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c b/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c
index f4927f7d9a9409128da2ff80b300480a35c0ba48..83514b0b5aca700313755d399a089546c922b5e1 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c b/MdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c
index e84556343a731b068889de70b5219f61167e2004..cf12111a6ad050359ea1e8dd3cb75727d0d14dd0 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c
index 84a7d62ea97831727bb14b2f9db952c38dd6ac01..c97a45df28cdb62311ad506163d41075ce351c11 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c b/MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c
index 886c9343b866ae21d9183a0bde488e2eb19cf419..21c70d36aa0053a7a6cc8305323350e8972466f9 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf b/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
index ef907f3ab30532a38c7ef5fa8b3ab10fc8fba3c0..8ad16c2b768c86114f8f751aeb36ed1ee4e286f7 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
+++ b/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
@@ -45,7 +45,6 @@
 \r
 [Sources.common]\r
   MemLibInternals.h\r
 \r
 [Sources.common]\r
   MemLibInternals.h\r

-  CommonHeader.h\r

 \r
 [Sources.Ia32]\r
   Ia32/ScanMem64.S\r
 \r
 [Sources.Ia32]\r
   Ia32/ScanMem64.S\r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/CommonHeader.h b/MdePkg/Library/BaseMemoryLibRepStr/CommonHeader.h
deleted file mode 100644 (file)
index 68b4d94..0000000
--- a/MdePkg/Library/BaseMemoryLibRepStr/CommonHeader.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2007, 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
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <Base.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/BaseMemoryLib.h>\r
-#include <Library/BaseLib.h>\r
-#include <Library/DebugLib.h>\r
-\r
-#endif\r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/CompareMemWrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/CompareMemWrapper.c
index b816af7489b08ac0fb6c9bfe845cbeeb6f19303e..b6f852cdf122e916920170e27fee8d78f5ac41a2 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/CompareMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/CompareMemWrapper.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/CopyMemWrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/CopyMemWrapper.c
index b0449b19b58358767ce9e5795ac58b923ac9543f..f7956e731b81b6d39f1c15aa33779dd8ad9ca4f6 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/CopyMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/CopyMemWrapper.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CompareMem.asm b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CompareMem.asm
index dabd337a7c05e6d4acf3cfc3efa74b8ca2b87383..2509e40bd89149384c29346109870e91b4c1f118 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CompareMem.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CompareMem.asm
@@ -1,7 +1,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 ;------------------------------------------------------------------------------\r
 ;\r
 \r
 ;------------------------------------------------------------------------------\r
 ;\r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CopyMem.asm b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CopyMem.asm
index 08f36767051d373968f5d2c48b30d8af1965937e..8b4366e976baea764c8b9e728cfeab991b09b28c 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CopyMem.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CopyMem.asm
@@ -1,7 +1,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 ;------------------------------------------------------------------------------\r
 ;\r
 \r
 ;------------------------------------------------------------------------------\r
 ;\r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.asm b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.asm
index a6d03306f34e9398585fc0974f7442ae124e23a9..6b5c81f5566da4935f9b6e46501bba7d356438f5 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.asm
@@ -1,7 +1,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 ;------------------------------------------------------------------------------\r
 ;\r
 \r
 ;------------------------------------------------------------------------------\r
 ;\r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.asm b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.asm
index 46a80111d7508d9045eb5bdb70efdf7d326f1697..cb0feed6be6f56225ef634ae4ed33dc9e9a030c2 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.asm
@@ -1,7 +1,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 ;------------------------------------------------------------------------------\r
 ;\r
 \r
 ;------------------------------------------------------------------------------\r
 ;\r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.asm b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.asm
index c19ed989ed3e0649aa027b4587fd049f450ea6a6..ee0deddc61f9979c42050592d8dd154fb0092856 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.asm
@@ -1,7 +1,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 ;------------------------------------------------------------------------------\r
 ;\r
 \r
 ;------------------------------------------------------------------------------\r
 ;\r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.asm b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.asm
index def2690d1ac856bb44065d1fc36ab54ba9b79b14..97d201abb575d99723b9e429720d0424f54df66a 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.asm
@@ -1,7 +1,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 ;------------------------------------------------------------------------------\r
 ;\r
 \r
 ;------------------------------------------------------------------------------\r
 ;\r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem.asm b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem.asm
index d88d1fd105ec4d29024161236a605ea3667bf434..b48cffc1ee14c54f94696a6f7c0da1ab801e48c3 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem.asm
@@ -1,7 +1,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 ;------------------------------------------------------------------------------\r
 ;\r
 \r
 ;------------------------------------------------------------------------------\r
 ;\r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem16.asm b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem16.asm
index 414ed7cae6f75faf5e1ba3abbcab6769c9d3b4d6..1319614d516a6771bd4e95aed3a23d07ff4f1889 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem16.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem16.asm
@@ -1,7 +1,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 ;------------------------------------------------------------------------------\r
 ;\r
 \r
 ;------------------------------------------------------------------------------\r
 ;\r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem32.asm b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem32.asm
index 020bb795cfe4bd44539d737f6e72c6f2cb031bce..34f4b8e5d7a8c114b54fddc0d8e0898649d2cbdf 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem32.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem32.asm
@@ -1,7 +1,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 ;------------------------------------------------------------------------------\r
 ;\r
 \r
 ;------------------------------------------------------------------------------\r
 ;\r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem64.asm b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem64.asm
index c9a51ae7014345d7a7fdd3511011e8641f35960b..3aa24ef7e435473c6e7bcd248c85b1db3608bceb 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem64.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem64.asm
@@ -1,7 +1,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 ;------------------------------------------------------------------------------\r
 ;\r
 \r
 ;------------------------------------------------------------------------------\r
 ;\r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ZeroMem.asm b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ZeroMem.asm
index 26137f771e193aedd5967f534209bd187e8a308c..fe569250ae8868b25778f554ff63b96a72350bff 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ZeroMem.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ZeroMem.asm
@@ -1,7 +1,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 ;------------------------------------------------------------------------------\r
 ;\r
 \r
 ;------------------------------------------------------------------------------\r
 ;\r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c b/MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c
index 243435801703e321420b6171b3f5fd867c880019..5abb5997e069d62edb452250dbf155f6d737f12d 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include "MemLibInternals.h"\r

 \r
 /**\r
   Copies a source GUID to a destination GUID.\r
 \r
 /**\r
   Copies a source GUID to a destination GUID.\r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/MemLibInternals.h b/MdePkg/Library/BaseMemoryLibRepStr/MemLibInternals.h
index 663a758f291e0c897cc8e3e5a94a2b7eaa04e84d..ceddbbe7a05b30419497fa9c491fcbe03993c8b4 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/MemLibInternals.h
+++ b/MdePkg/Library/BaseMemoryLibRepStr/MemLibInternals.h
@@ -23,10 +23,11 @@
 #ifndef __MEM_LIB_INTERNALS__\r
 #define __MEM_LIB_INTERNALS__\r
 \r
 #ifndef __MEM_LIB_INTERNALS__\r
 #define __MEM_LIB_INTERNALS__\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
+#include <Base.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/BaseLib.h>\r
+#include <Library/DebugLib.h>\r
+\r

 \r
 /**\r
   Copy Length bytes from Source to Destination.\r
 \r
 /**\r
   Copy Length bytes from Source to Destination.\r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem16Wrapper.c
index f0ca471844da42fb838ca0dd8a230d410abf826a..7f58a41810ff35392464db0000fde2b838e1eaee 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem16Wrapper.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem32Wrapper.c
index 7a0ebcd78f6960b4e71f5a3299084b030b4c47ee..cb02d605f23ad5169fd1309bc1a81a94523e536f 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem32Wrapper.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem64Wrapper.c
index dd1a82fef28a7ea2a45d0524ba19861731c6b76c..8b125794261a03baafa16f76bb56173117ae2371 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem64Wrapper.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem8Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem8Wrapper.c
index 685563e3796d9ec61607391f35fcb415c83c0ba1..5393f7bc487622cf0890670f248eda5ac64a3d14 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem8Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem8Wrapper.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/SetMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/SetMem16Wrapper.c
index 5e58eb9f74da7d86c483a8fe43de55bf3bd03912..da5f5c370b55488746e979a717ef73f7911344c9 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/SetMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/SetMem16Wrapper.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/SetMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/SetMem32Wrapper.c
index f4927f7d9a9409128da2ff80b300480a35c0ba48..83514b0b5aca700313755d399a089546c922b5e1 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/SetMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/SetMem32Wrapper.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/SetMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/SetMem64Wrapper.c
index e84556343a731b068889de70b5219f61167e2004..cf12111a6ad050359ea1e8dd3cb75727d0d14dd0 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/SetMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/SetMem64Wrapper.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c
index 84a7d62ea97831727bb14b2f9db952c38dd6ac01..c97a45df28cdb62311ad506163d41075ce351c11 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ZeroMemWrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/ZeroMemWrapper.c
index 886c9343b866ae21d9183a0bde488e2eb19cf419..21c70d36aa0053a7a6cc8305323350e8972466f9 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/ZeroMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/ZeroMemWrapper.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf b/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf
index 5c29c4c6bd342697f95278d2e7808555a18c7ae7..eabf41864a59da9b2f987f8d6ea7b8ba6fe7d740 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf
+++ b/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf
@@ -45,7 +45,6 @@
 \r
 [Sources.common]\r
   MemLibInternals.h\r
 \r
 [Sources.common]\r
   MemLibInternals.h\r

-  CommonHeader.h\r

 \r
 [Sources.Ia32]\r
   Ia32/ScanMem64.S\r
 \r
 [Sources.Ia32]\r
   Ia32/ScanMem64.S\r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/CommonHeader.h b/MdePkg/Library/BaseMemoryLibSse2/CommonHeader.h
deleted file mode 100644 (file)
index 68b4d94..0000000
--- a/MdePkg/Library/BaseMemoryLibSse2/CommonHeader.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2007, 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
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <Base.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/BaseMemoryLib.h>\r
-#include <Library/BaseLib.h>\r
-#include <Library/DebugLib.h>\r
-\r
-#endif\r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/CompareMemWrapper.c b/MdePkg/Library/BaseMemoryLibSse2/CompareMemWrapper.c
index b816af7489b08ac0fb6c9bfe845cbeeb6f19303e..b6f852cdf122e916920170e27fee8d78f5ac41a2 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/CompareMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/CompareMemWrapper.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/CopyMemWrapper.c b/MdePkg/Library/BaseMemoryLibSse2/CopyMemWrapper.c
index b0449b19b58358767ce9e5795ac58b923ac9543f..f7956e731b81b6d39f1c15aa33779dd8ad9ca4f6 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/CopyMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/CopyMemWrapper.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.asm
index dabd337a7c05e6d4acf3cfc3efa74b8ca2b87383..2509e40bd89149384c29346109870e91b4c1f118 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.asm
@@ -1,7 +1,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 ;------------------------------------------------------------------------------\r
 ;\r
 \r
 ;------------------------------------------------------------------------------\r
 ;\r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CopyMem.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/CopyMem.asm
index d8b80dba03d9249ad0383cdaf724d4998a9555f3..034918af2fc9a16abf5b78ac8671eecfb35c07c5 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CopyMem.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/CopyMem.asm
@@ -1,7 +1,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 ;------------------------------------------------------------------------------\r
 ;\r
 \r
 ;------------------------------------------------------------------------------\r
 ;\r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.asm
index a6d03306f34e9398585fc0974f7442ae124e23a9..6b5c81f5566da4935f9b6e46501bba7d356438f5 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.asm
@@ -1,7 +1,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 ;------------------------------------------------------------------------------\r
 ;\r
 \r
 ;------------------------------------------------------------------------------\r
 ;\r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.asm
index 46a80111d7508d9045eb5bdb70efdf7d326f1697..cb0feed6be6f56225ef634ae4ed33dc9e9a030c2 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.asm
@@ -1,7 +1,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 ;------------------------------------------------------------------------------\r
 ;\r
 \r
 ;------------------------------------------------------------------------------\r
 ;\r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.asm
index c19ed989ed3e0649aa027b4587fd049f450ea6a6..ee0deddc61f9979c42050592d8dd154fb0092856 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.asm
@@ -1,7 +1,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 ;------------------------------------------------------------------------------\r
 ;\r
 \r
 ;------------------------------------------------------------------------------\r
 ;\r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.asm
index def2690d1ac856bb44065d1fc36ab54ba9b79b14..97d201abb575d99723b9e429720d0424f54df66a 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.asm
@@ -1,7 +1,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 ;------------------------------------------------------------------------------\r
 ;\r
 \r
 ;------------------------------------------------------------------------------\r
 ;\r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.asm
index f41d19cc8219884c0a4dbd79e0256148df926408..ab89482d6f965bb9f96a7d6ceac452f92823f0ec 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.asm
@@ -1,7 +1,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 ;------------------------------------------------------------------------------\r
 ;\r
 \r
 ;------------------------------------------------------------------------------\r
 ;\r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem16.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem16.asm
index 93ce0af5b17aad250cc6dab7623c925acb6c6d37..75abe18b1d1b855de02d7e5af458b0b51c8c9f09 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem16.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem16.asm
@@ -1,7 +1,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 ;------------------------------------------------------------------------------\r
 ;\r
 \r
 ;------------------------------------------------------------------------------\r
 ;\r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.asm
index 3aea7b15813c9b0479313777f5bd27885cc19886..c12af90e7925b97aca1a13b2c379f4fda468aa2b 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.asm
@@ -1,7 +1,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 ;------------------------------------------------------------------------------\r
 ;\r
 \r
 ;------------------------------------------------------------------------------\r
 ;\r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.asm
index 8f1ebe4cdbba22bcfa71e2ba24dce4c0e6a2bc9d..17f0eb4bea66615bac2f216ddaf63bfd9a312a9d 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.asm
@@ -1,7 +1,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 ;------------------------------------------------------------------------------\r
 ;\r
 \r
 ;------------------------------------------------------------------------------\r
 ;\r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.asm
index 2f06ee196155c136b2ea16d3bd4dc68fe0a6203d..294e8ce04128c94338b088065f1537768da0a7fa 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.asm
@@ -1,7 +1,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 ;------------------------------------------------------------------------------\r
 ;\r
 \r
 ;------------------------------------------------------------------------------\r
 ;\r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c b/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c
index 243435801703e321420b6171b3f5fd867c880019..5abb5997e069d62edb452250dbf155f6d737f12d 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include "MemLibInternals.h"\r

 \r
 /**\r
   Copies a source GUID to a destination GUID.\r
 \r
 /**\r
   Copies a source GUID to a destination GUID.\r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/MemLibInternals.h b/MdePkg/Library/BaseMemoryLibSse2/MemLibInternals.h
index 663a758f291e0c897cc8e3e5a94a2b7eaa04e84d..ceddbbe7a05b30419497fa9c491fcbe03993c8b4 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/MemLibInternals.h
+++ b/MdePkg/Library/BaseMemoryLibSse2/MemLibInternals.h
@@ -23,10 +23,11 @@
 #ifndef __MEM_LIB_INTERNALS__\r
 #define __MEM_LIB_INTERNALS__\r
 \r
 #ifndef __MEM_LIB_INTERNALS__\r
 #define __MEM_LIB_INTERNALS__\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
+#include <Base.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/BaseLib.h>\r
+#include <Library/DebugLib.h>\r
+\r

 \r
 /**\r
   Copy Length bytes from Source to Destination.\r
 \r
 /**\r
   Copy Length bytes from Source to Destination.\r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/ScanMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/ScanMem16Wrapper.c
index f0ca471844da42fb838ca0dd8a230d410abf826a..7f58a41810ff35392464db0000fde2b838e1eaee 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/ScanMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/ScanMem16Wrapper.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/ScanMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/ScanMem32Wrapper.c
index 7a0ebcd78f6960b4e71f5a3299084b030b4c47ee..cb02d605f23ad5169fd1309bc1a81a94523e536f 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/ScanMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/ScanMem32Wrapper.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/ScanMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/ScanMem64Wrapper.c
index dd1a82fef28a7ea2a45d0524ba19861731c6b76c..8b125794261a03baafa16f76bb56173117ae2371 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/ScanMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/ScanMem64Wrapper.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/ScanMem8Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/ScanMem8Wrapper.c
index 685563e3796d9ec61607391f35fcb415c83c0ba1..5393f7bc487622cf0890670f248eda5ac64a3d14 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/ScanMem8Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/ScanMem8Wrapper.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/SetMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/SetMem16Wrapper.c
index 5e58eb9f74da7d86c483a8fe43de55bf3bd03912..da5f5c370b55488746e979a717ef73f7911344c9 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/SetMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/SetMem16Wrapper.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/SetMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/SetMem32Wrapper.c
index f4927f7d9a9409128da2ff80b300480a35c0ba48..83514b0b5aca700313755d399a089546c922b5e1 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/SetMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/SetMem32Wrapper.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/SetMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/SetMem64Wrapper.c
index e84556343a731b068889de70b5219f61167e2004..cf12111a6ad050359ea1e8dd3cb75727d0d14dd0 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/SetMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/SetMem64Wrapper.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c
index 84a7d62ea97831727bb14b2f9db952c38dd6ac01..c97a45df28cdb62311ad506163d41075ce351c11 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/ZeroMemWrapper.c b/MdePkg/Library/BaseMemoryLibSse2/ZeroMemWrapper.c
index 886c9343b866ae21d9183a0bde488e2eb19cf419..21c70d36aa0053a7a6cc8305323350e8972466f9 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/ZeroMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/ZeroMemWrapper.c
@@ -26,7 +26,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "MemLibInternals.h"\r
 \r
 \r
 #include "MemLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
index 67a821a4657b2123e796d12821acaabf2c0a3715..bcd92bfcd0c9bb3787241c9b2b3d76487a81e6f7 100644 (file)
--- a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
+++ b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
@@ -20,7 +20,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "BasePeCoffLibInternals.h"\r
 \r
 \r
 #include "BasePeCoffLibInternals.h"\r
 \r

diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf b/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
index 7ef65c1e525e490346ccb6e07f1dbf9cacab8eeb..8305d4325aeba1c2b498813d796af4aec3f035a4 100644 (file)
--- a/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
+++ b/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
@@ -45,7 +45,6 @@
 [Sources.common]\r
   BasePeCoffLibInternals.h\r
   BasePeCoff.c\r
 [Sources.common]\r
   BasePeCoffLibInternals.h\r
   BasePeCoff.c\r

-  CommonHeader.h\r

 \r
 [Sources.Ia32]\r
   Ia32/PeCoffLoaderEx.c\r
 \r
 [Sources.Ia32]\r
   Ia32/PeCoffLoaderEx.c\r

diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoffLibInternals.h b/MdePkg/Library/BasePeCoffLib/BasePeCoffLibInternals.h
index bf9e18bef42dcf29de74740daa238353b3fb310d..039f34e8888c15a34abc495ce622d80cf0160afb 100644 (file)
--- a/MdePkg/Library/BasePeCoffLib/BasePeCoffLibInternals.h
+++ b/MdePkg/Library/BasePeCoffLib/BasePeCoffLibInternals.h
@@ -17,10 +17,13 @@
 #ifndef __BASE_PECOFF_LIB_INTERNALS__\r
 #define __BASE_PECOFF_LIB_INTERNALS__\r
 \r
 #ifndef __BASE_PECOFF_LIB_INTERNALS__\r
 #define __BASE_PECOFF_LIB_INTERNALS__\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
+#include <Base.h>\r
+#include <Library/PeCoffLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/DebugLib.h>\r
+#include <IndustryStandard/PeImage.h>\r
+\r
+\r

 \r
 /**\r
   Performs an Itanium-based specific relocation fixup and is a no-op on other\r
 \r
 /**\r
   Performs an Itanium-based specific relocation fixup and is a no-op on other\r

diff --git a/MdePkg/Library/BasePeCoffLib/CommonHeader.h b/MdePkg/Library/BasePeCoffLib/CommonHeader.h
deleted file mode 100644 (file)
index cdbe44b..0000000
--- a/MdePkg/Library/BasePeCoffLib/CommonHeader.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2006, 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
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <Base.h>\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/PeCoffLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
-#include <Library/DebugLib.h>\r
-\r
-#include <IndustryStandard/PeImage.h>\r
-\r
-#endif\r

diff --git a/MdePkg/Library/BasePeCoffLib/Ebc/PeCoffLoaderEx.c b/MdePkg/Library/BasePeCoffLib/Ebc/PeCoffLoaderEx.c
index d52fcdd4805aec2e576f11e8920abdb188224570..217545436cabf2086cc9008f3b62a4b5cb903c8b 100644 (file)
--- a/MdePkg/Library/BasePeCoffLib/Ebc/PeCoffLoaderEx.c
+++ b/MdePkg/Library/BasePeCoffLib/Ebc/PeCoffLoaderEx.c
@@ -14,13 +14,7 @@
 \r
 **/\r
 \r
 \r
 **/\r
 \r

-\r
-\r
-\r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
+#include "BasePeCoffLibInternals.h"\r

 \r
 /**\r
   Performs an EBC specific relocation fixup.\r
 \r
 /**\r
   Performs an EBC specific relocation fixup.\r

diff --git a/MdePkg/Library/BasePeCoffLib/Ia32/PeCoffLoaderEx.c b/MdePkg/Library/BasePeCoffLib/Ia32/PeCoffLoaderEx.c
index 96302850111c77a7cbaa41f3d669f3cddc0ec3e0..4f8e4611474bd92c35cb196e9e134f5cc88941fb 100644 (file)
--- a/MdePkg/Library/BasePeCoffLib/Ia32/PeCoffLoaderEx.c
+++ b/MdePkg/Library/BasePeCoffLib/Ia32/PeCoffLoaderEx.c
@@ -14,15 +14,9 @@
 \r
 **/\r
 \r
 \r
 **/\r
 \r

+#include "BasePeCoffLibInternals.h"\r

 \r
 \r
 \r
 \r

-\r
-\r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 /**\r
   Performs an IA-32 specific relocation fixup.\r
 \r
 /**\r
   Performs an IA-32 specific relocation fixup.\r
 \r

diff --git a/MdePkg/Library/BasePeCoffLib/Ipf/PeCoffLoaderEx.c b/MdePkg/Library/BasePeCoffLib/Ipf/PeCoffLoaderEx.c
index c0821181e10d77b09418747053bac3f258888c8b..065aec42ac36c2cebcb6d7ae2250231c52757bac 100644 (file)
--- a/MdePkg/Library/BasePeCoffLib/Ipf/PeCoffLoaderEx.c
+++ b/MdePkg/Library/BasePeCoffLib/Ipf/PeCoffLoaderEx.c
@@ -14,11 +14,6 @@
 \r
 **/\r
 \r
 \r
 **/\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 #include "BasePeCoffLibInternals.h"\r
 \r
 \r
 #include "BasePeCoffLibInternals.h"\r
 \r
 \r

diff --git a/MdePkg/Library/BasePeCoffLib/x64/PeCoffLoaderEx.c b/MdePkg/Library/BasePeCoffLib/x64/PeCoffLoaderEx.c
index da7cf3d4a8d3df37cb2f94c403b0bb1415df7677..3126ca8c2b6dd0f3c389d741a68e12ef0b5ea3a7 100644 (file)
--- a/MdePkg/Library/BasePeCoffLib/x64/PeCoffLoaderEx.c
+++ b/MdePkg/Library/BasePeCoffLib/x64/PeCoffLoaderEx.c
@@ -12,10 +12,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 \r
 \r
 **/\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
+#include "BasePeCoffLibInternals.h"\r

 \r
 /**\r
   Performs an x64 specific relocation fixup.\r
 \r
 /**\r
   Performs an x64 specific relocation fixup.\r

diff --git a/MdePkg/Library/BasePrintLib/BasePrintLib.inf b/MdePkg/Library/BasePrintLib/BasePrintLib.inf
index 8abdfd7895bae6d1332f4d5e7f0b23180f60722b..d978addcd02e0a5d3f7aed14b5a177b6b25880cd 100644 (file)
--- a/MdePkg/Library/BasePrintLib/BasePrintLib.inf
+++ b/MdePkg/Library/BasePrintLib/BasePrintLib.inf
@@ -46,7 +46,6 @@
   PrintLibInternal.h\r
   PrintLibInternal.c\r
   PrintLib.c\r
   PrintLibInternal.h\r
   PrintLibInternal.c\r
   PrintLib.c\r

-  CommonHeader.h\r

 \r
 \r
 ################################################################################\r
 \r
 \r
 ################################################################################\r

diff --git a/MdePkg/Library/BasePrintLib/CommonHeader.h b/MdePkg/Library/BasePrintLib/CommonHeader.h
deleted file mode 100644 (file)
index c6d7f41..0000000
--- a/MdePkg/Library/BasePrintLib/CommonHeader.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2007, 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
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <Base.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/PrintLib.h>\r
-#include <Library/BaseLib.h>\r
-#include <Library/DebugLib.h>\r
-\r
-#endif\r

diff --git a/MdePkg/Library/BasePrintLib/PrintLib.c b/MdePkg/Library/BasePrintLib/PrintLib.c
index 764e3847a2c9a3e90e518b27b0d2f4c5133ba74b..4c08ff98dc83e58965a0f4b65cfd45ce00a80615 100644 (file)
--- a/MdePkg/Library/BasePrintLib/PrintLib.c
+++ b/MdePkg/Library/BasePrintLib/PrintLib.c
@@ -17,7 +17,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "PrintLibInternal.h"\r
 \r
 \r
 #include "PrintLibInternal.h"\r
 \r

diff --git a/MdePkg/Library/BasePrintLib/PrintLibInternal.c b/MdePkg/Library/BasePrintLib/PrintLibInternal.c
index 72c05e4dc5dbd88c515e51826a4a43079884ced4..fec8db898332a6f70a57390265dd89dba1d7085f 100644 (file)
--- a/MdePkg/Library/BasePrintLib/PrintLibInternal.c
+++ b/MdePkg/Library/BasePrintLib/PrintLibInternal.c
@@ -17,7 +17,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+\r

 \r
 #include "PrintLibInternal.h"\r
 \r
 \r
 #include "PrintLibInternal.h"\r
 \r

diff --git a/MdePkg/Library/BasePrintLib/PrintLibInternal.h b/MdePkg/Library/BasePrintLib/PrintLibInternal.h
index 3a1003beeaccefd1f47ccaf6e250bbdbf3105780..62e51838e3ce22599aad30cbfc359b9071e09c44 100644 (file)
--- a/MdePkg/Library/BasePrintLib/PrintLibInternal.h
+++ b/MdePkg/Library/BasePrintLib/PrintLibInternal.h
@@ -15,10 +15,11 @@
 #ifndef __PRINT_LIB_INTERNAL_H\r
 #define __PRINT_LIB_INTERNAL_H\r
 \r
 #ifndef __PRINT_LIB_INTERNAL_H\r
 #define __PRINT_LIB_INTERNAL_H\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
+#include <Base.h>\r
+#include <Library/PrintLib.h>\r
+#include <Library/BaseLib.h>\r
+#include <Library/DebugLib.h>\r
+\r

 \r
 //\r
 // Print primitives\r
 \r
 //\r
 // Print primitives\r

diff --git a/MdePkg/Library/DxeMemoryAllocationLib/CommonHeader.h b/MdePkg/Library/DxeMemoryAllocationLib/CommonHeader.h
deleted file mode 100644 (file)
index ef4a5b8..0000000
--- a/MdePkg/Library/DxeMemoryAllocationLib/CommonHeader.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2007, 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
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <PiDxe.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/MemoryAllocationLib.h>\r
-#include <Library/UefiBootServicesTableLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
-#include <Library/DebugLib.h>\r
-\r
-#endif\r

diff --git a/MdePkg/Library/DxeMemoryAllocationLib/MemoryAllocationLibInternals.h b/MdePkg/Library/DxeMemoryAllocationLib/MemoryAllocationLibInternals.h
index 2a28844eb2d67d1b008fcb1c8d68d59a030211a4..c4f27f1a5aabd989781609733f8f7e573901e2e7 100644 (file)
--- a/MdePkg/Library/DxeMemoryAllocationLib/MemoryAllocationLibInternals.h
+++ b/MdePkg/Library/DxeMemoryAllocationLib/MemoryAllocationLibInternals.h
@@ -15,6 +15,13 @@
 #ifndef __DXE_MEMORY_ALLOCATION_LIB_INTERNALS_H__\r
 #define __DXE_MEMORY_ALLOCATION_LIB_INTERNALS_H__\r
 \r
 #ifndef __DXE_MEMORY_ALLOCATION_LIB_INTERNALS_H__\r
 #define __DXE_MEMORY_ALLOCATION_LIB_INTERNALS_H__\r
 \r

+#include <PiDxe.h>\r
+#include <Library/MemoryAllocationLib.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/DebugLib.h>\r
+\r
+\r

 /**\r
   Allocates one or more 4KB pages of a certain memory type.\r
 \r
 /**\r
   Allocates one or more 4KB pages of a certain memory type.\r
 \r

diff --git a/MdePkg/Library/DxeServicesTableLib/CommonHeader.h b/MdePkg/Library/DxeServicesTableLib/CommonHeader.h
deleted file mode 100644 (file)
index e922174..0000000
--- a/MdePkg/Library/DxeServicesTableLib/CommonHeader.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2007, 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
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <PiDxe.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-#include <Guid/DxeServices.h>\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/DxeServicesTableLib.h>\r
-#include <Library/DebugLib.h>\r
-#include <Library/UefiLib.h>\r
-\r
-#endif\r

diff --git a/MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.c b/MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.c
index 5aea46e08455ef753a22b962cd0b5400f73e16b2..b4faf976f657df597f9bb75f0c3721a0c79dc64e 100644 (file)
--- a/MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.c
+++ b/MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.c
@@ -14,21 +14,13 @@
 \r
 **/\r
 \r
 \r
 **/\r
 \r

-//\r
-// The package level header files this module uses\r
-//\r

 #include <PiDxe.h>\r
 #include <PiDxe.h>\r

-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r

 #include <Guid/DxeServices.h>\r
 #include <Guid/DxeServices.h>\r

-//\r
-// The Library classes this module consumes\r
-//\r

 #include <Library/DxeServicesTableLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/UefiLib.h>\r
 \r
 #include <Library/DxeServicesTableLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/UefiLib.h>\r
 \r

+\r

 //\r
 // Cache copy of the DXE Services Table\r
 //\r
 //\r
 // Cache copy of the DXE Services Table\r
 //\r

diff --git a/MdePkg/Library/PeiServicesTablePointerLib/CommonHeader.h b/MdePkg/Library/PeiServicesTablePointerLib/CommonHeader.h
deleted file mode 100644 (file)
index 4a68867..0000000
--- a/MdePkg/Library/PeiServicesTablePointerLib/CommonHeader.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2007 - 2007, 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
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <PiPei.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/PeiServicesTablePointerLib.h>\r
-#include <Library/DebugLib.h>\r
-\r
-#endif\r

diff --git a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c b/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
index c923f601d87a695b6c615d69e0c032126ea490a6..9dea0476d973ca85b7d5321584237e9c23609f6f 100644 (file)
--- a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
+++ b/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
@@ -14,21 +14,11 @@
 \r
 **/\r
 \r
 \r
 **/\r
 \r

-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r

 #include <PiPei.h>\r
 #include <PiPei.h>\r

-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-//\r
-// The Library classes this module consumes\r
-//\r

 #include <Library/PeiServicesTablePointerLib.h>\r
 #include <Library/DebugLib.h>\r
 \r
 #include <Library/PeiServicesTablePointerLib.h>\r
 #include <Library/DebugLib.h>\r
 \r

+\r

 static EFI_PEI_SERVICES  **gPeiServices;\r
 \r
 /**\r
 static EFI_PEI_SERVICES  **gPeiServices;\r
 \r
 /**\r

diff --git a/MdePkg/Library/SecPeiDxeTimerLibCpu/CommonHeader.h b/MdePkg/Library/SecPeiDxeTimerLibCpu/CommonHeader.h
deleted file mode 100644 (file)
index 7d1af9c..0000000
--- a/MdePkg/Library/SecPeiDxeTimerLibCpu/CommonHeader.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2007 - 2007, 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
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <Base.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/TimerLib.h>\r
-#include <Library/BaseLib.h>\r
-#include <Library/IoLib.h>\r
-#include <Library/DebugLib.h>\r
-#include <Library/PcdLib.h>\r
-\r
-#endif\r

diff --git a/MdePkg/Library/SecPeiDxeTimerLibCpu/IpfTimerLib.c b/MdePkg/Library/SecPeiDxeTimerLibCpu/IpfTimerLib.c
index 2acdab3d2a17867bd4a0917f3e523116cec7a8e3..42c8511dde18f07c89e47acf20bbf9c1e03bb517 100644 (file)
--- a/MdePkg/Library/SecPeiDxeTimerLibCpu/IpfTimerLib.c
+++ b/MdePkg/Library/SecPeiDxeTimerLibCpu/IpfTimerLib.c
@@ -14,14 +14,14 @@
 \r
 **/\r
 \r
 \r
 **/\r
 \r

+#include <Base.h>\r
+#include <Library/TimerLib.h>\r
+#include <Library/BaseLib.h>\r
+#include <Library/IoLib.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/PcdLib.h>\r

 \r
 \r
 \r
 \r

-\r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 /**\r
   Performs a delay measured as number of ticks.\r
 \r
 /**\r
   Performs a delay measured as number of ticks.\r
 \r

diff --git a/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf b/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
index 9fbceafebb10703063d0eab34768d19db1af7b08..774a2dd3b11dd65d027d46b6651ce5d816015484 100644 (file)
--- a/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
+++ b/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
@@ -46,8 +46,6 @@
 #\r
 ################################################################################\r
 \r
 #\r
 ################################################################################\r
 \r

-[Sources.common]\r
-  CommonHeader.h\r

 \r
 [Sources.Ia32]\r
   x86TimerLib.c\r
 \r
 [Sources.Ia32]\r
   x86TimerLib.c\r

diff --git a/MdePkg/Library/SecPeiDxeTimerLibCpu/x86TimerLib.c b/MdePkg/Library/SecPeiDxeTimerLibCpu/x86TimerLib.c
index 24ee2e7d73f40d8f014f73b880376f11d7c75217..1b65858f12455dc8052bcad6247dabb8c8316304 100644 (file)
--- a/MdePkg/Library/SecPeiDxeTimerLibCpu/x86TimerLib.c
+++ b/MdePkg/Library/SecPeiDxeTimerLibCpu/x86TimerLib.c
@@ -14,10 +14,13 @@
 \r
 **/\r
 \r
 \r
 **/\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
+#include <Base.h>\r
+#include <Library/TimerLib.h>\r
+#include <Library/BaseLib.h>\r
+#include <Library/IoLib.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/PcdLib.h>\r
+\r

 \r
 //\r
 // The following array is used in calculating the frequency of local APIC\r
 \r
 //\r
 // The following array is used in calculating the frequency of local APIC\r

diff --git a/MdePkg/Library/UefiApplicationEntryPoint/ApplicationEntryPoint.c b/MdePkg/Library/UefiApplicationEntryPoint/ApplicationEntryPoint.c
index d56a0888041c43a74340378968d8f423444a7e77..3f45977aeb6d96f5b33fe2063ca380634f2749f2 100644 (file)
--- a/MdePkg/Library/UefiApplicationEntryPoint/ApplicationEntryPoint.c
+++ b/MdePkg/Library/UefiApplicationEntryPoint/ApplicationEntryPoint.c
@@ -12,19 +12,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 \r
 \r
 **/\r
 \r

-//\r
-// The package level header files this module uses\r
-//\r

 #include <Uefi.h>\r
 #include <Uefi.h>\r

-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-//\r
-// The Library classes this module consumes\r
-//\r

 #include <Library/UefiApplicationEntryPoint.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
 \r
 #include <Library/UefiApplicationEntryPoint.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
 \r

+\r

 /**\r
   Enrty point to UEFI application.\r
 \r
 /**\r
   Enrty point to UEFI application.\r
 \r

diff --git a/MdePkg/Library/UefiApplicationEntryPoint/CommonHeader.h b/MdePkg/Library/UefiApplicationEntryPoint/CommonHeader.h
deleted file mode 100644 (file)
index ffc077d..0000000
--- a/MdePkg/Library/UefiApplicationEntryPoint/CommonHeader.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2007, 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
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <Uefi.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/UefiApplicationEntryPoint.h>\r
-#include <Library/UefiBootServicesTableLib.h>\r
-\r
-#endif\r

diff --git a/MdePkg/Library/UefiLib/CommonHeader.h b/MdePkg/Library/UefiLib/CommonHeader.h
deleted file mode 100644 (file)
index ad028a7..0000000
--- a/MdePkg/Library/UefiLib/CommonHeader.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2007, 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
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <PiDxe.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-#include <Protocol/DriverBinding.h>\r
-#include <Protocol/ComponentName.h>\r
-#include <Protocol/ComponentName2.h>\r
-#include <Protocol/DriverConfiguration.h>\r
-#include <Protocol/DriverDiagnostics.h>\r
-#include <Protocol/DriverDiagnostics2.h>\r
-\r
-\r
-#include <Guid/EventGroup.h>\r
-#include <Guid/EventLegacyBios.h>\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/UefiLib.h>\r
-#include <Library/UefiBootServicesTableLib.h>\r
-#include <Library/BaseLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
-#include <Library/DebugLib.h>\r
-#include <Library/MemoryAllocationLib.h>\r
-#include <Library/PcdLib.h>\r
-#include <Library/PrintLib.h>\r
-\r
-#endif\r

diff --git a/MdePkg/Library/UefiLib/Console.c b/MdePkg/Library/UefiLib/Console.c
index b82af08ffc7b814ab8f6de34e73d20e245e74a5b..b549e7e018a715a9e5fee804d93ba92f2961ed7a 100644 (file)
--- a/MdePkg/Library/UefiLib/Console.c
+++ b/MdePkg/Library/UefiLib/Console.c
@@ -19,7 +19,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include "UefiLibInternal.h"\r

 \r
 typedef struct {\r
   CHAR16  WChar;\r
 \r
 typedef struct {\r
   CHAR16  WChar;\r

diff --git a/MdePkg/Library/UefiLib/UefiDriverModel.c b/MdePkg/Library/UefiLib/UefiDriverModel.c
index 582ad6acdd4c4b4a4a2d9aa828e02d89be676a0d..0a72d263ad9138862feeb88f5c66d4ecf18e35f5 100644 (file)
--- a/MdePkg/Library/UefiLib/UefiDriverModel.c
+++ b/MdePkg/Library/UefiLib/UefiDriverModel.c
@@ -16,7 +16,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include "UefiLibInternal.h"\r

 \r
 /**\r
   Intialize a driver by installing the Driver Binding Protocol onto the\r
 \r
 /**\r
   Intialize a driver by installing the Driver Binding Protocol onto the\r

diff --git a/MdePkg/Library/UefiLib/UefiLib.c b/MdePkg/Library/UefiLib/UefiLib.c
index f4eb3eb43baedec3890827011713ef0c04e76df4..a2d93d5f895553e8c18623199926ce437c87ee73 100644 (file)
--- a/MdePkg/Library/UefiLib/UefiLib.c
+++ b/MdePkg/Library/UefiLib/UefiLib.c
@@ -17,7 +17,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include "UefiLibInternal.h"\r

 \r
 /**\r
   Compare whether two names of languages are identical.\r
 \r
 /**\r
   Compare whether two names of languages are identical.\r

diff --git a/MdePkg/Library/UefiLib/UefiLib.inf b/MdePkg/Library/UefiLib/UefiLib.inf
index 6f6d034d527684331b2b170ebdb084f957a296c5..732b73b9d1ce57d0d606b55d3a005f5108ef2829 100644 (file)
--- a/MdePkg/Library/UefiLib/UefiLib.inf
+++ b/MdePkg/Library/UefiLib/UefiLib.inf
@@ -51,7 +51,7 @@
   UefiDriverModel.c\r
   Console.c\r
   UefiLib.c\r
   UefiDriverModel.c\r
   Console.c\r
   UefiLib.c\r

-  CommonHeader.h\r
+  UefiLibInternal.h\r

 \r
 \r
 ################################################################################\r
 \r
 \r
 ################################################################################\r

diff --git a/MdePkg/Library/UefiLib/UefiLibInternal.h b/MdePkg/Library/UefiLib/UefiLibInternal.h
new file mode 100644 (file)
index 0000000..82ba4c4
--- /dev/null
+++ b/MdePkg/Library/UefiLib/UefiLibInternal.h
@@ -0,0 +1,35 @@
+/**@file\r
+  Internal include file for UefiLib.\r
+\r
+  Copyright (c) 2007, Intel Corporation.<BR>\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
+   http://opensource.org/licenses/bsd-license.php\r
+   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+**/\r
+\r
+#ifndef __UEFI_LIB_INTERNAL_H_\r
+#define __UEFI_LIB_INTERNAL_H_\r
+\r
+\r
+#include <PiDxe.h>\r
+#include <Protocol/DriverBinding.h>\r
+#include <Protocol/ComponentName.h>\r
+#include <Protocol/ComponentName2.h>\r
+#include <Protocol/DriverConfiguration.h>\r
+#include <Protocol/DriverDiagnostics.h>\r
+#include <Protocol/DriverDiagnostics2.h>\r
+#include <Guid/EventGroup.h>\r
+#include <Guid/EventLegacyBios.h>\r
+#include <Library/UefiLib.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
+#include <Library/BaseLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/MemoryAllocationLib.h>\r
+#include <Library/PcdLib.h>\r
+#include <Library/PrintLib.h>\r
+\r
+#endif\r

diff --git a/MdePkg/Library/UefiLib/UefiLibPrint.c b/MdePkg/Library/UefiLib/UefiLibPrint.c
index f4453e4cd8a2290dd6a8dd534ddff41e28fa9150..de3e68ea2f4e18dcde47b202cb751cbfa78c0f6c 100644 (file)
--- a/MdePkg/Library/UefiLib/UefiLibPrint.c
+++ b/MdePkg/Library/UefiLib/UefiLibPrint.c
@@ -16,7 +16,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include "UefiLibInternal.h"\r

 \r
 /**\r
   Internal function which prints a formatted Unicode string to the console output device\r
 \r
 /**\r
   Internal function which prints a formatted Unicode string to the console output device\r

diff --git a/MdePkg/Library/UefiLib/UefiNotTiano.c b/MdePkg/Library/UefiLib/UefiNotTiano.c
index 9eba9ddf48648350afc59f8cec927e33e996840a..f51a16cb7e7a2a648bddd7c557c97f24b2a9f880 100644 (file)
--- a/MdePkg/Library/UefiLib/UefiNotTiano.c
+++ b/MdePkg/Library/UefiLib/UefiNotTiano.c
@@ -21,7 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include "UefiLibInternal.h"\r

 \r
 /**\r
   An empty function to pass error checking of CreateEventEx ().\r
 \r
 /**\r
   An empty function to pass error checking of CreateEventEx ().\r

diff --git a/MdePkg/Library/UefiRuntimeLib/CommonHeader.h b/MdePkg/Library/UefiRuntimeLib/CommonHeader.h
deleted file mode 100644 (file)
index 1868728..0000000
--- a/MdePkg/Library/UefiRuntimeLib/CommonHeader.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2006 - 2007, 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
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <PiDxe.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/UefiRuntimeLib.h>\r
-#include <Library/DebugLib.h>\r
-#include <Library/UefiBootServicesTableLib.h>\r
-\r
-#endif\r

diff --git a/MdePkg/Library/UefiRuntimeLib/RuntimeLibInternal.h b/MdePkg/Library/UefiRuntimeLib/RuntimeLibInternal.h
index 568f42921ec1f8a717b9c17c1bfe2ee32ed8b20c..e9b4c9d764a1ce69d938ba20ea6b1c81915423bb 100644 (file)
--- a/MdePkg/Library/UefiRuntimeLib/RuntimeLibInternal.h
+++ b/MdePkg/Library/UefiRuntimeLib/RuntimeLibInternal.h
@@ -15,10 +15,10 @@
 #ifndef __RUNTIMELIBINTERNAL_H__\r
 #define __RUNTIMELIBINTERNAL_H__\r
 \r
 #ifndef __RUNTIMELIBINTERNAL_H__\r
 #define __RUNTIMELIBINTERNAL_H__\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
+#include <PiDxe.h>\r
+#include <Library/UefiRuntimeLib.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r

 \r
 extern EFI_RUNTIME_SERVICES   *mRT;\r
 \r
 \r
 extern EFI_RUNTIME_SERVICES   *mRT;\r
 \r

diff --git a/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf b/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
index d26fc8b0ea9410d6ba90b311bc02aed45b318734..e90d5da488d74a898a1fa18ff88d995b06f46414 100644 (file)
--- a/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
+++ b/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
@@ -47,7 +47,6 @@
 \r
 [Sources.common]\r
   RuntimeLibInternal.h\r
 \r
 [Sources.common]\r
   RuntimeLibInternal.h\r

-  CommonHeader.h\r

 \r
 [Sources.Ia32]\r
   RuntimeService.c\r
 \r
 [Sources.Ia32]\r
   RuntimeService.c\r