Changeset 1916d1f in mainline for uspace/app

Timestamp:

2011-07-12T13:41:26Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

50fc490

Parents:

11809eab (diff), 6817eba (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 libposix changes.

Location:

uspace/app

Files:

• ext2info/ext2info.c (modified) (1 diff)
• init/init.c (modified) (1 diff)
• ping/ping.c (modified) (5 diffs)
• trace/syscalls.c (modified) (1 diff)

uspace/app/ext2info/ext2info.c

@@ -590 +590 @@
         printf("  Directory contents:\n");
         
-        rc = ext2_directory_iterator_init(&it, fs, inode_ref);
+        rc = ext2_directory_iterator_init(&it, fs, inode_ref, 0);
         if (rc != EOK) {
                 printf("Failed initializing directory iterator\n");

uspace/app/init/init.c

@@ -270 +270 @@
         spawn("/srv/apic");
         spawn("/srv/i8259");
-        spawn("/srv/fhc");
         spawn("/srv/obio");
         srv_start("/srv/cuda_adb");

uspace/app/ping/ping.c

@@ -36 +36 @@
 
 #include <async.h>
-#include <async_obsolete.h>
 #include <stdio.h>
 #include <str.h>
@@ -341 +340 @@
             config.dest_str, config.size, config.size);
         
-        int icmp_phone = icmp_connect_module();
-        if (icmp_phone < 0) {
+        async_sess_t *sess = icmp_connect_module();
+        if (!sess) {
                 fprintf(stderr, "%s: Unable to connect to ICMP service (%s)\n", NAME,
-                    str_error(icmp_phone));
-                return icmp_phone;
+                    str_error(errno));
+                return errno;
         }
         
@@ -356 +355 @@
                             str_error(ret));
                         
-                        async_obsolete_hangup(icmp_phone);
+                        async_hangup(sess);
                         return ret;
                 }
                 
                 /* Ping! */
-                int result = icmp_echo_msg(icmp_phone, config.size, config.timeout,
+                int result = icmp_echo_msg(sess, config.size, config.timeout,
                     config.ttl, config.tos, !config.fragments, config.dest_raw,
                     config.dest_len);
@@ -371 +370 @@
                             str_error(ret));
                         
-                        async_obsolete_hangup(icmp_phone);
+                        async_hangup(sess);
                         return ret;
                 }
@@ -391 +390 @@
         }
         
-        async_obsolete_hangup(icmp_phone);
+        async_hangup(sess);
         
         return 0;

uspace/app/trace/syscalls.c

@@ -80 +80 @@
     [SYS_SYSINFO_GET_DATA] = { "sysinfo_get_data",              5,      V_ERRNO },
 
-    [SYS_DEBUG_ENABLE_CONSOLE] = { "debug_enable_console", 0,   V_ERRNO },
+    [SYS_DEBUG_ACTIVATE_CONSOLE] = { "debug_activate_console", 0,       V_ERRNO },
     [SYS_IPC_CONNECT_KBOX] = { "ipc_connect_kbox",      1,      V_ERRNO }
 };