fix the ecc issue.

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

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.c
index ede1d5664cc89e8fae5a475055f5ad82d267b688..c396ab581310ac0a188b6b0c45bb475d1f6349de 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.c
@@ -1,5 +1,5 @@
-/**@file\r
-  PS2 Mouse Communication Interface \r
+/** @file\r
+  PS2 Mouse Communication Interface.\r
   \r
 Copyright (c) 2006 - 2007, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r
@@ -588,7 +588,7 @@ Out8042Data (
   )\r
 {\r
   EFI_STATUS  Status;\r
-  UINT8       temp;\r
+  UINT8       Temp;\r
   //\r
   // Wait keyboard controller input buffer empty\r
   //\r
@@ -597,8 +597,8 @@ Out8042Data (
     return Status;\r
   }\r
 \r
-  temp = Data;\r
-  IsaIo->Io.Write (IsaIo, EfiIsaIoWidthUint8, KBC_DATA_PORT, 1, &temp);\r
+  Temp = Data;\r
+  IsaIo->Io.Write (IsaIo, EfiIsaIoWidthUint8, KBC_DATA_PORT, 1, &Temp);\r
 \r
   Status = WaitInputEmpty (IsaIo, TIMEOUT);\r
   if (EFI_ERROR (Status)) {\r
@@ -624,23 +624,23 @@ In8042Data (
   )\r
 {\r
   UINTN Delay;\r
-  UINT8 temp;\r
+  UINT8 Temp;\r
 \r
   Delay = TIMEOUT / 50;\r
 \r
   do {\r
-    IsaIo->Io.Read (IsaIo, EfiIsaIoWidthUint8, KBC_CMD_STS_PORT, 1, &temp);\r
+    IsaIo->Io.Read (IsaIo, EfiIsaIoWidthUint8, KBC_CMD_STS_PORT, 1, &Temp);\r
 \r
     //\r
     // Check keyboard controller status bit 0(output buffer status)\r
     //\r
-    if ((temp & KBC_OUTB) == KBC_OUTB) {\r
+    if ((Temp & KBC_OUTB) == KBC_OUTB) {\r
       break;\r
     }\r
 \r
     gBS->Stall (50);\r
     Delay--;\r
-  } while (Delay);\r
+  } while (Delay != 0);\r
 \r
   if (Delay == 0) {\r
     return EFI_TIMEOUT;\r
@@ -737,7 +737,7 @@ Out8042AuxCommand (
   I/O work flow of outing 8042 Aux data.\r
   \r
   @param IsaIo   Pointer to instance of EFI_ISA_IO_PROTOCOL\r
-  @param Command Aux I/O command\r
+  @param Data    Buffer holding return value\r
   \r
   @retval EFI_SUCCESS Success to excute I/O work flow\r
   @retval EFI_TIMEOUT Keyboard controller time out.\r
@@ -811,7 +811,7 @@ In8042AuxData (
 \r
 \r
 /**\r
-  Check keyboard controller status, if it is output buffer full and for auxiliary device\r
+  Check keyboard controller status, if it is output buffer full and for auxiliary device.\r
   \r
   @param IsaIo   Pointer to instance of EFI_ISA_IO_PROTOCOL\r
   \r
@@ -869,7 +869,7 @@ WaitInputEmpty (
 \r
     gBS->Stall (50);\r
     Delay--;\r
-  } while (Delay);\r
+  } while (Delay != 0);\r
 \r
   if (Delay == 0) {\r
     return EFI_TIMEOUT;\r
@@ -928,7 +928,7 @@ Returns:
 \r
     gBS->Stall (50);\r
     Delay--;\r
-  } while (Delay);\r
+  } while (Delay != 0);\r
 \r
   if (Delay == 0) {\r
     return EFI_TIMEOUT;\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.h
index c92a1c57ed520ac065498e1b5947cb7a5229e421..8e2b58d44069a648eef120922cb533de77a9efd0 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.h
@@ -1,7 +1,6 @@
-/**@file\r
+/** @file\r
   PS2 Mouse Communication Interface \r
 \r
-  \r
 Copyright (c) 2006 - 2007, 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
@@ -360,7 +359,7 @@ In8042AuxData (
   I/O work flow of outing 8042 Aux data.\r
   \r
   @param IsaIo   Pointer to instance of EFI_ISA_IO_PROTOCOL\r
-  @param Command Aux I/O command\r
+  @param Data    Buffer holding return value\r
   \r
   @retval EFI_SUCCESS Success to excute I/O work flow\r
   @retval EFI_TIMEOUT Keyboard controller time out.\r
@@ -372,7 +371,7 @@ Out8042AuxData (
   );\r
 \r
 /**\r
-  Check keyboard controller status, if it is output buffer full and for auxiliary device\r
+  Check keyboard controller status, if it is output buffer full and for auxiliary device.\r
   \r
   @param IsaIo   Pointer to instance of EFI_ISA_IO_PROTOCOL\r
   \r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/ComponentName.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/ComponentName.c
index 9adf41fb2432bab9b8d3ec989e3f8ac93094a312..e14e2ba4343d50128c7be3aaf9ebb861cb27171f 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/ComponentName.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/ComponentName.c
@@ -1,6 +1,7 @@
-/**@file\r
+/** @file\r
+  UEFI Component Name(2) protocol implementation for Ps2MouseDxe driver.\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

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c
index 084c3244aebae38329055742c717f6d7f5ad4e60..b0dc3098bd489548de55d990ce509deb55708383 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c
@@ -1,4 +1,4 @@
-/**@file\r
+/** @file\r
   PS/2 Mouse driver. Routines that interacts with callers,\r
   conforming to EFI driver model\r
   \r
@@ -618,10 +618,10 @@ Exit:
 /**\r
   Check whether there is Ps/2 mouse device in system\r
 \r
-  @param PS2_MOUSE_DEV - Mouse Private Data Structure\r
+  @param MouseDev   - Mouse Private Data Structure\r
 \r
-  @retval TRUE                - Keyboard in System.\r
-  @retval FALSE               - Keyboard not in System.\r
+  @retval TRUE      - Keyboard in System.\r
+  @retval FALSE     - Keyboard not in System.\r
 \r
 **/\r
 BOOLEAN\r
