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 008627b9ddd5ae2034b143501bc5877430fb59a8..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,7 +107,7 @@ Cbi1ReportStatusCode (
   );\r
 \r
 \r
-EFI_DRIVER_BINDING_PROTOCOL   gCBI1DriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL   gUsbCbi1DriverBinding = {\r
   CBI1DriverBindingSupported,\r
   CBI1DriverBindingStart,\r
   CBI1DriverBindingStop,\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
@@ -817,6 +819,7 @@ CBI1AtapiCommand (
   return EFI_DEVICE_ERROR;\r
 }\r
 \r
+STATIC\r
 VOID\r
 Cbi1ReportStatusCode (\r
   IN EFI_DEVICE_PATH_PROTOCOL  *DevicePath,\r