From 0994fe6f81c638f9bba117d1c23bafd0efefd4f9 Mon Sep 17 00:00:00 2001
From: Jaben Carsey <jaben.carsey@intel.com>
Date: Thu, 24 Sep 2015 19:48:58 +0000
Subject: ShellPkg: Update tftp to build with current tip

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Signed-off-by: Tapan  Shah <tapandshah@hpe.com>
Signed-off-by: Jiaxin Wu <jiaxin.wu@intel.com>
Reviewed-by: Qiu Shumin <shumin.qiu@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18541 6f19259b-4bc3-4df7-8a09-765794883524
---
 ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c       |  13 ++++++++-----
 .../UefiShellTftpCommandLib/UefiShellTftpCommandLib.h |   3 +--
 .../UefiShellTftpCommandLib.uni                       | Bin 8748 -> 8856 bytes
 3 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'ShellPkg/Library/UefiShellTftpCommandLib')

diff --git a/ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c b/ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c
index d2f7046de0..e596c22723 100644
--- a/ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c
+++ b/ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c
@@ -2,6 +2,7 @@
   The implementation for the 'tftp' Shell command.
 
   Copyright (c) 2015, ARM Ltd. All rights reserved.<BR>
+  Copyright (c) 2015, 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
@@ -14,6 +15,8 @@
 
 #include "UefiShellTftpCommandLib.h"
 
+#define EFI_IP4_CONFIG2_INTERFACE_INFO_NAME_LENGTH 32
+
 /*
    Constant strings and definitions related to the message indicating the amount of
    progress in the dowloading of a TFTP file.
@@ -258,7 +261,7 @@ ShellCommandRunTftp (
   EFI_HANDLE              *Handles;
   UINTN                   HandleCount;
   UINTN                   NicNumber;
-  CHAR16                  NicName[IP4_NIC_NAME_LENGTH];
+  CHAR16                  NicName[EFI_IP4_CONFIG2_INTERFACE_INFO_NAME_LENGTH];
   EFI_HANDLE              ControllerHandle;
   EFI_HANDLE              Mtftp4ChildHandle;
   EFI_MTFTP4_PROTOCOL     *Mtftp4;
@@ -571,7 +574,7 @@ StringToUint16 (
     return FALSE;
   }
 
-  *Value = Val;
+  *Value = (UINT16)Val;
   return TRUE;
 }
 
@@ -623,7 +626,7 @@ GetNicName (
 
   UnicodeSPrint (
     NicName,
-    IP4_NIC_NAME_LENGTH,
+    EFI_IP4_CONFIG2_INTERFACE_INFO_NAME_LENGTH,
     SnpMode.IfType == NET_IFTYPE_ETHERNET ?
     L"eth%d" :
     L"unk%d" ,
@@ -944,8 +947,8 @@ CheckPacket (
   CHAR16            Progress[TFTP_PROGRESS_MESSAGE_SIZE];
   UINT64            NbOfKb;
   UINTN             Index;
-  UINTN             LastStep;
-  UINTN             Step;
+  UINT64            LastStep;
+  UINT64            Step;
 
   if ((NTOHS (Packet->OpCode)) != EFI_MTFTP4_OPCODE_DATA) {
     return EFI_SUCCESS;
diff --git a/ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.h b/ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.h
index a73b86c85b..993aa9e5bd 100644
--- a/ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.h
+++ b/ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.h
@@ -1,7 +1,7 @@
 /** @file
   header file for NULL named library for 'tftp' Shell command functions.
 
-  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved. <BR>
   Copyright (c) 2015, ARM Ltd. All rights reserved.<BR>
 
   This program and the accompanying materials
@@ -21,7 +21,6 @@
 #include <ShellBase.h>
 
 #include <Guid/ShellLibHiiGuid.h>
-#include <Guid/NicIp4ConfigNvData.h>
 
 #include <Protocol/ServiceBinding.h>
 #include <Protocol/Mtftp4.h>
diff --git a/ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.uni b/ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.uni
index 607a3602d2..43b8cc5e7c 100644
Binary files a/ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.uni and b/ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.uni differ
-- 
cgit v1.2.3