Changeset c028b22 in mainline for uspace/app/tester/hw/misc/virtchar1.c

Timestamp:

2011-07-08T17:01:01Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cc1a727

Parents:

4e36219 (diff), 026793d (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/hw/misc/virtchar1.c (modified) (3 diffs)

uspace/app/tester/hw/misc/virtchar1.c

@@ -43 +43 @@
 #include <str.h>
 #include <vfs/vfs.h>
+#include <vfs/vfs_sess.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -66 +67 @@
         TPRINTF("   ...file handle %d\n", fd);
 
-        TPRINTF(" Asking for phone...\n");
-        int phone = fd_phone(fd);
-        if (phone < 0) {
+        TPRINTF(" Asking for session...\n");
+        async_sess_t *sess = fd_session(EXCHANGE_SERIALIZE, fd);
+        if (!sess) {
                 close(fd);
-                TPRINTF("   ...error: %s\n", str_error(phone));
-                return "Failed to get phone to device";
+                TPRINTF("   ...error: %s\n", str_error(errno));
+                return "Failed to get session to device";
         }
-        TPRINTF("   ...phone is %d\n", phone);
+        TPRINTF("   ...session is %p\n", sess);
         
         TPRINTF(" Will try to read...\n");
         size_t i;
         char buffer[BUFFER_SIZE];
-        char_dev_read(phone, buffer, BUFFER_SIZE);
+        char_dev_read(sess, buffer, BUFFER_SIZE);
         TPRINTF(" ...verifying that we read zeroes only...\n");
         for (i = 0; i < BUFFER_SIZE; i++) {
@@ -88 +89 @@
         
         /* Clean-up. */
-        TPRINTF(" Closing phones and file descriptors\n");
-        async_hangup(phone);
+        TPRINTF(" Closing session and file descriptor\n");
+        async_hangup(sess);
         close(fd);