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

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2338 6f19259b-4bc3-4df7-8a09-765794883524

22 files changed, 309 insertions, 350 deletions

diff --git a/EdkModulePkg/Bus/Usb/UsbBot/Dxe/ComponentName.c b/EdkModulePkg/Bus/Usb/UsbBot/Dxe/ComponentName.c
index ca4228583a..1b3d5abfa1 100644
--- a/EdkModulePkg/Bus/Usb/UsbBot/Dxe/ComponentName.c
+++ b/EdkModulePkg/Bus/Usb/UsbBot/Dxe/ComponentName.c
@@ -20,27 +20,6 @@ Abstract:
 #include "bot.h"

 

 //

-// EFI Component Name Functions

-//

-EFI_STATUS

-EFIAPI

-UsbBotComponentNameGetDriverName (

-  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,

-  IN  CHAR8                        *Language,

-  OUT CHAR16                       **DriverName

-  );

-

-EFI_STATUS

-EFIAPI

-UsbBotComponentNameGetControllerName (

-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,

-  IN  EFI_HANDLE                                      ControllerHandle,

-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,

-  IN  CHAR8                                           *Language,

-  OUT CHAR16                                          **ControllerName

-  );

-

-//

 // EFI Component Name Protocol

 //

 EFI_COMPONENT_NAME_PROTOCOL     gUsbBotComponentName = {

diff --git a/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.c b/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.c
index fd830ec56e..e6a5be480b 100644
--- a/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.c
+++ b/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.c
@@ -21,44 +21,6 @@ Abstract:
 

 GLOBAL_REMOVE_IF_UNREFERENCED UINT32     gBOTDebugLevel  = EFI_D_INFO;

 GLOBAL_REMOVE_IF_UNREFERENCED UINT32     gBOTErrorLevel  = EFI_D_INFO;

-//

-// Function prototypes

-//

-EFI_STATUS

-EFIAPI

-UsbBotDriverEntryPoint (

-  IN EFI_HANDLE           ImageHandle,

-  IN EFI_SYSTEM_TABLE     *SystemTable

-  );

-

-//

-// Bot Driver Binding Protocol

-//

-EFI_STATUS

-EFIAPI

-BotDriverBindingSupported (

-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,

-  IN EFI_HANDLE                     ControllerHandle,

-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath

-  );

-

-EFI_STATUS

-EFIAPI

-BotDriverBindingStart (

-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,

-  IN EFI_HANDLE                     ControllerHandle,

-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath

-  );

-

-EFI_STATUS

-EFIAPI

-BotDriverBindingStop (

-  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,

-  IN  EFI_HANDLE                     ControllerHandle,

-  IN  UINTN                          NumberOfChildren,

-  IN  EFI_HANDLE                     *ChildHandleBuffer

-  );

-

 

 EFI_DRIVER_BINDING_PROTOCOL   gUsbBotDriverBinding = {

   BotDriverBindingSupported,

@@ -124,6 +86,7 @@ BotMassStorageReset (
   IN  BOOLEAN                   ExtendedVerification

   );

 

+STATIC

 VOID

 BotReportStatusCode (

   IN EFI_DEVICE_PATH_PROTOCOL  *DevicePath,

@@ -979,6 +942,7 @@ BotMassStorageReset (
   return Status;

 }

 

+STATIC

 VOID

 BotReportStatusCode (

   IN EFI_DEVICE_PATH_PROTOCOL  *DevicePath,

diff --git a/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.h b/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.h
index 383cfde48e..6e43a1b940 100644
--- a/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.h
+++ b/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.h
@@ -78,4 +78,53 @@ extern EFI_DRIVER_BINDING_PROTOCOL  gUsbBotDriverBinding;
 extern EFI_COMPONENT_NAME_PROTOCOL  gUsbBotComponentName;

 extern EFI_GUID                     gUsbBotDriverGuid;

 

+//

+// Bot Driver Binding Protocol

+//

+EFI_STATUS

+EFIAPI

+BotDriverBindingSupported (

+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,

+  IN EFI_HANDLE                     ControllerHandle,

+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath

+  );

+

+EFI_STATUS

+EFIAPI

+BotDriverBindingStart (

+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,

+  IN EFI_HANDLE                     ControllerHandle,

+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath

+  );

+

+EFI_STATUS

+EFIAPI

+BotDriverBindingStop (

+  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,

+  IN  EFI_HANDLE                     ControllerHandle,

+  IN  UINTN                          NumberOfChildren,

+  IN  EFI_HANDLE                     *ChildHandleBuffer

+  );

+

+//

+// EFI Component Name Functions

+//

+EFI_STATUS

+EFIAPI

+UsbBotComponentNameGetDriverName (

+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,

+  IN  CHAR8                        *Language,

+  OUT CHAR16                       **DriverName

+  );

+

+EFI_STATUS

+EFIAPI

+UsbBotComponentNameGetControllerName (

+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,

+  IN  EFI_HANDLE                                      ControllerHandle,

+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,

+  IN  CHAR8                                           *Language,

+  OUT CHAR16                                          **ControllerName

+  );

+

 #endif

diff --git a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/ComponentName.c b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/ComponentName.c
index 8ecbbb0995..1233eaccec 100644
--- a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/ComponentName.c
+++ b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/ComponentName.c
@@ -20,27 +20,6 @@ Abstract:
 #include "usbbus.h"

 

 //

-// EFI Component Name Functions

-//

-EFI_STATUS

-EFIAPI

-UsbBusComponentNameGetDriverName (

-  IN  EFI_COMPONENT_NAME_PROTOCOL     *This,

-  IN  CHAR8                           *Language,

-  OUT CHAR16                          **DriverName

-  );

-

-EFI_STATUS

-EFIAPI

-UsbBusComponentNameGetControllerName (

-  IN  EFI_COMPONENT_NAME_PROTOCOL     *This,

-  IN  EFI_HANDLE                      ControllerHandle,

-  IN  EFI_HANDLE                      ChildHandle, OPTIONAL

-  IN  CHAR8                           *Language,

-  OUT CHAR16                          **ControllerName

-  );

-

-//

 // EFI Component Name Protocol

 //

 EFI_COMPONENT_NAME_PROTOCOL     gUsbBusComponentName = {

diff --git a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.c b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.c
index ffca53595e..e1fdce7997 100644
--- a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.c
+++ b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.c
@@ -34,36 +34,6 @@ GLOBAL_REMOVE_IF_UNREFERENCED    UINTN    gUSBErrorLevel  = EFI_D_ERROR;
 //

 STATIC EFI_GUID             mUsbBusProtocolGuid = EFI_USB_BUS_PROTOCOL_GUID;

 

-

-

-//

-// EFI_DRIVER_BINDING_PROTOCOL Protocol Interface

-//

-EFI_STATUS

-EFIAPI

-UsbBusControllerDriverSupported (

-  IN EFI_DRIVER_BINDING_PROTOCOL     *This,

-  IN EFI_HANDLE                      Controller,

-  IN EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath

-  );

-

-EFI_STATUS

-EFIAPI

-UsbBusControllerDriverStart (

-  IN EFI_DRIVER_BINDING_PROTOCOL     *This,

-  IN EFI_HANDLE                      Controller,

-  IN EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath

-  );

-

-EFI_STATUS

-EFIAPI

-UsbBusControllerDriverStop (

-  IN EFI_DRIVER_BINDING_PROTOCOL     *This,

-  IN EFI_HANDLE                      Controller,

-  IN UINTN                           NumberOfChildren,

-  IN EFI_HANDLE                      *ChildHandleBuffer

-  );

-

 EFI_DRIVER_BINDING_PROTOCOL gUsbBusDriverBinding = {

   UsbBusControllerDriverSupported,

   UsbBusControllerDriverStart,

@@ -154,6 +124,7 @@ ReleasePortToCHC (
   UINT8                     PortNum

   );

 

+STATIC

 EFI_STATUS

 ResetRootPort (

   IN USB_BUS_CONTROLLER_DEVICE *UsbBusDev,

@@ -161,6 +132,7 @@ ResetRootPort (
   IN UINT8                     RetryTimes

   );

 

+STATIC

 EFI_STATUS

 ResetHubPort (

   IN USB_IO_CONTROLLER_DEVICE    *UsbIoController,

@@ -2341,6 +2313,7 @@ UsbPortReset (
   return ParentPortReset (UsbIoController, TRUE, 0);

 }

 

+STATIC

 EFI_STATUS

 ResetRootPort (

   IN USB_BUS_CONTROLLER_DEVICE *UsbBusDev,

@@ -2433,6 +2406,7 @@ ResetRootPort (
   return EFI_SUCCESS;

 }

 

+STATIC

 EFI_STATUS

 ResetHubPort (

   IN USB_IO_CONTROLLER_DEVICE    *UsbIoController,

diff --git a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.h b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.h
index 4977d71695..ce0e698013 100644
--- a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.h
+++ b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.h
@@ -176,6 +176,55 @@ extern EFI_COMPONENT_NAME_PROTOCOL  gUsbBusComponentName;
 extern EFI_GUID                     gUSBBusDriverGuid;

 

 //

+// EFI_DRIVER_BINDING_PROTOCOL Protocol Interface

+//

+EFI_STATUS

+EFIAPI

+UsbBusControllerDriverSupported (

+  IN EFI_DRIVER_BINDING_PROTOCOL     *This,

+  IN EFI_HANDLE                      Controller,

+  IN EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath

+  );

+

+EFI_STATUS

+EFIAPI

+UsbBusControllerDriverStart (

+  IN EFI_DRIVER_BINDING_PROTOCOL     *This,

+  IN EFI_HANDLE                      Controller,

+  IN EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath

+  );

+

+EFI_STATUS

+EFIAPI

+UsbBusControllerDriverStop (

+  IN EFI_DRIVER_BINDING_PROTOCOL     *This,

+  IN EFI_HANDLE                      Controller,

+  IN UINTN                           NumberOfChildren,

+  IN EFI_HANDLE                      *ChildHandleBuffer

+  );

+

+//

+// EFI Component Name Functions

+//

+EFI_STATUS

+EFIAPI

+UsbBusComponentNameGetDriverName (

+  IN  EFI_COMPONENT_NAME_PROTOCOL     *This,

+  IN  CHAR8                           *Language,

+  OUT CHAR16                          **DriverName

+  );

+

+EFI_STATUS

+EFIAPI

+UsbBusComponentNameGetControllerName (

+  IN  EFI_COMPONENT_NAME_PROTOCOL     *This,

+  IN  EFI_HANDLE                      ControllerHandle,

+  IN  EFI_HANDLE                      ChildHandle, OPTIONAL

+  IN  CHAR8                           *Language,

+  OUT CHAR16                          **ControllerName

+  );

+

+//

 // Usb Device Configuration functions

 //

 BOOLEAN

diff --git a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/Cbi0.c b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/Cbi0.c
index 91a447de66..73b89406bd 100644
--- a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/Cbi0.c
+++ b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/Cbi0.c
@@ -19,17 +19,6 @@ Abstract:
 

 #include "cbi.h"

 

-extern EFI_COMPONENT_NAME_PROTOCOL  gUsbCbi0ComponentName;

-//

-// Function prototypes

-//

-EFI_STATUS

-EFIAPI

-UsbCbi0DriverEntryPoint (

-  IN EFI_HANDLE           ImageHandle,

-  IN EFI_SYSTEM_TABLE     *SystemTable

-  );

-

 //

 // Bot Driver Binding Protocol

 //

@@ -61,6 +50,7 @@ Cbi0DriverBindingStop (
   IN  EFI_HANDLE                     *ChildHandleBuffer

   );

 

+STATIC

 VOID

 Cbi0ReportStatusCode (

   IN EFI_DEVICE_PATH_PROTOCOL  *DevicePath,

@@ -1004,6 +994,7 @@ Cbi0AtapiCommand (
   return Status;

 }

 

+STATIC

 VOID

 Cbi0ReportStatusCode (

   IN EFI_DEVICE_PATH_PROTOCOL  *DevicePath,

diff --git a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/ComponentName.c b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/ComponentName.c
index 7d16b5a1e3..87ff7d257b 100644
--- a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/ComponentName.c
+++ b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/ComponentName.c
@@ -19,29 +19,6 @@ Abstract:
 

 #include "cbi.h"

 

-extern EFI_DRIVER_BINDING_PROTOCOL  gUsbCbi0DriverBinding;

-

-//

-// EFI Component Name Functions

-//

-EFI_STATUS

-EFIAPI

-UsbCbi0ComponentNameGetDriverName (

-  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,

-  IN  CHAR8                        *Language,

-  OUT CHAR16                       **DriverName

-  );

-

-EFI_STATUS

-EFIAPI

-UsbCbi0ComponentNameGetControllerName (

-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,

-  IN  EFI_HANDLE                                      ControllerHandle,

-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,

-  IN  CHAR8                                           *Language,

-  OUT CHAR16                                          **ControllerName

-  );

-

 //

 // EFI Component Name Protocol

 //

diff --git a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/cbi.h b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/cbi.h
index e2a7c9d5af..d312176cac 100644
--- a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/cbi.h
+++ b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/cbi.h
@@ -67,4 +67,28 @@ typedef struct {
 #define USB_CBI_DEVICE_FROM_THIS(a) \

     CR(a, USB_CBI_DEVICE, UsbAtapiProtocol, USB_CBI_DEVICE_SIGNATURE)

 

+extern EFI_COMPONENT_NAME_PROTOCOL  gUsbCbi0ComponentName;

+extern EFI_DRIVER_BINDING_PROTOCOL  gUsbCbi0DriverBinding;

+

+//

+// EFI Component Name Functions

+//

+EFI_STATUS

+EFIAPI

+UsbCbi0ComponentNameGetDriverName (

+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,

+  IN  CHAR8                        *Language,

+  OUT CHAR16                       **DriverName

+  );

+

+EFI_STATUS

+EFIAPI

+UsbCbi0ComponentNameGetControllerName (

+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,

+  IN  EFI_HANDLE                                      ControllerHandle,

+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,

+  IN  CHAR8                                           *Language,

+  OUT CHAR16                                          **ControllerName

+  );

+

 #endif

diff --git a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/ComponentName.c b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/ComponentName.c
index f8485dd734..316c7f4c55 100644
--- a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/ComponentName.c
+++ b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/ComponentName.c
@@ -19,29 +19,6 @@ Abstract:
 

 #include "cbi.h"

 

-extern EFI_DRIVER_BINDING_PROTOCOL  gUsbCbi1DriverBinding;

-

-//

-// EFI Component Name Functions

-//

-EFI_STATUS

-EFIAPI

-UsbCbi1ComponentNameGetDriverName (

-  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,

-  IN  CHAR8                        *Language,

-  OUT CHAR16                       **DriverName

-  );

-

-EFI_STATUS

-EFIAPI

-UsbCbi1ComponentNameGetControllerName (

-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,

-  IN  EFI_HANDLE                                      ControllerHandle,

-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,

-  IN  CHAR8                                           *Language,

-  OUT CHAR16                                          **ControllerName

-  );

-

 //

 // EFI Component Name Protocol

 //

diff --git a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/cbi.h b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/cbi.h
index e2a7c9d5af..77daa1a29b 100644
--- a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/cbi.h
+++ b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/cbi.h
@@ -67,4 +67,28 @@ typedef struct {
 #define USB_CBI_DEVICE_FROM_THIS(a) \

     CR(a, USB_CBI_DEVICE, UsbAtapiProtocol, USB_CBI_DEVICE_SIGNATURE)

 

+extern EFI_DRIVER_BINDING_PROTOCOL  gUsbCbi1DriverBinding;

+extern EFI_COMPONENT_NAME_PROTOCOL  gUsbCbi1ComponentName;

+

+//

+// EFI Component Name Functions

+//

+EFI_STATUS

+EFIAPI

+UsbCbi1ComponentNameGetDriverName (

+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,

+  IN  CHAR8                        *Language,

+  OUT CHAR16                       **DriverName

+  );

+

+EFI_STATUS

+EFIAPI

+UsbCbi1ComponentNameGetControllerName (

+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,

+  IN  EFI_HANDLE                                      ControllerHandle,

+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,

+  IN  CHAR8                                           *Language,

+  OUT CHAR16                                          **ControllerName

+  );

+

 #endif

diff --git a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/cbi1.c b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/cbi1.c
index d8ef374c9f..d98d022a54 100644
--- a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/cbi1.c
+++ b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/cbi1.c
@@ -20,15 +20,6 @@ Abstract:
 

 #include "cbi.h"

 

-extern EFI_COMPONENT_NAME_PROTOCOL  gUsbCbi1ComponentName;

-

-EFI_STATUS

-EFIAPI

-UsbCBI1DriverEntryPoint (

-  IN EFI_HANDLE           ImageHandle,

-  IN EFI_SYSTEM_TABLE     *SystemTable

-  );

-

 //

 // CBI Function prototypes

 //

@@ -107,6 +98,7 @@ CBI1DriverBindingStop (
   IN  EFI_HANDLE                     *ChildHandleBuffer

   );

 

+STATIC

 VOID

 Cbi1ReportStatusCode (

   IN EFI_DEVICE_PATH_PROTOCOL  *DevicePath,

@@ -827,6 +819,7 @@ CBI1AtapiCommand (
   return EFI_DEVICE_ERROR;

 }

 

+STATIC

 VOID

 Cbi1ReportStatusCode (

   IN EFI_DEVICE_PATH_PROTOCOL  *DevicePath,

diff --git a/EdkModulePkg/Bus/Usb/UsbKb/Dxe/ComponentName.c b/EdkModulePkg/Bus/Usb/UsbKb/Dxe/ComponentName.c
index 3e139f9d9a..71a715f06e 100644
--- a/EdkModulePkg/Bus/Usb/UsbKb/Dxe/ComponentName.c
+++ b/EdkModulePkg/Bus/Usb/UsbKb/Dxe/ComponentName.c
@@ -20,27 +20,6 @@ Abstract:
 #include "keyboard.h"

 

 //

-// EFI Component Name Functions

-//

-EFI_STATUS

-EFIAPI

-UsbKeyboardComponentNameGetDriverName (

-  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,

-  IN  CHAR8                        *Language,

-  OUT CHAR16                       **DriverName

-  );

-

-EFI_STATUS

-EFIAPI

-UsbKeyboardComponentNameGetControllerName (

-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,

-  IN  EFI_HANDLE                                      ControllerHandle,

-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,

-  IN  CHAR8                                           *Language,

-  OUT CHAR16                                          **ControllerName

-  );

-

-//

 // EFI Component Name Protocol

 //

 EFI_COMPONENT_NAME_PROTOCOL     gUsbKeyboardComponentName = {

diff --git a/EdkModulePkg/Bus/Usb/UsbKb/Dxe/efikey.c b/EdkModulePkg/Bus/Usb/UsbKb/Dxe/efikey.c
index 1b8c96166c..a1fd418bde 100644
--- a/EdkModulePkg/Bus/Usb/UsbKb/Dxe/efikey.c
+++ b/EdkModulePkg/Bus/Usb/UsbKb/Dxe/efikey.c
@@ -25,42 +25,6 @@ Revision History
 #include "keyboard.h"

 

 //

-// Prototypes

-// Driver model protocol interface

-//

-EFI_STATUS

-EFIAPI

-USBKeyboardDriverBindingEntryPoint (

-  IN EFI_HANDLE           ImageHandle,

-  IN EFI_SYSTEM_TABLE     *SystemTable

-  );

-

-EFI_STATUS

-EFIAPI

-USBKeyboardDriverBindingSupported (

-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,

-  IN EFI_HANDLE                     Controller,

-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath

-  );

-

-EFI_STATUS

-EFIAPI

-USBKeyboardDriverBindingStart (

-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,

-  IN EFI_HANDLE                     Controller,

-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath

-  );

-

-EFI_STATUS

-EFIAPI

-USBKeyboardDriverBindingStop (

-  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,

-  IN  EFI_HANDLE                     Controller,

-  IN  UINTN                          NumberOfChildren,

-  IN  EFI_HANDLE                     *ChildHandleBuffer

-  );

-

-//

 // Simple Text In Protocol Interface

 //

 STATIC

diff --git a/EdkModulePkg/Bus/Usb/UsbKb/Dxe/efikey.h b/EdkModulePkg/Bus/Usb/UsbKb/Dxe/efikey.h
index 31307ebe57..4bdbfc9f9a 100644
--- a/EdkModulePkg/Bus/Usb/UsbKb/Dxe/efikey.h
+++ b/EdkModulePkg/Bus/Usb/UsbKb/Dxe/efikey.h
@@ -117,4 +117,34 @@ typedef struct {
   UINT8 ScrollLock : 1;

   UINT8 Resrvd : 5;

 } LED_MAP;

+

+//

+// Prototypes

+// Driver model protocol interface

+//

+EFI_STATUS

+EFIAPI

+USBKeyboardDriverBindingSupported (

+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,

+  IN EFI_HANDLE                     Controller,

+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath

+  );

+

+EFI_STATUS

+EFIAPI

+USBKeyboardDriverBindingStart (

+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,

+  IN EFI_HANDLE                     Controller,

+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath

+  );

+

+EFI_STATUS

+EFIAPI

+USBKeyboardDriverBindingStop (

+  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,

+  IN  EFI_HANDLE                     Controller,

+  IN  UINTN                          NumberOfChildren,

+  IN  EFI_HANDLE                     *ChildHandleBuffer

+  );

+

 #endif

diff --git a/EdkModulePkg/Bus/Usb/UsbKb/Dxe/keyboard.h b/EdkModulePkg/Bus/Usb/UsbKb/Dxe/keyboard.h
index a01fda3ca4..ef4c1c3443 100644
--- a/EdkModulePkg/Bus/Usb/UsbKb/Dxe/keyboard.h
+++ b/EdkModulePkg/Bus/Usb/UsbKb/Dxe/keyboard.h
@@ -24,6 +24,27 @@ Revision History
 

 #include "efikey.h"

 

+//

+// EFI Component Name Functions

+//

+EFI_STATUS

+EFIAPI

+UsbKeyboardComponentNameGetDriverName (

+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,

+  IN  CHAR8                        *Language,

+  OUT CHAR16                       **DriverName

+  );

+

+EFI_STATUS

+EFIAPI

+UsbKeyboardComponentNameGetControllerName (

+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,

+  IN  EFI_HANDLE                                      ControllerHandle,

+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,

+  IN  CHAR8                                           *Language,

+  OUT CHAR16                                          **ControllerName

+  );

+

 BOOLEAN

 IsUSBKeyboard (

   IN  EFI_USB_IO_PROTOCOL       *UsbIo

diff --git a/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/ComponentName.c b/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/ComponentName.c
index f033361fff..3e34361cef 100644
--- a/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/ComponentName.c
+++ b/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/ComponentName.c
@@ -20,27 +20,6 @@ Abstract:
 #include "UsbMassStorage.h"

 

 //

-// EFI Component Name Functions

-//

-EFI_STATUS

-EFIAPI

-UsbMassStorageComponentNameGetDriverName (

-  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,

-  IN  CHAR8                        *Language,

-  OUT CHAR16                       **DriverName

-  );

-

-EFI_STATUS

-EFIAPI

-UsbMassStorageComponentNameGetControllerName (

-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,

-  IN  EFI_HANDLE                                      ControllerHandle,

-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,

-  IN  CHAR8                                           *Language,

-  OUT CHAR16                                          **ControllerName

-  );

-

-//

 // EFI Component Name Protocol

 //

 EFI_COMPONENT_NAME_PROTOCOL     gUsbMassStorageComponentName = {

diff --git a/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.c b/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.c
index 7f6cd4daf2..951ab0a186 100644
--- a/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.c
+++ b/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.c
@@ -24,44 +24,6 @@ Revision History
 #include "UsbMassStorage.h"

 #include "UsbMassStorageHelper.h"

 

-extern EFI_COMPONENT_NAME_PROTOCOL  gUsbMassStorageComponentName;

-

-//

-// Prototypes

-// Driver model protocol interface

-//

-EFI_STATUS

-EFIAPI

-USBMassStorageDriverBindingEntryPoint (

-  IN EFI_HANDLE           ImageHandle,

-  IN EFI_SYSTEM_TABLE     *SystemTable

-  );

-

-EFI_STATUS

-EFIAPI

-USBFloppyDriverBindingSupported (

-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,

-  IN EFI_HANDLE                     Controller,

-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath

-  );

-

-EFI_STATUS

-EFIAPI

-USBFloppyDriverBindingStart (

-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,

-  IN EFI_HANDLE                     Controller,

-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath

-  );

-

-EFI_STATUS

-EFIAPI

-USBFloppyDriverBindingStop (

-  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,

-  IN  EFI_HANDLE                     Controller,

-  IN  UINTN                          NumberOfChildren,

-  IN  EFI_HANDLE                     *ChildHandleBuffer

-  );

-

 //

 // Block I/O Protocol Interface

 //

diff --git a/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.h b/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.h
index 832befcccc..27912b0d13 100644
--- a/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.h
+++ b/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.h
@@ -57,4 +57,56 @@ typedef struct {
 #define USB_FLOPPY_DEV_FROM_THIS(a) \

     CR(a, USB_FLOPPY_DEV, BlkIo, USB_FLOPPY_DEV_SIGNATURE)

 

+extern EFI_COMPONENT_NAME_PROTOCOL  gUsbMassStorageComponentName;

+

+//

+// Prototypes

+// Driver model protocol interface

+//

+EFI_STATUS

+EFIAPI

+USBFloppyDriverBindingSupported (

+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,

+  IN EFI_HANDLE                     Controller,

+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath

+  );

+

+EFI_STATUS

+EFIAPI

+USBFloppyDriverBindingStart (

+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,

+  IN EFI_HANDLE                     Controller,

+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath

+  );

+

+EFI_STATUS

+EFIAPI

+USBFloppyDriverBindingStop (

+  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,

+  IN  EFI_HANDLE                     Controller,

+  IN  UINTN                          NumberOfChildren,

+  IN  EFI_HANDLE                     *ChildHandleBuffer

+  );

+

+//

+// EFI Component Name Functions

+//

+EFI_STATUS

+EFIAPI

+UsbMassStorageComponentNameGetDriverName (

+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,

+  IN  CHAR8                        *Language,

+  OUT CHAR16                       **DriverName

+  );

+

+EFI_STATUS

+EFIAPI

+UsbMassStorageComponentNameGetControllerName (

+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,

+  IN  EFI_HANDLE                                      ControllerHandle,

+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,

+  IN  CHAR8                                           *Language,

+  OUT CHAR16                                          **ControllerName

+  );

+

 #endif

diff --git a/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/ComponentName.c b/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/ComponentName.c
index 5b01cea9d4..695961f17c 100644
--- a/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/ComponentName.c
+++ b/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/ComponentName.c
@@ -20,27 +20,6 @@ Abstract:
 #include "usbmouse.h"

 

 //

-// EFI Component Name Functions

-//

-EFI_STATUS

-EFIAPI

-UsbMouseComponentNameGetDriverName (

-  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,

-  IN  CHAR8                        *Language,

-  OUT CHAR16                       **DriverName

-  );

-

-EFI_STATUS

-EFIAPI

-UsbMouseComponentNameGetControllerName (

-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,

-  IN  EFI_HANDLE                                      ControllerHandle,

-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,

-  IN  CHAR8                                           *Language,

-  OUT CHAR16                                          **ControllerName

-  );

-

-//

 // EFI Component Name Protocol

 //

 EFI_COMPONENT_NAME_PROTOCOL     gUsbMouseComponentName = {

diff --git a/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/usbmouse.c b/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/usbmouse.c
index 442b5a2139..f7449ebfc3 100644
--- a/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/usbmouse.c
+++ b/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/usbmouse.c
@@ -20,43 +20,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "usbmouse.h"

 #include "mousehid.h"

 

-//

-// Prototypes

-// Driver model protocol interface

-//

-EFI_STATUS

-EFIAPI

-USBMouseDriverBindingEntryPoint (

-  IN EFI_HANDLE           ImageHandle,

-  IN EFI_SYSTEM_TABLE     *SystemTable

-  );

-

-EFI_STATUS

-EFIAPI

-USBMouseDriverBindingSupported (

-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,

-  IN EFI_HANDLE                     Controller,

-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath

-  );

-

-EFI_STATUS

-EFIAPI

-USBMouseDriverBindingStart (

-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,

-  IN EFI_HANDLE                     Controller,

-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath

-  );

-

-EFI_STATUS

-EFIAPI

-USBMouseDriverBindingStop (

-  IN  EFI_DRIVER_BINDING_PROTOCOL   *This,

-  IN  EFI_HANDLE                    Controller,

-  IN  UINTN                         NumberOfChildren,

-  IN  EFI_HANDLE                    *ChildHandleBuffer

-  );

-

-

 EFI_DRIVER_BINDING_PROTOCOL gUsbMouseDriverBinding = {

   USBMouseDriverBindingSupported,

   USBMouseDriverBindingStart,

diff --git a/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/usbmouse.h b/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/usbmouse.h
index 47485bfc08..ac071db311 100644
--- a/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/usbmouse.h
+++ b/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/usbmouse.h
@@ -82,4 +82,54 @@ MouseReportStatusCode (
   IN EFI_STATUS_CODE_VALUE     Value

   );

 

+//

+// Prototypes

+// Driver model protocol interface

+//

+EFI_STATUS

+EFIAPI

+USBMouseDriverBindingSupported (

+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,

+  IN EFI_HANDLE                     Controller,

+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath

+  );

+

+EFI_STATUS

+EFIAPI

+USBMouseDriverBindingStart (

+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,

+  IN EFI_HANDLE                     Controller,

+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath

+  );

+

+EFI_STATUS

+EFIAPI

+USBMouseDriverBindingStop (

+  IN  EFI_DRIVER_BINDING_PROTOCOL   *This,

+  IN  EFI_HANDLE                    Controller,

+  IN  UINTN                         NumberOfChildren,

+  IN  EFI_HANDLE                    *ChildHandleBuffer

+  );

+

+//

+// EFI Component Name Functions

+//

+EFI_STATUS

+EFIAPI

+UsbMouseComponentNameGetDriverName (

+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,

+  IN  CHAR8                        *Language,

+  OUT CHAR16                       **DriverName

+  );

+

+EFI_STATUS

+EFIAPI

+UsbMouseComponentNameGetControllerName (

+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,

+  IN  EFI_HANDLE                                      ControllerHandle,

+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,

+  IN  CHAR8                                           *Language,

+  OUT CHAR16                                          **ControllerName

+  );

+

 #endif