Update to support to produce Component Name and & Component Name 2 protocol based...

[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..1dee9765041119288536ab6cf77026c02386bdea 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
@@ -1854,14 +1852,13 @@ UhciDriverEntryPoint (
 \r
 --*/\r
 {\r
-  return EfiLibInstallAllDriverProtocols (\r
+  return EfiLibInstallDriverBindingComponentName2 (\r
            ImageHandle,\r
            SystemTable,\r
            &gUhciDriverBinding,\r
            ImageHandle,\r
            &gUhciComponentName,\r
-           NULL,\r
-           NULL\r
+           &gUhciComponentName2\r
            );\r
 }\r
 \r
@@ -1897,7 +1894,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 +2145,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
@@ -2219,13 +2216,22 @@ UhciDriverBindingStart (
   //\r
   Uhc->CtrlNameTable = NULL;\r
 \r
-  AddUnicodeString (\r
+  AddUnicodeString2 (\r
     "eng",\r
     gUhciComponentName.SupportedLanguages,\r
     &Uhc->CtrlNameTable,\r
-    L"Usb Universal Host Controller"\r
+    L"Usb Universal Host Controller",\r
+    TRUE\r
+    );\r
+  AddUnicodeString2 (\r
+    "en",\r
+    gUhciComponentName2.SupportedLanguages,\r
+    &Uhc->CtrlNameTable,\r
+    L"Usb Universal Host Controller",\r
+    FALSE\r
     );\r
 \r
+\r
   //\r
   // Start the UHCI hardware, also set its reclamation point to 64 bytes\r
   //\r
@@ -2277,7 +2283,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 +2300,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