@@ -687,22 +687,19 @@ MouseGetState (
 \r
 /**\r
 \r
-  Event notification function for SIMPLE_POINTER.WaitForInput event\r
-  Signal the event if there is input from mouse\r
+  Event notification function for SIMPLE_POINTER.WaitForInput event.\r
+  Signal the event if there is input from mouse.\r
 \r
   @param Event    event object\r
   @param Context  event context\r
 \r
 **/\r
-\r
 VOID\r
 EFIAPI\r
 MouseWaitForInput (\r
   IN  EFI_EVENT               Event,\r
   IN  VOID                    *Context\r
   )\r
-// GC_TODO:    Event - add argument and description to function comment\r
-// GC_TODO:    Context - add argument and description to function comment\r
 {\r
   PS2_MOUSE_DEV *MouseDev;\r
 \r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h
index 3ed2581888ff0434de6072ddcfcc0d307c877dbe..ae6720a5c915659d7bf4d180a6a721de21b33e7e 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h
@@ -1,5 +1,5 @@
-/**@file\r
-  PS/2 Mouse driver header file\r
+/** @file\r
+  PS/2 Mouse driver header file.\r
   \r
 Copyright (c) 2006 - 2007, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r
@@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 \r
-#ifndef _PS2MOUSE_H\r
-#define _PS2MOUSE_H\r
+#ifndef _PS2MOUSE_H_\r
+#define _PS2MOUSE_H_\r
 \r
 #include <PiDxe.h>\r
 #include <Framework/StatusCode.h>\r
@@ -105,6 +105,20 @@ typedef struct {
 //\r
 // Function prototypes\r
 //\r
+/**\r
+  Test to see if this driver supports ControllerHandle. Any ControllerHandle\r
+  than contains a IsaIo protocol can be supported.\r
+\r
+  @param  This                Protocol instance pointer.\r
+  @param  ControllerHandle    Handle of device to test\r
+  @param  RemainingDevicePath Optional parameter use to pick a specific child\r
+                              device to start.\r
+\r
+  @retval EFI_SUCCESS         This driver supports this device\r
+  @retval EFI_ALREADY_STARTED This driver is already running on this device\r
+  @retval other               This driver does not support this device\r
+\r
+**/\r
 EFI_STATUS\r
 EFIAPI\r
 PS2MouseDriverSupported (\r
@@ -113,6 +127,21 @@ PS2MouseDriverSupported (
   IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
   );\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
+\r
+  @param  This                 Protocol instance pointer.\r
+  @param  ControllerHandle     Handle of device to bind driver to\r
+  @param  RemainingDevicePath  Optional parameter use to pick a specific child\r
+                               device to start.\r
+\r
+  @retval EFI_SUCCESS          This driver is added to ControllerHandle\r
+  @retval EFI_ALREADY_STARTED  This driver is already running on ControllerHandle\r
+  @retval other                This driver does not support this device\r
+\r
+**/\r
 EFI_STATUS\r
 EFIAPI\r
 PS2MouseDriverStart (\r
@@ -121,6 +150,20 @@ PS2MouseDriverStart (
   IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
   );\r
 \r
+/**\r
+  Stop this driver on ControllerHandle. Support stoping any child handles\r
+  created by this driver.\r
+\r
+  @param  This              Protocol instance pointer.\r
+  @param  ControllerHandle  Handle of device to stop driver on\r
+  @param  NumberOfChildren  Number of Handles in ChildHandleBuffer. If number of\r
+                            children is zero stop the entire bus driver.\r
+  @param  ChildHandleBuffer List of Child Handles to Stop.\r
+\r
+  @retval EFI_SUCCESS       This driver is removed ControllerHandle\r
+  @retval other             This driver was not removed from this device\r
+\r
+**/\r
 EFI_STATUS\r
 EFIAPI\r
 PS2MouseDriverStop (\r
@@ -259,7 +302,17 @@ Ps2MouseComponentNameGetControllerName (
   OUT CHAR16                                          **ControllerName\r
   );\r
 \r
+/**\r
+  Reset the Mouse and do BAT test for it, if ExtendedVerification isTRUE and there is a mouse device connectted to system\r
+\r
+  @param This                 - Pointer of simple pointer Protocol.\r
+  @param ExtendedVerification - Whether configure mouse parameters. True: do; FALSE: skip.\r
 \r
+\r
+  @retval EFI_SUCCESS         - The command byte is written successfully.\r
+  @retval EFI_DEVICE_ERROR    - Errors occurred during reseting keyboard.\r
+\r
+**/\r
 EFI_STATUS\r
 EFIAPI\r
 MouseReset (\r
@@ -267,6 +320,16 @@ MouseReset (
   IN BOOLEAN                        ExtendedVerification\r
   );\r
 \r
+/**\r
+  Get and Clear mouse status.\r
+  \r
+  @param This                 - Pointer of simple pointer Protocol.\r
+  @param State                - Output buffer holding status.\r
+\r
+  @retval EFI_INVALID_PARAMETER Output buffer is invalid.\r
+  @retval EFI_NOT_READY         Mouse is not changed status yet.\r
+  @retval EFI_SUCCESS           Mouse status is changed and get successful.\r
+**/\r
 EFI_STATUS\r
 EFIAPI\r
 MouseGetState (\r
@@ -274,6 +337,15 @@ MouseGetState (
   IN OUT EFI_SIMPLE_POINTER_STATE   *State\r
   );\r
 \r
+/**\r
+\r
+  Event notification function for SIMPLE_POINTER.WaitForInput event.\r
+  Signal the event if there is input from mouse.\r
+\r
+  @param Event    event object\r
+  @param Context  event context\r
+\r
+**/\r
 VOID\r
 EFIAPI\r
 MouseWaitForInput (\r
@@ -281,6 +353,14 @@ MouseWaitForInput (
   IN  VOID                    *Context\r
   );\r
 \r
+/**\r
+  Event notification function for TimerEvent event\r
+  If mouse device is connected to system, try to get the mouse packet data\r
+\r
+  @param Event      -  TimerEvent in PS2_MOUSE_DEV\r
+  @param Context    -  Pointer to PS2_MOUSE_DEV structure\r
+\r
+**/\r
 VOID\r
 EFIAPI\r
 PollMouse (\r
@@ -288,11 +368,30 @@ PollMouse (
   IN VOID       *Context\r
   );\r
 \r
+/**\r
+  I/O work flow of in 8042 data.\r
+  \r
+  @param IsaIo   Pointer to instance of EFI_ISA_IO_PROTOCOL\r
+  @param Data    Data value\r
+  \r
+  @retval EFI_SUCCESS Success to excute I/O work flow\r
+  @retval EFI_TIMEOUT Keyboard controller time out.\r
+**/\r
 EFI_STATUS\r
 In8042Data (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo,\r
   IN OUT UINT8                            *Data\r
   );\r
+\r
+/**\r
+  Check whether there is Ps/2 mouse device in system\r
+\r
+  @param MouseDev   - Mouse Private Data Structure\r
+\r
+  @retval TRUE      - Keyboard in System.\r
+  @retval FALSE     - Keyboard not in System.\r
+\r
+**/\r
 BOOLEAN\r
 CheckMouseConnect (\r
   IN  PS2_MOUSE_DEV     *MouseDev\r