InOsEmuPkg: Fix warnings with GCC44 toolchain

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

diff --git a/InOsEmuPkg/CpuRuntimeDxe/MpService.c b/InOsEmuPkg/CpuRuntimeDxe/MpService.c
index 8d7666b7b42c51e9c4312eab546ff13ea7bac704..6bb9dea2b37bf7dc13cb1a07014f5cb54d3d4554 100644 (file)
--- a/InOsEmuPkg/CpuRuntimeDxe/MpService.c
+++ b/InOsEmuPkg/CpuRuntimeDxe/MpService.c
@@ -27,17 +27,17 @@
   APs to help test system memory in parallel with other device initialization.\r
   Diagnostics applications may also use this protocol for multi-processor.\r
 \r
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
 Portitions Copyright (c) 2011, Apple Inc. All rights reserved.\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r
 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
+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
 \r
 #include "CpuDriver.h"\r
@@ -929,6 +929,8 @@ CpuCheckAllAPsStatus (
   EFI_STATUS            Status;\r
   PROCESSOR_STATE       ProcessorState;\r
 \r
+  ProcessorData = (PROCESSOR_DATA_BLOCK *) Context;\r
+\r
   for (ProcessorNumber = 0; ProcessorNumber < gMPSystem.NumberOfProcessors; ProcessorNumber++) {\r
     if ((ProcessorData[ProcessorNumber].Info.StatusFlag & PROCESSOR_AS_BSP_BIT) == PROCESSOR_AS_BSP_BIT) {\r
      // Skip BSP\r
@@ -1212,7 +1214,6 @@ CpuMpServicesInit (
   EFI_HANDLE              Handle;\r
   EMU_IO_THUNK_PROTOCOL   *IoThunk;\r
   UINTN                   MaxCpus;\r
-  char                    *Str;\r
 \r
   MaxCpus = 1; // BSP\r
   \r

diff --git a/InOsEmuPkg/EmuBusDriverDxe/EmuBusDriverDxe.c b/InOsEmuPkg/EmuBusDriverDxe/EmuBusDriverDxe.c
index b76236f3252269d320083537329b78ef3a3a4220..0f04e0a3c423df77ba177074cad7bfd0c93c4c15 100644 (file)
--- a/InOsEmuPkg/EmuBusDriverDxe/EmuBusDriverDxe.c
+++ b/InOsEmuPkg/EmuBusDriverDxe/EmuBusDriverDxe.c
@@ -1,15 +1,15 @@
 /** @file\r
  Emu Bus driver\r
- \r
-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
 Portions copyright (c) 2011, Apple Inc. All rights reserved.\r
-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
+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
@@ -43,7 +43,6 @@ EmuBusDriverBindingSupported (
   EFI_STATUS                Status;\r
   EFI_DEVICE_PATH_PROTOCOL  *ParentDevicePath;\r
   EMU_THUNK_PROTOCOL        *EmuThunk;\r
-  UINTN                     Index;\r
 \r
   //\r
   // Check the contents of the first Device Path Node of RemainingDevicePath to make sure\r
@@ -145,17 +144,9 @@ EmuBusDriverBindingStart (
   EMU_IO_DEVICE                   *EmuDevice;\r
   EMU_BUS_DEVICE                  *EmuBusDevice;\r
   EMU_IO_THUNK_PROTOCOL           *EmuIoThunk;\r
-  UINTN                           Index;\r
-  CHAR16                          *StartString;\r
-  CHAR16                          *SubString;\r
-  UINTN                           StringSize;\r
   UINT16                          ComponentName[512];\r
   EMU_VENDOR_DEVICE_PATH_NODE     *Node;\r
   BOOLEAN                         CreateDevice;\r
-  CHAR16                          *TempStr;\r
-  CHAR16                          *PcdTempStr;\r
-  UINTN                           TempStrSize;\r
-\r
 \r
   Status = EFI_UNSUPPORTED;\r
 \r

diff --git a/InOsEmuPkg/EmuGopDxe/GopInput.c b/InOsEmuPkg/EmuGopDxe/GopInput.c
index f6c7959bcf99de86a617040fca85c1a128fd5af5..0bc2eb5a0280349451a26bb6a3964f81db171140 100644 (file)
--- a/InOsEmuPkg/EmuGopDxe/GopInput.c
+++ b/InOsEmuPkg/EmuGopDxe/GopInput.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 0 2011,Apple Inc. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
@@ -98,8 +98,6 @@ GopPrivateBreakCallbackFunction (
   IN EFI_KEY_DATA   *KeyData
   )
 { 
-  GOP_PRIVATE_DATA  *Private = (GOP_PRIVATE_DATA *)Context;
-  
   KeyMapBreak (KeyData);
 }
 

diff --git a/InOsEmuPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystem.c b/InOsEmuPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystem.c
index b7181fd2554de9c94fbec4c7868e4994ad4dea11..935cd122014f767afa6915babfb66902819be7a5 100644 (file)
--- a/InOsEmuPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystem.c
+++ b/InOsEmuPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystem.c
@@ -4,15 +4,15 @@
   environment variables. The variables must be visible to the Microsoft* \r
   Developer Studio for them to work.\r
 \r
-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
 Portions copyright (c) 2011, Apple Inc. All rights reserved.\r
-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
+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
@@ -692,7 +692,6 @@ EmuSimpleFileSystemDriverBindingStart (
   EFI_STATUS                        Status;\r
   EMU_IO_THUNK_PROTOCOL             *EmuIoThunk;\r
   EMU_SIMPLE_FILE_SYSTEM_PRIVATE    *Private;\r
-  INTN i;\r
 \r
   Private = NULL;\r
 \r

diff --git a/InOsEmuPkg/Include/Protocol/EmuPthreadThunk.h b/InOsEmuPkg/Include/Protocol/EmuPthreadThunk.h
index 80325f4305f9aafbf876e7a89e54a0b7b91d6d0f..d5c41a0e098903abbcc211b1d528cf28dd84f1a0 100644 (file)
--- a/InOsEmuPkg/Include/Protocol/EmuPthreadThunk.h
+++ b/InOsEmuPkg/Include/Protocol/EmuPthreadThunk.h
@@ -2,7 +2,8 @@
   Emulator Thunk to abstract OS services from pure EFI code\r
 \r
   Copyright (c) 2010 - 2011, Apple Inc. All rights reserved.<BR>\r
-  \r
+  Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+\r
   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
@@ -61,7 +62,7 @@ UINTN
 \r
 typedef \r
 VOID *\r
-(*PTREAD_THUNK_THEAD_ENTRY) (\r
+(EFIAPI *PTREAD_THUNK_THEAD_ENTRY) (\r
   IN  VOID *Context\r
   );\r
 \r