Revision: 18541
http://sourceforge.net/p/edk2/code/18541
Author: jcarsey
Date: 2015-09-24 19:48:58 +0000 (Thu, 24 Sep 2015)
Log Message:
-----------
ShellPkg: Update tftp to build with current tip
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jaben Carsey <[email protected]>
Signed-off-by: Tapan Shah <[email protected]>
Signed-off-by: Jiaxin Wu <[email protected]>
Reviewed-by: Qiu Shumin <[email protected]>
Modified Paths:
--------------
trunk/edk2/ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c
trunk/edk2/ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.h
trunk/edk2/ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.uni
Modified: trunk/edk2/ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c
===================================================================
--- trunk/edk2/ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c 2015-09-24
19:35:16 UTC (rev 18540)
+++ trunk/edk2/ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c 2015-09-24
19:48:58 UTC (rev 18541)
@@ -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 @@
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 @@
return FALSE;
}
- *Value = Val;
+ *Value = (UINT16)Val;
return TRUE;
}
@@ -623,7 +626,7 @@
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 @@
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;
Modified:
trunk/edk2/ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.h
===================================================================
---
trunk/edk2/ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.h
2015-09-24 19:35:16 UTC (rev 18540)
+++
trunk/edk2/ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.h
2015-09-24 19:48:58 UTC (rev 18541)
@@ -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>
Modified:
trunk/edk2/ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.uni
===================================================================
---
trunk/edk2/ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.uni
2015-09-24 19:35:16 UTC (rev 18540)
+++
trunk/edk2/ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.uni
2015-09-24 19:48:58 UTC (rev 18541)
@@ -2,7 +2,7 @@
- @@ -26,7 +26,7 @@
- @@ -34,7 +34,7 @@
- @@ -124,34 +124,38 @@
------+ --- ---+
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
