Partially make EdkModulePkg pass intel IPF compiler with /W4 /WX switched on.

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

diff --git a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c
index 1994c052cbb86a3f9bf9c081eab9091e5a83e79f..34d6f266e95c421c715aebff9da9d54b258e8bab 100644 (file)
--- a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c
+++ b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c
@@ -1,20 +1,4 @@
-/*++ \r
-\r
-Copyright (c) 2006, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
-\r
-Module Name:\r
-\r
-  ConSplitter.c\r
-\r
-Abstract:\r
-\r
+/**@file\r
   Console Splitter Driver. Any Handle that attatched \r
   EFI_CONSOLE_IDENTIFIER_PROTOCOL can be bound by this driver.\r
   \r
@@ -31,8 +15,17 @@ Abstract:
   and Console I/O protocol, will be produced in the driver entry point. \r
   The virtual handle are added on driver entry and never removed.\r
   Such design ensures sytem function well during none console device situation.\r
+\r
+Copyright (c) 2006 Intel Corporation. <BR>\r
+All rights reserved. This program and the accompanying materials                          \r
+are licensed and made available under the terms and conditions of the BSD License         \r
+which accompanies this distribution.  The full text of the license may be found at        \r
+http://opensource.org/licenses/bsd-license.php                                            \r
+                                                                                          \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
   \r
---*/\r
+**/\r
 \r
 #include "ConSplitter.h"\r
 \r
@@ -224,7 +217,7 @@ EFI_DRIVER_BINDING_PROTOCOL           gConSplitterConInDriverBinding = {
   ConSplitterConInDriverBindingSupported,\r
   ConSplitterConInDriverBindingStart,\r
   ConSplitterConInDriverBindingStop,\r
-  0x10,\r
+  0xa,\r
   NULL,\r
   NULL\r
 };\r
@@ -233,7 +226,7 @@ EFI_DRIVER_BINDING_PROTOCOL           gConSplitterSimplePointerDriverBinding = {
   ConSplitterSimplePointerDriverBindingSupported,\r
   ConSplitterSimplePointerDriverBindingStart,\r
   ConSplitterSimplePointerDriverBindingStop,\r
-  0x10,\r
+  0xa,\r
   NULL,\r
   NULL\r
 };\r
@@ -242,7 +235,7 @@ EFI_DRIVER_BINDING_PROTOCOL           gConSplitterConOutDriverBinding = {
   ConSplitterConOutDriverBindingSupported,\r
   ConSplitterConOutDriverBindingStart,\r
   ConSplitterConOutDriverBindingStop,\r
-  0x10,\r
+  0xa,\r
   NULL,\r
   NULL\r
 };\r
@@ -251,7 +244,7 @@ EFI_DRIVER_BINDING_PROTOCOL           gConSplitterStdErrDriverBinding = {
   ConSplitterStdErrDriverBindingSupported,\r
   ConSplitterStdErrDriverBindingStart,\r
   ConSplitterStdErrDriverBindingStop,\r
-  0x10,\r
+  0xa,\r
   NULL,\r
   NULL\r
 };\r
