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

26 files changed, 28 insertions, 61 deletions

diff --git a/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf b/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf
index 5c29c4c6bd..eabf41864a 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf
+++ b/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf
@@ -45,7 +45,6 @@
 

 [Sources.common]

   MemLibInternals.h

-  CommonHeader.h

 

 [Sources.Ia32]

   Ia32/ScanMem64.S

diff --git a/MdePkg/Library/BaseMemoryLibSse2/CommonHeader.h b/MdePkg/Library/BaseMemoryLibSse2/CommonHeader.h
deleted file mode 100644
index 68b4d9483b..0000000000
--- a/MdePkg/Library/BaseMemoryLibSse2/CommonHeader.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/**@file

-  Common header file shared by all source files.

-

-  This file includes package header files, library classes and protocol, PPI & GUID definitions.

-

-  Copyright (c) 2007, Intel Corporation

-  All rights reserved. This program and the accompanying materials

-   are licensed and made available under the terms and conditions of the BSD License

-   which accompanies this distribution. The full text of the license may be found at

-   http://opensource.org/licenses/bsd-license.php

-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-**/

-

-#ifndef __COMMON_HEADER_H_

-#define __COMMON_HEADER_H_

-

-

-//

-// The package level header files this module uses

-//

-#include <Base.h>

-//

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

-//

-//

-// The Library classes this module consumes

-//

-#include <Library/BaseMemoryLib.h>

-#include <Library/BaseLib.h>

-#include <Library/DebugLib.h>

-

-#endif

diff --git a/MdePkg/Library/BaseMemoryLibSse2/CompareMemWrapper.c b/MdePkg/Library/BaseMemoryLibSse2/CompareMemWrapper.c
index b816af7489..b6f852cdf1 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/CompareMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/CompareMemWrapper.c
@@ -26,7 +26,7 @@
 //

 // Include common header file for this module.

 //

-#include "CommonHeader.h"

+

 

 #include "MemLibInternals.h"

 

diff --git a/MdePkg/Library/BaseMemoryLibSse2/CopyMemWrapper.c b/MdePkg/Library/BaseMemoryLibSse2/CopyMemWrapper.c
index b0449b19b5..f7956e731b 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/CopyMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/CopyMemWrapper.c
@@ -26,7 +26,7 @@
 //

 // Include common header file for this module.

 //

-#include "CommonHeader.h"

+

 

 #include "MemLibInternals.h"

 

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.asm
index dabd337a7c..2509e40bd8 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.asm
@@ -1,7 +1,7 @@
 //

 // Include common header file for this module.

 //

-#include "CommonHeader.h"

+

 

 ;------------------------------------------------------------------------------

 ;

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CopyMem.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/CopyMem.asm
index d8b80dba03..034918af2f 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CopyMem.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/CopyMem.asm
@@ -1,7 +1,7 @@
 //

 // Include common header file for this module.

 //

-#include "CommonHeader.h"

+

 

 ;------------------------------------------------------------------------------

 ;

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.asm
index a6d03306f3..6b5c81f556 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.asm
@@ -1,7 +1,7 @@
 //

 // Include common header file for this module.

 //

-#include "CommonHeader.h"

+

 

 ;------------------------------------------------------------------------------

 ;

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.asm
index 46a80111d7..cb0feed6be 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.asm
@@ -1,7 +1,7 @@
 //

 // Include common header file for this module.

 //

-#include "CommonHeader.h"

+

 

 ;------------------------------------------------------------------------------

 ;

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.asm
index c19ed989ed..ee0deddc61 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.asm
@@ -1,7 +1,7 @@
 //

 // Include common header file for this module.

 //

-#include "CommonHeader.h"

+

 

 ;------------------------------------------------------------------------------

 ;

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.asm
index def2690d1a..97d201abb5 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.asm
@@ -1,7 +1,7 @@
 //

 // Include common header file for this module.

 //

-#include "CommonHeader.h"

+

 

 ;------------------------------------------------------------------------------

 ;

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.asm
index f41d19cc82..ab89482d6f 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.asm
@@ -1,7 +1,7 @@
 //

 // Include common header file for this module.

 //

-#include "CommonHeader.h"

+

 

 ;------------------------------------------------------------------------------

 ;

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem16.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem16.asm
index 93ce0af5b1..75abe18b1d 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem16.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem16.asm
@@ -1,7 +1,7 @@
 //

 // Include common header file for this module.

 //

-#include "CommonHeader.h"

+

 

 ;------------------------------------------------------------------------------

 ;

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.asm
index 3aea7b1581..c12af90e79 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.asm
@@ -1,7 +1,7 @@
 //

 // Include common header file for this module.

 //

-#include "CommonHeader.h"

+

 

 ;------------------------------------------------------------------------------

 ;

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.asm
index 8f1ebe4cdb..17f0eb4bea 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.asm
@@ -1,7 +1,7 @@
 //

 // Include common header file for this module.

 //

