X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=EdkModulePkg%2FBus%2FUsb%2FUsbCbi%2FDxe%2FCbi1%2Fcbi1.c;h=d98d022a54e8c1a72f8cbdfae83f500fc223ac24;hp=dd1c927daec0ab244baca2cf0ad84a967c969fb5;hb=92dda53e9fe6568c9204ffd97f146710bdde3369;hpb=71a62114eb16255adaf886be35edecf0045bb494

diff --git a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/cbi1.c b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/cbi1.c
index dd1c927dae..d98d022a54 100644
--- a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/cbi1.c
+++ b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/cbi1.c
@@ -20,13 +20,6 @@ Abstract:
 
 #include "cbi.h"
 
-EFI_STATUS
-EFIAPI
-UsbCBI1DriverEntryPoint (
-  IN EFI_HANDLE           ImageHandle,
-  IN EFI_SYSTEM_TABLE     *SystemTable
-  );
-
 //
 // CBI Function prototypes
 //
@@ -105,6 +98,7 @@ CBI1DriverBindingStop (
   IN  EFI_HANDLE                     *ChildHandleBuffer
   );
 
+STATIC
 VOID
 Cbi1ReportStatusCode (
   IN EFI_DEVICE_PATH_PROTOCOL  *DevicePath,
@@ -113,11 +107,11 @@ Cbi1ReportStatusCode (
   );
 
 
-EFI_DRIVER_BINDING_PROTOCOL   gCBI1DriverBinding = {
+EFI_DRIVER_BINDING_PROTOCOL   gUsbCbi1DriverBinding = {
   CBI1DriverBindingSupported,
   CBI1DriverBindingStart,
   CBI1DriverBindingStop,
-  0x10,
+  0xa,
   NULL,
   NULL
 };
@@ -352,6 +346,14 @@ CBI1DriverBindingStart (
     goto ErrorExit;
   }
 
+  UsbCbiDev->ControllerNameTable = NULL;
+  AddUnicodeString (
+    "eng",
+    gUsbCbi1ComponentName.SupportedLanguages,
+    &UsbCbiDev->ControllerNameTable,
+    (CHAR16 *) L"Usb Cbi1 Mass Storage"
+    );
+
   return EFI_SUCCESS;
 
 ErrorExit:
@@ -400,7 +402,6 @@ CBI1DriverBindingStop (
   EFI_STATUS              Status;
   EFI_USB_ATAPI_PROTOCOL  *CBI1AtapiProtocol;
   USB_CBI_DEVICE          *UsbCbiDev;
-  EFI_USB_IO_PROTOCOL     *UsbIo;
 
   //
   // Get our context back.
@@ -419,8 +420,6 @@ CBI1DriverBindingStop (
 
   UsbCbiDev = USB_CBI_DEVICE_FROM_THIS (CBI1AtapiProtocol);
 
-  UsbIo     = UsbCbiDev->UsbIo;
-
   Cbi1ReportStatusCode (
     UsbCbiDev->DevicePath,
     EFI_PROGRESS_CODE,
@@ -644,7 +643,6 @@ CBI1MassStorageReset (
 --*/
 {
   UINT8               ResetCommand[12];
-  EFI_STATUS          Status;
   EFI_USB_IO_PROTOCOL *UsbIo;
   USB_CBI_DEVICE      *UsbCbiDev;
   UINT8               EndpointAddr;
@@ -669,12 +667,12 @@ CBI1MassStorageReset (
   ResetCommand[0] = 0x1d;
   ResetCommand[1] = 0x04;
 
-  Status = CBI1CommandPhase (
-            UsbCbiDev,
-            ResetCommand,
-            12,
-            &Result
-            );
+  CBI1CommandPhase (
+    UsbCbiDev,
+    ResetCommand,
+    12,
+    &Result
+    );
 
   //
   // clear bulk in endpoint stall feature
@@ -821,6 +819,7 @@ CBI1AtapiCommand (
   return EFI_DEVICE_ERROR;
 }
 
+STATIC
 VOID
 Cbi1ReportStatusCode (
   IN EFI_DEVICE_PATH_PROTOCOL  *DevicePath,