Make EdkModulePkg pass Intel IPF compiler with /W4 /WX switches, solving warning...

[mirror_edk2.git] / EdkModulePkg / Bus / Usb / UsbCbi / Dxe / Cbi1 / cbi1.c

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