aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2011-10-24 18:00:02 +0000
committerWolfgang Denk <wd@denx.de>2011-10-26 21:33:42 +0200
commite4bf0c5cfe1d7b2059a6802c9e11d567c928dbb1 (patch)
treeb7119fed80e0e6bca1062215762c8ee2e414e747 /net
parent4793ee6522f10a3d108de7e47adbcf5f15eb3f46 (diff)
downloadu-boot-linaro-stable-e4bf0c5cfe1d7b2059a6802c9e11d567c928dbb1.tar.gz
net: tftpput: Rename TFTP to TFTPGET
This is a better name for this protocol. Also remove the typedef to keep checkpatch happy, and move zeroing of NetBootFileXferSize a little earlier since TFTPPUT will need to change this. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'net')
-rw-r--r--net/net.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/net/net.c b/net/net.c
index f6afb6439..c778a8065 100644
--- a/net/net.c
+++ b/net/net.c
@@ -225,7 +225,7 @@ static ulong timeDelta;
/* THE transmit packet */
volatile uchar *NetTxPacket;
-static int net_check_prereq(proto_t protocol);
+static int net_check_prereq(enum proto_t protocol);
static int NetTryCount;
@@ -311,8 +311,7 @@ void ArpTimeoutCheck(void)
}
}
-static void
-NetInitLoop(proto_t protocol)
+static void NetInitLoop(enum proto_t protocol)
{
static int env_changed_id;
bd_t *bd = gd->bd;
@@ -341,8 +340,7 @@ NetInitLoop(proto_t protocol)
* Main network processing loop.
*/
-int
-NetLoop(proto_t protocol)
+int NetLoop(enum proto_t protocol)
{
bd_t *bd = gd->bd;
int ret = -1;
@@ -407,10 +405,11 @@ restart:
case 0:
NetDevExists = 1;
+ NetBootFileXferSize = 0;
switch (protocol) {
- case TFTP:
+ case TFTPGET:
/* always use ARP to get server ethernet address */
- TftpStart();
+ TftpStart(protocol);
break;
#ifdef CONFIG_CMD_TFTPSRV
case TFTPSRV:
@@ -472,7 +471,6 @@ restart:
break;
}
- NetBootFileXferSize = 0;
break;
}
@@ -1764,7 +1762,7 @@ NetReceive(volatile uchar *inpkt, int len)
/**********************************************************************/
-static int net_check_prereq(proto_t protocol)
+static int net_check_prereq(enum proto_t protocol)
{
switch (protocol) {
/* Fall through */
@@ -1795,7 +1793,7 @@ static int net_check_prereq(proto_t protocol)
#if defined(CONFIG_CMD_NFS)
case NFS:
#endif
- case TFTP:
+ case TFTPGET:
if (NetServerIP == 0) {
puts("*** ERROR: `serverip' not set\n");
return 1;