EmulatorPkg: Remove variables that are set, but not used

GCC 4.6 flags a warning for this.

Signed-off-by: jljusten
Reviewed-by: andrewfish
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12613 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EmulatorPkg/CpuRuntimeDxe/Cpu.c b/EmulatorPkg/CpuRuntimeDxe/Cpu.c
index 2f7d5368e04accf5f47bcbf5b56e980813a2e9e0..10d86f8e9c12d78b0b666b3b276e665b7216477f 100644 (file)
--- a/EmulatorPkg/CpuRuntimeDxe/Cpu.c
+++ b/EmulatorPkg/CpuRuntimeDxe/Cpu.c
@@ -127,9 +127,6 @@ EmuInit (
   IN EFI_CPU_INIT_TYPE      InitType\r
   )\r
 {\r
-  CPU_ARCH_PROTOCOL_PRIVATE *Private;\r
-\r
-  Private = CPU_ARCH_PROTOCOL_PRIVATE_DATA_FROM_THIS (This);\r
   return EFI_UNSUPPORTED;\r
 }\r
 \r
@@ -141,8 +138,6 @@ EmuRegisterInterruptHandler (
   IN EFI_CPU_INTERRUPT_HANDLER  InterruptHandler\r
   )\r
 {\r
-  CPU_ARCH_PROTOCOL_PRIVATE *Private;\r
-\r
   //\r
   // Do parameter checking for EFI spec conformance\r
   //\r
@@ -152,7 +147,6 @@ EmuRegisterInterruptHandler (
   //\r
   // Do nothing for Emu emulation\r
   //\r
-  Private = CPU_ARCH_PROTOCOL_PRIVATE_DATA_FROM_THIS (This);\r
   return EFI_UNSUPPORTED;\r
 }\r
 \r
@@ -192,8 +186,6 @@ EmuSetMemoryAttributes (
   IN UINT64                 Attributes\r
   )\r
 {\r
-  CPU_ARCH_PROTOCOL_PRIVATE *Private;\r
-\r
   //\r
   // Check for invalid parameter for Spec conformance\r
   //\r
@@ -204,7 +196,6 @@ EmuSetMemoryAttributes (
   //\r
   // Do nothing for Nt32 emulation\r
   //\r
-  Private = CPU_ARCH_PROTOCOL_PRIVATE_DATA_FROM_THIS (This);\r
   return EFI_UNSUPPORTED;\r
 }\r
 \r

diff --git a/EmulatorPkg/CpuRuntimeDxe/MpService.c b/EmulatorPkg/CpuRuntimeDxe/MpService.c
index b5b1d156c011ccc83d3e4c97c4b0c2126fac4c43..ba0ad82504c92f8a5c844f9d605f12bba96e1806 100644 (file)
--- a/EmulatorPkg/CpuRuntimeDxe/MpService.c
+++ b/EmulatorPkg/CpuRuntimeDxe/MpService.c
@@ -374,7 +374,6 @@ CpuMpServicesStartupAllAps (
 {\r
   EFI_STATUS            Status;\r
   PROCESSOR_DATA_BLOCK  *ProcessorData;\r
-  UINTN                 ListIndex;\r
   UINTN                 Number;\r
   UINTN                 NextNumber;\r
   PROCESSOR_STATE       APInitialState;\r
@@ -411,7 +410,6 @@ CpuMpServicesStartupAllAps (
 \r
   Timeout = TimeoutInMicroseconds;\r
 \r
-  ListIndex                   = 0;\r
   ProcessorData               = NULL;\r
 \r
   gMPSystem.FinishCount   = 0;\r
@@ -650,7 +648,6 @@ CpuMpServicesStartupThisAP (
   OUT BOOLEAN                   *Finished               OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS      Status;\r
   INTN            Timeout;\r
 \r
   if (!IsBSP ()) {\r
@@ -685,13 +682,13 @@ CpuMpServicesStartupThisAP (
   SetApProcedure (&gMPSystem.ProcessorData[ProcessorNumber], Procedure, ProcedureArgument);\r
 \r
   if (WaitEvent != NULL) {\r
-      // Non Blocking\r
-      gMPSystem.WaitEvent = WaitEvent;\r
-      Status = gBS->SetTimer (\r
-                      gMPSystem.ProcessorData[ProcessorNumber].CheckThisAPEvent,\r
-                      TimerPeriodic,\r
-                      gPollInterval\r
-                      );\r
+    // Non Blocking\r
+    gMPSystem.WaitEvent = WaitEvent;\r
+    gBS->SetTimer (\r
+           gMPSystem.ProcessorData[ProcessorNumber].CheckThisAPEvent,\r
+           TimerPeriodic,\r
+           gPollInterval\r
+           );\r
     return EFI_SUCCESS;\r
   }\r
 \r
@@ -1155,10 +1152,6 @@ FillInProcessorInformation (
   IN     UINTN                ProcessorNumber\r
   )\r
 {\r
-  PROCESSOR_DATA_BLOCK            *ProcessorData;\r
-\r
-  ProcessorData = &gMPSystem.ProcessorData[ProcessorNumber];\r
-\r
   gMPSystem.ProcessorData[ProcessorNumber].Info.ProcessorId  = gThread->Self ();\r
   gMPSystem.ProcessorData[ProcessorNumber].Info.StatusFlag   = PROCESSOR_ENABLED_BIT | PROCESSOR_HEALTH_STATUS_BIT;\r
   if (BSP) {\r

diff --git a/EmulatorPkg/EmuGopDxe/GopInput.c b/EmulatorPkg/EmuGopDxe/GopInput.c
index 288a151d6d379b3b27c48420d1d10cf28a1c2bb8..a1f636aaa28250bb93ff8e599a0527542f202620 100644 (file)
--- a/EmulatorPkg/EmuGopDxe/GopInput.c
+++ b/EmulatorPkg/EmuGopDxe/GopInput.c
@@ -300,10 +300,6 @@ EmuGopSimpleTextInExResetEx (
 
 **/
 {
-  GOP_PRIVATE_DATA *Private;
-
-  Private = GOP_PRIVATE_DATA_FROM_TEXT_IN_EX_THIS (This);
-
   return EFI_SUCCESS;
 }
 

diff --git a/EmulatorPkg/EmuGopDxe/GopScreen.c b/EmulatorPkg/EmuGopDxe/GopScreen.c
index fff07d57fdbfcc9571873f515b42547e29db211d..34ee6a5d523cc529fa2a85768b9d95554dfab8f8 100644 (file)
--- a/EmulatorPkg/EmuGopDxe/GopScreen.c
+++ b/EmulatorPkg/EmuGopDxe/GopScreen.c
@@ -1,6 +1,6 @@
 /*++ @file
 
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
 Portions copyright (c) 2010 - 2011, Apple Inc. All rights reserved.
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
@@ -368,11 +368,8 @@ EmuGopDestructor (
   GOP_PRIVATE_DATA     *Private
   )
 {
-  EFI_STATUS  Status;
-
-  Status = EFI_SUCCESS;
   if (!Private->HardwareNeedsStarting) {
-    Status = Private->EmuIoThunk->Close (Private->EmuIoThunk);
+    Private->EmuIoThunk->Close (Private->EmuIoThunk);
     Private->EmuGraphicsWindow = NULL;
   }
 
@@ -414,7 +411,6 @@ Returns:
 
 **/
 {
-  EFI_STATUS  Status;
-  Status = EmuGopDestructor (Context);
+  EmuGopDestructor (Context);
 }