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/MdePkg/Include/Pi/PiSmmCis.h

    r48674 r58459  
    33  VOLUME 4 System Management Mode Core Interface version.
    44
    5   Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
     5  Copyright (c) 2009 - 2013, 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
     
    3030///
    3131#define SMM_SPECIFICATION_MAJOR_REVISION  1
    32 #define SMM_SPECIFICATION_MINOR_REVISION  20
     32#define SMM_SPECIFICATION_MINOR_REVISION  30
    3333#define EFI_SMM_SYSTEM_TABLE2_REVISION    ((SMM_SPECIFICATION_MAJOR_REVISION<<16) | (SMM_SPECIFICATION_MINOR_REVISION))
    3434
     
    107107  called whenever a protocol interface is installed for Protocol by
    108108  SmmInstallProtocolInterface().
     109  If Function == NULL and Registration is an existing registration, then the callback is unhooked.
    109110
    110111  @param[in]  Protocol          The unique ID of the protocol for which the event is to be registered.
     
    115116  @retval EFI_INVALID_PARAMETER One or more of Protocol, Function and Registration is NULL.
    116117  @retval EFI_OUT_OF_RESOURCES  Not enough memory resource to finish the request.
     118  @retval EFI_NOT_FOUND         If the registration is not found when Function == NULL.
    117119**/
    118120typedef
     
    132134  @param[in,out] CommBufferSize  Points to the size of the optional communication buffer.
    133135
    134   @retval EFI_SUCCESS                        Interrupt source was processed successfully but not quiesced.
     136  @retval EFI_WARN_INTERRUPT_SOURCE_PENDING  Interrupt source was processed successfully but not quiesced.
    135137  @retval EFI_INTERRUPT_PENDING              One or more SMI sources could not be quiesced.
    136   @retval EFI_WARN_INTERRUPT_SOURCE_PENDING  Interrupt source was not handled or quiesced.
    137   @retval EFI_WARN_INTERRUPT_SOURCE_QUIESCED Interrupt source was handled and quiesced.
     138  @retval EFI_NOT_FOUND                      Interrupt source was not handled or quiesced.
     139  @retval EFI_SUCCESS                        Interrupt source was handled and quiesced.
    138140**/
    139141typedef
     
    217219  UINTN                    CurrentlyExecutingCpu;
    218220  ///
    219   /// The number of current operational processors in the platform.  This is a 1 based
     221  /// The number of possible processors in the platform.  This is a 1 based
    220222  /// counter.  This does not indicate the number of processors that entered SMM.
    221223  ///
     
    298300  UINTN                                CurrentlyExecutingCpu;
    299301  ///
    300   /// The number of current operational processors in the platform.  This is a 1 based counter.
     302  /// The number of possible processors in the platform.  This is a 1 based counter.
    301303  ///
    302304  UINTN                                NumberOfCpus;
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