Changes in uspace/app/tester/hw/misc/virtchar1.c [12f9f0d0:b927375] in mainline

File:

• uspace/app/tester/hw/misc/virtchar1.c (modified) (4 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>
 #include "../../tester.h"
 
-#define DEVICE_PATH_NORMAL "/loc/devices/\\virt\\null\\a"
+#define DEVICE_PATH_NORMAL "/dev/devices/\\virt\\null\\a"
+#define DEVICE_PATH_CLASSES "/dev/class/virt-null\\1"
 #define BUFFER_SIZE 64
 
@@ -66 +66 @@
         TPRINTF("   ...file handle %d\n", fd);
 
-        TPRINTF(" Asking for session...\n");
-        async_sess_t *sess = fd_session(EXCHANGE_SERIALIZE, fd);
-        if (!sess) {
+        TPRINTF(" Asking for phone...\n");
+        int phone = fd_phone(fd);
+        if (phone < 0) {
                 close(fd);
-                TPRINTF("   ...error: %s\n", str_error(errno));
-                return "Failed to get session to device";
+                TPRINTF("   ...error: %s\n", str_error(phone));
+                return "Failed to get phone to device";
         }
-        TPRINTF("   ...session is %p\n", sess);
+        TPRINTF("   ...phone is %d\n", phone);
         
         TPRINTF(" Will try to read...\n");
         size_t i;
         char buffer[BUFFER_SIZE];
-        char_dev_read(sess, buffer, BUFFER_SIZE);
+        char_dev_read(phone, buffer, BUFFER_SIZE);
         TPRINTF(" ...verifying that we read zeroes only...\n");
         for (i = 0; i < BUFFER_SIZE; i++) {
@@ -88 +88 @@
         
         /* Clean-up. */
-        TPRINTF(" Closing session and file descriptor\n");
-        async_hangup(sess);
+        TPRINTF(" Closing phones and file descriptors\n");
+        async_hangup(phone);
         close(fd);
         
@@ -104 +104 @@
         }
 
+        res = test_virtchar1_internal(DEVICE_PATH_CLASSES);
+        if (res != NULL) {
+                return res;
+        }
+
         return NULL;
 }