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

7 files changed, 122 insertions, 134 deletions

diff --git a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ComponentName.c b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ComponentName.c
index dc2a22f447..f82ae55c4e 100644
--- a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ComponentName.c
+++ b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ComponentName.c
@@ -20,57 +20,6 @@ Abstract:
 #include "ConSplitter.h"

 

 //

-// EFI Component Name Functions

-//

-EFI_STATUS

-EFIAPI

-ConSplitterComponentNameGetDriverName (

-  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,

-  IN  CHAR8                        *Language,

-  OUT CHAR16                       **DriverName

-  );

-

-EFI_STATUS

-EFIAPI

-ConSplitterConInComponentNameGetControllerName (

-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,

-  IN  EFI_HANDLE                                      ControllerHandle,

-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,

-  IN  CHAR8                                           *Language,

-  OUT CHAR16                                          **ControllerName

-  );

-

-EFI_STATUS

-EFIAPI

-ConSplitterSimplePointerComponentNameGetControllerName (

-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,

-  IN  EFI_HANDLE                                      ControllerHandle,

-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,

-  IN  CHAR8                                           *Language,

-  OUT CHAR16                                          **ControllerName

-  );

-

-EFI_STATUS

-EFIAPI

-ConSplitterConOutComponentNameGetControllerName (

-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,

-  IN  EFI_HANDLE                                      ControllerHandle,

-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,

-  IN  CHAR8                                           *Language,

-  OUT CHAR16                                          **ControllerName

-  );

-

-EFI_STATUS

-EFIAPI

