diff options
author | Wolfgang Denk <wd@pollux.(none)> | 2005-09-23 11:05:55 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@pollux.(none)> | 2005-09-23 11:05:55 +0200 |
commit | 0c8721a466b5e0eca7e7fbe1007777fa82100541 (patch) | |
tree | 1f53decded27502be8593137739291a3de406d94 /common/cmd_dcr.c | |
parent | a6e6cf00367c0779eadb49915e40c55f0a787957 (diff) | |
download | u-boot-imx-0c8721a466b5e0eca7e7fbe1007777fa82100541.zip u-boot-imx-0c8721a466b5e0eca7e7fbe1007777fa82100541.tar.gz u-boot-imx-0c8721a466b5e0eca7e7fbe1007777fa82100541.tar.bz2 |
Cleanup (PPC4xx is AMCC now)
Diffstat (limited to 'common/cmd_dcr.c')
-rw-r--r-- | common/cmd_dcr.c | 120 |
1 files changed, 61 insertions, 59 deletions
diff --git a/common/cmd_dcr.c b/common/cmd_dcr.c index 3e4e08f..5842471 100644 --- a/common/cmd_dcr.c +++ b/common/cmd_dcr.c @@ -22,7 +22,7 @@ */ /* - * IBM 4XX DCR Functions + * AMCC 4XX DCR Functions */ #include <common.h> @@ -31,89 +31,91 @@ #if defined(CONFIG_4xx) && (CONFIG_COMMANDS & CFG_CMD_SETGETDCR) -/* ====================================================================== - * Interpreter command to retrieve an IBM PPC 4xx Device Control Register - * ====================================================================== +/* ======================================================================= + * Interpreter command to retrieve an AMCC PPC 4xx Device Control Register + * ======================================================================= */ int do_getdcr ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[] ) { - unsigned short dcrn; /* Device Control Register Num */ - unsigned long value; /* DCR's value */ + unsigned short dcrn; /* Device Control Register Num */ + unsigned long value; /* DCR's value */ - unsigned long get_dcr(unsigned short); + unsigned long get_dcr (unsigned short); - /* Validate arguments */ - if (argc < 2) { - printf("Usage:\n%s\n", cmdtp->usage); - return 1; - } + /* Validate arguments */ + if (argc < 2) { + printf ("Usage:\n%s\n", cmdtp->usage); + return 1; + } - /* Get a DCR */ - dcrn = (unsigned short)simple_strtoul(argv[ 1 ], NULL, 16); - value = get_dcr(dcrn); + /* Get a DCR */ + dcrn = (unsigned short) simple_strtoul (argv[1], NULL, 16); + value = get_dcr (dcrn); - printf("%04x: %08lx\n", dcrn, value); + printf ("%04x: %08lx\n", dcrn, value); - return 0; -} /* do_getdcr */ + return 0; +} /* ====================================================================== - * Interpreter command to set an IBM PPC 4xx Device Control Register + * Interpreter command to set an AMCC PPC 4xx Device Control Register * ====================================================================== */ -int do_setdcr ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +int do_setdcr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) { - unsigned long get_dcr(unsigned short ); - unsigned long set_dcr(unsigned short , unsigned long ); - unsigned short dcrn; /* Device Control Register Num */ - unsigned long value; - /* DCR's value */ - int nbytes; - extern char console_buffer[]; - - /* Validate arguments */ - if (argc < 2) { - printf("Usage:\n%s\n", cmdtp->usage); - return 1; - } - - /* Set a DCR */ - dcrn = (unsigned short)simple_strtoul(argv[1], NULL, 16); - do { - value = get_dcr(dcrn); - printf("%04x: %08lx", dcrn, value); - nbytes = readline(" ? "); - if (nbytes == 0) { - /* - * <CR> pressed as only input, don't modify current - * location and exit command. - */ - nbytes = 1; - return 0; - } else { - unsigned long i; - char *endp; - i = simple_strtoul(console_buffer, &endp, 16); - nbytes = endp - console_buffer; - if (nbytes) - set_dcr(dcrn, i); + unsigned long get_dcr (unsigned short); + unsigned long set_dcr (unsigned short, unsigned long); + unsigned short dcrn; /* Device Control Register Num */ + unsigned long value; + + /* DCR's value */ + int nbytes; + extern char console_buffer[]; + + /* Validate arguments */ + if (argc < 2) { + printf ("Usage:\n%s\n", cmdtp->usage); + return 1; } - } while (nbytes); - return 0; -} /* do_setdcr */ + /* Set a DCR */ + dcrn = (unsigned short) simple_strtoul (argv[1], NULL, 16); + do { + value = get_dcr (dcrn); + printf ("%04x: %08lx", dcrn, value); + nbytes = readline (" ? "); + if (nbytes == 0) { + /* + * <CR> pressed as only input, don't modify current + * location and exit command. + */ + nbytes = 1; + return 0; + } else { + unsigned long i; + char *endp; + + i = simple_strtoul (console_buffer, &endp, 16); + nbytes = endp - console_buffer; + if (nbytes) + set_dcr (dcrn, i); + } + } while (nbytes); + + return 0; +} /***************************************************/ U_BOOT_CMD( getdcr, 2, 1, do_getdcr, - "getdcr - Get an IBM PPC 4xx DCR's value\n", + "getdcr - Get an AMCC PPC 4xx DCR's value\n", "dcrn - return a DCR's value.\n" ); U_BOOT_CMD( setdcr, 2, 1, do_setdcr, - "setdcr - Set an IBM PPC 4xx DCR's value\n", + "setdcr - Set an AMCC PPC 4xx DCR's value\n", "dcrn - set a DCR's value.\n" ); |