1. Remove #ifdef _MSC_EXTENSION_ from all source files

[mirror_edk2.git] / EdkModulePkg / Universal / Capsule / RuntimeDxe / CapsuleService.c

diff --git a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c
index 9f4fe3c06170ea69b478f455e3e922815ade4b19..50de4c6c9d2a0c25a000c64d29bb03fc6920eb6b 100644 (file)
--- a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c
+++ b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c
@@ -1,13 +1,13 @@
 /*++\r
 \r
-Copyright (c) 2006, Intel Corporation                                                         \r
-All rights reserved. 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
+Copyright (c) 2006 - 2007, Intel Corporation\r
+All rights reserved. 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
 Module Name:\r
 \r
@@ -43,7 +43,7 @@ Arguments:
   CapsuleHeaderArray             A array of pointers to capsule headers passed in\r
   CapsuleCount                   The number of capsule\r
   ScatterGatherList              Physical address of datablock list points to capsule\r
-  \r
+\r
 Returns:\r
 \r
   EFI STATUS\r
@@ -51,8 +51,8 @@ Returns:
                                  not set, the capsule has been successfully processed by the firmware.\r
                                  If it set, the ScattlerGatherList is successfully to be set.\r
   EFI_INVALID_PARAMETER          CapsuleCount is less than 1,CapsuleGuid is not supported.\r
-  EFI_DEVICE_ERROR               Failed to SetVariable or AllocatePool or ProcessFirmwareVolume. \r
-  \r
+  EFI_DEVICE_ERROR               Failed to SetVariable or AllocatePool or ProcessFirmwareVolume.\r
+\r
 --*/\r
 {\r
   UINTN                     CapsuleSize;\r
@@ -76,17 +76,17 @@ Returns:
   for (ArrayNumber = 0; ArrayNumber < CapsuleCount; ArrayNumber++) {\r
     CapsuleHeader = CapsuleHeaderArray[ArrayNumber];\r
     if ((CapsuleHeader->Flags & (CAPSULE_FLAGS_PERSIST_ACROSS_RESET | CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE)) == CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) {\r
-      return EFI_INVALID_PARAMETER;      \r
+      return EFI_INVALID_PARAMETER;\r
     }\r
     if (!CompareGuid (&CapsuleHeader->CapsuleGuid, &mEfiCapsuleHeaderGuid)) {\r
       if ((CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) == 0) {\r
         return EFI_UNSUPPORTED;\r
-      }  \r
-    }   \r
+      }\r
+    }\r
   }\r
 \r
   //\r
-  //Assume that capsules have the same flags on reseting or not. \r
+  //Assume that capsules have the same flags on reseting or not.\r
   //\r
   CapsuleHeader = CapsuleHeaderArray[0];\r
 \r
@@ -97,28 +97,28 @@ Returns:
     if (!FeaturePcdGet(PcdSupportUpdateCapsuleRest)) {\r
       return EFI_UNSUPPORTED;\r
     }\r
-    \r
+\r
     if (ScatterGatherList == 0) {\r
       return EFI_INVALID_PARAMETER;\r
     } else {\r
       Status = EfiSetVariable (\r
-                 EFI_CAPSULE_VARIABLE_NAME,  \r
-                 &gEfiCapsuleVendorGuid,     \r
-                 EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS,  \r
-                 sizeof (UINTN), \r
-                 (VOID *) &ScatterGatherList \r
+                 EFI_CAPSULE_VARIABLE_NAME,\r
+                 &gEfiCapsuleVendorGuid,\r
+                 EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
+                 sizeof (UINTN),\r
+                 (VOID *) &ScatterGatherList\r
                  );\r
-      if (Status != EFI_SUCCESS) { \r
+      if (Status != EFI_SUCCESS) {\r
         return EFI_DEVICE_ERROR;\r
       }\r
     }\r
     return EFI_SUCCESS;\r
   }\r
-  \r
+\r
   //\r
   //The rest occurs in the condition of non-reset mode\r
   //\r
