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 (file)
index d306303..0000000
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/CommonHeader.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2006 - 2007, Intel Corporation<BR>\r
-  All rights reserved. This program and the accompanying materials\r
-  are licensed and made available under the terms and conditions of the BSD License\r
-  which accompanies this distribution.  The full text of the license may be found at\r
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <PiDxe.h>\r
-#include <FrameworkDxe.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-#include <Protocol/PciIo.h>\r
-#include <Protocol/ComponentName.h>\r
-#include <Protocol/IsaIo.h>\r
-#include <Protocol/DevicePath.h>\r
-#include <Protocol/IsaAcpi.h>\r
-#include <Protocol/DriverBinding.h>\r
-#include <Protocol/GenericMemoryTest.h>\r
-#include <Guid/StatusCodeDataTypeId.h>\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/DebugLib.h>\r
-#include <Library/UefiDriverEntryPoint.h>\r
-#include <Library/UefiLib.h>\r
-#include <Library/DevicePathLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
-#include <Library/MemoryAllocationLib.h>\r
-#include <Library/UefiBootServicesTableLib.h>\r
-#include <Library/ReportStatusCodeLib.h>\r
-#include <Library/BootScriptLib.h>\r
-#include <Library/PcdLib.h>\r
-//\r
-// Driver Binding Externs\r
-//\r
-extern EFI_DRIVER_BINDING_PROTOCOL gIsaBusControllerDriver;\r
-extern EFI_COMPONENT_NAME_PROTOCOL gIsaBusComponentName;\r
-\r
-#endif\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.h b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.h
index 19aed07a2c80c4ad0df5f1fbb3cfeafcb1f5baee..fc9ec553348203c992e3cd294f29c45f0352fdbf 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.h
@@ -26,7 +26,7 @@ Revision History:
 //\r
 // Include common header file for this module.\r
 //\r
-#include "CommonHeader.h"\r
+#include "InternalIsaBus.h"\r
 \r
 extern EFI_COMPONENT_NAME_PROTOCOL  gIsaBusComponentName;\r
 \r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/EntryPoint.c b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/EntryPoint.c