-#include "CommonHeader.h"

+

 

 ;------------------------------------------------------------------------------

 ;

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.asm
index 2f06ee1961..294e8ce041 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.asm
@@ -1,7 +1,7 @@
 //

 // Include common header file for this module.

 //

-#include "CommonHeader.h"

+

 

 ;------------------------------------------------------------------------------

 ;

diff --git a/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c b/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c
index 2434358017..5abb5997e0 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c
@@ -26,7 +26,7 @@
 //

 // Include common header file for this module.

 //

-#include "CommonHeader.h"

+#include "MemLibInternals.h"

 

 /**

   Copies a source GUID to a destination GUID.

diff --git a/MdePkg/Library/BaseMemoryLibSse2/MemLibInternals.h b/MdePkg/Library/BaseMemoryLibSse2/MemLibInternals.h
index 663a758f29..ceddbbe7a0 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/MemLibInternals.h
+++ b/MdePkg/Library/BaseMemoryLibSse2/MemLibInternals.h
@@ -23,10 +23,11 @@
 #ifndef __MEM_LIB_INTERNALS__

 #define __MEM_LIB_INTERNALS__

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

+#include <Base.h>

+#include <Library/BaseMemoryLib.h>

+#include <Library/BaseLib.h>

+#include <Library/DebugLib.h>

+

 

 /**

   Copy Length bytes from Source to Destination.

diff --git a/MdePkg/Library/BaseMemoryLibSse2/ScanMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/ScanMem16Wrapper.c
index f0ca471844..7f58a41810 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/ScanMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/ScanMem16Wrapper.c
@@ -26,7 +26,7 @@
 //

 // Include common header file for this module.

 //

-#include "CommonHeader.h"

+

 

 #include "MemLibInternals.h"

 

diff --git a/MdePkg/Library/BaseMemoryLibSse2/ScanMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/ScanMem32Wrapper.c
index 7a0ebcd78f..cb02d605f2 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/ScanMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/ScanMem32Wrapper.c
@@ -26,7 +26,7 @@
 //

 // Include common header file for this module.

 //

-#include "CommonHeader.h"

+

 

 #include "MemLibInternals.h"

 

diff --git a/MdePkg/Library/BaseMemoryLibSse2/ScanMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/ScanMem64Wrapper.c
index dd1a82fef2..8b12579426 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/ScanMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/ScanMem64Wrapper.c
@@ -26,7 +26,7 @@
 //

 // Include common header file for this module.

 //

-#include "CommonHeader.h"

+

 

 #include "MemLibInternals.h"

 

diff --git a/MdePkg/Library/BaseMemoryLibSse2/ScanMem8Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/ScanMem8Wrapper.c
index 685563e379..5393f7bc48 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/ScanMem8Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/ScanMem8Wrapper.c
@@ -26,7 +26,7 @@
 //

 // Include common header file for this module.

 //

-#include "CommonHeader.h"

+

 

 #include "MemLibInternals.h"

 

diff --git a/MdePkg/Library/BaseMemoryLibSse2/SetMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/SetMem16Wrapper.c
index 5e58eb9f74..da5f5c370b 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/SetMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/SetMem16Wrapper.c
@@ -26,7 +26,7 @@
 //

 // Include common header file for this module.

 //

-#include "CommonHeader.h"

+

 

 #include "MemLibInternals.h"

 

diff --git a/MdePkg/Library/BaseMemoryLibSse2/SetMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/SetMem32Wrapper.c
index f4927f7d9a..83514b0b5a 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/SetMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/SetMem32Wrapper.c
@@ -26,7 +26,7 @@
 //

 // Include common header file for this module.

 //

-#include "CommonHeader.h"

+

 

 #include "MemLibInternals.h"

 

diff --git a/MdePkg/Library/BaseMemoryLibSse2/SetMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/SetMem64Wrapper.c
index e84556343a..cf12111a6a 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/SetMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/SetMem64Wrapper.c
@@ -26,7 +26,7 @@
 //

 // Include common header file for this module.

 //

-#include "CommonHeader.h"

+

 

 #include "MemLibInternals.h"

 

diff --git a/MdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c
index 84a7d62ea9..c97a45df28 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c
@@ -26,7 +26,7 @@
 //

 // Include common header file for this module.

 //

-#include "CommonHeader.h"

+

 

 #include "MemLibInternals.h"

 

diff --git a/MdePkg/Library/BaseMemoryLibSse2/ZeroMemWrapper.c b/MdePkg/Library/BaseMemoryLibSse2/ZeroMemWrapper.c
index 886c9343b8..21c70d36aa 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/ZeroMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/ZeroMemWrapper.c
@@ -26,7 +26,7 @@
 //

 // Include common header file for this module.

 //

-#include "CommonHeader.h"

+

 

 #include "MemLibInternals.h"