IOMUX: Split out for_each_console_dev() helper macro

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>

diff --git a/common/console.c b/common/console.c
index 523fb45a99e73bf634e55a1b7b70fd37cc26d2f9..561cdf36a747983c4f4895fc9d64c26b69693381 100644 (file)
--- a/common/console.c
+++ b/common/console.c
@@ -293,8 +293,7 @@ static int console_tstc(int file)
        int prev;
 
        prev = disable_ctrlc(1);
-       for (i = 0; i < cd_count[file]; i++) {
-               dev = console_devices[file][i];
+       for_each_console_dev(i, file, dev) {
                if (dev->tstc != NULL) {
                        ret = dev->tstc(dev);
                        if (ret > 0) {
@@ -314,8 +313,7 @@ static void console_putc(int file, const char c)
        int i;
        struct stdio_dev *dev;
 
-       for (i = 0; i < cd_count[file]; i++) {
-               dev = console_devices[file][i];
+       for_each_console_dev(i, file, dev) {
                if (dev->putc != NULL)
                        dev->putc(dev, c);
        }
@@ -334,11 +332,9 @@ static void console_puts_select(int file, bool serial_only, const char *s)
        int i;
        struct stdio_dev *dev;
 
-       for (i = 0; i < cd_count[file]; i++) {
-               bool is_serial;
+       for_each_console_dev(i, file, dev) {
+               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)
                        dev->puts(dev, s);
        }
@@ -354,8 +350,7 @@ static void console_puts(int file, const char *s)
        int i;
        struct stdio_dev *dev;
 
-       for (i = 0; i < cd_count[file]; i++) {
-               dev = console_devices[file][i];
+       for_each_console_dev(i, file, dev) {
                if (dev->puts != NULL)
                        dev->puts(dev, s);
        }

diff --git a/common/iomux.c b/common/iomux.c
index a8be1ac7d8ab4a23ae73321bb8f00982f80b6cb4..5290b13b668ba1ad7e776253f1494d7de7f4a828 100644 (file)
--- a/common/iomux.c
+++ b/common/iomux.c
@@ -15,10 +15,8 @@ void iomux_printdevs(const int console)
        int i;
        struct stdio_dev *dev;
 
-       for (i = 0; i < cd_count[console]; i++) {
-               dev = console_devices[console][i];
+       for_each_console_dev(i, console, dev)
                printf("%s ", dev->name);
-       }
        printf("\n");
 }
 

diff --git a/include/iomux.h b/include/iomux.h
index 9c2d5796066ce1b8879c5e0665cb2bc83f05d476..bd4a143b1e6039ff78ea4f257cdbb5c1a2f1286d 100644 (file)
--- a/include/iomux.h
+++ b/include/iomux.h
@@ -24,6 +24,11 @@ extern struct stdio_dev **console_devices[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_doenv(const int, const char *);
 void iomux_printdevs(const int);