From 0b94e31981fde83116598dc7a2c8a346d46fd3cf Mon Sep 17 00:00:00 2001
From: klu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 14 Oct 2008 08:59:32 +0000
Subject: Fix ICC building issue for Nt32 platform.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6110 6f19259b-4bc3-4df7-8a09-765794883524
---
 Nt32Pkg/CpuRuntimeDxe/Cpu.c   | 10 +---------
 Nt32Pkg/CpuRuntimeDxe/CpuIo.c |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'Nt32Pkg/CpuRuntimeDxe')

diff --git a/Nt32Pkg/CpuRuntimeDxe/Cpu.c b/Nt32Pkg/CpuRuntimeDxe/Cpu.c
index f01df2ed38..9cc2aea86b 100644
--- a/Nt32Pkg/CpuRuntimeDxe/Cpu.c
+++ b/Nt32Pkg/CpuRuntimeDxe/Cpu.c
@@ -254,9 +254,6 @@ Returns:
 // TODO:    This - add argument and description to function comment
 // TODO:    InitType - add argument and description to function comment
 {
-  CPU_ARCH_PROTOCOL_PRIVATE *Private;
-
-  Private = CPU_ARCH_PROTOCOL_PRIVATE_DATA_FROM_THIS (This);
   return EFI_UNSUPPORTED;
 }
 
@@ -291,7 +288,6 @@ Returns:
 // TODO:    InterruptType - add argument and description to function comment
 // TODO:    InterruptHandler - add argument and description to function comment
 {
-  CPU_ARCH_PROTOCOL_PRIVATE *Private;
 
   //
   // Do parameter checking for EFI spec conformance
@@ -302,7 +298,6 @@ Returns:
   //
   // Do nothing for Nt32 emulation
   //
-  Private = CPU_ARCH_PROTOCOL_PRIVATE_DATA_FROM_THIS (This);
   return EFI_UNSUPPORTED;
 }
 
@@ -381,8 +376,6 @@ Returns:
 // TODO:    Attributes - add argument and description to function comment
 // TODO:    EFI_INVALID_PARAMETER - add return value to function comment
 {
-  CPU_ARCH_PROTOCOL_PRIVATE *Private;
-
   //
   // Check for invalid parameter for Spec conformance
   //
@@ -393,7 +386,6 @@ Returns:
   //
   // Do nothing for Nt32 emulation
   //
-  Private = CPU_ARCH_PROTOCOL_PRIVATE_DATA_FROM_THIS (This);
   return EFI_UNSUPPORTED;
 }
 
@@ -426,7 +418,7 @@ Returns:
   //
   // Locate DataHub protocol.
   //
-  Status = gBS->LocateProtocol (&gEfiDataHubProtocolGuid, NULL, &DataHub);
+  Status = gBS->LocateProtocol (&gEfiDataHubProtocolGuid, NULL, (VOID**)&DataHub);
   if (EFI_ERROR (Status)) {
     return;
   }
diff --git a/Nt32Pkg/CpuRuntimeDxe/CpuIo.c b/Nt32Pkg/CpuRuntimeDxe/CpuIo.c
index aa474db48a..b513c7242d 100644
--- a/Nt32Pkg/CpuRuntimeDxe/CpuIo.c
+++ b/Nt32Pkg/CpuRuntimeDxe/CpuIo.c
@@ -319,7 +319,7 @@ Returns:
     Count = 1;
   }
 
-  Width = Width & 0x03;
+  Width = (EFI_CPU_IO_PROTOCOL_WIDTH)(Width & 0x03);
   if (Address - 1 + (1 << Width) * Count > Limit) {
     return EFI_UNSUPPORTED;
   }
-- 
cgit v1.2.3