change "Ps2MouseSimulateTouchPad" to "Ps2MouseAbsolutePointer" for more clearing...
authoreric_tian <eric_tian@de2fecce-e211-0410-80a6-f3fac2684e05>
Wed, 28 Nov 2007 03:43:57 +0000 (03:43 +0000)
committereric_tian <eric_tian@de2fecce-e211-0410-80a6-f3fac2684e05>
Wed, 28 Nov 2007 03:43:57 +0000 (03:43 +0000)
git-svn-id: https://edk2.tianocore.org/svn/edk2/trunk@4339 de2fecce-e211-0410-80a6-f3fac2684e05

edk2/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseSimulateTouchPadDxe/CommPs2.c
edk2/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseSimulateTouchPadDxe/CommPs2.h
edk2/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseSimulateTouchPadDxe/ComponentName.c
edk2/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseSimulateTouchPadDxe/Ps2MouseAbsolutePointer.c [moved from edk2/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseSimulateTouchPadDxe/Ps2MouseSimulateTouchPad.c with 66% similarity]
edk2/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseSimulateTouchPadDxe/Ps2MouseAbsolutePointer.h [moved from edk2/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseSimulateTouchPadDxe/Ps2MouseSimulateTouchPad.h with 87% similarity]
edk2/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseSimulateTouchPadDxe/Ps2MouseAbsolutePointerDxe.inf [moved from edk2/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseSimulateTouchPadDxe/Ps2MouseSimulateTouchPadDxe.inf with 86% similarity]
edk2/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseSimulateTouchPadDxe/Ps2MouseAbsolutePointerDxe.msa [moved from edk2/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseSimulateTouchPadDxe/Ps2MouseSimulateTouchPadDxe.msa with 87% similarity]

index 719a650..895c1c2 100644 (file)
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 \r
-#include "Ps2MouseSimulateTouchPad.h"\r
+#include "Ps2MouseAbsolutePointer.h"\r
 #include "CommPs2.h"\r
 \r
 UINT8 SampleRateTbl[MAX_SR]   = { 0xa, 0x14, 0x28, 0x3c, 0x50, 0x64, 0xc8 };\r
@@ -430,7 +430,7 @@ Returns:
 \r
 EFI_STATUS\r
 PS2MouseGetPacket (\r
-  PS2_MOUSE_SIMULATE_TOUCHPAD_DEV     *MouseSimulateTouchPadDev\r
+  PS2_MOUSE_ABSOLUTE_POINTER_DEV     *MouseAbsolutePointerDev\r
   )\r
 /*++\r
 \r
@@ -474,15 +474,15 @@ Returns:
       //\r
       // Read mouse first byte data, if failed, immediately return\r
       //\r
-      KbcDisableAux (MouseSimulateTouchPadDev->IsaIo);\r
-      Status = PS2MouseRead (MouseSimulateTouchPadDev->IsaIo, &Data, &Count, State);\r
+      KbcDisableAux (MouseAbsolutePointerDev->IsaIo);\r
+      Status = PS2MouseRead (MouseAbsolutePointerDev->IsaIo, &Data, &Count, State);\r
       if (EFI_ERROR (Status)) {\r
-        KbcEnableAux (MouseSimulateTouchPadDev->IsaIo);\r
+        KbcEnableAux (MouseAbsolutePointerDev->IsaIo);\r
         return EFI_NOT_READY;\r
       }\r
 \r
       if (Count != 1) {\r
-        KbcEnableAux (MouseSimulateTouchPadDev->IsaIo);\r
+        KbcEnableAux (MouseAbsolutePointerDev->IsaIo);\r
         return EFI_NOT_READY;\r
       }\r
 \r
@@ -490,18 +490,18 @@ Returns:
         Packet[0] = Data;\r
         State     = PS2_READ_DATA_BYTE;\r
 \r
-        CheckKbStatus (MouseSimulateTouchPadDev->IsaIo, &KeyboardEnable);\r
-        KbcDisableKb (MouseSimulateTouchPadDev->IsaIo);\r
-        KbcEnableAux (MouseSimulateTouchPadDev->IsaIo);\r
+        CheckKbStatus (MouseAbsolutePointerDev->IsaIo, &KeyboardEnable);\r
+        KbcDisableKb (MouseAbsolutePointerDev->IsaIo);\r
+        KbcEnableAux (MouseAbsolutePointerDev->IsaIo);\r
       }\r
       break;\r
 \r
     case PS2_READ_DATA_BYTE:\r
       Count   = 2;\r
-      Status  = PS2MouseRead (MouseSimulateTouchPadDev->IsaIo, (Packet + 1), &Count, State);\r
+      Status  = PS2MouseRead (MouseAbsolutePointerDev->IsaIo, (Packet + 1), &Count, State);\r
       if (EFI_ERROR (Status)) {\r
         if (KeyboardEnable) {\r
-          KbcEnableKb (MouseSimulateTouchPadDev->IsaIo);\r
+          KbcEnableKb (MouseAbsolutePointerDev->IsaIo);\r
         }\r
 \r
         return EFI_NOT_READY;\r
@@ -509,7 +509,7 @@ Returns:
 \r
       if (Count != 2) {\r
         if (KeyboardEnable) {\r
-          KbcEnableKb (MouseSimulateTouchPadDev->IsaIo);\r
+          KbcEnableKb (MouseAbsolutePointerDev->IsaIo);\r
         }\r
 \r
         return EFI_NOT_READY;\r
@@ -520,7 +520,7 @@ Returns:
 \r
     case PS2_PROCESS_PACKET:\r
       if (KeyboardEnable) {\r
-        KbcEnableKb (MouseSimulateTouchPadDev->IsaIo);\r
+        KbcEnableKb (MouseAbsolutePointerDev->IsaIo);\r
       }\r
       //\r
       // Decode the packet\r
@@ -558,11 +558,11 @@ Returns:
       //\r
       // Update mouse state\r
       //\r
-      MouseSimulateTouchPadDev->State.CurrentX += RelativeMovementX;\r
-      MouseSimulateTouchPadDev->State.CurrentY -= RelativeMovementY;\r
-         MouseSimulateTouchPadDev->State.CurrentZ = 0;\r
-      MouseSimulateTouchPadDev->State.ActiveButtons = (UINT8) (LButton || RButton) & 0x3;\r
-      MouseSimulateTouchPadDev->StateChanged      = TRUE;\r
+      MouseAbsolutePointerDev->State.CurrentX += RelativeMovementX;\r
+      MouseAbsolutePointerDev->State.CurrentY -= RelativeMovementY;\r
+      MouseAbsolutePointerDev->State.CurrentZ = 0;\r
+      MouseAbsolutePointerDev->State.ActiveButtons = (UINT8) (LButton || RButton) & 0x3;\r
+      MouseAbsolutePointerDev->StateChanged      = TRUE;\r
 \r
       return EFI_SUCCESS;\r
     }\r
index 9702cb5..869ac01 100644 (file)
@@ -343,7 +343,7 @@ Returns:
 \r
 EFI_STATUS\r
 PS2MouseGetPacket (\r
-  PS2_MOUSE_SIMULATE_TOUCHPAD_DEV     *MouseSimulateTouchPadDev\r
+  PS2_MOUSE_ABSOLUTE_POINTER_DEV     *MouseAbsolutePointerDev\r
   )\r
 /*++\r
 \r
index d59fabe..c20e875 100644 (file)
@@ -11,28 +11,28 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 \r
-#include "Ps2MouseSimulateTouchPad.h"\r
+#include "Ps2MouseAbsolutePointer.h"\r
 \r
 //\r
 // EFI Component Name Protocol\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gPs2MouseSimulateTouchPadComponentName = {\r
-  Ps2MouseSimulateTouchPadComponentNameGetDriverName,\r
-  Ps2MouseSimulateTouchPadComponentNameGetControllerName,\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gPs2MouseAbsolutePointerComponentName = {\r
+  Ps2MouseAbsolutePointerComponentNameGetDriverName,\r
+  Ps2MouseAbsolutePointerComponentNameGetControllerName,\r
   "eng"\r
 };\r
 \r
 //\r
 // EFI Component Name 2 Protocol\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gPs2MouseSimulateTouchPadComponentName2 = {\r
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) Ps2MouseSimulateTouchPadComponentNameGetDriverName,\r
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) Ps2MouseSimulateTouchPadComponentNameGetControllerName,\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gPs2MouseAbsolutePointerComponentName2 = {\r
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) Ps2MouseAbsolutePointerComponentNameGetDriverName,\r
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) Ps2MouseAbsolutePointerComponentNameGetControllerName,\r
   "en"\r
 };\r
 \r
 \r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mPs2MouseSimulateTouchPadDriverNameTable[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mPs2MouseAbsolutePointerDriverNameTable[] = {\r
   {\r
     "eng;en",\r
     L"faked PS/2 Touchpad Driver"\r
@@ -84,7 +84,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mPs2MouseSimulateTouchPad
 **/\r
 EFI_STATUS\r
 EFIAPI\r
