diff options
Diffstat (limited to 'common/console.c')
| -rw-r--r-- | common/console.c | 76 |
1 files changed, 32 insertions, 44 deletions
diff --git a/common/console.c b/common/console.c index dc0d2655c0..9e7d6ad036 100644 --- a/common/console.c +++ b/common/console.c @@ -1,4 +1,4 @@ -/* Copyright 2012 The Chromium OS Authors. All rights reserved. +/* Copyright 2012 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -52,14 +52,14 @@ static int last_rx_was_cr; #ifndef CONFIG_EXPERIMENTAL_CONSOLE /* State of input escape code */ static enum { - ESC_OUTSIDE, /* Not in escape code */ - ESC_START, /* Got ESC */ - ESC_BAD, /* Bad escape sequence */ - ESC_BRACKET, /* Got ESC [ */ + ESC_OUTSIDE, /* Not in escape code */ + ESC_START, /* Got ESC */ + ESC_BAD, /* Bad escape sequence */ + ESC_BRACKET, /* Got ESC [ */ ESC_BRACKET_1, /* Got ESC [ 1 */ ESC_BRACKET_3, /* Got ESC [ 3 */ ESC_BRACKET_4, /* Got ESC [ 4 */ - ESC_O, /* Got ESC O */ + ESC_O, /* Got ESC O */ } esc_state; #endif /* !defined(CONFIG_EXPERIMENTAL_CONSOLE) */ @@ -85,7 +85,7 @@ enum extended_key_code { * @return EC_SUCCESS. If more than MAX_ARGS_PER_COMMAND words are found, * discards the excess and returns EC_ERROR_OVERFLOW. */ -static int split_words(char *input, int *argc, char **argv) +static int split_words(char *input, int *argc, const char **argv) { char *c; int in_word = 0; @@ -129,7 +129,7 @@ static int split_words(char *input, int *argc, char **argv) * * @return A pointer to the command structure, or NULL if no match found. */ -static const struct console_command *find_command(char *name) +static const struct console_command *find_command(const char *name) { const struct console_command *cmd, *match = NULL; int match_length = strlen(name); @@ -151,18 +151,10 @@ static const struct console_command *find_command(char *name) return match; } - static const char *const errmsgs[] = { - "OK", - "Unknown error", - "Unimplemented", - "Overflow", - "Timeout", - "Invalid argument", - "Busy", - "Access Denied", - "Not Powered", - "Not Calibrated", + "OK", "Unknown error", "Unimplemented", "Overflow", + "Timeout", "Invalid argument", "Busy", "Access Denied", + "Not Powered", "Not Calibrated", }; /** @@ -175,7 +167,7 @@ static const char *const errmsgs[] = { static int handle_command(char *input) { const struct console_command *cmd; - char *argv[MAX_ARGS_PER_COMMAND]; + const char *argv[MAX_ARGS_PER_COMMAND]; int argc = 0; int rv; #ifdef CONFIG_EXPERIMENTAL_CONSOLE @@ -205,10 +197,10 @@ static int handle_command(char *input) i = input[1] == '&' ? 2 : 1; /* Next, there should be 4 hex digits: XXYY + '&' */ - if (i+5 > input_len) + if (i + 5 > input_len) goto command_has_error; /* Replace the '&' with null so we can call strtoi(). */ - input[i+4] = 0; + input[i + 4] = 0; j = strtoi(input + i, &e, 16); if (*e) goto command_has_error; @@ -218,10 +210,10 @@ static int handle_command(char *input) i += 5; /* Lastly, verify the CRC8 of the command. */ - if (i+command_len > input_len) + if (i + command_len > input_len) goto command_has_error; if (packed_crc8 != cros_crc8(&input[i], command_len)) { -command_has_error: + command_has_error: /* Send back the error string. */ ccprintf("&&EE\n"); return EC_ERROR_UNKNOWN; @@ -248,7 +240,7 @@ command_has_error: rv = EC_ERROR_ACCESS_DENIED; else #endif - rv = cmd->handler(argc, argv); + rv = cmd->handler(argc, argv); if (rv == EC_SUCCESS) return rv; @@ -372,7 +364,7 @@ static void save_history(void) static void handle_backspace(void) { if (!input_pos) - return; /* Already at beginning of line */ + return; /* Already at beginning of line */ /* Move cursor back */ console_putc('\b'); @@ -380,8 +372,7 @@ static void handle_backspace(void) /* Print and move anything following the cursor position */ if (input_pos != input_len) { ccputs(input_buf + input_pos); - memmove(input_buf + input_pos - 1, - input_buf + input_pos, + memmove(input_buf + input_pos - 1, input_buf + input_pos, input_len - input_pos + 1); } else { input_buf[input_len - 1] = '\0'; @@ -511,7 +502,7 @@ static void console_handle_char(int c) #ifndef CONFIG_EXPERIMENTAL_CONSOLE case KEY_DEL: if (input_pos == input_len) - break; /* Already at end */ + break; /* Already at end */ move_cursor_right(); @@ -544,8 +535,8 @@ static void console_handle_char(int c) /* Save command in history buffer */ if (input_len) { save_history(); - history_next = (history_next + 1) % - CONFIG_CONSOLE_HISTORY; + history_next = + (history_next + 1) % CONFIG_CONSOLE_HISTORY; history_pos = history_next; } #endif @@ -692,7 +683,7 @@ void console_task(void *u) console_handle_char(c); } - task_wait_event(-1); /* Wait for more input */ + task_wait_event(-1); /* Wait for more input */ } } @@ -700,10 +691,10 @@ void console_task(void *u) /* Console commands */ /* Command handler - prints help. */ -static int command_help(int argc, char **argv) +static int command_help(int argc, const char **argv) { const int ncmds = __cmds_end - __cmds; - const int cols = 5; /* printing in five columns */ + const int cols = 5; /* printing in five columns */ const int rows = (ncmds + cols - 1) / cols; int i, j; @@ -715,16 +706,15 @@ static int command_help(int argc, char **argv) #ifdef CONFIG_CONSOLE_COMMAND_FLAGS ccputs("Command Flags Description\n"); for (i = 0; i < ncmds; i++) { - ccprintf(" %-14s %x %s\n", - __cmds[i].name, __cmds[i].flags, - __cmds[i].help); + ccprintf(" %-14s %x %s\n", __cmds[i].name, + __cmds[i].flags, __cmds[i].help); cflush(); } #else ccputs("Known commands:\n"); for (i = 0; i < ncmds; i++) { - ccprintf(" %-15s%s\n", - __cmds[i].name, __cmds[i].help); + ccprintf(" %-15s%s\n", __cmds[i].name, + __cmds[i].help); cflush(); } #endif @@ -771,12 +761,11 @@ static int command_help(int argc, char **argv) return EC_SUCCESS; } -DECLARE_SAFE_CONSOLE_COMMAND(help, command_help, - "[ list | <name> ]", +DECLARE_SAFE_CONSOLE_COMMAND(help, command_help, "[ list | <name> ]", "Print command help"); #ifdef CONFIG_CONSOLE_HISTORY -static int command_history(int argc, char **argv) +static int command_history(int argc, const char **argv) { int i; @@ -788,7 +777,6 @@ static int command_history(int argc, char **argv) return EC_SUCCESS; } -DECLARE_SAFE_CONSOLE_COMMAND(history, command_history, - NULL, +DECLARE_SAFE_CONSOLE_COMMAND(history, command_history, NULL, "Print console history"); #endif |