VirtualBox

Ignore:
Timestamp:
Oct 29, 2015 4:30:44 AM (9 years ago)
Author:
vboxsync
Message:

EFI/Firmware: Merged in the svn:eol-style, svn:mime-type and trailing whitespace cleanup that was done after the initial UDK2014.SP1 import: svn merge /vendor/edk2/UDK2014.SP1 /vendor/edk2/current .

Location:
trunk/src/VBox/Devices/EFI/Firmware
Files:
116 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Devices/EFI/Firmware

  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Application/Shell/ConsoleWrappers.c

    r58459 r58466  
    116116
    117117/**
    118   Function to create a EFI_SIMPLE_TEXT_INPUT_PROTOCOL on top of a 
     118  Function to create a EFI_SIMPLE_TEXT_INPUT_PROTOCOL on top of a
    119119  SHELL_FILE_HANDLE to support redirecting input from a file.
    120120
     
    156156  ProtocolToReturn->SimpleTextIn.Reset         = FileBasedSimpleTextInReset;
    157157  ProtocolToReturn->SimpleTextIn.ReadKeyStroke = FileBasedSimpleTextInReadKeyStroke;
    158  
     158
    159159  Status = gBS->CreateEvent (
    160160                  EVT_NOTIFY_WAIT,
     
    171171  ///@todo possibly also install SimpleTextInputEx on the handle at this point.
    172172  Status = gBS->InstallProtocolInterface(
    173     &(ProtocolToReturn->TheHandle), 
    174     &gEfiSimpleTextInProtocolGuid, 
    175     EFI_NATIVE_INTERFACE, 
     173    &(ProtocolToReturn->TheHandle),
     174    &gEfiSimpleTextInProtocolGuid,
     175    EFI_NATIVE_INTERFACE,
    176176    &(ProtocolToReturn->SimpleTextIn));
    177177  if (!EFI_ERROR(Status)) {
     
    185185
    186186/**
    187   Function to close a EFI_SIMPLE_TEXT_INPUT_PROTOCOL on top of a 
     187  Function to close a EFI_SIMPLE_TEXT_INPUT_PROTOCOL on top of a
    188188  SHELL_FILE_HANDLE to support redirecting input from a file.
    189189
     
    208208
    209209  Status1 = gBS->UninstallProtocolInterface(
    210     ((SHELL_EFI_SIMPLE_TEXT_INPUT_PROTOCOL*)SimpleTextIn)->TheHandle, 
    211     &gEfiSimpleTextInProtocolGuid, 
     210    ((SHELL_EFI_SIMPLE_TEXT_INPUT_PROTOCOL*)SimpleTextIn)->TheHandle,
     211    &gEfiSimpleTextInProtocolGuid,
    212212    &(((SHELL_EFI_SIMPLE_TEXT_INPUT_PROTOCOL*)SimpleTextIn)->SimpleTextIn));
    213213
     
    278278{
    279279  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *PassThruProtocol;
    280  
     280
    281281  PassThruProtocol = ((SHELL_EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *)This)->OriginalSimpleTextOut;
    282  
     282
    283283  // Pass the QueryMode call thru to the original SimpleTextOutProtocol
    284284  return (PassThruProtocol->QueryMode(
     
    416416
    417417/**
    418   Function to create a EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL on top of a 
     418  Function to create a EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL on top of a
    419419  SHELL_FILE_HANDLE to support redirecting output from a file.
    420420
     
    469469
    470470  Status = gBS->InstallProtocolInterface(
    471     &(ProtocolToReturn->TheHandle), 
    472     &gEfiSimpleTextOutProtocolGuid, 
    473     EFI_NATIVE_INTERFACE, 
     471    &(ProtocolToReturn->TheHandle),
     472    &gEfiSimpleTextOutProtocolGuid,
     473    EFI_NATIVE_INTERFACE,
    474474    &(ProtocolToReturn->SimpleTextOut));
    475475  if (!EFI_ERROR(Status)) {
     
    483483
    484484/**
    485   Function to close a EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL on top of a 
     485  Function to close a EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL on top of a
    486486  SHELL_FILE_HANDLE to support redirecting output from a file.
    487487
     
    501501  }
    502502  Status = gBS->UninstallProtocolInterface(
    503     ((SHELL_EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL*)SimpleTextOut)->TheHandle, 
    504     &gEfiSimpleTextOutProtocolGuid, 
     503    ((SHELL_EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL*)SimpleTextOut)->TheHandle,
     504    &gEfiSimpleTextOutProtocolGuid,
    505505    &(((SHELL_EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL*)SimpleTextOut)->SimpleTextOut));
    506506  FreePool(SimpleTextOut);
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Application/Shell/ConsoleWrappers.h

    r58459 r58466  
    1818
    1919/**
    20   Function to create a EFI_SIMPLE_TEXT_INPUT_PROTOCOL on top of a 
     20  Function to create a EFI_SIMPLE_TEXT_INPUT_PROTOCOL on top of a
    2121  SHELL_FILE_HANDLE to support redirecting input from a file.
    2222
     
    3535
    3636/**
    37   Function to close a EFI_SIMPLE_TEXT_INPUT_PROTOCOL on top of a 
     37  Function to close a EFI_SIMPLE_TEXT_INPUT_PROTOCOL on top of a
    3838  SHELL_FILE_HANDLE to support redirecting input from a file.
    3939
     
    4949
    5050/**
    51   Function to create a EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL on top of a 
     51  Function to create a EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL on top of a
    5252  SHELL_FILE_HANDLE to support redirecting output from a file.
    5353
     
    6868
    6969/**
    70   Function to close a EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL on top of a 
     70  Function to close a EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL on top of a
    7171  SHELL_FILE_HANDLE to support redirecting output from a file.
    7272
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Application/Shell/FileHandleWrappers.c

    r58459 r58466  
    1919
    2020/**
    21   File style interface for console (Open). 
    22  
     21  File style interface for console (Open).
     22
    2323  @param[in] This       Ignored.
    2424  @param[out] NewHandle Ignored.
     
    2626  @param[in] OpenMode   Ignored.
    2727  @param[in] Attributes Ignored.
    28  
     28
    2929  @retval EFI_NOT_FOUND
    3030**/
     
    4444/**
    4545  File style interface for console (Close, Delete, & Flush)
    46  
     46
    4747  @param[in] This       Ignored.
    48  
     48
    4949  @retval EFI_SUCCESS
    5050**/
     
    6363  @param[in] This       Ignored.
    6464  @param[out] Position  Ignored.
    65  
     65
    6666  @retval EFI_UNSUPPORTED
    6767**/
     
    7878/**
    7979  File style interface for console (SetPosition).
    80  
     80
    8181  @param[in] This       Ignored.
    8282  @param[in] Position   Ignored.
    83  
     83
    8484  @retval EFI_UNSUPPORTED
    8585**/
     
    9696/**
    9797  File style interface for console (GetInfo).
    98  
     98
    9999  @param[in] This              Ignored.
    100100  @param[in] InformationType   Ignored.
    101101  @param[in, out] BufferSize   Ignored.
    102102  @param[out] Buffer           Ignored.
    103  
     103
    104104  @retval EFI_UNSUPPORTED
    105105**/
     
    118118/**
    119119  File style interface for console (SetInfo).
    120  
     120
    121121  @param[in] This       Ignored.
    122122  @param[in] InformationType   Ignored.
    123123  @param[in] BufferSize Ignored.
    124124  @param[in] Buffer     Ignored.
    125  
     125
    126126  @retval EFI_UNSUPPORTED
    127127**/
     
    142142
    143143  Writes data to the screen.
    144  
     144
    145145  @param[in] This              The pointer to the EFI_FILE_PROTOCOL object.
    146146  @param[in, out] BufferSize   Size in bytes of Buffer.
    147147  @param[in] Buffer            The pointer to the buffer to write.
    148  
     148
    149149  @retval EFI_UNSUPPORTED No output console is supported.
    150150  @return A return value from gST->ConOut->OutputString.
     
    167167/**
    168168  File style interface for StdIn (Write).
    169  
     169
    170170  @param[in] This            Ignored.
    171171  @param[in, out] BufferSize Ignored.
    172172  @param[in] Buffer          Ignored.
    173  
     173
    174174  @retval EFI_UNSUPPORTED
    175175**/
     
    189189
    190190  Writes error to the error output.
    191  
     191
    192192  @param[in] This              The pointer to the EFI_FILE_PROTOCOL object.
    193193  @param[in, out] BufferSize   Size in bytes of Buffer.
    194194  @param[in] Buffer            The pointer to the buffer to write.
    195  
     195
    196196  @return A return value from gST->StdErr->OutputString.
    197197**/
     
    209209/**
    210210  File style interface for console StdOut (Read).
    211  
     211
    212212  @param[in] This              Ignored.
    213213  @param[in, out] BufferSize   Ignored.
    214214  @param[out] Buffer           Ignored.
    215  
     215
    216216  @retval EFI_UNSUPPORTED
    217217**/
     
    229229/**
    230230  File style interface for console StdErr (Read).
    231  
     231
    232232  @param[in] This              Ignored.
    233233  @param[in, out] BufferSize   Ignored.
    234234  @param[out] Buffer           Ignored.
    235  
     235
    236236  @retval EFI_UNSUPPORTED Always.
    237237**/
     
    249249/**
    250250  File style interface for NUL file (Read).
    251  
     251
    252252  @param[in] This              Ignored.
    253253  @param[in, out] BufferSize   Poiner to 0 upon return.
    254254  @param[out] Buffer           Ignored.
    255  
     255
    256256  @retval EFI_SUCCESS Always.
    257257**/
     
    270270/**
    271271  File style interface for NUL file (Write).
    272  
     272
    273273  @param[in] This              Ignored.
    274274  @param[in, out] BufferSize   Ignored.
    275275  @param[in] Buffer            Ignored.
    276  
     276
    277277  @retval EFI_SUCCESS
    278278**/
     
    940940
    941941  Frees the memory for this object.
    942  
     942
    943943  @param[in] This       The pointer to the EFI_FILE_PROTOCOL object.
    944  
     944
    945945  @retval EFI_SUCCESS
    946946**/
     
    956956
    957957  //
    958   // Most if not all UEFI commands will have an '\r\n' at the end of any output. 
    959   // Since the output was redirected to a variable, it does not make sense to 
     958  // Most if not all UEFI commands will have an '\r\n' at the end of any output.
     959  // Since the output was redirected to a variable, it does not make sense to
    960960  // keep this.  So, before closing, strip the trailing '\r\n' from the variable
    961961  // if it exists.
     
    969969    if (NewBuffer == NULL) {
    970970      return EFI_OUT_OF_RESOURCES;
    971     } 
     971    }
    972972    Status = SHELL_GET_ENVIRONMENT_VARIABLE(((EFI_FILE_PROTOCOL_ENVIRONMENT*)This)->Name, &NewSize, NewBuffer);
    973973  }
    974  
     974
    975975  if (!EFI_ERROR(Status) && NewBuffer != NULL) {
    976    
     976
    977977    if (StrSize(NewBuffer) > 6)
    978978    {
    979       if ((((CHAR16*)NewBuffer)[(StrSize(NewBuffer)/2) - 2] == CHAR_LINEFEED) 
     979      if ((((CHAR16*)NewBuffer)[(StrSize(NewBuffer)/2) - 2] == CHAR_LINEFEED)
    980980           && (((CHAR16*)NewBuffer)[(StrSize(NewBuffer)/2) - 3] == CHAR_CARRIAGE_RETURN)) {
    981         ((CHAR16*)NewBuffer)[(StrSize(NewBuffer)/2) - 3] = CHAR_NULL;   
     981        ((CHAR16*)NewBuffer)[(StrSize(NewBuffer)/2) - 3] = CHAR_NULL;
    982982      }
    983    
     983
    984984      if (IsVolatileEnv(((EFI_FILE_PROTOCOL_ENVIRONMENT*)This)->Name)) {
    985985        Status = SHELL_SET_ENVIRONMENT_VARIABLE_V(((EFI_FILE_PROTOCOL_ENVIRONMENT*)This)->Name, StrSize(NewBuffer), NewBuffer);
     
    988988      }
    989989    }
    990   } 
    991  
     990  }
     991
    992992  SHELL_FREE_NON_NULL(NewBuffer);
    993993  FreePool((EFI_FILE_PROTOCOL_ENVIRONMENT*)This);
     
    997997/**
    998998  File style interface for Environment Variable (Delete).
    999  
     999
    10001000  @param[in] This       The pointer to the EFI_FILE_PROTOCOL object.
    1001  
     1001
    10021002  @retval The return value from FileInterfaceEnvClose().
    10031003**/
     
    10141014/**
    10151015  File style interface for Environment Variable (Read).
    1016  
     1016
    10171017  @param[in] This              The pointer to the EFI_FILE_PROTOCOL object.
    10181018  @param[in, out] BufferSize   Size in bytes of Buffer.
    10191019  @param[out] Buffer           The pointer to the buffer to fill.
    1020  
     1020
    10211021  @retval EFI_SUCCESS   The data was read.
    10221022**/
     
    10371037/**
    10381038  File style interface for Volatile Environment Variable (Write).
    1039  
     1039
    10401040  @param[in] This              The pointer to the EFI_FILE_PROTOCOL object.
    10411041  @param[in, out] BufferSize   Size in bytes of Buffer.
    10421042  @param[in] Buffer            The pointer to the buffer to write.
    1043  
     1043
    10441044  @retval EFI_SUCCESS   The data was read.
    10451045**/
     
    10841084/**
    10851085  File style interface for Non Volatile Environment Variable (Write).
    1086  
     1086
    10871087  @param[in] This              The pointer to the EFI_FILE_PROTOCOL object.
    10881088  @param[in, out] BufferSize   Size in bytes of Buffer.
    10891089  @param[in] Buffer            The pointer to the buffer to write.
    1090  
     1090
    10911091  @retval EFI_SUCCESS   The data was read.
    10921092**/
     
    11691169  EnvFileInterface->Delete      = FileInterfaceEnvDelete;
    11701170  EnvFileInterface->Read        = FileInterfaceEnvRead;
    1171  
     1171
    11721172  CopyMem(EnvFileInterface->Name, EnvName, EnvNameSize);
    11731173
     
    13221322/**
    13231323  File style interface for Mem (SetPosition).
    1324  
     1324
    13251325  @param[in] This       The pointer to the EFI_FILE_PROTOCOL object.
    13261326  @param[out] Position  The position to set.
    1327  
     1327
    13281328  @retval EFI_SUCCESS             The position was successfully changed.
    13291329  @retval EFI_INVALID_PARAMETER   The Position was invalid.
     
    13461346/**
    13471347  File style interface for Mem (GetPosition).
    1348  
     1348
    13491349  @param[in] This       The pointer to the EFI_FILE_PROTOCOL object.
    13501350  @param[out] Position  The pointer to the position.
    1351  
     1351
    13521352  @retval EFI_SUCCESS   The position was retrieved.
    1353 **/ 
     1353**/
    13541354EFI_STATUS
    13551355EFIAPI
     
    13651365/**
    13661366  File style interface for Mem (Write).
    1367  
     1367
    13681368  @param[in] This              The pointer to the EFI_FILE_PROTOCOL object.
    13691369  @param[in, out] BufferSize   Size in bytes of Buffer.
    13701370  @param[in] Buffer            The pointer to the buffer to write.
    1371  
     1371
    13721372  @retval EFI_OUT_OF_RESOURCES The operation failed due to lack of resources.
    13731373  @retval EFI_SUCCESS          The data was written.
     
    14151415/**
    14161416  File style interface for Mem (Read).
    1417  
     1417
    14181418  @param[in] This              The pointer to the EFI_FILE_PROTOCOL object.
    14191419  @param[in, out] BufferSize   Size in bytes of Buffer.
    14201420  @param[in] Buffer            The pointer to the buffer to fill.
    1421  
     1421
    14221422  @retval EFI_SUCCESS   The data was read.
    14231423**/
     
    14421442
    14431443  Frees all memory associated with this object.
    1444  
     1444
    14451445  @param[in] This       The pointer to the EFI_FILE_PROTOCOL object.
    1446  
     1446
    14471447  @retval EFI_SUCCESS   The 'file' was closed.
    1448 **/ 
     1448**/
    14491449EFI_STATUS
    14501450EFIAPI
     
    15271527  @param  This            Protocol instance pointer.
    15281528  @param  Position        Byte position from the start of the file.
    1529                          
     1529
    15301530  @retval EFI_SUCCESS     Data was written.
    15311531  @retval EFI_UNSUPPORTED Seek request for non-zero is not valid on open.
     
    15471547  @param  This            Protocol instance pointer.
    15481548  @param  Position        Byte position from the start of the file.
    1549                          
     1549
    15501550  @retval EFI_SUCCESS     Data was written.
    15511551  @retval EFI_UNSUPPORTED Seek request for non-zero is not valid on open..
     
    17231723
    17241724  @param  This                     Protocol instance pointer.
    1725                                    
     1725
    17261726  @retval EFI_SUCCESS              The device was opened.
    17271727  @retval EFI_WARN_DELETE_FAILURE  The handle was closed but the file was not deleted.
     
    17421742/**
    17431743  File style interface for File (Close).
    1744  
     1744
    17451745  @param[in] This       The pointer to the EFI_FILE_PROTOCOL object.
    1746  
     1746
    17471747  @retval EFI_SUCCESS   The file was closed.
    17481748**/
     
    17621762  File style interface for File (Write).
    17631763
    1764   If the file was opened with ASCII mode the data will be processed through 
     1764  If the file was opened with ASCII mode the data will be processed through
    17651765  AsciiSPrint before writing.
    1766  
     1766
    17671767  @param[in] This              The pointer to the EFI_FILE_PROTOCOL object.
    17681768  @param[in, out] BufferSize   Size in bytes of Buffer.
    17691769  @param[in] Buffer            The pointer to the buffer to write.
    1770  
     1770
    17711771  @retval EFI_SUCCESS   The data was written.
    17721772**/
     
    18051805  This will create a new EFI_FILE_PROTOCOL identical to the Templace
    18061806  except that the new one has Unicode and Ascii knowledge.
    1807  
     1807
    18081808  @param[in] Template   A pointer to the EFI_FILE_PROTOCOL object.
    18091809  @param[in] Unicode    TRUE for UCS-2, FALSE for ASCII.
    1810  
     1810
    18111811  @return a new EFI_FILE_PROTOCOL object to be used instead of the template.
    18121812**/
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Application/Shell/Shell.c

    r58459 r58466  
    102102
    103103/**
    104   Parse for the next instance of one string within another string. Can optionally make sure that 
     104  Parse for the next instance of one string within another string. Can optionally make sure that
    105105  the string was not escaped (^ character) per the shell specification.
    106106
     
    159159{
    160160  CONST CHAR16    *Walker;
    161  
     161
    162162  Walker = NULL;
    163163
     
    165165  ASSERT (EndPercent != NULL);
    166166  ASSERT (BeginPercent < EndPercent);
    167  
     167
    168168  if ((BeginPercent + 1) == EndPercent) {
    169169    return FALSE;
     
    212212  TempSpot      = FindFirstCharacter(CmdLine, L"|", L'^');
    213213
    214   if (FirstQuote == NULL    || 
    215       TempSpot == NULL      || 
    216       TempSpot == CHAR_NULL || 
     214  if (FirstQuote == NULL    ||
     215      TempSpot == NULL      ||
     216      TempSpot == CHAR_NULL ||
    217217      FirstQuote > TempSpot
    218218      ) {
     
    223223    if (FirstQuote == NULL || FirstQuote > TempSpot) {
    224224      break;
    225     }   
     225    }
    226226    SecondQuote = FindNextInstance (FirstQuote + 1, L"\"", TRUE);
    227227    if (SecondQuote == NULL) {
     
    235235      TempSpot = FindFirstCharacter(TempSpot + 1, L"|", L'^');
    236236      continue;
    237     } 
    238   }
    239  
     237    }
     238  }
     239
    240240  return (BOOLEAN) ((TempSpot != NULL) && (*TempSpot != CHAR_NULL));
    241241}
    242242
    243243/**
    244   Function to start monitoring for CTRL-S using SimpleTextInputEx.  This 
     244  Function to start monitoring for CTRL-S using SimpleTextInputEx.  This
    245245  feature's enabled state was not known when the shell initially launched.
    246246
     
    267267  if (EFI_ERROR(Status)) {
    268268    ShellPrintHiiEx(
    269       -1, 
    270       -1, 
     269      -1,
     270      -1,
    271271      NULL,
    272272      STRING_TOKEN (STR_SHELL_NO_IN_EX),
     
    285285    NotificationFunction,
    286286    &ShellInfoObject.CtrlSNotifyHandle1);
    287  
     287
    288288  KeyData.KeyState.KeyShiftState  = EFI_SHIFT_STATE_VALID|EFI_RIGHT_CONTROL_PRESSED;
    289289  if (!EFI_ERROR(Status)) {
     
    303303      NotificationFunction,
    304304      &ShellInfoObject.CtrlSNotifyHandle3);
    305   } 
     305  }
    306306  KeyData.KeyState.KeyShiftState  = EFI_SHIFT_STATE_VALID|EFI_RIGHT_CONTROL_PRESSED;
    307307  if (!EFI_ERROR(Status)) {
     
    13741374      continue;
    13751375    }
    1376    
     1376
    13771377    if (FirstQuote == NULL || SecondPercent < FirstQuote) {
    13781378      if (IsValidEnvironmentVariableName(FirstPercent, SecondPercent)) {
     
    15151515  ShellCopySearchAndReplace(NewCommandLine1, NewCommandLine2, NewSize, L"^%", L"%", TRUE, FALSE);
    15161516  StrnCpy(NewCommandLine1, NewCommandLine2, NewSize/sizeof(CHAR16)-1);
    1517  
     1517
    15181518  FreePool(NewCommandLine2);
    15191519  FreePool(ItemTemp);
     
    16331633
    16341634/**
    1635   Take the original command line, substitute any variables, free 
     1635  Take the original command line, substitute any variables, free
    16361636  the original string, return the modified copy.
    16371637
     
    16581658
    16591659/**
    1660   Take the original command line, substitute any alias in the first group of space delimited characters, free 
     1660  Take the original command line, substitute any alias in the first group of space delimited characters, free
    16611661  the original string, return the modified copy.
    16621662
     
    17181718  SHELL_FREE_NON_NULL(*CmdLine);
    17191719  SHELL_FREE_NON_NULL(CommandName);
    1720  
     1720
    17211721  //
    17221722  // re-assign the passed in double pointer to point to our newly allocated buffer
     
    17311731
    17321732  @param[in] CmdName  pointer to the command line to update.
    1733  
     1733
    17341734  @retval Internal_Command    The name is an internal command.
    17351735  @retval File_Sys_Change     the name is a file system change.
     
    17601760  //
    17611761  if (CmdName[(StrLen(CmdName)-1)] == L':') {
    1762     if ( StrStr(CmdName, L" ") != NULL 
     1762    if ( StrStr(CmdName, L" ") != NULL
    17631763      || StrLen(StrStr(CmdName, L":")) > 1
    17641764      ) {
     
    17901790    return (Efi_Application);
    17911791  }
    1792  
     1792
    17931793  SHELL_FREE_NON_NULL(FileWithPath);
    17941794  //
     
    18071807  @retval EFI_NOT_FOUND         The operation type is unknown or invalid.
    18081808**/
    1809 EFI_STATUS 
     1809EFI_STATUS
    18101810EFIAPI
    18111811IsValidSplit(
     
    19591959  //
    19601960  ASSERT(CmdLine[(StrLen(CmdLine)-1)] == L':' && StrStr(CmdLine, L" ") == NULL);
    1961  
     1961
    19621962  //
    19631963  // Call the protocol API to do the work
     
    21072107
    21082108  This API will upadate the shell's environment since these commands are libraries.
    2109  
     2109
    21102110  @param[in] CmdLine          the command line to run.
    21112111  @param[in] FirstParameter   the first parameter on the command line
     
    21292129  BOOLEAN                   LastError;
    21302130  CHAR16                    *Walker;
    2131   CHAR16                    *NewCmdLine; 
     2131  CHAR16                    *NewCmdLine;
    21322132
    21332133  NewCmdLine = AllocateCopyPool (StrSize (CmdLine), CmdLine);
     
    23892389  Function will process and run a command line.
    23902390
    2391   This will determine if the command line represents an internal shell 
     2391  This will determine if the command line represents an internal shell
    23922392  command or dispatch an external application.
    23932393
     
    24632463    SHELL_FREE_NON_NULL(CleanOriginal);
    24642464    return (Status);
    2465   } 
     2465  }
    24662466
    24672467  //
     
    24992499    SetLastError(SHELL_NOT_FOUND);
    25002500  }
    2501  
     2501
    25022502  SHELL_FREE_NON_NULL(CleanOriginal);
    25032503  SHELL_FREE_NON_NULL(FirstParameter);
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Application/Shell/Shell.uni

    • Property svn:mime-type changed from application/octet-stream to text/plain;encoding=UTF-16LE
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Application/Shell/ShellEnvVar.c

    r58459 r58466  
    139139    return (EFI_INVALID_PARAMETER);
    140140  }
    141  
     141
    142142  Status = EFI_SUCCESS;
    143  
     143
    144144  ValBufferSize = INIT_DATA_BUFFER_SIZE;
    145145  NameBufferSize = INIT_NAME_BUFFER_SIZE;
     
    167167      Status = gRT->GetNextVariableName(&NameSize, VariableName, &Guid);
    168168    }
    169    
     169
    170170    if (!EFI_ERROR(Status) && CompareGuid(&Guid, &gShellVariableGuid)){
    171171      VarList = AllocateZeroPool(sizeof(ENV_VAR_LIST));
     
    190190            break;
    191191          }
    192          
     192
    193193          ValSize = ValBufferSize;
    194194          Status = SHELL_GET_ENVIRONMENT_VARIABLE_AND_ATTRIBUTES(VariableName, &VarList->Atts, &ValSize, VarList->Val);
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Application/Shell/ShellParametersProtocol.c

    r58459 r58466  
    144144  // Remove any remaining escape characters in the string
    145145  //
    146   for (NextDelim = FindFirstCharacter(*TempParameter, L"\"^", CHAR_NULL) 
    147     ; *NextDelim != CHAR_NULL 
     146  for (NextDelim = FindFirstCharacter(*TempParameter, L"\"^", CHAR_NULL)
     147    ; *NextDelim != CHAR_NULL
    148148    ; NextDelim = FindFirstCharacter(NextDelim, L"\"^", CHAR_NULL)
    149149    ) {
     
    174174  delimited and quote surrounded parameter definition.
    175175
    176   All special character processing (alias, environment variable, redirection, 
     176  All special character processing (alias, environment variable, redirection,
    177177  etc... must be complete before calling this API.
    178178
     
    483483  gEfiShellProtocol->SetFilePosition(Handle, OriginalFilePosition);
    484484  gEfiShellProtocol->CloseFile(Handle);
    485   return (Status); 
     485  return (Status);
    486486}
    487487
     
    562562    if ((TempLocation = StrStr(Copy , L"\"")) != NULL) {
    563563      TempLocation[0] = CHAR_NULL;
    564     }   
     564    }
    565565  } else {
    566566    Copy = FileName;
     
    570570    if ((TempLocation = StrStr(Copy , L" ")) != NULL) {
    571571      TempLocation[0] = CHAR_NULL;
    572     }   
     572    }
    573573  }
    574574
     
    603603    if ((TempLocation = StrStr(Copy , L"%")) != NULL) {
    604604      TempLocation[0] = CHAR_NULL;
    605     }   
     605    }
    606606  }
    607607
     
    612612  Remove the unicode file tag from the begining of the file buffer since that will not be
    613613  used by StdIn.
    614  
     614
    615615  @param[in]  Handle    Pointer to the handle of the file to be processed.
    616  
     616
    617617  @retval EFI_SUCCESS   The unicode file tag has been moved successfully.
    618618**/
     
    820820      Status = EFI_NOT_FOUND;
    821821    }
    822   } 
     822  }
    823823  if (!EFI_ERROR(Status) && (CommandLineWalker = StrStr(CommandLineCopy, L" >> ")) != NULL) {
    824824    FirstLocation = MIN(CommandLineWalker, FirstLocation);
     
    847847      Status = EFI_NOT_FOUND;
    848848    }
    849   } 
     849  }
    850850  if (!EFI_ERROR(Status) && (CommandLineWalker = StrStr(CommandLineCopy, L" 1>a ")) != NULL) {
    851851    FirstLocation = MIN(CommandLineWalker, FirstLocation);
     
    861861      Status = EFI_NOT_FOUND;
    862862    }
    863   } 
     863  }
    864864  if (!EFI_ERROR(Status) && (CommandLineWalker = StrStr(CommandLineCopy, L" >a ")) != NULL) {
    865865    FirstLocation = MIN(CommandLineWalker, FirstLocation);
     
    10891089      // Cant redirect during a reconnect operation.
    10901090      //
    1091       ||(StrStr(NewCommandLine, L"connect -r") != NULL 
     1091      ||(StrStr(NewCommandLine, L"connect -r") != NULL
    10921092         && (StdOutVarName != NULL || StdOutFileName != NULL || StdErrFileName != NULL || StdErrVarName != NULL))
    10931093      //
     
    12951295  SPLIT_LIST        *Split;
    12961296
    1297   if (ShellParameters == NULL 
     1297  if (ShellParameters == NULL
    12981298    ||OldStdIn        == NULL
    12991299    ||OldStdOut       == NULL
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Application/Shell/ShellProtocol.c

    r58459 r58466  
    11721172**/
    11731173EFI_STATUS
    1174 EFIAPI 
     1174EFIAPI
    11751175EfiShellRegisterGuidName(
    11761176  IN CONST EFI_GUID *Guid,
     
    14021402                                environment variable name and y is the value. If this
    14031403                                is NULL, then the current shell environment is used.
    1404                            
     1404
    14051405  @param[out] StartImageStatus  Returned status from gBS->StartImage.
    14061406
     
    14401440
    14411441  NewHandle = NULL;
    1442  
     1442
    14431443  NewCmdLine = AllocateCopyPool (StrSize (CommandLine), CommandLine);
    14441444  if (NewCmdLine == NULL) {
     
    20472047**/
    20482048EFI_STATUS
    2049 EFIAPI 
     2049EFIAPI
    20502050EfiShellGetGuidFromName(
    20512051  IN  CONST CHAR16   *GuidName,
     
    20592059    return (EFI_INVALID_PARAMETER);
    20602060  }
    2061  
     2061
    20622062  Status = GetGuidFromStringName(GuidName, NULL, &NewGuid);
    20632063
     
    20872087**/
    20882088EFI_STATUS
    2089 EFIAPI 
     2089EFIAPI
    20902090EfiShellGetGuidName(
    20912091  IN  CONST EFI_GUID *Guid,
     
    25632563**/
    25642564CONST CHAR16 *
    2565 EFIAPI 
     2565EFIAPI
    25662566EfiShellGetEnvEx(
    25672567  IN  CONST CHAR16 *Name,
     
    31053105  )
    31063106{
    3107  
     3107
    31083108  EFI_STATUS        Status;
    31093109  EFI_GUID          Guid;
     
    31403140        break;
    31413141      }
    3142      
     3142
    31433143      NameSize = NameBufferSize;
    31443144      Status = gRT->GetNextVariableName(&NameSize, VariableName, &Guid);
    31453145    }
    3146    
     3146
    31473147    if (EFI_ERROR (Status)) {
    31483148      SHELL_FREE_NON_NULL(RetVal);
     
    31503150      break;
    31513151    }
    3152    
     3152
    31533153    if (CompareGuid(&Guid, &gShellAliasGuid)){
    31543154      ASSERT((RetVal == NULL && RetSize == 0) || (RetVal != NULL));
     
    31653165  Convert a null-terminated unicode string, in-place, to all lowercase.
    31663166  Then return it.
    3167  
     3167
    31683168  @param  Str    The null-terminated string to be converted to all lowercase.
    3169  
    3170   @return        The null-terminated string converted into all lowercase. 
     3169
     3170  @return        The null-terminated string converted into all lowercase.
    31713171**/
    31723172CHAR16 *
     
    36283628        (KeyData->KeyState.KeyShiftState == (EFI_SHIFT_STATE_VALID|EFI_LEFT_CONTROL_PRESSED) || KeyData->KeyState.KeyShiftState  == (EFI_SHIFT_STATE_VALID|EFI_RIGHT_CONTROL_PRESSED))) ||
    36293629      (KeyData->Key.UnicodeChar == 3)
    3630       ){ 
     3630      ){
    36313631    if (ShellInfoObject.NewEfiShellProtocol->ExecutionBreak == NULL) {
    36323632      return (EFI_UNSUPPORTED);
     
    36353635  } else if  ((KeyData->Key.UnicodeChar == L's') &&
    36363636              (KeyData->KeyState.KeyShiftState  == (EFI_SHIFT_STATE_VALID|EFI_LEFT_CONTROL_PRESSED) || KeyData->KeyState.KeyShiftState  == (EFI_SHIFT_STATE_VALID|EFI_RIGHT_CONTROL_PRESSED))
    3637               ){ 
     3637              ){
    36383638    ShellInfoObject.HaltOutput = TRUE;
    36393639  }
     
    36423642
    36433643/**
    3644   Function to start monitoring for CTRL-C using SimpleTextInputEx.  This 
     3644  Function to start monitoring for CTRL-C using SimpleTextInputEx.  This
    36453645  feature's enabled state was not known when the shell initially launched.
    36463646
     
    36673667  if (EFI_ERROR(Status)) {
    36683668    ShellPrintHiiEx(
    3669       -1, 
    3670       -1, 
     3669      -1,
     3670      -1,
    36713671      NULL,
    36723672      STRING_TOKEN (STR_SHELL_NO_IN_EX),
     
    36893689    NotificationFunction,
    36903690    &ShellInfoObject.CtrlCNotifyHandle1);
    3691  
     3691
    36923692  KeyData.KeyState.KeyShiftState  = EFI_SHIFT_STATE_VALID|EFI_RIGHT_CONTROL_PRESSED;
    36933693  if (!EFI_ERROR(Status)) {
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Application/Shell/ShellProtocol.h

    r58459 r58466  
    3737  This must be removed via calling CleanUpShellProtocol().
    3838
    39   @param[in, out] NewShell   The pointer to the pointer to the structure 
     39  @param[in, out] NewShell   The pointer to the pointer to the structure
    4040  to install.
    4141
     
    5050
    5151/**
    52   Opposite of CreatePopulateInstallShellProtocol. 
     52  Opposite of CreatePopulateInstallShellProtocol.
    5353
    5454  Free all memory and restore the system to the state it was in before calling
     
    915915
    916916/**
    917   Function to start monitoring for CTRL-C using SimpleTextInputEx.  This 
     917  Function to start monitoring for CTRL-C using SimpleTextInputEx.  This
    918918  feature's enabled state was not known when the shell initially launched.
    919919
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Include/Library/HandleParsingLib.h

    r58459 r58466  
    121121/**
    122122  Get best support language for this driver.
    123  
    124   First base on the user input language  to search, second base on the current 
    125   platform used language to search, third get the first language from the 
     123
     124  First base on the user input language  to search, second base on the current
     125  platform used language to search, third get the first language from the
    126126  support language list. The caller need to free the buffer of the best language.
    127127
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Include/Library/PathLib.h

    r48674 r58466  
    3434
    3535/**
    36   Function to clean up paths. 
    37  
     36  Function to clean up paths.
     37
    3838  - Single periods in the path are removed.
    3939  - Double periods in the path are removed along with a single parent directory.
    4040  - Forward slashes L'/' are converted to backward slashes L'\'.
    4141
    42   This will be done inline and the existing buffer may be larger than required 
     42  This will be done inline and the existing buffer may be larger than required
    4343  upon completion.
    4444
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Include/Library/ShellCommandLib.h

    r58459 r58466  
    508508
    509509/**
    510   Create a consistent mapped name for the device specified by DevicePath 
     510  Create a consistent mapped name for the device specified by DevicePath
    511511  based on the Table.
    512512
    513   This must be called after ShellCommandConsistMappingInitialize() and 
     513  This must be called after ShellCommandConsistMappingInitialize() and
    514514  before ShellCommandConsistMappingUnInitialize() is called.
    515515
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Include/Library/ShellLib.h

    r58459 r58466  
    13481348/**
    13491349  Function to delete a file by name
    1350  
     1350
    13511351  @param[in]       FileName       Pointer to file name to delete.
    1352  
     1352
    13531353  @retval EFI_SUCCESS             the file was deleted sucessfully
    13541354  @retval EFI_WARN_DELETE_FAILURE the handle was closed, but the file was not
     
    13801380  @param[in] CommandToGetHelpOn  Pointer to a string containing the command name of help file to be printed.
    13811381  @param[in] SectionToGetHelpOn  Pointer to the section specifier(s).
    1382   @param[in] PrintCommandText    If TRUE, prints the command followed by the help content, otherwise prints 
     1382  @param[in] PrintCommandText    If TRUE, prints the command followed by the help content, otherwise prints
    13831383                                 the help content only.
    13841384  @retval EFI_DEVICE_ERROR       The help data format was incorrect.
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Include/Protocol/EfiShell.h

    r58459 r58466  
    416416
    417417/**
    418   Gets the environment variable and Attributes, or list of environment variables.  Can be 
     418  Gets the environment variable and Attributes, or list of environment variables.  Can be
    419419  used instead of GetEnv().
    420420
     
    424424
    425425  @param[in] Name               A pointer to the environment variable name. If Name is NULL,
    426                                 then the function will return all of the defined shell 
     426                                then the function will return all of the defined shell
    427427                                environment variables. In the case where multiple environment
    428                                 variables are being returned, each variable will be terminated 
     428                                variables are being returned, each variable will be terminated
    429429                                by a NULL, and the list will be terminated by a double NULL.
    430430  @param[out] Attributes        If not NULL, a pointer to the returned attributes bitmask for
     
    433433                                is undefined.
    434434
    435   @retval NULL                  The environment variable doesn't exist. 
    436   @return                       The environment variable's value. The returned pointer does not 
    437                                 need to be freed by the caller. 
     435  @retval NULL                  The environment variable doesn't exist.
     436  @return                       The environment variable's value. The returned pointer does not
     437                                need to be freed by the caller.
    438438**/
    439439typedef
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Include/Protocol/EfiShellDynamicCommand.h

    r58464 r58466  
    7575/// EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL protocol structure.
    7676struct _EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL {
    77  
     77
    7878  CONST CHAR16           *CommandName;
    7979  SHELL_COMMAND_HANDLER  Handler;
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/BasePathLib/BasePathLib.c

    r58459 r58466  
    1616#include <Library/PathLib.h>
    1717#include <Library/BaseLib.h>
    18 #include <Protocol/SimpleTextIn.h> 
     18#include <Protocol/SimpleTextIn.h>
    1919
    2020/**
     
    5454
    5555/**
    56   Function to clean up paths. 
    57  
     56  Function to clean up paths.
     57
    5858  - Single periods in the path are removed.
    5959  - Double periods in the path are removed along with a single parent directory.
    6060  - Forward slashes L'/' are converted to backward slashes L'\'.
    6161
    62   This will be done inline and the existing buffer may be larger than required 
     62  This will be done inline and the existing buffer may be larger than required
    6363  upon completion.
    6464
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/BasePathLib/BasePathLib.inf

    r48674 r58466  
    3232  MdePkg/MdePkg.dec
    3333  ShellPkg/ShellPkg.dec
    34  
     34
    3535
    3636[LibraryClasses]
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiDpLib/Dp.c

    r58464 r58466  
    1313  Dp uses this information to group records in different ways.  It also uses
    1414  timer information to calculate elapsed time for each measurement.
    15  
     15
    1616  Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.
    1717  This program and the accompanying materials
     
    1919  which accompanies this distribution.  The full text of the license may be found at
    2020  http://opensource.org/licenses/bsd-license.php
    21  
     21
    2222  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
    2323  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     
    111111}
    112112
    113 /** 
     113/**
    114114  Dump performance data.
    115  
     115
    116116  @param[in]  ImageHandle     The image handle.
    117117  @param[in]  SystemTable     The system table.
    118  
     118
    119119  @retval EFI_SUCCESS            Command completed successfully.
    120120  @retval EFI_INVALID_PARAMETER  Command usage error.
    121121  @retval value                  Unknown error.
    122  
     122
    123123**/
    124124SHELL_STATUS
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiDpLib/DpInternal.h

    r58464 r58466  
    4343///@}
    4444
    45 /** 
     45/**
    4646  Calculate an event's duration in timer ticks.
    47  
     47
    4848  Given the count direction and the event's start and end timer values,
    4949  calculate the duration of the event in timer ticks.  Information for
    5050  the current measurement is pointed to by the parameter.
    51  
     51
    5252  If the measurement's start time is 1, it indicates that the developer
    5353  is indicating that the measurement began at the release of reset.
    5454  The start time is adjusted to the timer's starting count before performing
    5555  the elapsed time calculation.
    56  
     56
    5757  The calculated duration, in ticks, is the absolute difference between
    5858  the measurement's ending and starting counts.
    59  
     59
    6060  @param Measurement   Pointer to a MEASUREMENT_RECORD structure containing
    6161                       data for the current measurement.
    62  
     62
    6363  @return              The 64-bit duration of the event.
    6464**/
     
    6868  );
    6969
    70 /** 
     70/**
    7171  Determine whether the Measurement record is for an EFI Phase.
    72  
     72
    7373  The Token and Module members of the measurement record are checked.
    7474  Module must be empty and Token must be one of SEC, PEI, DXE, BDS, or SHELL.
    75  
     75
    7676  @param[in]  Measurement A pointer to the Measurement record to test.
    77  
     77
    7878  @retval     TRUE        The measurement record is for an EFI Phase.
    7979  @retval     FALSE       The measurement record is NOT for an EFI Phase.
     
    8484  );
    8585
    86 /** 
     86/**
    8787  Get the file name portion of the Pdb File Name.
    88  
     88
    8989  The portion of the Pdb File Name between the last backslash and
    9090  either a following period or the end of the string is converted
    9191  to Unicode and copied into UnicodeBuffer.  The name is truncated,
    9292  if necessary, to ensure that UnicodeBuffer is not overrun.
    93  
     93
    9494  @param[in]  PdbFileName     Pdb file name.
    9595  @param[out] UnicodeBuffer   The resultant Unicode File Name.
    96  
     96
    9797**/
    9898VOID
     
    102102  );
    103103
    104 /** 
     104/**
    105105  Get a human readable name for an image handle.
    106106  The following methods will be tried orderly:
     
    111111    5. Image DevicePath
    112112    6. Unknown Driver Name
    113  
     113
    114114  @param[in]    Handle
    115  
     115
    116116  @post   The resulting Unicode name string is stored in the
    117117          mGaugeString global array.
    118  
     118
    119119**/
    120120VOID
     
    123123  );
    124124
    125 /** 
     125/**
    126126  Calculate the Duration in microseconds.
    127  
     127
    128128  Duration is multiplied by 1000, instead of Frequency being divided by 1000 or
    129129  multiplying the result by 1000, in order to maintain precision.  Since Duration is
    130130  a 64-bit value, multiplying it by 1000 is unlikely to produce an overflow.
    131  
     131
    132132  The time is calculated as (Duration * 1000) / Timer_Frequency.
    133  
     133
    134134  @param[in]  Duration   The event duration in timer ticks.
    135  
     135
    136136  @return     A 64-bit value which is the Elapsed time in microseconds.
    137137**/
     
    141141  );
    142142
    143 /** 
     143/**
    144144  Get index of Measurement Record's match in the CumData array.
    145  
     145
    146146  If the Measurement's Token value matches a Token in one of the CumData
    147147  records, the index of the matching record is returned.  The returned
    148148  index is a signed value so that negative values can indicate that
    149149  the Measurement didn't match any entry in the CumData array.
    150  
     150
    151151  @param[in]  Measurement A pointer to a Measurement Record to match against the CumData array.
    152  
     152
    153153  @retval     <0    Token is not in the CumData array.
    154154  @retval     >=0   Return value is the index into CumData where Token is found.
     
    159159  );
    160160
    161 /** 
     161/**
    162162  Collect verbose statistics about the logged performance measurements.
    163  
     163
    164164  General Summary information for all Trace measurements is gathered and
    165165  stored within the SummaryData structure.  This information is both
    166166  used internally by subsequent reporting functions, and displayed
    167167  at the end of verbose reports.
    168  
     168
    169169  @pre  The SummaryData and CumData structures must be initialized
    170170        prior to calling this function.
    171  
     171
    172172  @post The SummaryData and CumData structures contain statistics for the
    173173        current performance logs.
     
    178178  );
    179179
    180 /** 
     180/**
    181181  Gather and print ALL Trace Records.
    182  
     182
    183183  Displays all "interesting" Trace measurements in order.<BR>
    184184  The number of records displayed is controlled by:
     
    187187     - If the ExcludeFlag is TRUE, records matching entries in the CumData array are not
    188188       displayed.
    189  
     189
    190190  @pre    The mInterestThreshold global variable is set to the shortest duration to be printed.
    191191           The mGaugeString and mUnicodeToken global arrays are used for temporary string storage.
    192192           They must not be in use by a calling function.
    193  
     193
    194194  @param[in]    Limit       The number of records to print.  Zero is ALL.
    195195  @param[in]    ExcludeFlag TRUE to exclude individual Cumulative items from display.
    196  
     196
    197197**/
    198198VOID
     
    202202  );
    203203
    204 /** 
     204/**
    205205  Gather and print Raw Trace Records.
    206  
     206
    207207  All Trace measurements with a duration greater than or equal to
    208208  mInterestThreshold are printed without interpretation.
    209  
     209
    210210  The number of records displayed is controlled by:
    211211     - records with a duration less than mInterestThreshold microseconds are not displayed.
     
    213213     - If the ExcludeFlag is TRUE, records matching entries in the CumData array are not
    214214       displayed.
    215  
     215
    216216  @pre    The mInterestThreshold global variable is set to the shortest duration to be printed.
    217  
     217
    218218  @param[in]    Limit       The number of records to print.  Zero is ALL.
    219219  @param[in]    ExcludeFlag TRUE to exclude individual Cumulative items from display.
    220  
     220
    221221**/
    222222VOID
     
    226226  );
    227227
    228 /** 
     228/**
    229229  Gather and print Major Phase metrics.
    230  
     230
    231231  @param[in]    Ticker      The timer value for the END of Shell phase
    232  
     232
    233233**/
    234234VOID
     
    238238
    239239
    240 /** 
     240/**
    241241  Gather and print Handle data.
    242  
     242
    243243  @param[in]    ExcludeFlag   TRUE to exclude individual Cumulative items from display.
    244  
     244
    245245  @return       Status from a call to gBS->LocateHandle().
    246246**/
     
    251251
    252252
    253 /** 
     253/**
    254254  Gather and print PEIM data.
    255  
     255
    256256  Only prints complete PEIM records
    257  
     257
    258258**/
    259259VOID
     
    262262  );
    263263
    264 /** 
     264/**
    265265  Gather and print global data.
    266  
     266
    267267  Strips out incomplete or "Execution Phase" records
    268268  Only prints records where Handle is NULL
    269269  Increment TIndex for every record, even skipped ones, so that we have an
    270270  indication of every measurement record taken.
    271  
     271
    272272**/
    273273VOID
     
    276276  );
    277277
    278 /** 
     278/**
    279279  Gather and print cumulative data.
    280  
     280
    281281  Traverse the measurement records and:<BR>
    282282  For each record with a Token listed in the CumData array:<BR>
    283283     - Update the instance count and the total, minimum, and maximum durations.
    284284  Finally, print the gathered cumulative statistics.
    285  
     285
    286286**/
    287287VOID
     
    290290  );
    291291
    292 /** 
     292/**
    293293  Gather and print ALL Profiling Records.
    294  
     294
    295295  Displays all "interesting" Profile measurements in order.
    296296  The number of records displayed is controlled by:
     
    299299     - If the ExcludeFlag is TRUE, records matching entries in the CumData array are not
    300300       displayed.
    301  
     301
    302302  @pre    The mInterestThreshold global variable is set to the shortest duration to be printed.
    303303           The mGaugeString and mUnicodeToken global arrays are used for temporary string storage.
    304304           They must not be in use by a calling function.
    305  
     305
    306306  @param[in]    Limit         The number of records to print.  Zero is ALL.
    307307  @param[in]    ExcludeFlag   TRUE to exclude individual Cumulative items from display.
    308  
     308
    309309**/
    310310VOID
     
    314314  );
    315315
    316 /** 
     316/**
    317317  Gather and print Raw Profile Records.
    318  
     318
    319319  All Profile measurements with a duration greater than or equal to
    320320  mInterestThreshold are printed without interpretation.
    321  
     321
    322322  The number of records displayed is controlled by:
    323323     - records with a duration less than mInterestThreshold microseconds are not displayed.
     
    325325     - If the ExcludeFlag is TRUE, records matching entries in the CumData array are not
    326326       displayed.
    327  
     327
    328328  @pre    The mInterestThreshold global variable is set to the shortest duration to be printed.
    329  
     329
    330330  @param[in]    Limit         The number of records to print.  Zero is ALL.
    331331  @param[in]    ExcludeFlag   TRUE to exclude individual Cumulative items from display.
    332  
     332
    333333**/
    334334VOID
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiDpLib/DpProfile.c

    r58464 r58466  
    3030#include "DpInternal.h"
    3131
    32 /** 
     32/**
    3333  Gather and print ALL Profiling Records.
    34  
     34
    3535  Displays all "interesting" Profile measurements in order.
    3636  The number of records displayed is controlled by:
     
    3939     - If the ExcludeFlag is TRUE, records matching entries in the CumData array are not
    4040       displayed.
    41  
     41
    4242  @pre    The mInterestThreshold global variable is set to the shortest duration to be printed.
    4343           The mGaugeString and mUnicodeToken global arrays are used for temporary string storage.
    4444           They must not be in use by a calling function.
    45  
     45
    4646  @param[in]    Limit         The number of records to print.  Zero is ALL.
    4747  @param[in]    ExcludeFlag   TRUE to exclude individual Cumulative items from display.
    48  
     48
    4949**/
    5050VOID
     
    5757  EFI_STRING    StringPtrUnknown;
    5858
    59   StringPtrUnknown = HiiGetString (gDpHiiHandle, STRING_TOKEN (STR_ALIT_UNKNOWN), NULL);   
     59  StringPtrUnknown = HiiGetString (gDpHiiHandle, STRING_TOKEN (STR_ALIT_UNKNOWN), NULL);
    6060  StringPtr = HiiGetString (gDpHiiHandle, STRING_TOKEN (STR_DP_SECTION_PROFILE), NULL);
    6161
    62   ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DP_SECTION_HEADER), gDpHiiHandle, 
     62  ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DP_SECTION_HEADER), gDpHiiHandle,
    6363              (StringPtr == NULL) ? StringPtrUnknown: StringPtr);
    6464  FreePool (StringPtr);
     
    6666}
    6767
    68 /** 
     68/**
    6969  Gather and print Raw Profile Records.
    70  
     70
    7171  All Profile measurements with a duration greater than or equal to
    7272  mInterestThreshold are printed without interpretation.
    73  
     73
    7474  The number of records displayed is controlled by:
    7575     - records with a duration less than mInterestThreshold microseconds are not displayed.
     
    7777     - If the ExcludeFlag is TRUE, records matching entries in the CumData array are not
    7878       displayed.
    79  
     79
    8080  @pre    The mInterestThreshold global variable is set to the shortest duration to be printed.
    81  
     81
    8282  @param[in]    Limit         The number of records to print.  Zero is ALL.
    8383  @param[in]    ExcludeFlag   TRUE to exclude individual Cumulative items from display.
    84  
     84
    8585**/
    8686VOID
     
    9595  StringPtrUnknown = HiiGetString (gDpHiiHandle, STRING_TOKEN (STR_ALIT_UNKNOWN), NULL);
    9696  StringPtr = HiiGetString (gDpHiiHandle, STRING_TOKEN (STR_DP_SECTION_RAWPROFILE), NULL);
    97   ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DP_SECTION_HEADER), gDpHiiHandle, 
     97  ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DP_SECTION_HEADER), gDpHiiHandle,
    9898              (StringPtr == NULL) ? StringPtrUnknown: StringPtr);
    9999  FreePool (StringPtr);
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiDpLib/DpTrace.c

    r58464 r58466  
    3030#include "DpInternal.h"
    3131
    32 /** 
     32/**
    3333  Collect verbose statistics about the logged performance measurements.
    34  
     34
    3535  General Summary information for all Trace measurements is gathered and
    3636  stored within the SummaryData structure.  This information is both
    3737  used internally by subsequent reporting functions, and displayed
    3838  at the end of verbose reports.
    39  
     39
    4040  @pre  The SummaryData and CumData structures must be initialized
    4141        prior to calling this function.
    42  
     42
    4343  @post The SummaryData and CumData structures contain statistics for the
    4444        current performance logs.
     
    102102}
    103103
    104 /** 
     104/**
    105105  Gather and print ALL Trace Records.
    106  
     106
    107107  Displays all "interesting" Trace measurements in order.<BR>
    108108  The number of records displayed is controlled by:
     
    111111     - If the ExcludeFlag is TRUE, records matching entries in the CumData array are not
    112112       displayed.
    113  
     113
    114114  @pre    The mInterestThreshold global variable is set to the shortest duration to be printed.
    115115           The mGaugeString and mUnicodeToken global arrays are used for temporary string storage.
    116116           They must not be in use by a calling function.
    117  
     117
    118118  @param[in]    Limit       The number of records to print.  Zero is ALL.
    119119  @param[in]    ExcludeFlag TRUE to exclude individual Cumulative items from display.
    120  
     120
    121121**/
    122122VOID
     
    259259}
    260260
    261 /** 
     261/**
    262262  Gather and print Raw Trace Records.
    263  
     263
    264264  All Trace measurements with a duration greater than or equal to
    265265  mInterestThreshold are printed without interpretation.
    266  
     266
    267267  The number of records displayed is controlled by:
    268268     - records with a duration less than mInterestThreshold microseconds are not displayed.
     
    270270     - If the ExcludeFlag is TRUE, records matching entries in the CumData array are not
    271271       displayed.
    272  
     272
    273273  @pre    The mInterestThreshold global variable is set to the shortest duration to be printed.
    274  
     274
    275275  @param[in]    Limit       The number of records to print.  Zero is ALL.
    276276  @param[in]    ExcludeFlag TRUE to exclude individual Cumulative items from display.
    277  
     277
    278278**/
    279279VOID
     
    293293  EFI_STRING    StringPtrUnknown;
    294294
    295   StringPtrUnknown = HiiGetString (gDpHiiHandle, STRING_TOKEN (STR_ALIT_UNKNOWN), NULL); 
     295  StringPtrUnknown = HiiGetString (gDpHiiHandle, STRING_TOKEN (STR_ALIT_UNKNOWN), NULL);
    296296  StringPtr = HiiGetString (gDpHiiHandle, STRING_TOKEN (STR_DP_SECTION_RAWTRACE), NULL);
    297297  ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DP_SECTION_HEADER), gDpHiiHandle,
     
    358358}
    359359
    360 /** 
     360/**
    361361  Gather and print Major Phase metrics.
    362  
     362
    363363  @param[in]    Ticker      The timer value for the END of Shell phase
    364  
     364
    365365**/
    366366VOID
     
    388388  DxeTime         = 0;
    389389  BdsTime         = 0;
    390   ShellTime       = 0;   
     390  ShellTime       = 0;
    391391  //
    392392  // Get Execution Phase Statistics
    393393  //
    394   StringPtrUnknown = HiiGetString (gDpHiiHandle, STRING_TOKEN (STR_ALIT_UNKNOWN), NULL);   
     394  StringPtrUnknown = HiiGetString (gDpHiiHandle, STRING_TOKEN (STR_ALIT_UNKNOWN), NULL);
    395395  StringPtr = HiiGetString (gDpHiiHandle, STRING_TOKEN (STR_DP_SECTION_PHASES), NULL);
    396396  ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DP_SECTION_HEADER), gDpHiiHandle,
     
    499499}
    500500
    501 /** 
     501/**
    502502  Gather and print Handle data.
    503  
     503
    504504  @param[in]    ExcludeFlag   TRUE to exclude individual Cumulative items from display.
    505  
     505
    506506  @return       Status from a call to gBS->LocateHandle().
    507507**/
     
    524524  EFI_STRING                StringPtrUnknown;
    525525
    526   StringPtrUnknown = HiiGetString (gDpHiiHandle, STRING_TOKEN (STR_ALIT_UNKNOWN), NULL); 
     526  StringPtrUnknown = HiiGetString (gDpHiiHandle, STRING_TOKEN (STR_ALIT_UNKNOWN), NULL);
    527527  StringPtr = HiiGetString (gDpHiiHandle, STRING_TOKEN (STR_DP_SECTION_DRIVERS), NULL);
    528528  ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DP_SECTION_HEADER), gDpHiiHandle,
     
    619619}
    620620
    621 /** 
     621/**
    622622  Gather and print PEIM data.
    623  
     623
    624624  Only prints complete PEIM records
    625  
     625
    626626**/
    627627VOID
     
    638638  EFI_STRING                StringPtrUnknown;
    639639
    640   StringPtrUnknown = HiiGetString (gDpHiiHandle, STRING_TOKEN (STR_ALIT_UNKNOWN), NULL); 
     640  StringPtrUnknown = HiiGetString (gDpHiiHandle, STRING_TOKEN (STR_ALIT_UNKNOWN), NULL);
    641641  StringPtr = HiiGetString (gDpHiiHandle, STRING_TOKEN (STR_DP_SECTION_PEIMS), NULL);
    642642  ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DP_SECTION_HEADER), gDpHiiHandle,
     
    693693}
    694694
    695 /** 
     695/**
    696696  Gather and print global data.
    697  
     697
    698698  Strips out incomplete or "Execution Phase" records
    699699  Only prints records where Handle is NULL
    700700  Increment TIndex for every record, even skipped ones, so that we have an
    701701  indication of every measurement record taken.
    702  
     702
    703703**/
    704704VOID
     
    715715  EFI_STRING                StringPtrUnknown;
    716716
    717   StringPtrUnknown = HiiGetString (gDpHiiHandle, STRING_TOKEN (STR_ALIT_UNKNOWN), NULL); 
     717  StringPtrUnknown = HiiGetString (gDpHiiHandle, STRING_TOKEN (STR_ALIT_UNKNOWN), NULL);
    718718  StringPtr = HiiGetString (gDpHiiHandle, STRING_TOKEN (STR_DP_SECTION_GENERAL), NULL);
    719719  ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DP_SECTION_HEADER), gDpHiiHandle,
     
    775775}
    776776
    777 /** 
     777/**
    778778  Gather and print cumulative data.
    779  
     779
    780780  Traverse the measurement records and:<BR>
    781781  For each record with a Token listed in the CumData array:<BR>
    782782     - Update the instance count and the total, minimum, and maximum durations.
    783783  Finally, print the gathered cumulative statistics.
    784  
     784
    785785**/
    786786VOID
     
    797797  EFI_STRING                StringPtrUnknown;
    798798
    799   StringPtrUnknown = HiiGetString (gDpHiiHandle, STRING_TOKEN (STR_ALIT_UNKNOWN), NULL); 
     799  StringPtrUnknown = HiiGetString (gDpHiiHandle, STRING_TOKEN (STR_ALIT_UNKNOWN), NULL);
    800800  StringPtr = HiiGetString (gDpHiiHandle, STRING_TOKEN (STR_DP_SECTION_CUMULATIVE), NULL);
    801801  ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DP_SECTION_HEADER), gDpHiiHandle,
     
    815815      MaxDur = DurationInMicroSeconds(CumData[TIndex].MaxDur);
    816816      MinDur = DurationInMicroSeconds(CumData[TIndex].MinDur);
    817    
     817
    818818      ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DP_CUMULATIVE_STATS), gDpHiiHandle,
    819819                  CumData[TIndex].Name,
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiDpLib/DpUtilities.c

    r58464 r58466  
    4040#include "DpInternal.h"
    4141
    42 /** 
     42/**
    4343  Calculate an event's duration in timer ticks.
    44  
     44
    4545  Given the count direction and the event's start and end timer values,
    4646  calculate the duration of the event in timer ticks.  Information for
    4747  the current measurement is pointed to by the parameter.
    48  
     48
    4949  If the measurement's start time is 1, it indicates that the developer
    5050  is indicating that the measurement began at the release of reset.
    5151  The start time is adjusted to the timer's starting count before performing
    5252  the elapsed time calculation.
    53  
     53
    5454  The calculated duration, in ticks, is the absolute difference between
    5555  the measurement's ending and starting counts.
    56  
     56
    5757  @param Measurement   Pointer to a MEASUREMENT_RECORD structure containing
    5858                       data for the current measurement.
    59  
     59
    6060  @return              The 64-bit duration of the event.
    6161**/
     
    9292}
    9393
    94 /** 
     94/**
    9595  Determine whether the Measurement record is for an EFI Phase.
    96  
     96
    9797  The Token and Module members of the measurement record are checked.
    9898  Module must be empty and Token must be one of SEC, PEI, DXE, BDS, or SHELL.
    99  
     99
    100100  @param[in]  Measurement A pointer to the Measurement record to test.
    101  
     101
    102102  @retval     TRUE        The measurement record is for an EFI Phase.
    103103  @retval     FALSE       The measurement record is NOT for an EFI Phase.
     
    119119}
    120120
    121 /** 
     121/**
    122122  Get the file name portion of the Pdb File Name.
    123  
     123
    124124  The portion of the Pdb File Name between the last backslash and
    125125  either a following period or the end of the string is converted
    126126  to Unicode and copied into UnicodeBuffer.  The name is truncated,
    127127  if necessary, to ensure that UnicodeBuffer is not overrun.
    128  
     128
    129129  @param[in]  PdbFileName     Pdb file name.
    130130  @param[out] UnicodeBuffer   The resultant Unicode File Name.
    131  
     131
    132132**/
    133133VOID
     
    172172}
    173173
    174 /** 
     174/**
    175175  Get a human readable name for an image handle.
    176176  The following methods will be tried orderly:
     
    339339}
    340340
    341 /** 
     341/**
    342342  Calculate the Duration in microseconds.
    343  
     343
    344344  Duration is multiplied by 1000, instead of Frequency being divided by 1000 or
    345345  multiplying the result by 1000, in order to maintain precision.  Since Duration is
    346346  a 64-bit value, multiplying it by 1000 is unlikely to produce an overflow.
    347  
     347
    348348  The time is calculated as (Duration * 1000) / Timer_Frequency.
    349  
     349
    350350  @param[in]  Duration   The event duration in timer ticks.
    351  
     351
    352352  @return     A 64-bit value which is the Elapsed time in microseconds.
    353353**/
     
    363363}
    364364
    365 /** 
     365/**
    366366  Get index of Measurement Record's match in the CumData array.
    367  
     367
    368368  If the Measurement's Token value matches a Token in one of the CumData
    369369  records, the index of the matching record is returned.  The returned
    370370  index is a signed value so that negative values can indicate that
    371371  the Measurement didn't match any entry in the CumData array.
    372  
     372
    373373  @param[in]  Measurement A pointer to a Measurement Record to match against the CumData array.
    374  
     374
    375375  @retval     <0    Token is not in the CumData array.
    376376  @retval     >=0   Return value is the index into CumData where Token is found.
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c

    r58459 r58466  
    109109}
    110110
    111 /** 
     111/**
    112112  Initialization function for HII packages.
    113  
     113
    114114**/
    115115VOID
     
    221221                      LoadedImage->Unload);
    222222
    223  
     223
    224224  SHELL_FREE_NON_NULL(Temp);
    225225  SHELL_FREE_NON_NULL(CodeType);
     
    299299                      GraphicsOutput->Mode->Info->PixelFormat!=PixelBitMask?0:GraphicsOutput->Mode->Info->PixelInformation.BlueMask
    300300                      );
    301  
     301
    302302  SHELL_FREE_NON_NULL(Temp);
    303303  SHELL_FREE_NON_NULL(Fmt);
     
    355355  RetVal = Temp2;
    356356  Temp2 = NULL;
    357  
     357
    358358  Temp = HiiGetString(mHandleParsingHiiHandle, STRING_TOKEN(STR_PCIRB_DUMP_SEG), NULL);
    359359  ASSERT (Temp != NULL);
     
    369369  if (!EFI_ERROR(Status)) {
    370370    Temp = HiiGetString(mHandleParsingHiiHandle, STRING_TOKEN(STR_PCIRB_DUMP_ATT), NULL);
    371     ASSERT (Temp != NULL);   
     371    ASSERT (Temp != NULL);
    372372    Temp2 = CatSPrint(RetVal, Temp, Attributes);
    373373    FreePool(Temp);
     
    375375    RetVal = Temp2;
    376376    Temp2 = NULL;
    377    
     377
    378378    Temp = HiiGetString(mHandleParsingHiiHandle, STRING_TOKEN(STR_PCIRB_DUMP_SUPPORTS), NULL);
    379379    ASSERT (Temp != NULL);
     
    416416      }
    417417
    418       Temp2 = CatSPrint(RetVal, 
     418      Temp2 = CatSPrint(RetVal,
    419419        L"%H%02x    %016lx  %016lx  %02x%N\r\n",
    420420        Configuration->SpecificFlag,
     
    10561056/**
    10571057  Get best support language for this driver.
    1058  
    1059   First base on the user input language  to search, second base on the current 
    1060   platform used language to search, third get the first language from the 
     1058
     1059  First base on the user input language  to search, second base on the current
     1060  platform used language to search, third get the first language from the
    10611061  support language list. The caller need to free the buffer of the best language.
    10621062
     
    14561456      if (ControllerHandle == NULL) {
    14571457        //
    1458         // ControllerHandle == NULL and DriverBindingHandle != NULL. 
     1458        // ControllerHandle == NULL and DriverBindingHandle != NULL.
    14591459        // Return information on all the controller handles that the driver specified by DriverBindingHandle is managing
    14601460        //
     
    20042004
    20052005  //
    2006   // No handles were found... 
     2006  // No handles were found...
    20072007  //
    20082008  if (TotalSize == sizeof(EFI_HANDLE)) {
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni

    • Property svn:mime-type changed from application/octet-stream to text/plain;encoding=UTF-16LE
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c

    r58464 r58466  
    9292EFIAPI
    9393UpdateOptionalData(
    94   UINT16                          Index, 
    95   UINTN                           DataSize, 
     94  UINT16                          Index,
     95  UINTN                           DataSize,
    9696  UINT8                           *Data,
    9797  IN CONST BCFG_OPERATION_TARGET  Target
     
    107107
    108108  UnicodeSPrint(VariableName, sizeof(VariableName), L"%s%04x", Target == BcfgTargetBootOrder?L"Boot":L"Driver", Index);
    109  
     109
    110110  OriginalSize = 0;
    111111  OriginalData = NULL;
     
    154154    //
    155155    Status = gRT->SetVariable(
    156       VariableName, 
     156      VariableName,
    157157      (EFI_GUID*)&gEfiGlobalVariableGuid,
    158158      EFI_VARIABLE_NON_VOLATILE|EFI_VARIABLE_BOOTSERVICE_ACCESS|EFI_VARIABLE_RUNTIME_ACCESS,
     
    178178EFIAPI
    179179GetBootOptionCrc(
    180   UINT32      *Crc, 
     180  UINT32      *Crc,
    181181  UINT16      BootIndex
    182182  )
     
    810810
    811811  //
    812   // determine whether we have file with data, quote delimited information, or a hot-key 
     812  // determine whether we have file with data, quote delimited information, or a hot-key
    813813  //
    814814  if (Walker[0] == L'\"') {
     
    886886      if (ShellStatus == SHELL_SUCCESS) {
    887887        //
    888         // Now we know how many EFI_INPUT_KEY structs we need to attach to the end of the EFI_KEY_OPTION struct. 
     888        // Now we know how many EFI_INPUT_KEY structs we need to attach to the end of the EFI_KEY_OPTION struct.
    889889        // Re-allocate with the added information.
    890890        //
     
    941941          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellBcfgHiiHandle, L"Option Index");
    942942          ShellStatus = SHELL_INVALID_PARAMETER;
    943         }       
     943        }
    944944      }
    945945
     
    965965            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_SET_VAR_FAIL), gShellBcfgHiiHandle, VariableName, Status);
    966966            ShellStatus = SHELL_INVALID_PARAMETER;
    967           }   
     967          }
    968968        } else {
    969969          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_VAR_NO_NUM), gShellBcfgHiiHandle);
     
    10101010        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_SET_VAR_FAIL), gShellBcfgHiiHandle, VariableName, Status);
    10111011        ShellStatus = SHELL_INVALID_PARAMETER;
    1012       }   
     1012      }
    10131013    }
    10141014    if (EFI_ERROR(Status) && ShellStatus == SHELL_SUCCESS) {
    10151015      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_SET_VAR_FAIL), gShellBcfgHiiHandle, VariableName, Status);
    10161016      ShellStatus = SHELL_INVALID_PARAMETER;
    1017     }   
     1017    }
    10181018  }
    10191019
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf

    r58459 r58466  
    4141  gEfiShellParametersProtocolGuid                         ## CONSUMES
    4242  gEfiShellInterfaceGuid                                  ## SOMETIMES_CONSUMES
    43  
    4443
     44
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c

    r58459 r58466  
    239239    // not found or out of resources
    240240    //
    241     return NULL; 
     241    return NULL;
    242242  }
    243243
     
    256256          gUnicodeCollation,
    257257          (CHAR16*)CommandString,
    258           (CHAR16*)DynamicCommand->CommandName) == 0 
     258          (CHAR16*)DynamicCommand->CommandName) == 0
    259259          ){
    260260        FreePool(CommandHandleList);
     
    360360  // TODO: how to get proper language?
    361361  //
    362   return DynamicCommand->GetHelp(DynamicCommand, "en"); 
     362  return DynamicCommand->GetHelp(DynamicCommand, "en");
    363363}
    364364
     
    774774  ALIAS_LIST *Node;
    775775  ALIAS_LIST *CommandAlias;
    776   ALIAS_LIST *PrevCommandAlias; 
     776  ALIAS_LIST *PrevCommandAlias;
    777777  INTN       LexicalMatchValue;
    778778
     
    814814    // Swap PrevCommandAlias and CommandAlias list entry if PrevCommandAlias list entry
    815815    // is alphabetically greater than CommandAlias list entry
    816     // 
     816    //
    817817    if (LexicalMatchValue > 0) {
    818818      CommandAlias = (ALIAS_LIST *) SwapListEntries (&PrevCommandAlias->Link, &CommandAlias->Link);
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/Compress.c

    r58459 r58466  
    184184/**
    185185  Allocate memory spaces for data structures used in compression process.
    186  
     186
    187187  @retval EFI_SUCCESS           Memory was allocated successfully.
    188188  @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
     
    756756/**
    757757  Assign code to each symbol based on the code length array.
    758  
     758
    759759  @param[in] LoopVar8      The number of symbols.
    760760  @param[in] Len    The code length array.
     
    781781  }
    782782}
    783  
     783
    784784/**
    785785  Generates Huffman codes given a frequency distribution of symbols.
     
    12011201  Outputs an Original Character or a Pointer.
    12021202
    1203   @param[in] LoopVar5     The original character or the 'String Length' element of 
     1203  @param[in] LoopVar5     The original character or the 'String Length' element of
    12041204                   a Pointer.
    12051205  @param[in] LoopVar7     The 'Position' field of a Pointer.
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/Dblk.c

    r48674 r58466  
    6363  if (!EFI_ERROR(Status) && Buffer != NULL) {
    6464    ShellPrintHiiEx(
    65       -1, 
    66       -1, 
    67       NULL, 
    68       STRING_TOKEN (STR_DBLK_HEADER), 
    69       gShellDebug1HiiHandle, 
     65      -1,
     66      -1,
     67      NULL,
     68      STRING_TOKEN (STR_DBLK_HEADER),
     69      gShellDebug1HiiHandle,
    7070      Lba,
    7171      BufferSize,
     
    175175        }
    176176      }
    177      
     177
    178178      if (ShellStatus == SHELL_SUCCESS) {
    179179        //
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c

    r58459 r58466  
    153153          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDebug1HiiHandle, Temp1);
    154154          ShellStatus = SHELL_INVALID_PARAMETER;
    155         } 
     155        }
    156156        Temp1 = ShellCommandLineGetRawValue(Package, 2);
    157157        if (Temp1 == NULL) {
     
    199199          }
    200200
    201           ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_DMEM_SYSTEM_TABLE), gShellDebug1HiiHandle, 
     201          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_DMEM_SYSTEM_TABLE), gShellDebug1HiiHandle,
    202202            (UINT64)(UINTN)Address,
    203203            gST->Hdr.HeaderSize,
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c

    r58459 r58466  
    11/** @file
    22  Main file for DmpStore shell Debug1 function.
    3    
     3
    44  (C) Copyright 2013-2014, Hewlett-Packard Development Company, L.P.
    55  Copyright (c) 2005 - 2014, Intel Corporation. All rights reserved.<BR>
     
    5353  BufLen      = 0;
    5454  RetString   = NULL;
    55  
     55
    5656  if ((Atts & EFI_VARIABLE_NON_VOLATILE) != 0) {
    5757    StrnCatGrow (&RetString, &BufLen, L"+NV", 0);
     
    123123    return SHELL_DEVICE_ERROR;
    124124  }
    125  
     125
    126126  ShellStatus = SHELL_SUCCESS;
    127  
     127
    128128  InitializeListHead (&List);
    129  
     129
    130130  Position = 0;
    131131  while (Position < FileSize) {
     
    186186
    187187    Position += BufferSize + sizeof (Crc32);
    188    
     188
    189189    Variable = AllocateZeroPool (sizeof (*Variable) + NameSize + DataSize);
    190190    if (Variable == NULL) {
     
    205205    FreePool (Buffer);
    206206  }
    207    
     207
    208208  if ((Position != FileSize) || (ShellStatus != SHELL_SUCCESS)) {
    209209    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_DMPSTORE_LOAD_BAD_FILE), gShellDebug1HiiHandle);
     
    212212    }
    213213  }
    214  
     214
    215215  for ( Link = GetFirstNode (&List)
    216216      ; !IsNull (&List, Link) && (ShellStatus == SHELL_SUCCESS)
     
    218218      ) {
    219219    Variable = CR (Link, DMP_STORE_VARIABLE, Link, DMP_STORE_VARIABLE_SIGNATURE);
    220    
     220
    221221    if (((Name == NULL) || gUnicodeCollation->MetaiMatch (gUnicodeCollation, Variable->Name, (CHAR16 *) Name)) &&
    222222        ((Guid == NULL) || CompareGuid (&Variable->Guid, Guid))
     
    335335  FreePool (Buffer);
    336336
    337   if (!EFI_ERROR (Status) && 
     337  if (!EFI_ERROR (Status) &&
    338338      (BufferSize != sizeof (NameSize) + sizeof (DataSize) + sizeof (*Guid) + sizeof (Attributes) + NameSize + DataSize)
    339339    ) {
    340340    Status = EFI_DEVICE_ERROR;
    341341  }
    342  
     342
    343343  return Status;
    344344}
     
    347347  Recursive function to display or delete variables.
    348348
    349   This function will call itself to create a stack-based list of allt he variables to process, 
     349  This function will call itself to create a stack-based list of allt he variables to process,
    350350  then fromt he last to the first, they will do either printing or deleting.
    351351
     
    441441  // Only continue if Guid and VariableName are each either NULL or a match
    442442  //
    443   if ( ( Name == NULL 
     443  if ( ( Name == NULL
    444444      || gUnicodeCollation->MetaiMatch(gUnicodeCollation, FoundVarName, (CHAR16*) Name) )
    445      && ( Guid == NULL 
     445     && ( Guid == NULL
    446446      || CompareGuid(&FoundVarGuid, Guid) )
    447447      ) {
     
    572572    } else if (Name == NULL && Guid != NULL) {
    573573      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_DMPSTORE_NO_VAR_FOUND_G), gShellDebug1HiiHandle, Guid);
    574     } 
     574    }
    575575    return (SHELL_NOT_FOUND);
    576576  }
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/Edit.c

    r48674 r58466  
    8686            gEfiShellProtocol->SetCurDir(NULL, Nfs);
    8787            FreePool(Nfs);
    88           } 
     88          }
    8989        }
    9090      }
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c

    r58459 r58466  
    5454// the whole edit area needs to be refreshed
    5555//
    56 BOOLEAN          FileBufferNeedRefresh; 
     56BOOLEAN          FileBufferNeedRefresh;
    5757
    5858//
     
    147147/**
    148148  Advance to the next Count lines
    149  
     149
    150150  @param[in] Count              The line number to advance by.
    151151  @param[in] CurrentLine        The pointer to the current line structure.
     
    187187/**
    188188  Retreat to the previous Count lines.
    189  
     189
    190190  @param[in] Count              The line number to retreat by.
    191191  @param[in] CurrentLine        The pointer to the current line structure.
     
    227227/**
    228228  Advance/Retreat lines
    229  
     229
    230230  @param[in] Count  line number to advance/retreat
    231231                       >0 : advance
     
    492492  CHAR16  *PrintLine;
    493493  CHAR16  *PrintLine2;
    494   UINTN   BufLen; 
     494  UINTN   BufLen;
    495495
    496496  //
     
    722722
    723723  @param Str                    The file name to set.
    724  
     724
    725725  @retval EFI_SUCCESS           The filename was successfully set.
    726726  @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
     
    777777/**
    778778  Read a file from disk into the FileBuffer.
    779  
     779
    780780  @param[in] FileName           The filename to read.
    781781  @param[in] Recover            TRUE if is for recover mode, no information printouts.
    782  
     782
    783783  @retval EFI_SUCCESS            The load was successful.
    784784  @retval EFI_LOAD_ERROR         The load failed.
     
    838838
    839839    Info = ShellGetFileInfo(FileHandle);
    840    
     840
    841841    if (Info->Attribute & EFI_FILE_DIRECTORY) {
    842842      StatusBarSetStatusString (L"Directory Can Not Be Edited");
     
    14141414
    14151415  @retval EFI_SUCCESS           Data was written.
    1416   @retval EFI_LOAD_ERROR       
     1416  @retval EFI_LOAD_ERROR
    14171417  @retval EFI_OUT_OF_RESOURCES  There were not enough resources to write the file.
    14181418**/
     
    14901490      return EFI_LOAD_ERROR;
    14911491    }
    1492    
     1492
    14931493    if (Info != NULL) {
    14941494      Attribute = Info->Attribute & ~EFI_FILE_READ_ONLY;
     
    15681568      Status  = ShellWriteFile (FileHandle, &Size, Cache);
    15691569      if (EFI_ERROR (Status)) {
    1570         ShellDeleteFile (&FileHandle);       
     1570        ShellDeleteFile (&FileHandle);
    15711571        FreePool (Cache);
    15721572        return EFI_LOAD_ERROR;
     
    19341934
    19351935/**
    1936   Delete current character from current line.  This is the effect caused 
     1936  Delete current character from current line.  This is the effect caused
    19371937  by the 'del' key.
    19381938
     
    20482048  Insert a char into line
    20492049
    2050  
     2050
    20512051  @param[in] Line     The line to insert into.
    20522052  @param[in] Char     The char to insert.
     
    24282428}
    24292429
    2430 /** 
     2430/**
    24312431  Dispatch input to different handler
    24322432  @param[in] Key                The input key.  One of:
     
    26482648/**
    26492649  Advance/Retreat lines and set CurrentLine in FileBuffer to it
    2650  
     2650
    26512651  @param[in] Count The line number to advance/retreat
    26522652                     >0 : advance
     
    27962796  Cut current line out and return a pointer to it.
    27972797
    2798   @param[out] CutLine    Upon a successful return pointer to the pointer to 
     2798  @param[out] CutLine    Upon a successful return pointer to the pointer to
    27992799                        the allocated cut line.
    28002800
     
    29732973  Column = 0;
    29742974  Position = 0;
    2975  
     2975
    29762976  //
    29772977  // search if in current line
     
    29922992    Position = CharPos - Current + 1;
    29932993    Found   = TRUE;
    2994   } 
     2994  }
    29952995
    29962996  //
     
    30143014        Position = CharPos - Line->Buffer + 1;
    30153015        Found   = TRUE;
    3016       } 
    3017      
     3016      }
     3017
    30183018      if (Found) {
    30193019        //
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.h

    r48674 r58466  
    5454  );
    5555
    56 /** 
     56/**
    5757  Dispatch input to different handler
    5858  @param[in] Key                The input key.  One of:
     
    105105
    106106  @param Str                    The file name to set.
    107  
     107
    108108  @retval EFI_SUCCESS           The filename was successfully set.
    109109  @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
     
    118118/**
    119119  Read a file from disk into the FileBuffer.
    120  
     120
    121121  @param[in] FileName           The filename to read.
    122122  @param[in] Recover            TRUE if is for recover mode, no information printouts.
    123  
     123
    124124  @retval EFI_SUCCESS            The load was successful.
    125125  @retval EFI_LOAD_ERROR         The load failed.
     
    140140
    141141  @retval EFI_SUCCESS           Data was written.
    142   @retval EFI_LOAD_ERROR       
     142  @retval EFI_LOAD_ERROR
    143143  @retval EFI_OUT_OF_RESOURCES  There were not enough resources to write the file.
    144144**/
     
    165165  Cut current line out and return a pointer to it.
    166166
    167   @param[out] CutLine    Upon a successful return pointer to the pointer to 
     167  @param[out] CutLine    Upon a successful return pointer to the pointer to
    168168                        the allocated cut line.
    169169
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.c

    r58459 r58466  
    7878  Save current file to disk, you can save to current file name or
    7979  save to another file name.
    80  
     80
    8181  @retval EFI_SUCCESS           The file was saved correctly.
    8282  @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
     
    11371137  Save current file to disk, you can save to current file name or
    11381138  save to another file name.
    1139  
     1139
    11401140  @retval EFI_SUCCESS           The file was saved correctly.
    11411141  @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
     
    11511151  BOOLEAN           OldFile;
    11521152  CHAR16            *Str;
    1153   SHELL_FILE_HANDLE FileHandle; 
     1153  SHELL_FILE_HANDLE FileHandle;
    11541154  EFI_FILE_INFO     *Info;
    11551155
     
    12811281        FreePool (FileName);
    12821282        return EFI_SUCCESS;
    1283       } 
     1283      }
    12841284
    12851285      Info = ShellGetFileInfo(FileHandle);
     
    12881288        FreePool (FileName);
    12891289        return (EFI_SUCCESS);
    1290       } 
    1291      
     1290      }
     1291
    12921292      if (Info->Attribute & EFI_FILE_READ_ONLY) {
    12931293        StatusBarSetStatusString (L"Access Denied - Read Only");
     
    13641364  CHAR16          *InfoString;
    13651365  EFI_INPUT_KEY   Key;
    1366  
    1367   //
    1368   // print helpInfo     
     1366
     1367  //
     1368  // print helpInfo
    13691369  //
    13701370  for (CurrentLine = 0; 0 != MainMenuHelpInfo[CurrentLine]; CurrentLine++) {
    13711371    InfoString = HiiGetString(gShellDebug1HiiHandle, MainMenuHelpInfo[CurrentLine], NULL);
    1372     ShellPrintEx (0, CurrentLine+1, L"%E%s%N", InfoString);       
    1373   }
    1374  
     1372    ShellPrintEx (0, CurrentLine+1, L"%E%s%N", InfoString);
     1373  }
     1374
    13751375  //
    13761376  // scan for ctrl+w
     
    13781378  do {
    13791379    gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);
    1380   } while(SCAN_CONTROL_W != Key.UnicodeChar); 
     1380  } while(SCAN_CONTROL_W != Key.UnicodeChar);
    13811381
    13821382  //
     
    13861386  FileBufferNeedRefresh = TRUE;
    13871387  FileBufferOnlyLineNeedRefresh = FALSE;
    1388   FileBufferRefresh (); 
     1388  FileBufferRefresh ();
    13891389
    13901390  return EFI_SUCCESS;
     
    16101610  // call the components refresh function
    16111611  //
    1612   if (EditorFirst 
    1613     || StrCmp (FileBufferBackupVar.FileName, FileBuffer.FileName) != 0 
    1614     || FileBufferBackupVar.FileType != FileBuffer.FileType 
    1615     || FileBufferBackupVar.FileModified != FileBuffer.FileModified 
     1612  if (EditorFirst
     1613    || StrCmp (FileBufferBackupVar.FileName, FileBuffer.FileName) != 0
     1614    || FileBufferBackupVar.FileType != FileBuffer.FileType
     1615    || FileBufferBackupVar.FileModified != FileBuffer.FileModified
    16161616    || FileBufferBackupVar.ReadOnly != FileBuffer.ReadOnly) {
    16171617
     
    16211621  }
    16221622  if (EditorFirst
    1623     || FileBufferBackupVar.FilePosition.Row != FileBuffer.FilePosition.Row 
    1624     || FileBufferBackupVar.FilePosition.Column != FileBuffer.FilePosition.Column 
     1623    || FileBufferBackupVar.FilePosition.Row != FileBuffer.FilePosition.Row
     1624    || FileBufferBackupVar.FilePosition.Column != FileBuffer.FilePosition.Column
    16251625    || FileBufferBackupVar.ModeInsert != FileBuffer.ModeInsert
    16261626    || StatusBarGetRefresh()) {
     
    18611861      } else {
    18621862        StatusBarSetStatusString (L"Unknown Command");
    1863         FileBufferMouseNeedRefresh = FALSE; 
    1864       }
    1865      
     1863        FileBufferMouseNeedRefresh = FALSE;
     1864      }
     1865
    18661866      if (Status != EFI_SUCCESS && Status != EFI_OUT_OF_RESOURCES) {
    18671867        //
     
    19311931{
    19321932  FileBufferBackup ();
    1933  
     1933
    19341934  return EFI_SUCCESS;
    19351935}
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/TextEditStrings.uni

    • Property svn:mime-type changed from application/octet-stream to text/plain;encoding=UTF-16LE
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/EditInputBar.c

    r58459 r58466  
    242242
    243243  mReturnString[Size] = CHAR_NULL;
    244  
     244
    245245
    246246  //
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/EditMenuBar.c

    r48674 r58466  
    5050
    5151  for (NumItems = 0, ItemsWalker = Items ; ItemsWalker != NULL && ItemsWalker->Function != NULL ; ItemsWalker++,NumItems++);
    52  
     52
    5353  MenuItems = AllocateZeroPool((NumItems+1) * sizeof(EDITOR_MENU_ITEM));
    5454  if (MenuItems == NULL) {
     
    7373{
    7474  ControlBasedMenuFunctions = Items;
    75   return EFI_SUCCESS; 
     75  return EFI_SUCCESS;
    7676}
    7777/**
     
    143143  @param[in] Key                The pressed key.
    144144
    145   @retval EFI_NOT_FOUND         The key was not a valid function key 
     145  @retval EFI_NOT_FOUND         The key was not a valid function key
    146146                                (an error was sent to the status bar).
    147147  @return The return value from the called dispatch function.
     
    173173  @param[in] Key                The pressed key.
    174174
    175   @retval EFI_NOT_FOUND         The key was not a valid control-based key 
     175  @retval EFI_NOT_FOUND         The key was not a valid control-based key
    176176                                (an error was sent to the status bar).
    177177  @return EFI_SUCCESS.
     
    183183  )
    184184{
    185  
     185
    186186  if ((SCAN_CONTROL_Z < Key->UnicodeChar)
    187187    ||(NULL == ControlBasedMenuFunctions[Key->UnicodeChar]))
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/EditMenuBar.h

    r48674 r58466  
    9898  @param[in] Key                The pressed key.
    9999
    100   @retval EFI_NOT_FOUND         The key was not a valid function key 
     100  @retval EFI_NOT_FOUND         The key was not a valid function key
    101101                                (an error was sent to the status bar).
    102102  @return The return value from the called dispatch function.
     
    113113  @param[in] Key                The pressed key.
    114114
    115   @retval EFI_NOT_FOUND         The key was not a valid control-based key 
     115  @retval EFI_NOT_FOUND         The key was not a valid control-based key
    116116                                (an error was sent to the status bar).
    117117  @return EFI_SUCCESS.
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/EditStatusBar.c

    r58459 r58466  
    7474  Cause the status bar to refresh it's printing on the screen.
    7575
    76   @param[in] EditorFirst      TRUE to indicate the first launch of the editor. 
     76  @param[in] EditorFirst      TRUE to indicate the first launch of the editor.
    7777                              FALSE otherwise.
    7878  @param[in] LastRow          LastPrintable row.
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/EditStatusBar.h

    r48674 r58466  
    4141  Cause the status bar to refresh it's printing on the screen.
    4242
    43   @param[in] EditorFirst      TRUE to indicate the first launch of the editor. 
     43  @param[in] EditorFirst      TRUE to indicate the first launch of the editor.
    4444                              FALSE otherwise.
    4545  @param[in] LastRow          LastPrintable row.
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/EfiDecompress.c

    r58459 r58466  
    156156                }
    157157              }
    158             } 
     158            }
    159159          }
    160160        }
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c

    r58459 r58466  
    22  Defines HBufferImage - the view of the file that is visible at any point,
    33  as well as the event handlers for editing the file
    4  
     4
    55  Copyright (c) 2005 - 2014, Intel Corporation. All rights reserved. <BR>
    66  This program and the accompanying materials
     
    139139
    140140/**
    141   Backup function for HBufferImage. Only a few fields need to be backup. 
     141  Backup function for HBufferImage. Only a few fields need to be backup.
    142142  This is for making the file buffer refresh as few as possible.
    143143
     
    191191    CurrentLine
    192192    NumLines
    193     ListHead 
     193    ListHead
    194194
    195195  @retval EFI_SUCCESS  The operation was successful.
     
    948948    Status = HMemImageRead (MemOffset, MemSize, Recover);
    949949    break;
    950    
     950
    951951  default:
    952952    Status = EFI_NOT_FOUND;
     
    10151015    Status = HMemImageSave (MemOffset, MemSize);
    10161016    break;
    1017    
     1017
    10181018  default:
    10191019    Status = EFI_NOT_FOUND;
     
    10321032    Fields affected:
    10331033    NumLines
    1034     Lines 
     1034    Lines
    10351035
    10361036  @retval NULL    create line failed.
     
    13741374
    13751375  @param[in] FileRow  Row of file position ( start from 1 ).
    1376  
     1376
    13771377  @retval TRUE   It is above the current screen.
    13781378  @retval FALSE  It is not above the current screen.
     
    18861886/**
    18871887  Delete character from buffer.
    1888  
     1888
    18891889  @param[in] Pos      Position, Pos starting from 0.
    18901890  @param[in] Count    The Count of characters to delete.
    18911891  @param[out] DeleteBuffer    The DeleteBuffer.
    18921892
    1893   @retval EFI_SUCCESS Success 
     1893  @retval EFI_SUCCESS Success
    18941894**/
    18951895EFI_STATUS
     
    20202020  @param[in] AddBuffer  Add buffer.
    20212021
    2022   @retval EFI_SUCCESS   Success. 
     2022  @retval EFI_SUCCESS   Success.
    20232023**/
    20242024EFI_STATUS
     
    21732173/**
    21742174  Change the raw buffer to a list of lines for the UI.
    2175  
     2175
    21762176  @param[in] Buffer   The pointer to the buffer to fill.
    21772177  @param[in] Bytes    The size of the buffer in bytes.
     
    22392239/**
    22402240  Change the list of lines from the UI to a raw buffer.
    2241  
     2241
    22422242  @param[in] Buffer   The pointer to the buffer to fill.
    22432243  @param[in] Bytes    The size of the buffer in bytes.
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.h

    r48674 r58466  
    11/** @file
    2     Defines BufferImage - the view of the file that is visible at any point, 
     2    Defines BufferImage - the view of the file that is visible at any point,
    33    as well as the event handlers for editing the file
    4  
     4
    55  Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved. <BR>
    66  This program and the accompanying materials
     
    7373
    7474/**
    75   Backup function for HBufferImage. Only a few fields need to be backup. 
     75  Backup function for HBufferImage. Only a few fields need to be backup.
    7676  This is for making the file buffer refresh as few as possible.
    7777
     
    153153    Fields affected:
    154154    NumLines
    155     Lines 
     155    Lines
    156156
    157157  @retval NULL    create line failed.
     
    176176/**
    177177  Delete character from buffer.
    178  
     178
    179179  @param[in] Pos      Position, Pos starting from 0.
    180180  @param[in] Count    The Count of characters to delete.
    181181  @param[out] DeleteBuffer    The DeleteBuffer.
    182182
    183   @retval EFI_SUCCESS Success 
     183  @retval EFI_SUCCESS Success
    184184**/
    185185EFI_STATUS
     
    197197  @param[in] AddBuffer  Add buffer.
    198198
    199   @retval EFI_SUCCESS   Success. 
     199  @retval EFI_SUCCESS   Success.
    200200**/
    201201EFI_STATUS
     
    208208/**
    209209  Change the raw buffer to a list of lines for the UI.
    210  
     210
    211211  @param[in] Buffer   The pointer to the buffer to fill.
    212212  @param[in] Bytes    The size of the buffer in bytes.
     
    224224/**
    225225  Change the list of lines from the UI to a raw buffer.
    226  
     226
    227227  @param[in] Buffer   The pointer to the buffer to fill.
    228228  @param[in] Bytes    The size of the buffer in bytes.
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Clipboard.c

    r48674 r58466  
    11/** @file
    22    Functions to deal with Clip Board
    3  
     3
    44  Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved. <BR>
    55  This program and the accompanying materials
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Clipboard.h

    r48674 r58466  
    11/** @file
    2     Defines DiskImage - the view of the file that is visible at any point, 
     2    Defines DiskImage - the view of the file that is visible at any point,
    33    as well as the event handlers for editing the file
    4  
     4
    55  Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved. <BR>
    66  This program and the accompanying materials
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/DiskImage.c

    r58459 r58466  
    4040/**
    4141  Initialization function for HDiskImage.
    42  
     42
    4343  @retval EFI_SUCCESS     The operation was successful.
    4444  @retval EFI_LOAD_ERROR  A load error occured.
     
    6060
    6161/**
    62   Backup function for HDiskImage. Only a few fields need to be backup.   
     62  Backup function for HDiskImage. Only a few fields need to be backup.
    6363  This is for making the Disk buffer refresh as few as possible.
    6464
     
    160160  @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
    161161  @retval EFI_LOAD_ERROR        A load error occured.
    162   @retval EFI_INVALID_PARAMETER A parameter was invalid. 
     162  @retval EFI_INVALID_PARAMETER A parameter was invalid.
    163163**/
    164164EFI_STATUS
     
    332332  @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
    333333  @retval EFI_LOAD_ERROR        A load error occured.
    334   @retval EFI_INVALID_PARAMETER A parameter was invalid. 
     334  @retval EFI_INVALID_PARAMETER A parameter was invalid.
    335335**/
    336336EFI_STATUS
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/DiskImage.h

    r48674 r58466  
    11/** @file
    2   Defines DiskImage - the view of the file that is visible at any point, 
     2  Defines DiskImage - the view of the file that is visible at any point,
    33  as well as the event handlers for editing the file
    4  
     4
    55  Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved. <BR>
    66  This program and the accompanying materials
     
    2121/**
    2222  Initialization function for HDiskImage.
    23  
     23
    2424  @retval EFI_SUCCESS     The operation was successful.
    2525  @retval EFI_LOAD_ERROR  A load error occured.
     
    4141
    4242/**
    43   Backup function for HDiskImage. Only a few fields need to be backup.   
     43  Backup function for HDiskImage. Only a few fields need to be backup.
    4444  This is for making the Disk buffer refresh as few as possible.
    4545
     
    6363  @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
    6464  @retval EFI_LOAD_ERROR        A load error occured.
    65   @retval EFI_INVALID_PARAMETER A parameter was invalid. 
     65  @retval EFI_INVALID_PARAMETER A parameter was invalid.
    6666**/
    6767EFI_STATUS
     
    8484  @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
    8585  @retval EFI_LOAD_ERROR        A load error occured.
    86   @retval EFI_INVALID_PARAMETER A parameter was invalid. 
     86  @retval EFI_INVALID_PARAMETER A parameter was invalid.
    8787**/
    8888EFI_STATUS
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/FileImage.c

    r48674 r58466  
    3838/**
    3939  Initialization function for HFileImage
    40  
     40
    4141  @retval EFI_SUCCESS     The operation was successful.
    4242**/
     
    6161
    6262/**
    63   Backup function for HFileImage. Only a few fields need to be backup. 
     63  Backup function for HFileImage. Only a few fields need to be backup.
    6464  This is for making the file buffer refresh as few as possible.
    6565
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/FileImage.h

    r48674 r58466  
    11/** @file
    2   Defines FileImage - the view of the file that is visible at any point, 
     2  Defines FileImage - the view of the file that is visible at any point,
    33  as well as the event handlers for editing the file
    4  
     4
    55  Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved. <BR>
    66  This program and the accompanying materials
     
    2121/**
    2222  Initialization function for HFileImage
    23  
     23
    2424  @retval EFI_SUCCESS     The operation was successful.
    2525**/
     
    4040
    4141/**
    42   Backup function for HFileImage. Only a few fields need to be backup. 
     42  Backup function for HFileImage. Only a few fields need to be backup.
    4343  This is for making the file buffer refresh as few as possible.
    4444
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEdit.c

    r58459 r58466  
    11/** @file
    22  Main entry point of editor
    3  
     3
    44  Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved. <BR>
    55  This program and the accompanying materials
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEditor.h

    r48674 r58466  
    11/** @file
    22  Main include file for hex editor
    3  
     3
    44  Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved. <BR>
    55  This program and the accompanying materials
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEditorTypes.h

    r58459 r58466  
    11/** @file
    22  data types that are used by editor
    3  
     3
    44  Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved. <BR>
    55  This program and the accompanying materials
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexeditStrings.uni

    • Property svn:mime-type changed from application/octet-stream to text/plain;encoding=UTF-16LE
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c

    r58459 r58466  
    11/** @file
    2     Defines the Main Editor data type - 
    3      - Global variables 
     2    Defines the Main Editor data type -
     3     - Global variables
    44     - Instances of the other objects of the editor
    55     - Main Interfaces
    6  
     6
    77  Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved. <BR>
    88  This program and the accompanying materials
     
    111111
    112112  CurrentLine = 0;
    113   // print helpInfo     
     113  // print helpInfo
    114114  for (CurrentLine = 0; 0 != HexMainMenuHelpInfo[CurrentLine]; CurrentLine++) {
    115115    InfoString = HiiGetString(gShellDebug1HiiHandle, HexMainMenuHelpInfo[CurrentLine]
    116116, NULL);
    117     ShellPrintEx (0,CurrentLine+1,L"%E%s%N",InfoString);       
    118   }
    119  
     117    ShellPrintEx (0,CurrentLine+1,L"%E%s%N",InfoString);
     118  }
     119
    120120  // scan for ctrl+w
    121121  do {
    122122    gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);
    123   } while(SCAN_CONTROL_W != Key.UnicodeChar); 
     123  } while(SCAN_CONTROL_W != Key.UnicodeChar);
    124124
    125125  // update screen with buffer's info
     
    212212/**
    213213  Save current opened buffer.
    214   If is file buffer, you can save to current file name or 
     214  If is file buffer, you can save to current file name or
    215215  save to another file name.
    216216
     
    342342  //       and remove the Modified flag in Title Bar.
    343343  //
    344   Str = CatSPrint(NULL, 
     344  Str = CatSPrint(NULL,
    345345          L"File to Save: [%s]",
    346346          HMainEditor.BufferImage->FileImage->FileName
     
    389389  //
    390390  if (StrLen (InputBarGetString()) == 0) {
    391     FileName = CatSPrint(NULL, 
     391    FileName = CatSPrint(NULL,
    392392                L"%s",
    393393                HMainEditor.BufferImage->FileImage->FileName
     
    443443        SHELL_FREE_NON_NULL (FileName);
    444444        return EFI_SUCCESS;
    445       } 
     445      }
    446446
    447447      SHELL_FREE_NON_NULL(Info);
     
    487487    } // if opened existing file
    488488  } // if OldFile
    489  
     489
    490490  //
    491491  // save file back to disk
     
    17571757
    17581758  StatusBarCleanup ();
    1759  
     1759
    17601760  InputBarCleanup ();
    1761  
     1761
    17621762  Status = HBufferImageCleanup ();
    17631763  if (EFI_ERROR (Status)) {
     
    18041804    if (HMainEditor.BufferImage->DiskImage != NULL &&
    18051805        HBufferImageBackupVar.DiskImage != NULL &&
    1806         (HMainEditor.BufferImage->DiskImage->Offset != HBufferImageBackupVar.DiskImage->Offset || 
     1806        (HMainEditor.BufferImage->DiskImage->Offset != HBufferImageBackupVar.DiskImage->Offset ||
    18071807           HMainEditor.BufferImage->DiskImage->Size != HBufferImageBackupVar.DiskImage->Size) ){
    18081808      NameChange = TRUE;
     
    18111811    if (HMainEditor.BufferImage->MemImage != NULL &&
    18121812        HBufferImageBackupVar.MemImage != NULL &&
    1813         (HMainEditor.BufferImage->MemImage->Offset != HBufferImageBackupVar.MemImage->Offset || 
     1813        (HMainEditor.BufferImage->MemImage->Offset != HBufferImageBackupVar.MemImage->Offset ||
    18141814           HMainEditor.BufferImage->MemImage->Size != HBufferImageBackupVar.MemImage->Size) ){
    18151815      NameChange = TRUE;
    18161816    }
    18171817  } else if (HMainEditor.BufferImage->BufferType == FileTypeFileBuffer) {
    1818     if ( HMainEditor.BufferImage->FileImage != NULL && 
    1819          HMainEditor.BufferImage->FileImage->FileName != NULL && 
    1820          HBufferImageBackupVar.FileImage != NULL && 
    1821          HBufferImageBackupVar.FileImage->FileName != NULL && 
     1818    if ( HMainEditor.BufferImage->FileImage != NULL &&
     1819         HMainEditor.BufferImage->FileImage->FileName != NULL &&
     1820         HBufferImageBackupVar.FileImage != NULL &&
     1821         HBufferImageBackupVar.FileImage->FileName != NULL &&
    18221822         StrCmp (HMainEditor.BufferImage->FileImage->FileName, HBufferImageBackupVar.FileImage->FileName) != 0 ) {
    18231823      NameChange = TRUE;
    18241824    }
    18251825  }
    1826   if ( HMainEditor.BufferImage->FileImage != NULL && 
    1827        HBufferImageBackupVar.FileImage != NULL && 
     1826  if ( HMainEditor.BufferImage->FileImage != NULL &&
     1827       HBufferImageBackupVar.FileImage != NULL &&
    18281828       HMainEditor.BufferImage->FileImage->ReadOnly != HBufferImageBackupVar.FileImage->ReadOnly ) {
    18291829    ReadChange = TRUE;
     
    18391839  // call the components refresh function
    18401840  //
    1841   if (HEditorFirst 
     1841  if (HEditorFirst
    18421842    || NameChange
    1843     || HMainEditor.BufferImage->BufferType != HBufferImageBackupVar.BufferType 
    1844     || HBufferImageBackupVar.Modified != HMainEditor.BufferImage->Modified 
     1843    || HMainEditor.BufferImage->BufferType != HBufferImageBackupVar.BufferType
     1844    || HBufferImageBackupVar.Modified != HMainEditor.BufferImage->Modified
    18451845    || ReadChange ) {
    18461846
     
    18581858  }
    18591859  if (HEditorFirst
    1860     || HBufferImageBackupVar.DisplayPosition.Row != HMainEditor.BufferImage->DisplayPosition.Row 
    1861     || HBufferImageBackupVar.DisplayPosition.Column != HMainEditor.BufferImage->DisplayPosition.Column 
     1860    || HBufferImageBackupVar.DisplayPosition.Row != HMainEditor.BufferImage->DisplayPosition.Row
     1861    || HBufferImageBackupVar.DisplayPosition.Column != HMainEditor.BufferImage->DisplayPosition.Column
    18621862    || StatusBarGetRefresh()) {
    18631863
     
    22752275          OldSize = HBufferImage.MemImage->Size;
    22762276          break;
    2277        
     2277
    22782278        default:
    22792279          OldSize = 0;
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.h

    r48674 r58466  
    11/** @file
    2     Defines the Main Editor data type - 
    3      - Global variables 
     2    Defines the Main Editor data type -
     3     - Global variables
    44     - Instances of the other objects of the editor
    55     - Main Interfaces
    6  
     6
    77  Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved. <BR>
    88  This program and the accompanying materials
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MemImage.c

    r58459 r58466  
    11/** @file
    22  Functions to deal with Mem buffer
    3  
     3
    44  Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved. <BR>
    55  This program and the accompanying materials
     
    129129
    130130/**
    131   Backup function for HDiskImage. Only a few fields need to be backup. 
     131  Backup function for HDiskImage. Only a few fields need to be backup.
    132132  This is for making the Disk buffer refresh as few as possible.
    133133
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MemImage.h

    r48674 r58466  
    11/** @file
    2   Defines MemImage - the view of the file that is visible at any point, 
     2  Defines MemImage - the view of the file that is visible at any point,
    33  as well as the event handlers for editing the file
    4  
     4
    55  Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved. <BR>
    66  This program and the accompanying materials
     
    3131
    3232/**
    33   Backup function for HDiskImage. Only a few fields need to be backup. 
     33  Backup function for HDiskImage. Only a few fields need to be backup.
    3434  This is for making the Disk buffer refresh as few as possible.
    3535
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Misc.c

    r48674 r58466  
    11/** @file
    22  Implementation of various string and line routines
    3  
     3
    44  Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved. <BR>
    55  This program and the accompanying materials
     
    1919/**
    2020  Free a line and it's internal buffer.
    21  
     21
    2222  @param[in] Src    The line to be freed.
    2323**/
     
    110110  @param[in] Count      The line number to advance/retreat.
    111111                            >0 : advance
    112                             <0: retreat 
     112                            <0: retreat
    113113
    114114  @retval NULL An error occured.
     
    183183    CurrentLine
    184184    NumLines
    185     ListHead 
     185    ListHead
    186186
    187187  @param[in] ListHead     The list head.
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Misc.h

    r48674 r58466  
    2323  @param[in] Count      The line number to advance/retreat.
    2424                            >0 : advance
    25                             <0: retreat 
     25                            <0: retreat
    2626
    2727  @retval NULL An error occured.
     
    5454    CurrentLine
    5555    NumLines
    56     ListHead 
     56    ListHead
    5757
    5858  @param[in] ListHead     The list head.
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/LoadPciRom.c

    r48674 r58466  
    239239
    240240    //
    241     // If the pointer to the PCI Data Structure is invalid, no further images can be located. 
    242     // The PCI Data Structure must be DWORD aligned. 
     241    // If the pointer to the PCI Data Structure is invalid, no further images can be located.
     242    // The PCI Data Structure must be DWORD aligned.
    243243    //
    244244    if (EfiRomHeader->PcirOffset == 0 ||
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c

    r58459 r58466  
    20542054  @param[in] CapabilityPtr    The offset from the address to start.
    20552055  @param[in] EnhancedDump     The print format for the dump data.
    2056  
     2056
    20572057  @retval EFI_SUCCESS           The command completed successfully.
    2058   @retval @retval EFI_SUCCESS   Pci express extend space IO is not suppoted.   
     2058  @retval @retval EFI_SUCCESS   Pci express extend space IO is not suppoted.
    20592059**/
    20602060EFI_STATUS
     
    50415041
    50425042  ShellPrintHiiEx(
    5043     -1, -1, NULL, 
    5044     STRING_TOKEN (STR_PCI_EXT_CAP_LINK_CONTROL), 
    5045     gShellDebug1HiiHandle, 
     5043    -1, -1, NULL,
     5044    STRING_TOKEN (STR_PCI_EXT_CAP_LINK_CONTROL),
     5045    gShellDebug1HiiHandle,
    50465046    Header->RootComplexLinkCapabilities,
    50475047    Header->RootComplexLinkControl,
    50485048    Header->RootComplexLinkStatus
    5049     ); 
     5049    );
    50505050  DumpHex (
    50515051    4,
     
    50745074
    50755075  ShellPrintHiiEx(
    5076     -1, -1, NULL, 
    5077     STRING_TOKEN (STR_PCI_EXT_CAP_POWER), 
    5078     gShellDebug1HiiHandle, 
     5076    -1, -1, NULL,
     5077    STRING_TOKEN (STR_PCI_EXT_CAP_POWER),
     5078    gShellDebug1HiiHandle,
    50795079    Header->DataSelect,
    50805080    Header->Data,
    50815081    Header->PowerBudgetCapability
    5082     ); 
     5082    );
    50835083  DumpHex (
    50845084    4,
     
    51115111
    51125112  ShellPrintHiiEx(
    5113     -1, -1, NULL, 
    5114     STRING_TOKEN (STR_PCI_EXT_CAP_ACS), 
    5115     gShellDebug1HiiHandle, 
     5113    -1, -1, NULL,
     5114    STRING_TOKEN (STR_PCI_EXT_CAP_ACS),
     5115    gShellDebug1HiiHandle,
    51165116    Header->AcsCapability,
    51175117    Header->AcsControl
    5118     ); 
     5118    );
    51195119  if (PCI_EXPRESS_EXTENDED_CAPABILITY_ACS_EXTENDED_GET_EGRES_CONTROL(Header)) {
    51205120    VectorSize = PCI_EXPRESS_EXTENDED_CAPABILITY_ACS_EXTENDED_GET_EGRES_VECTOR_SIZE(Header);
     
    51245124    for (LoopCounter = 0 ; LoopCounter * 8 < VectorSize ; LoopCounter++) {
    51255125      ShellPrintHiiEx(
    5126         -1, -1, NULL, 
    5127         STRING_TOKEN (STR_PCI_EXT_CAP_ACS2), 
    5128         gShellDebug1HiiHandle, 
     5126        -1, -1, NULL,
     5127        STRING_TOKEN (STR_PCI_EXT_CAP_ACS2),
     5128        gShellDebug1HiiHandle,
    51295129        LoopCounter + 1,
    51305130        Header->EgressControlVectorArray[LoopCounter]
    5131         ); 
     5131        );
    51325132    }
    51335133  }
     
    51585158
    51595159  ShellPrintHiiEx(
    5160     -1, -1, NULL, 
    5161     STRING_TOKEN (STR_PCI_EXT_CAP_LAT), 
    5162     gShellDebug1HiiHandle, 
     5160    -1, -1, NULL,
     5161    STRING_TOKEN (STR_PCI_EXT_CAP_LAT),
     5162    gShellDebug1HiiHandle,
    51635163    Header->MaxSnoopLatency,
    51645164    Header->MaxNoSnoopLatency
    5165     ); 
     5165    );
    51665166  DumpHex (
    51675167    4,
     
    51905190
    51915191  ShellPrintHiiEx(
    5192     -1, -1, NULL, 
    5193     STRING_TOKEN (STR_PCI_EXT_CAP_SN), 
    5194     gShellDebug1HiiHandle, 
     5192    -1, -1, NULL,
     5193    STRING_TOKEN (STR_PCI_EXT_CAP_SN),
     5194    gShellDebug1HiiHandle,
    51955195    Header->SerialNumber
    5196     ); 
     5196    );
    51975197  DumpHex (
    51985198    4,
     
    52215221
    52225222  ShellPrintHiiEx(
    5223     -1, -1, NULL, 
    5224     STRING_TOKEN (STR_PCI_EXT_CAP_RCRB), 
    5225     gShellDebug1HiiHandle, 
     5223    -1, -1, NULL,
     5224    STRING_TOKEN (STR_PCI_EXT_CAP_RCRB),
     5225    gShellDebug1HiiHandle,
    52265226    Header->VendorId,
    52275227    Header->DeviceId,
    52285228    Header->RcrbCapabilities,
    52295229    Header->RcrbControl
    5230     ); 
     5230    );
    52315231  DumpHex (
    52325232    4,
     
    52555255
    52565256  ShellPrintHiiEx(
    5257     -1, -1, NULL, 
    5258     STRING_TOKEN (STR_PCI_EXT_CAP_VEN), 
    5259     gShellDebug1HiiHandle, 
     5257    -1, -1, NULL,
     5258    STRING_TOKEN (STR_PCI_EXT_CAP_VEN),
     5259    gShellDebug1HiiHandle,
    52605260    Header->VendorSpecificHeader
    5261     ); 
     5261    );
    52625262  DumpHex (
    52635263    4,
     
    52865286
    52875287  ShellPrintHiiEx(
    5288     -1, -1, NULL, 
    5289     STRING_TOKEN (STR_PCI_EXT_CAP_ECEA), 
    5290     gShellDebug1HiiHandle, 
     5288    -1, -1, NULL,
     5289    STRING_TOKEN (STR_PCI_EXT_CAP_ECEA),
     5290    gShellDebug1HiiHandle,
    52915291    Header->AssociationBitmap
    5292     ); 
     5292    );
    52935293  DumpHex (
    52945294    4,
     
    53175317
    53185318  ShellPrintHiiEx(
    5319     -1, -1, NULL, 
    5320     STRING_TOKEN (STR_PCI_EXT_CAP_ARI), 
    5321     gShellDebug1HiiHandle, 
     5319    -1, -1, NULL,
     5320    STRING_TOKEN (STR_PCI_EXT_CAP_ARI),
     5321    gShellDebug1HiiHandle,
    53225322    Header->AriCapability,
    53235323    Header->AriControl
    5324     ); 
     5324    );
    53255325  DumpHex (
    53265326    4,
     
    53505350
    53515351  ShellPrintHiiEx(
    5352     -1, -1, NULL, 
    5353     STRING_TOKEN (STR_PCI_EXT_CAP_DPA), 
    5354     gShellDebug1HiiHandle, 
     5352    -1, -1, NULL,
     5353    STRING_TOKEN (STR_PCI_EXT_CAP_DPA),
     5354    gShellDebug1HiiHandle,
    53555355    Header->DpaCapability,
    53565356    Header->DpaLatencyIndicator,
    53575357    Header->DpaStatus,
    53585358    Header->DpaControl
    5359     ); 
     5359    );
    53605360  for (LinkCount = 0 ; LinkCount < PCI_EXPRESS_EXTENDED_CAPABILITY_DYNAMIC_POWER_ALLOCATION_GET_SUBSTATE_MAX(Header) + 1 ; LinkCount++) {
    53615361    ShellPrintHiiEx(
    5362       -1, -1, NULL, 
    5363       STRING_TOKEN (STR_PCI_EXT_CAP_DPA2), 
    5364       gShellDebug1HiiHandle, 
     5362      -1, -1, NULL,
     5363      STRING_TOKEN (STR_PCI_EXT_CAP_DPA2),
     5364      gShellDebug1HiiHandle,
    53655365      LinkCount+1,
    53665366      Header->DpaPowerAllocationArray[LinkCount]
     
    53945394
    53955395  ShellPrintHiiEx(
    5396     -1, -1, NULL, 
    5397     STRING_TOKEN (STR_PCI_EXT_CAP_LINK_DECLAR), 
    5398     gShellDebug1HiiHandle, 
     5396    -1, -1, NULL,
     5397    STRING_TOKEN (STR_PCI_EXT_CAP_LINK_DECLAR),
     5398    gShellDebug1HiiHandle,
    53995399    Header->ElementSelfDescription
    54005400    );
     
    54025402  for (LinkCount = 0 ; LinkCount < PCI_EXPRESS_EXTENDED_CAPABILITY_LINK_DECLARATION_GET_LINK_COUNT(Header) ; LinkCount++) {
    54035403    ShellPrintHiiEx(
    5404       -1, -1, NULL, 
    5405       STRING_TOKEN (STR_PCI_EXT_CAP_LINK_DECLAR2), 
    5406       gShellDebug1HiiHandle, 
     5404      -1, -1, NULL,
     5405      STRING_TOKEN (STR_PCI_EXT_CAP_LINK_DECLAR2),
     5406      gShellDebug1HiiHandle,
    54075407      LinkCount+1,
    54085408      Header->LinkEntry[LinkCount]
     
    54355435
    54365436  ShellPrintHiiEx(
    5437     -1, -1, NULL, 
    5438     STRING_TOKEN (STR_PCI_EXT_CAP_AER), 
    5439     gShellDebug1HiiHandle, 
     5437    -1, -1, NULL,
     5438    STRING_TOKEN (STR_PCI_EXT_CAP_AER),
     5439    gShellDebug1HiiHandle,
    54405440    Header->UncorrectableErrorStatus,
    54415441    Header->UncorrectableErrorMask,
     
    54825482
    54835483  ShellPrintHiiEx(
    5484     -1, -1, NULL, 
    5485     STRING_TOKEN (STR_PCI_EXT_CAP_MULTICAST), 
    5486     gShellDebug1HiiHandle, 
     5484    -1, -1, NULL,
     5485    STRING_TOKEN (STR_PCI_EXT_CAP_MULTICAST),
     5486    gShellDebug1HiiHandle,
    54875487    Header->MultiCastCapability,
    54885488    Header->MulticastControl,
     
    55235523
    55245524  ShellPrintHiiEx(
    5525     -1, -1, NULL, 
    5526     STRING_TOKEN (STR_PCI_EXT_CAP_VC_BASE), 
    5527     gShellDebug1HiiHandle, 
     5525    -1, -1, NULL,
     5526    STRING_TOKEN (STR_PCI_EXT_CAP_VC_BASE),
     5527    gShellDebug1HiiHandle,
    55285528    Header->ExtendedVcCount,
    55295529    Header->PortVcCapability1,
     
    55365536    CapabilityItem = &Header->Capability[ItemCount];
    55375537    ShellPrintHiiEx(
    5538       -1, -1, NULL, 
    5539       STRING_TOKEN (STR_PCI_EXT_CAP_VC_ITEM), 
    5540       gShellDebug1HiiHandle, 
     5538      -1, -1, NULL,
     5539      STRING_TOKEN (STR_PCI_EXT_CAP_VC_ITEM),
     5540      gShellDebug1HiiHandle,
    55415541      ItemCount+1,
    55425542      CapabilityItem->VcResourceCapability,
     
    55765576  for (ItemCount = 0 ; ItemCount < (UINT32)GET_NUMBER_RESIZABLE_BARS(Header) ; ItemCount++) {
    55775577    ShellPrintHiiEx(
    5578       -1, -1, NULL, 
    5579       STRING_TOKEN (STR_PCI_EXT_CAP_RESIZE_BAR), 
    5580       gShellDebug1HiiHandle, 
     5578      -1, -1, NULL,
     5579      STRING_TOKEN (STR_PCI_EXT_CAP_RESIZE_BAR),
     5580      gShellDebug1HiiHandle,
    55815581      ItemCount+1,
    55825582      Header->Capability[ItemCount].ResizableBarCapability,
     
    56125612
    56135613  ShellPrintHiiEx(
    5614     -1, -1, NULL, 
    5615     STRING_TOKEN (STR_PCI_EXT_CAP_TPH), 
    5616     gShellDebug1HiiHandle, 
     5614    -1, -1, NULL,
     5615    STRING_TOKEN (STR_PCI_EXT_CAP_TPH),
     5616    gShellDebug1HiiHandle,
    56175617    Header->TphRequesterCapability,
    56185618    Header->TphRequesterControl
     
    56545654
    56555655  ShellPrintHiiEx(
    5656     -1, -1, NULL, 
    5657     STRING_TOKEN (STR_PCI_EXT_CAP_SECONDARY), 
    5658     gShellDebug1HiiHandle, 
     5656    -1, -1, NULL,
     5657    STRING_TOKEN (STR_PCI_EXT_CAP_SECONDARY),
     5658    gShellDebug1HiiHandle,
    56595659    Header->LinkControl3,
    56605660    Header->LaneErrorStatus
     
    56875687EFIAPI
    56885688PrintPciExtendedCapabilityDetails(
    5689   IN CONST PCI_EXP_EXT_HDR    *HeadersBaseAddress, 
     5689  IN CONST PCI_EXP_EXT_HDR    *HeadersBaseAddress,
    56905690  IN CONST PCI_EXP_EXT_HDR    *HeaderAddress,
    56915691  IN CONST PCIE_CAP_STRUCTURE *PciExpressCapPtr
     
    57205720    case PCI_EXPRESS_EXTENDED_CAPABILITY_MULTI_FUNCTION_VIRTUAL_CHANNEL_ID:
    57215721      return PrintInterpretedExtendedCompatibilityVirtualChannel(HeaderAddress, HeadersBaseAddress);
    5722     case PCI_EXPRESS_EXTENDED_CAPABILITY_MULTICAST_ID: 
     5722    case PCI_EXPRESS_EXTENDED_CAPABILITY_MULTICAST_ID:
    57235723      //
    57245724      // should only be present if PCIE_CAP_DEVICEPORT_TYPE(PciExpressCapPtr->PcieCapReg) == 0100b, 0101b, or 0110b
     
    57485748  @param[in] CapabilityPtr  The offset from the address to start.
    57495749  @param[in] EnhancedDump   The print format for the dump data.
    5750  
     5750
    57515751**/
    57525752EFI_STATUS
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/SetVar.c

    r58459 r58466  
    182182            }
    183183            Attributes = Attributes2;
    184           }         
     184          }
    185185          //
    186186          // ascii text
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/LibSmbiosView.c

    r58459 r58466  
    1212
    1313**/
    14    
     14
    1515
    1616#include "../UefiShellDebug1CommandsLib.h"
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c

    r58459 r58466  
    27282728  Display System Reset (Type 23) information.
    27292729
    2730  
     2730
    27312731Identifies the system-reset capabilities for the system.
    27322732 Bits 7:6 Reserved for future assignment via this specification, set to 00b.
     
    28322832  Display Hardware Security (Type 24) information.
    28332833
    2834    
     2834
    28352835Identifies the password and reset status for the system:
    28362836
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c

    r58459 r58466  
    32283228    // or if Key == Value in the table
    32293229    //
    3230     if ((High > Low && Key >= Low && Key <= High) 
     3230    if ((High > Low && Key >= Low && Key <= High)
    32313231      || (Table[Index].Key == Key)) {
    32323232      StrnCpy (Info, Table[Index].Info, InfoLen-1);
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView.c

    r58459 r58466  
    9292      //
    9393      // Init Lib
    94      
     94
    9595      Status = LibSmbiosInit ();
    9696      if (EFI_ERROR (Status)) {
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni

    • Property svn:mime-type changed from application/octet-stream to text/plain;encoding=UTF-16LE
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c

    r58459 r58466  
    296296  } else if (StrLen(StringGuid) != 36) {
    297297    return (EFI_INVALID_PARAMETER);
    298   } 
     298  }
    299299  TempCopy = NULL;
    300300  TempCopy = StrnCatGrow(&TempCopy, NULL, StringGuid, 0);
     
    365365/**
    366366  Clear the line at the specified Row.
    367  
     367
    368368  @param[in] Row                The row number to be cleared ( start from 1 )
    369369  @param[in] LastCol            The last printable column.
     
    430430/**
    431431  Check if file name has illegal characters.
    432  
     432
    433433  @param Name       The filename to check.
    434434
     
    512512
    513513/**
    514   Read a file into an allocated buffer.  The buffer is the responsibility 
     514  Read a file into an allocated buffer.  The buffer is the responsibility
    515515  of the caller to free.
    516516
    517517  @param[in]  FileName          The filename of the file to open.
    518   @param[out] Buffer            Upon successful return, the pointer to the 
    519                                 address of the allocated buffer.                                 
     518  @param[out] Buffer            Upon successful return, the pointer to the
     519                                address of the allocated buffer.
    520520  @param[out] BufferSize        If not NULL, then the pointer to the size
    521521                                of the allocated buffer.
     
    523523                                read only.  FALSE otherwise.
    524524
    525   @retval EFI_NOT_FOUND         The filename did not represent a file in the 
     525  @retval EFI_NOT_FOUND         The filename did not represent a file in the
    526526                                file system.
    527527  @retval EFI_SUCCESS           The file was read into the buffer.
     
    571571
    572572    Info = ShellGetFileInfo(FileHandle);
    573    
     573
    574574    if (Info->Attribute & EFI_FILE_DIRECTORY) {
    575575      FreePool (Info);
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h

    r58459 r58466  
    362362/**
    363363  Clear the line at the specified Row.
    364  
     364
    365365  @param[in] Row                The row number to be cleared ( start from 1 )
    366366  @param[in] LastCol            The last printable column.
     
    377377/**
    378378  Check if file name has illegal characters.
    379  
     379
    380380  @param Name       The filename to check.
    381381
     
    404404
    405405/**
    406   Read a file into an allocated buffer.  The buffer is the responsibility 
     406  Read a file into an allocated buffer.  The buffer is the responsibility
    407407  of the caller to free.
    408408
    409409  @param[in]  FileName          The filename of the file to open.
    410   @param[out] Buffer            Upon successful return, the pointer to the 
    411                                 address of the allocated buffer.                                 
     410  @param[out] Buffer            Upon successful return, the pointer to the
     411                                address of the allocated buffer.
    412412  @param[out] BufferSize        If not NULL, then the pointer to the size
    413413                                of the allocated buffer.
     
    415415                                read only.  FALSE otherwise.
    416416
    417   @retval EFI_NOT_FOUND         The filename did not represent a file in the 
     417  @retval EFI_NOT_FOUND         The filename did not represent a file in the
    418418                                file system.  Directories cannot be read with
    419419                                this method.
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf

    r58459 r58466  
    6565  EditMenuBar.h
    6666  EditMenuBar.c
    67  
    68 ## Files specific to the text editor 
     67
     68## Files specific to the text editor
    6969  Edit/Edit.c
    7070  Edit/TextEditor.h
     
    7777  Edit/Misc.c
    7878  Edit/TextEditStrings.uni
    79  
     79
    8080## Files specific to the HEX editor
    8181  HexEdit/BufferImage.h
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni

    • Property svn:mime-type changed from application/octet-stream to text/plain;encoding=UTF-16LE
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c

    r58459 r58466  
    3636  EFI_HANDLE                Handle;
    3737  EFI_HANDLE                PreviousHandle;
    38  
     38
    3939  if (DevicePathToConnect == NULL) {
    4040    return EFI_INVALID_PARAMETER;
     
    4242
    4343  PreviousHandle = NULL;
    44   do{   
     44  do{
    4545    RemainingDevicePath = DevicePathToConnect;
    4646    Status = gBS->LocateDevicePath (&gEfiDevicePathProtocolGuid, &RemainingDevicePath, &Handle);
    47    
     47
    4848    if (!EFI_ERROR (Status) && (Handle != NULL)) {
    4949      if (PreviousHandle == Handle) {
     
    5454      }
    5555    }
    56    
     56
    5757  } while (!EFI_ERROR (Status) && !IsDevicePathEnd (RemainingDevicePath) );
    58  
     58
    5959  return Status;
    60    
     60
    6161}
    6262
    6363/**
    6464  Connect drivers for PCI root bridge.
    65  
     65
    6666  @retval EFI_SUCCESS                     Connect drivers successfully.
    6767  @retval EFI_NOT_FOUND                   Cannot find PCI root bridge device.
     
    7272  VOID
    7373  )
    74 { 
     74{
    7575  UINTN               RootBridgeHandleCount;
    7676  EFI_HANDLE          *RootBridgeHandleBuffer;
    7777  UINTN               RootBridgeIndex;
    7878  EFI_STATUS          Status;
    79  
     79
    8080  RootBridgeHandleCount = 0;
    81  
    82   Status = gBS->LocateHandleBuffer ( 
    83               ByProtocol, 
    84               &gEfiPciRootBridgeIoProtocolGuid, 
    85               NULL, 
    86               &RootBridgeHandleCount, 
    87               &RootBridgeHandleBuffer 
     81
     82  Status = gBS->LocateHandleBuffer (
     83              ByProtocol,
     84              &gEfiPciRootBridgeIoProtocolGuid,
     85              NULL,
     86              &RootBridgeHandleCount,
     87              &RootBridgeHandleBuffer
    8888              );
    8989  if (EFI_ERROR (Status)) {
    9090    return Status;
    9191  }
    92  
    93   for (RootBridgeIndex = 0; RootBridgeIndex < RootBridgeHandleCount; RootBridgeIndex++) {   
    94     gBS->ConnectController (RootBridgeHandleBuffer[RootBridgeIndex], NULL, NULL, FALSE);   
    95   } 
    96  
     92
     93  for (RootBridgeIndex = 0; RootBridgeIndex < RootBridgeHandleCount; RootBridgeIndex++) {
     94    gBS->ConnectController (RootBridgeHandleBuffer[RootBridgeIndex], NULL, NULL, FALSE);
     95  }
     96
    9797  return EFI_SUCCESS;
    9898}
     
    199199  EFI_DEVICE_PATH_PROTOCOL  *DevPath;
    200200  EFI_DEVICE_PATH_PROTOCOL  *CopyOfDevPath;
    201   EFI_DEVICE_PATH_PROTOCOL  *Instance; 
     201  EFI_DEVICE_PATH_PROTOCOL  *Instance;
    202202  EFI_DEVICE_PATH_PROTOCOL  *Next;
    203203  UINTN                     Length;
     
    210210  EFI_PCI_IO_PROTOCOL       *PciIo;
    211211  UINT8                     Class[3];
    212  
     212
    213213  DevPath = NULL;
    214214  Length  = 0;
     
    266266      || (DevicePathSubType (Instance) == MSG_USB_WWID_DP)
    267267      )) {
    268      
     268
    269269      Status = ShellConnectPciRootBridge ();
    270270      if (EFI_ERROR(Status)) {
     
    273273        return Status;
    274274      }
    275      
     275
    276276      Status = gBS->LocateHandleBuffer (
    277277                  ByProtocol,
     
    281281                  &HandleArray
    282282                  );
    283      
     283
    284284      if (!EFI_ERROR (Status)) {
    285285        for (Index = 0; Index < HandleArrayCount; Index++) {
     
    289289                      (VOID **)&PciIo
    290290                      );
    291          
     291
    292292          if (!EFI_ERROR (Status)) {
    293293            Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint8, 0x09, 3, &Class);
     
    313313        FreePool (HandleArray);
    314314      }
    315     } else { 
     315    } else {
    316316      //
    317317      // connect the entire device path
     
    323323    }
    324324    FreePool (Instance);
    325    
     325
    326326  } while (CopyOfDevPath != NULL);
    327  
     327
    328328  if (DevPath != NULL) {
    329329    FreePool(DevPath);
     
    335335    return EFI_NOT_FOUND;
    336336  }
    337  
     337
    338338}
    339339
     
    521521        Handle2 = NULL;
    522522      }
    523      
     523
    524524      if (ShellStatus == SHELL_SUCCESS) {
    525525        if (Param1 != NULL && Handle1 == NULL){
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDriver1CommandsLib/DevTree.c

    r58459 r58466  
    5959
    6060  ASSERT(TheHandle    != NULL);
    61  
     61
    6262  if (ShellGetExecutionBreakFlag()) {
    6363    ShellStatus = SHELL_ABORTED;
    6464    return ShellStatus;
    6565  }
    66  
     66
    6767  //
    6868  // We want controller handles.  they will not have LoadedImage or DriverBinding (or others...)
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDriver1CommandsLib/Devices.c

    r58459 r58466  
    2020
    2121  @param[in] TheHandle       The device handle to get info on.
    22   @param[in, out] Type       On successful return R, B, or D (root, bus, or 
     22  @param[in, out] Type       On successful return R, B, or D (root, bus, or
    2323                             device) will be placed in this buffer.
    24   @param[in, out] Cfg        On successful return this buffer will be 
     24  @param[in, out] Cfg        On successful return this buffer will be
    2525                             TRUE if the handle has configuration, FALSE
    2626                             otherwise.
    27   @param[in, out] Diag       On successful return this buffer will be 
     27  @param[in, out] Diag       On successful return this buffer will be
    2828                             TRUE if the handle has disgnostics, FALSE
    2929                             otherwise.
    30   @param[in, out] Parents    On successful return this buffer will be 
     30  @param[in, out] Parents    On successful return this buffer will be
    3131                             contain the number of parent handles.
    32   @param[in, out] Devices    On successful return this buffer will be 
     32  @param[in, out] Devices    On successful return this buffer will be
    3333                             contain the number of devices controlled.
    34   @param[in, out] Children   On successful return this buffer will be 
     34  @param[in, out] Children   On successful return this buffer will be
    3535                             contain the number of child handles.
    3636  @param[out] Name           The pointer to a buffer that will be allocated
     
    6060  UINTN         Count;
    6161
    62   if (TheHandle == NULL 
     62  if (TheHandle == NULL
    6363    || Type == NULL
    6464    || Cfg == NULL
     
    255255          break;
    256256        }
    257        
     257
    258258      }
    259259
     
    261261        FreePool(HandleList);
    262262      }
    263  
     263
    264264    }
    265265    SHELL_FREE_NON_NULL(Language);
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c

    r58459 r58466  
    197197    }
    198198  }
    199  
     199
    200200  SHELL_FREE_NON_NULL(ProtocolGuidArray);
    201201
     
    251251/**
    252252  Display driver model information for a given handle.
    253  
     253
    254254  @param[in] Handle     The handle to display info on.
    255255  @param[in] BestName   Use the best name?
     
    340340    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_DH_OUTPUT_DRIVER1), gShellDriver1HiiHandle, TempStringPointer!=NULL?TempStringPointer:L"<Unknown>");
    341341    SHELL_FREE_NON_NULL(TempStringPointer);
    342  
     342
    343343    TempStringPointer = ConvertDevicePathToText(DevicePath, TRUE, FALSE);
    344344    ShellPrintHiiEx(
    345       -1, 
    346       -1, 
    347       NULL, 
    348       STRING_TOKEN (STR_DH_OUTPUT_DRIVER2), 
    349       gShellDriver1HiiHandle, 
     345      -1,
     346      -1,
     347      NULL,
     348      STRING_TOKEN (STR_DH_OUTPUT_DRIVER2),
     349      gShellDriver1HiiHandle,
    350350      TempStringPointer!=NULL?TempStringPointer:L"<None>",
    351351      ParentControllerHandleCount == 0?L"ROOT":(ChildControllerHandleCount > 0)?L"BUS":L"DEVICE",
     
    358358    if (DriverBindingHandleCount == 0) {
    359359      ShellPrintHiiEx(
    360         -1, 
    361         -1, 
    362         NULL, 
    363         STRING_TOKEN (STR_DH_OUTPUT_DRIVER3), 
    364         gShellDriver1HiiHandle, 
     360        -1,
     361        -1,
     362        NULL,
     363        STRING_TOKEN (STR_DH_OUTPUT_DRIVER3),
     364        gShellDriver1HiiHandle,
    365365        L"<None>"
    366366        );
    367367    } else {
    368368      ShellPrintHiiEx(
    369         -1, 
    370         -1, 
    371         NULL, 
    372         STRING_TOKEN (STR_DH_OUTPUT_DRIVER3), 
    373         gShellDriver1HiiHandle, 
     369        -1,
     370        -1,
     371        NULL,
     372        STRING_TOKEN (STR_DH_OUTPUT_DRIVER3),
     373        gShellDriver1HiiHandle,
    374374        L""
    375375        );
     
    393393        if (Image) {
    394394          ShellPrintHiiEx(
    395             -1, 
    396             -1, 
    397             NULL, 
     395            -1,
     396            -1,
     397            NULL,
    398398            STRING_TOKEN (STR_DH_OUTPUT_DRIVER4A),
    399399            gShellDriver1HiiHandle,
     
    403403        } else {
    404404          ShellPrintHiiEx(
    405             -1, 
    406             -1, 
    407             NULL, 
     405            -1,
     406            -1,
     407            NULL,
    408408            STRING_TOKEN (STR_DH_OUTPUT_DRIVER4B),
    409409            gShellDriver1HiiHandle,
     
    418418    if (ParentControllerHandleCount == 0) {
    419419      ShellPrintHiiEx(
    420         -1, 
    421         -1, 
    422         NULL, 
    423         STRING_TOKEN (STR_DH_OUTPUT_DRIVER5), 
    424         gShellDriver1HiiHandle, 
     420        -1,
     421        -1,
     422        NULL,
     423        STRING_TOKEN (STR_DH_OUTPUT_DRIVER5),
     424        gShellDriver1HiiHandle,
    425425        L"<None>"
    426426        );
    427427    } else {
    428428      ShellPrintHiiEx(
    429         -1, 
    430         -1, 
    431         NULL, 
    432         STRING_TOKEN (STR_DH_OUTPUT_DRIVER5), 
    433         gShellDriver1HiiHandle, 
     429        -1,
     430        -1,
     431        NULL,
     432        STRING_TOKEN (STR_DH_OUTPUT_DRIVER5),
     433        gShellDriver1HiiHandle,
    434434        L""
    435435        );
     
    437437        Status = gEfiShellProtocol->GetDeviceName(ParentControllerHandleBuffer[Index], EFI_DEVICE_NAME_USE_COMPONENT_NAME|EFI_DEVICE_NAME_USE_DEVICE_PATH, (CHAR8*)Language, &TempStringPointer);
    438438        ShellPrintHiiEx(
    439           -1, 
    440           -1, 
    441           NULL, 
     439          -1,
     440          -1,
     441          NULL,
    442442          STRING_TOKEN (STR_DH_OUTPUT_DRIVER5B),
    443443          gShellDriver1HiiHandle,
     
    451451    if (ChildControllerHandleCount == 0) {
    452452      ShellPrintHiiEx(
    453         -1, 
    454         -1, 
    455         NULL, 
    456         STRING_TOKEN (STR_DH_OUTPUT_DRIVER6), 
    457         gShellDriver1HiiHandle, 
     453        -1,
     454        -1,
     455        NULL,
     456        STRING_TOKEN (STR_DH_OUTPUT_DRIVER6),
     457        gShellDriver1HiiHandle,
    458458        L"<None>"
    459459        );
    460460    } else {
    461461      ShellPrintHiiEx(
    462         -1, 
    463         -1, 
    464         NULL, 
    465         STRING_TOKEN (STR_DH_OUTPUT_DRIVER6), 
    466         gShellDriver1HiiHandle, 
     462        -1,
     463        -1,
     464        NULL,
     465        STRING_TOKEN (STR_DH_OUTPUT_DRIVER6),
     466        gShellDriver1HiiHandle,
    467467        L""
    468468        );
     
    470470        Status = gEfiShellProtocol->GetDeviceName(ChildControllerHandleBuffer[Index], EFI_DEVICE_NAME_USE_COMPONENT_NAME|EFI_DEVICE_NAME_USE_DEVICE_PATH, (CHAR8*)Language, &TempStringPointer);
    471471        ShellPrintHiiEx(
    472           -1, 
    473           -1, 
    474           NULL, 
     472          -1,
     473          -1,
     474          NULL,
    475475          STRING_TOKEN (STR_DH_OUTPUT_DRIVER6B),
    476476          gShellDriver1HiiHandle,
     
    532532
    533533  ShellPrintHiiEx(
    534     -1, 
    535     -1, 
    536     NULL, 
     534    -1,
     535    -1,
     536    NULL,
    537537    STRING_TOKEN (STR_DH_OUTPUT_DRIVER6B),
    538538    gShellDriver1HiiHandle,
     
    549549  }
    550550  ShellPrintHiiEx(
    551     -1, 
    552     -1, 
    553     NULL, 
     551    -1,
     552    -1,
     553    NULL,
    554554    STRING_TOKEN (STR_DH_OUTPUT_DRIVER7B),
    555555    gShellDriver1HiiHandle,
     
    559559
    560560  ShellPrintHiiEx(
    561     -1, 
    562     -1, 
    563     NULL, 
    564     STRING_TOKEN (STR_DH_OUTPUT_DRIVER8), 
    565     gShellDriver1HiiHandle, 
     561    -1,
     562    -1,
     563    NULL,
     564    STRING_TOKEN (STR_DH_OUTPUT_DRIVER8),
     565    gShellDriver1HiiHandle,
    566566    DriverBinding->Version,
    567567    NumberOfChildren > 0?L"Bus":ControllerHandleCount > 0?L"Device":L"<Unknown>",
     
    572572  if (ControllerHandleCount == 0) {
    573573      ShellPrintHiiEx(
    574         -1, 
    575         -1, 
    576         NULL, 
    577         STRING_TOKEN (STR_DH_OUTPUT_DRIVER6), 
    578         gShellDriver1HiiHandle, 
     574        -1,
     575        -1,
     576        NULL,
     577        STRING_TOKEN (STR_DH_OUTPUT_DRIVER6),
     578        gShellDriver1HiiHandle,
    579579        L"None"
    580580        );
    581581  } else {
    582582    ShellPrintHiiEx(
    583       -1, 
    584       -1, 
    585       NULL, 
    586       STRING_TOKEN (STR_DH_OUTPUT_DRIVER6), 
    587       gShellDriver1HiiHandle, 
     583      -1,
     584      -1,
     585      NULL,
     586      STRING_TOKEN (STR_DH_OUTPUT_DRIVER6),
     587      gShellDriver1HiiHandle,
    588588      L""
    589589      );
     
    592592
    593593      ShellPrintHiiEx(
    594         -1, 
    595         -1, 
    596         NULL, 
     594        -1,
     595        -1,
     596        NULL,
    597597        STRING_TOKEN (STR_DH_OUTPUT_DRIVER9B),
    598598        gShellDriver1HiiHandle,
     
    613613
    614614          ShellPrintHiiEx(
    615             -1, 
    616             -1, 
    617             NULL, 
     615            -1,
     616            -1,
     617            NULL,
    618618            STRING_TOKEN (STR_DH_OUTPUT_DRIVER6B),
    619619            gShellDriver1HiiHandle,
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c

    r58459 r58466  
    3030
    3131  @retval NULL    An error occured.
    32   @return         A pointer to the driver path as a string.  The callee must 
     32  @return         A pointer to the driver path as a string.  The callee must
    3333                  free this memory.
    3434**/
     
    306306          FreePool(Temp2);
    307307        }
    308        
     308
    309309        if (ShellGetExecutionBreakFlag ()) {
    310310          ShellStatus = SHELL_ABORTED;
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c

    r58459 r58466  
    176176      -1,
    177177      NULL,
    178       STRING_TOKEN(STR_GEN_FILE_OPEN), 
    179       gShellDriver1HiiHandle, 
    180       FileName, 
     178      STRING_TOKEN(STR_GEN_FILE_OPEN),
     179      gShellDriver1HiiHandle,
     180      FileName,
    181181      Status);
    182182    return (SHELL_DEVICE_ERROR);
     
    194194  if (EFI_ERROR(Status) || HiiDatabase == NULL) {
    195195    ShellPrintHiiEx(
    196       -1, 
    197       -1, 
     196      -1,
     197      -1,
    198198      NULL,
    199       STRING_TOKEN(STR_GEN_PROTOCOL_NF), 
    200       gShellDriver1HiiHandle, 
    201       L"EfiHiiDatabaseProtocol", 
     199      STRING_TOKEN(STR_GEN_PROTOCOL_NF),
     200      gShellDriver1HiiHandle,
     201      L"EfiHiiDatabaseProtocol",
    202202      &gEfiHiiDatabaseProtocolGuid);
    203203    ShellCloseFile(&FileHandle);
     
    208208  if (EFI_ERROR(Status)) {
    209209    ShellPrintHiiEx(
    210       -1, 
    211       -1, 
    212       NULL, 
    213       STRING_TOKEN(STR_GEN_HANDLE_NOT), 
    214       gShellDriver1HiiHandle, 
    215       ConvertHandleToHandleIndex(Handle), 
     210      -1,
     211      -1,
     212      NULL,
     213      STRING_TOKEN(STR_GEN_HANDLE_NOT),
     214      gShellDriver1HiiHandle,
     215      ConvertHandleToHandleIndex(Handle),
    216216      L"Device");
    217217    ShellCloseFile(&FileHandle);
    218     return (SHELL_DEVICE_ERROR);   
     218    return (SHELL_DEVICE_ERROR);
    219219  }
    220220
     
    232232  if (EFI_ERROR(Status)) {
    233233    ShellPrintHiiEx(
    234       -1, 
     234      -1,
    235235      -1,
    236236      NULL,
    237       STRING_TOKEN(STR_FILE_WRITE_FAIL), 
    238       gShellDriver1HiiHandle, 
    239       FileName, 
     237      STRING_TOKEN(STR_FILE_WRITE_FAIL),
     238      gShellDriver1HiiHandle,
     239      FileName,
    240240      Status);
    241     return (SHELL_DEVICE_ERROR);   
     241    return (SHELL_DEVICE_ERROR);
    242242  }
    243243  ShellPrintHiiEx(
    244     -1, 
     244    -1,
    245245    -1,
    246246    NULL,
    247     STRING_TOKEN(STR_DRVCFG_COMP), 
     247    STRING_TOKEN(STR_DRVCFG_COMP),
    248248    gShellDriver1HiiHandle);
    249249
     
    288288      -1,
    289289      NULL,
    290       STRING_TOKEN(STR_GEN_FILE_OPEN), 
    291       gShellDriver1HiiHandle, 
    292       FileName, 
     290      STRING_TOKEN(STR_GEN_FILE_OPEN),
     291      gShellDriver1HiiHandle,
     292      FileName,
    293293      Status);
    294294    return (SHELL_DEVICE_ERROR);
     
    306306  if (EFI_ERROR(Status) || HiiDatabase == NULL) {
    307307    ShellPrintHiiEx(
    308       -1, 
    309       -1, 
     308      -1,
     309      -1,
    310310      NULL,
    311       STRING_TOKEN(STR_GEN_PROTOCOL_NF), 
    312       gShellDriver1HiiHandle, 
    313       L"EfiHiiDatabaseProtocol", 
     311      STRING_TOKEN(STR_GEN_PROTOCOL_NF),
     312      gShellDriver1HiiHandle,
     313      L"EfiHiiDatabaseProtocol",
    314314      &gEfiHiiDatabaseProtocolGuid);
    315315    ShellCloseFile(&FileHandle);
     
    321321  if (EFI_ERROR(Status)) {
    322322    ShellPrintHiiEx(
    323       -1, 
    324       -1, 
    325       NULL, 
    326       STRING_TOKEN(STR_FILE_READ_FAIL), 
    327       gShellDriver1HiiHandle, 
     323      -1,
     324      -1,
     325      NULL,
     326      STRING_TOKEN(STR_FILE_READ_FAIL),
     327      gShellDriver1HiiHandle,
    328328      FileName,
    329329      Status);
    330330    ShellCloseFile(&FileHandle);
    331     return (SHELL_DEVICE_ERROR);   
    332   }
    333   MainBuffer = AllocateZeroPool((UINTN)MainBufferSize); 
     331    return (SHELL_DEVICE_ERROR);
     332  }
     333  MainBuffer = AllocateZeroPool((UINTN)MainBufferSize);
    334334  if (EFI_ERROR(Status)) {
    335335    ShellPrintHiiEx(
    336       -1, 
    337       -1, 
    338       NULL, 
    339       STRING_TOKEN(STR_GEN_OUT_MEM), 
     336      -1,
     337      -1,
     338      NULL,
     339      STRING_TOKEN(STR_GEN_OUT_MEM),
    340340      gShellDriver1HiiHandle);
    341341    ShellCloseFile(&FileHandle);
    342     return (SHELL_DEVICE_ERROR);   
     342    return (SHELL_DEVICE_ERROR);
    343343  }
    344344  Status = ShellReadFile(FileHandle, &MainBufferSize, MainBuffer);
    345345  if (EFI_ERROR(Status)) {
    346346    ShellPrintHiiEx(
    347       -1, 
    348       -1, 
    349       NULL, 
    350       STRING_TOKEN(STR_FILE_READ_FAIL), 
    351       gShellDriver1HiiHandle, 
     347      -1,
     348      -1,
     349      NULL,
     350      STRING_TOKEN(STR_FILE_READ_FAIL),
     351      gShellDriver1HiiHandle,
    352352      FileName,
    353353      Status);
    354354    ShellCloseFile(&FileHandle);
    355355    SHELL_FREE_NON_NULL(MainBuffer);
    356     return (SHELL_DEVICE_ERROR);   
     356    return (SHELL_DEVICE_ERROR);
    357357  }
    358358
     
    367367    if (EFI_ERROR(Status)) {
    368368      ShellPrintHiiEx(
    369         -1, 
    370         -1, 
    371         NULL, 
    372         STRING_TOKEN(STR_GEN_HANDLE_NOT), 
    373         gShellDriver1HiiHandle, 
    374         ConvertHandleToHandleIndex(Handle), 
     369        -1,
     370        -1,
     371        NULL,
     372        STRING_TOKEN(STR_GEN_HANDLE_NOT),
     373        gShellDriver1HiiHandle,
     374        ConvertHandleToHandleIndex(Handle),
    375375        L"Device");
    376376      ShellCloseFile(&FileHandle);
    377       return (SHELL_DEVICE_ERROR);   
     377      return (SHELL_DEVICE_ERROR);
    378378    }
    379379    Status = HiiDatabase->UpdatePackageList(HiiDatabase, HiiHandle, MainBuffer);
    380380    if (EFI_ERROR(Status)) {
    381381      ShellPrintHiiEx(
    382         -1, 
    383         -1, 
    384         NULL, 
    385         STRING_TOKEN(STR_GEN_UEFI_FUNC_ERROR), 
    386         gShellDriver1HiiHandle, 
    387         L"HiiDatabase->UpdatePackageList", 
     382        -1,
     383        -1,
     384        NULL,
     385        STRING_TOKEN(STR_GEN_UEFI_FUNC_ERROR),
     386        gShellDriver1HiiHandle,
     387        L"HiiDatabase->UpdatePackageList",
    388388        Status);
    389       return (SHELL_DEVICE_ERROR);   
     389      return (SHELL_DEVICE_ERROR);
    390390    }
    391391  } else {
     
    409409                TempDevPathString = ConvertDevicePathToText((EFI_DEVICE_PATH_PROTOCOL*)(((CHAR8*)PackageHeader) + sizeof(EFI_HII_PACKAGE_HEADER)), TRUE, TRUE);
    410410                ShellPrintHiiEx(
    411                   -1, 
    412                   -1, 
    413                   NULL, 
    414                   STRING_TOKEN(STR_DRVCFG_IN_FILE_NF), 
    415                   gShellDriver1HiiHandle, 
     411                  -1,
     412                  -1,
     413                  NULL,
     414                  STRING_TOKEN(STR_DRVCFG_IN_FILE_NF),
     415                  gShellDriver1HiiHandle,
    416416                  TempDevPathString);
    417417                SHELL_FREE_NON_NULL(TempDevPathString);
     
    420420                if (EFI_ERROR(Status)) {
    421421                  ShellPrintHiiEx(
    422                     -1, 
    423                     -1, 
    424                     NULL, 
    425                     STRING_TOKEN(STR_GEN_UEFI_FUNC_ERROR), 
    426                     gShellDriver1HiiHandle, 
    427                     L"HiiDatabase->UpdatePackageList", 
     422                    -1,
     423                    -1,
     424                    NULL,
     425                    STRING_TOKEN(STR_GEN_UEFI_FUNC_ERROR),
     426                    gShellDriver1HiiHandle,
     427                    L"HiiDatabase->UpdatePackageList",
    428428                    Status);
    429429                  return (SHELL_DEVICE_ERROR);
     
    433433                  HandleIndex = ConvertHandleToHandleIndex(Handle);
    434434                  ShellPrintHiiEx(
    435                     -1, 
    436                     -1, 
    437                     NULL, 
    438                     STRING_TOKEN(STR_DRVCFG_DONE_HII), 
    439                     gShellDriver1HiiHandle, 
     435                    -1,
     436                    -1,
     437                    NULL,
     438                    STRING_TOKEN(STR_DRVCFG_DONE_HII),
     439                    gShellDriver1HiiHandle,
    440440                    HandleIndex);
    441441                }
    442               }             
     442              }
    443443            }
    444444        }
     
    450450
    451451  ShellPrintHiiEx(
    452     -1, 
     452    -1,
    453453    -1,
    454454    NULL,
    455     STRING_TOKEN(STR_DRVCFG_COMP), 
     455    STRING_TOKEN(STR_DRVCFG_COMP),
    456456    gShellDriver1HiiHandle);
    457457  return (SHELL_SUCCESS);
     
    582582      -1,
    583583      NULL,
    584       STRING_TOKEN (STR_DRVCFG_FORCE_D), 
    585       gShellDriver1HiiHandle, 
     584      STRING_TOKEN (STR_DRVCFG_FORCE_D),
     585      gShellDriver1HiiHandle,
    586586      DefaultType);
    587587  } else if (ValidateOptions) {
     
    590590      -1,
    591591      NULL,
    592       STRING_TOKEN (STR_DRVCFG_VALIDATE), 
     592      STRING_TOKEN (STR_DRVCFG_VALIDATE),
    593593      gShellDriver1HiiHandle);
    594594  } else if (SetOptions) {
     
    597597      -1,
    598598      NULL,
    599       STRING_TOKEN (STR_DRVCFG_SET), 
     599      STRING_TOKEN (STR_DRVCFG_SET),
    600600      gShellDriver1HiiHandle);
    601601  }
     
    608608    }
    609609    for (
    610       HandleBuffer = DriverImageHandleBuffer, DriverImageHandleCount = 0 
    611       ; HandleBuffer != NULL && *HandleBuffer != NULL 
     610      HandleBuffer = DriverImageHandleBuffer, DriverImageHandleCount = 0
     611      ; HandleBuffer != NULL && *HandleBuffer != NULL
    612612      ; HandleBuffer++,DriverImageHandleCount++);
    613613  } else {
     
    655655      continue;
    656656    }
    657    
     657
    658658    BestLanguage = GetBestLanguage (
    659659                          DriverConfiguration->SupportedLanguages,
     
    713713          -1,
    714714          NULL,
    715           STRING_TOKEN (STR_DRVCFG_OPTIONS_SET), 
     715          STRING_TOKEN (STR_DRVCFG_OPTIONS_SET),
    716716          gShellDriver1HiiHandle);
    717717        for (LoopCounter = 0; LoopCounter < HandleCount; LoopCounter++) {
     
    730730          -1,
    731731          NULL,
    732           STRING_TOKEN (STR_DRVCFG_NOT_SET), 
    733           gShellDriver1HiiHandle, 
     732          STRING_TOKEN (STR_DRVCFG_NOT_SET),
     733          gShellDriver1HiiHandle,
    734734          Status);
    735735      }
     
    772772              -1,
    773773              NULL,
    774               STRING_TOKEN (STR_DRVCFG_DEF_FORCED), 
     774              STRING_TOKEN (STR_DRVCFG_DEF_FORCED),
    775775              gShellDriver1HiiHandle);
    776776            ShellCmdDriverConfigurationProcessActionRequired (
     
    785785              -1,
    786786              NULL,
    787               STRING_TOKEN (STR_DRVCFG_FORCE_FAILED), 
    788               gShellDriver1HiiHandle, 
     787              STRING_TOKEN (STR_DRVCFG_FORCE_FAILED),
     788              gShellDriver1HiiHandle,
    789789              Status);
    790790           ShellStatus = SHELL_DEVICE_ERROR;
     
    802802              -1,
    803803              NULL,
    804               STRING_TOKEN (STR_DRVCFG_OPTIONS_VALID), 
     804              STRING_TOKEN (STR_DRVCFG_OPTIONS_VALID),
    805805              gShellDriver1HiiHandle);
    806806          } else {
     
    809809              -1,
    810810              NULL,
    811               STRING_TOKEN (STR_DRVCFG_OPTIONS_INV), 
    812               gShellDriver1HiiHandle, 
     811              STRING_TOKEN (STR_DRVCFG_OPTIONS_INV),
     812              gShellDriver1HiiHandle,
    813813              Status);
    814814            ShellStatus = SHELL_DEVICE_ERROR;
     
    841841              -1,
    842842              NULL,
    843               STRING_TOKEN (STR_DRVCFG_OPTIONS_SET), 
     843              STRING_TOKEN (STR_DRVCFG_OPTIONS_SET),
    844844              gShellDriver1HiiHandle);
    845845
     
    856856              -1,
    857857              NULL,
    858               STRING_TOKEN (STR_DRVCFG_NOT_SET), 
    859               gShellDriver1HiiHandle, 
     858              STRING_TOKEN (STR_DRVCFG_NOT_SET),
     859              gShellDriver1HiiHandle,
    860860              Status);
    861861            ShellStatus = SHELL_DEVICE_ERROR;
     
    919919              -1,
    920920              NULL,
    921               STRING_TOKEN (STR_DRVCFG_DEF_FORCED), 
     921              STRING_TOKEN (STR_DRVCFG_DEF_FORCED),
    922922              gShellDriver1HiiHandle);
    923923
     
    934934              -1,
    935935              NULL,
    936               STRING_TOKEN (STR_DRVCFG_FORCE_FAILED), 
    937               gShellDriver1HiiHandle, 
     936              STRING_TOKEN (STR_DRVCFG_FORCE_FAILED),
     937              gShellDriver1HiiHandle,
    938938              Status);
    939939            ShellStatus = SHELL_DEVICE_ERROR;
     
    951951              -1,
    952952              NULL,
    953               STRING_TOKEN (STR_DRVCFG_OPTIONS_VALID), 
     953              STRING_TOKEN (STR_DRVCFG_OPTIONS_VALID),
    954954              gShellDriver1HiiHandle);
    955955          } else {
     
    958958              -1,
    959959              NULL,
    960               STRING_TOKEN (STR_DRVCFG_OPTIONS_INV), 
    961               gShellDriver1HiiHandle, 
     960              STRING_TOKEN (STR_DRVCFG_OPTIONS_INV),
     961              gShellDriver1HiiHandle,
    962962              Status);
    963963            ShellStatus = SHELL_DEVICE_ERROR;
     
    992992              -1,
    993993              NULL,
    994               STRING_TOKEN (STR_DRVCFG_OPTIONS_SET), 
     994              STRING_TOKEN (STR_DRVCFG_OPTIONS_SET),
    995995              gShellDriver1HiiHandle);
    996996
     
    10071007              -1,
    10081008              NULL,
    1009               STRING_TOKEN (STR_DRVCFG_NOT_SET), 
    1010               gShellDriver1HiiHandle, 
     1009              STRING_TOKEN (STR_DRVCFG_NOT_SET),
     1010              gShellDriver1HiiHandle,
    10111011              Status);
    10121012            ShellStatus = SHELL_DEVICE_ERROR;
     
    10701070      Index2 = *CurrentHandle == NULL ? 0 : ConvertHandleToHandleIndex(*CurrentHandle);
    10711071      ShellPrintHiiEx(
    1072         -1, 
    1073         -1, 
    1074         NULL, 
    1075         STRING_TOKEN (STR_DRVCFG_LINE_HII), 
    1076         gShellDriver1HiiHandle, 
     1072        -1,
     1073        -1,
     1074        NULL,
     1075        STRING_TOKEN (STR_DRVCFG_LINE_HII),
     1076        gShellDriver1HiiHandle,
    10771077        Index2
    10781078        );
     
    11911191      }
    11921192    }
    1193   } 
     1193  }
    11941194  if (ShellStatus == SHELL_SUCCESS) {
    11951195    Lang = ShellCommandLineGetValue(Package, L"-l");
     
    12211221      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FIND_FAIL), gShellDriver1HiiHandle, FileName);
    12221222      ShellStatus = SHELL_INVALID_PARAMETER;
    1223       goto Done;     
     1223      goto Done;
    12241224    }
    12251225    if (OutToFile && !EFI_ERROR(ShellFileExists(FileName))) {
    12261226      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_EXIST), gShellDriver1HiiHandle, FileName);
    12271227      ShellStatus = SHELL_INVALID_PARAMETER;
    1228       goto Done;     
     1228      goto Done;
    12291229    }
    12301230    if (Force && ForceTypeString == NULL) {
     
    12321232      ShellStatus = SHELL_INVALID_PARAMETER;
    12331233      goto Done;
    1234     } 
     1234    }
    12351235    if (Force) {
    12361236      Status = ShellConvertStringToUint64(ForceTypeString, &Intermediate, FALSE, FALSE);
     
    12891289        ShellStatus = SHELL_INVALID_PARAMETER;
    12901290        goto Done;
    1291       } 
     1291      }
    12921292      if (OutToFile) {
    12931293        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"-o");
     
    13001300      ShellStatus = SHELL_INVALID_PARAMETER;
    13011301      goto Done;
    1302     } 
     1302    }
    13031303    if (Validate && Set) {
    13041304      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONF), gShellDriver1HiiHandle, L"-v", L"-s");
    13051305      ShellStatus = SHELL_INVALID_PARAMETER;
    13061306      goto Done;
    1307     } 
     1307    }
    13081308    if (Set && Force) {
    13091309      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONF), gShellDriver1HiiHandle, L"-s", L"-f");
     
    13481348        if (!EFI_ERROR(gBS->OpenProtocol(Handle1, &gEfiHiiConfigAccessProtocolGuid, NULL, gImageHandle, NULL, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {
    13491349          ShellPrintHiiEx(
    1350             -1, 
    1351             -1, 
    1352             NULL, 
    1353             STRING_TOKEN (STR_DRVCFG_LINE_HII), 
    1354             gShellDriver1HiiHandle, 
     1350            -1,
     1351            -1,
     1352            NULL,
     1353            STRING_TOKEN (STR_DRVCFG_LINE_HII),
     1354            gShellDriver1HiiHandle,
    13551355            ConvertHandleToHandleIndex(Handle1)
    13561356            );
     
    13821382        NULL,
    13831383        STRING_TOKEN (STR_DRVCFG_NOT_SUPPORT),
    1384         gShellDriver1HiiHandle, 
     1384        gShellDriver1HiiHandle,
    13851385        ConvertHandleToHandleIndex(Handle1)
    13861386        );
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c

    r58459 r58466  
    103103      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROTOCOL_NF), gShellDriver1HiiHandle, L"gEfiDriverDiagnostics2ProtocolGuid", &gEfiDriverDiagnostics2ProtocolGuid);
    104104      return (EFI_NOT_FOUND);
    105     } 
     105    }
    106106    for (Walker = DriverHandleList ; Walker != NULL && *Walker != NULL ; DriverHandleListCount++, Walker++);
    107107  }
     
    142142    if (ControllerHandle == NULL) {
    143143      PARSE_HANDLE_DATABASE_DEVICES(DriverHandleList[DriverHandleListLoop], &ControllerHandleListCount, &ControllerHandleList);
    144     } 
     144    }
    145145    if (ControllerHandleListCount == 0) {
    146146      if (Mode == TestModeList) {
     
    158158          ASSERT(ChildHandleList == NULL);
    159159          PARSE_HANDLE_DATABASE_MANAGED_CHILDREN(
    160             DriverHandleList[DriverHandleListLoop], 
     160            DriverHandleList[DriverHandleListLoop],
    161161            ControllerHandleList[ControllerHandleListLoop],
    162162            &ChildHandleListCount,
     
    194194                FreePool(Language);
    195195              }
    196             } 
     196            }
    197197            if (!Found && (Lang == NULL||(Lang!=NULL&&(Lang[2]!='-')))){
    198198              Status = gBS->OpenProtocol(
     
    430430      Language,
    431431      ShellCommandLineGetFlag(Package, L"-c"),
    432       Handle1, 
    433       Handle2, 
     432      Handle1,
     433      Handle2,
    434434      Handle3
    435435      );
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDriver1CommandsLib/OpenInfo.c

    r58459 r58466  
    127127              OpenTypeString,
    128128              Name
    129              );           
     129             );
    130130          }
    131131        }
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.uni

    • Property svn:mime-type changed from application/octet-stream to text/plain;encoding=UTF-16LE
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellDriver1CommandsLib/Unload.c

    r58459 r58466  
    3232
    3333  TheString = GetProtocolInformationDump(TheHandle, &gEfiLoadedImageProtocolGuid, TRUE);
    34  
     34
    3535  ShellPrintEx(-1, -1, L"%s", TheString);
    3636
    3737  SHELL_FREE_NON_NULL(TheString);
    38  
     38
    3939  return (EFI_SUCCESS);
    4040}
     
    118118          DumpLoadedImageProtocolInfo(TheHandle);
    119119        }
    120        
     120
    121121        if (!ShellCommandLineGetFlag(Package, L"-n")) {
    122122          Status = ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN(STR_UNLOAD_CONF), gShellDriver1HiiHandle, (UINTN)TheHandle);
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf

    r58459 r58466  
    4949
    5050[Guids]
    51   gShellInstall1HiiGuid                         ## UNDEFINED 
     51  gShellInstall1HiiGuid                         ## UNDEFINED
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellLevel1CommandsLib/For.c

    r58459 r58466  
    9090    CurrentScriptFile = ShellCommandGetCurrentScriptFile();
    9191    ShellPrintHiiEx(
    92       -1, 
    93       -1, 
    94       NULL, 
    95       STRING_TOKEN (STR_SYNTAX_NO_MATCHING), 
    96       gShellLevel1HiiHandle, 
    97       L"For", 
    98       L"EndFor", 
     92      -1,
     93      -1,
     94      NULL,
     95      STRING_TOKEN (STR_SYNTAX_NO_MATCHING),
     96      gShellLevel1HiiHandle,
     97      L"For",
     98      L"EndFor",
    9999      CurrentScriptFile!=NULL
    100100        && CurrentScriptFile->CurrentCommand!=NULL
     
    344344    if (!MoveToTag(GetNextNode, L"endfor", L"for", NULL, CurrentScriptFile, TRUE, TRUE, FALSE)) {
    345345      ShellPrintHiiEx(
    346         -1, 
    347         -1, 
    348         NULL, 
    349         STRING_TOKEN (STR_SYNTAX_NO_MATCHING), 
    350         gShellLevel1HiiHandle, 
    351         L"EndFor", 
    352         L"For", 
     346        -1,
     347        -1,
     348        NULL,
     349        STRING_TOKEN (STR_SYNTAX_NO_MATCHING),
     350        gShellLevel1HiiHandle,
     351        L"EndFor",
     352        L"For",
    353353        CurrentScriptFile->CurrentCommand->Line);
    354354      return (SHELL_DEVICE_ERROR);
     
    461461        if (ArgSetWalker[0] != L'(') {
    462462          ShellPrintHiiEx(
    463             -1, 
    464             -1, 
    465             NULL, 
    466             STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), 
    467             gShellLevel1HiiHandle, 
    468             ArgSet, 
     463            -1,
     464            -1,
     465            NULL,
     466            STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT),
     467            gShellLevel1HiiHandle,
     468            ArgSet,
    469469            CurrentScriptFile->CurrentCommand->Line);
    470470          ShellStatus = SHELL_INVALID_PARAMETER;
     
    484484          if (TempSpot == NULL) {
    485485            ShellPrintHiiEx(
    486               -1, 
    487               -1, 
    488               NULL, 
    489               STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), 
    490               gShellLevel1HiiHandle, 
     486              -1,
     487              -1,
     488              NULL,
     489              STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT),
     490              gShellLevel1HiiHandle,
    491491              CurrentScriptFile->CurrentCommand->Line);
    492492            ShellStatus = SHELL_INVALID_PARAMETER;
     
    499499            if (!ShellIsValidForNumber(ArgSetWalker)) {
    500500              ShellPrintHiiEx(
    501                 -1, 
    502                 -1, 
    503                 NULL, 
    504                 STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), 
    505                 gShellLevel1HiiHandle, 
    506                 ArgSet, 
     501                -1,
     502                -1,
     503                NULL,
     504                STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT),
     505                gShellLevel1HiiHandle,
     506                ArgSet,
    507507                CurrentScriptFile->CurrentCommand->Line);
    508508              ShellStatus = SHELL_INVALID_PARAMETER;
     
    519519              if (ArgSetWalker == NULL || *ArgSetWalker == CHAR_NULL || !ShellIsValidForNumber(ArgSetWalker)){
    520520                ShellPrintHiiEx(
    521                   -1, 
    522                   -1, 
    523                   NULL, 
    524                   STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), 
    525                   gShellLevel1HiiHandle, 
    526                   ArgSet, 
     521                  -1,
     522                  -1,
     523                  NULL,
     524                  STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT),
     525                  gShellLevel1HiiHandle,
     526                  ArgSet,
    527527                  CurrentScriptFile->CurrentCommand->Line);
    528528                ShellStatus = SHELL_INVALID_PARAMETER;
     
    546546                  if (ArgSetWalker == NULL || *ArgSetWalker == CHAR_NULL || !ShellIsValidForNumber(ArgSetWalker)){
    547547                    ShellPrintHiiEx(
    548                       -1, 
    549                       -1, 
    550                       NULL, 
    551                       STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), 
    552                       gShellLevel1HiiHandle, 
    553                       ArgSet, 
     548                      -1,
     549                      -1,
     550                      NULL,
     551                      STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT),
     552                      gShellLevel1HiiHandle,
     553                      ArgSet,
    554554                      CurrentScriptFile->CurrentCommand->Line);
    555555                    ShellStatus = SHELL_INVALID_PARAMETER;
     
    566566                      if (StrStr(ArgSetWalker, L" ") != NULL) {
    567567                        ShellPrintHiiEx(
    568                           -1, 
    569                           -1, 
    570                           NULL, 
    571                           STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), 
    572                           gShellLevel1HiiHandle, 
    573                           ArgSet, 
     568                          -1,
     569                          -1,
     570                          NULL,
     571                          STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT),
     572                          gShellLevel1HiiHandle,
     573                          ArgSet,
    574574                          CurrentScriptFile->CurrentCommand->Line);
    575575                        ShellStatus = SHELL_INVALID_PARAMETER;
     
    577577                    }
    578578                  }
    579                  
     579
    580580                }
    581581              }
     
    596596    } else {
    597597      ShellPrintHiiEx(
    598         -1, 
    599         -1, 
    600         NULL, 
    601         STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), 
    602         gShellLevel1HiiHandle, 
    603         ArgSet, 
    604         CurrentScriptFile!=NULL 
     598        -1,
     599        -1,
     600        NULL,
     601        STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT),
     602        gShellLevel1HiiHandle,
     603        ArgSet,
     604        CurrentScriptFile!=NULL
    605605          && CurrentScriptFile->CurrentCommand!=NULL
    606606          ? CurrentScriptFile->CurrentCommand->Line:0);
     
    651651        if (!MoveToTag(GetNextNode, L"endfor", L"for", NULL, CurrentScriptFile, TRUE, FALSE, FALSE)) {
    652652          ShellPrintHiiEx(
    653             -1, 
    654             -1, 
    655             NULL, 
    656             STRING_TOKEN (STR_SYNTAX_NO_MATCHING), 
    657             gShellLevel1HiiHandle, 
    658             L"EndFor", 
    659             L"For", 
    660             CurrentScriptFile!=NULL 
     653            -1,
     654            -1,
     655            NULL,
     656            STRING_TOKEN (STR_SYNTAX_NO_MATCHING),
     657            gShellLevel1HiiHandle,
     658            L"EndFor",
     659            L"For",
     660            CurrentScriptFile!=NULL
    661661              && CurrentScriptFile->CurrentCommand!=NULL
    662662              ? CurrentScriptFile->CurrentCommand->Line:0);
     
    713713        if (!MoveToTag(GetNextNode, L"endfor", L"for", NULL, CurrentScriptFile, TRUE, FALSE, FALSE)) {
    714714          ShellPrintHiiEx(
    715             -1, 
    716             -1, 
    717             NULL, 
    718             STRING_TOKEN (STR_SYNTAX_NO_MATCHING), 
    719             gShellLevel1HiiHandle, 
    720             L"EndFor", 
    721             L"For", 
    722             CurrentScriptFile!=NULL 
     715            -1,
     716            -1,
     717            NULL,
     718            STRING_TOKEN (STR_SYNTAX_NO_MATCHING),
     719            gShellLevel1HiiHandle,
     720            L"EndFor",
     721            L"For",
     722            CurrentScriptFile!=NULL
    723723              && CurrentScriptFile->CurrentCommand!=NULL
    724724              ? CurrentScriptFile->CurrentCommand->Line:0);
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellLevel1CommandsLib/Goto.c

    r48674 r58466  
    8383        CurrentScriptFile = ShellCommandGetCurrentScriptFile();
    8484        ShellPrintHiiEx(
    85           -1, 
    86           -1, 
    87           NULL, 
    88           STRING_TOKEN (STR_SYNTAX_NO_MATCHING), 
    89           gShellLevel1HiiHandle, 
    90           CompareString, 
    91           L"Goto", 
    92           CurrentScriptFile!=NULL 
     85          -1,
     86          -1,
     87          NULL,
     88          STRING_TOKEN (STR_SYNTAX_NO_MATCHING),
     89          gShellLevel1HiiHandle,
     90          CompareString,
     91          L"Goto",
     92          CurrentScriptFile!=NULL
    9393            && CurrentScriptFile->CurrentCommand!=NULL
    9494            ? CurrentScriptFile->CurrentCommand->Line:0);
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c

    r58459 r58466  
    334334  Process an if statement and determine if its is valid or not.
    335335
    336   @param[in, out] PassingState     Opon entry, the current state.  Upon exit, 
     336  @param[in, out] PassingState     Opon entry, the current state.  Upon exit,
    337337                                   the new state.
    338338  @param[in] StartParameterNumber  The number of the first parameter of
     
    345345
    346346  @retval EFI_INVALID_PARAMETER   A parameter was invalid.
    347   @retval EFI_SUCCESS             The operation was successful.                                 
     347  @retval EFI_SUCCESS             The operation was successful.
    348348**/
    349349EFI_STATUS
     
    642642
    643643  @param[in] ParameterNumber      The current parameter number.
    644   @param[out] EndParameter        Upon successful return, will point to the 
     644  @param[out] EndParameter        Upon successful return, will point to the
    645645                                  parameter to start the next iteration with.
    646   @param[out] EndTag              Upon successful return, will point to the 
     646  @param[out] EndTag              Upon successful return, will point to the
    647647                                  type that was found at the end of this statement.
    648648
     
    848848  if (!MoveToTag(GetNextNode, L"endif", L"if", NULL, CurrentScriptFile, TRUE, TRUE, FALSE)) {
    849849    ShellPrintHiiEx(
    850       -1, 
    851       -1, 
    852       NULL, 
    853       STRING_TOKEN (STR_SYNTAX_NO_MATCHING), 
    854       gShellLevel1HiiHandle, 
    855       L"EndIf", 
    856       L"If", 
    857       CurrentScriptFile!=NULL 
     850      -1,
     851      -1,
     852      NULL,
     853      STRING_TOKEN (STR_SYNTAX_NO_MATCHING),
     854      gShellLevel1HiiHandle,
     855      L"EndIf",
     856      L"If",
     857      CurrentScriptFile!=NULL
    858858        && CurrentScriptFile->CurrentCommand!=NULL
    859859        ? CurrentScriptFile->CurrentCommand->Line:0);
     
    933933        CurrentScriptFile = ShellCommandGetCurrentScriptFile();
    934934        ShellPrintHiiEx(
    935           -1, 
    936           -1, 
    937           NULL, 
    938           STRING_TOKEN (STR_SYNTAX_NO_MATCHING), 
    939           gShellLevel1HiiHandle, 
    940           L"Then", 
     935          -1,
     936          -1,
     937          NULL,
     938          STRING_TOKEN (STR_SYNTAX_NO_MATCHING),
     939          gShellLevel1HiiHandle,
     940          L"Then",
    941941          L"If",
    942           CurrentScriptFile!=NULL 
     942          CurrentScriptFile!=NULL
    943943            && CurrentScriptFile->CurrentCommand!=NULL
    944944            ? CurrentScriptFile->CurrentCommand->Line:0);
     
    10101010  if (!MoveToTag(GetPreviousNode, L"if", L"endif", NULL, CurrentScriptFile, FALSE, TRUE, FALSE)) {
    10111011    ShellPrintHiiEx(
    1012       -1, 
    1013       -1, 
    1014       NULL, 
    1015       STRING_TOKEN (STR_SYNTAX_NO_MATCHING), 
    1016       gShellLevel1HiiHandle, 
    1017       L"If", 
    1018       L"Else", 
    1019       CurrentScriptFile!=NULL 
     1012      -1,
     1013      -1,
     1014      NULL,
     1015      STRING_TOKEN (STR_SYNTAX_NO_MATCHING),
     1016      gShellLevel1HiiHandle,
     1017      L"If",
     1018      L"Else",
     1019      CurrentScriptFile!=NULL
    10201020        && CurrentScriptFile->CurrentCommand!=NULL
    10211021        ? CurrentScriptFile->CurrentCommand->Line:0);
     
    10241024  if (!MoveToTag(GetPreviousNode, L"if", L"else", NULL, CurrentScriptFile, FALSE, TRUE, FALSE)) {
    10251025    ShellPrintHiiEx(
    1026       -1, 
    1027       -1, 
    1028       NULL, 
    1029       STRING_TOKEN (STR_SYNTAX_NO_MATCHING), 
    1030       gShellLevel1HiiHandle, 
    1031       L"If", 
    1032       L"Else", 
    1033       CurrentScriptFile!=NULL 
     1026      -1,
     1027      -1,
     1028      NULL,
     1029      STRING_TOKEN (STR_SYNTAX_NO_MATCHING),
     1030      gShellLevel1HiiHandle,
     1031      L"If",
     1032      L"Else",
     1033      CurrentScriptFile!=NULL
    10341034        && CurrentScriptFile->CurrentCommand!=NULL
    10351035        ? CurrentScriptFile->CurrentCommand->Line:0);
     
    10391039  if (!MoveToTag(GetNextNode, L"endif", L"if", NULL, CurrentScriptFile, FALSE, FALSE, FALSE)) {
    10401040    ShellPrintHiiEx(
    1041       -1, 
    1042       -1, 
    1043       NULL, 
    1044       STRING_TOKEN (STR_SYNTAX_NO_MATCHING), 
    1045       gShellLevel1HiiHandle, 
    1046       L"EndIf", 
    1047       "Else", 
    1048       CurrentScriptFile!=NULL 
     1041      -1,
     1042      -1,
     1043      NULL,
     1044      STRING_TOKEN (STR_SYNTAX_NO_MATCHING),
     1045      gShellLevel1HiiHandle,
     1046      L"EndIf",
     1047      "Else",
     1048      CurrentScriptFile!=NULL
    10491049        && CurrentScriptFile->CurrentCommand!=NULL
    10501050        ? CurrentScriptFile->CurrentCommand->Line:0);
     
    10841084  if (!MoveToTag(GetPreviousNode, L"if", L"endif", NULL, CurrentScriptFile, FALSE, TRUE, FALSE)) {
    10851085    ShellPrintHiiEx(
    1086       -1, 
    1087       -1, 
    1088       NULL, 
    1089       STRING_TOKEN (STR_SYNTAX_NO_MATCHING), 
    1090       gShellLevel1HiiHandle, 
    1091       L"If", 
    1092       L"EndIf", 
    1093       CurrentScriptFile!=NULL 
     1086      -1,
     1087      -1,
     1088      NULL,
     1089      STRING_TOKEN (STR_SYNTAX_NO_MATCHING),
     1090      gShellLevel1HiiHandle,
     1091      L"If",
     1092      L"EndIf",
     1093      CurrentScriptFile!=NULL
    10941094        && CurrentScriptFile->CurrentCommand!=NULL
    10951095        ? CurrentScriptFile->CurrentCommand->Line:0);
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.c

    r58459 r58466  
    104104  hits the specified tags.  when it hits zero the location has been found.
    105105
    106   DecrementerTag and IncrementerTag are used to get around for/endfor and 
     106  DecrementerTag and IncrementerTag are used to get around for/endfor and
    107107  similar paired types where the entire middle should be ignored.
    108108
    109109  If label is used it will be used instead of the count.
    110110
    111   @param[in] Function          The function to use to enumerate through the 
     111  @param[in] Function          The function to use to enumerate through the
    112112                               list.  Normally GetNextNode or GetPreviousNode.
    113113  @param[in] DecrementerTag    The tag to decrement the count at.
     
    115115  @param[in] Label             A label to look for.
    116116  @param[in, out] ScriptFile   The pointer to the current script file structure.
    117   @param[in] MovePast          TRUE makes function return 1 past the found 
     117  @param[in] MovePast          TRUE makes function return 1 past the found
    118118                               location.
    119119  @param[in] FindOnly          TRUE to not change the ScriptFile.
     
    229229  hits the specified tags.  when it hits zero the location has been found.
    230230
    231   DecrementerTag and IncrementerTag are used to get around for/endfor and 
     231  DecrementerTag and IncrementerTag are used to get around for/endfor and
    232232  similar paired types where the entire middle should be ignored.
    233233
    234234  If label is used it will be used instead of the count.
    235235
    236   @param[in] Function          The function to use to enumerate through the 
     236  @param[in] Function          The function to use to enumerate through the
    237237                               list.  Normally GetNextNode or GetPreviousNode.
    238238  @param[in] DecrementerTag    The tag to decrement the count at.
     
    240240  @param[in] Label             A label to look for.
    241241  @param[in, out] ScriptFile   The pointer to the current script file structure.
    242   @param[in] MovePast          TRUE makes function return 1 past the found 
     242  @param[in] MovePast          TRUE makes function return 1 past the found
    243243                               location.
    244244  @param[in] FindOnly          TRUE to not change the ScriptFile.
    245   @param[in] WrapAroundScript  TRUE to wrap end-to-begining or vise versa in 
     245  @param[in] WrapAroundScript  TRUE to wrap end-to-begining or vise versa in
    246246                               searching.
    247247**/
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.h

    r58459 r58466  
    178178  hits the specified tags.  when it hits zero the location has been found.
    179179
    180   DecrementerTag and IncrementerTag are used to get around for/endfor and 
     180  DecrementerTag and IncrementerTag are used to get around for/endfor and
    181181  similar paired types where the entire middle should be ignored.
    182182
    183183  If label is used it will be used instead of the count.
    184184
    185   @param[in] Function          The function to use to enumerate through the 
     185  @param[in] Function          The function to use to enumerate through the
    186186                               list.  Normally GetNextNode or GetPreviousNode.
    187187  @param[in] DecrementerTag    The tag to decrement the count at.
     
    189189  @param[in] Label             A label to look for.
    190190  @param[in, out] ScriptFile   The pointer to the current script file structure.
    191   @param[in] MovePast          TRUE makes function return 1 past the found 
     191  @param[in] MovePast          TRUE makes function return 1 past the found
    192192                               location.
    193193  @param[in] FindOnly          TRUE to not change the ScriptFile.
    194   @param[in] WrapAroundScript  TRUE to wrap end-to-begining or vise versa in 
     194  @param[in] WrapAroundScript  TRUE to wrap end-to-begining or vise versa in
    195195                               searching.
    196196**/
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.uni

    • Property svn:mime-type changed from application/octet-stream to text/plain;encoding=UTF-16LE
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellLevel2CommandsLib/Attrib.c

    r58459 r58466  
    154154                FileNode->FileName
    155155               );
    156                
     156
    157157              if (ShellGetExecutionBreakFlag()) {
    158158                  ShellStatus = SHELL_ABORTED;
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellLevel2CommandsLib/Cd.c

    r58459 r58466  
    103103        }
    104104      }
    105      
     105
    106106      if (Param1Copy != NULL) {
    107107        Param1Copy = PathCleanUpDirectories(Param1Copy);
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c

    r58459 r58466  
    243243    SHELL_FREE_NON_NULL(DestVolumeInfo);
    244244  }
    245  
     245
    246246  //
    247247  // close files
     
    319319  ASSERT(DestDir  != NULL);
    320320
    321  
     321
    322322  Status = ShellLevel2StripQuotes (DestDir, &CleanFilePathStr);
    323323  if (EFI_ERROR (Status)) {
     
    328328    }
    329329  }
    330  
     330
    331331  ASSERT (CleanFilePathStr != NULL);
    332332
     
    441441      // we have multiple files or a directory in the DestDir
    442442      //
    443      
     443
    444444      //
    445445      // Check for leading slash
     
    490490      }
    491491    }
    492    
     492
    493493    //
    494494    // Make sure the path exists
     
    553553
    554554/**
    555   Validate and if successful copy all the files from the list into 
     555  Validate and if successful copy all the files from the list into
    556556  destination directory.
    557557
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c

    r58459 r58466  
    155155EFIAPI
    156156PrintFileInformation(
    157   IN CONST BOOLEAN              Sfo, 
    158   IN CONST EFI_SHELL_FILE_INFO  *TheNode, 
    159   IN UINT64                     *Files, 
    160   IN UINT64                     *Size, 
     157  IN CONST BOOLEAN              Sfo,
     158  IN CONST EFI_SHELL_FILE_INFO  *TheNode,
     159  IN UINT64                     *Files,
     160  IN UINT64                     *Size,
    161161  IN UINT64                     *Dirs
    162162  )
     
    303303EFIAPI
    304304PrintNonSfoFooter(
    305   IN UINT64                     Files, 
    306   IN UINT64                     Size, 
     305  IN UINT64                     Files,
     306  IN UINT64                     Size,
    307307  IN UINT64                     Dirs
    308308  )
     
    471471    CorrectedPath = StrnCatGrow(&CorrectedPath, &LongestPath, L"*",     0);
    472472    Status = ShellOpenFileMetaArg((CHAR16*)CorrectedPath, EFI_FILE_MODE_READ, &ListHead);
    473    
     473
    474474    if (!EFI_ERROR(Status)) {
    475475      for ( Node = (EFI_SHELL_FILE_INFO *)GetFirstNode(&ListHead->Link)
     
    498498            Count,
    499499            TimeZone);
    500            
     500
    501501          //
    502502          // Since it's running recursively, we have to break immediately when returned SHELL_ABORTED
     
    694694                return SHELL_OUT_OF_RESOURCES;
    695695            }
    696                
     696
    697697            if  (ShellIsDirectory(PathName) == EFI_SUCCESS) {
    698698              //
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c

    r58459 r58466  
    5656  @param[in] List         The list to seatch in.
    5757  @param[in] MetaTarget   The item to search for. MetaMatching supported.
    58   @param[out] FullName    Optional pointer to an allocated buffer containing 
     58  @param[out] FullName    Optional pointer to an allocated buffer containing
    5959                          the match.
    6060  @param[in] Meta         TRUE to use MetaMatching.
    6161  @param[in] SkipTrailingNumbers  TRUE to allow for numbers after the MetaTarget.
    62   @param[in] Target       The single character that delimits list 
    63                           items (";" normally). 
     62  @param[in] Target       The single character that delimits list
     63                          items (";" normally).
    6464**/
    6565BOOLEAN
     
    120120
    121121/**
    122   Determine what type of device is represented and return it's string.  The 
     122  Determine what type of device is represented and return it's string.  The
    123123  string is in allocated memory and must be callee freed.  The HII is is listed below.
    124124  The actual string cannot be determined.
     
    876876  EFI_STATUS                      Status;
    877877  CHAR16                          *NewSName;
    878  
     878
    879879  NewSName = AllocateCopyPool(StrSize(SName) + sizeof(CHAR16), SName);
    880880  if (NewSName == NULL) {
     
    928928  EFI_STATUS                Status;
    929929  CHAR16                    *NewSName;
    930  
     930
    931931  NewSName = AllocateCopyPool(StrSize(SName) + sizeof(CHAR16), SName);
    932932  if (NewSName == NULL) {
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c

    r58459 r58466  
    288288      return SHELL_INVALID_PARAMETER;
    289289    }
    290   } 
     290  }
    291291
    292292  ASSERT (CleanFilePathStr != NULL);
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c

    r58459 r58466  
    1717
    1818/**
    19   Do the actual parsing of the file.  the file should be SFO output from a 
     19  Do the actual parsing of the file.  the file should be SFO output from a
    2020  shell command or a similar format.
    2121
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c

    r58459 r58466  
    2424
    2525  @param[in] FileHandle   The EFI_HANDLE to the directory.
    26  
     26
    2727  @retval TRUE  The directory has no files (or directories).
    2828  @retval FALSE The directory has at least 1 file or directory in it.
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c

    r58459 r58466  
    7878
    7979/**
    80   Verify that the DateString is valid and if so set that as the current 
     80  Verify that the DateString is valid and if so set that as the current
    8181  date.
    8282
     
    290290
    291291/**
    292   Verify that the TimeString is valid and if so set that as the current 
     292  Verify that the TimeString is valid and if so set that as the current
    293293  time.
    294294
     
    692692
    693693/**
    694   Verify that the TimeZoneString is valid and if so set that as the current 
     694  Verify that the TimeZoneString is valid and if so set that as the current
    695695  timezone.
    696696
     
    956956              ShellPrintHiiEx (-1, -1, NULL, TimeZoneList[LoopVar].StringId, gShellLevel2HiiHandle);
    957957              break;
    958             } 
     958            }
    959959          }
    960960        } else {
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c

    r58459 r58466  
    315315
    316316  @param[in]     OriginalString   pointer to the string to be cleaned.
    317   @param[out]   CleanString      The new string with all quotes removed. 
    318                                                   Memory allocated in the function and free 
     317  @param[out]   CleanString      The new string with all quotes removed.
     318                                                  Memory allocated in the function and free
    319319                                                  by caller.
    320320
     
    329329{
    330330  CHAR16            *Walker;
    331  
     331
    332332  if (OriginalString == NULL || CleanString == NULL) {
    333333    return EFI_INVALID_PARAMETER;
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h

    r58459 r58466  
    305305
    306306  @param[in]     OriginalString   pointer to the string to be cleaned.
    307   @param[out]   CleanString      The new string with all quotes removed. 
    308                                                   Memory allocated in the function and free 
     307  @param[out]   CleanString      The new string with all quotes removed.
     308                                                  Memory allocated in the function and free
    309309                                                  by caller.
    310310
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.uni

    • Property svn:mime-type changed from application/octet-stream to text/plain;encoding=UTF-16LE
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c

    r58459 r58466  
    117117        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_OUT_MEM), gShellLevel2HiiHandle);
    118118        ShellStatus = SHELL_OUT_OF_RESOURCES;
    119       } 
     119      }
    120120    }
    121121    if (SysInfo != NULL) {
     
    128128        SysInfo);
    129129    }
    130   } 
     130  }
    131131
    132132  FreePool(SysInfo);
     
    158158
    159159  gEfiShellProtocol->CloseFile(ShellFileHandle);
    160  
     160
    161161  ASSERT(SysInfo != NULL);
    162162
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellLevel3CommandsLib/Echo.c

    r58459 r58466  
    104104        if (ShellCommandLineGetRawValue(Package, ParamCount+1) != NULL) {
    105105          StrnCatGrow(&PrintString, &Size, L" ", 0);
    106         } 
     106        }
    107107      }
    108108      ShellPrintEx(-1, -1, L"%s\r\n", PrintString);
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellLevel3CommandsLib/Help.c

    r58459 r58466  
    232232          if (ShellGetExecutionBreakFlag ()) {
    233233            break;
    234           } 
     234          }
    235235          if ((gUnicodeCollation->MetaiMatch(gUnicodeCollation, Node->CommandString, CommandToGetHelpOn)) ||
    236236             (gEfiShellProtocol->GetAlias(CommandToGetHelpOn, NULL) != NULL && (gUnicodeCollation->MetaiMatch(gUnicodeCollation, Node->CommandString, (CHAR16*)(gEfiShellProtocol->GetAlias(CommandToGetHelpOn, NULL)))))) {
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellLevel3CommandsLib/Type.c

    r58459 r58466  
    8585          // Allow Line Feed (LF) (0xA) & Carriage Return (CR) (0xD)
    8686          // characters to be displayed as is.
    87           // 
     87          //
    8888          if (AsciiChar == '\n' && ((CHAR8*)Buffer)[LoopVar-1] != '\r') {
    8989            //
     
    116116        LoopSize = ReadSize / (sizeof (CHAR16));
    117117      }
    118      
     118
    119119      for (LoopVar = 0 ; LoopVar < LoopSize ; LoopVar++) {
    120120        //
     
    128128          // Allow Line Feed (LF) (0xA) & Carriage Return (CR) (0xD)
    129129          // characters to be displayed as is.
    130           // 
     130          //
    131131          if (Ucs2Char == '\n' && ((CHAR16*)Buffer)[LoopVar-1] != '\r') {
    132132            //
     
    139139            continue;
    140140          }
    141         } 
     141        }
    142142        else if (Ucs2Char < 0x20) {
    143143          //
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.uni

    • Property svn:mime-type changed from application/octet-stream to text/plain;encoding=UTF-16LE
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellLib/UefiShellLib.c

    r58459 r58466  
    26702670  }
    26712671  if (mEfiShellInterface          != NULL) {
    2672     if (mEfiShellInterface->RedirArgc == 0) { 
     2672    if (mEfiShellInterface->RedirArgc == 0) {
    26732673    //
    26742674    // Divide in half for old shell.  Must be string length not size.
    2675       // 
     2675      //
    26762676      Size /=2;  // Divide in half only when no redirection.
    26772677    }
     
    31113111    return ((UINTN)RetVal);
    31123112  }
    3113  
     3113
    31143114  return ((UINTN)(-1));
    31153115}
     
    41574157  @param[in] CommandToGetHelpOn  Pointer to a string containing the command name of help file to be printed.
    41584158  @param[in] SectionToGetHelpOn  Pointer to the section specifier(s).
    4159   @param[in] PrintCommandText    If TRUE, prints the command followed by the help content, otherwise prints 
     4159  @param[in] PrintCommandText    If TRUE, prints the command followed by the help content, otherwise prints
    41604160                                 the help content only.
    41614161  @retval EFI_DEVICE_ERROR       The help data format was incorrect.
     
    41734173        EFI_STATUS          Status;
    41744174        CHAR16              *OutText;
    4175          
     4175
    41764176        OutText = NULL;
    4177        
     4177
    41784178  //
    41794179  // Get the string to print based
    41804180  //
    41814181        Status = gEfiShellProtocol->GetHelpText (CommandToGetHelpOn, SectionToGetHelpOn, &OutText);
    4182  
     4182
    41834183  //
    41844184  // make sure we got a valid string
     
    41864186  if (EFI_ERROR(Status)){
    41874187    return Status;
    4188         } 
     4188        }
    41894189  if (OutText == NULL || StrLen(OutText) == 0) {
    4190     return EFI_NOT_FOUND; 
     4190    return EFI_NOT_FOUND;
    41914191        }
    4192  
     4192
    41934193  //
    41944194  // Chop off trailing stuff we dont need
     
    41974197    OutText[StrLen(OutText)-1] = CHAR_NULL;
    41984198  }
    4199  
     4199
    42004200  //
    42014201  // Print this out to the console
     
    42064206    ShellPrintEx(-1, -1, L"%N%s\r\n", OutText);
    42074207  }
    4208  
     4208
    42094209  SHELL_FREE_NON_NULL(OutText);
    42104210
     
    42144214/**
    42154215  Function to delete a file by name
    4216  
     4216
    42174217  @param[in]       FileName       Pointer to file name to delete.
    4218  
     4218
    42194219  @retval EFI_SUCCESS             the file was deleted sucessfully
    42204220  @retval EFI_WARN_DELETE_FAILURE the handle was closed, but the file was not
     
    42434243  EFI_STATUS                Status;
    42444244  SHELL_FILE_HANDLE         FileHandle;
    4245  
     4245
    42464246  Status = ShellFileExists(FileName);
    4247  
     4247
    42484248  if (Status == EFI_SUCCESS){
    42494249    Status = ShellOpenFileByName(FileName, &FileHandle, EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE | EFI_FILE_MODE_CREATE, 0x0);
     
    42514251      Status = ShellDeleteFile(&FileHandle);
    42524252    }
    4253   } 
     4253  }
    42544254
    42554255  return(Status);
    4256  
     4256
    42574257}
    42584258
     
    42614261
    42624262  @param[in]     OriginalString   pointer to the string to be cleaned.
    4263   @param[out]   CleanString      The new string with all quotes removed. 
    4264                                                   Memory allocated in the function and free 
     4263  @param[out]   CleanString      The new string with all quotes removed.
     4264                                                  Memory allocated in the function and free
    42654265                                                  by caller.
    42664266
     
    42754275{
    42764276  CHAR16            *Walker;
    4277  
     4277
    42784278  if (OriginalString == NULL || CleanString == NULL) {
    42794279    return EFI_INVALID_PARAMETER;
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellLib/UefiShellLib.h

    r58459 r58466  
    7777
    7878  @param[in]     OriginalString   pointer to the string to be cleaned.
    79   @param[out]   CleanString      The new string with all quotes removed. 
    80                                                   Memory allocated in the function and free 
     79  @param[out]   CleanString      The new string with all quotes removed.
     80                                                  Memory allocated in the function and free
    8181                                                  by caller.
    8282
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ifconfig.c

    r58459 r58466  
    8888
    8989  @param[in] Name     The pointer to the string containing the NIC name.
    90  
     90
    9191  @return The pointer to the NIC_INFO if there is a NIC_INFO named by Name.
    9292  @retval NULL  No NIC_INFO was found for Name.
     
    179179  @retval EFI_SUCCESS         Successfully to get child handle.
    180180**/
    181 EFI_STATUS 
     181EFI_STATUS
    182182GetChildHandle (
    183183  IN EFI_HANDLE         Controller,
     
    209209
    210210  for (Index = 0; Index < HandleCount; Index++) {
    211  
     211
    212212    Status = TestChildHandle (Controller, Handles[Index], &gEfiManagedNetworkServiceBindingProtocolGuid);
    213213    if (!EFI_ERROR (Status)) {
     
    220220                     (VOID **) &ChildDeviceDevicePath
    221221                     );
    222      
     222
    223223      if (!EFI_ERROR (Status)) {
    224224        while (!IsDevicePathEnd (ChildDeviceDevicePath)) {
     
    227227          // Parse one instance
    228228          //
    229           if (ChildDeviceDevicePath->Type == HARDWARE_DEVICE_PATH && 
     229          if (ChildDeviceDevicePath->Type == HARDWARE_DEVICE_PATH &&
    230230              ChildDeviceDevicePath->SubType == HW_VENDOR_DP) {
    231231            VendorDeviceNode = (VENDOR_DEVICE_PATH *) ChildDeviceDevicePath;
     
    240240          }
    241241        }
    242       }     
     242      }
    243243    }
    244244  }
    245245
    246246  FreePool (Handles);
    247   return Status; 
     247  return Status;
    248248}
    249249
     
    287287    }
    288288  }
    289  
     289
    290290  return String - OriString;
    291291}
     
    297297  @param ConfigString  String to be converted
    298298**/
    299 CHAR16* 
     299CHAR16*
    300300EFIAPI
    301301HiiToLower (
     
    367367  if (ConfigHdr == NULL) {
    368368    return NULL;
    369   } 
     369  }
    370370
    371371  String = ConfigHdr;
     
    388388    String += UnicodeSPrint (String, 10, L"00%x", Name[Index]);
    389389  }
    390  
     390
    391391  //
    392392  // Append L"&PATH="
     
    408408
    409409  @retval EFI_SUCCESS         Get NIC information successfully.
    410 **/                 
     410**/
    411411EFI_STATUS
    412412EFIAPI
     
    414414  IN  EFI_HANDLE                    Handle,
    415415  OUT NIC_ADDR                      *NicAddr
    416   )   
     416  )
    417417{
    418418  EFI_STATUS                    Status;
     
    426426  Status = NetLibCreateServiceChild (
    427427             Handle,
    428              gImageHandle, 
     428             gImageHandle,
    429429             &gEfiManagedNetworkServiceBindingProtocolGuid,
    430430             &MnpHandle
     
    447447    goto ON_ERROR;
    448448  }
    449  
     449
    450450  NicAddr->Type    = (UINT16) SnpMode.IfType;
    451451  NicAddr->Len     = (UINT8) SnpMode.HwAddressSize;
     
    456456  NetLibDestroyServiceChild (
    457457    Handle,
    458     gImageHandle, 
     458    gImageHandle,
    459459    &gEfiManagedNetworkServiceBindingProtocolGuid,
    460460    MnpHandle
     
    470470  @param[in] Handle         The network physical device handle.
    471471  @param[out] MediaPresentSupported
    472                             Upon successful return, TRUE is media present 
     472                            Upon successful return, TRUE is media present
    473473                            is supported.  FALSE otherwise.
    474   @param[out] MediaPresent  Upon successful return, TRUE is media present 
     474  @param[out] MediaPresent  Upon successful return, TRUE is media present
    475475                            is enabled.  FALSE otherwise.
    476476
     
    483483  OUT BOOLEAN                       *MediaPresentSupported,
    484484  OUT BOOLEAN                       *MediaPresent
    485   )   
    486                  
     485  )
     486
    487487{
    488488  EFI_STATUS                    Status;
     
    496496  Status = NetLibCreateServiceChild (
    497497             Handle,
    498              gImageHandle, 
     498             gImageHandle,
    499499             &gEfiManagedNetworkServiceBindingProtocolGuid,
    500500             &MnpHandle
     
    517517    goto ON_ERROR;
    518518  }
    519  
     519
    520520  *MediaPresentSupported = SnpMode.MediaPresentSupported;
    521521  *MediaPresent = SnpMode.MediaPresent;
     
    525525  NetLibDestroyServiceChild (
    526526    Handle,
    527     gImageHandle, 
     527    gImageHandle,
    528528    &gEfiManagedNetworkServiceBindingProtocolGuid,
    529529    MnpHandle
     
    621621      StrnCpy (ConfigResp, ConfigHdr, Length + NIC_ITEM_CONFIG_SIZE * 2 + 100 - 1);
    622622    }
    623  
     623
    624624    //
    625625    // Append OFFSET/WIDTH pair
     
    713713
    714714  return EFI_SUCCESS;
    715  
     715
    716716ON_ERROR:
    717717  if (AccessResults != NULL) {
     
    869869
    870870  Request->Duplicate = FALSE;
    871  
     871
    872872  if (0 == CompareMem (&Request->LocalMac, &Request->DestMac, Request->MacLen)) {
    873873    ShellPrintHiiEx(
    874       -1, 
    875       -1, 
     874      -1,
     875      -1,
    876876      NULL,
    877       STRING_TOKEN (STR_IFCONFIG_SHOW_IP_ADDR), 
    878       gShellNetwork1HiiHandle, 
     877      STRING_TOKEN (STR_IFCONFIG_SHOW_IP_ADDR),
     878      gShellNetwork1HiiHandle,
    879879      L"Already Configured",
    880880      (UINTN)Request->DestIp.v4.Addr[0],
     
    886886    return;
    887887  }
    888  
     888
    889889  for (Index = 0; Index < Request->MacLen; Index++) {
    890890    if (Request->DestMac.Addr[Index] != 0) {
     
    898898    -1,
    899899    NULL,
    900     STRING_TOKEN(STR_IFCONFIG_CONF_IP_ADDR), 
    901     gShellNetwork1HiiHandle, 
    902     (UINTN)Request->DestMac.Addr[0], 
    903     (UINTN)Request->DestMac.Addr[1], 
     900    STRING_TOKEN(STR_IFCONFIG_CONF_IP_ADDR),
     901    gShellNetwork1HiiHandle,
     902    (UINTN)Request->DestMac.Addr[0],
     903    (UINTN)Request->DestMac.Addr[1],
    904904    (UINTN)Request->DestMac.Addr[2],
    905     (UINTN)Request->DestMac.Addr[3], 
    906     (UINTN)Request->DestMac.Addr[4], 
     905    (UINTN)Request->DestMac.Addr[3],
     906    (UINTN)Request->DestMac.Addr[4],
    907907    (UINTN)Request->DestMac.Addr[5]
    908     );   
     908    );
    909909  }
    910910
     
    941941  Status = NetLibCreateServiceChild (
    942942             NicInfo->Handle,
    943              gImageHandle, 
     943             gImageHandle,
    944944             &gEfiArpServiceBindingProtocolGuid,
    945945             &ArpHandle
     
    970970  Request.LocalMac                    = NicInfo->NicAddress.MacAddr;
    971971  Request.MacLen                      = NicInfo->NicAddress.Len;
    972  
     972
    973973  Status = gBS->CreateEvent (
    974974                 EVT_NOTIFY_SIGNAL,
     
    978978                 &Request.OnResolved
    979979                 );
    980  
     980
    981981  if (EFI_ERROR (Status)) {
    982982    goto ON_EXIT;
    983983  }
    984  
     984
    985985  ArpCfgData.SwAddressType    = 0x0800;
    986986  ArpCfgData.SwAddressLength  = 4;
     
    989989  ArpCfgData.RetryCount       = 3;
    990990  ArpCfgData.RetryTimeOut     = 0;
    991  
     991
    992992  Status = Arp->Configure (Arp, &ArpCfgData);
    993  
     993
    994994  if (EFI_ERROR (Status)) {
    995995    goto ON_EXIT;
     
    10021002                  &Request.DestMac
    10031003                  );
    1004  
     1004
    10051005  if (EFI_ERROR (Status) && (Status != EFI_NOT_READY)) {
    10061006    goto ON_EXIT;
     
    10081008
    10091009  while (!ArpResolved) {
    1010    
     1010
    10111011  }
    10121012
     
    10171017
    10181018  NetLibDestroyServiceChild (
    1019     NicInfo->Handle, 
    1020     gImageHandle, 
    1021     &gEfiArpServiceBindingProtocolGuid, 
     1019    NicInfo->Handle,
     1020    gImageHandle,
     1021    &gEfiArpServiceBindingProtocolGuid,
    10221022    ArpHandle
    10231023    );
     
    11221122                    &TimerToGetMap
    11231123                    );
    1124    
     1124
    11251125    if (EFI_ERROR (Status)) {
    11261126      goto ON_EXIT;
    11271127    }
    1128    
     1128
    11291129    Status = gBS->SetTimer (
    11301130                   TimerToGetMap,
     
    11321132                   MultU64x32 (SecondsToNanoSeconds, 5)
    11331133                   );
    1134    
     1134
    11351135    if (EFI_ERROR (Status)) {
    11361136      goto ON_EXIT;
     
    11381138
    11391139    ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_IFCONFIG_WAIT_SET_DONE), gShellNetwork1HiiHandle);
    1140    
     1140
    11411141    while (!mTimeout) {
    11421142      Ip4->Poll (Ip4);
    1143  
    1144       if (!EFI_ERROR (Ip4->GetModeData (Ip4, &Ip4Mode, NULL, NULL)) && 
    1145           Ip4Mode.IsConfigured) {       
     1143
     1144      if (!EFI_ERROR (Ip4->GetModeData (Ip4, &Ip4Mode, NULL, NULL)) &&
     1145          Ip4Mode.IsConfigured) {
    11461146        break;
    11471147      }
    1148     }   
     1148    }
    11491149  }
    11501150
     
    11531153  if ((Status == EFI_SUCCESS) && Ip4Mode.IsConfigured) {
    11541154    ShellPrintHiiEx(
    1155       -1, 
    1156       -1, 
     1155      -1,
     1156      -1,
    11571157      NULL,
    1158       STRING_TOKEN (STR_IFCONFIG_SHOW_IP_ADDR), 
    1159       gShellNetwork1HiiHandle, 
     1158      STRING_TOKEN (STR_IFCONFIG_SHOW_IP_ADDR),
     1159      gShellNetwork1HiiHandle,
    11601160      L"Default",
    11611161      (UINTN)Ip4Mode.ConfigData.StationAddress.Addr[0],
     
    11651165      );
    11661166  }
    1167  
    1168 ON_EXIT: 
     1167
     1168ON_EXIT:
    11691169
    11701170  if (EFI_ERROR (Status)) {
     
    11831183    Ip4Handle
    11841184    );
    1185  
     1185
    11861186  return Status;
    11871187}
     
    12481248  DhcpTemp = DhcpString;
    12491249  StaticTemp = StaticString;
    1250  
     1250
    12511251  if (StringNoCaseCompare(&Temp, &DhcpTemp) == 0) {
    12521252    //
     
    12871287    //
    12881288    // validate the parameter, two forms: eth0 static IP NETMASK GATEWAY and
    1289     // eth0 static IP NETMASK GATEWAY permanent 
     1289    // eth0 static IP NETMASK GATEWAY permanent
    12901290    //
    12911291    if ((Argc != 5) && (Argc != 6)) {
     
    13591359    if (!IP4_NET_EQUAL (Ip.Addr[0], Gateway.Addr[0], Mask.Addr[0]) ||
    13601360        !NetIp4IsUnicast (NetworkBytes1, NetworkBytes2)) {
    1361        
     1361
    13621362      ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_IFCONFIG_INVALID_GATEWAY), gShellNetwork1HiiHandle);
    13631363      ASSERT(ShellStatus == SHELL_INVALID_PARAMETER);
     
    13671367    //
    13681368    // Set the configuration up, two route table entries are added:
    1369     // one for the direct connected network, and another for the 
     1369    // one for the direct connected network, and another for the
    13701370    // default gateway. Remember, some structure members are cleared
    13711371    // by AllocateZeroPool
     
    13991399    ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_IFCONFIG_SET_FAIL), gShellNetwork1HiiHandle, ShellStatus^MAX_BIT);
    14001400    goto ON_EXIT;
    1401   } 
     1401  }
    14021402
    14031403  Status = IfconfigStartIp4 (Info);
     
    14091409    ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_IFCONFIG_IP_CHILD_FAIL), gShellNetwork1HiiHandle, ShellStatus^MAX_BIT);
    14101410  }
    1411  
     1411
    14121412ON_EXIT:
    14131413  SHELL_FREE_NON_NULL(Config);
    1414  
     1414
    14151415  return ShellStatus;
    14161416}
     
    14191419  Show the address information for the nic specified.
    14201420
    1421   @param[in] Name   A pointer to the string containg the nic's name, if NULL, 
     1421  @param[in] Name   A pointer to the string containg the nic's name, if NULL,
    14221422                    all nics' information is shown.
    14231423**/
     
    14501450    -1,
    14511451    NULL,
    1452     STRING_TOKEN(STR_IFCONFIG_SHOW_MAC_ADDR), 
    1453     gShellNetwork1HiiHandle, 
    1454     (UINTN)NicInfo->NicAddress.MacAddr.Addr[0], 
    1455     (UINTN)NicInfo->NicAddress.MacAddr.Addr[1], 
     1452    STRING_TOKEN(STR_IFCONFIG_SHOW_MAC_ADDR),
     1453    gShellNetwork1HiiHandle,
     1454    (UINTN)NicInfo->NicAddress.MacAddr.Addr[0],
     1455    (UINTN)NicInfo->NicAddress.MacAddr.Addr[1],
    14561456    (UINTN)NicInfo->NicAddress.MacAddr.Addr[2],
    1457     (UINTN)NicInfo->NicAddress.MacAddr.Addr[3], 
    1458     (UINTN)NicInfo->NicAddress.MacAddr.Addr[4], 
     1457    (UINTN)NicInfo->NicAddress.MacAddr.Addr[3],
     1458    (UINTN)NicInfo->NicAddress.MacAddr.Addr[4],
    14591459    (UINTN)NicInfo->NicAddress.MacAddr.Addr[5]
    1460     );   
     1460    );
    14611461
    14621462    Print (L"  Media State: %s\n", NicInfo->MediaPresent ? L"Media present" : L"Media disconnected");
     
    14651465      ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_IFCONFIG_NIC_NOT_CONFIGURED), gShellNetwork1HiiHandle);
    14661466      continue;
    1467     } 
     1467    }
    14681468
    14691469    if (NicInfo->ConfigInfo->Source == IP4_CONFIG_SOURCE_DHCP) {
     
    14841484
    14851485    ShellPrintHiiEx(
    1486       -1, 
    1487       -1, 
     1486      -1,
     1487      -1,
    14881488      NULL,
    1489       STRING_TOKEN (STR_IFCONFIG_SHOW_IP_ADDR), 
    1490       gShellNetwork1HiiHandle, 
     1489      STRING_TOKEN (STR_IFCONFIG_SHOW_IP_ADDR),
     1490      gShellNetwork1HiiHandle,
    14911491      L"IP address",
    14921492      (UINTN)Ip4Config->StationAddress.Addr[0],
     
    14961496      );
    14971497    ShellPrintHiiEx(
    1498       -1, 
    1499       -1, 
     1498      -1,
     1499      -1,
    15001500      NULL,
    1501       STRING_TOKEN (STR_IFCONFIG_SHOW_IP_ADDR), 
    1502       gShellNetwork1HiiHandle, 
     1501      STRING_TOKEN (STR_IFCONFIG_SHOW_IP_ADDR),
     1502      gShellNetwork1HiiHandle,
    15031503      L"Mask",
    15041504      (UINTN)Ip4Config->SubnetMask.Addr[0],
     
    15091509
    15101510    ZeroMem (&Gateway, sizeof (EFI_IPv4_ADDRESS));
    1511    
     1511
    15121512    for (Index = 0; Index < Ip4Config->RouteTableSize; Index++) {
    15131513      if ((CompareMem (&Ip4Config->RouteTable[Index].SubnetAddress, &mZeroIp4Addr, sizeof (EFI_IPv4_ADDRESS)) == 0) &&
     
    15161516      }
    15171517    }
    1518    
     1518
    15191519    ShellPrintHiiEx(
    1520       -1, 
    1521       -1, 
     1520      -1,
     1521      -1,
    15221522      NULL,
    1523       STRING_TOKEN (STR_IFCONFIG_SHOW_IP_ADDR), 
    1524       gShellNetwork1HiiHandle, 
     1523      STRING_TOKEN (STR_IFCONFIG_SHOW_IP_ADDR),
     1524      gShellNetwork1HiiHandle,
    15251525      L"Gateway",
    15261526      (UINTN)Gateway.Addr[0],
     
    15361536
    15371537      ShellPrintHiiEx(
    1538         -1, 
    1539         -1, 
     1538        -1,
     1539        -1,
    15401540        NULL,
    1541         STRING_TOKEN (STR_IFCONFIG_SHOW_IP_ADDR), 
    1542         gShellNetwork1HiiHandle, 
     1541        STRING_TOKEN (STR_IFCONFIG_SHOW_IP_ADDR),
     1542        gShellNetwork1HiiHandle,
    15431543        L"Subnet",
    15441544        (UINTN)Ip4Config->RouteTable[Index].SubnetAddress.Addr[0],
     
    15491549
    15501550      ShellPrintHiiEx(
    1551         -1, 
    1552         -1, 
     1551        -1,
     1552        -1,
    15531553        NULL,
    1554         STRING_TOKEN (STR_IFCONFIG_SHOW_IP_ADDR), 
    1555         gShellNetwork1HiiHandle, 
     1554        STRING_TOKEN (STR_IFCONFIG_SHOW_IP_ADDR),
     1555        gShellNetwork1HiiHandle,
    15561556        L"Netmask",
    15571557        (UINTN)Ip4Config->RouteTable[Index].SubnetMask.Addr[0],
     
    15621562
    15631563      ShellPrintHiiEx(
    1564         -1, 
    1565         -1, 
     1564        -1,
     1565        -1,
    15661566        NULL,
    1567         STRING_TOKEN (STR_IFCONFIG_SHOW_IP_ADDR), 
    1568         gShellNetwork1HiiHandle, 
     1567        STRING_TOKEN (STR_IFCONFIG_SHOW_IP_ADDR),
     1568        gShellNetwork1HiiHandle,
    15691569        L"Gateway",
    15701570        (UINTN)Ip4Config->RouteTable[Index].GatewayAddress.Addr[0],
     
    15821582  Clear address configuration for the nic specified.
    15831583
    1584   @param[in] Name     A pointer to the string containg the nic's name, 
     1584  @param[in] Name     A pointer to the string containg the nic's name,
    15851585                      if NULL, all nics address configurations are cleared.
    15861586
     
    15981598  NIC_INFO                      *Info;
    15991599  EFI_STATUS                    Status;
    1600  
     1600
    16011601  NET_LIST_FOR_EACH_SAFE (Entry, NextEntry, &NicInfoList) {
    16021602    Info = BASE_CR (Entry, NIC_INFO, Link);
     
    16061606    }
    16071607
    1608 //    if (Info->NicIp4Config == NULL) { 
     1608//    if (Info->NicIp4Config == NULL) {
    16091609      Status = IfconfigSetNicAddrByHii (Info, NULL);
    16101610//    } else {
     
    16181618
    16191619  return EFI_SUCCESS;
    1620  
     1620
    16211621}
    16221622
     
    16871687    goto Done;
    16881688  }
    1689    
    1690    
     1689
     1690
    16911691  Status = IfconfigGetAllNicInfoByHii ();
    16921692  if (EFI_ERROR (Status)) {
     
    17071707      ShellStatus = SHELL_INVALID_PARAMETER;
    17081708      goto Done;
    1709     } 
    1710    
     1709    }
     1710
    17111711    //
    17121712    // Show the configuration.
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ping.c

    r58459 r58466  
    2323// Function templates to match the IPv4 and IPv6 commands that we use.
    2424//
    25 typedef 
     25typedef
    2626EFI_STATUS
    2727(EFIAPI *PING_IPX_POLL)(
    2828  IN VOID          *This
    29   ); 
    30 
    31 typedef 
     29  );
     30
     31typedef
    3232EFI_STATUS
    3333(EFIAPI *PING_IPX_TRANSMIT)(
     
    3636  );
    3737
    38 typedef 
     38typedef
    3939EFI_STATUS
    4040(EFIAPI *PING_IPX_RECEIVE)(
    4141  IN VOID          *This,
    4242  IN VOID          *Token
    43   ); 
     43  );
    4444
    4545typedef
     
    5151
    5252///
    53 /// A set of pointers to either IPv6 or IPv4 functions. 
     53/// A set of pointers to either IPv6 or IPv4 functions.
    5454/// Unknown which one to the ping command.
    5555///
     
    6969//
    7070// PING_IPX_COMPLETION_TOKEN
    71 // structures are used for both transmit and receive operations. 
     71// structures are used for both transmit and receive operations.
    7272// This version is IP-unaware.
    7373//
     
    142142  @param[in] Length  Length to be checksummed.
    143143
    144   @retval Checksum     Returns the 16 bit ones complement of 
     144  @retval Checksum     Returns the 16 bit ones complement of
    145145                       ones complement sum of 16 bit words
    146146**/
     
    243243    CurrentTick += 1000000;
    244244  }
    245  
     245
    246246  return CurrentTick;
    247247}
     
    467467      goto ON_EXIT;
    468468    }
    469     if (!IP6_IS_MULTICAST ((EFI_IPv6_ADDRESS*)&Private->DstAddress) && 
     469    if (!IP6_IS_MULTICAST ((EFI_IPv6_ADDRESS*)&Private->DstAddress) &&
    470470        !EFI_IP6_EQUAL (&((EFI_IP6_RECEIVE_DATA*)Private->RxToken.Packet.RxData)->Header->SourceAddress, (EFI_IPv6_ADDRESS*)&Private->DstAddress)) {
    471471      goto ON_EXIT;
     
    478478    Reply   = ((EFI_IP4_RECEIVE_DATA*)Private->RxToken.Packet.RxData)->FragmentTable[0].FragmentBuffer;
    479479    PayLoad = ((EFI_IP4_RECEIVE_DATA*)Private->RxToken.Packet.RxData)->DataLength;
    480     if (!IP4_IS_MULTICAST (EFI_IP4(*(EFI_IPv4_ADDRESS*)Private->DstAddress)) && 
     480    if (!IP4_IS_MULTICAST (EFI_IP4(*(EFI_IPv4_ADDRESS*)Private->DstAddress)) &&
    481481        !EFI_IP4_EQUAL (&((EFI_IP4_RECEIVE_DATA*)Private->RxToken.Packet.RxData)->Header->SourceAddress, (EFI_IPv4_ADDRESS*)&Private->DstAddress)) {
    482482      goto ON_EXIT;
     
    487487    }
    488488  }
    489  
     489
    490490
    491491  if (PayLoad != Private->BufferSize) {
     
    979979                           );
    980980      }
    981      
     981
    982982      //
    983983      // Skip the ones not in current use.
     
    11651165    Private->ProtocolPointers.Receive   = (PING_IPX_RECEIVE  )((EFI_IP4_PROTOCOL*)Private->IpProtocol)->Receive;
    11661166    Private->ProtocolPointers.Cancel    = (PING_IPX_CANCEL   )((EFI_IP4_PROTOCOL*)Private->IpProtocol)->Cancel;
    1167     Private->ProtocolPointers.Poll      = (PING_IPX_POLL     )((EFI_IP4_PROTOCOL*)Private->IpProtocol)->Poll; 
     1167    Private->ProtocolPointers.Poll      = (PING_IPX_POLL     )((EFI_IP4_PROTOCOL*)Private->IpProtocol)->Poll;
    11681168  }
    11691169
     
    14491449
    14501450  //
    1451   // we use IPv6 buffers to hold items... 
     1451  // we use IPv6 buffers to hold items...
    14521452  // make sure this is enough space!
    14531453  //
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf

    r58459 r58466  
    6363  gEfiIp6ServiceBindingProtocolGuid             ## SOMETIMES_CONSUMES
    6464  gEfiIp6ConfigProtocolGuid                     ## SOMETIMES_CONSUMES
    65  
     65
    6666[Guids]
    6767  gShellNetwork1HiiGuid                         ## SOMETIMES_CONSUMES ## HII
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.uni

    • Property svn:mime-type changed from application/octet-stream to text/plain;encoding=UTF-16LE
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Readme.txt

    r48674 r58466  
    88                    HOW TO INCORPORATE THIS SHELL INTO NT32
    99============================================================================
    10 The instructions below are included as a sample and template on how a 
     10The instructions below are included as a sample and template on how a
    1111developer may integrate this code into an existing platform:
    1212
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/ShellPkg.dec

    • Property svn:eol-style set to native
  • trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/ShellPkg.dsc

    r58459 r58466  
    2929  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLibOptionalDevicePathProtocol.inf
    3030  DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf
    31   DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf 
     31  DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
    3232  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
    3333  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
     
    4747  SortLib|ShellPkg/Library/UefiSortLib/UefiSortLib.inf
    4848  HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
    49  
     49
    5050  PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
    5151  PathLib|ShellPkg/Library/BasePathLib/BasePathLib.inf
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