diff options
4 files changed, 63 insertions, 36 deletions
diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/CommPs2.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/CommPs2.h index 294aaceb4f..be2a54fda4 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/CommPs2.h +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/CommPs2.h @@ -1,7 +1,7 @@ /** @file
Using PS2 Mouse to simulation Absolution Pointer Device.
-Copyright (c) 2006 - 2007, Intel Corporation
+Copyright (c) 2006 - 2009, 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
@@ -75,32 +75,50 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. //
// Keyboard Controller Status
//
-#define KBC_PARE 0x80 // Parity Error
-#define KBC_TIM 0x40 // General Time Out
-#define KBC_AUXB 0x20 // Output buffer for auxiliary device (PS/2):
-// 0 - Holds keyboard data
-// 1 - Holds data for auxiliary device
-//
-#define KBC_KEYL 0x10 // Keyboard lock status:
-// 0 - keyboard locked
-// 1 - keyboard free
-//
-#define KBC_CD 0x08 // Command/Data:
-// 0 - data byte written via port 60h
-// 1 - command byte written via port 64h
-//
-#define KBC_SYSF 0x04 // System Flag:
-// 0 - power-on reset
-// 1 - self-test successful
-//
-#define KBC_INPB 0x02 // Input Buffer Status :
-// 0 - input buffer empty
-// 1 - CPU data in input buffer
-//
-#define KBC_OUTB 0x01 // Output Buffer Status :
-// 0 - output buffer empty
-// 1 - keyboard controller data in output buffer
-//
+///
+/// Parity Error
+///
+#define KBC_PARE 0x80
+///
+/// General Time Out
+///
+#define KBC_TIM 0x40
+///
+/// Output buffer for auxiliary device (PS/2):
+/// 0 - Holds keyboard data
+/// 1 - Holds data for auxiliary device
+///
+#define KBC_AUXB 0x20
+///
+/// Keyboard lock status:
+/// 0 - keyboard locked
+/// 1 - keyboard free
+///
+#define KBC_KEYL 0x10
+///
+/// Command/Data:
+/// 0 - data byte written via port 60h
+/// 1 - command byte written via port 64h
+///
+#define KBC_CD 0x08
+///
+/// System Flag:
+/// 0 - power-on reset
+/// 1 - self-test successful
+///
+#define KBC_SYSF 0x04
+///
+/// Input Buffer Status :
+/// 0 - input buffer empty
+/// 1 - CPU data in input buffer
+///
+#define KBC_INPB 0x02
+///
+/// Output Buffer Status :
+/// 0 - output buffer empty
+/// 1 - keyboard controller data in output buffer
+///
+#define KBC_OUTB 0x01
/**
Issue self test command via IsaIo interface.
@@ -413,4 +431,5 @@ WaitOutputFull ( IN UINTN Timeout
);
-#endif // __COMMPS2_H__
+#endif
+
diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.c index f9da93d0ac..85ceaa9ef1 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.c +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.c @@ -109,9 +109,9 @@ PS2MouseAbsolutePointerDriverSupported ( }
/**
- Start this driver on ControllerHandle by opening a IsaIo
- protocol, creating PS2_MOUSE_ABSOLUTE_POINTER_DEV device and install gEfiAbsolutePointerProtocolGuid
- finnally.
+ Start this driver on ControllerHandle by opening a IsaIo protocol, creating
+ PS2_MOUSE_ABSOLUTE_POINTER_DEV device and install gEfiAbsolutePointerProtocolGuid
+ finally.
@param This Protocol instance pointer.
@param ControllerHandle Handle of device to bind driver to
@@ -363,7 +363,7 @@ ErrorExit: }
if (MouseAbsolutePointerDev != NULL) {
- gBS->FreePool (MouseAbsolutePointerDev);
+ FreePool (MouseAbsolutePointerDev);
}
gBS->CloseProtocol (
@@ -466,7 +466,7 @@ PS2MouseAbsolutePointerDriverStop ( gBS->CloseEvent (MouseAbsolutePointerDev->AbsolutePointerProtocol.WaitForInput);
FreeUnicodeStringTable (MouseAbsolutePointerDev->ControllerNameTable);
- gBS->FreePool (MouseAbsolutePointerDev);
+ FreePool (MouseAbsolutePointerDev);
gBS->CloseProtocol (
Controller,
diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointerDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointerDxe.inf index 309d7d0323..0b1e4fdffc 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointerDxe.inf +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointerDxe.inf @@ -21,7 +21,6 @@ FILE_GUID = 2899C94A-1FB6-4b1a-B96B-8364975303E0
MODULE_TYPE = UEFI_DRIVER
VERSION_STRING = 1.0
- EFI_SPECIFICATION_VERSION = 0x00020000
ENTRY_POINT = InitializePs2MouseAbsolutePointer
#
diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf index 16eefae67b..eb0664a753 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf @@ -1,5 +1,5 @@ #/** @file
-# Ps2 Mouse Driver
+# Ps2 Mouse Driver.
#
# This dirver directly uses IsaIo protocol service to support Ps2 mouse work.
# Copyright (c) 2006 - 2009, Intel Corporation.
@@ -21,7 +21,6 @@ FILE_GUID = 202A2B0E-9A31-4812-B291-8747DF152439
MODULE_TYPE = UEFI_DRIVER
VERSION_STRING = 1.0
- EFI_SPECIFICATION_VERSION = 0x00020000
ENTRY_POINT = InitializePs2Mouse
#
@@ -59,3 +58,13 @@ gEfiDevicePathProtocolGuid # PROTOCOL TO_START
+# [Event]
+# ##
+# # Event will be signaled for WaitForKey event.
+# #
+# EVT_NOTIFY_WAIT ## PRODUCES
+#
+# ##
+# # Event will be used to poll mouse state.
+# #
+# EVT_NOTIFY_SIGNAL ## PRODUCES
\ No newline at end of file |