-Ps2MouseSimulateTouchPadComponentNameGetDriverName (\r
+Ps2MouseAbsolutePointerComponentNameGetDriverName (\r
   IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
   IN  CHAR8                        *Language,\r
   OUT CHAR16                       **DriverName\r
@@ -93,9 +93,9 @@ Ps2MouseSimulateTouchPadComponentNameGetDriverName (
   return LookupUnicodeString2 (\r
            Language,\r
            This->SupportedLanguages,\r
-           mPs2MouseSimulateTouchPadDriverNameTable,\r
+           mPs2MouseAbsolutePointerDriverNameTable,\r
            DriverName,\r
-           (BOOLEAN)(This == &gPs2MouseSimulateTouchPadComponentName)\r
+           (BOOLEAN)(This == &gPs2MouseAbsolutePointerComponentName)\r
            );\r
 }\r
 \r
@@ -169,7 +169,7 @@ Ps2MouseSimulateTouchPadComponentNameGetDriverName (
 **/\r
 EFI_STATUS\r
 EFIAPI\r
-Ps2MouseSimulateTouchPadComponentNameGetControllerName (\r
+Ps2MouseAbsolutePointerComponentNameGetControllerName (\r
   IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
   IN  EFI_HANDLE                                      ControllerHandle,\r
   IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
@@ -179,7 +179,7 @@ Ps2MouseSimulateTouchPadComponentNameGetControllerName (
 {\r
   EFI_STATUS                                  Status;\r
   EFI_ABSOLUTE_POINTER_PROTOCOL               *AbsolutePointerProtocol;\r
-  PS2_MOUSE_SIMULATE_TOUCHPAD_DEV             *MouseSimulateTouchPadDev;\r
+  PS2_MOUSE_ABSOLUTE_POINTER_DEV             *MouseAbsolutePointerDev;\r
   EFI_ISA_IO_PROTOCOL                         *IsaIoProtocol;\r
 \r
   //\r
@@ -195,7 +195,7 @@ Ps2MouseSimulateTouchPadComponentNameGetControllerName (
                   ControllerHandle,\r
                   &gEfiIsaIoProtocolGuid,\r
                   (VOID **) &IsaIoProtocol,\r
-                  gPS2MouseSimulateTouchPadDriver.DriverBindingHandle,\r
+                  gPS2MouseAbsolutePointerDriver.DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
                   );\r
@@ -203,7 +203,7 @@ Ps2MouseSimulateTouchPadComponentNameGetControllerName (
     gBS->CloseProtocol (\r
            ControllerHandle,\r
            &gEfiIsaIoProtocolGuid,\r
-           gPS2MouseSimulateTouchPadDriver.DriverBindingHandle,\r
+           gPS2MouseAbsolutePointerDriver.DriverBindingHandle,\r
            ControllerHandle\r
            );\r
 \r
@@ -220,7 +220,7 @@ Ps2MouseSimulateTouchPadComponentNameGetControllerName (
                   ControllerHandle,\r
                   &gEfiAbsolutePointerProtocolGuid,\r
                   (VOID **) &AbsolutePointerProtocol,\r
-                  gPS2MouseSimulateTouchPadDriver.DriverBindingHandle,\r
+                  gPS2MouseAbsolutePointerDriver.DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
                   );\r
@@ -228,13 +228,13 @@ Ps2MouseSimulateTouchPadComponentNameGetControllerName (
     return Status;\r
   }\r
 \r
-  MouseSimulateTouchPadDev = PS2_MOUSE_SIMULATE_TOUCHPAD_DEV_FROM_THIS (AbsolutePointerProtocol);\r
+  MouseAbsolutePointerDev = PS2_MOUSE_ABSOLUTE_POINTER_DEV_FROM_THIS (AbsolutePointerProtocol);\r
 \r
   return LookupUnicodeString2 (\r
            Language,\r
            This->SupportedLanguages,\r
-           MouseSimulateTouchPadDev->ControllerNameTable,\r
+           MouseAbsolutePointerDev->ControllerNameTable,\r
            ControllerName,\r
-           (BOOLEAN)(This == &gPs2MouseSimulateTouchPadComponentName)\r
+           (BOOLEAN)(This == &gPs2MouseAbsolutePointerComponentName)\r
            );\r
 }\r
@@ -13,16 +13,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 \r
-#include "Ps2MouseSimulateTouchPad.h"\r
+#include "Ps2MouseAbsolutePointer.h"\r
 #include "CommPs2.h"\r
 \r
 //\r
 // DriverBinding Protocol Instance\r
 //\r
-EFI_DRIVER_BINDING_PROTOCOL gPS2MouseSimulateTouchPadDriver = {\r
-  PS2MouseSimulateTouchPadDriverSupported,\r
-  PS2MouseSimulateTouchPadDriverStart,\r
-  PS2MouseSimulateTouchPadDriverStop,\r
+EFI_DRIVER_BINDING_PROTOCOL gPS2MouseAbsolutePointerDriver = {\r
+  PS2MouseAbsolutePointerDriverSupported,\r
+  PS2MouseAbsolutePointerDriverStart,\r
+  PS2MouseAbsolutePointerDriverStop,\r
   0x1,\r
   NULL,\r
   NULL\r
@@ -30,7 +30,7 @@ EFI_DRIVER_BINDING_PROTOCOL gPS2MouseSimulateTouchPadDriver = {
 \r
 EFI_STATUS\r
 EFIAPI\r
-PS2MouseSimulateTouchPadDriverSupported (\r
+PS2MouseAbsolutePointerDriverSupported (\r
   IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
   IN EFI_HANDLE                     Controller,\r
   IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
@@ -110,7 +110,7 @@ Returns:
 \r
 EFI_STATUS\r
 EFIAPI\r
-PS2MouseSimulateTouchPadDriverStart (\r
+PS2MouseAbsolutePointerDriverStart (\r
   IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
   IN EFI_HANDLE                     Controller,\r
   IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
@@ -134,14 +134,14 @@ Returns:
   EFI_STATUS                          Status;\r
   EFI_STATUS                          EmptyStatus;\r
   EFI_ISA_IO_PROTOCOL                 *IsaIo;\r
-  PS2_MOUSE_SIMULATE_TOUCHPAD_DEV     *MouseSimulateTouchPadDev;\r
+  PS2_MOUSE_ABSOLUTE_POINTER_DEV     *MouseAbsolutePointerDev;\r
   UINT8                               Data;\r
   EFI_TPL                             OldTpl;\r
   EFI_STATUS_CODE_VALUE               StatusCode;\r
   EFI_DEVICE_PATH_PROTOCOL            *ParentDevicePath;\r
 \r
   StatusCode  = 0;\r
-  MouseSimulateTouchPadDev    = NULL;\r
+  MouseAbsolutePointerDev    = NULL;\r
   IsaIo       = NULL;\r
 \r
   //\r
@@ -195,37 +195,37 @@ Returns:
   //\r
   // Allocate private data\r
   //\r
-  MouseSimulateTouchPadDev = AllocateZeroPool (sizeof (PS2_MOUSE_SIMULATE_TOUCHPAD_DEV));\r
-  if (MouseSimulateTouchPadDev == NULL) {\r
+  MouseAbsolutePointerDev = AllocateZeroPool (sizeof (PS2_MOUSE_ABSOLUTE_POINTER_DEV));\r
+  if (MouseAbsolutePointerDev == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ErrorExit;\r
   }\r
   //\r
   // Setup the device instance\r
   //\r
-  MouseSimulateTouchPadDev->Signature       = PS2_MOUSE_SIMULATE_TOUCHPAD_DEV_SIGNATURE;\r
-  MouseSimulateTouchPadDev->Handle          = Controller;\r
-  MouseSimulateTouchPadDev->SampleRate      = SSR_20;\r
-  MouseSimulateTouchPadDev->Resolution      = CMR4;\r
-  MouseSimulateTouchPadDev->Scaling         = SF1;\r
-  MouseSimulateTouchPadDev->DataPackageSize = 3;\r
-  MouseSimulateTouchPadDev->IsaIo           = IsaIo;\r
-  MouseSimulateTouchPadDev->DevicePath      = ParentDevicePath;\r
+  MouseAbsolutePointerDev->Signature       = PS2_MOUSE_ABSOLUTE_POINTER_DEV_SIGNATURE;\r
+  MouseAbsolutePointerDev->Handle          = Controller;\r
+  MouseAbsolutePointerDev->SampleRate      = SSR_20;\r
+  MouseAbsolutePointerDev->Resolution      = CMR4;\r
+  MouseAbsolutePointerDev->Scaling         = SF1;\r
+  MouseAbsolutePointerDev->DataPackageSize = 3;\r
+  MouseAbsolutePointerDev->IsaIo           = IsaIo;\r
+  MouseAbsolutePointerDev->DevicePath      = ParentDevicePath;\r
 \r
   //\r
   // Resolution = 4 counts/mm\r
   //\r
-  MouseSimulateTouchPadDev->Mode.AbsoluteMaxX               = 1024;\r
-  MouseSimulateTouchPadDev->Mode.AbsoluteMinX               = 0;\r
-  MouseSimulateTouchPadDev->Mode.AbsoluteMaxY               = 798;\r
-  MouseSimulateTouchPadDev->Mode.AbsoluteMinY               = 0;\r
-  MouseSimulateTouchPadDev->Mode.AbsoluteMaxZ               = 0;\r
-  MouseSimulateTouchPadDev->Mode.AbsoluteMinZ               = 0;\r
-  MouseSimulateTouchPadDev->Mode.Attributes                 = 0x03;\r
+  MouseAbsolutePointerDev->Mode.AbsoluteMaxX               = 1024;\r
+  MouseAbsolutePointerDev->Mode.AbsoluteMinX               = 0;\r
+  MouseAbsolutePointerDev->Mode.AbsoluteMaxY               = 798;\r
+  MouseAbsolutePointerDev->Mode.AbsoluteMinY               = 0;\r
+  MouseAbsolutePointerDev->Mode.AbsoluteMaxZ               = 0;\r
+  MouseAbsolutePointerDev->Mode.AbsoluteMinZ               = 0;\r
+  MouseAbsolutePointerDev->Mode.Attributes                 = 0x03;\r
 \r
-  MouseSimulateTouchPadDev->AbsolutePointerProtocol.Reset     = MouseSimulateTouchPadReset;\r
-  MouseSimulateTouchPadDev->AbsolutePointerProtocol.GetState  = MouseSimulateTouchPadGetState;\r
-  MouseSimulateTouchPadDev->AbsolutePointerProtocol.Mode      = &(MouseSimulateTouchPadDev->Mode);\r
+  MouseAbsolutePointerDev->AbsolutePointerProtocol.Reset     = MouseAbsolutePointerReset;\r
+  MouseAbsolutePointerDev->AbsolutePointerProtocol.GetState  = MouseAbsolutePointerGetState;\r
+  MouseAbsolutePointerDev->AbsolutePointerProtocol.Mode      = &(MouseAbsolutePointerDev->Mode);\r
 \r
   //\r
   // Initialize keyboard controller if necessary\r
@@ -250,7 +250,7 @@ Returns:
   //\r
   // Reset the mouse\r
   //\r
-  Status = MouseSimulateTouchPadDev->AbsolutePointerProtocol.Reset (&MouseSimulateTouchPadDev->AbsolutePointerProtocol, TRUE);\r
+  Status = MouseAbsolutePointerDev->AbsolutePointerProtocol.Reset (&MouseAbsolutePointerDev->AbsolutePointerProtocol, TRUE);\r
   if (EFI_ERROR (Status)) {\r
     //\r
     // mouse not connected\r
@@ -265,9 +265,9 @@ Returns:
   Status = gBS->CreateEvent (\r
                   EVT_NOTIFY_WAIT,\r
                   TPL_NOTIFY,\r
-                  MouseSimulateTouchPadWaitForInput,\r
-                  MouseSimulateTouchPadDev,\r
-                  &((MouseSimulateTouchPadDev->AbsolutePointerProtocol).WaitForInput)\r
+                  MouseAbsolutePointerWaitForInput,\r
+                  MouseAbsolutePointerDev,\r
+                  &((MouseAbsolutePointerDev->AbsolutePointerProtocol).WaitForInput)\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
@@ -279,9 +279,9 @@ Returns:
   Status = gBS->CreateEvent (\r
                   EVT_TIMER | EVT_NOTIFY_SIGNAL,\r
                   TPL_NOTIFY,\r
-                  PollMouseSimulateTouchPad,\r
-                  MouseSimulateTouchPadDev,\r
-                  &MouseSimulateTouchPadDev->TimerEvent\r
+                  PollMouseAbsolutePointer,\r
+                  MouseAbsolutePointerDev,\r
+                  &MouseAbsolutePointerDev->TimerEvent\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
@@ -290,24 +290,24 @@ Returns:
   //\r
   // Start timer to poll mouse (100 samples per second)\r
   //\r
-  Status = gBS->SetTimer (MouseSimulateTouchPadDev->TimerEvent, TimerPeriodic, 100000);\r
+  Status = gBS->SetTimer (MouseAbsolutePointerDev->TimerEvent, TimerPeriodic, 100000);\r
   if (EFI_ERROR (Status)) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ErrorExit;\r
   }\r
 \r
-  MouseSimulateTouchPadDev->ControllerNameTable = NULL;\r
+  MouseAbsolutePointerDev->ControllerNameTable = NULL;\r
   AddUnicodeString2 (\r
     "eng",\r
-    gPs2MouseSimulateTouchPadComponentName.SupportedLanguages,\r
-    &MouseSimulateTouchPadDev->ControllerNameTable,\r
+    gPs2MouseAbsolutePointerComponentName.SupportedLanguages,\r
+    &MouseAbsolutePointerDev->ControllerNameTable,\r
     L"Faked PS/2 Touchpad Device",\r
     TRUE\r
     );\r
   AddUnicodeString2 (\r
     "en",\r
-    gPs2MouseSimulateTouchPadComponentName2.SupportedLanguages,\r
-    &MouseSimulateTouchPadDev->ControllerNameTable,\r
+    gPs2MouseAbsolutePointerComponentName2.SupportedLanguages,\r
+    &MouseAbsolutePointerDev->ControllerNameTable,\r
     L"Faked PS/2 Touchpad Device",\r
     FALSE\r
     );\r
@@ -319,7 +319,7 @@ Returns:
   Status = gBS->InstallMultipleProtocolInterfaces (\r
                   &Controller,\r
                   &gEfiAbsolutePointerProtocolGuid,\r
-                  &MouseSimulateTouchPadDev->AbsolutePointerProtocol,\r
+                  &MouseAbsolutePointerDev->AbsolutePointerProtocol,\r
                   NULL\r
                   );\r
   if (EFI_ERROR (Status)) {\r
@@ -342,16 +342,16 @@ ErrorExit:
       );\r
   }\r
 \r
-  if ((MouseSimulateTouchPadDev != NULL) && (MouseSimulateTouchPadDev->AbsolutePointerProtocol.WaitForInput != NULL)) {\r
-    gBS->CloseEvent (MouseSimulateTouchPadDev->AbsolutePointerProtocol.WaitForInput);\r
+  if ((MouseAbsolutePointerDev != NULL) && (MouseAbsolutePointerDev->AbsolutePointerProtocol.WaitForInput != NULL)) {\r
+    gBS->CloseEvent (MouseAbsolutePointerDev->AbsolutePointerProtocol.WaitForInput);\r
   }\r
 \r
-  if ((MouseSimulateTouchPadDev != NULL) && (MouseSimulateTouchPadDev->TimerEvent != NULL)) {\r
-    gBS->CloseEvent (MouseSimulateTouchPadDev->TimerEvent);\r
+  if ((MouseAbsolutePointerDev != NULL) && (MouseAbsolutePointerDev->TimerEvent != NULL)) {\r
+    gBS->CloseEvent (MouseAbsolutePointerDev->TimerEvent);\r
   }\r
 \r
-  if ((MouseSimulateTouchPadDev != NULL) && (MouseSimulateTouchPadDev->ControllerNameTable != NULL)) {\r
-    FreeUnicodeStringTable (MouseSimulateTouchPadDev->ControllerNameTable);\r
+  if ((MouseAbsolutePointerDev != NULL) && (MouseAbsolutePointerDev->ControllerNameTable != NULL)) {\r
+    FreeUnicodeStringTable (MouseAbsolutePointerDev->ControllerNameTable);\r
   }\r
   //\r
   // Since there will be no timer handler for mouse input any more,\r
@@ -362,8 +362,8 @@ ErrorExit:
     EmptyStatus = In8042Data (IsaIo, &Data);\r
   }\r
 \r
-  if (MouseSimulateTouchPadDev != NULL) {\r
-    gBS->FreePool (MouseSimulateTouchPadDev);\r
+  if (MouseAbsolutePointerDev != NULL) {\r
+    gBS->FreePool (MouseAbsolutePointerDev);\r
   }\r
 \r
   gBS->CloseProtocol (\r
@@ -387,7 +387,7 @@ ErrorExit:
 \r
 EFI_STATUS\r
 EFIAPI\r
-PS2MouseSimulateTouchPadDriverStop (\r
+PS2MouseAbsolutePointerDriverStop (\r
   IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
   IN EFI_HANDLE                     Controller,\r
   IN UINTN                          NumberOfChildren,\r
@@ -411,7 +411,7 @@ PS2MouseSimulateTouchPadDriverStop (
 {\r
   EFI_STATUS                            Status;\r
   EFI_ABSOLUTE_POINTER_PROTOCOL         *AbsolutePointerProtocol;\r
-  PS2_MOUSE_SIMULATE_TOUCHPAD_DEV       *MouseSimulateTouchPadDev;\r
+  PS2_MOUSE_ABSOLUTE_POINTER_DEV       *MouseAbsolutePointerDev;\r
   UINT8                                 Data;\r
 \r
   Status = gBS->OpenProtocol (\r
@@ -426,7 +426,7 @@ PS2MouseSimulateTouchPadDriverStop (
     return EFI_SUCCESS;\r
   }\r
 \r
-  MouseSimulateTouchPadDev = PS2_MOUSE_SIMULATE_TOUCHPAD_DEV_FROM_THIS (AbsolutePointerProtocol);\r
+  MouseAbsolutePointerDev = PS2_MOUSE_ABSOLUTE_POINTER_DEV_FROM_THIS (AbsolutePointerProtocol);\r
 \r
   //\r
   // Report that the keyboard is being disabled\r
@@ -434,13 +434,13 @@ PS2MouseSimulateTouchPadDriverStop (
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_PROGRESS_CODE,\r
     EFI_PERIPHERAL_MOUSE | EFI_P_PC_DISABLE,\r
-    MouseSimulateTouchPadDev->DevicePath\r
+    MouseAbsolutePointerDev->DevicePath\r
     );\r
 \r
   Status = gBS->UninstallProtocolInterface (\r
                   Controller,\r
                   &gEfiAbsolutePointerProtocolGuid,\r
-                  &MouseSimulateTouchPadDev->AbsolutePointerProtocol\r
+                  &MouseAbsolutePointerDev->AbsolutePointerProtocol\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -448,13 +448,13 @@ PS2MouseSimulateTouchPadDriverStop (
   //\r
   // Disable mouse on keyboard controller\r
   //\r
-  KbcDisableAux (MouseSimulateTouchPadDev->IsaIo);\r
+  KbcDisableAux (MouseAbsolutePointerDev->IsaIo);\r
 \r
   //\r
   // Cancel mouse data polling timer, close timer event\r
   //\r
-  gBS->SetTimer (MouseSimulateTouchPadDev->TimerEvent, TimerCancel, 0);\r
-  gBS->CloseEvent (MouseSimulateTouchPadDev->TimerEvent);\r
+  gBS->SetTimer (MouseAbsolutePointerDev->TimerEvent, TimerCancel, 0);\r
+  gBS->CloseEvent (MouseAbsolutePointerDev->TimerEvent);\r
 \r
   //\r
   // Since there will be no timer handler for mouse input any more,\r
@@ -462,12 +462,12 @@ PS2MouseSimulateTouchPadDriverStop (
   //\r
   Status = EFI_SUCCESS;\r
   while (!EFI_ERROR (Status)) {\r
-    Status = In8042Data (MouseSimulateTouchPadDev->IsaIo, &Data);\r
+    Status = In8042Data (MouseAbsolutePointerDev->IsaIo, &Data);\r
   }\r
 \r
-  gBS->CloseEvent (MouseSimulateTouchPadDev->AbsolutePointerProtocol.WaitForInput);\r
-  FreeUnicodeStringTable (MouseSimulateTouchPadDev->ControllerNameTable);\r
-  gBS->FreePool (MouseSimulateTouchPadDev);\r
+  gBS->CloseEvent (MouseAbsolutePointerDev->AbsolutePointerProtocol.WaitForInput);\r
+  FreeUnicodeStringTable (MouseAbsolutePointerDev->ControllerNameTable);\r
+  gBS->FreePool (MouseAbsolutePointerDev);\r
 \r
   gBS->CloseProtocol (\r
          Controller,\r
@@ -488,7 +488,7 @@ PS2MouseSimulateTouchPadDriverStop (
 \r
 EFI_STATUS\r
 EFIAPI\r
-MouseSimulateTouchPadReset (\r
+MouseAbsolutePointerReset (\r
   IN EFI_ABSOLUTE_POINTER_PROTOCOL    *This,\r
   IN BOOLEAN                          ExtendedVerification\r
   )\r
@@ -511,12 +511,12 @@ Returns:
 --*/\r
 {\r
   EFI_STATUS                       Status;\r
-  PS2_MOUSE_SIMULATE_TOUCHPAD_DEV  *MouseSimulateTouchPadDev;\r
+  PS2_MOUSE_ABSOLUTE_POINTER_DEV  *MouseAbsolutePointerDev;\r
   EFI_TPL                          OldTpl;\r
   BOOLEAN                          KeyboardEnable;\r
   UINT8                            Data;\r
 \r
-  MouseSimulateTouchPadDev = PS2_MOUSE_SIMULATE_TOUCHPAD_DEV_FROM_THIS (This);\r
+  MouseAbsolutePointerDev = PS2_MOUSE_ABSOLUTE_POINTER_DEV_FROM_THIS (This);\r
 \r
   //\r
   // Report reset progress code\r
@@ -524,7 +524,7 @@ Returns:
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_PROGRESS_CODE,\r
     EFI_PERIPHERAL_MOUSE | EFI_P_PC_RESET,\r
-    MouseSimulateTouchPadDev->DevicePath\r
+    MouseAbsolutePointerDev->DevicePath\r
     );\r
 \r
   KeyboardEnable = FALSE;\r
@@ -534,28 +534,28 @@ Returns:
   //\r
   OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
 \r
-  ZeroMem (&MouseSimulateTouchPadDev->State, sizeof (EFI_ABSOLUTE_POINTER_STATE));\r
-  MouseSimulateTouchPadDev->StateChanged = FALSE;\r
+  ZeroMem (&MouseAbsolutePointerDev->State, sizeof (EFI_ABSOLUTE_POINTER_STATE));\r
+  MouseAbsolutePointerDev->StateChanged = FALSE;\r
 \r
   //\r
   // Exhaust input data\r
   //\r
   Status = EFI_SUCCESS;\r
   while (!EFI_ERROR (Status)) {\r
-    Status = In8042Data (MouseSimulateTouchPadDev->IsaIo, &Data);\r
+    Status = In8042Data (MouseAbsolutePointerDev->IsaIo, &Data);\r
   }\r
 \r
-  CheckKbStatus (MouseSimulateTouchPadDev->IsaIo, &KeyboardEnable);\r
+  CheckKbStatus (MouseAbsolutePointerDev->IsaIo, &KeyboardEnable);\r
 \r
-  KbcDisableKb (MouseSimulateTouchPadDev->IsaIo);\r
+  KbcDisableKb (MouseAbsolutePointerDev->IsaIo);\r
 \r
-  MouseSimulateTouchPadDev->IsaIo->Io.Read (MouseSimulateTouchPadDev->IsaIo, EfiIsaIoWidthUint8, KBC_CMD_STS_PORT, 1, &Data);\r
+  MouseAbsolutePointerDev->IsaIo->Io.Read (MouseAbsolutePointerDev->IsaIo, EfiIsaIoWidthUint8, KBC_CMD_STS_PORT, 1, &Data);\r
 \r
   //\r
   // if there's data block on KBC data port, read it out\r
   //\r
   if ((Data & KBC_OUTB) == KBC_OUTB) {\r
-    MouseSimulateTouchPadDev->IsaIo->Io.Read (MouseSimulateTouchPadDev->IsaIo, EfiIsaIoWidthUint8, KBC_DATA_PORT, 1, &Data);\r
+    MouseAbsolutePointerDev->IsaIo->Io.Read (MouseAbsolutePointerDev->IsaIo, EfiIsaIoWidthUint8, KBC_DATA_PORT, 1, &Data);\r
   }\r
 \r
   Status = EFI_SUCCESS;\r
@@ -564,35 +564,35 @@ Returns:
   // This behavior is needed by performance speed. The following mouse command only succeessfully finish when mouse device is\r
   // connected to system, so if PS2 mouse device not connect to system or user not ask for, we skip the mouse configuration and enabling\r
   //\r
-  if (ExtendedVerification && CheckMouseSimulateTouchPadConnect (MouseSimulateTouchPadDev)) {\r
+  if (ExtendedVerification && CheckMouseAbsolutePointerConnect (MouseAbsolutePointerDev)) {\r
     //\r
     // Send mouse reset command and set mouse default configure\r
     //\r
-    Status = PS2MouseReset (MouseSimulateTouchPadDev->IsaIo);\r
+    Status = PS2MouseReset (MouseAbsolutePointerDev->IsaIo);\r
     if (EFI_ERROR (Status)) {\r
       Status = EFI_DEVICE_ERROR;\r
       goto Exit;\r
     }\r
 \r
-    Status = PS2MouseSetSampleRate (MouseSimulateTouchPadDev->IsaIo, MouseSimulateTouchPadDev->SampleRate);\r
+    Status = PS2MouseSetSampleRate (MouseAbsolutePointerDev->IsaIo, MouseAbsolutePointerDev->SampleRate);\r
     if (EFI_ERROR (Status)) {\r
       Status = EFI_DEVICE_ERROR;\r
       goto Exit;\r
     }\r
 \r
-    Status = PS2MouseSetResolution (MouseSimulateTouchPadDev->IsaIo, MouseSimulateTouchPadDev->Resolution);\r
+    Status = PS2MouseSetResolution (MouseAbsolutePointerDev->IsaIo, MouseAbsolutePointerDev->Resolution);\r
     if (EFI_ERROR (Status)) {\r
       Status = EFI_DEVICE_ERROR;\r
       goto Exit;\r
     }\r
 \r
-    Status = PS2MouseSetScaling (MouseSimulateTouchPadDev->IsaIo, MouseSimulateTouchPadDev->Scaling);\r
+    Status = PS2MouseSetScaling (MouseAbsolutePointerDev->IsaIo, MouseAbsolutePointerDev->Scaling);\r
     if (EFI_ERROR (Status)) {\r
       Status = EFI_DEVICE_ERROR;\r
       goto Exit;\r
     }\r
 \r
-    Status = PS2MouseEnable (MouseSimulateTouchPadDev->IsaIo);\r
+    Status = PS2MouseEnable (MouseAbsolutePointerDev->IsaIo);\r
     if (EFI_ERROR (Status)) {\r
       Status = EFI_DEVICE_ERROR;\r
       goto Exit;\r
@@ -602,15 +602,15 @@ Exit:
   gBS->RestoreTPL (OldTpl);\r
 \r
   if (KeyboardEnable) {\r
-    KbcEnableKb (MouseSimulateTouchPadDev->IsaIo);\r
+    KbcEnableKb (MouseAbsolutePointerDev->IsaIo);\r
   }\r
 \r
   return Status;\r
 }\r
 \r
 BOOLEAN\r
-CheckMouseSimulateTouchPadConnect (\r
-  IN  PS2_MOUSE_SIMULATE_TOUCHPAD_DEV     *MouseSimulateTouchPadDev\r
+CheckMouseAbsolutePointerConnect (\r
+  IN  PS2_MOUSE_ABSOLUTE_POINTER_DEV     *MouseAbsolutePointerDev\r
   )\r
 /*++\r
 \r
@@ -631,7 +631,7 @@ Returns:
 {\r
   EFI_STATUS     Status;\r
 \r
-  Status = PS2MouseEnable (MouseSimulateTouchPadDev->IsaIo);\r
+  Status = PS2MouseEnable (MouseAbsolutePointerDev->IsaIo);\r
   if (!EFI_ERROR (Status)) {\r
     return TRUE;\r
   }\r
@@ -641,7 +641,7 @@ Returns:
 \r
 EFI_STATUS\r
 EFIAPI\r
-MouseSimulateTouchPadGetState (\r
+MouseAbsolutePointerGetState (\r
   IN EFI_ABSOLUTE_POINTER_PROTOCOL     *This,\r
   IN OUT EFI_ABSOLUTE_POINTER_STATE    *State\r
   )\r
@@ -664,30 +664,30 @@ Returns:
 \r
 --*/\r
 {\r
-  PS2_MOUSE_SIMULATE_TOUCHPAD_DEV *MouseSimulateTouchPadDev;\r
+  PS2_MOUSE_ABSOLUTE_POINTER_DEV *MouseAbsolutePointerDev;\r
   EFI_TPL       OldTpl;\r
 \r
-  MouseSimulateTouchPadDev = PS2_MOUSE_SIMULATE_TOUCHPAD_DEV_FROM_THIS (This);\r
+  MouseAbsolutePointerDev = PS2_MOUSE_ABSOLUTE_POINTER_DEV_FROM_THIS (This);\r
 \r
   if (State == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (!MouseSimulateTouchPadDev->StateChanged) {\r
+  if (!MouseAbsolutePointerDev->StateChanged) {\r
     return EFI_NOT_READY;\r
   }\r
 \r
   OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
-  CopyMem (State, &(MouseSimulateTouchPadDev->State), sizeof (EFI_ABSOLUTE_POINTER_STATE));\r
+  CopyMem (State, &(MouseAbsolutePointerDev->State), sizeof (EFI_ABSOLUTE_POINTER_STATE));\r
 \r
   //\r
   // clear mouse state\r
   //\r
-  MouseSimulateTouchPadDev->State.CurrentX = 0;\r
-  MouseSimulateTouchPadDev->State.CurrentY = 0;\r
-  MouseSimulateTouchPadDev->State.CurrentZ = 0;\r
-  MouseSimulateTouchPadDev->State.ActiveButtons = 0x0;\r
-  MouseSimulateTouchPadDev->StateChanged            = FALSE;\r
+  MouseAbsolutePointerDev->State.CurrentX = 0;\r
+  MouseAbsolutePointerDev->State.CurrentY = 0;\r
+  MouseAbsolutePointerDev->State.CurrentZ = 0;\r
+  MouseAbsolutePointerDev->State.ActiveButtons = 0x0;\r
+  MouseAbsolutePointerDev->StateChanged            = FALSE;\r
   gBS->RestoreTPL (OldTpl);\r
 \r
   return EFI_SUCCESS;\r
@@ -695,7 +695,7 @@ Returns:
 \r
 VOID\r
 EFIAPI\r
-MouseSimulateTouchPadWaitForInput (\r
+MouseAbsolutePointerWaitForInput (\r
   IN  EFI_EVENT               Event,\r
   IN  VOID                    *Context\r
   )\r
@@ -714,15 +714,15 @@ Returns:
 // 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_SIMULATE_TOUCHPAD_DEV *MouseSimulateTouchPadDev;\r
+  PS2_MOUSE_ABSOLUTE_POINTER_DEV *MouseAbsolutePointerDev;\r
 \r
-  MouseSimulateTouchPadDev = (PS2_MOUSE_SIMULATE_TOUCHPAD_DEV *) Context;\r
+  MouseAbsolutePointerDev = (PS2_MOUSE_ABSOLUTE_POINTER_DEV *) Context;\r
 \r
   //\r
   // Someone is waiting on the mouse event, if there's\r
   // input from mouse, signal the event\r
   //\r
-  if (MouseSimulateTouchPadDev->StateChanged) {\r
+  if (MouseAbsolutePointerDev->StateChanged) {\r
     gBS->SignalEvent (Event);\r
   }\r
 \r
@@ -730,7 +730,7 @@ Returns:
 \r
 VOID\r
 EFIAPI\r
-PollMouseSimulateTouchPad(\r
+PollMouseAbsolutePointer(\r
   IN EFI_EVENT  Event,\r
   IN VOID       *Context\r
   )\r
@@ -752,18 +752,18 @@ Returns:
 \r
 --*/\r
 {\r
-  PS2_MOUSE_SIMULATE_TOUCHPAD_DEV *MouseSimulateTouchPadDev;\r
+  PS2_MOUSE_ABSOLUTE_POINTER_DEV *MouseAbsolutePointerDev;\r
 \r
-  MouseSimulateTouchPadDev = (PS2_MOUSE_SIMULATE_TOUCHPAD_DEV *) Context;\r
+  MouseAbsolutePointerDev = (PS2_MOUSE_ABSOLUTE_POINTER_DEV *) Context;\r
 \r
   //\r
   // Polling mouse packet data\r
   //\r
-  PS2MouseGetPacket (MouseSimulateTouchPadDev);\r
+  PS2MouseGetPacket (MouseAbsolutePointerDev);\r
 }\r
 \r
 /**\r
-  The user Entry Point for module Ps2MouseSimulateTouchPad. The user code starts with this function.\r
+  The user Entry Point for module Ps2MouseAbsolutePointer. The user code starts with this function.\r
 \r
   @param[in] ImageHandle    The firmware allocated handle for the EFI image.  \r
   @param[in] SystemTable    A pointer to the EFI System Table.\r
@@ -774,7 +774,7 @@ Returns:
 **/\r
 EFI_STATUS\r
 EFIAPI\r
-InitializePs2MouseSimulateTouchPad(\r
+InitializePs2MouseAbsolutePointer(\r
   IN EFI_HANDLE           ImageHandle,\r
   IN EFI_SYSTEM_TABLE     *SystemTable\r
   )\r
@@ -787,10 +787,10 @@ InitializePs2MouseSimulateTouchPad(
   Status = EfiLibInstallDriverBindingComponentName2 (\r
              ImageHandle,\r
              SystemTable,\r
-             &gPS2MouseSimulateTouchPadDriver,\r
+             &gPS2MouseAbsolutePointerDriver,\r
              ImageHandle,\r
-             &gPs2MouseSimulateTouchPadComponentName,\r
-             &gPs2MouseSimulateTouchPadComponentName2\r
+             &gPs2MouseAbsolutePointerComponentName,\r
+             &gPs2MouseAbsolutePointerComponentName2\r
              );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -1,5 +1,5 @@
 /**@file\r
-  A faked PS/2 Touchpad driver header file\r
+  A Ps2MouseAbsolutePointer 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 _PS2MOUSESIMULATETOUCHPAD_H\r
-#define _PS2MOUSESIMULATETOUCHPAD_H\r
+#ifndef _PS2MOUSEABSOLUTEPOINTER_H\r
+#define _PS2MOUSEABSOLUTEPOINTER_H\r
 \r
 #include <PiDxe.h>\r
 #include <Framework/StatusCode.h>\r
@@ -66,7 +66,7 @@ typedef enum {
 //\r
 // Driver Private Data\r
 //\r
-#define PS2_MOUSE_SIMULATE_TOUCHPAD_DEV_SIGNATURE EFI_SIGNATURE_32 ('p', '2', 's', 't')\r
+#define PS2_MOUSE_ABSOLUTE_POINTER_DEV_SIGNATURE EFI_SIGNATURE_32 ('p', '2', 's', 't')\r
 \r
 typedef struct {\r
   UINTN                               Signature;\r
@@ -91,23 +91,23 @@ typedef struct {
 \r
   EFI_UNICODE_STRING_TABLE            *ControllerNameTable;\r
   EFI_DEVICE_PATH_PROTOCOL            *DevicePath;\r
-} PS2_MOUSE_SIMULATE_TOUCHPAD_DEV;\r
+} PS2_MOUSE_ABSOLUTE_POINTER_DEV;\r
 \r
-#define PS2_MOUSE_SIMULATE_TOUCHPAD_DEV_FROM_THIS(a)  CR (a, PS2_MOUSE_SIMULATE_TOUCHPAD_DEV, AbsolutePointerProtocol, PS2_MOUSE_SIMULATE_TOUCHPAD_DEV_SIGNATURE)\r
+#define PS2_MOUSE_ABSOLUTE_POINTER_DEV_FROM_THIS(a)  CR (a, PS2_MOUSE_ABSOLUTE_POINTER_DEV, AbsolutePointerProtocol, PS2_MOUSE_ABSOLUTE_POINTER_DEV_SIGNATURE)\r
 \r
 //\r
 // Global Variables\r
 //\r
-extern EFI_DRIVER_BINDING_PROTOCOL   gPS2MouseSimulateTouchPadDriver;\r
-extern EFI_COMPONENT_NAME_PROTOCOL   gPs2MouseSimulateTouchPadComponentName;\r
-extern EFI_COMPONENT_NAME2_PROTOCOL  gPs2MouseSimulateTouchPadComponentName2;\r
+extern EFI_DRIVER_BINDING_PROTOCOL   gPS2MouseAbsolutePointerDriver;\r
+extern EFI_COMPONENT_NAME_PROTOCOL   gPs2MouseAbsolutePointerComponentName;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL  gPs2MouseAbsolutePointerComponentName2;\r
 \r
 //\r
 // Function prototypes\r
 //\r
 EFI_STATUS\r
 EFIAPI\r
-PS2MouseSimulateTouchPadDriverSupported (\r
+PS2MouseAbsolutePointerDriverSupported (\r
   IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
   IN EFI_HANDLE                     Controller,\r
   IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
@@ -115,7 +115,7 @@ PS2MouseSimulateTouchPadDriverSupported (
 \r
 EFI_STATUS\r
 EFIAPI\r
-PS2MouseSimulateTouchPadDriverStart (\r
+PS2MouseAbsolutePointerDriverStart (\r
   IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
   IN EFI_HANDLE                     Controller,\r
   IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
@@ -123,7 +123,7 @@ PS2MouseSimulateTouchPadDriverStart (
 \r
 EFI_STATUS\r
 EFIAPI\r
-PS2MouseSimulateTouchPadDriverStop (\r
+PS2MouseAbsolutePointerDriverStop (\r
   IN EFI_DRIVER_BINDING_PROTOCOL   *This,\r
   IN EFI_HANDLE                    Controller,\r
   IN UINTN                         NumberOfChildren,\r
@@ -174,7 +174,7 @@ PS2MouseSimulateTouchPadDriverStop (
 **/\r
 EFI_STATUS\r
 EFIAPI\r
-Ps2MouseSimulateTouchPadComponentNameGetDriverName (\r
+Ps2MouseAbsolutePointerComponentNameGetDriverName (\r
   IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
   IN  CHAR8                        *Language,\r
   OUT CHAR16                       **DriverName\r
@@ -251,7 +251,7 @@ Ps2MouseSimulateTouchPadComponentNameGetDriverName (
 **/\r
 EFI_STATUS\r
 EFIAPI\r
-Ps2MouseSimulateTouchPadComponentNameGetControllerName (\r
+Ps2MouseAbsolutePointerComponentNameGetControllerName (\r
   IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
   IN  EFI_HANDLE                                      ControllerHandle,\r
   IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
@@ -262,28 +262,28 @@ Ps2MouseSimulateTouchPadComponentNameGetControllerName (
 \r
 EFI_STATUS\r
 EFIAPI\r
-MouseSimulateTouchPadReset (\r
+MouseAbsolutePointerReset (\r
   IN EFI_ABSOLUTE_POINTER_PROTOCOL  *This,\r
   IN BOOLEAN                        ExtendedVerification\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
-MouseSimulateTouchPadGetState (\r
+MouseAbsolutePointerGetState (\r
   IN EFI_ABSOLUTE_POINTER_PROTOCOL  *This,\r
   IN OUT EFI_ABSOLUTE_POINTER_STATE   *State\r
   );\r
 \r
 VOID\r
 EFIAPI\r
-MouseSimulateTouchPadWaitForInput (\r
+MouseAbsolutePointerWaitForInput (\r
   IN  EFI_EVENT               Event,\r
   IN  VOID                    *Context\r
   );\r
 \r
 VOID\r
 EFIAPI\r
-PollMouseSimulateTouchPad (\r
+PollMouseAbsolutePointer (\r
   IN EFI_EVENT  Event,\r
   IN VOID       *Context\r
   );\r
@@ -294,8 +294,8 @@ In8042Data (
   IN OUT UINT8                            *Data\r
   );\r
 BOOLEAN\r
-CheckMouseSimulateTouchPadConnect (\r
-  IN  PS2_MOUSE_SIMULATE_TOUCHPAD_DEV     *MouseDev\r
+CheckMouseAbsolutePointerConnect (\r
+  IN  PS2_MOUSE_ABSOLUTE_POINTER_DEV     *MouseAbsolutePointerDev\r
   );\r
 \r
 #endif\r
 \r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
-  BASE_NAME                      = Ps2MouseSimulateTouchPadDxe\r
+  BASE_NAME                      = Ps2MouseAbsolutePointerDxe\r
   FILE_GUID                      = 2899C94A-1FB6-4b1a-B96B-8364975303E0\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r
 \r
-  ENTRY_POINT                    = InitializePs2MouseSimulateTouchPad\r
+  ENTRY_POINT                    = InitializePs2MouseAbsolutePointer\r
 \r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 \r
@@ -33,8 +33,8 @@
   ComponentName.c\r
   CommPs2.h\r
   CommPs2.c\r
-  Ps2MouseSimulateTouchPad.h\r
-  Ps2MouseSimulateTouchPad.c\r
+  Ps2MouseAbsolutePointer.h\r
+  Ps2MouseAbsolutePointer.c\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
   <MsaHeader>\r
-    <ModuleName>Ps2MouseSimulateTouchPad</ModuleName>\r
+    <ModuleName>Ps2MouseAbsolutePointer</ModuleName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r
     <GuidValue>2899C94A-1FB6-4b1a-B96B-8364975303E0</GuidValue>\r
     <Version>1.0</Version>\r
-    <Abstract>Ps2 Mouse Simulate Touchpad Driver</Abstract>\r
+    <Abstract>Ps2 Mouse Absolute Pointer Driver</Abstract>\r
     <Description>This dirver directly uses IsaIo protocol service to support a faked Ps2 touchpad work.</Description>\r
     <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>\r
     <License>All rights reserved. This program and the accompanying materials\r
@@ -19,7 +19,7 @@
   <ModuleDefinitions>\r
     <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
-    <OutputFileBasename>Ps2MouseSimulateTouchPad</OutputFileBasename>\r
+    <OutputFileBasename>Ps2MouseAbsolutePointer</OutputFileBasename>\r
   </ModuleDefinitions>\r
   <LibraryClassDefinitions>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
@@ -48,8 +48,8 @@
     </LibraryClass>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
-    <Filename>Ps2MouseSimulateTouchPad.c</Filename>\r
-    <Filename>Ps2MouseSimulateTouchPad.h</Filename>\r
+    <Filename>Ps2MouseAbsolutePointer.c</Filename>\r
+    <Filename>Ps2MouseAbsolutePointer.h</Filename>\r
     <Filename>CommPs2.c</Filename>\r
     <Filename>CommPs2.h</Filename>\r
     <Filename>ComponentName.c</Filename>\r
@@ -91,8 +91,8 @@
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
     <Extern>\r
-      <DriverBinding>gPS2MouseSimulateTouchPadDriver</DriverBinding>\r
-      <ComponentName>gPs2MouseSimulateTouchPadComponentName</ComponentName>\r
+      <DriverBinding>gPS2MouseAbsolutePointerDriver</DriverBinding>\r
+      <ComponentName>gPs2MouseAbsolutePointerComponentName</ComponentName>\r
     </Extern>\r
   </Externs>\r
 </ModuleSurfaceArea>
\ No newline at end of file