From c92e277d99335fa827994e410a3dc0830904a264 Mon Sep 17 00:00:00 2001
From: xli24 <xli24@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 13 Jan 2009 08:46:31 +0000
Subject: Minor refinement for USB modules.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7257 6f19259b-4bc3-4df7-8a09-765794883524
---
 MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c |   2 -
 MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h | 110 ++++++++++++++--------------
 2 files changed, 57 insertions(+), 55 deletions(-)

(limited to 'MdeModulePkg/Bus/Usb/UsbMouseDxe')

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c
index f13d26527e..e8b53f6c9f 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c
+++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c
@@ -854,7 +854,6 @@ UsbMouseReset (
   return EFI_SUCCESS;
 }
 
-
 /**
   Event notification function for SIMPLE_POINTER.WaitForInput event.
 
@@ -881,7 +880,6 @@ UsbMouseWaitForInput (
   }
 }
 
-
 /**
   Handler for Delayed Recovery event.
 
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h
index 7c0ff785a2..d13ae69fc3 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h
+++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h
@@ -291,6 +291,63 @@ UsbMouseComponentNameGetControllerName (
   OUT CHAR16                                          **ControllerName
   );
 
+//
+// Functions of EFI_SIMPLE_POINTER_PROTOCOL
+//
+
+/**
+  Retrieves the current state of a pointer device.
+    
+  @param  This                  A pointer to the EFI_SIMPLE_POINTER_PROTOCOL instance.                                   
+  @param  MouseState            A pointer to the state information on the pointer device.
+                                
+  @retval EFI_SUCCESS           The state of the pointer device was returned in State.
+  @retval EFI_NOT_READY         The state of the pointer device has not changed since the last call to
+                                GetState().                                                           
+  @retval EFI_DEVICE_ERROR      A device error occurred while attempting to retrieve the pointer device's
+                                current state.                                                           
+  @retval EFI_INVALID_PARAMETER MouseState is NULL.                                                           
+
+**/
+EFI_STATUS
+EFIAPI
+GetMouseState (
+  IN   EFI_SIMPLE_POINTER_PROTOCOL  *This,
+  OUT  EFI_SIMPLE_POINTER_STATE     *MouseState
+  );
+
+/**                                                                 
+  Resets the pointer device hardware.
+  
+  @param  This                  A pointer to the EFI_SIMPLE_POINTER_PROTOCOL instance.
+  @param  ExtendedVerification  Indicates that the driver may perform a more exhaustive
+                                verification operation of the device during reset.
+                                
+  @retval EFI_SUCCESS           The device was reset.
+  @retval EFI_DEVICE_ERROR      The device is not functioning correctly and could not be reset.
+
+**/
+EFI_STATUS
+EFIAPI
+UsbMouseReset (
+  IN EFI_SIMPLE_POINTER_PROTOCOL    *This,
+  IN BOOLEAN                        ExtendedVerification
+  );
+
+/**
+  Event notification function for SIMPLE_POINTER.WaitForInput event.
+
+  @param  Event        Event to be signaled when there's input from mouse.
+  @param  Context      Points to USB_MOUSE_DEV instance.
+ 
+**/
+VOID
+EFIAPI
+UsbMouseWaitForInput (
+  IN  EFI_EVENT               Event,
+  IN  VOID                    *Context
+  );
+
 //
 // Internal worker functions
 //
@@ -355,59 +412,6 @@ OnMouseInterruptComplete (
   IN  UINT32      Result
   );
 
-/**
-  Retrieves the current state of a pointer device.
-    
-  @param  This                  A pointer to the EFI_SIMPLE_POINTER_PROTOCOL instance.                                   
-  @param  MouseState            A pointer to the state information on the pointer device.
-                                
-  @retval EFI_SUCCESS           The state of the pointer device was returned in State.
-  @retval EFI_NOT_READY         The state of the pointer device has not changed since the last call to
-                                GetState().                                                           
-  @retval EFI_DEVICE_ERROR      A device error occurred while attempting to retrieve the pointer device's
-                                current state.                                                           
-  @retval EFI_INVALID_PARAMETER MouseState is NULL.                                                           
-
-**/
-EFI_STATUS
-EFIAPI
-GetMouseState (
-  IN   EFI_SIMPLE_POINTER_PROTOCOL  *This,
-  OUT  EFI_SIMPLE_POINTER_STATE     *MouseState
-  );
-
-/**                                                                 
-  Resets the pointer device hardware.
-  
-  @param  This                  A pointer to the EFI_SIMPLE_POINTER_PROTOCOL instance.
-  @param  ExtendedVerification  Indicates that the driver may perform a more exhaustive
-                                verification operation of the device during reset.
-                                
-  @retval EFI_SUCCESS           The device was reset.
-  @retval EFI_DEVICE_ERROR      The device is not functioning correctly and could not be reset.
-
-**/
-EFI_STATUS
-EFIAPI
-UsbMouseReset (
-  IN EFI_SIMPLE_POINTER_PROTOCOL    *This,
-  IN BOOLEAN                        ExtendedVerification
-  );
-
-/**
-  Event notification function for SIMPLE_POINTER.WaitForInput event.
-
-  @param  Event        Event to be signaled when there's input from mouse.
-  @param  Context      Points to USB_MOUSE_DEV instance.
- 
-**/
-VOID
-EFIAPI
-UsbMouseWaitForInput (
-  IN  EFI_EVENT               Event,
-  IN  VOID                    *Context
-  );
-
 /**
   Handler for Delayed Recovery event.
 
-- 
cgit v1.2.3