Changeset 26e7d6d in mainline for uspace/app/tester/console/console1.c

Timestamp:

2011-09-19T16:31:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a347a11

Parents:

3842a955 (diff), 086290d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/app/tester/console/console1.c (modified) (3 diffs)

uspace/app/tester/console/console1.c

@@ -76 +76 @@
                         for (i = COLOR_BLACK; i <= COLOR_WHITE; i++) {
                                 console_flush(console);
-                                console_set_color(console, i, COLOR_WHITE,
+                                console_set_color(console, COLOR_WHITE, i,
                                     j ? CATTR_BRIGHT : 0);
                                 printf(" %s ", color_name[i]);
@@ -89 +89 @@
                         for (i = COLOR_BLACK; i <= COLOR_WHITE; i++) {
                                 console_flush(console);
-                                console_set_color(console, COLOR_WHITE, i,
+                                console_set_color(console, i, COLOR_WHITE,
                                     j ? CATTR_BRIGHT : 0);
                                 printf(" %s ", color_name[i]);
@@ -102 +102 @@
                 for (i = 0; i < 255; i += 16) {
                         console_flush(console);
-                        console_set_rgb_color(console, (255 - i) << 16, i << 16);
+                        console_set_rgb_color(console, i << 16, (255 - i) << 16);
                         putchar('X');
                 }
                 console_flush(console);
-                console_set_color(console, COLOR_BLACK, COLOR_WHITE, 0);
+                console_set_color(console, COLOR_WHITE, COLOR_BLACK, 0);
                 putchar('\n');
                 
                 for (i = 0; i < 255; i += 16) {
                         console_flush(console);
-                        console_set_rgb_color(console, (255 - i) << 8, i << 8);
+                        console_set_rgb_color(console, i << 8, (255 - i) << 8);
                         putchar('X');
                 }
                 console_flush(console);
-                console_set_color(console, COLOR_BLACK, COLOR_WHITE, 0);
+                console_set_color(console, COLOR_WHITE, COLOR_BLACK, 0);
                 putchar('\n');
                 
                 for (i = 0; i < 255; i += 16) {
                         console_flush(console);
-                        console_set_rgb_color(console, 255 - i, i);
+                        console_set_rgb_color(console, i, 255 - i);
                         putchar('X');
                 }