VirtualBox

Ignore:
Timestamp:
Aug 12, 2020 4:09:12 PM (5 years ago)
Author:
vboxsync
Message:

Devices/EFI: Merge edk-stable202005 and make it build, bugref:4643

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

Legend:

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

  • trunk/src/VBox/Devices/EFI/FirmwareNew/MdePkg/Include/Pi/PiDxeCis.h

    r80721 r85718  
    66
    77  @par Revision Reference:
    8   PI Version 1.6
     8  PI Version 1.7
    99
    1010**/
     
    691691#define DXE_SERVICES_SIGNATURE            0x565245535f455844ULL
    692692#define DXE_SPECIFICATION_MAJOR_REVISION  1
    693 #define DXE_SPECIFICATION_MINOR_REVISION  60
     693#define DXE_SPECIFICATION_MINOR_REVISION  70
    694694#define DXE_SERVICES_REVISION             ((DXE_SPECIFICATION_MAJOR_REVISION<<16) | (DXE_SPECIFICATION_MINOR_REVISION))
    695695
  • trunk/src/VBox/Devices/EFI/FirmwareNew/MdePkg/Include/Pi/PiPeiCis.h

    r80721 r85718  
    66
    77  @par Revision Reference:
    8   PI Version 1.6.
     8  PI Version 1.7.
    99
    1010**/
     
    851851//
    852852#define PEI_SPECIFICATION_MAJOR_REVISION  1
    853 #define PEI_SPECIFICATION_MINOR_REVISION  60
     853#define PEI_SPECIFICATION_MINOR_REVISION  70
    854854///
    855855/// Specification inconsistency here:
  • trunk/src/VBox/Devices/EFI/FirmwareNew/MdePkg/Include/Pi/PiStatusCode.h

    r80721 r85718  
    341341#define EFI_CHIPSET_EC_DXE_NB_ERROR     (EFI_SUBCLASS_SPECIFIC | 0x00000001)
    342342#define EFI_CHIPSET_EC_DXE_SB_ERROR     (EFI_SUBCLASS_SPECIFIC | 0x00000002)
     343#define EFI_CHIPSET_EC_INTRUDER_DETECT  (EFI_SUBCLASS_SPECIFIC | 0x00000003)
    343344///@}
    344345
     
    362363#define EFI_PERIPHERAL_LCD_DEVICE       (EFI_PERIPHERAL | 0x000B0000)
    363364#define EFI_PERIPHERAL_NETWORK          (EFI_PERIPHERAL | 0x000C0000)
     365#define EFI_PERIPHERAL_DOCKING          (EFI_PERIPHERAL | 0x000D0000)
    364366///@}
    365367
     
    376378#define EFI_P_PC_RECONFIG         0x00000005
    377379#define EFI_P_PC_DETECTED         0x00000006
     380#define EFI_P_PC_REMOVED          0x00000007
    378381///@}
    379382
     
    465468///
    466469///@{
    467 #define EFI_P_KEYBOARD_EC_LOCKED    (EFI_SUBCLASS_SPECIFIC | 0x00000000)
    468 #define EFI_P_KEYBOARD_EC_STUCK_KEY (EFI_SUBCLASS_SPECIFIC | 0x00000001)
     470#define EFI_P_KEYBOARD_EC_LOCKED      (EFI_SUBCLASS_SPECIFIC | 0x00000000)
     471#define EFI_P_KEYBOARD_EC_STUCK_KEY   (EFI_SUBCLASS_SPECIFIC | 0x00000001)
     472#define EFI_P_KEYBOARD_EC_BUFFER_FULL (EFI_SUBCLASS_SPECIFIC | 0x00000002)
    469473///@}
    470474
     
    763767#define EFI_SW_PEI_PC_S3_BOOT_SCRIPT  (EFI_SUBCLASS_SPECIFIC | 0x00000005)
    764768#define EFI_SW_PEI_PC_OS_WAKE         (EFI_SUBCLASS_SPECIFIC | 0x00000006)
     769#define EFI_SW_PEI_PC_S3_STARTED      (EFI_SUBCLASS_SPECIFIC | 0x00000007)
    765770///@}
    766771
     
    785790#define EFI_SW_DXE_BS_PC_EXIT_BOOT_SERVICES_EVENT     (EFI_SUBCLASS_SPECIFIC | 0x00000003)
    786791#define EFI_SW_DXE_BS_PC_VIRTUAL_ADDRESS_CHANGE_EVENT (EFI_SUBCLASS_SPECIFIC | 0x00000004)
     792#define EFI_SW_DXE_BS_PC_VARIABLE_SERVICES_INIT       (EFI_SUBCLASS_SPECIFIC | 0x00000005)
     793#define EFI_SW_DXE_BS_PC_VARIABLE_RECLAIM             (EFI_SUBCLASS_SPECIFIC | 0x00000006)
    787794#define EFI_SW_DXE_BS_PC_ATTEMPT_BOOT_ORDER_EVENT     (EFI_SUBCLASS_SPECIFIC | 0x00000007)
     795#define EFI_SW_DXE_BS_PC_CONFIG_RESET                 (EFI_SUBCLASS_SPECIFIC | 0x00000008)
     796#define EFI_SW_DXE_BS_PC_CSM_INIT                     (EFI_SUBCLASS_SPECIFIC | 0x00000009)
    788797///@}
    789798
     
    975984#define EFI_SW_EC_PWD_CLEARED             0x00000010
    976985#define EFI_SW_EC_EVENT_LOG_FULL          0x00000011
     986#define EFI_SW_EC_WRITE_PROTECTED         0x00000012
     987#define EFI_SW_EC_FV_CORRUPTED            0x00000013
    977988///@}
    978989
     
    10061017#define EFI_SW_PEI_EC_RECOVERY_PPI_NOT_FOUND       (EFI_SUBCLASS_SPECIFIC | 0x00000006)
    10071018#define EFI_SW_PEI_EC_RECOVERY_FAILED              (EFI_SUBCLASS_SPECIFIC | 0x00000007)
     1019#define EFI_SW_PEI_EC_S3_RESUME_ERROR              (EFI_SUBCLASS_SPECIFIC | 0x00000008)
     1020#define EFI_SW_PEI_EC_INVALID_CAPSULE              (EFI_SUBCLASS_SPECIFIC | 0x00000009)
    10081021///@}
    10091022
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