deleted file mode 100644 (file)
index 126d90e..0000000
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/EntryPoint.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/**@file\r
-  Entry Point Source file.\r
-\r
-  This file contains the user entry point \r
-\r
-  Copyright (c) 2006 - 2007, Intel Corporation<BR>\r
-  All rights reserved. This program and the accompanying materials\r
-  are licensed and made available under the terms and conditions of the BSD License\r
-  which accompanies this distribution.  The full text of the license may be found at\r
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-**/\r
-\r
-\r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "InternalIsaBus.h"\r
-\r
-/**\r
-  The user Entry Point for module IsaBus. The user code starts with this function.\r
-\r
-  @param[in] ImageHandle    The firmware allocated handle for the EFI image.  \r
-  @param[in] SystemTable    A pointer to the EFI System Table.\r
-  \r
-  @retval EFI_SUCCESS       The entry point is executed successfully.\r
-  @retval other             Some error occurs when executing this entry point.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-InitializeIsaBus(\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
-  )\r
-{\r
-  EFI_STATUS              Status;\r
-\r
-  //\r
-  // Install driver model protocol(s).\r
-  //\r
-  Status = EfiLibInstallAllDriverProtocols (\r
-             ImageHandle,\r
-             SystemTable,\r
-             &gIsaBusControllerDriver,\r
-             ImageHandle,\r
-             &gIsaBusComponentName,\r
-             NULL,\r
-             NULL\r
-             );\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
-\r
-  return Status;\r
-}\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h
index 1d42afca3c177950ed8c5152d2a28a0eb90b70bc..1921d4c7d25f98aa1cc93ae29c466283e4e1934e 100644 (file)
--- 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\r
 \r
 //\r
-// Include common header file for this module.\r
+// The package level header files this module uses\r
 //\r
-#include "CommonHeader.h"\r
+#include <PiDxe.h>\r
+#include <FrameworkDxe.h>\r
+//\r
+// The protocols, PPI and GUID defintions for this module\r
+//\r
+#include <Protocol/PciIo.h>\r
+#include <Protocol/ComponentName.h>\r
+#include <Protocol/IsaIo.h>\r
+#include <Protocol/DevicePath.h>\r
+#include <Protocol/IsaAcpi.h>\r
+#include <Protocol/DriverBinding.h>\r
+#include <Protocol/GenericMemoryTest.h>\r
+#include <Guid/StatusCodeDataTypeId.h>\r
+//\r
+// The Library classes this module consumes\r
+//\r
+#include <Library/DebugLib.h>\r
+#include <Library/UefiDriverEntryPoint.h>\r
+#include <Library/UefiLib.h>\r
+#include <Library/DevicePathLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/MemoryAllocationLib.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
+#include <Library/ReportStatusCodeLib.h>\r
+#include <Library/PcdLib.h>\r
 \r
 #include "ComponentName.h"\r
 \r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaIo.h b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaIo.h
index a06be2ef17abc6a64e554ed9cbae748de42829d6..36bb6655c6b47c4951e456b5316482fcb12c1f6f 100644 (file)
--- 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\r
 #define _EFI_ISA_IO_LOCAL_H\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "InternalIsaBus.h"\r
 \r
 //\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.c b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.c
index 2d8a983e09a89d10e7cb4722cb63318853f23745..00f0ea767cdbce2632960746b5a02d7bfa6dd58c 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.c
@@ -40,6 +40,44 @@ EFI_DRIVER_BINDING_PROTOCOL gIsaBusControllerDriver = {
   NULL\r
 };\r
 \r
+/**\r
+  The user Entry Point for module IsaBus. The user code starts with this function.\r
+\r
+  @param[in] ImageHandle    The firmware allocated handle for the EFI image.  \r
+  @param[in] SystemTable    A pointer to the EFI System Table.\r
+  \r
+  @retval EFI_SUCCESS       The entry point is executed successfully.\r
+  @retval other             Some error occurs when executing this entry point.\r
+\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+InitializeIsaBus(\r
+  IN EFI_HANDLE           ImageHandle,\r
+  IN EFI_SYSTEM_TABLE     *SystemTable\r
+  )\r
+{\r
+  EFI_STATUS              Status;\r
+\r
+  //\r
+  // Install driver model protocol(s).\r
+  //\r
+  Status = EfiLibInstallAllDriverProtocols (\r
+             ImageHandle,\r
+             SystemTable,\r
+             &gIsaBusControllerDriver,\r
+             ImageHandle,\r
+             &gIsaBusComponentName,\r
+             NULL,\r
+             NULL\r
+             );\r
+  ASSERT_EFI_ERROR (Status);\r
+\r
+\r
+  return Status;\r
+}\r
+\r
+\r
 EFI_STATUS\r
 EFIAPI\r
 IsaBusControllerDriverSupported (\r
@@ -181,11 +219,6 @@ IsaBusControllerDriverStart (
   EFI_RESOURCE_ALLOC_FAILURE_ERROR_DATA AllocFailExtendedData;\r
   EFI_DEVICE_PATH_PROTOCOL              *DevicePathData;\r
 \r
-  BootScriptSaveInformationAsciiString (\r
-    EFI_ACPI_S3_RESUME_SCRIPT_TABLE,\r
-    "IsaBusBindingStartBegin"\r
-    );\r
-\r
   //\r
   // Initialize status code structure\r
   //\r
@@ -378,11 +411,6 @@ IsaBusControllerDriverStart (
 \r
   } while (TRUE);\r
 \r
-  BootScriptSaveInformationAsciiString (\r
-    EFI_ACPI_S3_RESUME_SCRIPT_TABLE,\r
-    "IsaBusBindingStartEnd"\r
-    );\r
-\r
   return EFI_SUCCESS;\r
 }\r
 \r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.inf b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.inf
index 704586180e6fd8ff635b08e7c14fec0f771bf1e9..26a1527afc8ac4db79d12c81d000c2b986555daa 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.inf
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.inf
@@ -56,8 +56,6 @@
   IsaBus.h\r
   IsaAcpi.h\r
   ComponentName.h\r
-  CommonHeader.h\r
-  EntryPoint.c\r
 \r
 \r
 ################################################################################\r