Changeset 99404 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c

Timestamp:

Apr 14, 2023 3:17:44 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

156854

Message:

Devices/EFI/FirmwareNew: Update to edk2-stable202302 and make it build, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c (modified) (9 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c

@@ -19 +19 @@
 #pragma pack(1)
 typedef struct {
-  MEMMAP_DEVICE_PATH                      Node1;
-  EFI_DEVICE_PATH_PROTOCOL                End;
+  MEMMAP_DEVICE_PATH          Node1;
+  EFI_DEVICE_PATH_PROTOCOL    End;
 } MEMORY_DEVICE_PATH;
 #pragma pack()
 
-STATIC CONST MEMORY_DEVICE_PATH MemoryDevicePathTemplate =
+STATIC CONST MEMORY_DEVICE_PATH  MemoryDevicePathTemplate =
 {
   {
@@ -45 +45 @@
 };
 
-
 /**
   Start an EFI Application from a Device Path
@@ -60 +59 @@
 EFI_STATUS
 StartEfiApplication (
-  IN EFI_HANDLE                  ParentImageHandle,
-  IN EFI_DEVICE_PATH_PROTOCOL    *DevicePath,
-  IN UINTN                       LoadOptionsSize,
-  IN VOID*                       LoadOptions
+  IN EFI_HANDLE                ParentImageHandle,
+  IN EFI_DEVICE_PATH_PROTOCOL  *DevicePath,
+  IN UINTN                     LoadOptionsSize,
+  IN VOID                      *LoadOptions
   )
 {
-  EFI_STATUS                   Status;
-  EFI_HANDLE                   ImageHandle;
-  EFI_LOADED_IMAGE_PROTOCOL*   LoadedImage;
+  EFI_STATUS                 Status;
+  EFI_HANDLE                 ImageHandle;
+  EFI_LOADED_IMAGE_PROTOCOL  *LoadedImage;
 
   // Load the image from the device path with Boot Services function
-  Status = gBS->LoadImage (TRUE, ParentImageHandle, DevicePath, NULL, 0,
-                  &ImageHandle);
+  Status = gBS->LoadImage (
+                  TRUE,
+                  ParentImageHandle,
+                  DevicePath,
+                  NULL,
+                  0,
+                  &ImageHandle
+                  );
   if (EFI_ERROR (Status)) {
     //
@@ -83 +88 @@
       gBS->UnloadImage (ImageHandle);
     }
+
     return Status;
   }
@@ -88 +94 @@
   // Passed LoadOptions to the EFI Application
   if (LoadOptionsSize != 0) {
-    Status = gBS->HandleProtocol (ImageHandle, &gEfiLoadedImageProtocolGuid,
-                    (VOID **) &LoadedImage);
+    Status = gBS->HandleProtocol (
+                    ImageHandle,
+                    &gEfiLoadedImageProtocolGuid,
+                    (VOID **)&LoadedImage
+                    );
     if (EFI_ERROR (Status)) {
       return Status;
     }
 
-    LoadedImage->LoadOptionsSize  = LoadOptionsSize;
-    LoadedImage->LoadOptions      = LoadOptions;
+    LoadedImage->LoadOptionsSize = LoadOptionsSize;
+    LoadedImage->LoadOptions     = LoadOptions;
   }
 
@@ -110 +119 @@
 EFI_STATUS
 BootAndroidBootImg (
-  IN UINTN    BufferSize,
-  IN VOID    *Buffer
+  IN UINTN  BufferSize,
+  IN VOID   *Buffer
   )
 {
-  EFI_STATUS                          Status;
-  CHAR8                               KernelArgs[ANDROID_BOOTIMG_KERNEL_ARGS_SIZE];
-  VOID                               *Kernel;
-  UINTN                               KernelSize;
-  VOID                               *Ramdisk;
-  UINTN                               RamdiskSize;
-  MEMORY_DEVICE_PATH                  KernelDevicePath;
-  CHAR16                              *LoadOptions, *NewLoadOptions;
+  EFI_STATUS          Status;
+  CHAR8               KernelArgs[ANDROID_BOOTIMG_KERNEL_ARGS_SIZE];
+  VOID                *Kernel;
+  UINTN               KernelSize;
+  VOID                *Ramdisk;
+  UINTN               RamdiskSize;
+  MEMORY_DEVICE_PATH  KernelDevicePath;
+  CHAR16              *LoadOptions, *NewLoadOptions;
 
   Status = ParseAndroidBootImg (
-            Buffer,
-            &Kernel,
-            &KernelSize,
-            &Ramdisk,
-            &RamdiskSize,
-            KernelArgs
-            );
+             Buffer,
+             &Kernel,
+             &KernelSize,
+             &Ramdisk,
+             &RamdiskSize,
+             KernelArgs
+             );
   if (EFI_ERROR (Status)) {
     return Status;
@@ -139 +148 @@
   // Have to cast to UINTN before casting to EFI_PHYSICAL_ADDRESS in order to
   // appease GCC.
-  KernelDevicePath.Node1.StartingAddress = (EFI_PHYSICAL_ADDRESS)(UINTN) Kernel;
-  KernelDevicePath.Node1.EndingAddress   = (EFI_PHYSICAL_ADDRESS)(UINTN) Kernel + KernelSize;
+  KernelDevicePath.Node1.StartingAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)Kernel;
+  KernelDevicePath.Node1.EndingAddress   = (EFI_PHYSICAL_ADDRESS)(UINTN)Kernel + KernelSize;
 
   // Initialize Linux command line
@@ -149 +158 @@
 
   if (RamdiskSize != 0) {
-    NewLoadOptions = CatSPrint (LoadOptions, L" initrd=0x%x,0x%x",
-                       (UINTN)Ramdisk, RamdiskSize);
+    NewLoadOptions = CatSPrint (
+                       LoadOptions,
+                       L" initrd=0x%x,0x%x",
+                       (UINTN)Ramdisk,
+                       RamdiskSize
+                       );
     FreePool (LoadOptions);
     if (NewLoadOptions == NULL) {
       return EFI_OUT_OF_RESOURCES;
     }
+
     LoadOptions = NewLoadOptions;
   }
 
-  Status = StartEfiApplication (gImageHandle,
-             (EFI_DEVICE_PATH_PROTOCOL *) &KernelDevicePath,
+  Status = StartEfiApplication (
+             gImageHandle,
+             (EFI_DEVICE_PATH_PROTOCOL *)&KernelDevicePath,
              StrSize (LoadOptions),
-             LoadOptions);
+             LoadOptions
+             );
   if (EFI_ERROR (Status)) {
-    DEBUG ((EFI_D_ERROR, "Couldn't Boot Linux: %d\n", Status));
+    DEBUG ((DEBUG_ERROR, "Couldn't Boot Linux: %d\n", Status));
     Status = EFI_DEVICE_ERROR;
     goto FreeLoadOptions;
@@ -170 +186 @@
   // If we got here we do a confused face because BootLinuxFdt returned,
   // reporting success.
-  DEBUG ((EFI_D_ERROR, "WARNING: BdsBootLinuxFdt returned EFI_SUCCESS.\n"));
+  DEBUG ((DEBUG_ERROR, "WARNING: BdsBootLinuxFdt returned EFI_SUCCESS.\n"));
   return EFI_SUCCESS;