VirtualBox

Ignore:
Timestamp:
Aug 14, 2024 1:16:30 PM (5 months ago)
Author:
vboxsync
Message:

Devices/EFI/FirmwareNew: Merge edk2-stable-202405 and make it build on aarch64, bugref:4643

Location:
trunk/src/VBox/Devices/EFI/FirmwareNew
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/EFI/FirmwareNew

  • trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellLevel2CommandsLib/Cd.c

    r99404 r105670  
    1515  Function will replace drive identifier with CWD.
    1616
    17   If FullPath begining with ':' is invalid path, then ASSERT.
    18   If FullPath not include dirve identifier , then do nothing.
     17  If FullPath beginning with ':' is invalid path, then ASSERT.
     18  If FullPath not include drive identifier , then do nothing.
    1919  If FullPath likes "fs0:\xx" or "fs0:/xx" , then do nothing.
    2020  If FullPath likes "fs0:xxx" or "fs0:", the drive replaced by CWD.

  • trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c

    r99404 r105670  
    428428                            unfiltered.
    429429
    430   @retval SHELL_SUCCESS     the printing was sucessful.
     430  @retval SHELL_SUCCESS     the printing was successful.
    431431**/
    432432SHELL_STATUS

  • trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c

    r99404 r105670  
    13551355                                TRUE
    13561356                                );
    1357               } // we were sucessful so do an output
     1357              } // we were successful so do an output
    13581358            }
    13591359          } // got a valid map target

  • trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c

    r99404 r105670  
    217217  have 2 possible destination).
    218218
    219   if the result is sucessful the caller must free *DestPathPointer.
     219  if the result is successful the caller must free *DestPathPointer.
    220220
    221221  @param[in] DestParameter               The original path to the destination.
    … …  
    228228  @retval SHELL_INVALID_PARAMETER  The DestParameter could be resolved to more than 1 location.
    229229  @retval SHELL_INVALID_PARAMETER  Cwd is required and is NULL.
    230   @retval SHELL_SUCCESS            The operation was sucessful.
     230  @retval SHELL_SUCCESS            The operation was successful.
    231231**/
    232232SHELL_STATUS
    … …  
    851851            //
    852852            // ValidateAndMoveFiles will report errors to the screen itself
    853             // Only change ShellStatus if it's sucessful
     853            // Only change ShellStatus if it's successful
    854854            //
    855855            if (ShellStatus == SHELL_SUCCESS) {

  • trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellLevel2CommandsLib/Reset.c

    r99404 r105670  
    8080                          &OsIndications
    8181                          );
    82         if (!EFI_ERROR (Status)) {
    83           if ((OsIndications & EFI_OS_INDICATIONS_BOOT_TO_FW_UI) != 0) {
    84             DataSize = sizeof (OsIndications);
    85             Status   = gRT->GetVariable (
    86                               EFI_OS_INDICATIONS_VARIABLE_NAME,
    87                               &gEfiGlobalVariableGuid,
    88                               &Attr,
    89                               &DataSize,
    90                               &OsIndications
    91                               );
    92             if (!EFI_ERROR (Status)) {
    93               OsIndications |= EFI_OS_INDICATIONS_BOOT_TO_FW_UI;
    94             } else {
    95               OsIndications = EFI_OS_INDICATIONS_BOOT_TO_FW_UI;
    96             }
    9782
    98             Status = gRT->SetVariable (
     83        if (EFI_ERROR (Status)) {
     84          ShellStatus = SHELL_UNSUPPORTED;
     85          goto Error;
     86        }
     87
     88        if ((OsIndications & EFI_OS_INDICATIONS_BOOT_TO_FW_UI) != 0) {
     89          DataSize = sizeof (OsIndications);
     90          Status   = gRT->GetVariable (
    9991                            EFI_OS_INDICATIONS_VARIABLE_NAME,
    10092                            &gEfiGlobalVariableGuid,
    101                             EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
    102                             sizeof (OsIndications),
     93                            &Attr,
     94                            &DataSize,
    10395                            &OsIndications
    10496                            );
     97
     98          if (EFI_ERROR (Status)) {
     99            OsIndications = EFI_OS_INDICATIONS_BOOT_TO_FW_UI;
     100          } else {
     101            OsIndications |= EFI_OS_INDICATIONS_BOOT_TO_FW_UI;
    105102          }
     103
     104          Status = gRT->SetVariable (
     105                          EFI_OS_INDICATIONS_VARIABLE_NAME,
     106                          &gEfiGlobalVariableGuid,
     107                          EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
     108                          sizeof (OsIndications),
     109                          &OsIndications
     110                          );
    106111        }
    107112

  • trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c

    r99404 r105670  
    1515  If you spawn a pre 2.0 shell from the Shell 2.0 the environment variable may not carry through.
    1616
    17   @retval STATUS_SUCCESS  the printout was sucessful
     17  @retval STATUS_SUCCESS  the printout was successful
    1818  @return any return code from GetNextVariableName except EFI_NOT_FOUND
    1919**/

  • trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c

    r99404 r105670  
    5454  @param SystemTable    the EFI System Table pointer
    5555
    56   @retval EFI_SUCCESS        the shell command handlers were installed sucessfully
     56  @retval EFI_SUCCESS        the shell command handlers were installed successfully
    5757  @retval EFI_UNSUPPORTED    the shell level required was not found.
    5858**/
    … …  
    149149
    150150/**
    151   returns a fully qualified directory (contains a map drive at the begining)
     151  returns a fully qualified directory (contains a map drive at the beginning)
    152152  path from a unknown directory path.
    153153
    154   If Path is already fully qualified this will return a duplicat otherwise this
     154  If Path is already fully qualified this will return a duplicate otherwise this
    155155  will use get the current directory and use that to build the fully qualified
    156156  version.
    … …  
    162162  @retval NULL            A memory allocation failed
    163163  @retval NULL            A fully qualified path could not be discovered.
    164   @retval other           An allocated pointer to a fuly qualified path.
     164  @retval other           An allocated pointer to a fully qualified path.
    165165**/
    166166CHAR16 *

  • trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h

    r99404 r105670  
    242242
    243243/**
    244   returns a fully qualified directory (contains a map drive at the begining)
     244  returns a fully qualified directory (contains a map drive at the beginning)
    245245  path from a unknown directory path.
    246246
    247   If Path is already fully qualified this will return a duplicat otherwise this
     247  If Path is already fully qualified this will return a duplicate otherwise this
    248248  will use get the current directory and use that to build the fully qualified
    249249  version.
    … …  
    255255  @retval NULL            A memory allocation failed
    256256  @retval NULL            a fully qualified path could not be discovered.
    257   @retval other           pointer to a fuly qualified path.
     257  @retval other           pointer to a fully qualified path.
    258258**/
    259259CHAR16 *

  • trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c

    r99404 r105670  
    1919  @param[in] Name           New name to set to the volume label.
    2020
    21   @retval SHELL_SUCCESS     The operation was sucessful.
     21  @retval SHELL_SUCCESS     The operation was successful.
    2222**/
    2323SHELL_STATUS
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette