1. Sync Tcp4 protocol definitions to match UEFI 2.1

[mirror_edk2.git] / MdeModulePkg / Bus / Pci / UhciDxe / Uhci.c

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c
index 1c3e37a7bc377b643c137d08e7ece8411f64d065..28d9b63d9d242cfbedd2155c7da7f3d403d1334e 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c
@@ -1538,7 +1538,7 @@ Uhci2ControlTransfer (
   BOOLEAN             IsSlow;\r
 \r
   Uhc     = UHC_FROM_USB2_HC_PROTO (This);\r
-  IsSlow  = (EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE;\r
+  IsSlow  = (BOOLEAN) ((EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE);\r
 \r
   return UhciControlTransfer (\r
            &Uhc->UsbHc,\r
@@ -1668,7 +1668,7 @@ Uhci2AsyncInterruptTransfer (
   BOOLEAN             IsSlow;\r
 \r
   Uhc     = UHC_FROM_USB2_HC_PROTO (This);\r
-  IsSlow  = (EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE;\r
+  IsSlow  = (BOOLEAN) ((EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE);\r
 \r
   return UhciAsyncInterruptTransfer (\r
            &Uhc->UsbHc,\r
@@ -1736,7 +1736,7 @@ Uhci2SyncInterruptTransfer (
   }\r
 \r
   Uhc     = UHC_FROM_USB2_HC_PROTO (This);\r
-  IsSlow  = (EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE;\r
+  IsSlow  = (BOOLEAN) ((EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE);\r
 \r
   return UhciSyncInterruptTransfer (\r
            &Uhc->UsbHc,\r
@@ -1828,8 +1828,6 @@ Uhci2AsyncIsochronousTransfer (
   return EFI_UNSUPPORTED;\r
 }\r
 \r
-//@MT: EFI_DRIVER_ENTRY_POINT (UhciDriverEntryPoint)\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 UhciDriverEntryPoint (\r
@@ -1897,7 +1895,7 @@ UhciDriverBindingSupported (
   OpenStatus = gBS->OpenProtocol (\r
                       Controller,\r
                       &gEfiPciIoProtocolGuid,\r
-                      &PciIo,\r
+                      (VOID **) &PciIo,\r
                       This->DriverBindingHandle,\r
                       Controller,\r
                       EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -2148,7 +2146,7 @@ UhciDriverBindingStart (
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiPciIoProtocolGuid,\r
-                  &PciIo,\r
+                  (VOID **) &PciIo,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -2277,7 +2275,7 @@ UhciDriverBindingStop (
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiUsbHcProtocolGuid,\r
-                  &UsbHc,\r
+                  (VOID **) &UsbHc,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -2294,7 +2292,7 @@ UhciDriverBindingStop (
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiUsb2HcProtocolGuid,\r
-                  &Usb2Hc,\r
+                  (VOID **) &Usb2Hc,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r