From c21fc3e8ae6032b59091a92f6ba504d1c73fcd7e Mon Sep 17 00:00:00 2001 From: yshang1 Date: Thu, 19 Jul 2007 07:57:59 +0000 Subject: Clean up the Isa related DXE in IntelFrameworkMoudlePkg. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3359 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Bus/Isa/Ps2MouseDxe/EntryPoint.c | 55 ---------------------- .../Bus/Isa/Ps2MouseDxe/Ps2Mouse.c | 37 +++++++++++++++ .../Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf | 51 +------------------- 3 files changed, 38 insertions(+), 105 deletions(-) delete mode 100644 IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/EntryPoint.c (limited to 'IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe') diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/EntryPoint.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/EntryPoint.c deleted file mode 100644 index ffd8281cb5..0000000000 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/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 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 "Ps2Mouse.h" - -/** - The user Entry Point for module Ps2Mouse. 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 -InitializePs2Mouse( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ) -{ - EFI_STATUS Status; - - // - // Install driver model protocol(s). - // - Status = EfiLibInstallAllDriverProtocols ( - ImageHandle, - SystemTable, - &gPS2MouseDriver, - ImageHandle, - &gPs2MouseComponentName, - NULL, - NULL - ); - ASSERT_EFI_ERROR (Status); - - - return Status; -} diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c index cc01a5c165..7f2fbc99b9 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c @@ -755,3 +755,40 @@ Returns: // PS2MouseGetPacket (MouseDev); } + +/** + The user Entry Point for module Ps2Mouse. 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 +InitializePs2Mouse( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable + ) +{ + EFI_STATUS Status; + + // + // Install driver model protocol(s). + // + Status = EfiLibInstallAllDriverProtocols ( + ImageHandle, + SystemTable, + &gPS2MouseDriver, + ImageHandle, + &gPs2MouseComponentName, + NULL, + NULL + ); + ASSERT_EFI_ERROR (Status); + + + return Status; +} diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf index 60a1fcf0af..77f97e351a 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf @@ -16,14 +16,9 @@ # #**/ -################################################################################ -# -# Defines Section - statements that will be processed to create a Makefile. -# -################################################################################ [Defines] INF_VERSION = 0x00010005 - BASE_NAME = Ps2Mouse + BASE_NAME = Ps2MouseDxe FILE_GUID = 202A2B0E-9A31-4812-B291-8747DF152439 MODULE_TYPE = DXE_DRIVER VERSION_STRING = 1.0 @@ -32,25 +27,7 @@ ENTRY_POINT = InitializePs2Mouse -# -# The following information is for reference only and not required by the build tools. -# # VALID_ARCHITECTURES = IA32 X64 IPF EBC -# -# DRIVER_BINDING = gPS2MouseDriver -# COMPONENT_NAME = gPs2MouseComponentName -# Create Event Guid C Name: Event Type: EVENT_TYPE_RELATIVE_TIMER -# Create Event Guid C Name: Event Type: EVENT_TYPE_PERIODIC_TIMER -# -# Signal Event Guid C Name: Event Type: EVENT_TYPE_RELATIVE_TIMER -# -# - -################################################################################ -# -# Sources Section - list of files that are required for the build to succeed. -# -################################################################################ [Sources.common] ComponentName.c @@ -58,16 +35,6 @@ CommPs2.c Ps2Mouse.h Ps2Mouse.c - CommonHeader.h - EntryPoint.c - - -################################################################################ -# -# Package Dependency Section - list of Package files that are required for -# this module. -# -################################################################################ [Packages] MdePkg/MdePkg.dec @@ -75,14 +42,6 @@ IntelFrameworkPkg/IntelFrameworkPkg.dec IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec - -################################################################################ -# -# Library Class Section - list of Library Classes that are required for -# this module. -# -################################################################################ - [LibraryClasses] ReportStatusCodeLib UefiBootServicesTableLib @@ -92,14 +51,6 @@ UefiDriverEntryPoint DebugLib - -################################################################################ -# -# Protocol C Name Section - list of Protocol and Protocol Notify C Names -# that this module uses or produces. -# -################################################################################ - [Protocols] gEfiIsaIoProtocolGuid # PROTOCOL TO_START gEfiSimplePointerProtocolGuid # PROTOCOL BY_START -- cgit v1.2.3