Changeset 357b5f5 in mainline for uspace/app/tester/hw/serial/serial1.c

Timestamp:

2011-01-23T20:09:13Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fdb9982c

Parents:

cead2aa (diff), 7e36c8d (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/serial/serial1.c (modified) (5 diffs)

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>
@@ -93 +93 @@
         }
         
-        ipcarg_t old_baud;
-        ipcarg_t old_par;
-        ipcarg_t old_stop;
-        ipcarg_t old_word_size;
+        sysarg_t old_baud;
+        sysarg_t old_par;
+        sysarg_t old_stop;
+        sysarg_t old_word_size;
         
         res = ipc_call_sync_0_4(phone, SERIAL_GET_COM_PROPS, &old_baud,
@@ -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,