Removed CommonHeader.h from MdePkg & MdeModulePkg

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

7 files changed, 15 insertions, 118 deletions

diff --git a/MdeModulePkg/Universal/DevicePathDxe/CommonHeader.h b/MdeModulePkg/Universal/DevicePathDxe/CommonHeader.h
deleted file mode 100644
index 24b9be38b4..0000000000
--- a/MdeModulePkg/Universal/DevicePathDxe/CommonHeader.h
+++ /dev/null
@@ -1,44 +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) 2006 - 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 <PiDxe.h>

-//

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

-//

-#include <Protocol/DevicePathUtilities.h>

-#include <Protocol/DebugPort.h>

-#include <Protocol/DevicePathToText.h>

-#include <Protocol/DevicePathFromText.h>

-#include <Guid/PcAnsi.h>

-//

-// The Library classes this module consumes

-//

-#include <Library/DebugLib.h>

-#include <Library/PrintLib.h>

-#include <Library/UefiDriverEntryPoint.h>

-#include <Library/BaseLib.h>

-#include <Library/BaseMemoryLib.h>

-#include <Library/MemoryAllocationLib.h>

-#include <Library/UefiBootServicesTableLib.h>

-#include <Library/DevicePathLib.h>

-#include <Library/PcdLib.h>

-

-#endif

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.c b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.c
index fc92fc986f..8aff74d64e 100644
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.c
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.c
@@ -20,11 +20,6 @@ Abstract:
 

 --*/

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

 #include "DevicePath.h"

 

 EFI_HANDLE  mDevicePathHandle = NULL;

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h
index 9473b89e37..f95b13f7a8 100644
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h
@@ -21,10 +21,21 @@ Abstract:
 #ifndef _DEVICE_PATH_DRIVER_H

 #define _DEVICE_PATH_DRIVER_H

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

+#include <PiDxe.h>

+#include <Protocol/DevicePathUtilities.h>

+#include <Protocol/DebugPort.h>

+#include <Protocol/DevicePathToText.h>

+#include <Protocol/DevicePathFromText.h>

+#include <Guid/PcAnsi.h>

+#include <Library/DebugLib.h>

+#include <Library/PrintLib.h>

+#include <Library/UefiDriverEntryPoint.h>

+#include <Library/BaseLib.h>

+#include <Library/BaseMemoryLib.h>

+#include <Library/MemoryAllocationLib.h>

+#include <Library/UefiBootServicesTableLib.h>

+#include <Library/DevicePathLib.h>

+#include <Library/PcdLib.h>

 

 extern const EFI_GUID mEfiDevicePathMessagingUartFlowControlGuid;

 extern const EFI_GUID mEfiDevicePathMessagingSASGuid;

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.inf b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.inf
index 98c3f1a60c..8258846190 100644
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.inf
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.inf
@@ -15,11 +15,6 @@
 #

 #**/

 

-################################################################################

-#

-# Defines Section - statements that will be processed to create a Makefile.

-#

-################################################################################

 [Defines]

   INF_VERSION                    = 0x00010005

   BASE_NAME                      = DevicePath

@@ -37,40 +32,17 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

 #

 

-################################################################################

-#

-# Sources Section - list of files that are required for the build to succeed.

-#

-################################################################################

-

 [Sources.common]

   DevicePathUtilities.c

   DevicePathToText.c

   DevicePathFromText.c

   DevicePath.h

   DevicePath.c

-  CommonHeader.h

-

-

-################################################################################

-#

-# Package Dependency Section - list of Package files that are required for

-#                              this module.

-#

-################################################################################

 

 [Packages]

   MdeModulePkg/MdeModulePkg.dec

   MdePkg/MdePkg.dec

 

-

-################################################################################

-#

-# Library Class Section - list of Library Classes that are required for

-#                         this module.

-#

-################################################################################

-

 [LibraryClasses]

   PcdLib

   DevicePathLib

@@ -82,40 +54,18 @@
   PrintLib

   DebugLib

 

-

-################################################################################

-#

-# Guid C Name Section - list of Guids that this module uses or produces.

-#

-################################################################################

-

 [Guids]

   gEfiVTUTF8Guid                                # ALWAYS_CONSUMED

   gEfiVT100Guid                                 # ALWAYS_CONSUMED

   gEfiVT100PlusGuid                             # ALWAYS_CONSUMED

   gEfiPcAnsiGuid                                # ALWAYS_CONSUMED

 

-

-################################################################################

-#

-# Protocol C Name Section - list of Protocol and Protocol Notify C Names

-#                           that this module uses or produces.

-#

-################################################################################

-

 [Protocols]

   gEfiDevicePathToTextProtocolGuid              # PROTOCOL ALWAYS_PRODUCED

   gEfiDevicePathFromTextProtocolGuid            # PROTOCOL ALWAYS_PRODUCED

   gEfiDevicePathUtilitiesProtocolGuid           # PROTOCOL ALWAYS_PRODUCED

   gEfiDebugPortProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED

 

-

-################################################################################

-#

-# Pcd FEATURE_FLAG - list of PCDs that this module is coded for.

-#

-################################################################################

-

 [PcdsFeatureFlag.common]

   PcdDevicePathSupportDevicePathFromText|gEfiMdeModulePkgTokenSpaceGuid

   PcdDevicePathSupportDevicePathToText|gEfiMdeModulePkgTokenSpaceGuid

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c b/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c
index 18bb291a94..94a4a2b5b7 100644
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c
@@ -19,11 +19,6 @@ Abstract:
 

 --*/

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

 #include "DevicePath.h"

 

 STATIC

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c b/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c
index c024ccfba1..f1365baa26 100644
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c
@@ -19,11 +19,6 @@ Abstract:
 

 --*/

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

 #include "DevicePath.h"

 

 STATIC

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathUtilities.c b/MdeModulePkg/Universal/DevicePathDxe/DevicePathUtilities.c
index a78a24d9f5..548a5349a8 100644
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathUtilities.c
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePathUtilities.c
@@ -19,11 +19,6 @@ Abstract:
 

 --*/

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

 #include "DevicePath.h"

 

 UINTN