sf: unify status register writing (and thus block unlocking)

[J-u-boot.git] / common / cmd_dcr.c

diff --git a/common/cmd_dcr.c b/common/cmd_dcr.c
index 12fa9db08d07bcd5037467c65f1f3d329beb503d..d3bbc36c58cdbe10113ba6755b47b2e47eba5479 100644 (file)
--- a/common/cmd_dcr.c
+++ b/common/cmd_dcr.c
@@ -29,8 +29,6 @@
 #include <config.h>
 #include <command.h>
 
-#if defined(CONFIG_4xx) && defined(CONFIG_CMD_SETGETDCR)
-
 unsigned long get_dcr (unsigned short);
 unsigned long set_dcr (unsigned short, unsigned long);
 
@@ -38,7 +36,7 @@ unsigned long set_dcr (unsigned short, unsigned long);
  * Interpreter command to retrieve an AMCC PPC 4xx Device Control Register
  * =======================================================================
  */
-int do_getdcr ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[] )
+int do_getdcr ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[] )
 {
        unsigned short dcrn;    /* Device Control Register Num */
        unsigned long value;    /* DCR's value */
@@ -46,10 +44,8 @@ int do_getdcr ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[] )
        unsigned long get_dcr (unsigned short);
 
        /* Validate arguments */
-       if (argc < 2) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
-               return 1;
-       }
+       if (argc < 2)
+               return CMD_RET_USAGE;
 
        /* Get a DCR */
        dcrn = (unsigned short) simple_strtoul (argv[1], NULL, 16);
@@ -65,20 +61,17 @@ int do_getdcr ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[] )
  * 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 * const argv[])
 {
        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;
-       }
+       if (argc < 2)
+               return CMD_RET_USAGE;
 
        /* Set a DCR */
        dcrn = (unsigned short) simple_strtoul (argv[1], NULL, 16);
@@ -112,7 +105,7 @@ int do_setdcr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
  * Device Control Register inderect addressing.
  * =======================================================================
  */
-int do_getidcr (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_getidcr (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        unsigned short adr_dcrn;        /* Device Control Register Num for Address */
        unsigned short dat_dcrn;        /* Device Control Register Num for Data */
@@ -122,10 +115,8 @@ int do_getidcr (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        char buf[80];
 
        /* Validate arguments */
-       if (argc < 3) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
-               return 1;
-       }
+       if (argc < 3)
+               return CMD_RET_USAGE;
 
        /* Find out whether ther is '.' (dot) symbol in the first parameter. */
        strncpy (buf, argv[1], sizeof(buf)-1);
@@ -168,7 +159,7 @@ int do_getidcr (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
  * Device Control Register inderect addressing.
  * =======================================================================
  */
-int do_setidcr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+int do_setidcr (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        unsigned short adr_dcrn;        /* Device Control Register Num for Address */
        unsigned short dat_dcrn;        /* Device Control Register Num for Data */
@@ -178,10 +169,8 @@ int do_setidcr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        char buf[80];
 
        /* Validate arguments */
-       if (argc < 4) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
-               return 1;
-       }
+       if (argc < 4)
+               return CMD_RET_USAGE;
 
        /* Find out whether ther is '.' (dot) symbol in the first parameter. */
        strncpy (buf, argv[1], sizeof(buf)-1);
@@ -225,25 +214,23 @@ int do_setidcr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        getdcr, 2,      1,      do_getdcr,
-       "getdcr  - Get an AMCC PPC 4xx DCR's value\n",
-       "dcrn - return a DCR's value.\n"
+       "Get an AMCC PPC 4xx DCR's value",
+       "dcrn - return a DCR's value."
 );
 U_BOOT_CMD(
        setdcr, 2,      1,      do_setdcr,
-       "setdcr  - Set an AMCC PPC 4xx DCR's value\n",
-       "dcrn - set a DCR's value.\n"
+       "Set an AMCC PPC 4xx DCR's value",
+       "dcrn - set a DCR's value."
 );
 
 U_BOOT_CMD(
        getidcr,        3,      1,      do_getidcr,
-       "getidcr - Get a register value via indirect DCR addressing\n",
-       "adr_dcrn[.dat_dcrn] offset - write offset to adr_dcrn, read value from dat_dcrn.\n"
+       "Get a register value via indirect DCR addressing",
+       "adr_dcrn[.dat_dcrn] offset - write offset to adr_dcrn, read value from dat_dcrn."
 );
 
 U_BOOT_CMD(
        setidcr,        4,      1,      do_setidcr,
-       "setidcr - Set a register value via indirect DCR addressing\n",
-       "adr_dcrn[.dat_dcrn] offset value - write offset to adr_dcrn, write value to dat_dcrn.\n"
+       "Set a register value via indirect DCR addressing",
+       "adr_dcrn[.dat_dcrn] offset value - write offset to adr_dcrn, write value to dat_dcrn."
 );
-
-#endif