diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 07:59:18 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 07:59:18 +0200 |
| commit | 574947ef76428803c3a2cbe8a02f294e3227d8e0 (patch) | |
| tree | 20ef37824aa8b169faf6cb87868aa7de912811a8 /commands | |
| parent | fb0c2ee1ae85b9f5127c37e604b92899a907082c (diff) | |
| parent | 6a5121f74894ed2d3514b59bd287d126eb7f1488 (diff) | |
| download | barebox-574947ef76428803c3a2cbe8a02f294e3227d8e0.tar.gz barebox-574947ef76428803c3a2cbe8a02f294e3227d8e0.tar.xz | |
Merge branch 'for-next/console'
Diffstat (limited to 'commands')
| -rw-r--r-- | commands/loadb.c | 22 | ||||
| -rw-r--r-- | commands/loadxy.c | 24 |
2 files changed, 3 insertions, 43 deletions
diff --git a/commands/loadb.c b/commands/loadb.c index a2f3315b64..b527e0095c 100644 --- a/commands/loadb.c +++ b/commands/loadb.c @@ -591,26 +591,6 @@ err_quit: } /** - * @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 @@ static int do_load_serial_bin(int argc, char *argv[]) } } - 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 52ecdcaa0b..7a912864e3 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 @@ static int do_loady(int argc, char *argv[]) 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 @@ static int do_loadx(int argc, char *argv[]) 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"); |