From 859b72fa7e3ff1cf1d7476a3446af4ebbb5fe3e6 Mon Sep 17 00:00:00 2001 From: AJFISH Date: Tue, 10 Jul 2007 16:13:56 +0000 Subject: Removed CommonHeader.h from MdePkg & MdeModulePkg git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3180 6f19259b-4bc3-4df7-8a09-765794883524 --- .../BaseCustomDecompressLibNull.c | 7 ++-- .../BaseCustomDecompressLibNull.inf | 20 ---------- .../BaseCustomDecompressLibNull/CommonHeader.h | 28 -------------- .../Library/DxeDebugLibSerialPort/CommonHeader.h | 33 ----------------- MdePkg/Library/DxeDebugLibSerialPort/DebugLib.c | 12 ++++-- .../DxeDebugLibSerialPort.inf | 43 ---------------------- MdePkg/Library/UefiUsbLib/CommonHeader.h | 29 --------------- MdePkg/Library/UefiUsbLib/UsbDxeLib.c | 5 +-- MdePkg/Library/UefiUsbLib/hid.c | 5 +-- 9 files changed, 13 insertions(+), 169 deletions(-) delete mode 100644 MdePkg/Library/BaseCustomDecompressLibNull/CommonHeader.h delete mode 100644 MdePkg/Library/DxeDebugLibSerialPort/CommonHeader.h delete mode 100644 MdePkg/Library/UefiUsbLib/CommonHeader.h (limited to 'MdePkg') diff --git a/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.c b/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.c index 877ebc97e6..96c538b15a 100644 --- a/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.c +++ b/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.c @@ -19,10 +19,9 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" +#include +#include + RETURN_STATUS EFIAPI diff --git a/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.inf b/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.inf index df8d92e766..f7b16b1c04 100644 --- a/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.inf +++ b/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.inf @@ -14,11 +14,6 @@ # #**/ -################################################################################ -# -# Defines Section - statements that will be processed to create a Makefile. -# -################################################################################ [Defines] INF_VERSION = 0x00010005 BASE_NAME = BaseCustomDecompressLibNull @@ -36,23 +31,8 @@ # VALID_ARCHITECTURES = IA32 X64 IPF EBC # -################################################################################ -# -# Sources Section - list of files that are required for the build to succeed. -# -################################################################################ - [Sources.common] BaseCustomDecompressLibNull.c - CommonHeader.h - - -################################################################################ -# -# Package Dependency Section - list of Package files that are required for -# this module. -# -################################################################################ [Packages] MdePkg/MdePkg.dec diff --git a/MdePkg/Library/BaseCustomDecompressLibNull/CommonHeader.h b/MdePkg/Library/BaseCustomDecompressLibNull/CommonHeader.h deleted file mode 100644 index eedb273912..0000000000 --- a/MdePkg/Library/BaseCustomDecompressLibNull/CommonHeader.h +++ /dev/null @@ -1,28 +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 -// -// The Library classes this module consumes -// -#include - -#endif diff --git a/MdePkg/Library/DxeDebugLibSerialPort/CommonHeader.h b/MdePkg/Library/DxeDebugLibSerialPort/CommonHeader.h deleted file mode 100644 index 88e494fda5..0000000000 --- a/MdePkg/Library/DxeDebugLibSerialPort/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) 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 -// -// The Library classes this module consumes -// -#include -#include -#include -#include -#include -#include - -#endif diff --git a/MdePkg/Library/DxeDebugLibSerialPort/DebugLib.c b/MdePkg/Library/DxeDebugLibSerialPort/DebugLib.c index 0f3c390965..4fc33ee402 100644 --- a/MdePkg/Library/DxeDebugLibSerialPort/DebugLib.c +++ b/MdePkg/Library/DxeDebugLibSerialPort/DebugLib.c @@ -12,10 +12,14 @@ **/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" +#include +#include +#include +#include +#include +#include +#include + // // Define the maximum debug and assert message length that this library supports diff --git a/MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.inf b/MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.inf index b1aeff14f0..37741d6762 100644 --- a/MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.inf +++ b/MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.inf @@ -14,11 +14,6 @@ # #**/ -################################################################################ -# -# Defines Section - statements that will be processed to create a Makefile. -# -################################################################################ [Defines] INF_VERSION = 0x00010005 BASE_NAME = DxeDebugLibSerialPort @@ -29,42 +24,18 @@ EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 - # # The following information is for reference only and not required by the build tools. # # VALID_ARCHITECTURES = IA32 X64 IPF EBC # -################################################################################ -# -# Sources Section - list of files that are required for the build to succeed. -# -################################################################################ - [Sources.common] DebugLib.c - CommonHeader.h - - -################################################################################ -# -# Package Dependency Section - list of Package files that are required for -# this module. -# -################################################################################ [Packages] MdePkg/MdePkg.dec - -################################################################################ -# -# Library Class Section - list of Library Classes that are required for -# this module. -# -################################################################################ - [LibraryClasses] SerialPortLib BaseMemoryLib @@ -72,24 +43,10 @@ PrintLib BaseLib - -################################################################################ -# -# Pcd FIXED_AT_BUILD - list of PCDs that this module is coded for. -# -################################################################################ - [PcdsFixedAtBuild.common] PcdDebugClearMemoryValue|gEfiMdePkgTokenSpaceGuid PcdDebugPropertyMask|gEfiMdePkgTokenSpaceGuid - -################################################################################ -# -# Pcd DYNAMIC - list of PCDs that this module is coded for. -# -################################################################################ - [PcdsDynamic.common] PcdDebugPrintErrorLevel|gEfiMdePkgTokenSpaceGuid diff --git a/MdePkg/Library/UefiUsbLib/CommonHeader.h b/MdePkg/Library/UefiUsbLib/CommonHeader.h deleted file mode 100644 index 83a6a4301f..0000000000 --- a/MdePkg/Library/UefiUsbLib/CommonHeader.h +++ /dev/null @@ -1,29 +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, 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 -// -// The Library classes this module consumes -// -#include -#include - -#endif diff --git a/MdePkg/Library/UefiUsbLib/UsbDxeLib.c b/MdePkg/Library/UefiUsbLib/UsbDxeLib.c index 6686291aa2..626fa22290 100644 --- a/MdePkg/Library/UefiUsbLib/UsbDxeLib.c +++ b/MdePkg/Library/UefiUsbLib/UsbDxeLib.c @@ -21,10 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" +#include "UefiUsbLibInternal.h" // // Get Device Descriptor diff --git a/MdePkg/Library/UefiUsbLib/hid.c b/MdePkg/Library/UefiUsbLib/hid.c index a98fbfb9a1..a1019a0f2d 100644 --- a/MdePkg/Library/UefiUsbLib/hid.c +++ b/MdePkg/Library/UefiUsbLib/hid.c @@ -21,10 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" +#include "UefiUsbLibInternal.h" // // Function to get HID descriptor -- cgit v1.2.3