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

cm5200: Make function test command names more unique

Browse Source 
Add "_test" to cm5200's function test command names to prevent
overlap with common, global function names.  Originally, the
"do_i2c" function test command interfered with
common/cmd_i2c.c's "do_i2c" when CONFIG_I2C_CMD_TREE was defined.

The functions were also made static as they are not globally accessed.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
This commit is contained in:
Peter Tyser 2009-04-18 22:34:00 -05:00 committed by Wolfgang Denk
parent f0722ee762
commit 8229e9c04f
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
board/cm5200/cmd_cm5200.c
View File

@ -29,7 +29,7 @@
#ifdef CONFIG_CMD_BSP
int do_i2c(char *argv[])
static int do_i2c_test(char *argv[])
{
unsigned char temp, temp1;
@ -57,7 +57,7 @@ int do_i2c(char *argv[])
return 0;
}
int do_usbtest(char *argv[])
static int do_usb_test(char *argv[])
{
int i;
static int usb_stor_curr_dev = -1; /* current device */
@ -90,7 +90,7 @@ int do_usbtest(char *argv[])
return 0;
}
int do_led(char *argv[])
static int do_led_test(char *argv[])
{
int i = 0;
struct mpc5xxx_gpt_0_7 *gpt = (struct mpc5xxx_gpt_0_7 *)MPC5XXX_GPT;
@ -134,7 +134,7 @@ int do_led(char *argv[])
return 0;
}
int do_rs232(char *argv[])
static int do_rs232_test(char *argv[])
{
int error_status = 0;
struct mpc5xxx_gpio *gpio = (struct mpc5xxx_gpio *)MPC5XXX_GPIO;
@ -397,22 +397,22 @@ int do_rs232(char *argv[])
return error_status;
}
int cmd_fkt(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
static int cmd_fkt(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
int rcode = -1;
switch (argc) {
case 2:
if (strncmp(argv[1], "i2c", 3) == 0)
rcode = do_i2c(argv);
rcode = do_i2c_test(argv);
else if (strncmp(argv[1], "led", 3) == 0)
rcode = do_led(argv);
rcode = do_led_test(argv);
else if (strncmp(argv[1], "usb", 3) == 0)
rcode = do_usbtest(argv);
rcode = do_usb_test(argv);
break;
case 3:
if (strncmp(argv[1], "rs232", 3) == 0)
rcode = do_rs232(argv);
rcode = do_rs232_test(argv);
break;
}