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

[mirror_edk2.git] / EdkModulePkg / Universal / Console / GraphicsConsole / Dxe / GraphicsConsole.c

diff --git a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.c b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.c
index 40e89a91702617b81286e1fc9d675e3e96ed6d31..4a2dd5928c68021302919f7aaba859372710ddd7 100644 (file)
--- 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.
 \r
 #include "GraphicsConsole.h"\r
 \r
-//\r
-// Function Prototypes\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-GraphicsConsoleControllerDriverSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-GraphicsConsoleControllerDriverStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-GraphicsConsoleControllerDriverStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN  EFI_HANDLE                     Controller,\r
-  IN  UINTN                          NumberOfChildren,\r
-  IN  EFI_HANDLE                     *ChildHandleBuffer\r
-  );\r
-\r
+STATIC\r
 EFI_STATUS\r
 GetTextColors (\r
   IN  EFI_SIMPLE_TEXT_OUT_PROTOCOL  *This,\r
@@ -54,12 +27,7 @@ GetTextColors (
   OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL *Background\r
   );\r
 \r
-EFI_STATUS\r
-DrawUnicodeWeightAtCursor (\r
-  IN  EFI_SIMPLE_TEXT_OUT_PROTOCOL  *This,\r
-  IN  CHAR16                        UnicodeWeight\r
-  );\r
-\r
+STATIC\r
 EFI_STATUS\r
 DrawUnicodeWeightAtCursorN (\r
   IN  EFI_SIMPLE_TEXT_OUT_PROTOCOL  *This,\r
@@ -67,6 +35,7 @@ DrawUnicodeWeightAtCursorN (
   IN  UINTN                         Count\r
   );\r
 \r
+STATIC\r
 EFI_STATUS\r
 EraseCursor (\r
   IN  EFI_SIMPLE_TEXT_OUT_PROTOCOL  *This\r
@@ -144,7 +113,7 @@ EFI_DRIVER_BINDING_PROTOCOL gGraphicsConsoleDriverBinding = {
   GraphicsConsoleControllerDriverSupported,\r
   GraphicsConsoleControllerDriverStart,\r
   GraphicsConsoleControllerDriverStop,\r
-  0x10,\r
+  0xa,\r
   NULL,\r
   NULL\r
 };\r
@@ -378,9 +347,7 @@ GraphicsConsoleControllerDriverStart (
                          );\r
       if (!EFI_ERROR (Status)) {\r
         if ((Info->HorizontalResolution == 800) &&\r
-            (Info->VerticalResolution == 600) &&\r
-            ((Info->PixelFormat == PixelRedGreenBlueReserved8BitPerColor) ||\r
-             (Info->PixelFormat == PixelBlueGreenRedReserved8BitPerColor))) {\r
+            (Info->VerticalResolution == 600)) {\r
           Status = Private->GraphicsOutput->SetMode (Private->GraphicsOutput, ModeNumber);\r
           if (!EFI_ERROR (Status)) {\r
             gBS->FreePool (Info);\r
@@ -1034,10 +1001,8 @@ GraphicsConsoleConOutTestString (
   UINT16                GlyphWidth;\r
   UINT32                GlyphStatus;\r
   UINT16                Count;\r
-  GRAPHICS_CONSOLE_DEV  *Private;\r
   GLYPH_UNION           *Glyph;\r
 \r
-  Private     = GRAPHICS_CONSOLE_CON_OUT_DEV_FROM_THIS (This);\r
   GlyphStatus = 0;\r
   Count       = 0;\r
 \r
@@ -1164,6 +1129,10 @@ GraphicsConsoleConOutSetMode (
   UgaDraw   = Private->UgaDraw;\r
   ModeData  = &(Private->ModeData[ModeNumber]);\r
 \r
+  if (ModeData->Columns <= 0 && ModeData->Rows <= 0) {\r
+    return EFI_UNSUPPORTED;\r
+  }\r
+\r
   //\r
   // Make sure the requested mode number is supported\r
   //\r
@@ -1532,6 +1501,7 @@ GraphicsConsoleConOutEnableCursor (
   return EFI_SUCCESS;\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 GetTextColors (\r
   IN  EFI_SIMPLE_TEXT_OUT_PROTOCOL  *This,\r
@@ -1549,6 +1519,7 @@ GetTextColors (
   return EFI_SUCCESS;\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 DrawUnicodeWeightAtCursorN (\r
   IN  EFI_SIMPLE_TEXT_OUT_PROTOCOL  *This,\r
@@ -1689,6 +1660,7 @@ DrawUnicodeWeightAtCursorN (
   return ReturnStatus;\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 EraseCursor (\r
   IN  EFI_SIMPLE_TEXT_OUT_PROTOCOL  *This\r