From: yshang1 Date: Tue, 10 Jul 2007 10:03:21 +0000 (+0000) Subject: Remove CommonHeader.h from IsaBusDxe. X-Git-Tag: edk2-stable201903~22779 X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=c55fa8cc3c2dbce4ea60ba9eef33a71ac587cb34 Remove CommonHeader.h from IsaBusDxe. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3176 6f19259b-4bc3-4df7-8a09-765794883524 --- diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/CommonHeader.h b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/CommonHeader.h deleted file mode 100644 index d3063037c7..0000000000 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/CommonHeader.h +++ /dev/null @@ -1,56 +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 -#include -// -// The protocols, PPI and GUID defintions for this module -// -#include -#include -#include -#include -#include -#include -#include -#include -// -// The Library classes this module consumes -// -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -// -// Driver Binding Externs -// -extern EFI_DRIVER_BINDING_PROTOCOL gIsaBusControllerDriver; -extern EFI_COMPONENT_NAME_PROTOCOL gIsaBusComponentName; - -#endif diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.h b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.h index 19aed07a2c..fc9ec55334 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.h +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.h @@ -26,7 +26,7 @@ Revision History: // // Include common header file for this module. // -#include "CommonHeader.h" +#include "InternalIsaBus.h" extern EFI_COMPONENT_NAME_PROTOCOL gIsaBusComponentName; diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/EntryPoint.c b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/EntryPoint.c deleted file mode 100644 index 126d90e936..0000000000 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/EntryPoint.c +++ /dev/null @@ -1,58 +0,0 @@ -/**@file - Entry Point Source file. - - This file contains the user entry point - - 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. - -**/ - - -// -// Include common header file for this module. -// -#include "InternalIsaBus.h" - -/** - The user Entry Point for module IsaBus. The user code starts with this function. - - @param[in] ImageHandle The firmware allocated handle for the EFI image. - @param[in] SystemTable A pointer to the EFI System Table. - - @retval EFI_SUCCESS The entry point is executed successfully. - @retval other Some error occurs when executing this entry point. - -**/ -EFI_STATUS -EFIAPI -InitializeIsaBus( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ) -{ - EFI_STATUS Status; - - // - // Install driver model protocol(s). - // - Status = EfiLibInstallAllDriverProtocols ( - ImageHandle, - SystemTable, - &gIsaBusControllerDriver, - ImageHandle, - &gIsaBusComponentName, - NULL, - NULL - ); - ASSERT_EFI_ERROR (Status); - - - return Status; -} diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h index 1d42afca3c..1921d4c7d2 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h @@ -25,9 +25,33 @@ Revision History: #define _EFI_ISA_BUS_H // -// Include common header file for this module. +// The package level header files this module uses // -#include "CommonHeader.h" +#include +#include +// +// The protocols, PPI and GUID defintions for this module +// +#include +#include +#include +#include +#include +#include +#include +#include +// +// The Library classes this module consumes +// +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "ComponentName.h" diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaIo.h b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaIo.h index a06be2ef17..36bb6655c6 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaIo.h +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaIo.h @@ -22,11 +22,6 @@ Abstract: #ifndef _EFI_ISA_IO_LOCAL_H #define _EFI_ISA_IO_LOCAL_H -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "InternalIsaBus.h" // diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.c b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.c index 2d8a983e09..00f0ea767c 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.c +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.c @@ -40,6 +40,44 @@ EFI_DRIVER_BINDING_PROTOCOL gIsaBusControllerDriver = { NULL }; +/** + The user Entry Point for module IsaBus. The user code starts with this function. + + @param[in] ImageHandle The firmware allocated handle for the EFI image. + @param[in] SystemTable A pointer to the EFI System Table. + + @retval EFI_SUCCESS The entry point is executed successfully. + @retval other Some error occurs when executing this entry point. + +**/ +EFI_STATUS +EFIAPI +InitializeIsaBus( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable + ) +{ + EFI_STATUS Status; + + // + // Install driver model protocol(s). + // + Status = EfiLibInstallAllDriverProtocols ( + ImageHandle, + SystemTable, + &gIsaBusControllerDriver, + ImageHandle, + &gIsaBusComponentName, + NULL, + NULL + ); + ASSERT_EFI_ERROR (Status); + + + return Status; +} + + EFI_STATUS EFIAPI IsaBusControllerDriverSupported ( @@ -181,11 +219,6 @@ IsaBusControllerDriverStart ( EFI_RESOURCE_ALLOC_FAILURE_ERROR_DATA AllocFailExtendedData; EFI_DEVICE_PATH_PROTOCOL *DevicePathData; - BootScriptSaveInformationAsciiString ( - EFI_ACPI_S3_RESUME_SCRIPT_TABLE, - "IsaBusBindingStartBegin" - ); - // // Initialize status code structure // @@ -378,11 +411,6 @@ IsaBusControllerDriverStart ( } while (TRUE); - BootScriptSaveInformationAsciiString ( - EFI_ACPI_S3_RESUME_SCRIPT_TABLE, - "IsaBusBindingStartEnd" - ); - return EFI_SUCCESS; } diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.inf b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.inf index 704586180e..26a1527afc 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.inf +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.inf @@ -56,8 +56,6 @@ IsaBus.h IsaAcpi.h ComponentName.h - CommonHeader.h - EntryPoint.c ################################################################################