diff options
| author | Peter Tyser <ptyser@xes-inc.com> | 2009-04-18 22:34:00 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-06-12 20:39:45 +0200 |
| commit | 8229e9c04f7019ddd76aea05d4dca044cbc9a34a (patch) | |
| tree | b819bd0a41c210674f697d6720d53455e7df9ac2 /board/cm5200 | |
| parent | f0722ee762e8dada9d7f74ac2745e043f83aae85 (diff) | |
| download | blackbird-obmc-uboot-8229e9c04f7019ddd76aea05d4dca044cbc9a34a.tar.gz blackbird-obmc-uboot-8229e9c04f7019ddd76aea05d4dca044cbc9a34a.zip | |
cm5200: Make function test command names more unique
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>
Diffstat (limited to 'board/cm5200')
| -rw-r--r-- | board/cm5200/cmd_cm5200.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/board/cm5200/cmd_cm5200.c b/board/cm5200/cmd_cm5200.c index 52f031cbb2..f009eede27 100644 --- a/board/cm5200/cmd_cm5200.c +++ b/board/cm5200/cmd_cm5200.c @@ -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; } |
