VirtualBox

Ignore:
Timestamp:
Sep 11, 2019 8:46:37 AM (6 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
133262
Message:

Devices/EFI/FirmwareNew: Start upgrade process to edk2-stable201908 (compiles on Windows and works to some extent), bugref:4643

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

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/EFI/FirmwareNew

  • trunk/src/VBox/Devices/EFI/FirmwareNew/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.c

    r77662 r80721  
    22  Reset Architectural and Reset Notification protocols implementation.
    33
    4   Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
    5 
    6   This program and the accompanying materials
    7   are licensed and made available under the terms and conditions of the BSD License
    8   which accompanies this distribution.  The full text of the license may be found at
    9   http://opensource.org/licenses/bsd-license.php
    10 
    11   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
    12   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     4  Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
     5
     6  SPDX-License-Identifier: BSD-2-Clause-Patent
    137
    148**/
    … …  
    188182  // Hook the runtime service table
    189183  //
    190   gRT->ResetSystem = ResetSystem;
     184  gRT->ResetSystem = RuntimeServiceResetSystem;
    191185
    192186  //
    … …  
    208202
    209203/**
    210   Put the system into S3 power state.
    211 **/
    212 VOID
    213 DoS3 (
    214   VOID
    215   )
    216 {
    217   EnterS3WithImmediateWake ();
    218 
    219   //
    220   // Should not return
    221   //
    222   CpuDeadLoop ();
    223 }
    224 
    225 /**
    226204  Resets the entire platform.
    227205
    … …  
    233211                                string, optionally followed by additional binary data.
    234212                                The string is a description that the caller may use to further
    235                                 indicate the reason for the system reset. ResetData is only
    236                                 valid if ResetStatus is something other than EFI_SUCCESS
    237                                 unless the ResetType is EfiResetPlatformSpecific
    238                                 where a minimum amount of ResetData is always required.
     213                                indicate the reason for the system reset.
    239214                                For a ResetType of EfiResetPlatformSpecific the data buffer
    240215                                also starts with a Null-terminated string that is followed
    … …  
    243218VOID
    244219EFIAPI
    245 ResetSystem (
     220RuntimeServiceResetSystem (
    246221  IN EFI_RESET_TYPE   ResetType,
    247222  IN EFI_STATUS       ResetStatus,
    … …  
    250225  )
    251226{
    252   EFI_STATUS          Status;
    253   UINTN               Size;
    254   UINTN               CapsuleDataPtr;
    255227  LIST_ENTRY          *Link;
    256228  RESET_NOTIFY_ENTRY  *Entry;
    257229
    258230  //
    259   // Only do REPORT_STATUS_CODE() on first call to ResetSystem()
     231  // Only do REPORT_STATUS_CODE() on first call to RuntimeServiceResetSystem()
    260232  //
    261233  if (mResetNotifyDepth == 0) {
    … …  
    316288  case EfiResetWarm:
    317289
    318     //
    319     //Check if there are pending capsules to process
    320     //
    321     Size = sizeof (CapsuleDataPtr);
    322     Status =  EfiGetVariable (
    323                  EFI_CAPSULE_VARIABLE_NAME,
    324                  &gEfiCapsuleVendorGuid,
    325                  NULL,
    326                  &Size,
    327                  (VOID *) &CapsuleDataPtr
    328                  );
    329 
    330     if (Status == EFI_SUCCESS) {
    331       //
    332       //Process capsules across a system reset.
    333       //
    334       DoS3();
    335     }
    336 
    337290    ResetWarm ();
    338291    break;

  • trunk/src/VBox/Devices/EFI/FirmwareNew/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.h

    r77662 r80721  
    11/** @file
    22
    3   Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
     3  Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
    44
    5   This program and the accompanying materials
    6   are licensed and made available under the terms and conditions of the BSD License
    7   which accompanies this distribution.  The full text of the license may be found at
    8   http://opensource.org/licenses/bsd-license.php
    9 
    10   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
    11   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     5  SPDX-License-Identifier: BSD-2-Clause-Patent
    126
    137**/
    … …  
    2822#include <Library/DebugLib.h>
    2923#include <Library/UefiLib.h>
    30 #include <Library/IoLib.h>
    3124#include <Library/UefiDriverEntryPoint.h>
    3225#include <Library/UefiBootServicesTableLib.h>
    … …  
    8881                                string, optionally followed by additional binary data.
    8982                                The string is a description that the caller may use to further
    90                                 indicate the reason for the system reset. ResetData is only
    91                                 valid if ResetStatus is something other than EFI_SUCCESS
    92                                 unless the ResetType is EfiResetPlatformSpecific
    93                                 where a minimum amount of ResetData is always required.
     83                                indicate the reason for the system reset.
    9484                                For a ResetType of EfiResetPlatformSpecific the data buffer
    9585                                also starts with a Null-terminated string that is followed
    … …  
    9989VOID
    10090EFIAPI
    101 ResetSystem (
     91RuntimeServiceResetSystem (
    10292  IN EFI_RESET_TYPE   ResetType,
    10393  IN EFI_STATUS       ResetStatus,

  • trunk/src/VBox/Devices/EFI/FirmwareNew/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf

    r77662 r80721  
    44# Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
    55#
    6 # This program and the accompanying materials are
    7 # licensed and made available under the terms and conditions of the BSD License
    8 # which accompanies this distribution.  The full text of the license may be found at
    9 # http://opensource.org/licenses/bsd-license.php
    10 #
    11 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
    12 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     6# SPDX-License-Identifier: BSD-2-Clause-Patent
    137#
    148##
    … …  
    4438  UefiBootServicesTableLib
    4539  UefiDriverEntryPoint
    46   IoLib
    4740  UefiLib
    4841  DebugLib

  • trunk/src/VBox/Devices/EFI/FirmwareNew/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.uni

    r77662 r80721  
    22// This driver implements Reset Architectural and Reset Notification protocols.
    33//
    4 // Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
     4// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
    55//
    6 // This program and the accompanying materials are
    7 // licensed and made available under the terms and conditions of the BSD License
    8 // which accompanies this distribution.  The full text of the license may be found at
    9 // http://opensource.org/licenses/bsd-license.php
    10 //
    11 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
    12 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     6// SPDX-License-Identifier: BSD-2-Clause-Patent
    137//
    148// **/

  • trunk/src/VBox/Devices/EFI/FirmwareNew/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxeExtra.uni

    r77662 r80721  
    22// ResetSystemRuntimeDxe Localized Strings and Content
    33//
    4 // Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
     4// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
    55//
    6 // This program and the accompanying materials are
    7 // licensed and made available under the terms and conditions of the BSD License
    8 // which accompanies this distribution.  The full text of the license may be found at
    9 // http://opensource.org/licenses/bsd-license.php
    10 //
    11 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
    12 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     6// SPDX-License-Identifier: BSD-2-Clause-Patent
    137//
    148// **/
    159
    16 #string STR_PROPERTIES_MODULE_NAME 
    17 #language en-US 
     10#string STR_PROPERTIES_MODULE_NAME
     11#language en-US
    1812"Reset System DXE Driver"
    1913
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