From 2fdd0eafcc38ff3b5a0793ba56c05ebfe35009b2 Mon Sep 17 00:00:00 2001 From: qwang12 Date: Mon, 16 Jul 2007 08:19:29 +0000 Subject: mass cleanup inf name git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3257 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Bus/Isa/Ps2KeyboardDxe/Ps2keyboard.msa | 102 -------------------- .../Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.msa | 102 ++++++++++++++++++++ .../Bus/Isa/Ps2MouseDxe/CommPs2.c | 5 - .../Bus/Isa/Ps2MouseDxe/CommPs2.h | 5 - .../Bus/Isa/Ps2MouseDxe/ComponentName.c | 5 - .../Bus/Isa/Ps2MouseDxe/EntryPoint.c | 5 +- .../Bus/Isa/Ps2MouseDxe/Ps2Mouse.c | 5 - .../Bus/Isa/Ps2MouseDxe/Ps2Mouse.h | 18 +++- .../Bus/Isa/Ps2MouseDxe/Ps2Mouse.inf | 107 --------------------- .../Bus/Isa/Ps2MouseDxe/Ps2Mouse.msa | 98 ------------------- .../Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf | 107 +++++++++++++++++++++ .../Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.msa | 98 +++++++++++++++++++ 12 files changed, 322 insertions(+), 335 deletions(-) delete mode 100644 IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboard.msa create mode 100644 IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.msa delete mode 100644 IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.inf delete mode 100644 IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.msa create mode 100644 IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf create mode 100644 IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.msa (limited to 'IntelFrameworkModulePkg/Bus') diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboard.msa b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboard.msa deleted file mode 100644 index dbc4cc5169..0000000000 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboard.msa +++ /dev/null @@ -1,102 +0,0 @@ - - - - Ps2Keyboard - DXE_DRIVER - 3DC82376-637B-40a6-A8FC-A565417F2C38 - 1.0 - Ps2 Keyboard Driver - This dirver directly uses IsaIo protocol service to support KeyBoard work. - 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. - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052 - - - IA32 X64 IPF EBC - false - Ps2Keyboard - - - - UefiDriverModelLib - - - UefiDriverEntryPoint - - - UefiLib - - - UefiBootServicesTableLib - - - ReportStatusCodeLib - - - DebugLib - - - UefiRuntimeServicesTableLib - - - MemoryAllocationLib - - - - Ps2Keyboard.c - Ps2KbdTextIn.c - Ps2KbdCtrller.c - Ps2Keyboard.h - ComponentName.c - - - - - - - - - gEfiDevicePathProtocolGuid - - - gEfiSimpleTextInProtocolGuid - - - gEfiIsaIoProtocolGuid - - - gEfiPs2PolicyProtocolGuid - - - - - - EVENT_TYPE_RELATIVE_TIMER - Set up event in order to wait for key stroke - - - EVENT_TYPE_PERIODIC_TIMER - Set up a periodic timer to read key strokes at a fixed interval - - - - - EVENT_TYPE_PERIODIC_TIMER - Signal an event wheneven there is a key pending - - - - - EFI_SPECIFICATION_VERSION 0x00020000 - EDK_RELEASE_VERSION 0x00020000 - - gKeyboardControllerDriver - gPs2KeyboardComponentName - - - \ No newline at end of file diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.msa b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.msa new file mode 100644 index 0000000000..dbc4cc5169 --- /dev/null +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.msa @@ -0,0 +1,102 @@ + + + + Ps2Keyboard + DXE_DRIVER + 3DC82376-637B-40a6-A8FC-A565417F2C38 + 1.0 + Ps2 Keyboard Driver + This dirver directly uses IsaIo protocol service to support KeyBoard work. + 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. + FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052 + + + IA32 X64 IPF EBC + false + Ps2Keyboard + + + + UefiDriverModelLib + + + UefiDriverEntryPoint + + + UefiLib + + + UefiBootServicesTableLib + + + ReportStatusCodeLib + + + DebugLib + + + UefiRuntimeServicesTableLib + + + MemoryAllocationLib + + + + Ps2Keyboard.c + Ps2KbdTextIn.c + Ps2KbdCtrller.c + Ps2Keyboard.h + ComponentName.c + + + + + + + + + gEfiDevicePathProtocolGuid + + + gEfiSimpleTextInProtocolGuid + + + gEfiIsaIoProtocolGuid + + + gEfiPs2PolicyProtocolGuid + + + + + + EVENT_TYPE_RELATIVE_TIMER + Set up event in order to wait for key stroke + + + EVENT_TYPE_PERIODIC_TIMER + Set up a periodic timer to read key strokes at a fixed interval + + + + + EVENT_TYPE_PERIODIC_TIMER + Signal an event wheneven there is a key pending + + + + + EFI_SPECIFICATION_VERSION 0x00020000 + EDK_RELEASE_VERSION 0x00020000 + + gKeyboardControllerDriver + gPs2KeyboardComponentName + + + \ No newline at end of file diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.c index 5e18d4949f..e1898bb525 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.c +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.c @@ -16,11 +16,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "Ps2Mouse.h" #include "CommPs2.h" diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.h index 594e9b8845..e7f35e8ac4 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.h +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.h @@ -26,11 +26,6 @@ Revision History #ifndef _COMMPS2_H_ #define _COMMPS2_H_ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #define PS2_PACKET_LENGTH 3 #define PS2_SYNC_MASK 0xc #define PS2_SYNC_BYTE 0x8 diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/ComponentName.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/ComponentName.c index 83545809c6..0e2f5233e6 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/ComponentName.c +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/ComponentName.c @@ -17,11 +17,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "Ps2Mouse.h" // diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/EntryPoint.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/EntryPoint.c index e0ba716c9b..ffd8281cb5 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/EntryPoint.c +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/EntryPoint.c @@ -15,10 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" +#include "Ps2Mouse.h" /** The user Entry Point for module Ps2Mouse. The user code starts with this function. diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c index 78061f2024..cc01a5c165 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c @@ -20,11 +20,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "Ps2Mouse.h" #include "CommPs2.h" diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h index c9a5832136..3d9173553f 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h @@ -24,10 +24,20 @@ Revision History #ifndef _PS2MOUSE_H #define _PS2MOUSE_H -// -// Include common header file for this module. -// -#include "CommonHeader.h" +#include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include // // PS/2 mouse sample rate diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.inf b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.inf deleted file mode 100644 index 60a1fcf0af..0000000000 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.inf +++ /dev/null @@ -1,107 +0,0 @@ -#/** @file -# Ps2 Mouse Driver -# -# This dirver directly uses IsaIo protocol service to support Ps2 mouse work. -# Copyright (c) 2006 - 2007, Intel Corporation. -# -# 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. -# -# -#**/ - -################################################################################ -# -# Defines Section - statements that will be processed to create a Makefile. -# -################################################################################ -[Defines] - INF_VERSION = 0x00010005 - BASE_NAME = Ps2Mouse - FILE_GUID = 202A2B0E-9A31-4812-B291-8747DF152439 - MODULE_TYPE = DXE_DRIVER - VERSION_STRING = 1.0 - EDK_RELEASE_VERSION = 0x00020000 - EFI_SPECIFICATION_VERSION = 0x00020000 - - 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 - CommPs2.h - 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 - MdeModulePkg/MdeModulePkg.dec - IntelFrameworkPkg/IntelFrameworkPkg.dec - IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec - - -################################################################################ -# -# Library Class Section - list of Library Classes that are required for -# this module. -# -################################################################################ - -[LibraryClasses] - ReportStatusCodeLib - UefiBootServicesTableLib - MemoryAllocationLib - BaseMemoryLib - UefiLib - 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 - gEfiDevicePathProtocolGuid # PROTOCOL TO_START - diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.msa b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.msa deleted file mode 100644 index 9f12700975..0000000000 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.msa +++ /dev/null @@ -1,98 +0,0 @@ - - - - Ps2Mouse - DXE_DRIVER - 202A2B0E-9A31-4812-B291-8747DF152439 - 1.0 - Ps2 Mouse Driver - This dirver directly uses IsaIo protocol service to support Ps2 mouse work. - 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. - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052 - - - IA32 X64 IPF EBC - false - Ps2Mouse - - - - DebugLib - - - UefiDriverModelLib - - - UefiDriverEntryPoint - - - UefiLib - - - BaseMemoryLib - - - MemoryAllocationLib - - - UefiBootServicesTableLib - - - ReportStatusCodeLib - - - - Ps2Mouse.c - Ps2Mouse.h - CommPs2.c - CommPs2.h - ComponentName.c - - - - - - - - gEfiDevicePathProtocolGuid - - - gEfiSimplePointerProtocolGuid - - - gEfiIsaIoProtocolGuid - - - - - - EVENT_TYPE_RELATIVE_TIMER - Set up a time event to wait for the mouse input - - - EVENT_TYPE_PERIODIC_TIMER - Set up a periodic timer to poll mouse state at a fixed interval - - - - - EVENT_TYPE_RELATIVE_TIMER - Signal an event whenever these is a pending event from mouse input - - - - - EFI_SPECIFICATION_VERSION 0x00020000 - EDK_RELEASE_VERSION 0x00020000 - - gPS2MouseDriver - gPs2MouseComponentName - - - \ No newline at end of file diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf new file mode 100644 index 0000000000..60a1fcf0af --- /dev/null +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf @@ -0,0 +1,107 @@ +#/** @file +# Ps2 Mouse Driver +# +# This dirver directly uses IsaIo protocol service to support Ps2 mouse work. +# Copyright (c) 2006 - 2007, Intel Corporation. +# +# 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. +# +# +#**/ + +################################################################################ +# +# Defines Section - statements that will be processed to create a Makefile. +# +################################################################################ +[Defines] + INF_VERSION = 0x00010005 + BASE_NAME = Ps2Mouse + FILE_GUID = 202A2B0E-9A31-4812-B291-8747DF152439 + MODULE_TYPE = DXE_DRIVER + VERSION_STRING = 1.0 + EDK_RELEASE_VERSION = 0x00020000 + EFI_SPECIFICATION_VERSION = 0x00020000 + + 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 + CommPs2.h + 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 + MdeModulePkg/MdeModulePkg.dec + IntelFrameworkPkg/IntelFrameworkPkg.dec + IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec + + +################################################################################ +# +# Library Class Section - list of Library Classes that are required for +# this module. +# +################################################################################ + +[LibraryClasses] + ReportStatusCodeLib + UefiBootServicesTableLib + MemoryAllocationLib + BaseMemoryLib + UefiLib + 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 + gEfiDevicePathProtocolGuid # PROTOCOL TO_START + diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.msa b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.msa new file mode 100644 index 0000000000..9f12700975 --- /dev/null +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.msa @@ -0,0 +1,98 @@ + + + + Ps2Mouse + DXE_DRIVER + 202A2B0E-9A31-4812-B291-8747DF152439 + 1.0 + Ps2 Mouse Driver + This dirver directly uses IsaIo protocol service to support Ps2 mouse work. + 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. + FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052 + + + IA32 X64 IPF EBC + false + Ps2Mouse + + + + DebugLib + + + UefiDriverModelLib + + + UefiDriverEntryPoint + + + UefiLib + + + BaseMemoryLib + + + MemoryAllocationLib + + + UefiBootServicesTableLib + + + ReportStatusCodeLib + + + + Ps2Mouse.c + Ps2Mouse.h + CommPs2.c + CommPs2.h + ComponentName.c + + + + + + + + gEfiDevicePathProtocolGuid + + + gEfiSimplePointerProtocolGuid + + + gEfiIsaIoProtocolGuid + + + + + + EVENT_TYPE_RELATIVE_TIMER + Set up a time event to wait for the mouse input + + + EVENT_TYPE_PERIODIC_TIMER + Set up a periodic timer to poll mouse state at a fixed interval + + + + + EVENT_TYPE_RELATIVE_TIMER + Signal an event whenever these is a pending event from mouse input + + + + + EFI_SPECIFICATION_VERSION 0x00020000 + EDK_RELEASE_VERSION 0x00020000 + + gPS2MouseDriver + gPs2MouseComponentName + + + \ No newline at end of file -- cgit v1.2.3