GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-28 10:01:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change env_get_char from a global function ptr to a function

Browse source 
This avoids an early global data reference.

Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
This commit is contained in:
Joakim Tjernlund 2008-07-06 12:30:09 +02:00 • committed by Wolfgang Denk
parent 27269417ad
commit b502611b51
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
common/env_common.c
View file

@ -50,7 +50,6 @@ extern void env_relocate_spec (void);
extern uchar env_get_char_spec(int); extern uchar env_get_char_spec(int);
static uchar env_get_char_init (int index); static uchar env_get_char_init (int index);
uchar (*env_get_char)(int) = env_get_char_init;
/************************************************************************ /************************************************************************
* Default settings to be used when no valid environment is found * Default settings to be used when no valid environment is found
@ -183,6 +182,19 @@ uchar env_get_char_memory (int index)
} }
#endif #endif
uchar env_get_char (int index)
{
uchar c;
/* if relocated to RAM */
if (gd->flags & GD_FLG_RELOC)
c = env_get_char_memory(index);
else
c = env_get_char_init(index);
return (c);
}
uchar *env_get_addr (int index) uchar *env_get_addr (int index)
{ {
if (gd->env_valid) { if (gd->env_valid) {
@ -216,11 +228,6 @@ void env_relocate (void)
DEBUGF ("%s[%d] malloced ENV at %p\n", __FUNCTION__,__LINE__,env_ptr); DEBUGF ("%s[%d] malloced ENV at %p\n", __FUNCTION__,__LINE__,env_ptr);
#endif #endif
/*
* After relocation to RAM, we can always use the "memory" functions
*/
env_get_char = env_get_char_memory;
if (gd->env_valid == 0) { if (gd->env_valid == 0) {
#if defined(CONFIG_GTH) || defined(CFG_ENV_IS_NOWHERE) /* Environment not changable */ #if defined(CONFIG_GTH) || defined(CFG_ENV_IS_NOWHERE) /* Environment not changable */
puts ("Using default environment\n\n"); puts ("Using default environment\n\n");

4
include/environment.h
View file

@ -107,8 +107,8 @@ typedef struct environment_s {
unsigned char data[ENV_SIZE]; /* Environment data */ unsigned char data[ENV_SIZE]; /* Environment data */
} env_t; } env_t;
/* Pointer to function that returns a character from the environment */ /* Function that returns a character from the environment */
extern unsigned char (*env_get_char)(int); unsigned char env_get_char (int);
/* Function that returns a pointer to a value from the environment */ /* Function that returns a pointer to a value from the environment */
unsigned char *env_get_addr(int); unsigned char *env_get_addr(int);