V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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>
This commit is contained in:
Simon Glass 2011-10-24 18:00:02 +00:00 committed by Wolfgang Denk
parent 4793ee6522
commit e4bf0c5cfe
7 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board/hymod/bsp.c
View File

@ -200,7 +200,7 @@ do_fpga (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
load_addr = simple_strtoul (argv[3], NULL, 16); load_addr = simple_strtoul (argv[3], NULL, 16);
NetBootFileXferSize = 0; NetBootFileXferSize = 0;
if (NetLoop (TFTP) <= 0) { if (NetLoop(TFTPGET) <= 0) {
printf ("tftp transfer failed - aborting " printf ("tftp transfer failed - aborting "
"fgpa load\n"); "fgpa load\n");
return 1; return 1;

2
board/hymod/fetch.c
View File

@ -55,7 +55,7 @@ fetch_and_parse (char *fn, ulong addr, int (*cback)(uchar *, uchar *))
load_addr = addr; load_addr = addr;
NetBootFileXferSize = 0; NetBootFileXferSize = 0;
if (NetLoop (TFTP) == 0) { if (NetLoop(TFTPGET) == 0) {
printf ("tftp transfer of file '%s' failed\n", fn); printf ("tftp transfer of file '%s' failed\n", fn);
return (0); return (0);
} }

6
common/cmd_elf.c
View File

@ -133,10 +133,10 @@ int do_bootvx (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
/* Check to see if we need to tftp the image ourselves before starting */ /* Check to see if we need to tftp the image ourselves before starting */
if ((argc == 2) && (strcmp (argv[1], "tftp") == 0)) { if ((argc == 2) && (strcmp (argv[1], "tftp") == 0)) {
if (NetLoop (TFTP) <= 0) if (NetLoop(TFTPGET) <= 0)
return 1; return 1;
printf ("Automatic boot of VxWorks image at address 0x%08lx ... \n", printf("Automatic boot of VxWorks image at address 0x%08lx "
addr); "...\n", addr);
} }
#endif #endif

8
common/cmd_net.c
View File

@ -28,7 +28,7 @@
#include <command.h> #include <command.h>
#include <net.h> #include <net.h>
static int netboot_common (proto_t, cmd_tbl_t *, int , char * const []); static int netboot_common(enum proto_t, cmd_tbl_t *, int, char * const []);
int do_bootp (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int do_bootp (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
@ -43,7 +43,7 @@ U_BOOT_CMD(
int do_tftpb (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int do_tftpb (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
return netboot_common (TFTP, cmdtp, argc, argv); return netboot_common(TFTPGET, cmdtp, argc, argv);
} }
U_BOOT_CMD( U_BOOT_CMD(
@ -167,8 +167,8 @@ static void netboot_update_env (void)
#endif #endif
} }
static int static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,
netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char * const argv[]) char * const argv[])
{ {
char *s; char *s;
char *end; char *end;

2
common/update.c
View File

@ -86,7 +86,7 @@ static int update_load(char *filename, ulong msec_max, int cnt_max, ulong addr)
/* download the update file */ /* download the update file */
load_addr = addr; load_addr = addr;
copy_filename(BootFile, filename, sizeof(BootFile)); copy_filename(BootFile, filename, sizeof(BootFile));
size = NetLoop(TFTP); size = NetLoop(TFTPGET);
if (size < 0) if (size < 0)
rv = 1; rv = 1;

8
include/net.h
View File

@ -365,8 +365,10 @@ extern int NetState; /* Network loop state */
extern int NetRestartWrap; /* Tried all network devices */ extern int NetRestartWrap; /* Tried all network devices */
typedef enum { BOOTP, RARP, ARP, TFTP, DHCP, PING, DNS, NFS, CDP, NETCONS, SNTP, enum proto_t {
TFTPSRV } proto_t; BOOTP, RARP, ARP, TFTPGET, DHCP, PING, DNS, NFS, CDP, NETCONS, SNTP,
TFTPSRV
};
/* from net/net.c */ /* from net/net.c */
extern char BootFile[128]; /* Boot File name */ extern char BootFile[128]; /* Boot File name */
@ -392,7 +394,7 @@ extern int NetTimeOffset; /* offset time from UTC */
#endif #endif
/* Initialize the network adapter */ /* Initialize the network adapter */
extern int NetLoop(proto_t); extern int NetLoop(enum proto_t);
/* Shutdown adapters and cleanup */ /* Shutdown adapters and cleanup */
extern void NetStop(void); extern void NetStop(void);

18
net/net.c
View File

@ -225,7 +225,7 @@ static ulong timeDelta;
/* THE transmit packet */ /* THE transmit packet */
volatile uchar *NetTxPacket; volatile uchar *NetTxPacket;
static int net_check_prereq(proto_t protocol); static int net_check_prereq(enum proto_t protocol);
static int NetTryCount; static int NetTryCount;
@ -311,8 +311,7 @@ void ArpTimeoutCheck(void)
} }
} }
static void static void NetInitLoop(enum proto_t protocol)
NetInitLoop(proto_t protocol)
{ {
static int env_changed_id; static int env_changed_id;
bd_t *bd = gd->bd; bd_t *bd = gd->bd;
@ -341,8 +340,7 @@ NetInitLoop(proto_t protocol)
* Main network processing loop. * Main network processing loop.
*/ */
int int NetLoop(enum proto_t protocol)
NetLoop(proto_t protocol)
{ {
bd_t *bd = gd->bd; bd_t *bd = gd->bd;
int ret = -1; int ret = -1;
@ -407,10 +405,11 @@ restart:
case 0: case 0:
NetDevExists = 1; NetDevExists = 1;
NetBootFileXferSize = 0;
switch (protocol) { switch (protocol) {
case TFTP: case TFTPGET:
/* always use ARP to get server ethernet address */ /* always use ARP to get server ethernet address */
TftpStart(); TftpStart(protocol);
break; break;
#ifdef CONFIG_CMD_TFTPSRV #ifdef CONFIG_CMD_TFTPSRV
case TFTPSRV: case TFTPSRV:
@ -472,7 +471,6 @@ restart:
break; break;
} }
NetBootFileXferSize = 0;
break; 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) { switch (protocol) {
/* Fall through */ /* Fall through */
@ -1795,7 +1793,7 @@ static int net_check_prereq(proto_t protocol)
#if defined(CONFIG_CMD_NFS) #if defined(CONFIG_CMD_NFS)
case NFS: case NFS:
#endif #endif
case TFTP: case TFTPGET:
if (NetServerIP == 0) { if (NetServerIP == 0) {
puts("*** ERROR: `serverip' not set\n"); puts("*** ERROR: `serverip' not set\n");
return 1; return 1;