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

Timestamp:

2009-06-03T19:31:07Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0c25c10

Parents:

73878c1

Message:

update for latest I/O changes
(some tests are not 100% working yet, will be solved soon)

File:

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

uspace/app/tester/console/console1.c

@@ -29 +29 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <io/stream.h>
+#include <io/console.h>
+#include <io/color.h>
+#include <io/style.h>
 #include <async.h>
 #include "../tester.h"
-
-#include <console.h>
 
 const char *color_name[] = {
@@ -51 +51 @@
 
         printf("Style test: ");
-        console_set_style(STYLE_NORMAL);
+        console_set_style(fphone(stdout), STYLE_NORMAL);
         printf("normal ");
-        console_set_style(STYLE_EMPHASIS);
+        console_set_style(fphone(stdout), STYLE_EMPHASIS);
         printf("emphasized");
-        console_set_style(STYLE_NORMAL);
+        console_set_style(fphone(stdout), STYLE_NORMAL);
         printf(".\n");
 
@@ -61 +61 @@
         for (j = 0; j < 2; j++) {
                 for (i = COLOR_BLACK; i <= COLOR_WHITE; i++) {
-                        console_set_color(i, COLOR_WHITE,
+                        console_set_color(fphone(stdout), i, COLOR_WHITE,
                             j ? CATTR_BRIGHT : 0);
                         printf(" %s ", color_name[i]);
                 }
-                console_set_color(COLOR_BLACK, COLOR_WHITE, 0);
+                console_set_color(fphone(stdout), COLOR_BLACK, COLOR_WHITE, 0);
                 putchar('\n');
         }
@@ -72 +72 @@
         for (j = 0; j < 2; j++) {
                 for (i = COLOR_BLACK; i <= COLOR_WHITE; i++) {
-                        console_set_color(COLOR_WHITE, i,
+                        console_set_color(fphone(stdout), COLOR_WHITE, i,
                             j ? CATTR_BRIGHT : 0);
                         printf(" %s ", color_name[i]);
                 }
-                console_set_color(COLOR_BLACK, COLOR_WHITE, 0);
+                console_set_color(fphone(stdout), COLOR_BLACK, COLOR_WHITE, 0);
                 putchar('\n');
         }
@@ -83 +83 @@
 
         for (i = 0; i < 255; i += 16) {
-                console_set_rgb_color(0xffffff, i << 16);
+                console_set_rgb_color(fphone(stdout), 0xffffff, i << 16);
                 putchar('X');
         }
-        console_set_color(COLOR_BLACK, COLOR_WHITE, 0);
+        console_set_color(fphone(stdout), COLOR_BLACK, COLOR_WHITE, 0);
         putchar('\n');
 
         for (i = 0; i < 255; i += 16) {
-                console_set_rgb_color(0xffffff, i << 8);
+                console_set_rgb_color(fphone(stdout), 0xffffff, i << 8);
                 putchar('X');
         }
-        console_set_color(COLOR_BLACK, COLOR_WHITE, 0);
+        console_set_color(fphone(stdout), COLOR_BLACK, COLOR_WHITE, 0);
         putchar('\n');
 
         for (i = 0; i < 255; i += 16) {
-                console_set_rgb_color(0xffffff, i);
+                console_set_rgb_color(fphone(stdout), 0xffffff, i);
                 putchar('X');
         }
-        console_set_color(COLOR_BLACK, COLOR_WHITE, 0);
+        console_set_color(fphone(stdout), COLOR_BLACK, COLOR_WHITE, 0);
         putchar('\n');