Sync up ArmPkg with patch from mailing list. Changed name of BdsLib.h to BdsUnixLib.h and fixed a lot of issues with Xcode building.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11293 6f19259b-4bc3-4df7-8a09-765794883524
2011-02-02 22:35:30 +00:00
parent 7373d15a98
commit 1bfda055df
113 changed files with 7979 additions and 964 deletions
--- a/ArmPkg/Library/BdsLib/BdsAppLoader.c
+++ b/ArmPkg/Library/BdsLib/BdsAppLoader.c
@@ -0,0 +1,102 @@
+/** @file
+*
+*  Copyright (c) 2011, ARM Limited. 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.             
+*
+**/
+
+#include "BdsInternal.h"
+
+EFI_STATUS
+BdsLoadPeCoff (
+ IN  BDS_FILE     *EfiAppFile
+ )
+{
+    EFI_STATUS                          Status;
+    EFI_HANDLE                          ImageHandle;
+    MEDIA_FW_VOL_FILEPATH_DEVICE_PATH   NewNode;
+    EFI_DEVICE_PATH_PROTOCOL            *DevicePath;
+
+    // Only support loading from FV right now
+    ASSERT(EfiAppFile->Type == BDS_FILETYPE_FV);
+
+    // Generate the Device Path for the file
+    DevicePath = DuplicateDevicePath(EfiAppFile->DevicePath);
+    EfiInitializeFwVolDevicepathNode (&NewNode, &(EfiAppFile->File.Fv.Guid));
+    DevicePath = AppendDevicePathNode (DevicePath, (EFI_DEVICE_PATH_PROTOCOL *)&NewNode);
+
+    Status = gBS->LoadImage (TRUE, gImageHandle, DevicePath, NULL, 0, &ImageHandle);
+    if (!EFI_ERROR (Status)) {
+        Status = gBS->StartImage (ImageHandle, NULL, NULL);
+    }
+  
+    return Status;
+}
+
+EFI_STATUS BdsLoadApplicationFromPath(
+    IN  CHAR16* EfiAppPath
+) {
+    EFI_STATUS Status;
+    BDS_FILE   EfiAppFile;
+
+    // Need to connect every drivers to ensure no dependencies are missing for the application
+    Status = BdsConnectAllDrivers();
+    if (EFI_ERROR(Status)) {
+        DEBUG ((EFI_D_ERROR, "FAIL to connect all drivers\n"));
+        return Status;
+    }
+
+    // Locate the application from a device path
+    Status = BdsLoadFilePath(EfiAppPath, &EfiAppFile);
+    if (EFI_ERROR(Status)) {
+        DEBUG ((EFI_D_ERROR, "ERROR: Do not find EFI application %s\n",EfiAppPath));
+        return Status;
+    }
+
+    // Start the application
+    Status = BdsLoadPeCoff(&EfiAppFile);
+
+    return Status;
+}
+
+EFI_STATUS BdsLoadApplication(
+    IN  CHAR16* EfiApp
+) {
+    EFI_STATUS                      Status;
+    UINTN                           NoHandles, HandleIndex;
+    EFI_HANDLE                      *Handles;
+    BDS_FILE                        EfiAppFile;
+
+    // Need to connect every drivers to ensure no dependencies are missing for the application
+    Status = BdsConnectAllDrivers();
+    if (EFI_ERROR(Status)) {
+        DEBUG ((EFI_D_ERROR, "FAIL to connect all drivers\n"));
+        return Status;
+    }
+
+    // Search the application in any Firmware Volume
+    Status = gBS->LocateHandleBuffer (ByProtocol, &gEfiFirmwareVolume2ProtocolGuid, NULL, &NoHandles, &Handles);
+    if (EFI_ERROR (Status) || (NoHandles == 0)) {
+        DEBUG ((EFI_D_ERROR, "FAIL to find Firmware Volume\n"));
+        return Status;
+    }
+
+    // Search in all Firmware Volume for the EFI Application
+    for (HandleIndex = 0; HandleIndex < NoHandles; HandleIndex++) {
+        Status = BdsLoadFileFromFirmwareVolume(Handles[HandleIndex],EfiApp,EFI_FV_FILETYPE_APPLICATION,&EfiAppFile);
+        if (!EFI_ERROR (Status)) {
+            // Start the application
+            Status = BdsLoadPeCoff(&EfiAppFile);
+            return Status;
+        }
+    }
+
+    return Status;
+}