Changeset 58459 in vbox for trunk/src/VBox/Devices/EFI/Firmware/MdePkg/Include/Protocol/DriverDiagnostics.h

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:

• . (modified) (1 prop)
• MdePkg/Include/Protocol/DriverDiagnostics.h (modified) (2 diffs)

trunk/src/VBox/Devices/EFI/Firmware/MdePkg/Include/Protocol/DriverDiagnostics.h

@@ -2 +2 @@
   EFI Driver Diagnostics Protocol
 
-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials are licensed and made available under 
 the terms and conditions of the BSD License that accompanies this distribution.  
@@ -41 +41 @@
   ///
   EfiDriverDiagnosticTypeManufacturing= 2,
+  ///
+  /// This is an optional diagnostic type that would only be used in the situation where an 
+  /// EFI_NOT_READY had been returned by a previous call to RunDiagnostics()
+  /// and there is a desire to cancel the current running diagnostics operation.
+  ///
+  EfiDriverDiagnosticTypeCancel       = 3,
   EfiDriverDiagnosticTypeMaximum
 } EFI_DRIVER_DIAGNOSTIC_TYPE;