Revert 18541

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18542 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c b/ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c
index e596c227239a6f65d0f00319f980fcabb3d5d387..d2f7046de037cdcaacce7a7265f4cbd2ca4e3e0d 100644 (file)
--- a/ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c
+++ b/ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c
@@ -2,7 +2,6 @@
   The implementation for the 'tftp' Shell command.\r
 \r
   Copyright (c) 2015, ARM Ltd. All rights reserved.<BR>\r
-  Copyright (c) 2015, Intel Corporation. All rights reserved. <BR>\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
@@ -15,8 +14,6 @@
 \r
 #include "UefiShellTftpCommandLib.h"\r
 \r
-#define EFI_IP4_CONFIG2_INTERFACE_INFO_NAME_LENGTH 32\r
-\r
 /*\r
    Constant strings and definitions related to the message indicating the amount of\r
    progress in the dowloading of a TFTP file.\r
@@ -261,7 +258,7 @@ ShellCommandRunTftp (
   EFI_HANDLE              *Handles;\r
   UINTN                   HandleCount;\r
   UINTN                   NicNumber;\r
-  CHAR16                  NicName[EFI_IP4_CONFIG2_INTERFACE_INFO_NAME_LENGTH];\r
+  CHAR16                  NicName[IP4_NIC_NAME_LENGTH];\r
   EFI_HANDLE              ControllerHandle;\r
   EFI_HANDLE              Mtftp4ChildHandle;\r
   EFI_MTFTP4_PROTOCOL     *Mtftp4;\r
@@ -574,7 +571,7 @@ StringToUint16 (
     return FALSE;\r
   }\r
 \r
-  *Value = (UINT16)Val;\r
+  *Value = Val;\r
   return TRUE;\r
 }\r
 \r
@@ -626,7 +623,7 @@ GetNicName (
 \r
   UnicodeSPrint (\r
     NicName,\r
-    EFI_IP4_CONFIG2_INTERFACE_INFO_NAME_LENGTH,\r
+    IP4_NIC_NAME_LENGTH,\r
     SnpMode.IfType == NET_IFTYPE_ETHERNET ?\r
     L"eth%d" :\r
     L"unk%d" ,\r
@@ -947,8 +944,8 @@ CheckPacket (
   CHAR16            Progress[TFTP_PROGRESS_MESSAGE_SIZE];\r
   UINT64            NbOfKb;\r
   UINTN             Index;\r
-  UINT64            LastStep;\r
-  UINT64            Step;\r
+  UINTN             LastStep;\r
+  UINTN             Step;\r
 \r
   if ((NTOHS (Packet->OpCode)) != EFI_MTFTP4_OPCODE_DATA) {\r
     return EFI_SUCCESS;\r

diff --git a/ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.h b/ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.h
index 993aa9e5bdf4cef660b80d6e1030113847cb7412..a73b86c85b12e0aa1b612f1402fefad18c3ee190 100644 (file)
--- a/ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.h
+++ b/ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.h
@@ -1,7 +1,7 @@
 /** @file\r
   header file for NULL named library for 'tftp' Shell command functions.\r
 \r
-  Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved. <BR>\r
+  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved. <BR>\r
   Copyright (c) 2015, ARM Ltd. All rights reserved.<BR>\r
 \r
   This program and the accompanying materials\r
@@ -21,6 +21,7 @@
 #include <ShellBase.h>\r
 \r
 #include <Guid/ShellLibHiiGuid.h>\r
+#include <Guid/NicIp4ConfigNvData.h>\r
 \r
 #include <Protocol/ServiceBinding.h>\r
 #include <Protocol/Mtftp4.h>\r

diff --git a/ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.uni b/ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.uni
index 43b8cc5e7cd8726138c600b96b4ebbb1c960824c..607a3602d2a3aad30619c0844162e7399c0aba9a 100644 (file)
Binary files a/ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.uni and b/ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.uni differ