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:
2 edited

Legend:

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

  • trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/DisplayEngineDxe/InputHandler.c

    r58464 r58466  
    3535    StringOp = (EFI_IFR_STRING *) OpCode;
    3636    *Minimum = StringOp->MinSize;
    37     *Maximum = StringOp->MaxSize;   
     37    *Maximum = StringOp->MaxSize;
    3838  } else if (OpCode->OpCode == EFI_IFR_PASSWORD_OP) {
    3939    PasswordOp = (EFI_IFR_PASSWORD *) OpCode;
    4040    *Minimum = PasswordOp->MinSize;
    41     *Maximum = PasswordOp->MaxSize;       
     41    *Maximum = PasswordOp->MaxSize;
    4242  } else {
    4343    *Minimum = 0;
    44     *Maximum = 0;       
     44    *Maximum = 0;
    4545  }
    4646}
     
    159159      PrintStringAt (Start + 1, Top + 3, BufferedString);
    160160    }
    161    
     161
    162162    gST->ConOut->SetAttribute (gST->ConOut, EFI_TEXT_ATTR (EFI_LIGHTGRAY, EFI_BLACK));
    163163    gST->ConOut->SetCursorPosition (gST->ConOut, Start + GetStringWidth (StringPtr) / 2, Top + 3);
    164164  }
    165  
     165
    166166  do {
    167167    Status = WaitForKeyStroke (&Key);
     
    354354    }
    355355  }
    356  
     356
    357357  //
    358358  // Change the Year area.
     
    387387
    388388  NumericOp = (EFI_IFR_NUMERIC *) OpCode;
    389  
     389
    390390  switch (NumericOp->Flags & EFI_IFR_NUMERIC_SIZE) {
    391391  case EFI_IFR_NUMERIC_SIZE_1:
     
    395395    *StorageWidth = (UINT16) sizeof (UINT8);
    396396    break;
    397  
     397
    398398  case EFI_IFR_NUMERIC_SIZE_2:
    399399    *Minimum = NumericOp->data.u16.MinValue;
     
    402402    *StorageWidth = (UINT16) sizeof (UINT16);
    403403    break;
    404  
     404
    405405  case EFI_IFR_NUMERIC_SIZE_4:
    406406    *Minimum = NumericOp->data.u32.MinValue;
     
    409409    *StorageWidth = (UINT16) sizeof (UINT32);
    410410    break;
    411  
     411
    412412  case EFI_IFR_NUMERIC_SIZE_8:
    413413    *Minimum = NumericOp->data.u64.MinValue;
     
    416416    *StorageWidth = (UINT16) sizeof (UINT64);
    417417    break;
    418  
     418
    419419  default:
    420420    break;
     
    509509      switch (QuestionValue->Value.date.Month) {
    510510      case 2:
    511         if ((QuestionValue->Value.date.Year % 4) == 0  && 
    512             ((QuestionValue->Value.date.Year % 100) != 0 || 
     511        if ((QuestionValue->Value.date.Year % 4) == 0  &&
     512            ((QuestionValue->Value.date.Year % 100) != 0 ||
    513513            (QuestionValue->Value.date.Year % 400) == 0)) {
    514514          Maximum = 29;
     
    526526        Maximum = 31;
    527527        break;
    528       } 
     528      }
    529529
    530530      EraseLen = 3;
     
    816816        UpdateStatusBar (INPUT_ERROR, FALSE);
    817817      }
    818      
     818
    819819      CopyMem (&gUserInput->InputValue, &Question->CurrentValue, sizeof (EFI_HII_VALUE));
    820820      QuestionValue = &gUserInput->InputValue;
     
    868868      //              2013.03.29 -> 2013.02.29 -> 2013.02.28
    869869      //
    870       if (Question->OpCode->OpCode  == EFI_IFR_DATE_OP && 
     870      if (Question->OpCode->OpCode  == EFI_IFR_DATE_OP &&
    871871        (MenuOption->Sequence == 0 || MenuOption->Sequence == 2)) {
    872872        AdjustQuestionValue (QuestionValue, (UINT8)MenuOption->Sequence);
     
    992992    }
    993993  }
    994  
     994
    995995  *PopUpMenuLines = Index;
    996  
     996
    997997  //
    998998  // Prepare HiiValue array
    999   // 
     999  //
    10001000  HiiValueArray = AllocateZeroPool (*PopUpMenuLines * sizeof (EFI_HII_VALUE));
    10011001  ASSERT (HiiValueArray != NULL);
     
    10051005    HiiValueArray[Index].Value.u64 = GetArrayData (ValueArray, ValueType, Index);
    10061006  }
    1007  
     1007
    10081008  for (Index = 0; Index < *PopUpMenuLines; Index++) {
    10091009    OneOfOption = ValueToOption (Question, &HiiValueArray[*PopUpMenuLines - Index - 1]);
     
    10111011      return EFI_NOT_FOUND;
    10121012    }
    1013  
     1013
    10141014    RemoveEntryList (&OneOfOption->Link);
    1015  
     1015
    10161016    //
    10171017    // Insert to head.
     
    10191019    InsertHeadList (&Question->OptionListHead, &OneOfOption->Link);
    10201020  }
    1021  
     1021
    10221022  FreePool (HiiValueArray);
    10231023
     
    10471047  case EFI_IFR_TYPE_NUM_SIZE_8:
    10481048    return (BOOLEAN) (Value1->u8 == Value2->u8);
    1049  
     1049
    10501050  case EFI_IFR_TYPE_NUM_SIZE_16:
    10511051    return (BOOLEAN) (Value1->u16 == Value2->u16);
    1052  
     1052
    10531053  case EFI_IFR_TYPE_NUM_SIZE_32:
    10541054    return (BOOLEAN) (Value1->u32 == Value2->u32);
    1055  
     1055
    10561056  case EFI_IFR_TYPE_NUM_SIZE_64:
    10571057    return (BOOLEAN) (Value1->u64 == Value2->u64);
     
    15221522
    15231523      return EFI_SUCCESS;
    1524      
     1524
    15251525    default:
    15261526      break;
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