leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IOMUX: Split out for_each_console_dev() helper macro

Browse Source 
It is not only less lines of code, but also better readability
when new macro is being in use. Introduce for_each_console_dev()
helper macro and convert current users to it.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
This commit is contained in:
Andy Shevchenko 2021-02-11 17:09:42 +02:00 committed by Tom Rini
parent b672c1619b
commit 400797cad3
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/console.c
View File

@ -293,8 +293,7 @@ static int console_tstc(int file)
int prev; int prev;
prev = disable_ctrlc(1); prev = disable_ctrlc(1);
for (i = 0; i < cd_count[file]; i++) { for_each_console_dev(i, file, dev) {
dev = console_devices[file][i];
if (dev->tstc != NULL) { if (dev->tstc != NULL) {
ret = dev->tstc(dev); ret = dev->tstc(dev);
if (ret > 0) { if (ret > 0) {
@ -314,8 +313,7 @@ static void console_putc(int file, const char c)
int i; int i;
struct stdio_dev *dev; struct stdio_dev *dev;
for (i = 0; i < cd_count[file]; i++) { for_each_console_dev(i, file, dev) {
dev = console_devices[file][i];
if (dev->putc != NULL) if (dev->putc != NULL)
dev->putc(dev, c); dev->putc(dev, c);
} }
@ -334,11 +332,9 @@ static void console_puts_select(int file, bool serial_only, const char *s)
int i; int i;
struct stdio_dev *dev; struct stdio_dev *dev;
for (i = 0; i < cd_count[file]; i++) { for_each_console_dev(i, file, dev) {
bool is_serial; bool is_serial = console_dev_is_serial(dev);
dev = console_devices[file][i];
is_serial = console_dev_is_serial(dev);
if (dev->puts && serial_only == is_serial) if (dev->puts && serial_only == is_serial)
dev->puts(dev, s); dev->puts(dev, s);
} }
@ -354,8 +350,7 @@ static void console_puts(int file, const char *s)
int i; int i;
struct stdio_dev *dev; struct stdio_dev *dev;
for (i = 0; i < cd_count[file]; i++) { for_each_console_dev(i, file, dev) {
dev = console_devices[file][i];
if (dev->puts != NULL) if (dev->puts != NULL)
dev->puts(dev, s); dev->puts(dev, s);
} }

4
common/iomux.c
View File

@ -15,10 +15,8 @@ void iomux_printdevs(const int console)
int i; int i;
struct stdio_dev *dev; struct stdio_dev *dev;
for (i = 0; i < cd_count[console]; i++) { for_each_console_dev(i, console, dev)
dev = console_devices[console][i];
printf("%s ", dev->name); printf("%s ", dev->name);
}
printf("\n"); printf("\n");
} }

5
include/iomux.h
View File

@ -24,6 +24,11 @@ extern struct stdio_dev **console_devices[MAX_FILES];
*/ */
extern int cd_count[MAX_FILES]; extern int cd_count[MAX_FILES];
#define for_each_console_dev(i, file, dev) \
for (i = 0, dev = console_devices[file][i]; \
i < cd_count[file]; \
i++, dev = console_devices[file][i])
int iomux_match_device(struct stdio_dev **, const int, struct stdio_dev *); int iomux_match_device(struct stdio_dev **, const int, struct stdio_dev *);
int iomux_doenv(const int, const char *); int iomux_doenv(const int, const char *);
void iomux_printdevs(const int); void iomux_printdevs(const int);