From 92dda53e9fe6568c9204ffd97f146710bdde3369 Mon Sep 17 00:00:00 2001
From: xli24 <xli24@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 31 Jan 2007 04:57:46 +0000
Subject: 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
---
 .../Console/GraphicsConsole/Dxe/GraphicsConsole.c  | 40 ++++------------------
 .../Console/GraphicsConsole/Dxe/GraphicsConsole.h  | 25 ++++++++++++++
 2 files changed, 31 insertions(+), 34 deletions(-)

(limited to 'EdkModulePkg/Universal/Console/GraphicsConsole/Dxe')

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
-- 
cgit v1.2.3