brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 15:26:03 +09:00
Code Issues Projects Releases Wiki Activity

console: rename search_device() to console_search_dev()

Browse Source 
Rename search_device() to console_search_dev() since it's in console.h.

Suggested-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Andy Shevchenko 2020-12-21 14:30:03 +02:00 committed by Tom Rini
parent e645b9bd8d
commit 3232487daf
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common/console.c
View File

@ -832,7 +832,7 @@ void clear_ctrlc(void)
/** U-Boot INIT FUNCTIONS *************************************************/ /** U-Boot INIT FUNCTIONS *************************************************/
struct stdio_dev *search_device(int flags, const char *name) struct stdio_dev *console_search_dev(int flags, const char *name)
{ {
struct stdio_dev *dev; struct stdio_dev *dev;
@ -868,7 +868,7 @@ int console_assign(int file, const char *devname)
/* Check for valid device name */ /* Check for valid device name */
dev = search_device(flag, devname); dev = console_search_dev(flag, devname);
if (dev) if (dev)
return console_setfile(file, dev); return console_setfile(file, dev);
@ -974,9 +974,9 @@ int console_init_r(void)
stderrname = env_get("stderr"); stderrname = env_get("stderr");
if (OVERWRITE_CONSOLE == 0) { /* if not overwritten by config switch */ if (OVERWRITE_CONSOLE == 0) { /* if not overwritten by config switch */
inputdev = search_device(DEV_FLAGS_INPUT, stdinname); inputdev = console_search_dev(DEV_FLAGS_INPUT, stdinname);
outputdev = search_device(DEV_FLAGS_OUTPUT, stdoutname); outputdev = console_search_dev(DEV_FLAGS_OUTPUT, stdoutname);
errdev = search_device(DEV_FLAGS_OUTPUT, stderrname); errdev = console_search_dev(DEV_FLAGS_OUTPUT, stderrname);
if (CONFIG_IS_ENABLED(CONSOLE_MUX)) { if (CONFIG_IS_ENABLED(CONSOLE_MUX)) {
iomux_err = iomux_doenv(stdin, stdinname); iomux_err = iomux_doenv(stdin, stdinname);
iomux_err += iomux_doenv(stdout, stdoutname); iomux_err += iomux_doenv(stdout, stdoutname);
@ -988,13 +988,13 @@ int console_init_r(void)
} }
/* if the devices are overwritten or not found, use default device */ /* if the devices are overwritten or not found, use default device */
if (inputdev == NULL) { if (inputdev == NULL) {
inputdev = search_device(DEV_FLAGS_INPUT, "serial"); inputdev = console_search_dev(DEV_FLAGS_INPUT, "serial");
} }
if (outputdev == NULL) { if (outputdev == NULL) {
outputdev = search_device(DEV_FLAGS_OUTPUT, "serial"); outputdev = console_search_dev(DEV_FLAGS_OUTPUT, "serial");
} }
if (errdev == NULL) { if (errdev == NULL) {
errdev = search_device(DEV_FLAGS_OUTPUT, "serial"); errdev = console_search_dev(DEV_FLAGS_OUTPUT, "serial");
} }
/* Initializes output console first */ /* Initializes output console first */
if (outputdev != NULL) { if (outputdev != NULL) {
@ -1064,7 +1064,7 @@ int console_init_r(void)
*/ */
if (IS_ENABLED(CONFIG_SPLASH_SCREEN) && env_get("splashimage")) { if (IS_ENABLED(CONFIG_SPLASH_SCREEN) && env_get("splashimage")) {
if (!(gd->flags & GD_FLG_SILENT)) if (!(gd->flags & GD_FLG_SILENT))
outputdev = search_device (DEV_FLAGS_OUTPUT, "serial"); outputdev = console_search_dev (DEV_FLAGS_OUTPUT, "serial");
} }
/* Scan devices looking for input and output devices */ /* Scan devices looking for input and output devices */

4
common/iomux.c
View File

@ -95,10 +95,10 @@ int iomux_doenv(const int console, const char *arg)
for (j = 0; j < i; j++) { for (j = 0; j < i; j++) {
/* /*
* Check whether the device exists and is valid. * Check whether the device exists and is valid.
* console_assign() also calls search_device(), * console_assign() also calls console_search_dev(),
* but I need the pointer to the device. * but I need the pointer to the device.
*/ */
dev = search_device(io_flag, start[j]); dev = console_search_dev(io_flag, start[j]);
if (dev == NULL) if (dev == NULL)
continue; continue;
/* /*

4
common/stdio.c
View File

@ -181,7 +181,7 @@ struct stdio_dev *stdio_get_by_name(const char *name)
* 'stdout', which may include a list of devices separate by * 'stdout', which may include a list of devices separate by
* commas. Obviously this is not going to work, so we ignore * commas. Obviously this is not going to work, so we ignore
* that case. The call path in that case is * that case. The call path in that case is
* console_init_r() -> search_device() -> stdio_get_by_name() * console_init_r() -> console_search_dev() -> stdio_get_by_name()
*/ */
if (!strncmp(name, "vidconsole", 10) && !strchr(name, ',') && if (!strncmp(name, "vidconsole", 10) && !strchr(name, ',') &&
!stdio_probe_device(name, UCLASS_VIDEO, &sdev)) !stdio_probe_device(name, UCLASS_VIDEO, &sdev))
@ -332,7 +332,7 @@ int stdio_add_devices(void)
/* /*
* If the console setting is not in environment variables then * If the console setting is not in environment variables then
* console_init_r() will not be calling iomux_doenv() (which * console_init_r() will not be calling iomux_doenv() (which
* calls search_device()). So we will not dynamically add * calls console_search_dev()). So we will not dynamically add
* devices by calling stdio_probe_device(). * devices by calling stdio_probe_device().
* *
* So just probe all video devices now so that whichever one is * So just probe all video devices now so that whichever one is

2
include/console.h
View File

@ -25,7 +25,7 @@ void clear_ctrlc(void); /* clear the Control-C condition */
int disable_ctrlc(int); /* 1 to disable, 0 to enable Control-C detect */ int disable_ctrlc(int); /* 1 to disable, 0 to enable Control-C detect */
int confirm_yesno(void); /* 1 if input is "y", "Y", "yes" or "YES" */ int confirm_yesno(void); /* 1 if input is "y", "Y", "yes" or "YES" */
struct stdio_dev *search_device(int flags, const char *name); struct stdio_dev *console_search_dev(int flags, const char *name);
#ifdef CONFIG_CONSOLE_RECORD #ifdef CONFIG_CONSOLE_RECORD
/** /**