-ConSplitterStdErrComponentNameGetControllerName (

-  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     gConSplitterConInComponentName = {

diff --git a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.h b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.h
index 4509390e83..13c4e743db 100644
--- a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.h
+++ b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.h
@@ -293,6 +293,54 @@ ConSplitterStdErrDriverBindingStop (
   )

 ;

 

+EFI_STATUS

+EFIAPI

+ConSplitterComponentNameGetDriverName (

+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,

+  IN  CHAR8                        *Language,

+  OUT CHAR16                       **DriverName

+  );

+

+EFI_STATUS

+EFIAPI

+ConSplitterConInComponentNameGetControllerName (

+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,

+  IN  EFI_HANDLE                                      ControllerHandle,

+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,

+  IN  CHAR8                                           *Language,

+  OUT CHAR16                                          **ControllerName

+  );

+

+EFI_STATUS

+EFIAPI

+ConSplitterSimplePointerComponentNameGetControllerName (

+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,

+  IN  EFI_HANDLE                                      ControllerHandle,

+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,

+  IN  CHAR8                                           *Language,

+  OUT CHAR16                                          **ControllerName

+  );

+

+EFI_STATUS

+EFIAPI

+ConSplitterConOutComponentNameGetControllerName (

+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,

+  IN  EFI_HANDLE                                      ControllerHandle,

+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,

+  IN  CHAR8                                           *Language,

+  OUT CHAR16                                          **ControllerName

+  );

+

+EFI_STATUS

+EFIAPI

+ConSplitterStdErrComponentNameGetControllerName (

+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,

+  IN  EFI_HANDLE                                      ControllerHandle,

+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,

+  IN  CHAR8                                           *Language,

+  OUT CHAR16                                          **ControllerName

+  );

+

 //

 // TextIn Constructor/Destructor functions

 //

diff --git a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.c b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.c
index 866aaad444..4a2dd5928c 100644
--- a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.c
+++ b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.c
@@ -19,34 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

 #include "GraphicsConsole.h"

 

-//

-// Function Prototypes

-//

-EFI_STATUS

-EFIAPI

-GraphicsConsoleControllerDriverSupported (

-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,

-  IN EFI_HANDLE                     Controller,

-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath

-  );

-

-EFI_STATUS

-EFIAPI

-GraphicsConsoleControllerDriverStart (

-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,

-  IN EFI_HANDLE                     Controller,

-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath

-  );

-

-EFI_STATUS

-EFIAPI

-GraphicsConsoleControllerDriverStop (

-  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,

-  IN  EFI_HANDLE                     Controller,

-  IN  UINTN                          NumberOfChildren,

-  IN  EFI_HANDLE                     *ChildHandleBuffer

-  );

-

+STATIC

 EFI_STATUS

 GetTextColors (

   IN  EFI_SIMPLE_TEXT_OUT_PROTOCOL  *This,

@@ -54,12 +27,7 @@ GetTextColors (
   OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL *Background

   );

 

-EFI_STATUS

-DrawUnicodeWeightAtCursor (

-  IN  EFI_SIMPLE_TEXT_OUT_PROTOCOL  *This,

-  IN  CHAR16                        UnicodeWeight

-  );

-

+STATIC

 EFI_STATUS

 DrawUnicodeWeightAtCursorN (

   IN  EFI_SIMPLE_TEXT_OUT_PROTOCOL  *This,

@@ -67,6 +35,7 @@ DrawUnicodeWeightAtCursorN (
   IN  UINTN                         Count

   );

 

+STATIC

 EFI_STATUS

 EraseCursor (

   IN  EFI_SIMPLE_TEXT_OUT_PROTOCOL  *This

@@ -1532,6 +1501,7 @@ GraphicsConsoleConOutEnableCursor (
   return EFI_SUCCESS;

 }

 

+STATIC

 EFI_STATUS

 GetTextColors (

   IN  EFI_SIMPLE_TEXT_OUT_PROTOCOL  *This,

@@ -1549,6 +1519,7 @@ GetTextColors (
   return EFI_SUCCESS;

 }

 

+STATIC

 EFI_STATUS

 DrawUnicodeWeightAtCursorN (

   IN  EFI_SIMPLE_TEXT_OUT_PROTOCOL  *This,

@@ -1689,6 +1660,7 @@ DrawUnicodeWeightAtCursorN (
   return ReturnStatus;

 }

 

+STATIC

 EFI_STATUS

 EraseCursor (

   IN  EFI_SIMPLE_TEXT_OUT_PROTOCOL  *This

diff --git a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.h b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.h
index 45a2ec4764..bcc1d56746 100644
--- a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.h
+++ b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.h
@@ -159,4 +159,29 @@ EfiLocateHiiProtocol (
   VOID

   );

 

+EFI_STATUS

+EFIAPI

+GraphicsConsoleControllerDriverSupported (

+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,

+  IN EFI_HANDLE                     Controller,

+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath

+  );

+

+EFI_STATUS

+EFIAPI

+GraphicsConsoleControllerDriverStart (

+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,

+  IN EFI_HANDLE                     Controller,

+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath

+  );

+

+EFI_STATUS

+EFIAPI

+GraphicsConsoleControllerDriverStop (

+  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,

+  IN  EFI_HANDLE                     Controller,

+  IN  UINTN                          NumberOfChildren,

+  IN  EFI_HANDLE                     *ChildHandleBuffer

+  );

+

 #endif

diff --git a/EdkModulePkg/Universal/Console/Terminal/Dxe/ComponentName.c b/EdkModulePkg/Universal/Console/Terminal/Dxe/ComponentName.c
index 7a1c23d17c..bdc6df471d 100644
--- a/EdkModulePkg/Universal/Console/Terminal/Dxe/ComponentName.c
+++ b/EdkModulePkg/Universal/Console/Terminal/Dxe/ComponentName.c
@@ -21,27 +21,6 @@ Abstract:
 #include "Terminal.h"

 

 //

-// EFI Component Name Functions

-//

-EFI_STATUS

-EFIAPI

-TerminalComponentNameGetDriverName (

-  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,

-  IN  CHAR8                        *Language,

-  OUT CHAR16                       **DriverName

-  );

-

-EFI_STATUS

-EFIAPI

-TerminalComponentNameGetControllerName (

-  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     gTerminalComponentName = {

diff --git a/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.c b/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.c
index 45eb632e26..6aa70e4c95 100644
--- a/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.c
+++ b/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.c
@@ -23,34 +23,6 @@ Revision History:
 #include "Terminal.h"

 

 //

-// Function Prototypes

-//

-EFI_STATUS

-EFIAPI

-TerminalDriverBindingSupported (

-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,

-  IN EFI_HANDLE                     Controller,

-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath

-  );

-

-EFI_STATUS

-EFIAPI

-TerminalDriverBindingStart (

-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,

-  IN EFI_HANDLE                     Controller,

-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath

-  );

-

-EFI_STATUS

-EFIAPI

-TerminalDriverBindingStop (

-  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,

-  IN  EFI_HANDLE                     Controller,

-  IN  UINTN                          NumberOfChildren,

-  IN  EFI_HANDLE                     *ChildHandleBuffer

-  );

-

-//

 // Globals

 //

 EFI_DRIVER_BINDING_PROTOCOL gTerminalDriverBinding = {

diff --git a/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.h b/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.h
index 2382d86f7e..e7ce1dc324 100644
--- a/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.h
+++ b/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.h
@@ -244,6 +244,49 @@ TerminalConOutEnableCursor (
   )

 ;

 

+EFI_STATUS

+EFIAPI

+TerminalDriverBindingSupported (

+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,

+  IN EFI_HANDLE                     Controller,

+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath

+  );

+

+EFI_STATUS

+EFIAPI

+TerminalDriverBindingStart (

+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,

+  IN EFI_HANDLE                     Controller,

+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath

+  );

+

+EFI_STATUS

+EFIAPI

+TerminalDriverBindingStop (

+  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,

+  IN  EFI_HANDLE                     Controller,

+  IN  UINTN                          NumberOfChildren,

+  IN  EFI_HANDLE                     *ChildHandleBuffer

+  );

+

+EFI_STATUS

+EFIAPI

+TerminalComponentNameGetDriverName (

+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,

+  IN  CHAR8                        *Language,

+  OUT CHAR16                       **DriverName

+  );

+

+EFI_STATUS

+EFIAPI

+TerminalComponentNameGetControllerName (

+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,

+  IN  EFI_HANDLE                                      ControllerHandle,

+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,

+  IN  CHAR8                                           *Language,

+  OUT CHAR16                                          **ControllerName

+  );

+

 //

 // internal functions

 //