leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netloop: updates for NetLoop

Browse Source 
Fix some issues introduced from commit:
2f70c49e5b
suggested by Mike Frysinger.

- added some comment for the env_id variable in common_cmd_nvedit.c
- moved some variables in fn scope instead of file scope
- NetInitLoop now static void

Signed-off-by: Heiko Schocher <hs@denx.de>
Acked-by: Ben Warren <biggerbadderben@gmail.com>
This commit is contained in:
Heiko Schocher 2009-04-28 08:36:11 +02:00 committed by Wolfgang Denk
parent 3c1d89545d
commit da95427ce4
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/cmd_nvedit.c
View File

@ -77,6 +77,13 @@ SPI_FLASH|MG_DISK|NVRAM|NOWHERE}
static const unsigned long baudrate_table[] = CONFIG_SYS_BAUDRATE_TABLE;
#define N_BAUDRATES (sizeof(baudrate_table) / sizeof(baudrate_table[0]))
/*
* This variable is incremented on each do_setenv (), so it can
* be used via get_env_id() as an indication, if the environment
* has changed or not. So it is possible to reread an environment
* variable only if the environment was changed ... done so for
* example in NetInitLoop()
*/
static int env_id = 1;
int get_env_id (void)

5
net/eth.c
View File

@ -57,9 +57,6 @@ int eth_setenv_enetaddr(char *name, const uchar *enetaddr)
#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI)
static char *act = NULL;
static int env_changed_id = 0;
/*
* CPU and board-specific Ethernet initializations. Aliased function
* signals caller to move on
@ -471,6 +468,8 @@ void eth_try_another(int first_restart)
#ifdef CONFIG_NET_MULTI
void eth_set_current(void)
{
static char *act = NULL;
static int env_changed_id = 0;
struct eth_device* old_current;
int env_id;

7
net/net.c
View File

@ -209,8 +209,6 @@ uchar NetArpWaitPacketBuf[PKTSIZE_ALIGN + PKTALIGN];
ulong NetArpWaitTimerStart;
int NetArpWaitTry;
int env_changed_id = 0;
void ArpRequest (void)
{
int i;
@ -278,9 +276,10 @@ void ArpTimeoutCheck(void)
}
}
int
static void
NetInitLoop(proto_t protocol)
{
static int env_changed_id = 0;
bd_t *bd = gd->bd;
int env_id = get_env_id ();
@ -295,7 +294,7 @@ NetInitLoop(proto_t protocol)
env_changed_id = env_id;
}
return 0;
return;
}
/**********************************************************************/