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

Timestamp:

2011-01-13T20:58:24Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

87e373b

Parents:

eaef141 (diff), a613fea1 (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) (2 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"
 
@@ -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++) {