Move console definitions into a new console.h file

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

diff --git a/common/cmd_dcr.c b/common/cmd_dcr.c
index 12fa9db08d07bcd5037467c65f1f3d329beb503d..cc77250ac8239f91f40223d768a8cbd7c5b8eb38 100644 (file)
--- a/common/cmd_dcr.c
+++ b/common/cmd_dcr.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2001
  * Erik Theisen,  Wave 7 Optics, [email protected].
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -26,10 +10,10 @@
  */
 
 #include <common.h>
+#include <cli.h>
 #include <config.h>
 #include <command.h>
-
-#if defined(CONFIG_4xx) && defined(CONFIG_CMD_SETGETDCR)
+#include <console.h>
 
 unsigned long get_dcr (unsigned short);
 unsigned long set_dcr (unsigned short, unsigned long);
@@ -38,7 +22,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 +30,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,27 +47,24 @@ 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);
        do {
                value = get_dcr (dcrn);
                printf ("%04x: %08lx", dcrn, value);
-               nbytes = readline (" ? ");
+               nbytes = cli_readline(" ? ");
                if (nbytes == 0) {
                        /*
                         * <CR> pressed as only input, don't modify current
@@ -112,7 +91,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 +101,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 +145,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 +155,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 +200,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