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

5 files changed, 30 insertions, 40 deletions

diff --git a/InOsEmuPkg/CpuRuntimeDxe/MpService.c b/InOsEmuPkg/CpuRuntimeDxe/MpService.c
index 8d7666b7b4..6bb9dea2b3 100644
--- 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.

   Diagnostics applications may also use this protocol for multi-processor.

 

-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

 Portitions Copyright (c) 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 that accompanies this distribution.  

+This program and the accompanying materials are licensed and made available under

+the terms and conditions of the BSD License that accompanies this distribution.

 The full text of the license may be found at

-http://opensource.org/licenses/bsd-license.php.                                          

-    

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

+http://opensource.org/licenses/bsd-license.php.

+

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

-  

+

 **/

 

 #include "CpuDriver.h"

@@ -929,6 +929,8 @@ CpuCheckAllAPsStatus (
   EFI_STATUS            Status;

   PROCESSOR_STATE       ProcessorState;

 

+  ProcessorData = (PROCESSOR_DATA_BLOCK *) Context;

+

   for (ProcessorNumber = 0; ProcessorNumber < gMPSystem.NumberOfProcessors; ProcessorNumber++) {

     if ((ProcessorData[ProcessorNumber].Info.StatusFlag & PROCESSOR_AS_BSP_BIT) == PROCESSOR_AS_BSP_BIT) {

      // Skip BSP

@@ -1212,7 +1214,6 @@ CpuMpServicesInit (
   EFI_HANDLE              Handle;

   EMU_IO_THUNK_PROTOCOL   *IoThunk;

   UINTN                   MaxCpus;

-  char                    *Str;

 

   MaxCpus = 1; // BSP

   

diff --git a/InOsEmuPkg/EmuBusDriverDxe/EmuBusDriverDxe.c b/InOsEmuPkg/EmuBusDriverDxe/EmuBusDriverDxe.c
index b76236f325..0f04e0a3c4 100644
--- a/InOsEmuPkg/EmuBusDriverDxe/EmuBusDriverDxe.c
+++ b/InOsEmuPkg/EmuBusDriverDxe/EmuBusDriverDxe.c
@@ -1,15 +1,15 @@
 /** @file

  Emu Bus driver

- 

-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>

+

+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

 Portions copyright (c) 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         

-which accompanies this distribution.  The full text of the license may be found at        

-http://opensource.org/licenses/bsd-license.php                                            

-                                                                                          

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+This program and the accompanying materials

+are licensed and made available under the terms and conditions of the BSD License

+which accompanies this distribution.  The full text of the license may be found at

+http://opensource.org/licenses/bsd-license.php

+

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

 

 **/

@@ -43,7 +43,6 @@ EmuBusDriverBindingSupported (
   EFI_STATUS                Status;

   EFI_DEVICE_PATH_PROTOCOL  *ParentDevicePath;

   EMU_THUNK_PROTOCOL        *EmuThunk;

-  UINTN                     Index;

 

   //

   // Check the contents of the first Device Path Node of RemainingDevicePath to make sure

@@ -145,17 +144,9 @@ EmuBusDriverBindingStart (
   EMU_IO_DEVICE                   *EmuDevice;

   EMU_BUS_DEVICE                  *EmuBusDevice;

   EMU_IO_THUNK_PROTOCOL           *EmuIoThunk;

-  UINTN                           Index;

-  CHAR16                          *StartString;

-  CHAR16                          *SubString;

-  UINTN                           StringSize;

   UINT16                          ComponentName[512];

   EMU_VENDOR_DEVICE_PATH_NODE     *Node;

   BOOLEAN                         CreateDevice;

-  CHAR16                          *TempStr;

-  CHAR16                          *PcdTempStr;

-  UINTN                           TempStrSize;

-

 

   Status = EFI_UNSUPPORTED;

 

diff --git a/InOsEmuPkg/EmuGopDxe/GopInput.c b/InOsEmuPkg/EmuGopDxe/GopInput.c
index f6c7959bcf..0bc2eb5a02 100644
--- 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 b7181fd255..935cd12201 100644
--- a/InOsEmuPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystem.c
+++ b/InOsEmuPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystem.c
@@ -4,15 +4,15 @@
   environment variables. The variables must be visible to the Microsoft* 

   Developer Studio for them to work.

 

-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

 Portions copyright (c) 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         

-which accompanies this distribution.  The full text of the license may be found at        

-http://opensource.org/licenses/bsd-license.php                                            

-                                                                                          

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+This program and the accompanying materials

+are licensed and made available under the terms and conditions of the BSD License

+which accompanies this distribution.  The full text of the license may be found at

+http://opensource.org/licenses/bsd-license.php

+

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

 **/

 

@@ -692,7 +692,6 @@ EmuSimpleFileSystemDriverBindingStart (
   EFI_STATUS                        Status;

   EMU_IO_THUNK_PROTOCOL             *EmuIoThunk;

   EMU_SIMPLE_FILE_SYSTEM_PRIVATE    *Private;

-  INTN i;

 

   Private = NULL;

 

diff --git a/InOsEmuPkg/Include/Protocol/EmuPthreadThunk.h b/InOsEmuPkg/Include/Protocol/EmuPthreadThunk.h
index 80325f4305..d5c41a0e09 100644
--- 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

 

   Copyright (c) 2010 - 2011, Apple Inc. All rights reserved.<BR>

-  

+  Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>

+

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -61,7 +62,7 @@ UINTN
 

 typedef 

 VOID *

-(*PTREAD_THUNK_THEAD_ENTRY) (

+(EFIAPI *PTREAD_THUNK_THEAD_ENTRY) (

   IN  VOID *Context

   );