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

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

6 files changed, 20 insertions, 17 deletions

diff --git a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c
index 973f13d..34d6f26 100644
--- a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c
+++ b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c
@@ -531,6 +531,7 @@ ConSplitterTextOutConstructor (
   return Status;

 }

 

+STATIC

 EFI_STATUS

 ConSplitterSupported (

   IN  EFI_DRIVER_BINDING_PROTOCOL     *This,

@@ -717,6 +718,7 @@ Returns:
           );

 }

 

+STATIC

 EFI_STATUS

 EFIAPI

 ConSplitterStart (

@@ -1026,6 +1028,7 @@ Returns:
   return Status;

 }

 

+STATIC

 EFI_STATUS

 EFIAPI

 ConSplitterStop (

@@ -1499,6 +1502,7 @@ Returns:
   return EFI_NOT_FOUND;

 }

 

+STATIC

 EFI_STATUS

 ConSplitterGrowMapTable (

   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private

@@ -1575,6 +1579,7 @@ Returns:
   return EFI_SUCCESS;

 }

 

+STATIC

 EFI_STATUS

 ConSplitterAddOutputMode (

   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private,

@@ -1642,6 +1647,7 @@ Returns:
   return EFI_SUCCESS;

 }

 

+STATIC

 VOID

 ConSplitterGetIntersection (

   IN  INT32                           *TextOutModeMap,

@@ -1694,6 +1700,7 @@ ConSplitterGetIntersection (
   return ;

 }

 

+STATIC

 VOID

 ConSplitterSyncOutputMode (

   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private,

@@ -1712,7 +1719,6 @@ Returns:
 

 --*/

 {

-  INT32                         CurrentMode;

   INT32                         CurrentMaxMode;

   INT32                         Mode;

   INT32                         Index;

@@ -1726,7 +1732,6 @@ Returns:
   //

   // Must make sure that current mode won't change even if mode number changes

   //

-  CurrentMode       = Private->TextOutMode.Mode;

   CurrentMaxMode    = Private->TextOutMode.MaxMode;

   TextOutModeMap    = Private->TextOutModeMap;

   StepSize          = Private->TextOutListCount;

@@ -1771,6 +1776,7 @@ Returns:
   return ;

 }

 

+STATIC

 EFI_STATUS

 ConSplitterGetIntersectionBetweenConOutAndStrErr (

   VOID

@@ -1796,8 +1802,6 @@ Returns:
   UINTN                         Indexj;

   UINTN                         Rows;

   UINTN                         Columns;

-  INT32                         ConOutCurrentMode;

-  INT32                         StdErrCurrentMode;

   INT32                         ConOutMaxMode;

   INT32                         StdErrMaxMode;

   INT32                         Mode;

@@ -1808,8 +1812,6 @@ Returns:
   INT32                         *StdErrMapTable;

   TEXT_OUT_SPLITTER_QUERY_DATA  *ConOutQueryData;

   TEXT_OUT_SPLITTER_QUERY_DATA  *StdErrQueryData;

-  UINTN                         ConOutStepSize;

-  UINTN                         StdErrStepSize;

   BOOLEAN                       FoundTheSameTextOut;

   UINTN                         ConOutMapTableSize;

   UINTN                         StdErrMapTableSize;

@@ -1843,16 +1845,12 @@ Returns:
   //

   // Must make sure that current mode won't change even if mode number changes

   //

-  ConOutCurrentMode = mConOut.TextOutMode.Mode;

   ConOutMaxMode     = mConOut.TextOutMode.MaxMode;

   ConOutModeMap     = mConOut.TextOutModeMap;

-  ConOutStepSize    = mConOut.TextOutListCount;

   ConOutQueryData   = mConOut.TextOutQueryData;

 

-  StdErrCurrentMode = mStdErr.TextOutMode.Mode;

   StdErrMaxMode     = mStdErr.TextOutMode.MaxMode;

   StdErrModeMap     = mStdErr.TextOutModeMap;

-  StdErrStepSize    = mStdErr.TextOutListCount;

   StdErrQueryData   = mStdErr.TextOutQueryData;

 

   //

@@ -1933,6 +1931,7 @@ Returns:
 }

 

 #if (EFI_SPECIFICATION_VERSION >= 0x00020000)

+STATIC

 EFI_STATUS

 ConSplitterAddGraphicsOutputMode (

   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private,

@@ -2726,6 +2725,7 @@ ConSplitterSimplePointerReset (
   return ReturnStatus;

 }

 

+STATIC

 EFI_STATUS

 EFIAPI

 ConSplitterSimplePointerPrivateGetState (

diff --git a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.h b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.h
index 8ca743c..4509390 100644
--- a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.h
+++ b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.h
@@ -578,7 +578,7 @@ DevNullGopSync (
   )

 ;

 

-#if (EFI_SPECIFICATION < 0x00020000)

+#if (EFI_SPECIFICATION_VERSION < 0x00020000)

 EFI_STATUS

 EFIAPI

 ConSpliterUgaDrawGetMode (

diff --git a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitterGraphics.c b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitterGraphics.c
index 4bc15e6..cec8adb 100644
--- a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitterGraphics.c
+++ b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitterGraphics.c
@@ -355,6 +355,7 @@ Routine Description:
   return ReturnStatus;

 }

 

+STATIC

 EFI_STATUS

 DevNullGraphicsOutputBlt (

   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA                *Private,

diff --git a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.c b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.c
index 25b0429..866aaad 100644
--- a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.c
+++ b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.c
@@ -1032,10 +1032,8 @@ GraphicsConsoleConOutTestString (
   UINT16                GlyphWidth;

   UINT32                GlyphStatus;

   UINT16                Count;

-  GRAPHICS_CONSOLE_DEV  *Private;

   GLYPH_UNION           *Glyph;

 

-  Private     = GRAPHICS_CONSOLE_CON_OUT_DEV_FROM_THIS (This);

   GlyphStatus = 0;

   Count       = 0;

 

diff --git a/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.c b/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.c
index 6621b64..45eb632 100644
--- a/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.c
+++ b/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.c
@@ -402,9 +402,9 @@ TerminalDriverBindingStart (
                                       Mode->BaudRate,

                                       Mode->ReceiveFifoDepth,

                                       (UINT32) SerialInTimeOut,

-                                      Mode->Parity,

+                                      (EFI_PARITY_TYPE) (Mode->Parity),

                                       (UINT8) Mode->DataBits,

-                                      Mode->StopBits

+                                      (EFI_STOP_BITS_TYPE) (Mode->StopBits)

                                       );

   if (EFI_ERROR (Status)) {

     //

@@ -897,6 +897,7 @@ TerminalUpdateConsoleDevVariable (
                   VariableSize,

                   Variable

                   );

+  ASSERT_EFI_ERROR (Status);

   gBS->FreePool (Variable);

 

   return ;

@@ -1015,6 +1016,7 @@ TerminalRemoveConsoleDevVariable (
                     VariableSize,

                     NewVariable

                     );

+    ASSERT_EFI_ERROR (Status);

   }

 

   if (NewVariable != NULL) {

diff --git a/EdkModulePkg/Universal/Console/Terminal/Dxe/TerminalConIn.c b/EdkModulePkg/Universal/Console/Terminal/Dxe/TerminalConIn.c
index 3c62138..4dbb17e 100644
--- a/EdkModulePkg/Universal/Console/Terminal/Dxe/TerminalConIn.c
+++ b/EdkModulePkg/Universal/Console/Terminal/Dxe/TerminalConIn.c
@@ -268,9 +268,9 @@ TerminalConInCheckForKey (
                         Mode->BaudRate,

                         Mode->ReceiveFifoDepth,

                         (UINT32) SerialInTimeOut,

-                        Mode->Parity,

+                        (EFI_PARITY_TYPE) (Mode->Parity),

                         (UINT8) Mode->DataBits,

-                        Mode->StopBits

+                        (EFI_STOP_BITS_TYPE) (Mode->StopBits)

                         );

 

     if (EFI_ERROR (Status)) {

@@ -681,6 +681,7 @@ UnicodeFiFoGetKeyCount (
   }

 }

 

+STATIC

 VOID

 UnicodeToEfiKeyFlushState (

   IN  TERMINAL_DEV    *TerminalDevice

@@ -1162,6 +1163,7 @@ ESC R ESC r ESC R = Reset System
                       TimerRelative,

                       (UINT64)20000000

                       );

+      ASSERT_EFI_ERROR (Status);

       continue;

     }