aboutsummaryrefslogtreecommitdiff
path: root/src/include/ipxe/efi/Base.h
diff options
context:
space:
mode:
authorMichael Brown <mcb30@ipxe.org>2016-03-13 11:47:30 +0000
committerMichael Brown <mcb30@ipxe.org>2016-03-13 11:47:30 +0000
commit24415a3eeefbdeb59c947363b1ab2b3796616092 (patch)
tree4f0f1ed8296e37eeea4494b171e74b16a4cb2fc2 /src/include/ipxe/efi/Base.h
parent0d29cf2a4da86f65f74f94695c98bd175f897db5 (diff)
downloadipxe-24415a3eeefbdeb59c947363b1ab2b3796616092.zip
ipxe-24415a3eeefbdeb59c947363b1ab2b3796616092.tar.gz
ipxe-24415a3eeefbdeb59c947363b1ab2b3796616092.tar.bz2
[efi] Update to current EDK2 headers
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/include/ipxe/efi/Base.h')
-rw-r--r--src/include/ipxe/efi/Base.h15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/include/ipxe/efi/Base.h b/src/include/ipxe/efi/Base.h
index ed678a9..8a047ae 100644
--- a/src/include/ipxe/efi/Base.h
+++ b/src/include/ipxe/efi/Base.h
@@ -6,7 +6,7 @@
environment. There are a set of base libraries in the Mde Package that can
be used to implement base modules.
-Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -943,6 +943,11 @@ typedef UINTN RETURN_STATUS;
#define RETURN_COMPROMISED_DATA ENCODE_ERROR (33)
///
+/// A HTTP error occurred during the network operation.
+///
+#define RETURN_HTTP_ERROR ENCODE_ERROR (35)
+
+///
/// The string contained one or more characters that
/// the device could not render and were skipped.
///
@@ -971,6 +976,12 @@ typedef UINTN RETURN_STATUS;
///
#define RETURN_WARN_STALE_DATA ENCODE_WARNING (5)
+///
+/// The resulting buffer contains UEFI-compliant file system.
+///
+#define RETURN_WARN_FILE_SYSTEM ENCODE_WARNING (6)
+
+
/**
Returns a 16-bit signature built from 2 ASCII characters.
@@ -1024,7 +1035,7 @@ typedef UINTN RETURN_STATUS;
#define SIGNATURE_64(A, B, C, D, E, F, G, H) \
(SIGNATURE_32 (A, B, C, D) | ((UINT64) (SIGNATURE_32 (E, F, G, H)) << 32))
-#if defined(_MSC_EXTENSIONS) && !defined (MDE_CPU_EBC)
+#if defined(_MSC_EXTENSIONS) && !defined (__INTEL_COMPILER) && !defined (MDE_CPU_EBC)
#pragma intrinsic(_ReturnAddress)
/**
Get the return address of the calling funcation.