-  if (EfiAtRuntime ()) { \r
+  if (EfiAtRuntime ()) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -128,34 +128,31 @@ Returns:
   for (ArrayNumber = 0; ArrayNumber < CapsuleCount ; ArrayNumber++) {\r
     CapsuleHeader = CapsuleHeaderArray[ArrayNumber];\r
     CapsuleSize = CapsuleHeader->CapsuleImageSize - CapsuleHeader->HeaderSize;\r
-    Status = gBS->AllocatePool (EfiBootServicesData, CapsuleSize, &BufferPtr);\r
-    if (Status != EFI_SUCCESS) {\r
-      goto Done;\r
+\r
+    BufferPtr = AllocatePool (CapsuleSize);\r
+    if (BufferPtr == NULL) {\r
+      return EFI_DEVICE_ERROR;\r
     }\r
-    gBS->CopyMem (BufferPtr, (UINT8*)CapsuleHeader+ CapsuleHeader->HeaderSize, CapsuleSize);\r
+\r
+    CopyMem (BufferPtr, (UINT8*)CapsuleHeader+ CapsuleHeader->HeaderSize, CapsuleSize);\r
 \r
     //\r
-    //Call DXE service ProcessFirmwareVolume to process immediatelly \r
+    //Call DXE service ProcessFirmwareVolume to process immediatelly\r
     //\r
     Status = gDS->ProcessFirmwareVolume (BufferPtr, CapsuleSize, &FvHandle);\r
     if (Status != EFI_SUCCESS) {\r
-      gBS->FreePool (BufferPtr);\r
+      FreePool (BufferPtr);\r
       return EFI_DEVICE_ERROR;\r
     }\r
     gDS->Dispatch ();\r
-    gBS->FreePool (BufferPtr);\r
+    FreePool (BufferPtr);\r
   }\r
-  return EFI_SUCCESS;\r
 \r
-Done:\r
-  if (BufferPtr != NULL) {\r
-    gBS->FreePool (BufferPtr);\r
-  }     \r
-  return EFI_DEVICE_ERROR;\r
+  return EFI_SUCCESS;\r
 }\r
 \r
 \r
-  \r
+\r
 EFI_STATUS\r
 EFIAPI\r
 QueryCapsuleCapabilities (\r
@@ -196,10 +193,10 @@ Returns:
 \r
   if ((MaxiumCapsuleSize == NULL) ||(ResetType == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
-  }  \r
+  }\r
 \r
   CapsuleHeader = NULL;\r
-  \r
+\r
   //\r
   //Compare GUIDs with EFI_CAPSULE_GUID, if capsule header contains CAPSULE_FLAGS_PERSIST_ACROSS_RESET\r
   //and CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE flags,whatever the GUID is ,the service supports.\r
@@ -207,19 +204,19 @@ Returns:
   for (ArrayNumber = 0; ArrayNumber < CapsuleCount; ArrayNumber++) {\r
     CapsuleHeader = CapsuleHeaderArray[ArrayNumber];\r
     if ((CapsuleHeader->Flags & (CAPSULE_FLAGS_PERSIST_ACROSS_RESET | CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE)) == CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) {\r
-      return EFI_INVALID_PARAMETER;      \r
+      return EFI_INVALID_PARAMETER;\r
     }\r
     if (!CompareGuid (&CapsuleHeader->CapsuleGuid, &mEfiCapsuleHeaderGuid)) {\r
       if ((CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) == 0) {\r
         return EFI_UNSUPPORTED;\r
       }\r
-    }  \r
+    }\r
   }\r
 \r
   //\r
-  //Assume that capsules have the same flags on reseting or not. \r
+  //Assume that capsules have the same flags on reseting or not.\r
   //\r
-  CapsuleHeader = CapsuleHeaderArray[0];  \r
+  CapsuleHeader = CapsuleHeaderArray[0];\r
   if ((CapsuleHeader->Flags & CAPSULE_FLAGS_PERSIST_ACROSS_RESET) != 0) {\r
     //\r
     //Check if the platform supports update capsule across a system reset\r
@@ -228,11 +225,11 @@ Returns:
       return EFI_UNSUPPORTED;\r
     }\r
     *ResetType = EfiResetWarm;\r
-    *MaxiumCapsuleSize = FixedPcdGet32(PcdMaxSizePopulateCapsule);    \r
+    *MaxiumCapsuleSize = FixedPcdGet32(PcdMaxSizePopulateCapsule);\r
   } else {\r
     *ResetType = EfiResetCold;\r
     *MaxiumCapsuleSize = FixedPcdGet32(PcdMaxSizeNonPopulateCapsule);\r
-  }  \r
+  }\r
   return EFI_SUCCESS;\r
-} \r
+}\r
 \r