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

Timestamp:

2011-03-30T13:10:24Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4ae90f9

Parents:

6e50466 (diff), d6b81941 (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

@@ -40 +40 @@
 #include <sys/types.h>
 #include <async.h>
-#include <device/char.h>
+#include <device/char_dev.h>
 #include <str.h>
 #include <vfs/vfs.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <device/char.h>
 #include "../../tester.h"
 
-#define DEVICE_PATH_NORMAL "/dev/devices/\\virt\\null"
+#define DEVICE_PATH_NORMAL "/dev/devices/\\virt\\null\\a"
 #define DEVICE_PATH_CLASSES "/dev/class/virt-null\\1"
 #define BUFFER_SIZE 64
@@ -79 +78 @@
         size_t i;
         char buffer[BUFFER_SIZE];
-        read_dev(phone, 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++) {
@@ -90 +89 @@
         /* Clean-up. */
         TPRINTF(" Closing phones and file descriptors\n");
-        ipc_hangup(phone);
+        async_hangup(phone);
         close(fd);