VirtualBox

Ignore:
Timestamp:
Oct 28, 2015 8:17:18 PM (9 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
103761
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:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/EFI/Firmware

  • trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/StatusCodeHandler/Pei/SerialStatusCodeWorker.c

    r48674 r58459  
    22  Serial I/O status code reporting worker.
    33
    4   Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
     4  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
    55  This program and the accompanying materials
    66  are licensed and made available under the terms and conditions of the BSD License
    … …  
    5151  CHAR8           *Description;
    5252  CHAR8           *Format;
    53   CHAR8           Buffer[EFI_STATUS_CODE_DATA_MAX_SIZE];
     53  CHAR8           Buffer[MAX_DEBUG_MESSAGE_LENGTH];
    5454  UINT32          ErrorLevel;
    5555  UINT32          LineNumber;
    … …  
    9090                  Buffer,
    9191                  sizeof (Buffer),
    92                   "ERROR: C%x:V%x I%x",
     92                  "ERROR: C%08x:V%08x I%x",
    9393                  CodeType,
    9494                  Value,
    … …  
    128128                  Buffer,
    129129                  sizeof (Buffer),
    130                   "PROGRESS CODE: V%x I%x\n\r",
     130                  "PROGRESS CODE: V%08x I%x\n\r",
    131131                  Value,
    132132                  Instance
    … …  
    151151                  Buffer,
    152152                  sizeof (Buffer),
    153                   "Undefined: C%x:V%x I%x\n\r",
     153                  "Undefined: C%08x:V%08x I%x\n\r",
    154154                  CodeType,
    155155                  Value,

  • trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.h

    r48674 r58459  
    22  Internal include file for Status Code Handler PEIM.
    33
    4   Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
     4  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
    55  This program and the accompanying materials
    66  are licensed and made available under the terms and conditions of the BSD License
    … …  
    3232#include <Library/PeimEntryPoint.h>
    3333#include <Library/BaseMemoryLib.h>
     34
     35//
     36// Define the maximum message length
     37//
     38#define MAX_DEBUG_MESSAGE_LENGTH 0x100
    3439
    3540/**

  • trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf

    r48674 r58459  
    11## @file
    2 #  Report Status Code Handler PEIM which produces general handlers and hook them
    3 #  onto the PEI status code router.
     2#  Report Status Code Handler PEIM which produces general handlers and hook them onto the PEI status code router.
    43#
    5 #  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
     4#  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
    65#
    76#  This program and the accompanying materials
    … …  
    1817  INF_VERSION                    = 0x00010005
    1918  BASE_NAME                      = StatusCodeHandlerPei
     19  MODULE_UNI_FILE                = StatusCodeHandlerPei.uni
    2020  FILE_GUID                      = 9D225237-FA01-464C-A949-BAABC02D31D0
    2121  MODULE_TYPE                    = PEIM
    … …  
    5151 
    5252[Guids]
    53   gMemoryStatusCodeRecordGuid                   ## SOMETIMES_CONSUMES ## HOB
    54   gEfiStatusCodeDataTypeStringGuid              ## CONSUMES
     53  ## SOMETIMES_PRODUCES   ## HOB
     54  ## SOMETIMES_CONSUMES   ## HOB
     55  gMemoryStatusCodeRecordGuid
     56  gEfiStatusCodeDataTypeStringGuid              ## SOMETIMES_CONSUMES   ## UNDEFINED
    5557 
    5658[Ppis]
    … …  
    5860
    5961[FeaturePcd]
    60   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory
    61   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial
     62  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory ## CONSUMES
     63  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial ## CONSUMES
    6264
    6365[Pcd]
    64   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1|gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory
     66  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1|gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory    ## SOMETIMES_CONSUMES
    6567
    6668[Depex]
    6769  gEfiPeiRscHandlerPpiGuid
     70
     71[UserExtensions.TianoCore."ExtraFiles"]
     72  StatusCodeHandlerPeiExtra.uni

  • trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/SerialStatusCodeWorker.c

    r48674 r58459  
    22  Serial I/O status code reporting worker.
    33
    4   Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
     4  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
    55  This program and the accompanying materials                         
    66  are licensed and made available under the terms and conditions of the BSD License         
    … …  
    4747  CHAR8           *Description;
    4848  CHAR8           *Format;
    49   CHAR8           Buffer[EFI_STATUS_CODE_DATA_MAX_SIZE];
     49  CHAR8           Buffer[MAX_DEBUG_MESSAGE_LENGTH];
    5050  UINT32          ErrorLevel;
    5151  UINT32          LineNumber;
    … …  
    8686                  Buffer,
    8787                  sizeof (Buffer),
    88                   "ERROR: C%x:V%x I%x",
     88                  "ERROR: C%08x:V%08x I%x",
    8989                  CodeType,
    9090                  Value,
    … …  
    123123                  Buffer,
    124124                  sizeof (Buffer),
    125                   "PROGRESS CODE: V%x I%x\n\r",
     125                  "PROGRESS CODE: V%08x I%x\n\r",
    126126                  Value,
    127127                  Instance
    … …  
    146146                  Buffer,
    147147                  sizeof (Buffer),
    148                   "Undefined: C%x:V%x I%x\n\r",
     148                  "Undefined: C%08x:V%08x I%x\n\r",
    149149                  CodeType,
    150150                  Value,

  • trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.h

    r48674 r58459  
    22  Internal include file for Status Code Handler Driver.
    33
    4   Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
     4  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
    55  This program and the accompanying materials
    66  are licensed and made available under the terms and conditions of the BSD License
    … …  
    3535#include <Library/UefiRuntimeLib.h>
    3636#include <Library/SerialPortLib.h>
     37
     38//
     39// Define the maximum message length
     40//
     41#define MAX_DEBUG_MESSAGE_LENGTH 0x100
    3742
    3843//

  • trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf

    r48674 r58459  
    11## @file
    2 #  Status Code Handler Driver which produces general handlers and hook them
    3 #  onto the DXE status code router.
     2#  Status Code Handler Driver which produces general handlers and hook them onto the DXE status code router.
    43#
    5 #  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
     4#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
    65#
    76#  This program and the accompanying materials
    … …  
    1817  INF_VERSION                    = 0x00010005
    1918  BASE_NAME                      = StatusCodeHandlerRuntimeDxe
     19  MODULE_UNI_FILE                = StatusCodeHandlerRuntimeDxe.uni
    2020  FILE_GUID                      = 6C2004EF-4E0E-4BE4-B14C-340EB4AA5891
    2121  MODULE_TYPE                    = DXE_RUNTIME_DRIVER
    … …  
    5050  ReportStatusCodeLib
    5151  DebugLib
    52   SynchronizationLib
    5352  BaseMemoryLib
    5453 
    5554[Guids]
    56   gMemoryStatusCodeRecordGuid                   ## CONSUMES ## HOB
     55  gMemoryStatusCodeRecordGuid                   ## SOMETIMES_CONSUMES   ## HOB
     56  gEfiStatusCodeDataTypeStringGuid              ## SOMETIMES_CONSUMES   ## UNDEFINED
    5757  gEfiEventVirtualAddressChangeGuid             ## CONSUMES ## Event
    5858  gEfiEventExitBootServicesGuid                 ## CONSUMES ## Event
    59   gEfiStatusCodeDataTypeStringGuid              ## CONSUMES
    6059
    6160[Protocols]
    … …  
    6362
    6463[FeaturePcd]
    65   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeReplayIn
    66   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory
    67   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial
     64  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeReplayIn  ## CONSUMES
     65  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory ## CONSUMES
     66  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial ## CONSUMES
    6867
    6968[Pcd]
    70   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize |128| gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory
     69  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize |128| gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory   ## SOMETIMES_CONSUMES
    7170
    7271[Depex]
    7372  gEfiRscHandlerProtocolGuid
     73
     74[UserExtensions.TianoCore."ExtraFiles"]
     75  StatusCodeHandlerRuntimeDxeExtra.uni

  • trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/StatusCodeHandler/Smm/SerialStatusCodeWorker.c

    r48674 r58459  
    22  Serial I/O status code reporting worker.
    33
    4   Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
     4  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
    55  This program and the accompanying materials                         
    66  are licensed and made available under the terms and conditions of the BSD License         
    … …  
    4747  CHAR8           *Description;
    4848  CHAR8           *Format;
    49   CHAR8           Buffer[EFI_STATUS_CODE_DATA_MAX_SIZE];
     49  CHAR8           Buffer[MAX_DEBUG_MESSAGE_LENGTH];
    5050  UINT32          ErrorLevel;
    5151  UINT32          LineNumber;
    … …  
    8686                  Buffer,
    8787                  sizeof (Buffer),
    88                   "ERROR: C%x:V%x I%x",
     88                  "ERROR: C%08x:V%08x I%x",
    8989                  CodeType,
    9090                  Value,
    … …  
    123123                  Buffer,
    124124                  sizeof (Buffer),
    125                   "PROGRESS CODE: V%x I%x\n\r",
     125                  "PROGRESS CODE: V%08x I%x\n\r",
    126126                  Value,
    127127                  Instance
    … …  
    146146                  Buffer,
    147147                  sizeof (Buffer),
    148                   "Undefined: C%x:V%x I%x\n\r",
     148                  "Undefined: C%08x:V%08x I%x\n\r",
    149149                  CodeType,
    150150                  Value,

  • trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.h

    r48674 r58459  
    22  Internal include file for Status Code Handler Driver.
    33
    4   Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
     4  Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
    55  This program and the accompanying materials
    66  are licensed and made available under the terms and conditions of the BSD License
    … …  
    3232#include <Library/MemoryAllocationLib.h>
    3333#include <Library/BaseMemoryLib.h>
     34
     35//
     36// Define the maximum message length
     37//
     38#define MAX_DEBUG_MESSAGE_LENGTH 0x100
    3439
    3540//

  • trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf

    r48674 r58459  
    11## @file
    2 #  Status Code Handler Driver which produces general handlers and hook them
    3 #  onto the SMM status code router.
     2#  Status Code Handler Driver which produces general handlers and hook them onto the SMM status code router.
    43#
    5 #  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
     4#  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
    65#
    76#  This program and the accompanying materials
    … …  
    1817  INF_VERSION                    = 0x00010005
    1918  BASE_NAME                      = StatusCodeHandlerSmm
     19  MODULE_UNI_FILE                = StatusCodeHandlerSmm.uni
    2020  FILE_GUID                      = 79CD78D8-6EDC-4978-BD02-3299C387AB17
    2121  MODULE_TYPE                    = DXE_SMM_DRIVER
    … …  
    4848  ReportStatusCodeLib
    4949  DebugLib
    50   SynchronizationLib
    5150  MemoryAllocationLib
    5251  BaseMemoryLib
    5352 
    5453[Guids]
    55   gMemoryStatusCodeRecordGuid                   ## CONSUMES ## HOB
    56   gEfiStatusCodeDataTypeStringGuid              ## CONSUMES
     54  gEfiStatusCodeDataTypeStringGuid              ## SOMETIMES_CONSUMES   ## UNDEFINED
    5755
    5856[Protocols]
    … …  
    6058
    6159[FeaturePcd]
    62   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory
    63   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial
     60  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory ## CONSUMES
     61  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial ## CONSUMES
    6462
    6563[Pcd]
    66   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize |128| gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory
     64  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize |128| gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory   ## SOMETIMES_CONSUMES
    6765
    6866[Depex]
    6967  gEfiSmmRscHandlerProtocolGuid
     68
     69[UserExtensions.TianoCore."ExtraFiles"]
     70  StatusCodeHandlerSmmExtra.uni
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette