diff options
| author | Fu Siyuan <siyuan.fu@intel.com> | 2016-03-17 09:27:07 +0800 |
|---|---|---|
| committer | Fu Siyuan <siyuan.fu@intel.com> | 2016-03-24 10:09:47 +0800 |
| commit | a5acc84226183fc5a5d55eb923f6c47a8d42d861 (patch) | |
| tree | fb36b608d7fd9554bf499cfa7d34aa45da504626 /NetworkPkg/HttpBootDxe/HttpBootConfigNVDataStruc.h | |
| parent | 9e41f686fc20304086db387563089e42cf3189d5 (diff) | |
| download | edk2-a5acc84226183fc5a5d55eb923f6c47a8d42d861.tar.gz edk2-a5acc84226183fc5a5d55eb923f6c47a8d42d861.tar.bz2 edk2-a5acc84226183fc5a5d55eb923f6c47a8d42d861.zip | |
NetworkPkg: Fix HII related problem in HTTP boot driver.
According to UEFI spec, HII_Config_Access.RouteConfig() should return success
if the required configuration has been processed. Current HTTP boot driver
may return error code in some situation, which failed the UEFI SCT test.
This patch fix this issue by removing the returned error status code and adding
extra check point in the Callback() function, which will pop up a message box
if user input an unsupported URI string.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Dong Eric <eric.dong@intel.com>
Reviewed-by: Wu Jiaxin <jiaxin.wu@intel.com>
Diffstat (limited to 'NetworkPkg/HttpBootDxe/HttpBootConfigNVDataStruc.h')
| -rw-r--r-- | NetworkPkg/HttpBootDxe/HttpBootConfigNVDataStruc.h | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/NetworkPkg/HttpBootDxe/HttpBootConfigNVDataStruc.h b/NetworkPkg/HttpBootDxe/HttpBootConfigNVDataStruc.h index 07043e7ee8..37ce440411 100644 --- a/NetworkPkg/HttpBootDxe/HttpBootConfigNVDataStruc.h +++ b/NetworkPkg/HttpBootDxe/HttpBootConfigNVDataStruc.h @@ -17,24 +17,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <Guid/HttpBootConfigHii.h>
-#define HTTP_BOOT_IP_VERSION_4 0
-#define HTTP_BOOT_IP_VERSION_6 1
+#define HTTP_BOOT_IP_VERSION_4 0
+#define HTTP_BOOT_IP_VERSION_6 1
//
// Macros used for an IPv4 or an IPv6 address.
//
-#define URI_STR_MIN_SIZE 8
-#define URI_STR_MAX_SIZE 255
+#define URI_STR_MIN_SIZE 8
+#define URI_STR_MAX_SIZE 255
+
+#define DESCRIPTION_STR_MIN_SIZE 6
+#define DESCRIPTION_STR_MAX_SIZE 75
#define CONFIGURATION_VARSTORE_ID 0x1234
-#define FORMID_MAIN_FORM 1
+#define FORMID_MAIN_FORM 1
+
+#define KEY_INITIATOR_URI 0x101
+
+#define HTTP_BOOT_DEFAULT_DESCRIPTION_STR L"UEFI HTTP"
#pragma pack(1)
typedef struct _HTTP_BOOT_CONFIG_IFR_NVDATA {
UINT8 IpVersion;
UINT8 Padding;
- CHAR16 Description[URI_STR_MAX_SIZE];
+ CHAR16 Description[DESCRIPTION_STR_MAX_SIZE];
CHAR16 Uri[URI_STR_MAX_SIZE];
} HTTP_BOOT_CONFIG_IFR_NVDATA;
#pragma pack()
|