Changeset 6610565b in mainline for uspace/app/tester

Timestamp:

2011-01-10T16:20:56Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1ffa73b, 8048c648, 8426912a, 977fcea, f401312

Parents:

a97ea0f (diff), 4a5c6c1 (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

Location:

uspace/app/tester/hw

Files:

• misc/virtchar1.c (modified) (2 diffs)
• serial/serial1.c (modified) (4 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++) {

uspace/app/tester/hw/serial/serial1.c

@@ -45 +45 @@
 #include <ipc/devman.h>
 #include <devman.h>
-#include <device/char.h>
+#include <device/char_dev.h>
 #include <str.h>
 #include <ipc/serial_ctl.h>
@@ -121 +121 @@
         size_t total = 0;
         while (total < cnt) {
-                ssize_t read = read_dev(phone, buf, cnt - total);
+                ssize_t read = char_dev_read(phone, buf, cnt - total);
                 
                 if (read < 0) {
@@ -152 +152 @@
                          * direction of data transfer.
                          */
-                        ssize_t written = write_dev(phone, buf, read);
+                        ssize_t written = char_dev_write(phone, buf, read);
                         
                         if (written < 0) {
@@ -181 +181 @@
         
         size_t eot_size = str_size(EOT);
-        ssize_t written = write_dev(phone, (void *) EOT, eot_size);
+        ssize_t written = char_dev_write(phone, (void *) EOT, eot_size);
         
         ipc_call_sync_4_0(phone, SERIAL_SET_COM_PROPS, old_baud,