Changeset 79ae36dd in mainline for uspace/app/bdsh/cmds/modules/cat/cat.c

Timestamp:

2011-06-08T19:01:55Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0eff68e

Parents:

764d71e

Message:

new async framework with integrated exchange tracking

• strict isolation between low-level IPC and high-level async framework with integrated exchange tracking
  • each IPC connection is represented by an async_sess_t structure
  • each IPC exchange is represented by an async_exch_t structure
  • exchange management is either based on atomic messages (EXCHANGE_ATOMIC), locking (EXCHANGE_SERIALIZE) or connection cloning (EXCHANGE_CLONE)
• async_obsolete: temporary compatibility layer to keep old async clients working (several pieces of code are currently broken, but only non-essential functionality)
• IPC_M_PHONE_HANGUP is now method no. 0 (for elegant boolean evaluation)
• IPC_M_DEBUG_ALL has been renamed to IPC_M_DEBUG
• IPC_M_PING has been removed (VFS protocol now has VFS_IN_PING)
• console routines in libc have been rewritten for better abstraction
• additional use for libc-private header files (FILE structure opaque to the client)
• various cstyle changes (typos, indentation, missing externs in header files, improved comments, etc.)

File:

• uspace/app/bdsh/cmds/modules/cat/cat.c (modified) (5 diffs)

uspace/app/bdsh/cmds/modules/cat/cat.c

@@ -64 +64 @@
 static sysarg_t console_rows = 0;
 static bool should_quit = false;
+
+static console_ctrl_t *console = NULL;
 
 static struct option const long_options[] = {
@@ -102 +104 @@
 static void waitprompt()
 {
-        console_set_pos(fphone(stdout), 0, console_rows-1);
-        console_set_color(fphone(stdout), COLOR_BLUE, COLOR_WHITE, 0);
+        console_set_pos(console, 0, console_rows-1);
+        console_set_color(console, COLOR_BLUE, COLOR_WHITE, 0);
+        
         printf("ENTER/SPACE/PAGE DOWN - next page, "
                "ESC/Q - quit, C - continue unpaged");
         fflush(stdout);
-        console_set_style(fphone(stdout), STYLE_NORMAL);
+        
+        console_set_style(console, STYLE_NORMAL);
 }
 
 static void waitkey()
 {
-        console_event_t ev;
+        kbd_event_t ev;
         
         while (true) {
-                if (!console_get_event(fphone(stdin), &ev)) {
+                if (!console_get_kbd_event(console, &ev)) {
                         return;
                 }
@@ -138 +142 @@
 static void newpage()
 {
-        console_clear(fphone(stdout));
+        console_clear(console);
         chars_remaining = console_cols;
-        lines_remaining = console_rows-1;
+        lines_remaining = console_rows - 1;
 }
 
@@ -238 +242 @@
         console_rows = 0;
         should_quit = false;
+        console = console_init(stdin, stdout);
 
         argc = cli_count_args(argv);
@@ -280 +285 @@
         
         if (more) {
-                rc = console_get_size(fphone(stdout), &cols, &rows);
+                rc = console_get_size(console, &cols, &rows);
                 if (rc != EOK) {
                         printf("%s - cannot get console size\n", cmdname);