Remove the EntryPoint.c from FloppyDxe.

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

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppy/Dxe/EntryPoint.c b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppy/Dxe/EntryPoint.c
deleted file mode 100644 (file)
index 451d4cb..0000000
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppy/Dxe/EntryPoint.c
+++ /dev/null
@@ -1,55 +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.\r
-  All rights reserved.\r
-   This software and associated documentation (if any) is furnished\r
-   under a license and may only be used or copied in accordance\r
-   with the terms of the license. Except as permitted by such\r
-   license, no part of this software or documentation may be\r
-   reproduced, stored in a retrieval system, or transmitted in any\r
-   form or by any means without the express written consent of\r
-   Intel Corporation.\r
-**/\r
-\r
-\r
-#include "IsaFloppy.h"\r
-\r
-/**\r
-  The user Entry Point for module IsaFloppy. 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
-InitializeIsaFloppy(\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
-             &gFdcControllerDriver,\r
-             ImageHandle,\r
-             &gIsaFloppyComponentName,\r
-             NULL,\r
-             NULL\r
-             );\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
-\r
-  return Status;\r
-}\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppy/Dxe/IsaFloppy.c b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppy/Dxe/IsaFloppy.c
index 483e7507b7ccd2aef3580b5176f3166aca63067c..34e628d364178d574695633b1d608a5bf4f9295f 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppy/Dxe/IsaFloppy.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppy/Dxe/IsaFloppy.c
@@ -45,6 +45,45 @@ EFI_DRIVER_BINDING_PROTOCOL gFdcControllerDriver = {
   NULL\r
 };\r
 \r
+\r
+/**\r
+  The user Entry Point for module IsaFloppy. 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
+InitializeIsaFloppy(\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
+             &gFdcControllerDriver,\r
+             ImageHandle,\r
+             &gIsaFloppyComponentName,\r
+             NULL,\r
+             NULL\r
+             );\r
+  ASSERT_EFI_ERROR (Status);\r
+\r
+\r
+  return Status;\r
+}\r
+\r
+\r
 EFI_STATUS\r
 EFIAPI\r
 FdcControllerDriverSupported (\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppy/Dxe/IsaFloppy.inf b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppy/Dxe/IsaFloppy.inf
index 906cc96eaaf343fc4f366430395e2c4e53bc7614..414b86b0a9f935de18026a8e34fd8025b2eced1a 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppy/Dxe/IsaFloppy.inf
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppy/Dxe/IsaFloppy.inf
@@ -64,7 +64,6 @@
   IsaFloppyBlock.c\r
   IsaFloppy.c\r
   IsaFloppy.h\r
-  EntryPoint.c\r
 \r
 ################################################################################\r
 #\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppy/Pei/FloppyPeim.inf b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppy/Pei/FloppyPeim.inf
index 1c4ce588b88c6b9fcd7059d34d842d5f0ac83c94..4eb077717b65da1f59cdc670901bdb27d77ed883 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppy/Pei/FloppyPeim.inf
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppy/Pei/FloppyPeim.inf
@@ -99,5 +99,5 @@
 ################################################################################\r
 \r
 [Depex]\r
-  gEfiPeiMemoryDiscoveredPpiGuid AND gEfiPeiFvFileLoaderPpiGuid AND gEfiPeiBootInRecoveryModePpiGuid\r
+  gEfiPeiMemoryDiscoveredPpiGuid AND gEfiPeiLoadFilePpiGuid AND gEfiPeiBootInRecoveryModePpiGuid\r
 \r