EmulatorPkg/PlatformBmLib: Fix GCC build failure

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

diff --git a/EmulatorPkg/CpuRuntimeDxe/Cpu.c b/EmulatorPkg/CpuRuntimeDxe/Cpu.c
index b25ed45da4f1ca4af0a993ccba92ce515bbf11e1..83e876509ac19fc9806ac5867da69d018d7be31c 100644 (file)
--- a/EmulatorPkg/CpuRuntimeDxe/Cpu.c
+++ b/EmulatorPkg/CpuRuntimeDxe/Cpu.c
@@ -63,7 +63,7 @@ SMBIOS_TABLE_TYPE4 mCpuSmbiosType4 = {
       0, //  ProcessorXModel:    4;\r
       0, //  ProcessorXFamily:   8;\r
       0, //  ProcessorReserved2: 4;\r
-    }, \r
+    },\r
     {  // PROCESSOR_FEATURE_FLAGS\r
       0, //  ProcessorFpu       :1;\r
       0, //  ProcessorVme       :1;\r
@@ -100,13 +100,13 @@ SMBIOS_TABLE_TYPE4 mCpuSmbiosType4 = {
   },\r
   3,                    // ProcessorVersion String;\r
   {                     // Voltage;\r
-    1,  // ProcessorVoltageCapability5V        :1; \r
-    1,  // ProcessorVoltageCapability3_3V      :1;  \r
-    1,  // ProcessorVoltageCapability2_9V      :1;  \r
+    1,  // ProcessorVoltageCapability5V        :1;\r
+    1,  // ProcessorVoltageCapability3_3V      :1;\r
+    1,  // ProcessorVoltageCapability2_9V      :1;\r
     0,  // ProcessorVoltageCapabilityReserved  :1; ///< Bit 3, must be zero.\r
     0,  // ProcessorVoltageReserved            :3; ///< Bits 4-6, must be zero.\r
     0   // ProcessorVoltageIndicateLegacy      :1;\r
-  },              \r
+  },\r
   0,                      // ExternalClock;\r
   0,                      // MaxSpeed;\r
   0,                      // CurrentSpeed;\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
@@ -151,26 +151,26 @@ CHAR8 *mCpuSmbiosType4Strings[] = {
     "Not Found",\r
     NULL\r
   };\r
-  \r
+\r
   ...\r
   LogSmbiosData (\r
-    (EFI_SMBIOS_TABLE_HEADER*)&gSmbiosType12, \r
+    (EFI_SMBIOS_TABLE_HEADER*)&gSmbiosType12,\r
     gSmbiosType12Strings\r
     );\r
 \r
   @param  Template    Fixed SMBIOS structure, required.\r
-  @param  StringArray Array of strings to convert to an SMBIOS string pack. \r
+  @param  StringArray Array of strings to convert to an SMBIOS string pack.\r
                       NULL is OK.\r
 \r
 **/\r
 EFI_STATUS\r
 LogSmbiosData (\r
   IN  EFI_SMBIOS_TABLE_HEADER *Template,\r
-  IN  CHAR8                   **StringPack \r
+  IN  CHAR8                   **StringPack\r
   )\r
 {\r
   EFI_STATUS                Status;\r
-  EFI_SMBIOS_PROTOCOL       *Smbios;  \r
+  EFI_SMBIOS_PROTOCOL       *Smbios;\r
   EFI_SMBIOS_HANDLE         SmbiosHandle;\r
   EFI_SMBIOS_TABLE_HEADER   *Record;\r
   UINTN                     Index;\r
@@ -219,7 +219,7 @@ LogSmbiosData (
     Str += StringSize;\r
   }\r
   *Str = 0;\r
-  \r
+\r
   SmbiosHandle = SMBIOS_HANDLE_PI_RESERVED;\r
   Status = Smbios->Add (\r
                      Smbios,\r
@@ -228,7 +228,7 @@ LogSmbiosData (
                      Record\r
                      );\r
   ASSERT_EFI_ERROR (Status);\r
-  \r
+\r
   FreePool (Record);\r
   return Status;\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