From 24a2dd3d08c2d146b66cf0a2f1cec8988eca511d Mon Sep 17 00:00:00 2001 From: eric_tian Date: Thu, 25 Jun 2009 08:27:12 +0000 Subject: [PATCH] code scrub on Ps2MouseDxe module git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8657 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Bus/Isa/Ps2MouseDxe/CommPs2.c | 19 +---- .../Bus/Isa/Ps2MouseDxe/CommPs2.h | 73 ++++++++++++------- .../Bus/Isa/Ps2MouseDxe/Ps2Mouse.c | 20 ++--- 3 files changed, 57 insertions(+), 55 deletions(-) diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.c index 548386f844..aa22b5cf3e 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.c +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.c @@ -1,7 +1,7 @@ /** @file PS2 Mouse Communication Interface. -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 @@ -892,23 +892,6 @@ WaitOutputFull ( IN EFI_ISA_IO_PROTOCOL *IsaIo, IN UINTN Timeout ) -/** - -Routine Description: - - GC_TODO: Add function description - -Arguments: - - IsaIo - GC_TODO: add argument description - Timeout - GC_TODO: add argument description - -Returns: - - EFI_TIMEOUT - GC_TODO: Add description for return value - EFI_SUCCESS - GC_TODO: Add description for return value - -**/ { UINTN Delay; UINT8 Data; diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.h index 8e2b58d440..5eb55de13c 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.h +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.h @@ -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/Ps2MouseDxe/Ps2Mouse.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c index 2bd8231494..13c4c20690 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c @@ -1,8 +1,8 @@ /** @file PS/2 Mouse driver. Routines that interacts with callers, - conforming to EFI driver model + conforming to EFI driver model. -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 @@ -16,9 +16,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include "Ps2Mouse.h" #include "CommPs2.h" -// -// DriverBinding Protocol Instance -// +/// +/// DriverBinding Protocol Instance +/// EFI_DRIVER_BINDING_PROTOCOL gPS2MouseDriver = { PS2MouseDriverSupported, PS2MouseDriverStart, @@ -109,9 +109,9 @@ PS2MouseDriverSupported ( } /** - 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 @@ -377,7 +377,7 @@ ErrorExit: } if (MouseDev != NULL) { - gBS->FreePool (MouseDev); + FreePool (MouseDev); } gBS->CloseProtocol ( @@ -480,7 +480,7 @@ PS2MouseDriverStop ( gBS->CloseEvent (MouseDev->SimplePointerProtocol.WaitForInput); FreeUnicodeStringTable (MouseDev->ControllerNameTable); - gBS->FreePool (MouseDev); + FreePool (MouseDev); gBS->CloseProtocol ( Controller, -- 2.39.2