diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-11-04 15:55:14 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-11-07 22:09:58 +0100 |
| commit | 40ac78a949e877a6e52ad3527e92aa51985a8c51 (patch) | |
| tree | 58dfb68b15419408da4cc7f0fcb438b5a62c5c05 | |
| parent | b633741bcd0d41573b0c9ca22db0ed83600c4ae3 (diff) | |
| download | u-boot-40ac78a949e877a6e52ad3527e92aa51985a8c51.zip u-boot-40ac78a949e877a6e52ad3527e92aa51985a8c51.tar.gz u-boot-40ac78a949e877a6e52ad3527e92aa51985a8c51.tar.bz2 | |
drivers/video/videomodes.c: fix GCC 4.6 build warning
Fix:
videomodes.c: In function 'video_get_params':
videomodes.c:162:13: warning: variable 't' set but not used
[-Wunused-but-set-variable]
Signed-off-by: Wolfgang Denk <wd@denx.de>
Acked-by: Anatolij Gustschin <agust@denx.de>
| -rw-r--r-- | drivers/video/videomodes.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/drivers/video/videomodes.c b/drivers/video/videomodes.c index 6fe5811..ef9bc4c 100644 --- a/drivers/video/videomodes.c +++ b/drivers/video/videomodes.c @@ -159,15 +159,18 @@ video_search_param (char *start, char *param) int video_get_params (struct ctfb_res_modes *pPar, char *penv) { char *p, *s, *val_s; - int i = 0, t; + int i = 0; int bpp; int mode; + /* first search for the environment containing the real param string */ s = penv; - if ((p = getenv (s)) != NULL) { + + if ((p = getenv (s)) != NULL) s = p; - } - /* in case of the bootargs line, we have to start + + /* + * in case of the bootargs line, we have to start * after "video=ctfb:" */ i = video_search_param (s, "video=ctfb:"); @@ -177,19 +180,22 @@ int video_get_params (struct ctfb_res_modes *pPar, char *penv) } /* search for mode as a default value */ p = s; - t = 0; mode = 0; /* default */ + while ((i = video_get_param_len (p, ',')) != 0) { GET_OPTION ("mode:", mode) p += i; if (*p != 0) p++; /* skip ',' */ } + if (mode >= RES_MODES_COUNT) mode = 0; + *pPar = res_mode_init[mode]; /* copy default values */ bpp = 24 - ((mode % 3) * 8); p = s; /* restart */ + while ((i = video_get_param_len (p, ',')) != 0) { GET_OPTION ("x:", pPar->xres) GET_OPTION ("y:", pPar->yres) |