1
0
Fork 0

move CLI prototypes to cli.h and add comments

Move the CLI prototypes from common.h to cli.h as part of an effort to
reduce the size of common.h.

Signed-off-by: Simon Glass <sjg@chromium.org>
utp
Simon Glass 2014-04-10 20:01:25 -06:00 committed by Tom Rini
parent eca86fad3d
commit 18d66533ac
18 changed files with 118 additions and 4 deletions

View File

@ -8,6 +8,7 @@
*/
#include <common.h>
#include <cli.h>
#include <errno.h>
#include <linux/mtd/nand.h>
#include <nand.h>

View File

@ -8,6 +8,7 @@
*/
#include <common.h>
#include <cli.h>
#include <command.h>
#include "yucca.h"
#include <i2c.h>

View File

@ -7,6 +7,7 @@
/* includes */
#include <common.h>
#include <cli.h>
#include <linux/ctype.h>
#include <pci.h>
#include <net.h>

View File

@ -14,6 +14,7 @@
* SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
#include <cli.h>
#include <linux/ctype.h>
#include <commproc.h>
#include "mpc8xx.h"

View File

@ -8,6 +8,7 @@
*/
#include <common.h>
#include <cli.h>
#include <mpc8260.h>
#include <mpc8260_irq.h>
#include <ioports.h>

View File

@ -6,6 +6,7 @@
*/
#include <common.h>
#include <cli.h>
int
hymod_get_serno (const char *prompt)

View File

@ -79,6 +79,7 @@
#include <malloc.h> /* malloc, free, realloc*/
#include <linux/ctype.h> /* isalpha, isdigit */
#include <common.h> /* readline */
#include <cli.h>
#include <cli_hush.h>
#include <command.h> /* find_cmd */
#ifndef CONFIG_SYS_PROMPT_HUSH_PS2

View File

@ -3,6 +3,7 @@
*/
#include <common.h>
#include <cli.h>
#include <command.h>
#include <linux/ctype.h>
#include <net.h>

View File

@ -10,6 +10,7 @@
*/
#include <common.h>
#include <cli.h>
#include <config.h>
#include <command.h>

View File

@ -66,6 +66,7 @@
*/
#include <common.h>
#include <cli.h>
#include <command.h>
#include <edid.h>
#include <environment.h>

View File

@ -12,6 +12,7 @@
*/
#include <common.h>
#include <cli.h>
#include <command.h>
#ifdef CONFIG_HAS_DATAFLASH
#include <dataflash.h>

View File

@ -25,6 +25,7 @@
*/
#include <common.h>
#include <cli.h>
#include <command.h>
#include <environment.h>
#include <search.h>

View File

@ -14,6 +14,7 @@
*/
#include <common.h>
#include <cli.h>
#include <command.h>
#include <asm/processor.h>
#include <asm/io.h>

View File

@ -12,6 +12,7 @@
/* #define DEBUG */
#include <common.h>
#include <cli.h>
#include <command.h>
#include <fdtdec.h>
#include <cli_hush.h>

View File

@ -5,6 +5,7 @@
*/
#include <common.h>
#include <cli.h>
#include <malloc.h>
#include <errno.h>
#include <linux/list.h>

View File

@ -12,6 +12,7 @@
*/
#include <common.h>
#include <cli.h>
#include <linux/ctype.h>
#include <asm/types.h>
#include <asm/io.h>

102
include/cli.h 100644
View File

@ -0,0 +1,102 @@
/*
* (C) Copyright 2014 Google, Inc
* Simon Glass <sjg@chromium.org>
*
* SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CLI_H
#define __CLI_H
/**
* Go into the command loop
*
* This will return if we get a timeout waiting for a command. See
* CONFIG_BOOT_RETRY_TIME.
*/
void cli_loop(void);
/**
* cli_simple_run_command() - Execute a command with the simple CLI
*
* @cmd: String containing the command to execute
* @flag Flag value - see CMD_FLAG_...
* @return 1 - command executed, repeatable
* 0 - command executed but not repeatable, interrupted commands are
* always considered not repeatable
* -1 - not executed (unrecognized, bootd recursion or too many args)
* (If cmd is NULL or "" or longer than CONFIG_SYS_CBSIZE-1 it is
* considered unrecognized)
*/
int cli_simple_run_command(const char *cmd, int flag);
/**
* cli_simple_run_command_list() - Execute a list of command
*
* The commands should be separated by ; or \n and will be executed
* by the built-in parser.
*
* This function cannot take a const char * for the command, since if it
* finds newlines in the string, it replaces them with \0.
*
* @param cmd String containing list of commands
* @param flag Execution flags (CMD_FLAG_...)
* @return 0 on success, or != 0 on error.
*/
int cli_simple_run_command_list(char *cmd, int flag);
/**
* cli_readline() - read a line into the console_buffer
*
* This is a convenience function which calls cli_readline_into_buffer().
*
* @prompt: Prompt to display
* @return command line length excluding terminator, or -ve on error
*/
int readline(const char *const prompt);
/**
* readline_into_buffer() - read a line into a buffer
*
* Display the prompt, then read a command line into @buffer. The
* maximum line length is CONFIG_SYS_CBSIZE including a \0 terminator, which
* will always be added.
*
* The command is echoed as it is typed. Command editing is supported if
* CONFIG_CMDLINE_EDITING is defined. Tab auto-complete is supported if
* CONFIG_AUTO_COMPLETE is defined. If CONFIG_BOOT_RETRY_TIME is defined,
* then a timeout will be applied.
*
* If CONFIG_BOOT_RETRY_TIME is defined and retry_time >= 0,
* time out when time goes past endtime (timebase time in ticks).
*
* @prompt: Prompt to display
* @buffer: Place to put the line that is entered
* @timeout: Timeout in milliseconds, 0 if none
* @return command line length excluding terminator, or -ve on error: of the
* timeout is exceeded (either CONFIG_BOOT_RETRY_TIME or the timeout
* parameter), then -2 is returned. If a break is detected (Ctrl-C) then
* -1 is returned.
*/
int readline_into_buffer(const char *const prompt, char *buffer, int timeout);
/**
* parse_line() - split a command line down into separate arguments
*
* The argv[] array is filled with pointers into @line, and each argument
* is terminated by \0 (i.e. @line is changed in the process unless there
* is only one argument).
*
* #argv is terminated by a NULL after the last argument pointer.
*
* At most CONFIG_SYS_MAXARGS arguments are permited - if there are more
* than that then an error is printed, and this function returns
* CONFIG_SYS_MAXARGS, with argv[] set up to that point.
*
* @line: Command line to parse
* @args: Array to hold arguments
* @return number of arguments
*/
int parse_line(char *line, char *argv[]);
#endif

View File

@ -286,10 +286,6 @@ int run_command(const char *cmd, int flag);
* @return 0 on success, or != 0 on error.
*/
int run_command_list(const char *cmd, int len, int flag);
int readline (const char *const prompt);
int readline_into_buffer(const char *const prompt, char *buffer,
int timeout);
int parse_line (char *, char *[]);
void init_cmd_timeout(void);
void reset_cmd_timeout(void);
extern char console_buffer[];