Changes in uspace/app/tester/hw/serial/serial1.c [74017ce:c4c6025] in mainline

File:

• uspace/app/tester/hw/serial/serial1.c (modified) (13 diffs)

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

@@ -35 +35 @@
  */
 
-#include <async.h>
+#include <inttypes.h>
 #include <errno.h>
-#include <io/chardev.h>
-#include <io/serial.h>
-#include <ipc/services.h>
-#include <loc.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stddef.h>
+#include <async.h>
+#include <thread.h>
+#include <ipc/services.h>
+#include <loc.h>
+#include <char_dev_iface.h>
 #include <str.h>
-#include <thread.h>
+#include <io/serial.h>
 #include "../../tester.h"
 
@@ -56 +57 @@
         size_t cnt;
         serial_t *serial;
-        chardev_t *chardev;
-        int rc;
-        size_t nread;
-        size_t nwritten;
         
         if (test_argc < 1)
@@ -86 +83 @@
                 return "Failed connecting to serial device";
         
-        res = chardev_open(sess, &chardev);
-        if (res != EOK) {
-                async_hangup(sess);
+        res = serial_open(sess, &serial);
+        if (res != EOK)
                 return "Failed opening serial port";
-        }
-        
-        res = serial_open(sess, &serial);
-        if (res != EOK) {
-                chardev_close(chardev);
-                async_hangup(sess);
-                return "Failed opening serial port";
-        }
         
         char *buf = (char *) malloc(cnt + 1);
         if (buf == NULL) {
-                chardev_close(chardev);
                 serial_close(serial);
                 async_hangup(sess);
@@ -116 +103 @@
         if (res != EOK) {
                 free(buf);
-                chardev_close(chardev);
                 serial_close(serial);
                 async_hangup(sess);
@@ -125 +111 @@
         if (EOK != res) {
                 free(buf);
-                chardev_close(chardev);
                 serial_close(serial);
                 async_hangup(sess);
@@ -136 +121 @@
         size_t total = 0;
         while (total < cnt) {
-                
-                rc = chardev_read(chardev, buf, cnt - total, &nread);
-                if (rc != EOK) {
+                ssize_t read = char_dev_read(sess, buf, cnt - total);
+                
+                if (read < 0) {
                         (void) serial_set_comm_props(serial, old_baud,
                             old_par, old_word_size, old_stop);
                         
                         free(buf);
-                        chardev_close(chardev);
                         serial_close(serial);
                         async_hangup(sess);
@@ -149 +133 @@
                 }
                 
-                if (nread > cnt - total) {
+                if ((size_t) read > cnt - total) {
                         (void) serial_set_comm_props(serial, old_baud,
                             old_par, old_word_size, old_stop);
                         
                         free(buf);
-                        chardev_close(chardev);
                         serial_close(serial);
                         async_hangup(sess);
@@ -160 +143 @@
                 }
                 
-                TPRINTF("Read %zd bytes\n", nread);
-                
-                if (nread == 0)
+                TPRINTF("Read %zd bytes\n", read);
+                
+                if (read == 0)
                         thread_usleep(DEFAULT_SLEEP);
                 else {
-                        buf[nread] = 0;
+                        buf[read] = 0;
                         
                         /*
@@ -171 +154 @@
                          * direction of data transfer.
                          */
-                        rc = chardev_write(chardev, buf, nread, &nwritten);
-                        if (rc != EOK) {
+                        ssize_t written = char_dev_write(sess, buf, read);
+                        
+                        if (written < 0) {
                                 (void) serial_set_comm_props(serial, old_baud,
                                     old_par, old_word_size, old_stop);
                                 
                                 free(buf);
-                                chardev_close(chardev);
                                 serial_close(serial);
                                 async_hangup(sess);
@@ -183 +166 @@
                         }
                         
-                        if (nwritten != nread) {
+                        if (written != read) {
                                 (void) serial_set_comm_props(serial, old_baud,
                                     old_par, old_word_size, old_stop);
                                 
                                 free(buf);
-                                chardev_close(chardev);
                                 serial_close(serial);
                                 async_hangup(sess);
@@ -194 +176 @@
                         }
                         
-                        TPRINTF("Written %zd bytes\n", nwritten);
-                }
-                
-                total += nread;
+                        TPRINTF("Written %zd bytes\n", written);
+                }
+                
+                total += read;
         }
         
@@ -203 +185 @@
         
         size_t eot_size = str_size(EOT);
-        rc = chardev_write(chardev, (void *) EOT, eot_size, &nwritten);
+        ssize_t written = char_dev_write(sess, (void *) EOT, eot_size);
         
         (void) serial_set_comm_props(serial, old_baud, old_par, old_word_size,
@@ -209 +191 @@
         
         free(buf);
-        chardev_close(chardev);
         serial_close(serial);
         async_hangup(sess);
         
-        if (rc != EOK)
+        if (written < 0)
                 return "Failed to write EOT banner to serial device";
         
-        if (nwritten != eot_size)
+        if ((size_t) written != eot_size)
                 return "Written less data than the size of the EOT banner "
                     "to serial device";