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

cmd_bdinfo: simplify local static funcs a bit

Browse Source 
If we move the local funcs to the top of the file, and use the
__maybe_unused define, we can drop a lot of ugly ifdef logic and
duplicated prototypes.

Acked-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2011-12-04 17:45:22 +00:00 committed by Wolfgang Denk
parent 5c45a22b92
commit d88af4da9a
1 changed files with 31 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
common/cmd_bdinfo.c
View File

@ -26,25 +26,44 @@
*/ */
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <linux/compiler.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
static void print_num(const char *, ulong); __maybe_unused
static void print_num(const char *name, ulong value)
{
printf("%-12s= 0x%08lX\n", name, value);
}
#if !(defined(CONFIG_ARM) || defined(CONFIG_M68K) || \ static void print_eth(int idx)
defined(CONFIG_SANDBOX) || defined(CONFIG_X86)) \ {
|| defined(CONFIG_CMD_NET) char name[10], *val;
#define HAVE_PRINT_ETH if (idx)
static void print_eth(int idx); sprintf(name, "eth%iaddr", idx);
#endif else
strcpy(name, "ethaddr");
val = getenv(name);
if (!val)
val = "(not set)";
printf("%-12s= %s\n", name, val);
}
#if (!defined(CONFIG_ARM) && !defined(CONFIG_X86) && !defined(CONFIG_SANDBOX)) __maybe_unused
#define HAVE_PRINT_LNUM static void print_lnum(const char *name, u64 value)
static void print_lnum(const char *, u64); {
#endif printf("%-12s= 0x%.8llX\n", name, value);
}
__maybe_unused
static void print_mhz(const char *name, unsigned long hz)
{
char buf[32];
printf("%-12s= %6s MHz\n", name, strmhz(buf, hz));
}
#if defined(CONFIG_PPC) #if defined(CONFIG_PPC)
static void print_mhz(const char *, unsigned long);
int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
@ -209,8 +228,6 @@ int do_bdinfo(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
#elif defined(CONFIG_M68K) #elif defined(CONFIG_M68K)
static void print_mhz(const char *, unsigned long);
int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
bd_t *bd = gd->bd; bd_t *bd = gd->bd;
@ -258,8 +275,6 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
#elif defined(CONFIG_BLACKFIN) #elif defined(CONFIG_BLACKFIN)
static void print_mhz(const char *, unsigned long);
int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
bd_t *bd = gd->bd; bd_t *bd = gd->bd;
@ -378,8 +393,6 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
#elif defined(CONFIG_X86) #elif defined(CONFIG_X86)
static void print_mhz(const char *, unsigned long);
int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
int i; int i;
@ -465,46 +478,6 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
#error "a case for this architecture does not exist!" #error "a case for this architecture does not exist!"
#endif #endif
static void print_num(const char *name, ulong value)
{
printf("%-12s= 0x%08lX\n", name, value);
}
#ifdef HAVE_PRINT_ETH
static void print_eth(int idx)
{
char name[10], *val;
if (idx)
sprintf(name, "eth%iaddr", idx);
else
strcpy(name, "ethaddr");
val = getenv(name);
if (!val)
val = "(not set)";
printf("%-12s= %s\n", name, val);
}
#endif
#ifdef HAVE_PRINT_LNUM
static void print_lnum(const char *name, u64 value)
{
printf("%-12s= 0x%.8llX\n", name, value);
}
#endif
#if defined(CONFIG_PPC) || \
defined(CONFIG_M68K) || \
defined(CONFIG_BLACKFIN) || \
defined(CONFIG_X86)
static void print_mhz(const char *name, unsigned long hz)
{
char buf[32];
printf("%-12s= %6s MHz\n", name, strmhz(buf, hz));
}
#endif /* CONFIG_PPC */
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
U_BOOT_CMD( U_BOOT_CMD(