diff --git a/arch/ppc/mach-mpc85xx/fdt.c b/arch/ppc/mach-mpc85xx/fdt.c index 4feae44..65de6f1 100644 --- a/arch/ppc/mach-mpc85xx/fdt.c +++ b/arch/ppc/mach-mpc85xx/fdt.c @@ -70,9 +70,7 @@ goto error; } - for_each_console(cdev) - if ((cdev->f_active & (CONSOLE_STDIN | CONSOLE_STDOUT))) - break; + cdev = console_get_first_active(); if (cdev) sprintf(sername, "serial%d", cdev->dev->id); else diff --git a/commands/loadb.c b/commands/loadb.c index a2f3315..b527e00 100644 --- a/commands/loadb.c +++ b/commands/loadb.c @@ -591,26 +591,6 @@ } /** - * @brief returns current used console device - * - * @return console device which is registered with CONSOLE_STDIN and - * CONSOLE_STDOUT - */ -static struct console_device *get_current_console(void) -{ - struct console_device *cdev; - /* - * Assumption to have BOTH CONSOLE_STDIN AND STDOUT in the - * same output console - */ - for_each_console(cdev) { - if ((cdev->f_active & (CONSOLE_STDIN | CONSOLE_STDOUT))) - return cdev; - } - return NULL; -} - -/** * @brief provide the loadb(Kermit) or loadY mode support * * @param cmdtp @@ -650,7 +630,7 @@ } } - cdev = get_current_console(); + cdev = console_get_first_active(); if (NULL == cdev) { printf("%s:No console device with STDIN and STDOUT\n", argv[0]); return -ENODEV; diff --git a/commands/loadxy.c b/commands/loadxy.c index 52ecdca..7a91286 100644 --- a/commands/loadxy.c +++ b/commands/loadxy.c @@ -40,26 +40,6 @@ #define DEF_FILE "image.bin" -/** - * @brief returns current used console device - * - * @return console device which is registered with CONSOLE_STDIN and - * CONSOLE_STDOUT - */ -static struct console_device *get_current_console(void) -{ - struct console_device *cdev; - /* - * Assumption to have BOTH CONSOLE_STDIN AND STDOUT in the - * same output console - */ - for_each_console(cdev) { - if ((cdev->f_active & (CONSOLE_STDIN | CONSOLE_STDOUT))) - return cdev; - } - return NULL; -} - static int console_change_speed(struct console_device *cdev, int baudrate) { int current_baudrate; @@ -134,7 +114,7 @@ if (cname) cdev = get_named_console(cname); else - cdev = get_current_console(); + cdev = console_get_first_active(); if (!cdev) { printf("%s:No console device %s with STDIN and STDOUT\n", argv[0], cname ? cname : "default"); @@ -202,7 +182,7 @@ if (cname) cdev = get_named_console(cname); else - cdev = get_current_console(); + cdev = console_get_first_active(); if (!cdev) { printf("%s:No console device %s with STDIN and STDOUT\n", argv[0], cname ? cname : "default"); diff --git a/common/console_common.c b/common/console_common.c index d139d1a..a3aca6f 100644 --- a/common/console_common.c +++ b/common/console_common.c @@ -108,3 +108,25 @@ return 0; } EXPORT_SYMBOL(fputc); + +/* + * @brief returns current used console device + * + * @return console device which is registered with CONSOLE_STDIN and + * CONSOLE_STDOUT + */ +struct console_device *console_get_first_active(void) +{ + struct console_device *cdev; + /* + * Assumption to have BOTH CONSOLE_STDIN AND STDOUT in the + * same output console + */ + for_each_console(cdev) { + if ((cdev->f_active & (CONSOLE_STDIN | CONSOLE_STDOUT))) + return cdev; + } + + return NULL; +} +EXPORT_SYMBOL(console_get_first_active); diff --git a/include/console.h b/include/console.h index 56e0484..707ba92 100644 --- a/include/console.h +++ b/include/console.h @@ -53,4 +53,6 @@ #define CFG_PBSIZE (CONFIG_CBSIZE+sizeof(CONFIG_PROMPT)+16) +struct console_device *console_get_first_active(void); + #endif