MdePkg:Add a new error status code EFI_HTTP_ERROR.

v2:
*Return the EFI_HTTP_ERROR in the “Status” field in token, instead of
in the status codes returned table of EFI_HTTP_PROTOCOL.Response() interface.

Add a new error status code EFI_HTTP_ERROR in corresponding with
the UEFI 2.6 spec

Cc: Ye Ting <ting.ye@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Zhang Lubo <lubo.zhang@intel.com>
Reviewed-by: Siyuan Fu <siyuan.fu@intel.com>
Reviewed-by: Jiaxin Wu <jiaxin.wu@intel.com>

diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h
index 85ed34f0887beb97a4ab525754b2ee14382e1c18..882b5a679375bc47bd8a6d167fbb15533c71c1d0 100644 (file)
--- a/MdePkg/Include/Base.h
+++ b/MdePkg/Include/Base.h
@@ -6,7 +6,7 @@
   environment. There are a set of base libraries in the Mde Package that can\r
   be used to implement base modules.\r
 \r
   environment. There are a set of base libraries in the Mde Package that can\r
   be used to implement base modules.\r
 \r

-Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r

 Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r


@@ -940,6 +940,11 @@ typedef UINTN RETURN_STATUS;
 ///\r
 #define RETURN_COMPROMISED_DATA      ENCODE_ERROR (33)\r
 \r
 ///\r
 #define RETURN_COMPROMISED_DATA      ENCODE_ERROR (33)\r
 \r

+///\r
+/// A HTTP error occurred during the network operation.\r
+///\r
+#define RETURN_HTTP_ERROR            ENCODE_ERROR (35)\r
+\r

 ///\r
 /// The string contained one or more characters that\r
 /// the device could not render and were skipped.\r
 ///\r
 /// The string contained one or more characters that\r
 /// the device could not render and were skipped.\r

diff --git a/MdePkg/Include/Protocol/Http.h b/MdePkg/Include/Protocol/Http.h
index ad6c76a4c44d79dde798dd91e204e2b1169493b3..22201b4b43a7d16f80a1645db4367a03bc580e96 100644 (file)
--- a/MdePkg/Include/Protocol/Http.h
+++ b/MdePkg/Include/Protocol/Http.h
@@ -282,6 +282,8 @@ typedef struct {
   /// Status will be set to one of the following value if the HTTP request is\r
   /// successfully sent or if an unexpected error occurs:\r
   ///   EFI_SUCCESS:      The HTTP request was successfully sent to the remote host.\r
   /// Status will be set to one of the following value if the HTTP request is\r
   /// successfully sent or if an unexpected error occurs:\r
   ///   EFI_SUCCESS:      The HTTP request was successfully sent to the remote host.\r

+  ///   EFI_HTTP_ERROR:   The response message was successfully received but contains a\r
+  ///                     HTTP error. The response status code is returned in token.\r

   ///   EFI_ABORTED:      The HTTP request was cancelled by the caller and removed from\r
   ///                     the transmit queue.\r
   ///   EFI_TIMEOUT:      The HTTP request timed out before reaching the remote host.\r
   ///   EFI_ABORTED:      The HTTP request was cancelled by the caller and removed from\r
   ///                     the transmit queue.\r
   ///   EFI_TIMEOUT:      The HTTP request timed out before reaching the remote host.\r

diff --git a/MdePkg/Include/Uefi/UefiBaseType.h b/MdePkg/Include/Uefi/UefiBaseType.h
index b505e7de1e1a19f067901d679b68f5f9d7bd2916..90a93db8b2a48a5c3f2027da3f11b673fe20e466 100644 (file)
--- a/MdePkg/Include/Uefi/UefiBaseType.h
+++ b/MdePkg/Include/Uefi/UefiBaseType.h
@@ -2,7 +2,7 @@
   Defines data types and constants introduced in UEFI.\r
 \r
 Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
   Defines data types and constants introduced in UEFI.\r
 \r
 Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r

-Portions copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.<BR>\r
+Portions copyright (c) 2011 - 2016, ARM Ltd. All rights reserved.<BR>\r

 \r
 This program and the accompanying materials are licensed and made available under \r
 the terms and conditions of the BSD License that accompanies this distribution.  \r
 \r
 This program and the accompanying materials are licensed and made available under \r
 the terms and conditions of the BSD License that accompanies this distribution.  \r


@@ -151,6 +151,7 @@ typedef union {
 #define EFI_END_OF_FILE           RETURN_END_OF_FILE\r
 #define EFI_INVALID_LANGUAGE      RETURN_INVALID_LANGUAGE\r
 #define EFI_COMPROMISED_DATA      RETURN_COMPROMISED_DATA\r
 #define EFI_END_OF_FILE           RETURN_END_OF_FILE\r
 #define EFI_INVALID_LANGUAGE      RETURN_INVALID_LANGUAGE\r
 #define EFI_COMPROMISED_DATA      RETURN_COMPROMISED_DATA\r

+#define EFI_HTTP_ERROR            RETURN_HTTP_ERROR\r

 \r
 #define EFI_WARN_UNKNOWN_GLYPH    RETURN_WARN_UNKNOWN_GLYPH   \r
 #define EFI_WARN_DELETE_FAILURE   RETURN_WARN_DELETE_FAILURE  \r
 \r
 #define EFI_WARN_UNKNOWN_GLYPH    RETURN_WARN_UNKNOWN_GLYPH   \r
 #define EFI_WARN_DELETE_FAILURE   RETURN_WARN_DELETE_FAILURE  \r