change "Ps2MouseSimulateTouchPad" to "Ps2MouseAbsolutePointer" for more clearing...

[mirror_edk2.git] / IntelFrameworkModulePkg / Bus / Isa / Ps2MouseSimulateTouchPadDxe / CommPs2.c

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseSimulateTouchPadDxe/CommPs2.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseSimulateTouchPadDxe/CommPs2.c
index 719a650cb672264bacb6a79528a207a7eced1da8..895c1c25a582d01c042c51a7091cc2d35db238d7 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseSimulateTouchPadDxe/CommPs2.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseSimulateTouchPadDxe/CommPs2.c
@@ -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