On Sun, 2008-07-06 at 00:32 +0200, Wolfgang Denk wrote:
In message 1213253528.5446.48.camel@gentoo-jocke.transmode.se you wrote:
So what *is* the state of this?
If nobody responds soon, I will indeed re-apply that patch, andthen I will not revert this commit again. So if you think this bytes you, please speak up *now*.
Jock, would you please send me a reminder in a week or so? Thanks.
About week has passed so here is the reminder :)
Unfortunately, the original patch does not apply any more; could you please rebase and resubmit it? Thanks in advance.
From ba9ae2fb5f10f2a6c2b7635d27e70c77f7b068cb Mon Sep 17 00:00:00 2001
From: Joakim Tjernlund Joakim.Tjernlund@transmode.se Date: Sun, 6 Jul 2008 12:24:18 +0200 Subject: [PATCH] Change env_get_char from a global function ptr to a function
This avoids an early global data reference
Signed-off-by: Joakim Tjernlund Joakim.Tjernlund@transmode.se ---
OK, here it is again. I am on vacation now so I have only compile tested this version.
common/env_common.c | 19 +++++++++++++------ include/environment.h | 4 ++-- 2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/common/env_common.c b/common/env_common.c index e6df9a5..5ac14e8 100644 --- a/common/env_common.c +++ b/common/env_common.c @@ -50,7 +50,6 @@ extern void env_relocate_spec (void); extern uchar env_get_char_spec(int);
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 @@ -183,6 +182,19 @@ uchar env_get_char_memory (int index) } #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) { if (gd->env_valid) { @@ -216,11 +228,6 @@ void env_relocate (void) DEBUGF ("%s[%d] malloced ENV at %p\n", __FUNCTION__,__LINE__,env_ptr); #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 defined(CONFIG_GTH) || defined(CFG_ENV_IS_NOWHERE) /* Environment not changable */ puts ("Using default environment\n\n"); diff --git a/include/environment.h b/include/environment.h index bf9f669..dcb7c5a 100644 --- a/include/environment.h +++ b/include/environment.h @@ -107,8 +107,8 @@ typedef struct environment_s { unsigned char data[ENV_SIZE]; /* Environment data */ } env_t;
-/* Pointer to function that returns a character from the environment */ -extern unsigned char (*env_get_char)(int); +/* Function that returns a character from the environment */ +unsigned char env_get_char (int);
/* Function that returns a pointer to a value from the environment */ unsigned char *env_get_addr(int);