Remove CommonHeader.h from IsaBusDxe.

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

IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/CommonHeader.h

@@ -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<BR>
-  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>
-#include <FrameworkDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
-#include <Protocol/PciIo.h>
-#include <Protocol/ComponentName.h>
-#include <Protocol/IsaIo.h>
-#include <Protocol/DevicePath.h>
-#include <Protocol/IsaAcpi.h>
-#include <Protocol/DriverBinding.h>
-#include <Protocol/GenericMemoryTest.h>
-#include <Guid/StatusCodeDataTypeId.h>
-//
-// The Library classes this module consumes
-//
-#include <Library/DebugLib.h>
-#include <Library/UefiDriverEntryPoint.h>
-#include <Library/UefiLib.h>
-#include <Library/DevicePathLib.h>
-#include <Library/BaseMemoryLib.h>
-#include <Library/MemoryAllocationLib.h>
-#include <Library/UefiBootServicesTableLib.h>
-#include <Library/ReportStatusCodeLib.h>
-#include <Library/BootScriptLib.h>
-#include <Library/PcdLib.h>
-//
-// Driver Binding Externs
-//
-extern EFI_DRIVER_BINDING_PROTOCOL gIsaBusControllerDriver;
-extern EFI_COMPONENT_NAME_PROTOCOL gIsaBusComponentName;
-
-#endif

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;
 

IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/EntryPoint.c

@@ -1,58 +0,0 @@
-/**@file
-  Entry Point Source file.
-
-  This file contains the user entry point 
-
-  Copyright (c) 2006 - 2007, Intel Corporation<BR>
-  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;
-}

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 <PiDxe.h>
+#include <FrameworkDxe.h>
+//
+// The protocols, PPI and GUID defintions for this module
+//
+#include <Protocol/PciIo.h>
+#include <Protocol/ComponentName.h>
+#include <Protocol/IsaIo.h>
+#include <Protocol/DevicePath.h>
+#include <Protocol/IsaAcpi.h>
+#include <Protocol/DriverBinding.h>
+#include <Protocol/GenericMemoryTest.h>
+#include <Guid/StatusCodeDataTypeId.h>
+//
+// The Library classes this module consumes
+//
+#include <Library/DebugLib.h>
+#include <Library/UefiDriverEntryPoint.h>
+#include <Library/UefiLib.h>
+#include <Library/DevicePathLib.h>
+#include <Library/BaseMemoryLib.h>
+#include <Library/MemoryAllocationLib.h>
+#include <Library/UefiBootServicesTableLib.h>
+#include <Library/ReportStatusCodeLib.h>
+#include <Library/PcdLib.h>
 
 #include "ComponentName.h"
 

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"
 
 //

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;
 }
 

IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.inf

@@ -56,8 +56,6 @@
   IsaBus.h
   IsaAcpi.h
   ComponentName.h
-  CommonHeader.h
-  EntryPoint.c
 
 
 ################################################################################