ArmPkg/CpuDxe: order CpuDxe after ArmGicDxe via protocol depex

[mirror_edk2.git] / EmulatorPkg / CpuRuntimeDxe / Cpu.c

diff --git a/EmulatorPkg/CpuRuntimeDxe/Cpu.c b/EmulatorPkg/CpuRuntimeDxe/Cpu.c
index fc8d325ffc26a7488fca033d4cac6f2af1aeebd0..47fb7f07e891a74554b30411f646d615909a6e21 100644 (file)
--- a/EmulatorPkg/CpuRuntimeDxe/Cpu.c
+++ b/EmulatorPkg/CpuRuntimeDxe/Cpu.c
@@ -1,7 +1,7 @@
 /*++ @file\r
   Emu driver to produce CPU Architectural Protocol.\r
 \r
-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
 Portions copyright (c) 2011 - 2012, 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
@@ -127,7 +127,7 @@ SMBIOS_TABLE_TYPE4 mCpuSmbiosType4 = {
 \r
 CHAR8 *mCpuSmbiosType4Strings[] = {\r
   "Socket",\r
-  "edk2.svn.sourceforge.net",\r
+  "http://www.tianocore.org/edk2/",\r
   "Emulated Processor",\r
   "1.0",\r
   "1.0",\r
@@ -241,9 +241,9 @@ CpuUpdateSmbios (
   IN UINTN  MaxCpus\r
   )\r
 {\r
-  mCpuSmbiosType4.CoreCount        = MaxCpus;\r
-  mCpuSmbiosType4.EnabledCoreCount = MaxCpus;\r
-  mCpuSmbiosType4.ThreadCount      = MaxCpus;\r
+  mCpuSmbiosType4.CoreCount        = (UINT8) MaxCpus;\r
+  mCpuSmbiosType4.EnabledCoreCount = (UINT8) MaxCpus;\r
+  mCpuSmbiosType4.ThreadCount      = (UINT8) MaxCpus;\r
 \r
   LogSmbiosData ((EFI_SMBIOS_TABLE_HEADER *)&mCpuSmbiosType4, mCpuSmbiosType4Strings);\r
 }\r
@@ -327,9 +327,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
@@ -341,8 +338,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
@@ -352,7 +347,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
@@ -392,8 +386,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
@@ -404,7 +396,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