@@ -381,7 +374,6 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 ConSplitterTextInConstructor (\r
   TEXT_IN_SPLITTER_PRIVATE_DATA       *ConInPrivate\r
@@ -457,7 +449,6 @@ Returns:
   return Status;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 ConSplitterTextOutConstructor (\r
   TEXT_OUT_SPLITTER_PRIVATE_DATA      *ConOutPrivate\r
@@ -607,7 +598,6 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConInDriverBindingSupported (\r
@@ -638,7 +628,6 @@ Returns:
           );\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterSimplePointerDriverBindingSupported (\r
@@ -669,7 +658,6 @@ Returns:
           );\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConOutDriverBindingSupported (\r
@@ -700,7 +688,6 @@ Returns:
           );\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterStdErrDriverBindingSupported (\r
@@ -796,7 +783,6 @@ Returns:
                 );\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConInDriverBindingStart (\r
@@ -844,7 +830,6 @@ Returns:
   return ConSplitterTextInAddDevice (&mConIn, TextIn);\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterSimplePointerDriverBindingStart (\r
@@ -887,7 +872,6 @@ Returns:
   return ConSplitterSimplePointerAddDevice (&mConIn, SimplePointer);\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConOutDriverBindingStart (\r
@@ -980,7 +964,6 @@ Returns:
   return Status;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterStdErrDriverBindingStart (\r
@@ -1101,7 +1084,6 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConInDriverBindingStop (\r
@@ -1147,7 +1129,6 @@ Returns:
   return ConSplitterTextInDeleteDevice (&mConIn, TextIn);\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterSimplePointerDriverBindingStop (\r
@@ -1193,7 +1174,6 @@ Returns:
   return ConSplitterSimplePointerDeleteDevice (&mConIn, SimplePointer);\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConOutDriverBindingStop (\r
@@ -1240,7 +1220,6 @@ Returns:
   return ConSplitterTextOutDeleteDevice (&mConOut, TextOut);\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterStdErrDriverBindingStop (\r
@@ -1523,6 +1502,7 @@ Returns:
   return EFI_NOT_FOUND;\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 ConSplitterGrowMapTable (\r
   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private\r
@@ -1599,6 +1579,7 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 ConSplitterAddOutputMode (\r
   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private,\r
@@ -1666,6 +1647,7 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
+STATIC\r
 VOID\r
 ConSplitterGetIntersection (\r
   IN  INT32                           *TextOutModeMap,\r
@@ -1718,6 +1700,7 @@ ConSplitterGetIntersection (
   return ;\r
 }\r
 \r
+STATIC\r
 VOID\r
 ConSplitterSyncOutputMode (\r
   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private,\r
@@ -1736,7 +1719,6 @@ Returns:
 \r
 --*/\r
 {\r
-  INT32                         CurrentMode;\r
   INT32                         CurrentMaxMode;\r
   INT32                         Mode;\r
   INT32                         Index;\r
@@ -1750,7 +1732,6 @@ Returns:
   //\r
   // Must make sure that current mode won't change even if mode number changes\r
   //\r
-  CurrentMode       = Private->TextOutMode.Mode;\r
   CurrentMaxMode    = Private->TextOutMode.MaxMode;\r
   TextOutModeMap    = Private->TextOutModeMap;\r
   StepSize          = Private->TextOutListCount;\r
@@ -1795,6 +1776,7 @@ Returns:
   return ;\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 ConSplitterGetIntersectionBetweenConOutAndStrErr (\r
   VOID\r
@@ -1820,8 +1802,6 @@ Returns:
   UINTN                         Indexj;\r
   UINTN                         Rows;\r
   UINTN                         Columns;\r
-  INT32                         ConOutCurrentMode;\r
-  INT32                         StdErrCurrentMode;\r
   INT32                         ConOutMaxMode;\r
   INT32                         StdErrMaxMode;\r
   INT32                         Mode;\r
@@ -1832,8 +1812,6 @@ Returns:
   INT32                         *StdErrMapTable;\r
   TEXT_OUT_SPLITTER_QUERY_DATA  *ConOutQueryData;\r
   TEXT_OUT_SPLITTER_QUERY_DATA  *StdErrQueryData;\r
-  UINTN                         ConOutStepSize;\r
-  UINTN                         StdErrStepSize;\r
   BOOLEAN                       FoundTheSameTextOut;\r
   UINTN                         ConOutMapTableSize;\r
   UINTN                         StdErrMapTableSize;\r
@@ -1867,16 +1845,12 @@ Returns:
   //\r
   // Must make sure that current mode won't change even if mode number changes\r
   //\r
-  ConOutCurrentMode = mConOut.TextOutMode.Mode;\r
   ConOutMaxMode     = mConOut.TextOutMode.MaxMode;\r
   ConOutModeMap     = mConOut.TextOutModeMap;\r
-  ConOutStepSize    = mConOut.TextOutListCount;\r
   ConOutQueryData   = mConOut.TextOutQueryData;\r
 \r
-  StdErrCurrentMode = mStdErr.TextOutMode.Mode;\r
   StdErrMaxMode     = mStdErr.TextOutMode.MaxMode;\r
   StdErrModeMap     = mStdErr.TextOutModeMap;\r
-  StdErrStepSize    = mStdErr.TextOutListCount;\r
   StdErrQueryData   = mStdErr.TextOutQueryData;\r
 \r
   //\r
@@ -1957,6 +1931,7 @@ Returns:
 }\r
 \r
 #if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
+STATIC\r
 EFI_STATUS\r
 ConSplitterAddGraphicsOutputMode (\r
   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private,\r
@@ -2750,6 +2725,7 @@ ConSplitterSimplePointerReset (
   return ReturnStatus;\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterSimplePointerPrivateGetState (\r