1. Sync Tcp4 protocol definitions to match UEFI 2.1

[mirror_edk2.git] / MdeModulePkg / Bus / Usb / UsbMouseDxe / usbmouse.c

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/usbmouse.c b/MdeModulePkg/Bus/Usb/UsbMouseDxe/usbmouse.c
index a4c9e776602953c9bd1194e9dd4c06d35e964b15..4d9aed937d1155edf70eb86030a94d540de07910 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/usbmouse.c
+++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/usbmouse.c
@@ -24,19 +24,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <IndustryStandard/Usb.h>\r
 \r
 \r
-//\r
-// Driver Consumed Protocol Prototypes\r
-//\r
-//@MT:#include EFI_PROTOCOL_DEFINITION (DriverBinding)\r
-//@MT:#include EFI_PROTOCOL_DEFINITION (UsbIo)\r
-\r
-//\r
-// Driver Produced Protocol Prototypes\r
-//\r
-//@MT:#include EFI_PROTOCOL_DEFINITION (SimplePointer)\r
-\r
-//@MT:#include "UsbDxeLib.h"\r
-//@MT:#include "hid.h"\r
 #include "usbmouse.h"\r
 #include "mousehid.h"\r
 \r
@@ -77,7 +64,7 @@ USBMouseDriverBindingStop (
   );\r
 \r
 EFI_GUID  gEfiUsbMouseDriverGuid = {\r
-  0x290156b5, 0x6a05, 0x4ac0, 0xb8, 0x0, 0x51, 0x27, 0x55, 0xad, 0x14, 0x29\r
+  0x290156b5, 0x6a05, 0x4ac0, {0xb8, 0x0, 0x51, 0x27, 0x55, 0xad, 0x14, 0x29}\r
 };\r
 \r
 EFI_DRIVER_BINDING_PROTOCOL gUsbMouseDriverBinding = {\r
@@ -147,8 +134,6 @@ UsbMouseReset (
 //\r
 // Driver start here\r
 //\r
-//@MT: EFI_DRIVER_ENTRY_POINT (USBMouseDriverBindingEntryPoint)\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 USBMouseDriverBindingEntryPoint (\r
@@ -208,7 +193,7 @@ USBMouseDriverBindingSupported (
   OpenStatus = gBS->OpenProtocol (\r
                       Controller,\r
                       &gEfiUsbIoProtocolGuid,\r
-                      &UsbIo,\r
+                      (VOID **) &UsbIo,\r
                       This->DriverBindingHandle,\r
                       Controller,\r
                       EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -279,7 +264,7 @@ USBMouseDriverBindingStart (
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiUsbIoProtocolGuid,\r
-                  &UsbIo,\r
+                  (VOID **) &UsbIo,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -513,7 +498,7 @@ USBMouseDriverBindingStop (
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiSimplePointerProtocolGuid,\r
-                  &SimplePointerProtocol,\r
+                  (VOID **) &SimplePointerProtocol,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -944,12 +929,9 @@ UsbMouseReset (
   )\r
 {\r
   USB_MOUSE_DEV       *UsbMouseDevice;\r
-  EFI_USB_IO_PROTOCOL *UsbIo;\r
 \r
   UsbMouseDevice  = USB_MOUSE_DEV_FROM_MOUSE_PROTOCOL (This);\r
 \r
-  UsbIo           = UsbMouseDevice->UsbIo;\r
-\r
   MouseReportStatusCode (\r
     UsbMouseDevice->DevicePath,\r
     EFI_PROGRESS_CODE,\r