Changes in uspace/app/trace/trace.c [79ae36dd:7c014d1] in mainline

File:

• uspace/app/trace/trace.c (modified) (7 diffs)

uspace/app/trace/trace.c

@@ -50 +50 @@
 #include <sys/types.h>
 #include <sys/typefmt.h>
+#include <vfs/vfs.h>
 
 #include <libc.h>
@@ -85 +86 @@
 void thread_trace_start(uintptr_t thread_hash);
 
-static proto_t *proto_console;
 static task_id_t task_id;
 static loader_t *task_ldr;
@@ -586 +586 @@
 
         /* Send default files */
-        fdi_node_t *files[4];
-        fdi_node_t stdin_node;
-        fdi_node_t stdout_node;
-        fdi_node_t stderr_node;
-        
-        if ((stdin != NULL) && (fnode(stdin, &stdin_node) == EOK))
-                files[0] = &stdin_node;
+        int *files[4];
+        int fd_stdin;
+        int fd_stdout;
+        int fd_stderr;
+        
+        if ((stdin != NULL) && (fhandle(stdin, &fd_stdin) == EOK))
+                files[0] = &fd_stdin;
         else
                 files[0] = NULL;
         
-        if ((stdout != NULL) && (fnode(stdout, &stdout_node) == EOK))
-                files[1] = &stdout_node;
+        if ((stdout != NULL) && (fhandle(stdout, &fd_stdout) == EOK))
+                files[1] = &fd_stdout;
         else
                 files[1] = NULL;
         
-        if ((stderr != NULL) && (fnode(stderr, &stderr_node) == EOK))
-                files[2] = &stderr_node;
+        if ((stderr != NULL) && (fhandle(stderr, &fd_stderr) == EOK))
+                files[2] = &fd_stderr;
         else
                 files[2] = NULL;
@@ -658 +658 @@
         ipcp_init();
 
-        /* 
-         * User apps now typically have console on phone 3.
-         * (Phones 1 and 2 are used by the loader).
-         */
-        ipcp_connection_set(3, 0, proto_console);
-
         rc = get_thread_list();
         if (rc < 0) {
@@ -713 +707 @@
                         fibril_mutex_unlock(&state_lock);
                         printf("Resume...\n");
+                        break;
+                default:
                         break;
                 }
@@ -761 +757 @@
         o = oper_new("open", 2, arg_def, V_INT_ERRNO, 0, resp_def);
         proto_add_oper(p, VFS_IN_OPEN, o);
-        o = oper_new("open_node", 4, arg_def, V_INT_ERRNO, 0, resp_def);
-        proto_add_oper(p, VFS_IN_OPEN_NODE, o);
         o = oper_new("read", 1, arg_def, V_ERRNO, 1, resp_def);
         proto_add_oper(p, VFS_IN_READ, o);
@@ -791 +785 @@
 
         proto_register(SERVICE_VFS, p);
-
-        p = proto_new("console");
-
-        o = oper_new("write", 1, arg_def, V_ERRNO, 1, resp_def);
-        proto_add_oper(p, VFS_IN_WRITE, o);
-
-        resp_def[0] = V_INTEGER; resp_def[1] = V_INTEGER;
-        resp_def[2] = V_INTEGER; resp_def[3] = V_CHAR;
-        o = oper_new("getkey", 0, arg_def, V_ERRNO, 4, resp_def);
-
-        arg_def[0] = V_CHAR;
-        o = oper_new("clear", 0, arg_def, V_VOID, 0, resp_def);
-        proto_add_oper(p, CONSOLE_CLEAR, o);
-
-        arg_def[0] = V_INTEGER; arg_def[1] = V_INTEGER;
-        o = oper_new("goto", 2, arg_def, V_VOID, 0, resp_def);
-        proto_add_oper(p, CONSOLE_GOTO, o);
-
-        resp_def[0] = V_INTEGER; resp_def[1] = V_INTEGER;
-        o = oper_new("getsize", 0, arg_def, V_INTEGER, 2, resp_def);
-        proto_add_oper(p, CONSOLE_GET_SIZE, o);
-
-        arg_def[0] = V_INTEGER;
-        o = oper_new("set_style", 1, arg_def, V_VOID, 0, resp_def);
-        proto_add_oper(p, CONSOLE_SET_STYLE, o);
-        arg_def[0] = V_INTEGER; arg_def[1] = V_INTEGER; arg_def[2] = V_INTEGER;
-        o = oper_new("set_color", 3, arg_def, V_VOID, 0, resp_def);
-        proto_add_oper(p, CONSOLE_SET_COLOR, o);
-        arg_def[0] = V_INTEGER; arg_def[1] = V_INTEGER;
-        o = oper_new("set_rgb_color", 2, arg_def, V_VOID, 0, resp_def);
-        proto_add_oper(p, CONSOLE_SET_RGB_COLOR, o);
-        o = oper_new("cursor_visibility", 1, arg_def, V_VOID, 0, resp_def);
-        proto_add_oper(p, CONSOLE_CURSOR_VISIBILITY, o);
-
-        proto_console = p;
-        proto_register(SERVICE_CONSOLE, p);
 }