diff options
| author | yshang1 <yshang1@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-07-10 09:24:34 +0000 |
|---|---|---|
| committer | yshang1 <yshang1@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-07-10 09:24:34 +0000 |
| commit | 99bda0fd20817a768d596eda6d71b1f0e6e7d784 (patch) | |
| tree | 72ac40807e1761e37274a52fa48c4891ef18a154 /IntelFrameworkModulePkg | |
| parent | 11f43dfd8b23702a000e45e8f3f0f6dacaa4f38b (diff) | |
| download | edk2-platforms-99bda0fd20817a768d596eda6d71b1f0e6e7d784.tar.xz | |
Remove the EntryPoint.c from FloppyDxe.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3169 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'IntelFrameworkModulePkg')
4 files changed, 40 insertions, 57 deletions
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppy/Dxe/EntryPoint.c b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppy/Dxe/EntryPoint.c deleted file mode 100644 index 451d4cbff6..0000000000 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppy/Dxe/EntryPoint.c +++ /dev/null @@ -1,55 +0,0 @@ -/**@file
- Entry Point Source file.
-
- This file contains the user entry point
-
- Copyright (c) 2006 - 2007, Intel Corporation.
- All rights reserved.
- This software and associated documentation (if any) is furnished
- under a license and may only be used or copied in accordance
- with the terms of the license. Except as permitted by such
- license, no part of this software or documentation may be
- reproduced, stored in a retrieval system, or transmitted in any
- form or by any means without the express written consent of
- Intel Corporation.
-**/
-
-
-#include "IsaFloppy.h"
-
-/**
- The user Entry Point for module IsaFloppy. 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
-InitializeIsaFloppy(
- IN EFI_HANDLE ImageHandle,
- IN EFI_SYSTEM_TABLE *SystemTable
- )
-{
- EFI_STATUS Status;
-
- //
- // Install driver model protocol(s).
- //
- Status = EfiLibInstallAllDriverProtocols (
- ImageHandle,
- SystemTable,
- &gFdcControllerDriver,
- ImageHandle,
- &gIsaFloppyComponentName,
- NULL,
- NULL
- );
- ASSERT_EFI_ERROR (Status);
-
-
- return Status;
-}
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppy/Dxe/IsaFloppy.c b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppy/Dxe/IsaFloppy.c index 483e7507b7..34e628d364 100644 --- 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
};
+
+/**
+ The user Entry Point for module IsaFloppy. 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
+InitializeIsaFloppy(
+ IN EFI_HANDLE ImageHandle,
+ IN EFI_SYSTEM_TABLE *SystemTable
+ )
+{
+ EFI_STATUS Status;
+
+ //
+ // Install driver model protocol(s).
+ //
+ Status = EfiLibInstallAllDriverProtocols (
+ ImageHandle,
+ SystemTable,
+ &gFdcControllerDriver,
+ ImageHandle,
+ &gIsaFloppyComponentName,
+ NULL,
+ NULL
+ );
+ ASSERT_EFI_ERROR (Status);
+
+
+ return Status;
+}
+
+
EFI_STATUS
EFIAPI
FdcControllerDriverSupported (
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppy/Dxe/IsaFloppy.inf b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppy/Dxe/IsaFloppy.inf index 906cc96eaa..414b86b0a9 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppy/Dxe/IsaFloppy.inf +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppy/Dxe/IsaFloppy.inf @@ -64,7 +64,6 @@ IsaFloppyBlock.c
IsaFloppy.c
IsaFloppy.h
- EntryPoint.c
################################################################################
#
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppy/Pei/FloppyPeim.inf b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppy/Pei/FloppyPeim.inf index 1c4ce588b8..4eb077717b 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppy/Pei/FloppyPeim.inf +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppy/Pei/FloppyPeim.inf @@ -99,5 +99,5 @@ ################################################################################
[Depex]
- gEfiPeiMemoryDiscoveredPpiGuid AND gEfiPeiFvFileLoaderPpiGuid AND gEfiPeiBootInRecoveryModePpiGuid
+ gEfiPeiMemoryDiscoveredPpiGuid AND gEfiPeiLoadFilePpiGuid AND gEfiPeiBootInRecoveryModePpiGuid
|