code scrub on Ps2MouseDxe/Ps2MouseAbsolutePointer module

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8659 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/CommPs2.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/CommPs2.h
index 294aaceb4f9ff7458e6a9db6e4d61e44581d5f59..be2a54fda4551d3779441b30c3287c65c4b9df46 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/CommPs2.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/CommPs2.h
@@ -1,7 +1,7 @@
 /** @file\r
   Using PS2 Mouse to simulation Absolution Pointer Device.\r
   \r
-Copyright (c) 2006 - 2007, Intel Corporation\r
+Copyright (c) 2006 - 2009, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -75,32 +75,50 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //\r
 // Keyboard Controller Status\r
 //\r
-#define KBC_PARE  0x80  // Parity Error\r
-#define KBC_TIM   0x40  // General Time Out\r
-#define KBC_AUXB  0x20  // Output buffer for auxiliary device (PS/2):\r
-//    0 - Holds keyboard data\r
-//    1 - Holds data for auxiliary device\r
-//\r
-#define KBC_KEYL  0x10  // Keyboard lock status:\r
-//    0 - keyboard locked\r
-//    1 - keyboard free\r
-//\r
-#define KBC_CD  0x08  // Command/Data:\r
-//    0 - data byte written via port 60h\r
-//    1 - command byte written via port 64h\r
-//\r
-#define KBC_SYSF  0x04  // System Flag:\r
-//    0 - power-on reset\r
-//    1 - self-test successful\r
-//\r
-#define KBC_INPB  0x02  // Input Buffer Status :\r
-//    0 - input buffer empty\r
-//    1 - CPU data in input buffer\r
-//\r
-#define KBC_OUTB  0x01  // Output Buffer Status :\r
-//    0 - output buffer empty\r
-//    1 - keyboard controller data in output buffer\r
-//\r
+///\r
+/// Parity Error\r
+///\r
+#define KBC_PARE  0x80  \r
+///\r
+/// General Time Out\r
+///\r
+#define KBC_TIM   0x40  \r
+///\r
+/// Output buffer for auxiliary device (PS/2):\r
+///    0 - Holds keyboard data\r
+///    1 - Holds data for auxiliary device\r
+///\r
+#define KBC_AUXB  0x20  \r
+///\r
+/// Keyboard lock status:\r
+///    0 - keyboard locked\r
+///    1 - keyboard free\r
+///\r
+#define KBC_KEYL  0x10 \r
+///\r
+/// Command/Data:\r
+///    0 - data byte written via port 60h\r
+///    1 - command byte written via port 64h\r
+///\r
+#define KBC_CD  0x08\r
+///\r
+/// System Flag:\r
+///    0 - power-on reset\r
+///    1 - self-test successful\r
+///\r
+#define KBC_SYSF  0x04  \r
+///\r
+/// Input Buffer Status :\r
+///    0 - input buffer empty\r
+///    1 - CPU data in input buffer\r
+///\r
+#define KBC_INPB  0x02  \r
+///\r
+/// Output Buffer Status :\r
+///    0 - output buffer empty\r
+///    1 - keyboard controller data in output buffer\r
+///\r
+#define KBC_OUTB  0x01  \r
 \r
 /**\r
   Issue self test command via IsaIo interface.\r
@@ -413,4 +431,5 @@ WaitOutputFull (
   IN UINTN                                Timeout\r
   );\r
 \r
-#endif // __COMMPS2_H__\r
+#endif\r
+\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.c
index f9da93d0acec118f5d0df1d4fc6cd3b4ad2faa27..85ceaa9ef19b2ba65fa664f64e36aa19d333a76a 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.c
@@ -109,9 +109,9 @@ PS2MouseAbsolutePointerDriverSupported (
 }\r
 \r
 /**\r
-  Start this driver on ControllerHandle by opening a IsaIo\r
-  protocol, creating PS2_MOUSE_ABSOLUTE_POINTER_DEV device and install gEfiAbsolutePointerProtocolGuid\r
-  finnally.\r
+  Start this driver on ControllerHandle by opening a IsaIo protocol, creating\r
+  PS2_MOUSE_ABSOLUTE_POINTER_DEV device and install gEfiAbsolutePointerProtocolGuid\r
+  finally.\r
 \r
   @param  This                 Protocol instance pointer.\r
   @param  ControllerHandle     Handle of device to bind driver to\r
@@ -363,7 +363,7 @@ ErrorExit:
   }\r
 \r
   if (MouseAbsolutePointerDev != NULL) {\r
-    gBS->FreePool (MouseAbsolutePointerDev);\r
+    FreePool (MouseAbsolutePointerDev);\r
   }\r
 \r
   gBS->CloseProtocol (\r
@@ -466,7 +466,7 @@ PS2MouseAbsolutePointerDriverStop (
 \r
   gBS->CloseEvent (MouseAbsolutePointerDev->AbsolutePointerProtocol.WaitForInput);\r
   FreeUnicodeStringTable (MouseAbsolutePointerDev->ControllerNameTable);\r
-  gBS->FreePool (MouseAbsolutePointerDev);\r
+  FreePool (MouseAbsolutePointerDev);\r
 \r
   gBS->CloseProtocol (\r
          Controller,\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointerDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointerDxe.inf
index 309d7d03236ed1c72ee90b0a804a725ce9751e6c..0b1e4fdffcd20a6e01d6552672c3eff664b3f984 100644 (file)
--- 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\r
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r
-  EFI_SPECIFICATION_VERSION      = 0x00020000\r
   ENTRY_POINT                    = InitializePs2MouseAbsolutePointer\r
 \r
 #\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
index 16eefae67bbc73c82e7da0c215a3812f0e72a8fd..eb0664a75386c1a8145de1eba13901583b3a9f68 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
@@ -1,5 +1,5 @@
 #/** @file\r
-# Ps2 Mouse Driver\r
+# Ps2 Mouse Driver.\r
 #\r
 # This dirver directly uses IsaIo protocol service to support Ps2 mouse work.\r
 # Copyright (c) 2006 - 2009, Intel Corporation.\r
@@ -21,7 +21,6 @@
   FILE_GUID                      = 202A2B0E-9A31-4812-B291-8747DF152439\r
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r
-  EFI_SPECIFICATION_VERSION      = 0x00020000\r
   ENTRY_POINT                    = InitializePs2Mouse\r
 \r
 #\r
@@ -59,3 +58,13 @@
   gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START\r
 \r
 \r
+# [Event]\r
+#   ##\r
+#   # Event will be signaled for WaitForKey event.\r
+#   #\r
+#   EVT_NOTIFY_WAIT                             ## PRODUCES\r
+#\r
+#   ##\r
+#   # Event will be used to poll mouse state.\r
+#   #\r
+#   EVT_NOTIFY_SIGNAL                           ## PRODUCES
\ No newline at end of file