VirtualBox

Ignore:
Timestamp:
Oct 28, 2015 8:17:18 PM (9 years ago)
Author:
vboxsync
Message:

EFI/Firmware: 'svn merge /vendor/edk2/UDK2010.SR1 /vendor/edk2/current .', reverting and removing files+dirs listed in ReadMe.vbox, resolving conflicts with help from ../UDK2014.SP1/. This is a raw untested merge.

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/DriverSampleDxe/Vfr.vfr

    r48674 r58459  
    33//    Sample Setup formset.
    44//
    5 //  Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>
     5//  Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
    66//  This program and the accompanying materials
    77//  are licensed and made available under the terms and conditions of the BSD License
    … …  
    126126      help   = STRING_TOKEN(STR_EXIT_TEXT),
    127127      text   = STRING_TOKEN(STR_EXIT_TEXT),
    128         text   = STRING_TOKEN(STR_EXIT_TEXT),
    129128      flags  = INTERACTIVE,   // VfrCompiler will generate opcode EFI_IFR_ACTION for Text marked as INTERACTIVE
    130129      key    = 0x1237;
    … …  
    133132      help   = STRING_TOKEN(STR_SAVE_TEXT),
    134133      text   = STRING_TOKEN(STR_SAVE_TEXT),
    135         text   = STRING_TOKEN(STR_SAVE_TEXT),
    136134      flags  = INTERACTIVE,
    137135      key    = 0x1238;
    … …  
    140138      help   = STRING_TOKEN(STR_SAVE_CURRENT),
    141139      text   = STRING_TOKEN(STR_SAVE_CURRENT),
    142         text   = STRING_TOKEN(STR_SAVE_CURRENT),
    143140      flags  = INTERACTIVE,
    144141      key    = 0x1243;
    … …  
    147144      help   = STRING_TOKEN(STR_DISCARD_CURRENT_AND_EXIT),
    148145      text   = STRING_TOKEN(STR_DISCARD_CURRENT_AND_EXIT),
    149         text   = STRING_TOKEN(STR_DISCARD_CURRENT_AND_EXIT),
    150146      flags  = INTERACTIVE,
    151147      key    = 0x1244;
    … …  
    187183                 //
    188184                 flags    = CHECKBOX_DEFAULT | CHECKBOX_DEFAULT_MFG,
    189                  key      = 0,
    190                  default  = 1,
     185                 default  = TRUE,
    191186        endcheckbox;
    192187      endif;
    193         endif;
     188    endif;
    194189
    195190    //
    … …  
    212207                prompt      = STRING_TOKEN(STR_BOOT_OPTIONS),
    213208                help        = STRING_TOKEN(STR_NULL_STRING),
    214                 option text = STRING_TOKEN(STR_BOOT_OPTION2), value = 2, flags = RESET_REQUIRED;
    215                 option text = STRING_TOKEN(STR_BOOT_OPTION1), value = 1, flags = RESET_REQUIRED;
    216                 option text = STRING_TOKEN(STR_BOOT_OPTION3), value = 3, flags = RESET_REQUIRED;
     209                flags       = RESET_REQUIRED,
     210                option text = STRING_TOKEN(STR_BOOT_OPTION2), value = 2, flags = 0;
     211                option text = STRING_TOKEN(STR_BOOT_OPTION1), value = 1, flags = 0;
     212                option text = STRING_TOKEN(STR_BOOT_OPTION3), value = 3, flags = 0;
    217213              suppressif ideqval MyIfrNVData.BootOrderLarge == 0;
    218                 option text = STRING_TOKEN(STR_BOOT_OPTION4), value = 4, flags = RESET_REQUIRED;
     214                option text = STRING_TOKEN(STR_BOOT_OPTION4), value = 4, flags = 0;
    219215              endif
    220216      endlist;
    … …  
    232228        prompt      = STRING_TOKEN(STR_TEST_OPCODE),
    233229        help        = STRING_TOKEN(STR_TEXT_HELP),
    234         option text = STRING_TOKEN(STR_ONE_OF_TEXT1), value = 3, flags = RESET_REQUIRED;
    235         option text = STRING_TOKEN(STR_ONE_OF_TEXT2), value = 2, flags = RESET_REQUIRED;
    236         option text = STRING_TOKEN(STR_ONE_OF_TEXT3), value = 1, flags = RESET_REQUIRED;
     230        flags       = RESET_REQUIRED,
     231        option text = STRING_TOKEN(STR_ONE_OF_TEXT1), value = 3, flags = 0;
     232        option text = STRING_TOKEN(STR_ONE_OF_TEXT2), value = 2, flags = 0;
     233        option text = STRING_TOKEN(STR_ONE_OF_TEXT3), value = 1, flags = 0;
    237234      endlist;
    238235    endif;
    … …  
    258255      prompt      = STRING_TOKEN(STR_TEST_OPCODE),
    259256      help        = STRING_TOKEN(STR_ONE_OF_HELP),
    260       option text = STRING_TOKEN(STR_ONE_OF_TEXT1), value = 0, flags = RESET_REQUIRED;
    261       option text = STRING_TOKEN(STR_ONE_OF_TEXT2), value = 1, flags = DEFAULT | RESET_REQUIRED;
     257      flags       = RESET_REQUIRED,
     258      option text = STRING_TOKEN(STR_ONE_OF_TEXT1), value = 0, flags = 0;
     259      option text = STRING_TOKEN(STR_ONE_OF_TEXT2), value = 1, flags = DEFAULT;
     260      warningif prompt = STRING_TOKEN(STR_WARNING_POPUP), timeout = 5,
     261        ideqval MyIfrNVData.TestLateCheck == 0
     262      endif
    262263
    263264    endoneof;
    … …  
    266267      prompt      = STRING_TOKEN(STR_TEST_OPCODE2),
    267268      help        = STRING_TOKEN(STR_ONE_OF_HELP),
    268       option text = STRING_TOKEN(STR_ONE_OF_TEXT1), value = 0, flags = DEFAULT | RESET_REQUIRED;
    269       option text = STRING_TOKEN(STR_ONE_OF_TEXT2), value = 1, flags = RESET_REQUIRED;
     269      flags       = RESET_REQUIRED,
     270      option text = STRING_TOKEN(STR_ONE_OF_TEXT1), value = 0, flags = DEFAULT;
     271      option text = STRING_TOKEN(STR_ONE_OF_TEXT2), value = 1, flags = 0;
    270272
    271273      inconsistentif prompt = STRING_TOKEN(STR_ERROR_POPUP),
    … …  
    278280      prompt      = STRING_TOKEN(STR_ONE_OF_PROMPT),
    279281      help        = STRING_TOKEN(STR_ONE_OF_HELP),
    280       option text = STRING_TOKEN(STR_ONE_OF_TEXT1), value = 0, flags = RESET_REQUIRED;
    281       option text = STRING_TOKEN(STR_ONE_OF_TEXT2), value = 1, flags = DEFAULT | RESET_REQUIRED;
    282       option text = STRING_TOKEN(STR_ONE_OF_TEXT3), value = 0x03, flags = RESET_REQUIRED;
    283 
     282      flags       = RESET_REQUIRED,
     283      option text = STRING_TOKEN(STR_ONE_OF_TEXT1), value = 0, flags = 0;
     284      option text = STRING_TOKEN(STR_ONE_OF_TEXT2), value = 1, flags = DEFAULT;
     285      option text = STRING_TOKEN(STR_ONE_OF_TEXT3), value = 3, flags = 0;
    284286    endoneof;
    285287
    … …  
    360362            step    = 0,
    361363            locked,
     364            default = 16, defaultstore = MyStandardDefault,     // This is standard default value
     365            default = 17, defaultstore = MyManufactureDefault,  // This is manufacture default value
    362366    endnumeric;
    363367
    … …  
    369373            maximum = 0xffff,
    370374            step    = 0,
     375            default = 18, defaultstore = MyStandardDefault,     // This is standard default value
     376            default = 19, defaultstore = MyManufactureDefault,  // This is manufacture default value
    371377    endnumeric;
    372378
    … …  
    518524      title = STRING_TOKEN(STR_FORM2_TITLE);  // note formid is a variable (for readability) (UINT16) - also added Form to the line to signify the Op-Code
    519525
    520 
    521       date    year varid  = Date.Year,    // Note that it is a member of NULL, so the RTC will be the system resource to retrieve and save from
    522               prompt      = STRING_TOKEN(STR_DATE_PROMPT),
    523               help        = STRING_TOKEN(STR_DATE_HELP),
    524               minimum     = 1998,
    525               maximum     = 2099,
    526               step        = 1,
    527               default     = 2004,
    528 
    529               month varid = Date.Month,    // Note that it is a member of NULL, so the RTC will be the system resource to retrieve and save from
    530               prompt      = STRING_TOKEN(STR_DATE_PROMPT),
    531               help        = STRING_TOKEN(STR_DATE_HELP),
    532               minimum     = 1,
    533               maximum     = 12,
    534               step        = 1,
    535               default     = 1,
    536 
    537               day varid   = Date.Day,          // Note that it is a member of NULL, so the RTC will be the system resource to retrieve and save from
    538               prompt      = STRING_TOKEN(STR_DATE_PROMPT),
    539               help        = STRING_TOKEN(STR_DATE_HELP),
    540               minimum     = 1,
    541               maximum     = 31,
    542               step        = 0x1,
    543               default     = 1,
     526      date
     527        name    = Date,
     528        prompt  = STRING_TOKEN(STR_DATE_PROMPT),
     529        help    = STRING_TOKEN(STR_DATE_HELP),
     530        flags   = STORAGE_TIME,
     531        default = 2004/1/1,
    544532
    545533        inconsistentif prompt = STRING_TOKEN(STR_ERROR_POPUP),
    … …  
    575563        help   = STRING_TOKEN(STR_SAVE_CURRENT_AND_EXIT),
    576564        text   = STRING_TOKEN(STR_SAVE_CURRENT_AND_EXIT),
    577           text   = STRING_TOKEN(STR_SAVE_CURRENT_AND_EXIT),
    578565        flags  = INTERACTIVE,
    579566        key    = 0x1241;
    … …  
    582569        help   = STRING_TOKEN(STR_DISCARD_CURRENT),
    583570        text   = STRING_TOKEN(STR_DISCARD_CURRENT),
    584           text   = STRING_TOKEN(STR_DISCARD_CURRENT),
    585571        flags  = INTERACTIVE,
    586572        key    = 0x1242;
    587573
    588       time    hour varid  = Time.Hour,         // Note that it is a member of NULL, so the RTC will be the system resource to retrieve and save from
    589               prompt      = STRING_TOKEN(STR_TIME_PROMPT),
    590               help        = STRING_TOKEN(STR_TIME_HELP),
    591               minimum     = 0,
    592               maximum     = 23,
    593               step        = 1,
    594               default     = 0,
    595 
    596               minute varid  = Time.Minute,       // Note that it is a member of NULL, so the RTC will be the system resource to retrieve and save from
    597               prompt        = STRING_TOKEN(STR_TIME_PROMPT),
    598               help          = STRING_TOKEN(STR_TIME_HELP),
    599               minimum       = 0,
    600               maximum       = 59,
    601               step          = 1,
    602               default       = 0,
    603 
    604               second varid  = Time.Second,       // Note that it is a member of NULL, so the RTC will be the system resource to retrieve and save from
    605               prompt        = STRING_TOKEN(STR_TIME_PROMPT),
    606               help          = STRING_TOKEN(STR_TIME_HELP),
    607               minimum       = 0,
    608               maximum       = 59,
    609               step          = 1,
    610               default       = 0,
    611 
     574      time
     575        prompt  = STRING_TOKEN(STR_TIME_PROMPT),
     576        help    = STRING_TOKEN(STR_TIME_HELP),
     577        flags   = STORAGE_TIME,
    612578      endtime;
    613579     
    … …  
    625591              help     = STRING_TOKEN(STR_CHECK_BOX_HELP),
    626592              flags    = CHECKBOX_DEFAULT,
    627               key      = 0,
    628593      endcheckbox;
    629594
    … …  
    759724      help   = STRING_TOKEN(STR_EXIT_TEXT),
    760725      text   = STRING_TOKEN(STR_EXIT_TEXT),
    761         text   = STRING_TOKEN(STR_EXIT_TEXT),
    762726      flags  = INTERACTIVE,   // VfrCompiler will generate opcode EFI_IFR_ACTION for Text marked as INTERACTIVE
    763727      key    = 0x1245;
    … …  
    766730      help   = STRING_TOKEN(STR_SAVE_TEXT),
    767731      text   = STRING_TOKEN(STR_SAVE_TEXT),
    768         text   = STRING_TOKEN(STR_SAVE_TEXT),
    769732      flags  = INTERACTIVE,   // VfrCompiler will generate opcode EFI_IFR_ACTION for Text marked as INTERACTIVE
    770733      key    = 0x1246;
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